diff --git a/local/patches/base/P0-bootstrap-workspace-fix.patch b/local/patches/base/P0-bootstrap-workspace-fix.patch
index 383617473d..1519b3a849 100644
--- a/local/patches/base/P0-bootstrap-workspace-fix.patch
+++ b/local/patches/base/P0-bootstrap-workspace-fix.patch
@@ -1,9 +1,6 @@
 diff --git a/bootstrap/Cargo.toml b/bootstrap/Cargo.toml
+index 82120c21..50faead5 100644
 --- a/bootstrap/Cargo.toml
 +++ b/bootstrap/Cargo.toml
-@@ -7,5 +7,3 @@ edition = "2024"
- license = "MIT"
- 
--[workspace]
+@@ -8 +7,0 @@ license = "MIT"
 -
- [dependencies]
diff --git a/local/patches/base/P9-base-local-relibc-patch.patch b/local/patches/base/P9-base-local-relibc-patch.patch
new file mode 100644
index 0000000000..dd91b9a656
--- /dev/null
+++ b/local/patches/base/P9-base-local-relibc-patch.patch
@@ -0,0 +1,8 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 9e776232..fdaeae69 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -117 +117,2 @@ precedence = "deny"
+-#redox-ioctl = { path = "../../relibc/source/redox-ioctl" }
++redox-ioctl = { path = "../../relibc/source/redox-ioctl" }
++redox-rt = { path = "../../relibc/source/redox-rt" }
diff --git a/local/patches/relibc/P4-pselect-implementation.patch b/local/patches/relibc/P4-pselect-implementation.patch
new file mode 100644
index 0000000000..975d566903
--- /dev/null
+++ b/local/patches/relibc/P4-pselect-implementation.patch
@@ -0,0 +1,127 @@
+diff --git a/src/header/sys_select/cbindgen.toml b/src/header/sys_select/cbindgen.toml
+index 36bfa1fc..bb88cf19 100644
+--- a/src/header/sys_select/cbindgen.toml
++++ b/src/header/sys_select/cbindgen.toml
+@@ -2,0 +3,2 @@ after_includes = """
++#include <bits/timespec.h> // for timespec (needed by pselect)
++
+@@ -33,0 +36,3 @@ exclude = ["FD_SETSIZE", "fd_set"]
++
++[export.rename]
++"timespec" = "struct timespec"
+diff --git a/src/header/sys_select/mod.rs b/src/header/sys_select/mod.rs
+index 45e7a238..d4c34fb1 100644
+--- a/src/header/sys_select/mod.rs
++++ b/src/header/sys_select/mod.rs
+@@ -5 +5 @@
+-use core::mem;
++use core::{mem, ptr};
+@@ -11,0 +12,2 @@ use crate::{
++        bits_sigset_t::sigset_t,
++        bits_timespec::timespec,
+@@ -15 +17 @@ use crate::{
+-            epoll_data, epoll_event, epoll_wait,
++            epoll_data, epoll_event, epoll_pwait,
+@@ -48,0 +51,5 @@ pub struct fd_set {
++/// Inner implementation shared by `select` and `pselect`.
++///
++/// Uses epoll internally, mirroring the `poll_epoll` pattern from `poll/mod.rs`.
++/// The `timeout_ms` parameter is in milliseconds (-1 = block forever, 0 = non-blocking).
++/// The `sigmask` parameter is passed through to `epoll_pwait` for atomic signal mask changes.
+@@ -55 +62,2 @@ pub fn select_epoll(
+-    timeout: Option<&mut timeval>,
++    timeout_ms: c_int,
++    sigmask: *const sigset_t,
+@@ -136,11 +144 @@ pub fn select_epoll(
+-        match timeout {
+-            Some(timeout) => {
+-                let sec_ms = (timeout.tv_sec as c_int).checked_mul(1000);
+-                let usec_ms = (timeout.tv_usec as c_int) / 1000;
+-                match sec_ms.and_then(|s| s.checked_add(usec_ms)) {
+-                    Some(s) => s as c_int,
+-                    None => c_int::MAX,
+-                }
+-            }
+-            None => -1,
+-        }
++        timeout_ms
+@@ -149 +147 @@ pub fn select_epoll(
+-        epoll_wait(
++        epoll_pwait(
+@@ -153,0 +152 @@ pub fn select_epoll(
++            sigmask,
+@@ -188 +187 @@ pub fn select_epoll(
+-/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pselect.html>.
++/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/select.html>.
+@@ -196,0 +196,11 @@ pub unsafe extern "C" fn select(
++    let timeout_ms = if timeout.is_null() {
++        -1
++    } else {
++        let tv = unsafe { &*timeout };
++        let sec_ms = (tv.tv_sec as c_int).checked_mul(1000);
++        let usec_ms = (tv.tv_usec as c_int) / 1000;
++        match sec_ms.and_then(|s| s.checked_add(usec_ms)) {
++            Some(s) => s as c_int,
++            None => c_int::MAX,
++        }
++    };
+@@ -215,5 +225,2 @@ pub unsafe extern "C" fn select(
+-            if timeout.is_null() {
+-                None
+-            } else {
+-                Some(unsafe { &mut *timeout })
+-            }
++            timeout_ms,
++            ptr::null()
+@@ -228,0 +236,51 @@ pub unsafe extern "C" fn select(
++
++/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pselect.html>.
++#[unsafe(no_mangle)]
++pub unsafe extern "C" fn pselect(
++    nfds: c_int,
++    readfds: *mut fd_set,
++    writefds: *mut fd_set,
++    exceptfds: *mut fd_set,
++    timeout: *const timespec,
++    sigmask: *const sigset_t,
++) -> c_int {
++    let timeout_ms = if timeout.is_null() {
++        -1
++    } else {
++        let ts = unsafe { &*timeout };
++        if ts.tv_sec > (c_int::MAX / 1000) as _ {
++            c_int::MAX
++        } else {
++            ((ts.tv_sec as c_int) * 1000) + ((ts.tv_nsec as c_int) / 1000000)
++        }
++    };
++    trace_expr!(
++        select_epoll(
++            nfds,
++            if readfds.is_null() {
++                None
++            } else {
++                Some(unsafe { &mut *readfds })
++            },
++            if writefds.is_null() {
++                None
++            } else {
++                Some(unsafe { &mut *writefds })
++            },
++            if exceptfds.is_null() {
++                None
++            } else {
++                Some(unsafe { &mut *exceptfds })
++            },
++            timeout_ms,
++            sigmask
++        ),
++        "pselect({}, {:p}, {:p}, {:p}, {:p}, {:p})",
++        nfds,
++        readfds,
++        writefds,
++        exceptfds,
++        timeout,
++        sigmask
++    )
++}
diff --git a/local/recipes/dev/bison/recipe.toml b/local/recipes/dev/bison/recipe.toml
index ec50419fed..94d48f24fc 100644
--- a/local/recipes/dev/bison/recipe.toml
+++ b/local/recipes/dev/bison/recipe.toml
@@ -7,13 +7,102 @@ template = "custom"
 script = """
 DYNAMIC_INIT
 export ac_cv_func___fseterr=yes
-export ac_cv_type_sigset_t=yes
+
+# Gnulib cross-compilation: relibc has standard POSIX headers and types
+# but gnulib's configure can't run test programs during cross-compilation.
+# Without these, gnulib generates broken #define fallbacks and replacement headers.
+
+# Standard headers (gnulib can't detect these when cross-compiling)
+export ac_cv_header_stdio_h=yes
+export ac_cv_header_stdlib_h=yes
+export ac_cv_header_string_h=yes
+export ac_cv_header_strings_h=yes
+export ac_cv_header_inttypes_h=yes
+export ac_cv_header_stdint_h=yes
+export ac_cv_header_unistd_h=yes
+export ac_cv_header_sys_types_h=yes
+export ac_cv_header_sys_stat_h=yes
+export ac_cv_header_time_h=yes
+export ac_cv_header_sys_time_h=yes
+export ac_cv_header_sys_select_h=yes
+export ac_cv_header_wchar_h=yes
+export ac_cv_header_wctype_h=yes
+export ac_cv_header_signal_h=yes
+export ac_cv_header_dirent_h=yes
+export ac_cv_header_fcntl_h=yes
+export ac_cv_header_locale_h=yes
+export ac_cv_header_errno_h=yes
+export ac_cv_header_ctype_h=yes
+export ac_cv_header_limits_h=yes
+export ac_cv_header_stdarg_h=yes
+export ac_cv_header_stddef_h=yes
+export ac_cv_header_math_h=yes
+export ac_cv_header_spawn_h=yes
+export gl_cv_header_inttypes_h=yes
+export gl_cv_header_stdint_h=yes
+export gl_cv_header_inttypes_h_with_uintmax=yes
+export ac_cv_have_inttypes_h_with_uintmax=yes
+
+# Standard types (gnulib generates broken fallbacks without these)
+export ac_cv_type_intmax_t=yes
+export ac_cv_type_uintmax_t=yes
+export ac_cv_type_gid_t=yes
+export ac_cv_type_uid_t=yes
+export ac_cv_type_pid_t=yes
+export ac_cv_type_mode_t=yes
+export ac_cv_type_off_t=yes
+export ac_cv_type_size_t=yes
+export ac_cv_type_ssize_t=yes
+export ac_cv_type_ptrdiff_t=yes
+export ac_cv_type_nlink_t=yes
+export ac_cv_type_mbstate_t=yes
+export gl_cv_type_intmax_t=yes
+export gl_cv_type_ptrdiff_t_signed=yes
+export gl_cv_header_inttypes_h_with_uintmax=yes
+export ac_cv_have_inttypes_h_with_uintmax=yes
+
+# Spawn functions (relibc provides these via the P3-spawn patch)
+export gl_cv_func_spawn_posix_spawn=yes
+export gl_cv_func_spawn_posix_spawnp=yes
+export ac_cv_func_posix_spawn=yes
+export ac_cv_func_posix_spawnp=yes
+export ac_cv_func_posix_spawn_file_actions_init=yes
+export ac_cv_func_posix_spawn_file_actions_destroy=yes
+export ac_cv_func_posix_spawn_file_actions_addopen=yes
+export ac_cv_func_posix_spawn_file_actions_addclose=yes
+export ac_cv_func_posix_spawn_file_actions_adddup2=yes
+export ac_cv_func_posix_spawnattr_init=yes
+export ac_cv_func_posix_spawnattr_destroy=yes
+export ac_cv_func_posix_spawnattr_setflags=yes
+export ac_cv_func_posix_spawnattr_getflags=yes
+export ac_cv_func_posix_spawnattr_setsigmask=yes
+export ac_cv_func_posix_spawnattr_getsigmask=yes
+
+# Other functions
+export ac_cv_func_getpagesize=yes
+export ac_cv_func_memcmp_working=yes
+export ac_cv_func_mmap_fixed_mapped=yes
+
+# Spawn types
 export ac_cv_type_posix_spawnattr_t=yes
 export ac_cv_type_posix_spawn_file_actions_t=yes
 COOKBOOK_CONFIGURE_FLAGS+=(
     --disable-nls
 )
-cookbook_configure
+
+# Cross-compilation fix: run configure manually, then patch the
+# generated Makefile to use host bison instead of the cross-compiled
+# wrapper. The generated Makefile hardcodes
+#   BISON = $(top_builddir)/tests/bison
+# which wraps the x86_64-unknown-redox binary — unrunnable on the host.
+"${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"
+sed -i 's|^BISON = .*|BISON = /usr/bin/bison|' "${COOKBOOK_BUILD}/Makefile"
+
+# Fix gnulib cross-compilation misdetections in config.h
+"${COOKBOOK_ROOT}/local/scripts/gnulib-cross-fix.sh" "${COOKBOOK_BUILD}/lib/config.h"
+
+"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}"
+"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}"
 """
 
 [package]
diff --git a/local/recipes/dev/bison/source/configure b/local/recipes/dev/bison/source/configure
index c8c4cfebdf..67b26a3e32 100755
--- a/local/recipes/dev/bison/source/configure
+++ b/local/recipes/dev/bison/source/configure
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for GNU Bison 3.8.2.
+# Generated by GNU Autoconf 2.73 for GNU Bison 3.8.2.
 #
 # Report bugs to <bug-bison@gnu.org>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 # Inc.
 #
 #
@@ -17,21 +17,21 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
 if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
 then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else $as_nop
-  case `(set -o) 2>/dev/null` in #(
+else case e in #(
+  e) case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
+esac ;;
 esac
 fi
 
@@ -103,13 +103,13 @@ IFS=$as_save_IFS
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -131,30 +131,33 @@ case $- in # ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $# in # ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+# out after a failed 'exec'.
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="as_nop=:
-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+  as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
 then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else \$as_nop
-  case \`(set -o) 2>/dev/null\` in #(
+else case e in #(
+  e) case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
+esac ;;
 esac
 fi
 "
@@ -172,8 +175,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
 if ( set x; as_fn_ret_success y && test x = \"\$1\" )
 then :
 
-else \$as_nop
-  exitcode=1; echo positional parameters were not saved.
+else case e in #(
+  e) exitcode=1; echo positional parameters were not saved. ;;
+esac
 fi
 test x\$exitcode = x0 || exit 1
 blah=\$(echo \$(echo blah))
@@ -187,14 +191,15 @@ test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null
 then :
   as_have_required=yes
-else $as_nop
-  as_have_required=no
+else case e in #(
+  e) as_have_required=no ;;
+esac
 fi
   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
 then :
 
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
@@ -227,12 +232,13 @@ IFS=$as_save_IFS
 if $as_found
 then :
 
-else $as_nop
-  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+else case e in #(
+  e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
 	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
 then :
   CONFIG_SHELL=$SHELL as_have_required=yes
-fi
+fi ;;
+esac
 fi
 
 
@@ -252,29 +258,33 @@ case $- in # ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $# in # ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+# out after a failed 'exec'.
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and bug-bison@gnu.org
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org and bug-bison@gnu.org
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
 $0: have one."
   fi
   exit 1
-fi
+fi ;;
+esac
 fi
 fi
 SHELL=${CONFIG_SHELL-/bin/sh}
@@ -313,14 +323,6 @@ as_fn_exit ()
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -335,7 +337,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -344,7 +346,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -389,11 +391,12 @@ then :
   {
     eval $1+=\$2
   }'
-else $as_nop
-  as_fn_append ()
+else case e in #(
+  e) as_fn_append ()
   {
     eval $1=\$$1\$2
-  }
+  } ;;
+esac
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -407,21 +410,14 @@ then :
   {
     as_val=$(( $* ))
   }'
-else $as_nop
-  as_fn_arith ()
+else case e in #(
+  e) as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  }
+  } ;;
+esac
 fi # as_fn_arith
 
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -433,9 +429,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -462,7 +458,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -495,6 +491,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
     /[$]LINENO/=
   ' <$as_myself |
     sed '
+      t clear
+      :clear
       s/[$]LINENO.*/&-/
       t lineno
       b
@@ -506,7 +504,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -520,30 +518,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -555,9 +529,9 @@ if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -582,10 +556,12 @@ as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
@@ -600,6 +576,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
@@ -1026,6 +1003,7 @@ HAVE_RAISE
 HAVE_PTHREAD_SIGMASK
 HAVE_POSIX_SIGNALBLOCKING
 ASM_SYMBOL_PREFIX
+EGREP
 GL_GNULIB_POSIX_SPAWNATTR_DESTROY
 GL_GNULIB_POSIX_SPAWNATTR_SETSIGMASK
 GL_GNULIB_POSIX_SPAWNATTR_GETSIGMASK
@@ -1165,6 +1143,7 @@ HAVE_MBSINIT
 HAVE_BTOWC
 NEXT_AS_FIRST_DIRECTIVE_MATH_H
 NEXT_MATH_H
+GREP
 SED
 LTLIBMULTITHREAD
 LIBMULTITHREAD
@@ -2184,8 +2163,6 @@ HAVE_LIBTEXTSTYLE
 RANLIB
 ARFLAGS
 AR
-EGREP
-GREP
 CPP
 host_os
 host_vendor
@@ -2248,13 +2225,13 @@ INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
 PACKAGE_COPYRIGHT_YEAR
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -2432,9 +2409,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+      as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -2458,9 +2435,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+      as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -2671,9 +2648,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
+      as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2687,9 +2664,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
+      as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2717,8 +2694,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error $? "unrecognized option: '$ac_option'
+Try '$0 --help' for more information"
     ;;
 
   *=*)
@@ -2726,16 +2703,16 @@ Try \`$0 --help' for more information"
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -2743,7 +2720,7 @@ Try \`$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -2751,7 +2728,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -2776,7 +2753,7 @@ do
   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
-# There might be people who depend on the old broken behavior: `$host'
+# There might be people who depend on the old broken behavior: '$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 build=$build_alias
@@ -2815,7 +2792,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -2844,7 +2821,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work"
 ac_abs_confdir=`(
 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
@@ -2872,7 +2849,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Bison 3.8.2 to adapt to many kinds of systems.
+'configure' configures GNU Bison 3.8.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2886,11 +2863,11 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print 'checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -C, --config-cache      alias for '--cache-file=config.cache'
   -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+      --srcdir=DIR        find the sources in DIR [configure dir or '..']
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -2898,10 +2875,10 @@ Installation directories:
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           [PREFIX]
 
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
+By default, 'make install' will install all the files in
+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than '$ac_default_prefix' using '--prefix',
+for instance '--prefix=\$HOME'.
 
 For better control, use the options below.
 
@@ -2998,16 +2975,16 @@ Some influential environment variables:
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CPP         C preprocessor
-  YACC        The `Yet Another Compiler Compiler' implementation to use.
-              Defaults to the first program found out of: `bison -y', `byacc',
-              `yacc'.
+  YACC        The 'Yet Another Compiler Compiler' implementation to use.
+              Defaults to the first program found out of: 'bison -y', 'byacc',
+              'yacc'.
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
-              default value of `-d' given by some make applications.
+              default value of '-d' given by some make applications.
   M4          Location of GNU M4 1.4.6 or later. Defaults to the first program
               of 'm4', 'gm4', or 'gnum4' on PATH that meets Autoconf needs.
 
-Use these variables to override the choices made by `configure' or to help
+Use these variables to override the choices made by 'configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <bug-bison@gnu.org>.
@@ -3028,9 +3005,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -3067,7 +3044,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -3077,9 +3054,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Bison configure 3.8.2
-generated by GNU Autoconf 2.71
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -3103,7 +3080,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3111,18 +3088,19 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -3142,7 +3120,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3150,18 +3128,19 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -3175,13 +3154,13 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
@@ -3189,14 +3168,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no" ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -3213,7 +3194,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3221,18 +3202,19 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1
+    ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -3252,7 +3234,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3260,7 +3242,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3270,11 +3252,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -3292,20 +3275,20 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-   which can conflict with char $2 (); below.  */
+   which can conflict with char $2 (void); below.  */
 
 #include <limits.h>
 #undef $2
@@ -3316,7 +3299,7 @@ else $as_nop
 #ifdef __cplusplus
 extern "C"
 #endif
-char $2 ();
+char $2 (void);
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
@@ -3335,15 +3318,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -3361,7 +3346,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3369,7 +3354,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -3379,11 +3364,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -3402,13 +3388,13 @@ fi
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
@@ -3438,16 +3424,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  eval "$3=yes"
+else case e in #(
+  e) eval "$3=yes" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
@@ -3465,29 +3453,30 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_retval=$ac_status
+       ac_retval=$ac_status ;;
+esac
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
@@ -3540,18 +3529,19 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_hi=$ac_mid; break
-else $as_nop
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+else case e in #(
+  e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
 			  ac_lo= ac_hi=
 			  break
 			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
@@ -3586,20 +3576,23 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_lo=$ac_mid; break
-else $as_nop
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+else case e in #(
+  e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
 			  ac_lo= ac_hi=
 			  break
 			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else $as_nop
-  ac_lo= ac_hi=
+else case e in #(
+  e) ac_lo= ac_hi= ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 # Binary search between lo and hi bounds.
@@ -3622,8 +3615,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_hi=$ac_mid
-else $as_nop
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+else case e in #(
+  e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done
@@ -3671,8 +3665,9 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else $as_nop
-  ac_retval=1
+else case e in #(
+  e) ac_retval=1 ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -3696,13 +3691,13 @@ ac_fn_check_decl ()
   fi
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 printf %s "checking whether $as_decl_name is declared... " >&6; }
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+else case e in #(
+  e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
   eval ac_save_FLAGS=\$$6
   as_fn_append $6 " $5"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3726,16 +3721,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   eval $6=\$ac_save_FLAGS
-
+ ;;
+esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   ac_compile="$ac_save_ac_compile"
 
@@ -3748,13 +3745,13 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 printf %s "checking for $2.$3... " >&6; }
 if eval test \${$4+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
@@ -3770,8 +3767,8 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$4=yes"
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
@@ -3787,16 +3784,19 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$4=yes"
-else $as_nop
-  eval "$4=no"
+else case e in #(
+  e) eval "$4=no" ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
@@ -3805,7 +3805,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -3817,7 +3817,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -3825,7 +3825,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Bison $as_me 3.8.2, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -3865,7 +3865,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -3900,7 +3900,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -3929,31 +3929,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -3962,67 +3953,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -4031,21 +4050,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -4067,14 +4086,14 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -4082,27 +4101,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -4110,9 +4222,7 @@ struct stat;
 /* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
 struct buf { int x; };
 struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
+static char *e (char **p, int i)
 {
   return p[i];
 }
@@ -4126,6 +4236,21 @@ static char *f (char * (*g) (char **, int), char **p, ...)
   return s;
 }
 
+/* C89 style stringification. */
+#define noexpand_stringify(a) #a
+const char *stringified = noexpand_stringify(arbitrary+token=sequence);
+
+/* C89 style token pasting.  Exercises some of the corner cases that
+   e.g. old MSVC gets wrong, but not very hard. */
+#define noexpand_concat(a,b) a##b
+#define expand_concat(a,b) noexpand_concat(a,b)
+extern int vA;
+extern int vbee;
+#define aye A
+#define bee B
+int *pvA = &expand_concat(v,aye);
+int *pvbee = &noexpand_concat(v,bee);
+
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not \xHH hex character constants.
    These do not provoke an error unfortunately, instead are silently treated
@@ -4153,20 +4278,24 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
 
 # Test code for whether the C compiler supports C99 (global declarations)
 ac_c_conftest_c99_globals='
-// Does the compiler advertise C99 conformance?
+/* Does the compiler advertise C99 conformance? */
 #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
 # error "Compiler does not advertise C99 conformance"
 #endif
 
+// See if C++-style comments work.
+
 #include <stdbool.h>
 extern int puts (const char *);
 extern int printf (const char *, ...);
 extern int dprintf (int, const char *, ...);
 extern void *malloc (size_t);
+extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -4177,7 +4306,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -4212,7 +4341,6 @@ typedef const char *ccp;
 static inline int
 test_restrict (ccp restrict text)
 {
-  // See if C++-style comments work.
   // Iterate through items via the restricted pointer.
   // Also check for declarations in for loops.
   for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
@@ -4266,18 +4394,20 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
+  // Work around memory leak warnings.
+  free (ia);
 
   // Check named initializers.
   struct named_init ni = {
@@ -4288,18 +4418,17 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
 ac_c_conftest_c11_globals='
-// Does the compiler advertise C11 conformance?
+/* Does the compiler advertise C11 conformance? */
 #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
 # error "Compiler does not advertise C11 conformance"
 #endif
@@ -4403,222 +4532,6 @@ main (int argc, char **argv)
 }
 "
 
-# Test code for whether the C++ compiler supports C++98 (global declarations)
-ac_cxx_conftest_cxx98_globals='
-// Does the compiler advertise C++98 conformance?
-#if !defined __cplusplus || __cplusplus < 199711L
-# error "Compiler does not advertise C++98 conformance"
-#endif
-
-// These inclusions are to reject old compilers that
-// lack the unsuffixed header files.
-#include <cstdlib>
-#include <exception>
-
-// <cassert> and <cstring> are *not* freestanding headers in C++98.
-extern void assert (int);
-namespace std {
-  extern int strcmp (const char *, const char *);
-}
-
-// Namespaces, exceptions, and templates were all added after "C++ 2.0".
-using std::exception;
-using std::strcmp;
-
-namespace {
-
-void test_exception_syntax()
-{
-  try {
-    throw "test";
-  } catch (const char *s) {
-    // Extra parentheses suppress a warning when building autoconf itself,
-    // due to lint rules shared with more typical C programs.
-    assert (!(strcmp) (s, "test"));
-  }
-}
-
-template <typename T> struct test_template
-{
-  T const val;
-  explicit test_template(T t) : val(t) {}
-  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
-};
-
-} // anonymous namespace
-'
-
-# Test code for whether the C++ compiler supports C++98 (body of main)
-ac_cxx_conftest_cxx98_main='
-  assert (argc);
-  assert (! argv[0]);
-{
-  test_exception_syntax ();
-  test_template<double> tt (2.0);
-  assert (tt.add (4) == 6.0);
-  assert (true && !false);
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (global declarations)
-ac_cxx_conftest_cxx11_globals='
-// Does the compiler advertise C++ 2011 conformance?
-#if !defined __cplusplus || __cplusplus < 201103L
-# error "Compiler does not advertise C++11 conformance"
-#endif
-
-namespace cxx11test
-{
-  constexpr int get_val() { return 20; }
-
-  struct testinit
-  {
-    int i;
-    double d;
-  };
-
-  class delegate
-  {
-  public:
-    delegate(int n) : n(n) {}
-    delegate(): delegate(2354) {}
-
-    virtual int getval() { return this->n; };
-  protected:
-    int n;
-  };
-
-  class overridden : public delegate
-  {
-  public:
-    overridden(int n): delegate(n) {}
-    virtual int getval() override final { return this->n * 2; }
-  };
-
-  class nocopy
-  {
-  public:
-    nocopy(int i): i(i) {}
-    nocopy() = default;
-    nocopy(const nocopy&) = delete;
-    nocopy & operator=(const nocopy&) = delete;
-  private:
-    int i;
-  };
-
-  // for testing lambda expressions
-  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
-  {
-    return f(v);
-  }
-
-  // for testing variadic templates and trailing return types
-  template <typename V> auto sum(V first) -> V
-  {
-    return first;
-  }
-  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
-  {
-    return first + sum(rest...);
-  }
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (body of main)
-ac_cxx_conftest_cxx11_main='
-{
-  // Test auto and decltype
-  auto a1 = 6538;
-  auto a2 = 48573953.4;
-  auto a3 = "String literal";
-
-  int total = 0;
-  for (auto i = a3; *i; ++i) { total += *i; }
-
-  decltype(a2) a4 = 34895.034;
-}
-{
-  // Test constexpr
-  short sa[cxx11test::get_val()] = { 0 };
-}
-{
-  // Test initializer lists
-  cxx11test::testinit il = { 4323, 435234.23544 };
-}
-{
-  // Test range-based for
-  int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
-                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
-  for (auto &x : array) { x += 23; }
-}
-{
-  // Test lambda expressions
-  using cxx11test::eval;
-  assert (eval ([](int x) { return x*2; }, 21) == 42);
-  double d = 2.0;
-  assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
-  assert (d == 5.0);
-  assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
-  assert (d == 5.0);
-}
-{
-  // Test use of variadic templates
-  using cxx11test::sum;
-  auto a = sum(1);
-  auto b = sum(1, 2);
-  auto c = sum(1.0, 2.0, 3.0);
-}
-{
-  // Test constructor delegation
-  cxx11test::delegate d1;
-  cxx11test::delegate d2();
-  cxx11test::delegate d3(45);
-}
-{
-  // Test override and final
-  cxx11test::overridden o1(55464);
-}
-{
-  // Test nullptr
-  char *c = nullptr;
-}
-{
-  // Test template brackets
-  test_template<::test_template<int>> v(test_template<int>(12));
-}
-{
-  // Unicode literals
-  char const *utf8 = u8"UTF-8 string \u2500";
-  char16_t const *utf16 = u"UTF-8 string \u2500";
-  char32_t const *utf32 = U"UTF-32 string \u2500";
-}
-'
-
-# Test code for whether the C compiler supports C++11 (complete).
-ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
-${ac_cxx_conftest_cxx11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  ${ac_cxx_conftest_cxx11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C++98 (complete).
-ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  return ok;
-}
-"
-
 as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
 as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
 as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
@@ -4722,7 +4635,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -4735,7 +4648,7 @@ do
   esac
   as_found=:
 
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -4746,13 +4659,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -4764,7 +4677,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -4787,8 +4700,9 @@ IFS=$as_save_IFS
 if $as_found
 then :
 
-else $as_nop
-  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+else case e in #(
+  e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
+esac
 fi
 
 
@@ -4816,38 +4730,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -4857,17 +4777,34 @@ printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4878,7 +4815,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 PACKAGE_COPYRIGHT_YEAR=2021
 
 
-printf "%s\n" "#define PACKAGE_COPYRIGHT_YEAR $PACKAGE_COPYRIGHT_YEAR" >>confdefs.h
+printf '%s\n' "#define PACKAGE_COPYRIGHT_YEAR $PACKAGE_COPYRIGHT_YEAR" >>confdefs.h
 
 
 
@@ -4911,14 +4848,14 @@ am__api_version='1.16'
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
@@ -4934,8 +4871,8 @@ case $as_dir in #((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4972,7 +4909,8 @@ esac
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
-
+ ;;
+esac
 fi
   if test ${ac_cv_path_install+y}; then
     INSTALL=$ac_cv_path_install
@@ -4984,8 +4922,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -4995,7 +4933,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
@@ -5050,8 +4988,8 @@ else
    as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 # If we didn't sleep, we still need to ensure time stamps of config.status and
 # generated files are strictly newer.
 am_sleep_pid=
@@ -5068,9 +5006,9 @@ test "$program_prefix" != NONE &&
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.
-# By default was `s,x,x', remove it if useless.
+# By default was 's,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf '%s\n' "$program_transform_name" | sed "$ac_script"`
 
 
 # Expand $ac_aux_dir to an absolute path.
@@ -5085,8 +5023,8 @@ if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf '%s\n' "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -5106,13 +5044,13 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$STRIP"; then
+else case e in #(
+  e) if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5127,22 +5065,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5151,13 +5090,13 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_STRIP"; then
+else case e in #(
+  e) if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5172,22 +5111,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -5195,8 +5135,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -5209,14 +5149,14 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
 printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test ${ac_cv_path_mkdir+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
@@ -5230,7 +5170,7 @@ do
 	   as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir ('*'coreutils) '* | \
-	     'BusyBox '* | \
+	     *'BusyBox '* | \
 	     'mkdir (fileutils) '4.1*)
 	       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
 	       break 3;;
@@ -5239,34 +5179,33 @@ do
        done
   done
 IFS=$as_save_IFS
-
+ ;;
+esac
 fi
 
   test -d ./--version && rmdir ./--version
   if test ${ac_cv_path_mkdir+y}; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
+    # As a last resort, use plain mkdir -p,
+    # in the hope it doesn't have the bugs of ancient mkdir.
+    MKDIR_P='mkdir -p'
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf '%s\n' "$MKDIR_P" >&6; }
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AWK"; then
+else case e in #(
+  e) if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5281,40 +5220,41 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat >conftest.make <<\_ACEOF
+else case e in #(
+  e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -5323,15 +5263,16 @@ case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *)
     eval ac_cv_prog_make_${ac_make}_set=no;;
 esac
-rm -f conftest.make
+rm -f conftest.make ;;
+esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -5356,13 +5297,13 @@ case $enable_silent_rules in # (((
     *) AM_DEFAULT_VERBOSITY=1;;
 esac
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 printf %s "checking whether $am_make supports nested variables... " >&6; }
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if printf "%s\n" 'TRUE=$(BAR$(V))
+else case e in #(
+  e) if printf '%s\n' 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -5372,10 +5313,11 @@ am__doit:
   am_cv_make_support_nested_variables=yes
 else
   am_cv_make_support_nested_variables=no
+fi ;;
+esac
 fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf '%s\n' "$am_cv_make_support_nested_variables" >&6; }
 if test $am_cv_make_support_nested_variables = yes; then
     AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
@@ -5410,10 +5352,10 @@ fi
  VERSION='3.8.2'
 
 
-printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
 
-printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h
+printf '%s\n' "#define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -5522,13 +5464,13 @@ case $enable_silent_rules in # (((
     *) AM_DEFAULT_VERBOSITY=0;;
 esac
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 printf %s "checking whether $am_make supports nested variables... " >&6; }
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if printf "%s\n" 'TRUE=$(BAR$(V))
+else case e in #(
+  e) if printf '%s\n' 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -5538,10 +5480,11 @@ am__doit:
   am_cv_make_support_nested_variables=yes
 else
   am_cv_make_support_nested_variables=no
+fi ;;
+esac
 fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf '%s\n' "$am_cv_make_support_nested_variables" >&6; }
 if test $am_cv_make_support_nested_variables = yes; then
     AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
@@ -5564,6 +5507,9 @@ ac_config_headers="$ac_config_headers lib/config.h:lib/config.in.h"
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5572,13 +5518,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5593,22 +5539,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5617,13 +5564,13 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
+else case e in #(
+  e) if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5638,22 +5585,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5661,8 +5609,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5675,13 +5623,13 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5696,22 +5644,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5720,13 +5669,13 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
@@ -5746,7 +5695,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5765,15 +5714,16 @@ if test $ac_prog_rejected = yes; then
     ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5784,13 +5734,13 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5805,22 +5755,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5833,13 +5784,13 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
+else case e in #(
+  e) if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5854,22 +5805,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5881,8 +5833,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5894,13 +5846,13 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5915,22 +5867,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5939,13 +5892,13 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
+else case e in #(
+  e) if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5960,22 +5913,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5983,8 +5937,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5996,13 +5950,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -6012,7 +5966,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -6022,7 +5976,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -6042,9 +5996,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -6065,14 +6019,14 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+  # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
+# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
@@ -6092,7 +6046,7 @@ do
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
+	# safe: cross compilers may not add the suffix if given an '-o'
 	# argument, so we may need to know it at that point already.
 	# Even if this section looks crufty: it has the advantage of
 	# actually working.
@@ -6103,33 +6057,35 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else $as_nop
-  ac_file=''
+else case e in #(
+  e) ac_file='' ;;
+esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -6137,16 +6093,16 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
+  # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
+# catch 'conftest.exe'.  For instance with Cygwin, 'ls conftest' will
+# work properly (i.e., refer to 'conftest.exe'), while it won't with
+# 'rm'.
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -6156,15 +6112,16 @@ for ac_file in conftest.exe conftest conftest.*; do
     * ) break;;
   esac
 done
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -6176,6 +6133,8 @@ int
 main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
+ if (!f)
+  return 1;
  return ferror (f) || fclose (f) != 0;
 
   ;
@@ -6185,7 +6144,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -6194,10 +6153,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -6205,36 +6164,37 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+If you meant to cross compile, use '--host'.
+See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext \
+  conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6252,10 +6212,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -6266,28 +6226,30 @@ then :
        break;;
   esac
 done
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6304,15 +6266,17 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else $as_nop
-  ac_compiler_gnu=no
+else case e in #(
+  e) ac_compiler_gnu=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -6322,13 +6286,13 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_save_c_werror_flag=$ac_c_werror_flag
+else case e in #(
+  e) ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
@@ -6346,8 +6310,8 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_prog_cc_g=yes
-else $as_nop
-  CFLAGS=""
+else case e in #(
+  e) CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6362,8 +6326,8 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  ac_c_werror_flag=$ac_save_c_werror_flag
+else case e in #(
+  e) ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6380,15 +6344,18 @@ if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -6407,19 +6374,68 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in #(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in #(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c11=no
+else case e in #(
+  e) ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -6430,36 +6446,39 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c11" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
 fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c11" = x
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in #(
+  e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11"
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in #(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11" ;;
+esac
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11
+  ac_prog_cc_stdc=c11 ;;
+esac
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c99=no
+else case e in #(
+  e) ac_cv_prog_cc_c99=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6476,36 +6495,39 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c99" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
 fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c99" = x
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in #(
+  e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99"
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in #(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99" ;;
+esac
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99
+  ac_prog_cc_stdc=c99 ;;
+esac
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c89=no
+else case e in #(
+  e) ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6522,25 +6544,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
 fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c89" = x
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in #(
+  e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89"
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in #(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89" ;;
+esac
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89
+  ac_prog_cc_stdc=c89 ;;
+esac
 fi
 fi
 
@@ -6556,13 +6581,13 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
 printf %s "checking whether $CC understands -c and -o together... " >&6; }
 if test ${am_cv_prog_cc_c_o+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6592,10 +6617,11 @@ _ACEOF
     fi
   done
   rm -f core conftest*
-  unset am_i
+  unset am_i ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf '%s\n' "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -6612,13 +6638,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
 printf %s "checking whether the compiler is clang... " >&6; }
 if test ${gl_cv_compiler_clang+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e)                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
            #ifdef __clang__
@@ -6637,23 +6663,25 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_compiler_clang=no
-else $as_nop
-  gl_cv_compiler_clang=yes
+else case e in #(
+  e) gl_cv_compiler_clang=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
-printf "%s\n" "$gl_cv_compiler_clang" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
+printf '%s\n' "$gl_cv_compiler_clang" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
 printf %s "checking for compiler option needed when checking for declarations... " >&6; }
 if test ${gl_cv_compiler_check_decl_option+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $gl_cv_compiler_clang = yes; then
+else case e in #(
+  e) if test $gl_cv_compiler_clang = yes; then
                      save_ac_compile="$ac_compile"
        ac_compile="$ac_compile -Werror=implicit-function-declaration"
                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6670,18 +6698,20 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'
-else $as_nop
-  gl_cv_compiler_check_decl_option=none
+else case e in #(
+  e) gl_cv_compiler_check_decl_option=none ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ac_compile="$save_ac_compile"
      else
        gl_cv_compiler_check_decl_option=none
      fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
-printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
+printf '%s\n' "$gl_cv_compiler_check_decl_option" >&6; }
   if test "x$gl_cv_compiler_check_decl_option" != xnone; then
     ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
   else
@@ -6692,7 +6722,7 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
 printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
 cat > confinc.mk << 'END'
 am__doit:
@@ -6729,8 +6759,8 @@ esac
   fi
 done
 rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf '%s\n' "${_am_result}" >&6; }
 
 # Check whether --enable-dependency-tracking was given.
 if test ${enable_dependency_tracking+y}
@@ -6755,13 +6785,13 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CC_dependencies_compiler_type+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+else case e in #(
+  e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
@@ -6865,10 +6895,11 @@ else $as_nop
 else
   am_cv_CC_dependencies_compiler_type=none
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -6882,12 +6913,6 @@ else
 fi
 
 
-
-
-
-
-
-
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6902,13 +6927,13 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CXX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CXX"; then
+else case e in #(
+  e) if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6923,22 +6948,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-printf "%s\n" "$CXX" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf '%s\n' "$CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6951,13 +6977,13 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CXX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CXX"; then
+else case e in #(
+  e) if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6972,22 +6998,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-printf "%s\n" "$ac_ct_CXX" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf '%s\n' "$ac_ct_CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6999,8 +7026,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -7010,7 +7037,7 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -7020,7 +7047,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -7030,17 +7057,17 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
 printf %s "checking whether the compiler supports GNU C++... " >&6; }
 if test ${ac_cv_cxx_compiler_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -7057,15 +7084,17 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else $as_nop
-  ac_compiler_gnu=no
+else case e in #(
+  e) ac_compiler_gnu=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_cxx_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -7075,13 +7104,13 @@ else
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+y}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 printf %s "checking whether $CXX accepts -g... " >&6; }
 if test ${ac_cv_prog_cxx_g+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+else case e in #(
+  e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
@@ -7099,8 +7128,8 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_cv_prog_cxx_g=yes
-else $as_nop
-  CXXFLAGS=""
+else case e in #(
+  e) CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7115,8 +7144,8 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
 
-else $as_nop
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else case e in #(
+  e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7133,15 +7162,18 @@ if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+printf '%s\n' "$ac_cv_prog_cxx_g" >&6; }
 if test $ac_test_CXXFLAGS; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -7157,100 +7189,6 @@ else
     CXXFLAGS=
   fi
 fi
-ac_prog_cxx_stdcxx=no
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
-printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cxx_11=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx11_program
-_ACEOF
-for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX
-fi
-
-if test "x$ac_cv_prog_cxx_cxx11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cxx_cxx11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx11"
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11
-fi
-fi
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
-printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cxx_98=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx98_program
-_ACEOF
-for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx98=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX
-fi
-
-if test "x$ac_cv_prog_cxx_cxx98" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cxx_cxx98" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx98"
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98
-fi
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7259,13 +7197,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CXX_dependencies_compiler_type+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+else case e in #(
+  e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
@@ -7369,10 +7307,11 @@ else $as_nop
 else
   am_cv_CXX_dependencies_compiler_type=none
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
  if
@@ -7395,7 +7334,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -7415,7 +7354,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
 
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -7424,13 +7363,13 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #         define __EXTENSIONS__ 1
@@ -7446,21 +7385,23 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_safe_to_define___extensions__=yes
-else $as_nop
-  ac_cv_safe_to_define___extensions__=no
+else case e in #(
+  e) ac_cv_safe_to_define___extensions__=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_should_define__xopen_source=no
+else case e in #(
+  e) ac_cv_should_define__xopen_source=no
     if test $ac_cv_header_wchar_h = yes
 then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7479,8 +7420,8 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
             #define _XOPEN_SOURCE 500
@@ -7498,64 +7439,71 @@ if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_should_define__xopen_source=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
 fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "#define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "#define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+  printf '%s\n' "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "#define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "#define _MINIX 1" >>confdefs.h
+    printf '%s\n' "#define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "#define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
-else $as_nop
-  MINIX=
+else case e in #(
+  e) MINIX= ;;
+esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "#define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "#define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
@@ -7565,23 +7513,24 @@ fi
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_build_alias=$build_alias
+else case e in #(
+  e) ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
   as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -7597,25 +7546,26 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "x$host_alias" = x; then
+else case e in #(
+  e) if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
     as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -7631,7 +7581,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -7641,7 +7591,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
   case "$host_os" in
     openbsd*)
 
-printf "%s\n" "#define _ISOC11_SOURCE 1" >>confdefs.h
+printf '%s\n' "#define _ISOC11_SOURCE 1" >>confdefs.h
 
       ;;
   esac
@@ -7651,7 +7601,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -7661,8 +7611,8 @@ if test -z "$CPP"; then
   if test ${ac_cv_prog_CPP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-      # Double quotes because $CC needs to be expanded
+else case e in #(
+  e)     # Double quotes because $CC needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
@@ -7680,9 +7630,10 @@ _ACEOF
 if ac_fn_c_try_cpp "$LINENO"
 then :
 
-else $as_nop
-  # Broken: fails on valid input.
-continue
+else case e in #(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -7696,15 +7647,16 @@ if ac_fn_c_try_cpp "$LINENO"
 then :
   # Broken: success on invalid input.
 continue
-else $as_nop
-  # Passes both tests.
+else case e in #(
+  e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok
 then :
@@ -7713,14 +7665,15 @@ fi
 
     done
     ac_cv_prog_CPP=$CPP
-
+   ;;
+esac
 fi
   CPP=$ac_cv_prog_CPP
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -7736,9 +7689,10 @@ _ACEOF
 if ac_fn_c_try_cpp "$LINENO"
 then :
 
-else $as_nop
-  # Broken: fails on valid input.
-continue
+else case e in #(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -7752,24 +7706,26 @@ if ac_fn_c_try_cpp "$LINENO"
 then :
   # Broken: success on invalid input.
 continue
-else $as_nop
-  # Passes both tests.
+else case e in #(
+  e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok
 then :
 
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 
 ac_ext=c
@@ -7779,14 +7735,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-printf %s "checking for grep that handles long lines and -e... " >&6; }
-if test ${ac_cv_path_GREP+y}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+printf %s "checking for egrep -e... " >&6; }
+if test ${ac_cv_path_EGREP_TRADITIONAL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
+else case e in #(
+  e) if test -z "$EGREP_TRADITIONAL"; then
+  ac_path_EGREP_TRADITIONAL_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
@@ -7800,13 +7756,14 @@ do
     for ac_prog in grep ggrep
    do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
+      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+  # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
 *GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -7815,14 +7772,14 @@ case `"$ac_path_GREP" --version 2>&1` in
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
+    "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
       # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
+      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+      ac_path_EGREP_TRADITIONAL_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
@@ -7830,35 +7787,24 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_GREP_found && break 3
+      $ac_path_EGREP_TRADITIONAL_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
+    :
   fi
 else
-  ac_cv_path_GREP=$GREP
+  ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
 fi
 
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
+    if test "$ac_cv_path_EGREP_TRADITIONAL"
 then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
+  ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E"
+else case e in #(
+  e) if test -z "$EGREP_TRADITIONAL"; then
+  ac_path_EGREP_TRADITIONAL_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
@@ -7872,13 +7818,14 @@ do
     for ac_prog in egrep
    do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
+      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+  # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
 *GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -7887,14 +7834,14 @@ case `"$ac_path_EGREP" --version 2>&1` in
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
+    "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
       # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
+      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+      ac_path_EGREP_TRADITIONAL_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
@@ -7902,35 +7849,36 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_TRADITIONAL_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
+  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
     as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
-  ac_cv_path_EGREP=$EGREP
+  ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
 fi
-
-   fi
+ ;;
+esac
+fi ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf '%s\n' "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+ EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
 
 
 
 
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
 printf %s "checking for Minix Amsterdam compiler... " >&6; }
 if test ${gl_cv_c_amsterdam_compiler+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7940,18 +7888,20 @@ Amsterdam
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Amsterdam" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Amsterdam" >/dev/null 2>&1
 then :
   gl_cv_c_amsterdam_compiler=yes
-else $as_nop
-  gl_cv_c_amsterdam_compiler=no
+else case e in #(
+  e) gl_cv_c_amsterdam_compiler=no ;;
+esac
 fi
 rm -rf conftest*
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
-printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
+printf '%s\n' "$gl_cv_c_amsterdam_compiler" >&6; }
 
       if test $gl_cv_c_amsterdam_compiler = yes; then
     if test -z "$AR"; then
@@ -7967,13 +7917,13 @@ printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AR"; then
+else case e in #(
+  e) if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7988,22 +7938,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8012,13 +7963,13 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_AR"; then
+else case e in #(
+  e) if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8033,22 +7984,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -8056,8 +8008,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -8079,13 +8031,13 @@ fi
             if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$RANLIB"; then
+else case e in #(
+  e) if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8100,22 +8052,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8124,13 +8077,13 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_RANLIB"; then
+else case e in #(
+  e) if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8145,22 +8098,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -8168,8 +8122,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -8220,13 +8174,13 @@ fi
 
 if test "$enable_largefile" != no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 printf %s "checking for special C compiler options needed for large files... " >&6; }
 if test ${ac_cv_sys_largefile_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_sys_largefile_CC=no
+else case e in #(
+  e) ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
        ac_save_CC=$CC
        while :; do
@@ -8235,13 +8189,16 @@ else $as_nop
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+#ifndef FTYPE
+# define FTYPE off_t
+#endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_FTYPE to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
+#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+  int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721
+		       && LARGE_FTYPE % 2147483647 == 1)
 		      ? 1 : -1];
 int
 main (void)
@@ -8266,31 +8223,35 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
        done
        CC=$ac_save_CC
        rm -f conftest.$ac_ext
-    fi
+    fi ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf '%s\n' "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
 if test ${ac_cv_sys_file_offset_bits+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  while :; do
+else case e in #(
+  e) while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+#ifndef FTYPE
+# define FTYPE off_t
+#endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_FTYPE to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
+#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+  int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721
+		       && LARGE_FTYPE % 2147483647 == 1)
 		      ? 1 : -1];
 int
 main (void)
@@ -8310,13 +8271,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 #undef _FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+#ifndef FTYPE
+# define FTYPE off_t
+#endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_FTYPE to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
+#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+  int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721
+		       && LARGE_FTYPE % 2147483647 == 1)
 		      ? 1 : -1];
 int
 main (void)
@@ -8333,36 +8297,40 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_file_offset_bits=unknown
   break
-done
+done ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf '%s\n' "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *)
-printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
+printf '%s\n' "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   case $ac_cv_sys_file_offset_bits in #(
   unknown) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
 if test ${ac_cv_sys_large_files+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  while :; do
+else case e in #(
+  e) while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+#ifndef FTYPE
+# define FTYPE off_t
+#endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_FTYPE to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
+#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+  int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721
+		       && LARGE_FTYPE % 2147483647 == 1)
 		      ? 1 : -1];
 int
 main (void)
@@ -8382,13 +8350,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 #undef _LARGE_FILES
 #define _LARGE_FILES 1
 #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+#ifndef FTYPE
+# define FTYPE off_t
+#endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_FTYPE to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
+#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+  int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721
+		       && LARGE_FTYPE % 2147483647 == 1)
 		      ? 1 : -1];
 int
 main (void)
@@ -8405,14 +8376,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_large_files=unknown
   break
-done
+done ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-printf "%s\n" "$ac_cv_sys_large_files" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf '%s\n' "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *)
-printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
+printf '%s\n' "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest* ;; #(
@@ -8427,13 +8399,13 @@ fi
  if test "$enable_year2038" != no
 then :
 
-                            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
+                            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
 printf %s "checking for time_t past the year 2038... " >&6; }
 if test ${gl_cv_type_time_t_y2038+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   #include <time.h>
@@ -8448,22 +8420,24 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_time_t_y2038=yes
-else $as_nop
-  gl_cv_type_time_t_y2038=no
+else case e in #(
+  e) gl_cv_type_time_t_y2038=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
-printf "%s\n" "$gl_cv_type_time_t_y2038" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
+printf '%s\n' "$gl_cv_type_time_t_y2038" >&6; }
   if test "$gl_cv_type_time_t_y2038" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
 printf %s "checking for 64-bit time_t with _TIME_BITS=64... " >&6; }
 if test ${gl_cv_type_time_t_bits_macro+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _TIME_BITS 64
                            #define _FILE_OFFSET_BITS 64
@@ -8480,20 +8454,22 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_time_t_bits_macro=yes
-else $as_nop
-  gl_cv_type_time_t_bits_macro=no
+else case e in #(
+  e) gl_cv_type_time_t_bits_macro=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
-printf "%s\n" "$gl_cv_type_time_t_bits_macro" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
+printf '%s\n' "$gl_cv_type_time_t_bits_macro" >&6; }
     if test "$gl_cv_type_time_t_bits_macro" = yes; then
 
-printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h
+printf '%s\n' "#define _TIME_BITS 64" >>confdefs.h
 
 
-printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+printf '%s\n' "#define _FILE_OFFSET_BITS 64" >>confdefs.h
 
       gl_cv_type_time_t_y2038=yes
     fi
@@ -8510,29 +8486,30 @@ printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "The 'time_t' type stops working after January 2038.
           Remove _USE_32BIT_TIME_T from the compiler flags.
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  # If not cross-compiling and  says we should check,
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) # If not cross-compiling and  says we should check,
        # and 'touch' works with a large timestamp, then evidently wider time_t
        # is desired and supported, so fail and ask the builder to fix the
        # problem.  Otherwise, just warn the builder.
 
        if test "$gl_warned_about_y2038" != yes; then
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5
-printf "%s\n" "$as_me: WARNING: The 'time_t' type stops working after January 2038,
+printf '%s\n' "$as_me: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;}
          gl_warned_about_y2038=yes
        fi
-
+       ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   fi
@@ -8548,7 +8525,7 @@ fi
   case "$host_os" in
     mingw*)
 
-printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
+printf '%s\n' "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 
       ;;
   esac
@@ -8563,8 +8540,8 @@ printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 if test ${enable_threads+y}
 then :
   enableval=$enable_threads; gl_use_threads=$enableval
-else $as_nop
-  if test -n "$gl_use_threads_default"; then
+else case e in #(
+  e) if test -n "$gl_use_threads_default"; then
        gl_use_threads="$gl_use_threads_default"
      else
        case "$host_os" in
@@ -8585,7 +8562,8 @@ else $as_nop
          *)    gl_use_threads=yes ;;
        esac
      fi
-
+     ;;
+esac
 fi
 
   if test "$gl_use_threads" = yes \
@@ -8991,8 +8969,9 @@ fi
 if test ${with_gnu_ld+y}
 then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else $as_nop
-  with_gnu_ld=no
+else case e in #(
+  e) with_gnu_ld=no ;;
+esac
 fi
 
 # Prepare PATH_SEPARATOR.
@@ -9009,16 +8988,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -9028,8 +9007,8 @@ else
   if test ${acl_cv_path_LD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     acl_cv_path_LD= # Final result of this test
     ac_prog=ld # Program to search in $PATH
     if test "$GCC" = yes; then
@@ -9122,38 +9101,40 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  # The compiler produces 32-bit code. Add option '-m elf32_sparc'
+else case e in #(
+  e) # The compiler produces 32-bit code. Add option '-m elf32_sparc'
            # so that the linker groks 32-bit object files.
            case "$acl_cv_path_LD " in
              *" -m elf32_sparc "*) ;;
              *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
            esac
-
+           ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
         ;;
     esac
-
+   ;;
+esac
 fi
 
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+else case e in #(
+  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   acl_cv_prog_gnu_ld=yes
@@ -9161,32 +9142,34 @@ case `$LD -v 2>&1 </dev/null` in
 *)
   acl_cv_prog_gnu_ld=no
   ;;
+esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
 
 
-                                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+                                                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 printf %s "checking for shared library run path origin... " >&6; }
 if test ${acl_cv_rpath+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_rpath=done
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-printf "%s\n" "$acl_cv_rpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf '%s\n' "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   acl_libext="$acl_cv_libext"
   acl_shlibext="$acl_cv_shlibext"
@@ -9200,20 +9183,21 @@ printf "%s\n" "$acl_cv_rpath" >&6; }
 if test ${enable_rpath+y}
 then :
   enableval=$enable_rpath; :
-else $as_nop
-  enable_rpath=yes
+else case e in #(
+  e) enable_rpath=yes ;;
+esac
 fi
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
 printf %s "checking 32-bit host C ABI... " >&6; }
 if test ${gl_cv_host_cpu_c_abi_32bit+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$gl_cv_host_cpu_c_abi"; then
+else case e in #(
+  e) if test -n "$gl_cv_host_cpu_c_abi"; then
        case "$gl_cv_host_cpu_c_abi" in
          i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
            gl_cv_host_cpu_c_abi_32bit=yes ;;
@@ -9277,8 +9261,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -9302,8 +9287,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -9323,8 +9309,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -9344,8 +9331,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=yes
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=no
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -9365,8 +9353,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -9390,8 +9379,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -9415,8 +9405,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -9436,8 +9427,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -9457,8 +9449,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -9468,10 +9461,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
        esac
      fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
-printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
+printf '%s\n' "$gl_cv_host_cpu_c_abi_32bit" >&6; }
 
   HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
 
@@ -9479,13 +9473,13 @@ printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
 printf %s "checking for ELF binary format... " >&6; }
 if test ${gl_cv_elf+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __ELF__
         Extensible Linking Format
@@ -9493,18 +9487,20 @@ else $as_nop
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Extensible Linking Format" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1
 then :
   gl_cv_elf=yes
-else $as_nop
-  gl_cv_elf=no
+else case e in #(
+  e) gl_cv_elf=no ;;
+esac
 fi
 rm -rf conftest*
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
-printf "%s\n" "$gl_cv_elf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
+printf '%s\n' "$gl_cv_elf" >&6; }
   if test $gl_cv_elf = yes; then
     # Extract the ELF class of a file (5th byte) in decimal.
     # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
@@ -9555,13 +9551,13 @@ printf "%s\n" "$gl_cv_elf" >&6; }
     }
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
 printf %s "checking for the common suffixes of directories in the library search path... " >&6; }
 if test ${acl_cv_libdirstems+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-            acl_libdirstem=lib
+else case e in #(
+  e)           acl_libdirstem=lib
      acl_libdirstem2=
      acl_libdirstem3=
      case "$host_os" in
@@ -9622,10 +9618,11 @@ else $as_nop
      test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
      test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
      acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
-printf "%s\n" "$acl_cv_libdirstems" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+printf '%s\n' "$acl_cv_libdirstems" >&6; }
       acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
   acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
   acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
@@ -10163,13 +10160,13 @@ fi
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtextstyle" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for libtextstyle" >&5
 printf %s "checking for libtextstyle... " >&6; }
 if test ${ac_cv_libtextstyle+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     ac_save_LIBS="$LIBS"
                                 case " $LIBTEXTSTYLE" in
       *" -l"*) LIBS="$LIBS $LIBTEXTSTYLE" ;;
@@ -10189,25 +10186,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_libtextstyle=yes
-else $as_nop
-  ac_cv_libtextstyle='no'
+else case e in #(
+  e) ac_cv_libtextstyle='no' ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_save_LIBS"
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libtextstyle" >&5
-printf "%s\n" "$ac_cv_libtextstyle" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libtextstyle" >&5
+printf '%s\n' "$ac_cv_libtextstyle" >&6; }
   if test "$ac_cv_libtextstyle" = yes; then
     HAVE_LIBTEXTSTYLE=yes
 
-printf "%s\n" "#define HAVE_LIBTEXTSTYLE 1" >>confdefs.h
+printf '%s\n' "#define HAVE_LIBTEXTSTYLE 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libtextstyle" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libtextstyle" >&5
 printf %s "checking how to link with libtextstyle... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBTEXTSTYLE" >&5
-printf "%s\n" "$LIBTEXTSTYLE" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBTEXTSTYLE" >&5
+printf '%s\n' "$LIBTEXTSTYLE" >&6; }
   else
     HAVE_LIBTEXTSTYLE=no
             CPPFLAGS="$ac_save_CPPFLAGS"
@@ -10223,13 +10222,13 @@ printf "%s\n" "$LIBTEXTSTYLE" >&6; }
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 printf %s "checking for inline... " >&6; }
 if test ${ac_cv_c_inline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_c_inline=no
+else case e in #(
+  e) ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10247,10 +10246,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-printf "%s\n" "$ac_cv_c_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+printf '%s\n' "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -10309,13 +10309,13 @@ fi
 
 # Gnulib uses '#pragma GCC diagnostic push' to silence some
 # warnings, but older gcc doesn't support this.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pragma GCC diagnostic push works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pragma GCC diagnostic push works" >&5
 printf %s "checking whether pragma GCC diagnostic push works... " >&6; }
 if test ${lv_cv_gcc_pragma_push_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   save_CFLAGS=$CFLAGS
   CFLAGS='-Wunknown-pragmas -Werror'
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10335,14 +10335,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   lv_cv_gcc_pragma_push_works=yes
-else $as_nop
-  lv_cv_gcc_pragma_push_works=no
+else case e in #(
+  e) lv_cv_gcc_pragma_push_works=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$save_CFLAGS
+  CFLAGS=$save_CFLAGS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lv_cv_gcc_pragma_push_works" >&5
-printf "%s\n" "$lv_cv_gcc_pragma_push_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lv_cv_gcc_pragma_push_works" >&5
+printf '%s\n' "$lv_cv_gcc_pragma_push_works" >&6; }
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -10359,13 +10361,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Werror -Wunknown-warning-option" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Werror -Wunknown-warning-option" >&5
 printf %s "checking whether C++ compiler handles -Werror -Wunknown-warning-option... " >&6; }
 if test ${gl_cv_warn_cxx__Werror__Wunknown_warning_option+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Werror -Wunknown-warning-option"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10382,21 +10384,24 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   gl_cv_warn_cxx__Werror__Wunknown_warning_option=yes
-else $as_nop
-  gl_cv_warn_cxx__Werror__Wunknown_warning_option=no
+else case e in #(
+  e) gl_cv_warn_cxx__Werror__Wunknown_warning_option=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Werror__Wunknown_warning_option" >&5
-printf "%s\n" "$gl_cv_warn_cxx__Werror__Wunknown_warning_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Werror__Wunknown_warning_option" >&5
+printf '%s\n' "$gl_cv_warn_cxx__Werror__Wunknown_warning_option" >&6; }
 if test "x$gl_cv_warn_cxx__Werror__Wunknown_warning_option" = xyes
 then :
   gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'
-else $as_nop
-  gl_unknown_warnings_are_errors=
+else case e in #(
+  e) gl_unknown_warnings_are_errors= ;;
+esac
 fi
 
   ac_ext=cpp
@@ -10408,13 +10413,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -fno-exceptions" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -fno-exceptions" >&5
 printf %s "checking whether C++ compiler handles -fno-exceptions... " >&6; }
 if test ${gl_cv_warn_cxx__fno_exceptions+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fno-exceptions"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10431,16 +10436,18 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   gl_cv_warn_cxx__fno_exceptions=yes
-else $as_nop
-  gl_cv_warn_cxx__fno_exceptions=no
+else case e in #(
+  e) gl_cv_warn_cxx__fno_exceptions=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fno_exceptions" >&5
-printf "%s\n" "$gl_cv_warn_cxx__fno_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fno_exceptions" >&5
+printf '%s\n' "$gl_cv_warn_cxx__fno_exceptions" >&6; }
 if test "x$gl_cv_warn_cxx__fno_exceptions" = xyes
 then :
   as_fn_append NO_EXCEPTIONS_CXXFLAGS " -fno-exceptions"
@@ -10456,14 +10463,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 for f in '-std=c++98' '-std=c++98 -stdlib=libc++'
 do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$f" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$f" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
 printf %s "checking whether C++ compiler accepts $f... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   ax_check_save_flags=$CXXFLAGS
   CXXFLAGS="$CXXFLAGS  $f"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10482,17 +10489,19 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$as_CACHEVAR=yes"
-else $as_nop
-  eval "$as_CACHEVAR=no"
+else case e in #(
+  e) eval "$as_CACHEVAR=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS=$ax_check_save_flags
+  CXXFLAGS=$ax_check_save_flags ;;
+esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\n" "$as_val"'`" = xyes
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\\n" "$as_val"'`" = xyes
 then :
   CXX98_CXXFLAGS=$f
  break
@@ -10515,14 +10524,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 for f in '-std=c++03' '-std=c++03 -stdlib=libc++'
 do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$f" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$f" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
 printf %s "checking whether C++ compiler accepts $f... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   ax_check_save_flags=$CXXFLAGS
   CXXFLAGS="$CXXFLAGS  $f"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10542,17 +10551,19 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$as_CACHEVAR=yes"
-else $as_nop
-  eval "$as_CACHEVAR=no"
+else case e in #(
+  e) eval "$as_CACHEVAR=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS=$ax_check_save_flags
+  CXXFLAGS=$ax_check_save_flags ;;
+esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\n" "$as_val"'`" = xyes
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\\n" "$as_val"'`" = xyes
 then :
   CXX03_CXXFLAGS=$f
  break
@@ -10575,14 +10586,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 for f in '-std=c++11' '-std=c++11 -stdlib=libc++'
 do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$f" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$f" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
 printf %s "checking whether C++ compiler accepts $f... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   ax_check_save_flags=$CXXFLAGS
   CXXFLAGS="$CXXFLAGS  $f"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10672,17 +10683,19 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$as_CACHEVAR=yes"
-else $as_nop
-  eval "$as_CACHEVAR=no"
+else case e in #(
+  e) eval "$as_CACHEVAR=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS=$ax_check_save_flags
+  CXXFLAGS=$ax_check_save_flags ;;
+esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\n" "$as_val"'`" = xyes
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\\n" "$as_val"'`" = xyes
 then :
   CXX11_CXXFLAGS=$f
  break
@@ -10705,14 +10718,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 for f in '-std=c++14' '-std=c++14 -stdlib=libc++'
 do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$f" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$f" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
 printf %s "checking whether C++ compiler accepts $f... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   ax_check_save_flags=$CXXFLAGS
   CXXFLAGS="$CXXFLAGS  $f"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10812,17 +10825,19 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$as_CACHEVAR=yes"
-else $as_nop
-  eval "$as_CACHEVAR=no"
+else case e in #(
+  e) eval "$as_CACHEVAR=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS=$ax_check_save_flags
+  CXXFLAGS=$ax_check_save_flags ;;
+esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\n" "$as_val"'`" = xyes
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\\n" "$as_val"'`" = xyes
 then :
   CXX14_CXXFLAGS=$f
  break
@@ -10845,14 +10860,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 for f in '-std=c++17' '-std=c++17 -stdlib=libc++'
 do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$f" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$f" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
 printf %s "checking whether C++ compiler accepts $f... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   ax_check_save_flags=$CXXFLAGS
   CXXFLAGS="$CXXFLAGS  $f"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10959,17 +10974,19 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$as_CACHEVAR=yes"
-else $as_nop
-  eval "$as_CACHEVAR=no"
+else case e in #(
+  e) eval "$as_CACHEVAR=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS=$ax_check_save_flags
+  CXXFLAGS=$ax_check_save_flags ;;
+esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\n" "$as_val"'`" = xyes
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\\n" "$as_val"'`" = xyes
 then :
   CXX17_CXXFLAGS=$f
  break
@@ -10992,14 +11009,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 for f in '-std=c++20' '-std=c++20 -stdlib=libc++'
 do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$f" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$f" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
 printf %s "checking whether C++ compiler accepts $f... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   ax_check_save_flags=$CXXFLAGS
   CXXFLAGS="$CXXFLAGS  $f"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11108,17 +11125,19 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$as_CACHEVAR=yes"
-else $as_nop
-  eval "$as_CACHEVAR=no"
+else case e in #(
+  e) eval "$as_CACHEVAR=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS=$ax_check_save_flags
+  CXXFLAGS=$ax_check_save_flags ;;
+esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\n" "$as_val"'`" = xyes
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\\n" "$as_val"'`" = xyes
 then :
   CXX20_CXXFLAGS=$f
  break
@@ -11141,14 +11160,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 for f in '-std=c++2b' '-std=c++2b -stdlib=libc++'
 do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$f" | $as_tr_sh`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$f" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $f" >&5
 printf %s "checking whether C++ compiler accepts $f... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   ax_check_save_flags=$CXXFLAGS
   CXXFLAGS="$CXXFLAGS  $f"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11259,17 +11278,19 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$as_CACHEVAR=yes"
-else $as_nop
-  eval "$as_CACHEVAR=no"
+else case e in #(
+  e) eval "$as_CACHEVAR=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS=$ax_check_save_flags
+  CXXFLAGS=$ax_check_save_flags ;;
+esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\n" "$as_val"'`" = xyes
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+if test x"`eval 'as_val=${'$as_CACHEVAR'};printf "%s\\n" "$as_val"'`" = xyes
 then :
   CXX2B_CXXFLAGS=$f
  break
@@ -11313,8 +11334,9 @@ then :
    yes|no) ;;
    *)  as_fn_error $? "invalid value for --gcc-warnings: $enable_gcc_warnings" "$LINENO" 5;;
  esac
-else $as_nop
-  enable_gcc_warnings=no
+else case e in #(
+  e) enable_gcc_warnings=no ;;
+esac
 fi
 
  if test "$enable_gcc_warnings" = yes; then
@@ -11410,13 +11432,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror -Wunknown-warning-option" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror -Wunknown-warning-option" >&5
 printf %s "checking whether C compiler handles -Werror -Wunknown-warning-option... " >&6; }
 if test ${gl_cv_warn_c__Werror__Wunknown_warning_option+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CFLAGS"
   as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror -Wunknown-warning-option"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11433,21 +11455,24 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_warn_c__Werror__Wunknown_warning_option=yes
-else $as_nop
-  gl_cv_warn_c__Werror__Wunknown_warning_option=no
+else case e in #(
+  e) gl_cv_warn_c__Werror__Wunknown_warning_option=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror__Wunknown_warning_option" >&5
-printf "%s\n" "$gl_cv_warn_c__Werror__Wunknown_warning_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror__Wunknown_warning_option" >&5
+printf '%s\n' "$gl_cv_warn_c__Werror__Wunknown_warning_option" >&6; }
 if test "x$gl_cv_warn_c__Werror__Wunknown_warning_option" = xyes
 then :
   gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'
-else $as_nop
-  gl_unknown_warnings_are_errors=
+else case e in #(
+  e) gl_unknown_warnings_are_errors= ;;
+esac
 fi
 
   ac_ext=c
@@ -11459,13 +11484,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror=unknown-warning-option" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror=unknown-warning-option" >&5
 printf %s "checking whether C compiler handles -Werror=unknown-warning-option... " >&6; }
 if test ${gl_cv_warn_c__Werror_unknown_warning_option+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CFLAGS"
   as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror=unknown-warning-option"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11482,16 +11507,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_warn_c__Werror_unknown_warning_option=yes
-else $as_nop
-  gl_cv_warn_c__Werror_unknown_warning_option=no
+else case e in #(
+  e) gl_cv_warn_c__Werror_unknown_warning_option=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror_unknown_warning_option" >&5
-printf "%s\n" "$gl_cv_warn_c__Werror_unknown_warning_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror_unknown_warning_option" >&5
+printf '%s\n' "$gl_cv_warn_c__Werror_unknown_warning_option" >&6; }
 if test "x$gl_cv_warn_c__Werror_unknown_warning_option" = xyes
 then :
   as_fn_append CFLAGS " -Werror=unknown-warning-option"
@@ -11502,13 +11529,13 @@ fi
   # and 3.4).
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wunreachable-code" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wunreachable-code" >&5
 printf %s "checking whether C compiler handles -Wunreachable-code... " >&6; }
 if test ${gl_cv_warn_c__Wunreachable_code+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CFLAGS"
   as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wunreachable-code"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11525,16 +11552,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_warn_c__Wunreachable_code=yes
-else $as_nop
-  gl_cv_warn_c__Wunreachable_code=no
+else case e in #(
+  e) gl_cv_warn_c__Wunreachable_code=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wunreachable_code" >&5
-printf "%s\n" "$gl_cv_warn_c__Wunreachable_code" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wunreachable_code" >&5
+printf '%s\n' "$gl_cv_warn_c__Wunreachable_code" >&6; }
 if test "x$gl_cv_warn_c__Wunreachable_code" = xyes
 then :
   as_fn_append WARN_CFLAGS " -Wunreachable-code"
@@ -11545,18 +11574,18 @@ fi
   do
 
 
-as_gl_Warn=`printf "%s\n" "gl_cv_warn_c_$i" | $as_tr_sh`
+as_gl_Warn=`printf '%s\n' "gl_cv_warn_c_$i" | sed "$as_sed_sh"`
 gl_positive="$i"
 case $gl_positive in
   -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $i" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $i" >&5
 printf %s "checking whether C compiler handles $i... " >&6; }
 if eval test \${$as_gl_Warn+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CFLAGS"
   as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $gl_positive"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11573,17 +11602,19 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$as_gl_Warn=yes"
-else $as_nop
-  eval "$as_gl_Warn=no"
+else case e in #(
+  e) eval "$as_gl_Warn=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
 eval ac_res=\$$as_gl_Warn
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_gl_Warn"\" = x"yes"
 then :
   as_fn_append WARN_CFLAGS " $i"
@@ -11593,13 +11624,13 @@ fi
   done
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5
 printf %s "checking whether C compiler handles -Werror... " >&6; }
 if test ${gl_cv_warn_c__Werror+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CFLAGS"
   as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11616,16 +11647,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_warn_c__Werror=yes
-else $as_nop
-  gl_cv_warn_c__Werror=no
+else case e in #(
+  e) gl_cv_warn_c__Werror=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror" >&5
-printf "%s\n" "$gl_cv_warn_c__Werror" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror" >&5
+printf '%s\n' "$gl_cv_warn_c__Werror" >&6; }
 if test "x$gl_cv_warn_c__Werror" = xyes
 then :
   as_fn_append WERROR_CFLAGS " -Werror"
@@ -11643,18 +11676,18 @@ fi
   do
 
 
-as_gl_Warn=`printf "%s\n" "gl_cv_warn_c_$i" | $as_tr_sh`
+as_gl_Warn=`printf '%s\n' "gl_cv_warn_c_$i" | sed "$as_sed_sh"`
 gl_positive="$i"
 case $gl_positive in
   -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $i" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $i" >&5
 printf %s "checking whether C compiler handles $i... " >&6; }
 if eval test \${$as_gl_Warn+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CFLAGS"
   as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $gl_positive"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11671,17 +11704,19 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$as_gl_Warn=yes"
-else $as_nop
-  eval "$as_gl_Warn=no"
+else case e in #(
+  e) eval "$as_gl_Warn=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
 eval ac_res=\$$as_gl_Warn
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_gl_Warn"\" = x"yes"
 then :
   as_fn_append WARN_CFLAGS_TEST " $i"
@@ -11707,13 +11742,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   save_CXXFLAGS=$CXXFLAGS
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Werror=unknown-warning-option" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Werror=unknown-warning-option" >&5
 printf %s "checking whether C++ compiler handles -Werror=unknown-warning-option... " >&6; }
 if test ${gl_cv_warn_cxx__Werror_unknown_warning_option+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Werror=unknown-warning-option"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11730,16 +11765,18 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   gl_cv_warn_cxx__Werror_unknown_warning_option=yes
-else $as_nop
-  gl_cv_warn_cxx__Werror_unknown_warning_option=no
+else case e in #(
+  e) gl_cv_warn_cxx__Werror_unknown_warning_option=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Werror_unknown_warning_option" >&5
-printf "%s\n" "$gl_cv_warn_cxx__Werror_unknown_warning_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Werror_unknown_warning_option" >&5
+printf '%s\n' "$gl_cv_warn_cxx__Werror_unknown_warning_option" >&6; }
 if test "x$gl_cv_warn_cxx__Werror_unknown_warning_option" = xyes
 then :
   as_fn_append CXXFLAGS " -Werror=unknown-warning-option"
@@ -11750,18 +11787,18 @@ fi
   do
 
 
-as_gl_Warn=`printf "%s\n" "gl_cv_warn_cxx_$i" | $as_tr_sh`
+as_gl_Warn=`printf '%s\n' "gl_cv_warn_cxx_$i" | sed "$as_sed_sh"`
 gl_positive="$i"
 case $gl_positive in
   -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles $i" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles $i" >&5
 printf %s "checking whether C++ compiler handles $i... " >&6; }
 if eval test \${$as_gl_Warn+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors $gl_positive"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11778,17 +11815,19 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$as_gl_Warn=yes"
-else $as_nop
-  eval "$as_gl_Warn=no"
+else case e in #(
+  e) eval "$as_gl_Warn=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
 eval ac_res=\$$as_gl_Warn
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_gl_Warn"\" = x"yes"
 then :
   as_fn_append WARN_CXXFLAGS " $i"
@@ -11800,13 +11839,13 @@ fi
   # and 3.4).
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wunreachable-code" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wunreachable-code" >&5
 printf %s "checking whether C++ compiler handles -Wunreachable-code... " >&6; }
 if test ${gl_cv_warn_cxx__Wunreachable_code+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Wunreachable-code"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11823,16 +11862,18 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   gl_cv_warn_cxx__Wunreachable_code=yes
-else $as_nop
-  gl_cv_warn_cxx__Wunreachable_code=no
+else case e in #(
+  e) gl_cv_warn_cxx__Wunreachable_code=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wunreachable_code" >&5
-printf "%s\n" "$gl_cv_warn_cxx__Wunreachable_code" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wunreachable_code" >&5
+printf '%s\n' "$gl_cv_warn_cxx__Wunreachable_code" >&6; }
 if test "x$gl_cv_warn_cxx__Wunreachable_code" = xyes
 then :
   as_fn_append WARN_CXXFLAGS " -Wunreachable-code"
@@ -11841,13 +11882,13 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wzero-as-null-pointer-constant" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wzero-as-null-pointer-constant" >&5
 printf %s "checking whether C++ compiler handles -Wzero-as-null-pointer-constant... " >&6; }
 if test ${gl_cv_warn_cxx__Wzero_as_null_pointer_constant+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Wzero-as-null-pointer-constant"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11864,16 +11905,18 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   gl_cv_warn_cxx__Wzero_as_null_pointer_constant=yes
-else $as_nop
-  gl_cv_warn_cxx__Wzero_as_null_pointer_constant=no
+else case e in #(
+  e) gl_cv_warn_cxx__Wzero_as_null_pointer_constant=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wzero_as_null_pointer_constant" >&5
-printf "%s\n" "$gl_cv_warn_cxx__Wzero_as_null_pointer_constant" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wzero_as_null_pointer_constant" >&5
+printf '%s\n' "$gl_cv_warn_cxx__Wzero_as_null_pointer_constant" >&6; }
 if test "x$gl_cv_warn_cxx__Wzero_as_null_pointer_constant" = xyes
 then :
   as_fn_append WARN_CXXFLAGS " -Wzero-as-null-pointer-constant"
@@ -11884,13 +11927,13 @@ fi
   # this warning.
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wuseless-cast" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wuseless-cast" >&5
 printf %s "checking whether C++ compiler handles -Wuseless-cast... " >&6; }
 if test ${gl_cv_warn_cxx__Wuseless_cast+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Wuseless-cast"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11911,16 +11954,18 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   gl_cv_warn_cxx__Wuseless_cast=yes
-else $as_nop
-  gl_cv_warn_cxx__Wuseless_cast=no
+else case e in #(
+  e) gl_cv_warn_cxx__Wuseless_cast=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wuseless_cast" >&5
-printf "%s\n" "$gl_cv_warn_cxx__Wuseless_cast" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wuseless_cast" >&5
+printf '%s\n' "$gl_cv_warn_cxx__Wuseless_cast" >&6; }
 if test "x$gl_cv_warn_cxx__Wuseless_cast" = xyes
 then :
   as_fn_append WARN_CXXFLAGS " -Wuseless-cast"
@@ -11929,13 +11974,13 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Werror" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Werror" >&5
 printf %s "checking whether C++ compiler handles -Werror... " >&6; }
 if test ${gl_cv_warn_cxx__Werror+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Werror"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11952,16 +11997,18 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   gl_cv_warn_cxx__Werror=yes
-else $as_nop
-  gl_cv_warn_cxx__Werror=no
+else case e in #(
+  e) gl_cv_warn_cxx__Werror=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Werror" >&5
-printf "%s\n" "$gl_cv_warn_cxx__Werror" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Werror" >&5
+printf '%s\n' "$gl_cv_warn_cxx__Werror" >&6; }
 if test "x$gl_cv_warn_cxx__Werror" = xyes
 then :
   as_fn_append WERROR_CXXFLAGS " -Werror"
@@ -11973,18 +12020,18 @@ fi
   do
 
 
-as_gl_Warn=`printf "%s\n" "gl_cv_warn_cxx_$i" | $as_tr_sh`
+as_gl_Warn=`printf '%s\n' "gl_cv_warn_cxx_$i" | sed "$as_sed_sh"`
 gl_positive="$i"
 case $gl_positive in
   -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles $i" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles $i" >&5
 printf %s "checking whether C++ compiler handles $i... " >&6; }
 if eval test \${$as_gl_Warn+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors $gl_positive"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12001,17 +12048,19 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$as_gl_Warn=yes"
-else $as_nop
-  eval "$as_gl_Warn=no"
+else case e in #(
+  e) eval "$as_gl_Warn=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
 eval ac_res=\$$as_gl_Warn
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_gl_Warn"\" = x"yes"
 then :
   as_fn_append WARN_CXXFLAGS_TEST " $i"
@@ -12022,13 +12071,13 @@ fi
   # Too many compilers complain about Flex generated code.
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wno-error" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wno-error" >&5
 printf %s "checking whether C++ compiler handles -Wno-error... " >&6; }
 if test ${gl_cv_warn_cxx__Wno_error+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Werror"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12045,16 +12094,18 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   gl_cv_warn_cxx__Wno_error=yes
-else $as_nop
-  gl_cv_warn_cxx__Wno_error=no
+else case e in #(
+  e) gl_cv_warn_cxx__Wno_error=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wno_error" >&5
-printf "%s\n" "$gl_cv_warn_cxx__Wno_error" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wno_error" >&5
+printf '%s\n' "$gl_cv_warn_cxx__Wno_error" >&6; }
 if test "x$gl_cv_warn_cxx__Wno_error" = xyes
 then :
   as_fn_append FLEX_SCANNER_CXXFLAGS " -Wno-error"
@@ -12064,13 +12115,13 @@ fi
   # Clang++ deprecates compiling C.
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wno-deprecated" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wno-deprecated" >&5
 printf %s "checking whether C++ compiler handles -Wno-deprecated... " >&6; }
 if test ${gl_cv_warn_cxx__Wno_deprecated+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
   gl_save_compiler_FLAGS="$CXXFLAGS"
   as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Wdeprecated"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12087,16 +12138,18 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   gl_cv_warn_cxx__Wno_deprecated=yes
-else $as_nop
-  gl_cv_warn_cxx__Wno_deprecated=no
+else case e in #(
+  e) gl_cv_warn_cxx__Wno_deprecated=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wno_deprecated" >&5
-printf "%s\n" "$gl_cv_warn_cxx__Wno_deprecated" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wno_deprecated" >&5
+printf '%s\n' "$gl_cv_warn_cxx__Wno_deprecated" >&6; }
 if test "x$gl_cv_warn_cxx__Wno_deprecated" = xyes
 then :
   as_fn_append WNO_DEPRECATED_CXXFLAGS " -Wno-deprecated"
@@ -12129,11 +12182,12 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compile a simple C program
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    BISON_C_WORKS=:
@@ -12145,13 +12199,13 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports POSIXLY_CORRECT=1" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC supports POSIXLY_CORRECT=1" >&5
 printf %s "checking whether $CC supports POSIXLY_CORRECT=1... " >&6; }
 if test ${bison_cv_c_supports_posixly_correct+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
+else case e in #(
+  e) gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
 case ${POSIXLY_CORRECT+x}`$AWK "$gl_awk_probe" </dev/null` in
   xx) gl_had_POSIXLY_CORRECT=exported ;;
   x)  gl_had_POSIXLY_CORRECT=yes      ;;
@@ -12173,8 +12227,9 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   bison_cv_c_supports_posixly_correct=yes
-else $as_nop
-  bison_cv_c_supports_posixly_correct=no
+else case e in #(
+  e) bison_cv_c_supports_posixly_correct=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -12183,10 +12238,11 @@ case $gl_had_POSIXLY_CORRECT in
   yes) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}; POSIXLY_CORRECT=1 ;;
   *) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;} ;;
 esac
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bison_cv_c_supports_posixly_correct" >&5
-printf "%s\n" "$bison_cv_c_supports_posixly_correct" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $bison_cv_c_supports_posixly_correct" >&5
+printf '%s\n' "$bison_cv_c_supports_posixly_correct" >&6; }
 case $bison_cv_c_supports_posixly_correct in
   yes) C_COMPILER_POSIXLY_CORRECT=true
  ;;
@@ -12202,13 +12258,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX builds executables that work" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX builds executables that work" >&5
 printf %s "checking whether $CXX builds executables that work... " >&6; }
 if test ${bison_cv_cxx_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_ext=cpp
+else case e in #(
+  e) ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -12245,22 +12301,23 @@ then :
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   if test "$cross_compiling" = yes
 then :
   bison_cv_cxx_works=cross
-else $as_nop
-  if { ac_try='./conftest$ac_exeext'
+else case e in #(
+  e) if { ac_try='./conftest$ac_exeext'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   bison_cv_cxx_works=yes
-fi
+fi ;;
+esac
 fi
 fi
        rm -f conftest$ac_exeext
@@ -12271,10 +12328,11 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bison_cv_cxx_works" >&5
-printf "%s\n" "$bison_cv_cxx_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $bison_cv_cxx_works" >&5
+printf '%s\n' "$bison_cv_cxx_works" >&6; }
 
  case $bison_cv_cxx_works in
    yes)        BISON_CXX_WORKS=':';;
@@ -12297,13 +12355,13 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports POSIXLY_CORRECT=1" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports POSIXLY_CORRECT=1" >&5
 printf %s "checking whether $CXX supports POSIXLY_CORRECT=1... " >&6; }
 if test ${bison_cv_cxx_supports_posixly_correct+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
+else case e in #(
+  e) gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
 case ${POSIXLY_CORRECT+x}`$AWK "$gl_awk_probe" </dev/null` in
   xx) gl_had_POSIXLY_CORRECT=exported ;;
   x)  gl_had_POSIXLY_CORRECT=yes      ;;
@@ -12325,8 +12383,9 @@ _ACEOF
 if ac_fn_cxx_try_link "$LINENO"
 then :
   bison_cv_cxx_supports_posixly_correct=yes
-else $as_nop
-  bison_cv_cxx_supports_posixly_correct=no
+else case e in #(
+  e) bison_cv_cxx_supports_posixly_correct=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -12335,10 +12394,11 @@ case $gl_had_POSIXLY_CORRECT in
   yes) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}; POSIXLY_CORRECT=1 ;;
   *) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;} ;;
 esac
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $bison_cv_cxx_supports_posixly_correct" >&5
-printf "%s\n" "$bison_cv_cxx_supports_posixly_correct" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $bison_cv_cxx_supports_posixly_correct" >&5
+printf '%s\n' "$bison_cv_cxx_supports_posixly_correct" >&6; }
 case $bison_cv_cxx_supports_posixly_correct in
   yes) CXX_COMPILER_POSIXLY_CORRECT=true
  ;;
@@ -12359,13 +12419,13 @@ for ac_prog in dmd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DC"; then
+else case e in #(
+  e) if test -n "$DC"; then
   ac_cv_prog_DC="$DC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12380,22 +12440,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 DC=$ac_cv_prog_DC
 if test -n "$DC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DC" >&5
-printf "%s\n" "$DC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DC" >&5
+printf '%s\n' "$DC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12406,13 +12467,13 @@ for ac_prog in -g
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DCFLAGS+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DCFLAGS"; then
+else case e in #(
+  e) if test -n "$DCFLAGS"; then
   ac_cv_prog_DCFLAGS="$DCFLAGS" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12427,22 +12488,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DCFLAGS="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 DCFLAGS=$ac_cv_prog_DCFLAGS
 if test -n "$DCFLAGS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DCFLAGS" >&5
-printf "%s\n" "$DCFLAGS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DCFLAGS" >&5
+printf '%s\n' "$DCFLAGS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12470,11 +12532,12 @@ fi
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   CLASSPATH_SEPARATOR=';'
-else $as_nop
-  CLASSPATH_SEPARATOR=':'
+else case e in #(
+  e) CLASSPATH_SEPARATOR=':' ;;
+esac
 fi
 rm -rf conftest*
 
@@ -12531,7 +12594,7 @@ rm -rf conftest*
       echo
     }
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Java compiler" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Java compiler" >&5
 printf %s "checking for Java compiler... " >&6; }
                                                                                                                                                                   CONF_JAVAC=
   HAVE_JAVAC_ENVVAR=
@@ -12551,23 +12614,23 @@ EOF
         if $JAVAC --version 2>/dev/null | sed -e 1q | grep gcj > /dev/null; then
             if $JAVAC --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
                         rm -f conftest.class
-        if { echo "$as_me:12554: $JAVAC -d . conftest.java" >&5
+        if { echo "$as_me:12617: $JAVAC -d . conftest.java" >&5
              $JAVAC -d . conftest.java >&5 2>&1
            } \
            && test -f conftest.class \
            && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:12561: $JAVAC -fsource=$source_version -d . conftest.java" >&5
+          if { echo "$as_me:12624: $JAVAC -fsource=$source_version -d . conftest.java" >&5
                $JAVAC -fsource="$source_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
              && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-             && { echo "$as_me:12566: $JAVAC -d . conftestfail.java" >&5
+             && { echo "$as_me:12629: $JAVAC -d . conftestfail.java" >&5
                   $JAVAC -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:12570: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:12633: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
                     $JAVAC -fsource="$source_version" -d . conftestfail.java >&5 2>&1
                   }; then
             CONF_JAVAC="$JAVAC -fsource=$source_version"
@@ -12581,7 +12644,7 @@ EOF
         else
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:12584: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+          if { echo "$as_me:12647: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
                $JAVAC -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
@@ -12594,7 +12657,7 @@ EOF
       else
                 if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
                     rm -f conftest.class
-          if { echo "$as_me:12597: $JAVAC -d . conftest.java" >&5
+          if { echo "$as_me:12660: $JAVAC -d . conftest.java" >&5
                $JAVAC -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class; then
@@ -12606,7 +12669,7 @@ EOF
           if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
                                     javac_works=
             rm -f conftest.class
-            if { echo "$as_me:12609: $JAVAC -d . conftest.java" >&5
+            if { echo "$as_me:12672: $JAVAC -d . conftest.java" >&5
                  $JAVAC -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class; then
@@ -12614,7 +12677,7 @@ EOF
             fi
             javac_noassert_works=
             rm -f conftest.class
-            if { echo "$as_me:12617: $JAVAC -fno-assert -d . conftest.java" >&5
+            if { echo "$as_me:12680: $JAVAC -fno-assert -d . conftest.java" >&5
                  $JAVAC -fno-assert -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class; then
@@ -12622,11 +12685,11 @@ EOF
             fi
             if test -n "$javac_works" && test -n "$javac_noassert_works"; then
               rm -f conftestfail.class
-              if { echo "$as_me:12625: $JAVAC -d . conftestfail.java" >&5
+              if { echo "$as_me:12688: $JAVAC -d . conftestfail.java" >&5
                    $JAVAC -d . conftestfail.java >&5 2>&1
                  } \
                  && test -f conftestfail.class \
-                 && ! { echo "$as_me:12629: $JAVAC -fno-assert -d . conftestfail.java" >&5
+                 && ! { echo "$as_me:12692: $JAVAC -fno-assert -d . conftestfail.java" >&5
                         $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
                       }; then
                                 javac_works=
@@ -12654,23 +12717,23 @@ EOF
         esac
       fi
       rm -f conftest.class
-      if { echo "$as_me:12657: $JAVAC -d . conftest.java" >&5
+      if { echo "$as_me:12720: $JAVAC -d . conftest.java" >&5
            $JAVAC -d . conftest.java >&5 2>&1
          } \
          && test -f conftest.class \
          && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                 rm -f conftest.class
         rm -f conftestfail.class
-        if { echo "$as_me:12664: $JAVAC -source $source_version -d . conftest.java" >&5
+        if { echo "$as_me:12727: $JAVAC -source $source_version -d . conftest.java" >&5
              $JAVAC -source "$source_version" -d . conftest.java >&5 2>&1
            } \
            && test -f conftest.class \
            && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-           && { echo "$as_me:12669: $JAVAC -d . conftestfail.java" >&5
+           && { echo "$as_me:12732: $JAVAC -d . conftestfail.java" >&5
                 $JAVAC -d . conftestfail.java >&5 2>&1
               } \
            && test -f conftestfail.class \
-           && ! { echo "$as_me:12673: $JAVAC -source $source_version -d . conftestfail.java" >&5
+           && ! { echo "$as_me:12736: $JAVAC -source $source_version -d . conftestfail.java" >&5
                   $JAVAC -source "$source_version" -d . conftestfail.java >&5 2>&1
                 }; then
           CONF_JAVAC="$JAVAC -source $source_version"
@@ -12683,23 +12746,23 @@ EOF
         fi
       else
                         rm -f conftest.class
-        if { echo "$as_me:12686: $JAVAC -target $target_version -d . conftest.java" >&5
+        if { echo "$as_me:12749: $JAVAC -target $target_version -d . conftest.java" >&5
              $JAVAC -target "$target_version" -d . conftest.java >&5 2>&1
            } \
            && test -f conftest.class \
            && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:12693: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:12756: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
                $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
              && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-             && { echo "$as_me:12698: $JAVAC -target $target_version -d . conftestfail.java" >&5
+             && { echo "$as_me:12761: $JAVAC -target $target_version -d . conftestfail.java" >&5
                   $JAVAC -target "$target_version" -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:12702: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:12765: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
                     $JAVAC -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
                   }; then
             CONF_JAVAC="$JAVAC -target $target_version -source $source_version"
@@ -12712,7 +12775,7 @@ EOF
           fi
         else
                                         rm -f conftest.class
-          if { echo "$as_me:12715: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:12778: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
                $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
@@ -12732,8 +12795,8 @@ set dummy gcj; ac_word=$2
 if test ${ac_cv_prog_HAVE_GCJ_IN_PATH+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$HAVE_GCJ_IN_PATH"; then
+else case e in #(
+  e) if test -n "$HAVE_GCJ_IN_PATH"; then
   ac_cv_prog_HAVE_GCJ_IN_PATH="$HAVE_GCJ_IN_PATH" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12748,14 +12811,15 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HAVE_GCJ_IN_PATH="yes"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 HAVE_GCJ_IN_PATH=$ac_cv_prog_HAVE_GCJ_IN_PATH
 if test -n "$HAVE_GCJ_IN_PATH"; then
@@ -12771,8 +12835,8 @@ set dummy javac; ac_word=$2
 if test ${ac_cv_prog_HAVE_JAVAC_IN_PATH+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$HAVE_JAVAC_IN_PATH"; then
+else case e in #(
+  e) if test -n "$HAVE_JAVAC_IN_PATH"; then
   ac_cv_prog_HAVE_JAVAC_IN_PATH="$HAVE_JAVAC_IN_PATH" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12787,14 +12851,15 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HAVE_JAVAC_IN_PATH="yes"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 HAVE_JAVAC_IN_PATH=$ac_cv_prog_HAVE_JAVAC_IN_PATH
 if test -n "$HAVE_JAVAC_IN_PATH"; then
@@ -12810,8 +12875,8 @@ set dummy jikes; ac_word=$2
 if test ${ac_cv_prog_HAVE_JIKES_IN_PATH+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$HAVE_JIKES_IN_PATH"; then
+else case e in #(
+  e) if test -n "$HAVE_JIKES_IN_PATH"; then
   ac_cv_prog_HAVE_JIKES_IN_PATH="$HAVE_JIKES_IN_PATH" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12826,14 +12891,15 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HAVE_JIKES_IN_PATH="yes"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 HAVE_JIKES_IN_PATH=$ac_cv_prog_HAVE_JIKES_IN_PATH
 if test -n "$HAVE_JIKES_IN_PATH"; then
@@ -12845,28 +12911,28 @@ fi
 
                 if test -z "$HAVE_JAVACOMP" && test -n "$HAVE_GCJ_IN_PATH"; then
             if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null; then
-                if { echo "$as_me:12848: gcj -C -d . conftestlib.java" >&5
+                if { echo "$as_me:12914: gcj -C -d . conftestlib.java" >&5
              gcj -C -d . conftestlib.java >&5 2>&1
            }; then
                     if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
                                     rm -f conftest.class
-            if { echo "$as_me:12853: gcj -C -d . conftest.java" >&5
+            if { echo "$as_me:12919: gcj -C -d . conftest.java" >&5
                  gcj -C -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class \
                && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                             rm -f conftest.class
               rm -f conftestfail.class
-              if { echo "$as_me:12860: gcj -C -fsource=$source_version -d . conftest.java" >&5
+              if { echo "$as_me:12926: gcj -C -fsource=$source_version -d . conftest.java" >&5
                    gcj -C -fsource="$source_version" -d . conftest.java >&5 2>&1
                  } \
                  && test -f conftest.class \
                  && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-                 && { echo "$as_me:12865: gcj -C -d . conftestfail.java" >&5
+                 && { echo "$as_me:12931: gcj -C -d . conftestfail.java" >&5
                       gcj -C -d . conftestfail.java >&5 2>&1
                     } \
                  && test -f conftestfail.class \
-                 && ! { echo "$as_me:12869: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
+                 && ! { echo "$as_me:12935: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
                         gcj -C -fsource="$source_version" -d . conftestfail.java >&5 2>&1
                       }; then
                 CONF_JAVAC="gcj -C -fsource=$source_version"
@@ -12880,7 +12946,7 @@ fi
             else
                             rm -f conftest.class
               rm -f conftestfail.class
-              if { echo "$as_me:12883: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+              if { echo "$as_me:12949: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
                    gcj -C -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
                  } \
                  && test -f conftest.class \
@@ -12893,7 +12959,7 @@ fi
           else
                                                 if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
               rm -f conftest.class
-              if { echo "$as_me:12896: gcj -C -d . conftest.java" >&5
+              if { echo "$as_me:12962: gcj -C -d . conftest.java" >&5
                    gcj -C -d . conftest.java >&5 2>&1
                  } \
                  && test -f conftest.class; then
@@ -12904,7 +12970,7 @@ fi
             else
               if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
                                                 rm -f conftest.class
-                if { echo "$as_me:12907: gcj -C -fno-assert -d . conftest.java" >&5
+                if { echo "$as_me:12973: gcj -C -fno-assert -d . conftest.java" >&5
                      gcj -C -fno-assert -d . conftest.java >&5 2>&1
                    } \
                    && test -f conftest.class; then
@@ -12913,7 +12979,7 @@ fi
                   HAVE_JAVACOMP=1
                 else
                   rm -f conftest.class
-                  if { echo "$as_me:12916: gcj -C -d . conftest.java" >&5
+                  if { echo "$as_me:12982: gcj -C -d . conftest.java" >&5
                        gcj -C -d . conftest.java >&5 2>&1
                      } \
                      && test -f conftest.class; then
@@ -12938,23 +13004,23 @@ fi
           esac
         fi
                         rm -f conftest.class
-        if { echo "$as_me:12941: javac -d . conftest.java" >&5
+        if { echo "$as_me:13007: javac -d . conftest.java" >&5
              javac -d . conftest.java >&5 2>&1
            } \
            && test -f conftest.class \
            && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:12948: javac -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:13014: javac -source $source_version -d . conftest.java" >&5
                javac -source "$source_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
              && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-             && { echo "$as_me:12953: javac -d . conftestfail.java" >&5
+             && { echo "$as_me:13019: javac -d . conftestfail.java" >&5
                   javac -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:12957: javac -source $source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:13023: javac -source $source_version -d . conftestfail.java" >&5
                     javac -source "$source_version" -d . conftestfail.java >&5 2>&1
                   }; then
             CONF_JAVAC="javac -source $source_version"
@@ -12967,23 +13033,23 @@ fi
           fi
         else
                               rm -f conftest.class
-          if { echo "$as_me:12970: javac -target $target_version -d . conftest.java" >&5
+          if { echo "$as_me:13036: javac -target $target_version -d . conftest.java" >&5
                javac -target "$target_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
              && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                         rm -f conftest.class
             rm -f conftestfail.class
-            if { echo "$as_me:12977: javac -target $target_version -source $source_version -d . conftest.java" >&5
+            if { echo "$as_me:13043: javac -target $target_version -source $source_version -d . conftest.java" >&5
                  javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class \
                && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-               && { echo "$as_me:12982: javac -target $target_version -d . conftestfail.java" >&5
+               && { echo "$as_me:13048: javac -target $target_version -d . conftestfail.java" >&5
                     javac -target "$target_version" -d . conftestfail.java >&5 2>&1
                   } \
                && test -f conftestfail.class \
-               && ! { echo "$as_me:12986: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
+               && ! { echo "$as_me:13052: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
                       javac -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
                     }; then
               CONF_JAVAC="javac -target $target_version -source $source_version"
@@ -12996,7 +13062,7 @@ fi
             fi
           else
                                                 rm -f conftest.class
-            if { echo "$as_me:12999: javac -target $target_version -source $source_version -d . conftest.java" >&5
+            if { echo "$as_me:13065: javac -target $target_version -source $source_version -d . conftest.java" >&5
                  javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class \
@@ -13033,8 +13099,8 @@ fi
   else
     ac_result="no"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_result" >&5
-printf "%s\n" "$ac_result" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_result" >&5
+printf '%s\n' "$ac_result" >&6; }
 
 
 
@@ -13044,7 +13110,7 @@ printf "%s\n" "$ac_result" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Java virtual machine" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Java virtual machine" >&5
 printf %s "checking for Java virtual machine... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13055,11 +13121,12 @@ printf %s "checking for Java virtual machine... " >&6; }
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   CLASSPATH_SEPARATOR=';'
-else $as_nop
-  CLASSPATH_SEPARATOR=':'
+else case e in #(
+  e) CLASSPATH_SEPARATOR=':' ;;
+esac
 fi
 rm -rf conftest*
 
@@ -13080,8 +13147,8 @@ set dummy gij; ac_word=$2
 if test ${ac_cv_prog_HAVE_GIJ_IN_PATH+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$HAVE_GIJ_IN_PATH"; then
+else case e in #(
+  e) if test -n "$HAVE_GIJ_IN_PATH"; then
   ac_cv_prog_HAVE_GIJ_IN_PATH="$HAVE_GIJ_IN_PATH" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13096,14 +13163,15 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HAVE_GIJ_IN_PATH="yes"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 HAVE_GIJ_IN_PATH=$ac_cv_prog_HAVE_GIJ_IN_PATH
 if test -n "$HAVE_GIJ_IN_PATH"; then
@@ -13119,8 +13187,8 @@ set dummy java; ac_word=$2
 if test ${ac_cv_prog_HAVE_JAVA_IN_PATH+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$HAVE_JAVA_IN_PATH"; then
+else case e in #(
+  e) if test -n "$HAVE_JAVA_IN_PATH"; then
   ac_cv_prog_HAVE_JAVA_IN_PATH="$HAVE_JAVA_IN_PATH" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13135,14 +13203,15 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HAVE_JAVA_IN_PATH="yes"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 HAVE_JAVA_IN_PATH=$ac_cv_prog_HAVE_JAVA_IN_PATH
 if test -n "$HAVE_JAVA_IN_PATH"; then
@@ -13158,8 +13227,8 @@ set dummy jre; ac_word=$2
 if test ${ac_cv_prog_HAVE_JRE_IN_PATH+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$HAVE_JRE_IN_PATH"; then
+else case e in #(
+  e) if test -n "$HAVE_JRE_IN_PATH"; then
   ac_cv_prog_HAVE_JRE_IN_PATH="$HAVE_JRE_IN_PATH" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13174,14 +13243,15 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HAVE_JRE_IN_PATH="yes"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 HAVE_JRE_IN_PATH=$ac_cv_prog_HAVE_JRE_IN_PATH
 if test -n "$HAVE_JRE_IN_PATH"; then
@@ -13197,8 +13267,8 @@ set dummy jview; ac_word=$2
 if test ${ac_cv_prog_HAVE_JVIEW_IN_PATH+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$HAVE_JVIEW_IN_PATH"; then
+else case e in #(
+  e) if test -n "$HAVE_JVIEW_IN_PATH"; then
   ac_cv_prog_HAVE_JVIEW_IN_PATH="$HAVE_JVIEW_IN_PATH" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13213,14 +13283,15 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HAVE_JVIEW_IN_PATH="yes"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 HAVE_JVIEW_IN_PATH=$ac_cv_prog_HAVE_JVIEW_IN_PATH
 if test -n "$HAVE_JVIEW_IN_PATH"; then
@@ -13268,8 +13339,8 @@ fi
   else
     ac_result="no"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_result" >&5
-printf "%s\n" "$ac_result" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_result" >&5
+printf '%s\n' "$ac_result" >&6; }
 
 
 
@@ -13293,8 +13364,9 @@ fi
 if test ${enable_yacc+y}
 then :
   enableval=$enable_yacc;
-else $as_nop
-  enable_yacc=yes
+else case e in #(
+  e) enable_yacc=yes ;;
+esac
 fi
 
  if test "$enable_yacc" = yes; then
@@ -13316,13 +13388,13 @@ for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LEX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$LEX"; then
+else case e in #(
+  e) if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13337,22 +13409,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LEX="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-printf "%s\n" "$LEX" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+printf '%s\n' "$LEX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -13361,13 +13434,13 @@ done
 test -n "$LEX" || LEX=":"
 
 if test "x$LEX" != "x:"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lex is flex" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether lex is flex" >&5
 printf %s "checking whether lex is flex... " >&6; }
 if test ${ac_cv_prog_lex_is_flex+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat >conftest.l <<_ACEOF
+else case e in #(
+  e) cat >conftest.l <<_ACEOF
 %option debug nodefault noinput nounput noyywrap never-interactive
 %x SC_CONF_TEST
 %%
@@ -13379,46 +13452,48 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$LEX conftest.l") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   ac_cv_prog_lex_is_flex=yes
 else
   ac_cv_prog_lex_is_flex=no
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_is_flex" >&5
-printf "%s\n" "$ac_cv_prog_lex_is_flex" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_is_flex" >&5
+printf '%s\n' "$ac_cv_prog_lex_is_flex" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether flex supports --header=FILE" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether flex supports --header=FILE" >&5
 printf %s "checking whether flex supports --header=FILE... " >&6; }
 if test ${ac_cv_prog_lex_supports_header_opt+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if { { ac_try="$LEX --header=conftest.h conftest.l"
+else case e in #(
+  e) if { { ac_try="$LEX --header=conftest.h conftest.l"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$LEX --header=conftest.h conftest.l") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   ac_cv_prog_lex_supports_header_opt=yes
 else
   ac_cv_prog_lex_supports_header_opt=no
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_supports_header_opt" >&5
-printf "%s\n" "$ac_cv_prog_lex_supports_header_opt" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_supports_header_opt" >&5
+printf '%s\n' "$ac_cv_prog_lex_supports_header_opt" >&6; }
 if test "$ac_cv_prog_lex_supports_header_opt" = yes; then
   FLEX_SUPPORTS_HEADER_OPT=true
 else
@@ -13452,38 +13527,39 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$LEX conftest.l") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
 printf %s "checking lex output file root... " >&6; }
 if test ${ac_cv_prog_lex_root+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 if test -f lex.yy.c; then
   ac_cv_prog_lex_root=lex.yy
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
   as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
+fi ;;
+esac
 fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-printf "%s\n" "$ac_cv_prog_lex_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+printf '%s\n' "$ac_cv_prog_lex_root" >&6; }
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 if test -z "${LEXLIB+set}"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
 printf %s "checking lex library... " >&6; }
 if test ${ac_cv_lib_lex+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     ac_save_LIBS=$LIBS
     ac_cv_lib_lex='none needed'
     for ac_lib in '' -lfl -ll; do
@@ -13501,21 +13577,22 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
       test "$ac_cv_lib_lex" != 'none needed' && break
     done
     LIBS=$ac_save_LIBS
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-printf "%s\n" "$ac_cv_lib_lex" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+printf '%s\n' "$ac_cv_lib_lex" >&6; }
   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
 printf %s "checking whether yytext is a pointer... " >&6; }
 if test ${ac_cv_prog_lex_yytext_pointer+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # POSIX says lex can declare yytext either as a pointer or an array; the
+else case e in #(
+  e) # POSIX says lex can declare yytext either as a pointer or an array; the
 # default is implementation-dependent.  Figure out which it is, since
 # not all implementations provide the %pointer and %array declarations.
 ac_cv_prog_lex_yytext_pointer=no
@@ -13534,13 +13611,14 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-printf "%s\n" "$ac_cv_prog_lex_yytext_pointer" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+printf '%s\n' "$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
-printf "%s\n" "#define YYTEXT_POINTER 1" >>confdefs.h
+printf '%s\n' "#define YYTEXT_POINTER 1" >>confdefs.h
 
 fi
 rm -f conftest.l $LEX_OUTPUT_ROOT.c
@@ -13549,8 +13627,8 @@ fi
 LEX_IS_FLEX=`test "$ac_cv_prog_lex_is_flex" = yes && echo true || echo false`
 
 if ! "$LEX_IS_FLEX" || test "X$LEX" = X:; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: bypassing lex because flex is required" >&5
-printf "%s\n" "$as_me: WARNING: bypassing lex because flex is required" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: bypassing lex because flex is required" >&5
+printf '%s\n' "$as_me: WARNING: bypassing lex because flex is required" >&2;}
   LEX=:
 fi
  if $LEX_IS_FLEX && $FLEX_SUPPORTS_HEADER_OPT; then
@@ -13573,13 +13651,13 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_YACC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$YACC"; then
+else case e in #(
+  e) if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13594,22 +13672,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_YACC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-printf "%s\n" "$YACC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+printf '%s\n' "$YACC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -13620,13 +13699,13 @@ test -n "$YACC" || YACC="yacc"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$RANLIB"; then
+else case e in #(
+  e) if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13641,22 +13720,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -13665,13 +13745,13 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_RANLIB"; then
+else case e in #(
+  e) if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13686,22 +13766,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -13709,8 +13790,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -13720,13 +13801,13 @@ else
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU M4 that supports accurate traces" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU M4 that supports accurate traces" >&5
 printf %s "checking for GNU M4 that supports accurate traces... " >&6; }
 if test ${ac_cv_path_M4+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -f conftest.m4f
+else case e in #(
+  e) rm -f conftest.m4f
 ac_had_posixly_correct=${POSIXLY_CORRECT:+yes}
 { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}
 if test -z "$M4"; then
@@ -13755,7 +13836,7 @@ do
       ac_snippet=${ac_snippet}${as_nl}if'else(in''dex(..wi.d.,.d.),-1,bug)'
       ac_snippet=${ac_snippet}${as_nl}if'else(in''dex(;:11-:12-:12-:12-:12-:12-:12-:12-:12.:12.:12.:12.:12.:12.:12.:12.:12-,:12-:12-:12-:12-:12-:12-:12-:12-),-1,,strstr-bug2)'
       test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
-      && test -z "`printf "%s\n" $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
+      && test -z "`printf '%s\n' $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
       && test -f conftest.m4f \
       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
       rm -f conftest.m4f
@@ -13773,24 +13854,26 @@ Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another strstr bug." "$LINENO"
 else
   ac_cv_path_M4=$M4
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_M4" >&5
-printf "%s\n" "$ac_cv_path_M4" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_M4" >&5
+printf '%s\n' "$ac_cv_path_M4" >&6; }
   M4=$ac_cv_path_M4
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $ac_cv_path_M4 accepts --gnu" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $ac_cv_path_M4 accepts --gnu" >&5
 printf %s "checking whether $ac_cv_path_M4 accepts --gnu... " >&6; }
 if test ${ac_cv_prog_gnu_m4_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case `$M4 --help < /dev/null 2>&1` in
+else case e in #(
+  e) case `$M4 --help < /dev/null 2>&1` in
       *--gnu*) ac_cv_prog_gnu_m4_gnu=yes ;;
       *) ac_cv_prog_gnu_m4_gnu=no ;;
-    esac
+    esac ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_m4_gnu" >&5
-printf "%s\n" "$ac_cv_prog_gnu_m4_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_m4_gnu" >&5
+printf '%s\n' "$ac_cv_prog_gnu_m4_gnu" >&6; }
   if test "$ac_cv_prog_gnu_m4_gnu" = yes; then
     M4_GNU=--gnu
   else
@@ -13800,43 +13883,44 @@ printf "%s\n" "$ac_cv_prog_gnu_m4_gnu" >&6; }
   if test x$ac_had_posixly_correct = xyes; then
     POSIXLY_CORRECT=:
     if test $ac_cv_prog_gnu_m4_gnu = no; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: the version of M4 that was found does not support -g" >&5
-printf "%s\n" "$as_me: WARNING: the version of M4 that was found does not support -g" >&2;}
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using it with POSIXLY_CORRECT set may cause problems" >&5
-printf "%s\n" "$as_me: WARNING: using it with POSIXLY_CORRECT set may cause problems" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: the version of M4 that was found does not support -g" >&5
+printf '%s\n' "$as_me: WARNING: the version of M4 that was found does not support -g" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using it with POSIXLY_CORRECT set may cause problems" >&5
+printf '%s\n' "$as_me: WARNING: using it with POSIXLY_CORRECT set may cause problems" >&2;}
     fi
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how m4 supports trace files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how m4 supports trace files" >&5
 printf %s "checking how m4 supports trace files... " >&6; }
 if test ${ac_cv_prog_gnu_m4_debugfile+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case `$M4 --help < /dev/null 2>&1` in
+else case e in #(
+  e) case `$M4 --help < /dev/null 2>&1` in
       *debugfile*) ac_cv_prog_gnu_m4_debugfile=--debugfile ;;
       *) ac_cv_prog_gnu_m4_debugfile=--error-output ;;
-    esac
+    esac ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_m4_debugfile" >&5
-printf "%s\n" "$ac_cv_prog_gnu_m4_debugfile" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_m4_debugfile" >&5
+printf '%s\n' "$ac_cv_prog_gnu_m4_debugfile" >&6; }
   M4_DEBUGFILE=$ac_cv_prog_gnu_m4_debugfile
 
 
 
-printf "%s\n" "#define M4 \"$M4\"" >>confdefs.h
+printf '%s\n' "#define M4 \"$M4\"" >>confdefs.h
 
 
-printf "%s\n" "#define M4_GNU_OPTION \"$M4_GNU\"" >>confdefs.h
+printf '%s\n' "#define M4_GNU_OPTION \"$M4_GNU\"" >>confdefs.h
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_PERL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $PERL in
+else case e in #(
+  e) case $PERL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
   ;;
@@ -13853,7 +13937,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -13861,15 +13945,16 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-printf "%s\n" "$PERL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+printf '%s\n' "$PERL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -13878,13 +13963,13 @@ HELP2MAN=${HELP2MAN-"${am_missing_run}help2man"}
 
 # Extract the first word of "xsltproc", so it can be a program name with args.
 set dummy xsltproc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XSLTPROC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $XSLTPROC in
+else case e in #(
+  e) case $XSLTPROC in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
   ;;
@@ -13901,7 +13986,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_XSLTPROC="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -13909,15 +13994,16 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 XSLTPROC=$ac_cv_path_XSLTPROC
 if test -n "$XSLTPROC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
-printf "%s\n" "$XSLTPROC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+printf '%s\n' "$XSLTPROC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -13928,13 +14014,13 @@ fi
 
 
 # Checks for compiler characteristics.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 printf %s "checking for inline... " >&6; }
 if test ${ac_cv_c_inline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_c_inline=no
+else case e in #(
+  e) ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13952,10 +14038,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-printf "%s\n" "$ac_cv_c_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+printf '%s\n' "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -13987,13 +14074,14 @@ esac
 if test ${enable_cross_guesses+y}
 then :
   enableval=$enable_cross_guesses; if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
-printf "%s\n" "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
+printf '%s\n' "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
        enableval=conservative
      fi
      gl_cross_guesses="$enableval"
-else $as_nop
-  gl_cross_guesses=conservative
+else case e in #(
+  e) gl_cross_guesses=conservative ;;
+esac
 fi
 
   if test $gl_cross_guesses = risky; then
@@ -14441,21 +14529,22 @@ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 if test "x$ac_cv_type_size_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define size_t unsigned int" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define size_t unsigned int" >>confdefs.h
+ ;;
+esac
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 printf %s "checking for working alloca.h... " >&6; }
 if test ${ac_cv_working_alloca_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
@@ -14470,29 +14559,31 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_working_alloca_h=yes
-else $as_nop
-  ac_cv_working_alloca_h=no
+else case e in #(
+  e) ac_cv_working_alloca_h=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+printf '%s\n' "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 printf %s "checking for alloca... " >&6; }
 if test ${ac_cv_func_alloca_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $ac_cv_working_alloca_h = yes; then
-  ac_cv_func_alloca_works=yes
-else
+else case e in #(
+  e) ac_cv_func_alloca_works=$ac_cv_working_alloca_h
+if test "$ac_cv_func_alloca_works" != yes
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
@@ -14523,19 +14614,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_func_alloca_works=yes
-else $as_nop
-  ac_cv_func_alloca_works=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
+fi ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
-fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+printf '%s\n' "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -14549,20 +14639,20 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h
+printf '%s\n' "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 printf %s "checking stack direction for C alloca... " >&6; }
 if test ${ac_cv_c_stack_direction+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   ac_cv_c_stack_direction=0
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -14585,17 +14675,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_c_stack_direction=1
-else $as_nop
-  ac_cv_c_stack_direction=-1
+else case e in #(
+  e) ac_cv_c_stack_direction=-1 ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
-printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+printf '%s\n' "$ac_cv_c_stack_direction" >&6; }
+printf '%s\n' "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
 
 
 fi
@@ -14675,13 +14768,13 @@ fi
   REPLACE_WCTOMB=0;
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
 printf %s "checking whether malloc is ptrdiff_t safe... " >&6; }
 if test ${gl_cv_malloc_ptrdiff+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdint.h>
 
@@ -14715,14 +14808,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_malloc_ptrdiff=yes
-else $as_nop
-  gl_cv_malloc_ptrdiff=no
+else case e in #(
+  e) gl_cv_malloc_ptrdiff=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
-printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
+printf '%s\n' "$gl_cv_malloc_ptrdiff" >&6; }
 
 
 
@@ -14731,13 +14826,13 @@ printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
 printf %s "checking whether malloc, realloc, calloc set errno on failure... " >&6; }
 if test ${gl_cv_func_malloc_posix+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                                     case "$host_os" in
         mingw*)
           gl_cv_func_malloc_posix=no ;;
@@ -14747,10 +14842,11 @@ else $as_nop
         *)
           gl_cv_func_malloc_posix=yes ;;
       esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
-printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
+printf '%s\n' "$gl_cv_func_malloc_posix" >&6; }
 
 
 
@@ -14758,7 +14854,7 @@ printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
 
   if test "$gl_cv_func_malloc_posix" = yes; then
 
-printf "%s\n" "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC=1
@@ -14954,13 +15050,13 @@ printf "%s\n" "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
 
 
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 printf %s "checking whether lstat correctly handles trailing slash... " >&6; }
 if test ${gl_cv_func_lstat_dereferences_slashed_symlink+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -f conftest.sym conftest.file
+else case e in #(
+  e) rm -f conftest.sym conftest.file
      echo >conftest.file
      if test "$cross_compiling" = yes
 then :
@@ -14979,8 +15075,8 @@ then :
             gl_cv_func_lstat_dereferences_slashed_symlink="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -15001,22 +15097,25 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_lstat_dereferences_slashed_symlink=yes
-else $as_nop
-  gl_cv_func_lstat_dereferences_slashed_symlink=no
+else case e in #(
+  e) gl_cv_func_lstat_dereferences_slashed_symlink=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
      rm -f conftest.sym conftest.file
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
-printf "%s\n" "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
+printf '%s\n' "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
   case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
     *yes)
 
-printf "%s\n" "#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
+printf '%s\n' "#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
       ;;
   esac
@@ -15025,13 +15124,13 @@ printf "%s\n" "#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-   if test x"$cross_compiling" = xyes ; then
+else case e in #(
+  e)  if test x"$cross_compiling" = xyes ; then
         # When cross-compiling, there is no way to tell whether // is special
         # short of a list of hosts.  However, the only known hosts to date
         # that have a distinct // are Apollo DomainOS (too old to port to),
@@ -15053,13 +15152,14 @@ else $as_nop
         else
           gl_cv_double_slash_root=yes
         fi
-      fi
+      fi ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
 
-printf "%s\n" "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
@@ -15067,13 +15167,13 @@ printf "%s\n" "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
 printf %s "checking whether realpath works... " >&6; }
 if test ${gl_cv_func_realpath_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     rm -rf conftest.a conftest.d
     touch conftest.a
     # Assume that if we have lstat, we can also check symlinks.
@@ -15096,8 +15196,8 @@ then :
         *)             gl_cv_func_realpath_works="$gl_cross_guess_normal" ;;
       esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -15284,31 +15384,34 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_realpath_works=yes
-else $as_nop
-  case $? in
+else case e in #(
+  e) case $? in
         32) gl_cv_func_realpath_works=nearly ;;
         *)  gl_cv_func_realpath_works=no ;;
       esac
-
+      ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
     rm -rf conftest.a conftest.l conftest.d
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
-printf "%s\n" "$gl_cv_func_realpath_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
+printf '%s\n' "$gl_cv_func_realpath_works" >&6; }
   case "$gl_cv_func_realpath_works" in
     *yes)
 
-printf "%s\n" "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
+printf '%s\n' "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
 
       ;;
     *nearly)
 
-printf "%s\n" "#define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
+printf '%s\n' "#define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
 
       ;;
   esac
@@ -15325,7 +15428,7 @@ printf "%s\n" "#define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -15335,13 +15438,13 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 printf %s "checking for C/C++ restrict keyword... " >&6; }
 if test ${ac_cv_c_restrict+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_c_restrict=no
+else case e in #(
+  e) ac_cv_c_restrict=no
    # Put '__restrict__' first, to avoid problems with glibc and non-GCC; see:
    # https://lists.gnu.org/archive/html/bug-autoconf/2016-02/msg00006.html
    # Put 'restrict' last, because C++ lacks it.
@@ -15372,16 +15475,17 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      test "$ac_cv_c_restrict" != no && break
    done
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
-printf "%s\n" "$ac_cv_c_restrict" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+printf '%s\n' "$ac_cv_c_restrict" >&6; }
 
  case $ac_cv_c_restrict in
    restrict) ;;
-   no) printf "%s\n" "#define restrict /**/" >>confdefs.h
+   no) printf '%s\n' "#define restrict /**/" >>confdefs.h
  ;;
-   *)  printf "%s\n" "#define restrict $ac_cv_c_restrict" >>confdefs.h
+   *)  printf '%s\n' "#define restrict $ac_cv_c_restrict" >>confdefs.h
  ;;
  esac
 
@@ -15392,7 +15496,7 @@ printf "%s\n" "$ac_cv_c_restrict" >&6; }
   if test $ac_cv_func__set_invalid_parameter_handler = yes; then
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
 
-printf "%s\n" "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
 
   else
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
@@ -15469,13 +15573,13 @@ gl_mda_defines='
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
 printf %s "checking if environ is properly declared... " >&6; }
 if test ${gt_cv_var_environ_declaration+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if HAVE_UNISTD_H
      #include <unistd.h>
@@ -15496,16 +15600,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gt_cv_var_environ_declaration=no
-else $as_nop
-  gt_cv_var_environ_declaration=yes
+else case e in #(
+  e) gt_cv_var_environ_declaration=yes ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
-printf "%s\n" "$gt_cv_var_environ_declaration" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
+printf '%s\n' "$gt_cv_var_environ_declaration" >&6; }
   if test $gt_cv_var_environ_declaration = yes; then
 
-printf "%s\n" "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
   fi
 
@@ -15516,13 +15622,13 @@ printf "%s\n" "#define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
 printf %s "checking whether the preprocessor supports include_next... " >&6; }
 if test ${gl_cv_have_include_next+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -rf conftestd1a conftestd1b conftestd2
+else case e in #(
+  e) rm -rf conftestd1a conftestd1b conftestd2
      mkdir conftestd1a conftestd1b conftestd2
                                                   cat <<EOF > conftestd1a/conftest.h
 #define DEFINED_IN_CONFTESTD1
@@ -15558,8 +15664,8 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_have_include_next=yes
-else $as_nop
-  CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+else case e in #(
+  e) CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <conftest.h>
@@ -15567,19 +15673,22 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_have_include_next=buggy
-else $as_nop
-  gl_cv_have_include_next=no
+else case e in #(
+  e) gl_cv_have_include_next=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+        ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      CPPFLAGS="$gl_save_CPPFLAGS"
      rm -rf conftestd1a conftestd1b conftestd2
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
-printf "%s\n" "$gl_cv_have_include_next" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
+printf '%s\n' "$gl_cv_have_include_next" >&6; }
   PRAGMA_SYSTEM_HEADER=
   if test $gl_cv_have_include_next = yes; then
     INCLUDE_NEXT=include_next
@@ -15600,13 +15709,13 @@ printf "%s\n" "$gl_cv_have_include_next" >&6; }
 
 
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
 printf %s "checking whether source code line length is unlimited... " >&6; }
 if test ${gl_cv_source_line_length_unlimited+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef __TANDEM
@@ -15615,18 +15724,20 @@ choke me
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "choke me" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "choke me" >/dev/null 2>&1
 then :
   gl_cv_source_line_length_unlimited=no
-else $as_nop
-  gl_cv_source_line_length_unlimited=yes
+else case e in #(
+  e) gl_cv_source_line_length_unlimited=yes ;;
+esac
 fi
 rm -rf conftest*
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
-printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
+printf '%s\n' "$gl_cv_source_line_length_unlimited" >&6; }
   if test $gl_cv_source_line_length_unlimited = no; then
     PRAGMA_COLUMNS="#pragma COLUMNS 10000"
   else
@@ -15636,13 +15747,13 @@ printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
 printf %s "checking for complete errno.h... " >&6; }
 if test ${gl_cv_header_errno_h_complete+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15701,18 +15812,20 @@ booboo
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "booboo" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "booboo" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_complete=no
-else $as_nop
-  gl_cv_header_errno_h_complete=yes
+else case e in #(
+  e) gl_cv_header_errno_h_complete=yes ;;
+esac
 fi
 rm -rf conftest*
 
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
-printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
+printf '%s\n' "$gl_cv_header_errno_h_complete" >&6; }
   if test $gl_cv_header_errno_h_complete = yes; then
     ERRNO_H=''
   else
@@ -15727,13 +15840,13 @@ printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_errno_h='<'errno.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
 printf %s "checking absolute name of <errno.h>... " >&6; }
 if test ${gl_cv_next_errno_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15769,10 +15882,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_errno_h
            gl_cv_next_errno_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
-printf "%s\n" "$gl_cv_next_errno_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
+printf '%s\n' "$gl_cv_next_errno_h" >&6; }
      fi
      NEXT_ERRNO_H=$gl_cv_next_errno_h
 
@@ -15801,13 +15915,13 @@ fi
 
 
   if test -n "$ERRNO_H"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
 printf %s "checking for EMULTIHOP value... " >&6; }
 if test ${gl_cv_header_errno_h_EMULTIHOP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15818,11 +15932,12 @@ yes
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_EMULTIHOP=yes
-else $as_nop
-  gl_cv_header_errno_h_EMULTIHOP=no
+else case e in #(
+  e) gl_cv_header_errno_h_EMULTIHOP=no ;;
+esac
 fi
 rm -rf conftest*
 
@@ -15838,7 +15953,7 @@ yes
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_EMULTIHOP=hidden
 fi
@@ -15858,10 +15973,11 @@ fi
 
         fi
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
     case $gl_cv_header_errno_h_EMULTIHOP in
       yes | no)
         EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE=
@@ -15876,13 +15992,13 @@ printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
 
 
   if test -n "$ERRNO_H"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
 printf %s "checking for ENOLINK value... " >&6; }
 if test ${gl_cv_header_errno_h_ENOLINK+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15893,11 +16009,12 @@ yes
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_ENOLINK=yes
-else $as_nop
-  gl_cv_header_errno_h_ENOLINK=no
+else case e in #(
+  e) gl_cv_header_errno_h_ENOLINK=no ;;
+esac
 fi
 rm -rf conftest*
 
@@ -15913,7 +16030,7 @@ yes
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_ENOLINK=hidden
 fi
@@ -15933,10 +16050,11 @@ fi
 
         fi
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
-printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
+printf '%s\n' "$gl_cv_header_errno_h_ENOLINK" >&6; }
     case $gl_cv_header_errno_h_ENOLINK in
       yes | no)
         ENOLINK_HIDDEN=0; ENOLINK_VALUE=
@@ -15951,13 +16069,13 @@ printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
 
 
   if test -n "$ERRNO_H"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
 printf %s "checking for EOVERFLOW value... " >&6; }
 if test ${gl_cv_header_errno_h_EOVERFLOW+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15968,11 +16086,12 @@ yes
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_EOVERFLOW=yes
-else $as_nop
-  gl_cv_header_errno_h_EOVERFLOW=no
+else case e in #(
+  e) gl_cv_header_errno_h_EOVERFLOW=no ;;
+esac
 fi
 rm -rf conftest*
 
@@ -15988,7 +16107,7 @@ yes
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_EOVERFLOW=hidden
 fi
@@ -16008,10 +16127,11 @@ fi
 
         fi
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
     case $gl_cv_header_errno_h_EOVERFLOW in
       yes | no)
         EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE=
@@ -16025,13 +16145,13 @@ printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
   fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
-printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to detect undeclared functions" >&5
+printf %s "checking for $CC options to detect undeclared functions... " >&6; }
 if test ${ac_cv_c_undeclared_builtin_options+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_save_CFLAGS=$CFLAGS
+else case e in #(
+  e) ac_save_CFLAGS=$CFLAGS
    ac_cv_c_undeclared_builtin_options='cannot detect'
    for ac_arg in '' -fno-builtin; do
      CFLAGS="$ac_save_CFLAGS $ac_arg"
@@ -16050,8 +16170,8 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  # This test program should compile successfully.
+else case e in #(
+  e) # This test program should compile successfully.
         # No library function is consistently available on
         # freestanding implementations, so test against a dummy
         # declaration.  Include always-available headers on the
@@ -16079,40 +16199,87 @@ then :
   if test x"$ac_arg" = x
 then :
   ac_cv_c_undeclared_builtin_options='none needed'
-else $as_nop
-  ac_cv_c_undeclared_builtin_options=$ac_arg
+else case e in #(
+  e) ac_cv_c_undeclared_builtin_options=$ac_arg ;;
+esac
 fi
           break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     done
     CFLAGS=$ac_save_CFLAGS
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
-printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf '%s\n' "$ac_cv_c_undeclared_builtin_options" >&6; }
   case $ac_cv_c_undeclared_builtin_options in #(
   'cannot detect') :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot make $CC report undeclared builtins
-See \`config.log' for more details" "$LINENO" 5; } ;; #(
+See 'config.log' for more details" "$LINENO" 5; } ;; #(
   'none needed') :
     ac_c_undeclared_builtin_options='' ;; #(
   *) :
     ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
 esac
 
-ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to ignore future-version functions" >&5
+printf %s "checking for $CC options to ignore future-version functions... " >&6; }
+if test ${ac_cv_c_future_darwin_options+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)       ac_compile_saved="$ac_compile"
+   ac_compile="$ac_compile -Werror=unguarded-availability-new"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if ! (defined __APPLE__ && defined __MACH__)
+	   #error "-Werror=unguarded-availability-new not needed here"
+	  #endif
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_future_darwin_options='-Werror=unguarded-availability-new'
+else case e in #(
+  e) ac_cv_c_future_darwin_options='none needed' ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_compile="$ac_compile_saved"
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_future_darwin_options" >&5
+printf '%s\n' "$ac_cv_c_future_darwin_options" >&6; }
+ case $ac_cv_c_future_darwin_options in #(
+  'none needed') :
+    ac_c_future_darwin_options='' ;; #(
+  *) :
+    ac_c_future_darwin_options=$ac_cv_c_future_darwin_options ;;
+esac
+
+ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_strerror_r" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
 
 
 if test $ac_cv_have_decl_strerror_r = yes; then
@@ -16120,17 +16287,17 @@ if test $ac_cv_have_decl_strerror_r = yes; then
   # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well
   # as AC_CHECK_DECLS_ONCE.)
 
-printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRERROR_R 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
 printf %s "checking whether strerror_r returns char *... " >&6; }
 if test ${ac_cv_func_strerror_r_char_p+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     ac_cv_func_strerror_r_char_p=no
     if test $ac_cv_have_decl_strerror_r = yes; then
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16156,13 +16323,14 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
     fi
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+printf '%s\n' "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
 
-printf "%s\n" "#define STRERROR_R_CHAR_P 1" >>confdefs.h
+printf '%s\n' "#define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
@@ -16173,10 +16341,11 @@ ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
 if test "x$ac_cv_type_mode_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define mode_t int" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define mode_t int" >>confdefs.h
+ ;;
+esac
 fi
 
 
@@ -16188,13 +16357,14 @@ fi
 if test "x$ac_cv_type_sig_atomic_t" = xyes
 then :
 
-printf "%s\n" "#define HAVE_SIG_ATOMIC_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_SIG_ATOMIC_T 1" >>confdefs.h
 
 
-else $as_nop
-
-printf "%s\n" "#define sig_atomic_t int" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define sig_atomic_t int" >>confdefs.h
+ ;;
+esac
 fi
 
 
@@ -16243,13 +16413,13 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 printf %s "checking for working fcntl.h... " >&6; }
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                   # Guess 'no' on native Windows.
@@ -16257,8 +16427,8 @@ then :
           *)      gl_cv_header_working_fcntl_h=cross-compiling ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
            #include <sys/stat.h>
@@ -16360,29 +16530,32 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_header_working_fcntl_h=yes
-else $as_nop
-  case $? in #(
+else case e in #(
+  e) case $? in #(
         4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
         64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
         68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
          *) gl_cv_header_working_fcntl_h='no';;
-        esac
+        esac ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+printf '%s\n' "$gl_cv_header_working_fcntl_h" >&6; }
 
   case $gl_cv_header_working_fcntl_h in #(
   *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
   *) ac_val=1;;
   esac
 
-printf "%s\n" "#define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
+printf '%s\n' "#define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
 
 
   case $gl_cv_header_working_fcntl_h in #(
@@ -16390,7 +16563,7 @@ printf "%s\n" "#define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
   *) ac_val=1;;
   esac
 
-printf "%s\n" "#define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
+printf '%s\n' "#define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 
 
 
@@ -16399,8 +16572,8 @@ printf "%s\n" "#define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 if test "x$ac_cv_type_pid_t" = xyes
 then :
 
-else $as_nop
-                                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e)                                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
           #if defined _WIN64 && !defined __CYGWIN__
@@ -16419,14 +16592,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_pid_type='int'
-else $as_nop
-  ac_pid_type='__int64'
+else case e in #(
+  e) ac_pid_type='__int64' ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h
-
+printf '%s\n' "#define pid_t $ac_pid_type" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -16444,13 +16619,13 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_fcntl_h='<'fcntl.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
 printf %s "checking absolute name of <fcntl.h>... " >&6; }
 if test ${gl_cv_next_fcntl_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16486,10 +16661,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_fcntl_h
            gl_cv_next_fcntl_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
-printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
+printf '%s\n' "$gl_cv_next_fcntl_h" >&6; }
      fi
      NEXT_FCNTL_H=$gl_cv_next_fcntl_h
 
@@ -16737,10 +16913,11 @@ printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
 if test "x$ac_cv_func_eaccess" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define eaccess access" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define eaccess access" >>confdefs.h
+ ;;
+esac
 fi
 
 
@@ -17035,13 +17212,13 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
 printf %s "checking for stdint.h... " >&6; }
 if test ${gl_cv_header_stdint_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
             #include <stdint.h>
@@ -17056,27 +17233,29 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_stdint_h=yes
-else $as_nop
-  gl_cv_header_stdint_h=no
+else case e in #(
+  e) gl_cv_header_stdint_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_h" >&5
-printf "%s\n" "$gl_cv_header_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_h" >&5
+printf '%s\n' "$gl_cv_header_stdint_h" >&6; }
   if test $gl_cv_header_stdint_h = yes; then
 
-printf "%s\n" "#define HAVE_STDINT_H_WITH_UINTMAX 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STDINT_H_WITH_UINTMAX 1" >>confdefs.h
 
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
 printf %s "checking for inttypes.h... " >&6; }
 if test ${gl_cv_header_inttypes_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -17093,16 +17272,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_inttypes_h=yes
-else $as_nop
-  gl_cv_header_inttypes_h=no
+else case e in #(
+  e) gl_cv_header_inttypes_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_inttypes_h" >&5
-printf "%s\n" "$gl_cv_header_inttypes_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_inttypes_h" >&5
+printf '%s\n' "$gl_cv_header_inttypes_h" >&6; }
   if test $gl_cv_header_inttypes_h = yes; then
 
-printf "%s\n" "#define HAVE_INTTYPES_H_WITH_UINTMAX 1" >>confdefs.h
+printf '%s\n' "#define HAVE_INTTYPES_H_WITH_UINTMAX 1" >>confdefs.h
 
   fi
 
@@ -17110,13 +17291,13 @@ printf "%s\n" "#define HAVE_INTTYPES_H_WITH_UINTMAX 1" >>confdefs.h
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports size specifiers as in C99" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports size specifiers as in C99" >&5
 printf %s "checking whether printf supports size specifiers as in C99... " >&6; }
 if test ${gl_cv_func_printf_sizes_c99+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -17155,11 +17336,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_printf_sizes_c99="guessing yes"
-else $as_nop
-  gl_cv_func_printf_sizes_c99="guessing no"
+else case e in #(
+  e) gl_cv_func_printf_sizes_c99="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -17168,8 +17350,8 @@ rm -rf conftest*
            *)                    gl_cv_func_printf_sizes_c99="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stddef.h>
@@ -17212,27 +17394,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_sizes_c99=yes
-else $as_nop
-  gl_cv_func_printf_sizes_c99=no
+else case e in #(
+  e) gl_cv_func_printf_sizes_c99=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_sizes_c99" >&5
-printf "%s\n" "$gl_cv_func_printf_sizes_c99" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_sizes_c99" >&5
+printf '%s\n' "$gl_cv_func_printf_sizes_c99" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports 'long double' arguments" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports 'long double' arguments" >&5
 printf %s "checking whether printf supports 'long double' arguments... " >&6; }
 if test ${gl_cv_func_printf_long_double+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -17250,11 +17435,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_printf_long_double="guessing yes"
-else $as_nop
-  gl_cv_func_printf_long_double="guessing no"
+else case e in #(
+  e) gl_cv_func_printf_long_double="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -17262,8 +17448,8 @@ rm -rf conftest*
            *)               gl_cv_func_printf_long_double="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -17290,27 +17476,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_long_double=yes
-else $as_nop
-  gl_cv_func_printf_long_double=no
+else case e in #(
+  e) gl_cv_func_printf_long_double=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_long_double" >&5
-printf "%s\n" "$gl_cv_func_printf_long_double" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_long_double" >&5
+printf '%s\n' "$gl_cv_func_printf_long_double" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports infinite 'double' arguments" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports infinite 'double' arguments" >&5
 printf %s "checking whether printf supports infinite 'double' arguments... " >&6; }
 if test ${gl_cv_func_printf_infinite+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -17350,11 +17539,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_printf_infinite="guessing yes"
-else $as_nop
-  gl_cv_func_printf_infinite="guessing no"
+else case e in #(
+  e) gl_cv_func_printf_infinite="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -17363,8 +17553,8 @@ rm -rf conftest*
            *)                    gl_cv_func_printf_infinite="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -17437,26 +17627,29 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_infinite=yes
-else $as_nop
-  gl_cv_func_printf_infinite=no
+else case e in #(
+  e) gl_cv_func_printf_infinite=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_infinite" >&5
-printf "%s\n" "$gl_cv_func_printf_infinite" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_infinite" >&5
+printf '%s\n' "$gl_cv_func_printf_infinite" >&6; }
 
 
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 printf %s "checking whether byte ordering is bigendian... " >&6; }
 if test ${ac_cv_c_bigendian+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_c_bigendian=unknown
+else case e in #(
+  e) ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17502,8 +17695,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 int
 main (void)
 {
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\
 		     && LITTLE_ENDIAN)
 	      bogus endian macros
 	     #endif
@@ -17534,8 +17727,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_bigendian=yes
-else $as_nop
-  ac_cv_c_bigendian=no
+else case e in #(
+  e) ac_cv_c_bigendian=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
@@ -17579,8 +17773,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_bigendian=yes
-else $as_nop
-  ac_cv_c_bigendian=no
+else case e in #(
+  e) ac_cv_c_bigendian=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
@@ -17607,22 +17802,23 @@ unsigned short int ascii_mm[] =
 		int use_ebcdic (int i) {
 		  return ebcdic_mm[i] + ebcdic_ii[i];
 		}
-		extern int foo;
-
-int
-main (void)
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
+		int
+		main (int argc, char **argv)
+		{
+		  /* Intimidate the compiler so that it does not
+		     optimize the arrays away.  */
+		  char *p = argv[0];
+		  ascii_mm[1] = *p++; ebcdic_mm[1] = *p++;
+		  ascii_ii[1] = *p++; ebcdic_ii[1] = *p++;
+		  return use_ascii (argc) == use_ebcdic (*p);
+		}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
+if ac_fn_c_try_link "$LINENO"
 then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+  if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	    if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then
 	      if test "$ac_cv_c_bigendian" = unknown; then
 		ac_cv_c_bigendian=no
 	      else
@@ -17631,9 +17827,10 @@ then :
 	      fi
 	    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -17656,26 +17853,29 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_c_bigendian=no
-else $as_nop
-  ac_cv_c_bigendian=yes
+else case e in #(
+  e) ac_cv_c_bigendian=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-    fi
+    fi ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-printf "%s\n" "$ac_cv_c_bigendian" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf '%s\n' "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf '%s\n' "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
       ;; #(
    universal)
 
-printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf '%s\n' "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -17685,13 +17885,13 @@ printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether long double and double are the same" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether long double and double are the same" >&5
 printf %s "checking whether long double and double are the same... " >&6; }
 if test ${gl_cv_long_double_equals_double+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <float.h>
 int
@@ -17710,17 +17910,19 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_long_double_equals_double=yes
-else $as_nop
-  gl_cv_long_double_equals_double=no
+else case e in #(
+  e) gl_cv_long_double_equals_double=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_long_double_equals_double" >&5
-printf "%s\n" "$gl_cv_long_double_equals_double" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_long_double_equals_double" >&5
+printf '%s\n' "$gl_cv_long_double_equals_double" >&6; }
   if test $gl_cv_long_double_equals_double = yes; then
 
-printf "%s\n" "#define HAVE_SAME_LONG_DOUBLE_AS_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define HAVE_SAME_LONG_DOUBLE_AS_DOUBLE 1" >>confdefs.h
 
     HAVE_SAME_LONG_DOUBLE_AS_DOUBLE=1
   else
@@ -17735,18 +17937,18 @@ printf "%s\n" "#define HAVE_SAME_LONG_DOUBLE_AS_DOUBLE 1" >>confdefs.h
 
          if test -n "$gl_printf_safe"; then
 
-printf "%s\n" "#define CHECK_PRINTF_SAFE 1" >>confdefs.h
+printf '%s\n' "#define CHECK_PRINTF_SAFE 1" >>confdefs.h
 
   fi
   case "$gl_cv_func_printf_long_double" in
     *yes)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports infinite 'long double' arguments" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports infinite 'long double' arguments" >&5
 printf %s "checking whether printf supports infinite 'long double' arguments... " >&6; }
 if test ${gl_cv_func_printf_infinite_long_double+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
           if test "$cross_compiling" = yes
 then :
   case "$host_cpu" in
@@ -17780,11 +17982,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_printf_infinite_long_double="guessing yes"
-else $as_nop
-  gl_cv_func_printf_infinite_long_double="guessing no"
+else case e in #(
+  e) gl_cv_func_printf_infinite_long_double="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -17795,8 +17998,8 @@ rm -rf conftest*
                  ;;
              esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -18064,17 +18267,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_infinite_long_double=yes
-else $as_nop
-  gl_cv_func_printf_infinite_long_double=no
+else case e in #(
+  e) gl_cv_func_printf_infinite_long_double=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_infinite_long_double" >&5
-printf "%s\n" "$gl_cv_func_printf_infinite_long_double" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_infinite_long_double" >&5
+printf '%s\n' "$gl_cv_func_printf_infinite_long_double" >&6; }
       ;;
     *)
       gl_cv_func_printf_infinite_long_double="irrelevant"
@@ -18083,13 +18289,13 @@ printf "%s\n" "$gl_cv_func_printf_infinite_long_double" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'a' and 'A' directives" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'a' and 'A' directives" >&5
 printf %s "checking whether printf supports the 'a' and 'A' directives... " >&6; }
 if test ${gl_cv_func_printf_directive_a+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -18108,11 +18314,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "BZ2908" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "BZ2908" >/dev/null 2>&1
 then :
   gl_cv_func_printf_directive_a="guessing yes"
-else $as_nop
-  gl_cv_func_printf_directive_a="guessing no"
+else case e in #(
+  e) gl_cv_func_printf_directive_a="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -18127,8 +18334,8 @@ rm -rf conftest*
            *)                    gl_cv_func_printf_directive_a="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -18190,27 +18397,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_directive_a=yes
-else $as_nop
-  gl_cv_func_printf_directive_a=no
+else case e in #(
+  e) gl_cv_func_printf_directive_a=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_a" >&5
-printf "%s\n" "$gl_cv_func_printf_directive_a" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_a" >&5
+printf '%s\n' "$gl_cv_func_printf_directive_a" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'F' directive" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'F' directive" >&5
 printf %s "checking whether printf supports the 'F' directive... " >&6; }
 if test ${gl_cv_func_printf_directive_f+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -18244,11 +18454,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_printf_directive_f="guessing yes"
-else $as_nop
-  gl_cv_func_printf_directive_f="guessing no"
+else case e in #(
+  e) gl_cv_func_printf_directive_f="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -18257,8 +18468,8 @@ rm -rf conftest*
            *)                    gl_cv_func_printf_directive_f="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -18284,27 +18495,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_directive_f=yes
-else $as_nop
-  gl_cv_func_printf_directive_f=no
+else case e in #(
+  e) gl_cv_func_printf_directive_f=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_f" >&5
-printf "%s\n" "$gl_cv_func_printf_directive_f" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_f" >&5
+printf '%s\n' "$gl_cv_func_printf_directive_f" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'n' directive" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'n' directive" >&5
 printf %s "checking whether printf supports the 'n' directive... " >&6; }
 if test ${gl_cv_func_printf_directive_n+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -18319,8 +18533,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_printf_directive_n="guessing yes"
-else $as_nop
-  gl_cv_func_printf_directive_n="guessing no"
+else case e in #(
+  e) gl_cv_func_printf_directive_n="guessing no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
                             ;;
@@ -18331,8 +18546,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            *)               gl_cv_func_printf_directive_n="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -18374,27 +18589,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_directive_n=yes
-else $as_nop
-  gl_cv_func_printf_directive_n=no
+else case e in #(
+  e) gl_cv_func_printf_directive_n=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_n" >&5
-printf "%s\n" "$gl_cv_func_printf_directive_n" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_n" >&5
+printf '%s\n' "$gl_cv_func_printf_directive_n" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'ls' directive" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'ls' directive" >&5
 printf %s "checking whether printf supports the 'ls' directive... " >&6; }
 if test ${gl_cv_func_printf_directive_ls+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -18413,8 +18631,8 @@ then :
            *)               gl_cv_func_printf_directive_ls="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -18464,27 +18682,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_directive_ls=yes
-else $as_nop
-  gl_cv_func_printf_directive_ls=no
+else case e in #(
+  e) gl_cv_func_printf_directive_ls=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_ls" >&5
-printf "%s\n" "$gl_cv_func_printf_directive_ls" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_ls" >&5
+printf '%s\n' "$gl_cv_func_printf_directive_ls" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
 printf %s "checking whether printf supports POSIX/XSI format strings with positions... " >&6; }
 if test ${gl_cv_func_printf_positions+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -18499,8 +18720,8 @@ then :
            *)               gl_cv_func_printf_positions="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -18518,27 +18739,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_positions=yes
-else $as_nop
-  gl_cv_func_printf_positions=no
+else case e in #(
+  e) gl_cv_func_printf_positions=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5
-printf "%s\n" "$gl_cv_func_printf_positions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5
+printf '%s\n' "$gl_cv_func_printf_positions" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the grouping flag" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports the grouping flag" >&5
 printf %s "checking whether printf supports the grouping flag... " >&6; }
 if test ${gl_cv_func_printf_flag_grouping+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -18552,8 +18776,8 @@ then :
            *)               gl_cv_func_printf_flag_grouping="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -18570,27 +18794,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_flag_grouping=yes
-else $as_nop
-  gl_cv_func_printf_flag_grouping=no
+else case e in #(
+  e) gl_cv_func_printf_flag_grouping=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_flag_grouping" >&5
-printf "%s\n" "$gl_cv_func_printf_flag_grouping" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_flag_grouping" >&5
+printf '%s\n' "$gl_cv_func_printf_flag_grouping" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the left-adjust flag correctly" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports the left-adjust flag correctly" >&5
 printf %s "checking whether printf supports the left-adjust flag correctly... " >&6; }
 if test ${gl_cv_func_printf_flag_leftadjust+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -18607,8 +18834,8 @@ then :
            *)               gl_cv_func_printf_flag_leftadjust="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -18626,27 +18853,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_flag_leftadjust=yes
-else $as_nop
-  gl_cv_func_printf_flag_leftadjust=no
+else case e in #(
+  e) gl_cv_func_printf_flag_leftadjust=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_flag_leftadjust" >&5
-printf "%s\n" "$gl_cv_func_printf_flag_leftadjust" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_flag_leftadjust" >&5
+printf '%s\n' "$gl_cv_func_printf_flag_leftadjust" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the zero flag correctly" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports the zero flag correctly" >&5
 printf %s "checking whether printf supports the zero flag correctly... " >&6; }
 if test ${gl_cv_func_printf_flag_zero+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -18665,8 +18895,8 @@ then :
            *)               gl_cv_func_printf_flag_zero="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -18685,27 +18915,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_flag_zero=yes
-else $as_nop
-  gl_cv_func_printf_flag_zero=no
+else case e in #(
+  e) gl_cv_func_printf_flag_zero=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_flag_zero" >&5
-printf "%s\n" "$gl_cv_func_printf_flag_zero" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_flag_zero" >&5
+printf '%s\n' "$gl_cv_func_printf_flag_zero" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports large precisions" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports large precisions" >&5
 printf %s "checking whether printf supports large precisions... " >&6; }
 if test ${gl_cv_func_printf_precision+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -18719,8 +18952,8 @@ then :
            *)               gl_cv_func_printf_precision="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -18749,26 +18982,29 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_precision=yes
-else $as_nop
-  gl_cv_func_printf_precision=no
+else case e in #(
+  e) gl_cv_func_printf_precision=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_precision" >&5
-printf "%s\n" "$gl_cv_func_printf_precision" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_precision" >&5
+printf '%s\n' "$gl_cv_func_printf_precision" >&6; }
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
 printf %s "checking whether the compiler produces multi-arch binaries... " >&6; }
 if test ${gl_cv_c_multiarch+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_c_multiarch=no
+else case e in #(
+  e) gl_cv_c_multiarch=no
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __APPLE_CC__
@@ -18803,10 +19039,11 @@ then :
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
-printf "%s\n" "$gl_cv_c_multiarch" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
+printf '%s\n' "$gl_cv_c_multiarch" >&6; }
   if test $gl_cv_c_multiarch = yes; then
     APPLE_UNIVERSAL_BUILD=1
   else
@@ -18817,13 +19054,13 @@ printf "%s\n" "$gl_cv_c_multiarch" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf survives out-of-memory conditions" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf survives out-of-memory conditions" >&5
 printf %s "checking whether printf survives out-of-memory conditions... " >&6; }
 if test ${gl_cv_func_printf_enomem+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       gl_cv_func_printf_enomem="guessing no"
       if test "$cross_compiling" = no; then
         if test $APPLE_UNIVERSAL_BUILD = 0; then
@@ -18993,11 +19230,11 @@ _ACEOF
           if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
             (./conftest 2>&5
              result=$?
-             printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $result" >&5
+             printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $result" >&5
              if test $result != 0 && test $result != 77; then result=1; fi
              exit $result
             ) >/dev/null 2>/dev/null
@@ -19042,10 +19279,11 @@ _ACEOF
           *)               gl_cv_func_printf_enomem="$gl_cross_guess_normal";;
         esac
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_enomem" >&5
-printf "%s\n" "$gl_cv_func_printf_enomem" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_enomem" >&5
+printf '%s\n' "$gl_cv_func_printf_enomem" >&6; }
 
 
 
@@ -19054,20 +19292,20 @@ printf "%s\n" "$gl_cv_func_printf_enomem" >&6; }
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 printf %s "checking for wchar_t... " >&6; }
 if test ${gt_cv_c_wchar_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
             wchar_t foo = (wchar_t)'\0';
@@ -19082,27 +19320,29 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gt_cv_c_wchar_t=yes
-else $as_nop
-  gt_cv_c_wchar_t=no
+else case e in #(
+  e) gt_cv_c_wchar_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
-printf "%s\n" "$gt_cv_c_wchar_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+printf '%s\n' "$gt_cv_c_wchar_t" >&6; }
   if test $gt_cv_c_wchar_t = yes; then
 
-printf "%s\n" "#define HAVE_WCHAR_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_WCHAR_T 1" >>confdefs.h
 
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
 printf %s "checking for wint_t... " >&6; }
 if test ${gt_cv_c_wint_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
             wint_t foo = (wchar_t)'\0';
@@ -19117,25 +19357,27 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gt_cv_c_wint_t=yes
-else $as_nop
-  gt_cv_c_wint_t=no
+else case e in #(
+  e) gt_cv_c_wint_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
-printf "%s\n" "$gt_cv_c_wint_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+printf '%s\n' "$gt_cv_c_wint_t" >&6; }
   if test $gt_cv_c_wint_t = yes; then
 
-printf "%s\n" "#define HAVE_WINT_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_WINT_T 1" >>confdefs.h
 
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
 printf %s "checking whether wint_t is large enough... " >&6; }
 if test ${gl_cv_type_wint_t_large_enough+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
               int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
@@ -19151,13 +19393,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_wint_t_large_enough=yes
-else $as_nop
-  gl_cv_type_wint_t_large_enough=no
+else case e in #(
+  e) gl_cv_type_wint_t_large_enough=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
-printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
+printf '%s\n' "$gl_cv_type_wint_t_large_enough" >&6; }
     if test $gl_cv_type_wint_t_large_enough = no; then
       GNULIBHEADERS_OVERRIDE_WINT_T=1
     else
@@ -19181,13 +19425,13 @@ printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
 printf %s "checking for intmax_t... " >&6; }
 if test ${gt_cv_c_intmax_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stddef.h>
@@ -19210,31 +19454,33 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gt_cv_c_intmax_t=yes
-else $as_nop
-  gt_cv_c_intmax_t=no
+else case e in #(
+  e) gt_cv_c_intmax_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5
-printf "%s\n" "$gt_cv_c_intmax_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5
+printf '%s\n' "$gt_cv_c_intmax_t" >&6; }
   if test $gt_cv_c_intmax_t = yes; then
 
-printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_INTMAX_T 1" >>confdefs.h
 
   else
 
-printf "%s\n" "#define intmax_t long long" >>confdefs.h
+printf '%s\n' "#define intmax_t long long" >>confdefs.h
 
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'double'" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'double'" >&5
 printf %s "checking where to find the exponent in a 'double'... " >&6; }
 if test ${gl_cv_cc_double_expbit0+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -19247,17 +19493,17 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "mixed_endianness" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "mixed_endianness" >/dev/null 2>&1
 then :
   gl_cv_cc_double_expbit0="unknown"
-else $as_nop
-
+else case e in #(
+  e)
                                                          :
 if test ${ac_cv_c_bigendian+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_c_bigendian=unknown
+else case e in #(
+  e) ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19303,8 +19549,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 int
 main (void)
 {
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\
 		     && LITTLE_ENDIAN)
 	      bogus endian macros
 	     #endif
@@ -19335,8 +19581,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_bigendian=yes
-else $as_nop
-  ac_cv_c_bigendian=no
+else case e in #(
+  e) ac_cv_c_bigendian=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
@@ -19380,8 +19627,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_bigendian=yes
-else $as_nop
-  ac_cv_c_bigendian=no
+else case e in #(
+  e) ac_cv_c_bigendian=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
@@ -19408,22 +19656,23 @@ unsigned short int ascii_mm[] =
 		int use_ebcdic (int i) {
 		  return ebcdic_mm[i] + ebcdic_ii[i];
 		}
-		extern int foo;
-
-int
-main (void)
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
+		int
+		main (int argc, char **argv)
+		{
+		  /* Intimidate the compiler so that it does not
+		     optimize the arrays away.  */
+		  char *p = argv[0];
+		  ascii_mm[1] = *p++; ebcdic_mm[1] = *p++;
+		  ascii_ii[1] = *p++; ebcdic_ii[1] = *p++;
+		  return use_ascii (argc) == use_ebcdic (*p);
+		}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
+if ac_fn_c_try_link "$LINENO"
 then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+  if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	    if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then
 	      if test "$ac_cv_c_bigendian" = unknown; then
 		ac_cv_c_bigendian=no
 	      else
@@ -19432,9 +19681,10 @@ then :
 	      fi
 	    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -19457,14 +19707,17 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_c_bigendian=no
-else $as_nop
-  ac_cv_c_bigendian=yes
+else case e in #(
+  e) ac_cv_c_bigendian=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-    fi
+    fi ;;
+esac
 fi
 :
  case $ac_cv_c_bigendian in #(
@@ -19474,20 +19727,21 @@ fi
      gl_cv_cc_double_expbit0="word 1 bit 20" ;; #(
    universal)
 
-printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf '%s\n' "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
      gl_cv_cc_double_expbit0="unknown" ;;
  esac
 
-
+                                                       ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -19557,27 +19811,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_cc_double_expbit0=`cat conftest.out`
-else $as_nop
-  gl_cv_cc_double_expbit0="unknown"
+else case e in #(
+  e) gl_cv_cc_double_expbit0="unknown" ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       rm -f conftest.out
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_double_expbit0" >&5
-printf "%s\n" "$gl_cv_cc_double_expbit0" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_double_expbit0" >&5
+printf '%s\n' "$gl_cv_cc_double_expbit0" >&6; }
   case "$gl_cv_cc_double_expbit0" in
     word*bit*)
       word=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word //' -e 's/ bit.*//'`
       bit=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word.*bit //'`
 
-printf "%s\n" "#define DBL_EXPBIT0_WORD $word" >>confdefs.h
+printf '%s\n' "#define DBL_EXPBIT0_WORD $word" >>confdefs.h
 
 
-printf "%s\n" "#define DBL_EXPBIT0_BIT $bit" >>confdefs.h
+printf '%s\n' "#define DBL_EXPBIT0_BIT $bit" >>confdefs.h
 
       ;;
   esac
@@ -19589,13 +19846,13 @@ printf "%s\n" "#define DBL_EXPBIT0_BIT $bit" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5
 printf %s "checking whether snprintf returns a byte count as in C99... " >&6; }
 if test ${gl_cv_func_snprintf_retval_c99+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -19638,11 +19895,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_snprintf_retval_c99="guessing yes"
-else $as_nop
-  gl_cv_func_snprintf_retval_c99="guessing no"
+else case e in #(
+  e) gl_cv_func_snprintf_retval_c99="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -19651,8 +19909,8 @@ rm -rf conftest*
            *)                    gl_cv_func_snprintf_retval_c99="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -19687,28 +19945,31 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_snprintf_retval_c99=yes
-else $as_nop
-  gl_cv_func_snprintf_retval_c99=no
+else case e in #(
+  e) gl_cv_func_snprintf_retval_c99=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_retval_c99" >&5
-printf "%s\n" "$gl_cv_func_snprintf_retval_c99" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_retval_c99" >&5
+printf '%s\n' "$gl_cv_func_snprintf_retval_c99" >&6; }
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf truncates the result as in C99" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether snprintf truncates the result as in C99" >&5
 printf %s "checking whether snprintf truncates the result as in C99... " >&6; }
 if test ${gl_cv_func_snprintf_truncation_c99+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -19757,8 +20018,8 @@ then :
            *)                    gl_cv_func_snprintf_truncation_c99="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -19790,17 +20051,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_snprintf_truncation_c99=yes
-else $as_nop
-  gl_cv_func_snprintf_truncation_c99=no
+else case e in #(
+  e) gl_cv_func_snprintf_truncation_c99=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_truncation_c99" >&5
-printf "%s\n" "$gl_cv_func_snprintf_truncation_c99" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_truncation_c99" >&5
+printf '%s\n' "$gl_cv_func_snprintf_truncation_c99" >&6; }
 
 
 
@@ -19809,56 +20073,57 @@ printf "%s\n" "$gl_cv_func_snprintf_truncation_c99" >&6; }
   ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
 if test "x$ac_cv_func_snprintf" = xyes
 then :
-  printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SNPRINTF 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
 if test "x$ac_cv_func_strnlen" = xyes
 then :
-  printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_STRNLEN 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "wcslen" "ac_cv_func_wcslen"
 if test "x$ac_cv_func_wcslen" = xyes
 then :
-  printf "%s\n" "#define HAVE_WCSLEN 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_WCSLEN 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "wcsnlen" "ac_cv_func_wcsnlen"
 if test "x$ac_cv_func_wcsnlen" = xyes
 then :
-  printf "%s\n" "#define HAVE_WCSNLEN 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_WCSNLEN 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc"
 if test "x$ac_cv_func_mbrtowc" = xyes
 then :
-  printf "%s\n" "#define HAVE_MBRTOWC 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_MBRTOWC 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "wcrtomb" "ac_cv_func_wcrtomb"
 if test "x$ac_cv_func_wcrtomb" = xyes
 then :
-  printf "%s\n" "#define HAVE_WCRTOMB 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_WCRTOMB 1" >>confdefs.h
 
 fi
 
       ac_fn_check_decl "$LINENO" "_snprintf" "ac_cv_have_decl__snprintf" "#include <stdio.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl__snprintf" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL__SNPRINTF $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL__SNPRINTF $ac_have_decl" >>confdefs.h
 
 
 
   case "$gl_cv_func_snprintf_retval_c99" in
     *yes)
 
-printf "%s\n" "#define HAVE_SNPRINTF_RETVAL_C99 1" >>confdefs.h
+printf '%s\n' "#define HAVE_SNPRINTF_RETVAL_C99 1" >>confdefs.h
 
       ;;
   esac
@@ -19866,7 +20131,7 @@ printf "%s\n" "#define HAVE_SNPRINTF_RETVAL_C99 1" >>confdefs.h
   case "$gl_cv_func_snprintf_truncation_c99" in
     *yes)
 
-printf "%s\n" "#define HAVE_SNPRINTF_TRUNCATION_C99 1" >>confdefs.h
+printf '%s\n' "#define HAVE_SNPRINTF_TRUNCATION_C99 1" >>confdefs.h
 
       ;;
   esac
@@ -20049,13 +20314,13 @@ printf "%s\n" "#define HAVE_SNPRINTF_TRUNCATION_C99 1" >>confdefs.h
   REPLACE_TRUNCL=0;
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether frexp() can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether frexp() can be used without linking with libm" >&5
 printf %s "checking whether frexp() can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_frexp_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -20071,24 +20336,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_frexp_no_libm=yes
-else $as_nop
-  gl_cv_func_frexp_no_libm=no
+else case e in #(
+  e) gl_cv_func_frexp_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexp_no_libm" >&5
-printf "%s\n" "$gl_cv_func_frexp_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexp_no_libm" >&5
+printf '%s\n' "$gl_cv_func_frexp_no_libm" >&6; }
 
-ac_fn_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_alarm" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_ALARM $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_ALARM $ac_have_decl" >>confdefs.h
 
 
 
@@ -20499,13 +20767,13 @@ printf "%s\n" "#define HAVE_DECL_ALARM $ac_have_decl" >>confdefs.h
 
 
 
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getcwd (NULL, 0) allocates memory for result" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether getcwd (NULL, 0) allocates memory for result" >&5
 printf %s "checking whether getcwd (NULL, 0) allocates memory for result... " >&6; }
 if test ${gl_cv_func_getcwd_null+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                            # Guess yes on glibc systems.
@@ -20518,8 +20786,8 @@ then :
             *)             gl_cv_func_getcwd_null="$gl_cross_guess_normal";;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #	 include <stdlib.h>
@@ -20567,25 +20835,28 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getcwd_null=yes
-else $as_nop
-  gl_cv_func_getcwd_null=no
+else case e in #(
+  e) gl_cv_func_getcwd_null=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_null" >&5
-printf "%s\n" "$gl_cv_func_getcwd_null" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_null" >&5
+printf '%s\n' "$gl_cv_func_getcwd_null" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getcwd with POSIX signature" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for getcwd with POSIX signature" >&5
 printf %s "checking for getcwd with POSIX signature... " >&6; }
 if test ${gl_cv_func_getcwd_posix_signature+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 
@@ -20609,34 +20880,37 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_getcwd_posix_signature=yes
-else $as_nop
-  gl_cv_func_getcwd_posix_signature=no
+else case e in #(
+  e) gl_cv_func_getcwd_posix_signature=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+    ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_posix_signature" >&5
-printf "%s\n" "$gl_cv_func_getcwd_posix_signature" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_posix_signature" >&5
+printf '%s\n' "$gl_cv_func_getcwd_posix_signature" >&6; }
 
-ac_fn_check_decl "$LINENO" "getcwd" "ac_cv_have_decl_getcwd" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getcwd" "ac_cv_have_decl_getcwd" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getcwd" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_GETCWD $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_GETCWD $ac_have_decl" >>confdefs.h
 
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for d_ino member in directory struct" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for d_ino member in directory struct" >&5
 printf %s "checking for d_ino member in directory struct... " >&6; }
 if test ${gl_cv_struct_dirent_d_ino+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                             # Guess yes on glibc systems with Linux kernel.
@@ -20649,8 +20923,8 @@ then :
               *)            gl_cv_struct_dirent_d_ino="$gl_cross_guess_normal" ;;
             esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
              #include <sys/stat.h>
@@ -20681,20 +20955,23 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_struct_dirent_d_ino=yes
-else $as_nop
-  gl_cv_struct_dirent_d_ino=no
+else case e in #(
+  e) gl_cv_struct_dirent_d_ino=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_struct_dirent_d_ino" >&5
-printf "%s\n" "$gl_cv_struct_dirent_d_ino" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_struct_dirent_d_ino" >&5
+printf '%s\n' "$gl_cv_struct_dirent_d_ino" >&6; }
    case "$gl_cv_struct_dirent_d_ino" in
      *yes)
 
-printf "%s\n" "#define D_INO_IN_DIRENT 1" >>confdefs.h
+printf '%s\n' "#define D_INO_IN_DIRENT 1" >>confdefs.h
 
        ;;
    esac
@@ -20702,13 +20979,13 @@ printf "%s\n" "#define D_INO_IN_DIRENT 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for arithmetic hrtime_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for arithmetic hrtime_t" >&5
 printf %s "checking for arithmetic hrtime_t... " >&6; }
 if test ${gl_cv_arithmetic_hrtime_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
@@ -20722,16 +20999,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_arithmetic_hrtime_t=yes
-else $as_nop
-  gl_cv_arithmetic_hrtime_t=no
+else case e in #(
+  e) gl_cv_arithmetic_hrtime_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_arithmetic_hrtime_t" >&5
-printf "%s\n" "$gl_cv_arithmetic_hrtime_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_arithmetic_hrtime_t" >&5
+printf '%s\n' "$gl_cv_arithmetic_hrtime_t" >&6; }
   if test $gl_cv_arithmetic_hrtime_t = yes; then
 
-printf "%s\n" "#define HAVE_ARITHMETIC_HRTIME_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ARITHMETIC_HRTIME_T 1" >>confdefs.h
 
   fi
 
@@ -20757,13 +21036,13 @@ printf "%s\n" "#define HAVE_ARITHMETIC_HRTIME_T 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_getopt_h='<'getopt.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5
 printf %s "checking absolute name of <getopt.h>... " >&6; }
 if test ${gl_cv_next_getopt_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_getopt_h = yes; then
 
 
@@ -20805,10 +21084,11 @@ _ACEOF
                gl_cv_next_getopt_h='<'getopt.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5
-printf "%s\n" "$gl_cv_next_getopt_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5
+printf '%s\n' "$gl_cv_next_getopt_h" >&6; }
      fi
      NEXT_GETOPT_H=$gl_cv_next_getopt_h
 
@@ -20839,10 +21119,11 @@ do :
   ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
 if test "x$ac_cv_header_getopt_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_GETOPT_H 1" >>confdefs.h
 
-else $as_nop
-  gl_replace_getopt=yes
+else case e in #(
+  e) gl_replace_getopt=yes ;;
+esac
 fi
 
 done
@@ -20855,32 +21136,33 @@ do :
   ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only"
 if test "x$ac_cv_func_getopt_long_only" = xyes
 then :
-  printf "%s\n" "#define HAVE_GETOPT_LONG_ONLY 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_GETOPT_LONG_ONLY 1" >>confdefs.h
 
-else $as_nop
-  gl_replace_getopt=yes
+else case e in #(
+  e) gl_replace_getopt=yes ;;
+esac
 fi
 
 done
   fi
 
           if test -z "$gl_replace_getopt"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5
 printf %s "checking whether getopt is POSIX compatible... " >&6; }
 if test ${gl_cv_func_getopt_posix+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                                                 if test $cross_compiling = no; then
                               if test "$cross_compiling" = yes
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -20912,22 +21194,24 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_posix=maybe
-else $as_nop
-  gl_cv_func_getopt_posix=no
+else case e in #(
+  e) gl_cv_func_getopt_posix=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
           if test $gl_cv_func_getopt_posix = maybe; then
                                     if test "$cross_compiling" = yes
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -20973,23 +21257,25 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_posix=maybe
-else $as_nop
-  gl_cv_func_getopt_posix=no
+else case e in #(
+  e) gl_cv_func_getopt_posix=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
           fi
           if test $gl_cv_func_getopt_posix = maybe; then
                         if test "$cross_compiling" = yes
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -21017,11 +21303,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_posix=yes
-else $as_nop
-  gl_cv_func_getopt_posix=no
+else case e in #(
+  e) gl_cv_func_getopt_posix=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
           fi
@@ -21031,23 +21319,24 @@ fi
             *)                       gl_cv_func_getopt_posix="guessing yes";;
           esac
         fi
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5
-printf "%s\n" "$gl_cv_func_getopt_posix" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5
+printf '%s\n' "$gl_cv_func_getopt_posix" >&6; }
     case "$gl_cv_func_getopt_posix" in
       *no) gl_replace_getopt=yes ;;
     esac
   fi
 
   if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5
 printf %s "checking for working GNU getopt function... " >&6; }
 if test ${gl_cv_func_getopt_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the
+else case e in #(
+  e) # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the
        # optstring is necessary for programs like m4 that have POSIX-mandated
        # semantics for supporting options interspersed with files.
        # Also, since getopt_long is a GNU extension, we require optind=0.
@@ -21065,8 +21354,8 @@ else $as_nop
 then :
                              gl_cv_func_getopt_gnu="$gl_cross_guess_normal"
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <getopt.h>
                            #include <stddef.h>
@@ -21268,11 +21557,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_gnu=yes
-else $as_nop
-  gl_cv_func_getopt_gnu=no
+else case e in #(
+  e) gl_cv_func_getopt_gnu=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
        case $gl_had_POSIXLY_CORRECT in
@@ -21280,28 +21571,29 @@ fi
          yes) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}; POSIXLY_CORRECT=1 ;;
          *) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;} ;;
        esac
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5
-printf "%s\n" "$gl_cv_func_getopt_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5
+printf '%s\n' "$gl_cv_func_getopt_gnu" >&6; }
     if test "$gl_cv_func_getopt_gnu" != yes; then
       gl_replace_getopt=yes
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt_long function" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt_long function" >&5
 printf %s "checking for working GNU getopt_long function... " >&6; }
 if test ${gl_cv_func_getopt_long_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
               case "$host_os" in
               openbsd*) gl_cv_func_getopt_long_gnu="guessing no";;
               *)        gl_cv_func_getopt_long_gnu="guessing yes";;
             esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <getopt.h>
                 #include <stddef.h>
@@ -21337,17 +21629,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_long_gnu=yes
-else $as_nop
-  gl_cv_func_getopt_long_gnu=no
+else case e in #(
+  e) gl_cv_func_getopt_long_gnu=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_long_gnu" >&5
-printf "%s\n" "$gl_cv_func_getopt_long_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_long_gnu" >&5
+printf '%s\n' "$gl_cv_func_getopt_long_gnu" >&6; }
       case "$gl_cv_func_getopt_long_gnu" in
         *yes) ;;
         *) gl_replace_getopt=yes ;;
@@ -21394,13 +21689,13 @@ printf "%s\n" "$gl_cv_func_getopt_long_gnu" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_time_h='<'sys/time.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/time.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/time.h>" >&5
 printf %s "checking absolute name of <sys/time.h>... " >&6; }
 if test ${gl_cv_next_sys_time_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_sys_time_h = yes; then
 
 
@@ -21442,10 +21737,11 @@ _ACEOF
                gl_cv_next_sys_time_h='<'sys/time.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_time_h" >&5
-printf "%s\n" "$gl_cv_next_sys_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_time_h" >&5
+printf '%s\n' "$gl_cv_next_sys_time_h" >&6; }
      fi
      NEXT_SYS_TIME_H=$gl_cv_next_sys_time_h
 
@@ -21474,7 +21770,7 @@ printf "%s\n" "$gl_cv_next_sys_time_h" >&6; }
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -21488,13 +21784,13 @@ fi
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
 printf %s "checking for struct timeval... " >&6; }
 if test ${gl_cv_sys_struct_timeval+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if HAVE_SYS_TIME_H
              #include <sys/time.h>
@@ -21515,24 +21811,26 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timeval=yes
-else $as_nop
-  gl_cv_sys_struct_timeval=no
+else case e in #(
+  e) gl_cv_sys_struct_timeval=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval" >&5
-printf "%s\n" "$gl_cv_sys_struct_timeval" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval" >&5
+printf '%s\n' "$gl_cv_sys_struct_timeval" >&6; }
   if test $gl_cv_sys_struct_timeval != yes; then
     HAVE_STRUCT_TIMEVAL=0
   else
-                            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5
+                            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5
 printf %s "checking for wide-enough struct timeval.tv_sec member... " >&6; }
 if test ${gl_cv_sys_struct_timeval_tv_sec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if HAVE_SYS_TIME_H
                #include <sys/time.h>
@@ -21557,14 +21855,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timeval_tv_sec=yes
-else $as_nop
-  gl_cv_sys_struct_timeval_tv_sec=no
+else case e in #(
+  e) gl_cv_sys_struct_timeval_tv_sec=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval_tv_sec" >&5
-printf "%s\n" "$gl_cv_sys_struct_timeval_tv_sec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval_tv_sec" >&5
+printf '%s\n' "$gl_cv_sys_struct_timeval_tv_sec" >&6; }
     if test $gl_cv_sys_struct_timeval_tv_sec != yes; then
       REPLACE_STRUCT_TIMEVAL=1
     fi
@@ -22126,13 +22426,13 @@ fi
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22185,18 +22485,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
@@ -22209,8 +22510,8 @@ then :
              aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
              *)            am_cv_func_iconv_works="guessing yes" ;;
            esac
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -22339,16 +22640,18 @@ then :
   am_cv_func_iconv_works=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
       LIBS="$am_save_LIBS"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -22358,14 +22661,14 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
 
-printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -22375,13 +22678,13 @@ printf "%s\n" "$LIBICONV" >&6; }
 
 
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
 printf %s "checking whether iconv is compatible with its POSIX signature... " >&6; }
 if test ${gl_cv_iconv_nonconst+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -22403,14 +22706,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_iconv_nonconst=yes
-else $as_nop
-  gl_cv_iconv_nonconst=no
+else case e in #(
+  e) gl_cv_iconv_nonconst=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
-printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
+printf '%s\n' "$gl_cv_iconv_nonconst" >&6; }
   else
             gl_cv_iconv_nonconst=yes
   fi
@@ -22420,7 +22725,7 @@ printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
     iconv_arg1="const"
   fi
 
-printf "%s\n" "#define ICONV_CONST $iconv_arg1" >>confdefs.h
+printf '%s\n' "#define ICONV_CONST $iconv_arg1" >>confdefs.h
 
 
      if test $gl_cv_iconv_nonconst != yes; then
@@ -22450,13 +22755,13 @@ printf "%s\n" "#define ICONV_CONST $iconv_arg1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_iconv_h='<'iconv.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <iconv.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <iconv.h>" >&5
 printf %s "checking absolute name of <iconv.h>... " >&6; }
 if test ${gl_cv_next_iconv_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_iconv_h = yes; then
 
 
@@ -22498,10 +22803,11 @@ _ACEOF
                gl_cv_next_iconv_h='<'iconv.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_iconv_h" >&5
-printf "%s\n" "$gl_cv_next_iconv_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_iconv_h" >&5
+printf '%s\n' "$gl_cv_next_iconv_h" >&6; }
      fi
      NEXT_ICONV_H=$gl_cv_next_iconv_h
 
@@ -22538,13 +22844,13 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_limits_h='<'limits.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
 printf %s "checking absolute name of <limits.h>... " >&6; }
 if test ${gl_cv_next_limits_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_limits_h = yes; then
 
 
@@ -22586,10 +22892,11 @@ _ACEOF
                gl_cv_next_limits_h='<'limits.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
-printf "%s\n" "$gl_cv_next_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
+printf '%s\n' "$gl_cv_next_limits_h" >&6; }
      fi
      NEXT_LIMITS_H=$gl_cv_next_limits_h
 
@@ -22606,13 +22913,13 @@ printf "%s\n" "$gl_cv_next_limits_h" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
 printf %s "checking whether limits.h has WORD_BIT, BOOL_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_limits_width+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __STDC_WANT_IEC_60559_BFP_EXT__
              #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
@@ -22634,13 +22941,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_limits_width=yes
-else $as_nop
-  gl_cv_header_limits_width=no
+else case e in #(
+  e) gl_cv_header_limits_width=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
-printf "%s\n" "$gl_cv_header_limits_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
+printf '%s\n' "$gl_cv_header_limits_width" >&6; }
   if test "$gl_cv_header_limits_width" = yes; then
     LIMITS_H=
   else
@@ -22662,10 +22971,10 @@ fi
 
 
 
-printf "%s\n" "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
 
 
 
@@ -22704,13 +23013,13 @@ printf "%s\n" "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdint_h='<'stdint.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
 printf %s "checking absolute name of <stdint.h>... " >&6; }
 if test ${gl_cv_next_stdint_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_stdint_h = yes; then
 
 
@@ -22752,10 +23061,11 @@ _ACEOF
                gl_cv_next_stdint_h='<'stdint.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
-printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+printf '%s\n' "$gl_cv_next_stdint_h" >&6; }
      fi
      NEXT_STDINT_H=$gl_cv_next_stdint_h
 
@@ -22779,13 +23089,13 @@ printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
 
 
     if test $ac_cv_header_stdint_h = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
 printf %s "checking whether stdint.h conforms to C99... " >&6; }
 if test ${gl_cv_header_working_stdint_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_header_working_stdint_h=no
+else case e in #(
+  e) gl_cv_header_working_stdint_h=no
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -22967,8 +23277,8 @@ then :
                  *)      gl_cv_header_working_stdint_h="guessing yes" ;;
                esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -23046,16 +23356,18 @@ then :
   gl_cv_header_working_stdint_h=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdint_h" >&6; }
   fi
 
   HAVE_C99_STDINT_H=0
@@ -23065,13 +23377,13 @@ printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
   case "$gl_cv_header_working_stdint_h" in
     *yes)
       HAVE_C99_STDINT_H=1
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
 printf %s "checking whether stdint.h works without ISO C predefines... " >&6; }
 if test ${gl_cv_header_stdint_without_STDC_macros+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_header_stdint_without_STDC_macros=no
+else case e in #(
+  e) gl_cv_header_stdint_without_STDC_macros=no
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -23103,26 +23415,27 @@ then :
   gl_cv_header_stdint_without_STDC_macros=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
-printf "%s\n" "$gl_cv_header_stdint_without_STDC_macros" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
+printf '%s\n' "$gl_cv_header_stdint_without_STDC_macros" >&6; }
 
       if test $gl_cv_header_stdint_without_STDC_macros = no; then
 
-printf "%s\n" "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+printf '%s\n' "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
 
 
-printf "%s\n" "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
+printf '%s\n' "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
 
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
 printf %s "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_stdint_width+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_header_stdint_width=no
+else case e in #(
+  e) gl_cv_header_stdint_width=no
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -23153,10 +23466,11 @@ if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_stdint_width=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
-printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
+printf '%s\n' "$gl_cv_header_stdint_width" >&6; }
       if test "$gl_cv_header_stdint_width" = yes; then
         STDINT_H=
       fi
@@ -23165,13 +23479,13 @@ printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
                   ac_fn_c_check_header_compile "$LINENO" "sys/inttypes.h" "ac_cv_header_sys_inttypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_inttypes_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
 
 fi
 ac_fn_c_check_header_compile "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_bitypes_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_SYS_BITYPES_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SYS_BITYPES_H 1" >>confdefs.h
 
 fi
 
@@ -23187,13 +23501,13 @@ fi
 
 
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+else case e in #(
+  e) if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
   #include <stddef.h>
   #include <signal.h>
   #if HAVE_WCHAR_H
@@ -23203,22 +23517,26 @@ else $as_nop
 #include <limits.h>"
 then :
 
-else $as_nop
-  result=unknown
+else case e in #(
+  e) result=unknown ;;
+esac
 fi
 
        eval gl_cv_bitsizeof_${gltype}=\$result
-
+       ;;
+esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "#define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -23228,13 +23546,13 @@ printf "%s\n" "$ac_res" >&6; }
 
 
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+else case e in #(
+  e) if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
   #include <stddef.h>
   #include <signal.h>
   #if HAVE_WCHAR_H
@@ -23244,22 +23562,26 @@ else $as_nop
 #include <limits.h>"
 then :
 
-else $as_nop
-  result=unknown
+else case e in #(
+  e) result=unknown ;;
+esac
 fi
 
        eval gl_cv_bitsizeof_${gltype}=\$result
-
+       ;;
+esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "#define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -23268,13 +23590,13 @@ printf "%s\n" "$ac_res" >&6; }
 
 
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
 printf %s "checking whether $gltype is signed... " >&6; }
 if eval test \${gl_cv_type_${gltype}_signed+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   #include <stddef.h>
@@ -23295,20 +23617,24 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   result=yes
-else $as_nop
-  result=no
+else case e in #(
+  e) result=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        eval gl_cv_type_${gltype}_signed=\$result
-
+       ;;
+esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_signed
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_type_${gltype}_signed
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     if test "$result" = yes; then
-      printf "%s\n" "#define HAVE_SIGNED_${GLTYPE} 1" >>confdefs.h
+      cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
 
       eval HAVE_SIGNED_${GLTYPE}=1
     else
@@ -23323,13 +23649,13 @@ printf "%s\n" "$ac_res" >&6; }
 
 
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  eval gl_cv_type_${gltype}_suffix=no
+else case e in #(
+  e) eval gl_cv_type_${gltype}_suffix=no
        eval result=\$gl_cv_type_${gltype}_signed
        if test "$result" = yes; then
          glsufu=
@@ -23373,16 +23699,19 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          eval result=\$gl_cv_type_${gltype}_suffix
          test "$result" != no && break
-       done
+       done ;;
+esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "#define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
 
@@ -23391,13 +23720,13 @@ printf "%s\n" "$ac_res" >&6; }
 
 
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  eval gl_cv_type_${gltype}_suffix=no
+else case e in #(
+  e) eval gl_cv_type_${gltype}_suffix=no
        eval result=\$gl_cv_type_${gltype}_signed
        if test "$result" = yes; then
          glsufu=
@@ -23441,16 +23770,19 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          eval result=\$gl_cv_type_${gltype}_suffix
          test "$result" != no && break
-       done
+       done ;;
+esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "#define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
 
@@ -23520,13 +23852,13 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_inttypes_h='<'inttypes.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
 printf %s "checking absolute name of <inttypes.h>... " >&6; }
 if test ${gl_cv_next_inttypes_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_inttypes_h = yes; then
 
 
@@ -23568,10 +23900,11 @@ _ACEOF
                gl_cv_next_inttypes_h='<'inttypes.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
-printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
+printf '%s\n' "$gl_cv_next_inttypes_h" >&6; }
      fi
      NEXT_INTTYPES_H=$gl_cv_next_inttypes_h
 
@@ -23620,8 +23953,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   PRIPTR_PREFIX='"l"'
-else $as_nop
-  PRIPTR_PREFIX='"ll"'
+else case e in #(
+  e) PRIPTR_PREFIX='"ll"' ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   else
@@ -23656,13 +23990,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether INT32_MAX < INTMAX_MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether INT32_MAX < INTMAX_MAX" >&5
 printf %s "checking whether INT32_MAX < INTMAX_MAX... " >&6; }
 if test ${gl_cv_test_INT32_MAX_LT_INTMAX_MAX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Work also in C++ mode.  */
             #define __STDC_LIMIT_MACROS 1
@@ -23692,13 +24026,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_test_INT32_MAX_LT_INTMAX_MAX=yes
-else $as_nop
-  gl_cv_test_INT32_MAX_LT_INTMAX_MAX=no
+else case e in #(
+  e) gl_cv_test_INT32_MAX_LT_INTMAX_MAX=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&5
-printf "%s\n" "$gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&5
+printf '%s\n' "$gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&6; }
   if test $gl_cv_test_INT32_MAX_LT_INTMAX_MAX = yes; then
     INT32_MAX_LT_INTMAX_MAX=1;
   else
@@ -23708,13 +24044,13 @@ printf "%s\n" "$gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&6; }
 
   if test $APPLE_UNIVERSAL_BUILD = 0; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether INT64_MAX == LONG_MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether INT64_MAX == LONG_MAX" >&5
 printf %s "checking whether INT64_MAX == LONG_MAX... " >&6; }
 if test ${gl_cv_test_INT64_MAX_EQ_LONG_MAX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Work also in C++ mode.  */
             #define __STDC_LIMIT_MACROS 1
@@ -23744,13 +24080,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_test_INT64_MAX_EQ_LONG_MAX=yes
-else $as_nop
-  gl_cv_test_INT64_MAX_EQ_LONG_MAX=no
+else case e in #(
+  e) gl_cv_test_INT64_MAX_EQ_LONG_MAX=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&5
-printf "%s\n" "$gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&5
+printf '%s\n' "$gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&6; }
   if test $gl_cv_test_INT64_MAX_EQ_LONG_MAX = yes; then
     INT64_MAX_EQ_LONG_MAX=1;
   else
@@ -23762,13 +24100,13 @@ printf "%s\n" "$gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&6; }
     INT64_MAX_EQ_LONG_MAX=-1
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UINT32_MAX < UINTMAX_MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether UINT32_MAX < UINTMAX_MAX" >&5
 printf %s "checking whether UINT32_MAX < UINTMAX_MAX... " >&6; }
 if test ${gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Work also in C++ mode.  */
             #define __STDC_LIMIT_MACROS 1
@@ -23798,13 +24136,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=yes
-else $as_nop
-  gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=no
+else case e in #(
+  e) gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&5
-printf "%s\n" "$gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&5
+printf '%s\n' "$gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&6; }
   if test $gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX = yes; then
     UINT32_MAX_LT_UINTMAX_MAX=1;
   else
@@ -23814,13 +24154,13 @@ printf "%s\n" "$gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&6; }
 
   if test $APPLE_UNIVERSAL_BUILD = 0; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UINT64_MAX == ULONG_MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether UINT64_MAX == ULONG_MAX" >&5
 printf %s "checking whether UINT64_MAX == ULONG_MAX... " >&6; }
 if test ${gl_cv_test_UINT64_MAX_EQ_ULONG_MAX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Work also in C++ mode.  */
             #define __STDC_LIMIT_MACROS 1
@@ -23850,13 +24190,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=yes
-else $as_nop
-  gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=no
+else case e in #(
+  e) gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&5
-printf "%s\n" "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&5
+printf '%s\n' "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; }
   if test $gl_cv_test_UINT64_MAX_EQ_ULONG_MAX = yes; then
     UINT64_MAX_EQ_ULONG_MAX=1;
   else
@@ -23888,18 +24230,18 @@ printf "%s\n" "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'float'" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'float'" >&5
 printf %s "checking where to find the exponent in a 'float'... " >&6; }
 if test ${gl_cv_cc_float_expbit0+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   gl_cv_cc_float_expbit0="word 0 bit 23"
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -23970,27 +24312,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_cc_float_expbit0=`cat conftest.out`
-else $as_nop
-  gl_cv_cc_float_expbit0="unknown"
+else case e in #(
+  e) gl_cv_cc_float_expbit0="unknown" ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       rm -f conftest.out
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_float_expbit0" >&5
-printf "%s\n" "$gl_cv_cc_float_expbit0" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_float_expbit0" >&5
+printf '%s\n' "$gl_cv_cc_float_expbit0" >&6; }
   case "$gl_cv_cc_float_expbit0" in
     word*bit*)
       word=`echo "$gl_cv_cc_float_expbit0" | sed -e 's/word //' -e 's/ bit.*//'`
       bit=`echo "$gl_cv_cc_float_expbit0" | sed -e 's/word.*bit //'`
 
-printf "%s\n" "#define FLT_EXPBIT0_WORD $word" >>confdefs.h
+printf '%s\n' "#define FLT_EXPBIT0_WORD $word" >>confdefs.h
 
 
-printf "%s\n" "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h
+printf '%s\n' "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h
 
       ;;
   esac
@@ -23999,13 +24344,13 @@ printf "%s\n" "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h
 
   ISNANF_LIBM=
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used without linking with libm" >&5
 printf %s "checking whether isnan(float) can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_isnanf_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -24028,25 +24373,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanf_no_libm=yes
-else $as_nop
-  gl_cv_func_isnanf_no_libm=no
+else case e in #(
+  e) gl_cv_func_isnanf_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_no_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanf_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_no_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanf_no_libm" >&6; }
 
   if test $gl_cv_func_isnanf_no_libm = no; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used with libm" >&5
 printf %s "checking whether isnan(float) can be used with libm... " >&6; }
 if test ${gl_cv_func_isnanf_in_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24071,16 +24418,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanf_in_libm=yes
-else $as_nop
-  gl_cv_func_isnanf_in_libm=no
+else case e in #(
+  e) gl_cv_func_isnanf_in_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$save_LIBS"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_in_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanf_in_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_in_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanf_in_libm" >&6; }
 
     if test $gl_cv_func_isnanf_in_libm = yes; then
       ISNANF_LIBM=-lm
@@ -24093,13 +24442,13 @@ printf "%s\n" "$gl_cv_func_isnanf_in_libm" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) works" >&5
 printf %s "checking whether isnan(float) works... " >&6; }
 if test ${gl_cv_func_isnanf_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -24114,11 +24463,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_isnanf_works="guessing yes"
-else $as_nop
-  gl_cv_func_isnanf_works="guessing no"
+else case e in #(
+  e) gl_cv_func_isnanf_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -24126,8 +24476,8 @@ rm -rf conftest*
            *) gl_cv_func_isnanf_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -24185,17 +24535,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_isnanf_works=yes
-else $as_nop
-  gl_cv_func_isnanf_works=no
+else case e in #(
+  e) gl_cv_func_isnanf_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_works" >&5
-printf "%s\n" "$gl_cv_func_isnanf_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_works" >&5
+printf '%s\n' "$gl_cv_func_isnanf_works" >&6; }
 
     LIBS="$save_LIBS"
     case "$gl_cv_func_isnanf_works" in
@@ -24214,13 +24567,13 @@ printf "%s\n" "$gl_cv_func_isnanf_works" >&6; }
 
   ISNAND_LIBM=
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used without linking with libm" >&5
 printf %s "checking whether isnan(double) can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_isnand_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -24243,25 +24596,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnand_no_libm=yes
-else $as_nop
-  gl_cv_func_isnand_no_libm=no
+else case e in #(
+  e) gl_cv_func_isnand_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_no_libm" >&5
-printf "%s\n" "$gl_cv_func_isnand_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_no_libm" >&5
+printf '%s\n' "$gl_cv_func_isnand_no_libm" >&6; }
 
   if test $gl_cv_func_isnand_no_libm = no; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used with libm" >&5
 printf %s "checking whether isnan(double) can be used with libm... " >&6; }
 if test ${gl_cv_func_isnand_in_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24286,16 +24641,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnand_in_libm=yes
-else $as_nop
-  gl_cv_func_isnand_in_libm=no
+else case e in #(
+  e) gl_cv_func_isnand_in_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$save_LIBS"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_in_libm" >&5
-printf "%s\n" "$gl_cv_func_isnand_in_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_in_libm" >&5
+printf '%s\n' "$gl_cv_func_isnand_in_libm" >&6; }
 
     if test $gl_cv_func_isnand_in_libm = yes; then
       ISNAND_LIBM=-lm
@@ -24314,13 +24671,13 @@ printf "%s\n" "$gl_cv_func_isnand_in_libm" >&6; }
 
   ISNANL_LIBM=
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used without linking with libm" >&5
 printf %s "checking whether isnan(long double) can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_isnanl_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -24343,25 +24700,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanl_no_libm=yes
-else $as_nop
-  gl_cv_func_isnanl_no_libm=no
+else case e in #(
+  e) gl_cv_func_isnanl_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_no_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanl_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_no_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanl_no_libm" >&6; }
 
   if test $gl_cv_func_isnanl_no_libm = no; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used with libm" >&5
 printf %s "checking whether isnan(long double) can be used with libm... " >&6; }
 if test ${gl_cv_func_isnanl_in_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24386,16 +24745,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanl_in_libm=yes
-else $as_nop
-  gl_cv_func_isnanl_in_libm=no
+else case e in #(
+  e) gl_cv_func_isnanl_in_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$save_LIBS"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_in_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanl_in_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_in_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanl_in_libm" >&6; }
 
     if test $gl_cv_func_isnanl_in_libm = yes; then
       ISNANL_LIBM=-lm
@@ -24409,13 +24770,13 @@ printf "%s\n" "$gl_cv_func_isnanl_in_libm" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnanl works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnanl works" >&5
 printf %s "checking whether isnanl works... " >&6; }
 if test ${gl_cv_func_isnanl_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -24429,11 +24790,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_isnanl_works="guessing yes"
-else $as_nop
-  gl_cv_func_isnanl_works="guessing no"
+else case e in #(
+  e) gl_cv_func_isnanl_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -24441,8 +24803,8 @@ rm -rf conftest*
            *) gl_cv_func_isnanl_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -24558,17 +24920,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_isnanl_works=yes
-else $as_nop
-  gl_cv_func_isnanl_works=no
+else case e in #(
+  e) gl_cv_func_isnanl_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_works" >&5
-printf "%s\n" "$gl_cv_func_isnanl_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_works" >&5
+printf '%s\n' "$gl_cv_func_isnanl_works" >&6; }
 
     LIBS="$save_LIBS"
     case "$gl_cv_func_isnanl_works" in
@@ -24637,13 +25002,13 @@ printf "%s\n" "$gl_cv_func_isnanl_works" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_wctype_h='<'wctype.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
 printf %s "checking absolute name of <wctype.h>... " >&6; }
 if test ${gl_cv_next_wctype_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_wctype_h = yes; then
 
 
@@ -24685,10 +25050,11 @@ _ACEOF
                gl_cv_next_wctype_h='<'wctype.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
-printf "%s\n" "$gl_cv_next_wctype_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
+printf '%s\n' "$gl_cv_next_wctype_h" >&6; }
      fi
      NEXT_WCTYPE_H=$gl_cv_next_wctype_h
 
@@ -24706,13 +25072,13 @@ printf "%s\n" "$gl_cv_next_wctype_h" >&6; }
 
   if test $ac_cv_header_wctype_h = yes; then
     if test $ac_cv_func_iswcntrl = yes; then
-                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
+                  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
 printf %s "checking whether iswcntrl works... " >&6; }
 if test ${gl_cv_func_iswcntrl_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
           if test "$cross_compiling" = yes
 then :
                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24732,13 +25098,14 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_iswcntrl_works="guessing yes"
-else $as_nop
-  gl_cv_func_iswcntrl_works="guessing no"
+else case e in #(
+  e) gl_cv_func_iswcntrl_works="guessing no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                #include <wchar.h>
@@ -24749,17 +25116,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_iswcntrl_works=yes
-else $as_nop
-  gl_cv_func_iswcntrl_works=no
+else case e in #(
+  e) gl_cv_func_iswcntrl_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
-printf "%s\n" "$gl_cv_func_iswcntrl_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
+printf '%s\n' "$gl_cv_func_iswcntrl_works" >&6; }
     fi
     HAVE_WCTYPE_H=1
   else
@@ -24787,7 +25157,7 @@ printf "%s\n" "$gl_cv_func_iswcntrl_works" >&6; }
     ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower"
 if test "x$ac_cv_func_towlower" = xyes
 then :
-  printf "%s\n" "#define HAVE_TOWLOWER 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_TOWLOWER 1" >>confdefs.h
 
 fi
 
@@ -24799,14 +25169,15 @@ fi
           # include <wctype.h>
           #endif
 
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_towlower" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_TOWLOWER $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_TOWLOWER $ac_have_decl" >>confdefs.h
 
       if test $ac_cv_have_decl_towlower = yes; then
                                 REPLACE_TOWLOWER=1
@@ -24821,13 +25192,13 @@ printf "%s\n" "#define HAVE_DECL_TOWLOWER $ac_have_decl" >>confdefs.h
         :
   fi
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
 printf %s "checking for wctype_t... " >&6; }
 if test ${gl_cv_type_wctype_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
             #if HAVE_WCTYPE_H
@@ -24846,25 +25217,27 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_wctype_t=yes
-else $as_nop
-  gl_cv_type_wctype_t=no
+else case e in #(
+  e) gl_cv_type_wctype_t=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5
-printf "%s\n" "$gl_cv_type_wctype_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5
+printf '%s\n' "$gl_cv_type_wctype_t" >&6; }
   if test $gl_cv_type_wctype_t = no; then
     HAVE_WCTYPE_T=0
   fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
 printf %s "checking for wctrans_t... " >&6; }
 if test ${gl_cv_type_wctrans_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
             #include <wctype.h>
@@ -24881,14 +25254,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_wctrans_t=yes
-else $as_nop
-  gl_cv_type_wctrans_t=no
+else case e in #(
+  e) gl_cv_type_wctrans_t=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5
-printf "%s\n" "$gl_cv_type_wctrans_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5
+printf '%s\n' "$gl_cv_type_wctrans_t" >&6; }
   if test $gl_cv_type_wctrans_t = no; then
     HAVE_WCTRANS_T=0
   fi
@@ -24929,13 +25304,13 @@ printf "%s\n" "$gl_cv_type_wctrans_t" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 printf %s "checking for nl_langinfo and CODESET... " >&6; }
 if test ${am_cv_langinfo_codeset+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <langinfo.h>
 int
@@ -24949,31 +25324,33 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   am_cv_langinfo_codeset=yes
-else $as_nop
-  am_cv_langinfo_codeset=no
+else case e in #(
+  e) am_cv_langinfo_codeset=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf '%s\n' "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
 
-printf "%s\n" "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf '%s\n' "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
 printf %s "checking for a traditional french locale... " >&6; }
 if test ${gt_cv_locale_fr+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -25046,7 +25423,7 @@ _ACEOF
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
       case "$host_os" in
         # Handle native Windows specially, because there setlocale() interprets
@@ -25100,23 +25477,24 @@ _ACEOF
       esac
     fi
     rm -fr conftest*
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
-printf "%s\n" "$gt_cv_locale_fr" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
+printf '%s\n' "$gt_cv_locale_fr" >&6; }
   LOCALE_FR=$gt_cv_locale_fr
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
 printf %s "checking for a traditional japanese locale... " >&6; }
 if test ${gt_cv_locale_ja+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -25193,7 +25571,7 @@ _ACEOF
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
       case "$host_os" in
         # Handle native Windows specially, because there setlocale() interprets
@@ -25249,22 +25627,23 @@ _ACEOF
       esac
     fi
     rm -fr conftest*
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
-printf "%s\n" "$gt_cv_locale_ja" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
+printf '%s\n' "$gt_cv_locale_ja" >&6; }
   LOCALE_JA=$gt_cv_locale_ja
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
 printf %s "checking for a french Unicode locale... " >&6; }
 if test ${gt_cv_locale_fr_utf8+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -25334,7 +25713,7 @@ _ACEOF
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
       case "$host_os" in
         # Handle native Windows specially, because there setlocale() interprets
@@ -25378,23 +25757,24 @@ _ACEOF
       esac
     fi
     rm -fr conftest*
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
+printf '%s\n' "$gt_cv_locale_fr_utf8" >&6; }
   LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
 printf %s "checking for a transitional chinese locale... " >&6; }
 if test ${gt_cv_locale_zh_CN+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -25472,7 +25852,7 @@ _ACEOF
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
       case "$host_os" in
         # Handle native Windows specially, because there setlocale() interprets
@@ -25521,10 +25901,11 @@ _ACEOF
       gt_cv_locale_zh_CN=none
     fi
     rm -fr conftest*
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
-printf "%s\n" "$gt_cv_locale_zh_CN" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
+printf '%s\n' "$gt_cv_locale_zh_CN" >&6; }
   LOCALE_ZH_CN=$gt_cv_locale_zh_CN
 
 
@@ -25532,13 +25913,13 @@ printf "%s\n" "$gt_cv_locale_zh_CN" >&6; }
 
   case "$host_os" in
     mingw*)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
 printf %s "checking for 64-bit off_t... " >&6; }
 if test ${gl_cv_type_off_t_64+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
                 int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1];
@@ -25554,26 +25935,28 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_off_t_64=yes
-else $as_nop
-  gl_cv_type_off_t_64=no
+else case e in #(
+  e) gl_cv_type_off_t_64=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
-printf "%s\n" "$gl_cv_type_off_t_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
+printf '%s\n' "$gl_cv_type_off_t_64" >&6; }
       if test $gl_cv_type_off_t_64 = no; then
         WINDOWS_64_BIT_OFF_T=1
       else
         WINDOWS_64_BIT_OFF_T=0
       fi
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
 printf %s "checking for 64-bit st_size... " >&6; }
 if test ${gl_cv_member_st_size_64+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
                 struct stat buf;
@@ -25590,14 +25973,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_member_st_size_64=yes
-else $as_nop
-  gl_cv_member_st_size_64=no
+else case e in #(
+  e) gl_cv_member_st_size_64=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
-printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
+printf '%s\n' "$gl_cv_member_st_size_64" >&6; }
       if test $gl_cv_member_st_size_64 = no; then
         WINDOWS_64_BIT_ST_SIZE=1
       else
@@ -25611,13 +25996,13 @@ printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
   esac
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ldexp() can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ldexp() can be used without linking with libm" >&5
 printf %s "checking whether ldexp() can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_ldexp_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __NO_MATH_INLINES
@@ -25637,27 +26022,29 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_ldexp_no_libm=yes
-else $as_nop
-  gl_cv_func_ldexp_no_libm=no
+else case e in #(
+  e) gl_cv_func_ldexp_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexp_no_libm" >&5
-printf "%s\n" "$gl_cv_func_ldexp_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexp_no_libm" >&5
+printf '%s\n' "$gl_cv_func_ldexp_no_libm" >&6; }
 
 
 
   LDEXP_LIBM=
   if test $gl_cv_func_ldexp_no_libm = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ldexp() can be used with libm" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ldexp() can be used with libm" >&5
 printf %s "checking whether ldexp() can be used with libm... " >&6; }
 if test ${gl_cv_func_ldexp_in_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
         save_LIBS="$LIBS"
         LIBS="$LIBS -lm"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25679,16 +26066,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_ldexp_in_libm=yes
-else $as_nop
-  gl_cv_func_ldexp_in_libm=no
+else case e in #(
+  e) gl_cv_func_ldexp_in_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
         LIBS="$save_LIBS"
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexp_in_libm" >&5
-printf "%s\n" "$gl_cv_func_ldexp_in_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexp_in_libm" >&5
+printf '%s\n' "$gl_cv_func_ldexp_in_libm" >&6; }
     if test $gl_cv_func_ldexp_in_libm = yes; then
       LDEXP_LIBM=-lm
     fi
@@ -25706,13 +26095,13 @@ printf "%s\n" "$gl_cv_func_ldexp_in_libm" >&6; }
   if test "$gl_use_threads" != no; then
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
 printf %s "checking whether imported symbols can be declared weak... " >&6; }
 if test ${gl_cv_have_weak+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
        cygwin*)
                                     gl_cv_have_weak="guessing no"
          ;;
@@ -25747,17 +26136,18 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Extensible Linking Format" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1
 then :
   gl_cv_have_weak="guessing yes"
-else $as_nop
-  gl_cv_have_weak="guessing no"
+else case e in #(
+  e) gl_cv_have_weak="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -25770,11 +26160,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_have_weak=yes
-else $as_nop
-  gl_cv_have_weak=no
+else case e in #(
+  e) gl_cv_have_weak=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
          fi
@@ -25804,14 +26196,15 @@ EOF
          esac
          ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
-printf "%s\n" "$gl_cv_have_weak" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
+printf '%s\n' "$gl_cv_have_weak" >&6; }
   case "$gl_cv_have_weak" in
     *yes)
 
-printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
+printf '%s\n' "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
 
       ;;
   esac
@@ -25839,8 +26232,9 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
 if test "x$ac_cv_header_pthread_h" = xyes
 then :
   gl_have_pthread_h=yes
-else $as_nop
-  gl_have_pthread_h=no
+else case e in #(
+  e) gl_have_pthread_h=no ;;
+esac
 fi
 
     if test "$gl_have_pthread_h" = yes; then
@@ -25883,8 +26277,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
         LIBS=$save_LIBS
         test $gl_pthread_api = yes && break
       done
-      echo "$as_me:25886: gl_pthread_api=$gl_pthread_api" >&5
-      echo "$as_me:25887: LIBPTHREAD=$LIBPTHREAD" >&5
+      echo "$as_me:26280: gl_pthread_api=$gl_pthread_api" >&5
+      echo "$as_me:26281: LIBPTHREAD=$LIBPTHREAD" >&5
 
       gl_pthread_in_glibc=no
       # On Linux with glibc >= 2.34, libc contains the fully functional
@@ -25902,7 +26296,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1
 then :
   gl_pthread_in_glibc=yes
 fi
@@ -25910,28 +26304,34 @@ rm -rf conftest*
 
           ;;
       esac
-      echo "$as_me:25913: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
+      echo "$as_me:26307: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
 
       # Test for libpthread by looking for pthread_kill. (Not pthread_self,
       # since it is defined as a macro on OSF/1.)
       if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then
         # The program links fine without libpthread. But it may actually
         # need to link with libpthread in order to create multiple threads.
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 printf %s "checking for pthread_kill in -lpthread... " >&6; }
 if test ${ac_cv_lib_pthread_pthread_kill+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_kill ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill (void);
 int
 main (void)
 {
@@ -25943,15 +26343,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_pthread_pthread_kill=yes
-else $as_nop
-  ac_cv_lib_pthread_pthread_kill=no
+else case e in #(
+  e) ac_cv_lib_pthread_pthread_kill=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
-printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+printf '%s\n' "$ac_cv_lib_pthread_pthread_kill" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_kill" = xyes
 then :
   if test $gl_pthread_in_glibc = yes; then
@@ -25967,7 +26369,7 @@ then :
              case "$host_os" in
                solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
 
-printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
+printf '%s\n' "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 
              esac
            fi
@@ -25976,21 +26378,27 @@ fi
 
       elif test $gl_pthread_api != yes; then
         # Some library is needed. Try libpthread and libc_r.
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 printf %s "checking for pthread_kill in -lpthread... " >&6; }
 if test ${ac_cv_lib_pthread_pthread_kill+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_kill ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill (void);
 int
 main (void)
 {
@@ -26002,15 +26410,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_pthread_pthread_kill=yes
-else $as_nop
-  ac_cv_lib_pthread_pthread_kill=no
+else case e in #(
+  e) ac_cv_lib_pthread_pthread_kill=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
-printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+printf '%s\n' "$ac_cv_lib_pthread_pthread_kill" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_kill" = xyes
 then :
   gl_pthread_api=yes
@@ -26020,21 +26430,27 @@ fi
 
         if test $gl_pthread_api != yes; then
           # For FreeBSD 4.
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
 printf %s "checking for pthread_kill in -lc_r... " >&6; }
 if test ${ac_cv_lib_c_r_pthread_kill+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_kill ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill (void);
 int
 main (void)
 {
@@ -26046,15 +26462,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_c_r_pthread_kill=yes
-else $as_nop
-  ac_cv_lib_c_r_pthread_kill=no
+else case e in #(
+  e) ac_cv_lib_c_r_pthread_kill=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
-printf "%s\n" "$ac_cv_lib_c_r_pthread_kill" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
+printf '%s\n' "$ac_cv_lib_c_r_pthread_kill" >&6; }
 if test "x$ac_cv_lib_c_r_pthread_kill" = xyes
 then :
   gl_pthread_api=yes
@@ -26064,17 +26482,17 @@ fi
 
         fi
       fi
-      echo "$as_me:26067: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
+      echo "$as_me:26485: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
 printf %s "checking whether POSIX threads API is available... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5
-printf "%s\n" "$gl_pthread_api" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5
+printf '%s\n' "$gl_pthread_api" >&6; }
 
 
     if test $gl_pthread_api = yes; then
 
-printf "%s\n" "#define HAVE_PTHREAD_API 1" >>confdefs.h
+printf '%s\n' "#define HAVE_PTHREAD_API 1" >>confdefs.h
 
     fi
 
@@ -26093,22 +26511,28 @@ if ac_fn_c_try_link "$LINENO"
 then :
   LIB_SCHED_YIELD=
 
-else $as_nop
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
+else case e in #(
+  e)        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
 printf %s "checking for sched_yield in -lrt... " >&6; }
 if test ${ac_cv_lib_rt_sched_yield+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char sched_yield ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sched_yield (void);
 int
 main (void)
 {
@@ -26120,34 +26544,42 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_rt_sched_yield=yes
-else $as_nop
-  ac_cv_lib_rt_sched_yield=no
+else case e in #(
+  e) ac_cv_lib_rt_sched_yield=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
-printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
+printf '%s\n' "$ac_cv_lib_rt_sched_yield" >&6; }
 if test "x$ac_cv_lib_rt_sched_yield" = xyes
 then :
   LIB_SCHED_YIELD=-lrt
-else $as_nop
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
+else case e in #(
+  e)           { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
 printf %s "checking for sched_yield in -lposix4... " >&6; }
 if test ${ac_cv_lib_posix4_sched_yield+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char sched_yield ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sched_yield (void);
 int
 main (void)
 {
@@ -26159,23 +26591,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_posix4_sched_yield=yes
-else $as_nop
-  ac_cv_lib_posix4_sched_yield=no
+else case e in #(
+  e) ac_cv_lib_posix4_sched_yield=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
-printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
+printf '%s\n' "$ac_cv_lib_posix4_sched_yield" >&6; }
 if test "x$ac_cv_lib_posix4_sched_yield" = xyes
 then :
   LIB_SCHED_YIELD=-lposix4
 fi
-
+ ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -26190,22 +26626,22 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
         if test "$gl_use_threads" = isoc+posix && test "$gl_have_isoc_threads" = yes; then
           gl_threads_api='isoc+posix'
 
-printf "%s\n" "#define USE_ISOC_AND_POSIX_THREADS 1" >>confdefs.h
+printf '%s\n' "#define USE_ISOC_AND_POSIX_THREADS 1" >>confdefs.h
 
           LIBTHREAD= LTLIBTHREAD=
         else
           gl_threads_api=posix
 
-printf "%s\n" "#define USE_POSIX_THREADS 1" >>confdefs.h
+printf '%s\n' "#define USE_POSIX_THREADS 1" >>confdefs.h
 
           if test -z "$LIBMULTITHREAD" && test -z "$LTLIBMULTITHREAD"; then
 
-printf "%s\n" "#define USE_POSIX_THREADS_FROM_LIBC 1" >>confdefs.h
+printf '%s\n' "#define USE_POSIX_THREADS_FROM_LIBC 1" >>confdefs.h
 
           else
             if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
 
-printf "%s\n" "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
+printf '%s\n' "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
 
               LIBTHREAD= LTLIBTHREAD=
             else
@@ -26213,7 +26649,7 @@ printf "%s\n" "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
                 freebsd* | dragonfly* | midnightbsd*)
                   if test "x$LIBTHREAD" != "x$LIBMULTITHREAD"; then
 
-printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
+printf '%s\n' "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 
                   fi
                   ;;
@@ -26248,8 +26684,9 @@ printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 if test "x$ac_cv_header_pthread_h" = xyes
 then :
   gl_have_pthread_h=yes
-else $as_nop
-  gl_have_pthread_h=no
+else case e in #(
+  e) gl_have_pthread_h=no ;;
+esac
 fi
 
     if test "$gl_have_pthread_h" = yes; then
@@ -26292,8 +26729,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
         LIBS=$save_LIBS
         test $gl_pthread_api = yes && break
       done
-      echo "$as_me:26295: gl_pthread_api=$gl_pthread_api" >&5
-      echo "$as_me:26296: LIBPTHREAD=$LIBPTHREAD" >&5
+      echo "$as_me:26732: gl_pthread_api=$gl_pthread_api" >&5
+      echo "$as_me:26733: LIBPTHREAD=$LIBPTHREAD" >&5
 
       gl_pthread_in_glibc=no
       # On Linux with glibc >= 2.34, libc contains the fully functional
@@ -26311,7 +26748,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1
 then :
   gl_pthread_in_glibc=yes
 fi
@@ -26319,28 +26756,34 @@ rm -rf conftest*
 
           ;;
       esac
-      echo "$as_me:26322: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
+      echo "$as_me:26759: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
 
       # Test for libpthread by looking for pthread_kill. (Not pthread_self,
       # since it is defined as a macro on OSF/1.)
       if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then
         # The program links fine without libpthread. But it may actually
         # need to link with libpthread in order to create multiple threads.
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 printf %s "checking for pthread_kill in -lpthread... " >&6; }
 if test ${ac_cv_lib_pthread_pthread_kill+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_kill ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill (void);
 int
 main (void)
 {
@@ -26352,15 +26795,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_pthread_pthread_kill=yes
-else $as_nop
-  ac_cv_lib_pthread_pthread_kill=no
+else case e in #(
+  e) ac_cv_lib_pthread_pthread_kill=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
-printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+printf '%s\n' "$ac_cv_lib_pthread_pthread_kill" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_kill" = xyes
 then :
   if test $gl_pthread_in_glibc = yes; then
@@ -26376,7 +26821,7 @@ then :
              case "$host_os" in
                solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
 
-printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
+printf '%s\n' "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 
              esac
            fi
@@ -26385,21 +26830,27 @@ fi
 
       elif test $gl_pthread_api != yes; then
         # Some library is needed. Try libpthread and libc_r.
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 printf %s "checking for pthread_kill in -lpthread... " >&6; }
 if test ${ac_cv_lib_pthread_pthread_kill+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_kill ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill (void);
 int
 main (void)
 {
@@ -26411,15 +26862,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_pthread_pthread_kill=yes
-else $as_nop
-  ac_cv_lib_pthread_pthread_kill=no
+else case e in #(
+  e) ac_cv_lib_pthread_pthread_kill=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
-printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+printf '%s\n' "$ac_cv_lib_pthread_pthread_kill" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_kill" = xyes
 then :
   gl_pthread_api=yes
@@ -26429,21 +26882,27 @@ fi
 
         if test $gl_pthread_api != yes; then
           # For FreeBSD 4.
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
 printf %s "checking for pthread_kill in -lc_r... " >&6; }
 if test ${ac_cv_lib_c_r_pthread_kill+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_kill ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill (void);
 int
 main (void)
 {
@@ -26455,15 +26914,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_c_r_pthread_kill=yes
-else $as_nop
-  ac_cv_lib_c_r_pthread_kill=no
+else case e in #(
+  e) ac_cv_lib_c_r_pthread_kill=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
-printf "%s\n" "$ac_cv_lib_c_r_pthread_kill" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
+printf '%s\n' "$ac_cv_lib_c_r_pthread_kill" >&6; }
 if test "x$ac_cv_lib_c_r_pthread_kill" = xyes
 then :
   gl_pthread_api=yes
@@ -26473,17 +26934,17 @@ fi
 
         fi
       fi
-      echo "$as_me:26476: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
+      echo "$as_me:26937: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
 printf %s "checking whether POSIX threads API is available... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5
-printf "%s\n" "$gl_pthread_api" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5
+printf '%s\n' "$gl_pthread_api" >&6; }
 
 
     if test $gl_pthread_api = yes; then
 
-printf "%s\n" "#define HAVE_PTHREAD_API 1" >>confdefs.h
+printf '%s\n' "#define HAVE_PTHREAD_API 1" >>confdefs.h
 
     fi
 
@@ -26502,22 +26963,28 @@ if ac_fn_c_try_link "$LINENO"
 then :
   LIB_SCHED_YIELD=
 
-else $as_nop
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
+else case e in #(
+  e)        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
 printf %s "checking for sched_yield in -lrt... " >&6; }
 if test ${ac_cv_lib_rt_sched_yield+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char sched_yield ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sched_yield (void);
 int
 main (void)
 {
@@ -26529,34 +26996,42 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_rt_sched_yield=yes
-else $as_nop
-  ac_cv_lib_rt_sched_yield=no
+else case e in #(
+  e) ac_cv_lib_rt_sched_yield=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
-printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
+printf '%s\n' "$ac_cv_lib_rt_sched_yield" >&6; }
 if test "x$ac_cv_lib_rt_sched_yield" = xyes
 then :
   LIB_SCHED_YIELD=-lrt
-else $as_nop
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
+else case e in #(
+  e)           { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
 printf %s "checking for sched_yield in -lposix4... " >&6; }
 if test ${ac_cv_lib_posix4_sched_yield+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char sched_yield ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sched_yield (void);
 int
 main (void)
 {
@@ -26568,23 +27043,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_posix4_sched_yield=yes
-else $as_nop
-  ac_cv_lib_posix4_sched_yield=no
+else case e in #(
+  e) ac_cv_lib_posix4_sched_yield=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
-printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
+printf '%s\n' "$ac_cv_lib_posix4_sched_yield" >&6; }
 if test "x$ac_cv_lib_posix4_sched_yield" = xyes
 then :
   LIB_SCHED_YIELD=-lposix4
 fi
-
+ ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -26597,28 +27076,34 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
                                                             ac_fn_c_check_func "$LINENO" "thrd_create" "ac_cv_func_thrd_create"
 if test "x$ac_cv_func_thrd_create" = xyes
 then :
-  printf "%s\n" "#define HAVE_THRD_CREATE 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_THRD_CREATE 1" >>confdefs.h
 
 fi
 
           if test $ac_cv_func_thrd_create = yes; then
             LIBSTDTHREAD=
           else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for thrd_create in -lstdthreads" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for thrd_create in -lstdthreads" >&5
 printf %s "checking for thrd_create in -lstdthreads... " >&6; }
 if test ${ac_cv_lib_stdthreads_thrd_create+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lstdthreads  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char thrd_create ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char thrd_create (void);
 int
 main (void)
 {
@@ -26630,24 +27115,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_stdthreads_thrd_create=yes
-else $as_nop
-  ac_cv_lib_stdthreads_thrd_create=no
+else case e in #(
+  e) ac_cv_lib_stdthreads_thrd_create=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdthreads_thrd_create" >&5
-printf "%s\n" "$ac_cv_lib_stdthreads_thrd_create" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdthreads_thrd_create" >&5
+printf '%s\n' "$ac_cv_lib_stdthreads_thrd_create" >&6; }
 if test "x$ac_cv_lib_stdthreads_thrd_create" = xyes
 then :
 
               LIBSTDTHREAD='-lstdthreads -lpthread'
 
-else $as_nop
-
+else case e in #(
+  e)
                             LIBSTDTHREAD="$LIBPMULTITHREAD"
-
+             ;;
+esac
 fi
 
           fi
@@ -26658,10 +27146,10 @@ fi
     esac
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ISO C threads API is available" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ISO C threads API is available" >&5
 printf %s "checking whether ISO C threads API is available... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_threads_h" >&5
-printf "%s\n" "$ac_cv_header_threads_h" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_threads_h" >&5
+printf '%s\n' "$ac_cv_header_threads_h" >&6; }
     gl_stdthreadlib_body_done=done
   fi
 
@@ -26669,7 +27157,7 @@ printf "%s\n" "$ac_cv_header_threads_h" >&6; }
         LIBMULTITHREAD=$LIBSTDTHREAD LTLIBMULTITHREAD=$LIBSTDTHREAD
         gl_threads_api=isoc
 
-printf "%s\n" "#define USE_ISOC_THREADS 1" >>confdefs.h
+printf '%s\n' "#define USE_ISOC_THREADS 1" >>confdefs.h
 
       fi
     fi
@@ -26683,17 +27171,17 @@ printf "%s\n" "#define USE_ISOC_THREADS 1" >>confdefs.h
              }; then
             gl_threads_api=windows
 
-printf "%s\n" "#define USE_WINDOWS_THREADS 1" >>confdefs.h
+printf '%s\n' "#define USE_WINDOWS_THREADS 1" >>confdefs.h
 
           fi
           ;;
       esac
     fi
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5
 printf %s "checking for multithread API to use... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_threads_api" >&5
-printf "%s\n" "$gl_threads_api" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_threads_api" >&5
+printf '%s\n' "$gl_threads_api" >&6; }
 
 
 
@@ -26703,13 +27191,13 @@ printf "%s\n" "$gl_threads_api" >&6; }
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+else case e in #(
+  e)           ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
@@ -26734,9 +27222,10 @@ do
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
+case `"$ac_path_SED" --version 2>&1` in #(
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -26745,7 +27234,7 @@ case `"$ac_path_SED" --version 2>&1` in
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -26771,13 +27260,85 @@ IFS=$as_save_IFS
 else
   ac_cv_path_SED=$SED
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in #(
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+#(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
 
 
 
@@ -26793,13 +27354,13 @@ printf "%s\n" "$ac_cv_path_SED" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_math_h='<'math.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <math.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <math.h>" >&5
 printf %s "checking absolute name of <math.h>... " >&6; }
 if test ${gl_cv_next_math_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_math_h = yes; then
 
 
@@ -26841,10 +27402,11 @@ _ACEOF
                gl_cv_next_math_h='<'math.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_math_h" >&5
-printf "%s\n" "$gl_cv_next_math_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_math_h" >&5
+printf '%s\n' "$gl_cv_next_math_h" >&6; }
      fi
      NEXT_MATH_H=$gl_cv_next_math_h
 
@@ -26861,13 +27423,13 @@ printf "%s\n" "$gl_cv_next_math_h" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NAN macro works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NAN macro works" >&5
 printf %s "checking whether NAN macro works... " >&6; }
 if test ${gl_cv_header_math_nan_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
 int
@@ -26888,23 +27450,25 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_math_nan_works=yes
-else $as_nop
-  gl_cv_header_math_nan_works=no
+else case e in #(
+  e) gl_cv_header_math_nan_works=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_nan_works" >&5
-printf "%s\n" "$gl_cv_header_math_nan_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_nan_works" >&5
+printf '%s\n' "$gl_cv_header_math_nan_works" >&6; }
   if test $gl_cv_header_math_nan_works = no; then
     REPLACE_NAN=1
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL works" >&5
 printf %s "checking whether HUGE_VAL works... " >&6; }
 if test ${gl_cv_header_math_huge_val_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
 int
@@ -26920,13 +27484,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_math_huge_val_works=yes
-else $as_nop
-  gl_cv_header_math_huge_val_works=no
+else case e in #(
+  e) gl_cv_header_math_huge_val_works=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_huge_val_works" >&5
-printf "%s\n" "$gl_cv_header_math_huge_val_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_huge_val_works" >&5
+printf '%s\n' "$gl_cv_header_math_huge_val_works" >&6; }
   if test $gl_cv_header_math_huge_val_works = no; then
     REPLACE_HUGE_VAL=1
   fi
@@ -26937,13 +27503,13 @@ printf "%s\n" "$gl_cv_header_math_huge_val_works" >&6; }
 
 
 
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
              #include <wchar.h>
@@ -26958,20 +27524,22 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_type_mbstate_t=yes
-else $as_nop
-  ac_cv_type_mbstate_t=no
+else case e in #(
+  e) ac_cv_type_mbstate_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
 
-printf "%s\n" "#define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
 
-printf "%s\n" "#define mbstate_t int" >>confdefs.h
+printf '%s\n' "#define mbstate_t int" >>confdefs.h
 
    fi
 
@@ -27048,8 +27616,9 @@ printf "%s\n" "#define mbstate_t int" >>confdefs.h
 if test "x$ac_cv_header_pthread_h" = xyes
 then :
   gl_have_pthread_h=yes
-else $as_nop
-  gl_have_pthread_h=no
+else case e in #(
+  e) gl_have_pthread_h=no ;;
+esac
 fi
 
     if test "$gl_have_pthread_h" = yes; then
@@ -27092,8 +27661,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
         LIBS=$save_LIBS
         test $gl_pthread_api = yes && break
       done
-      echo "$as_me:27095: gl_pthread_api=$gl_pthread_api" >&5
-      echo "$as_me:27096: LIBPTHREAD=$LIBPTHREAD" >&5
+      echo "$as_me:27664: gl_pthread_api=$gl_pthread_api" >&5
+      echo "$as_me:27665: LIBPTHREAD=$LIBPTHREAD" >&5
 
       gl_pthread_in_glibc=no
       # On Linux with glibc >= 2.34, libc contains the fully functional
@@ -27111,7 +27680,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1
 then :
   gl_pthread_in_glibc=yes
 fi
@@ -27119,28 +27688,34 @@ rm -rf conftest*
 
           ;;
       esac
-      echo "$as_me:27122: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
+      echo "$as_me:27691: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
 
       # Test for libpthread by looking for pthread_kill. (Not pthread_self,
       # since it is defined as a macro on OSF/1.)
       if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then
         # The program links fine without libpthread. But it may actually
         # need to link with libpthread in order to create multiple threads.
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 printf %s "checking for pthread_kill in -lpthread... " >&6; }
 if test ${ac_cv_lib_pthread_pthread_kill+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_kill ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill (void);
 int
 main (void)
 {
@@ -27152,15 +27727,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_pthread_pthread_kill=yes
-else $as_nop
-  ac_cv_lib_pthread_pthread_kill=no
+else case e in #(
+  e) ac_cv_lib_pthread_pthread_kill=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
-printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+printf '%s\n' "$ac_cv_lib_pthread_pthread_kill" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_kill" = xyes
 then :
   if test $gl_pthread_in_glibc = yes; then
@@ -27176,7 +27753,7 @@ then :
              case "$host_os" in
                solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
 
-printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
+printf '%s\n' "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 
              esac
            fi
@@ -27185,21 +27762,27 @@ fi
 
       elif test $gl_pthread_api != yes; then
         # Some library is needed. Try libpthread and libc_r.
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 printf %s "checking for pthread_kill in -lpthread... " >&6; }
 if test ${ac_cv_lib_pthread_pthread_kill+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_kill ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill (void);
 int
 main (void)
 {
@@ -27211,15 +27794,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_pthread_pthread_kill=yes
-else $as_nop
-  ac_cv_lib_pthread_pthread_kill=no
+else case e in #(
+  e) ac_cv_lib_pthread_pthread_kill=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
-printf "%s\n" "$ac_cv_lib_pthread_pthread_kill" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+printf '%s\n' "$ac_cv_lib_pthread_pthread_kill" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_kill" = xyes
 then :
   gl_pthread_api=yes
@@ -27229,21 +27814,27 @@ fi
 
         if test $gl_pthread_api != yes; then
           # For FreeBSD 4.
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
 printf %s "checking for pthread_kill in -lc_r... " >&6; }
 if test ${ac_cv_lib_c_r_pthread_kill+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char pthread_kill ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill (void);
 int
 main (void)
 {
@@ -27255,15 +27846,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_c_r_pthread_kill=yes
-else $as_nop
-  ac_cv_lib_c_r_pthread_kill=no
+else case e in #(
+  e) ac_cv_lib_c_r_pthread_kill=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
-printf "%s\n" "$ac_cv_lib_c_r_pthread_kill" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
+printf '%s\n' "$ac_cv_lib_c_r_pthread_kill" >&6; }
 if test "x$ac_cv_lib_c_r_pthread_kill" = xyes
 then :
   gl_pthread_api=yes
@@ -27273,17 +27866,17 @@ fi
 
         fi
       fi
-      echo "$as_me:27276: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
+      echo "$as_me:27869: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
 printf %s "checking whether POSIX threads API is available... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5
-printf "%s\n" "$gl_pthread_api" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5
+printf '%s\n' "$gl_pthread_api" >&6; }
 
 
     if test $gl_pthread_api = yes; then
 
-printf "%s\n" "#define HAVE_PTHREAD_API 1" >>confdefs.h
+printf '%s\n' "#define HAVE_PTHREAD_API 1" >>confdefs.h
 
     fi
 
@@ -27302,22 +27895,28 @@ if ac_fn_c_try_link "$LINENO"
 then :
   LIB_SCHED_YIELD=
 
-else $as_nop
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
+else case e in #(
+  e)        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
 printf %s "checking for sched_yield in -lrt... " >&6; }
 if test ${ac_cv_lib_rt_sched_yield+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char sched_yield ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sched_yield (void);
 int
 main (void)
 {
@@ -27329,34 +27928,42 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_rt_sched_yield=yes
-else $as_nop
-  ac_cv_lib_rt_sched_yield=no
+else case e in #(
+  e) ac_cv_lib_rt_sched_yield=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
-printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
+printf '%s\n' "$ac_cv_lib_rt_sched_yield" >&6; }
 if test "x$ac_cv_lib_rt_sched_yield" = xyes
 then :
   LIB_SCHED_YIELD=-lrt
-else $as_nop
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
+else case e in #(
+  e)           { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
 printf %s "checking for sched_yield in -lposix4... " >&6; }
 if test ${ac_cv_lib_posix4_sched_yield+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char sched_yield ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sched_yield (void);
 int
 main (void)
 {
@@ -27368,23 +27975,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_posix4_sched_yield=yes
-else $as_nop
-  ac_cv_lib_posix4_sched_yield=no
+else case e in #(
+  e) ac_cv_lib_posix4_sched_yield=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
-printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
+printf '%s\n' "$ac_cv_lib_posix4_sched_yield" >&6; }
 if test "x$ac_cv_lib_posix4_sched_yield" = xyes
 then :
   LIB_SCHED_YIELD=-lposix4
 fi
-
+ ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -27577,15 +28188,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 if test "x$ac_cv_func_mmap" = xyes
 then :
   gl_have_mmap=yes
-else $as_nop
-  gl_have_mmap=no
+else case e in #(
+  e) gl_have_mmap=no ;;
+esac
 fi
 
 
   # Try to allow MAP_ANONYMOUS.
   gl_have_mmap_anonymous=no
   if test $gl_have_mmap = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5
 printf %s "checking for MAP_ANONYMOUS... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27597,7 +28209,7 @@ printf %s "checking for MAP_ANONYMOUS... " >&6; }
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "I cannot identify this map" >/dev/null 2>&1
 then :
   gl_have_mmap_anonymous=yes
 fi
@@ -27614,21 +28226,21 @@ rm -rf conftest*
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "I cannot identify this map" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "I cannot identify this map" >/dev/null 2>&1
 then :
 
-printf "%s\n" "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
+printf '%s\n' "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h
 
          gl_have_mmap_anonymous=yes
 fi
 rm -rf conftest*
 
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
-printf "%s\n" "$gl_have_mmap_anonymous" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5
+printf '%s\n' "$gl_have_mmap_anonymous" >&6; }
     if test $gl_have_mmap_anonymous = yes; then
 
-printf "%s\n" "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
 
     fi
   fi
@@ -27651,13 +28263,13 @@ printf "%s\n" "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
   # memchr should cast the second argument to 'unsigned char'.
   #   This bug exists in Android 4.3.
   # Assume that memchr works on platforms that lack mprotect.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
 printf %s "checking whether memchr works... " >&6; }
 if test ${gl_cv_func_memchr_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                            # Guess no on Android.
@@ -27668,8 +28280,8 @@ then :
           *)               gl_cv_func_memchr_works="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -27740,17 +28352,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_memchr_works=yes
-else $as_nop
-  gl_cv_func_memchr_works=no
+else case e in #(
+  e) gl_cv_func_memchr_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5
-printf "%s\n" "$gl_cv_func_memchr_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5
+printf '%s\n' "$gl_cv_func_memchr_works" >&6; }
   case "$gl_cv_func_memchr_works" in
     *yes) ;;
     *) REPLACE_MEMCHR=1 ;;
@@ -27760,13 +28375,13 @@ printf "%s\n" "$gl_cv_func_memchr_works" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
 printf %s "checking whether <limits.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_limits_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
             int x = MIN (42, 17);
@@ -27781,16 +28396,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_minmax_in_limits_h=yes
-else $as_nop
-  gl_cv_minmax_in_limits_h=no
+else case e in #(
+  e) gl_cv_minmax_in_limits_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_limits_h" >&6; }
   if test $gl_cv_minmax_in_limits_h = yes; then
 
-printf "%s\n" "#define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
 
   fi
 
@@ -27799,13 +28416,13 @@ printf "%s\n" "#define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
 printf %s "checking whether <sys/param.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_sys_param_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/param.h>
             int x = MIN (42, 17);
@@ -27820,16 +28437,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_minmax_in_sys_param_h=yes
-else $as_nop
-  gl_cv_minmax_in_sys_param_h=no
+else case e in #(
+  e) gl_cv_minmax_in_sys_param_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_sys_param_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_sys_param_h" >&6; }
   if test $gl_cv_minmax_in_sys_param_h = yes; then
 
-printf "%s\n" "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
 
   fi
 
@@ -27840,23 +28459,24 @@ printf "%s\n" "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
 
 
 
-ac_fn_check_decl "$LINENO" "obstack_printf" "ac_cv_have_decl_obstack_printf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "obstack_printf" "ac_cv_have_decl_obstack_printf" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_obstack_printf" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_OBSTACK_PRINTF $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_OBSTACK_PRINTF $ac_have_decl" >>confdefs.h
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
 printf %s "checking for O_CLOEXEC... " >&6; }
 if test ${gl_cv_macro_O_CLOEXEC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
                           #ifndef O_CLOEXEC
@@ -27874,23 +28494,25 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_macro_O_CLOEXEC=yes
-else $as_nop
-  gl_cv_macro_O_CLOEXEC=no
+else case e in #(
+  e) gl_cv_macro_O_CLOEXEC=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
-printf "%s\n" "$gl_cv_macro_O_CLOEXEC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
+printf '%s\n' "$gl_cv_macro_O_CLOEXEC" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
 printf %s "checking for promoted mode_t type... " >&6; }
 if test ${gl_cv_promoted_mode_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -27905,27 +28527,29 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_promoted_mode_t='int'
-else $as_nop
-  gl_cv_promoted_mode_t='mode_t'
+else case e in #(
+  e) gl_cv_promoted_mode_t='mode_t' ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
-printf "%s\n" "$gl_cv_promoted_mode_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
+printf '%s\n' "$gl_cv_promoted_mode_t" >&6; }
 
-printf "%s\n" "#define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
+printf '%s\n' "#define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
 
 
 
      REPLACE_STRERROR_0=0
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
 printf %s "checking whether strerror(0) succeeds... " >&6; }
 if test ${gl_cv_func_strerror_0_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                         # Guess yes on glibc systems.
@@ -27938,8 +28562,8 @@ then :
          *)             gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
        esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
            #include <errno.h>
@@ -27963,23 +28587,26 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_strerror_0_works=yes
-else $as_nop
-  gl_cv_func_strerror_0_works=no
+else case e in #(
+  e) gl_cv_func_strerror_0_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
-printf "%s\n" "$gl_cv_func_strerror_0_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
+printf '%s\n' "$gl_cv_func_strerror_0_works" >&6; }
   case "$gl_cv_func_strerror_0_works" in
     *yes) ;;
     *)
       REPLACE_STRERROR_0=1
 
-printf "%s\n" "#define REPLACE_STRERROR_0 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_STRERROR_0 1" >>confdefs.h
 
       ;;
   esac
@@ -27996,13 +28623,13 @@ printf "%s\n" "#define REPLACE_STRERROR_0 1" >>confdefs.h
 
   if test $ac_cv_func_strerror_r = yes; then
     if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strerror_r with POSIX signature" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for strerror_r with POSIX signature" >&5
 printf %s "checking for strerror_r with POSIX signature... " >&6; }
 if test ${gl_cv_func_strerror_r_posix_signature+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
                 int strerror_r (int, char *, size_t);
@@ -28018,22 +28645,24 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_strerror_r_posix_signature=yes
-else $as_nop
-  gl_cv_func_strerror_r_posix_signature=no
+else case e in #(
+  e) gl_cv_func_strerror_r_posix_signature=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_r_posix_signature" >&5
-printf "%s\n" "$gl_cv_func_strerror_r_posix_signature" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_r_posix_signature" >&5
+printf '%s\n' "$gl_cv_func_strerror_r_posix_signature" >&6; }
       if test $gl_cv_func_strerror_r_posix_signature = yes; then
-                                                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r works" >&5
+                                                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror_r works" >&5
 printf %s "checking whether strerror_r works... " >&6; }
 if test ${gl_cv_func_strerror_r_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
 
               case "$host_os" in
@@ -28047,8 +28676,8 @@ then :
                 *)     gl_cv_func_strerror_r_works="guessing yes";;
               esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <errno.h>
                   #include <string.h>
@@ -28087,32 +28716,35 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_strerror_r_works=yes
-else $as_nop
-  gl_cv_func_strerror_r_works=no
+else case e in #(
+  e) gl_cv_func_strerror_r_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+           ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_r_works" >&5
-printf "%s\n" "$gl_cv_func_strerror_r_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_r_works" >&5
+printf '%s\n' "$gl_cv_func_strerror_r_works" >&6; }
       else
 
                         if test $ac_cv_func___xpg_strerror_r = yes; then
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __xpg_strerror_r works" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether __xpg_strerror_r works" >&5
 printf %s "checking whether __xpg_strerror_r works... " >&6; }
 if test ${gl_cv_func_strerror_r_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
                                   gl_cv_func_strerror_r_works="$gl_cross_guess_normal"
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <errno.h>
                     #include <string.h>
@@ -28146,17 +28778,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_strerror_r_works=yes
-else $as_nop
-  gl_cv_func_strerror_r_works=no
+else case e in #(
+  e) gl_cv_func_strerror_r_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+             ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_r_works" >&5
-printf "%s\n" "$gl_cv_func_strerror_r_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_r_works" >&5
+printf '%s\n' "$gl_cv_func_strerror_r_works" >&6; }
         fi
       fi
     fi
@@ -28214,20 +28849,26 @@ printf "%s\n" "$gl_cv_func_strerror_r_works" >&6; }
   LIB_POSIX_SPAWN=
 
   gl_saved_libs=$LIBS
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing posix_spawn" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing posix_spawn" >&5
 printf %s "checking for library containing posix_spawn... " >&6; }
 if test ${ac_cv_search_posix_spawn+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_func_search_save_LIBS=$LIBS
+else case e in #(
+  e) ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char posix_spawn ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char posix_spawn (void);
 int
 main (void)
 {
@@ -28258,14 +28899,16 @@ done
 if test ${ac_cv_search_posix_spawn+y}
 then :
 
-else $as_nop
-  ac_cv_search_posix_spawn=no
+else case e in #(
+  e) ac_cv_search_posix_spawn=no ;;
+esac
 fi
 rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_posix_spawn" >&5
-printf "%s\n" "$ac_cv_search_posix_spawn" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_posix_spawn" >&5
+printf '%s\n' "$ac_cv_search_posix_spawn" >&6; }
 ac_res=$ac_cv_search_posix_spawn
 if test "$ac_res" != no
 then :
@@ -28277,7 +28920,7 @@ fi
     ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
 if test "x$ac_cv_func_posix_spawn" = xyes
 then :
-  printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_POSIX_SPAWN 1" >>confdefs.h
 
 fi
 
@@ -28292,14 +28935,15 @@ fi
 
 
                                       ac_fn_check_decl "$LINENO" "posix_spawn" "ac_cv_have_decl_posix_spawn" "#include <spawn.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_posix_spawn" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_POSIX_SPAWN $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_POSIX_SPAWN $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_func_posix_spawn = yes; then
 
@@ -28311,13 +28955,13 @@ printf "%s\n" "#define HAVE_DECL_POSIX_SPAWN $ac_have_decl" >>confdefs.h
     if test $REPLACE_POSIX_SPAWN = 0; then
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn works" >&5
 printf %s "checking whether posix_spawn works... " >&6; }
 if test ${gl_cv_func_posix_spawn_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $cross_compiling = no; then
+else case e in #(
+  e) if test $cross_compiling = no; then
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -28466,20 +29110,21 @@ then :
           else
             gl_cv_func_posix_spawn_works=no
           fi
-else $as_nop
-  gl_cv_func_posix_spawn_works=no
+else case e in #(
+  e) gl_cv_func_posix_spawn_works=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
        if test $gl_cv_func_posix_spawn_works = yes; then
          if test "$cross_compiling" = yes
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Test whether posix_spawn_file_actions_addopen supports filename arguments
@@ -28640,11 +29285,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
 
-else $as_nop
-  gl_cv_func_posix_spawn_works=no
+else case e in #(
+  e) gl_cv_func_posix_spawn_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
        fi
@@ -28654,10 +29301,11 @@ fi
          *)    gl_cv_func_posix_spawn_works="guessing yes";;
        esac
      fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_works" >&5
-printf "%s\n" "$gl_cv_func_posix_spawn_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_works" >&5
+printf '%s\n' "$gl_cv_func_posix_spawn_works" >&6; }
 
       case "$gl_cv_func_posix_spawn_works" in
         *yes) ;;
@@ -28667,13 +29315,13 @@ printf "%s\n" "$gl_cv_func_posix_spawn_works" >&6; }
     if test $REPLACE_POSIX_SPAWN = 0; then
 
 
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn rejects scripts without shebang" >&5
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn rejects scripts without shebang" >&5
 printf %s "checking whether posix_spawn rejects scripts without shebang... " >&6; }
 if test ${gl_cv_func_posix_spawn_secure_exec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  echo ':' > conftest.scr
+else case e in #(
+  e) echo ':' > conftest.scr
      chmod a+x conftest.scr
      if test "$cross_compiling" = yes
 then :
@@ -28686,8 +29334,8 @@ then :
             gl_cv_func_posix_spawn_secure_exec="guessing yes" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #include <errno.h>
@@ -28723,25 +29371,28 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_posix_spawn_secure_exec=yes
-else $as_nop
-  gl_cv_func_posix_spawn_secure_exec=no
+else case e in #(
+  e) gl_cv_func_posix_spawn_secure_exec=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
      rm -f conftest.scr
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_secure_exec" >&5
-printf "%s\n" "$gl_cv_func_posix_spawn_secure_exec" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnp rejects scripts without shebang" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_secure_exec" >&5
+printf '%s\n' "$gl_cv_func_posix_spawn_secure_exec" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnp rejects scripts without shebang" >&5
 printf %s "checking whether posix_spawnp rejects scripts without shebang... " >&6; }
 if test ${gl_cv_func_posix_spawnp_secure_exec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  echo ':' > conftest.scr
+else case e in #(
+  e) echo ':' > conftest.scr
      chmod a+x conftest.scr
      if test "$cross_compiling" = yes
 then :
@@ -28759,8 +29410,8 @@ then :
             gl_cv_func_posix_spawnp_secure_exec="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #include <errno.h>
@@ -28796,18 +29447,21 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_posix_spawnp_secure_exec=yes
-else $as_nop
-  gl_cv_func_posix_spawnp_secure_exec=no
+else case e in #(
+  e) gl_cv_func_posix_spawnp_secure_exec=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
      rm -f conftest.scr
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawnp_secure_exec" >&5
-printf "%s\n" "$gl_cv_func_posix_spawnp_secure_exec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawnp_secure_exec" >&5
+printf '%s\n' "$gl_cv_func_posix_spawnp_secure_exec" >&6; }
 
       case "$gl_cv_func_posix_spawn_secure_exec" in
         *yes) ;;
@@ -28819,13 +29473,13 @@ printf "%s\n" "$gl_cv_func_posix_spawnp_secure_exec" >&6; }
       esac
     fi
     if test $REPLACE_POSIX_SPAWN = 0; then
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedpolicy is supported" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedpolicy is supported" >&5
 printf %s "checking whether posix_spawnattr_setschedpolicy is supported... " >&6; }
 if test ${gl_cv_func_spawnattr_setschedpolicy+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <spawn.h>
@@ -28835,25 +29489,27 @@ else $as_nop
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "POSIX scheduling supported" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "POSIX scheduling supported" >/dev/null 2>&1
 then :
   gl_cv_func_spawnattr_setschedpolicy=yes
-else $as_nop
-  gl_cv_func_spawnattr_setschedpolicy=no
+else case e in #(
+  e) gl_cv_func_spawnattr_setschedpolicy=no ;;
+esac
 fi
 rm -rf conftest*
 
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedpolicy" >&5
-printf "%s\n" "$gl_cv_func_spawnattr_setschedpolicy" >&6; }
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedparam is supported" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedpolicy" >&5
+printf '%s\n' "$gl_cv_func_spawnattr_setschedpolicy" >&6; }
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether posix_spawnattr_setschedparam is supported" >&5
 printf %s "checking whether posix_spawnattr_setschedparam is supported... " >&6; }
 if test ${gl_cv_func_spawnattr_setschedparam+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <spawn.h>
@@ -28863,18 +29519,20 @@ else $as_nop
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "POSIX scheduling supported" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "POSIX scheduling supported" >/dev/null 2>&1
 then :
   gl_cv_func_spawnattr_setschedparam=yes
-else $as_nop
-  gl_cv_func_spawnattr_setschedparam=no
+else case e in #(
+  e) gl_cv_func_spawnattr_setschedparam=no ;;
+esac
 fi
 rm -rf conftest*
 
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedparam" >&5
-printf "%s\n" "$gl_cv_func_spawnattr_setschedparam" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_spawnattr_setschedparam" >&5
+printf '%s\n' "$gl_cv_func_spawnattr_setschedparam" >&6; }
     fi
   else
                 if test $ac_cv_have_decl_posix_spawn = yes; then
@@ -28883,7 +29541,7 @@ printf "%s\n" "$gl_cv_func_spawnattr_setschedparam" >&6; }
   fi
   if test $ac_cv_func_posix_spawn != yes || test $REPLACE_POSIX_SPAWN = 1; then
 
-printf "%s\n" "#define REPLACE_POSIX_SPAWN 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_POSIX_SPAWN 1" >>confdefs.h
 
   fi
 
@@ -29066,7 +29724,7 @@ printf "%s\n" "#define REPLACE_POSIX_SPAWN 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -29081,7 +29739,7 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
           ;;
         *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
 
           ;;
       esac
@@ -29095,12 +29753,12 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
 
       ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes
 then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h
 
 fi
 
@@ -29114,7 +29772,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
 
       ;;
   esac
@@ -29126,7 +29784,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
 
       ;;
   esac
@@ -29138,7 +29796,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
 
       ;;
   esac
@@ -29150,7 +29808,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
 
       ;;
   esac
@@ -29162,7 +29820,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
 
       ;;
   esac
@@ -29174,13 +29832,13 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -29192,13 +29850,13 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -29247,7 +29905,7 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
   if test $ac_cv_func_vasnprintf = yes; then
 
-printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 
   fi
 
@@ -29263,11 +29921,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 if test "x$ac_cv_type_ptrdiff_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define ptrdiff_t long" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define ptrdiff_t long" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -29290,12 +29949,89 @@ fi
 
   REPLACE_VFPRINTF=1
 
-printf "%s\n" "#define REPLACE_VFPRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VFPRINTF_POSIX 1" >>confdefs.h
 
   :
 
   fi
 
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in #(
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+#(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+         EGREP_TRADITIONAL=$EGREP
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP
+
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -29306,7 +30042,7 @@ MicrosoftCompiler
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "MicrosoftCompiler" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "MicrosoftCompiler" >/dev/null 2>&1
 then :
             rm -f conftest*
      echo 'int dummy;' > conftest.c
@@ -29314,7 +30050,7 @@ then :
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if test -f conftest.o; then
        gl_asmext='s'
@@ -29325,10 +30061,11 @@ then :
      fi
      rm -f conftest*
 
-else $as_nop
-  gl_asmext='s'
+else case e in #(
+  e) gl_asmext='s'
      gl_c_asm_opt='-S'
-
+     ;;
+esac
 fi
 rm -rf conftest*
 
@@ -29336,13 +30073,13 @@ rm -rf conftest*
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
 printf %s "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
 if test ${gl_cv_prog_as_underscore+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat > conftest.c <<EOF
+else case e in #(
+  e) cat > conftest.c <<EOF
 #ifdef __cplusplus
 extern "C" int foo (void);
 #endif
@@ -29353,7 +30090,7 @@ EOF
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if LC_ALL=C $EGREP '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
@@ -29361,17 +30098,18 @@ EOF
        gl_cv_prog_as_underscore=no
      fi
      rm -f conftest*
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
-printf "%s\n" "$gl_cv_prog_as_underscore" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
+printf '%s\n' "$gl_cv_prog_as_underscore" >&6; }
   if test $gl_cv_prog_as_underscore = yes; then
     USER_LABEL_PREFIX=_
   else
     USER_LABEL_PREFIX=
   fi
 
-printf "%s\n" "#define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
+printf '%s\n' "#define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
 
   ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
 
@@ -29401,11 +30139,12 @@ printf "%s\n" "#define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
 if test "x$ac_cv_type_sigset_t" = xyes
 then :
 
-printf "%s\n" "#define HAVE_SIGSET_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_SIGSET_T 1" >>confdefs.h
 
 gl_cv_type_sigset_t=yes
-else $as_nop
-  gl_cv_type_sigset_t=no
+else case e in #(
+  e) gl_cv_type_sigset_t=no ;;
+esac
 fi
 
   if test $gl_cv_type_sigset_t != yes; then
@@ -29443,26 +30182,27 @@ fi
   fi
 
 
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 printf %s "checking for shared library path variable... " >&6; }
 if test ${acl_cv_libpath+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     LD="$LD" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.libpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_libpath=${acl_cv_shlibpath_var:-none}
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-printf "%s\n" "$acl_cv_libpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+printf '%s\n' "$acl_cv_libpath" >&6; }
   shlibpath_var="$acl_cv_shlibpath_var"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
 printf %s "checking whether to activate relocatable installation... " >&6; }
   # Check whether --enable-relocatable was given.
 if test ${enable_relocatable+y}
@@ -29473,13 +30213,14 @@ then :
        RELOCATABLE=no
      fi
 
-else $as_nop
-  RELOCATABLE=no
+else case e in #(
+  e) RELOCATABLE=no ;;
+esac
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-printf "%s\n" "$RELOCATABLE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+printf '%s\n' "$RELOCATABLE" >&6; }
 
 
 
@@ -29489,11 +30230,13 @@ printf "%s\n" "$RELOCATABLE" >&6; }
     reloc_final_prefix="$prefix"
   fi
 
-printf "%s\n" "#define INSTALLPREFIX \"${reloc_final_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define INSTALLPREFIX "${reloc_final_prefix}"
+_ACEOF
 
   if test $RELOCATABLE = yes; then
 
-printf "%s\n" "#define ENABLE_RELOCATABLE 1" >>confdefs.h
+printf '%s\n' "#define ENABLE_RELOCATABLE 1" >>confdefs.h
 
   fi
 
@@ -29514,14 +30257,14 @@ printf "%s\n" "#define ENABLE_RELOCATABLE 1" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
 if test "x$ac_cv_header_mach_o_dyld_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
 
 fi
 
     ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
 if test "x$ac_cv_func__NSGetExecutablePath" = xyes
 then :
-  printf "%s\n" "#define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
+  printf '%s\n' "#define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
 
 fi
 
@@ -29540,7 +30283,7 @@ fi
         ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
 if test "x$ac_cv_func_copy_file_range" = xyes
 then :
-  printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
@@ -29626,13 +30369,13 @@ fi
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
 printf %s "checking whether malloc (0) returns nonnull... " >&6; }
 if test ${ac_cv_func_malloc_0_nonnull+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
           # Guess yes on platforms where we know the result.
@@ -29644,8 +30387,8 @@ then :
           *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
@@ -29664,17 +30407,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_func_malloc_0_nonnull=yes
-else $as_nop
-  ac_cv_func_malloc_0_nonnull=no
+else case e in #(
+  e) ac_cv_func_malloc_0_nonnull=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+printf '%s\n' "$ac_cv_func_malloc_0_nonnull" >&6; }
   case $ac_cv_func_malloc_0_nonnull in #(
   *yes) :
     gl_cv_func_malloc_0_nonnull=1 ;; #(
@@ -29683,17 +30429,18 @@ printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
 esac
 
 
-printf "%s\n" "#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
+printf '%s\n' "#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
 
 
-ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_setenv" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
 
 
 
@@ -29714,7 +30461,7 @@ printf "%s\n" "#define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
 "
 if test "x$ac_cv_header_sched_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_SCHED_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SCHED_H 1" >>confdefs.h
 
 fi
 
@@ -29729,13 +30476,13 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sched_h='<'sched.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sched.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sched.h>" >&5
 printf %s "checking absolute name of <sched.h>... " >&6; }
 if test ${gl_cv_next_sched_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29771,10 +30518,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_sched_h
            gl_cv_next_sched_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sched_h" >&5
-printf "%s\n" "$gl_cv_next_sched_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sched_h" >&5
+printf '%s\n' "$gl_cv_next_sched_h" >&6; }
      fi
      NEXT_SCHED_H=$gl_cv_next_sched_h
 
@@ -29808,8 +30556,9 @@ printf "%s\n" "$gl_cv_next_sched_h" >&6; }
 if test "x$ac_cv_type_struct_sched_param" = xyes
 then :
   HAVE_STRUCT_SCHED_PARAM=1
-else $as_nop
-  HAVE_STRUCT_SCHED_PARAM=0
+else case e in #(
+  e) HAVE_STRUCT_SCHED_PARAM=0 ;;
+esac
 fi
 
   else
@@ -29857,36 +30606,26 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-printf %s "checking for uid_t in sys/types.h... " >&6; }
-if test ${ac_cv_type_uid_t+y}
+ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default"
+if test "x$ac_cv_type_uid_t" = xyes
 then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1
+else case e in #(
+  e)
+printf '%s\n' "#define uid_t int" >>confdefs.h
+ ;;
+esac
+fi
+
+ac_fn_c_check_type "$LINENO" "gid_t" "ac_cv_type_gid_t" "$ac_includes_default"
+if test "x$ac_cv_type_gid_t" = xyes
 then :
-  ac_cv_type_uid_t=yes
-else $as_nop
-  ac_cv_type_uid_t=no
-fi
-rm -rf conftest*
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-printf "%s\n" "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
-
-printf "%s\n" "#define uid_t int" >>confdefs.h
-
-
-printf "%s\n" "#define gid_t int" >>confdefs.h
 
+else case e in #(
+  e)
+printf '%s\n' "#define gid_t int" >>confdefs.h
+ ;;
+esac
 fi
 
 
@@ -29905,13 +30644,13 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_signal_h='<'signal.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
 printf %s "checking absolute name of <signal.h>... " >&6; }
 if test ${gl_cv_next_signal_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29947,10 +30686,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_signal_h
            gl_cv_next_signal_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
-printf "%s\n" "$gl_cv_next_signal_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
+printf '%s\n' "$gl_cv_next_signal_h" >&6; }
      fi
      NEXT_SIGNAL_H=$gl_cv_next_signal_h
 
@@ -29976,8 +30716,9 @@ printf "%s\n" "$gl_cv_next_signal_h" >&6; }
 if test "x$ac_cv_type_volatile_sig_atomic_t" = xyes
 then :
 
-else $as_nop
-  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0
+else case e in #(
+  e) HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0 ;;
+esac
 fi
 
 
@@ -29993,8 +30734,9 @@ fi
 if test "x$ac_cv_type_sighandler_t" = xyes
 then :
 
-else $as_nop
-  HAVE_SIGHANDLER_T=0
+else case e in #(
+  e) HAVE_SIGHANDLER_T=0 ;;
+esac
 fi
 
 
@@ -30004,14 +30746,15 @@ fi
 
 
 
-ac_fn_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_snprintf" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_SNPRINTF $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_SNPRINTF $ac_have_decl" >>confdefs.h
 
 
 
@@ -30029,13 +30772,13 @@ printf "%s\n" "#define HAVE_DECL_SNPRINTF $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_spawn_h='<'spawn.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <spawn.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <spawn.h>" >&5
 printf %s "checking absolute name of <spawn.h>... " >&6; }
 if test ${gl_cv_next_spawn_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_spawn_h = yes; then
 
 
@@ -30077,10 +30820,11 @@ _ACEOF
                gl_cv_next_spawn_h='<'spawn.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_spawn_h" >&5
-printf "%s\n" "$gl_cv_next_spawn_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_spawn_h" >&5
+printf '%s\n' "$gl_cv_next_spawn_h" >&6; }
      fi
      NEXT_SPAWN_H=$gl_cv_next_spawn_h
 
@@ -30106,11 +30850,12 @@ printf "%s\n" "$gl_cv_next_spawn_h" >&6; }
 if test "x$ac_cv_type_posix_spawnattr_t" = xyes
 then :
 
-printf "%s\n" "#define HAVE_POSIX_SPAWNATTR_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_POSIX_SPAWNATTR_T 1" >>confdefs.h
 
 
-else $as_nop
-  HAVE_POSIX_SPAWNATTR_T=0
+else case e in #(
+  e) HAVE_POSIX_SPAWNATTR_T=0 ;;
+esac
 fi
 
     ac_fn_c_check_type "$LINENO" "posix_spawn_file_actions_t" "ac_cv_type_posix_spawn_file_actions_t" "
@@ -30120,11 +30865,12 @@ fi
 if test "x$ac_cv_type_posix_spawn_file_actions_t" = xyes
 then :
 
-printf "%s\n" "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_POSIX_SPAWN_FILE_ACTIONS_T 1" >>confdefs.h
 
 
-else $as_nop
-  HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0
+else case e in #(
+  e) HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0 ;;
+esac
 fi
 
   else
@@ -30172,13 +30918,13 @@ fi
   REPLACE_STAT=0;
   REPLACE_UTIMENSAT=0;
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
 printf %s "checking whether stat file-mode macros are broken... " >&6; }
 if test ${ac_cv_header_stat_broken+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -30203,16 +30949,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_header_stat_broken=no
-else $as_nop
-  ac_cv_header_stat_broken=yes
+else case e in #(
+  e) ac_cv_header_stat_broken=yes ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-printf "%s\n" "$ac_cv_header_stat_broken" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+printf '%s\n' "$ac_cv_header_stat_broken" >&6; }
 if test $ac_cv_header_stat_broken = yes; then
 
-printf "%s\n" "#define STAT_MACROS_BROKEN 1" >>confdefs.h
+printf '%s\n' "#define STAT_MACROS_BROKEN 1" >>confdefs.h
 
 fi
 
@@ -30233,13 +30981,13 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_stat_h='<'sys/stat.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
 printf %s "checking absolute name of <sys/stat.h>... " >&6; }
 if test ${gl_cv_next_sys_stat_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_sys_stat_h = yes; then
 
 
@@ -30281,10 +31029,11 @@ _ACEOF
                gl_cv_next_sys_stat_h='<'sys/stat.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
-printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
+printf '%s\n' "$gl_cv_next_sys_stat_h" >&6; }
      fi
      NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h
 
@@ -30319,10 +31068,11 @@ printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; }
 if test "x$ac_cv_type_nlink_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define nlink_t int" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define nlink_t int" >>confdefs.h
+ ;;
+esac
 fi
 
 
@@ -30339,7 +31089,7 @@ fi
       ac_fn_c_check_header_compile "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default"
 if test "x$ac_cv_header_sdkddkver_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_SDKDDKVER_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SDKDDKVER_H 1" >>confdefs.h
 
 fi
 
@@ -30428,13 +31178,13 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 printf %s "checking for stdbool.h that conforms to C99... " >&6; }
 if test ${ac_cv_header_stdbool_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
              #include <stdbool.h>
@@ -30507,18 +31257,20 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_header_stdbool_h=yes
-else $as_nop
-  ac_cv_header_stdbool_h=no
+else case e in #(
+  e) ac_cv_header_stdbool_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-printf "%s\n" "$ac_cv_header_stdbool_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+printf '%s\n' "$ac_cv_header_stdbool_h" >&6; }
    ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 if test "x$ac_cv_type__Bool" = xyes
 then :
 
-printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h
+printf '%s\n' "#define HAVE__BOOL 1" >>confdefs.h
 
 
 fi
@@ -30537,13 +31289,13 @@ fi
 
   STDDEF_H=
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
 printf %s "checking for good max_align_t... " >&6; }
 if test ${gl_cv_type_max_align_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
             unsigned int s = sizeof (max_align_t);
@@ -30570,14 +31322,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_max_align_t=yes
-else $as_nop
-  gl_cv_type_max_align_t=no
+else case e in #(
+  e) gl_cv_type_max_align_t=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
-printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
+printf '%s\n' "$gl_cv_type_max_align_t" >&6; }
   if test $gl_cv_type_max_align_t = no; then
     HAVE_MAX_ALIGN_T=0
     STDDEF_H=stddef.h
@@ -30588,13 +31342,13 @@ printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
     STDDEF_H=stddef.h
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
 printf %s "checking whether NULL can be used in arbitrary expressions... " >&6; }
 if test ${gl_cv_decl_null_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
       int test[2 * (sizeof NULL == sizeof (void *)) -1];
@@ -30610,13 +31364,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_decl_null_works=yes
-else $as_nop
-  gl_cv_decl_null_works=no
+else case e in #(
+  e) gl_cv_decl_null_works=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-printf "%s\n" "$gl_cv_decl_null_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+printf '%s\n' "$gl_cv_decl_null_works" >&6; }
   if test $gl_cv_decl_null_works = no; then
     REPLACE_NULL=1
     STDDEF_H=stddef.h
@@ -30643,13 +31399,13 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stddef_h='<'stddef.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
 printf %s "checking absolute name of <stddef.h>... " >&6; }
 if test ${gl_cv_next_stddef_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30685,10 +31441,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_stddef_h
            gl_cv_next_stddef_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+printf '%s\n' "$gl_cv_next_stddef_h" >&6; }
      fi
      NEXT_STDDEF_H=$gl_cv_next_stddef_h
 
@@ -30708,19 +31465,20 @@ printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
 
 
 
-ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcloseall" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
 
 
 
 
-  printf "%s\n" "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
+  printf '%s\n' "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
 
 
 
@@ -30733,13 +31491,13 @@ printf "%s\n" "#define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdio_h='<'stdio.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
 printf %s "checking absolute name of <stdio.h>... " >&6; }
 if test ${gl_cv_next_stdio_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30775,10 +31533,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_stdio_h
            gl_cv_next_stdio_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
-printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
+printf '%s\n' "$gl_cv_next_stdio_h" >&6; }
      fi
      NEXT_STDIO_H=$gl_cv_next_stdio_h
 
@@ -30795,13 +31554,13 @@ printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
 
 
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
 printf %s "checking which flavor of printf attribute matches inttypes macros... " >&6; }
 if test ${gl_cv_func_printf_attribute_flavor+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #define __STDC_FORMAT_MACROS 1
@@ -30826,16 +31585,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_printf_attribute_flavor=system
-else $as_nop
-  gl_cv_func_printf_attribute_flavor=gnu
+else case e in #(
+  e) gl_cv_func_printf_attribute_flavor=gnu ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
-printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
+printf '%s\n' "$gl_cv_func_printf_attribute_flavor" >&6; }
   if test "$gl_cv_func_printf_attribute_flavor" = gnu; then
 
-printf "%s\n" "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
 
   fi
 
@@ -30855,32 +31616,35 @@ printf "%s\n" "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
     HAVE_DECL_FCLOSEALL=0
   fi
 
-ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ecvt" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcvt" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_gcvt" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
 
 
 
@@ -30895,13 +31659,13 @@ printf "%s\n" "#define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdlib_h='<'stdlib.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
 printf %s "checking absolute name of <stdlib.h>... " >&6; }
 if test ${gl_cv_next_stdlib_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30937,10 +31701,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_stdlib_h
            gl_cv_next_stdlib_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
-printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
+printf '%s\n' "$gl_cv_next_stdlib_h" >&6; }
      fi
      NEXT_STDLIB_H=$gl_cv_next_stdlib_h
 
@@ -30976,24 +31741,26 @@ printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
     HAVE_DECL_GCVT=0
   fi
 
-ac_fn_check_decl "$LINENO" "stpncpy" "ac_cv_have_decl_stpncpy" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "stpncpy" "ac_cv_have_decl_stpncpy" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_stpncpy" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_STPNCPY $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_STPNCPY $ac_have_decl" >>confdefs.h
 
 
-ac_fn_check_decl "$LINENO" "strdup" "ac_cv_have_decl_strdup" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "strdup" "ac_cv_have_decl_strdup" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_strdup" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_STRDUP $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_STRDUP $ac_have_decl" >>confdefs.h
 
 
 
@@ -31008,13 +31775,13 @@ printf "%s\n" "#define HAVE_DECL_STRDUP $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_string_h='<'string.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
 printf %s "checking absolute name of <string.h>... " >&6; }
 if test ${gl_cv_next_string_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31050,10 +31817,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_string_h
            gl_cv_next_string_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
-printf "%s\n" "$gl_cv_next_string_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
+printf '%s\n' "$gl_cv_next_string_h" >&6; }
      fi
      NEXT_STRING_H=$gl_cv_next_string_h
 
@@ -31076,14 +31844,15 @@ printf "%s\n" "$gl_cv_next_string_h" >&6; }
 
 
 
-ac_fn_check_decl "$LINENO" "strndup" "ac_cv_have_decl_strndup" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "strndup" "ac_cv_have_decl_strndup" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_strndup" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_STRNDUP $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_STRNDUP $ac_have_decl" >>confdefs.h
 
 
 
@@ -31093,13 +31862,13 @@ printf "%s\n" "#define HAVE_DECL_STRNDUP $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_header_sys_ioctl_h = yes; then
     HAVE_SYS_IOCTL_H=1
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/ioctl.h> declares ioctl" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <sys/ioctl.h> declares ioctl" >&5
 printf %s "checking whether <sys/ioctl.h> declares ioctl... " >&6; }
 if test ${gl_cv_decl_ioctl_in_sys_ioctl_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e)        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/ioctl.h>
 int
@@ -31113,14 +31882,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_decl_ioctl_in_sys_ioctl_h=yes
-else $as_nop
-  gl_cv_decl_ioctl_in_sys_ioctl_h=no
+else case e in #(
+  e) gl_cv_decl_ioctl_in_sys_ioctl_h=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_ioctl_in_sys_ioctl_h" >&5
-printf "%s\n" "$gl_cv_decl_ioctl_in_sys_ioctl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_ioctl_in_sys_ioctl_h" >&5
+printf '%s\n' "$gl_cv_decl_ioctl_in_sys_ioctl_h" >&6; }
   else
     HAVE_SYS_IOCTL_H=0
   fi
@@ -31137,13 +31908,13 @@ printf "%s\n" "$gl_cv_decl_ioctl_in_sys_ioctl_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_ioctl_h='<'sys/ioctl.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/ioctl.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/ioctl.h>" >&5
 printf %s "checking absolute name of <sys/ioctl.h>... " >&6; }
 if test ${gl_cv_next_sys_ioctl_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_sys_ioctl_h = yes; then
 
 
@@ -31185,10 +31956,11 @@ _ACEOF
                gl_cv_next_sys_ioctl_h='<'sys/ioctl.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_ioctl_h" >&5
-printf "%s\n" "$gl_cv_next_sys_ioctl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_ioctl_h" >&5
+printf '%s\n' "$gl_cv_next_sys_ioctl_h" >&6; }
      fi
      NEXT_SYS_IOCTL_H=$gl_cv_next_sys_ioctl_h
 
@@ -31230,13 +32002,13 @@ printf "%s\n" "$gl_cv_next_sys_ioctl_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_resource_h='<'sys/resource.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/resource.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/resource.h>" >&5
 printf %s "checking absolute name of <sys/resource.h>... " >&6; }
 if test ${gl_cv_next_sys_resource_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_sys_resource_h = yes; then
 
 
@@ -31278,10 +32050,11 @@ _ACEOF
                gl_cv_next_sys_resource_h='<'sys/resource.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_resource_h" >&5
-printf "%s\n" "$gl_cv_next_sys_resource_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_resource_h" >&5
+printf '%s\n' "$gl_cv_next_sys_resource_h" >&6; }
      fi
      NEXT_SYS_RESOURCE_H=$gl_cv_next_sys_resource_h
 
@@ -31328,13 +32101,13 @@ printf "%s\n" "$gl_cv_next_sys_resource_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_times_h='<'sys/times.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/times.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/times.h>" >&5
 printf %s "checking absolute name of <sys/times.h>... " >&6; }
 if test ${gl_cv_next_sys_times_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_sys_times_h = yes; then
 
 
@@ -31376,10 +32149,11 @@ _ACEOF
                gl_cv_next_sys_times_h='<'sys/times.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_times_h" >&5
-printf "%s\n" "$gl_cv_next_sys_times_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_times_h" >&5
+printf '%s\n' "$gl_cv_next_sys_times_h" >&6; }
      fi
      NEXT_SYS_TIMES_H=$gl_cv_next_sys_times_h
 
@@ -31404,11 +32178,12 @@ printf "%s\n" "$gl_cv_next_sys_times_h" >&6; }
 if test "x$ac_cv_type_struct_tms" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_TMS 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_TMS 1" >>confdefs.h
 
 
-else $as_nop
-  HAVE_STRUCT_TMS=0
+else case e in #(
+  e) HAVE_STRUCT_TMS=0 ;;
+esac
 fi
 
   else
@@ -31439,7 +32214,7 @@ fi
 
 
 
-printf "%s\n" "#define _USE_STD_STAT 1" >>confdefs.h
+printf '%s\n' "#define _USE_STD_STAT 1" >>confdefs.h
 
 
 
@@ -31453,13 +32228,13 @@ printf "%s\n" "#define _USE_STD_STAT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_types_h='<'sys/types.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
 printf %s "checking absolute name of <sys/types.h>... " >&6; }
 if test ${gl_cv_next_sys_types_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31495,10 +32270,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_sys_types_h
            gl_cv_next_sys_types_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
-printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
+printf '%s\n' "$gl_cv_next_sys_types_h" >&6; }
      fi
      NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
 
@@ -31546,13 +32322,13 @@ printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_wait_h='<'sys/wait.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/wait.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/wait.h>" >&5
 printf %s "checking absolute name of <sys/wait.h>... " >&6; }
 if test ${gl_cv_next_sys_wait_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_sys_wait_h = yes; then
 
 
@@ -31594,10 +32370,11 @@ _ACEOF
                gl_cv_next_sys_wait_h='<'sys/wait.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_wait_h" >&5
-printf "%s\n" "$gl_cv_next_sys_wait_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_wait_h" >&5
+printf '%s\n' "$gl_cv_next_sys_wait_h" >&6; }
      fi
      NEXT_SYS_WAIT_H=$gl_cv_next_sys_wait_h
 
@@ -31646,13 +32423,13 @@ printf "%s\n" "$gl_cv_next_sys_wait_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_termios_h='<'termios.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <termios.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <termios.h>" >&5
 printf %s "checking absolute name of <termios.h>... " >&6; }
 if test ${gl_cv_next_termios_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_termios_h = yes; then
 
 
@@ -31694,10 +32471,11 @@ _ACEOF
                gl_cv_next_termios_h='<'termios.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_termios_h" >&5
-printf "%s\n" "$gl_cv_next_termios_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_termios_h" >&5
+printf '%s\n' "$gl_cv_next_termios_h" >&6; }
      fi
      NEXT_TERMIOS_H=$gl_cv_next_termios_h
 
@@ -31750,13 +32528,13 @@ printf "%s\n" "$gl_cv_next_termios_h" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
 printf %s "checking for struct timespec in <time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_time_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 
@@ -31771,13 +32549,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timespec_in_time_h=yes
-else $as_nop
-  gl_cv_sys_struct_timespec_in_time_h=no
+else case e in #(
+  e) gl_cv_sys_struct_timespec_in_time_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
 
   TIME_H_DEFINES_STRUCT_TIMESPEC=0
   SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
@@ -31786,13 +32566,13 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
   if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
     TIME_H_DEFINES_STRUCT_TIMESPEC=1
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
 printf %s "checking for struct timespec in <sys/time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_sys_time_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/time.h>
 
@@ -31807,23 +32587,25 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timespec_in_sys_time_h=yes
-else $as_nop
-  gl_cv_sys_struct_timespec_in_sys_time_h=no
+else case e in #(
+  e) gl_cv_sys_struct_timespec_in_sys_time_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
     if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
       SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
 printf %s "checking for struct timespec in <pthread.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_pthread_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 
@@ -31838,23 +32620,25 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timespec_in_pthread_h=yes
-else $as_nop
-  gl_cv_sys_struct_timespec_in_pthread_h=no
+else case e in #(
+  e) gl_cv_sys_struct_timespec_in_pthread_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
       if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
         PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
 printf %s "checking for struct timespec in <unistd.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_unistd_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 
@@ -31869,13 +32653,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timespec_in_unistd_h=yes
-else $as_nop
-  gl_cv_sys_struct_timespec_in_unistd_h=no
+else case e in #(
+  e) gl_cv_sys_struct_timespec_in_unistd_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
         if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
           UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
         fi
@@ -31901,13 +32687,13 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_time_h='<'time.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
 printf %s "checking absolute name of <time.h>... " >&6; }
 if test ${gl_cv_next_time_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31943,10 +32729,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_time_h
            gl_cv_next_time_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
-printf "%s\n" "$gl_cv_next_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
+printf '%s\n' "$gl_cv_next_time_h" >&6; }
      fi
      NEXT_TIME_H=$gl_cv_next_time_h
 
@@ -31966,13 +32753,13 @@ printf "%s\n" "$gl_cv_next_time_h" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
 printf %s "checking for TIME_UTC in <time.h>... " >&6; }
 if test ${gl_cv_time_h_has_TIME_UTC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 
@@ -31987,13 +32774,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_time_h_has_TIME_UTC=yes
-else $as_nop
-  gl_cv_time_h_has_TIME_UTC=no
+else case e in #(
+  e) gl_cv_time_h_has_TIME_UTC=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
-printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
+printf '%s\n' "$gl_cv_time_h_has_TIME_UTC" >&6; }
   if test $gl_cv_time_h_has_TIME_UTC = yes; then
     TIME_H_DEFINES_TIME_UTC=1
   else
@@ -32055,18 +32844,19 @@ printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
 
   case "$host_os" in
     *-musl*)
-printf "%s\n" "#define MUSL_LIBC 1" >>confdefs.h
+printf '%s\n' "#define MUSL_LIBC 1" >>confdefs.h
  ;;
   esac
 
-ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_execvpe" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
 
 
 
@@ -32083,13 +32873,13 @@ printf "%s\n" "#define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_unistd_h='<'unistd.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
 printf %s "checking absolute name of <unistd.h>... " >&6; }
 if test ${gl_cv_next_unistd_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_unistd_h = yes; then
 
 
@@ -32131,10 +32921,11 @@ _ACEOF
                gl_cv_next_unistd_h='<'unistd.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
-printf "%s\n" "$gl_cv_next_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
+printf '%s\n' "$gl_cv_next_unistd_h" >&6; }
      fi
      NEXT_UNISTD_H=$gl_cv_next_unistd_h
 
@@ -32201,150 +32992,165 @@ q
     LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
   fi
 
-ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_feof_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ferror_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fflush_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fgets_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputc_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputs_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fread_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getc_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getchar_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putc_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putchar_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "unsetenv" "ac_cv_have_decl_unsetenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "unsetenv" "ac_cv_have_decl_unsetenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_unsetenv" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_UNSETENV $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_UNSETENV $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_vsnprintf" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_VSNPRINTF $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_VSNPRINTF $ac_have_decl" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
 printf %s "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
 if test ${gl_cv_header_wchar_h_correct_inline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_header_wchar_h_correct_inline=yes
+else case e in #(
+  e) gl_cv_header_wchar_h_correct_inline=yes
      case "$host_os" in
        *-gnu* | gnu*)
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32363,7 +33169,7 @@ _ACEOF
             && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -32379,7 +33185,7 @@ _ACEOF
               && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
              if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
                :
@@ -32392,10 +33198,11 @@ _ACEOF
          rm -f conftest12.c conftest12.$ac_objext conftest$ac_exeext
          ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
-printf "%s\n" "$gl_cv_header_wchar_h_correct_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
+printf '%s\n' "$gl_cv_header_wchar_h_correct_inline" >&6; }
   if test $gl_cv_header_wchar_h_correct_inline = no; then
     as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
 This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
@@ -32423,13 +33230,13 @@ Configuration aborted." "$LINENO" 5
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_wchar_h='<'wchar.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
 printf %s "checking absolute name of <wchar.h>... " >&6; }
 if test ${gl_cv_next_wchar_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_wchar_h = yes; then
 
 
@@ -32471,10 +33278,11 @@ _ACEOF
                gl_cv_next_wchar_h='<'wchar.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
-printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
+printf '%s\n' "$gl_cv_next_wchar_h" >&6; }
      fi
      NEXT_WCHAR_H=$gl_cv_next_wchar_h
 
@@ -32518,27 +33326,28 @@ printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
   ac_fn_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" "
       #include <wchar.h>
 
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_wcsdup" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_have_decl_wcsdup = no; then
     HAVE_DECL_WCSDUP=0
   fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking POSIX termios" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking POSIX termios" >&5
 printf %s "checking POSIX termios... " >&6; }
 if test ${ac_cv_sys_posix_termios+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <unistd.h>
@@ -32556,23 +33365,25 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_sys_posix_termios=yes
-else $as_nop
-  ac_cv_sys_posix_termios=no
+else case e in #(
+  e) ac_cv_sys_posix_termios=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_posix_termios" >&5
-printf "%s\n" "$ac_cv_sys_posix_termios" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_posix_termios" >&5
+printf '%s\n' "$ac_cv_sys_posix_termios" >&6; }
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether use of TIOCGWINSZ requires termios.h" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether use of TIOCGWINSZ requires termios.h" >&5
 printf %s "checking whether use of TIOCGWINSZ requires termios.h... " >&6; }
 if test ${gl_cv_sys_tiocgwinsz_needs_termios_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_sys_tiocgwinsz_needs_termios_h=no
+else case e in #(
+  e) gl_cv_sys_tiocgwinsz_needs_termios_h=no
 
    if test $ac_cv_sys_posix_termios = yes; then
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32585,17 +33396,18 @@ else $as_nop
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_sys_tiocgwinsz_needs_termios_h=yes
 fi
 rm -rf conftest*
 
    fi
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_tiocgwinsz_needs_termios_h" >&5
-printf "%s\n" "$gl_cv_sys_tiocgwinsz_needs_termios_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_tiocgwinsz_needs_termios_h" >&5
+printf '%s\n' "$gl_cv_sys_tiocgwinsz_needs_termios_h" >&6; }
 
 
     HAVE_OPENDIR=1;
@@ -32666,13 +33478,13 @@ printf "%s\n" "$gl_cv_sys_tiocgwinsz_needs_termios_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_dirent_h='<'dirent.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <dirent.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <dirent.h>" >&5
 printf %s "checking absolute name of <dirent.h>... " >&6; }
 if test ${gl_cv_next_dirent_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_dirent_h = yes; then
 
 
@@ -32714,10 +33526,11 @@ _ACEOF
                gl_cv_next_dirent_h='<'dirent.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_dirent_h" >&5
-printf "%s\n" "$gl_cv_next_dirent_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_dirent_h" >&5
+printf '%s\n' "$gl_cv_next_dirent_h" >&6; }
      fi
      NEXT_DIRENT_H=$gl_cv_next_dirent_h
 
@@ -32744,14 +33557,15 @@ printf "%s\n" "$gl_cv_next_dirent_h" >&6; }
 
 
 
-ac_fn_check_decl "$LINENO" "fchdir" "ac_cv_have_decl_fchdir" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fchdir" "ac_cv_have_decl_fchdir" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fchdir" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FCHDIR $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FCHDIR $ac_have_decl" >>confdefs.h
 
 
 
@@ -32768,47 +33582,50 @@ printf "%s\n" "#define HAVE_DECL_FCHDIR $ac_have_decl" >>confdefs.h
 
 
 
-ac_fn_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getdelim" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_GETDELIM $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_GETDELIM $ac_have_decl" >>confdefs.h
 
 
 
-ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getdtablesize" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getline" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_GETLINE $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_GETLINE $ac_have_decl" >>confdefs.h
 
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5
 printf %s "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >&6; }
 if test ${gl_cv_func_setlocale_null_all_mtsafe+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
        # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin.
        *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*)
          gl_cv_func_setlocale_null_all_mtsafe=no ;;
@@ -32819,10 +33636,11 @@ else $as_nop
        *)
          gl_cv_func_setlocale_null_all_mtsafe="$gl_cross_guess_normal" ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5
-printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5
+printf '%s\n' "$gl_cv_func_setlocale_null_all_mtsafe" >&6; }
     case "$host_os" in
     mingw*) ;;
     *)
@@ -32836,16 +33654,16 @@ printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; }
     *)    SETLOCALE_NULL_ALL_MTSAFE=0 ;;
   esac
 
-printf "%s\n" "#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE" >>confdefs.h
+printf '%s\n' "#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE" >>confdefs.h
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5
 printf %s "checking whether setlocale (category, NULL) is multithread-safe... " >&6; }
 if test ${gl_cv_func_setlocale_null_one_mtsafe+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
        # Guess no on OpenBSD, AIX.
        openbsd* | aix*)
          gl_cv_func_setlocale_null_one_mtsafe=no ;;
@@ -32856,10 +33674,11 @@ else $as_nop
        *)
          gl_cv_func_setlocale_null_one_mtsafe="$gl_cross_guess_normal" ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5
-printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5
+printf '%s\n' "$gl_cv_func_setlocale_null_one_mtsafe" >&6; }
     case "$host_os" in
     mingw*) ;;
     *)
@@ -32873,7 +33692,7 @@ printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; }
     *)    SETLOCALE_NULL_ONE_MTSAFE=0 ;;
   esac
 
-printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>confdefs.h
+printf '%s\n' "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>confdefs.h
 
 
     if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then
@@ -32882,13 +33701,13 @@ printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>c
       *)
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
 printf %s "checking whether imported symbols can be declared weak... " >&6; }
 if test ${gl_cv_have_weak+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
        cygwin*)
                                     gl_cv_have_weak="guessing no"
          ;;
@@ -32923,17 +33742,18 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Extensible Linking Format" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1
 then :
   gl_cv_have_weak="guessing yes"
-else $as_nop
-  gl_cv_have_weak="guessing no"
+else case e in #(
+  e) gl_cv_have_weak="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -32946,11 +33766,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_have_weak=yes
-else $as_nop
-  gl_cv_have_weak=no
+else case e in #(
+  e) gl_cv_have_weak=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
          fi
@@ -32980,14 +33802,15 @@ EOF
          esac
          ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
-printf "%s\n" "$gl_cv_have_weak" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
+printf '%s\n' "$gl_cv_have_weak" >&6; }
   case "$gl_cv_have_weak" in
     *yes)
 
-printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
+printf '%s\n' "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
 
       ;;
   esac
@@ -33019,13 +33842,13 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
 
 
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5
 printf %s "checking whether locale.h defines locale_t... " >&6; }
 if test ${gl_cv_header_locale_has_locale_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
             locale_t x;
@@ -33040,14 +33863,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_locale_has_locale_t=yes
-else $as_nop
-  gl_cv_header_locale_has_locale_t=no
+else case e in #(
+  e) gl_cv_header_locale_has_locale_t=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_has_locale_t" >&5
-printf "%s\n" "$gl_cv_header_locale_has_locale_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_has_locale_t" >&5
+printf '%s\n' "$gl_cv_header_locale_has_locale_t" >&6; }
 
 
   if test $ac_cv_header_xlocale_h = yes; then
@@ -33082,18 +33907,18 @@ printf "%s\n" "$gl_cv_header_locale_has_locale_t" >&6; }
   case "$host_os" in
     solaris*)
 
-printf "%s\n" "#define _LCONV_C99 1" >>confdefs.h
+printf '%s\n' "#define _LCONV_C99 1" >>confdefs.h
 
       ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether locale.h conforms to POSIX:2001" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether locale.h conforms to POSIX:2001" >&5
 printf %s "checking whether locale.h conforms to POSIX:2001... " >&6; }
 if test ${gl_cv_header_locale_h_posix2001+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
             int x = LC_MESSAGES;
@@ -33109,21 +33934,23 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_locale_h_posix2001=yes
-else $as_nop
-  gl_cv_header_locale_h_posix2001=no
+else case e in #(
+  e) gl_cv_header_locale_h_posix2001=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_h_posix2001" >&5
-printf "%s\n" "$gl_cv_header_locale_h_posix2001" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_h_posix2001" >&5
+printf '%s\n' "$gl_cv_header_locale_h_posix2001" >&6; }
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct lconv is properly defined" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether struct lconv is properly defined" >&5
 printf %s "checking whether struct lconv is properly defined... " >&6; }
 if test ${gl_cv_sys_struct_lconv_ok+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
             struct lconv l;
@@ -33140,14 +33967,16 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_lconv_ok=yes
-else $as_nop
-  gl_cv_sys_struct_lconv_ok=no
+else case e in #(
+  e) gl_cv_sys_struct_lconv_ok=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5
-printf "%s\n" "$gl_cv_sys_struct_lconv_ok" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5
+printf '%s\n' "$gl_cv_sys_struct_lconv_ok" >&6; }
   if test $gl_cv_sys_struct_lconv_ok = no; then
             case "$host_os" in
       mingw*)
@@ -33160,11 +33989,12 @@ printf "%s\n" "$gl_cv_sys_struct_lconv_ok" >&6; }
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Special" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Special" >/dev/null 2>&1
 then :
 
-else $as_nop
-  REPLACE_STRUCT_LCONV=1
+else case e in #(
+  e) REPLACE_STRUCT_LCONV=1 ;;
+esac
 fi
 rm -rf conftest*
 
@@ -33184,13 +34014,13 @@ rm -rf conftest*
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_locale_h='<'locale.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <locale.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <locale.h>" >&5
 printf %s "checking absolute name of <locale.h>... " >&6; }
 if test ${gl_cv_next_locale_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33226,10 +34056,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_locale_h
            gl_cv_next_locale_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_locale_h" >&5
-printf "%s\n" "$gl_cv_next_locale_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_locale_h" >&5
+printf '%s\n' "$gl_cv_next_locale_h" >&6; }
      fi
      NEXT_LOCALE_H=$gl_cv_next_locale_h
 
@@ -33272,14 +34103,15 @@ printf "%s\n" "$gl_cv_next_locale_h" >&6; }
 
 
 
-ac_fn_check_decl "$LINENO" "memrchr" "ac_cv_have_decl_memrchr" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "memrchr" "ac_cv_have_decl_memrchr" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_memrchr" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_MEMRCHR $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_MEMRCHR $ac_have_decl" >>confdefs.h
 
 
 
@@ -33298,13 +34130,13 @@ printf "%s\n" "#define HAVE_DECL_MEMRCHR $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_strings_h='<'strings.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <strings.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <strings.h>" >&5
 printf %s "checking absolute name of <strings.h>... " >&6; }
 if test ${gl_cv_next_strings_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_strings_h = yes; then
 
 
@@ -33346,10 +34178,11 @@ _ACEOF
                gl_cv_next_strings_h='<'strings.h'>'
              fi
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_strings_h" >&5
-printf "%s\n" "$gl_cv_next_strings_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_strings_h" >&5
+printf '%s\n' "$gl_cv_next_strings_h" >&6; }
      fi
      NEXT_STRINGS_H=$gl_cv_next_strings_h
 
@@ -33376,14 +34209,15 @@ printf "%s\n" "$gl_cv_next_strings_h" >&6; }
 
 
 
-ac_fn_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_strnlen" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_STRNLEN $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_STRNLEN $ac_have_decl" >>confdefs.h
 
 
    if false; then
@@ -33445,7 +34279,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_ACCESS 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_ACCESS 1" >>confdefs.h
 
 
 
@@ -33457,13 +34291,13 @@ printf "%s\n" "#define GNULIB_TEST_ACCESS 1" >>confdefs.h
 
   # Define an additional variable used in the Makefile substitution.
   if test $ac_cv_working_alloca_h = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca as a compiler built-in" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for alloca as a compiler built-in" >&5
 printf %s "checking for alloca as a compiler built-in... " >&6; }
 if test ${gl_cv_rpl_alloca+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -33473,21 +34307,23 @@ else $as_nop
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Need own alloca" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Need own alloca" >/dev/null 2>&1
 then :
   gl_cv_rpl_alloca=yes
-else $as_nop
-  gl_cv_rpl_alloca=no
+else case e in #(
+  e) gl_cv_rpl_alloca=no ;;
+esac
 fi
 rm -rf conftest*
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_rpl_alloca" >&5
-printf "%s\n" "$gl_cv_rpl_alloca" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_rpl_alloca" >&5
+printf '%s\n' "$gl_cv_rpl_alloca" >&6; }
     if test $gl_cv_rpl_alloca = yes; then
 
-printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ALLOCA 1" >>confdefs.h
 
       ALLOCA_H=alloca.h
     else
@@ -33514,7 +34350,7 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable assertions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to enable assertions" >&5
 printf %s "checking whether to enable assertions... " >&6; }
   # Check whether --enable-assert was given.
 if test ${enable_assert+y}
@@ -33522,30 +34358,31 @@ then :
   enableval=$enable_assert; if test "x$enableval" = xno
 then :
 
-printf "%s\n" "#define NDEBUG 1" >>confdefs.h
+printf '%s\n' "#define NDEBUG 1" >>confdefs.h
 
 elif test "x$enableval" != xyes
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-assert" >&5
-printf "%s\n" "$as_me: WARNING: invalid argument supplied to --enable-assert" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-assert" >&5
+printf '%s\n' "$as_me: WARNING: invalid argument supplied to --enable-assert" >&2;}
       enable_assert=yes
 fi
-else $as_nop
-  enable_assert=yes
+else case e in #(
+  e) enable_assert=yes ;;
+esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_assert" >&5
-printf "%s\n" "$enable_assert" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_assert" >&5
+printf '%s\n' "$enable_assert" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
 printf %s "checking for __builtin_expect... " >&6; }
 if test ${gl_cv___builtin_expect+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
          int
@@ -33558,8 +34395,8 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv___builtin_expect=yes
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
              #include <builtins.h>
@@ -33573,22 +34410,25 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv___builtin_expect="in <builtins.h>"
-else $as_nop
-  gl_cv___builtin_expect=no
+else case e in #(
+  e) gl_cv___builtin_expect=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
-printf "%s\n" "$gl_cv___builtin_expect" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
+printf '%s\n' "$gl_cv___builtin_expect" >&6; }
   if test "$gl_cv___builtin_expect" = yes; then
-    printf "%s\n" "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
+    printf '%s\n' "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
 
   elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
-    printf "%s\n" "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
+    printf '%s\n' "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
 
   fi
 
@@ -33598,22 +34438,22 @@ printf "%s\n" "$gl_cv___builtin_expect" >&6; }
 
   if test $REPLACE_CALLOC = 0; then
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether calloc (0, n) and calloc (n, 0) return nonnull" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether calloc (0, n) and calloc (n, 0) return nonnull" >&5
 printf %s "checking whether calloc (0, n) and calloc (n, 0) return nonnull... " >&6; }
 if test ${ac_cv_func_calloc_0_nonnull+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $cross_compiling != yes; then
+else case e in #(
+  e) if test $cross_compiling != yes; then
        ac_cv_func_calloc_0_nonnull=yes
        if test "$cross_compiling" = yes
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -33633,11 +34473,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
 
-else $as_nop
-  ac_cv_func_calloc_0_nonnull=no
+else case e in #(
+  e) ac_cv_func_calloc_0_nonnull=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
      else
@@ -33652,10 +34494,11 @@ fi
          *)             ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;;
        esac
      fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_calloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_calloc_0_nonnull" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_calloc_0_nonnull" >&5
+printf '%s\n' "$ac_cv_func_calloc_0_nonnull" >&6; }
   case $ac_cv_func_calloc_0_nonnull in #(
   *yes) :
      ;; #(
@@ -33711,7 +34554,7 @@ esac
 
 
 
-printf "%s\n" "#define GNULIB_TEST_CALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_CALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -33732,12 +34575,12 @@ printf "%s\n" "#define GNULIB_TEST_CALLOC_POSIX 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_CANONICALIZE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_CANONICALIZE 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define GNULIB_TEST_CANONICALIZE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_CANONICALIZE 1" >>confdefs.h
 
 
 
@@ -33755,7 +34598,7 @@ printf "%s\n" "#define GNULIB_TEST_CANONICALIZE 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
 
@@ -33797,7 +34640,7 @@ printf "%s\n" "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
   fi
 
 
-printf "%s\n" "#define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
 
 
@@ -33815,7 +34658,7 @@ printf "%s\n" "#define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
 
@@ -33834,7 +34677,7 @@ printf "%s\n" "#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_REALPATH 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_REALPATH 1" >>confdefs.h
 
 
 
@@ -33852,20 +34695,26 @@ printf "%s\n" "#define GNULIB_TEST_REALPATH 1" >>confdefs.h
   LIB_CLOCK_GETTIME=
 
   gl_saved_libs=$LIBS
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
 printf %s "checking for library containing clock_gettime... " >&6; }
 if test ${ac_cv_search_clock_gettime+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_func_search_save_LIBS=$LIBS
+else case e in #(
+  e) ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char clock_gettime ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clock_gettime (void);
 int
 main (void)
 {
@@ -33896,14 +34745,16 @@ done
 if test ${ac_cv_search_clock_gettime+y}
 then :
 
-else $as_nop
-  ac_cv_search_clock_gettime=no
+else case e in #(
+  e) ac_cv_search_clock_gettime=no ;;
+esac
 fi
 rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
-printf "%s\n" "$ac_cv_search_clock_gettime" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
+printf '%s\n' "$ac_cv_search_clock_gettime" >&6; }
 ac_res=$ac_cv_search_clock_gettime
 if test "$ac_res" != no
 then :
@@ -33915,13 +34766,13 @@ fi
     ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
 if test "x$ac_cv_func_clock_gettime" = xyes
 then :
-  printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "clock_settime" "ac_cv_func_clock_settime"
 if test "x$ac_cv_func_clock_settime" = xyes
 then :
-  printf "%s\n" "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h
 
 fi
 
@@ -33929,7 +34780,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
 
 
 
@@ -33949,7 +34800,7 @@ printf "%s\n" "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -34009,13 +34860,13 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_CLOSE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_CLOSE 1" >>confdefs.h
 
 
 
 
 
-printf "%s\n" "#define GNULIB_CLOSE_STREAM 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_CLOSE_STREAM 1" >>confdefs.h
 
 
 
@@ -34034,18 +34885,18 @@ printf "%s\n" "#define GNULIB_CLOSE_STREAM 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_DIRNAME 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_DIRNAME 1" >>confdefs.h
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-   if test x"$cross_compiling" = xyes ; then
+else case e in #(
+  e)  if test x"$cross_compiling" = xyes ; then
         # When cross-compiling, there is no way to tell whether // is special
         # short of a list of hosts.  However, the only known hosts to date
         # that have a distinct // are Apollo DomainOS (too old to port to),
@@ -34067,26 +34918,27 @@ else $as_nop
         else
           gl_cv_double_slash_root=yes
         fi
-      fi
+      fi ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
 
-printf "%s\n" "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
 printf %s "checking whether dup2 works... " >&6; }
 if test ${gl_cv_func_dup2_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
          mingw*) # on this platform, dup2 always returns 0 for success
@@ -34105,8 +34957,8 @@ then :
            gl_cv_func_dup2_works="guessing no" ;;
          *) gl_cv_func_dup2_works="guessing yes" ;;
        esac
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #include <errno.h>
@@ -34176,17 +35028,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_dup2_works=yes
-else $as_nop
-  gl_cv_func_dup2_works=no
+else case e in #(
+  e) gl_cv_func_dup2_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
-printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
+printf '%s\n' "$gl_cv_func_dup2_works" >&6; }
   case "$gl_cv_func_dup2_works" in
     *yes) ;;
     *)
@@ -34194,7 +35049,7 @@ printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
       ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize"
 if test "x$ac_cv_func_setdtablesize" = xyes
 then :
-  printf "%s\n" "#define HAVE_SETDTABLESIZE 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SETDTABLESIZE 1" >>confdefs.h
 
 fi
 
@@ -34241,7 +35096,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_DUP2 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_DUP2 1" >>confdefs.h
 
 
 
@@ -34261,19 +35116,19 @@ printf "%s\n" "#define GNULIB_TEST_DUP2 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h
 
 
 
 
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
 printf %s "checking for error_at_line... " >&6; }
 if test ${ac_cv_lib_error_at_line+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <error.h>
 int
@@ -34287,14 +35142,16 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_error_at_line=yes
-else $as_nop
-  ac_cv_lib_error_at_line=no
+else case e in #(
+  e) ac_cv_lib_error_at_line=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-printf "%s\n" "$ac_cv_lib_error_at_line" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
+printf '%s\n' "$ac_cv_lib_error_at_line" >&6; }
 
   if test "$ac_cv_lib_error_at_line" = no
 then :
@@ -34350,21 +35207,21 @@ fi
   fi
 
   else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
 printf %s "checking whether fcntl handles F_DUPFD correctly... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case $host_os in
             aix* | cygwin* | haiku*)
                gl_cv_func_fcntl_f_dupfd_works="guessing no" ;;
             *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;;
           esac
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <errno.h>
               #include <fcntl.h>
@@ -34417,16 +35274,19 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_fcntl_f_dupfd_works=yes
-else $as_nop
-  gl_cv_func_fcntl_f_dupfd_works=no
+else case e in #(
+  e) gl_cv_func_fcntl_f_dupfd_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
     case $gl_cv_func_fcntl_f_dupfd_works in
       *yes) ;;
       *)
@@ -34439,17 +35299,17 @@ printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
   fi
 
 
-printf "%s\n" "#define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
+printf '%s\n' "#define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
  ;;
     esac
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
 printf %s "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_cloexec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                      # Guess no on NetBSD.
@@ -34457,8 +35317,8 @@ then :
             *)       gl_cv_func_fcntl_f_dupfd_cloexec="$gl_cross_guess_normal" ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
               #include <unistd.h>
@@ -34500,22 +35360,26 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_fcntl_f_dupfd_cloexec=yes
-else $as_nop
-  gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check"
+else case e in #(
+  e) gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-else $as_nop
-  gl_cv_func_fcntl_f_dupfd_cloexec=no
+else case e in #(
+  e) gl_cv_func_fcntl_f_dupfd_cloexec=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
     case "$gl_cv_func_fcntl_f_dupfd_cloexec" in
       *yes) ;;
       *)
@@ -34578,7 +35442,7 @@ printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FCNTL 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FCNTL 1" >>confdefs.h
 
 
 
@@ -34590,7 +35454,7 @@ printf "%s\n" "#define GNULIB_TEST_FCNTL 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_FD_SAFER_FLAG 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_FD_SAFER_FLAG 1" >>confdefs.h
 
 
 
@@ -34630,7 +35494,7 @@ printf "%s\n" "#define GNULIB_FD_SAFER_FLAG 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FFSL 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FFSL 1" >>confdefs.h
 
 
 
@@ -34666,8 +35530,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  FLOAT_H=float.h
+else case e in #(
+  e) FLOAT_H=float.h ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
           ;;
@@ -34690,13 +35555,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   esac
 
     REPLACE_ITOLD=0
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether conversion from 'int' to 'long double' works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether conversion from 'int' to 'long double' works" >&5
 printf %s "checking whether conversion from 'int' to 'long double' works... " >&6; }
 if test ${gl_cv_func_itold_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host" in
@@ -34713,8 +35578,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_itold_works="guessing no"
-else $as_nop
-  gl_cv_func_itold_works="guessing yes"
+else case e in #(
+  e) gl_cv_func_itold_works="guessing yes" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
              ;;
@@ -34723,8 +35589,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            *)      gl_cv_func_itold_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int i = -1;
@@ -34740,17 +35606,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_itold_works=yes
-else $as_nop
-  gl_cv_func_itold_works=no
+else case e in #(
+  e) gl_cv_func_itold_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_itold_works" >&5
-printf "%s\n" "$gl_cv_func_itold_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_itold_works" >&5
+printf '%s\n' "$gl_cv_func_itold_works" >&6; }
   case "$gl_cv_func_itold_works" in
     *no)
       REPLACE_ITOLD=1
@@ -34770,13 +35639,13 @@ printf "%s\n" "$gl_cv_func_itold_works" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_float_h='<'float.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <float.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <float.h>" >&5
 printf %s "checking absolute name of <float.h>... " >&6; }
 if test ${gl_cv_next_float_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -34812,10 +35681,11 @@ _ACEOF
            gl_header=$gl_cv_absolute_float_h
            gl_cv_next_float_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_float_h" >&5
-printf "%s\n" "$gl_cv_next_float_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_float_h" >&5
+printf '%s\n' "$gl_cv_next_float_h" >&6; }
      fi
      NEXT_FLOAT_H=$gl_cv_next_float_h
 
@@ -34876,13 +35746,13 @@ fi
             gl_cv_func_fopen_slash="guessing no"
       ;;
     *)
-                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fopen recognizes a trailing slash" >&5
+                  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fopen recognizes a trailing slash" >&5
 printf %s "checking whether fopen recognizes a trailing slash... " >&6; }
 if test ${gl_cv_func_fopen_slash+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
           if test "$cross_compiling" = yes
 then :
 
@@ -34893,8 +35763,8 @@ then :
                  gl_cv_func_fopen_slash="guessing yes" ;;
              esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stddef.h>
@@ -34911,24 +35781,27 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_fopen_slash=yes
-else $as_nop
-  gl_cv_func_fopen_slash=no
+else case e in #(
+  e) gl_cv_func_fopen_slash=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
           rm -f conftest.sl
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_slash" >&5
-printf "%s\n" "$gl_cv_func_fopen_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_slash" >&5
+printf '%s\n' "$gl_cv_func_fopen_slash" >&6; }
       ;;
   esac
   case "$gl_cv_func_fopen_slash" in
     *no)
 
-printf "%s\n" "#define FOPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "#define FOPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
       REPLACE_FOPEN=1
       ;;
@@ -34962,19 +35835,19 @@ printf "%s\n" "#define FOPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FOPEN 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FOPEN 1" >>confdefs.h
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fopen supports the mode character 'x'" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fopen supports the mode character 'x'" >&5
 printf %s "checking whether fopen supports the mode character 'x'... " >&6; }
 if test ${gl_cv_func_fopen_mode_x+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -f conftest.x
+else case e in #(
+  e) rm -f conftest.x
      if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -34986,8 +35859,8 @@ then :
             gl_cv_func_fopen_mode_x="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -35011,25 +35884,28 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_fopen_mode_x=yes
-else $as_nop
-  gl_cv_func_fopen_mode_x=no
+else case e in #(
+  e) gl_cv_func_fopen_mode_x=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
      rm -f conftest.x
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_x" >&5
-printf "%s\n" "$gl_cv_func_fopen_mode_x" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fopen supports the mode character 'e'" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_x" >&5
+printf '%s\n' "$gl_cv_func_fopen_mode_x" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fopen supports the mode character 'e'" >&5
 printf %s "checking whether fopen supports the mode character 'e'... " >&6; }
 if test ${gl_cv_func_fopen_mode_e+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  echo foo > conftest.x
+else case e in #(
+  e) echo foo > conftest.x
      if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -35044,8 +35920,8 @@ then :
             gl_cv_func_fopen_mode_e="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -35074,18 +35950,21 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_fopen_mode_e=yes
-else $as_nop
-  gl_cv_func_fopen_mode_e=no
+else case e in #(
+  e) gl_cv_func_fopen_mode_e=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
      rm -f conftest.x
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_e" >&5
-printf "%s\n" "$gl_cv_func_fopen_mode_e" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fopen_mode_e" >&5
+printf '%s\n' "$gl_cv_func_fopen_mode_e" >&6; }
   case "$gl_cv_func_fopen_mode_x" in
     *no) REPLACE_FOPEN=1 ;;
   esac
@@ -35108,12 +35987,12 @@ printf "%s\n" "$gl_cv_func_fopen_mode_e" >&6; }
   fi
 
 
-printf "%s\n" "#define GNULIB_FOPEN_GNU 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_FOPEN_GNU 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define GNULIB_FOPEN_SAFER 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_FOPEN_SAFER 1" >>confdefs.h
 
 
 
@@ -35124,13 +36003,13 @@ printf "%s\n" "#define GNULIB_FOPEN_SAFER 1" >>confdefs.h
     # include <stdio_ext.h>
     #endif
   '
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __fpending" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __fpending" >&5
 printf %s "checking for __fpending... " >&6; }
 if test ${gl_cv_func___fpending+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $fp_headers
@@ -35145,25 +36024,28 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func___fpending=yes
-else $as_nop
-  gl_cv_func___fpending=no
+else case e in #(
+  e) gl_cv_func___fpending=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func___fpending" >&5
-printf "%s\n" "$gl_cv_func___fpending" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func___fpending" >&5
+printf '%s\n' "$gl_cv_func___fpending" >&6; }
   if test $gl_cv_func___fpending = yes; then
     ac_fn_check_decl "$LINENO" "__fpending" "ac_cv_have_decl___fpending" "$fp_headers
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl___fpending" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL___FPENDING $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL___FPENDING $ac_have_decl" >>confdefs.h
 
   fi
 
@@ -35263,7 +36145,7 @@ printf "%s\n" "#define HAVE_DECL___FPENDING $ac_have_decl" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -35278,7 +36160,7 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
           ;;
         *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
 
           ;;
       esac
@@ -35292,12 +36174,12 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
 
       ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes
 then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h
 
 fi
 
@@ -35311,7 +36193,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
 
       ;;
   esac
@@ -35323,7 +36205,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
 
       ;;
   esac
@@ -35335,7 +36217,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
 
       ;;
   esac
@@ -35347,7 +36229,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
 
       ;;
   esac
@@ -35359,7 +36241,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
 
       ;;
   esac
@@ -35371,13 +36253,13 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -35389,13 +36271,13 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -35444,7 +36326,7 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
   if test $ac_cv_func_vasnprintf = yes; then
 
-printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 
   fi
 
@@ -35460,11 +36342,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 if test "x$ac_cv_type_ptrdiff_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define ptrdiff_t long" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define ptrdiff_t long" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -35487,7 +36370,7 @@ fi
 
   REPLACE_FPRINTF=1
 
-printf "%s\n" "#define REPLACE_FPRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_FPRINTF_POSIX 1" >>confdefs.h
 
   :
 
@@ -35508,20 +36391,20 @@ printf "%s\n" "#define REPLACE_FPRINTF_POSIX 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FPRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FPRINTF_POSIX 1" >>confdefs.h
 
 
 
 
 
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
@@ -35542,19 +36425,21 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_free_preserves_errno=yes
-else $as_nop
-  gl_cv_func_free_preserves_errno=no
+else case e in #(
+  e) gl_cv_func_free_preserves_errno=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
 
-printf "%s\n" "#define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "#define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -35588,7 +36473,7 @@ printf "%s\n" "#define HAVE_FREE_POSIX 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
 
 
 
@@ -35599,13 +36484,13 @@ printf "%s\n" "#define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether frexp works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether frexp works" >&5
 printf %s "checking whether frexp works... " >&6; }
 if test ${gl_cv_func_frexp_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -35620,11 +36505,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Good" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Good" >/dev/null 2>&1
 then :
   gl_cv_func_frexp_works="guessing yes"
-else $as_nop
-  gl_cv_func_frexp_works="guessing no"
+else case e in #(
+  e) gl_cv_func_frexp_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -35632,8 +36518,8 @@ rm -rf conftest*
            *) gl_cv_func_frexp_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -35703,17 +36589,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_frexp_works=yes
-else $as_nop
-  gl_cv_func_frexp_works=no
+else case e in #(
+  e) gl_cv_func_frexp_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexp_works" >&5
-printf "%s\n" "$gl_cv_func_frexp_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexp_works" >&5
+printf '%s\n' "$gl_cv_func_frexp_works" >&6; }
 
     case "$gl_cv_func_frexp_works" in
       *yes) gl_func_frexp_no_libm=yes ;;
@@ -35725,7 +36614,7 @@ printf "%s\n" "$gl_cv_func_frexp_works" >&6; }
   fi
   if test $gl_func_frexp_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_FREXP_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_FREXP_IN_LIBC 1" >>confdefs.h
 
   fi
 
@@ -35756,7 +36645,7 @@ printf "%s\n" "#define HAVE_FREXP_IN_LIBC 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FREXP 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FREXP 1" >>confdefs.h
 
 
 
@@ -35764,22 +36653,23 @@ printf "%s\n" "#define GNULIB_TEST_FREXP 1" >>confdefs.h
 
 
       ac_fn_check_decl "$LINENO" "frexpl" "ac_cv_have_decl_frexpl" "#include <math.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_frexpl" = xyes
 then :
 
-else $as_nop
-  HAVE_DECL_FREXPL=0
+else case e in #(
+  e) HAVE_DECL_FREXPL=0 ;;
+esac
 fi
   if test $HAVE_DECL_FREXPL = 1; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether frexpl() can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether frexpl() can be used without linking with libm" >&5
 printf %s "checking whether frexpl() can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_frexpl_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -35795,26 +36685,28 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_frexpl_no_libm=yes
-else $as_nop
-  gl_cv_func_frexpl_no_libm=no
+else case e in #(
+  e) gl_cv_func_frexpl_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexpl_no_libm" >&5
-printf "%s\n" "$gl_cv_func_frexpl_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexpl_no_libm" >&5
+printf '%s\n' "$gl_cv_func_frexpl_no_libm" >&6; }
 
     if test $gl_cv_func_frexpl_no_libm = yes; then
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether frexpl works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether frexpl works" >&5
 printf %s "checking whether frexpl works... " >&6; }
 if test ${gl_cv_func_frexpl_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -35824,8 +36716,8 @@ then :
            *) gl_cv_func_frexpl_works="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -35926,17 +36818,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_frexpl_works=yes
-else $as_nop
-  gl_cv_func_frexpl_works=no
+else case e in #(
+  e) gl_cv_func_frexpl_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexpl_works" >&5
-printf "%s\n" "$gl_cv_func_frexpl_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexpl_works" >&5
+printf '%s\n' "$gl_cv_func_frexpl_works" >&6; }
 
       case "$gl_cv_func_frexpl_works" in
         *yes) gl_func_frexpl_no_libm=yes ;;
@@ -35948,7 +36843,7 @@ printf "%s\n" "$gl_cv_func_frexpl_works" >&6; }
     fi
     if test $gl_func_frexpl_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_FREXPL_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_FREXPL_IN_LIBC 1" >>confdefs.h
 
     fi
   fi
@@ -35980,7 +36875,7 @@ printf "%s\n" "#define HAVE_FREXPL_IN_LIBC 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FREXPL 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FREXPL 1" >>confdefs.h
 
 
 
@@ -36019,7 +36914,7 @@ printf "%s\n" "#define GNULIB_TEST_FREXPL 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FSYNC 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FSYNC 1" >>confdefs.h
 
 
 
@@ -36039,13 +36934,13 @@ printf "%s\n" "#define GNULIB_TEST_FSYNC 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getcwd handles long file names properly" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether getcwd handles long file names properly" >&5
 printf %s "checking whether getcwd handles long file names properly... " >&6; }
 if test ${gl_cv_func_getcwd_path_max+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # Arrange for deletion of the temporary directory this test creates.
+else case e in #(
+  e) # Arrange for deletion of the temporary directory this test creates.
      ac_clean_files="$ac_clean_files confdir3"
           if test "$cross_compiling" = yes
 then :
@@ -36065,8 +36960,8 @@ then :
             gl_cv_func_getcwd_path_max="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <errno.h>
@@ -36277,22 +37172,25 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getcwd_path_max=yes
-else $as_nop
-  case $? in
+else case e in #(
+  e) case $? in
         10|11|12) gl_cv_func_getcwd_path_max='no, but it is partly working';;
         31) gl_cv_func_getcwd_path_max='no, it has the AIX bug';;
         32) gl_cv_func_getcwd_path_max='yes, but with shorter paths';;
         *) gl_cv_func_getcwd_path_max=no;;
-        esac
+        esac ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_path_max" >&5
-printf "%s\n" "$gl_cv_func_getcwd_path_max" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_path_max" >&5
+printf '%s\n' "$gl_cv_func_getcwd_path_max" >&6; }
 
       case "$gl_cv_func_getcwd_null" in
         *yes)
@@ -36302,13 +37200,13 @@ printf "%s\n" "$gl_cv_func_getcwd_path_max" >&6; }
 
 
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5
 printf %s "checking for getpagesize... " >&6; }
 if test ${gl_cv_func_getpagesize+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
@@ -36323,29 +37221,31 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_getpagesize=yes
-else $as_nop
-  gl_cv_func_getpagesize=no
+else case e in #(
+  e) gl_cv_func_getpagesize=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getpagesize" >&5
-printf "%s\n" "$gl_cv_func_getpagesize" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getpagesize" >&5
+printf '%s\n' "$gl_cv_func_getpagesize" >&6; }
 
   if test $gl_cv_func_getpagesize = yes; then
 
-printf "%s\n" "#define HAVE_GETPAGESIZE 1" >>confdefs.h
+printf '%s\n' "#define HAVE_GETPAGESIZE 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getcwd succeeds when 4k < cwd_length < 16k" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether getcwd succeeds when 4k < cwd_length < 16k" >&5
 printf %s "checking whether getcwd succeeds when 4k < cwd_length < 16k... " >&6; }
 if test ${gl_cv_func_getcwd_succeeds_beyond_4k+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # Remove any remnants of a previous test.
+else case e in #(
+  e) # Remove any remnants of a previous test.
      rm -rf confdir-14B---
      # Arrange for deletion of the temporary directory this test creates.
      ac_clean_files="$ac_clean_files confdir-14B---"
@@ -36356,8 +37256,8 @@ then :
           *) gl_cv_func_getcwd_succeeds_beyond_4k="guessing no"
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <errno.h>
@@ -36479,23 +37379,26 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getcwd_succeeds_beyond_4k=yes
-else $as_nop
-                                                          ret=$?
+else case e in #(
+  e)                                                         ret=$?
         if test $ret -ge 128 || test $ret = 4; then
           gl_cv_func_getcwd_succeeds_beyond_4k=no
         else
           gl_cv_func_getcwd_succeeds_beyond_4k=yes
         fi
-
+        ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_succeeds_beyond_4k" >&5
-printf "%s\n" "$gl_cv_func_getcwd_succeeds_beyond_4k" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_succeeds_beyond_4k" >&5
+printf '%s\n' "$gl_cv_func_getcwd_succeeds_beyond_4k" >&6; }
   case "$gl_cv_func_getcwd_succeeds_beyond_4k" in
     *no)
       gl_abort_bug=yes
@@ -36513,19 +37416,19 @@ printf "%s\n" "$gl_cv_func_getcwd_succeeds_beyond_4k" >&6; }
     *"no" | *"no, it has the AIX bug") ;;
     *)
 
-printf "%s\n" "#define HAVE_MINIMALLY_WORKING_GETCWD 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MINIMALLY_WORKING_GETCWD 1" >>confdefs.h
 
       ;;
   esac
   case "$gl_cv_func_getcwd_path_max" in
     *"no, but it is partly working")
 
-printf "%s\n" "#define HAVE_PARTLY_WORKING_GETCWD 1" >>confdefs.h
+printf '%s\n' "#define HAVE_PARTLY_WORKING_GETCWD 1" >>confdefs.h
 
       ;;
     *"yes, but with shorter paths")
 
-printf "%s\n" "#define HAVE_GETCWD_SHORTER 1" >>confdefs.h
+printf '%s\n' "#define HAVE_GETCWD_SHORTER 1" >>confdefs.h
 
       ;;
   esac
@@ -36556,7 +37459,7 @@ printf "%s\n" "#define HAVE_GETCWD_SHORTER 1" >>confdefs.h
   fi
 
 
-printf "%s\n" "#define GNULIB_GETCWD 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_GETCWD 1" >>confdefs.h
 
 
 
@@ -36574,7 +37477,7 @@ printf "%s\n" "#define GNULIB_GETCWD 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETCWD 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETCWD 1" >>confdefs.h
 
 
 
@@ -36583,14 +37486,15 @@ printf "%s\n" "#define GNULIB_TEST_GETCWD 1" >>confdefs.h
 
 
   ac_fn_check_decl "$LINENO" "gethrtime" "ac_cv_have_decl_gethrtime" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_gethrtime" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_GETHRTIME $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_GETHRTIME $ac_have_decl" >>confdefs.h
 
   LIB_GETHRXTIME=
   if test $ac_cv_have_decl_gethrtime = no \
@@ -36601,13 +37505,13 @@ printf "%s\n" "#define HAVE_DECL_GETHRTIME $ac_have_decl" >>confdefs.h
     if test $ac_cv_func_nanouptime != yes \
        && { test $ac_cv_have_decl_gethrtime = no \
             || test $gl_cv_arithmetic_hrtime_t = no; }; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined" >&5
 printf %s "checking whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined... " >&6; }
 if test ${gl_cv_have_clock_gettime_macro+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #          include <time.h>
@@ -36617,17 +37521,19 @@ else $as_nop
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "have_clock_gettime_macro" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "have_clock_gettime_macro" >/dev/null 2>&1
 then :
   gl_cv_have_clock_gettime_macro=yes
-else $as_nop
-  gl_cv_have_clock_gettime_macro=no
+else case e in #(
+  e) gl_cv_have_clock_gettime_macro=no ;;
+esac
 fi
 rm -rf conftest*
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_clock_gettime_macro" >&5
-printf "%s\n" "$gl_cv_have_clock_gettime_macro" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_clock_gettime_macro" >&5
+printf '%s\n' "$gl_cv_have_clock_gettime_macro" >&6; }
       if test $gl_cv_have_clock_gettime_macro = yes; then
         LIB_GETHRXTIME=$LIB_CLOCK_GETTIME
       fi
@@ -36660,7 +37566,7 @@ printf "%s\n" "$gl_cv_have_clock_gettime_macro" >&6; }
 
 
 
-printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h
+printf '%s\n' "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
   GETOPT_H=getopt.h
   GETOPT_CDEFS_H=getopt-cdefs.h
@@ -36715,7 +37621,7 @@ printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETOPT_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETOPT_POSIX 1" >>confdefs.h
 
 
 
@@ -36724,42 +37630,45 @@ printf "%s\n" "#define GNULIB_TEST_GETOPT_POSIX 1" >>confdefs.h
 
   ac_found=0
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include <stdlib.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl___argv" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
@@ -36770,13 +37679,13 @@ fi
   if test $ac_found = 0; then
     # On OpenBSD 5.1, using the global __progname variable appears to be
     # the only way to implement getprogname.
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
 printf %s "checking whether __progname is defined in default libraries... " >&6; }
 if test ${gl_cv_var___progname+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
         gl_cv_var___progname=
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -36798,13 +37707,14 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
-printf "%s\n" "$gl_cv_var___progname" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
+printf '%s\n' "$gl_cv_var___progname" >&6; }
     if test "$gl_cv_var___progname" = yes; then
 
-printf "%s\n" "#define HAVE_VAR___PROGNAME 1" >>confdefs.h
+printf '%s\n' "#define HAVE_VAR___PROGNAME 1" >>confdefs.h
 
     fi
   fi
@@ -36843,7 +37753,7 @@ printf "%s\n" "#define HAVE_VAR___PROGNAME 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETRUSAGE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETRUSAGE 1" >>confdefs.h
 
 
 
@@ -36865,13 +37775,13 @@ printf "%s\n" "#define GNULIB_TEST_GETRUSAGE 1" >>confdefs.h
   if test $ac_cv_func_gettimeofday != yes; then
     HAVE_GETTIMEOFDAY=0
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gettimeofday with POSIX signature" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for gettimeofday with POSIX signature" >&5
 printf %s "checking for gettimeofday with POSIX signature... " >&6; }
 if test ${gl_cv_func_gettimeofday_posix_signature+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/time.h>
               struct timeval c;
@@ -36897,8 +37807,8 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_gettimeofday_posix_signature=yes
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/time.h>
 int gettimeofday (struct timeval *restrict, struct timezone *restrict);
@@ -36914,15 +37824,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_gettimeofday_posix_signature=almost
-else $as_nop
-  gl_cv_func_gettimeofday_posix_signature=no
+else case e in #(
+  e) gl_cv_func_gettimeofday_posix_signature=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_posix_signature" >&5
-printf "%s\n" "$gl_cv_func_gettimeofday_posix_signature" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_posix_signature" >&5
+printf '%s\n' "$gl_cv_func_gettimeofday_posix_signature" >&6; }
     if test $gl_cv_func_gettimeofday_posix_signature = almost; then
       gl_gettimeofday_timezone='struct timezone'
     elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
@@ -36936,7 +37849,7 @@ printf "%s\n" "$gl_cv_func_gettimeofday_posix_signature" >&6; }
     esac
   fi
 
-printf "%s\n" "#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone" >>confdefs.h
+printf '%s\n' "#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone" >>confdefs.h
 
 
   if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
@@ -36967,7 +37880,7 @@ printf "%s\n" "#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone" >>confde
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
 
 
 
@@ -37032,11 +37945,12 @@ fi
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "gnu_iconv" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "gnu_iconv" >/dev/null 2>&1
 then :
   gl_func_iconv_gnu=yes
-else $as_nop
-  gl_func_iconv_gnu=no
+else case e in #(
+  e) gl_func_iconv_gnu=no ;;
+esac
 fi
 rm -rf conftest*
 
@@ -37052,7 +37966,7 @@ rm -rf conftest*
       esac
       if test -n "$iconv_flavor"; then
 
-printf "%s\n" "#define ICONV_FLAVOR $iconv_flavor" >>confdefs.h
+printf '%s\n' "#define ICONV_FLAVOR $iconv_flavor" >>confdefs.h
 
 
 
@@ -37114,13 +38028,13 @@ fi
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler generally respects inline" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler generally respects inline" >&5
 printf %s "checking whether the compiler generally respects inline... " >&6; }
 if test ${gl_cv_c_inline_effective+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $ac_cv_c_inline = no; then
+else case e in #(
+  e) if test $ac_cv_c_inline = no; then
        gl_cv_c_inline_effective=no
      else
                                           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -37139,18 +38053,20 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_c_inline_effective=yes
-else $as_nop
-  gl_cv_c_inline_effective=no
+else case e in #(
+  e) gl_cv_c_inline_effective=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_inline_effective" >&5
-printf "%s\n" "$gl_cv_c_inline_effective" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_inline_effective" >&5
+printf '%s\n' "$gl_cv_c_inline_effective" >&6; }
   if test $gl_cv_c_inline_effective = yes; then
 
-printf "%s\n" "#define HAVE_INLINE 1" >>confdefs.h
+printf '%s\n' "#define HAVE_INLINE 1" >>confdefs.h
 
   fi
 
@@ -37170,13 +38086,13 @@ printf "%s\n" "#define HAVE_INLINE 1" >>confdefs.h
 
   # If we replaced any of the underlying isnan* functions, replace
   # the isnan macro; it undoubtedly suffers from the same flaws.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan macro works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan macro works" >&5
 printf %s "checking whether isnan macro works... " >&6; }
   if test $gl_func_isnanf = yes \
      && test $gl_func_isnand = yes \
      && test $gl_func_isnanl = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
     ISNAN_LIBM=
         case " $ISNAN_LIBM " in
       *" $ISNANF_LIBM "*) ;;
@@ -37191,8 +38107,8 @@ printf "%s\n" "yes" >&6; }
       *) ISNAN_LIBM="$ISNAN_LIBM $ISNANL_LIBM" ;;
     esac
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         REPLACE_ISNAN=1
     ISNAN_LIBM=
   fi
@@ -37213,7 +38129,7 @@ printf "%s\n" "no" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_ISNAN 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_ISNAN 1" >>confdefs.h
 
 
 
@@ -37221,13 +38137,13 @@ printf "%s\n" "#define GNULIB_TEST_ISNAN 1" >>confdefs.h
 
   ISNAND_LIBM=
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used without linking with libm" >&5
 printf %s "checking whether isnan(double) can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_isnand_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -37250,25 +38166,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnand_no_libm=yes
-else $as_nop
-  gl_cv_func_isnand_no_libm=no
+else case e in #(
+  e) gl_cv_func_isnand_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_no_libm" >&5
-printf "%s\n" "$gl_cv_func_isnand_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_no_libm" >&5
+printf '%s\n' "$gl_cv_func_isnand_no_libm" >&6; }
 
   if test $gl_cv_func_isnand_no_libm = no; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used with libm" >&5
 printf %s "checking whether isnan(double) can be used with libm... " >&6; }
 if test ${gl_cv_func_isnand_in_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -37293,16 +38211,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnand_in_libm=yes
-else $as_nop
-  gl_cv_func_isnand_in_libm=no
+else case e in #(
+  e) gl_cv_func_isnand_in_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$save_LIBS"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_in_libm" >&5
-printf "%s\n" "$gl_cv_func_isnand_in_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_in_libm" >&5
+printf '%s\n' "$gl_cv_func_isnand_in_libm" >&6; }
 
     if test $gl_cv_func_isnand_in_libm = yes; then
       ISNAND_LIBM=-lm
@@ -37350,19 +38270,19 @@ printf "%s\n" "$gl_cv_func_isnand_in_libm" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_ISNAND 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_ISNAND 1" >>confdefs.h
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(double) can be used without linking with libm" >&5
 printf %s "checking whether isnan(double) can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_isnand_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -37385,20 +38305,22 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnand_no_libm=yes
-else $as_nop
-  gl_cv_func_isnand_no_libm=no
+else case e in #(
+  e) gl_cv_func_isnand_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_no_libm" >&5
-printf "%s\n" "$gl_cv_func_isnand_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnand_no_libm" >&5
+printf '%s\n' "$gl_cv_func_isnand_no_libm" >&6; }
 
   gl_func_isnand_no_libm=$gl_cv_func_isnand_no_libm
   if test $gl_cv_func_isnand_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_ISNAND_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ISNAND_IN_LIBC 1" >>confdefs.h
 
   fi
 
@@ -37421,13 +38343,13 @@ printf "%s\n" "#define HAVE_ISNAND_IN_LIBC 1" >>confdefs.h
 
   ISNANF_LIBM=
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used without linking with libm" >&5
 printf %s "checking whether isnan(float) can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_isnanf_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -37450,25 +38372,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanf_no_libm=yes
-else $as_nop
-  gl_cv_func_isnanf_no_libm=no
+else case e in #(
+  e) gl_cv_func_isnanf_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_no_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanf_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_no_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanf_no_libm" >&6; }
 
   if test $gl_cv_func_isnanf_no_libm = no; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used with libm" >&5
 printf %s "checking whether isnan(float) can be used with libm... " >&6; }
 if test ${gl_cv_func_isnanf_in_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -37493,16 +38417,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanf_in_libm=yes
-else $as_nop
-  gl_cv_func_isnanf_in_libm=no
+else case e in #(
+  e) gl_cv_func_isnanf_in_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$save_LIBS"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_in_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanf_in_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_in_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanf_in_libm" >&6; }
 
     if test $gl_cv_func_isnanf_in_libm = yes; then
       ISNANF_LIBM=-lm
@@ -37515,13 +38441,13 @@ printf "%s\n" "$gl_cv_func_isnanf_in_libm" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) works" >&5
 printf %s "checking whether isnan(float) works... " >&6; }
 if test ${gl_cv_func_isnanf_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -37536,11 +38462,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_isnanf_works="guessing yes"
-else $as_nop
-  gl_cv_func_isnanf_works="guessing no"
+else case e in #(
+  e) gl_cv_func_isnanf_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -37548,8 +38475,8 @@ rm -rf conftest*
            *) gl_cv_func_isnanf_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -37607,17 +38534,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_isnanf_works=yes
-else $as_nop
-  gl_cv_func_isnanf_works=no
+else case e in #(
+  e) gl_cv_func_isnanf_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_works" >&5
-printf "%s\n" "$gl_cv_func_isnanf_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_works" >&5
+printf '%s\n' "$gl_cv_func_isnanf_works" >&6; }
 
     LIBS="$save_LIBS"
     case "$gl_cv_func_isnanf_works" in
@@ -37648,18 +38578,18 @@ printf "%s\n" "$gl_cv_func_isnanf_works" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'float'" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'float'" >&5
 printf %s "checking where to find the exponent in a 'float'... " >&6; }
 if test ${gl_cv_cc_float_expbit0+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   gl_cv_cc_float_expbit0="word 0 bit 23"
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -37730,27 +38660,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_cc_float_expbit0=`cat conftest.out`
-else $as_nop
-  gl_cv_cc_float_expbit0="unknown"
+else case e in #(
+  e) gl_cv_cc_float_expbit0="unknown" ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       rm -f conftest.out
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_float_expbit0" >&5
-printf "%s\n" "$gl_cv_cc_float_expbit0" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_float_expbit0" >&5
+printf '%s\n' "$gl_cv_cc_float_expbit0" >&6; }
   case "$gl_cv_cc_float_expbit0" in
     word*bit*)
       word=`echo "$gl_cv_cc_float_expbit0" | sed -e 's/word //' -e 's/ bit.*//'`
       bit=`echo "$gl_cv_cc_float_expbit0" | sed -e 's/word.*bit //'`
 
-printf "%s\n" "#define FLT_EXPBIT0_WORD $word" >>confdefs.h
+printf '%s\n' "#define FLT_EXPBIT0_WORD $word" >>confdefs.h
 
 
-printf "%s\n" "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h
+printf '%s\n' "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h
 
       ;;
   esac
@@ -37772,7 +38705,7 @@ printf "%s\n" "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_ISNANF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_ISNANF 1" >>confdefs.h
 
 
 
@@ -37780,13 +38713,13 @@ printf "%s\n" "#define GNULIB_TEST_ISNANF 1" >>confdefs.h
 
   ISNANL_LIBM=
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used without linking with libm" >&5
 printf %s "checking whether isnan(long double) can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_isnanl_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -37809,25 +38742,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanl_no_libm=yes
-else $as_nop
-  gl_cv_func_isnanl_no_libm=no
+else case e in #(
+  e) gl_cv_func_isnanl_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_no_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanl_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_no_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanl_no_libm" >&6; }
 
   if test $gl_cv_func_isnanl_no_libm = no; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used with libm" >&5
 printf %s "checking whether isnan(long double) can be used with libm... " >&6; }
 if test ${gl_cv_func_isnanl_in_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       save_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -37852,16 +38787,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanl_in_libm=yes
-else $as_nop
-  gl_cv_func_isnanl_in_libm=no
+else case e in #(
+  e) gl_cv_func_isnanl_in_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$save_LIBS"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_in_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanl_in_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_in_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanl_in_libm" >&6; }
 
     if test $gl_cv_func_isnanl_in_libm = yes; then
       ISNANL_LIBM=-lm
@@ -37875,13 +38812,13 @@ printf "%s\n" "$gl_cv_func_isnanl_in_libm" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnanl works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnanl works" >&5
 printf %s "checking whether isnanl works... " >&6; }
 if test ${gl_cv_func_isnanl_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -37895,11 +38832,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_isnanl_works="guessing yes"
-else $as_nop
-  gl_cv_func_isnanl_works="guessing no"
+else case e in #(
+  e) gl_cv_func_isnanl_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -37907,8 +38845,8 @@ rm -rf conftest*
            *) gl_cv_func_isnanl_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -38024,17 +38962,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_isnanl_works=yes
-else $as_nop
-  gl_cv_func_isnanl_works=no
+else case e in #(
+  e) gl_cv_func_isnanl_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_works" >&5
-printf "%s\n" "$gl_cv_func_isnanl_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_works" >&5
+printf '%s\n' "$gl_cv_func_isnanl_works" >&6; }
 
     LIBS="$save_LIBS"
     case "$gl_cv_func_isnanl_works" in
@@ -38066,13 +39007,13 @@ printf "%s\n" "$gl_cv_func_isnanl_works" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'long double'" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'long double'" >&5
 printf %s "checking where to find the exponent in a 'long double'... " >&6; }
 if test ${gl_cv_cc_long_double_expbit0+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -38089,7 +39030,7 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_cc_long_double_expbit0="word 2 bit 0"
 fi
@@ -38104,7 +39045,7 @@ rm -rf conftest*
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_cc_long_double_expbit0="word 1 bit 20"
 fi
@@ -38113,8 +39054,8 @@ rm -rf conftest*
               ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -38184,27 +39125,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_cc_long_double_expbit0=`cat conftest.out`
-else $as_nop
-  gl_cv_cc_long_double_expbit0="unknown"
+else case e in #(
+  e) gl_cv_cc_long_double_expbit0="unknown" ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       rm -f conftest.out
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_long_double_expbit0" >&5
-printf "%s\n" "$gl_cv_cc_long_double_expbit0" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_long_double_expbit0" >&5
+printf '%s\n' "$gl_cv_cc_long_double_expbit0" >&6; }
   case "$gl_cv_cc_long_double_expbit0" in
     word*bit*)
       word=`echo "$gl_cv_cc_long_double_expbit0" | sed -e 's/word //' -e 's/ bit.*//'`
       bit=`echo "$gl_cv_cc_long_double_expbit0" | sed -e 's/word.*bit //'`
 
-printf "%s\n" "#define LDBL_EXPBIT0_WORD $word" >>confdefs.h
+printf '%s\n' "#define LDBL_EXPBIT0_WORD $word" >>confdefs.h
 
 
-printf "%s\n" "#define LDBL_EXPBIT0_BIT $bit" >>confdefs.h
+printf '%s\n' "#define LDBL_EXPBIT0_BIT $bit" >>confdefs.h
 
       ;;
   esac
@@ -38227,19 +39171,19 @@ printf "%s\n" "#define LDBL_EXPBIT0_BIT $bit" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_ISNANL 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_ISNANL 1" >>confdefs.h
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(long double) can be used without linking with libm" >&5
 printf %s "checking whether isnan(long double) can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_isnanl_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -38262,15 +39206,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanl_no_libm=yes
-else $as_nop
-  gl_cv_func_isnanl_no_libm=no
+else case e in #(
+  e) gl_cv_func_isnanl_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_no_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanl_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_no_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanl_no_libm" >&6; }
 
   gl_func_isnanl_no_libm=$gl_cv_func_isnanl_no_libm
   if test $gl_func_isnanl_no_libm = yes; then
@@ -38278,13 +39224,13 @@ printf "%s\n" "$gl_cv_func_isnanl_no_libm" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnanl works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnanl works" >&5
 printf %s "checking whether isnanl works... " >&6; }
 if test ${gl_cv_func_isnanl_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -38298,11 +39244,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_isnanl_works="guessing yes"
-else $as_nop
-  gl_cv_func_isnanl_works="guessing no"
+else case e in #(
+  e) gl_cv_func_isnanl_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -38310,8 +39257,8 @@ rm -rf conftest*
            *) gl_cv_func_isnanl_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -38427,17 +39374,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_isnanl_works=yes
-else $as_nop
-  gl_cv_func_isnanl_works=no
+else case e in #(
+  e) gl_cv_func_isnanl_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_works" >&5
-printf "%s\n" "$gl_cv_func_isnanl_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanl_works" >&5
+printf '%s\n' "$gl_cv_func_isnanl_works" >&6; }
 
     case "$gl_cv_func_isnanl_works" in
       *yes) ;;
@@ -38446,7 +39396,7 @@ printf "%s\n" "$gl_cv_func_isnanl_works" >&6; }
   fi
   if test $gl_func_isnanl_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_ISNANL_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ISNANL_IN_LIBC 1" >>confdefs.h
 
   fi
 
@@ -38464,13 +39414,13 @@ printf "%s\n" "#define HAVE_ISNANL_IN_LIBC 1" >>confdefs.h
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'long double'" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'long double'" >&5
 printf %s "checking where to find the exponent in a 'long double'... " >&6; }
 if test ${gl_cv_cc_long_double_expbit0+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -38487,7 +39437,7 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_cc_long_double_expbit0="word 2 bit 0"
 fi
@@ -38502,7 +39452,7 @@ rm -rf conftest*
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_cc_long_double_expbit0="word 1 bit 20"
 fi
@@ -38511,8 +39461,8 @@ rm -rf conftest*
               ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -38582,27 +39532,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_cc_long_double_expbit0=`cat conftest.out`
-else $as_nop
-  gl_cv_cc_long_double_expbit0="unknown"
+else case e in #(
+  e) gl_cv_cc_long_double_expbit0="unknown" ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       rm -f conftest.out
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_long_double_expbit0" >&5
-printf "%s\n" "$gl_cv_cc_long_double_expbit0" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_long_double_expbit0" >&5
+printf '%s\n' "$gl_cv_cc_long_double_expbit0" >&6; }
   case "$gl_cv_cc_long_double_expbit0" in
     word*bit*)
       word=`echo "$gl_cv_cc_long_double_expbit0" | sed -e 's/word //' -e 's/ bit.*//'`
       bit=`echo "$gl_cv_cc_long_double_expbit0" | sed -e 's/word.*bit //'`
 
-printf "%s\n" "#define LDBL_EXPBIT0_WORD $word" >>confdefs.h
+printf '%s\n' "#define LDBL_EXPBIT0_WORD $word" >>confdefs.h
 
 
-printf "%s\n" "#define LDBL_EXPBIT0_BIT $bit" >>confdefs.h
+printf '%s\n' "#define LDBL_EXPBIT0_BIT $bit" >>confdefs.h
 
       ;;
   esac
@@ -38619,14 +39572,15 @@ printf "%s\n" "#define LDBL_EXPBIT0_BIT $bit" >>confdefs.h
     #include <wchar.h>
     #include <wctype.h>
 
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_iswblank" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_ISWBLANK $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_ISWBLANK $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_func_iswblank = no; then
     HAVE_ISWBLANK=0
@@ -38674,7 +39628,7 @@ printf "%s\n" "#define HAVE_DECL_ISWBLANK $ac_have_decl" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_ISWBLANK 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_ISWBLANK 1" >>confdefs.h
 
 
 
@@ -38689,13 +39643,13 @@ printf "%s\n" "#define GNULIB_TEST_ISWBLANK 1" >>confdefs.h
   if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
         REPLACE_ISWDIGIT="$REPLACE_ISWCNTRL"
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iswdigit is ISO C compliant" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether iswdigit is ISO C compliant" >&5
 printf %s "checking whether iswdigit is ISO C compliant... " >&6; }
 if test ${gl_cv_func_iswdigit_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                      case "$host_os" in
          # Guess no on FreeBSD, NetBSD, Solaris, native Windows.
          freebsd* | dragonfly* | netbsd* | solaris* | mingw*)
@@ -38707,8 +39661,8 @@ else $as_nop
          if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -38783,18 +39737,21 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_iswdigit_works=yes
-else $as_nop
-  gl_cv_func_iswdigit_works=no
+else case e in #(
+  e) gl_cv_func_iswdigit_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
        fi
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswdigit_works" >&5
-printf "%s\n" "$gl_cv_func_iswdigit_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswdigit_works" >&5
+printf '%s\n' "$gl_cv_func_iswdigit_works" >&6; }
     case "$gl_cv_func_iswdigit_works" in
       *yes) ;;
       *) REPLACE_ISWDIGIT=1 ;;
@@ -38832,7 +39789,7 @@ printf "%s\n" "$gl_cv_func_iswdigit_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_ISWDIGIT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_ISWDIGIT 1" >>confdefs.h
 
 
 
@@ -38846,13 +39803,13 @@ printf "%s\n" "#define GNULIB_TEST_ISWDIGIT 1" >>confdefs.h
   if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
         REPLACE_ISWXDIGIT="$REPLACE_ISWCNTRL"
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iswxdigit is ISO C compliant" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether iswxdigit is ISO C compliant" >&5
 printf %s "checking whether iswxdigit is ISO C compliant... " >&6; }
 if test ${gl_cv_func_iswxdigit_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                      case "$host_os" in
          # Guess no on FreeBSD, NetBSD, Solaris, native Windows.
          freebsd* | dragonfly* | netbsd* | solaris* | mingw*)
@@ -38864,8 +39821,8 @@ else $as_nop
          if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -38932,18 +39889,21 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_iswxdigit_works=yes
-else $as_nop
-  gl_cv_func_iswxdigit_works=no
+else case e in #(
+  e) gl_cv_func_iswxdigit_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
        fi
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswxdigit_works" >&5
-printf "%s\n" "$gl_cv_func_iswxdigit_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswxdigit_works" >&5
+printf '%s\n' "$gl_cv_func_iswxdigit_works" >&6; }
     case "$gl_cv_func_iswxdigit_works" in
       *yes) ;;
       *) REPLACE_ISWXDIGIT=1 ;;
@@ -38981,7 +39941,7 @@ printf "%s\n" "$gl_cv_func_iswxdigit_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_ISWXDIGIT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_ISWXDIGIT 1" >>confdefs.h
 
 
 
@@ -38999,24 +39959,25 @@ printf "%s\n" "#define GNULIB_TEST_ISWXDIGIT 1" >>confdefs.h
 
 
       ac_fn_check_decl "$LINENO" "ldexpl" "ac_cv_have_decl_ldexpl" "#include <math.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ldexpl" = xyes
 then :
 
-else $as_nop
-  HAVE_DECL_LDEXPL=0
+else case e in #(
+  e) HAVE_DECL_LDEXPL=0 ;;
+esac
 fi
 
   LDEXPL_LIBM=
   if test $HAVE_DECL_LDEXPL = 1; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ldexpl() can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ldexpl() can be used without linking with libm" >&5
 printf %s "checking whether ldexpl() can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_ldexpl_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -39032,24 +39993,26 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_ldexpl_no_libm=yes
-else $as_nop
-  gl_cv_func_ldexpl_no_libm=no
+else case e in #(
+  e) gl_cv_func_ldexpl_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_no_libm" >&5
-printf "%s\n" "$gl_cv_func_ldexpl_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_no_libm" >&5
+printf '%s\n' "$gl_cv_func_ldexpl_no_libm" >&6; }
 
     if test $gl_cv_func_ldexpl_no_libm = no; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ldexpl() can be used with libm" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ldexpl() can be used with libm" >&5
 printf %s "checking whether ldexpl() can be used with libm... " >&6; }
 if test ${gl_cv_func_ldexpl_in_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
           save_LIBS="$LIBS"
           LIBS="$LIBS -lm"
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -39067,16 +40030,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_ldexpl_in_libm=yes
-else $as_nop
-  gl_cv_func_ldexpl_in_libm=no
+else case e in #(
+  e) gl_cv_func_ldexpl_in_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
           LIBS="$save_LIBS"
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_in_libm" >&5
-printf "%s\n" "$gl_cv_func_ldexpl_in_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_in_libm" >&5
+printf '%s\n' "$gl_cv_func_ldexpl_in_libm" >&6; }
       if test $gl_cv_func_ldexpl_in_libm = yes; then
         LDEXPL_LIBM=-lm
       fi
@@ -39087,13 +40052,13 @@ printf "%s\n" "$gl_cv_func_ldexpl_in_libm" >&6; }
       LIBS="$LIBS $LDEXPL_LIBM"
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ldexpl works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ldexpl works" >&5
 printf %s "checking whether ldexpl works... " >&6; }
 if test ${gl_cv_func_ldexpl_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -39104,8 +40069,8 @@ then :
            *)               gl_cv_func_ldexpl_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -39135,17 +40100,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_ldexpl_works=yes
-else $as_nop
-  gl_cv_func_ldexpl_works=no
+else case e in #(
+  e) gl_cv_func_ldexpl_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_works" >&5
-printf "%s\n" "$gl_cv_func_ldexpl_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_works" >&5
+printf '%s\n' "$gl_cv_func_ldexpl_works" >&6; }
 
       LIBS="$save_LIBS"
       case "$gl_cv_func_ldexpl_works" in
@@ -39157,7 +40125,7 @@ printf "%s\n" "$gl_cv_func_ldexpl_works" >&6; }
     fi
     if test $gl_func_ldexpl = yes; then
 
-printf "%s\n" "#define HAVE_LDEXPL 1" >>confdefs.h
+printf '%s\n' "#define HAVE_LDEXPL 1" >>confdefs.h
 
     fi
   fi
@@ -39198,18 +40166,18 @@ printf "%s\n" "#define HAVE_LDEXPL 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_LDEXPL 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_LDEXPL 1" >>confdefs.h
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
 printf %s "checking whether the compiler supports the __inline keyword... " >&6; }
 if test ${gl_cv_c___inline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 typedef int foo_t;
            static __inline foo_t foo (void) { return 0; }
@@ -39224,16 +40192,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_c___inline=yes
-else $as_nop
-  gl_cv_c___inline=no
+else case e in #(
+  e) gl_cv_c___inline=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
-printf "%s\n" "$gl_cv_c___inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
+printf '%s\n' "$gl_cv_c___inline" >&6; }
   if test $gl_cv_c___inline = yes; then
 
-printf "%s\n" "#define HAVE___INLINE 1" >>confdefs.h
+printf '%s\n' "#define HAVE___INLINE 1" >>confdefs.h
 
   fi
 
@@ -39257,20 +40227,20 @@ if test "x$ac_cv_type_pthread_rwlock_t" = xyes
 then :
   has_rwlock=true
 
-printf "%s\n" "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
+printf '%s\n' "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
 
 fi
 
     if $has_rwlock; then
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthread_rwlock_rdlock prefers a writer to a reader" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pthread_rwlock_rdlock prefers a writer to a reader" >&5
 printf %s "checking whether pthread_rwlock_rdlock prefers a writer to a reader... " >&6; }
 if test ${gl_cv_pthread_rwlock_rdlock_prefer_writer+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  save_LIBS="$LIBS"
+else case e in #(
+  e) save_LIBS="$LIBS"
      LIBS="$LIBS $LIBMULTITHREAD"
      if test "$cross_compiling" = yes
 then :
@@ -39293,8 +40263,8 @@ then :
           *)             gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <errno.h>
@@ -39412,22 +40382,25 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_pthread_rwlock_rdlock_prefer_writer=yes
-else $as_nop
-  gl_cv_pthread_rwlock_rdlock_prefer_writer=no
+else case e in #(
+  e) gl_cv_pthread_rwlock_rdlock_prefer_writer=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
      LIBS="$save_LIBS"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pthread_rwlock_rdlock_prefer_writer" >&5
-printf "%s\n" "$gl_cv_pthread_rwlock_rdlock_prefer_writer" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pthread_rwlock_rdlock_prefer_writer" >&5
+printf '%s\n' "$gl_cv_pthread_rwlock_rdlock_prefer_writer" >&6; }
   case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in
     *yes)
 
-printf "%s\n" "#define HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER 1" >>confdefs.h
+printf '%s\n' "#define HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER 1" >>confdefs.h
 
       ;;
   esac
@@ -39459,7 +40432,7 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-printf "%s\n" "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
+printf '%s\n' "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -39468,7 +40441,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 
-printf "%s\n" "#define GNULIB_LOCK 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_LOCK 1" >>confdefs.h
 
 
 
@@ -39479,13 +40452,13 @@ printf "%s\n" "#define GNULIB_LOCK 1" >>confdefs.h
 
   if test $REPLACE_MALLOC = 0; then
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
 printf %s "checking whether malloc (0) returns nonnull... " >&6; }
 if test ${ac_cv_func_malloc_0_nonnull+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
           # Guess yes on platforms where we know the result.
@@ -39497,8 +40470,8 @@ then :
           *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
@@ -39517,17 +40490,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_func_malloc_0_nonnull=yes
-else $as_nop
-  ac_cv_func_malloc_0_nonnull=no
+else case e in #(
+  e) ac_cv_func_malloc_0_nonnull=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+printf '%s\n' "$ac_cv_func_malloc_0_nonnull" >&6; }
   case $ac_cv_func_malloc_0_nonnull in #(
   *yes) :
      ;; #(
@@ -39577,7 +40553,7 @@ esac
 
 
 
-printf "%s\n" "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -39616,13 +40592,13 @@ printf "%s\n" "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
 printf %s "checking whether mbrtowc handles incomplete characters... " >&6; }
 if test ${gl_cv_func_mbrtowc_incomplete_state+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   case "$host_os" in
                      # Guess no on AIX and OSF/1.
         aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
@@ -39633,8 +40609,8 @@ else $as_nop
         if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -39659,11 +40635,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_incomplete_state=yes
-else $as_nop
-  gl_cv_func_mbrtowc_incomplete_state=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_incomplete_state=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       else
@@ -39671,8 +40649,8 @@ fi
           if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -39697,30 +40675,33 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_incomplete_state=yes
-else $as_nop
-  gl_cv_func_mbrtowc_incomplete_state=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_incomplete_state=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
         fi
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
 
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
 printf %s "checking whether mbrtowc works as well as mbtowc... " >&6; }
 if test ${gl_cv_func_mbrtowc_sanitycheck+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   case "$host_os" in
                     # Guess no on Solaris 8.
         solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
@@ -39731,8 +40712,8 @@ else $as_nop
         if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -39761,18 +40742,21 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_sanitycheck=yes
-else $as_nop
-  gl_cv_func_mbrtowc_sanitycheck=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_sanitycheck=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
     REPLACE_MBSTATE_T=0
     case "$gl_cv_func_mbrtowc_incomplete_state" in
@@ -39794,14 +40778,15 @@ printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
     ac_fn_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" "
       #include <wchar.h>
 
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_mbrtowc" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_MBRTOWC $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_MBRTOWC $ac_have_decl" >>confdefs.h
 
     if test $ac_cv_have_decl_mbrtowc = yes; then
                         REPLACE_MBRTOWC=1
@@ -39813,13 +40798,13 @@ printf "%s\n" "#define HAVE_DECL_MBRTOWC $ac_have_decl" >>confdefs.h
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5
 printf %s "checking whether mbrtowc handles a NULL pwc argument... " >&6; }
 if test ${gl_cv_func_mbrtowc_null_arg1+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   case "$host_os" in
                   # Guess no on Solaris.
         solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;;
@@ -39830,8 +40815,8 @@ else $as_nop
         if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -39870,29 +40855,32 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_null_arg1=yes
-else $as_nop
-  gl_cv_func_mbrtowc_null_arg1=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_null_arg1=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_null_arg1" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_null_arg1" >&6; }
 
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
 printf %s "checking whether mbrtowc handles a NULL string argument... " >&6; }
 if test ${gl_cv_func_mbrtowc_null_arg2+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   case "$host_os" in
               # Guess no on OSF/1.
         osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;;
@@ -39903,8 +40891,8 @@ else $as_nop
         if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -39931,31 +40919,34 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_null_arg2=yes
-else $as_nop
-  gl_cv_func_mbrtowc_null_arg2=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_null_arg2=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_null_arg2" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_null_arg2" >&6; }
 
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
 printf %s "checking whether mbrtowc has a correct return value... " >&6; }
 if test ${gl_cv_func_mbrtowc_retval+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   case "$host_os" in
                                    # Guess no on HP-UX, Solaris, native Windows.
         hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
@@ -39967,8 +40958,8 @@ else $as_nop
         if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -40062,32 +41053,35 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_retval=yes
-else $as_nop
-  if test $? != 77; then
+else case e in #(
+  e) if test $? != 77; then
              gl_cv_func_mbrtowc_retval=no
            fi
-
+           ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_retval" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_retval" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_retval" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_retval" >&6; }
 
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
 printf %s "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; }
 if test ${gl_cv_func_mbrtowc_nul_retval+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   case "$host_os" in
                        # Guess no on Solaris 8 and 9.
         solaris2.[89]) gl_cv_func_mbrtowc_nul_retval="guessing no" ;;
@@ -40098,8 +41092,8 @@ else $as_nop
         if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -40123,28 +41117,31 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_nul_retval=yes
-else $as_nop
-  gl_cv_func_mbrtowc_nul_retval=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_nul_retval=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_nul_retval" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_nul_retval" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc stores incomplete characters" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc stores incomplete characters" >&5
 printf %s "checking whether mbrtowc stores incomplete characters... " >&6; }
 if test ${gl_cv_func_mbrtowc_stores_incomplete+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                case "$host_os" in
                # Guess yes on native Windows.
        mingw*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;;
@@ -40155,8 +41152,8 @@ else $as_nop
          if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -40211,11 +41208,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_stores_incomplete=no
-else $as_nop
-  gl_cv_func_mbrtowc_stores_incomplete=yes
+else case e in #(
+  e) gl_cv_func_mbrtowc_stores_incomplete=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
          ;;
@@ -40225,8 +41224,8 @@ fi
            if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -40250,30 +41249,33 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_stores_incomplete=no
-else $as_nop
-  gl_cv_func_mbrtowc_stores_incomplete=yes
+else case e in #(
+  e) gl_cv_func_mbrtowc_stores_incomplete=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
          fi
          ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_stores_incomplete" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_stores_incomplete" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_stores_incomplete" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_stores_incomplete" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5
 printf %s "checking whether mbrtowc works on empty input... " >&6; }
 if test ${gl_cv_func_mbrtowc_empty_input+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   case "$host_os" in
                               # Guess no on AIX and glibc systems.
         aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;;
@@ -40284,8 +41286,8 @@ else $as_nop
       if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
            #include <wchar.h>
@@ -40300,26 +41302,29 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_empty_input=yes
-else $as_nop
-  gl_cv_func_mbrtowc_empty_input=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_empty_input=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_empty_input" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_empty_input" >&6; }
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5
 printf %s "checking whether the C locale is free of encoding errors... " >&6; }
 if test ${gl_cv_func_mbrtowc_C_locale_sans_EILSEQ+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal"
 
      if test "$cross_compiling" = yes
@@ -40329,8 +41334,8 @@ then :
          mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;;
        esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
             #include <locale.h>
@@ -40362,22 +41367,25 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes
-else $as_nop
-  gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&6; }
 
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *)
-printf "%s\n" "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
+printf '%s\n' "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
 
            REPLACE_MBRTOWC=1
            ;;
@@ -40385,7 +41393,7 @@ printf "%s\n" "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_null_arg2" in
         *yes) ;;
         *)
-printf "%s\n" "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
+printf '%s\n' "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
 
            REPLACE_MBRTOWC=1
            ;;
@@ -40393,7 +41401,7 @@ printf "%s\n" "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_retval" in
         *yes) ;;
         *)
-printf "%s\n" "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h
+printf '%s\n' "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h
 
            REPLACE_MBRTOWC=1
            ;;
@@ -40401,7 +41409,7 @@ printf "%s\n" "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_nul_retval" in
         *yes) ;;
         *)
-printf "%s\n" "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
+printf '%s\n' "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
 
            REPLACE_MBRTOWC=1
            ;;
@@ -40409,7 +41417,7 @@ printf "%s\n" "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_stores_incomplete" in
         *no) ;;
         *)
-printf "%s\n" "#define MBRTOWC_STORES_INCOMPLETE_BUG 1" >>confdefs.h
+printf '%s\n' "#define MBRTOWC_STORES_INCOMPLETE_BUG 1" >>confdefs.h
 
            REPLACE_MBRTOWC=1
            ;;
@@ -40417,7 +41425,7 @@ printf "%s\n" "#define MBRTOWC_STORES_INCOMPLETE_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_empty_input" in
         *yes) ;;
         *)
-printf "%s\n" "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
+printf '%s\n' "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
 
            REPLACE_MBRTOWC=1
            ;;
@@ -40425,7 +41433,7 @@ printf "%s\n" "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in
         *yes) ;;
         *)
-printf "%s\n" "#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
+printf '%s\n' "#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
 
            REPLACE_MBRTOWC=1
            ;;
@@ -40438,13 +41446,13 @@ printf "%s\n" "#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
       *)
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
 printf %s "checking whether imported symbols can be declared weak... " >&6; }
 if test ${gl_cv_have_weak+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
        cygwin*)
                                     gl_cv_have_weak="guessing no"
          ;;
@@ -40479,17 +41487,18 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Extensible Linking Format" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1
 then :
   gl_cv_have_weak="guessing yes"
-else $as_nop
-  gl_cv_have_weak="guessing no"
+else case e in #(
+  e) gl_cv_have_weak="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -40502,11 +41511,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_have_weak=yes
-else $as_nop
-  gl_cv_have_weak=no
+else case e in #(
+  e) gl_cv_have_weak=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
          fi
@@ -40536,14 +41547,15 @@ EOF
          esac
          ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
-printf "%s\n" "$gl_cv_have_weak" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
+printf '%s\n' "$gl_cv_have_weak" >&6; }
   case "$gl_cv_have_weak" in
     *yes)
 
-printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
+printf '%s\n' "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
 
       ;;
   esac
@@ -40597,13 +41609,13 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS="$CFLAGS"
+else case e in #(
+  e) gl_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Werror"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -40619,22 +41631,24 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_cc_vis_werror=yes
-else $as_nop
-  gl_cv_cc_vis_werror=no
+else case e in #(
+  e) gl_cv_cc_vis_werror=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        CFLAGS="$gl_save_CFLAGS"
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS="$CFLAGS"
+else case e in #(
+  e) gl_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fvisibility=hidden"
                                           if test $gl_cv_cc_vis_werror = yes; then
          CFLAGS="$CFLAGS -Werror"
@@ -40663,15 +41677,17 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_cc_visibility=yes
-else $as_nop
-  gl_cv_cc_visibility=no
+else case e in #(
+  e) gl_cv_cc_visibility=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        CFLAGS="$gl_save_CFLAGS"
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -40680,7 +41696,7 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
 
 
 
-printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
@@ -40705,7 +41721,7 @@ printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
 
 
 
@@ -40730,13 +41746,13 @@ printf "%s\n" "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
 printf %s "checking whether mbrtowc handles incomplete characters... " >&6; }
 if test ${gl_cv_func_mbrtowc_incomplete_state+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   case "$host_os" in
                      # Guess no on AIX and OSF/1.
         aix* | osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
@@ -40747,8 +41763,8 @@ else $as_nop
         if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -40773,11 +41789,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_incomplete_state=yes
-else $as_nop
-  gl_cv_func_mbrtowc_incomplete_state=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_incomplete_state=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       else
@@ -40785,8 +41803,8 @@ fi
           if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -40811,30 +41829,33 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_incomplete_state=yes
-else $as_nop
-  gl_cv_func_mbrtowc_incomplete_state=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_incomplete_state=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
         fi
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
 
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
 printf %s "checking whether mbrtowc works as well as mbtowc... " >&6; }
 if test ${gl_cv_func_mbrtowc_sanitycheck+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   case "$host_os" in
                     # Guess no on Solaris 8.
         solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
@@ -40845,8 +41866,8 @@ else $as_nop
         if test "$cross_compiling" = yes
 then :
   :
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -40875,18 +41896,21 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_mbrtowc_sanitycheck=yes
-else $as_nop
-  gl_cv_func_mbrtowc_sanitycheck=no
+else case e in #(
+  e) gl_cv_func_mbrtowc_sanitycheck=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
-printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+printf '%s\n' "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
     REPLACE_MBSTATE_T=0
     case "$gl_cv_func_mbrtowc_incomplete_state" in
@@ -40908,14 +41932,15 @@ printf "%s\n" "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
     ac_fn_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
       #include <wchar.h>
 
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_mbsinit" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_MBSINIT $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_MBSINIT $ac_have_decl" >>confdefs.h
 
     if test $ac_cv_have_decl_mbsinit = yes; then
                         REPLACE_MBSINIT=1
@@ -40960,7 +41985,7 @@ printf "%s\n" "#define HAVE_DECL_MBSINIT $ac_have_decl" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
 
 
 
@@ -40968,13 +41993,13 @@ printf "%s\n" "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
 
 
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbswidth is declared in <wchar.h>" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbswidth is declared in <wchar.h>" >&5
 printf %s "checking whether mbswidth is declared in <wchar.h>... " >&6; }
 if test ${ac_cv_have_decl_mbswidth+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
 
@@ -40991,31 +42016,33 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_have_decl_mbswidth=yes
-else $as_nop
-  ac_cv_have_decl_mbswidth=no
+else case e in #(
+  e) ac_cv_have_decl_mbswidth=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_mbswidth" >&5
-printf "%s\n" "$ac_cv_have_decl_mbswidth" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_mbswidth" >&5
+printf '%s\n' "$ac_cv_have_decl_mbswidth" >&6; }
   if test $ac_cv_have_decl_mbswidth = yes; then
     ac_val=1
   else
     ac_val=0
   fi
 
-printf "%s\n" "#define HAVE_DECL_MBSWIDTH_IN_WCHAR_H $ac_val" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_MBSWIDTH_IN_WCHAR_H $ac_val" >>confdefs.h
 
 
 
 
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
              #include <wchar.h>
@@ -41030,20 +42057,22 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_type_mbstate_t=yes
-else $as_nop
-  ac_cv_type_mbstate_t=no
+else case e in #(
+  e) ac_cv_type_mbstate_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
 
-printf "%s\n" "#define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
 
-printf "%s\n" "#define mbstate_t int" >>confdefs.h
+printf '%s\n' "#define mbstate_t int" >>confdefs.h
 
    fi
 
@@ -41064,7 +42093,7 @@ printf "%s\n" "#define mbstate_t int" >>confdefs.h
   ac_fn_c_check_header_compile "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default"
 if test "x$ac_cv_header_bp_sym_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_BP_SYM_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_BP_SYM_H 1" >>confdefs.h
 
 fi
 
@@ -41085,7 +42114,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
 
 
 
@@ -41098,7 +42127,7 @@ printf "%s\n" "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "#define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -41136,7 +42165,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
 
 
 
@@ -41171,7 +42200,7 @@ printf "%s\n" "#define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
   fi
 
 
-printf "%s\n" "#define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
 
 
 
@@ -41188,13 +42217,13 @@ printf "%s\n" "#define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
 
 
 
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for obstacks that work with any size object" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for obstacks that work with any size object" >&5
 printf %s "checking for obstacks that work with any size object... " >&6; }
 if test ${ac_cv_func_obstack+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "obstack.h"
              void *obstack_chunk_alloc (size_t n) { return 0; }
@@ -41216,17 +42245,19 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_func_obstack=yes
-else $as_nop
-  ac_cv_func_obstack=no
+else case e in #(
+  e) ac_cv_func_obstack=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_obstack" >&5
-printf "%s\n" "$ac_cv_func_obstack" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_obstack" >&5
+printf '%s\n' "$ac_cv_func_obstack" >&6; }
    if test "$ac_cv_func_obstack" = yes; then
 
-printf "%s\n" "#define HAVE_OBSTACK 1" >>confdefs.h
+printf '%s\n' "#define HAVE_OBSTACK 1" >>confdefs.h
 
    else
 
@@ -41289,7 +42320,7 @@ printf "%s\n" "#define HAVE_OBSTACK 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_OBSTACK_PRINTF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_OBSTACK_PRINTF 1" >>confdefs.h
 
 
 
@@ -41307,13 +42338,13 @@ printf "%s\n" "#define GNULIB_TEST_OBSTACK_PRINTF 1" >>confdefs.h
       fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
 printf %s "checking whether open recognizes a trailing slash... " >&6; }
 if test ${gl_cv_func_open_slash+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # Assume that if we have lstat, we can also check symlinks.
+else case e in #(
+  e) # Assume that if we have lstat, we can also check symlinks.
      if test $ac_cv_func_lstat = yes; then
        touch conftest.tmp
        ln -s conftest.tmp conftest.lnk
@@ -41328,8 +42359,8 @@ then :
             gl_cv_func_open_slash="guessing yes" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <fcntl.h>
@@ -41355,22 +42386,25 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_open_slash=yes
-else $as_nop
-  gl_cv_func_open_slash=no
+else case e in #(
+  e) gl_cv_func_open_slash=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
      rm -f conftest.sl conftest.tmp conftest.lnk
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
-printf "%s\n" "$gl_cv_func_open_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
+printf '%s\n' "$gl_cv_func_open_slash" >&6; }
   case "$gl_cv_func_open_slash" in
     *no)
 
-printf "%s\n" "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
       ;;
   esac
@@ -41429,7 +42463,7 @@ printf "%s\n" "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_OPEN 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_OPEN 1" >>confdefs.h
 
 
 
@@ -41446,13 +42480,13 @@ printf "%s\n" "#define GNULIB_TEST_OPEN 1" >>confdefs.h
   fi
   case ${gl_cv_func_strerror_r_works-unset} in
     unset|*yes)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether perror matches strerror" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether perror matches strerror" >&5
 printf %s "checking whether perror matches strerror... " >&6; }
 if test ${gl_cv_func_perror_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                        # Guess yes on musl systems.
@@ -41463,8 +42497,8 @@ then :
               *)       gl_cv_func_perror_works="$gl_cross_guess_normal" ;;
             esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <errno.h>
                 #include <stdio.h>
@@ -41495,17 +42529,20 @@ then :
               gl_cv_func_perror_works=no
             fi
             rm -rf conftest.txt1 conftest.txt2
-else $as_nop
-  gl_cv_func_perror_works=no
+else case e in #(
+  e) gl_cv_func_perror_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+         ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_perror_works" >&5
-printf "%s\n" "$gl_cv_func_perror_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_perror_works" >&5
+printf '%s\n' "$gl_cv_func_perror_works" >&6; }
       case "$gl_cv_func_perror_works" in
         *yes) ;;
         *) REPLACE_PERROR=1 ;;
@@ -41543,7 +42580,7 @@ printf "%s\n" "$gl_cv_func_perror_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_PERROR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_PERROR 1" >>confdefs.h
 
 
 
@@ -41582,7 +42619,7 @@ printf "%s\n" "#define GNULIB_TEST_PERROR 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_PIPE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_PIPE 1" >>confdefs.h
 
 
 
@@ -41611,13 +42648,13 @@ printf "%s\n" "#define GNULIB_TEST_PIPE 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_PIPE2 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_PIPE2 1" >>confdefs.h
 
 
 
 
 
-printf "%s\n" "#define GNULIB_PIPE2_SAFER 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_PIPE2_SAFER 1" >>confdefs.h
 
 
 
@@ -41650,7 +42687,7 @@ printf "%s\n" "#define GNULIB_PIPE2_SAFER 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWN 1" >>confdefs.h
 
 
 
@@ -41694,7 +42731,7 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR 1" >>confdefs.h
 
 
 
@@ -41707,13 +42744,13 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR 1" >>confde
   if test $REPLACE_POSIX_SPAWN = 1; then
     REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1
   else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_addclose works" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_addclose works" >&5
 printf %s "checking whether posix_spawn_file_actions_addclose works... " >&6; }
 if test ${gl_cv_func_posix_spawn_file_actions_addclose_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   # Guess no on musl libc and Solaris, yes otherwise.
           case "$host_os" in
@@ -41724,8 +42761,8 @@ then :
             *)        gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes" ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <spawn.h>
@@ -41742,17 +42779,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_posix_spawn_file_actions_addclose_works=yes
-else $as_nop
-  gl_cv_func_posix_spawn_file_actions_addclose_works=no
+else case e in #(
+  e) gl_cv_func_posix_spawn_file_actions_addclose_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_addclose_works" >&5
-printf "%s\n" "$gl_cv_func_posix_spawn_file_actions_addclose_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_addclose_works" >&5
+printf '%s\n' "$gl_cv_func_posix_spawn_file_actions_addclose_works" >&6; }
     case "$gl_cv_func_posix_spawn_file_actions_addclose_works" in
       *yes) ;;
       *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1 ;;
@@ -41786,7 +42826,7 @@ printf "%s\n" "$gl_cv_func_posix_spawn_file_actions_addclose_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE 1" >>confdefs.h
 
 
 
@@ -41799,13 +42839,13 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE 1" >>confde
   if test $REPLACE_POSIX_SPAWN = 1; then
     REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1
   else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_adddup2 works" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_adddup2 works" >&5
 printf %s "checking whether posix_spawn_file_actions_adddup2 works... " >&6; }
 if test ${gl_cv_func_posix_spawn_file_actions_adddup2_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   # Guess no on musl libc and Solaris, yes otherwise.
           case "$host_os" in
@@ -41816,8 +42856,8 @@ then :
             *)        gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <spawn.h>
@@ -41834,17 +42874,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_posix_spawn_file_actions_adddup2_works=yes
-else $as_nop
-  gl_cv_func_posix_spawn_file_actions_adddup2_works=no
+else case e in #(
+  e) gl_cv_func_posix_spawn_file_actions_adddup2_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_adddup2_works" >&5
-printf "%s\n" "$gl_cv_func_posix_spawn_file_actions_adddup2_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_adddup2_works" >&5
+printf '%s\n' "$gl_cv_func_posix_spawn_file_actions_adddup2_works" >&6; }
     case "$gl_cv_func_posix_spawn_file_actions_adddup2_works" in
       *yes) ;;
       *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1 ;;
@@ -41878,7 +42921,7 @@ printf "%s\n" "$gl_cv_func_posix_spawn_file_actions_adddup2_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 1" >>confdefs.h
 
 
 
@@ -41891,13 +42934,13 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 1" >>confdef
   if test $REPLACE_POSIX_SPAWN = 1; then
     REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1
   else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_addopen works" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether posix_spawn_file_actions_addopen works" >&5
 printf %s "checking whether posix_spawn_file_actions_addopen works... " >&6; }
 if test ${gl_cv_func_posix_spawn_file_actions_addopen_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   # Guess no on musl libc and Solaris, yes otherwise.
           case "$host_os" in
@@ -41908,8 +42951,8 @@ then :
             *)        gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <spawn.h>
@@ -41928,17 +42971,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_posix_spawn_file_actions_addopen_works=yes
-else $as_nop
-  gl_cv_func_posix_spawn_file_actions_addopen_works=no
+else case e in #(
+  e) gl_cv_func_posix_spawn_file_actions_addopen_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_addopen_works" >&5
-printf "%s\n" "$gl_cv_func_posix_spawn_file_actions_addopen_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_posix_spawn_file_actions_addopen_works" >&5
+printf '%s\n' "$gl_cv_func_posix_spawn_file_actions_addopen_works" >&6; }
     case "$gl_cv_func_posix_spawn_file_actions_addopen_works" in
       *yes) ;;
       *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1 ;;
@@ -41972,7 +43018,7 @@ printf "%s\n" "$gl_cv_func_posix_spawn_file_actions_addopen_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 1" >>confdefs.h
 
 
 
@@ -42006,7 +43052,7 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 1" >>confdef
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_DESTROY 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_DESTROY 1" >>confdefs.h
 
 
 
@@ -42040,7 +43086,7 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_DESTROY 1" >>confdef
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_INIT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_INIT 1" >>confdefs.h
 
 
 
@@ -42074,7 +43120,7 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWN_FILE_ACTIONS_INIT 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_DESTROY 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWNATTR_DESTROY 1" >>confdefs.h
 
 
 
@@ -42108,7 +43154,7 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_DESTROY 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_INIT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWNATTR_INIT 1" >>confdefs.h
 
 
 
@@ -42142,7 +43188,7 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_INIT 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_SETFLAGS 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWNATTR_SETFLAGS 1" >>confdefs.h
 
 
 
@@ -42176,7 +43222,7 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_SETFLAGS 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_SETPGROUP 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWNATTR_SETPGROUP 1" >>confdefs.h
 
 
 
@@ -42210,7 +43256,7 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_SETPGROUP 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_SETSIGMASK 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWNATTR_SETSIGMASK 1" >>confdefs.h
 
 
 
@@ -42244,7 +43290,7 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNATTR_SETSIGMASK 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNP 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_POSIX_SPAWNP 1" >>confdefs.h
 
 
 
@@ -42254,13 +43300,13 @@ printf "%s\n" "#define GNULIB_TEST_POSIX_SPAWNP 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether frexp works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether frexp works" >&5
 printf %s "checking whether frexp works... " >&6; }
 if test ${gl_cv_func_frexp_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -42275,11 +43321,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Good" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Good" >/dev/null 2>&1
 then :
   gl_cv_func_frexp_works="guessing yes"
-else $as_nop
-  gl_cv_func_frexp_works="guessing no"
+else case e in #(
+  e) gl_cv_func_frexp_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -42287,8 +43334,8 @@ rm -rf conftest*
            *) gl_cv_func_frexp_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -42358,34 +43405,37 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_frexp_works=yes
-else $as_nop
-  gl_cv_func_frexp_works=no
+else case e in #(
+  e) gl_cv_func_frexp_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexp_works" >&5
-printf "%s\n" "$gl_cv_func_frexp_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexp_works" >&5
+printf '%s\n' "$gl_cv_func_frexp_works" >&6; }
 
     case "$gl_cv_func_frexp_works" in
       *yes)
 
-printf "%s\n" "#define HAVE_FREXP_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_FREXP_IN_LIBC 1" >>confdefs.h
 
         ;;
     esac
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ldexp can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ldexp can be used without linking with libm" >&5
 printf %s "checking whether ldexp can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_ldexp_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -42402,18 +43452,20 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_ldexp_no_libm=yes
-else $as_nop
-  gl_cv_func_ldexp_no_libm=no
+else case e in #(
+  e) gl_cv_func_ldexp_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexp_no_libm" >&5
-printf "%s\n" "$gl_cv_func_ldexp_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexp_no_libm" >&5
+printf '%s\n' "$gl_cv_func_ldexp_no_libm" >&6; }
   if test $gl_cv_func_ldexp_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_LDEXP_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_LDEXP_IN_LIBC 1" >>confdefs.h
 
   fi
 
@@ -42422,13 +43474,13 @@ printf "%s\n" "#define HAVE_LDEXP_IN_LIBC 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether frexpl() can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether frexpl() can be used without linking with libm" >&5
 printf %s "checking whether frexpl() can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_frexpl_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -42444,26 +43496,28 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_frexpl_no_libm=yes
-else $as_nop
-  gl_cv_func_frexpl_no_libm=no
+else case e in #(
+  e) gl_cv_func_frexpl_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexpl_no_libm" >&5
-printf "%s\n" "$gl_cv_func_frexpl_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexpl_no_libm" >&5
+printf '%s\n' "$gl_cv_func_frexpl_no_libm" >&6; }
 
   if test $gl_cv_func_frexpl_no_libm = yes; then
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether frexpl works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether frexpl works" >&5
 printf %s "checking whether frexpl works... " >&6; }
 if test ${gl_cv_func_frexpl_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -42473,8 +43527,8 @@ then :
            *) gl_cv_func_frexpl_works="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -42575,17 +43629,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_frexpl_works=yes
-else $as_nop
-  gl_cv_func_frexpl_works=no
+else case e in #(
+  e) gl_cv_func_frexpl_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexpl_works" >&5
-printf "%s\n" "$gl_cv_func_frexpl_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexpl_works" >&5
+printf '%s\n' "$gl_cv_func_frexpl_works" >&6; }
 
     case "$gl_cv_func_frexpl_works" in
       *yes) gl_func_frexpl_no_libm=yes ;;
@@ -42597,26 +43654,27 @@ printf "%s\n" "$gl_cv_func_frexpl_works" >&6; }
   fi
   if test $gl_func_frexpl_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_FREXPL_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_FREXPL_IN_LIBC 1" >>confdefs.h
 
             ac_fn_check_decl "$LINENO" "frexpl" "ac_cv_have_decl_frexpl" "#include <math.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_frexpl" = xyes
 then :
 
-else $as_nop
-  HAVE_DECL_FREXPL=0
+else case e in #(
+  e) HAVE_DECL_FREXPL=0 ;;
+esac
 fi
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ldexpl() can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ldexpl() can be used without linking with libm" >&5
 printf %s "checking whether ldexpl() can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_ldexpl_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -42632,26 +43690,28 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_ldexpl_no_libm=yes
-else $as_nop
-  gl_cv_func_ldexpl_no_libm=no
+else case e in #(
+  e) gl_cv_func_ldexpl_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_no_libm" >&5
-printf "%s\n" "$gl_cv_func_ldexpl_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_no_libm" >&5
+printf '%s\n' "$gl_cv_func_ldexpl_no_libm" >&6; }
 
   if test $gl_cv_func_ldexpl_no_libm = yes; then
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ldexpl works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ldexpl works" >&5
 printf %s "checking whether ldexpl works... " >&6; }
 if test ${gl_cv_func_ldexpl_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -42662,8 +43722,8 @@ then :
            *)               gl_cv_func_ldexpl_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -42693,30 +43753,34 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_ldexpl_works=yes
-else $as_nop
-  gl_cv_func_ldexpl_works=no
+else case e in #(
+  e) gl_cv_func_ldexpl_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_works" >&5
-printf "%s\n" "$gl_cv_func_ldexpl_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexpl_works" >&5
+printf '%s\n' "$gl_cv_func_ldexpl_works" >&6; }
 
     case "$gl_cv_func_ldexpl_works" in
       *yes)
 
-printf "%s\n" "#define HAVE_LDEXPL_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_LDEXPL_IN_LIBC 1" >>confdefs.h
 
                         ac_fn_check_decl "$LINENO" "ldexpl" "ac_cv_have_decl_ldexpl" "#include <math.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ldexpl" = xyes
 then :
 
-else $as_nop
-  HAVE_DECL_LDEXPL=0
+else case e in #(
+  e) HAVE_DECL_LDEXPL=0 ;;
+esac
 fi
         ;;
     esac
@@ -42740,7 +43804,7 @@ fi
 
   REPLACE_PRINTF=1
 
-printf "%s\n" "#define REPLACE_PRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_PRINTF_POSIX 1" >>confdefs.h
 
   :
 
@@ -42761,30 +43825,32 @@ printf "%s\n" "#define REPLACE_PRINTF_POSIX 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_PRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_PRINTF_POSIX 1" >>confdefs.h
 
 
 
 
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 
 
       :
@@ -42799,7 +43865,7 @@ printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>
   ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
 if test "x$ac_cv_func_raise" = xyes
 then :
-  printf "%s\n" "#define HAVE_RAISE 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_RAISE 1" >>confdefs.h
 
 fi
 
@@ -42860,7 +43926,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_RAISE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_RAISE 1" >>confdefs.h
 
 
 
@@ -42871,7 +43937,7 @@ printf "%s\n" "#define GNULIB_TEST_RAISE 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "#define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -42907,7 +43973,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
 
 
 
@@ -43433,13 +44499,13 @@ fi
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
 printf %s "checking for readline... " >&6; }
 if test ${gl_cv_lib_readline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     gl_cv_lib_readline=no
     am_save_LIBS="$LIBS"
                         for extra_lib in "" ncurses termcap curses; do
@@ -43475,24 +44541,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
       fi
     done
     LIBS="$am_save_LIBS"
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_lib_readline" >&5
-printf "%s\n" "$gl_cv_lib_readline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_lib_readline" >&5
+printf '%s\n' "$gl_cv_lib_readline" >&6; }
 
   if test "$gl_cv_lib_readline" != no; then
 
-printf "%s\n" "#define HAVE_READLINE 1" >>confdefs.h
+printf '%s\n' "#define HAVE_READLINE 1" >>confdefs.h
 
     extra_lib=`echo "$gl_cv_lib_readline" | sed -n -e 's/yes, requires //p'`
     if test -n "$extra_lib"; then
       LIBREADLINE="$LIBREADLINE $extra_lib"
       LTLIBREADLINE="$LTLIBREADLINE $extra_lib"
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libreadline" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libreadline" >&5
 printf %s "checking how to link with libreadline... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBREADLINE" >&5
-printf "%s\n" "$LIBREADLINE" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBREADLINE" >&5
+printf '%s\n' "$LIBREADLINE" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBREADLINE=
@@ -43504,13 +44571,13 @@ printf "%s\n" "$LIBREADLINE" >&6; }
   ac_fn_c_check_header_compile "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_readline_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_READLINE_READLINE_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_READLINE_READLINE_H 1" >>confdefs.h
 
 fi
 ac_fn_c_check_header_compile "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_history_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_READLINE_HISTORY_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_READLINE_HISTORY_H 1" >>confdefs.h
 
 fi
 
@@ -43536,13 +44603,13 @@ fi
   if test $ac_cv_func_readlink = no; then
     HAVE_READLINK=0
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
 printf %s "checking whether readlink signature is correct... " >&6; }
 if test ${gl_cv_decl_readlink_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
       /* Cause compilation failure if original declaration has wrong type.  */
@@ -43558,20 +44625,22 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_decl_readlink_works=yes
-else $as_nop
-  gl_cv_decl_readlink_works=no
+else case e in #(
+  e) gl_cv_decl_readlink_works=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
-printf "%s\n" "$gl_cv_decl_readlink_works" >&6; }
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
+printf '%s\n' "$gl_cv_decl_readlink_works" >&6; }
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
 printf %s "checking whether readlink handles trailing slash correctly... " >&6; }
 if test ${gl_cv_func_readlink_trailing_slash+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # We have readlink, so assume ln -s works.
+else case e in #(
+  e) # We have readlink, so assume ln -s works.
        ln -s conftest.no-such conftest.link
        ln -s conftest.link conftest.lnk2
        if test "$cross_compiling" = yes
@@ -43588,8 +44657,8 @@ then :
               gl_cv_func_readlink_trailing_slash="$gl_cross_guess_normal" ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 
@@ -43605,17 +44674,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_readlink_trailing_slash=yes
-else $as_nop
-  gl_cv_func_readlink_trailing_slash=no
+else case e in #(
+  e) gl_cv_func_readlink_trailing_slash=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-      rm -f conftest.link conftest.lnk2
+      rm -f conftest.link conftest.lnk2 ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
-printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
+printf '%s\n' "$gl_cv_func_readlink_trailing_slash" >&6; }
     case "$gl_cv_func_readlink_trailing_slash" in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -43624,19 +44696,19 @@ printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
         ;;
       *)
 
-printf "%s\n" "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
     esac
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
 printf %s "checking whether readlink truncates results correctly... " >&6; }
 if test ${gl_cv_func_readlink_truncate+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # We have readlink, so assume ln -s works.
+else case e in #(
+  e) # We have readlink, so assume ln -s works.
        ln -s ab conftest.link
        if test "$cross_compiling" = yes
 then :
@@ -43652,8 +44724,8 @@ then :
               gl_cv_func_readlink_truncate="$gl_cross_guess_normal" ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 
@@ -43669,17 +44741,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_readlink_truncate=yes
-else $as_nop
-  gl_cv_func_readlink_truncate=no
+else case e in #(
+  e) gl_cv_func_readlink_truncate=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-      rm -f conftest.link conftest.lnk2
+      rm -f conftest.link conftest.lnk2 ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
-printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
+printf '%s\n' "$gl_cv_func_readlink_truncate" >&6; }
     case $gl_cv_func_readlink_truncate in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -43688,7 +44763,7 @@ printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
         ;;
       *)
 
-printf "%s\n" "#define READLINK_TRUNCATE_BUG 1" >>confdefs.h
+printf '%s\n' "#define READLINK_TRUNCATE_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
@@ -43725,7 +44800,7 @@ printf "%s\n" "#define READLINK_TRUNCATE_BUG 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_READLINK 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_READLINK 1" >>confdefs.h
 
 
 
@@ -43734,13 +44809,13 @@ printf "%s\n" "#define GNULIB_TEST_READLINK 1" >>confdefs.h
 
   if test $REPLACE_REALLOC = 0; then
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realloc (0, 0) returns nonnull" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether realloc (0, 0) returns nonnull" >&5
 printf %s "checking whether realloc (0, 0) returns nonnull... " >&6; }
 if test ${ac_cv_func_realloc_0_nonnull+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
           # Guess yes on platforms where we know the result.
@@ -43752,8 +44827,8 @@ then :
           *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
@@ -43772,17 +44847,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_func_realloc_0_nonnull=yes
-else $as_nop
-  ac_cv_func_realloc_0_nonnull=no
+else case e in #(
+  e) ac_cv_func_realloc_0_nonnull=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_realloc_0_nonnull" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
+printf '%s\n' "$ac_cv_func_realloc_0_nonnull" >&6; }
   case $ac_cv_func_realloc_0_nonnull in #(
   *yes) :
      ;; #(
@@ -43838,7 +44916,7 @@ esac
 
 
 
-printf "%s\n" "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -43850,7 +44928,7 @@ printf "%s\n" "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray"
 if test "x$ac_cv_func_reallocarray" = xyes
 then :
-  printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_REALLOCARRAY 1" >>confdefs.h
 
 fi
 
@@ -43875,7 +44953,7 @@ fi
   fi
 
 
-printf "%s\n" "#define GNULIB_REALLOCARRAY 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_REALLOCARRAY 1" >>confdefs.h
 
 
 
@@ -43893,7 +44971,7 @@ printf "%s\n" "#define GNULIB_REALLOCARRAY 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_REALLOCARRAY 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_REALLOCARRAY 1" >>confdefs.h
 
 
 
@@ -43946,7 +45024,7 @@ printf "%s\n" "#define GNULIB_TEST_REALLOCARRAY 1" >>confdefs.h
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -43962,7 +45040,7 @@ fi
 
   if test "$gl_cv_func_malloc_posix" = yes; then
 
-printf "%s\n" "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC=1
@@ -43978,13 +45056,13 @@ printf "%s\n" "#define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
 
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
@@ -44005,19 +45083,21 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_free_preserves_errno=yes
-else $as_nop
-  gl_cv_func_free_preserves_errno=no
+else case e in #(
+  e) gl_cv_func_free_preserves_errno=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
 
-printf "%s\n" "#define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "#define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -44032,7 +45112,7 @@ printf "%s\n" "#define HAVE_FREE_POSIX 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "#define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -44047,7 +45127,7 @@ fi
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "#define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -44075,14 +45155,14 @@ fi
   ac_fn_c_check_header_compile "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
 if test "x$ac_cv_header_search_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_SEARCH_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SEARCH_H 1" >>confdefs.h
 
 fi
 
   ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
 if test "x$ac_cv_func_tsearch" = xyes
 then :
-  printf "%s\n" "#define HAVE_TSEARCH 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_TSEARCH 1" >>confdefs.h
 
 fi
 
@@ -44096,13 +45176,13 @@ fi
 
 
 
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether rename honors trailing slash on destination" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether rename honors trailing slash on destination" >&5
 printf %s "checking whether rename honors trailing slash on destination... " >&6; }
 if test ${gl_cv_func_rename_slash_dst_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk
+else case e in #(
+  e) rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk
     touch conftest.f && touch conftest.f1 && mkdir conftest.d1 ||
       as_fn_error $? "cannot create temporary files" "$LINENO" 5
     # Assume that if we have lstat, we can also check symlinks.
@@ -44122,8 +45202,8 @@ then :
          *)               gl_cv_func_rename_slash_dst_works="$gl_cross_guess_normal" ;;
        esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #        include <stdio.h>
@@ -44150,35 +45230,38 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_rename_slash_dst_works=yes
-else $as_nop
-  gl_cv_func_rename_slash_dst_works=no
+else case e in #(
+  e) gl_cv_func_rename_slash_dst_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
     rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_slash_dst_works" >&5
-printf "%s\n" "$gl_cv_func_rename_slash_dst_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_slash_dst_works" >&5
+printf '%s\n' "$gl_cv_func_rename_slash_dst_works" >&6; }
   case "$gl_cv_func_rename_slash_dst_works" in
     *yes) ;;
     *)
       REPLACE_RENAME=1
 
-printf "%s\n" "#define RENAME_TRAILING_SLASH_DEST_BUG 1" >>confdefs.h
+printf '%s\n' "#define RENAME_TRAILING_SLASH_DEST_BUG 1" >>confdefs.h
 
       ;;
   esac
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether rename honors trailing slash on source" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether rename honors trailing slash on source" >&5
 printf %s "checking whether rename honors trailing slash on source... " >&6; }
 if test ${gl_cv_func_rename_slash_src_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk
+else case e in #(
+  e) rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk
     touch conftest.f && touch conftest.f1 && mkdir conftest.d1 ||
       as_fn_error $? "cannot create temporary files" "$LINENO" 5
     # Assume that if we have lstat, we can also check symlinks.
@@ -44198,8 +45281,8 @@ then :
          *)               gl_cv_func_rename_slash_src_works="$gl_cross_guess_normal" ;;
        esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #        include <stdio.h>
@@ -44226,36 +45309,39 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_rename_slash_src_works=yes
-else $as_nop
-  gl_cv_func_rename_slash_src_works=no
+else case e in #(
+  e) gl_cv_func_rename_slash_src_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
     rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_slash_src_works" >&5
-printf "%s\n" "$gl_cv_func_rename_slash_src_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_slash_src_works" >&5
+printf '%s\n' "$gl_cv_func_rename_slash_src_works" >&6; }
   case "$gl_cv_func_rename_slash_src_works" in
     *yes) ;;
     *)
       REPLACE_RENAME=1
 
-printf "%s\n" "#define RENAME_TRAILING_SLASH_SOURCE_BUG 1" >>confdefs.h
+printf '%s\n' "#define RENAME_TRAILING_SLASH_SOURCE_BUG 1" >>confdefs.h
 
       ;;
   esac
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether rename manages hard links correctly" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether rename manages hard links correctly" >&5
 printf %s "checking whether rename manages hard links correctly... " >&6; }
 if test ${gl_cv_func_rename_link_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $ac_cv_func_link = yes; then
+else case e in #(
+  e) if test $ac_cv_func_link = yes; then
        if test $cross_compiling != yes; then
          rm -rf conftest.f conftest.f1 conftest.f2
          if touch conftest.f conftest.f2 && ln conftest.f conftest.f1 &&
@@ -44264,8 +45350,8 @@ else $as_nop
 then :
                 :
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #               include <errno.h>
@@ -44305,11 +45391,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_rename_link_works=yes
-else $as_nop
-  gl_cv_func_rename_link_works=no
+else case e in #(
+  e) gl_cv_func_rename_link_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
          else
@@ -44331,27 +45419,28 @@ fi
      else
        gl_cv_func_rename_link_works=yes
      fi
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_link_works" >&5
-printf "%s\n" "$gl_cv_func_rename_link_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_link_works" >&5
+printf '%s\n' "$gl_cv_func_rename_link_works" >&6; }
   case "$gl_cv_func_rename_link_works" in
     *yes) ;;
     *)
       REPLACE_RENAME=1
 
-printf "%s\n" "#define RENAME_HARD_LINK_BUG 1" >>confdefs.h
+printf '%s\n' "#define RENAME_HARD_LINK_BUG 1" >>confdefs.h
 
       ;;
   esac
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether rename manages existing destinations correctly" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether rename manages existing destinations correctly" >&5
 printf %s "checking whether rename manages existing destinations correctly... " >&6; }
 if test ${gl_cv_func_rename_dest_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -rf conftest.f conftest.d1 conftest.d2
+else case e in #(
+  e) rm -rf conftest.f conftest.d1 conftest.d2
     touch conftest.f && mkdir conftest.d1 conftest.d2 ||
       as_fn_error $? "cannot create temporary files" "$LINENO" 5
     if test "$cross_compiling" = yes
@@ -44367,8 +45456,8 @@ then :
          *)               gl_cv_func_rename_dest_works="$gl_cross_guess_normal" ;;
        esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #        include <stdio.h>
@@ -44391,24 +45480,27 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_rename_dest_works=yes
-else $as_nop
-  gl_cv_func_rename_dest_works=no
+else case e in #(
+  e) gl_cv_func_rename_dest_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
     rm -rf conftest.f conftest.d1 conftest.d2
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_dest_works" >&5
-printf "%s\n" "$gl_cv_func_rename_dest_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rename_dest_works" >&5
+printf '%s\n' "$gl_cv_func_rename_dest_works" >&6; }
   case "$gl_cv_func_rename_dest_works" in
     *yes) ;;
     *)
       REPLACE_RENAME=1
 
-printf "%s\n" "#define RENAME_DEST_EXISTS_BUG 1" >>confdefs.h
+printf '%s\n' "#define RENAME_DEST_EXISTS_BUG 1" >>confdefs.h
 
       ;;
   esac
@@ -44440,7 +45532,7 @@ printf "%s\n" "#define RENAME_DEST_EXISTS_BUG 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_RENAME 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_RENAME 1" >>confdefs.h
 
 
 
@@ -44460,7 +45552,7 @@ printf "%s\n" "#define GNULIB_TEST_RENAME 1" >>confdefs.h
 if test "x$ac_cv_member_struct_sigaction_sa_sigaction" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_SIGACTION_SA_SIGACTION 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_SIGACTION_SA_SIGACTION 1" >>confdefs.h
 
 
 fi
@@ -44496,7 +45588,7 @@ fi
 if test "x$ac_cv_type_siginfo_t" = xyes
 then :
 
-printf "%s\n" "#define HAVE_SIGINFO_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_SIGINFO_T 1" >>confdefs.h
 
 
 fi
@@ -44521,7 +45613,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_SIGACTION 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_SIGACTION 1" >>confdefs.h
 
 
 
@@ -44534,13 +45626,13 @@ printf "%s\n" "#define GNULIB_TEST_SIGACTION 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for signbit macro" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for signbit macro" >&5
 printf %s "checking for signbit macro... " >&6; }
 if test ${gl_cv_func_signbit+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -44554,8 +45646,8 @@ then :
            *)             gl_cv_func_signbit="$gl_cross_guess_normal" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -44648,24 +45740,27 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_signbit=yes
-else $as_nop
-  gl_cv_func_signbit=no
+else case e in #(
+  e) gl_cv_func_signbit=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_signbit" >&5
-printf "%s\n" "$gl_cv_func_signbit" >&6; }
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for signbit compiler built-ins" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_signbit" >&5
+printf '%s\n' "$gl_cv_func_signbit" >&6; }
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for signbit compiler built-ins" >&5
 printf %s "checking for signbit compiler built-ins... " >&6; }
 if test ${gl_cv_func_signbit_builtins+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -44684,8 +45779,8 @@ then :
            *)             gl_cv_func_signbit_builtins="$gl_cross_guess_normal" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if (__GNUC__ >= 4) || (__clang_major__ >= 4)
@@ -44775,17 +45870,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_signbit_builtins=yes
-else $as_nop
-  gl_cv_func_signbit_builtins=no
+else case e in #(
+  e) gl_cv_func_signbit_builtins=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_signbit_builtins" >&5
-printf "%s\n" "$gl_cv_func_signbit_builtins" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_signbit_builtins" >&5
+printf '%s\n' "$gl_cv_func_signbit_builtins" >&6; }
       case "$gl_cv_func_signbit_builtins" in
     *yes)
       REPLACE_SIGNBIT_USING_BUILTINS=1
@@ -44807,20 +45905,20 @@ printf "%s\n" "$gl_cv_func_signbit_builtins" >&6; }
   if test $REPLACE_SIGNBIT = 1; then
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the sign bit in a 'float'" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to find the sign bit in a 'float'" >&5
 printf %s "checking where to find the sign bit in a 'float'... " >&6; }
 if test ${gl_cv_cc_float_signbit+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
                               gl_cv_cc_float_signbit="unknown"
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stddef.h>
@@ -44885,27 +45983,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_cc_float_signbit=`cat conftest.out`
-else $as_nop
-  gl_cv_cc_float_signbit="unknown"
+else case e in #(
+  e) gl_cv_cc_float_signbit="unknown" ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       rm -f conftest.out
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_float_signbit" >&5
-printf "%s\n" "$gl_cv_cc_float_signbit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_float_signbit" >&5
+printf '%s\n' "$gl_cv_cc_float_signbit" >&6; }
   case "$gl_cv_cc_float_signbit" in
     word*bit*)
       word=`echo "$gl_cv_cc_float_signbit" | sed -e 's/word //' -e 's/ bit.*//'`
       bit=`echo "$gl_cv_cc_float_signbit" | sed -e 's/word.*bit //'`
 
-printf "%s\n" "#define FLT_SIGNBIT_WORD $word" >>confdefs.h
+printf '%s\n' "#define FLT_SIGNBIT_WORD $word" >>confdefs.h
 
 
-printf "%s\n" "#define FLT_SIGNBIT_BIT $bit" >>confdefs.h
+printf '%s\n' "#define FLT_SIGNBIT_BIT $bit" >>confdefs.h
 
       ;;
   esac
@@ -44913,20 +46014,20 @@ printf "%s\n" "#define FLT_SIGNBIT_BIT $bit" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the sign bit in a 'double'" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to find the sign bit in a 'double'" >&5
 printf %s "checking where to find the sign bit in a 'double'... " >&6; }
 if test ${gl_cv_cc_double_signbit+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
                               gl_cv_cc_double_signbit="unknown"
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stddef.h>
@@ -44991,27 +46092,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_cc_double_signbit=`cat conftest.out`
-else $as_nop
-  gl_cv_cc_double_signbit="unknown"
+else case e in #(
+  e) gl_cv_cc_double_signbit="unknown" ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       rm -f conftest.out
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_double_signbit" >&5
-printf "%s\n" "$gl_cv_cc_double_signbit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_double_signbit" >&5
+printf '%s\n' "$gl_cv_cc_double_signbit" >&6; }
   case "$gl_cv_cc_double_signbit" in
     word*bit*)
       word=`echo "$gl_cv_cc_double_signbit" | sed -e 's/word //' -e 's/ bit.*//'`
       bit=`echo "$gl_cv_cc_double_signbit" | sed -e 's/word.*bit //'`
 
-printf "%s\n" "#define DBL_SIGNBIT_WORD $word" >>confdefs.h
+printf '%s\n' "#define DBL_SIGNBIT_WORD $word" >>confdefs.h
 
 
-printf "%s\n" "#define DBL_SIGNBIT_BIT $bit" >>confdefs.h
+printf '%s\n' "#define DBL_SIGNBIT_BIT $bit" >>confdefs.h
 
       ;;
   esac
@@ -45019,20 +46123,20 @@ printf "%s\n" "#define DBL_SIGNBIT_BIT $bit" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the sign bit in a 'long double'" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to find the sign bit in a 'long double'" >&5
 printf %s "checking where to find the sign bit in a 'long double'... " >&6; }
 if test ${gl_cv_cc_long_double_signbit+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
                               gl_cv_cc_long_double_signbit="unknown"
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stddef.h>
@@ -45097,27 +46201,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_cc_long_double_signbit=`cat conftest.out`
-else $as_nop
-  gl_cv_cc_long_double_signbit="unknown"
+else case e in #(
+  e) gl_cv_cc_long_double_signbit="unknown" ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       rm -f conftest.out
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_long_double_signbit" >&5
-printf "%s\n" "$gl_cv_cc_long_double_signbit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_long_double_signbit" >&5
+printf '%s\n' "$gl_cv_cc_long_double_signbit" >&6; }
   case "$gl_cv_cc_long_double_signbit" in
     word*bit*)
       word=`echo "$gl_cv_cc_long_double_signbit" | sed -e 's/word //' -e 's/ bit.*//'`
       bit=`echo "$gl_cv_cc_long_double_signbit" | sed -e 's/word.*bit //'`
 
-printf "%s\n" "#define LDBL_SIGNBIT_WORD $word" >>confdefs.h
+printf '%s\n' "#define LDBL_SIGNBIT_WORD $word" >>confdefs.h
 
 
-printf "%s\n" "#define LDBL_SIGNBIT_BIT $bit" >>confdefs.h
+printf '%s\n' "#define LDBL_SIGNBIT_BIT $bit" >>confdefs.h
 
       ;;
   esac
@@ -45125,23 +46232,24 @@ printf "%s\n" "#define LDBL_SIGNBIT_BIT $bit" >>confdefs.h
 
     if test "$gl_cv_cc_float_signbit" = unknown; then
             ac_fn_check_decl "$LINENO" "copysignf" "ac_cv_have_decl_copysignf" "#include <math.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_copysignf" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_COPYSIGNF $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_COPYSIGNF $ac_have_decl" >>confdefs.h
 
       if test "$ac_cv_have_decl_copysignf" = yes; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether copysignf can be used without linking with libm" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether copysignf can be used without linking with libm" >&5
 printf %s "checking whether copysignf can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_copysignf_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -45157,41 +46265,44 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_copysignf_no_libm=yes
-else $as_nop
-  gl_cv_func_copysignf_no_libm=no
+else case e in #(
+  e) gl_cv_func_copysignf_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+           ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_copysignf_no_libm" >&5
-printf "%s\n" "$gl_cv_func_copysignf_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_copysignf_no_libm" >&5
+printf '%s\n' "$gl_cv_func_copysignf_no_libm" >&6; }
         if test $gl_cv_func_copysignf_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_COPYSIGNF_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_COPYSIGNF_IN_LIBC 1" >>confdefs.h
 
         fi
       fi
     fi
     if test "$gl_cv_cc_double_signbit" = unknown; then
             ac_fn_check_decl "$LINENO" "copysign" "ac_cv_have_decl_copysign" "#include <math.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_copysign" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_COPYSIGN $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_COPYSIGN $ac_have_decl" >>confdefs.h
 
       if test "$ac_cv_have_decl_copysign" = yes; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether copysign can be used without linking with libm" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether copysign can be used without linking with libm" >&5
 printf %s "checking whether copysign can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_copysign_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -45207,41 +46318,44 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_copysign_no_libm=yes
-else $as_nop
-  gl_cv_func_copysign_no_libm=no
+else case e in #(
+  e) gl_cv_func_copysign_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+           ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_copysign_no_libm" >&5
-printf "%s\n" "$gl_cv_func_copysign_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_copysign_no_libm" >&5
+printf '%s\n' "$gl_cv_func_copysign_no_libm" >&6; }
         if test $gl_cv_func_copysign_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_COPYSIGN_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_COPYSIGN_IN_LIBC 1" >>confdefs.h
 
         fi
       fi
     fi
     if test "$gl_cv_cc_long_double_signbit" = unknown; then
             ac_fn_check_decl "$LINENO" "copysignl" "ac_cv_have_decl_copysignl" "#include <math.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_copysignl" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_COPYSIGNL $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_COPYSIGNL $ac_have_decl" >>confdefs.h
 
       if test "$ac_cv_have_decl_copysignl" = yes; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether copysignl can be used without linking with libm" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether copysignl can be used without linking with libm" >&5
 printf %s "checking whether copysignl can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_copysignl_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -45257,18 +46371,20 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_copysignl_no_libm=yes
-else $as_nop
-  gl_cv_func_copysignl_no_libm=no
+else case e in #(
+  e) gl_cv_func_copysignl_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+           ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_copysignl_no_libm" >&5
-printf "%s\n" "$gl_cv_func_copysignl_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_copysignl_no_libm" >&5
+printf '%s\n' "$gl_cv_func_copysignl_no_libm" >&6; }
         if test $gl_cv_func_copysignl_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_COPYSIGNL_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_COPYSIGNL_IN_LIBC 1" >>confdefs.h
 
         fi
       fi
@@ -45322,7 +46438,7 @@ printf "%s\n" "#define HAVE_COPYSIGNL_IN_LIBC 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_SIGNBIT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_SIGNBIT 1" >>confdefs.h
 
 
 
@@ -45367,7 +46483,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
 
 
 
@@ -45375,17 +46491,17 @@ printf "%s\n" "#define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
   ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
 if test "x$ac_cv_header_stdint_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_STDINT_H 1" >>confdefs.h
 
 fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
 printf %s "checking for SIZE_MAX... " >&6; }
 if test ${gl_cv_size_max+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     gl_cv_size_max=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -45400,7 +46516,7 @@ Found it
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Found it" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Found it" >/dev/null 2>&1
 then :
   gl_cv_size_max=yes
 fi
@@ -45411,15 +46527,17 @@ rm -rf conftest*
 #include <limits.h>"
 then :
 
-else $as_nop
-  size_t_bits_minus_1=
+else case e in #(
+  e) size_t_bits_minus_1= ;;
+esac
 fi
 
       if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint"        "#include <stddef.h>"
 then :
 
-else $as_nop
-  fits_in_uint=
+else case e in #(
+  e) fits_in_uint= ;;
+esac
 fi
 
       if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
@@ -45453,13 +46571,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
                 gl_cv_size_max='((size_t)~(size_t)0)'
       fi
     fi
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5
-printf "%s\n" "$gl_cv_size_max" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5
+printf '%s\n' "$gl_cv_size_max" >&6; }
   if test "$gl_cv_size_max" != yes; then
 
-printf "%s\n" "#define SIZE_MAX $gl_cv_size_max" >>confdefs.h
+printf '%s\n' "#define SIZE_MAX $gl_cv_size_max" >>confdefs.h
 
   fi
 
@@ -45470,7 +46589,7 @@ printf "%s\n" "#define SIZE_MAX $gl_cv_size_max" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
 if test "x$ac_cv_func_snprintf" = xyes
 then :
-  printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SNPRINTF 1" >>confdefs.h
 
 fi
 
@@ -45478,13 +46597,13 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
 printf %s "checking whether snprintf respects a size of 1... " >&6; }
 if test ${gl_cv_func_snprintf_size1+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -45495,8 +46614,8 @@ then :
            *)               gl_cv_func_snprintf_size1="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -45524,17 +46643,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_snprintf_size1=yes
-else $as_nop
-  gl_cv_func_snprintf_size1=no
+else case e in #(
+  e) gl_cv_func_snprintf_size1=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5
-printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5
+printf '%s\n' "$gl_cv_func_snprintf_size1" >&6; }
 
     case "$gl_cv_func_snprintf_size1" in
       *yes)
@@ -45543,13 +46665,13 @@ printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; }
           *yes)
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
 printf %s "checking whether printf supports POSIX/XSI format strings with positions... " >&6; }
 if test ${gl_cv_func_printf_positions+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -45564,8 +46686,8 @@ then :
            *)               gl_cv_func_printf_positions="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -45583,17 +46705,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_positions=yes
-else $as_nop
-  gl_cv_func_printf_positions=no
+else case e in #(
+  e) gl_cv_func_printf_positions=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5
-printf "%s\n" "$gl_cv_func_printf_positions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5
+printf '%s\n' "$gl_cv_func_printf_positions" >&6; }
 
             case "$gl_cv_func_printf_positions" in
               *yes)
@@ -45649,13 +46774,13 @@ printf "%s\n" "$gl_cv_func_printf_positions" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_SNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_SNPRINTF 1" >>confdefs.h
 
 
 
 
 
-printf "%s\n" "#define GNULIB_SNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_SNPRINTF 1" >>confdefs.h
 
 
 
@@ -45677,7 +46802,7 @@ printf "%s\n" "#define GNULIB_SNPRINTF 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
 if test "x$ac_cv_func_snprintf" = xyes
 then :
-  printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SNPRINTF 1" >>confdefs.h
 
 fi
 
@@ -45687,13 +46812,13 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf fully supports the 'n' directive" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether snprintf fully supports the 'n' directive" >&5
 printf %s "checking whether snprintf fully supports the 'n' directive... " >&6; }
 if test ${gl_cv_func_snprintf_directive_n+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -45709,8 +46834,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_snprintf_directive_n="guessing yes"
-else $as_nop
-  gl_cv_func_snprintf_directive_n="guessing no"
+else case e in #(
+  e) gl_cv_func_snprintf_directive_n="guessing no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
                                  ;;
@@ -45749,8 +46875,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            *)                    gl_cv_func_snprintf_directive_n="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -45787,28 +46913,31 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_snprintf_directive_n=yes
-else $as_nop
-  gl_cv_func_snprintf_directive_n=no
+else case e in #(
+  e) gl_cv_func_snprintf_directive_n=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_directive_n" >&5
-printf "%s\n" "$gl_cv_func_snprintf_directive_n" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_directive_n" >&5
+printf '%s\n' "$gl_cv_func_snprintf_directive_n" >&6; }
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
 printf %s "checking whether snprintf respects a size of 1... " >&6; }
 if test ${gl_cv_func_snprintf_size1+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -45819,8 +46948,8 @@ then :
            *)               gl_cv_func_snprintf_size1="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -45848,27 +46977,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_snprintf_size1=yes
-else $as_nop
-  gl_cv_func_snprintf_size1=no
+else case e in #(
+  e) gl_cv_func_snprintf_size1=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5
-printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5
+printf '%s\n' "$gl_cv_func_snprintf_size1" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf respects a zero size as in C99" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf respects a zero size as in C99" >&5
 printf %s "checking whether vsnprintf respects a zero size as in C99... " >&6; }
 if test ${gl_cv_func_vsnprintf_zerosize_c99+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -45909,8 +47041,8 @@ then :
            *)                    gl_cv_func_vsnprintf_zerosize_c99="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdarg.h>
@@ -45934,17 +47066,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_vsnprintf_zerosize_c99=yes
-else $as_nop
-  gl_cv_func_vsnprintf_zerosize_c99=no
+else case e in #(
+  e) gl_cv_func_vsnprintf_zerosize_c99=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_vsnprintf_zerosize_c99" >&5
-printf "%s\n" "$gl_cv_func_vsnprintf_zerosize_c99" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_vsnprintf_zerosize_c99" >&5
+printf '%s\n' "$gl_cv_func_vsnprintf_zerosize_c99" >&6; }
 
     case "$gl_cv_func_printf_sizes_c99" in
       *yes)
@@ -46035,7 +47170,7 @@ printf "%s\n" "$gl_cv_func_vsnprintf_zerosize_c99" >&6; }
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -46050,7 +47185,7 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
           ;;
         *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
 
           ;;
       esac
@@ -46064,12 +47199,12 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
 
       ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes
 then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h
 
 fi
 
@@ -46083,7 +47218,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
 
       ;;
   esac
@@ -46095,7 +47230,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
 
       ;;
   esac
@@ -46107,7 +47242,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
 
       ;;
   esac
@@ -46119,7 +47254,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
 
       ;;
   esac
@@ -46131,7 +47266,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
 
       ;;
   esac
@@ -46143,13 +47278,13 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -46161,13 +47296,13 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -46216,7 +47351,7 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
   if test $ac_cv_func_vasnprintf = yes; then
 
-printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 
   fi
 
@@ -46232,11 +47367,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 if test "x$ac_cv_type_ptrdiff_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define ptrdiff_t long" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define ptrdiff_t long" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -46377,7 +47513,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -46392,7 +47528,7 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
           ;;
         *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
 
           ;;
       esac
@@ -46406,12 +47542,12 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
 
       ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes
 then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h
 
 fi
 
@@ -46425,7 +47561,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
 
       ;;
   esac
@@ -46437,7 +47573,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
 
       ;;
   esac
@@ -46449,7 +47585,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
 
       ;;
   esac
@@ -46461,7 +47597,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
 
       ;;
   esac
@@ -46473,7 +47609,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
 
       ;;
   esac
@@ -46485,13 +47621,13 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -46503,13 +47639,13 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -46558,7 +47694,7 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
   if test $ac_cv_func_vasnprintf = yes; then
 
-printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 
   fi
 
@@ -46574,11 +47710,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 if test "x$ac_cv_type_ptrdiff_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define ptrdiff_t long" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define ptrdiff_t long" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -46619,18 +47756,18 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_SPRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_SPRINTF_POSIX 1" >>confdefs.h
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
 if test ${gt_cv_ssize_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
@@ -46645,16 +47782,18 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gt_cv_ssize_t=yes
-else $as_nop
-  gt_cv_ssize_t=no
+else case e in #(
+  e) gt_cv_ssize_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+printf '%s\n' "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
 
-printf "%s\n" "#define ssize_t int" >>confdefs.h
+printf '%s\n' "#define ssize_t int" >>confdefs.h
 
   fi
 
@@ -46667,13 +47806,13 @@ printf "%s\n" "#define ssize_t int" >>confdefs.h
                   REPLACE_STAT=1
       ;;
     *)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
 printf %s "checking whether stat handles trailing slashes on files... " >&6; }
 if test ${gl_cv_func_stat_file_slash+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  touch conftest.tmp
+else case e in #(
+  e) touch conftest.tmp
          # Assume that if we have lstat, we can also check symlinks.
          if test $ac_cv_func_lstat = yes; then
            ln -s conftest.tmp conftest.lnk
@@ -46689,8 +47828,8 @@ then :
               *)               gl_cv_func_stat_file_slash="$gl_cross_guess_normal" ;;
             esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 
@@ -46714,22 +47853,25 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_stat_file_slash=yes
-else $as_nop
-  gl_cv_func_stat_file_slash=no
+else case e in #(
+  e) gl_cv_func_stat_file_slash=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-         rm -f conftest.tmp conftest.lnk
+         rm -f conftest.tmp conftest.lnk ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
-printf "%s\n" "$gl_cv_func_stat_file_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
+printf '%s\n' "$gl_cv_func_stat_file_slash" >&6; }
       case $gl_cv_func_stat_file_slash in
         *no)
           REPLACE_STAT=1
 
-printf "%s\n" "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
 ;;
       esac
       case $host_os in
@@ -46785,18 +47927,18 @@ printf "%s\n" "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STAT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STAT 1" >>confdefs.h
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
 printf %s "checking for working stdalign.h... " >&6; }
 if test ${gl_cv_header_working_stdalign_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdint.h>
             #include <stdalign.h>
@@ -46841,13 +47983,15 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_working_stdalign_h=yes
-else $as_nop
-  gl_cv_header_working_stdalign_h=no
+else case e in #(
+  e) gl_cv_header_working_stdalign_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdalign_h" >&6; }
 
   if test $gl_cv_header_working_stdalign_h = yes; then
     STDALIGN_H=''
@@ -46930,13 +48074,13 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FSCANF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FSCANF 1" >>confdefs.h
 
 
 
 
 
-printf "%s\n" "#define GNULIB_FSCANF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_FSCANF 1" >>confdefs.h
 
 
 
@@ -46954,13 +48098,13 @@ printf "%s\n" "#define GNULIB_FSCANF 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_SCANF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_SCANF 1" >>confdefs.h
 
 
 
 
 
-printf "%s\n" "#define GNULIB_SCANF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_SCANF 1" >>confdefs.h
 
 
 
@@ -46978,7 +48122,7 @@ printf "%s\n" "#define GNULIB_SCANF 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FGETC 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FGETC 1" >>confdefs.h
 
 
 
@@ -46997,7 +48141,7 @@ printf "%s\n" "#define GNULIB_TEST_FGETC 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETC 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETC 1" >>confdefs.h
 
 
 
@@ -47016,7 +48160,7 @@ printf "%s\n" "#define GNULIB_TEST_GETC 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETCHAR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
 
 
@@ -47035,7 +48179,7 @@ printf "%s\n" "#define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FGETS 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FGETS 1" >>confdefs.h
 
 
 
@@ -47054,7 +48198,7 @@ printf "%s\n" "#define GNULIB_TEST_FGETS 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FREAD 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FREAD 1" >>confdefs.h
 
 
 
@@ -47073,7 +48217,7 @@ printf "%s\n" "#define GNULIB_TEST_FREAD 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FPRINTF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
 
 
@@ -47092,7 +48236,7 @@ printf "%s\n" "#define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_PRINTF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
 
 
@@ -47111,7 +48255,7 @@ printf "%s\n" "#define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
 
 
@@ -47130,7 +48274,7 @@ printf "%s\n" "#define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_VPRINTF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
 
 
@@ -47149,7 +48293,7 @@ printf "%s\n" "#define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FPUTC 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
 
 
@@ -47168,7 +48312,7 @@ printf "%s\n" "#define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_PUTC 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_PUTC 1" >>confdefs.h
 
 
 
@@ -47187,7 +48331,7 @@ printf "%s\n" "#define GNULIB_TEST_PUTC 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
 
 
@@ -47206,7 +48350,7 @@ printf "%s\n" "#define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FPUTS 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
 
 
@@ -47225,7 +48369,7 @@ printf "%s\n" "#define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_PUTS 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_PUTS 1" >>confdefs.h
 
 
 
@@ -47244,7 +48388,7 @@ printf "%s\n" "#define GNULIB_TEST_PUTS 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FWRITE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FWRITE 1" >>confdefs.h
 
 
 
@@ -47263,7 +48407,7 @@ printf "%s\n" "#define GNULIB_TEST_FWRITE 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
 if test "x$ac_cv_func_stpcpy" = xyes
 then :
-  printf "%s\n" "#define HAVE_STPCPY 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_STPCPY 1" >>confdefs.h
 
 fi
 
@@ -47301,7 +48445,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
 
 
 
@@ -47317,13 +48461,13 @@ printf "%s\n" "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
 
 
   if test $ac_cv_func_stpncpy = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working stpncpy" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working stpncpy" >&5
 printf %s "checking for working stpncpy... " >&6; }
 if test ${gl_cv_func_stpncpy+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -47336,21 +48480,22 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Thanks for using GNU" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Thanks for using GNU" >/dev/null 2>&1
 then :
   gl_cv_func_stpncpy="guessing yes"
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
               *-musl*) gl_cv_func_stpncpy="guessing yes" ;;
               *)       gl_cv_func_stpncpy="$gl_cross_guess_normal" ;;
             esac
-
+            ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -47393,21 +48538,24 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_stpncpy=yes
-else $as_nop
-  gl_cv_func_stpncpy=no
+else case e in #(
+  e) gl_cv_func_stpncpy=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stpncpy" >&5
-printf "%s\n" "$gl_cv_func_stpncpy" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stpncpy" >&5
+printf '%s\n' "$gl_cv_func_stpncpy" >&6; }
     case "$gl_cv_func_stpncpy" in
       *yes)
 
-printf "%s\n" "#define HAVE_STPNCPY 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STPNCPY 1" >>confdefs.h
 
         ;;
       *)
@@ -47448,7 +48596,7 @@ printf "%s\n" "#define HAVE_STPNCPY 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STPNCPY 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STPNCPY 1" >>confdefs.h
 
 
 
@@ -47491,7 +48639,7 @@ printf "%s\n" "#define GNULIB_TEST_STPNCPY 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STRDUP 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STRDUP 1" >>confdefs.h
 
 
 
@@ -47503,13 +48651,13 @@ printf "%s\n" "#define GNULIB_TEST_STRDUP 1" >>confdefs.h
 
 
   if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
 printf %s "checking for working strerror function... " >&6; }
 if test ${gl_cv_func_working_strerror+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                           # Guess yes on glibc systems.
@@ -47520,8 +48668,8 @@ then :
            *)             gl_cv_func_working_strerror="$gl_cross_guess_normal" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
@@ -47536,17 +48684,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_working_strerror=yes
-else $as_nop
-  gl_cv_func_working_strerror=no
+else case e in #(
+  e) gl_cv_func_working_strerror=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
-printf "%s\n" "$gl_cv_func_working_strerror" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
+printf '%s\n' "$gl_cv_func_working_strerror" >&6; }
     case "$gl_cv_func_working_strerror" in
       *yes) ;;
       *)
@@ -47576,7 +48727,7 @@ printf "%s\n" "$gl_cv_func_working_strerror" >&6; }
   fi
 
 
-printf "%s\n" "#define GNULIB_STRERROR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_STRERROR 1" >>confdefs.h
 
 
 
@@ -47594,7 +48745,7 @@ printf "%s\n" "#define GNULIB_STRERROR 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STRERROR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STRERROR 1" >>confdefs.h
 
 
 
@@ -47617,13 +48768,13 @@ printf "%s\n" "#define GNULIB_TEST_STRERROR 1" >>confdefs.h
   if test $ac_cv_func_strndup = yes; then
     HAVE_STRNDUP=1
     # AIX 4.3.3, AIX 5.1 have a function that fails to add the terminating '\0'.
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strndup" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working strndup" >&5
 printf %s "checking for working strndup... " >&6; }
 if test ${gl_cv_func_strndup_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
 
           case $host_os in
@@ -47631,8 +48782,8 @@ then :
             *)               gl_cv_func_strndup_works="guessing yes";;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
          #include <string.h>
@@ -47663,16 +48814,19 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_strndup_works=yes
-else $as_nop
-  gl_cv_func_strndup_works=no
+else case e in #(
+  e) gl_cv_func_strndup_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strndup_works" >&5
-printf "%s\n" "$gl_cv_func_strndup_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strndup_works" >&5
+printf '%s\n' "$gl_cv_func_strndup_works" >&6; }
     case $gl_cv_func_strndup_works in
       *no) REPLACE_STRNDUP=1 ;;
     esac
@@ -47707,7 +48861,7 @@ printf "%s\n" "$gl_cv_func_strndup_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STRNDUP 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STRNDUP 1" >>confdefs.h
 
 
 
@@ -47715,13 +48869,13 @@ printf "%s\n" "#define GNULIB_TEST_STRNDUP 1" >>confdefs.h
 
 
   if test $HAVE_STRTOD = 1; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strtod obeys C99" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strtod obeys C99" >&5
 printf %s "checking whether strtod obeys C99... " >&6; }
 if test ${gl_cv_func_strtod_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
                     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -47736,24 +48890,25 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1
 then :
   gl_cv_func_strtod_works="guessing yes"
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
                        # Guess yes on musl systems.
               *-musl*) gl_cv_func_strtod_works="guessing yes" ;;
                        # Guess yes on native Windows.
               mingw*)  gl_cv_func_strtod_works="guessing yes" ;;
               *)       gl_cv_func_strtod_works="$gl_cross_guess_normal" ;;
             esac
-
+            ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -47844,17 +48999,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_strtod_works=yes
-else $as_nop
-  gl_cv_func_strtod_works=no
+else case e in #(
+  e) gl_cv_func_strtod_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strtod_works" >&5
-printf "%s\n" "$gl_cv_func_strtod_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strtod_works" >&5
+printf '%s\n' "$gl_cv_func_strtod_works" >&6; }
     case "$gl_cv_func_strtod_works" in
       *yes) ;;
       *)
@@ -47878,13 +49036,13 @@ printf "%s\n" "$gl_cv_func_strtod_works" >&6; }
 
   if test $gl_cv_func_ldexp_no_libm = yes; then
 
-printf "%s\n" "#define HAVE_LDEXP_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_LDEXP_IN_LIBC 1" >>confdefs.h
 
   fi
   ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes
 then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h
 
 fi
 
@@ -47905,7 +49063,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STRTOD 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STRTOD 1" >>confdefs.h
 
 
 
@@ -47916,7 +49074,7 @@ printf "%s\n" "#define GNULIB_TEST_STRTOD 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "strverscmp" "ac_cv_func_strverscmp"
 if test "x$ac_cv_func_strverscmp" = xyes
 then :
-  printf "%s\n" "#define HAVE_STRVERSCMP 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_STRVERSCMP 1" >>confdefs.h
 
 fi
 
@@ -47954,7 +49112,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STRVERSCMP 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STRVERSCMP 1" >>confdefs.h
 
 
 
@@ -48016,7 +49174,7 @@ printf "%s\n" "#define GNULIB_TEST_STRVERSCMP 1" >>confdefs.h
   ac_fn_c_check_header_compile "$LINENO" "sys/single_threaded.h" "ac_cv_header_sys_single_threaded_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_single_threaded_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_SYS_SINGLE_THREADED_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SYS_SINGLE_THREADED_H 1" >>confdefs.h
 
 fi
 
@@ -48072,7 +49230,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_UNISTR_U8_MBTOUCR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_UNISTR_U8_MBTOUCR 1" >>confdefs.h
 
 
 
@@ -48106,7 +49264,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_UNISTR_U8_UCTOMB 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_UNISTR_U8_UCTOMB 1" >>confdefs.h
 
 
 
@@ -48227,13 +49385,13 @@ fi
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether unlink honors trailing slashes" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether unlink honors trailing slashes" >&5
 printf %s "checking whether unlink honors trailing slashes... " >&6; }
 if test ${gl_cv_func_unlink_honors_slashes+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  touch conftest.file
+else case e in #(
+  e) touch conftest.file
      # Assume that if we have lstat, we can also check symlinks.
      if test $ac_cv_func_lstat = yes; then
        ln -s conftest.file conftest.lnk
@@ -48251,8 +49409,8 @@ then :
          *)               gl_cv_func_unlink_honors_slashes="$gl_cross_guess_normal" ;;
        esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if HAVE_UNISTD_H
            # include <unistd.h>
@@ -48287,30 +49445,33 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_unlink_honors_slashes=yes
-else $as_nop
-  gl_cv_func_unlink_honors_slashes=no
+else case e in #(
+  e) gl_cv_func_unlink_honors_slashes=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-     rm -f conftest.file conftest.lnk
+     rm -f conftest.file conftest.lnk ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unlink_honors_slashes" >&5
-printf "%s\n" "$gl_cv_func_unlink_honors_slashes" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unlink_honors_slashes" >&5
+printf '%s\n' "$gl_cv_func_unlink_honors_slashes" >&6; }
   case "$gl_cv_func_unlink_honors_slashes" in
     *no)
       REPLACE_UNLINK=1
       ;;
   esac
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether unlink of a parent directory fails as it should" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether unlink of a parent directory fails as it should" >&5
 printf %s "checking whether unlink of a parent directory fails as it should... " >&6; }
 if test ${gl_cv_func_unlink_parent_fails+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
        darwin*)
                                                       if {
               # Use the mktemp program if available. If not available, hide the error
@@ -48335,8 +49496,8 @@ then :
   # If we don't know, obey --enable-cross-guesses.
               gl_cv_func_unlink_parent_fails="$gl_cross_guess_normal"
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                 #include <stdlib.h>
@@ -48364,11 +49525,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_unlink_parent_fails=yes
-else $as_nop
-  gl_cv_func_unlink_parent_fails=no
+else case e in #(
+  e) gl_cv_func_unlink_parent_fails=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
            unset GL_SUBDIR_FOR_UNLINK
@@ -48381,15 +49544,16 @@ fi
          gl_cv_func_unlink_parent_fails="guessing yes"
          ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unlink_parent_fails" >&5
-printf "%s\n" "$gl_cv_func_unlink_parent_fails" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unlink_parent_fails" >&5
+printf '%s\n' "$gl_cv_func_unlink_parent_fails" >&6; }
   case "$gl_cv_func_unlink_parent_fails" in
     *no)
       REPLACE_UNLINK=1
 
-printf "%s\n" "#define UNLINK_PARENT_BUG 1" >>confdefs.h
+printf '%s\n' "#define UNLINK_PARENT_BUG 1" >>confdefs.h
 
       ;;
   esac
@@ -48421,15 +49585,15 @@ printf "%s\n" "#define UNLINK_PARENT_BUG 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_UNLINK 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_UNLINK 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
 
 
-printf "%s\n" "#define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
+printf '%s\n' "#define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
 
 
 
@@ -48457,7 +49621,7 @@ printf "%s\n" "#define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
 if test "x$ac_cv_func_unsetenv" = xyes
 then :
-  printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_UNSETENV 1" >>confdefs.h
 
 fi
 
@@ -48465,13 +49629,13 @@ fi
     HAVE_UNSETENV=0
   else
     HAVE_UNSETENV=1
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unsetenv() return type" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for unsetenv() return type" >&5
 printf %s "checking for unsetenv() return type... " >&6; }
 if test ${gt_cv_func_unsetenv_ret+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #undef _BSD
@@ -48494,27 +49658,29 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gt_cv_func_unsetenv_ret='int'
-else $as_nop
-  gt_cv_func_unsetenv_ret='void'
+else case e in #(
+  e) gt_cv_func_unsetenv_ret='void' ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_unsetenv_ret" >&5
-printf "%s\n" "$gt_cv_func_unsetenv_ret" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_unsetenv_ret" >&5
+printf '%s\n' "$gt_cv_func_unsetenv_ret" >&6; }
     if test $gt_cv_func_unsetenv_ret = 'void'; then
 
-printf "%s\n" "#define VOID_UNSETENV 1" >>confdefs.h
+printf '%s\n' "#define VOID_UNSETENV 1" >>confdefs.h
 
       REPLACE_UNSETENV=1
     fi
 
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether unsetenv obeys POSIX" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether unsetenv obeys POSIX" >&5
 printf %s "checking whether unsetenv obeys POSIX... " >&6; }
 if test ${gl_cv_func_unsetenv_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                     # Guess yes on glibc systems.
@@ -48523,8 +49689,8 @@ then :
             *)      gl_cv_func_unsetenv_works="$gl_cross_guess_normal" ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
             #include <stdlib.h>
@@ -48561,17 +49727,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_unsetenv_works=yes
-else $as_nop
-  gl_cv_func_unsetenv_works=no
+else case e in #(
+  e) gl_cv_func_unsetenv_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unsetenv_works" >&5
-printf "%s\n" "$gl_cv_func_unsetenv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unsetenv_works" >&5
+printf '%s\n' "$gl_cv_func_unsetenv_works" >&6; }
     case "$gl_cv_func_unsetenv_works" in
       *yes) ;;
       *)
@@ -48611,7 +49780,7 @@ printf "%s\n" "$gl_cv_func_unsetenv_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_UNSETENV 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_UNSETENV 1" >>confdefs.h
 
 
 
@@ -48663,7 +49832,7 @@ printf "%s\n" "#define GNULIB_TEST_UNSETENV 1" >>confdefs.h
 
   if test $ac_cv_func_vasnprintf = yes; then
 
-printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 
   fi
 
@@ -48679,11 +49848,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 if test "x$ac_cv_type_ptrdiff_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define ptrdiff_t long" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define ptrdiff_t long" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -48698,7 +49868,7 @@ fi
   ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
 if test "x$ac_cv_func_vasprintf" = xyes
 then :
-  printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_VASPRINTF 1" >>confdefs.h
 
 fi
 
@@ -48755,7 +49925,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_VASPRINTF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_VASPRINTF 1" >>confdefs.h
 
 
 
@@ -48786,7 +49956,7 @@ printf "%s\n" "#define GNULIB_TEST_VASPRINTF 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
 if test "x$ac_cv_func_vasprintf" = xyes
 then :
-  printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_VASPRINTF 1" >>confdefs.h
 
 fi
 
@@ -48860,7 +50030,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -48875,7 +50045,7 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
           ;;
         *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
 
           ;;
       esac
@@ -48889,12 +50059,12 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
 
       ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes
 then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h
 
 fi
 
@@ -48908,7 +50078,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
 
       ;;
   esac
@@ -48920,7 +50090,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
 
       ;;
   esac
@@ -48932,7 +50102,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
 
       ;;
   esac
@@ -48944,7 +50114,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
 
       ;;
   esac
@@ -48956,7 +50126,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
 
       ;;
   esac
@@ -48968,13 +50138,13 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -48986,13 +50156,13 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -49041,7 +50211,7 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
   if test $ac_cv_func_vasnprintf = yes; then
 
-printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 
   fi
 
@@ -49057,11 +50227,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 if test "x$ac_cv_type_ptrdiff_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define ptrdiff_t long" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define ptrdiff_t long" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -49113,7 +50284,7 @@ fi
   ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
 if test "x$ac_cv_func_vsnprintf" = xyes
 then :
-  printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_VSNPRINTF 1" >>confdefs.h
 
 fi
 
@@ -49121,13 +50292,13 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
 printf %s "checking whether snprintf respects a size of 1... " >&6; }
 if test ${gl_cv_func_snprintf_size1+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -49138,8 +50309,8 @@ then :
            *)               gl_cv_func_snprintf_size1="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -49167,17 +50338,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_snprintf_size1=yes
-else $as_nop
-  gl_cv_func_snprintf_size1=no
+else case e in #(
+  e) gl_cv_func_snprintf_size1=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5
-printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5
+printf '%s\n' "$gl_cv_func_snprintf_size1" >&6; }
 
     case "$gl_cv_func_snprintf_size1" in
       *yes)
@@ -49186,13 +50360,13 @@ printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; }
           *yes)
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5
 printf %s "checking whether printf supports POSIX/XSI format strings with positions... " >&6; }
 if test ${gl_cv_func_printf_positions+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -49207,8 +50381,8 @@ then :
            *)               gl_cv_func_printf_positions="guessing yes";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -49226,17 +50400,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_printf_positions=yes
-else $as_nop
-  gl_cv_func_printf_positions=no
+else case e in #(
+  e) gl_cv_func_printf_positions=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5
-printf "%s\n" "$gl_cv_func_printf_positions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_positions" >&5
+printf '%s\n' "$gl_cv_func_printf_positions" >&6; }
 
             case "$gl_cv_func_printf_positions" in
               *yes)
@@ -49292,7 +50469,7 @@ printf "%s\n" "$gl_cv_func_printf_positions" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_VSNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_VSNPRINTF 1" >>confdefs.h
 
 
 
@@ -49315,7 +50492,7 @@ printf "%s\n" "#define GNULIB_TEST_VSNPRINTF 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
 if test "x$ac_cv_func_vsnprintf" = xyes
 then :
-  printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_VSNPRINTF 1" >>confdefs.h
 
 fi
 
@@ -49325,13 +50502,13 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf fully supports the 'n' directive" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether snprintf fully supports the 'n' directive" >&5
 printf %s "checking whether snprintf fully supports the 'n' directive... " >&6; }
 if test ${gl_cv_func_snprintf_directive_n+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -49347,8 +50524,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_snprintf_directive_n="guessing yes"
-else $as_nop
-  gl_cv_func_snprintf_directive_n="guessing no"
+else case e in #(
+  e) gl_cv_func_snprintf_directive_n="guessing no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
                                  ;;
@@ -49387,8 +50565,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            *)                    gl_cv_func_snprintf_directive_n="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -49425,28 +50603,31 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_snprintf_directive_n=yes
-else $as_nop
-  gl_cv_func_snprintf_directive_n=no
+else case e in #(
+  e) gl_cv_func_snprintf_directive_n=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_directive_n" >&5
-printf "%s\n" "$gl_cv_func_snprintf_directive_n" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_directive_n" >&5
+printf '%s\n' "$gl_cv_func_snprintf_directive_n" >&6; }
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether snprintf respects a size of 1" >&5
 printf %s "checking whether snprintf respects a size of 1... " >&6; }
 if test ${gl_cv_func_snprintf_size1+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -49457,8 +50638,8 @@ then :
            *)               gl_cv_func_snprintf_size1="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -49486,27 +50667,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_snprintf_size1=yes
-else $as_nop
-  gl_cv_func_snprintf_size1=no
+else case e in #(
+  e) gl_cv_func_snprintf_size1=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5
-printf "%s\n" "$gl_cv_func_snprintf_size1" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_size1" >&5
+printf '%s\n' "$gl_cv_func_snprintf_size1" >&6; }
 
 
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf respects a zero size as in C99" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf respects a zero size as in C99" >&5
 printf %s "checking whether vsnprintf respects a zero size as in C99... " >&6; }
 if test ${gl_cv_func_vsnprintf_zerosize_c99+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
 
@@ -49547,8 +50731,8 @@ then :
            *)                    gl_cv_func_vsnprintf_zerosize_c99="$gl_cross_guess_normal";;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdarg.h>
@@ -49572,17 +50756,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_vsnprintf_zerosize_c99=yes
-else $as_nop
-  gl_cv_func_vsnprintf_zerosize_c99=no
+else case e in #(
+  e) gl_cv_func_vsnprintf_zerosize_c99=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_vsnprintf_zerosize_c99" >&5
-printf "%s\n" "$gl_cv_func_vsnprintf_zerosize_c99" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_vsnprintf_zerosize_c99" >&5
+printf '%s\n' "$gl_cv_func_vsnprintf_zerosize_c99" >&6; }
 
     case "$gl_cv_func_printf_sizes_c99" in
       *yes)
@@ -49673,7 +50860,7 @@ printf "%s\n" "$gl_cv_func_vsnprintf_zerosize_c99" >&6; }
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -49688,7 +50875,7 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
           ;;
         *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
 
           ;;
       esac
@@ -49702,12 +50889,12 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
 
       ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes
 then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h
 
 fi
 
@@ -49721,7 +50908,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
 
       ;;
   esac
@@ -49733,7 +50920,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
 
       ;;
   esac
@@ -49745,7 +50932,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
 
       ;;
   esac
@@ -49757,7 +50944,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
 
       ;;
   esac
@@ -49769,7 +50956,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
 
       ;;
   esac
@@ -49781,13 +50968,13 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -49799,13 +50986,13 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -49854,7 +51041,7 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
   if test $ac_cv_func_vasnprintf = yes; then
 
-printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 
   fi
 
@@ -49870,11 +51057,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 if test "x$ac_cv_type_ptrdiff_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define ptrdiff_t long" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define ptrdiff_t long" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -49991,7 +51179,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -50006,7 +51194,7 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
           ;;
         *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
 
           ;;
       esac
@@ -50020,12 +51208,12 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
 
       ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes
 then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h
 
 fi
 
@@ -50039,7 +51227,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
 
       ;;
   esac
@@ -50051,7 +51239,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
 
       ;;
   esac
@@ -50063,7 +51251,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
 
       ;;
   esac
@@ -50075,7 +51263,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
 
       ;;
   esac
@@ -50087,7 +51275,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
 
       ;;
   esac
@@ -50099,13 +51287,13 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -50117,13 +51305,13 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -50172,7 +51360,7 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
   if test $ac_cv_func_vasnprintf = yes; then
 
-printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 
   fi
 
@@ -50188,11 +51376,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 if test "x$ac_cv_type_ptrdiff_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define ptrdiff_t long" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define ptrdiff_t long" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -50233,7 +51422,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_VSPRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_VSPRINTF_POSIX 1" >>confdefs.h
 
 
 
@@ -50242,7 +51431,7 @@ printf "%s\n" "#define GNULIB_TEST_VSPRINTF_POSIX 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "waitid" "ac_cv_func_waitid"
 if test "x$ac_cv_func_waitid" = xyes
 then :
-  printf "%s\n" "#define HAVE_WAITID 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_WAITID 1" >>confdefs.h
 
 fi
 
@@ -50281,7 +51470,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_WAITPID 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_WAITPID 1" >>confdefs.h
 
 
 
@@ -50311,27 +51500,28 @@ printf "%s\n" "#define GNULIB_TEST_WAITPID 1" >>confdefs.h
   ac_fn_check_decl "$LINENO" "wcwidth" "ac_cv_have_decl_wcwidth" "
     #include <wchar.h>
 
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_wcwidth" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_WCWIDTH $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_WCWIDTH $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_have_decl_wcwidth != yes; then
     HAVE_DECL_WCWIDTH=0
   fi
 
   if test $ac_cv_func_wcwidth != yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wcwidth is a macro" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether wcwidth is a macro" >&5
 printf %s "checking whether wcwidth is a macro... " >&6; }
 if test ${gl_cv_func_wcwidth_macro+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <wchar.h>
@@ -50340,29 +51530,31 @@ else $as_nop
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "wchar_header_defines_wcwidth" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "wchar_header_defines_wcwidth" >/dev/null 2>&1
 then :
   gl_cv_func_wcwidth_macro=yes
-else $as_nop
-  gl_cv_func_wcwidth_macro=no
+else case e in #(
+  e) gl_cv_func_wcwidth_macro=no ;;
+esac
 fi
 rm -rf conftest*
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_macro" >&5
-printf "%s\n" "$gl_cv_func_wcwidth_macro" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_macro" >&5
+printf '%s\n' "$gl_cv_func_wcwidth_macro" >&6; }
   fi
 
   if test $ac_cv_func_wcwidth = yes || test $gl_cv_func_wcwidth_macro = yes; then
     HAVE_WCWIDTH=1
-                                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
+                                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
 printf %s "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; }
 if test ${gl_cv_func_wcwidth_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
         if test "$cross_compiling" = yes
 then :
 
@@ -50376,8 +51568,8 @@ then :
              *)             gl_cv_func_wcwidth_works="$gl_cross_guess_normal";;
            esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -50411,17 +51603,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_wcwidth_works=yes
-else $as_nop
-  gl_cv_func_wcwidth_works=no
+else case e in #(
+  e) gl_cv_func_wcwidth_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_works" >&5
-printf "%s\n" "$gl_cv_func_wcwidth_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_works" >&5
+printf '%s\n' "$gl_cv_func_wcwidth_works" >&6; }
     case "$gl_cv_func_wcwidth_works" in
       *yes) ;;
       *no) REPLACE_WCWIDTH=1 ;;
@@ -50461,7 +51656,7 @@ printf "%s\n" "$gl_cv_func_wcwidth_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h
 
 
 
@@ -50481,13 +51676,13 @@ printf "%s\n" "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h
       ;;
   esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5
 printf %s "checking whether use of TIOCGWINSZ requires sys/ioctl.h... " >&6; }
 if test ${gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
+else case e in #(
+  e) gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
 
    if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no; then
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -50500,31 +51695,32 @@ else $as_nop
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h=yes
 fi
 rm -rf conftest*
 
    fi
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h" >&5
-printf "%s\n" "$gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h" >&5
+printf '%s\n' "$gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h" >&6; }
   if test $gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
 
-printf "%s\n" "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
+printf '%s\n' "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
 
   fi
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether use of TIOCGWINSZ requires termios.h" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether use of TIOCGWINSZ requires termios.h" >&5
 printf %s "checking whether use of TIOCGWINSZ requires termios.h... " >&6; }
 if test ${gl_cv_sys_tiocgwinsz_needs_termios_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_sys_tiocgwinsz_needs_termios_h=no
+else case e in #(
+  e) gl_cv_sys_tiocgwinsz_needs_termios_h=no
 
    if test $ac_cv_sys_posix_termios = yes; then
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -50537,27 +51733,28 @@ else $as_nop
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_sys_tiocgwinsz_needs_termios_h=yes
 fi
 rm -rf conftest*
 
    fi
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_tiocgwinsz_needs_termios_h" >&5
-printf "%s\n" "$gl_cv_sys_tiocgwinsz_needs_termios_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_tiocgwinsz_needs_termios_h" >&5
+printf '%s\n' "$gl_cv_sys_tiocgwinsz_needs_termios_h" >&6; }
 
 
 
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether use of struct winsize requires sys/ptem.h" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether use of struct winsize requires sys/ptem.h" >&5
 printf %s "checking whether use of struct winsize requires sys/ptem.h... " >&6; }
 if test ${gl_cv_sys_struct_winsize_needs_sys_ptem_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_sys_struct_winsize_needs_sys_ptem_h=yes
+else case e in #(
+  e) gl_cv_sys_struct_winsize_needs_sys_ptem_h=yes
       if test $ac_cv_sys_posix_termios = yes; then
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -50593,29 +51790,31 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  gl_cv_sys_struct_winsize_needs_sys_ptem_h=no
+else case e in #(
+  e) gl_cv_sys_struct_winsize_needs_sys_ptem_h=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-      fi
+      fi ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_winsize_needs_sys_ptem_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_winsize_needs_sys_ptem_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_winsize_needs_sys_ptem_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_winsize_needs_sys_ptem_h" >&6; }
    if test $gl_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
 
-printf "%s\n" "#define WINSIZE_IN_PTEM 1" >>confdefs.h
+printf '%s\n' "#define WINSIZE_IN_PTEM 1" >>confdefs.h
 
    fi
 
   :
 
 
-printf "%s\n" "#define GNULIB_XALLOC 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_XALLOC 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define GNULIB_XALLOC_DIE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_XALLOC_DIE 1" >>confdefs.h
 
 
 
@@ -50623,7 +51822,7 @@ printf "%s\n" "#define GNULIB_XALLOC_DIE 1" >>confdefs.h
   ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
 if test "x$ac_cv_header_stdint_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_STDINT_H 1" >>confdefs.h
 
 fi
 
@@ -50708,7 +51907,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_CHDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_CHDIR 1" >>confdefs.h
 
 
 
@@ -50720,13 +51919,13 @@ printf "%s\n" "#define GNULIB_TEST_CHDIR 1" >>confdefs.h
     if ! $gl_gnulib_enabled_8198daae261b932d64a998f8586f5005; then
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether this system supports file names of any length" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether this system supports file names of any length" >&5
 printf %s "checking whether this system supports file names of any length... " >&6; }
 if test ${gl_cv_have_unlimited_file_name_length+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Arrange to define PATH_MAX, like "pathmax.h" does. */
@@ -50754,17 +51953,19 @@ have_arbitrary_file_name_length_limit
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "have_arbitrary_file_name_length_limit" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "have_arbitrary_file_name_length_limit" >/dev/null 2>&1
 then :
   gl_cv_have_unlimited_file_name_length=no
-else $as_nop
-  gl_cv_have_unlimited_file_name_length=yes
+else case e in #(
+  e) gl_cv_have_unlimited_file_name_length=yes ;;
+esac
 fi
 rm -rf conftest*
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_unlimited_file_name_length" >&5
-printf "%s\n" "$gl_cv_have_unlimited_file_name_length" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_unlimited_file_name_length" >&5
+printf '%s\n' "$gl_cv_have_unlimited_file_name_length" >&6; }
 
       if test $gl_cv_have_unlimited_file_name_length = no; then
 
@@ -50801,7 +52002,7 @@ printf "%s\n" "$gl_cv_have_unlimited_file_name_length" >&6; }
   ac_fn_c_check_func "$LINENO" "closedir" "ac_cv_func_closedir"
 if test "x$ac_cv_func_closedir" = xyes
 then :
-  printf "%s\n" "#define HAVE_CLOSEDIR 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_CLOSEDIR 1" >>confdefs.h
 
 fi
 
@@ -50854,7 +52055,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_CLOSEDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_CLOSEDIR 1" >>confdefs.h
 
 
 
@@ -50868,13 +52069,13 @@ printf "%s\n" "#define GNULIB_TEST_CLOSEDIR 1" >>confdefs.h
   func_gl_gnulib_m4code_75c65a2c014cf8235dd95289676302a4 ()
   {
     if ! $gl_gnulib_enabled_75c65a2c014cf8235dd95289676302a4; then
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for d_ino member in directory struct" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for d_ino member in directory struct" >&5
 printf %s "checking for d_ino member in directory struct... " >&6; }
 if test ${gl_cv_struct_dirent_d_ino+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                             # Guess yes on glibc systems with Linux kernel.
@@ -50887,8 +52088,8 @@ then :
               *)            gl_cv_struct_dirent_d_ino="$gl_cross_guess_normal" ;;
             esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
              #include <sys/stat.h>
@@ -50919,20 +52120,23 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_struct_dirent_d_ino=yes
-else $as_nop
-  gl_cv_struct_dirent_d_ino=no
+else case e in #(
+  e) gl_cv_struct_dirent_d_ino=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_struct_dirent_d_ino" >&5
-printf "%s\n" "$gl_cv_struct_dirent_d_ino" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_struct_dirent_d_ino" >&5
+printf '%s\n' "$gl_cv_struct_dirent_d_ino" >&6; }
    case "$gl_cv_struct_dirent_d_ino" in
      *yes)
 
-printf "%s\n" "#define D_INO_IN_DIRENT 1" >>confdefs.h
+printf '%s\n' "#define D_INO_IN_DIRENT 1" >>confdefs.h
 
        ;;
    esac
@@ -50964,32 +52168,33 @@ printf "%s\n" "#define D_INO_IN_DIRENT 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
 if test "x$ac_cv_func_dirfd" = xyes
 then :
-  printf "%s\n" "#define HAVE_DIRFD 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_DIRFD 1" >>confdefs.h
 
 fi
 
   ac_fn_check_decl "$LINENO" "dirfd" "ac_cv_have_decl_dirfd" "#include <sys/types.h>
       #include <dirent.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_dirfd" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_DIRFD $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_DIRFD $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_have_decl_dirfd = no; then
     HAVE_DECL_DIRFD=0
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dirfd is a macro" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether dirfd is a macro" >&5
 printf %s "checking whether dirfd is a macro... " >&6; }
 if test ${gl_cv_func_dirfd_macro+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -50999,17 +52204,19 @@ else $as_nop
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "dirent_header_defines_dirfd" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "dirent_header_defines_dirfd" >/dev/null 2>&1
 then :
   gl_cv_func_dirfd_macro=yes
-else $as_nop
-  gl_cv_func_dirfd_macro=no
+else case e in #(
+  e) gl_cv_func_dirfd_macro=no ;;
+esac
 fi
 rm -rf conftest*
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dirfd_macro" >&5
-printf "%s\n" "$gl_cv_func_dirfd_macro" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dirfd_macro" >&5
+printf '%s\n' "$gl_cv_func_dirfd_macro" >&6; }
 
   # Use the replacement if we have no function or macro with that name,
   # or if OS/2 kLIBC whose dirfd() does not work.
@@ -51018,7 +52225,7 @@ printf "%s\n" "$gl_cv_func_dirfd_macro" >&6; }
     no,no,*,yes | *,*,os2*,yes)
       REPLACE_DIRFD=1
 
-printf "%s\n" "#define REPLACE_DIRFD 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_DIRFD 1" >>confdefs.h
 ;;
   esac
 
@@ -51035,13 +52242,13 @@ printf "%s\n" "#define REPLACE_DIRFD 1" >>confdefs.h
   gl_LIBOBJS="$gl_LIBOBJS dirfd.$ac_objext"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to get the file descriptor associated with an open DIR*" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to get the file descriptor associated with an open DIR*" >&5
 printf %s "checking how to get the file descriptor associated with an open DIR*... " >&6; }
 if test ${gl_cv_sys_dir_fd_member_name+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       dirfd_save_CFLAGS=$CFLAGS
       for ac_expr in d_fd dd_fd; do
 
@@ -51072,13 +52279,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
       gl_cv_sys_dir_fd_member_name=$ac_expr
 
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_dir_fd_member_name" >&5
-printf "%s\n" "$gl_cv_sys_dir_fd_member_name" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_dir_fd_member_name" >&5
+printf '%s\n' "$gl_cv_sys_dir_fd_member_name" >&6; }
   if test $gl_cv_sys_dir_fd_member_name != no_such_member; then
 
-printf "%s\n" "#define DIR_FD_MEMBER_NAME $gl_cv_sys_dir_fd_member_name" >>confdefs.h
+printf '%s\n' "#define DIR_FD_MEMBER_NAME $gl_cv_sys_dir_fd_member_name" >>confdefs.h
 
   fi
 
@@ -51099,7 +52307,7 @@ printf "%s\n" "#define DIR_FD_MEMBER_NAME $gl_cv_sys_dir_fd_member_name" >>confd
 
 
 
-printf "%s\n" "#define GNULIB_TEST_DIRFD 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_DIRFD 1" >>confdefs.h
 
 
 
@@ -51130,13 +52338,13 @@ printf "%s\n" "#define GNULIB_TEST_DIRFD 1" >>confdefs.h
       REPLACE_DUP=1
     fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dup works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether dup works" >&5
 printf %s "checking whether dup works... " >&6; }
 if test ${gl_cv_func_dup_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                  # Guess no on native Windows.
@@ -51144,8 +52352,8 @@ then :
          *)      gl_cv_func_dup_works="guessing yes" ;;
        esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
                          #include <fcntl.h>
@@ -51169,17 +52377,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_dup_works=yes
-else $as_nop
-  gl_cv_func_dup_works=no
+else case e in #(
+  e) gl_cv_func_dup_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup_works" >&5
-printf "%s\n" "$gl_cv_func_dup_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup_works" >&5
+printf '%s\n' "$gl_cv_func_dup_works" >&6; }
   case "$gl_cv_func_dup_works" in
     *yes) ;;
     *)
@@ -51215,7 +52426,7 @@ printf "%s\n" "$gl_cv_func_dup_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_DUP 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_DUP 1" >>confdefs.h
 
 
 
@@ -51248,15 +52459,15 @@ printf "%s\n" "#define GNULIB_TEST_DUP 1" >>confdefs.h
 
     :
 
-printf "%s\n" "#define REPLACE_FCHDIR 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_FCHDIR 1" >>confdefs.h
 
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether open can visit directories" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether open can visit directories" >&5
 printf %s "checking whether open can visit directories... " >&6; }
 if test ${gl_cv_func_open_directory_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                              # Guess yes on Linux systems.
@@ -51269,8 +52480,8 @@ then :
             *)               gl_cv_func_open_directory_works="$gl_cross_guess_normal" ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
 
@@ -51288,21 +52499,24 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_open_directory_works=yes
-else $as_nop
-  gl_cv_func_open_directory_works=no
+else case e in #(
+  e) gl_cv_func_open_directory_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_directory_works" >&5
-printf "%s\n" "$gl_cv_func_open_directory_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_directory_works" >&5
+printf '%s\n' "$gl_cv_func_open_directory_works" >&6; }
     case "$gl_cv_func_open_directory_works" in
       *yes) ;;
       *)
 
-printf "%s\n" "#define REPLACE_OPEN_DIRECTORY 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_OPEN_DIRECTORY 1" >>confdefs.h
 
         ;;
     esac
@@ -51323,7 +52537,7 @@ printf "%s\n" "#define REPLACE_OPEN_DIRECTORY 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FCHDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FCHDIR 1" >>confdefs.h
 
 
 
@@ -51365,32 +52579,34 @@ printf "%s\n" "#define GNULIB_TEST_FCHDIR 1" >>confdefs.h
     ac_fn_check_decl "$LINENO" "fdopendir" "ac_cv_have_decl_fdopendir" "
 #include <dirent.h>
 
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fdopendir" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_FDOPENDIR $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_FDOPENDIR $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
 
-else $as_nop
-  HAVE_DECL_FDOPENDIR=0
+else case e in #(
+  e) HAVE_DECL_FDOPENDIR=0 ;;
+esac
 fi
 
 
   if test $ac_cv_func_fdopendir = no; then
     HAVE_FDOPENDIR=0
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fdopendir works" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fdopendir works" >&5
 printf %s "checking whether fdopendir works... " >&6; }
 if test ${gl_cv_func_fdopendir_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                      # Guess yes on glibc systems.
@@ -51401,8 +52617,8 @@ then :
             *)       gl_cv_func_fdopendir_works="$gl_cross_guess_normal" ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <dirent.h>
@@ -51437,16 +52653,19 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_fdopendir_works=yes
-else $as_nop
-  gl_cv_func_fdopendir_works=no
+else case e in #(
+  e) gl_cv_func_fdopendir_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fdopendir_works" >&5
-printf "%s\n" "$gl_cv_func_fdopendir_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fdopendir_works" >&5
+printf '%s\n' "$gl_cv_func_fdopendir_works" >&6; }
     case "$gl_cv_func_fdopendir_works" in
       *yes) ;;
       *)
@@ -51482,13 +52701,13 @@ printf "%s\n" "$gl_cv_func_fdopendir_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FDOPENDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FDOPENDIR 1" >>confdefs.h
 
 
 
 
 
-printf "%s\n" "#define GNULIB_FDOPENDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_FDOPENDIR 1" >>confdefs.h
 
 
       gl_gnulib_enabled_fdopendir=true
@@ -51525,13 +52744,13 @@ printf "%s\n" "#define GNULIB_FDOPENDIR 1" >>confdefs.h
 
 
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ffs" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ffs" >&5
 printf %s "checking for ffs... " >&6; }
 if test ${gl_cv_func_ffs+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <strings.h>
             int x;
@@ -51550,15 +52769,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_ffs=yes
-else $as_nop
-  gl_cv_func_ffs=no
+else case e in #(
+  e) gl_cv_func_ffs=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ffs" >&5
-printf "%s\n" "$gl_cv_func_ffs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ffs" >&5
+printf '%s\n' "$gl_cv_func_ffs" >&6; }
   if test $gl_cv_func_ffs = no; then
     HAVE_FFS=0
   fi
@@ -51700,7 +52921,7 @@ printf "%s\n" "$gl_cv_func_ffs" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FSTAT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FSTAT 1" >>confdefs.h
 
 
 
@@ -51723,21 +52944,21 @@ printf "%s\n" "#define GNULIB_TEST_FSTAT 1" >>confdefs.h
   if test $ac_cv_func_fstatat = no; then
     HAVE_FSTATAT=0
   else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fstatat (..., 0) works" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fstatat (..., 0) works" >&5
 printf %s "checking whether fstatat (..., 0) works... " >&6; }
 if test ${gl_cv_func_fstatat_zero_flag+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
             aix*) gl_cv_func_fstatat_zero_flag="guessing no";;
             *)    gl_cv_func_fstatat_zero_flag="guessing yes";;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
               #include <fcntl.h>
@@ -51753,17 +52974,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_fstatat_zero_flag=yes
-else $as_nop
-  gl_cv_func_fstatat_zero_flag=no
+else case e in #(
+  e) gl_cv_func_fstatat_zero_flag=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fstatat_zero_flag" >&5
-printf "%s\n" "$gl_cv_func_fstatat_zero_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fstatat_zero_flag" >&5
+printf '%s\n' "$gl_cv_func_fstatat_zero_flag" >&6; }
 
     case $gl_cv_func_fstatat_zero_flag+$gl_cv_func_lstat_dereferences_slashed_symlink in
     *yes+*yes) ;;
@@ -51778,7 +53002,7 @@ printf "%s\n" "$gl_cv_func_fstatat_zero_flag" >&6; }
     case $REPLACE_FSTATAT,$gl_cv_func_fstatat_zero_flag in
       1,*yes)
 
-printf "%s\n" "#define HAVE_WORKING_FSTATAT_ZERO_FLAG 1" >>confdefs.h
+printf '%s\n' "#define HAVE_WORKING_FSTATAT_ZERO_FLAG 1" >>confdefs.h
 
          ;;
     esac
@@ -51811,7 +53035,7 @@ printf "%s\n" "#define HAVE_WORKING_FSTATAT_ZERO_FLAG 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_FSTATAT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_FSTATAT 1" >>confdefs.h
 
 
 
@@ -51881,7 +53105,7 @@ printf "%s\n" "#define GNULIB_TEST_FSTATAT 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETCWD 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETCWD 1" >>confdefs.h
 
 
 
@@ -51901,13 +53125,13 @@ printf "%s\n" "#define GNULIB_TEST_GETCWD 1" >>confdefs.h
 
   if test $ac_cv_func_getdelim = yes; then
     HAVE_GETDELIM=1
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5
 printf %s "checking for working getdelim function... " >&6; }
 if test ${gl_cv_func_working_getdelim+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+else case e in #(
+  e) echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
        if test "$cross_compiling" = yes
 then :
                       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -51922,21 +53146,22 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky GNU user" >/dev/null 2>&1
 then :
   gl_cv_func_working_getdelim="guessing yes"
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
                *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
                *)       gl_cv_func_working_getdelim="$gl_cross_guess_normal" ;;
              esac
-
+             ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #    include <stdio.h>
@@ -51974,17 +53199,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_working_getdelim=yes
-else $as_nop
-  gl_cv_func_working_getdelim=no
+else case e in #(
+  e) gl_cv_func_working_getdelim=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5
-printf "%s\n" "$gl_cv_func_working_getdelim" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5
+printf '%s\n' "$gl_cv_func_working_getdelim" >&6; }
     case "$gl_cv_func_working_getdelim" in
       *yes) ;;
       *) REPLACE_GETDELIM=1 ;;
@@ -52012,24 +53240,25 @@ printf "%s\n" "$gl_cv_func_working_getdelim" >&6; }
   ac_fn_c_check_func "$LINENO" "flockfile" "ac_cv_func_flockfile"
 if test "x$ac_cv_func_flockfile" = xyes
 then :
-  printf "%s\n" "#define HAVE_FLOCKFILE 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_FLOCKFILE 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "funlockfile" "ac_cv_func_funlockfile"
 if test "x$ac_cv_func_funlockfile" = xyes
 then :
-  printf "%s\n" "#define HAVE_FUNLOCKFILE 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_FUNLOCKFILE 1" >>confdefs.h
 
 fi
 
-  ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+  ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getc_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
-printf "%s\n" "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
       fi
@@ -52048,7 +53277,7 @@ printf "%s\n" "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h
 
 
 
@@ -52065,13 +53294,13 @@ printf "%s\n" "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h
 
   if test $ac_cv_func_getdtablesize = yes &&
      test $ac_cv_have_decl_getdtablesize = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
 printf %s "checking whether getdtablesize works... " >&6; }
 if test ${gl_cv_func_getdtablesize_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-                                                   case "$host_os" in
+else case e in #(
+  e)                                                  case "$host_os" in
          vms*) gl_cv_func_getdtablesize_works="no (limitation)" ;;
          *)
                                                        if test "$cross_compiling" = yes
@@ -52082,8 +53311,8 @@ then :
                 *) gl_cv_func_getdtablesize_works="guessing yes" ;;
               esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
              #include <unistd.h>
@@ -52108,19 +53337,22 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getdtablesize_works=yes
-else $as_nop
-  gl_cv_func_getdtablesize_works=no
+else case e in #(
+  e) gl_cv_func_getdtablesize_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
            ;;
        esac
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
-printf "%s\n" "$gl_cv_func_getdtablesize_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
+printf '%s\n' "$gl_cv_func_getdtablesize_works" >&6; }
     case "$gl_cv_func_getdtablesize_works" in
       *yes | "no (limitation)") ;;
       *) REPLACE_GETDTABLESIZE=1 ;;
@@ -52157,7 +53389,7 @@ printf "%s\n" "$gl_cv_func_getdtablesize_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
 
 
 
@@ -52179,18 +53411,19 @@ printf "%s\n" "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
 if test "x$ac_cv_func_getline" = xyes
 then :
                    gl_getline_needs_run_time_check=yes
-else $as_nop
-  am_cv_func_working_getline=no
+else case e in #(
+  e) am_cv_func_working_getline=no ;;
+esac
 fi
 
   if test $gl_getline_needs_run_time_check = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5
 printf %s "checking for working getline function... " >&6; }
 if test ${am_cv_func_working_getline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+else case e in #(
+  e) echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
        if test "$cross_compiling" = yes
 then :
                       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -52205,21 +53438,22 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky GNU user" >/dev/null 2>&1
 then :
   am_cv_func_working_getline="guessing yes"
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
                *-musl*) am_cv_func_working_getline="guessing yes" ;;
                *)       am_cv_func_working_getline="$gl_cross_guess_normal" ;;
              esac
-
+             ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #    include <stdio.h>
@@ -52257,17 +53491,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   am_cv_func_working_getline=yes
-else $as_nop
-  am_cv_func_working_getline=no
+else case e in #(
+  e) am_cv_func_working_getline=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_working_getline" >&5
-printf "%s\n" "$am_cv_func_working_getline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_working_getline" >&5
+printf '%s\n' "$am_cv_func_working_getline" >&6; }
   fi
 
   if test $ac_cv_have_decl_getline = no; then
@@ -52311,7 +53548,7 @@ printf "%s\n" "$am_cv_func_working_getline" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_GETLINE 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_GETLINE 1" >>confdefs.h
 
 
 
@@ -52336,13 +53573,13 @@ printf "%s\n" "#define GNULIB_TEST_GETLINE 1" >>confdefs.h
     if ! $gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66; then
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used without linking with libm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) can be used without linking with libm" >&5
 printf %s "checking whether isnan(float) can be used without linking with libm... " >&6; }
 if test ${gl_cv_func_isnanf_no_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
@@ -52365,27 +53602,29 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_isnanf_no_libm=yes
-else $as_nop
-  gl_cv_func_isnanf_no_libm=no
+else case e in #(
+  e) gl_cv_func_isnanf_no_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_no_libm" >&5
-printf "%s\n" "$gl_cv_func_isnanf_no_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_no_libm" >&5
+printf '%s\n' "$gl_cv_func_isnanf_no_libm" >&6; }
 
   if test $gl_cv_func_isnanf_no_libm = yes; then
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether isnan(float) works" >&5
 printf %s "checking whether isnan(float) works... " >&6; }
 if test ${gl_cv_func_isnanf_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   case "$host_os" in
@@ -52400,11 +53639,12 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Known" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Known" >/dev/null 2>&1
 then :
   gl_cv_func_isnanf_works="guessing yes"
-else $as_nop
-  gl_cv_func_isnanf_works="guessing no"
+else case e in #(
+  e) gl_cv_func_isnanf_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
@@ -52412,8 +53652,8 @@ rm -rf conftest*
            *) gl_cv_func_isnanf_works="guessing yes" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -52471,17 +53711,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_isnanf_works=yes
-else $as_nop
-  gl_cv_func_isnanf_works=no
+else case e in #(
+  e) gl_cv_func_isnanf_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_works" >&5
-printf "%s\n" "$gl_cv_func_isnanf_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isnanf_works" >&5
+printf '%s\n' "$gl_cv_func_isnanf_works" >&6; }
 
   fi
   if test $gl_cv_func_isnanf_no_libm = yes \
@@ -52492,7 +53735,7 @@ printf "%s\n" "$gl_cv_func_isnanf_works" >&6; }
         }; then
     gl_func_isnanf_no_libm=yes
 
-printf "%s\n" "#define HAVE_ISNANF_IN_LIBC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ISNANF_IN_LIBC 1" >>confdefs.h
 
   else
     gl_func_isnanf_no_libm=no
@@ -52511,18 +53754,18 @@ printf "%s\n" "#define HAVE_ISNANF_IN_LIBC 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'float'" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'float'" >&5
 printf %s "checking where to find the exponent in a 'float'... " >&6; }
 if test ${gl_cv_cc_float_expbit0+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       if test "$cross_compiling" = yes
 then :
   gl_cv_cc_float_expbit0="word 0 bit 23"
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <float.h>
@@ -52593,27 +53836,30 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_cc_float_expbit0=`cat conftest.out`
-else $as_nop
-  gl_cv_cc_float_expbit0="unknown"
+else case e in #(
+  e) gl_cv_cc_float_expbit0="unknown" ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       rm -f conftest.out
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_float_expbit0" >&5
-printf "%s\n" "$gl_cv_cc_float_expbit0" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_float_expbit0" >&5
+printf '%s\n' "$gl_cv_cc_float_expbit0" >&6; }
   case "$gl_cv_cc_float_expbit0" in
     word*bit*)
       word=`echo "$gl_cv_cc_float_expbit0" | sed -e 's/word //' -e 's/ bit.*//'`
       bit=`echo "$gl_cv_cc_float_expbit0" | sed -e 's/word.*bit //'`
 
-printf "%s\n" "#define FLT_EXPBIT0_WORD $word" >>confdefs.h
+printf '%s\n' "#define FLT_EXPBIT0_WORD $word" >>confdefs.h
 
 
-printf "%s\n" "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h
+printf '%s\n' "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h
 
       ;;
   esac
@@ -52630,13 +53876,13 @@ printf "%s\n" "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h
 
   LDEXP_LIBM=
   if test $gl_cv_func_ldexp_no_libm = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ldexp() can be used with libm" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ldexp() can be used with libm" >&5
 printf %s "checking whether ldexp() can be used with libm... " >&6; }
 if test ${gl_cv_func_ldexp_in_libm+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
         save_LIBS="$LIBS"
         LIBS="$LIBS -lm"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -52658,16 +53904,18 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_func_ldexp_in_libm=yes
-else $as_nop
-  gl_cv_func_ldexp_in_libm=no
+else case e in #(
+  e) gl_cv_func_ldexp_in_libm=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
         LIBS="$save_LIBS"
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexp_in_libm" >&5
-printf "%s\n" "$gl_cv_func_ldexp_in_libm" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ldexp_in_libm" >&5
+printf '%s\n' "$gl_cv_func_ldexp_in_libm" >&6; }
     if test $gl_cv_func_ldexp_in_libm = yes; then
       LDEXP_LIBM=-lm
     fi
@@ -52735,7 +53983,7 @@ printf "%s\n" "$gl_cv_func_ldexp_in_libm" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
 
 
 
@@ -52769,7 +54017,7 @@ printf "%s\n" "#define GNULIB_TEST_LSTAT 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr"
 if test "x$ac_cv_func_memrchr" = xyes
 then :
-  printf "%s\n" "#define HAVE_MEMRCHR 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_MEMRCHR 1" >>confdefs.h
 
 fi
 
@@ -52802,7 +54050,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_MEMRCHR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_MEMRCHR 1" >>confdefs.h
 
 
 
@@ -52850,7 +54098,7 @@ printf "%s\n" "#define GNULIB_TEST_MEMRCHR 1" >>confdefs.h
       fi
 
 
-printf "%s\n" "#define GNULIB_OPENAT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_OPENAT 1" >>confdefs.h
 
 
 
@@ -52867,7 +54115,7 @@ printf "%s\n" "#define GNULIB_OPENAT 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_OPENAT 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_OPENAT 1" >>confdefs.h
 
 
 
@@ -52914,7 +54162,7 @@ printf "%s\n" "#define GNULIB_TEST_OPENAT 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "opendir" "ac_cv_func_opendir"
 if test "x$ac_cv_func_opendir" = xyes
 then :
-  printf "%s\n" "#define HAVE_OPENDIR 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_OPENDIR 1" >>confdefs.h
 
 fi
 
@@ -52967,7 +54215,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_OPENDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_OPENDIR 1" >>confdefs.h
 
 
 
@@ -53002,44 +54250,44 @@ printf "%s\n" "#define GNULIB_TEST_OPENDIR 1" >>confdefs.h
   ac_fn_c_check_header_compile "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default"
 if test "x$ac_cv_header_paths_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_PATHS_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_PATHS_H 1" >>confdefs.h
 
 fi
 
   ac_fn_c_check_func "$LINENO" "confstr" "ac_cv_func_confstr"
 if test "x$ac_cv_func_confstr" = xyes
 then :
-  printf "%s\n" "#define HAVE_CONFSTR 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_CONFSTR 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "sched_setparam" "ac_cv_func_sched_setparam"
 if test "x$ac_cv_func_sched_setparam" = xyes
 then :
-  printf "%s\n" "#define HAVE_SCHED_SETPARAM 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SCHED_SETPARAM 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "sched_setscheduler" "ac_cv_func_sched_setscheduler"
 if test "x$ac_cv_func_sched_setscheduler" = xyes
 then :
-  printf "%s\n" "#define HAVE_SCHED_SETSCHEDULER 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SCHED_SETSCHEDULER 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "setegid" "ac_cv_func_setegid"
 if test "x$ac_cv_func_setegid" = xyes
 then :
-  printf "%s\n" "#define HAVE_SETEGID 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SETEGID 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid"
 if test "x$ac_cv_func_seteuid" = xyes
 then :
-  printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SETEUID 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "vfork" "ac_cv_func_vfork"
 if test "x$ac_cv_func_vfork" = xyes
 then :
-  printf "%s\n" "#define HAVE_VFORK 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_VFORK 1" >>confdefs.h
 
 fi
 
@@ -53062,7 +54310,7 @@ fi
   ac_fn_c_check_func "$LINENO" "readdir" "ac_cv_func_readdir"
 if test "x$ac_cv_func_readdir" = xyes
 then :
-  printf "%s\n" "#define HAVE_READDIR 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_READDIR 1" >>confdefs.h
 
 fi
 
@@ -53097,7 +54345,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_READDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_READDIR 1" >>confdefs.h
 
 
 
@@ -53114,7 +54362,7 @@ printf "%s\n" "#define GNULIB_TEST_READDIR 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "rewinddir" "ac_cv_func_rewinddir"
 if test "x$ac_cv_func_rewinddir" = xyes
 then :
-  printf "%s\n" "#define HAVE_REWINDDIR 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_REWINDDIR 1" >>confdefs.h
 
 fi
 
@@ -53149,7 +54397,7 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_REWINDDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_REWINDDIR 1" >>confdefs.h
 
 
 
@@ -53163,13 +54411,13 @@ printf "%s\n" "#define GNULIB_TEST_REWINDDIR 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether rmdir works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether rmdir works" >&5
 printf %s "checking whether rmdir works... " >&6; }
 if test ${gl_cv_func_rmdir_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  mkdir conftest.dir
+else case e in #(
+  e) mkdir conftest.dir
      touch conftest.file
      if test "$cross_compiling" = yes
 then :
@@ -53184,8 +54432,8 @@ then :
           *)               gl_cv_func_rmdir_works="$gl_cross_guess_normal" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
            #include <errno.h>
@@ -53217,17 +54465,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_rmdir_works=yes
-else $as_nop
-  gl_cv_func_rmdir_works=no
+else case e in #(
+  e) gl_cv_func_rmdir_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-     rm -rf conftest.dir conftest.file
+     rm -rf conftest.dir conftest.file ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rmdir_works" >&5
-printf "%s\n" "$gl_cv_func_rmdir_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_rmdir_works" >&5
+printf '%s\n' "$gl_cv_func_rmdir_works" >&6; }
   case "$gl_cv_func_rmdir_works" in
     *yes) ;;
     *)
@@ -53262,7 +54513,7 @@ printf "%s\n" "$gl_cv_func_rmdir_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_RMDIR 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_RMDIR 1" >>confdefs.h
 
 
 
@@ -53289,13 +54540,13 @@ printf "%s\n" "#define GNULIB_TEST_RMDIR 1" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5
 printf %s "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >&6; }
 if test ${gl_cv_func_setlocale_null_all_mtsafe+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
        # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin.
        *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*)
          gl_cv_func_setlocale_null_all_mtsafe=no ;;
@@ -53306,10 +54557,11 @@ else $as_nop
        *)
          gl_cv_func_setlocale_null_all_mtsafe="$gl_cross_guess_normal" ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5
-printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5
+printf '%s\n' "$gl_cv_func_setlocale_null_all_mtsafe" >&6; }
     case "$host_os" in
     mingw*) ;;
     *)
@@ -53323,16 +54575,16 @@ printf "%s\n" "$gl_cv_func_setlocale_null_all_mtsafe" >&6; }
     *)    SETLOCALE_NULL_ALL_MTSAFE=0 ;;
   esac
 
-printf "%s\n" "#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE" >>confdefs.h
+printf '%s\n' "#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE" >>confdefs.h
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5
 printf %s "checking whether setlocale (category, NULL) is multithread-safe... " >&6; }
 if test ${gl_cv_func_setlocale_null_one_mtsafe+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
        # Guess no on OpenBSD, AIX.
        openbsd* | aix*)
          gl_cv_func_setlocale_null_one_mtsafe=no ;;
@@ -53343,10 +54595,11 @@ else $as_nop
        *)
          gl_cv_func_setlocale_null_one_mtsafe="$gl_cross_guess_normal" ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5
-printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5
+printf '%s\n' "$gl_cv_func_setlocale_null_one_mtsafe" >&6; }
     case "$host_os" in
     mingw*) ;;
     *)
@@ -53360,7 +54613,7 @@ printf "%s\n" "$gl_cv_func_setlocale_null_one_mtsafe" >&6; }
     *)    SETLOCALE_NULL_ONE_MTSAFE=0 ;;
   esac
 
-printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>confdefs.h
+printf '%s\n' "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>confdefs.h
 
 
     if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then
@@ -53369,13 +54622,13 @@ printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>c
       *)
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
 printf %s "checking whether imported symbols can be declared weak... " >&6; }
 if test ${gl_cv_have_weak+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$host_os" in
+else case e in #(
+  e) case "$host_os" in
        cygwin*)
                                     gl_cv_have_weak="guessing no"
          ;;
@@ -53410,17 +54663,18 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Extensible Linking Format" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1
 then :
   gl_cv_have_weak="guessing yes"
-else $as_nop
-  gl_cv_have_weak="guessing no"
+else case e in #(
+  e) gl_cv_have_weak="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -53433,11 +54687,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_have_weak=yes
-else $as_nop
-  gl_cv_have_weak=no
+else case e in #(
+  e) gl_cv_have_weak=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
          fi
@@ -53467,14 +54723,15 @@ EOF
          esac
          ;;
      esac
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
-printf "%s\n" "$gl_cv_have_weak" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
+printf '%s\n' "$gl_cv_have_weak" >&6; }
   case "$gl_cv_have_weak" in
     *yes)
 
-printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
+printf '%s\n' "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
 
       ;;
   esac
@@ -53507,13 +54764,13 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS="$CFLAGS"
+else case e in #(
+  e) gl_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Werror"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -53529,22 +54786,24 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_cc_vis_werror=yes
-else $as_nop
-  gl_cv_cc_vis_werror=no
+else case e in #(
+  e) gl_cv_cc_vis_werror=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        CFLAGS="$gl_save_CFLAGS"
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS="$CFLAGS"
+else case e in #(
+  e) gl_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fvisibility=hidden"
                                           if test $gl_cv_cc_vis_werror = yes; then
          CFLAGS="$CFLAGS -Werror"
@@ -53573,15 +54832,17 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_cc_visibility=yes
-else $as_nop
-  gl_cv_cc_visibility=no
+else case e in #(
+  e) gl_cv_cc_visibility=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        CFLAGS="$gl_save_CFLAGS"
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -53590,7 +54851,7 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
 
 
 
-printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
@@ -53610,7 +54871,7 @@ printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_SETLOCALE_NULL 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_SETLOCALE_NULL 1" >>confdefs.h
 
 
 
@@ -53640,15 +54901,15 @@ printf "%s\n" "#define GNULIB_TEST_SETLOCALE_NULL 1" >>confdefs.h
 if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
 printf %s "checking whether struct stat.st_atim is of type struct timespec... " >&6; }
 if test ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
             #include <sys/types.h>
@@ -53673,54 +54934,59 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes
-else $as_nop
-  ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no
+else case e in #(
+  e) ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
-printf "%s\n" "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
+printf '%s\n' "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
      if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then
 
-printf "%s\n" "#define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
+printf '%s\n' "#define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
 
      fi
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "#include <sys/types.h>
         #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "#include <sys/types.h>
            #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
 
 
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "#include <sys/types.h>
               #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
-
+ ;;
+esac
 fi
-
+ ;;
+esac
 fi
-
+ ;;
+esac
 fi
 
 
@@ -53733,33 +54999,35 @@ fi
 if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "#include <sys/types.h>
         #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
 
 
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim.tv_nsec" "ac_cv_member_struct_stat_st_birthtim_tv_nsec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim.tv_nsec" "ac_cv_member_struct_stat_st_birthtim_tv_nsec" "#include <sys/types.h>
           #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
-
+ ;;
+esac
 fi
-
+ ;;
+esac
 fi
 
 
@@ -53776,20 +55044,20 @@ fi
   ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
 if test "x$ac_cv_func_strchrnul" = xyes
 then :
-  printf "%s\n" "#define HAVE_STRCHRNUL 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_STRCHRNUL 1" >>confdefs.h
 
 fi
 
   if test $ac_cv_func_strchrnul = no; then
     HAVE_STRCHRNUL=0
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strchrnul works" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strchrnul works" >&5
 printf %s "checking whether strchrnul works... " >&6; }
 if test ${gl_cv_func_strchrnul_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -53805,17 +55073,18 @@ then :
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1
 then :
   gl_cv_func_strchrnul_works="guessing yes"
-else $as_nop
-  gl_cv_func_strchrnul_works="guessing no"
+else case e in #(
+  e) gl_cv_func_strchrnul_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h> /* for strchrnul */
@@ -53833,17 +55102,20 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_strchrnul_works=yes
-else $as_nop
-  gl_cv_func_strchrnul_works=no
+else case e in #(
+  e) gl_cv_func_strchrnul_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strchrnul_works" >&5
-printf "%s\n" "$gl_cv_func_strchrnul_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strchrnul_works" >&5
+printf '%s\n' "$gl_cv_func_strchrnul_works" >&6; }
     case "$gl_cv_func_strchrnul_works" in
       *yes) ;;
       *) REPLACE_STRCHRNUL=1 ;;
@@ -53878,7 +55150,7 @@ printf "%s\n" "$gl_cv_func_strchrnul_works" >&6; }
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STRCHRNUL 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STRCHRNUL 1" >>confdefs.h
 
 
 
@@ -53909,7 +55181,7 @@ printf "%s\n" "#define GNULIB_TEST_STRCHRNUL 1" >>confdefs.h
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -53989,13 +55261,13 @@ fi
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STRERROR_R 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STRERROR_R 1" >>confdefs.h
 
 
 
 
 
-printf "%s\n" "#define GNULIB_STRERROR_R_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_STRERROR_R_POSIX 1" >>confdefs.h
 
 
       gl_gnulib_enabled_1f32594a85e6221ba15f884daeee8c2a=true
@@ -54029,42 +55301,68 @@ printf "%s\n" "#define GNULIB_STRERROR_R_POSIX 1" >>confdefs.h
     HAVE_DECL_STRNLEN=0
   else
 
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
 printf %s "checking for working strnlen... " >&6; }
 if test ${ac_cv_func_strnlen_working+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
-  # Guess no on AIX systems, yes otherwise.
-		case "$host_os" in
-		  aix*) ac_cv_func_strnlen_working=no;;
-		  *)    ac_cv_func_strnlen_working=yes;;
-		esac
-else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main (void)
 {
+#if defined _AIX && !defined _AIX51
+	    #error "AIX pre 5.1 is buggy"
+	   #endif
+	   #ifdef __ANDROID__
+	    #include <android/api-level.h>
+	    #if __ANDROID_API__ < 22
+	     #error "Android API < 22 is buggy"
+	    #endif
+	   #endif
 
-#define S "foobar"
-#define S_LEN (sizeof S - 1)
-
-  /* At least one implementation is buggy: that of AIX 4.3 would
-     give strnlen (S, 1) == 3.  */
-
-  int i;
-  for (i = 0; i < S_LEN + 1; ++i)
-    {
-      int expected = i <= S_LEN ? i : S_LEN;
-      if (strnlen (S, i) != expected)
-	return 1;
-    }
+  ;
   return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_func_strnlen_working=yes
+else case e in #(
+  e) ac_cv_func_strnlen_working=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+       /* Use pstrnlen to test; 'volatile' prevents the compiler
+	   from optimizing the strnlen calls away.  */
+	size_t (*volatile pstrnlen) (char const *, size_t) = strnlen;
+	char const s[] = "foobar";
+	int s_len = sizeof s - 1;
 
+int
+main (void)
+{
+
+	/* AIX 4.3 is buggy: strnlen (S, 1) == 3.  */
+	int i;
+	for (i = 0; i < s_len + 1; ++i)
+	  {
+	    int expected = i <= s_len ? i : s_len;
+	    if (pstrnlen (s, i) != expected)
+	      return 1;
+	  }
+
+	/* Android 5.0 (API 21) strnlen ("", SIZE_MAX) incorrectly crashes.  */
+	if (pstrnlen ("", -1) != 0)
+	  return 1;
   ;
   return 0;
 }
@@ -54072,16 +55370,19 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_func_strnlen_working=yes
-else $as_nop
-  ac_cv_func_strnlen_working=no
+else case e in #(
+  e) ac_cv_func_strnlen_working=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5
-printf "%s\n" "$ac_cv_func_strnlen_working" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5
+printf '%s\n' "$ac_cv_func_strnlen_working" >&6; }
 test $ac_cv_func_strnlen_working = no && :
 
 
@@ -54118,7 +55419,7 @@ test $ac_cv_func_strnlen_working = no && :
 
 
 
-printf "%s\n" "#define GNULIB_TEST_STRNLEN 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_STRNLEN 1" >>confdefs.h
 
 
 
@@ -54212,7 +55513,7 @@ printf "%s\n" "#define GNULIB_TEST_STRNLEN 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -54227,7 +55528,7 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_DOUBLE 1" >>confdefs.h
           ;;
         *)
 
-printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
 
           ;;
       esac
@@ -54241,12 +55542,12 @@ printf "%s\n" "#define NEED_PRINTF_INFINITE_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h
 
       ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes
 then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_NL_LANGINFO 1" >>confdefs.h
 
 fi
 
@@ -54260,7 +55561,7 @@ fi
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
 
       ;;
   esac
@@ -54272,7 +55573,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_F 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
 
       ;;
   esac
@@ -54284,7 +55585,7 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LS 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
 
       ;;
   esac
@@ -54296,7 +55597,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_GROUPING 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
 
       ;;
   esac
@@ -54308,7 +55609,7 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_LEFTADJUST 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
 
       ;;
   esac
@@ -54320,13 +55621,13 @@ printf "%s\n" "#define NEED_PRINTF_FLAG_ZERO 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_UNBOUNDED_PRECISION 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -54338,13 +55639,13 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
       ;;
     *)
 
-printf "%s\n" "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_ENOMEM 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_DOUBLE 1" >>confdefs.h
 
 
-printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
+printf '%s\n' "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
       ;;
   esac
@@ -54393,7 +55694,7 @@ printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h
 
   if test $ac_cv_func_vasnprintf = yes; then
 
-printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 
   fi
 
@@ -54409,11 +55710,12 @@ printf "%s\n" "#define REPLACE_VASNPRINTF 1" >>confdefs.h
 if test "x$ac_cv_type_ptrdiff_t" = xyes
 then :
 
-else $as_nop
-
-printf "%s\n" "#define ptrdiff_t long" >>confdefs.h
-
+else case e in #(
+  e)
+printf '%s\n' "#define ptrdiff_t long" >>confdefs.h
 
+     ;;
+esac
 fi
 
 
@@ -54436,7 +55738,7 @@ fi
 
   REPLACE_VFPRINTF=1
 
-printf "%s\n" "#define REPLACE_VFPRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define REPLACE_VFPRINTF_POSIX 1" >>confdefs.h
 
   :
 
@@ -54457,13 +55759,13 @@ printf "%s\n" "#define REPLACE_VFPRINTF_POSIX 1" >>confdefs.h
 
 
 
-printf "%s\n" "#define GNULIB_TEST_VFPRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_TEST_VFPRINTF_POSIX 1" >>confdefs.h
 
 
 
 
 
-printf "%s\n" "#define GNULIB_VFPRINTF_POSIX 1" >>confdefs.h
+printf '%s\n' "#define GNULIB_VFPRINTF_POSIX 1" >>confdefs.h
 
 
       gl_gnulib_enabled_ed5616be3593d355b981ffab56b9f37b=true
@@ -55155,18 +56457,19 @@ fi
 # We use gnulib, which is only guaranteed to work properly with the
 # latest Gettext.
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 printf %s "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
 if test ${enable_nls+y}
 then :
   enableval=$enable_nls; USE_NLS=$enableval
-else $as_nop
-  USE_NLS=yes
+else case e in #(
+  e) USE_NLS=yes ;;
+esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
 
 
 
@@ -55205,13 +56508,13 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGFMT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$MSGFMT" in
+else case e in #(
+  e) case "$MSGFMT" in
   [\\/]* | ?:[\\/]*)
     ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
     ;;
@@ -55234,26 +56537,27 @@ else $as_nop
     IFS="$ac_save_IFS"
   test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
     ;;
+esac ;;
 esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-printf "%s\n" "$MSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf '%s\n' "$MSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_GMSGFMT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $GMSGFMT in
+else case e in #(
+  e) case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
@@ -55270,7 +56574,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -55279,15 +56583,16 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
+esac ;;
 esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-printf "%s\n" "$GMSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf '%s\n' "$GMSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -55333,13 +56638,13 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XGETTEXT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$XGETTEXT" in
+else case e in #(
+  e) case "$XGETTEXT" in
   [\\/]* | ?:[\\/]*)
     ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
     ;;
@@ -55362,15 +56667,16 @@ else $as_nop
     IFS="$ac_save_IFS"
   test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
     ;;
+esac ;;
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-printf "%s\n" "$XGETTEXT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf '%s\n' "$XGETTEXT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     rm -f messages.po
@@ -55411,13 +56717,13 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGMERGE+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$MSGMERGE" in
+else case e in #(
+  e) case "$MSGMERGE" in
   [\\/]* | ?:[\\/]*)
     ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
     ;;
@@ -55439,15 +56745,16 @@ else $as_nop
     IFS="$ac_save_IFS"
   test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
     ;;
+esac ;;
 esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-printf "%s\n" "$MSGMERGE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf '%s\n' "$MSGMERGE" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -55484,13 +56791,13 @@ fi
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
 if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gt_save_LIBS="$LIBS"
+else case e in #(
+  e) gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -55506,27 +56813,29 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gt_cv_func_CFPreferencesCopyAppValue=yes
-else $as_nop
-  gt_cv_func_CFPreferencesCopyAppValue=no
+else case e in #(
+  e) gt_cv_func_CFPreferencesCopyAppValue=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
+     LIBS="$gt_save_LIBS" ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf '%s\n' "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 
-printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+printf '%s\n' "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 printf %s "checking for CFLocaleCopyCurrent... " >&6; }
 if test ${gt_cv_func_CFLocaleCopyCurrent+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gt_save_LIBS="$LIBS"
+else case e in #(
+  e) gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -55542,18 +56851,20 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   gt_cv_func_CFLocaleCopyCurrent=yes
-else $as_nop
-  gt_cv_func_CFLocaleCopyCurrent=no
+else case e in #(
+  e) gt_cv_func_CFLocaleCopyCurrent=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
+     LIBS="$gt_save_LIBS" ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+printf '%s\n' "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
   if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
 
-printf "%s\n" "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+printf '%s\n' "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
 
   fi
   INTL_MACOSX_LIBS=
@@ -55598,13 +56909,13 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
           gt_expression_test_code=
         fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 printf %s "checking for GNU gettext in libc... " >&6; }
 if eval test \${$gt_func_gnugettext_libc+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <libintl.h>
@@ -55626,15 +56937,17 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$gt_func_gnugettext_libc=yes"
-else $as_nop
-  eval "$gt_func_gnugettext_libc=no"
+else case e in #(
+  e) eval "$gt_func_gnugettext_libc=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libc
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
@@ -55667,13 +56980,13 @@ printf "%s\n" "$ac_res" >&6; }
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -55726,18 +57039,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
-
+   ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                   am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
@@ -55750,8 +57064,8 @@ then :
              aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
              *)            am_cv_func_iconv_works="guessing yes" ;;
            esac
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -55880,16 +57194,18 @@ then :
   am_cv_func_iconv_works=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
       LIBS="$am_save_LIBS"
-
+     ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -55899,14 +57215,14 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
 
-printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -56407,13 +57723,13 @@ fi
 
 
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 printf %s "checking for GNU gettext in libintl... " >&6; }
 if eval test \${$gt_func_gnugettext_libintl+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gt_save_CPPFLAGS="$CPPFLAGS"
+else case e in #(
+  e) gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
@@ -56443,8 +57759,9 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$gt_func_gnugettext_libintl=yes"
-else $as_nop
-  eval "$gt_func_gnugettext_libintl=no"
+else case e in #(
+  e) eval "$gt_func_gnugettext_libintl=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -56484,11 +57801,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"
+            LIBS="$gt_save_LIBS" ;;
+esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libintl
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
         fi
 
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
@@ -56515,19 +57833,19 @@ printf "%s\n" "$ac_res" >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
 
-printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h
+printf '%s\n' "#define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
 printf %s "checking whether to use NLS... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
 printf %s "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
@@ -56538,18 +57856,18 @@ printf %s "checking where the gettext function comes from... " >&6; }
     else
       gt_source="included intl directory"
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-printf "%s\n" "$gt_source" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf '%s\n' "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
 printf %s "checking how to link with libintl... " >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-printf "%s\n" "$LIBINTL" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf '%s\n' "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -56576,10 +57894,10 @@ printf "%s\n" "$LIBINTL" >&6; }
       fi
 
 
-printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h
+printf '%s\n' "#define HAVE_GETTEXT 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -56617,7 +57935,7 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
   fi
   if test $BISON_USE_NLS = yes; then
 
-printf "%s\n" "#define YYENABLE_NLS 1" >>confdefs.h
+printf '%s\n' "#define YYENABLE_NLS 1" >>confdefs.h
 
   fi
 
@@ -56647,13 +57965,13 @@ for ac_prog in valgrind
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_VALGRIND+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$VALGRIND"; then
+else case e in #(
+  e) if test -n "$VALGRIND"; then
   ac_cv_prog_VALGRIND="$VALGRIND" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -56668,22 +57986,23 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_VALGRIND="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 VALGRIND=$ac_cv_prog_VALGRIND
 if test -n "$VALGRIND"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VALGRIND" >&5
-printf "%s\n" "$VALGRIND" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $VALGRIND" >&5
+printf '%s\n' "$VALGRIND" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -56705,10 +58024,10 @@ case $VALGRIND:$uname in
     fi
     ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Valgrind suppression file" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking Valgrind suppression file" >&5
 printf %s "checking Valgrind suppression file... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $suppfile" >&5
-printf "%s\n" "$suppfile" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $suppfile" >&5
+printf '%s\n' "$suppfile" >&6; }
 
 # Whether we cannot run the compiled bison.
  if test "$cross_compiling" = yes; then
@@ -56757,50 +58076,13 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# 'ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* 'ac_cv_foo' will be assigned the
 # following values.
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -56812,8 +58094,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -56827,8 +58109,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -56845,7 +58127,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -56856,14 +58138,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
 printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf '%s\n' "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -57274,13 +58556,21 @@ fi
 
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in #(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; #(
+  */*) :
+     ;; #(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -57294,28 +58584,28 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
 if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
 then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else $as_nop
-  case `(set -o) 2>/dev/null` in #(
+else case e in #(
+  e) case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
+esac ;;
 esac
 fi
 
@@ -57387,13 +58677,13 @@ IFS=$as_save_IFS
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -57409,14 +58699,13 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -57456,11 +58745,12 @@ then :
   {
     eval $1+=\$2
   }'
-else $as_nop
-  as_fn_append ()
+else case e in #(
+  e) as_fn_append ()
   {
     eval $1=\$$1\$2
-  }
+  } ;;
+esac
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -57474,11 +58764,12 @@ then :
   {
     as_val=$(( $* ))
   }'
-else $as_nop
-  as_fn_arith ()
+else case e in #(
+  e) as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  }
+  } ;;
+esac
 fi # as_fn_arith
 
 
@@ -57505,7 +58796,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -57527,29 +58818,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -57561,9 +58829,9 @@ if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -57591,7 +58859,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -57600,7 +58868,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -57644,26 +58912,28 @@ as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by GNU Bison $as_me 3.8.2, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -57685,7 +58955,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -57694,9 +58964,9 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
+'$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
 and actions are specified as TAGs, all are instantiated by default.
 
@@ -57731,16 +59001,16 @@ GNU Bison home page: <https://www.gnu.org/software/bison/>.
 General help using GNU software: <https://www.gnu.org/gethelp/>."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 GNU Bison config.status 3.8.2
-configured by $0, generated by GNU Autoconf 2.71,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -57749,10 +59019,14 @@ srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -57780,15 +59054,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -57796,23 +59070,23 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+    as_fn_error $? "ambiguous option: '$1'
+Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+  -*) as_fn_error $? "unrecognized option: '$1'
+Try '$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
@@ -57829,29 +59103,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -57869,7 +59143,7 @@ ac_cv_exeext="$ac_cv_exeext"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -57892,7 +59166,7 @@ do
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "doc/yacc.1") CONFIG_FILES="$CONFIG_FILES doc/yacc.1" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -57913,7 +59187,7 @@ fi
 # creating and moving files from /tmp can sometimes cause problems.
 # Hook for its removal unless debugging.
 # Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
+# after its creation but before its name has been assigned to '$tmp'.
 $debug ||
 {
   tmp= ac_tmp=
@@ -57937,7 +59211,7 @@ ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+# This happens for instance with './config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
 if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
@@ -57955,7 +59229,7 @@ else
       print "|#_!!_#|"
       print "cat " F[key] " &&"
       '$ac_cs_awk_pipe_init
-  # The final `:' finishes the AND list.
+  # The final ':' finishes the AND list.
   ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
 fi
 ac_cr=`echo X | tr X '\015'`
@@ -57977,9 +59251,9 @@ _ACEOF
 
 # Create commands to substitute file output variables.
 {
-  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
-  echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
-  echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
+  echo 'cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1' &&
+  printf '%s\n' 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
+  printf '%s\n' "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
   echo "_ACAWK" &&
   echo "_ACEOF"
 } >conf$$files.sh &&
@@ -57993,13 +59267,13 @@ rm -f conf$$files.sh
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -58010,7 +59284,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -58055,9 +59329,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -58092,7 +59366,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 \$ac_cs_awk_pipe_fini
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -58124,18 +59398,18 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
 # No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
+# This happens for instance with './config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
 cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
-# Transform confdefs.h into an awk script `defines.awk', embedded as
+# Transform confdefs.h into an awk script 'defines.awk', embedded as
 # here-document in config.status, that substitutes the proper values into
 # config.h.in to produce config.h.
 
@@ -58195,9 +59469,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -58215,8 +59489,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -58231,7 +59509,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -58245,7 +59523,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -58267,33 +59545,33 @@ do
       -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
+	 # because $ac_f cannot contain ':'.
 	 test -f "$ac_f" ||
 	   case $ac_f in
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # Let's still pretend it is 'configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -58310,7 +59588,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -58334,9 +59612,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -58381,7 +59659,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -58398,10 +59676,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -58412,14 +59690,14 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 esac
 _ACEOF
 
-# Neutralize VPATH when `$srcdir' = `.'.
+# Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -58448,9 +59726,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -58466,20 +59744,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -58499,7 +59777,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$_am_arg" |
+printf '%s\n' X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -58531,8 +59809,8 @@ printf "%s\n" X"$_am_arg" |
       ac_source=$srcdir/$ac_source
     fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
-printf "%s\n" "$as_me: linking $ac_source to $ac_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
+printf '%s\n' "$as_me: linking $ac_source to $ac_file" >&6;}
 
     if test ! -r "$ac_source"; then
       as_fn_error $? "$ac_source: file not found" "$LINENO" 5
@@ -58550,8 +59828,8 @@ printf "%s\n" "$as_me: linking $ac_source to $ac_file" >&6;}
       as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
   fi
  ;;
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -58577,7 +59855,7 @@ esac
   for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    am_mf=`printf '%s\n' "$am_mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile which includes
     # dependency-tracking related rules and includes.
     # Grep'ing the whole file directly is not great: AIX grep has a line
@@ -58589,7 +59867,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$am_mf" : 'X\(//\)[^/]' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$am_mf" |
+printf '%s\n' X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -58611,7 +59889,7 @@ printf "%s\n" X"$am_mf" |
 $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$am_mf" |
+printf '%s\n' X/"$am_mf" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -58636,15 +59914,15 @@ printf "%s\n" X/"$am_mf" |
    (exit $ac_status); } || am_rc=$?
   done
   if test $am_rc -ne 0; then
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
     for automatic dependency tracking.  If GNU make was not used, consider
     re-running the configure script with MAKE=\"gmake\" (or whatever is
     necessary).  You can also try re-running configure with the
     '--disable-dependency-tracking' option to at least be able to build
     the package (albeit without support for automatic dependency tracking).
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
   fi
   { am_dirpart=; unset am_dirpart;}
   { am_filepart=; unset am_filepart;}
@@ -58772,7 +60050,7 @@ See \`config.log' for more details" "$LINENO" 5; }
     "tests/atconfig":C) cat >tests/atconfig <<ATEOF
 # Configurable variable values for building test suites.
 # Generated by $0.
-# Copyright (C) 2021 Free Software Foundation, Inc.
+# Copyright (C) 2026 Free Software Foundation, Inc.
 
 # The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
 at_testdir='tests'
@@ -58802,7 +60080,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -58818,19 +60096,26 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in #(
+  -*) :
+    ac_no_opts=-- ;; #(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
diff --git a/local/recipes/dev/bison/source/doc/bison.info b/local/recipes/dev/bison/source/doc/bison.info
index 4f4fb08267..fea740eb9e 100644
--- a/local/recipes/dev/bison/source/doc/bison.info
+++ b/local/recipes/dev/bison/source/doc/bison.info
@@ -1,22 +1,22 @@
-This is bison.info, produced by makeinfo version 6.8 from bison.texi.
+This is bison.info, produced by makeinfo version 7.3 from bison.texi.
 
-This manual (12 September 2021) is for GNU Bison (version 3.8.2), the
-GNU parser generator.
+This manual (15 May 2026) is for GNU Bison (version 3.8.2), the GNU
+parser generator.
 
-   Copyright © 1988–1993, 1995, 1998–2015, 2018–2021 Free Software
+   Copyright © 1988-1993, 1995, 1998-2015, 2018-2021 Free Software
 Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
      Version 1.3 or any later version published by the Free Software
      Foundation; with no Invariant Sections, with the Front-Cover texts
-     being “A GNU Manual,” and with the Back-Cover Texts as in (a)
+     being "A GNU Manual," and with the Back-Cover Texts as in (a)
      below.  A copy of the license is included in the section entitled
-     “GNU Free Documentation License.”
+     "GNU Free Documentation License."
 
-     (a) The FSF’s Back-Cover Text is: “You have the freedom to copy and
+     (a) The FSF's Back-Cover Text is: "You have the freedom to copy and
      modify this GNU manual.  Buying copies from the FSF supports it in
-     developing GNU and promoting software freedom.”
+     developing GNU and promoting software freedom."
 INFO-DIR-SECTION Software development
 START-INFO-DIR-ENTRY
 * bison: (bison).       GNU parser generator (Yacc replacement).
@@ -28,23 +28,23 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****
 
-This manual (12 September 2021) is for GNU Bison (version 3.8.2), the
-GNU parser generator.
+This manual (15 May 2026) is for GNU Bison (version 3.8.2), the GNU
+parser generator.
 
-   Copyright © 1988–1993, 1995, 1998–2015, 2018–2021 Free Software
+   Copyright © 1988-1993, 1995, 1998-2015, 2018-2021 Free Software
 Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
      Version 1.3 or any later version published by the Free Software
      Foundation; with no Invariant Sections, with the Front-Cover texts
-     being “A GNU Manual,” and with the Back-Cover Texts as in (a)
+     being "A GNU Manual," and with the Back-Cover Texts as in (a)
      below.  A copy of the license is included in the section entitled
-     “GNU Free Documentation License.”
+     "GNU Free Documentation License."
 
-     (a) The FSF’s Back-Cover Text is: “You have the freedom to copy and
+     (a) The FSF's Back-Cover Text is: "You have the freedom to copy and
      modify this GNU manual.  Buying copies from the FSF supports it in
-     developing GNU and promoting software freedom.”
+     developing GNU and promoting software freedom."
 
 * Menu:
 
@@ -76,20 +76,20 @@ Reference sections:
 * Bibliography::        Publications cited in this manual.
 * Index of Terms::      Cross-references to the text.
 
- — The Detailed Node Listing —
+ -- The Detailed Node Listing --
 
 The Concepts of Bison
 
 * Language and Grammar:: Languages and context-free grammars,
                            as mathematical ideas.
-* Grammar in Bison::     How we represent grammars for Bison’s sake.
+* Grammar in Bison::     How we represent grammars for Bison's sake.
 * Semantic Values::      Each token or syntactic grouping can have
                            a semantic value (the value of an integer,
                            the name of an identifier, etc.).
 * Semantic Actions::     Each rule can have an action containing C code.
 * GLR Parsers::          Writing parsers for general context-free languages.
 * Locations::            Overview of location tracking.
-* Bison Parser::         What are Bison’s input and output,
+* Bison Parser::         What are Bison's input and output,
                            how is the output used?
 * Stages::               Stages in writing and running Bison grammars.
 * Grammar Layout::       Overall structure of a Bison grammar file.
@@ -211,7 +211,7 @@ Bison Declarations
 * Pure Decl::         Requesting a reentrant parser.
 * Push Decl::         Requesting a push parser.
 * Decl Summary::      Table of all Bison declarations.
-* %define Summary::   Defining variables to adjust Bison’s behavior.
+* %define Summary::   Defining variables to adjust Bison's behavior.
 * %code Summary::     Inserting code into the parser source.
 
 Parser C-Language Interface
@@ -222,7 +222,7 @@ Parser C-Language Interface
                               which reads tokens.
 * Error Reporting::         Passing error messages to the user.
 * Action Features::         Special features for use in actions.
-* Internationalization::    How to let the parser speak in the user’s
+* Internationalization::    How to let the parser speak in the user's
                               native language.
 
 The Lexical Analyzer Function ‘yylex’
@@ -253,7 +253,7 @@ The Bison Parser Algorithm
 * Lookahead::         Parser looks one token ahead when deciding what to do.
 * Shift/Reduce::      Conflicts: when either shifting or reduction is valid.
 * Precedence::        Operator precedence works by resolving conflicts.
-* Contextual Precedence::  When an operator’s precedence depends on context.
+* Contextual Precedence::  When an operator's precedence depends on context.
 * Parser States::     The parser is a finite-state-machine with stack.
 * Reduce/Reduce::     When two rules are applicable in the same situation.
 * Mysterious Conflicts:: Conflicts that look unjustified.
@@ -401,7 +401,6 @@ Copying This Manual
 
 * GNU Free Documentation License:: Copying and sharing this manual
 
-
 
 File: bison.info,  Node: Introduction,  Next: Conditions,  Prev: Top,  Up: Top
 
@@ -423,7 +422,7 @@ understand this manual.
 
    We begin with tutorial chapters that explain the basic concepts of
 using Bison and show three explained examples, each building on the
-last.  If you don’t know Bison or Yacc, start by reading these chapters.
+last.  If you don't know Bison or Yacc, start by reading these chapters.
 Reference chapters follow, which describe specific aspects of Bison in
 detail.
 
@@ -454,24 +453,24 @@ software.  The reason Bison was different was not due to a special
 policy decision; it resulted from applying the usual General Public
 License to all of the Bison source code.
 
-   The main output of the Bison utility—the Bison parser implementation
-file—contains a verbatim copy of a sizable piece of Bison, which is the
-code for the parser’s implementation.  (The actions from your grammar
+   The main output of the Bison utility--the Bison parser implementation
+file--contains a verbatim copy of a sizable piece of Bison, which is the
+code for the parser's implementation.  (The actions from your grammar
 are inserted into this implementation at one point, but most of the rest
 of the implementation is not changed.)  When we applied the GPL terms to
-the skeleton code for the parser’s implementation, the effect was to
+the skeleton code for the parser's implementation, the effect was to
 restrict the use of Bison output to free software.
 
-   We didn’t change the terms because of sympathy for people who want to
+   We didn't change the terms because of sympathy for people who want to
 make software proprietary.  *Software should be free.*  But we concluded
-that limiting Bison’s use to free software was doing little to encourage
+that limiting Bison's use to free software was doing little to encourage
 people to make other software free.  So we decided to make the practical
 conditions for using Bison match the practical conditions for using the
 other GNU tools.
 
    This exception applies when Bison is generating code for a parser.
 You can tell whether the exception applies to a Bison output file by
-inspecting the file for text beginning with “As a special exception...”.
+inspecting the file for text beginning with "As a special exception...".
 The text spells out the exact terms of the exception.
 
 
@@ -496,7 +495,7 @@ and other kinds of works.
    The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program—to make sure it remains free
+share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
@@ -524,16 +523,16 @@ know their rights.
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
 
-   For the developers’ and authors’ protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users’ and
-authors’ sake, the GPL requires that modified versions be marked as
+   For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
 
    Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
-protecting users’ freedom to change the software.  The systematic
+protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
@@ -556,25 +555,25 @@ TERMS AND CONDITIONS
 
   0. Definitions.
 
-     “This License” refers to version 3 of the GNU General Public
+     "This License" refers to version 3 of the GNU General Public
      License.
 
-     “Copyright” also means copyright-like laws that apply to other
+     "Copyright" also means copyright-like laws that apply to other
      kinds of works, such as semiconductor masks.
 
-     “The Program” refers to any copyrightable work licensed under this
-     License.  Each licensee is addressed as “you”.  “Licensees” and
-     “recipients” may be individuals or organizations.
+     "The Program" refers to any copyrightable work licensed under this
+     License.  Each licensee is addressed as "you".  "Licensees" and
+     "recipients" may be individuals or organizations.
 
-     To “modify” a work means to copy from or adapt all or part of the
+     To "modify" a work means to copy from or adapt all or part of the
      work in a fashion requiring copyright permission, other than the
-     making of an exact copy.  The resulting work is called a “modified
-     version” of the earlier work or a work “based on” the earlier work.
+     making of an exact copy.  The resulting work is called a "modified
+     version" of the earlier work or a work "based on" the earlier work.
 
-     A “covered work” means either the unmodified Program or a work
+     A "covered work" means either the unmodified Program or a work
      based on the Program.
 
-     To “propagate” a work means to do anything with it that, without
+     To "propagate" a work means to do anything with it that, without
      permission, would make you directly or secondarily liable for
      infringement under applicable copyright law, except executing it on
      a computer or modifying a private copy.  Propagation includes
@@ -582,12 +581,12 @@ TERMS AND CONDITIONS
      available to the public, and in some countries other activities as
      well.
 
-     To “convey” a work means any kind of propagation that enables other
+     To "convey" a work means any kind of propagation that enables other
      parties to make or receive copies.  Mere interaction with a user
      through a computer network, with no transfer of a copy, is not
      conveying.
 
-     An interactive user interface displays “Appropriate Legal Notices”
+     An interactive user interface displays "Appropriate Legal Notices"
      to the extent that it includes a convenient and prominently visible
      feature that (1) displays an appropriate copyright notice, and (2)
      tells the user that there is no warranty for the work (except to
@@ -599,33 +598,33 @@ TERMS AND CONDITIONS
 
   1. Source Code.
 
-     The “source code” for a work means the preferred form of the work
-     for making modifications to it.  “Object code” means any non-source
+     The "source code" for a work means the preferred form of the work
+     for making modifications to it.  "Object code" means any non-source
      form of a work.
 
-     A “Standard Interface” means an interface that either is an
+     A "Standard Interface" means an interface that either is an
      official standard defined by a recognized standards body, or, in
      the case of interfaces specified for a particular programming
      language, one that is widely used among developers working in that
      language.
 
-     The “System Libraries” of an executable work include anything,
+     The "System Libraries" of an executable work include anything,
      other than the work as a whole, that (a) is included in the normal
      form of packaging a Major Component, but which is not part of that
      Major Component, and (b) serves only to enable use of the work with
      that Major Component, or to implement a Standard Interface for
      which an implementation is available to the public in source code
-     form.  A “Major Component”, in this context, means a major
+     form.  A "Major Component", in this context, means a major
      essential component (kernel, window system, and so on) of the
      specific operating system (if any) on which the executable work
      runs, or a compiler used to produce the work, or an object code
      interpreter used to run it.
 
-     The “Corresponding Source” for a work in object code form means all
+     The "Corresponding Source" for a work in object code form means all
      the source code needed to generate, install, and (for an executable
      work) run the object code and to modify the work, including scripts
      to control those activities.  However, it does not include the
-     work’s System Libraries, or general-purpose tools or generally
+     work's System Libraries, or general-purpose tools or generally
      available free programs which are used unmodified in performing
      those activities but which are not part of the work.  For example,
      Corresponding Source includes interface definition files associated
@@ -669,7 +668,7 @@ TERMS AND CONDITIONS
      the conditions stated below.  Sublicensing is not allowed; section
      10 makes it unnecessary.
 
-  3. Protecting Users’ Legal Rights From Anti-Circumvention Law.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
      No covered work shall be deemed part of an effective technological
      measure under any applicable law fulfilling obligations under
@@ -682,12 +681,12 @@ TERMS AND CONDITIONS
      circumvention is effected by exercising rights under this License
      with respect to the covered work, and you disclaim any intention to
      limit operation or modification of the work as a means of
-     enforcing, against the work’s users, your or third parties’ legal
+     enforcing, against the work's users, your or third parties' legal
      rights to forbid circumvention of technological measures.
 
   4. Conveying Verbatim Copies.
 
-     You may convey verbatim copies of the Program’s source code as you
+     You may convey verbatim copies of the Program's source code as you
      receive it, in any medium, provided that you conspicuously and
      appropriately publish on each copy an appropriate copyright notice;
      keep intact all notices stating that this License and any
@@ -711,7 +710,7 @@ TERMS AND CONDITIONS
        b. The work must carry prominent notices stating that it is
           released under this License and any conditions added under
           section 7.  This requirement modifies the requirement in
-          section 4 to “keep intact all notices”.
+          section 4 to "keep intact all notices".
 
        c. You must license the entire work, as a whole, under this
           License to anyone who comes into possession of a copy.  This
@@ -731,9 +730,9 @@ TERMS AND CONDITIONS
      works, which are not by their nature extensions of the covered
      work, and which are not combined with it such as to form a larger
      program, in or on a volume of a storage or distribution medium, is
-     called an “aggregate” if the compilation and its resulting
+     called an "aggregate" if the compilation and its resulting
      copyright are not used to limit the access or legal rights of the
-     compilation’s users beyond what the individual works permit.
+     compilation's users beyond what the individual works permit.
      Inclusion of a covered work in an aggregate does not cause this
      License to apply to the other parts of the aggregate.
 
@@ -791,13 +790,13 @@ TERMS AND CONDITIONS
      excluded from the Corresponding Source as a System Library, need
      not be included in conveying the object code work.
 
-     A “User Product” is either (1) a “consumer product”, which means
+     A "User Product" is either (1) a "consumer product", which means
      any tangible personal property which is normally used for personal,
      family, or household purposes, or (2) anything designed or sold for
      incorporation into a dwelling.  In determining whether a product is
      a consumer product, doubtful cases shall be resolved in favor of
      coverage.  For a particular product received by a particular user,
-     “normally used” refers to a typical or common use of that class of
+     "normally used" refers to a typical or common use of that class of
      product, regardless of the status of the particular user or of the
      way in which the particular user actually uses, or expects or is
      expected to use, the product.  A product is a consumer product
@@ -805,7 +804,7 @@ TERMS AND CONDITIONS
      industrial or non-consumer uses, unless such uses represent the
      only significant mode of use of the product.
 
-     “Installation Information” for a User Product means any methods,
+     "Installation Information" for a User Product means any methods,
      procedures, authorization keys, or other information required to
      install and execute modified versions of a covered work in that
      User Product from a modified version of its Corresponding Source.
@@ -841,7 +840,7 @@ TERMS AND CONDITIONS
 
   7. Additional Terms.
 
-     “Additional permissions” are terms that supplement the terms of
+     "Additional permissions" are terms that supplement the terms of
      this License by making exceptions from one or more of its
      conditions.  Additional permissions that are applicable to the
      entire Program shall be treated as though they were included in
@@ -886,8 +885,8 @@ TERMS AND CONDITIONS
           the recipient, for any liability that these contractual
           assumptions directly impose on those licensors and authors.
 
-     All other non-permissive additional terms are considered “further
-     restrictions” within the meaning of section 10.  If the Program as
+     All other non-permissive additional terms are considered "further
+     restrictions" within the meaning of section 10.  If the Program as
      you received it, or any part of it, contains a notice stating that
      it is governed by this License along with a term that is a further
      restriction, you may remove that term.  If a license document
@@ -953,12 +952,12 @@ TERMS AND CONDITIONS
      responsible for enforcing compliance by third parties with this
      License.
 
-     An “entity transaction” is a transaction transferring control of an
+     An "entity transaction" is a transaction transferring control of an
      organization, or substantially all assets of one, or subdividing an
      organization, or merging organizations.  If propagation of a
      covered work results from an entity transaction, each party to that
      transaction who receives a copy of the work also receives whatever
-     licenses to the work the party’s predecessor in interest had or
+     licenses to the work the party's predecessor in interest had or
      could give under the previous paragraph, plus a right to possession
      of the Corresponding Source of the work from the predecessor in
      interest, if the predecessor has it or can get it with reasonable
@@ -975,31 +974,31 @@ TERMS AND CONDITIONS
 
   11. Patents.
 
-     A “contributor” is a copyright holder who authorizes use under this
+     A "contributor" is a copyright holder who authorizes use under this
      License of the Program or a work on which the Program is based.
-     The work thus licensed is called the contributor’s “contributor
-     version”.
+     The work thus licensed is called the contributor's "contributor
+     version".
 
-     A contributor’s “essential patent claims” are all patent claims
+     A contributor's "essential patent claims" are all patent claims
      owned or controlled by the contributor, whether already acquired or
      hereafter acquired, that would be infringed by some manner,
      permitted by this License, of making, using, or selling its
      contributor version, but do not include claims that would be
      infringed only as a consequence of further modification of the
-     contributor version.  For purposes of this definition, “control”
+     contributor version.  For purposes of this definition, "control"
      includes the right to grant patent sublicenses in a manner
      consistent with the requirements of this License.
 
      Each contributor grants you a non-exclusive, worldwide,
-     royalty-free patent license under the contributor’s essential
+     royalty-free patent license under the contributor's essential
      patent claims, to make, use, sell, offer for sale, import and
      otherwise run, modify and propagate the contents of its contributor
      version.
 
-     In the following three paragraphs, a “patent license” is any
+     In the following three paragraphs, a "patent license" is any
      express agreement or commitment, however denominated, not to
      enforce a patent (such as an express permission to practice a
-     patent or covenant not to sue for patent infringement).  To “grant”
+     patent or covenant not to sue for patent infringement).  To "grant"
      such a patent license to a party means to make such an agreement or
      commitment not to enforce a patent against the party.
 
@@ -1012,9 +1011,9 @@ TERMS AND CONDITIONS
      yourself of the benefit of the patent license for this particular
      work, or (3) arrange, in a manner consistent with the requirements
      of this License, to extend the patent license to downstream
-     recipients.  “Knowingly relying” means you have actual knowledge
+     recipients.  "Knowingly relying" means you have actual knowledge
      that, but for the patent license, your conveying the covered work
-     in a country, or your recipient’s use of the covered work in a
+     in a country, or your recipient's use of the covered work in a
      country, would infringe one or more identifiable patents in that
      country that you have reason to believe are valid.
 
@@ -1026,7 +1025,7 @@ TERMS AND CONDITIONS
      patent license you grant is automatically extended to all
      recipients of the covered work and works based on it.
 
-     A patent license is “discriminatory” if it does not include within
+     A patent license is "discriminatory" if it does not include within
      the scope of its coverage, prohibits the exercise of, or is
      conditioned on the non-exercise of one or more of the rights that
      are specifically granted under this License.  You may not convey a
@@ -1046,7 +1045,7 @@ TERMS AND CONDITIONS
      any implied license or other defenses to infringement that may
      otherwise be available to you under applicable patent law.
 
-  12. No Surrender of Others’ Freedom.
+  12. No Surrender of Others' Freedom.
 
      If conditions are imposed on you (whether by court order, agreement
      or otherwise) that contradict the conditions of this License, they
@@ -1079,7 +1078,7 @@ TERMS AND CONDITIONS
 
      Each version is given a distinguishing version number.  If the
      Program specifies that a certain numbered version of the GNU
-     General Public License “or any later version” applies to it, you
+     General Public License "or any later version" applies to it, you
      have the option of following the terms and conditions either of
      that numbered version or of any later version published by the Free
      Software Foundation.  If the Program does not specify a version
@@ -1088,7 +1087,7 @@ TERMS AND CONDITIONS
 
      If the Program specifies that a proxy can decide which future
      versions of the GNU General Public License can be used, that
-     proxy’s public statement of acceptance of a version permanently
+     proxy's public statement of acceptance of a version permanently
      authorizes you to choose that version for the Program.
 
      Later license versions may give you additional or different
@@ -1100,7 +1099,7 @@ TERMS AND CONDITIONS
 
      THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
      APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE
-     COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS”
+     COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS"
      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE
@@ -1144,7 +1143,7 @@ terms.
    To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least the
-“copyright” line and a pointer to where the full notice is found.
+"copyright" line and a pointer to where the full notice is found.
 
      ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
      Copyright (C) YEAR NAME OF AUTHOR
@@ -1175,11 +1174,11 @@ notice like this when it starts in an interactive mode:
 
    The hypothetical commands ‘show w’ and ‘show c’ should show the
 appropriate parts of the General Public License.  Of course, your
-program’s commands might be different; for a GUI interface, you would
-use an “about box”.
+program's commands might be different; for a GUI interface, you would
+use an "about box".
 
    You should also get your employer (if you work as a programmer) or
-school, if any, to sign a “copyright disclaimer” for the program, if
+school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  For more information on this, and how to apply and follow
 the GNU GPL, see <https://www.gnu.org/licenses/>.
 
@@ -1205,14 +1204,14 @@ carefully.
 
 * Language and Grammar:: Languages and context-free grammars,
                            as mathematical ideas.
-* Grammar in Bison::     How we represent grammars for Bison’s sake.
+* Grammar in Bison::     How we represent grammars for Bison's sake.
 * Semantic Values::      Each token or syntactic grouping can have
                            a semantic value (the value of an integer,
                            the name of an identifier, etc.).
 * Semantic Actions::     Each rule can have an action containing C code.
 * GLR Parsers::          Writing parsers for general context-free languages.
 * Locations::            Overview of location tracking.
-* Bison Parser::         What are Bison’s input and output,
+* Bison Parser::         What are Bison's input and output,
                            how is the output used?
 * Stages::               Stages in writing and running Bison grammars.
 * Grammar Layout::       Overall structure of a Bison grammar file.
@@ -1227,14 +1226,14 @@ In order for Bison to parse a language, it must be described by a
 “context-free grammar”.  This means that you specify one or more
 “syntactic groupings” and give rules for constructing them from their
 parts.  For example, in the C language, one kind of grouping is called
-an ‘expression’.  One rule for making an expression might be, “An
-expression can be made of a minus sign and another expression”.  Another
-would be, “An expression can be an integer”.  As you can see, rules are
+an 'expression'.  One rule for making an expression might be, "An
+expression can be made of a minus sign and another expression".  Another
+would be, "An expression can be an integer".  As you can see, rules are
 often recursive, but there must be at least one rule which leads out of
 the recursion.
 
    The most common formal system for presenting such rules for humans to
-read is “Backus-Naur Form” or “BNF”, which was developed in order to
+read is “Backus-Naur Form” or "BNF", which was developed in order to
 specify the language Algol 60.  Any grammar expressed in BNF is a
 context-free grammar.  The input to Bison is essentially
 machine-readable BNF.
@@ -1259,14 +1258,14 @@ rules to get the same inputs.  Even unambiguous grammars can be
 “nondeterministic”, meaning that no fixed lookahead always suffices to
 determine the next grammar rule to apply.  With the proper declarations,
 Bison is also able to parse these more general context-free grammars,
-using a technique known as GLR parsing (for Generalized LR). Bison’s GLR
+using a technique known as GLR parsing (for Generalized LR). Bison's GLR
 parsers are able to handle any context-free grammar for which the number
 of possible parses of any given string is finite.
 
    In the formal grammatical rules for a language, each kind of
 syntactic unit or grouping is named by a “symbol”.  Those which are
 built by grouping smaller constructs according to grammatical rules are
-called “nonterminal symbols”; those which can’t be subdivided are called
+called “nonterminal symbols”; those which can't be subdivided are called
 “terminal symbols” or “token kinds”.  We call a piece of input
 corresponding to a single terminal symbol a “token”, and a piece
 corresponding to a single nonterminal symbol a “grouping”.
@@ -1275,26 +1274,26 @@ corresponding to a single nonterminal symbol a “grouping”.
 nonterminal, mean.  The tokens of C are identifiers, constants (numeric
 and string), and the various keywords, arithmetic operators and
 punctuation marks.  So the terminal symbols of a grammar for C include
-‘identifier’, ‘number’, ‘string’, plus one symbol for each keyword,
-operator or punctuation mark: ‘if’, ‘return’, ‘const’, ‘static’, ‘int’,
-‘char’, ‘plus-sign’, ‘open-brace’, ‘close-brace’, ‘comma’ and many more.
+'identifier', 'number', 'string', plus one symbol for each keyword,
+operator or punctuation mark: 'if', 'return', 'const', 'static', 'int',
+'char', 'plus-sign', 'open-brace', 'close-brace', 'comma' and many more.
 (These tokens can be subdivided into characters, but that is a matter of
 lexicography, not grammar.)
 
    Here is a simple C function subdivided into tokens:
 
-     int             /* keyword ‘int’ */
-     square (int x)  /* identifier, open-paren, keyword ‘int’,
+     int             /* keyword 'int' */
+     square (int x)  /* identifier, open-paren, keyword 'int',
                         identifier, close-paren */
      {               /* open-brace */
-       return x * x; /* keyword ‘return’, identifier, asterisk,
+       return x * x; /* keyword 'return', identifier, asterisk,
                         identifier, semicolon */
      }               /* close-brace */
 
    The syntactic groupings of C include the expression, the statement,
 the declaration, and the function definition.  These are represented in
-the grammar of C by nonterminal symbols ‘expression’, ‘statement’,
-‘declaration’ and ‘function definition’.  The full grammar uses dozens
+the grammar of C by nonterminal symbols 'expression', 'statement',
+'declaration' and 'function definition'.  The full grammar uses dozens
 of additional language constructs, each with its own nonterminal symbol,
 in order to express the meanings of these four.  The example above is a
 function definition; it contains one declaration, and one statement.  In
@@ -1305,28 +1304,28 @@ made out of simpler constructs.  For example, one kind of C statement is
 the ‘return’ statement; this would be described with a grammar rule
 which reads informally as follows:
 
-     A ‘statement’ can be made of a ‘return’ keyword, an ‘expression’
-     and a ‘semicolon’.
+     A 'statement' can be made of a 'return' keyword, an 'expression'
+     and a 'semicolon'.
 
-There would be many other rules for ‘statement’, one for each kind of
+There would be many other rules for 'statement', one for each kind of
 statement in C.
 
    One nonterminal symbol must be distinguished as the special one which
 defines a complete utterance in the language.  It is called the “start
 symbol”.  In a compiler, this means a complete input program.  In the C
-language, the nonterminal symbol ‘sequence of definitions and
-declarations’ plays this role.
+language, the nonterminal symbol 'sequence of definitions and
+declarations' plays this role.
 
-   For example, ‘1 + 2’ is a valid C expression—a valid part of a C
-program—but it is not valid as an _entire_ C program.  In the
-context-free grammar of C, this follows from the fact that ‘expression’
+   For example, ‘1 + 2’ is a valid C expression--a valid part of a C
+program--but it is not valid as an _entire_ C program.  In the
+context-free grammar of C, this follows from the fact that 'expression'
 is not the start symbol.
 
    The Bison parser reads a sequence of tokens as its input, and groups
 the tokens using the grammar rules.  If the input is valid, the end
 result is that the entire token sequence reduces to a single grouping
-whose symbol is the grammar’s start symbol.  If we use a grammar for C,
-the entire input must be a ‘sequence of definitions and declarations’.
+whose symbol is the grammar's start symbol.  If we use a grammar for C,
+the entire input must be a 'sequence of definitions and declarations'.
 If not, the parser reports a syntax error.
 
 
@@ -1378,7 +1377,7 @@ File: bison.info,  Node: Semantic Values,  Next: Semantic Actions,  Prev: Gramma
 ===================
 
 A formal grammar selects tokens only by their classifications: for
-example, if a rule mentions the terminal symbol ‘integer constant’, it
+example, if a rule mentions the terminal symbol 'integer constant', it
 means that _any_ integer constant is grammatically valid in that
 position.  The precise value of the constant is irrelevant to how to
 parse the input: if ‘x+4’ is grammatical then ‘x+1’ or ‘x+3989’ is
@@ -1398,7 +1397,7 @@ kinds.
 
    The semantic value has all the rest of the information about the
 meaning of the token, such as the value of an integer, or the name of an
-identifier.  (A token such as ‘','’ which is just punctuation doesn’t
+identifier.  (A token such as ‘','’ which is just punctuation doesn't
 need to have any semantic value.)
 
    For example, an input token might be classified as token kind
@@ -1406,7 +1405,7 @@ need to have any semantic value.)
 the same token kind ‘INTEGER’ but value 3989.  When a grammar rule says
 that ‘INTEGER’ is allowed, either of these tokens is acceptable because
 each is an ‘INTEGER’.  When the parser accepts the token, it keeps track
-of the token’s semantic value.
+of the token's semantic value.
 
    Each grouping can also have a semantic value as well as its
 nonterminal symbol.  For example, in a calculator, an expression
@@ -1448,7 +1447,7 @@ File: bison.info,  Node: GLR Parsers,  Next: Locations,  Prev: Semantic Actions,
 1.5 Writing GLR Parsers
 =======================
 
-In some grammars, Bison’s deterministic LR(1) parsing algorithm cannot
+In some grammars, Bison's deterministic LR(1) parsing algorithm cannot
 decide whether to apply a certain grammar rule at a given point.  That
 is, it may not be able to decide (on the basis of the input read so far)
 which of two possible reductions (applications of a grammar rule)
@@ -1534,7 +1533,7 @@ become a new identifier to represent the enumeration value, while in the
 former case ‘a’ must be evaluated with its current meaning, which may be
 a constant or even a function call.
 
-   You could parse ‘(a)’ as an “unspecified identifier in parentheses”,
+   You could parse ‘(a)’ as an "unspecified identifier in parentheses",
 to be resolved later, but this typically requires substantial
 contortions in both semantic actions and large parts of the grammar,
 where the parentheses are nested in the recursive rules for expressions.
@@ -1542,7 +1541,7 @@ where the parentheses are nested in the recursive rules for expressions.
    You might think of using the lexer to distinguish between the two
 forms by returning different tokens for currently defined and undefined
 identifiers.  But if these declarations occur in a local scope, and ‘a’
-is defined in an outer scope, then both forms are possible—either
+is defined in an outer scope, then both forms are possible--either
 locally redefining ‘a’, or using the value of ‘a’ from the outer scope.
 So this approach cannot work.
 
@@ -1560,7 +1559,7 @@ split.
    If the input is syntactically incorrect, both branches fail and the
 parser reports a syntax error as usual.
 
-   The effect of all this is that the parser seems to “guess” the
+   The effect of all this is that the parser seems to "guess" the
 correct branch to take, or in other words, it seems to use more
 lookahead than the underlying LR(1) algorithm actually allows for.  In
 this example, LR(2) would suffice, but also some cases that are not
@@ -1652,7 +1651,7 @@ File: bison.info,  Node: Merging GLR Parses,  Next: GLR Semantic Actions,  Prev:
 1.5.2 Using GLR to Resolve Ambiguities
 --------------------------------------
 
-Let’s consider an example, vastly simplified from a C++ grammar.(1)
+Let's consider an example, vastly simplified from a C++ grammar.(1)
 
      %{
        #include <stdio.h>
@@ -1701,7 +1700,7 @@ Let’s consider an example, vastly simplified from a C++ grammar.(1)
      | '(' declarator ')'
      ;
 
-This models a problematic part of the C++ grammar—the ambiguity between
+This models a problematic part of the C++ grammar--the ambiguity between
 certain declarations and statements.  For example,
 
      T (x) = y+z;
@@ -1713,10 +1712,10 @@ ID’, which it cannot resolve at the time it encounters ‘x’ in the
 example above.  Since this is a GLR parser, it therefore splits the
 problem into two parses, one for each choice of resolving the
 reduce/reduce conflict.  Unlike the example from the previous section
-(*note Simple GLR Parsers::), however, neither of these parses “dies,”
+(*note Simple GLR Parsers::), however, neither of these parses "dies,"
 because the grammar as it stands is ambiguous.  One of the parsers
 eventually reduces ‘stmt : expr ';'’ and the other reduces ‘stmt :
-decl’, after which both parsers are in an identical state: they’ve seen
+decl’, after which both parsers are in an identical state: they've seen
 ‘prog stmt’ and have the same unprocessed input remaining.  We say that
 these parses have “merged.”
 
@@ -1834,11 +1833,11 @@ features you might use in a semantic action in a GLR parser.
 kind of the lookahead token present at the time of the associated
 reduction.  After checking that ‘yychar’ is not set to ‘YYEMPTY’ or
 ‘YYEOF’, you can then examine ‘yylval’ and ‘yylloc’ to determine the
-lookahead token’s semantic value and location, if any.  In a nondeferred
+lookahead token's semantic value and location, if any.  In a nondeferred
 semantic action, you can also modify any of these variables to influence
 syntax analysis.  *Note Lookahead::.
 
-   In a deferred semantic action, it’s too late to influence syntax
+   In a deferred semantic action, it's too late to influence syntax
 analysis.  In this case, ‘yychar’, ‘yylval’, and ‘yylloc’ are set to
 shallow copies of the values they had at the time of the associated
 reduction.  For this reason alone, modifying them is dangerous.
@@ -1967,14 +1966,14 @@ distinct programs: the Bison utility is a program whose output is the
 Bison parser implementation file that becomes part of your program.
 
    The job of the Bison parser is to group tokens into groupings
-according to the grammar rules—for example, to build identifiers and
+according to the grammar rules--for example, to build identifiers and
 operators into expressions.  As it does this, it runs the actions for
 the grammar rules it uses.
 
    The tokens come from a function called the “lexical analyzer” that
 you must supply in some fashion (such as by writing it in C). The Bison
 parser calls the lexical analyzer each time it wants a new token.  It
-doesn’t know what is “inside” the tokens (though their semantic values
+doesn't know what is "inside" the tokens (though their semantic values
 may reflect this).  Typically the lexical analyzer makes the tokens by
 parsing characters of text, but Bison does not depend on this.  *Note
 Lexical::.
@@ -2092,9 +2091,9 @@ File: bison.info,  Node: Examples,  Next: Grammar File,  Prev: Concepts,  Up: To
 
 Now we show and explain several sample programs written using Bison: a
 Reverse Polish Notation calculator, an algebraic (infix) notation
-calculator — later extended to track “locations” — and a multi-function
-calculator.  All produce usable, though limited, interactive desk-top
-calculators.
+calculator -- later extended to track "locations" -- and a
+multi-function calculator.  All produce usable, though limited,
+interactive desk-top calculators.
 
    These examples are simple, but Bison grammars for real programming
 languages are written the same way.  You can copy these examples into a
@@ -2188,13 +2187,13 @@ about the tokens and their types (*note Bison Declarations::).
    The ‘%define’ directive defines the variable ‘api.value.type’, thus
 specifying the C data type for semantic values of both tokens and
 groupings (*note Value Type::).  The Bison parser will use whatever type
-‘api.value.type’ is defined as; if you don’t define it, ‘int’ is the
+‘api.value.type’ is defined as; if you don't define it, ‘int’ is the
 default.  Because we specify ‘{double}’, each token and each expression
 has an associated value, which is a floating point number.  C code can
 use ‘YYSTYPE’ to refer to the value ‘api.value.type’.
 
    Each terminal symbol that is not a single-character literal must be
-declared.  (Single-character literals normally don’t need to be
+declared.  (Single-character literals normally don't need to be
 declared.)  In this example, all the arithmetic operators are designated
 by single-character literals, so the only terminal symbol that needs to
 be declared is ‘NUM’, the token kind for numeric constants.
@@ -2228,11 +2227,11 @@ Here are the grammar rules for the Reverse Polish Notation calculator.
      ;
      %%
 
-   The groupings of the rpcalc “language” defined here are the
+   The groupings of the rpcalc "language" defined here are the
 expression (given the name ‘exp’), the line of input (‘line’), and the
 complete input transcript (‘input’).  Each of these nonterminal symbols
 has several alternate rules, joined by the vertical bar ‘|’ which is
-read as “or”.  The following sections explain what these rules mean.
+read as "or".  The following sections explain what these rules mean.
 
    The semantics of the language is determined by the actions taken when
 a grouping is recognized.  The actions are the C code that appears
@@ -2264,25 +2263,25 @@ Consider the definition of ‘input’:
      | input line
      ;
 
-   This definition reads as follows: “A complete input is either an
-empty string, or a complete input followed by an input line”.  Notice
-that “complete input” is defined in terms of itself.  This definition is
+   This definition reads as follows: "A complete input is either an
+empty string, or a complete input followed by an input line".  Notice
+that "complete input" is defined in terms of itself.  This definition is
 said to be “left recursive” since ‘input’ appears always as the leftmost
 symbol in the sequence.  *Note Recursion::.
 
    The first alternative is empty because there are no symbols between
 the colon and the first ‘|’; this means that ‘input’ can match an empty
 string of input (no tokens).  We write the rules this way because it is
-legitimate to type ‘Ctrl-d’ right after you start the calculator.  It’s
+legitimate to type ‘Ctrl-d’ right after you start the calculator.  It's
 conventional to put an empty alternative first and to use the (optional)
 ‘%empty’ directive, or to write the comment ‘/* empty */’ in it (*note
 Empty Rules::).
 
    The second alternate rule (‘input line’) handles all nontrivial
-input.  It means, “After reading any number of lines, read one more line
-if possible.” The left recursion makes this rule into a loop.  Since the
-first alternative matches empty input, the loop can be executed zero or
-more times.
+input.  It means, "After reading any number of lines, read one more line
+if possible."  The left recursion makes this rule into a loop.  Since
+the first alternative matches empty input, the loop can be executed zero
+or more times.
 
    The parser function ‘yyparse’ continues to process input until a
 grammatical error is seen or the lexical analyzer says there are no more
@@ -2313,8 +2312,8 @@ for.
    This action is unusual because it does not assign a value to ‘$$’.
 As a consequence, the semantic value associated with the ‘line’ is
 uninitialized (its value will be unpredictable).  This would be a bug if
-that value were ever used, but we don’t use it: once rpcalc has printed
-the value of the user’s input line, that value is no longer needed.
+that value were ever used, but we don't use it: once rpcalc has printed
+the value of the user's input line, that value is no longer needed.
 
 
 File: bison.info,  Node: Rpcalc Exp,  Prev: Rpcalc Line,  Up: Rpcalc Rules
@@ -2352,10 +2351,10 @@ associated semantic value, but if it had one you could refer to it as
 }’.
 
    When ‘yyparse’ recognizes a sum expression using this rule, the sum
-of the two subexpressions’ values is produced as the value of the entire
+of the two subexpressions' values is produced as the value of the entire
 expression.  *Note Actions::.
 
-   You don’t have to give an action for every rule.  When a rule has no
+   You don't have to give an action for every rule.  When a rule has no
 action, Bison by default copies the value of ‘$1’ into ‘$$’.  This is
 what happens in the first rule (the one that uses ‘NUM’).
 
@@ -2381,14 +2380,14 @@ File: bison.info,  Node: Rpcalc Lexer,  Next: Rpcalc Main,  Prev: Rpcalc Rules,
 2.1.3 The ‘rpcalc’ Lexical Analyzer
 -----------------------------------
 
-The lexical analyzer’s job is low-level parsing: converting characters
+The lexical analyzer's job is low-level parsing: converting characters
 or sequences of characters into tokens.  The Bison parser gets its
 tokens by calling the lexical analyzer.  *Note Lexical::.
 
    Only a simple lexical analyzer is needed for the RPN calculator.
 This lexical analyzer skips blanks and tabs, then reads in numbers as
 ‘double’ and returns them as ‘NUM’ tokens.  Any other character that
-isn’t part of a number is a separate token.  Note that the token-code
+isn't part of a number is a separate token.  Note that the token-code
 for such a single-character token is the character itself.
 
    The return value of the lexical analyzer function is a numeric code
@@ -2507,8 +2506,8 @@ command to convert it into a parser implementation file:
 
      $ bison FILE.y
 
-In this example, the grammar file is called ‘rpcalc.y’ (for “Reverse
-Polish CALCulator”).  Bison produces a parser implementation file named
+In this example, the grammar file is called ‘rpcalc.y’ (for "Reverse
+Polish CALCulator").  Bison produces a parser implementation file named
 ‘FILE.tab.c’, removing the ‘.y’ from the grammar file name.  The parser
 implementation file contains the source code for ‘yyparse’.  The
 additional functions in the grammar file (‘yylex’, ‘yyerror’ and ‘main’)
@@ -2611,7 +2610,7 @@ kinds and says they are left-associative operators.  The declarations
 ‘%left’ and ‘%right’ (right associativity) take the place of ‘%token’
 which is used to declare a token kind name without
 associativity/precedence.  (These tokens are single-character literals,
-which ordinarily don’t need to be declared.  We declare them here to
+which ordinarily don't need to be declared.  We declare them here to
 specify the associativity/precedence.)
 
    Operator precedence is determined by the line ordering of the
@@ -2623,7 +2622,7 @@ matters (‘%precedence’.  *Note Precedence::.
 
    The other important new feature is the ‘%prec’ in the grammar section
 for the unary minus operator.  The ‘%prec’ simply instructs Bison that
-the rule ‘| '-' exp’ has the same precedence as ‘NEG’—in this case the
+the rule ‘| '-' exp’ has the same precedence as ‘NEG’--in this case the
 next-to-highest.  *Note Contextual Precedence::.
 
    Here is a sample run of ‘calc.y’:
@@ -2649,7 +2648,7 @@ File: bison.info,  Node: Simple Error Recovery,  Next: Location Tracking Calc,
 =========================
 
 Up to this point, this manual has not addressed the issue of “error
-recovery”—how to continue parsing after the parser detects a syntax
+recovery”--how to continue parsing after the parser detects a syntax
 error.  All we have handled is error reporting with ‘yyerror’.  Recall
 that by default ‘yyparse’ returns after calling ‘yyerror’.  This means
 that an erroneous input line causes the calculator program to exit.  Now
@@ -2679,7 +2678,7 @@ other kinds of errors; for example, division by zero, which raises an
 exception signal that is normally fatal.  A real calculator program must
 handle this signal and use ‘longjmp’ to return to ‘main’ and resume
 parsing input lines; it would also have to discard the rest of the
-current line of input.  We won’t discuss this issue further because it
+current line of input.  We won't discuss this issue further because it
 is not specific to Bison programs.
 
 
@@ -2785,7 +2784,7 @@ the wrong expressions or subexpressions.
 using the pseudo-variables ‘@N’ for rule components, and the
 pseudo-variable ‘@$’ for groupings.
 
-   We don’t need to assign a value to ‘@$’: the output parser does it
+   We don't need to assign a value to ‘@$’: the output parser does it
 automatically.  By default, before executing the C code of each action,
 ‘@$’ is set to range from the beginning of ‘@1’ to the end of ‘@N’, for
 a rule with N components.  This behavior can be redefined (*note
@@ -2798,7 +2797,7 @@ File: bison.info,  Node: Ltcalc Lexer,  Prev: Ltcalc Rules,  Up: Location Tracki
 2.4.3 The ‘ltcalc’ Lexical Analyzer.
 ------------------------------------
 
-Until now, we relied on Bison’s defaults to enable location tracking.
+Until now, we relied on Bison's defaults to enable location tracking.
 The next step is to rewrite the lexical analyzer, and make it able to
 feed the parser with the token locations, as it already does for
 semantic values.
@@ -2851,7 +2850,7 @@ input text, to avoid the computed locations of being fuzzy or wrong:
    Basically, the lexical analyzer performs the same processing as
 before: it skips blanks and tabs, and reads numbers or single-character
 tokens.  In addition, it updates ‘yylloc’, the global variable (of type
-‘YYLTYPE’) containing the token’s location.
+‘YYLTYPE’) containing the token's location.
 
    Now, each time this function returns a token, the parser has its kind
 as well as its semantic value, and its location in the text.  The last
@@ -3018,7 +3017,7 @@ File: bison.info,  Node: Mfcalc Symbol Table,  Next: Mfcalc Lexer,  Prev: Mfcalc
 -------------------------------
 
 The multi-function calculator requires a symbol table to keep track of
-the names and meanings of variables and functions.  This doesn’t affect
+the names and meanings of variables and functions.  This doesn't affect
 the grammar rules (except for the actions) or the Bison declarations,
 but it requires some additional C functions for support.
 
@@ -3315,7 +3314,7 @@ The PROLOGUE section contains macro definitions and declarations of
 functions and variables that are used in the actions in the grammar
 rules.  These are copied to the beginning of the parser implementation
 file so that they precede the definition of ‘yyparse’.  You can use
-‘#include’ to get the declarations from a header file.  If you don’t
+‘#include’ to get the declarations from a header file.  If you don't
 need any C declarations, you may omit the ‘%{’ and ‘%}’ delimiters that
 bracket this section.
 
@@ -3384,9 +3383,9 @@ qualifier can be omitted for the default location, or it can be one of
 
      ...
 
-Notice that there are two PROLOGUE sections here, but there’s a subtle
+Notice that there are two PROLOGUE sections here, but there's a subtle
 distinction between their functionality.  For example, if you decide to
-override Bison’s default definition for ‘YYLTYPE’, in which PROLOGUE
+override Bison's default definition for ‘YYLTYPE’, in which PROLOGUE
 section should you write your new definition?(1)  You should write it in
 the first since Bison will insert that code into the parser
 implementation file _before_ the default ‘YYLTYPE’ definition.  In which
@@ -3403,7 +3402,7 @@ Second, what if there is no ‘%union’?  In that case, the second kind of
 PROLOGUE section is not available.  This behavior is not intuitive.
 
    To avoid this subtle ‘%union’ dependency, rewrite the example using a
-‘%code top’ and an unqualified ‘%code’.  Let’s go ahead and add the new
+‘%code top’ and an unqualified ‘%code’.  Let's go ahead and add the new
 ‘YYLTYPE’ definition and the ‘trace_token’ prototype at the same time:
 
      %code top {
@@ -3438,7 +3437,7 @@ PROLOGUE section is not available.  This behavior is not intuitive.
      ...
 
 In this way, ‘%code top’ and the unqualified ‘%code’ achieve the same
-functionality as the two kinds of PROLOGUE sections, but it’s always
+functionality as the two kinds of PROLOGUE sections, but it's always
 explicit which kind you intend.  Moreover, both kinds are always
 available even in the absence of ‘%union’.
 
@@ -3446,7 +3445,7 @@ available even in the absence of ‘%union’.
 two lines before the warning need to appear near the top of the parser
 implementation file.  The first line after the warning is required by
 ‘YYSTYPE’ and thus also needs to appear in the parser implementation
-file.  However, if you’ve instructed Bison to generate a parser header
+file.  However, if you've instructed Bison to generate a parser header
 file (*note Decl Summary::), you probably want that line to appear
 before the ‘YYSTYPE’ definition in that header file as well.  The
 ‘YYLTYPE’ definition should also appear in the parser header file to
@@ -3510,7 +3509,7 @@ provide ‘trace_token’ to modules that are external to your parser.
 Thus, you might wish for Bison to insert the prototype into both the
 parser header file and the parser implementation file.  Since this
 function is not a dependency required by ‘YYSTYPE’ or ‘YYLTYPE’, it
-doesn’t make sense to move its prototype to a ‘%code requires’.  More
+doesn't make sense to move its prototype to a ‘%code requires’.  More
 importantly, since it depends upon ‘YYLTYPE’ and ‘yytoken_kind_t’,
 ‘%code requires’ is not sufficient.  Instead, move its prototype from
 the unqualified ‘%code’ to a ‘%code provides’:
@@ -3583,7 +3582,7 @@ semantic-type-related directives by semantic type:
 You could even place each of the above directive groups in the rules
 section of the grammar file next to the set of rules that uses the
 associated semantic type.  (In the rules section, you must terminate
-each of those directives with a semicolon.)  And you don’t have to worry
+each of those directives with a semicolon.)  And you don't have to worry
 that some directive (like a ‘%union’) in the definitions section is
 going to adversely affect their functionality in some counter-intuitive
 manner just because it comes first.  Such an organization is not
@@ -3591,7 +3590,7 @@ possible using PROLOGUE sections.
 
    This section has been concerned with explaining the advantages of the
 four PROLOGUE alternatives over the original Yacc PROLOGUE.  However, in
-most cases when using these directives, you shouldn’t need to think
+most cases when using these directives, you shouldn't need to think
 about all the low-level ordering issues discussed here.  Instead, you
 should simply use these directives to label each block of your code
 according to its purpose and let Bison handle the ordering.  ‘%code’ is
@@ -3664,7 +3663,7 @@ of syntactically equivalent tokens.  You use the symbol in grammar rules
 to mean that a token in that class is allowed.  The symbol is
 represented in the Bison parser by a numeric code, and the ‘yylex’
 function returns a token kind code to indicate what kind of token has
-been read.  You don’t need to know what the code value is; you can use
+been read.  You don't need to know what the code value is; you can use
 the symbol to stand for it.
 
    A “nonterminal symbol” stands for a class of syntactically equivalent
@@ -3690,7 +3689,7 @@ token names.
    • A “character token kind” (or “literal character token”) is written
      in the grammar using the same syntax used in C for character
      constants; for example, ‘'+'’ is a character token kind.  A
-     character token kind doesn’t need to be declared unless you need to
+     character token kind doesn't need to be declared unless you need to
      specify its semantic value data type (*note Value Type::),
      associativity, or precedence (*note Precedence::).
 
@@ -3709,13 +3708,13 @@ token names.
 
    • A “literal string token” is written like a C string constant; for
      example, ‘"<="’ is a literal string token.  A literal string token
-     doesn’t need to be declared unless you need to specify its semantic
+     doesn't need to be declared unless you need to specify its semantic
      value data type (*note Value Type::), associativity, or precedence
      (*note Precedence::).
 
      You can associate the literal string token with a symbolic name as
      an alias, using the ‘%token’ declaration (*note Token Decl::).  If
-     you don’t do that, the lexical analyzer has to retrieve the token
+     you don't do that, the lexical analyzer has to retrieve the token
      code for the literal string token from the ‘yytname’ table (*note
      Calling Convention::).
 
@@ -3748,7 +3747,7 @@ token kind is simply the positive numeric code of the character, so
 though you may need to convert it to ‘unsigned char’ to avoid
 sign-extension on hosts where ‘char’ is signed.  Each named token kind
 becomes a C macro in the parser implementation file, so ‘yylex’ can use
-the name to stand for the code.  (This is why periods don’t make sense
+the name to stand for the code.  (This is why periods don't make sense
 in terminal symbols.)  *Note Calling Convention::.
 
    If ‘yylex’ is defined in a separate file, you need to arrange for the
@@ -3777,7 +3776,7 @@ that are incompatible with ASCII must rebuild those files before
 compiling them.
 
    The symbol ‘error’ is a terminal symbol reserved for error recovery
-(*note Error Recovery::); you shouldn’t use it for any other purpose.
+(*note Error Recovery::); you shouldn't use it for any other purpose.
 In particular, ‘yylex’ should never return this value.  The default
 value of the error token is 256, unless you explicitly assigned 256 to
 one of your tokens with a ‘%token’ declaration.
@@ -3996,14 +3995,14 @@ or
    The value of ‘api.value.type’ should be a type name that does not
 contain parentheses or square brackets.
 
-   Alternatively in C, instead of relying of Bison’s ‘%define’ support,
+   Alternatively in C, instead of relying of Bison's ‘%define’ support,
 you may rely on the C preprocessor and define ‘YYSTYPE’ as a macro:
 
      #define YYSTYPE double
 
 This macro definition must go in the prologue of the grammar file (*note
 Grammar Outline::).  If compatibility with POSIX Yacc matters to you,
-use this.  Note however that Bison cannot know ‘YYSTYPE’’s value, not
+use this.  Note however that Bison cannot know ‘YYSTYPE’'s value, not
 even whether it is defined, so there are services it cannot provide.
 Besides this works only for C.
 
@@ -4223,18 +4222,18 @@ references construct.
 
    Note that the vertical-bar character ‘|’ is really a rule separator,
 and actions are attached to a single rule.  This is a difference with
-tools like Flex, for which ‘|’ stands for either “or”, or “the same
-action as that of the next rule”.  In the following example, the action
+tools like Flex, for which ‘|’ stands for either "or", or "the same
+action as that of the next rule".  In the following example, the action
 is triggered only when ‘b’ is found:
 
      a-or-b: 'a'|'b'   { a_or_b_found = 1; };
 
-   If you don’t specify an action for a rule, Bison supplies a default:
+   If you don't specify an action for a rule, Bison supplies a default:
 ‘$$ = $1’.  Thus, the value of the first symbol in the rule becomes the
 value of the whole rule.  Of course, the default action is valid only if
 the two data types match.  There is no meaningful default action for an
 empty rule; every empty rule must have an explicit action unless the
-rule’s value does not matter.
+rule's value does not matter.
 
    ‘$N’ with N zero or negative is allowed for reference to tokens and
 groupings on the stack _before_ those that match the current rule.  This
@@ -4384,7 +4383,7 @@ readability and maintainability (*note Named References::):
    After the embedded statement is parsed, its semantic value becomes
 the value of the entire ‘let’-statement.  Then the semantic value from
 the earlier action is used to restore the prior list of variables.  This
-removes the temporary ‘let’-variable from the list so that it won’t
+removes the temporary ‘let’-variable from the list so that it won't
 appear to exist while the rest of the program is parsed.
 
    Because the types of the semantic values of midrule actions are
@@ -4410,7 +4409,7 @@ without restoring it.  Thus, ‘$<context>5’ needs a destructor (*note
 Destructor Decl::), and Bison needs the type of the semantic value
 (‘context’) to select the right destructor.
 
-   As an extension to Yacc’s midrule actions, Bison offers a means to
+   As an extension to Yacc's midrule actions, Bison offers a means to
 type their semantic value: specify its type tag (‘<...>’ before the
 midrule action.
 
@@ -4522,7 +4521,6 @@ a destructor for that symbol:
            declare_variable ($var);
          };
 
-
 
 File: bison.info,  Node: Midrule Conflicts,  Prev: Midrule Action Translation,  Up: Midrule Actions
 
@@ -4733,7 +4731,7 @@ File: bison.info,  Node: Printing Locations,  Next: Location Default Action,  Pr
 ------------------------
 
 When using the default location type, the debug traces report the
-symbols’ location.  The generated parser does so using the
+symbols' location.  The generated parser does so using the
 ‘YYLOCATION_PRINT’ macro.
 
  -- Macro: YYLOCATION_PRINT (FILE, LOC);
@@ -4757,7 +4755,7 @@ locations are much more general than semantic values, there is room in
 the output parser to redefine the default action to take for each rule.
 The ‘YYLLOC_DEFAULT’ macro is invoked each time a rule is matched,
 before the associated action is run.  It is also invoked while
-processing a syntax error, to compute the error’s location.  Before
+processing a syntax error, to compute the error's location.  Before
 reporting an unresolvable syntactic ambiguity, a GLR parser invokes
 ‘YYLLOC_DEFAULT’ recursively to compute the location of that ambiguity.
 
@@ -4768,7 +4766,7 @@ dedicated code from semantic actions.
 the location of the grouping (the result of the computation).  When a
 rule is matched, the second parameter identifies locations of all right
 hand side elements of the rule being matched, and the third parameter is
-the size of the rule’s right hand side.  When a GLR parser reports an
+the size of the rule's right hand side.  When a GLR parser reports an
 ambiguity, which of multiple candidate right hand sides it passes to
 ‘YYLLOC_DEFAULT’ is undefined.  When processing a syntax error, the
 second parameter identifies locations of the symbols that were discarded
@@ -4863,7 +4861,6 @@ closing brace of the midrule action code:
      exp[res]: exp[x] '+' {$left = $x;}[left] exp[right]
        { $res = $left + $right; }
 
-
    In references, in order to specify names containing dots and dashes,
 an explicit bracketed syntax ‘$[name]’ and ‘@[name]’ must be used:
      if-stmt: "if" '(' expr ')' "then" then.stmt ';'
@@ -4911,7 +4908,7 @@ must declare it explicitly (*note Language and Grammar::).
 * Pure Decl::         Requesting a reentrant parser.
 * Push Decl::         Requesting a push parser.
 * Decl Summary::      Table of all Bison declarations.
-* %define Summary::   Defining variables to adjust Bison’s behavior.
+* %define Summary::   Defining variables to adjust Bison's behavior.
 * %code Summary::     Inserting code into the parser source.
 
 
@@ -4944,7 +4941,7 @@ follows:
 
    Bison will convert this into a definition in the parser, so that the
 function ‘yylex’ (if it is in this file) can use the name NAME to stand
-for this token kind’s code.
+for this token kind's code.
 
    Alternatively, you can use ‘%left’, ‘%right’, ‘%precedence’, or
 ‘%nonassoc’ instead of ‘%token’, if you wish to specify associativity
@@ -4960,7 +4957,7 @@ field immediately following the token name:
      %token XNUM 0x12d // a GNU extension
 
 It is generally best, however, to let Bison choose the numeric codes for
-all token kinds.  Bison will automatically select codes that don’t
+all token kinds.  Bison will automatically select codes that don't
 conflict with each other or with normal characters.
 
    In the event that the stack type is a union, you must augment the
@@ -5124,7 +5121,7 @@ code.
  -- Directive: %initial-action { CODE }
      Declare that the braced CODE must be invoked before parsing each
      time ‘yyparse’ is called.  The CODE may use ‘$$’ (or ‘$<TAG>$’) and
-     ‘@$’ — initial value and location of the lookahead — and the
+     ‘@$’ -- initial value and location of the lookahead -- and the
      ‘%parse-param’.
 
    For instance, if your locations use a file name, you may use
@@ -5221,7 +5218,7 @@ the end token (token 0) if you redefine it from ‘$end’ to, for example,
    Finally, Bison will never invoke a ‘%destructor’ for an unreferenced
 midrule semantic value (*note Midrule Actions::).  That is, Bison does
 not consider a midrule to have a semantic value if you do not reference
-‘$$’ in the midrule’s action or ‘$N’ (where N is the right-hand side
+‘$$’ in the midrule's action or ‘$N’ (where N is the right-hand side
 symbol position of the midrule) in any later action in that rule.
 However, if you do reference either, the Bison-generated parser will
 invoke the ‘<>’ ‘%destructor’ whenever it discards the midrule symbol.
@@ -5354,7 +5351,7 @@ document this fact with an ‘%expect’ modifier as follows:
 
    Mid-rule actions generate implicit rules that are also subject to
 conflicts (*note Midrule Conflicts::).  To attach an ‘%expect’ or
-‘%expect-rr’ annotation to an implicit mid-rule action’s rule, put it
+‘%expect-rr’ annotation to an implicit mid-rule action's rule, put it
 before the action.  For example,
 
      %glr-parser
@@ -5377,7 +5374,7 @@ other, and we should expect one reduce/reduce conflict for each.
      a verbose list of where the conflicts occur.  Bison will also print
      the number of conflicts.
 
-   • Check each of the conflicts to make sure that Bison’s default
+   • Check each of the conflicts to make sure that Bison's default
      resolution is what you really want.  If not, rewrite the grammar
      and go back to the beginning.
 
@@ -5457,7 +5454,7 @@ completely parsed.  A push parser, on the other hand, is called each
 time a new token is made available.
 
    A push parser is typically useful when the parser is part of a main
-event loop in the client’s application.  This is typically a requirement
+event loop in the client's application.  This is typically a requirement
 of a GUI, when the main event loop needs to be triggered within a
 certain time period.
 
@@ -5484,7 +5481,7 @@ parser at a time.
 
    When a push parser is selected, Bison will generate some new symbols
 in the generated parser.  ‘yypstate’ is a structure that the generated
-parser uses to store the parser’s state.  ‘yypstate_new’ is the function
+parser uses to store the parser's state.  ‘yypstate_new’ is the function
 that will create a new parser instance.  ‘yypstate_delete’ will free the
 resources associated with the corresponding parser instance.  Finally,
 ‘yypush_parse’ is the function that should be called whenever a token is
@@ -5514,7 +5511,7 @@ would thus look like this:
      } while (status == YYPUSH_MORE);
      yypstate_delete (ps);
 
-   That’s it.  Notice the next token is put into the global variable
+   That's it.  Notice the next token is put into the global variable
 ‘yychar’ for use by the next invocation of the ‘yypush_parse’ function.
 
    Bison also supports both the push parser interface along with the
@@ -5581,7 +5578,7 @@ Here is a summary of the declarations used to define a grammar:
      Decl::).
 
  -- Directive: %start
-     Specify the grammar’s start symbol (*note Start Decl::).
+     Specify the grammar's start symbol (*note Start Decl::).
 
  -- Directive: %expect
      Declare the expected number of shift/reduce conflicts, either
@@ -5609,7 +5606,7 @@ directives:
  -- Directive: %define VARIABLE VALUE
  -- Directive: %define VARIABLE {VALUE}
  -- Directive: %define VARIABLE "VALUE"
-     Define a variable to adjust Bison’s behavior.  *Note %define
+     Define a variable to adjust Bison's behavior.  *Note %define
      Summary::.
 
  -- Directive: %defines
@@ -5703,7 +5700,7 @@ directives:
      ‘yytoken_kind_t’, ‘YYSTYPE’, ‘YYLTYPE’.
 
  -- Directive: %no-lines
-     Don’t generate any ‘#line’ preprocessor commands in the parser
+     Don't generate any ‘#line’ preprocessor commands in the parser
      implementation file.  Ordinarily Bison writes these commands in the
      parser implementation file so that the C compiler and debuggers
      will associate errors and object code with your source file (the
@@ -5762,7 +5759,7 @@ directives:
      ‘YYNSTATES’
           The number of parser states (*note Parser States::).
 
-     Here’s code for looking up a multicharacter token in ‘yytname’,
+     Here's code for looking up a multicharacter token in ‘yytname’,
      assuming that the characters of the token are stored in
      ‘token_buffer’, and assuming that the token does not contain any
      characters like ‘"’ that require escaping.
@@ -5804,7 +5801,7 @@ File: bison.info,  Node: %define Summary,  Next: %code Summary,  Prev: Decl Summ
 3.7.14 %define Summary
 ----------------------
 
-There are many features of Bison’s behavior that can be controlled by
+There are many features of Bison's behavior that can be controlled by
 assigning the feature a single value.  For historical reasons, some such
 features are assigned values by dedicated directives, such as ‘%start’,
 which assigns the start symbol.  However, newer such features are
@@ -5853,7 +5850,7 @@ described below.
 
         • Language(s): C++
 
-        • Purpose: Define the type of file names in Bison’s default
+        • Purpose: Define the type of file names in Bison's default
           location and position types.  *Note Exposing the Location
           Classes::.
 
@@ -5892,7 +5889,7 @@ described below.
           Using ‘api.header.include’ does not change the name of the
           generated header, only how it is included.
 
-          To work around limitations of Automake’s ‘ylwrap’ (which runs
+          To work around limitations of Automake's ‘ylwrap’ (which runs
           ‘bison’ with ‘--yacc’), ‘api.header.include’ is _not_
           predefined when the output file is ‘y.tab.c’.  Define it to
           avoid the duplication.
@@ -5913,7 +5910,7 @@ described below.
 
         • Language(s): C++
 
-        • Purpose: Define the name of the file in which Bison’s default
+        • Purpose: Define the name of the file in which Bison's default
           location and position types are generated.  *Note Exposing the
           Location Classes::.
 
@@ -5930,7 +5927,7 @@ described below.
 
         • Default Value: Not applicable if locations are not enabled, or
           if a user location type is specified (see
-          ‘api.location.type’).  Otherwise, Bison’s ‘location’ is
+          ‘api.location.type’).  Otherwise, Bison's ‘location’ is
           generated in ‘location.hh’ (*note C++ location::).
 
         • History: Introduced in Bison 3.2.
@@ -6103,7 +6100,7 @@ described below.
 
         • Accepted Values: Any non empty string.  Must be a valid
           identifier in the target language (typically a non empty
-          sequence of letters, underscores, and —not at the beginning—
+          sequence of letters, underscores, and --not at the beginning--
           digits).
 
           The empty prefix is (generally) invalid:
@@ -6163,7 +6160,7 @@ described below.
 
         • Accepted Values: Any string.  Must be a valid identifier
           prefix in the target language (typically, a possibly empty
-          sequence of letters, underscores, and —not at the beginning—
+          sequence of letters, underscores, and --not at the beginning--
           digits).
 
         • Default Value: empty
@@ -6250,7 +6247,7 @@ described below.
                properly supported yet.
           ‘union-directive’ (C, C++, D)
                The type is defined thanks to the ‘%union’ directive.
-               You don’t have to define ‘api.value.type’ in that case,
+               You don't have to define ‘api.value.type’ in that case,
                using ‘%union’ suffices.  *Note Union Decl::.  For
                instance:
                     %define api.value.type union-directive
@@ -6373,7 +6370,7 @@ described below.
           In C++, when variants are used (*note C++ Variants::), symbols
           must be constructed and destroyed properly.  This option
           checks these constraints using runtime type information
-          (RTTI). Therefore the generated code cannot be compiled with
+          (RTTI).  Therefore the generated code cannot be compiled with
           RTTI disabled (via compiler options such as ‘-fno-rtti’).
 
         • Accepted Values: Boolean
@@ -6487,9 +6484,9 @@ qualifiers produce an error.  Some of the accepted qualifiers are:
 
         • Purpose: This is the best place to write dependency code
           required for the value and location types (‘YYSTYPE’ and
-          ‘YYLTYPE’ in C). In other words, it’s the best place to define
+          ‘YYLTYPE’ in C). In other words, it's the best place to define
           types referenced in ‘%union’ directives.  In C, if you use
-          ‘#define’ to override Bison’s default ‘YYSTYPE’ and ‘YYLTYPE’
+          ‘#define’ to override Bison's default ‘YYSTYPE’ and ‘YYLTYPE’
           definitions, then it is also the best place.  However you
           should rather ‘%define’ ‘api.value.type’ and
           ‘api.location.type’.
@@ -6571,7 +6568,7 @@ by PREFIX (i.e., PREFIX upper-cased) instead of ‘YY’.
 ‘yylval’, ‘yylloc’, ‘yychar’ and ‘yydebug’.  If you use a push parser,
 ‘yypush_parse’, ‘yypull_parse’, ‘yypstate’, ‘yypstate_new’ and
 ‘yypstate_delete’ will also be renamed.  The renamed macros include
-‘YYSTYPE’, ‘YYLTYPE’, and ‘YYDEBUG’, which is treated specifically —
+‘YYSTYPE’, ‘YYLTYPE’, and ‘YYDEBUG’, which is treated specifically --
 more about this below.
 
    For example, if you use ‘%define api.prefix {c}’, the names become
@@ -6609,7 +6606,7 @@ beginning of the parser implementation file, defining ‘yyparse’ as
      int yyparse (void);
 
    This effectively substitutes one name for the other in the entire
-parser implementation file, thus the “original” names (‘yylex’,
+parser implementation file, thus the "original" names (‘yylex’,
 ‘YYSTYPE’, ...) are also usable in the parser implementation file.
 
    However, in the parser header file, the symbols are defined renamed,
@@ -6667,7 +6664,7 @@ grammar file, you are likely to run into trouble.
                               which reads tokens.
 * Error Reporting::         Passing error messages to the user.
 * Action Features::         Special features for use in actions.
-* Internationalization::    How to let the parser speak in the user’s
+* Internationalization::    How to let the parser speak in the user's
                               native language.
 
 
@@ -6714,7 +6711,7 @@ declaration ‘%parse-param’:
      declaring functions or prototypes.  The last identifier in
      ARGUMENT-DECLARATION must be the argument name.
 
-   Here’s an example.  Write this in the parser:
+   Here's an example.  Write this in the parser:
 
      %parse-param {int *nastiness} {int *randomness}
 
@@ -6903,7 +6900,7 @@ that there is nothing left afterwards.  *Note Calling Convention::, for
 an example.
 
    Returning ‘YYUNDEF’ tells the parser that some lexical error was
-found.  It will emit an error message about an “invalid token”, and
+found.  It will emit an error message about an "invalid token", and
 enter error-recovery (*note Error Recovery::).  Returning an unknown
 token kind results in the exact same behavior.
 
@@ -6974,9 +6971,9 @@ if the type is ‘int’ (the default), you might write this in ‘yylex’:
        return INT;      /* Return the kind of the token. */
        ...
 
-   When you are using multiple data types, ‘yylval’’s type is a union
+   When you are using multiple data types, ‘yylval’'s type is a union
 made from the ‘%union’ declaration (*note Union Decl::).  So when you
-store a token’s value, you must use the proper member of the union.  If
+store a token's value, you must use the proper member of the union.  If
 the ‘%union’ declaration looks like this:
 
      %union {
@@ -7117,7 +7114,7 @@ incorrect information if LAC is not enabled (*note LAC::).
 
    The parser can detect one other kind of error: memory exhaustion.
 This can happen when the input contains constructions that are very
-deeply nested.  It isn’t likely you will encounter this, since the Bison
+deeply nested.  It isn't likely you will encounter this, since the Bison
 parser normally extends its stack automatically up to a very large
 limit.  But if memory is exhausted, ‘yyparse’ calls ‘yyerror’ in the
 usual fashion, except that the argument string is ‘"memory exhausted"’.
@@ -7175,9 +7172,9 @@ then the parser no longer passes syntax error messages to ‘yyerror’,
 rather it delegates that task to the user by calling the
 ‘yyreport_syntax_error’ function.
 
-   The following functions and types are “‘static’”: they are defined in
+   The following functions and types are "‘static’": they are defined in
 the implementation file (‘*.c’) and available only from there.  They are
-meant to be used from the grammar’s epilogue.
+meant to be used from the grammar's epilogue.
 
  -- Function: static int yyreport_syntax_error (const yypcontext_t *CTX)
      Report a syntax error to the user.  Return 0 on success, ‘YYENOMEM’
@@ -7211,7 +7208,7 @@ meant to be used from the grammar’s epilogue.
 
  -- Function: static yysymbol_kind_t yypcontext_token (const
           yypcontext_t *CTX)
-     The “unexpected” token: the symbol kind of the lookahead token that
+     The "unexpected" token: the symbol kind of the lookahead token that
      caused the syntax error.  Returns ‘YYSYMBOL_YYEMPTY’ if there is no
      lookahead.
 
@@ -7392,12 +7389,12 @@ File: bison.info,  Node: Internationalization,  Prev: Action Features,  Up: Inte
 
 A Bison-generated parser can print diagnostics, including error and
 tracing messages.  By default, they appear in English.  However, Bison
-also supports outputting diagnostics in the user’s native language.  To
+also supports outputting diagnostics in the user's native language.  To
 make this work, the user should set the usual environment variables.
-*Note The User’s View: (gettext)Users.  For example, the shell command
-‘export LC_ALL=fr_CA.UTF-8’ might set the user’s locale to French
+*Note The User's View: (gettext)Users.  For example, the shell command
+‘export LC_ALL=fr_CA.UTF-8’ might set the user's locale to French
 Canadian using the UTF-8 encoding.  The exact set of available locales
-depends on the user’s installation.
+depends on the user's installation.
 
 * Menu:
 
@@ -7411,13 +7408,13 @@ File: bison.info,  Node: Enabling I18n,  Next: Token I18n,  Up: Internationaliza
 -----------------------------------
 
 The maintainer of a package that uses a Bison-generated parser enables
-the internationalization of the parser’s output through the following
+the internationalization of the parser's output through the following
 steps.  Here we assume a package that uses GNU Autoconf and GNU
 Automake.
 
   1. Into the directory containing the GNU Autoconf macros used by the
-     package —often called ‘m4’— copy the ‘bison-i18n.m4’ file installed
-     by Bison under ‘share/aclocal/bison-i18n.m4’ in Bison’s
+     package --often called ‘m4’-- copy the ‘bison-i18n.m4’ file
+     installed by Bison under ‘share/aclocal/bison-i18n.m4’ in Bison's
      installation directory.  For example:
 
           cp /usr/local/share/aclocal/bison-i18n.m4 m4/bison-i18n.m4
@@ -7430,7 +7427,7 @@ Automake.
      to enable translations in the Bison-generated parser.
 
   3. In the ‘main’ function of your program, designate the directory
-     containing Bison’s runtime message catalog, through a call to
+     containing Bison's runtime message catalog, through a call to
      ‘bindtextdomain’ with domain name ‘bison-runtime’.  For example:
 
           bindtextdomain ("bison-runtime", BISON_LOCALEDIR);
@@ -7478,17 +7475,17 @@ internationalization marker (‘_("function")’).
 parser will use both ‘N_’ and ‘_’, that must be defined (*note The
 Programmer’s View: (gettext)Programmers.).  They are used only on string
 aliases marked for translation.  In other words, even if your catalog
-features a translation for “function”, then with
+features a translation for "function", then with
 
      %token
        <symrec*>
          FUN      "function"
          VAR    _("variable")
 
-“function” will appear untranslated in debug traces and error messages.
+"function" will appear untranslated in debug traces and error messages.
 
    Unless defined by the user, the end-of-file token, ‘YYEOF’, is
-provided “end of file” as an alias.  It is also internationalized if the
+provided "end of file" as an alias.  It is also internationalized if the
 user internationalized tokens.  To map it to another string, use:
 
      %token END 0 _("end of input")
@@ -7512,11 +7509,11 @@ When the last N tokens and groupings shifted match the components of a
 grammar rule, they can be combined according to that rule.  This is
 called “reduction”.  Those tokens and groupings are replaced on the
 stack by a single grouping whose symbol is the result (left hand side)
-of that rule.  Running the rule’s action is part of the process of
+of that rule.  Running the rule's action is part of the process of
 reduction, because this is what computes the semantic value of the
 resulting grouping.
 
-   For example, if the infix calculator’s parser stack contains this:
+   For example, if the infix calculator's parser stack contains this:
 
      1 + 5 * 3
 
@@ -7533,7 +7530,7 @@ At this point, another reduction can be made, resulting in the single
 value 16.  Then the newline token can be shifted.
 
    The parser tries, by shifts and reductions, to reduce the entire
-input down to a single grouping whose symbol is the grammar’s
+input down to a single grouping whose symbol is the grammar's
 start-symbol (*note Language and Grammar::).
 
    This kind of parser is known in the literature as a bottom-up parser.
@@ -7543,7 +7540,7 @@ start-symbol (*note Language and Grammar::).
 * Lookahead::         Parser looks one token ahead when deciding what to do.
 * Shift/Reduce::      Conflicts: when either shifting or reduction is valid.
 * Precedence::        Operator precedence works by resolving conflicts.
-* Contextual Precedence::  When an operator’s precedence depends on context.
+* Contextual Precedence::  When an operator's precedence depends on context.
 * Parser States::     The parser is a finite-state-machine with stack.
 * Reduce/Reduce::     When two rules are applicable in the same situation.
 * Mysterious Conflicts:: Conflicts that look unjustified.
@@ -7560,7 +7557,7 @@ File: bison.info,  Node: Lookahead,  Next: Shift/Reduce,  Up: Algorithm
 The Bison parser does _not_ always reduce immediately as soon as the
 last N tokens and groupings match a rule.  This is because such a simple
 strategy is inadequate to handle most languages.  Instead, when a
-reduction is possible, the parser sometimes “looks ahead” at the next
+reduction is possible, the parser sometimes "looks ahead" at the next
 token in order to decide what to do.
 
    When a token is read, it is not immediately shifted; first it becomes
@@ -7630,7 +7627,7 @@ rule.
    This situation, where either a shift or a reduction would be valid,
 is called a “shift/reduce conflict”.  Bison is designed to resolve these
 conflicts by choosing to shift, unless otherwise directed by operator
-precedence declarations.  To see the reason for this, let’s contrast it
+precedence declarations.  To see the reason for this, let's contrast it
 with the other alternative.
 
    Since the parser prefers to shift the ‘"else"’, the result is to
@@ -7657,10 +7654,10 @@ Bison accomplishes by choosing to shift rather than reduce.  (It would
 ideally be cleaner to write an unambiguous grammar, but that is very
 hard to do in this case.)  This particular ambiguity was first
 encountered in the specifications of Algol 60 and is called the
-“dangling ‘else’” ambiguity.
+"dangling ‘else’" ambiguity.
 
    To assist the grammar author in understanding the nature of each
-conflict, Bison can be asked to generate “counterexamples”.  In the
+conflict, Bison can be asked to generate "counterexamples".  In the
 present case it actually even proves that the grammar is ambiguous by
 exhibiting a string with two different parses:
 
@@ -7684,7 +7681,7 @@ exhibiting a string with two different parses:
 shift/reduce conflicts, you can use the ‘%expect N’ declaration.  There
 will be no warning as long as the number of shift/reduce conflicts is
 exactly N, and Bison will report an error if there is a different
-number.  *Note Expect Decl::.  However, we don’t recommend the use of
+number.  *Note Expect Decl::.  However, we don't recommend the use of
 ‘%expect’ (except ‘%expect 0’!), as an equal number of conflicts does
 not mean that they are the _same_.  When possible, you should rather use
 precedence directives to _fix_ the conflicts explicitly (*note Non
@@ -7784,7 +7781,7 @@ list of tokens, which are operators whose precedence and associativity
 is being declared.  The ‘%left’ declaration makes all those operators
 left-associative and the ‘%right’ declaration makes them
 right-associative.  A third alternative is ‘%nonassoc’, which declares
-that it is a syntax error to find the same operator twice “in a row”.
+that it is a syntax error to find the same operator twice "in a row".
 The last alternative, ‘%precedence’, allows to define only precedence
 and no associativity at all.  As a result, any associativity-related
 conflict that remains will be reported as an compile-time error.  The
@@ -7873,8 +7870,8 @@ Precedence::.)
 
    Finally, the resolution of conflicts works by comparing the
 precedence of the rule being considered with that of the lookahead
-token.  If the token’s precedence is higher, the choice is to shift.  If
-the rule’s precedence is higher, the choice is to reduce.  If they have
+token.  If the token's precedence is higher, the choice is to shift.  If
+the rule's precedence is higher, the choice is to reduce.  If they have
 equal precedence, the choice is made based on the associativity of that
 precedence level.  The verbose output file made by ‘-v’ (*note
 Invocation::) says how each conflict was resolved.
@@ -7890,7 +7887,7 @@ File: bison.info,  Node: Non Operators,  Prev: How Precedence,  Up: Precedence
 
 Using properly precedence and associativity directives can help fixing
 shift/reduce conflicts that do not involve arithmetic-like operators.
-For instance, the “dangling ‘else’” problem (*note Shift/Reduce::) can
+For instance, the "dangling ‘else’" problem (*note Shift/Reduce::) can
 be solved elegantly in two different ways.
 
    In the present case, the conflict is between the token ‘"else"’
@@ -7910,12 +7907,12 @@ action, use right associativity:
      %right "then" "else"
 
    Neither solution is perfect however.  Since Bison does not provide,
-so far, “scoped” precedence, both force you to declare the precedence of
+so far, "scoped" precedence, both force you to declare the precedence of
 these keywords with respect to the other operators your grammar.
 Therefore, instead of being warned about new conflicts you would be
 unaware of (e.g., a shift/reduce conflict due to ‘if test then 1 else 2
 + 3’ being ambiguous: ‘if test then 1 else (2 + 3)’ or ‘(if test then 1
-else 2) + 3’?), the conflict will be already “fixed”.
+else 2) + 3’?), the conflict will be already "fixed".
 
 
 File: bison.info,  Node: Contextual Precedence,  Next: Parser States,  Prev: Precedence,  Up: Algorithm
@@ -7936,8 +7933,8 @@ the ‘%prec’ modifier for rules.
 
    The ‘%prec’ modifier declares the precedence of a particular rule by
 specifying a terminal symbol whose precedence should be used for that
-rule.  It’s not necessary for that symbol to appear otherwise in the
-rule.  The modifier’s syntax is:
+rule.  It's not necessary for that symbol to appear otherwise in the
+rule.  The modifier's syntax is:
 
      %prec TERMINAL-SYMBOL
 
@@ -7980,9 +7977,9 @@ do next.
 
    Each time a lookahead token is read, the current parser state
 together with the kind of lookahead token are looked up in a table.
-This table entry can say, “Shift the lookahead token.” In this case, it
+This table entry can say, "Shift the lookahead token."  In this case, it
 also specifies the new parser state, which is pushed onto the top of the
-parser stack.  Or it can say, “Reduce using rule number N.” This means
+parser stack.  Or it can say, "Reduce using rule number N."  This means
 that a certain number of tokens or groupings are taken off the top of
 the stack, and replaced by one grouping.  In other words, that number of
 states are popped from the stack, and one new state is pushed.
@@ -8030,8 +8027,8 @@ via ‘maybeword’ and then the second rule.
    You might think that this is a distinction without a difference,
 because it does not change whether any particular input is valid or not.
 But it does affect which actions are run.  One parsing order runs the
-second rule’s action; the other runs the first rule’s action and the
-third rule’s action.  In this example, the output of the program
+second rule's action; the other runs the first rule's action and the
+third rule's action.  In this example, the output of the program
 changes.
 
    Bison resolves a reduce/reduce conflict by choosing to use the rule
@@ -8147,7 +8144,7 @@ File: bison.info,  Node: Mysterious Conflicts,  Next: Tuning LR,  Prev: Reduce/R
 5.7 Mysterious Conflicts
 ========================
 
-Sometimes reduce/reduce conflicts can occur that don’t look warranted.
+Sometimes reduce/reduce conflicts can occur that don't look warranted.
 Here is an example:
 
      %%
@@ -8182,7 +8179,7 @@ default_, for historical reasons.  In this grammar, two contexts, that
 after an ‘"id"’ at the beginning of a ‘param_spec’ and likewise at the
 beginning of a ‘return_spec’, are similar enough that Bison assumes they
 are the same.  They appear similar because the same set of rules would
-be active—the rule for reducing to a ‘name’ and that for reducing to a
+be active--the rule for reducing to a ‘name’ and that for reducing to a
 ‘type’.  Bison is unable to determine at that stage of processing that
 the rules would require different lookahead tokens in the two contexts,
 so it makes a single parser state for them both.  Combining the two
@@ -8197,7 +8194,7 @@ algorithm.  Either IELR(1) or canonical LR(1) would suffice, but the
 former is more efficient and easier to debug during development.  *Note
 LR Table Construction::, for details.
 
-   If you instead wish to work around LALR(1)’s limitations, you can
+   If you instead wish to work around LALR(1)'s limitations, you can
 often fix a mysterious conflict by identifying the two parser states
 that are being confused, and adding something to make them look
 distinct.  In the above example, adding one rule to ‘return_spec’ as
@@ -8243,11 +8240,11 @@ File: bison.info,  Node: Tuning LR,  Next: Generalized LR Parsing,  Prev: Myster
 5.8 Tuning LR
 =============
 
-The default behavior of Bison’s LR-based parsers is chosen mostly for
+The default behavior of Bison's LR-based parsers is chosen mostly for
 historical reasons, but that behavior is often not robust.  For example,
 in the previous section, we discussed the mysterious conflicts that can
-be produced by LALR(1), Bison’s default parser table construction
-algorithm.  Another example is Bison’s ‘%define parse.error verbose’
+be produced by LALR(1), Bison's default parser table construction
+algorithm.  Another example is Bison's ‘%define parse.error verbose’
 directive, which instructs the generated parser to produce verbose
 syntax error messages, which can sometimes contain incorrect
 information.
@@ -8310,7 +8307,7 @@ use IELR will result in unnecessarily large parser tables.  That is,
 IELR generates LALR tables when LALR (using a deterministic parsing
 algorithm) is sufficient to support the full language-recognition power
 of LR. Thus, by enabling IELR at the start of grammar development, you
-can safely and completely eliminate the need to consider LALR’s
+can safely and completely eliminate the need to consider LALR's
 shortcomings.
 
    While IELR is almost always preferable, there are circumstances where
@@ -8335,7 +8332,7 @@ each parser table construction algorithm within Bison:
           to resolve conflicts statically, GLR behaves more like a
           deterministic parser in the syntactic contexts where those
           conflicts appear, and so either IELR or canonical LR can then
-          be helpful to avoid LALR’s mysterious behavior.
+          be helpful to avoid LALR's mysterious behavior.
 
         • Malformed grammars.
 
@@ -8354,7 +8351,7 @@ each parser table construction algorithm within Bison:
      sentences.  However, like LALR, IELR merges parser states during
      parser table construction so that the number of parser states is
      often an order of magnitude less than for canonical LR. More
-     importantly, because canonical LR’s extra parser states may contain
+     importantly, because canonical LR's extra parser states may contain
      duplicate conflicts in the case of non-LR grammars, the number of
      conflicts for IELR is often an order of magnitude less as well.
      This effect can significantly reduce the complexity of developing a
@@ -8533,7 +8530,7 @@ enable default reductions in consistent states, canonical LR and IELR
 behave almost exactly the same for both syntactically acceptable and
 syntactically unacceptable input.  While LALR still does not support the
 full language-recognition power of canonical LR and IELR, LAC at least
-enables LALR’s syntax error handling to correctly reflect LALR’s
+enables LALR's syntax error handling to correctly reflect LALR's
 language-recognition power.
 
    There are a few caveats to consider when using LAC:
@@ -8564,7 +8561,7 @@ language-recognition power.
      reductions in consistent states and shift actions, the parser never
      has to initiate an exploratory parse.  Moreover, the most
      time-consuming tasks in a parse are often the file I/O, the lexical
-     analysis performed by the scanner, and the user’s semantic actions,
+     analysis performed by the scanner, and the user's semantic actions,
      but none of these are performed during the exploratory parse.
      Finally, the base of the temporary stack used during an exploratory
      parse is a pointer into the normal parser state stack so that the
@@ -8582,7 +8579,7 @@ File: bison.info,  Node: Unreachable States,  Prev: LAC,  Up: Tuning LR
 5.8.4 Unreachable States
 ------------------------
 
-If there exists no sequence of transitions from the parser’s start state
+If there exists no sequence of transitions from the parser's start state
 to some state S, then Bison considers S to be an “unreachable state”.  A
 state can become unreachable during conflict resolution if Bison
 disables a shift action leading to it from a predecessor state.
@@ -8602,7 +8599,7 @@ understand the relationship between the parser and the grammar.
 
      Unreachable states may contain conflicts and may use rules not used
      in any other state.  Thus, keeping unreachable states may induce
-     warnings that are irrelevant to your parser’s behavior, and it may
+     warnings that are irrelevant to your parser's behavior, and it may
      eliminate warnings that are relevant.  Of course, the change in
      warnings may actually be relevant to a parser table analysis that
      wants to keep unreachable states, so this behavior will likely
@@ -8635,7 +8632,7 @@ The same is true of languages that require more than one symbol of
 lookahead, since the parser lacks the information necessary to make a
 decision at the point it must be made in a shift/reduce parser.
 Finally, as previously mentioned (*note Mysterious Conflicts::), there
-are languages where Bison’s default choice of how to summarize the input
+are languages where Bison's default choice of how to summarize the input
 seen so far loses necessary information.
 
    When you use the ‘%glr-parser’ declaration in your grammar file,
@@ -8685,7 +8682,7 @@ length of the input times the maximum number of stacks required for any
 prefix of the input.  Thus, really ambiguous or nondeterministic
 grammars can require exponential time and space to process.  Such badly
 behaving examples, however, are not generally of practical interest.
-Usually, nondeterminism in a grammar is local—the parser is “in doubt”
+Usually, nondeterminism in a grammar is local--the parser is "in doubt"
 only for a few tokens at a time.  Therefore, the current data structure
 should generally be adequate.  On LR(1) portions of a grammar, in
 particular, it is only slightly slower than with the deterministic LR(1)
@@ -8837,14 +8834,14 @@ shifted will error messages resume.
 as any other rules can.
 
    You can make error messages resume immediately by using the macro
-‘yyerrok’ in an action.  If you do this in the error rule’s action, no
+‘yyerrok’ in an action.  If you do this in the error rule's action, no
 error messages will be suppressed.  This macro requires no arguments;
 ‘yyerrok;’ is a valid C statement.
 
    The previous lookahead token is reanalyzed immediately after an
 error.  If this is unacceptable, then the macro ‘yyclearin’ may be used
 to clear this token.  Write the statement ‘yyclearin;’ in the error
-rule’s action.  *Note Action Features::.
+rule's action.  *Note Action Features::.
 
    For example, suppose that on a syntax error, an error handling
 routine is called that advances the input stream to some point where
@@ -8875,7 +8872,7 @@ for such languages.
 * Tie-in Recovery::   Lexical tie-ins have implications for how
                         error recovery rules must be written.
 
-   (Actually, “kludge” means any technique that gets its job done but is
+   (Actually, "kludge" means any technique that gets its job done but is
 neither clean nor robust.)
 
 
@@ -8904,7 +8901,7 @@ choice of token kind to recognize.  ‘IDENTIFIER’ is accepted as an
 expression, but ‘TYPENAME’ is not.  ‘TYPENAME’ can start a declaration,
 but ‘IDENTIFIER’ cannot.  In contexts where the meaning of the
 identifier is _not_ significant, such as in declarations that can shadow
-a typedef name, either ‘TYPENAME’ or ‘IDENTIFIER’ is accepted—there is
+a typedef name, either ‘TYPENAME’ or ‘IDENTIFIER’ is accepted--there is
 one rule for each of the two token kinds.
 
    This technique is simple to use if the decision of which kinds of
@@ -8922,13 +8919,13 @@ earlier:
      }
 
    Unfortunately, the name being declared is separated from the
-declaration construct itself by a complicated syntactic structure—the
-“declarator”.
+declaration construct itself by a complicated syntactic structure--the
+"declarator".
 
    As a result, part of the Bison parser for C needs to be duplicated,
 with all the nonterminal names changed: once for parsing a declaration
 in which a typedef name can be redefined, and once for parsing a
-declaration in which that can’t be done.  Here is a part of the
+declaration in which that can't be done.  Here is a part of the
 duplication, with actions omitted for brevity:
 
      initdcl:
@@ -9050,7 +9047,7 @@ way you can write the action to determine whether a ‘hex’ construct is
 being aborted or not.  So if you are using a lexical tie-in, you had
 better make sure your error recovery rules are not of this kind.  Each
 rule must be such that you can be sure that it always will, or always
-won’t, have to clear the flag.
+won't, have to clear the flag.
 
 
 File: bison.info,  Node: Debugging,  Next: Invocation,  Prev: Context Dependency,  Up: Top
@@ -9058,7 +9055,7 @@ File: bison.info,  Node: Debugging,  Next: Invocation,  Prev: Context Dependency
 8 Debugging Your Parser
 ***********************
 
-Developing a parser can be a challenge, especially if you don’t
+Developing a parser can be a challenge, especially if you don't
 understand the algorithm (*note Algorithm::).  This chapter explains how
 to understand and debug a parser.
 
@@ -9118,7 +9115,7 @@ features one shift/reduce conflict:
      else.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
      else.y: note: rerun with option '-Wcounterexamples' to generate conflict counterexamples
 
-Let’s rerun ‘bison’ with the option ‘-Wcex’/‘-Wcounterexamples’(the
+Let's rerun ‘bison’ with the option ‘-Wcex’/‘-Wcounterexamples’(the
 following output is actually in color):
 
      else.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
@@ -9205,7 +9202,7 @@ shows that the grammar accepts the empty input in two different ways.
 two ways.  In these cases, counterexample generation will provide two
 examples that are the same up until the dot.  Most notably, this will
 happen when your grammar requires a stronger parser (more lookahead, LR
-instead of LALR). The following example isn’t LR(1):
+instead of LALR). The following example isn't LR(1):
 
      %token ID
      %%
@@ -9309,7 +9306,7 @@ might vary, but the interpretation is the same.
 The first section reports useless tokens, nonterminals and rules.
 Useless nonterminals and rules are removed in order to produce a smaller
 parser, but useless tokens are preserved, since they might be used by
-the scanner (note the difference between “useless” and “unused” below):
+the scanner (note the difference between "useless" and "unused" below):
 
      Nonterminals useless in grammar
         useless
@@ -9373,14 +9370,14 @@ input cursor.
 
          exp  go to state 2
 
-   This reads as follows: “state 0 corresponds to being at the very
+   This reads as follows: "state 0 corresponds to being at the very
 beginning of the parsing, in the initial rule, right before the start
 symbol (here, ‘exp’).  When the parser returns to this state right after
 having reduced a rule that produced an ‘exp’, the control flow jumps to
 state 2.  If there is no such transition on a nonterminal symbol, and
 the lookahead is a ‘NUM’, then this token is shifted onto the parse
 stack, and the control flow jumps to state 1.  Any other lookahead
-triggers a syntax error.”
+triggers a syntax error."
 
    Even though the only active rule in state 0 seems to be rule 0, the
 report lists ‘NUM’ as a lookahead token because ‘NUM’ can be at the
@@ -9749,7 +9746,7 @@ distinguished by a red filling color on these nodes, just like how they
 are reported between square brackets in the verbose file.
 
    The reduction corresponding to the rule number 0 is the acceptation
-state.  It is shown as a blue diamond, labeled “Acc”.
+state.  It is shown as a blue diamond, labeled "Acc".
 
 Graphical Representation of Gotos
 ---------------------------------
@@ -9802,7 +9799,7 @@ File: bison.info,  Node: Tracing,  Prev: Xml,  Up: Debugging
 8.5 Tracing Your Parser
 =======================
 
-When a Bison grammar compiles properly but parses “incorrectly”, the
+When a Bison grammar compiles properly but parses "incorrectly", the
 ‘yydebug’ parser-trace feature helps figuring out why.
 
 * Menu:
@@ -9890,7 +9887,7 @@ arrive at the place where something undesirable happens, and you will
 see which parts of the grammar are to blame.
 
    The parser implementation file is a C/C++/D/Java program and you can
-use debuggers on it, but it’s not easy to interpret what it is doing.
+use debuggers on it, but it's not easy to interpret what it is doing.
 The parser function is a finite-state machine interpreter, and aside
 from the actions it executes the same code over and over.  Only the
 values of variables show where in the grammar it is working.
@@ -9923,7 +9920,7 @@ its prologue:
    The ‘%define’ directive instructs Bison to generate run-time trace
 support.  Then, activation of these traces is controlled at run-time by
 the ‘yydebug’ variable, which is disabled by default.  Because these
-traces will refer to the “states” of the parser, it is helpful to ask
+traces will refer to the "states" of the parser, it is helpful to ask
 for the creation of a description of that parser; this is the purpose of
 (admittedly ill-named) ‘%verbose’ directive.
 
@@ -10059,10 +10056,10 @@ The usual way to invoke Bison is as follows:
      $ bison FILE
 
    Here FILE is the grammar file name, which usually ends in ‘.y’.  The
-parser implementation file’s name is made by replacing the ‘.y’ with
+parser implementation file's name is made by replacing the ‘.y’ with
 ‘.tab.c’ and removing any leading directory.  Thus, the ‘bison foo.y’
 file name yields ‘foo.tab.c’, and the ‘bison hack/foo.y’ file name
-yields ‘foo.tab.c’.  It’s also possible, in case you are writing C++
+yields ‘foo.tab.c’.  It's also possible, in case you are writing C++
 code instead of C in your grammar file, to name it ‘foo.ypp’ or
 ‘foo.y++’.  Then, the output files will take an extension like the given
 one as input (respectively ‘foo.tab.cpp’ and ‘foo.tab.c++’).  This
@@ -10183,8 +10180,8 @@ Options controlling the global behavior of ‘bison’.
      Activate miscellaneous FEATUREs.  FEATURE can be one of:
      ‘caret’
      ‘diagnostics-show-caret’
-          Show caret errors, in a manner similar to GCC’s
-          ‘-fdiagnostics-show-caret’, or Clang’s ‘-fcaret-diagnostics’.
+          Show caret errors, in a manner similar to GCC's
+          ‘-fdiagnostics-show-caret’, or Clang's ‘-fcaret-diagnostics’.
           The location provided with the message is used to quote the
           corresponding line of the source file, underlining the
           important part of it with carets (‘^’).  Here is an example,
@@ -10225,8 +10222,8 @@ Options controlling the global behavior of ‘bison’.
 
      ‘fixit’
      ‘diagnostics-parseable-fixits’
-          Show machine-readable fixes, in a manner similar to GCC’s and
-          Clang’s ‘-fdiagnostics-parseable-fixits’.
+          Show machine-readable fixes, in a manner similar to GCC's and
+          Clang's ‘-fdiagnostics-parseable-fixits’.
 
           Fix-its are generated for duplicate directives:
 
@@ -10307,8 +10304,8 @@ Options controlling the diagnostics.
 
                %type <exVal> cond "condition"
 
-          does not define “condition” as a string alias to
-          ‘cond’—nonterminal symbols do not have string aliases.  It is
+          does not define "condition" as a string alias to
+          ‘cond’--nonterminal symbols do not have string aliases.  It is
           rather equivalent to
 
                %nterm <exVal> cond
@@ -10450,7 +10447,7 @@ Options controlling the diagnostics.
 
 ‘-Wno-error=CATEGORY’
      Deactivate the error treatment for this CATEGORY.  However, the
-     warning itself won’t be disabled, or enabled, by this option.
+     warning itself won't be disabled, or enabled, by this option.
 
 ‘--color’
      Equivalent to ‘--color=always’.
@@ -10539,7 +10536,7 @@ Options changing the generated parsers.
 
 ‘-l’
 ‘--no-lines’
-     Don’t put any ‘#line’ preprocessor commands in the parser
+     Don't put any ‘#line’ preprocessor commands in the parser
      implementation file.  Ordinarily Bison puts them in the parser
      implementation file so that the C compiler and debuggers will
      associate errors with your source file, the grammar file.  This
@@ -10574,11 +10571,11 @@ Options changing the generated parsers.
                void yyerror (const char *);
           As a Bison extension, additional arguments required by
           ‘%pure-parser’, ‘%locations’, ‘%lex-param’ and ‘%parse-param’
-          are taken into account.  You may disable ‘yyerror’’s prototype
+          are taken into account.  You may disable ‘yyerror’'s prototype
           with ‘#define yyerror yyerror’ (as specified by POSIX), or
           with ‘#define YYERROR_IS_DECLARED’ (a Bison extension).
           Likewise for ‘yylex’.
-        • Imitate Yacc’s output file name conventions, so that the
+        • Imitate Yacc's output file name conventions, so that the
           parser implementation file is called ‘y.tab.c’, and the other
           outputs are called ‘y.output’ and ‘y.tab.h’.  Do not use
           ‘--yacc’ just to change the output file names since it also
@@ -10636,7 +10633,7 @@ Options controlling the output.
 
      ‘state’
           Description of the grammar, conflicts (resolved and
-          unresolved), and parser’s automaton.
+          unresolved), and parser's automaton.
 
      ‘itemset’
           Implies ‘state’ and augments the description of the automaton
@@ -10645,7 +10642,7 @@ Options controlling the output.
 
      ‘lookahead’
           Implies ‘state’ and augments the description of the automaton
-          with each rule’s lookahead set.
+          with each rule's lookahead set.
 
      ‘solved’
           Implies ‘state’.  Explain how conflicts were solved thanks to
@@ -10682,7 +10679,7 @@ Options controlling the output.
 
 ‘-g [FILE]’
 ‘--graph[=FILE]’
-     Output a graphical representation of the parser’s automaton
+     Output a graphical representation of the parser's automaton
      computed by Bison, in Graphviz (https://www.graphviz.org/) DOT
      (https://www.graphviz.org/doc/info/lang.html) format.  ‘FILE’ is
      optional.  If omitted and the grammar file is ‘foo.y’, the output
@@ -10690,7 +10687,7 @@ Options controlling the output.
 
 ‘-x [FILE]’
 ‘--xml[=FILE]’
-     Output an XML report of the parser’s automaton computed by Bison.
+     Output an XML report of the parser's automaton computed by Bison.
      ‘FILE’ is optional.  If omitted and the grammar file is ‘foo.y’,
      the output file will be ‘foo.xml’.
 
@@ -10749,18 +10746,18 @@ File: bison.info,  Node: Yacc Library,  Prev: Option Cross Key,  Up: Invocation
 The Yacc library contains default implementations of the ‘yyerror’ and
 ‘main’ functions.  These default implementations are normally not
 useful, but POSIX requires them.  To use the Yacc library, link your
-program with the ‘-ly’ option.  Note that Bison’s implementation of the
+program with the ‘-ly’ option.  Note that Bison's implementation of the
 Yacc library is distributed under the terms of the GNU General Public
 License (*note Copying::).
 
-   If you use the Yacc library’s ‘yyerror’ function, you should declare
+   If you use the Yacc library's ‘yyerror’ function, you should declare
 ‘yyerror’ as follows:
 
      int yyerror (char const *);
 
 The ‘int’ value returned by this ‘yyerror’ is ignored.
 
-   The implementation of Yacc library’s ‘main’ function is:
+   The implementation of Yacc library's ‘main’ function is:
 
      int main (void)
      {
@@ -10783,7 +10780,7 @@ File: bison.info,  Node: Other Languages,  Next: History,  Prev: Invocation,  Up
 In addition to C, Bison can generate parsers in C++, D and Java.  This
 chapter is devoted to these languages.  The reader is expected to
 understand how Bison works; read the introductory chapters first if you
-don’t.
+don't.
 
 * Menu:
 
@@ -10832,7 +10829,7 @@ and that we generate C++.
      %require "3.2"
      %language "c++"
 
-   Let’s dive directly into the middle part: the grammar.  Our input is
+   Let's dive directly into the middle part: the grammar.  Our input is
 a simple list of strings, that we display once the parsing is done.
 
      %%
@@ -10847,7 +10844,7 @@ a simple list of strings, that we display once the parsing is done.
      ;
 
    We used a vector of strings as a semantic value!  To use genuine C++
-objects as semantic values—not just PODs—we cannot rely on the union
+objects as semantic values--not just PODs--we cannot rely on the union
 that Bison uses by default to store them, we need _variants_ (*note C++
 Variants::):
 
@@ -11017,7 +11014,7 @@ argument for its constructor.
      A structure that contains (only) the ‘token_kind_type’ enumeration,
      which defines the tokens.  To refer to the token ‘FOO’, use
      ‘yy::parser::token::FOO’.  The scanner can use ‘typedef
-     yy::parser::token token;’ to “import” the token enumeration (*note
+     yy::parser::token token;’ to "import" the token enumeration (*note
      Calc++ Scanner::).
 
  -- Type of parser: token_kind_type
@@ -11151,7 +11148,7 @@ section, and in particular, object types can be used without pointers.
    To enable variant-based semantic values, set the ‘%define’ variable
 ‘api.value.type’ to ‘variant’ (*note %define Summary::).  Then ‘%union’
 is ignored; instead of using the name of the fields of the ‘%union’ to
-“type” the symbols, use genuine types.
+"type" the symbols, use genuine types.
 
    For instance, instead of:
 
@@ -11196,14 +11193,14 @@ Typed Midrule Actions::).
      from the variadic forwarding references U....
 
    *Warning*: We do not use Boost.Variant, for two reasons.  First, it
-appeared unacceptable to require Boost on the user’s machine (i.e., the
+appeared unacceptable to require Boost on the user's machine (i.e., the
 machine on which the generated parser will be compiled, not the machine
 on which ‘bison’ was run).  Second, for each possible semantic value,
 Boost.Variant not only stores the value, but also a tag specifying its
-type.  But the parser already “knows” the type of the semantic value, so
+type.  But the parser already "knows" the type of the semantic value, so
 that would be duplicating the information.
 
-   We do not use C++17’s ‘std::variant’ either: we want to support all
+   We do not use C++17's ‘std::variant’ either: we want to support all
 the C++ standards, and of course ‘std::variant’ also stores a tag to
 record the current type.
 
@@ -11363,13 +11360,13 @@ File: bison.info,  Node: Exposing the Location Classes,  Next: User Defined Loca
 ......................................
 
 When both ‘%header’ and ‘%locations’ are enabled, Bison generates an
-additional file: ‘location.hh’.  If you don’t use locations outside of
+additional file: ‘location.hh’.  If you don't use locations outside of
 the parser, you may avoid its creation with ‘%define api.location.file
 none’.
 
    However this file is useful if, for instance, your parser builds an
-abstract syntax tree decorated with locations: you may use Bison’s
-‘location’ type independently of Bison’s parser.  You may name the file
+abstract syntax tree decorated with locations: you may use Bison's
+‘location’ type independently of Bison's parser.  You may name the file
 differently, e.g., ‘%define api.location.file
 "include/ast/location.hh"’: this name can have directory components, or
 even be absolute.  The way the location file is included is controlled
@@ -11489,7 +11486,7 @@ Function::), the user must define the following function.
           typedef symbol_kind::symbol_kind_t symbol_kind_type;
 
  -- Method on context: const symbol_type& lookahead () const
-     The “unexpected” token: the lookahead that caused the syntax error.
+     The "unexpected" token: the lookahead that caused the syntax error.
 
  -- Method on context: symbol_kind_type token () const
      The symbol kind of the lookahead token that caused the syntax
@@ -11636,7 +11633,7 @@ expects ‘yylex’ to have the following prototype.
      yield additional arguments.
 
  -- Type of parser: symbol_type
-     A “complete symbol”, that binds together its kind, value and (when
+     A "complete symbol", that binds together its kind, value and (when
      applicable) location.
 
  -- Method on symbol_type: symbol_kind_type kind () const
@@ -11763,8 +11760,8 @@ interface with.
 
 File: bison.info,  Node: Calc++ --- C++ Calculator,  Next: Calc++ Parsing Driver,  Up: A Complete C++ Example
 
-10.1.8.1 Calc++ — C++ Calculator
-................................
+10.1.8.1 Calc++ -- C++ Calculator
+.................................
 
 Of course the grammar is dedicated to arithmetic, a single expression,
 possibly preceded by variable assignments.  An environment containing
@@ -11782,7 +11779,7 @@ File: bison.info,  Node: Calc++ Parsing Driver,  Next: Calc++ Parser,  Prev: Cal
 ..............................
 
 To support a pure interface with the parser (and the scanner) the
-technique of the “parsing context” is convenient: a structure containing
+technique of the "parsing context" is convenient: a structure containing
 all the data to exchange.  Since, in addition to simply launch the
 parsing, there are several auxiliary tasks to execute (open the file for
 scanning, instantiate the parser etc.), we recommend transforming the
@@ -11894,7 +11891,7 @@ conversions.
 This example uses genuine C++ objects as semantic values, therefore, we
 require the variant-based storage of semantic values.  To make sure we
 properly use it, we enable assertions.  To fully benefit from
-type-safety and more natural definition of “symbol”, we enable
+type-safety and more natural definition of "symbol", we enable
 ‘api.token.constructor’.
 
      %define api.token.constructor
@@ -11905,8 +11902,8 @@ Then come the declarations/inclusions needed by the semantic values.
 Because the parser uses the parsing driver and reciprocally, both would
 like to include the header of the other, which is, of course, insane.
 This mutual dependency will be broken using forward declarations.
-Because the driver’s header needs detailed knowledge about the parser
-class (in particular its inner types), it is the parser’s header which
+Because the driver's header needs detailed knowledge about the parser
+class (in particular its inner types), it is the parser's header which
 will use a forward declaration of the driver.  *Note %code Summary::.
 
      %code requires {
@@ -12008,8 +12005,8 @@ File: bison.info,  Node: Calc++ Scanner,  Next: Calc++ Top Level,  Prev: Calc++
 10.1.8.4 Calc++ Scanner
 .......................
 
-In addition to standard headers, the Flex scanner includes the driver’s,
-then the parser’s to get the set of defined tokens.
+In addition to standard headers, the Flex scanner includes the driver's,
+then the parser's to get the set of defined tokens.
 
      %{ /* -*- C++ -*- */
      # include <cerrno>
@@ -12021,8 +12018,8 @@ then the parser’s to get the set of defined tokens.
      # include "parser.hh"
      %}
 
-Since our calculator has no ‘#include’-like feature, we don’t need
-‘yywrap’.  We don’t need the ‘unput’ and ‘input’ functions either, and
+Since our calculator has no ‘#include’-like feature, we don't need
+‘yywrap’.  We don't need the ‘unput’ and ‘input’ functions either, and
 we parse an actual file, this is not an interactive session with the
 user.  Finally, we enable scanner tracing.
 
@@ -12098,8 +12095,8 @@ report errors.
        return yy::parser::make_NUMBER ((int) n, loc);
      }
 
-Finally, because the scanner-related driver’s member-functions depend on
-the scanner’s data, it is simpler to implement them in this file.
+Finally, because the scanner-related driver's member-functions depend on
+the scanner's data, it is simpler to implement them in this file.
 
      void
      driver::scan_begin ()
@@ -12209,7 +12206,7 @@ garbage collection.  The parser will try to hold references to semantic
 values for as little time as needed.
 
    D parsers support ‘%printer’.  An example for the output of type
-‘int’, where ‘yyo’ is the parser’s debug output:
+‘int’, where ‘yyo’ is the parser's debug output:
 
      %printer { yyo.write($$); } <int>
 
@@ -12518,7 +12515,7 @@ Summary::).
 returned if more input is required to finish parsing the input.
 
    If ‘api.push-pull’ is defined as ‘both’, then the generated parser
-class will also implement the ‘parse’ method.  This method’s body is a
+class will also implement the ‘parse’ method.  This method's body is a
 loop that repeatedly invokes the scanner and then passes the values
 obtained from the scanner to the ‘pushParse’ method.
 
@@ -12581,7 +12578,7 @@ contains a single class for the parser.
 
    Contrary to C parsers, Java parsers do not use global variables; the
 state of the parser is always local to an instance of the parser class.
-Therefore, all Java parsers are “pure”, and the ‘%define api.pure’
+Therefore, all Java parsers are "pure", and the ‘%define api.pure’
 directive does nothing when used in Java.
 
    GLR parsers are currently unsupported in Java.  Do not use the
@@ -12598,7 +12595,7 @@ parser, so use ‘%define parse.trace’ explicitly if needed.  Also, in the
 future the ‘%token-table’ directive might enable a public interface to
 access the token names and codes.
 
-   Getting a “code too large” error from the Java compiler means the
+   Getting a "code too large" error from the Java compiler means the
 code hit the 64KB bytecode per method limitation of the Java class file.
 Try reducing the amount of code in actions and static initializers;
 otherwise, report a bug so that the parser skeleton will be improved.
@@ -12610,7 +12607,7 @@ File: bison.info,  Node: Java Semantic Values,  Next: Java Location Values,  Pre
 ---------------------------
 
 There is no ‘%union’ directive in Java parsers.  Instead, the semantic
-values’ types (class names) should be specified in the ‘%nterm’ or
+values' types (class names) should be specified in the ‘%nterm’ or
 ‘%token’ directive:
 
      %nterm <Expression> expr assignment_expr term factor
@@ -12776,7 +12773,7 @@ them automatically.
 must provide the parser with the following function:
 
  -- Static Method of YYParser: String i18n (string S)
-     Return the translation of S in the user’s language.  As an example:
+     Return the translation of S in the user's language.  As an example:
 
           %code {
             static ResourceBundle myResources
@@ -13034,7 +13031,7 @@ following: 0 (success), 1 (abort), 2 (memory exhaustion), or
 input is required to finish parsing the grammar.
 
    If ‘api.push-pull’ is defined as ‘both’, then the generated parser
-class will also implement the ‘parse’ method.  This method’s body is a
+class will also implement the ‘parse’ method.  This method's body is a
 loop that repeatedly invokes the scanner and then passes the values
 obtained from the scanner to the ‘push_parse’ method.
 
@@ -13265,7 +13262,7 @@ File: bison.info,  Node: Yacc,  Next: yacchack,  Up: History
 11.1 The ancestral Yacc
 =======================
 
-Bison originated as a workalike of a program called Yacc — Yet Another
+Bison originated as a workalike of a program called Yacc -- Yet Another
 Compiler Compiler.(1)  Yacc was written at Bell Labs as part of the very
 early development of Unix; one of its first uses was to develop the
 original Portable C Compiler, pcc.  The same person, Steven C. Johnson,
@@ -13289,13 +13286,13 @@ with less restrictive licenses and more features became available.
 
    Original Yacc became generally available when Caldera released the
 sources of old versions of Unix up to V7 and 32V in 2002.  By that time
-it had been long superseded in practical use by Bison even on Yacc’s
+it had been long superseded in practical use by Bison even on Yacc's
 native Unix variants.
 
    ---------- Footnotes ----------
 
-   (1) Because of the acronym, the name is sometimes given as “YACC”,
-but Johnson used “Yacc” in the descriptive paper included in the Version
+   (1) Because of the acronym, the name is sometimes given as "YACC",
+but Johnson used "Yacc" in the descriptive paper included in the Version
 7 Unix Manual
 (https://s3.amazonaws.com/plan9-bell-labs/7thEdMan/v7vol2b.pdf).
 
@@ -13309,7 +13306,7 @@ File: bison.info,  Node: yacchack,  Next: Byacc,  Prev: Yacc,  Up: History
 
 One of the deficiencies of original Yacc was its inability to produce
 reentrant parsers.  This was first remedied by a set of drop-in
-modifications called “yacchack”, published by Eric S. Raymond on USENET
+modifications called "yacchack", published by Eric S. Raymond on USENET
 around 1983.  This code was quickly forgotten when zoo and Berkeley Yacc
 became available a few years later.
 
@@ -13320,14 +13317,14 @@ File: bison.info,  Node: Byacc,  Next: Bison,  Prev: yacchack,  Up: History
 ==================
 
 Berkeley Yacc was originated in 1985 by Robert Corbett (*note Corbett
-1984::).  It was originally named “zoo”, but by October 1989 it became
+1984::).  It was originally named "zoo", but by October 1989 it became
 known as Berkeley Yacc or byacc.
 
    Berkeley Yacc had three advantages over the ancestral Yacc: it
 generated faster parsers, it could generate reentrant parsers, and the
 source code was released to the public domain rather than being under an
 AT&T proprietary license.  The better performance came from implementing
-techniques from DeRemer and Penello’s seminal paper on LALR parsing
+techniques from DeRemer and Penello's seminal paper on LALR parsing
 (*note DeRemer 1982::).
 
    Use of byacc spread rapidly due to its public domain license.
@@ -13341,12 +13338,12 @@ File: bison.info,  Node: Bison,  Next: Other Ungulates,  Prev: Byacc,  Up: Histo
 ==========
 
 Robert Corbett actually wrote two (closely related) LALR parsers in
-1985, both using the DeRemer/Penello techniques.  One was “zoo”, the
-other was “Byson”.  In 1987 Richard Stallman began working on Byson; the
+1985, both using the DeRemer/Penello techniques.  One was "zoo", the
+other was "Byson".  In 1987 Richard Stallman began working on Byson; the
 name changed to Bison and the interface became Yacc-compatible.
 
    The main visible difference between Yacc and Byson/Bison at the time
-of Byson’s first release is that Byson supported the ‘@N’ construct
+of Byson's first release is that Byson supported the ‘@N’ construct
 (giving access to the starting and ending line number and character
 number associated with any of the symbols in the current rule).
 
@@ -13391,8 +13388,8 @@ the early ports are extinct along with the languages that hosted them;
 others have been superseded by parser skeletons shipped with Bison.
 
    However, independent implementations persist.  One of the best-known
-still in use is David Beazley’s “PLY” (Python Lex-Yacc) for Python.
-Another is goyacc, supporting the Go language.  An “ocamlyacc” is
+still in use is David Beazley's "PLY" (Python Lex-Yacc) for Python.
+Another is goyacc, supporting the Go language.  An "ocamlyacc" is
 shipped as part of the Ocaml compiler suite.
 
 
@@ -13574,7 +13571,7 @@ manipulate multiple input buffers.
 
    If your Flex-generated scanner uses start conditions (*note Start
 conditions: (flex)Start conditions.), you might also want to reset the
-scanner’s state, i.e., go back to the initial start condition, through a
+scanner's state, i.e., go back to the initial start condition, through a
 call to ‘BEGIN (0)’.
 
 
@@ -13587,7 +13584,7 @@ File: bison.info,  Node: Strings are Destroyed,  Next: Implementing Gotos/Loops,
      them.  Instead of reporting ‘"foo", "bar"’, it reports ‘"bar",
      "bar"’, or even ‘"foo\nbar", "bar"’.
 
-   This error is probably the single most frequent “bug report” sent to
+   This error is probably the single most frequent "bug report" sent to
 Bison lists, but is only concerned with a misunderstanding of the role
 of the scanner.  Consider the following Lex code:
 
@@ -13639,9 +13636,9 @@ File: bison.info,  Node: Implementing Gotos/Loops,  Next: Multiple start-symbols
      functions, but how can I implement gotos, or loops?
 
    Although very pedagogical, the examples included in the document blur
-the distinction to make between the parser—whose job is to recover the
+the distinction to make between the parser--whose job is to recover the
 structure of a text and to transmit it to subsequent modules of the
-program—and the processing (such as the execution) of this structure.
+program--and the processing (such as the execution) of this structure.
 This works well with so called straight line programs, i.e., precisely
 those that have a straightforward execution model: execute simple
 instructions one after the others.
@@ -13709,7 +13706,7 @@ File: bison.info,  Node: Secure? Conform?,  Next: Enabling Relocatability,  Prev
 
      Is Bison secure?  Does it conform to POSIX?
 
-   If you’re looking for a guarantee or certification, we don’t provide
+   If you're looking for a guarantee or certification, we don't provide
 it.  However, Bison is intended to be a reliable program that conforms
 to the POSIX specification for Yacc.  If you run into problems, please
 send us a bug report.
@@ -13728,7 +13725,7 @@ through ‘configure; make; make install’ with all its dependencies,
 options, and hurdles.
 
    Most package management systems, that allow the user to install
-pre-built binaries of the packages, solve the “ease of installation”
+pre-built binaries of the packages, solve the "ease of installation"
 problem, but they hardwire path names, usually to ‘/usr’ or
 ‘/usr/local’.  This means that users need root privileges to install a
 binary package, and prevents installing two different versions of the
@@ -13760,7 +13757,7 @@ also do not recommend prefixes that might be behind an automounter (e.g.
 ‘$HOME/inst$$’) because of the performance impact of directory
 searching.
 
-   Here’s a sample installation run that takes into account all these
+   Here's a sample installation run that takes into account all these
 recommendations:
 
      ./configure --enable-relocatable --prefix=/nonexistent
@@ -13779,29 +13776,29 @@ executes the real program).
 
 File: bison.info,  Node: I can't build Bison,  Next: Where can I find help?,  Prev: Enabling Relocatability,  Up: FAQ
 
-13.8 I can’t build Bison
+13.8 I can't build Bison
 ========================
 
-     I can’t build Bison because ‘make’ complains that ‘msgfmt’ is not
+     I can't build Bison because ‘make’ complains that ‘msgfmt’ is not
      found.  What should I do?
 
    Like most GNU packages with internationalization support, that
 feature is turned on by default.  If you have problems building in the
-‘po’ subdirectory, it indicates that your system’s internationalization
+‘po’ subdirectory, it indicates that your system's internationalization
 support is lacking.  You can re-configure Bison with ‘--disable-nls’ to
 turn off this support, or you can install GNU gettext from
 <https://ftp.gnu.org/gnu/gettext/> and re-configure Bison.  See the file
 ‘ABOUT-NLS’ for more information.
 
-     I can’t build Bison because my C compiler is too old.
+     I can't build Bison because my C compiler is too old.
 
    Except for GLR parsers (which require C99), the C code that Bison
 generates requires only C89 or later.  However, Bison itself requires
-common C99 features such as declarations after statements.  Bison’s
+common C99 features such as declarations after statements.  Bison's
 ‘configure’ script attempts to enable C99 (or later) support on
 compilers that default to pre-C99.  If your compiler lacks these C99
 features entirely, GCC may well be a better choice; or you can try
-upgrading to your compiler’s latest version.
+upgrading to your compiler's latest version.
 
 
 File: bison.info,  Node: Where can I find help?,  Next: Bug Reports,  Prev: I can't build Bison,  Up: FAQ
@@ -13809,7 +13806,7 @@ File: bison.info,  Node: Where can I find help?,  Next: Bug Reports,  Prev: I ca
 13.9 Where can I find help?
 ===========================
 
-     I’m having trouble using Bison.  Where can I find help?
+     I'm having trouble using Bison.  Where can I find help?
 
    First, read this fine manual.  Beyond that, you can send mail to
 <help-bison@gnu.org>.  This mailing list is intended to be populated
@@ -13842,7 +13839,7 @@ to edit or add anything).  The smaller and simpler the grammar, the
 easier it will be to fix the bug.
 
    Include information about your compilation environment, including
-your operating system’s name and version and your compiler’s name and
+your operating system's name and version and your compiler's name and
 version.  If you have trouble compiling, you should also include a
 transcript of the build session, starting with the invocation of
 ‘configure’.  Depending on the nature of the bug, you may be asked to
@@ -13862,7 +13859,7 @@ File: bison.info,  Node: More Languages,  Next: Beta Testing,  Prev: Bug Reports
      Will Bison ever have C++ and Java support?  How about INSERT YOUR
      FAVORITE LANGUAGE HERE?
 
-   C++, D and Java are supported.  We’d love to add other languages;
+   C++, D and Java are supported.  We'd love to add other languages;
 contributions are welcome.
 
 
@@ -13873,7 +13870,7 @@ File: bison.info,  Node: Beta Testing,  Next: Mailing Lists,  Prev: More Languag
 
      What is involved in being a beta tester?
 
-   It’s not terribly involved.  Basically, you would download a test
+   It's not terribly involved.  Basically, you would download a test
 release, compile it, and use it to build and run a parser or two.  After
 that, you would submit either a bug report or a message saying that
 everything is okay.  It is important to report successes as well as
@@ -13959,7 +13956,7 @@ Appendix A Bison Symbols
      Comments, as in C/C++.
 
  -- Delimiter: :
-     Separates a rule’s result from its components.  *Note Rules::.
+     Separates a rule's result from its components.  *Note Rules::.
 
  -- Delimiter: ;
      Terminates a rule.  *Note Rules::.
@@ -13998,7 +13995,7 @@ Appendix A Bison Symbols
  -- Directive: %define VARIABLE VALUE
  -- Directive: %define VARIABLE {VALUE}
  -- Directive: %define VARIABLE "VALUE"
-     Define a variable to adjust Bison’s behavior.  *Note %define
+     Define a variable to adjust Bison's behavior.  *Note %define
      Summary::.
 
  -- Directive: %defines
@@ -14242,7 +14239,7 @@ Appendix A Bison Symbols
      External variable in which ‘yylex’ should place the line and column
      numbers associated with a token.  (In a pure parser, it is a local
      variable within ‘yyparse’, and its address is passed to ‘yylex’.)
-     You can ignore this variable if you don’t use the ‘@’ feature in
+     You can ignore this variable if you don't use the ‘@’ feature in
      the grammar actions.  *Note Token Locations::.  In semantic
      actions, it stores the location of the lookahead token.  *Note
      Actions and Locations::.
@@ -14352,7 +14349,7 @@ Accepting state
      A state whose only action is the accept action.  The accepting
      state is thus a consistent state.  *Note Understanding::.
 
-Backus-Naur Form (BNF; also called “Backus Normal Form”)
+Backus-Naur Form (BNF; also called "Backus Normal Form")
      Formal method of specifying context-free grammars originally
      proposed by John Backus, and slightly improved by Peter Naur in his
      1960-01-02 committee document contributing to what became the Algol
@@ -14401,7 +14398,7 @@ Empty string
      character string of length zero.
 
 Finite-state stack machine
-     A “machine” that has discrete states in which it is said to exist
+     A "machine" that has discrete states in which it is said to exist
      at each instant in time.  As input to the machine is processed, the
      machine moves from state to state as specified by the logic of the
      machine.  In the case of the parser, the input is the language
@@ -14411,14 +14408,14 @@ Finite-state stack machine
 Generalized LR (GLR)
      A parsing algorithm that can handle all context-free grammars,
      including those that are not LR(1).  It resolves situations that
-     Bison’s deterministic parsing algorithm cannot by effectively
+     Bison's deterministic parsing algorithm cannot by effectively
      splitting off multiple parsers, trying all possible parsers, and
      discarding those that fail in the light of additional right
      context.  *Note Generalized LR Parsing::.
 
 Grouping
      A language construct that is (in general) grammatically divisible;
-     for example, ‘expression’ or ‘declaration’ in C.  *Note Language
+     for example, 'expression' or 'declaration' in C.  *Note Language
      and Grammar::.
 
 IELR(1) (Inadequacy Elimination LR(1))
@@ -14427,7 +14424,7 @@ IELR(1) (Inadequacy Elimination LR(1))
      with the full language-recognition power of canonical LR(1) but
      with nearly the same number of parser states as LALR(1).  This
      reduction in parser states is often an order of magnitude.  More
-     importantly, because canonical LR(1)’s extra parser states may
+     importantly, because canonical LR(1)'s extra parser states may
      contain duplicate conflicts in the case of non-LR(1) grammars, the
      number of conflicts for IELR(1) is often an order of magnitude less
      as well.  This can significantly reduce the complexity of
@@ -14441,25 +14438,25 @@ Input stream
      A continuous flow of data between devices or programs.
 
 Kind
-     “Token” and “symbol” are each overloaded to mean either a grammar
+     "Token" and "symbol" are each overloaded to mean either a grammar
      symbol (kind) or all parse info (kind, value, location) associated
      with occurrences of that grammar symbol from the input.  To
      disambiguate,
 
-        • we use “token kind” and “symbol kind” to mean both grammar
+        • we use "token kind" and "symbol kind" to mean both grammar
           symbols and the values that represent them in a base
           programming language (C, C++, etc.).  The names of the types
           of these values are typically ‘token_kind_t’, or
           ‘token_kind_type’, or ‘TokenKind’, depending on the
           programming language.
 
-        • we use “token” and “symbol” without the word “kind” to mean
-          parsed occurrences, and we append the word “type” to refer to
+        • we use "token" and "symbol" without the word "kind" to mean
+          parsed occurrences, and we append the word "type" to refer to
           the types that represent them in a base programming language.
 
-     In summary: When you see “kind”, interpret “symbol” or “token” to
-     mean a _grammar symbol_.  When you don’t see “kind” (including when
-     you see “type”), interpret “symbol” or “token” to mean a _parsed
+     In summary: When you see "kind", interpret "symbol" or "token" to
+     mean a _grammar symbol_.  When you don't see "kind" (including when
+     you see "type"), interpret "symbol" or "token" to mean a _parsed
      symbol_.
 
 LAC (Lookahead Correction)
@@ -14594,7 +14591,7 @@ Token kind
 
 Unreachable state
      A parser state to which there does not exist a sequence of
-     transitions from the parser’s start state.  A state can become
+     transitions from the parser's start state.  A state can become
      unreachable during conflict resolution.  *Note Unreachable
      States::.
 
@@ -14622,7 +14619,7 @@ Appendix C GNU Free Documentation License
      author and publisher a way to get credit for their work, while not
      being considered responsible for modifications made by others.
 
-     This License is a kind of “copyleft”, which means that derivative
+     This License is a kind of "copyleft", which means that derivative
      works of the document must themselves be free in the same sense.
      It complements the GNU General Public License, which is a copyleft
      license designed for free software.
@@ -14643,18 +14640,18 @@ Appendix C GNU Free Documentation License
      be distributed under the terms of this License.  Such a notice
      grants a world-wide, royalty-free license, unlimited in duration,
      to use that work under the conditions stated herein.  The
-     “Document”, below, refers to any such manual or work.  Any member
-     of the public is a licensee, and is addressed as “you”.  You accept
+     "Document", below, refers to any such manual or work.  Any member
+     of the public is a licensee, and is addressed as "you".  You accept
      the license if you copy, modify or distribute the work in a way
      requiring permission under copyright law.
 
-     A “Modified Version” of the Document means any work containing the
+     A "Modified Version" of the Document means any work containing the
      Document or a portion of it, either copied verbatim, or with
      modifications and/or translated into another language.
 
-     A “Secondary Section” is a named appendix or a front-matter section
+     A "Secondary Section" is a named appendix or a front-matter section
      of the Document that deals exclusively with the relationship of the
-     publishers or authors of the Document to the Document’s overall
+     publishers or authors of the Document to the Document's overall
      subject (or to related matters) and contains nothing that could
      fall directly within that overall subject.  (Thus, if the Document
      is in part a textbook of mathematics, a Secondary Section may not
@@ -14663,7 +14660,7 @@ Appendix C GNU Free Documentation License
      of legal, commercial, philosophical, ethical or political position
      regarding them.
 
-     The “Invariant Sections” are certain Secondary Sections whose
+     The "Invariant Sections" are certain Secondary Sections whose
      titles are designated, as being those of Invariant Sections, in the
      notice that says that the Document is released under this License.
      If a section does not fit the above definition of Secondary then it
@@ -14671,13 +14668,13 @@ Appendix C GNU Free Documentation License
      contain zero Invariant Sections.  If the Document does not identify
      any Invariant Sections then there are none.
 
-     The “Cover Texts” are certain short passages of text that are
+     The "Cover Texts" are certain short passages of text that are
      listed, as Front-Cover Texts or Back-Cover Texts, in the notice
      that says that the Document is released under this License.  A
      Front-Cover Text may be at most 5 words, and a Back-Cover Text may
      be at most 25 words.
 
-     A “Transparent” copy of the Document means a machine-readable copy,
+     A "Transparent" copy of the Document means a machine-readable copy,
      represented in a format whose specification is available to the
      general public, that is suitable for revising the document
      straightforwardly with generic text editors or (for images composed
@@ -14689,7 +14686,7 @@ Appendix C GNU Free Documentation License
      been arranged to thwart or discourage subsequent modification by
      readers is not Transparent.  An image format is not Transparent if
      used for any substantial amount of text.  A copy that is not
-     “Transparent” is called “Opaque”.
+     "Transparent" is called "Opaque".
 
      Examples of suitable formats for Transparent copies include plain
      ASCII without markup, Texinfo input format, LaTeX input format,
@@ -14702,23 +14699,23 @@ Appendix C GNU Free Documentation License
      the machine-generated HTML, PostScript or PDF produced by some word
      processors for output purposes only.
 
-     The “Title Page” means, for a printed book, the title page itself,
+     The "Title Page" means, for a printed book, the title page itself,
      plus such following pages as are needed to hold, legibly, the
      material this License requires to appear in the title page.  For
-     works in formats which do not have any title page as such, “Title
-     Page” means the text near the most prominent appearance of the
-     work’s title, preceding the beginning of the body of the text.
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
 
-     The “publisher” means any person or entity that distributes copies
+     The "publisher" means any person or entity that distributes copies
      of the Document to the public.
 
-     A section “Entitled XYZ” means a named subunit of the Document
+     A section "Entitled XYZ" means a named subunit of the Document
      whose title either is precisely XYZ or contains XYZ in parentheses
      following text that translates XYZ in another language.  (Here XYZ
      stands for a specific section name mentioned below, such as
-     “Acknowledgements”, “Dedications”, “Endorsements”, or “History”.)
-     To “Preserve the Title” of such a section when you modify the
-     Document means that it remains a section “Entitled XYZ” according
+     "Acknowledgements", "Dedications", "Endorsements", or "History".)
+     To "Preserve the Title" of such a section when you modify the
+     Document means that it remains a section "Entitled XYZ" according
      to this definition.
 
      The Document may include Warranty Disclaimers next to the notice
@@ -14748,7 +14745,7 @@ Appendix C GNU Free Documentation License
 
      If you publish printed copies (or copies in media that commonly
      have printed covers) of the Document, numbering more than 100, and
-     the Document’s license notice requires Cover Texts, you must
+     the Document's license notice requires Cover Texts, you must
      enclose the copies in covers that carry, clearly and legibly, all
      these Cover Texts: Front-Cover Texts on the front cover, and
      Back-Cover Texts on the back cover.  Both covers must also clearly
@@ -14820,15 +14817,15 @@ Appendix C GNU Free Documentation License
           the Addendum below.
 
        G. Preserve in that license notice the full lists of Invariant
-          Sections and required Cover Texts given in the Document’s
+          Sections and required Cover Texts given in the Document's
           license notice.
 
        H. Include an unaltered copy of this License.
 
-       I. Preserve the section Entitled “History”, Preserve its Title,
+       I. Preserve the section Entitled "History", Preserve its Title,
           and add to it an item stating at least the title, year, new
           authors, and publisher of the Modified Version as given on the
-          Title Page.  If there is no section Entitled “History” in the
+          Title Page.  If there is no section Entitled "History" in the
           Document, create one stating the title, year, authors, and
           publisher of the Document as given on its Title Page, then add
           an item describing the Modified Version as stated in the
@@ -14838,12 +14835,12 @@ Appendix C GNU Free Documentation License
           for public access to a Transparent copy of the Document, and
           likewise the network locations given in the Document for
           previous versions it was based on.  These may be placed in the
-          “History” section.  You may omit a network location for a work
+          "History" section.  You may omit a network location for a work
           that was published at least four years before the Document
           itself, or if the original publisher of the version it refers
           to gives permission.
 
-       K. For any section Entitled “Acknowledgements” or “Dedications”,
+       K. For any section Entitled "Acknowledgements" or "Dedications",
           Preserve the Title of the section, and preserve in the section
           all the substance and tone of each of the contributor
           acknowledgements and/or dedications given therein.
@@ -14852,11 +14849,11 @@ Appendix C GNU Free Documentation License
           in their text and in their titles.  Section numbers or the
           equivalent are not considered part of the section titles.
 
-       M. Delete any section Entitled “Endorsements”.  Such a section
+       M. Delete any section Entitled "Endorsements".  Such a section
           may not be included in the Modified Version.
 
        N. Do not retitle any existing section to be Entitled
-          “Endorsements” or to conflict in title with any Invariant
+          "Endorsements" or to conflict in title with any Invariant
           Section.
 
        O. Preserve any Warranty Disclaimers.
@@ -14865,15 +14862,15 @@ Appendix C GNU Free Documentation License
      appendices that qualify as Secondary Sections and contain no
      material copied from the Document, you may at your option designate
      some or all of these sections as invariant.  To do this, add their
-     titles to the list of Invariant Sections in the Modified Version’s
+     titles to the list of Invariant Sections in the Modified Version's
      license notice.  These titles must be distinct from any other
      section titles.
 
-     You may add a section Entitled “Endorsements”, provided it contains
+     You may add a section Entitled "Endorsements", provided it contains
      nothing but endorsements of your Modified Version by various
-     parties—for example, statements of peer review or that the text has
-     been approved by an organization as the authoritative definition of
-     a standard.
+     parties--for example, statements of peer review or that the text
+     has been approved by an organization as the authoritative
+     definition of a standard.
 
      You may add a passage of up to five words as a Front-Cover Text,
      and a passage of up to 25 words as a Back-Cover Text, to the end of
@@ -14911,10 +14908,10 @@ Appendix C GNU Free Documentation License
      combined work.
 
      In the combination, you must combine any sections Entitled
-     “History” in the various original documents, forming one section
-     Entitled “History”; likewise combine any sections Entitled
-     “Acknowledgements”, and any sections Entitled “Dedications”.  You
-     must delete all sections Entitled “Endorsements.”
+     "History" in the various original documents, forming one section
+     Entitled "History"; likewise combine any sections Entitled
+     "Acknowledgements", and any sections Entitled "Dedications".  You
+     must delete all sections Entitled "Endorsements."
 
   6. COLLECTIONS OF DOCUMENTS
 
@@ -14935,16 +14932,16 @@ Appendix C GNU Free Documentation License
 
      A compilation of the Document or its derivatives with other
      separate and independent documents or works, in or on a volume of a
-     storage or distribution medium, is called an “aggregate” if the
+     storage or distribution medium, is called an "aggregate" if the
      copyright resulting from the compilation is not used to limit the
-     legal rights of the compilation’s users beyond what the individual
+     legal rights of the compilation's users beyond what the individual
      works permit.  When the Document is included in an aggregate, this
      License does not apply to the other works in the aggregate which
      are not themselves derivative works of the Document.
 
      If the Cover Text requirement of section 3 is applicable to these
      copies of the Document, then if the Document is less than one half
-     of the entire aggregate, the Document’s Cover Texts may be placed
+     of the entire aggregate, the Document's Cover Texts may be placed
      on covers that bracket the Document within the aggregate, or the
      electronic equivalent of covers if the Document is in electronic
      form.  Otherwise they must appear on printed covers that bracket
@@ -14966,8 +14963,8 @@ Appendix C GNU Free Documentation License
      this License or a notice or disclaimer, the original version will
      prevail.
 
-     If a section in the Document is Entitled “Acknowledgements”,
-     “Dedications”, or “History”, the requirement (section 4) to
+     If a section in the Document is Entitled "Acknowledgements",
+     "Dedications", or "History", the requirement (section 4) to
      Preserve its Title (section 1) will typically require changing the
      actual title.
 
@@ -15008,7 +15005,7 @@ Appendix C GNU Free Documentation License
 
      Each version of the License is given a distinguishing version
      number.  If the Document specifies that a particular numbered
-     version of this License “or any later version” applies to it, you
+     version of this License "or any later version" applies to it, you
      have the option of following the terms and conditions either of
      that specified version or of any later version that has been
      published (not as a draft) by the Free Software Foundation.  If the
@@ -15016,29 +15013,29 @@ Appendix C GNU Free Documentation License
      choose any version ever published (not as a draft) by the Free
      Software Foundation.  If the Document specifies that a proxy can
      decide which future versions of this License can be used, that
-     proxy’s public statement of acceptance of a version permanently
+     proxy's public statement of acceptance of a version permanently
      authorizes you to choose that version for the Document.
 
   11. RELICENSING
 
-     “Massive Multiauthor Collaboration Site” (or “MMC Site”) means any
+     "Massive Multiauthor Collaboration Site" (or "MMC Site") means any
      World Wide Web server that publishes copyrightable works and also
      provides prominent facilities for anybody to edit those works.  A
      public wiki that anybody can edit is an example of such a server.
-     A “Massive Multiauthor Collaboration” (or “MMC”) contained in the
+     A "Massive Multiauthor Collaboration" (or "MMC") contained in the
      site means any set of copyrightable works thus published on the MMC
      site.
 
-     “CC-BY-SA” means the Creative Commons Attribution-Share Alike 3.0
+     "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
      license published by Creative Commons Corporation, a not-for-profit
      corporation with a principal place of business in San Francisco,
      California, as well as future copyleft versions of that license
      published by that same organization.
 
-     “Incorporate” means to publish or republish a Document, in whole or
+     "Incorporate" means to publish or republish a Document, in whole or
      in part, as part of another Document.
 
-     An MMC is “eligible for relicensing” if it is licensed under this
+     An MMC is "eligible for relicensing" if it is licensed under this
      License, and if all works that were first published under this
      License somewhere other than this MMC, and subsequently
      incorporated in whole or in part into the MMC, (1) had no cover
@@ -15065,7 +15062,7 @@ notices just after the title page:
        Free Documentation License''.
 
    If you have Invariant Sections, Front-Cover Texts and Back-Cover
-Texts, replace the “with...Texts.” line with this:
+Texts, replace the "with...Texts." line with this:
 
          with the Invariant Sections being LIST THEIR TITLES, with
          the Front-Cover Texts being LIST, and with the Back-Cover Texts
@@ -15088,7 +15085,7 @@ Bibliography
 
 [Corbett 1984]
      Robert Paul Corbett, Static Semantics in Compiler Error Recovery
-     Ph.D. Dissertation, Report No.  UCB/CSD 85/251, Department of
+     Ph.D.  Dissertation, Report No.  UCB/CSD 85/251, Department of
      Electrical Engineering and Computer Science, Compute Science
      Division, University of California, Berkeley, California (June
      1985).  <https://digicoll.lib.berkeley.edu/record/135875>
@@ -15097,7 +15094,7 @@ Bibliography
      Joel E. Denny and Brian A. Malloy, IELR(1): Practical LR(1) Parser
      Tables for Non-LR(1) Grammars with Conflict Resolution, in
      ‘Proceedings of the 2008 ACM Symposium on Applied Computing’
-     (SAC’08), ACM, New York, NY, USA, pp. 240–245.
+     (SAC'08), ACM, New York, NY, USA, pp. 240-245.
      <https://dx.doi.org/10.1145/1363686.1363747>
 
 [Denny 2010 May]
@@ -15110,32 +15107,32 @@ Bibliography
      Joel E. Denny and Brian A. Malloy, The IELR(1) Algorithm for
      Generating Minimal LR(1) Parser Tables for Non-LR(1) Grammars with
      Conflict Resolution, in ‘Science of Computer Programming’, Vol. 75,
-     Issue 11 (November 2010), pp. 943–979.
+     Issue 11 (November 2010), pp. 943-979.
      <https://dx.doi.org/10.1016/j.scico.2009.08.001>
 
 [DeRemer 1982]
      Frank DeRemer and Thomas Pennello, Efficient Computation of LALR(1)
      Look-Ahead Sets, in ‘ACM Transactions on Programming Languages and
-     Systems’, Vol. 4, No. 4 (October 1982), pp. 615–649.
+     Systems’, Vol. 4, No. 4 (October 1982), pp. 615-649.
      <https://dx.doi.org/10.1145/69622.357187>
 
 [Isradisaikul 2015]
      Chinawat Isradisaikul, Andrew Myers, Finding Counterexamples from
      Parsing Conflicts, in ‘Proceedings of the 36th ACM SIGPLAN
      Conference on Programming Language Design and Implementation’ (PLDI
-     ’15), ACM, pp. 555–564.
+     '15), ACM, pp. 555-564.
      <https://www.cs.cornell.edu/andru/papers/cupex/cupex.pdf>
 
 [Johnson 1978]
      Steven C. Johnson, A portable compiler: theory and practice, in
      ‘Proceedings of the 5th ACM SIGACT-SIGPLAN symposium on Principles
-     of programming languages’ (POPL ’78), pp. 97–104.
+     of programming languages’ (POPL '78), pp. 97-104.
      <https://dx.doi.org/10.1145/512760.512771>.
 
 [Knuth 1965]
      Donald E. Knuth, On the Translation of Languages from Left to
      Right, in ‘Information and Control’, Vol. 8, Issue 6 (December
-     1965), pp. 607–639.
+     1965), pp. 607-639.
      <https://dx.doi.org/10.1016/S0019-9958(65)90426-2>
 
 [Scott 2000]
@@ -15154,39 +15151,42 @@ Index of Terms
 [index]
 * Menu:
 
-* $$:                                    Actions.             (line   6)
-* $$ <1>:                                Java Action Features.
-                                                              (line  20)
-* $$ <2>:                                Action Features.     (line   9)
-* $$ <3>:                                D Action Features.   (line   9)
-* $$ <4>:                                Table of Symbols.    (line  28)
-* $<TYPEALT>$:                           Java Action Features.
-                                                              (line  28)
-* $<TYPEALT>$ <1>:                       Action Features.     (line  17)
-* $<TYPEALT>N:                           Java Action Features.
-                                                              (line  16)
-* $<TYPEALT>N <1>:                       Action Features.     (line  21)
-* $@N:                                   Midrule Action Translation.
+* ;:                                     Table of Symbols.    (line  65)
+* ::                                     Table of Symbols.    (line  62)
+* @[NAME]:                               Actions and Locations.
                                                               (line   6)
-* $@N <1>:                               Table of Symbols.    (line  23)
-* $accept:                               Table of Symbols.    (line  84)
-* $end:                                  Table of Symbols.    (line 122)
-* $N:                                    Actions.             (line   6)
-* $N <1>:                                Java Action Features.
-                                                              (line  12)
-* $N <2>:                                Action Features.     (line  13)
-* $N <3>:                                D Action Features.   (line  13)
-* $N <4>:                                Table of Symbols.    (line  32)
-* $NAME:                                 Actions.             (line   6)
-* $NAME <1>:                             Table of Symbols.    (line  36)
-* $undefined:                            Table of Symbols.    (line 253)
-* $[NAME]:                               Actions.             (line   6)
-* $[NAME] <1>:                           Table of Symbols.    (line  37)
+* @[NAME] <1>:                           Table of Symbols.    (line  19)
+* @$:                                    Actions and Locations.
+                                                              (line   6)
+* @$ <1>:                                Java Action Features.
+                                                              (line  38)
+* @$ <2>:                                Action Features.     (line  99)
+* @$ <3>:                                Table of Symbols.    (line   6)
+* @N:                                    Midrule Action Translation.
+                                                              (line   6)
+* @N <1>:                                Actions and Locations.
+                                                              (line   6)
+* @N <2>:                                Java Action Features.
+                                                              (line  34)
+* @N <3>:                                Action Features.     (line 104)
+* @N <4>:                                Action Features.     (line 105)
+* @N <5>:                                Table of Symbols.    (line  10)
+* @N <6>:                                Table of Symbols.    (line  11)
+* @NAME:                                 Actions and Locations.
+                                                              (line   6)
+* @NAME <1>:                             Table of Symbols.    (line  18)
+* /*:                                    Table of Symbols.    (line  58)
+* /* ... */:                             Grammar Outline.     (line   6)
+* //:                                    Table of Symbols.    (line  59)
+* // ...:                                Grammar Outline.     (line   6)
+* %?:                                    Semantic Predicates. (line   6)
+* %?{EXPRESSION}:                        Table of Symbols.    (line  50)
+* %{:                                    Java Declarations Summary.
+                                                              (line  51)
+* %{CODE%}:                              Table of Symbols.    (line  45)
 * %%:                                    Java Declarations Summary.
                                                               (line  47)
 * %% <1>:                                Table of Symbols.    (line  41)
-* %?:                                    Semantic Predicates. (line   6)
-* %?{EXPRESSION}:                        Table of Symbols.    (line  50)
 * %code:                                 Prologue Alternatives.
                                                               (line   6)
 * %code <1>:                             Decl Summary.        (line  52)
@@ -15443,45 +15443,42 @@ Index of Terms
 * %union <3>:                            Table of Symbols.    (line 258)
 * %verbose:                              Decl Summary.        (line 241)
 * %yacc:                                 Decl Summary.        (line 246)
-* %{:                                    Java Declarations Summary.
-                                                              (line  51)
-* %{CODE%}:                              Table of Symbols.    (line  45)
-* /*:                                    Table of Symbols.    (line  58)
-* /* ... */:                             Grammar Outline.     (line   6)
-* //:                                    Table of Symbols.    (line  59)
-* // ...:                                Grammar Outline.     (line   6)
-* ::                                     Table of Symbols.    (line  62)
-* ;:                                     Table of Symbols.    (line  65)
 * <*>:                                   Destructor Decl.     (line   6)
 * <*> <1>:                               Printer Decl.        (line   6)
 * <*> <2>:                               Table of Symbols.    (line  72)
 * <>:                                    Destructor Decl.     (line   6)
 * <> <1>:                                Printer Decl.        (line   6)
 * <> <2>:                                Table of Symbols.    (line  78)
-* @$:                                    Actions and Locations.
-                                                              (line   6)
-* @$ <1>:                                Java Action Features.
-                                                              (line  38)
-* @$ <2>:                                Action Features.     (line  99)
-* @$ <3>:                                Table of Symbols.    (line   6)
-* @N:                                    Midrule Action Translation.
-                                                              (line   6)
-* @N <1>:                                Actions and Locations.
-                                                              (line   6)
-* @N <2>:                                Java Action Features.
-                                                              (line  34)
-* @N <3>:                                Action Features.     (line 104)
-* @N <4>:                                Action Features.     (line 105)
-* @N <5>:                                Table of Symbols.    (line  10)
-* @N <6>:                                Table of Symbols.    (line  11)
-* @NAME:                                 Actions and Locations.
-                                                              (line   6)
-* @NAME <1>:                             Table of Symbols.    (line  18)
-* @[NAME]:                               Actions and Locations.
-                                                              (line   6)
-* @[NAME] <1>:                           Table of Symbols.    (line  19)
 * |:                                     Rules Syntax.        (line  48)
 * | <1>:                                 Table of Symbols.    (line  68)
+* $[NAME]:                               Actions.             (line   6)
+* $[NAME] <1>:                           Table of Symbols.    (line  37)
+* $@N:                                   Midrule Action Translation.
+                                                              (line   6)
+* $@N <1>:                               Table of Symbols.    (line  23)
+* $<TYPEALT>$:                           Java Action Features.
+                                                              (line  28)
+* $<TYPEALT>$ <1>:                       Action Features.     (line  17)
+* $<TYPEALT>N:                           Java Action Features.
+                                                              (line  16)
+* $<TYPEALT>N <1>:                       Action Features.     (line  21)
+* $$:                                    Actions.             (line   6)
+* $$ <1>:                                Java Action Features.
+                                                              (line  20)
+* $$ <2>:                                Action Features.     (line   9)
+* $$ <3>:                                D Action Features.   (line   9)
+* $$ <4>:                                Table of Symbols.    (line  28)
+* $accept:                               Table of Symbols.    (line  84)
+* $end:                                  Table of Symbols.    (line 122)
+* $N:                                    Actions.             (line   6)
+* $N <1>:                                Java Action Features.
+                                                              (line  12)
+* $N <2>:                                Action Features.     (line  13)
+* $N <3>:                                D Action Features.   (line  13)
+* $N <4>:                                Table of Symbols.    (line  32)
+* $NAME:                                 Actions.             (line   6)
+* $NAME <1>:                             Table of Symbols.    (line  36)
+* $undefined:                            Table of Symbols.    (line 253)
 * abstract syntax tree:                  Implementing Gotos/Loops.
                                                               (line  17)
 * accepting state:                       Understanding.       (line 185)
@@ -15517,6 +15514,8 @@ Index of Terms
 * Bison parser algorithm:                Algorithm.           (line   6)
 * Bison symbols, table of:               Table of Symbols.    (line   6)
 * Bison utility:                         Bison Parser.        (line   6)
+* BISON_I18N:                            Enabling I18n.       (line  18)
+* BISON_LOCALEDIR:                       Enabling I18n.       (line  18)
 * bison-i18n.m4:                         Enabling I18n.       (line  11)
 * bison-po:                              Internationalization.
                                                               (line   6)
@@ -15526,8 +15525,6 @@ Index of Terms
 * bisonVersion of YYParser:              D Parser Interface.  (line  69)
 * bisonVersion of YYParser <1>:          Java Parser Interface.
                                                               (line  91)
-* BISON_I18N:                            Enabling I18n.       (line  18)
-* BISON_LOCALEDIR:                       Enabling I18n.       (line  18)
 * BNF:                                   Language and Grammar.
                                                               (line  16)
 * braced code:                           Rules Syntax.        (line  29)
@@ -15567,19 +15564,19 @@ Index of Terms
                                                               (line   6)
 * controlling function:                  Rpcalc Main.         (line   6)
 * core, item set:                        Understanding.       (line 132)
+* counter_type:                          C++ position.        (line  11)
 * counterexample, nonunifying:           Glossary.            (line  31)
 * counterexample, unifying:              Glossary.            (line  31)
 * counterexamples:                       Counterexamples.     (line   6)
-* counter_type:                          C++ position.        (line  11)
 * dangling else:                         Shift/Reduce.        (line   6)
 * data type of locations:                Location Type.       (line   6)
 * data types in actions:                 Action Types.        (line   6)
 * data types of semantic values:         Value Type.          (line   6)
-* debugging:                             Tracing.             (line   6)
 * debug_level on parser:                 C++ Parser Interface.
                                                               (line  91)
 * debug_stream on parser:                C++ Parser Interface.
                                                               (line  86)
+* debugging:                             Tracing.             (line   6)
 * declaration summary:                   Decl Summary.        (line   6)
 * declarations:                          Prologue.            (line   6)
 * declarations section:                  Prologue.            (line   6)
@@ -15781,10 +15778,10 @@ Index of Terms
                                                               (line  27)
 * location tracking calculator:          Location Tracking Calc.
                                                               (line   6)
-* location, textual:                     Locations.           (line   6)
-* location, textual <1>:                 Tracking Locations.  (line   6)
 * location_type:                         C++ Parser Interface.
                                                               (line  49)
+* location, textual:                     Locations.           (line   6)
+* location, textual <1>:                 Tracking Locations.  (line   6)
 * lookahead correction:                  LAC.                 (line   6)
 * lookahead on context:                  C++ Parser Context.  (line  43)
 * lookahead token:                       Lookahead.           (line   6)
@@ -15824,6 +15821,10 @@ Index of Terms
 * nonunifying counterexample:            Glossary.            (line  31)
 * operator precedence:                   Precedence.          (line   6)
 * operator precedence, declaring:        Precedence Decl.     (line   6)
+* operator- on location:                 C++ location.        (line  30)
+* operator- on position:                 C++ position.        (line  45)
+* operator-= on location:                C++ location.        (line  31)
+* operator-= on position:                C++ position.        (line  44)
 * operator!= on location:                C++ location.        (line  43)
 * operator!= on position:                C++ position.        (line  49)
 * operator() on parser:                  C++ Parser Interface.
@@ -15834,10 +15835,6 @@ Index of Terms
 * operator+= on location:                C++ location.        (line  29)
 * operator+= on location <1>:            C++ location.        (line  35)
 * operator+= on position:                C++ position.        (line  42)
-* operator- on location:                 C++ location.        (line  30)
-* operator- on position:                 C++ position.        (line  45)
-* operator-= on location:                C++ location.        (line  31)
-* operator-= on position:                C++ position.        (line  44)
 * operator<<:                            C++ position.        (line  52)
 * operator<< <1>:                        C++ location.        (line  47)
 * operator== on location:                C++ location.        (line  42)
@@ -15875,14 +15872,14 @@ Index of Terms
 * pure parser:                           Pure Decl.           (line   6)
 * push parser:                           Push Decl.           (line   6)
 * push parser <1>:                       Push Decl.           (line   6)
-* pushParse on YYParser:                 D Push Parser Interface.
-                                                              (line  18)
 * push_parse on YYParser:                Java Push Parser Interface.
                                                               (line  18)
 * push_parse on YYParser <1>:            Java Push Parser Interface.
                                                               (line  19)
 * push_parse on YYParser <2>:            Java Push Parser Interface.
                                                               (line  21)
+* pushParse on YYParser:                 D Push Parser Interface.
+                                                              (line  18)
 * questions:                             FAQ.                 (line   6)
 * recovering:                            Java Action Features.
                                                               (line  54)
@@ -15897,11 +15894,11 @@ Index of Terms
 * reduce/reduce conflicts <2>:           Merging GLR Parses.  (line   6)
 * reduction:                             Algorithm.           (line   6)
 * reentrant parser:                      Pure Decl.           (line   6)
+* report_syntax_error on parser:         C++ Parser Context.  (line   9)
 * reportSyntaxError on Lexer:            Java Scanner Interface.
                                                               (line  59)
 * reportSyntaxError(YYParser.Context on Lexer: D Scanner Interface.
                                                               (line  34)
-* report_syntax_error on parser:         C++ Parser Context.  (line   9)
 * requiring a version of Bison:          Require Decl.        (line   6)
 * Reverse Polish Notation:               RPN Calc.            (line   6)
 * right recursion:                       Recursion.           (line  17)
@@ -15917,6 +15914,10 @@ Index of Terms
 * Semantic predicates in GLR parsers:    Semantic Predicates. (line   6)
 * semantic value:                        Semantic Values.     (line   6)
 * semantic value type:                   Value Type.          (line   6)
+* set_debug_level on parser:             C++ Parser Interface.
+                                                              (line  92)
+* set_debug_stream on parser:            C++ Parser Interface.
+                                                              (line  87)
 * setDebugLevel on YYParser:             Java Parser Interface.
                                                               (line  87)
 * setDebugLevel(int on YYParser:         D Parser Interface.  (line  65)
@@ -15926,10 +15927,6 @@ Index of Terms
 * setErrorVerbose on YYParser:           Java Parser Interface.
                                                               (line  65)
 * setErrorVerbose(boolean on YYParser:   D Parser Interface.  (line  44)
-* set_debug_level on parser:             C++ Parser Interface.
-                                                              (line  92)
-* set_debug_stream on parser:            C++ Parser Interface.
-                                                              (line  87)
 * shift/reduce conflicts:                GLR Parsers.         (line   6)
 * shift/reduce conflicts <1>:            Simple GLR Parsers.  (line   6)
 * shift/reduce conflicts <2>:            Shift/Reduce.        (line   6)
@@ -15950,13 +15947,6 @@ Index of Terms
 * suppressing conflict warnings:         Expect Decl.         (line   6)
 * symbol:                                Symbols.             (line   6)
 * symbol table example:                  Mfcalc Symbol Table. (line   6)
-* SymbolKind:                            D Parser Context Interface.
-                                                              (line   9)
-* SymbolKind <1>:                        Java Parser Context Interface.
-                                                              (line   9)
-* symbols (abstract):                    Language and Grammar.
-                                                              (line  46)
-* symbols in Bison, table of:            Table of Symbols.    (line   6)
 * symbol_kind_type:                      C++ Parser Context.  (line  19)
 * symbol_name on parser:                 C++ Parser Context.  (line  68)
 * symbol_type:                           Complete Symbols.    (line  17)
@@ -15964,6 +15954,13 @@ Index of Terms
 * symbol_type on parser::symbol_type <1>: Complete Symbols.   (line  34)
 * symbol_type on parser::symbol_type <2>: Complete Symbols.   (line  36)
 * symbol_type on parser::symbol_type <3>: Complete Symbols.   (line  38)
+* SymbolKind:                            D Parser Context Interface.
+                                                              (line   9)
+* SymbolKind <1>:                        Java Parser Context Interface.
+                                                              (line   9)
+* symbols (abstract):                    Language and Grammar.
+                                                              (line  46)
+* symbols in Bison, table of:            Table of Symbols.    (line   6)
 * syntactic grouping:                    Language and Grammar.
                                                               (line  46)
 * syntax error:                          Error Reporting Function.
@@ -15978,8 +15975,8 @@ Index of Terms
 * terminal symbol:                       Symbols.             (line   6)
 * textual location:                      Locations.           (line   6)
 * textual location <1>:                  Tracking Locations.  (line   6)
-* this(Lexer on YYParser:                D Parser Interface.  (line  34)
 * this(LEX_PARAM, on YYParser:           D Parser Interface.  (line  29)
+* this(Lexer on YYParser:                D Parser Interface.  (line  34)
 * this(Position on Location:             D Location Values.   (line  14)
 * this(Position on Location <1>:         D Location Values.   (line  18)
 * token:                                 Language and Grammar.
@@ -15989,9 +15986,9 @@ Index of Terms
 * token kind:                            Symbols.             (line   6)
 * token kind names, declaring:           Token Decl.          (line   6)
 * token on context:                      C++ Parser Context.  (line  46)
-* token, useless:                        Understanding.       (line  56)
 * token_kind_type:                       C++ Parser Interface.
                                                               (line  21)
+* token, useless:                        Understanding.       (line  56)
 * toString on Location:                  Java Location Values.
                                                               (line  30)
 * toString() on Location:                D Location Values.   (line  21)
@@ -16011,9 +16008,9 @@ Index of Terms
 * value types, declaring <2>:            Structured Value Type.
                                                               (line   6)
 * value types, nonterminals, declaring:  Type Decl.           (line   6)
-* value, semantic:                       Semantic Values.     (line   6)
 * value_type:                            C++ Parser Interface.
                                                               (line  46)
+* value, semantic:                       Semantic Values.     (line   6)
 * version:                               Versioning.          (line   6)
 * version requirement:                   Require Decl.        (line   6)
 * warnings, preventing:                  Expect Decl.         (line   6)
@@ -16181,270 +16178,269 @@ Index of Terms
 * YYUNDEF:                               Table of Symbols.    (line 443)
 * zoo:                                   Bison.               (line   6)
 
-
 
 Tag Table:
-Node: Top1066
-Node: Introduction18219
-Node: Conditions19794
-Node: Copying21717
-Node: Concepts59459
-Node: Language and Grammar60655
-Node: Grammar in Bison66769
-Node: Semantic Values68685
-Node: Semantic Actions70821
-Node: GLR Parsers71998
-Node: Simple GLR Parsers74773
-Node: Merging GLR Parses81253
-Ref: Merging GLR Parses-Footnote-186591
-Node: GLR Semantic Actions86732
-Node: Semantic Predicates89333
-Node: Locations91786
-Node: Bison Parser93264
-Node: Stages96464
-Node: Grammar Layout97689
-Node: Examples99051
-Node: RPN Calc100544
-Ref: RPN Calc-Footnote-1101596
-Node: Rpcalc Declarations101674
-Node: Rpcalc Rules103730
-Node: Rpcalc Input105629
-Node: Rpcalc Line107208
-Node: Rpcalc Exp108360
-Node: Rpcalc Lexer110373
-Node: Rpcalc Main113070
-Node: Rpcalc Error113481
-Node: Rpcalc Generate114509
-Node: Rpcalc Compile115757
-Node: Infix Calc116721
-Ref: Infix Calc-Footnote-1119567
-Node: Simple Error Recovery119720
-Node: Location Tracking Calc121658
-Node: Ltcalc Declarations122358
-Node: Ltcalc Rules123453
-Node: Ltcalc Lexer125295
-Node: Multi-function Calc127636
-Ref: Multi-function Calc-Footnote-1129413
-Node: Mfcalc Declarations129491
-Node: Mfcalc Rules131515
-Node: Mfcalc Symbol Table132793
-Node: Mfcalc Lexer136255
-Node: Mfcalc Main138828
-Node: Exercises139704
-Node: Grammar File140231
-Node: Grammar Outline141081
-Node: Prologue141939
-Node: Prologue Alternatives143740
-Ref: Prologue Alternatives-Footnote-1153440
-Node: Bison Declarations153545
-Node: Grammar Rules153955
-Node: Epilogue154411
-Node: Symbols155462
-Node: Rules162497
-Node: Rules Syntax162812
-Node: Empty Rules164877
-Node: Recursion165964
-Node: Semantics167622
-Node: Value Type168928
-Node: Multiple Types170216
-Node: Type Generation171666
-Node: Union Decl173596
-Node: Structured Value Type174989
-Node: Actions176015
-Node: Action Types179899
-Node: Midrule Actions181252
-Node: Using Midrule Actions181906
-Node: Typed Midrule Actions185445
-Node: Midrule Action Translation186995
-Node: Midrule Conflicts189488
-Node: Tracking Locations192097
-Node: Location Type192829
-Node: Actions and Locations194352
-Node: Printing Locations196734
-Node: Location Default Action197496
-Node: Named References201033
-Node: Declarations203630
-Node: Require Decl205319
-Node: Token Decl205833
-Node: Precedence Decl208750
-Node: Type Decl211026
-Node: Symbol Decls211977
-Node: Initial Action Decl212932
-Node: Destructor Decl213747
-Node: Printer Decl219393
-Node: Expect Decl221662
-Node: Start Decl225663
-Node: Pure Decl226057
-Node: Push Decl227805
-Node: Decl Summary232244
-Ref: %header234925
-Node: %define Summary243258
-Ref: api-filename-type245169
-Ref: api-token-prefix256117
-Node: %code Summary268123
-Node: Multiple Parsers272379
-Node: Interface276239
-Node: Parser Function277348
-Node: Push Parser Interface279841
-Ref: yypstate_new280226
-Ref: yypstate_delete280667
-Ref: yypush_parse281081
-Ref: yypull_parse282093
-Node: Lexical283096
-Node: Calling Convention284671
-Node: Special Tokens286200
-Node: Tokens from Literals287639
-Node: Token Values288720
-Node: Token Locations289888
-Node: Pure Calling290820
-Node: Error Reporting293417
-Node: Error Reporting Function293940
-Node: Syntax Error Reporting Function297312
-Node: Action Features301923
-Node: Internationalization306263
-Node: Enabling I18n307123
-Node: Token I18n309241
-Node: Algorithm310644
-Node: Lookahead313066
-Node: Shift/Reduce315280
-Node: Precedence319347
-Node: Why Precedence320119
-Node: Using Precedence322034
-Node: Precedence Only323534
-Node: Precedence Examples325336
-Node: How Precedence325860
-Node: Non Operators327005
-Node: Contextual Precedence328578
-Node: Parser States330324
-Node: Reduce/Reduce331579
-Node: Mysterious Conflicts336388
-Node: Tuning LR340015
-Node: LR Table Construction341221
-Node: Default Reductions346839
-Node: LAC351626
-Node: Unreachable States357132
-Node: Generalized LR Parsing359139
-Node: Memory Management363524
-Node: Error Recovery365908
-Node: Context Dependency371188
-Node: Semantic Tokens372045
-Node: Lexical Tie-ins375121
-Node: Tie-in Recovery376577
-Node: Debugging378709
-Node: Counterexamples380174
-Node: Understanding386180
-Ref: state-8392904
-Node: Graphviz398455
-Node: Xml402776
-Node: Tracing404514
-Node: Enabling Traces404891
-Node: Mfcalc Traces409019
-Node: Invocation414230
-Node: Bison Options416336
-Node: Operation Modes417183
-Node: Diagnostics422900
-Ref: Wconflicts-sr423208
-Ref: Wconflicts-rr423232
-Ref: Wcounterexamples423620
-Ref: Wdangling-alias423933
-Ref: Wdeprecated425263
-Ref: Wempty-rule425387
-Ref: Wmidrule-values425599
-Ref: Wprecedence426310
-Ref: Wyacc427444
-Ref: Wother427506
-Ref: Wall427810
-Ref: Wnone427930
-Ref: Werror428206
-Node: Tuning the Parser430013
-Ref: option-yacc433427
-Ref: Tuning the Parser-Footnote-1435280
-Node: Output Files435346
-Node: Option Cross Key438623
-Node: Yacc Library440761
-Node: Other Languages441834
-Node: C++ Parsers442459
-Node: A Simple C++ Example443188
-Ref: A Simple C++ Example-Footnote-1447342
-Node: C++ Bison Interface447425
-Node: C++ Parser Interface449015
-Node: C++ Semantic Values453602
-Node: C++ Unions454152
-Node: C++ Variants454945
-Node: C++ Location Values458718
-Node: C++ position459657
-Node: C++ location462026
-Node: Exposing the Location Classes464216
-Node: User Defined Location Type466115
-Node: C++ Parser Context467694
-Node: C++ Scanner Interface471661
-Node: Split Symbols472229
-Node: Complete Symbols473964
-Node: A Complete C++ Example478719
-Node: Calc++ --- C++ Calculator479662
-Node: Calc++ Parsing Driver480183
-Node: Calc++ Parser483150
-Node: Calc++ Scanner487273
-Node: Calc++ Top Level491228
-Node: D Parsers491927
-Node: D Bison Interface492631
-Node: D Semantic Values493744
-Node: D Location Values494577
-Node: D Parser Interface495448
-Node: D Parser Context Interface500364
-Node: D Scanner Interface501807
-Node: D Action Features504747
-Node: D Push Parser Interface505516
-Node: D Complete Symbols506992
-Node: Java Parsers507708
-Node: Java Bison Interface508524
-Node: Java Semantic Values510715
-Node: Java Location Values512412
-Node: Java Parser Interface514010
-Node: Java Parser Context Interface519267
-Node: Java Scanner Interface521352
-Node: Java Action Features525424
-Node: Java Push Parser Interface528175
-Node: Java Differences531170
-Ref: Java Differences-Footnote-1533833
-Node: Java Declarations Summary533987
-Node: History539020
-Node: Yacc539476
-Ref: Yacc-Footnote-1540972
-Ref: Yacc-Footnote-2541203
-Node: yacchack541273
-Node: Byacc541700
-Node: Bison542519
-Node: Other Ungulates544537
-Node: Versioning545127
-Node: FAQ548550
-Node: Memory Exhausted549577
-Node: How Can I Reset the Parser549879
-Node: Strings are Destroyed552473
-Node: Implementing Gotos/Loops554178
-Node: Multiple start-symbols555471
-Node: Secure? Conform?557051
-Node: Enabling Relocatability557505
-Node: I can't build Bison560429
-Node: Where can I find help?561701
-Node: Bug Reports562496
-Node: More Languages563975
-Node: Beta Testing564312
-Node: Mailing Lists565188
-Node: Table of Symbols565400
-Node: Glossary582432
-Node: GNU Free Documentation License592794
-Node: Bibliography618148
-Ref: Corbett 1984618288
-Ref: Denny 2008618638
-Ref: Denny 2010 May618964
-Ref: Denny 2010 November619239
-Ref: DeRemer 1982619577
-Ref: Isradisaikul 2015619849
-Ref: Johnson 1978620178
-Ref: Knuth 1965620447
-Ref: Scott 2000620683
-Node: Index of Terms621000
+Node: Top1040
+Node: Introduction18154
+Node: Conditions19727
+Node: Copying21636
+Node: Concepts59175
+Node: Language and Grammar60367
+Node: Grammar in Bison66345
+Node: Semantic Values68261
+Node: Semantic Actions70389
+Node: GLR Parsers71566
+Node: Simple GLR Parsers74339
+Node: Merging GLR Parses80810
+Ref: Merging GLR Parses-Footnote-186139
+Node: GLR Semantic Actions86280
+Node: Semantic Predicates88877
+Node: Locations91330
+Node: Bison Parser92808
+Node: Stages96001
+Node: Grammar Layout97226
+Node: Examples98588
+Node: RPN Calc100075
+Ref: RPN Calc-Footnote-1101127
+Node: Rpcalc Declarations101205
+Node: Rpcalc Rules103257
+Node: Rpcalc Input105148
+Node: Rpcalc Line106714
+Node: Rpcalc Exp107862
+Node: Rpcalc Lexer109871
+Node: Rpcalc Main112564
+Node: Rpcalc Error112975
+Node: Rpcalc Generate114003
+Node: Rpcalc Compile115247
+Node: Infix Calc116211
+Ref: Infix Calc-Footnote-1119054
+Node: Simple Error Recovery119207
+Node: Location Tracking Calc121142
+Node: Ltcalc Declarations121842
+Node: Ltcalc Rules122937
+Node: Ltcalc Lexer124777
+Node: Multi-function Calc127114
+Ref: Multi-function Calc-Footnote-1128891
+Node: Mfcalc Declarations128969
+Node: Mfcalc Rules130993
+Node: Mfcalc Symbol Table132271
+Node: Mfcalc Lexer135731
+Node: Mfcalc Main138304
+Node: Exercises139180
+Node: Grammar File139707
+Node: Grammar Outline140557
+Node: Prologue141415
+Node: Prologue Alternatives143214
+Ref: Prologue Alternatives-Footnote-1152898
+Node: Bison Declarations153003
+Node: Grammar Rules153413
+Node: Epilogue153869
+Node: Symbols154920
+Node: Rules161943
+Node: Rules Syntax162258
+Node: Empty Rules164323
+Node: Recursion165410
+Node: Semantics167068
+Node: Value Type168374
+Node: Multiple Types169658
+Node: Type Generation171108
+Node: Union Decl173038
+Node: Structured Value Type174431
+Node: Actions175457
+Node: Action Types179329
+Node: Midrule Actions180682
+Node: Using Midrule Actions181336
+Node: Typed Midrule Actions184873
+Node: Midrule Action Translation186421
+Node: Midrule Conflicts188913
+Node: Tracking Locations191522
+Node: Location Type192254
+Node: Actions and Locations193777
+Node: Printing Locations196159
+Node: Location Default Action196919
+Node: Named References200452
+Node: Declarations203048
+Node: Require Decl204735
+Node: Token Decl205249
+Node: Precedence Decl208162
+Node: Type Decl210438
+Node: Symbol Decls211389
+Node: Initial Action Decl212344
+Node: Destructor Decl213157
+Node: Printer Decl218801
+Node: Expect Decl221070
+Node: Start Decl225067
+Node: Pure Decl225461
+Node: Push Decl227209
+Node: Decl Summary231642
+Ref: %header234319
+Node: %define Summary242648
+Ref: api-filename-type244557
+Ref: api-token-prefix255495
+Node: %code Summary267498
+Node: Multiple Parsers271750
+Node: Interface275605
+Node: Parser Function276712
+Node: Push Parser Interface279203
+Ref: yypstate_new279588
+Ref: yypstate_delete280029
+Ref: yypush_parse280443
+Ref: yypull_parse281455
+Node: Lexical282458
+Node: Calling Convention284033
+Node: Special Tokens285562
+Node: Tokens from Literals286997
+Node: Token Values288078
+Node: Token Locations289242
+Node: Pure Calling290174
+Node: Error Reporting292771
+Node: Error Reporting Function293294
+Node: Syntax Error Reporting Function296664
+Node: Action Features301265
+Node: Internationalization305605
+Node: Enabling I18n306457
+Node: Token I18n308567
+Node: Algorithm309958
+Node: Lookahead312372
+Node: Shift/Reduce314582
+Node: Precedence318637
+Node: Why Precedence319409
+Node: Using Precedence321324
+Node: Precedence Only322820
+Node: Precedence Examples324622
+Node: How Precedence325146
+Node: Non Operators326287
+Node: Contextual Precedence327848
+Node: Parser States329590
+Node: Reduce/Reduce330839
+Node: Mysterious Conflicts335642
+Node: Tuning LR339264
+Node: LR Table Construction340464
+Node: Default Reductions346076
+Node: LAC350863
+Node: Unreachable States356363
+Node: Generalized LR Parsing358366
+Node: Memory Management362744
+Node: Error Recovery365128
+Node: Context Dependency370404
+Node: Semantic Tokens371257
+Node: Lexical Tie-ins374325
+Node: Tie-in Recovery375781
+Node: Debugging377911
+Node: Counterexamples379374
+Node: Understanding385376
+Ref: state-8392088
+Node: Graphviz397639
+Node: Xml401956
+Node: Tracing403694
+Node: Enabling Traces404067
+Node: Mfcalc Traces408193
+Node: Invocation413400
+Node: Bison Options415502
+Node: Operation Modes416349
+Node: Diagnostics422058
+Ref: Wconflicts-sr422366
+Ref: Wconflicts-rr422390
+Ref: Wcounterexamples422778
+Ref: Wdangling-alias423091
+Ref: Wdeprecated424416
+Ref: Wempty-rule424540
+Ref: Wmidrule-values424752
+Ref: Wprecedence425463
+Ref: Wyacc426597
+Ref: Wother426659
+Ref: Wall426963
+Ref: Wnone427083
+Ref: Werror427359
+Node: Tuning the Parser429164
+Ref: option-yacc432576
+Ref: Tuning the Parser-Footnote-1434425
+Node: Output Files434491
+Node: Option Cross Key437760
+Node: Yacc Library439898
+Node: Other Languages440965
+Node: C++ Parsers441588
+Node: A Simple C++ Example442317
+Ref: A Simple C++ Example-Footnote-1446467
+Node: C++ Bison Interface446550
+Node: C++ Parser Interface448140
+Node: C++ Semantic Values452723
+Node: C++ Unions453273
+Node: C++ Variants454066
+Node: C++ Location Values457827
+Node: C++ position458766
+Node: C++ location461135
+Node: Exposing the Location Classes463325
+Node: User Defined Location Type465218
+Node: C++ Parser Context466797
+Node: C++ Scanner Interface470760
+Node: Split Symbols471328
+Node: Complete Symbols473063
+Node: A Complete C++ Example477814
+Node: Calc++ --- C++ Calculator478757
+Node: Calc++ Parsing Driver479278
+Node: Calc++ Parser482241
+Node: Calc++ Scanner486356
+Node: Calc++ Top Level490299
+Node: D Parsers490998
+Node: D Bison Interface491702
+Node: D Semantic Values492815
+Node: D Location Values493646
+Node: D Parser Interface494517
+Node: D Parser Context Interface499433
+Node: D Scanner Interface500876
+Node: D Action Features503816
+Node: D Push Parser Interface504585
+Node: D Complete Symbols506059
+Node: Java Parsers506775
+Node: Java Bison Interface507591
+Node: Java Semantic Values509774
+Node: Java Location Values511469
+Node: Java Parser Interface513067
+Node: Java Parser Context Interface518322
+Node: Java Scanner Interface520407
+Node: Java Action Features524479
+Node: Java Push Parser Interface527230
+Node: Java Differences530223
+Ref: Java Differences-Footnote-1532886
+Node: Java Declarations Summary533040
+Node: History538073
+Node: Yacc538529
+Ref: Yacc-Footnote-1540022
+Ref: Yacc-Footnote-2540245
+Node: yacchack540315
+Node: Byacc540738
+Node: Bison541551
+Node: Other Ungulates543559
+Node: Versioning544139
+Node: FAQ547562
+Node: Memory Exhausted548589
+Node: How Can I Reset the Parser548891
+Node: Strings are Destroyed551483
+Node: Implementing Gotos/Loops553184
+Node: Multiple start-symbols554475
+Node: Secure? Conform?556055
+Node: Enabling Relocatability556505
+Node: I can't build Bison559423
+Node: Where can I find help?560683
+Node: Bug Reports561476
+Node: More Languages562951
+Node: Beta Testing563286
+Node: Mailing Lists564160
+Node: Table of Symbols564372
+Node: Glossary581398
+Node: GNU Free Documentation License591676
+Node: Bibliography616829
+Ref: Corbett 1984616969
+Ref: Denny 2008617320
+Ref: Denny 2010 May617642
+Ref: Denny 2010 November617917
+Ref: DeRemer 1982618253
+Ref: Isradisaikul 2015618523
+Ref: Johnson 1978618848
+Ref: Knuth 1965619113
+Ref: Scott 2000619347
+Node: Index of Terms619664
 
 End Tag Table
 
diff --git a/local/recipes/dev/bison/source/doc/bison.info.bak b/local/recipes/dev/bison/source/doc/bison.info.bak
index 4f4fb08267..fea740eb9e 100644
--- a/local/recipes/dev/bison/source/doc/bison.info.bak
+++ b/local/recipes/dev/bison/source/doc/bison.info.bak
@@ -1,22 +1,22 @@
-This is bison.info, produced by makeinfo version 6.8 from bison.texi.
+This is bison.info, produced by makeinfo version 7.3 from bison.texi.
 
-This manual (12 September 2021) is for GNU Bison (version 3.8.2), the
-GNU parser generator.
+This manual (15 May 2026) is for GNU Bison (version 3.8.2), the GNU
+parser generator.
 
-   Copyright © 1988–1993, 1995, 1998–2015, 2018–2021 Free Software
+   Copyright © 1988-1993, 1995, 1998-2015, 2018-2021 Free Software
 Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
      Version 1.3 or any later version published by the Free Software
      Foundation; with no Invariant Sections, with the Front-Cover texts
-     being “A GNU Manual,” and with the Back-Cover Texts as in (a)
+     being "A GNU Manual," and with the Back-Cover Texts as in (a)
      below.  A copy of the license is included in the section entitled
-     “GNU Free Documentation License.”
+     "GNU Free Documentation License."
 
-     (a) The FSF’s Back-Cover Text is: “You have the freedom to copy and
+     (a) The FSF's Back-Cover Text is: "You have the freedom to copy and
      modify this GNU manual.  Buying copies from the FSF supports it in
-     developing GNU and promoting software freedom.”
+     developing GNU and promoting software freedom."
 INFO-DIR-SECTION Software development
 START-INFO-DIR-ENTRY
 * bison: (bison).       GNU parser generator (Yacc replacement).
@@ -28,23 +28,23 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****
 
-This manual (12 September 2021) is for GNU Bison (version 3.8.2), the
-GNU parser generator.
+This manual (15 May 2026) is for GNU Bison (version 3.8.2), the GNU
+parser generator.
 
-   Copyright © 1988–1993, 1995, 1998–2015, 2018–2021 Free Software
+   Copyright © 1988-1993, 1995, 1998-2015, 2018-2021 Free Software
 Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
      Version 1.3 or any later version published by the Free Software
      Foundation; with no Invariant Sections, with the Front-Cover texts
-     being “A GNU Manual,” and with the Back-Cover Texts as in (a)
+     being "A GNU Manual," and with the Back-Cover Texts as in (a)
      below.  A copy of the license is included in the section entitled
-     “GNU Free Documentation License.”
+     "GNU Free Documentation License."
 
-     (a) The FSF’s Back-Cover Text is: “You have the freedom to copy and
+     (a) The FSF's Back-Cover Text is: "You have the freedom to copy and
      modify this GNU manual.  Buying copies from the FSF supports it in
-     developing GNU and promoting software freedom.”
+     developing GNU and promoting software freedom."
 
 * Menu:
 
@@ -76,20 +76,20 @@ Reference sections:
 * Bibliography::        Publications cited in this manual.
 * Index of Terms::      Cross-references to the text.
 
- — The Detailed Node Listing —
+ -- The Detailed Node Listing --
 
 The Concepts of Bison
 
 * Language and Grammar:: Languages and context-free grammars,
                            as mathematical ideas.
-* Grammar in Bison::     How we represent grammars for Bison’s sake.
+* Grammar in Bison::     How we represent grammars for Bison's sake.
 * Semantic Values::      Each token or syntactic grouping can have
                            a semantic value (the value of an integer,
                            the name of an identifier, etc.).
 * Semantic Actions::     Each rule can have an action containing C code.
 * GLR Parsers::          Writing parsers for general context-free languages.
 * Locations::            Overview of location tracking.
-* Bison Parser::         What are Bison’s input and output,
+* Bison Parser::         What are Bison's input and output,
                            how is the output used?
 * Stages::               Stages in writing and running Bison grammars.
 * Grammar Layout::       Overall structure of a Bison grammar file.
@@ -211,7 +211,7 @@ Bison Declarations
 * Pure Decl::         Requesting a reentrant parser.
 * Push Decl::         Requesting a push parser.
 * Decl Summary::      Table of all Bison declarations.
-* %define Summary::   Defining variables to adjust Bison’s behavior.
+* %define Summary::   Defining variables to adjust Bison's behavior.
 * %code Summary::     Inserting code into the parser source.
 
 Parser C-Language Interface
@@ -222,7 +222,7 @@ Parser C-Language Interface
                               which reads tokens.
 * Error Reporting::         Passing error messages to the user.
 * Action Features::         Special features for use in actions.
-* Internationalization::    How to let the parser speak in the user’s
+* Internationalization::    How to let the parser speak in the user's
                               native language.
 
 The Lexical Analyzer Function ‘yylex’
@@ -253,7 +253,7 @@ The Bison Parser Algorithm
 * Lookahead::         Parser looks one token ahead when deciding what to do.
 * Shift/Reduce::      Conflicts: when either shifting or reduction is valid.
 * Precedence::        Operator precedence works by resolving conflicts.
-* Contextual Precedence::  When an operator’s precedence depends on context.
+* Contextual Precedence::  When an operator's precedence depends on context.
 * Parser States::     The parser is a finite-state-machine with stack.
 * Reduce/Reduce::     When two rules are applicable in the same situation.
 * Mysterious Conflicts:: Conflicts that look unjustified.
@@ -401,7 +401,6 @@ Copying This Manual
 
 * GNU Free Documentation License:: Copying and sharing this manual
 
-
 
 File: bison.info,  Node: Introduction,  Next: Conditions,  Prev: Top,  Up: Top
 
@@ -423,7 +422,7 @@ understand this manual.
 
    We begin with tutorial chapters that explain the basic concepts of
 using Bison and show three explained examples, each building on the
-last.  If you don’t know Bison or Yacc, start by reading these chapters.
+last.  If you don't know Bison or Yacc, start by reading these chapters.
 Reference chapters follow, which describe specific aspects of Bison in
 detail.
 
@@ -454,24 +453,24 @@ software.  The reason Bison was different was not due to a special
 policy decision; it resulted from applying the usual General Public
 License to all of the Bison source code.
 
-   The main output of the Bison utility—the Bison parser implementation
-file—contains a verbatim copy of a sizable piece of Bison, which is the
-code for the parser’s implementation.  (The actions from your grammar
+   The main output of the Bison utility--the Bison parser implementation
+file--contains a verbatim copy of a sizable piece of Bison, which is the
+code for the parser's implementation.  (The actions from your grammar
 are inserted into this implementation at one point, but most of the rest
 of the implementation is not changed.)  When we applied the GPL terms to
-the skeleton code for the parser’s implementation, the effect was to
+the skeleton code for the parser's implementation, the effect was to
 restrict the use of Bison output to free software.
 
-   We didn’t change the terms because of sympathy for people who want to
+   We didn't change the terms because of sympathy for people who want to
 make software proprietary.  *Software should be free.*  But we concluded
-that limiting Bison’s use to free software was doing little to encourage
+that limiting Bison's use to free software was doing little to encourage
 people to make other software free.  So we decided to make the practical
 conditions for using Bison match the practical conditions for using the
 other GNU tools.
 
    This exception applies when Bison is generating code for a parser.
 You can tell whether the exception applies to a Bison output file by
-inspecting the file for text beginning with “As a special exception...”.
+inspecting the file for text beginning with "As a special exception...".
 The text spells out the exact terms of the exception.
 
 
@@ -496,7 +495,7 @@ and other kinds of works.
    The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program—to make sure it remains free
+share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
@@ -524,16 +523,16 @@ know their rights.
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
 
-   For the developers’ and authors’ protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users’ and
-authors’ sake, the GPL requires that modified versions be marked as
+   For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
 
    Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
-protecting users’ freedom to change the software.  The systematic
+protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
@@ -556,25 +555,25 @@ TERMS AND CONDITIONS
 
   0. Definitions.
 
-     “This License” refers to version 3 of the GNU General Public
+     "This License" refers to version 3 of the GNU General Public
      License.
 
-     “Copyright” also means copyright-like laws that apply to other
+     "Copyright" also means copyright-like laws that apply to other
      kinds of works, such as semiconductor masks.
 
-     “The Program” refers to any copyrightable work licensed under this
-     License.  Each licensee is addressed as “you”.  “Licensees” and
-     “recipients” may be individuals or organizations.
+     "The Program" refers to any copyrightable work licensed under this
+     License.  Each licensee is addressed as "you".  "Licensees" and
+     "recipients" may be individuals or organizations.
 
-     To “modify” a work means to copy from or adapt all or part of the
+     To "modify" a work means to copy from or adapt all or part of the
      work in a fashion requiring copyright permission, other than the
-     making of an exact copy.  The resulting work is called a “modified
-     version” of the earlier work or a work “based on” the earlier work.
+     making of an exact copy.  The resulting work is called a "modified
+     version" of the earlier work or a work "based on" the earlier work.
 
-     A “covered work” means either the unmodified Program or a work
+     A "covered work" means either the unmodified Program or a work
      based on the Program.
 
-     To “propagate” a work means to do anything with it that, without
+     To "propagate" a work means to do anything with it that, without
      permission, would make you directly or secondarily liable for
      infringement under applicable copyright law, except executing it on
      a computer or modifying a private copy.  Propagation includes
@@ -582,12 +581,12 @@ TERMS AND CONDITIONS
      available to the public, and in some countries other activities as
      well.
 
-     To “convey” a work means any kind of propagation that enables other
+     To "convey" a work means any kind of propagation that enables other
      parties to make or receive copies.  Mere interaction with a user
      through a computer network, with no transfer of a copy, is not
      conveying.
 
-     An interactive user interface displays “Appropriate Legal Notices”
+     An interactive user interface displays "Appropriate Legal Notices"
      to the extent that it includes a convenient and prominently visible
      feature that (1) displays an appropriate copyright notice, and (2)
      tells the user that there is no warranty for the work (except to
@@ -599,33 +598,33 @@ TERMS AND CONDITIONS
 
   1. Source Code.
 
-     The “source code” for a work means the preferred form of the work
-     for making modifications to it.  “Object code” means any non-source
+     The "source code" for a work means the preferred form of the work
+     for making modifications to it.  "Object code" means any non-source
      form of a work.
 
-     A “Standard Interface” means an interface that either is an
+     A "Standard Interface" means an interface that either is an
      official standard defined by a recognized standards body, or, in
      the case of interfaces specified for a particular programming
      language, one that is widely used among developers working in that
      language.
 
-     The “System Libraries” of an executable work include anything,
+     The "System Libraries" of an executable work include anything,
      other than the work as a whole, that (a) is included in the normal
      form of packaging a Major Component, but which is not part of that
      Major Component, and (b) serves only to enable use of the work with
      that Major Component, or to implement a Standard Interface for
      which an implementation is available to the public in source code
-     form.  A “Major Component”, in this context, means a major
+     form.  A "Major Component", in this context, means a major
      essential component (kernel, window system, and so on) of the
      specific operating system (if any) on which the executable work
      runs, or a compiler used to produce the work, or an object code
      interpreter used to run it.
 
-     The “Corresponding Source” for a work in object code form means all
+     The "Corresponding Source" for a work in object code form means all
      the source code needed to generate, install, and (for an executable
      work) run the object code and to modify the work, including scripts
      to control those activities.  However, it does not include the
-     work’s System Libraries, or general-purpose tools or generally
+     work's System Libraries, or general-purpose tools or generally
      available free programs which are used unmodified in performing
      those activities but which are not part of the work.  For example,
      Corresponding Source includes interface definition files associated
@@ -669,7 +668,7 @@ TERMS AND CONDITIONS
      the conditions stated below.  Sublicensing is not allowed; section
      10 makes it unnecessary.
 
-  3. Protecting Users’ Legal Rights From Anti-Circumvention Law.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
      No covered work shall be deemed part of an effective technological
      measure under any applicable law fulfilling obligations under
@@ -682,12 +681,12 @@ TERMS AND CONDITIONS
      circumvention is effected by exercising rights under this License
      with respect to the covered work, and you disclaim any intention to
      limit operation or modification of the work as a means of
-     enforcing, against the work’s users, your or third parties’ legal
+     enforcing, against the work's users, your or third parties' legal
      rights to forbid circumvention of technological measures.
 
   4. Conveying Verbatim Copies.
 
-     You may convey verbatim copies of the Program’s source code as you
+     You may convey verbatim copies of the Program's source code as you
      receive it, in any medium, provided that you conspicuously and
      appropriately publish on each copy an appropriate copyright notice;
      keep intact all notices stating that this License and any
@@ -711,7 +710,7 @@ TERMS AND CONDITIONS
        b. The work must carry prominent notices stating that it is
           released under this License and any conditions added under
           section 7.  This requirement modifies the requirement in
-          section 4 to “keep intact all notices”.
+          section 4 to "keep intact all notices".
 
        c. You must license the entire work, as a whole, under this
           License to anyone who comes into possession of a copy.  This
@@ -731,9 +730,9 @@ TERMS AND CONDITIONS
      works, which are not by their nature extensions of the covered
      work, and which are not combined with it such as to form a larger
      program, in or on a volume of a storage or distribution medium, is
-     called an “aggregate” if the compilation and its resulting
+     called an "aggregate" if the compilation and its resulting
      copyright are not used to limit the access or legal rights of the
-     compilation’s users beyond what the individual works permit.
+     compilation's users beyond what the individual works permit.
      Inclusion of a covered work in an aggregate does not cause this
      License to apply to the other parts of the aggregate.
 
@@ -791,13 +790,13 @@ TERMS AND CONDITIONS
      excluded from the Corresponding Source as a System Library, need
      not be included in conveying the object code work.
 
-     A “User Product” is either (1) a “consumer product”, which means
+     A "User Product" is either (1) a "consumer product", which means
      any tangible personal property which is normally used for personal,
      family, or household purposes, or (2) anything designed or sold for
      incorporation into a dwelling.  In determining whether a product is
      a consumer product, doubtful cases shall be resolved in favor of
      coverage.  For a particular product received by a particular user,
-     “normally used” refers to a typical or common use of that class of
+     "normally used" refers to a typical or common use of that class of
      product, regardless of the status of the particular user or of the
      way in which the particular user actually uses, or expects or is
      expected to use, the product.  A product is a consumer product
@@ -805,7 +804,7 @@ TERMS AND CONDITIONS
      industrial or non-consumer uses, unless such uses represent the
      only significant mode of use of the product.
 
-     “Installation Information” for a User Product means any methods,
+     "Installation Information" for a User Product means any methods,
      procedures, authorization keys, or other information required to
      install and execute modified versions of a covered work in that
      User Product from a modified version of its Corresponding Source.
@@ -841,7 +840,7 @@ TERMS AND CONDITIONS
 
   7. Additional Terms.
 
-     “Additional permissions” are terms that supplement the terms of
+     "Additional permissions" are terms that supplement the terms of
      this License by making exceptions from one or more of its
      conditions.  Additional permissions that are applicable to the
      entire Program shall be treated as though they were included in
@@ -886,8 +885,8 @@ TERMS AND CONDITIONS
           the recipient, for any liability that these contractual
           assumptions directly impose on those licensors and authors.
 
-     All other non-permissive additional terms are considered “further
-     restrictions” within the meaning of section 10.  If the Program as
+     All other non-permissive additional terms are considered "further
+     restrictions" within the meaning of section 10.  If the Program as
      you received it, or any part of it, contains a notice stating that
      it is governed by this License along with a term that is a further
      restriction, you may remove that term.  If a license document
@@ -953,12 +952,12 @@ TERMS AND CONDITIONS
      responsible for enforcing compliance by third parties with this
      License.
 
-     An “entity transaction” is a transaction transferring control of an
+     An "entity transaction" is a transaction transferring control of an
      organization, or substantially all assets of one, or subdividing an
      organization, or merging organizations.  If propagation of a
      covered work results from an entity transaction, each party to that
      transaction who receives a copy of the work also receives whatever
-     licenses to the work the party’s predecessor in interest had or
+     licenses to the work the party's predecessor in interest had or
      could give under the previous paragraph, plus a right to possession
      of the Corresponding Source of the work from the predecessor in
      interest, if the predecessor has it or can get it with reasonable
@@ -975,31 +974,31 @@ TERMS AND CONDITIONS
 
   11. Patents.
 
-     A “contributor” is a copyright holder who authorizes use under this
+     A "contributor" is a copyright holder who authorizes use under this
      License of the Program or a work on which the Program is based.
-     The work thus licensed is called the contributor’s “contributor
-     version”.
+     The work thus licensed is called the contributor's "contributor
+     version".
 
-     A contributor’s “essential patent claims” are all patent claims
+     A contributor's "essential patent claims" are all patent claims
      owned or controlled by the contributor, whether already acquired or
      hereafter acquired, that would be infringed by some manner,
      permitted by this License, of making, using, or selling its
      contributor version, but do not include claims that would be
      infringed only as a consequence of further modification of the
-     contributor version.  For purposes of this definition, “control”
+     contributor version.  For purposes of this definition, "control"
      includes the right to grant patent sublicenses in a manner
      consistent with the requirements of this License.
 
      Each contributor grants you a non-exclusive, worldwide,
-     royalty-free patent license under the contributor’s essential
+     royalty-free patent license under the contributor's essential
      patent claims, to make, use, sell, offer for sale, import and
      otherwise run, modify and propagate the contents of its contributor
      version.
 
-     In the following three paragraphs, a “patent license” is any
+     In the following three paragraphs, a "patent license" is any
      express agreement or commitment, however denominated, not to
      enforce a patent (such as an express permission to practice a
-     patent or covenant not to sue for patent infringement).  To “grant”
+     patent or covenant not to sue for patent infringement).  To "grant"
      such a patent license to a party means to make such an agreement or
      commitment not to enforce a patent against the party.
 
@@ -1012,9 +1011,9 @@ TERMS AND CONDITIONS
      yourself of the benefit of the patent license for this particular
      work, or (3) arrange, in a manner consistent with the requirements
      of this License, to extend the patent license to downstream
-     recipients.  “Knowingly relying” means you have actual knowledge
+     recipients.  "Knowingly relying" means you have actual knowledge
      that, but for the patent license, your conveying the covered work
-     in a country, or your recipient’s use of the covered work in a
+     in a country, or your recipient's use of the covered work in a
      country, would infringe one or more identifiable patents in that
      country that you have reason to believe are valid.
 
@@ -1026,7 +1025,7 @@ TERMS AND CONDITIONS
      patent license you grant is automatically extended to all
      recipients of the covered work and works based on it.
 
-     A patent license is “discriminatory” if it does not include within
+     A patent license is "discriminatory" if it does not include within
      the scope of its coverage, prohibits the exercise of, or is
      conditioned on the non-exercise of one or more of the rights that
      are specifically granted under this License.  You may not convey a
@@ -1046,7 +1045,7 @@ TERMS AND CONDITIONS
      any implied license or other defenses to infringement that may
      otherwise be available to you under applicable patent law.
 
-  12. No Surrender of Others’ Freedom.
+  12. No Surrender of Others' Freedom.
 
      If conditions are imposed on you (whether by court order, agreement
      or otherwise) that contradict the conditions of this License, they
@@ -1079,7 +1078,7 @@ TERMS AND CONDITIONS
 
      Each version is given a distinguishing version number.  If the
      Program specifies that a certain numbered version of the GNU
-     General Public License “or any later version” applies to it, you
+     General Public License "or any later version" applies to it, you
      have the option of following the terms and conditions either of
      that numbered version or of any later version published by the Free
      Software Foundation.  If the Program does not specify a version
@@ -1088,7 +1087,7 @@ TERMS AND CONDITIONS
 
      If the Program specifies that a proxy can decide which future
      versions of the GNU General Public License can be used, that
-     proxy’s public statement of acceptance of a version permanently
+     proxy's public statement of acceptance of a version permanently
      authorizes you to choose that version for the Program.
 
      Later license versions may give you additional or different
@@ -1100,7 +1099,7 @@ TERMS AND CONDITIONS
 
      THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
      APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE
-     COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS”
+     COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS"
      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE
@@ -1144,7 +1143,7 @@ terms.
    To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least the
-“copyright” line and a pointer to where the full notice is found.
+"copyright" line and a pointer to where the full notice is found.
 
      ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
      Copyright (C) YEAR NAME OF AUTHOR
@@ -1175,11 +1174,11 @@ notice like this when it starts in an interactive mode:
 
    The hypothetical commands ‘show w’ and ‘show c’ should show the
 appropriate parts of the General Public License.  Of course, your
-program’s commands might be different; for a GUI interface, you would
-use an “about box”.
+program's commands might be different; for a GUI interface, you would
+use an "about box".
 
    You should also get your employer (if you work as a programmer) or
-school, if any, to sign a “copyright disclaimer” for the program, if
+school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  For more information on this, and how to apply and follow
 the GNU GPL, see <https://www.gnu.org/licenses/>.
 
@@ -1205,14 +1204,14 @@ carefully.
 
 * Language and Grammar:: Languages and context-free grammars,
                            as mathematical ideas.
-* Grammar in Bison::     How we represent grammars for Bison’s sake.
+* Grammar in Bison::     How we represent grammars for Bison's sake.
 * Semantic Values::      Each token or syntactic grouping can have
                            a semantic value (the value of an integer,
                            the name of an identifier, etc.).
 * Semantic Actions::     Each rule can have an action containing C code.
 * GLR Parsers::          Writing parsers for general context-free languages.
 * Locations::            Overview of location tracking.
-* Bison Parser::         What are Bison’s input and output,
+* Bison Parser::         What are Bison's input and output,
                            how is the output used?
 * Stages::               Stages in writing and running Bison grammars.
 * Grammar Layout::       Overall structure of a Bison grammar file.
@@ -1227,14 +1226,14 @@ In order for Bison to parse a language, it must be described by a
 “context-free grammar”.  This means that you specify one or more
 “syntactic groupings” and give rules for constructing them from their
 parts.  For example, in the C language, one kind of grouping is called
-an ‘expression’.  One rule for making an expression might be, “An
-expression can be made of a minus sign and another expression”.  Another
-would be, “An expression can be an integer”.  As you can see, rules are
+an 'expression'.  One rule for making an expression might be, "An
+expression can be made of a minus sign and another expression".  Another
+would be, "An expression can be an integer".  As you can see, rules are
 often recursive, but there must be at least one rule which leads out of
 the recursion.
 
    The most common formal system for presenting such rules for humans to
-read is “Backus-Naur Form” or “BNF”, which was developed in order to
+read is “Backus-Naur Form” or "BNF", which was developed in order to
 specify the language Algol 60.  Any grammar expressed in BNF is a
 context-free grammar.  The input to Bison is essentially
 machine-readable BNF.
@@ -1259,14 +1258,14 @@ rules to get the same inputs.  Even unambiguous grammars can be
 “nondeterministic”, meaning that no fixed lookahead always suffices to
 determine the next grammar rule to apply.  With the proper declarations,
 Bison is also able to parse these more general context-free grammars,
-using a technique known as GLR parsing (for Generalized LR). Bison’s GLR
+using a technique known as GLR parsing (for Generalized LR). Bison's GLR
 parsers are able to handle any context-free grammar for which the number
 of possible parses of any given string is finite.
 
    In the formal grammatical rules for a language, each kind of
 syntactic unit or grouping is named by a “symbol”.  Those which are
 built by grouping smaller constructs according to grammatical rules are
-called “nonterminal symbols”; those which can’t be subdivided are called
+called “nonterminal symbols”; those which can't be subdivided are called
 “terminal symbols” or “token kinds”.  We call a piece of input
 corresponding to a single terminal symbol a “token”, and a piece
 corresponding to a single nonterminal symbol a “grouping”.
@@ -1275,26 +1274,26 @@ corresponding to a single nonterminal symbol a “grouping”.
 nonterminal, mean.  The tokens of C are identifiers, constants (numeric
 and string), and the various keywords, arithmetic operators and
 punctuation marks.  So the terminal symbols of a grammar for C include
-‘identifier’, ‘number’, ‘string’, plus one symbol for each keyword,
-operator or punctuation mark: ‘if’, ‘return’, ‘const’, ‘static’, ‘int’,
-‘char’, ‘plus-sign’, ‘open-brace’, ‘close-brace’, ‘comma’ and many more.
+'identifier', 'number', 'string', plus one symbol for each keyword,
+operator or punctuation mark: 'if', 'return', 'const', 'static', 'int',
+'char', 'plus-sign', 'open-brace', 'close-brace', 'comma' and many more.
 (These tokens can be subdivided into characters, but that is a matter of
 lexicography, not grammar.)
 
    Here is a simple C function subdivided into tokens:
 
-     int             /* keyword ‘int’ */
-     square (int x)  /* identifier, open-paren, keyword ‘int’,
+     int             /* keyword 'int' */
+     square (int x)  /* identifier, open-paren, keyword 'int',
                         identifier, close-paren */
      {               /* open-brace */
-       return x * x; /* keyword ‘return’, identifier, asterisk,
+       return x * x; /* keyword 'return', identifier, asterisk,
                         identifier, semicolon */
      }               /* close-brace */
 
    The syntactic groupings of C include the expression, the statement,
 the declaration, and the function definition.  These are represented in
-the grammar of C by nonterminal symbols ‘expression’, ‘statement’,
-‘declaration’ and ‘function definition’.  The full grammar uses dozens
+the grammar of C by nonterminal symbols 'expression', 'statement',
+'declaration' and 'function definition'.  The full grammar uses dozens
 of additional language constructs, each with its own nonterminal symbol,
 in order to express the meanings of these four.  The example above is a
 function definition; it contains one declaration, and one statement.  In
@@ -1305,28 +1304,28 @@ made out of simpler constructs.  For example, one kind of C statement is
 the ‘return’ statement; this would be described with a grammar rule
 which reads informally as follows:
 
-     A ‘statement’ can be made of a ‘return’ keyword, an ‘expression’
-     and a ‘semicolon’.
+     A 'statement' can be made of a 'return' keyword, an 'expression'
+     and a 'semicolon'.
 
-There would be many other rules for ‘statement’, one for each kind of
+There would be many other rules for 'statement', one for each kind of
 statement in C.
 
    One nonterminal symbol must be distinguished as the special one which
 defines a complete utterance in the language.  It is called the “start
 symbol”.  In a compiler, this means a complete input program.  In the C
-language, the nonterminal symbol ‘sequence of definitions and
-declarations’ plays this role.
+language, the nonterminal symbol 'sequence of definitions and
+declarations' plays this role.
 
-   For example, ‘1 + 2’ is a valid C expression—a valid part of a C
-program—but it is not valid as an _entire_ C program.  In the
-context-free grammar of C, this follows from the fact that ‘expression’
+   For example, ‘1 + 2’ is a valid C expression--a valid part of a C
+program--but it is not valid as an _entire_ C program.  In the
+context-free grammar of C, this follows from the fact that 'expression'
 is not the start symbol.
 
    The Bison parser reads a sequence of tokens as its input, and groups
 the tokens using the grammar rules.  If the input is valid, the end
 result is that the entire token sequence reduces to a single grouping
-whose symbol is the grammar’s start symbol.  If we use a grammar for C,
-the entire input must be a ‘sequence of definitions and declarations’.
+whose symbol is the grammar's start symbol.  If we use a grammar for C,
+the entire input must be a 'sequence of definitions and declarations'.
 If not, the parser reports a syntax error.
 
 
@@ -1378,7 +1377,7 @@ File: bison.info,  Node: Semantic Values,  Next: Semantic Actions,  Prev: Gramma
 ===================
 
 A formal grammar selects tokens only by their classifications: for
-example, if a rule mentions the terminal symbol ‘integer constant’, it
+example, if a rule mentions the terminal symbol 'integer constant', it
 means that _any_ integer constant is grammatically valid in that
 position.  The precise value of the constant is irrelevant to how to
 parse the input: if ‘x+4’ is grammatical then ‘x+1’ or ‘x+3989’ is
@@ -1398,7 +1397,7 @@ kinds.
 
    The semantic value has all the rest of the information about the
 meaning of the token, such as the value of an integer, or the name of an
-identifier.  (A token such as ‘','’ which is just punctuation doesn’t
+identifier.  (A token such as ‘','’ which is just punctuation doesn't
 need to have any semantic value.)
 
    For example, an input token might be classified as token kind
@@ -1406,7 +1405,7 @@ need to have any semantic value.)
 the same token kind ‘INTEGER’ but value 3989.  When a grammar rule says
 that ‘INTEGER’ is allowed, either of these tokens is acceptable because
 each is an ‘INTEGER’.  When the parser accepts the token, it keeps track
-of the token’s semantic value.
+of the token's semantic value.
 
    Each grouping can also have a semantic value as well as its
 nonterminal symbol.  For example, in a calculator, an expression
@@ -1448,7 +1447,7 @@ File: bison.info,  Node: GLR Parsers,  Next: Locations,  Prev: Semantic Actions,
 1.5 Writing GLR Parsers
 =======================
 
-In some grammars, Bison’s deterministic LR(1) parsing algorithm cannot
+In some grammars, Bison's deterministic LR(1) parsing algorithm cannot
 decide whether to apply a certain grammar rule at a given point.  That
 is, it may not be able to decide (on the basis of the input read so far)
 which of two possible reductions (applications of a grammar rule)
@@ -1534,7 +1533,7 @@ become a new identifier to represent the enumeration value, while in the
 former case ‘a’ must be evaluated with its current meaning, which may be
 a constant or even a function call.
 
-   You could parse ‘(a)’ as an “unspecified identifier in parentheses”,
+   You could parse ‘(a)’ as an "unspecified identifier in parentheses",
 to be resolved later, but this typically requires substantial
 contortions in both semantic actions and large parts of the grammar,
 where the parentheses are nested in the recursive rules for expressions.
@@ -1542,7 +1541,7 @@ where the parentheses are nested in the recursive rules for expressions.
    You might think of using the lexer to distinguish between the two
 forms by returning different tokens for currently defined and undefined
 identifiers.  But if these declarations occur in a local scope, and ‘a’
-is defined in an outer scope, then both forms are possible—either
+is defined in an outer scope, then both forms are possible--either
 locally redefining ‘a’, or using the value of ‘a’ from the outer scope.
 So this approach cannot work.
 
@@ -1560,7 +1559,7 @@ split.
    If the input is syntactically incorrect, both branches fail and the
 parser reports a syntax error as usual.
 
-   The effect of all this is that the parser seems to “guess” the
+   The effect of all this is that the parser seems to "guess" the
 correct branch to take, or in other words, it seems to use more
 lookahead than the underlying LR(1) algorithm actually allows for.  In
 this example, LR(2) would suffice, but also some cases that are not
@@ -1652,7 +1651,7 @@ File: bison.info,  Node: Merging GLR Parses,  Next: GLR Semantic Actions,  Prev:
 1.5.2 Using GLR to Resolve Ambiguities
 --------------------------------------
 
-Let’s consider an example, vastly simplified from a C++ grammar.(1)
+Let's consider an example, vastly simplified from a C++ grammar.(1)
 
      %{
        #include <stdio.h>
@@ -1701,7 +1700,7 @@ Let’s consider an example, vastly simplified from a C++ grammar.(1)
      | '(' declarator ')'
      ;
 
-This models a problematic part of the C++ grammar—the ambiguity between
+This models a problematic part of the C++ grammar--the ambiguity between
 certain declarations and statements.  For example,
 
      T (x) = y+z;
@@ -1713,10 +1712,10 @@ ID’, which it cannot resolve at the time it encounters ‘x’ in the
 example above.  Since this is a GLR parser, it therefore splits the
 problem into two parses, one for each choice of resolving the
 reduce/reduce conflict.  Unlike the example from the previous section
-(*note Simple GLR Parsers::), however, neither of these parses “dies,”
+(*note Simple GLR Parsers::), however, neither of these parses "dies,"
 because the grammar as it stands is ambiguous.  One of the parsers
 eventually reduces ‘stmt : expr ';'’ and the other reduces ‘stmt :
-decl’, after which both parsers are in an identical state: they’ve seen
+decl’, after which both parsers are in an identical state: they've seen
 ‘prog stmt’ and have the same unprocessed input remaining.  We say that
 these parses have “merged.”
 
@@ -1834,11 +1833,11 @@ features you might use in a semantic action in a GLR parser.
 kind of the lookahead token present at the time of the associated
 reduction.  After checking that ‘yychar’ is not set to ‘YYEMPTY’ or
 ‘YYEOF’, you can then examine ‘yylval’ and ‘yylloc’ to determine the
-lookahead token’s semantic value and location, if any.  In a nondeferred
+lookahead token's semantic value and location, if any.  In a nondeferred
 semantic action, you can also modify any of these variables to influence
 syntax analysis.  *Note Lookahead::.
 
-   In a deferred semantic action, it’s too late to influence syntax
+   In a deferred semantic action, it's too late to influence syntax
 analysis.  In this case, ‘yychar’, ‘yylval’, and ‘yylloc’ are set to
 shallow copies of the values they had at the time of the associated
 reduction.  For this reason alone, modifying them is dangerous.
@@ -1967,14 +1966,14 @@ distinct programs: the Bison utility is a program whose output is the
 Bison parser implementation file that becomes part of your program.
 
    The job of the Bison parser is to group tokens into groupings
-according to the grammar rules—for example, to build identifiers and
+according to the grammar rules--for example, to build identifiers and
 operators into expressions.  As it does this, it runs the actions for
 the grammar rules it uses.
 
    The tokens come from a function called the “lexical analyzer” that
 you must supply in some fashion (such as by writing it in C). The Bison
 parser calls the lexical analyzer each time it wants a new token.  It
-doesn’t know what is “inside” the tokens (though their semantic values
+doesn't know what is "inside" the tokens (though their semantic values
 may reflect this).  Typically the lexical analyzer makes the tokens by
 parsing characters of text, but Bison does not depend on this.  *Note
 Lexical::.
@@ -2092,9 +2091,9 @@ File: bison.info,  Node: Examples,  Next: Grammar File,  Prev: Concepts,  Up: To
 
 Now we show and explain several sample programs written using Bison: a
 Reverse Polish Notation calculator, an algebraic (infix) notation
-calculator — later extended to track “locations” — and a multi-function
-calculator.  All produce usable, though limited, interactive desk-top
-calculators.
+calculator -- later extended to track "locations" -- and a
+multi-function calculator.  All produce usable, though limited,
+interactive desk-top calculators.
 
    These examples are simple, but Bison grammars for real programming
 languages are written the same way.  You can copy these examples into a
@@ -2188,13 +2187,13 @@ about the tokens and their types (*note Bison Declarations::).
    The ‘%define’ directive defines the variable ‘api.value.type’, thus
 specifying the C data type for semantic values of both tokens and
 groupings (*note Value Type::).  The Bison parser will use whatever type
-‘api.value.type’ is defined as; if you don’t define it, ‘int’ is the
+‘api.value.type’ is defined as; if you don't define it, ‘int’ is the
 default.  Because we specify ‘{double}’, each token and each expression
 has an associated value, which is a floating point number.  C code can
 use ‘YYSTYPE’ to refer to the value ‘api.value.type’.
 
    Each terminal symbol that is not a single-character literal must be
-declared.  (Single-character literals normally don’t need to be
+declared.  (Single-character literals normally don't need to be
 declared.)  In this example, all the arithmetic operators are designated
 by single-character literals, so the only terminal symbol that needs to
 be declared is ‘NUM’, the token kind for numeric constants.
@@ -2228,11 +2227,11 @@ Here are the grammar rules for the Reverse Polish Notation calculator.
      ;
      %%
 
-   The groupings of the rpcalc “language” defined here are the
+   The groupings of the rpcalc "language" defined here are the
 expression (given the name ‘exp’), the line of input (‘line’), and the
 complete input transcript (‘input’).  Each of these nonterminal symbols
 has several alternate rules, joined by the vertical bar ‘|’ which is
-read as “or”.  The following sections explain what these rules mean.
+read as "or".  The following sections explain what these rules mean.
 
    The semantics of the language is determined by the actions taken when
 a grouping is recognized.  The actions are the C code that appears
@@ -2264,25 +2263,25 @@ Consider the definition of ‘input’:
      | input line
      ;
 
-   This definition reads as follows: “A complete input is either an
-empty string, or a complete input followed by an input line”.  Notice
-that “complete input” is defined in terms of itself.  This definition is
+   This definition reads as follows: "A complete input is either an
+empty string, or a complete input followed by an input line".  Notice
+that "complete input" is defined in terms of itself.  This definition is
 said to be “left recursive” since ‘input’ appears always as the leftmost
 symbol in the sequence.  *Note Recursion::.
 
    The first alternative is empty because there are no symbols between
 the colon and the first ‘|’; this means that ‘input’ can match an empty
 string of input (no tokens).  We write the rules this way because it is
-legitimate to type ‘Ctrl-d’ right after you start the calculator.  It’s
+legitimate to type ‘Ctrl-d’ right after you start the calculator.  It's
 conventional to put an empty alternative first and to use the (optional)
 ‘%empty’ directive, or to write the comment ‘/* empty */’ in it (*note
 Empty Rules::).
 
    The second alternate rule (‘input line’) handles all nontrivial
-input.  It means, “After reading any number of lines, read one more line
-if possible.” The left recursion makes this rule into a loop.  Since the
-first alternative matches empty input, the loop can be executed zero or
-more times.
+input.  It means, "After reading any number of lines, read one more line
+if possible."  The left recursion makes this rule into a loop.  Since
+the first alternative matches empty input, the loop can be executed zero
+or more times.
 
    The parser function ‘yyparse’ continues to process input until a
 grammatical error is seen or the lexical analyzer says there are no more
@@ -2313,8 +2312,8 @@ for.
    This action is unusual because it does not assign a value to ‘$$’.
 As a consequence, the semantic value associated with the ‘line’ is
 uninitialized (its value will be unpredictable).  This would be a bug if
-that value were ever used, but we don’t use it: once rpcalc has printed
-the value of the user’s input line, that value is no longer needed.
+that value were ever used, but we don't use it: once rpcalc has printed
+the value of the user's input line, that value is no longer needed.
 
 
 File: bison.info,  Node: Rpcalc Exp,  Prev: Rpcalc Line,  Up: Rpcalc Rules
@@ -2352,10 +2351,10 @@ associated semantic value, but if it had one you could refer to it as
 }’.
 
    When ‘yyparse’ recognizes a sum expression using this rule, the sum
-of the two subexpressions’ values is produced as the value of the entire
+of the two subexpressions' values is produced as the value of the entire
 expression.  *Note Actions::.
 
-   You don’t have to give an action for every rule.  When a rule has no
+   You don't have to give an action for every rule.  When a rule has no
 action, Bison by default copies the value of ‘$1’ into ‘$$’.  This is
 what happens in the first rule (the one that uses ‘NUM’).
 
@@ -2381,14 +2380,14 @@ File: bison.info,  Node: Rpcalc Lexer,  Next: Rpcalc Main,  Prev: Rpcalc Rules,
 2.1.3 The ‘rpcalc’ Lexical Analyzer
 -----------------------------------
 
-The lexical analyzer’s job is low-level parsing: converting characters
+The lexical analyzer's job is low-level parsing: converting characters
 or sequences of characters into tokens.  The Bison parser gets its
 tokens by calling the lexical analyzer.  *Note Lexical::.
 
    Only a simple lexical analyzer is needed for the RPN calculator.
 This lexical analyzer skips blanks and tabs, then reads in numbers as
 ‘double’ and returns them as ‘NUM’ tokens.  Any other character that
-isn’t part of a number is a separate token.  Note that the token-code
+isn't part of a number is a separate token.  Note that the token-code
 for such a single-character token is the character itself.
 
    The return value of the lexical analyzer function is a numeric code
@@ -2507,8 +2506,8 @@ command to convert it into a parser implementation file:
 
      $ bison FILE.y
 
-In this example, the grammar file is called ‘rpcalc.y’ (for “Reverse
-Polish CALCulator”).  Bison produces a parser implementation file named
+In this example, the grammar file is called ‘rpcalc.y’ (for "Reverse
+Polish CALCulator").  Bison produces a parser implementation file named
 ‘FILE.tab.c’, removing the ‘.y’ from the grammar file name.  The parser
 implementation file contains the source code for ‘yyparse’.  The
 additional functions in the grammar file (‘yylex’, ‘yyerror’ and ‘main’)
@@ -2611,7 +2610,7 @@ kinds and says they are left-associative operators.  The declarations
 ‘%left’ and ‘%right’ (right associativity) take the place of ‘%token’
 which is used to declare a token kind name without
 associativity/precedence.  (These tokens are single-character literals,
-which ordinarily don’t need to be declared.  We declare them here to
+which ordinarily don't need to be declared.  We declare them here to
 specify the associativity/precedence.)
 
    Operator precedence is determined by the line ordering of the
@@ -2623,7 +2622,7 @@ matters (‘%precedence’.  *Note Precedence::.
 
    The other important new feature is the ‘%prec’ in the grammar section
 for the unary minus operator.  The ‘%prec’ simply instructs Bison that
-the rule ‘| '-' exp’ has the same precedence as ‘NEG’—in this case the
+the rule ‘| '-' exp’ has the same precedence as ‘NEG’--in this case the
 next-to-highest.  *Note Contextual Precedence::.
 
    Here is a sample run of ‘calc.y’:
@@ -2649,7 +2648,7 @@ File: bison.info,  Node: Simple Error Recovery,  Next: Location Tracking Calc,
 =========================
 
 Up to this point, this manual has not addressed the issue of “error
-recovery”—how to continue parsing after the parser detects a syntax
+recovery”--how to continue parsing after the parser detects a syntax
 error.  All we have handled is error reporting with ‘yyerror’.  Recall
 that by default ‘yyparse’ returns after calling ‘yyerror’.  This means
 that an erroneous input line causes the calculator program to exit.  Now
@@ -2679,7 +2678,7 @@ other kinds of errors; for example, division by zero, which raises an
 exception signal that is normally fatal.  A real calculator program must
 handle this signal and use ‘longjmp’ to return to ‘main’ and resume
 parsing input lines; it would also have to discard the rest of the
-current line of input.  We won’t discuss this issue further because it
+current line of input.  We won't discuss this issue further because it
 is not specific to Bison programs.
 
 
@@ -2785,7 +2784,7 @@ the wrong expressions or subexpressions.
 using the pseudo-variables ‘@N’ for rule components, and the
 pseudo-variable ‘@$’ for groupings.
 
-   We don’t need to assign a value to ‘@$’: the output parser does it
+   We don't need to assign a value to ‘@$’: the output parser does it
 automatically.  By default, before executing the C code of each action,
 ‘@$’ is set to range from the beginning of ‘@1’ to the end of ‘@N’, for
 a rule with N components.  This behavior can be redefined (*note
@@ -2798,7 +2797,7 @@ File: bison.info,  Node: Ltcalc Lexer,  Prev: Ltcalc Rules,  Up: Location Tracki
 2.4.3 The ‘ltcalc’ Lexical Analyzer.
 ------------------------------------
 
-Until now, we relied on Bison’s defaults to enable location tracking.
+Until now, we relied on Bison's defaults to enable location tracking.
 The next step is to rewrite the lexical analyzer, and make it able to
 feed the parser with the token locations, as it already does for
 semantic values.
@@ -2851,7 +2850,7 @@ input text, to avoid the computed locations of being fuzzy or wrong:
    Basically, the lexical analyzer performs the same processing as
 before: it skips blanks and tabs, and reads numbers or single-character
 tokens.  In addition, it updates ‘yylloc’, the global variable (of type
-‘YYLTYPE’) containing the token’s location.
+‘YYLTYPE’) containing the token's location.
 
    Now, each time this function returns a token, the parser has its kind
 as well as its semantic value, and its location in the text.  The last
@@ -3018,7 +3017,7 @@ File: bison.info,  Node: Mfcalc Symbol Table,  Next: Mfcalc Lexer,  Prev: Mfcalc
 -------------------------------
 
 The multi-function calculator requires a symbol table to keep track of
-the names and meanings of variables and functions.  This doesn’t affect
+the names and meanings of variables and functions.  This doesn't affect
 the grammar rules (except for the actions) or the Bison declarations,
 but it requires some additional C functions for support.
 
@@ -3315,7 +3314,7 @@ The PROLOGUE section contains macro definitions and declarations of
 functions and variables that are used in the actions in the grammar
 rules.  These are copied to the beginning of the parser implementation
 file so that they precede the definition of ‘yyparse’.  You can use
-‘#include’ to get the declarations from a header file.  If you don’t
+‘#include’ to get the declarations from a header file.  If you don't
 need any C declarations, you may omit the ‘%{’ and ‘%}’ delimiters that
 bracket this section.
 
@@ -3384,9 +3383,9 @@ qualifier can be omitted for the default location, or it can be one of
 
      ...
 
-Notice that there are two PROLOGUE sections here, but there’s a subtle
+Notice that there are two PROLOGUE sections here, but there's a subtle
 distinction between their functionality.  For example, if you decide to
-override Bison’s default definition for ‘YYLTYPE’, in which PROLOGUE
+override Bison's default definition for ‘YYLTYPE’, in which PROLOGUE
 section should you write your new definition?(1)  You should write it in
 the first since Bison will insert that code into the parser
 implementation file _before_ the default ‘YYLTYPE’ definition.  In which
@@ -3403,7 +3402,7 @@ Second, what if there is no ‘%union’?  In that case, the second kind of
 PROLOGUE section is not available.  This behavior is not intuitive.
 
    To avoid this subtle ‘%union’ dependency, rewrite the example using a
-‘%code top’ and an unqualified ‘%code’.  Let’s go ahead and add the new
+‘%code top’ and an unqualified ‘%code’.  Let's go ahead and add the new
 ‘YYLTYPE’ definition and the ‘trace_token’ prototype at the same time:
 
      %code top {
@@ -3438,7 +3437,7 @@ PROLOGUE section is not available.  This behavior is not intuitive.
      ...
 
 In this way, ‘%code top’ and the unqualified ‘%code’ achieve the same
-functionality as the two kinds of PROLOGUE sections, but it’s always
+functionality as the two kinds of PROLOGUE sections, but it's always
 explicit which kind you intend.  Moreover, both kinds are always
 available even in the absence of ‘%union’.
 
@@ -3446,7 +3445,7 @@ available even in the absence of ‘%union’.
 two lines before the warning need to appear near the top of the parser
 implementation file.  The first line after the warning is required by
 ‘YYSTYPE’ and thus also needs to appear in the parser implementation
-file.  However, if you’ve instructed Bison to generate a parser header
+file.  However, if you've instructed Bison to generate a parser header
 file (*note Decl Summary::), you probably want that line to appear
 before the ‘YYSTYPE’ definition in that header file as well.  The
 ‘YYLTYPE’ definition should also appear in the parser header file to
@@ -3510,7 +3509,7 @@ provide ‘trace_token’ to modules that are external to your parser.
 Thus, you might wish for Bison to insert the prototype into both the
 parser header file and the parser implementation file.  Since this
 function is not a dependency required by ‘YYSTYPE’ or ‘YYLTYPE’, it
-doesn’t make sense to move its prototype to a ‘%code requires’.  More
+doesn't make sense to move its prototype to a ‘%code requires’.  More
 importantly, since it depends upon ‘YYLTYPE’ and ‘yytoken_kind_t’,
 ‘%code requires’ is not sufficient.  Instead, move its prototype from
 the unqualified ‘%code’ to a ‘%code provides’:
@@ -3583,7 +3582,7 @@ semantic-type-related directives by semantic type:
 You could even place each of the above directive groups in the rules
 section of the grammar file next to the set of rules that uses the
 associated semantic type.  (In the rules section, you must terminate
-each of those directives with a semicolon.)  And you don’t have to worry
+each of those directives with a semicolon.)  And you don't have to worry
 that some directive (like a ‘%union’) in the definitions section is
 going to adversely affect their functionality in some counter-intuitive
 manner just because it comes first.  Such an organization is not
@@ -3591,7 +3590,7 @@ possible using PROLOGUE sections.
 
    This section has been concerned with explaining the advantages of the
 four PROLOGUE alternatives over the original Yacc PROLOGUE.  However, in
-most cases when using these directives, you shouldn’t need to think
+most cases when using these directives, you shouldn't need to think
 about all the low-level ordering issues discussed here.  Instead, you
 should simply use these directives to label each block of your code
 according to its purpose and let Bison handle the ordering.  ‘%code’ is
@@ -3664,7 +3663,7 @@ of syntactically equivalent tokens.  You use the symbol in grammar rules
 to mean that a token in that class is allowed.  The symbol is
 represented in the Bison parser by a numeric code, and the ‘yylex’
 function returns a token kind code to indicate what kind of token has
-been read.  You don’t need to know what the code value is; you can use
+been read.  You don't need to know what the code value is; you can use
 the symbol to stand for it.
 
    A “nonterminal symbol” stands for a class of syntactically equivalent
@@ -3690,7 +3689,7 @@ token names.
    • A “character token kind” (or “literal character token”) is written
      in the grammar using the same syntax used in C for character
      constants; for example, ‘'+'’ is a character token kind.  A
-     character token kind doesn’t need to be declared unless you need to
+     character token kind doesn't need to be declared unless you need to
      specify its semantic value data type (*note Value Type::),
      associativity, or precedence (*note Precedence::).
 
@@ -3709,13 +3708,13 @@ token names.
 
    • A “literal string token” is written like a C string constant; for
      example, ‘"<="’ is a literal string token.  A literal string token
-     doesn’t need to be declared unless you need to specify its semantic
+     doesn't need to be declared unless you need to specify its semantic
      value data type (*note Value Type::), associativity, or precedence
      (*note Precedence::).
 
      You can associate the literal string token with a symbolic name as
      an alias, using the ‘%token’ declaration (*note Token Decl::).  If
-     you don’t do that, the lexical analyzer has to retrieve the token
+     you don't do that, the lexical analyzer has to retrieve the token
      code for the literal string token from the ‘yytname’ table (*note
      Calling Convention::).
 
@@ -3748,7 +3747,7 @@ token kind is simply the positive numeric code of the character, so
 though you may need to convert it to ‘unsigned char’ to avoid
 sign-extension on hosts where ‘char’ is signed.  Each named token kind
 becomes a C macro in the parser implementation file, so ‘yylex’ can use
-the name to stand for the code.  (This is why periods don’t make sense
+the name to stand for the code.  (This is why periods don't make sense
 in terminal symbols.)  *Note Calling Convention::.
 
    If ‘yylex’ is defined in a separate file, you need to arrange for the
@@ -3777,7 +3776,7 @@ that are incompatible with ASCII must rebuild those files before
 compiling them.
 
    The symbol ‘error’ is a terminal symbol reserved for error recovery
-(*note Error Recovery::); you shouldn’t use it for any other purpose.
+(*note Error Recovery::); you shouldn't use it for any other purpose.
 In particular, ‘yylex’ should never return this value.  The default
 value of the error token is 256, unless you explicitly assigned 256 to
 one of your tokens with a ‘%token’ declaration.
@@ -3996,14 +3995,14 @@ or
    The value of ‘api.value.type’ should be a type name that does not
 contain parentheses or square brackets.
 
-   Alternatively in C, instead of relying of Bison’s ‘%define’ support,
+   Alternatively in C, instead of relying of Bison's ‘%define’ support,
 you may rely on the C preprocessor and define ‘YYSTYPE’ as a macro:
 
      #define YYSTYPE double
 
 This macro definition must go in the prologue of the grammar file (*note
 Grammar Outline::).  If compatibility with POSIX Yacc matters to you,
-use this.  Note however that Bison cannot know ‘YYSTYPE’’s value, not
+use this.  Note however that Bison cannot know ‘YYSTYPE’'s value, not
 even whether it is defined, so there are services it cannot provide.
 Besides this works only for C.
 
@@ -4223,18 +4222,18 @@ references construct.
 
    Note that the vertical-bar character ‘|’ is really a rule separator,
 and actions are attached to a single rule.  This is a difference with
-tools like Flex, for which ‘|’ stands for either “or”, or “the same
-action as that of the next rule”.  In the following example, the action
+tools like Flex, for which ‘|’ stands for either "or", or "the same
+action as that of the next rule".  In the following example, the action
 is triggered only when ‘b’ is found:
 
      a-or-b: 'a'|'b'   { a_or_b_found = 1; };
 
-   If you don’t specify an action for a rule, Bison supplies a default:
+   If you don't specify an action for a rule, Bison supplies a default:
 ‘$$ = $1’.  Thus, the value of the first symbol in the rule becomes the
 value of the whole rule.  Of course, the default action is valid only if
 the two data types match.  There is no meaningful default action for an
 empty rule; every empty rule must have an explicit action unless the
-rule’s value does not matter.
+rule's value does not matter.
 
    ‘$N’ with N zero or negative is allowed for reference to tokens and
 groupings on the stack _before_ those that match the current rule.  This
@@ -4384,7 +4383,7 @@ readability and maintainability (*note Named References::):
    After the embedded statement is parsed, its semantic value becomes
 the value of the entire ‘let’-statement.  Then the semantic value from
 the earlier action is used to restore the prior list of variables.  This
-removes the temporary ‘let’-variable from the list so that it won’t
+removes the temporary ‘let’-variable from the list so that it won't
 appear to exist while the rest of the program is parsed.
 
    Because the types of the semantic values of midrule actions are
@@ -4410,7 +4409,7 @@ without restoring it.  Thus, ‘$<context>5’ needs a destructor (*note
 Destructor Decl::), and Bison needs the type of the semantic value
 (‘context’) to select the right destructor.
 
-   As an extension to Yacc’s midrule actions, Bison offers a means to
+   As an extension to Yacc's midrule actions, Bison offers a means to
 type their semantic value: specify its type tag (‘<...>’ before the
 midrule action.
 
@@ -4522,7 +4521,6 @@ a destructor for that symbol:
            declare_variable ($var);
          };
 
-
 
 File: bison.info,  Node: Midrule Conflicts,  Prev: Midrule Action Translation,  Up: Midrule Actions
 
@@ -4733,7 +4731,7 @@ File: bison.info,  Node: Printing Locations,  Next: Location Default Action,  Pr
 ------------------------
 
 When using the default location type, the debug traces report the
-symbols’ location.  The generated parser does so using the
+symbols' location.  The generated parser does so using the
 ‘YYLOCATION_PRINT’ macro.
 
  -- Macro: YYLOCATION_PRINT (FILE, LOC);
@@ -4757,7 +4755,7 @@ locations are much more general than semantic values, there is room in
 the output parser to redefine the default action to take for each rule.
 The ‘YYLLOC_DEFAULT’ macro is invoked each time a rule is matched,
 before the associated action is run.  It is also invoked while
-processing a syntax error, to compute the error’s location.  Before
+processing a syntax error, to compute the error's location.  Before
 reporting an unresolvable syntactic ambiguity, a GLR parser invokes
 ‘YYLLOC_DEFAULT’ recursively to compute the location of that ambiguity.
 
@@ -4768,7 +4766,7 @@ dedicated code from semantic actions.
 the location of the grouping (the result of the computation).  When a
 rule is matched, the second parameter identifies locations of all right
 hand side elements of the rule being matched, and the third parameter is
-the size of the rule’s right hand side.  When a GLR parser reports an
+the size of the rule's right hand side.  When a GLR parser reports an
 ambiguity, which of multiple candidate right hand sides it passes to
 ‘YYLLOC_DEFAULT’ is undefined.  When processing a syntax error, the
 second parameter identifies locations of the symbols that were discarded
@@ -4863,7 +4861,6 @@ closing brace of the midrule action code:
      exp[res]: exp[x] '+' {$left = $x;}[left] exp[right]
        { $res = $left + $right; }
 
-
    In references, in order to specify names containing dots and dashes,
 an explicit bracketed syntax ‘$[name]’ and ‘@[name]’ must be used:
      if-stmt: "if" '(' expr ')' "then" then.stmt ';'
@@ -4911,7 +4908,7 @@ must declare it explicitly (*note Language and Grammar::).
 * Pure Decl::         Requesting a reentrant parser.
 * Push Decl::         Requesting a push parser.
 * Decl Summary::      Table of all Bison declarations.
-* %define Summary::   Defining variables to adjust Bison’s behavior.
+* %define Summary::   Defining variables to adjust Bison's behavior.
 * %code Summary::     Inserting code into the parser source.
 
 
@@ -4944,7 +4941,7 @@ follows:
 
    Bison will convert this into a definition in the parser, so that the
 function ‘yylex’ (if it is in this file) can use the name NAME to stand
-for this token kind’s code.
+for this token kind's code.
 
    Alternatively, you can use ‘%left’, ‘%right’, ‘%precedence’, or
 ‘%nonassoc’ instead of ‘%token’, if you wish to specify associativity
@@ -4960,7 +4957,7 @@ field immediately following the token name:
      %token XNUM 0x12d // a GNU extension
 
 It is generally best, however, to let Bison choose the numeric codes for
-all token kinds.  Bison will automatically select codes that don’t
+all token kinds.  Bison will automatically select codes that don't
 conflict with each other or with normal characters.
 
    In the event that the stack type is a union, you must augment the
@@ -5124,7 +5121,7 @@ code.
  -- Directive: %initial-action { CODE }
      Declare that the braced CODE must be invoked before parsing each
      time ‘yyparse’ is called.  The CODE may use ‘$$’ (or ‘$<TAG>$’) and
-     ‘@$’ — initial value and location of the lookahead — and the
+     ‘@$’ -- initial value and location of the lookahead -- and the
      ‘%parse-param’.
 
    For instance, if your locations use a file name, you may use
@@ -5221,7 +5218,7 @@ the end token (token 0) if you redefine it from ‘$end’ to, for example,
    Finally, Bison will never invoke a ‘%destructor’ for an unreferenced
 midrule semantic value (*note Midrule Actions::).  That is, Bison does
 not consider a midrule to have a semantic value if you do not reference
-‘$$’ in the midrule’s action or ‘$N’ (where N is the right-hand side
+‘$$’ in the midrule's action or ‘$N’ (where N is the right-hand side
 symbol position of the midrule) in any later action in that rule.
 However, if you do reference either, the Bison-generated parser will
 invoke the ‘<>’ ‘%destructor’ whenever it discards the midrule symbol.
@@ -5354,7 +5351,7 @@ document this fact with an ‘%expect’ modifier as follows:
 
    Mid-rule actions generate implicit rules that are also subject to
 conflicts (*note Midrule Conflicts::).  To attach an ‘%expect’ or
-‘%expect-rr’ annotation to an implicit mid-rule action’s rule, put it
+‘%expect-rr’ annotation to an implicit mid-rule action's rule, put it
 before the action.  For example,
 
      %glr-parser
@@ -5377,7 +5374,7 @@ other, and we should expect one reduce/reduce conflict for each.
      a verbose list of where the conflicts occur.  Bison will also print
      the number of conflicts.
 
-   • Check each of the conflicts to make sure that Bison’s default
+   • Check each of the conflicts to make sure that Bison's default
      resolution is what you really want.  If not, rewrite the grammar
      and go back to the beginning.
 
@@ -5457,7 +5454,7 @@ completely parsed.  A push parser, on the other hand, is called each
 time a new token is made available.
 
    A push parser is typically useful when the parser is part of a main
-event loop in the client’s application.  This is typically a requirement
+event loop in the client's application.  This is typically a requirement
 of a GUI, when the main event loop needs to be triggered within a
 certain time period.
 
@@ -5484,7 +5481,7 @@ parser at a time.
 
    When a push parser is selected, Bison will generate some new symbols
 in the generated parser.  ‘yypstate’ is a structure that the generated
-parser uses to store the parser’s state.  ‘yypstate_new’ is the function
+parser uses to store the parser's state.  ‘yypstate_new’ is the function
 that will create a new parser instance.  ‘yypstate_delete’ will free the
 resources associated with the corresponding parser instance.  Finally,
 ‘yypush_parse’ is the function that should be called whenever a token is
@@ -5514,7 +5511,7 @@ would thus look like this:
      } while (status == YYPUSH_MORE);
      yypstate_delete (ps);
 
-   That’s it.  Notice the next token is put into the global variable
+   That's it.  Notice the next token is put into the global variable
 ‘yychar’ for use by the next invocation of the ‘yypush_parse’ function.
 
    Bison also supports both the push parser interface along with the
@@ -5581,7 +5578,7 @@ Here is a summary of the declarations used to define a grammar:
      Decl::).
 
  -- Directive: %start
-     Specify the grammar’s start symbol (*note Start Decl::).
+     Specify the grammar's start symbol (*note Start Decl::).
 
  -- Directive: %expect
      Declare the expected number of shift/reduce conflicts, either
@@ -5609,7 +5606,7 @@ directives:
  -- Directive: %define VARIABLE VALUE
  -- Directive: %define VARIABLE {VALUE}
  -- Directive: %define VARIABLE "VALUE"
-     Define a variable to adjust Bison’s behavior.  *Note %define
+     Define a variable to adjust Bison's behavior.  *Note %define
      Summary::.
 
  -- Directive: %defines
@@ -5703,7 +5700,7 @@ directives:
      ‘yytoken_kind_t’, ‘YYSTYPE’, ‘YYLTYPE’.
 
  -- Directive: %no-lines
-     Don’t generate any ‘#line’ preprocessor commands in the parser
+     Don't generate any ‘#line’ preprocessor commands in the parser
      implementation file.  Ordinarily Bison writes these commands in the
      parser implementation file so that the C compiler and debuggers
      will associate errors and object code with your source file (the
@@ -5762,7 +5759,7 @@ directives:
      ‘YYNSTATES’
           The number of parser states (*note Parser States::).
 
-     Here’s code for looking up a multicharacter token in ‘yytname’,
+     Here's code for looking up a multicharacter token in ‘yytname’,
      assuming that the characters of the token are stored in
      ‘token_buffer’, and assuming that the token does not contain any
      characters like ‘"’ that require escaping.
@@ -5804,7 +5801,7 @@ File: bison.info,  Node: %define Summary,  Next: %code Summary,  Prev: Decl Summ
 3.7.14 %define Summary
 ----------------------
 
-There are many features of Bison’s behavior that can be controlled by
+There are many features of Bison's behavior that can be controlled by
 assigning the feature a single value.  For historical reasons, some such
 features are assigned values by dedicated directives, such as ‘%start’,
 which assigns the start symbol.  However, newer such features are
@@ -5853,7 +5850,7 @@ described below.
 
         • Language(s): C++
 
-        • Purpose: Define the type of file names in Bison’s default
+        • Purpose: Define the type of file names in Bison's default
           location and position types.  *Note Exposing the Location
           Classes::.
 
@@ -5892,7 +5889,7 @@ described below.
           Using ‘api.header.include’ does not change the name of the
           generated header, only how it is included.
 
-          To work around limitations of Automake’s ‘ylwrap’ (which runs
+          To work around limitations of Automake's ‘ylwrap’ (which runs
           ‘bison’ with ‘--yacc’), ‘api.header.include’ is _not_
           predefined when the output file is ‘y.tab.c’.  Define it to
           avoid the duplication.
@@ -5913,7 +5910,7 @@ described below.
 
         • Language(s): C++
 
-        • Purpose: Define the name of the file in which Bison’s default
+        • Purpose: Define the name of the file in which Bison's default
           location and position types are generated.  *Note Exposing the
           Location Classes::.
 
@@ -5930,7 +5927,7 @@ described below.
 
         • Default Value: Not applicable if locations are not enabled, or
           if a user location type is specified (see
-          ‘api.location.type’).  Otherwise, Bison’s ‘location’ is
+          ‘api.location.type’).  Otherwise, Bison's ‘location’ is
           generated in ‘location.hh’ (*note C++ location::).
 
         • History: Introduced in Bison 3.2.
@@ -6103,7 +6100,7 @@ described below.
 
         • Accepted Values: Any non empty string.  Must be a valid
           identifier in the target language (typically a non empty
-          sequence of letters, underscores, and —not at the beginning—
+          sequence of letters, underscores, and --not at the beginning--
           digits).
 
           The empty prefix is (generally) invalid:
@@ -6163,7 +6160,7 @@ described below.
 
         • Accepted Values: Any string.  Must be a valid identifier
           prefix in the target language (typically, a possibly empty
-          sequence of letters, underscores, and —not at the beginning—
+          sequence of letters, underscores, and --not at the beginning--
           digits).
 
         • Default Value: empty
@@ -6250,7 +6247,7 @@ described below.
                properly supported yet.
           ‘union-directive’ (C, C++, D)
                The type is defined thanks to the ‘%union’ directive.
-               You don’t have to define ‘api.value.type’ in that case,
+               You don't have to define ‘api.value.type’ in that case,
                using ‘%union’ suffices.  *Note Union Decl::.  For
                instance:
                     %define api.value.type union-directive
@@ -6373,7 +6370,7 @@ described below.
           In C++, when variants are used (*note C++ Variants::), symbols
           must be constructed and destroyed properly.  This option
           checks these constraints using runtime type information
-          (RTTI). Therefore the generated code cannot be compiled with
+          (RTTI).  Therefore the generated code cannot be compiled with
           RTTI disabled (via compiler options such as ‘-fno-rtti’).
 
         • Accepted Values: Boolean
@@ -6487,9 +6484,9 @@ qualifiers produce an error.  Some of the accepted qualifiers are:
 
         • Purpose: This is the best place to write dependency code
           required for the value and location types (‘YYSTYPE’ and
-          ‘YYLTYPE’ in C). In other words, it’s the best place to define
+          ‘YYLTYPE’ in C). In other words, it's the best place to define
           types referenced in ‘%union’ directives.  In C, if you use
-          ‘#define’ to override Bison’s default ‘YYSTYPE’ and ‘YYLTYPE’
+          ‘#define’ to override Bison's default ‘YYSTYPE’ and ‘YYLTYPE’
           definitions, then it is also the best place.  However you
           should rather ‘%define’ ‘api.value.type’ and
           ‘api.location.type’.
@@ -6571,7 +6568,7 @@ by PREFIX (i.e., PREFIX upper-cased) instead of ‘YY’.
 ‘yylval’, ‘yylloc’, ‘yychar’ and ‘yydebug’.  If you use a push parser,
 ‘yypush_parse’, ‘yypull_parse’, ‘yypstate’, ‘yypstate_new’ and
 ‘yypstate_delete’ will also be renamed.  The renamed macros include
-‘YYSTYPE’, ‘YYLTYPE’, and ‘YYDEBUG’, which is treated specifically —
+‘YYSTYPE’, ‘YYLTYPE’, and ‘YYDEBUG’, which is treated specifically --
 more about this below.
 
    For example, if you use ‘%define api.prefix {c}’, the names become
@@ -6609,7 +6606,7 @@ beginning of the parser implementation file, defining ‘yyparse’ as
      int yyparse (void);
 
    This effectively substitutes one name for the other in the entire
-parser implementation file, thus the “original” names (‘yylex’,
+parser implementation file, thus the "original" names (‘yylex’,
 ‘YYSTYPE’, ...) are also usable in the parser implementation file.
 
    However, in the parser header file, the symbols are defined renamed,
@@ -6667,7 +6664,7 @@ grammar file, you are likely to run into trouble.
                               which reads tokens.
 * Error Reporting::         Passing error messages to the user.
 * Action Features::         Special features for use in actions.
-* Internationalization::    How to let the parser speak in the user’s
+* Internationalization::    How to let the parser speak in the user's
                               native language.
 
 
@@ -6714,7 +6711,7 @@ declaration ‘%parse-param’:
      declaring functions or prototypes.  The last identifier in
      ARGUMENT-DECLARATION must be the argument name.
 
-   Here’s an example.  Write this in the parser:
+   Here's an example.  Write this in the parser:
 
      %parse-param {int *nastiness} {int *randomness}
 
@@ -6903,7 +6900,7 @@ that there is nothing left afterwards.  *Note Calling Convention::, for
 an example.
 
    Returning ‘YYUNDEF’ tells the parser that some lexical error was
-found.  It will emit an error message about an “invalid token”, and
+found.  It will emit an error message about an "invalid token", and
 enter error-recovery (*note Error Recovery::).  Returning an unknown
 token kind results in the exact same behavior.
 
@@ -6974,9 +6971,9 @@ if the type is ‘int’ (the default), you might write this in ‘yylex’:
        return INT;      /* Return the kind of the token. */
        ...
 
-   When you are using multiple data types, ‘yylval’’s type is a union
+   When you are using multiple data types, ‘yylval’'s type is a union
 made from the ‘%union’ declaration (*note Union Decl::).  So when you
-store a token’s value, you must use the proper member of the union.  If
+store a token's value, you must use the proper member of the union.  If
 the ‘%union’ declaration looks like this:
 
      %union {
@@ -7117,7 +7114,7 @@ incorrect information if LAC is not enabled (*note LAC::).
 
    The parser can detect one other kind of error: memory exhaustion.
 This can happen when the input contains constructions that are very
-deeply nested.  It isn’t likely you will encounter this, since the Bison
+deeply nested.  It isn't likely you will encounter this, since the Bison
 parser normally extends its stack automatically up to a very large
 limit.  But if memory is exhausted, ‘yyparse’ calls ‘yyerror’ in the
 usual fashion, except that the argument string is ‘"memory exhausted"’.
@@ -7175,9 +7172,9 @@ then the parser no longer passes syntax error messages to ‘yyerror’,
 rather it delegates that task to the user by calling the
 ‘yyreport_syntax_error’ function.
 
-   The following functions and types are “‘static’”: they are defined in
+   The following functions and types are "‘static’": they are defined in
 the implementation file (‘*.c’) and available only from there.  They are
-meant to be used from the grammar’s epilogue.
+meant to be used from the grammar's epilogue.
 
  -- Function: static int yyreport_syntax_error (const yypcontext_t *CTX)
      Report a syntax error to the user.  Return 0 on success, ‘YYENOMEM’
@@ -7211,7 +7208,7 @@ meant to be used from the grammar’s epilogue.
 
  -- Function: static yysymbol_kind_t yypcontext_token (const
           yypcontext_t *CTX)
-     The “unexpected” token: the symbol kind of the lookahead token that
+     The "unexpected" token: the symbol kind of the lookahead token that
      caused the syntax error.  Returns ‘YYSYMBOL_YYEMPTY’ if there is no
      lookahead.
 
@@ -7392,12 +7389,12 @@ File: bison.info,  Node: Internationalization,  Prev: Action Features,  Up: Inte
 
 A Bison-generated parser can print diagnostics, including error and
 tracing messages.  By default, they appear in English.  However, Bison
-also supports outputting diagnostics in the user’s native language.  To
+also supports outputting diagnostics in the user's native language.  To
 make this work, the user should set the usual environment variables.
-*Note The User’s View: (gettext)Users.  For example, the shell command
-‘export LC_ALL=fr_CA.UTF-8’ might set the user’s locale to French
+*Note The User's View: (gettext)Users.  For example, the shell command
+‘export LC_ALL=fr_CA.UTF-8’ might set the user's locale to French
 Canadian using the UTF-8 encoding.  The exact set of available locales
-depends on the user’s installation.
+depends on the user's installation.
 
 * Menu:
 
@@ -7411,13 +7408,13 @@ File: bison.info,  Node: Enabling I18n,  Next: Token I18n,  Up: Internationaliza
 -----------------------------------
 
 The maintainer of a package that uses a Bison-generated parser enables
-the internationalization of the parser’s output through the following
+the internationalization of the parser's output through the following
 steps.  Here we assume a package that uses GNU Autoconf and GNU
 Automake.
 
   1. Into the directory containing the GNU Autoconf macros used by the
-     package —often called ‘m4’— copy the ‘bison-i18n.m4’ file installed
-     by Bison under ‘share/aclocal/bison-i18n.m4’ in Bison’s
+     package --often called ‘m4’-- copy the ‘bison-i18n.m4’ file
+     installed by Bison under ‘share/aclocal/bison-i18n.m4’ in Bison's
      installation directory.  For example:
 
           cp /usr/local/share/aclocal/bison-i18n.m4 m4/bison-i18n.m4
@@ -7430,7 +7427,7 @@ Automake.
      to enable translations in the Bison-generated parser.
 
   3. In the ‘main’ function of your program, designate the directory
-     containing Bison’s runtime message catalog, through a call to
+     containing Bison's runtime message catalog, through a call to
      ‘bindtextdomain’ with domain name ‘bison-runtime’.  For example:
 
           bindtextdomain ("bison-runtime", BISON_LOCALEDIR);
@@ -7478,17 +7475,17 @@ internationalization marker (‘_("function")’).
 parser will use both ‘N_’ and ‘_’, that must be defined (*note The
 Programmer’s View: (gettext)Programmers.).  They are used only on string
 aliases marked for translation.  In other words, even if your catalog
-features a translation for “function”, then with
+features a translation for "function", then with
 
      %token
        <symrec*>
          FUN      "function"
          VAR    _("variable")
 
-“function” will appear untranslated in debug traces and error messages.
+"function" will appear untranslated in debug traces and error messages.
 
    Unless defined by the user, the end-of-file token, ‘YYEOF’, is
-provided “end of file” as an alias.  It is also internationalized if the
+provided "end of file" as an alias.  It is also internationalized if the
 user internationalized tokens.  To map it to another string, use:
 
      %token END 0 _("end of input")
@@ -7512,11 +7509,11 @@ When the last N tokens and groupings shifted match the components of a
 grammar rule, they can be combined according to that rule.  This is
 called “reduction”.  Those tokens and groupings are replaced on the
 stack by a single grouping whose symbol is the result (left hand side)
-of that rule.  Running the rule’s action is part of the process of
+of that rule.  Running the rule's action is part of the process of
 reduction, because this is what computes the semantic value of the
 resulting grouping.
 
-   For example, if the infix calculator’s parser stack contains this:
+   For example, if the infix calculator's parser stack contains this:
 
      1 + 5 * 3
 
@@ -7533,7 +7530,7 @@ At this point, another reduction can be made, resulting in the single
 value 16.  Then the newline token can be shifted.
 
    The parser tries, by shifts and reductions, to reduce the entire
-input down to a single grouping whose symbol is the grammar’s
+input down to a single grouping whose symbol is the grammar's
 start-symbol (*note Language and Grammar::).
 
    This kind of parser is known in the literature as a bottom-up parser.
@@ -7543,7 +7540,7 @@ start-symbol (*note Language and Grammar::).
 * Lookahead::         Parser looks one token ahead when deciding what to do.
 * Shift/Reduce::      Conflicts: when either shifting or reduction is valid.
 * Precedence::        Operator precedence works by resolving conflicts.
-* Contextual Precedence::  When an operator’s precedence depends on context.
+* Contextual Precedence::  When an operator's precedence depends on context.
 * Parser States::     The parser is a finite-state-machine with stack.
 * Reduce/Reduce::     When two rules are applicable in the same situation.
 * Mysterious Conflicts:: Conflicts that look unjustified.
@@ -7560,7 +7557,7 @@ File: bison.info,  Node: Lookahead,  Next: Shift/Reduce,  Up: Algorithm
 The Bison parser does _not_ always reduce immediately as soon as the
 last N tokens and groupings match a rule.  This is because such a simple
 strategy is inadequate to handle most languages.  Instead, when a
-reduction is possible, the parser sometimes “looks ahead” at the next
+reduction is possible, the parser sometimes "looks ahead" at the next
 token in order to decide what to do.
 
    When a token is read, it is not immediately shifted; first it becomes
@@ -7630,7 +7627,7 @@ rule.
    This situation, where either a shift or a reduction would be valid,
 is called a “shift/reduce conflict”.  Bison is designed to resolve these
 conflicts by choosing to shift, unless otherwise directed by operator
-precedence declarations.  To see the reason for this, let’s contrast it
+precedence declarations.  To see the reason for this, let's contrast it
 with the other alternative.
 
    Since the parser prefers to shift the ‘"else"’, the result is to
@@ -7657,10 +7654,10 @@ Bison accomplishes by choosing to shift rather than reduce.  (It would
 ideally be cleaner to write an unambiguous grammar, but that is very
 hard to do in this case.)  This particular ambiguity was first
 encountered in the specifications of Algol 60 and is called the
-“dangling ‘else’” ambiguity.
+"dangling ‘else’" ambiguity.
 
    To assist the grammar author in understanding the nature of each
-conflict, Bison can be asked to generate “counterexamples”.  In the
+conflict, Bison can be asked to generate "counterexamples".  In the
 present case it actually even proves that the grammar is ambiguous by
 exhibiting a string with two different parses:
 
@@ -7684,7 +7681,7 @@ exhibiting a string with two different parses:
 shift/reduce conflicts, you can use the ‘%expect N’ declaration.  There
 will be no warning as long as the number of shift/reduce conflicts is
 exactly N, and Bison will report an error if there is a different
-number.  *Note Expect Decl::.  However, we don’t recommend the use of
+number.  *Note Expect Decl::.  However, we don't recommend the use of
 ‘%expect’ (except ‘%expect 0’!), as an equal number of conflicts does
 not mean that they are the _same_.  When possible, you should rather use
 precedence directives to _fix_ the conflicts explicitly (*note Non
@@ -7784,7 +7781,7 @@ list of tokens, which are operators whose precedence and associativity
 is being declared.  The ‘%left’ declaration makes all those operators
 left-associative and the ‘%right’ declaration makes them
 right-associative.  A third alternative is ‘%nonassoc’, which declares
-that it is a syntax error to find the same operator twice “in a row”.
+that it is a syntax error to find the same operator twice "in a row".
 The last alternative, ‘%precedence’, allows to define only precedence
 and no associativity at all.  As a result, any associativity-related
 conflict that remains will be reported as an compile-time error.  The
@@ -7873,8 +7870,8 @@ Precedence::.)
 
    Finally, the resolution of conflicts works by comparing the
 precedence of the rule being considered with that of the lookahead
-token.  If the token’s precedence is higher, the choice is to shift.  If
-the rule’s precedence is higher, the choice is to reduce.  If they have
+token.  If the token's precedence is higher, the choice is to shift.  If
+the rule's precedence is higher, the choice is to reduce.  If they have
 equal precedence, the choice is made based on the associativity of that
 precedence level.  The verbose output file made by ‘-v’ (*note
 Invocation::) says how each conflict was resolved.
@@ -7890,7 +7887,7 @@ File: bison.info,  Node: Non Operators,  Prev: How Precedence,  Up: Precedence
 
 Using properly precedence and associativity directives can help fixing
 shift/reduce conflicts that do not involve arithmetic-like operators.
-For instance, the “dangling ‘else’” problem (*note Shift/Reduce::) can
+For instance, the "dangling ‘else’" problem (*note Shift/Reduce::) can
 be solved elegantly in two different ways.
 
    In the present case, the conflict is between the token ‘"else"’
@@ -7910,12 +7907,12 @@ action, use right associativity:
      %right "then" "else"
 
    Neither solution is perfect however.  Since Bison does not provide,
-so far, “scoped” precedence, both force you to declare the precedence of
+so far, "scoped" precedence, both force you to declare the precedence of
 these keywords with respect to the other operators your grammar.
 Therefore, instead of being warned about new conflicts you would be
 unaware of (e.g., a shift/reduce conflict due to ‘if test then 1 else 2
 + 3’ being ambiguous: ‘if test then 1 else (2 + 3)’ or ‘(if test then 1
-else 2) + 3’?), the conflict will be already “fixed”.
+else 2) + 3’?), the conflict will be already "fixed".
 
 
 File: bison.info,  Node: Contextual Precedence,  Next: Parser States,  Prev: Precedence,  Up: Algorithm
@@ -7936,8 +7933,8 @@ the ‘%prec’ modifier for rules.
 
    The ‘%prec’ modifier declares the precedence of a particular rule by
 specifying a terminal symbol whose precedence should be used for that
-rule.  It’s not necessary for that symbol to appear otherwise in the
-rule.  The modifier’s syntax is:
+rule.  It's not necessary for that symbol to appear otherwise in the
+rule.  The modifier's syntax is:
 
      %prec TERMINAL-SYMBOL
 
@@ -7980,9 +7977,9 @@ do next.
 
    Each time a lookahead token is read, the current parser state
 together with the kind of lookahead token are looked up in a table.
-This table entry can say, “Shift the lookahead token.” In this case, it
+This table entry can say, "Shift the lookahead token."  In this case, it
 also specifies the new parser state, which is pushed onto the top of the
-parser stack.  Or it can say, “Reduce using rule number N.” This means
+parser stack.  Or it can say, "Reduce using rule number N."  This means
 that a certain number of tokens or groupings are taken off the top of
 the stack, and replaced by one grouping.  In other words, that number of
 states are popped from the stack, and one new state is pushed.
@@ -8030,8 +8027,8 @@ via ‘maybeword’ and then the second rule.
    You might think that this is a distinction without a difference,
 because it does not change whether any particular input is valid or not.
 But it does affect which actions are run.  One parsing order runs the
-second rule’s action; the other runs the first rule’s action and the
-third rule’s action.  In this example, the output of the program
+second rule's action; the other runs the first rule's action and the
+third rule's action.  In this example, the output of the program
 changes.
 
    Bison resolves a reduce/reduce conflict by choosing to use the rule
@@ -8147,7 +8144,7 @@ File: bison.info,  Node: Mysterious Conflicts,  Next: Tuning LR,  Prev: Reduce/R
 5.7 Mysterious Conflicts
 ========================
 
-Sometimes reduce/reduce conflicts can occur that don’t look warranted.
+Sometimes reduce/reduce conflicts can occur that don't look warranted.
 Here is an example:
 
      %%
@@ -8182,7 +8179,7 @@ default_, for historical reasons.  In this grammar, two contexts, that
 after an ‘"id"’ at the beginning of a ‘param_spec’ and likewise at the
 beginning of a ‘return_spec’, are similar enough that Bison assumes they
 are the same.  They appear similar because the same set of rules would
-be active—the rule for reducing to a ‘name’ and that for reducing to a
+be active--the rule for reducing to a ‘name’ and that for reducing to a
 ‘type’.  Bison is unable to determine at that stage of processing that
 the rules would require different lookahead tokens in the two contexts,
 so it makes a single parser state for them both.  Combining the two
@@ -8197,7 +8194,7 @@ algorithm.  Either IELR(1) or canonical LR(1) would suffice, but the
 former is more efficient and easier to debug during development.  *Note
 LR Table Construction::, for details.
 
-   If you instead wish to work around LALR(1)’s limitations, you can
+   If you instead wish to work around LALR(1)'s limitations, you can
 often fix a mysterious conflict by identifying the two parser states
 that are being confused, and adding something to make them look
 distinct.  In the above example, adding one rule to ‘return_spec’ as
@@ -8243,11 +8240,11 @@ File: bison.info,  Node: Tuning LR,  Next: Generalized LR Parsing,  Prev: Myster
 5.8 Tuning LR
 =============
 
-The default behavior of Bison’s LR-based parsers is chosen mostly for
+The default behavior of Bison's LR-based parsers is chosen mostly for
 historical reasons, but that behavior is often not robust.  For example,
 in the previous section, we discussed the mysterious conflicts that can
-be produced by LALR(1), Bison’s default parser table construction
-algorithm.  Another example is Bison’s ‘%define parse.error verbose’
+be produced by LALR(1), Bison's default parser table construction
+algorithm.  Another example is Bison's ‘%define parse.error verbose’
 directive, which instructs the generated parser to produce verbose
 syntax error messages, which can sometimes contain incorrect
 information.
@@ -8310,7 +8307,7 @@ use IELR will result in unnecessarily large parser tables.  That is,
 IELR generates LALR tables when LALR (using a deterministic parsing
 algorithm) is sufficient to support the full language-recognition power
 of LR. Thus, by enabling IELR at the start of grammar development, you
-can safely and completely eliminate the need to consider LALR’s
+can safely and completely eliminate the need to consider LALR's
 shortcomings.
 
    While IELR is almost always preferable, there are circumstances where
@@ -8335,7 +8332,7 @@ each parser table construction algorithm within Bison:
           to resolve conflicts statically, GLR behaves more like a
           deterministic parser in the syntactic contexts where those
           conflicts appear, and so either IELR or canonical LR can then
-          be helpful to avoid LALR’s mysterious behavior.
+          be helpful to avoid LALR's mysterious behavior.
 
         • Malformed grammars.
 
@@ -8354,7 +8351,7 @@ each parser table construction algorithm within Bison:
      sentences.  However, like LALR, IELR merges parser states during
      parser table construction so that the number of parser states is
      often an order of magnitude less than for canonical LR. More
-     importantly, because canonical LR’s extra parser states may contain
+     importantly, because canonical LR's extra parser states may contain
      duplicate conflicts in the case of non-LR grammars, the number of
      conflicts for IELR is often an order of magnitude less as well.
      This effect can significantly reduce the complexity of developing a
@@ -8533,7 +8530,7 @@ enable default reductions in consistent states, canonical LR and IELR
 behave almost exactly the same for both syntactically acceptable and
 syntactically unacceptable input.  While LALR still does not support the
 full language-recognition power of canonical LR and IELR, LAC at least
-enables LALR’s syntax error handling to correctly reflect LALR’s
+enables LALR's syntax error handling to correctly reflect LALR's
 language-recognition power.
 
    There are a few caveats to consider when using LAC:
@@ -8564,7 +8561,7 @@ language-recognition power.
      reductions in consistent states and shift actions, the parser never
      has to initiate an exploratory parse.  Moreover, the most
      time-consuming tasks in a parse are often the file I/O, the lexical
-     analysis performed by the scanner, and the user’s semantic actions,
+     analysis performed by the scanner, and the user's semantic actions,
      but none of these are performed during the exploratory parse.
      Finally, the base of the temporary stack used during an exploratory
      parse is a pointer into the normal parser state stack so that the
@@ -8582,7 +8579,7 @@ File: bison.info,  Node: Unreachable States,  Prev: LAC,  Up: Tuning LR
 5.8.4 Unreachable States
 ------------------------
 
-If there exists no sequence of transitions from the parser’s start state
+If there exists no sequence of transitions from the parser's start state
 to some state S, then Bison considers S to be an “unreachable state”.  A
 state can become unreachable during conflict resolution if Bison
 disables a shift action leading to it from a predecessor state.
@@ -8602,7 +8599,7 @@ understand the relationship between the parser and the grammar.
 
      Unreachable states may contain conflicts and may use rules not used
      in any other state.  Thus, keeping unreachable states may induce
-     warnings that are irrelevant to your parser’s behavior, and it may
+     warnings that are irrelevant to your parser's behavior, and it may
      eliminate warnings that are relevant.  Of course, the change in
      warnings may actually be relevant to a parser table analysis that
      wants to keep unreachable states, so this behavior will likely
@@ -8635,7 +8632,7 @@ The same is true of languages that require more than one symbol of
 lookahead, since the parser lacks the information necessary to make a
 decision at the point it must be made in a shift/reduce parser.
 Finally, as previously mentioned (*note Mysterious Conflicts::), there
-are languages where Bison’s default choice of how to summarize the input
+are languages where Bison's default choice of how to summarize the input
 seen so far loses necessary information.
 
    When you use the ‘%glr-parser’ declaration in your grammar file,
@@ -8685,7 +8682,7 @@ length of the input times the maximum number of stacks required for any
 prefix of the input.  Thus, really ambiguous or nondeterministic
 grammars can require exponential time and space to process.  Such badly
 behaving examples, however, are not generally of practical interest.
-Usually, nondeterminism in a grammar is local—the parser is “in doubt”
+Usually, nondeterminism in a grammar is local--the parser is "in doubt"
 only for a few tokens at a time.  Therefore, the current data structure
 should generally be adequate.  On LR(1) portions of a grammar, in
 particular, it is only slightly slower than with the deterministic LR(1)
@@ -8837,14 +8834,14 @@ shifted will error messages resume.
 as any other rules can.
 
    You can make error messages resume immediately by using the macro
-‘yyerrok’ in an action.  If you do this in the error rule’s action, no
+‘yyerrok’ in an action.  If you do this in the error rule's action, no
 error messages will be suppressed.  This macro requires no arguments;
 ‘yyerrok;’ is a valid C statement.
 
    The previous lookahead token is reanalyzed immediately after an
 error.  If this is unacceptable, then the macro ‘yyclearin’ may be used
 to clear this token.  Write the statement ‘yyclearin;’ in the error
-rule’s action.  *Note Action Features::.
+rule's action.  *Note Action Features::.
 
    For example, suppose that on a syntax error, an error handling
 routine is called that advances the input stream to some point where
@@ -8875,7 +8872,7 @@ for such languages.
 * Tie-in Recovery::   Lexical tie-ins have implications for how
                         error recovery rules must be written.
 
-   (Actually, “kludge” means any technique that gets its job done but is
+   (Actually, "kludge" means any technique that gets its job done but is
 neither clean nor robust.)
 
 
@@ -8904,7 +8901,7 @@ choice of token kind to recognize.  ‘IDENTIFIER’ is accepted as an
 expression, but ‘TYPENAME’ is not.  ‘TYPENAME’ can start a declaration,
 but ‘IDENTIFIER’ cannot.  In contexts where the meaning of the
 identifier is _not_ significant, such as in declarations that can shadow
-a typedef name, either ‘TYPENAME’ or ‘IDENTIFIER’ is accepted—there is
+a typedef name, either ‘TYPENAME’ or ‘IDENTIFIER’ is accepted--there is
 one rule for each of the two token kinds.
 
    This technique is simple to use if the decision of which kinds of
@@ -8922,13 +8919,13 @@ earlier:
      }
 
    Unfortunately, the name being declared is separated from the
-declaration construct itself by a complicated syntactic structure—the
-“declarator”.
+declaration construct itself by a complicated syntactic structure--the
+"declarator".
 
    As a result, part of the Bison parser for C needs to be duplicated,
 with all the nonterminal names changed: once for parsing a declaration
 in which a typedef name can be redefined, and once for parsing a
-declaration in which that can’t be done.  Here is a part of the
+declaration in which that can't be done.  Here is a part of the
 duplication, with actions omitted for brevity:
 
      initdcl:
@@ -9050,7 +9047,7 @@ way you can write the action to determine whether a ‘hex’ construct is
 being aborted or not.  So if you are using a lexical tie-in, you had
 better make sure your error recovery rules are not of this kind.  Each
 rule must be such that you can be sure that it always will, or always
-won’t, have to clear the flag.
+won't, have to clear the flag.
 
 
 File: bison.info,  Node: Debugging,  Next: Invocation,  Prev: Context Dependency,  Up: Top
@@ -9058,7 +9055,7 @@ File: bison.info,  Node: Debugging,  Next: Invocation,  Prev: Context Dependency
 8 Debugging Your Parser
 ***********************
 
-Developing a parser can be a challenge, especially if you don’t
+Developing a parser can be a challenge, especially if you don't
 understand the algorithm (*note Algorithm::).  This chapter explains how
 to understand and debug a parser.
 
@@ -9118,7 +9115,7 @@ features one shift/reduce conflict:
      else.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
      else.y: note: rerun with option '-Wcounterexamples' to generate conflict counterexamples
 
-Let’s rerun ‘bison’ with the option ‘-Wcex’/‘-Wcounterexamples’(the
+Let's rerun ‘bison’ with the option ‘-Wcex’/‘-Wcounterexamples’(the
 following output is actually in color):
 
      else.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
@@ -9205,7 +9202,7 @@ shows that the grammar accepts the empty input in two different ways.
 two ways.  In these cases, counterexample generation will provide two
 examples that are the same up until the dot.  Most notably, this will
 happen when your grammar requires a stronger parser (more lookahead, LR
-instead of LALR). The following example isn’t LR(1):
+instead of LALR). The following example isn't LR(1):
 
      %token ID
      %%
@@ -9309,7 +9306,7 @@ might vary, but the interpretation is the same.
 The first section reports useless tokens, nonterminals and rules.
 Useless nonterminals and rules are removed in order to produce a smaller
 parser, but useless tokens are preserved, since they might be used by
-the scanner (note the difference between “useless” and “unused” below):
+the scanner (note the difference between "useless" and "unused" below):
 
      Nonterminals useless in grammar
         useless
@@ -9373,14 +9370,14 @@ input cursor.
 
          exp  go to state 2
 
-   This reads as follows: “state 0 corresponds to being at the very
+   This reads as follows: "state 0 corresponds to being at the very
 beginning of the parsing, in the initial rule, right before the start
 symbol (here, ‘exp’).  When the parser returns to this state right after
 having reduced a rule that produced an ‘exp’, the control flow jumps to
 state 2.  If there is no such transition on a nonterminal symbol, and
 the lookahead is a ‘NUM’, then this token is shifted onto the parse
 stack, and the control flow jumps to state 1.  Any other lookahead
-triggers a syntax error.”
+triggers a syntax error."
 
    Even though the only active rule in state 0 seems to be rule 0, the
 report lists ‘NUM’ as a lookahead token because ‘NUM’ can be at the
@@ -9749,7 +9746,7 @@ distinguished by a red filling color on these nodes, just like how they
 are reported between square brackets in the verbose file.
 
    The reduction corresponding to the rule number 0 is the acceptation
-state.  It is shown as a blue diamond, labeled “Acc”.
+state.  It is shown as a blue diamond, labeled "Acc".
 
 Graphical Representation of Gotos
 ---------------------------------
@@ -9802,7 +9799,7 @@ File: bison.info,  Node: Tracing,  Prev: Xml,  Up: Debugging
 8.5 Tracing Your Parser
 =======================
 
-When a Bison grammar compiles properly but parses “incorrectly”, the
+When a Bison grammar compiles properly but parses "incorrectly", the
 ‘yydebug’ parser-trace feature helps figuring out why.
 
 * Menu:
@@ -9890,7 +9887,7 @@ arrive at the place where something undesirable happens, and you will
 see which parts of the grammar are to blame.
 
    The parser implementation file is a C/C++/D/Java program and you can
-use debuggers on it, but it’s not easy to interpret what it is doing.
+use debuggers on it, but it's not easy to interpret what it is doing.
 The parser function is a finite-state machine interpreter, and aside
 from the actions it executes the same code over and over.  Only the
 values of variables show where in the grammar it is working.
@@ -9923,7 +9920,7 @@ its prologue:
    The ‘%define’ directive instructs Bison to generate run-time trace
 support.  Then, activation of these traces is controlled at run-time by
 the ‘yydebug’ variable, which is disabled by default.  Because these
-traces will refer to the “states” of the parser, it is helpful to ask
+traces will refer to the "states" of the parser, it is helpful to ask
 for the creation of a description of that parser; this is the purpose of
 (admittedly ill-named) ‘%verbose’ directive.
 
@@ -10059,10 +10056,10 @@ The usual way to invoke Bison is as follows:
      $ bison FILE
 
    Here FILE is the grammar file name, which usually ends in ‘.y’.  The
-parser implementation file’s name is made by replacing the ‘.y’ with
+parser implementation file's name is made by replacing the ‘.y’ with
 ‘.tab.c’ and removing any leading directory.  Thus, the ‘bison foo.y’
 file name yields ‘foo.tab.c’, and the ‘bison hack/foo.y’ file name
-yields ‘foo.tab.c’.  It’s also possible, in case you are writing C++
+yields ‘foo.tab.c’.  It's also possible, in case you are writing C++
 code instead of C in your grammar file, to name it ‘foo.ypp’ or
 ‘foo.y++’.  Then, the output files will take an extension like the given
 one as input (respectively ‘foo.tab.cpp’ and ‘foo.tab.c++’).  This
@@ -10183,8 +10180,8 @@ Options controlling the global behavior of ‘bison’.
      Activate miscellaneous FEATUREs.  FEATURE can be one of:
      ‘caret’
      ‘diagnostics-show-caret’
-          Show caret errors, in a manner similar to GCC’s
-          ‘-fdiagnostics-show-caret’, or Clang’s ‘-fcaret-diagnostics’.
+          Show caret errors, in a manner similar to GCC's
+          ‘-fdiagnostics-show-caret’, or Clang's ‘-fcaret-diagnostics’.
           The location provided with the message is used to quote the
           corresponding line of the source file, underlining the
           important part of it with carets (‘^’).  Here is an example,
@@ -10225,8 +10222,8 @@ Options controlling the global behavior of ‘bison’.
 
      ‘fixit’
      ‘diagnostics-parseable-fixits’
-          Show machine-readable fixes, in a manner similar to GCC’s and
-          Clang’s ‘-fdiagnostics-parseable-fixits’.
+          Show machine-readable fixes, in a manner similar to GCC's and
+          Clang's ‘-fdiagnostics-parseable-fixits’.
 
           Fix-its are generated for duplicate directives:
 
@@ -10307,8 +10304,8 @@ Options controlling the diagnostics.
 
                %type <exVal> cond "condition"
 
-          does not define “condition” as a string alias to
-          ‘cond’—nonterminal symbols do not have string aliases.  It is
+          does not define "condition" as a string alias to
+          ‘cond’--nonterminal symbols do not have string aliases.  It is
           rather equivalent to
 
                %nterm <exVal> cond
@@ -10450,7 +10447,7 @@ Options controlling the diagnostics.
 
 ‘-Wno-error=CATEGORY’
      Deactivate the error treatment for this CATEGORY.  However, the
-     warning itself won’t be disabled, or enabled, by this option.
+     warning itself won't be disabled, or enabled, by this option.
 
 ‘--color’
      Equivalent to ‘--color=always’.
@@ -10539,7 +10536,7 @@ Options changing the generated parsers.
 
 ‘-l’
 ‘--no-lines’
-     Don’t put any ‘#line’ preprocessor commands in the parser
+     Don't put any ‘#line’ preprocessor commands in the parser
      implementation file.  Ordinarily Bison puts them in the parser
      implementation file so that the C compiler and debuggers will
      associate errors with your source file, the grammar file.  This
@@ -10574,11 +10571,11 @@ Options changing the generated parsers.
                void yyerror (const char *);
           As a Bison extension, additional arguments required by
           ‘%pure-parser’, ‘%locations’, ‘%lex-param’ and ‘%parse-param’
-          are taken into account.  You may disable ‘yyerror’’s prototype
+          are taken into account.  You may disable ‘yyerror’'s prototype
           with ‘#define yyerror yyerror’ (as specified by POSIX), or
           with ‘#define YYERROR_IS_DECLARED’ (a Bison extension).
           Likewise for ‘yylex’.
-        • Imitate Yacc’s output file name conventions, so that the
+        • Imitate Yacc's output file name conventions, so that the
           parser implementation file is called ‘y.tab.c’, and the other
           outputs are called ‘y.output’ and ‘y.tab.h’.  Do not use
           ‘--yacc’ just to change the output file names since it also
@@ -10636,7 +10633,7 @@ Options controlling the output.
 
      ‘state’
           Description of the grammar, conflicts (resolved and
-          unresolved), and parser’s automaton.
+          unresolved), and parser's automaton.
 
      ‘itemset’
           Implies ‘state’ and augments the description of the automaton
@@ -10645,7 +10642,7 @@ Options controlling the output.
 
      ‘lookahead’
           Implies ‘state’ and augments the description of the automaton
-          with each rule’s lookahead set.
+          with each rule's lookahead set.
 
      ‘solved’
           Implies ‘state’.  Explain how conflicts were solved thanks to
@@ -10682,7 +10679,7 @@ Options controlling the output.
 
 ‘-g [FILE]’
 ‘--graph[=FILE]’
-     Output a graphical representation of the parser’s automaton
+     Output a graphical representation of the parser's automaton
      computed by Bison, in Graphviz (https://www.graphviz.org/) DOT
      (https://www.graphviz.org/doc/info/lang.html) format.  ‘FILE’ is
      optional.  If omitted and the grammar file is ‘foo.y’, the output
@@ -10690,7 +10687,7 @@ Options controlling the output.
 
 ‘-x [FILE]’
 ‘--xml[=FILE]’
-     Output an XML report of the parser’s automaton computed by Bison.
+     Output an XML report of the parser's automaton computed by Bison.
      ‘FILE’ is optional.  If omitted and the grammar file is ‘foo.y’,
      the output file will be ‘foo.xml’.
 
@@ -10749,18 +10746,18 @@ File: bison.info,  Node: Yacc Library,  Prev: Option Cross Key,  Up: Invocation
 The Yacc library contains default implementations of the ‘yyerror’ and
 ‘main’ functions.  These default implementations are normally not
 useful, but POSIX requires them.  To use the Yacc library, link your
-program with the ‘-ly’ option.  Note that Bison’s implementation of the
+program with the ‘-ly’ option.  Note that Bison's implementation of the
 Yacc library is distributed under the terms of the GNU General Public
 License (*note Copying::).
 
-   If you use the Yacc library’s ‘yyerror’ function, you should declare
+   If you use the Yacc library's ‘yyerror’ function, you should declare
 ‘yyerror’ as follows:
 
      int yyerror (char const *);
 
 The ‘int’ value returned by this ‘yyerror’ is ignored.
 
-   The implementation of Yacc library’s ‘main’ function is:
+   The implementation of Yacc library's ‘main’ function is:
 
      int main (void)
      {
@@ -10783,7 +10780,7 @@ File: bison.info,  Node: Other Languages,  Next: History,  Prev: Invocation,  Up
 In addition to C, Bison can generate parsers in C++, D and Java.  This
 chapter is devoted to these languages.  The reader is expected to
 understand how Bison works; read the introductory chapters first if you
-don’t.
+don't.
 
 * Menu:
 
@@ -10832,7 +10829,7 @@ and that we generate C++.
      %require "3.2"
      %language "c++"
 
-   Let’s dive directly into the middle part: the grammar.  Our input is
+   Let's dive directly into the middle part: the grammar.  Our input is
 a simple list of strings, that we display once the parsing is done.
 
      %%
@@ -10847,7 +10844,7 @@ a simple list of strings, that we display once the parsing is done.
      ;
 
    We used a vector of strings as a semantic value!  To use genuine C++
-objects as semantic values—not just PODs—we cannot rely on the union
+objects as semantic values--not just PODs--we cannot rely on the union
 that Bison uses by default to store them, we need _variants_ (*note C++
 Variants::):
 
@@ -11017,7 +11014,7 @@ argument for its constructor.
      A structure that contains (only) the ‘token_kind_type’ enumeration,
      which defines the tokens.  To refer to the token ‘FOO’, use
      ‘yy::parser::token::FOO’.  The scanner can use ‘typedef
-     yy::parser::token token;’ to “import” the token enumeration (*note
+     yy::parser::token token;’ to "import" the token enumeration (*note
      Calc++ Scanner::).
 
  -- Type of parser: token_kind_type
@@ -11151,7 +11148,7 @@ section, and in particular, object types can be used without pointers.
    To enable variant-based semantic values, set the ‘%define’ variable
 ‘api.value.type’ to ‘variant’ (*note %define Summary::).  Then ‘%union’
 is ignored; instead of using the name of the fields of the ‘%union’ to
-“type” the symbols, use genuine types.
+"type" the symbols, use genuine types.
 
    For instance, instead of:
 
@@ -11196,14 +11193,14 @@ Typed Midrule Actions::).
      from the variadic forwarding references U....
 
    *Warning*: We do not use Boost.Variant, for two reasons.  First, it
-appeared unacceptable to require Boost on the user’s machine (i.e., the
+appeared unacceptable to require Boost on the user's machine (i.e., the
 machine on which the generated parser will be compiled, not the machine
 on which ‘bison’ was run).  Second, for each possible semantic value,
 Boost.Variant not only stores the value, but also a tag specifying its
-type.  But the parser already “knows” the type of the semantic value, so
+type.  But the parser already "knows" the type of the semantic value, so
 that would be duplicating the information.
 
-   We do not use C++17’s ‘std::variant’ either: we want to support all
+   We do not use C++17's ‘std::variant’ either: we want to support all
 the C++ standards, and of course ‘std::variant’ also stores a tag to
 record the current type.
 
@@ -11363,13 +11360,13 @@ File: bison.info,  Node: Exposing the Location Classes,  Next: User Defined Loca
 ......................................
 
 When both ‘%header’ and ‘%locations’ are enabled, Bison generates an
-additional file: ‘location.hh’.  If you don’t use locations outside of
+additional file: ‘location.hh’.  If you don't use locations outside of
 the parser, you may avoid its creation with ‘%define api.location.file
 none’.
 
    However this file is useful if, for instance, your parser builds an
-abstract syntax tree decorated with locations: you may use Bison’s
-‘location’ type independently of Bison’s parser.  You may name the file
+abstract syntax tree decorated with locations: you may use Bison's
+‘location’ type independently of Bison's parser.  You may name the file
 differently, e.g., ‘%define api.location.file
 "include/ast/location.hh"’: this name can have directory components, or
 even be absolute.  The way the location file is included is controlled
@@ -11489,7 +11486,7 @@ Function::), the user must define the following function.
           typedef symbol_kind::symbol_kind_t symbol_kind_type;
 
  -- Method on context: const symbol_type& lookahead () const
-     The “unexpected” token: the lookahead that caused the syntax error.
+     The "unexpected" token: the lookahead that caused the syntax error.
 
  -- Method on context: symbol_kind_type token () const
      The symbol kind of the lookahead token that caused the syntax
@@ -11636,7 +11633,7 @@ expects ‘yylex’ to have the following prototype.
      yield additional arguments.
 
  -- Type of parser: symbol_type
-     A “complete symbol”, that binds together its kind, value and (when
+     A "complete symbol", that binds together its kind, value and (when
      applicable) location.
 
  -- Method on symbol_type: symbol_kind_type kind () const
@@ -11763,8 +11760,8 @@ interface with.
 
 File: bison.info,  Node: Calc++ --- C++ Calculator,  Next: Calc++ Parsing Driver,  Up: A Complete C++ Example
 
-10.1.8.1 Calc++ — C++ Calculator
-................................
+10.1.8.1 Calc++ -- C++ Calculator
+.................................
 
 Of course the grammar is dedicated to arithmetic, a single expression,
 possibly preceded by variable assignments.  An environment containing
@@ -11782,7 +11779,7 @@ File: bison.info,  Node: Calc++ Parsing Driver,  Next: Calc++ Parser,  Prev: Cal
 ..............................
 
 To support a pure interface with the parser (and the scanner) the
-technique of the “parsing context” is convenient: a structure containing
+technique of the "parsing context" is convenient: a structure containing
 all the data to exchange.  Since, in addition to simply launch the
 parsing, there are several auxiliary tasks to execute (open the file for
 scanning, instantiate the parser etc.), we recommend transforming the
@@ -11894,7 +11891,7 @@ conversions.
 This example uses genuine C++ objects as semantic values, therefore, we
 require the variant-based storage of semantic values.  To make sure we
 properly use it, we enable assertions.  To fully benefit from
-type-safety and more natural definition of “symbol”, we enable
+type-safety and more natural definition of "symbol", we enable
 ‘api.token.constructor’.
 
      %define api.token.constructor
@@ -11905,8 +11902,8 @@ Then come the declarations/inclusions needed by the semantic values.
 Because the parser uses the parsing driver and reciprocally, both would
 like to include the header of the other, which is, of course, insane.
 This mutual dependency will be broken using forward declarations.
-Because the driver’s header needs detailed knowledge about the parser
-class (in particular its inner types), it is the parser’s header which
+Because the driver's header needs detailed knowledge about the parser
+class (in particular its inner types), it is the parser's header which
 will use a forward declaration of the driver.  *Note %code Summary::.
 
      %code requires {
@@ -12008,8 +12005,8 @@ File: bison.info,  Node: Calc++ Scanner,  Next: Calc++ Top Level,  Prev: Calc++
 10.1.8.4 Calc++ Scanner
 .......................
 
-In addition to standard headers, the Flex scanner includes the driver’s,
-then the parser’s to get the set of defined tokens.
+In addition to standard headers, the Flex scanner includes the driver's,
+then the parser's to get the set of defined tokens.
 
      %{ /* -*- C++ -*- */
      # include <cerrno>
@@ -12021,8 +12018,8 @@ then the parser’s to get the set of defined tokens.
      # include "parser.hh"
      %}
 
-Since our calculator has no ‘#include’-like feature, we don’t need
-‘yywrap’.  We don’t need the ‘unput’ and ‘input’ functions either, and
+Since our calculator has no ‘#include’-like feature, we don't need
+‘yywrap’.  We don't need the ‘unput’ and ‘input’ functions either, and
 we parse an actual file, this is not an interactive session with the
 user.  Finally, we enable scanner tracing.
 
@@ -12098,8 +12095,8 @@ report errors.
        return yy::parser::make_NUMBER ((int) n, loc);
      }
 
-Finally, because the scanner-related driver’s member-functions depend on
-the scanner’s data, it is simpler to implement them in this file.
+Finally, because the scanner-related driver's member-functions depend on
+the scanner's data, it is simpler to implement them in this file.
 
      void
      driver::scan_begin ()
@@ -12209,7 +12206,7 @@ garbage collection.  The parser will try to hold references to semantic
 values for as little time as needed.
 
    D parsers support ‘%printer’.  An example for the output of type
-‘int’, where ‘yyo’ is the parser’s debug output:
+‘int’, where ‘yyo’ is the parser's debug output:
 
      %printer { yyo.write($$); } <int>
 
@@ -12518,7 +12515,7 @@ Summary::).
 returned if more input is required to finish parsing the input.
 
    If ‘api.push-pull’ is defined as ‘both’, then the generated parser
-class will also implement the ‘parse’ method.  This method’s body is a
+class will also implement the ‘parse’ method.  This method's body is a
 loop that repeatedly invokes the scanner and then passes the values
 obtained from the scanner to the ‘pushParse’ method.
 
@@ -12581,7 +12578,7 @@ contains a single class for the parser.
 
    Contrary to C parsers, Java parsers do not use global variables; the
 state of the parser is always local to an instance of the parser class.
-Therefore, all Java parsers are “pure”, and the ‘%define api.pure’
+Therefore, all Java parsers are "pure", and the ‘%define api.pure’
 directive does nothing when used in Java.
 
    GLR parsers are currently unsupported in Java.  Do not use the
@@ -12598,7 +12595,7 @@ parser, so use ‘%define parse.trace’ explicitly if needed.  Also, in the
 future the ‘%token-table’ directive might enable a public interface to
 access the token names and codes.
 
-   Getting a “code too large” error from the Java compiler means the
+   Getting a "code too large" error from the Java compiler means the
 code hit the 64KB bytecode per method limitation of the Java class file.
 Try reducing the amount of code in actions and static initializers;
 otherwise, report a bug so that the parser skeleton will be improved.
@@ -12610,7 +12607,7 @@ File: bison.info,  Node: Java Semantic Values,  Next: Java Location Values,  Pre
 ---------------------------
 
 There is no ‘%union’ directive in Java parsers.  Instead, the semantic
-values’ types (class names) should be specified in the ‘%nterm’ or
+values' types (class names) should be specified in the ‘%nterm’ or
 ‘%token’ directive:
 
      %nterm <Expression> expr assignment_expr term factor
@@ -12776,7 +12773,7 @@ them automatically.
 must provide the parser with the following function:
 
  -- Static Method of YYParser: String i18n (string S)
-     Return the translation of S in the user’s language.  As an example:
+     Return the translation of S in the user's language.  As an example:
 
           %code {
             static ResourceBundle myResources
@@ -13034,7 +13031,7 @@ following: 0 (success), 1 (abort), 2 (memory exhaustion), or
 input is required to finish parsing the grammar.
 
    If ‘api.push-pull’ is defined as ‘both’, then the generated parser
-class will also implement the ‘parse’ method.  This method’s body is a
+class will also implement the ‘parse’ method.  This method's body is a
 loop that repeatedly invokes the scanner and then passes the values
 obtained from the scanner to the ‘push_parse’ method.
 
@@ -13265,7 +13262,7 @@ File: bison.info,  Node: Yacc,  Next: yacchack,  Up: History
 11.1 The ancestral Yacc
 =======================
 
-Bison originated as a workalike of a program called Yacc — Yet Another
+Bison originated as a workalike of a program called Yacc -- Yet Another
 Compiler Compiler.(1)  Yacc was written at Bell Labs as part of the very
 early development of Unix; one of its first uses was to develop the
 original Portable C Compiler, pcc.  The same person, Steven C. Johnson,
@@ -13289,13 +13286,13 @@ with less restrictive licenses and more features became available.
 
    Original Yacc became generally available when Caldera released the
 sources of old versions of Unix up to V7 and 32V in 2002.  By that time
-it had been long superseded in practical use by Bison even on Yacc’s
+it had been long superseded in practical use by Bison even on Yacc's
 native Unix variants.
 
    ---------- Footnotes ----------
 
-   (1) Because of the acronym, the name is sometimes given as “YACC”,
-but Johnson used “Yacc” in the descriptive paper included in the Version
+   (1) Because of the acronym, the name is sometimes given as "YACC",
+but Johnson used "Yacc" in the descriptive paper included in the Version
 7 Unix Manual
 (https://s3.amazonaws.com/plan9-bell-labs/7thEdMan/v7vol2b.pdf).
 
@@ -13309,7 +13306,7 @@ File: bison.info,  Node: yacchack,  Next: Byacc,  Prev: Yacc,  Up: History
 
 One of the deficiencies of original Yacc was its inability to produce
 reentrant parsers.  This was first remedied by a set of drop-in
-modifications called “yacchack”, published by Eric S. Raymond on USENET
+modifications called "yacchack", published by Eric S. Raymond on USENET
 around 1983.  This code was quickly forgotten when zoo and Berkeley Yacc
 became available a few years later.
 
@@ -13320,14 +13317,14 @@ File: bison.info,  Node: Byacc,  Next: Bison,  Prev: yacchack,  Up: History
 ==================
 
 Berkeley Yacc was originated in 1985 by Robert Corbett (*note Corbett
-1984::).  It was originally named “zoo”, but by October 1989 it became
+1984::).  It was originally named "zoo", but by October 1989 it became
 known as Berkeley Yacc or byacc.
 
    Berkeley Yacc had three advantages over the ancestral Yacc: it
 generated faster parsers, it could generate reentrant parsers, and the
 source code was released to the public domain rather than being under an
 AT&T proprietary license.  The better performance came from implementing
-techniques from DeRemer and Penello’s seminal paper on LALR parsing
+techniques from DeRemer and Penello's seminal paper on LALR parsing
 (*note DeRemer 1982::).
 
    Use of byacc spread rapidly due to its public domain license.
@@ -13341,12 +13338,12 @@ File: bison.info,  Node: Bison,  Next: Other Ungulates,  Prev: Byacc,  Up: Histo
 ==========
 
 Robert Corbett actually wrote two (closely related) LALR parsers in
-1985, both using the DeRemer/Penello techniques.  One was “zoo”, the
-other was “Byson”.  In 1987 Richard Stallman began working on Byson; the
+1985, both using the DeRemer/Penello techniques.  One was "zoo", the
+other was "Byson".  In 1987 Richard Stallman began working on Byson; the
 name changed to Bison and the interface became Yacc-compatible.
 
    The main visible difference between Yacc and Byson/Bison at the time
-of Byson’s first release is that Byson supported the ‘@N’ construct
+of Byson's first release is that Byson supported the ‘@N’ construct
 (giving access to the starting and ending line number and character
 number associated with any of the symbols in the current rule).
 
@@ -13391,8 +13388,8 @@ the early ports are extinct along with the languages that hosted them;
 others have been superseded by parser skeletons shipped with Bison.
 
    However, independent implementations persist.  One of the best-known
-still in use is David Beazley’s “PLY” (Python Lex-Yacc) for Python.
-Another is goyacc, supporting the Go language.  An “ocamlyacc” is
+still in use is David Beazley's "PLY" (Python Lex-Yacc) for Python.
+Another is goyacc, supporting the Go language.  An "ocamlyacc" is
 shipped as part of the Ocaml compiler suite.
 
 
@@ -13574,7 +13571,7 @@ manipulate multiple input buffers.
 
    If your Flex-generated scanner uses start conditions (*note Start
 conditions: (flex)Start conditions.), you might also want to reset the
-scanner’s state, i.e., go back to the initial start condition, through a
+scanner's state, i.e., go back to the initial start condition, through a
 call to ‘BEGIN (0)’.
 
 
@@ -13587,7 +13584,7 @@ File: bison.info,  Node: Strings are Destroyed,  Next: Implementing Gotos/Loops,
      them.  Instead of reporting ‘"foo", "bar"’, it reports ‘"bar",
      "bar"’, or even ‘"foo\nbar", "bar"’.
 
-   This error is probably the single most frequent “bug report” sent to
+   This error is probably the single most frequent "bug report" sent to
 Bison lists, but is only concerned with a misunderstanding of the role
 of the scanner.  Consider the following Lex code:
 
@@ -13639,9 +13636,9 @@ File: bison.info,  Node: Implementing Gotos/Loops,  Next: Multiple start-symbols
      functions, but how can I implement gotos, or loops?
 
    Although very pedagogical, the examples included in the document blur
-the distinction to make between the parser—whose job is to recover the
+the distinction to make between the parser--whose job is to recover the
 structure of a text and to transmit it to subsequent modules of the
-program—and the processing (such as the execution) of this structure.
+program--and the processing (such as the execution) of this structure.
 This works well with so called straight line programs, i.e., precisely
 those that have a straightforward execution model: execute simple
 instructions one after the others.
@@ -13709,7 +13706,7 @@ File: bison.info,  Node: Secure? Conform?,  Next: Enabling Relocatability,  Prev
 
      Is Bison secure?  Does it conform to POSIX?
 
-   If you’re looking for a guarantee or certification, we don’t provide
+   If you're looking for a guarantee or certification, we don't provide
 it.  However, Bison is intended to be a reliable program that conforms
 to the POSIX specification for Yacc.  If you run into problems, please
 send us a bug report.
@@ -13728,7 +13725,7 @@ through ‘configure; make; make install’ with all its dependencies,
 options, and hurdles.
 
    Most package management systems, that allow the user to install
-pre-built binaries of the packages, solve the “ease of installation”
+pre-built binaries of the packages, solve the "ease of installation"
 problem, but they hardwire path names, usually to ‘/usr’ or
 ‘/usr/local’.  This means that users need root privileges to install a
 binary package, and prevents installing two different versions of the
@@ -13760,7 +13757,7 @@ also do not recommend prefixes that might be behind an automounter (e.g.
 ‘$HOME/inst$$’) because of the performance impact of directory
 searching.
 
-   Here’s a sample installation run that takes into account all these
+   Here's a sample installation run that takes into account all these
 recommendations:
 
      ./configure --enable-relocatable --prefix=/nonexistent
@@ -13779,29 +13776,29 @@ executes the real program).
 
 File: bison.info,  Node: I can't build Bison,  Next: Where can I find help?,  Prev: Enabling Relocatability,  Up: FAQ
 
-13.8 I can’t build Bison
+13.8 I can't build Bison
 ========================
 
-     I can’t build Bison because ‘make’ complains that ‘msgfmt’ is not
+     I can't build Bison because ‘make’ complains that ‘msgfmt’ is not
      found.  What should I do?
 
    Like most GNU packages with internationalization support, that
 feature is turned on by default.  If you have problems building in the
-‘po’ subdirectory, it indicates that your system’s internationalization
+‘po’ subdirectory, it indicates that your system's internationalization
 support is lacking.  You can re-configure Bison with ‘--disable-nls’ to
 turn off this support, or you can install GNU gettext from
 <https://ftp.gnu.org/gnu/gettext/> and re-configure Bison.  See the file
 ‘ABOUT-NLS’ for more information.
 
-     I can’t build Bison because my C compiler is too old.
+     I can't build Bison because my C compiler is too old.
 
    Except for GLR parsers (which require C99), the C code that Bison
 generates requires only C89 or later.  However, Bison itself requires
-common C99 features such as declarations after statements.  Bison’s
+common C99 features such as declarations after statements.  Bison's
 ‘configure’ script attempts to enable C99 (or later) support on
 compilers that default to pre-C99.  If your compiler lacks these C99
 features entirely, GCC may well be a better choice; or you can try
-upgrading to your compiler’s latest version.
+upgrading to your compiler's latest version.
 
 
 File: bison.info,  Node: Where can I find help?,  Next: Bug Reports,  Prev: I can't build Bison,  Up: FAQ
@@ -13809,7 +13806,7 @@ File: bison.info,  Node: Where can I find help?,  Next: Bug Reports,  Prev: I ca
 13.9 Where can I find help?
 ===========================
 
-     I’m having trouble using Bison.  Where can I find help?
+     I'm having trouble using Bison.  Where can I find help?
 
    First, read this fine manual.  Beyond that, you can send mail to
 <help-bison@gnu.org>.  This mailing list is intended to be populated
@@ -13842,7 +13839,7 @@ to edit or add anything).  The smaller and simpler the grammar, the
 easier it will be to fix the bug.
 
    Include information about your compilation environment, including
-your operating system’s name and version and your compiler’s name and
+your operating system's name and version and your compiler's name and
 version.  If you have trouble compiling, you should also include a
 transcript of the build session, starting with the invocation of
 ‘configure’.  Depending on the nature of the bug, you may be asked to
@@ -13862,7 +13859,7 @@ File: bison.info,  Node: More Languages,  Next: Beta Testing,  Prev: Bug Reports
      Will Bison ever have C++ and Java support?  How about INSERT YOUR
      FAVORITE LANGUAGE HERE?
 
-   C++, D and Java are supported.  We’d love to add other languages;
+   C++, D and Java are supported.  We'd love to add other languages;
 contributions are welcome.
 
 
@@ -13873,7 +13870,7 @@ File: bison.info,  Node: Beta Testing,  Next: Mailing Lists,  Prev: More Languag
 
      What is involved in being a beta tester?
 
-   It’s not terribly involved.  Basically, you would download a test
+   It's not terribly involved.  Basically, you would download a test
 release, compile it, and use it to build and run a parser or two.  After
 that, you would submit either a bug report or a message saying that
 everything is okay.  It is important to report successes as well as
@@ -13959,7 +13956,7 @@ Appendix A Bison Symbols
      Comments, as in C/C++.
 
  -- Delimiter: :
-     Separates a rule’s result from its components.  *Note Rules::.
+     Separates a rule's result from its components.  *Note Rules::.
 
  -- Delimiter: ;
      Terminates a rule.  *Note Rules::.
@@ -13998,7 +13995,7 @@ Appendix A Bison Symbols
  -- Directive: %define VARIABLE VALUE
  -- Directive: %define VARIABLE {VALUE}
  -- Directive: %define VARIABLE "VALUE"
-     Define a variable to adjust Bison’s behavior.  *Note %define
+     Define a variable to adjust Bison's behavior.  *Note %define
      Summary::.
 
  -- Directive: %defines
@@ -14242,7 +14239,7 @@ Appendix A Bison Symbols
      External variable in which ‘yylex’ should place the line and column
      numbers associated with a token.  (In a pure parser, it is a local
      variable within ‘yyparse’, and its address is passed to ‘yylex’.)
-     You can ignore this variable if you don’t use the ‘@’ feature in
+     You can ignore this variable if you don't use the ‘@’ feature in
      the grammar actions.  *Note Token Locations::.  In semantic
      actions, it stores the location of the lookahead token.  *Note
      Actions and Locations::.
@@ -14352,7 +14349,7 @@ Accepting state
      A state whose only action is the accept action.  The accepting
      state is thus a consistent state.  *Note Understanding::.
 
-Backus-Naur Form (BNF; also called “Backus Normal Form”)
+Backus-Naur Form (BNF; also called "Backus Normal Form")
      Formal method of specifying context-free grammars originally
      proposed by John Backus, and slightly improved by Peter Naur in his
      1960-01-02 committee document contributing to what became the Algol
@@ -14401,7 +14398,7 @@ Empty string
      character string of length zero.
 
 Finite-state stack machine
-     A “machine” that has discrete states in which it is said to exist
+     A "machine" that has discrete states in which it is said to exist
      at each instant in time.  As input to the machine is processed, the
      machine moves from state to state as specified by the logic of the
      machine.  In the case of the parser, the input is the language
@@ -14411,14 +14408,14 @@ Finite-state stack machine
 Generalized LR (GLR)
      A parsing algorithm that can handle all context-free grammars,
      including those that are not LR(1).  It resolves situations that
-     Bison’s deterministic parsing algorithm cannot by effectively
+     Bison's deterministic parsing algorithm cannot by effectively
      splitting off multiple parsers, trying all possible parsers, and
      discarding those that fail in the light of additional right
      context.  *Note Generalized LR Parsing::.
 
 Grouping
      A language construct that is (in general) grammatically divisible;
-     for example, ‘expression’ or ‘declaration’ in C.  *Note Language
+     for example, 'expression' or 'declaration' in C.  *Note Language
      and Grammar::.
 
 IELR(1) (Inadequacy Elimination LR(1))
@@ -14427,7 +14424,7 @@ IELR(1) (Inadequacy Elimination LR(1))
      with the full language-recognition power of canonical LR(1) but
      with nearly the same number of parser states as LALR(1).  This
      reduction in parser states is often an order of magnitude.  More
-     importantly, because canonical LR(1)’s extra parser states may
+     importantly, because canonical LR(1)'s extra parser states may
      contain duplicate conflicts in the case of non-LR(1) grammars, the
      number of conflicts for IELR(1) is often an order of magnitude less
      as well.  This can significantly reduce the complexity of
@@ -14441,25 +14438,25 @@ Input stream
      A continuous flow of data between devices or programs.
 
 Kind
-     “Token” and “symbol” are each overloaded to mean either a grammar
+     "Token" and "symbol" are each overloaded to mean either a grammar
      symbol (kind) or all parse info (kind, value, location) associated
      with occurrences of that grammar symbol from the input.  To
      disambiguate,
 
-        • we use “token kind” and “symbol kind” to mean both grammar
+        • we use "token kind" and "symbol kind" to mean both grammar
           symbols and the values that represent them in a base
           programming language (C, C++, etc.).  The names of the types
           of these values are typically ‘token_kind_t’, or
           ‘token_kind_type’, or ‘TokenKind’, depending on the
           programming language.
 
-        • we use “token” and “symbol” without the word “kind” to mean
-          parsed occurrences, and we append the word “type” to refer to
+        • we use "token" and "symbol" without the word "kind" to mean
+          parsed occurrences, and we append the word "type" to refer to
           the types that represent them in a base programming language.
 
-     In summary: When you see “kind”, interpret “symbol” or “token” to
-     mean a _grammar symbol_.  When you don’t see “kind” (including when
-     you see “type”), interpret “symbol” or “token” to mean a _parsed
+     In summary: When you see "kind", interpret "symbol" or "token" to
+     mean a _grammar symbol_.  When you don't see "kind" (including when
+     you see "type"), interpret "symbol" or "token" to mean a _parsed
      symbol_.
 
 LAC (Lookahead Correction)
@@ -14594,7 +14591,7 @@ Token kind
 
 Unreachable state
      A parser state to which there does not exist a sequence of
-     transitions from the parser’s start state.  A state can become
+     transitions from the parser's start state.  A state can become
      unreachable during conflict resolution.  *Note Unreachable
      States::.
 
@@ -14622,7 +14619,7 @@ Appendix C GNU Free Documentation License
      author and publisher a way to get credit for their work, while not
      being considered responsible for modifications made by others.
 
-     This License is a kind of “copyleft”, which means that derivative
+     This License is a kind of "copyleft", which means that derivative
      works of the document must themselves be free in the same sense.
      It complements the GNU General Public License, which is a copyleft
      license designed for free software.
@@ -14643,18 +14640,18 @@ Appendix C GNU Free Documentation License
      be distributed under the terms of this License.  Such a notice
      grants a world-wide, royalty-free license, unlimited in duration,
      to use that work under the conditions stated herein.  The
-     “Document”, below, refers to any such manual or work.  Any member
-     of the public is a licensee, and is addressed as “you”.  You accept
+     "Document", below, refers to any such manual or work.  Any member
+     of the public is a licensee, and is addressed as "you".  You accept
      the license if you copy, modify or distribute the work in a way
      requiring permission under copyright law.
 
-     A “Modified Version” of the Document means any work containing the
+     A "Modified Version" of the Document means any work containing the
      Document or a portion of it, either copied verbatim, or with
      modifications and/or translated into another language.
 
-     A “Secondary Section” is a named appendix or a front-matter section
+     A "Secondary Section" is a named appendix or a front-matter section
      of the Document that deals exclusively with the relationship of the
-     publishers or authors of the Document to the Document’s overall
+     publishers or authors of the Document to the Document's overall
      subject (or to related matters) and contains nothing that could
      fall directly within that overall subject.  (Thus, if the Document
      is in part a textbook of mathematics, a Secondary Section may not
@@ -14663,7 +14660,7 @@ Appendix C GNU Free Documentation License
      of legal, commercial, philosophical, ethical or political position
      regarding them.
 
-     The “Invariant Sections” are certain Secondary Sections whose
+     The "Invariant Sections" are certain Secondary Sections whose
      titles are designated, as being those of Invariant Sections, in the
      notice that says that the Document is released under this License.
      If a section does not fit the above definition of Secondary then it
@@ -14671,13 +14668,13 @@ Appendix C GNU Free Documentation License
      contain zero Invariant Sections.  If the Document does not identify
      any Invariant Sections then there are none.
 
-     The “Cover Texts” are certain short passages of text that are
+     The "Cover Texts" are certain short passages of text that are
      listed, as Front-Cover Texts or Back-Cover Texts, in the notice
      that says that the Document is released under this License.  A
      Front-Cover Text may be at most 5 words, and a Back-Cover Text may
      be at most 25 words.
 
-     A “Transparent” copy of the Document means a machine-readable copy,
+     A "Transparent" copy of the Document means a machine-readable copy,
      represented in a format whose specification is available to the
      general public, that is suitable for revising the document
      straightforwardly with generic text editors or (for images composed
@@ -14689,7 +14686,7 @@ Appendix C GNU Free Documentation License
      been arranged to thwart or discourage subsequent modification by
      readers is not Transparent.  An image format is not Transparent if
      used for any substantial amount of text.  A copy that is not
-     “Transparent” is called “Opaque”.
+     "Transparent" is called "Opaque".
 
      Examples of suitable formats for Transparent copies include plain
      ASCII without markup, Texinfo input format, LaTeX input format,
@@ -14702,23 +14699,23 @@ Appendix C GNU Free Documentation License
      the machine-generated HTML, PostScript or PDF produced by some word
      processors for output purposes only.
 
-     The “Title Page” means, for a printed book, the title page itself,
+     The "Title Page" means, for a printed book, the title page itself,
      plus such following pages as are needed to hold, legibly, the
      material this License requires to appear in the title page.  For
-     works in formats which do not have any title page as such, “Title
-     Page” means the text near the most prominent appearance of the
-     work’s title, preceding the beginning of the body of the text.
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
 
-     The “publisher” means any person or entity that distributes copies
+     The "publisher" means any person or entity that distributes copies
      of the Document to the public.
 
-     A section “Entitled XYZ” means a named subunit of the Document
+     A section "Entitled XYZ" means a named subunit of the Document
      whose title either is precisely XYZ or contains XYZ in parentheses
      following text that translates XYZ in another language.  (Here XYZ
      stands for a specific section name mentioned below, such as
-     “Acknowledgements”, “Dedications”, “Endorsements”, or “History”.)
-     To “Preserve the Title” of such a section when you modify the
-     Document means that it remains a section “Entitled XYZ” according
+     "Acknowledgements", "Dedications", "Endorsements", or "History".)
+     To "Preserve the Title" of such a section when you modify the
+     Document means that it remains a section "Entitled XYZ" according
      to this definition.
 
      The Document may include Warranty Disclaimers next to the notice
@@ -14748,7 +14745,7 @@ Appendix C GNU Free Documentation License
 
      If you publish printed copies (or copies in media that commonly
      have printed covers) of the Document, numbering more than 100, and
-     the Document’s license notice requires Cover Texts, you must
+     the Document's license notice requires Cover Texts, you must
      enclose the copies in covers that carry, clearly and legibly, all
      these Cover Texts: Front-Cover Texts on the front cover, and
      Back-Cover Texts on the back cover.  Both covers must also clearly
@@ -14820,15 +14817,15 @@ Appendix C GNU Free Documentation License
           the Addendum below.
 
        G. Preserve in that license notice the full lists of Invariant
-          Sections and required Cover Texts given in the Document’s
+          Sections and required Cover Texts given in the Document's
           license notice.
 
        H. Include an unaltered copy of this License.
 
-       I. Preserve the section Entitled “History”, Preserve its Title,
+       I. Preserve the section Entitled "History", Preserve its Title,
           and add to it an item stating at least the title, year, new
           authors, and publisher of the Modified Version as given on the
-          Title Page.  If there is no section Entitled “History” in the
+          Title Page.  If there is no section Entitled "History" in the
           Document, create one stating the title, year, authors, and
           publisher of the Document as given on its Title Page, then add
           an item describing the Modified Version as stated in the
@@ -14838,12 +14835,12 @@ Appendix C GNU Free Documentation License
           for public access to a Transparent copy of the Document, and
           likewise the network locations given in the Document for
           previous versions it was based on.  These may be placed in the
-          “History” section.  You may omit a network location for a work
+          "History" section.  You may omit a network location for a work
           that was published at least four years before the Document
           itself, or if the original publisher of the version it refers
           to gives permission.
 
-       K. For any section Entitled “Acknowledgements” or “Dedications”,
+       K. For any section Entitled "Acknowledgements" or "Dedications",
           Preserve the Title of the section, and preserve in the section
           all the substance and tone of each of the contributor
           acknowledgements and/or dedications given therein.
@@ -14852,11 +14849,11 @@ Appendix C GNU Free Documentation License
           in their text and in their titles.  Section numbers or the
           equivalent are not considered part of the section titles.
 
-       M. Delete any section Entitled “Endorsements”.  Such a section
+       M. Delete any section Entitled "Endorsements".  Such a section
           may not be included in the Modified Version.
 
        N. Do not retitle any existing section to be Entitled
-          “Endorsements” or to conflict in title with any Invariant
+          "Endorsements" or to conflict in title with any Invariant
           Section.
 
        O. Preserve any Warranty Disclaimers.
@@ -14865,15 +14862,15 @@ Appendix C GNU Free Documentation License
      appendices that qualify as Secondary Sections and contain no
      material copied from the Document, you may at your option designate
      some or all of these sections as invariant.  To do this, add their
-     titles to the list of Invariant Sections in the Modified Version’s
+     titles to the list of Invariant Sections in the Modified Version's
      license notice.  These titles must be distinct from any other
      section titles.
 
-     You may add a section Entitled “Endorsements”, provided it contains
+     You may add a section Entitled "Endorsements", provided it contains
      nothing but endorsements of your Modified Version by various
-     parties—for example, statements of peer review or that the text has
-     been approved by an organization as the authoritative definition of
-     a standard.
+     parties--for example, statements of peer review or that the text
+     has been approved by an organization as the authoritative
+     definition of a standard.
 
      You may add a passage of up to five words as a Front-Cover Text,
      and a passage of up to 25 words as a Back-Cover Text, to the end of
@@ -14911,10 +14908,10 @@ Appendix C GNU Free Documentation License
      combined work.
 
      In the combination, you must combine any sections Entitled
-     “History” in the various original documents, forming one section
-     Entitled “History”; likewise combine any sections Entitled
-     “Acknowledgements”, and any sections Entitled “Dedications”.  You
-     must delete all sections Entitled “Endorsements.”
+     "History" in the various original documents, forming one section
+     Entitled "History"; likewise combine any sections Entitled
+     "Acknowledgements", and any sections Entitled "Dedications".  You
+     must delete all sections Entitled "Endorsements."
 
   6. COLLECTIONS OF DOCUMENTS
 
@@ -14935,16 +14932,16 @@ Appendix C GNU Free Documentation License
 
      A compilation of the Document or its derivatives with other
      separate and independent documents or works, in or on a volume of a
-     storage or distribution medium, is called an “aggregate” if the
+     storage or distribution medium, is called an "aggregate" if the
      copyright resulting from the compilation is not used to limit the
-     legal rights of the compilation’s users beyond what the individual
+     legal rights of the compilation's users beyond what the individual
      works permit.  When the Document is included in an aggregate, this
      License does not apply to the other works in the aggregate which
      are not themselves derivative works of the Document.
 
      If the Cover Text requirement of section 3 is applicable to these
      copies of the Document, then if the Document is less than one half
-     of the entire aggregate, the Document’s Cover Texts may be placed
+     of the entire aggregate, the Document's Cover Texts may be placed
      on covers that bracket the Document within the aggregate, or the
      electronic equivalent of covers if the Document is in electronic
      form.  Otherwise they must appear on printed covers that bracket
@@ -14966,8 +14963,8 @@ Appendix C GNU Free Documentation License
      this License or a notice or disclaimer, the original version will
      prevail.
 
-     If a section in the Document is Entitled “Acknowledgements”,
-     “Dedications”, or “History”, the requirement (section 4) to
+     If a section in the Document is Entitled "Acknowledgements",
+     "Dedications", or "History", the requirement (section 4) to
      Preserve its Title (section 1) will typically require changing the
      actual title.
 
@@ -15008,7 +15005,7 @@ Appendix C GNU Free Documentation License
 
      Each version of the License is given a distinguishing version
      number.  If the Document specifies that a particular numbered
-     version of this License “or any later version” applies to it, you
+     version of this License "or any later version" applies to it, you
      have the option of following the terms and conditions either of
      that specified version or of any later version that has been
      published (not as a draft) by the Free Software Foundation.  If the
@@ -15016,29 +15013,29 @@ Appendix C GNU Free Documentation License
      choose any version ever published (not as a draft) by the Free
      Software Foundation.  If the Document specifies that a proxy can
      decide which future versions of this License can be used, that
-     proxy’s public statement of acceptance of a version permanently
+     proxy's public statement of acceptance of a version permanently
      authorizes you to choose that version for the Document.
 
   11. RELICENSING
 
-     “Massive Multiauthor Collaboration Site” (or “MMC Site”) means any
+     "Massive Multiauthor Collaboration Site" (or "MMC Site") means any
      World Wide Web server that publishes copyrightable works and also
      provides prominent facilities for anybody to edit those works.  A
      public wiki that anybody can edit is an example of such a server.
-     A “Massive Multiauthor Collaboration” (or “MMC”) contained in the
+     A "Massive Multiauthor Collaboration" (or "MMC") contained in the
      site means any set of copyrightable works thus published on the MMC
      site.
 
-     “CC-BY-SA” means the Creative Commons Attribution-Share Alike 3.0
+     "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
      license published by Creative Commons Corporation, a not-for-profit
      corporation with a principal place of business in San Francisco,
      California, as well as future copyleft versions of that license
      published by that same organization.
 
-     “Incorporate” means to publish or republish a Document, in whole or
+     "Incorporate" means to publish or republish a Document, in whole or
      in part, as part of another Document.
 
-     An MMC is “eligible for relicensing” if it is licensed under this
+     An MMC is "eligible for relicensing" if it is licensed under this
      License, and if all works that were first published under this
      License somewhere other than this MMC, and subsequently
      incorporated in whole or in part into the MMC, (1) had no cover
@@ -15065,7 +15062,7 @@ notices just after the title page:
        Free Documentation License''.
 
    If you have Invariant Sections, Front-Cover Texts and Back-Cover
-Texts, replace the “with...Texts.” line with this:
+Texts, replace the "with...Texts." line with this:
 
          with the Invariant Sections being LIST THEIR TITLES, with
          the Front-Cover Texts being LIST, and with the Back-Cover Texts
@@ -15088,7 +15085,7 @@ Bibliography
 
 [Corbett 1984]
      Robert Paul Corbett, Static Semantics in Compiler Error Recovery
-     Ph.D. Dissertation, Report No.  UCB/CSD 85/251, Department of
+     Ph.D.  Dissertation, Report No.  UCB/CSD 85/251, Department of
      Electrical Engineering and Computer Science, Compute Science
      Division, University of California, Berkeley, California (June
      1985).  <https://digicoll.lib.berkeley.edu/record/135875>
@@ -15097,7 +15094,7 @@ Bibliography
      Joel E. Denny and Brian A. Malloy, IELR(1): Practical LR(1) Parser
      Tables for Non-LR(1) Grammars with Conflict Resolution, in
      ‘Proceedings of the 2008 ACM Symposium on Applied Computing’
-     (SAC’08), ACM, New York, NY, USA, pp. 240–245.
+     (SAC'08), ACM, New York, NY, USA, pp. 240-245.
      <https://dx.doi.org/10.1145/1363686.1363747>
 
 [Denny 2010 May]
@@ -15110,32 +15107,32 @@ Bibliography
      Joel E. Denny and Brian A. Malloy, The IELR(1) Algorithm for
      Generating Minimal LR(1) Parser Tables for Non-LR(1) Grammars with
      Conflict Resolution, in ‘Science of Computer Programming’, Vol. 75,
-     Issue 11 (November 2010), pp. 943–979.
+     Issue 11 (November 2010), pp. 943-979.
      <https://dx.doi.org/10.1016/j.scico.2009.08.001>
 
 [DeRemer 1982]
      Frank DeRemer and Thomas Pennello, Efficient Computation of LALR(1)
      Look-Ahead Sets, in ‘ACM Transactions on Programming Languages and
-     Systems’, Vol. 4, No. 4 (October 1982), pp. 615–649.
+     Systems’, Vol. 4, No. 4 (October 1982), pp. 615-649.
      <https://dx.doi.org/10.1145/69622.357187>
 
 [Isradisaikul 2015]
      Chinawat Isradisaikul, Andrew Myers, Finding Counterexamples from
      Parsing Conflicts, in ‘Proceedings of the 36th ACM SIGPLAN
      Conference on Programming Language Design and Implementation’ (PLDI
-     ’15), ACM, pp. 555–564.
+     '15), ACM, pp. 555-564.
      <https://www.cs.cornell.edu/andru/papers/cupex/cupex.pdf>
 
 [Johnson 1978]
      Steven C. Johnson, A portable compiler: theory and practice, in
      ‘Proceedings of the 5th ACM SIGACT-SIGPLAN symposium on Principles
-     of programming languages’ (POPL ’78), pp. 97–104.
+     of programming languages’ (POPL '78), pp. 97-104.
      <https://dx.doi.org/10.1145/512760.512771>.
 
 [Knuth 1965]
      Donald E. Knuth, On the Translation of Languages from Left to
      Right, in ‘Information and Control’, Vol. 8, Issue 6 (December
-     1965), pp. 607–639.
+     1965), pp. 607-639.
      <https://dx.doi.org/10.1016/S0019-9958(65)90426-2>
 
 [Scott 2000]
@@ -15154,39 +15151,42 @@ Index of Terms
 [index]
 * Menu:
 
-* $$:                                    Actions.             (line   6)
-* $$ <1>:                                Java Action Features.
-                                                              (line  20)
-* $$ <2>:                                Action Features.     (line   9)
-* $$ <3>:                                D Action Features.   (line   9)
-* $$ <4>:                                Table of Symbols.    (line  28)
-* $<TYPEALT>$:                           Java Action Features.
-                                                              (line  28)
-* $<TYPEALT>$ <1>:                       Action Features.     (line  17)
-* $<TYPEALT>N:                           Java Action Features.
-                                                              (line  16)
-* $<TYPEALT>N <1>:                       Action Features.     (line  21)
-* $@N:                                   Midrule Action Translation.
+* ;:                                     Table of Symbols.    (line  65)
+* ::                                     Table of Symbols.    (line  62)
+* @[NAME]:                               Actions and Locations.
                                                               (line   6)
-* $@N <1>:                               Table of Symbols.    (line  23)
-* $accept:                               Table of Symbols.    (line  84)
-* $end:                                  Table of Symbols.    (line 122)
-* $N:                                    Actions.             (line   6)
-* $N <1>:                                Java Action Features.
-                                                              (line  12)
-* $N <2>:                                Action Features.     (line  13)
-* $N <3>:                                D Action Features.   (line  13)
-* $N <4>:                                Table of Symbols.    (line  32)
-* $NAME:                                 Actions.             (line   6)
-* $NAME <1>:                             Table of Symbols.    (line  36)
-* $undefined:                            Table of Symbols.    (line 253)
-* $[NAME]:                               Actions.             (line   6)
-* $[NAME] <1>:                           Table of Symbols.    (line  37)
+* @[NAME] <1>:                           Table of Symbols.    (line  19)
+* @$:                                    Actions and Locations.
+                                                              (line   6)
+* @$ <1>:                                Java Action Features.
+                                                              (line  38)
+* @$ <2>:                                Action Features.     (line  99)
+* @$ <3>:                                Table of Symbols.    (line   6)
+* @N:                                    Midrule Action Translation.
+                                                              (line   6)
+* @N <1>:                                Actions and Locations.
+                                                              (line   6)
+* @N <2>:                                Java Action Features.
+                                                              (line  34)
+* @N <3>:                                Action Features.     (line 104)
+* @N <4>:                                Action Features.     (line 105)
+* @N <5>:                                Table of Symbols.    (line  10)
+* @N <6>:                                Table of Symbols.    (line  11)
+* @NAME:                                 Actions and Locations.
+                                                              (line   6)
+* @NAME <1>:                             Table of Symbols.    (line  18)
+* /*:                                    Table of Symbols.    (line  58)
+* /* ... */:                             Grammar Outline.     (line   6)
+* //:                                    Table of Symbols.    (line  59)
+* // ...:                                Grammar Outline.     (line   6)
+* %?:                                    Semantic Predicates. (line   6)
+* %?{EXPRESSION}:                        Table of Symbols.    (line  50)
+* %{:                                    Java Declarations Summary.
+                                                              (line  51)
+* %{CODE%}:                              Table of Symbols.    (line  45)
 * %%:                                    Java Declarations Summary.
                                                               (line  47)
 * %% <1>:                                Table of Symbols.    (line  41)
-* %?:                                    Semantic Predicates. (line   6)
-* %?{EXPRESSION}:                        Table of Symbols.    (line  50)
 * %code:                                 Prologue Alternatives.
                                                               (line   6)
 * %code <1>:                             Decl Summary.        (line  52)
@@ -15443,45 +15443,42 @@ Index of Terms
 * %union <3>:                            Table of Symbols.    (line 258)
 * %verbose:                              Decl Summary.        (line 241)
 * %yacc:                                 Decl Summary.        (line 246)
-* %{:                                    Java Declarations Summary.
-                                                              (line  51)
-* %{CODE%}:                              Table of Symbols.    (line  45)
-* /*:                                    Table of Symbols.    (line  58)
-* /* ... */:                             Grammar Outline.     (line   6)
-* //:                                    Table of Symbols.    (line  59)
-* // ...:                                Grammar Outline.     (line   6)
-* ::                                     Table of Symbols.    (line  62)
-* ;:                                     Table of Symbols.    (line  65)
 * <*>:                                   Destructor Decl.     (line   6)
 * <*> <1>:                               Printer Decl.        (line   6)
 * <*> <2>:                               Table of Symbols.    (line  72)
 * <>:                                    Destructor Decl.     (line   6)
 * <> <1>:                                Printer Decl.        (line   6)
 * <> <2>:                                Table of Symbols.    (line  78)
-* @$:                                    Actions and Locations.
-                                                              (line   6)
-* @$ <1>:                                Java Action Features.
-                                                              (line  38)
-* @$ <2>:                                Action Features.     (line  99)
-* @$ <3>:                                Table of Symbols.    (line   6)
-* @N:                                    Midrule Action Translation.
-                                                              (line   6)
-* @N <1>:                                Actions and Locations.
-                                                              (line   6)
-* @N <2>:                                Java Action Features.
-                                                              (line  34)
-* @N <3>:                                Action Features.     (line 104)
-* @N <4>:                                Action Features.     (line 105)
-* @N <5>:                                Table of Symbols.    (line  10)
-* @N <6>:                                Table of Symbols.    (line  11)
-* @NAME:                                 Actions and Locations.
-                                                              (line   6)
-* @NAME <1>:                             Table of Symbols.    (line  18)
-* @[NAME]:                               Actions and Locations.
-                                                              (line   6)
-* @[NAME] <1>:                           Table of Symbols.    (line  19)
 * |:                                     Rules Syntax.        (line  48)
 * | <1>:                                 Table of Symbols.    (line  68)
+* $[NAME]:                               Actions.             (line   6)
+* $[NAME] <1>:                           Table of Symbols.    (line  37)
+* $@N:                                   Midrule Action Translation.
+                                                              (line   6)
+* $@N <1>:                               Table of Symbols.    (line  23)
+* $<TYPEALT>$:                           Java Action Features.
+                                                              (line  28)
+* $<TYPEALT>$ <1>:                       Action Features.     (line  17)
+* $<TYPEALT>N:                           Java Action Features.
+                                                              (line  16)
+* $<TYPEALT>N <1>:                       Action Features.     (line  21)
+* $$:                                    Actions.             (line   6)
+* $$ <1>:                                Java Action Features.
+                                                              (line  20)
+* $$ <2>:                                Action Features.     (line   9)
+* $$ <3>:                                D Action Features.   (line   9)
+* $$ <4>:                                Table of Symbols.    (line  28)
+* $accept:                               Table of Symbols.    (line  84)
+* $end:                                  Table of Symbols.    (line 122)
+* $N:                                    Actions.             (line   6)
+* $N <1>:                                Java Action Features.
+                                                              (line  12)
+* $N <2>:                                Action Features.     (line  13)
+* $N <3>:                                D Action Features.   (line  13)
+* $N <4>:                                Table of Symbols.    (line  32)
+* $NAME:                                 Actions.             (line   6)
+* $NAME <1>:                             Table of Symbols.    (line  36)
+* $undefined:                            Table of Symbols.    (line 253)
 * abstract syntax tree:                  Implementing Gotos/Loops.
                                                               (line  17)
 * accepting state:                       Understanding.       (line 185)
@@ -15517,6 +15514,8 @@ Index of Terms
 * Bison parser algorithm:                Algorithm.           (line   6)
 * Bison symbols, table of:               Table of Symbols.    (line   6)
 * Bison utility:                         Bison Parser.        (line   6)
+* BISON_I18N:                            Enabling I18n.       (line  18)
+* BISON_LOCALEDIR:                       Enabling I18n.       (line  18)
 * bison-i18n.m4:                         Enabling I18n.       (line  11)
 * bison-po:                              Internationalization.
                                                               (line   6)
@@ -15526,8 +15525,6 @@ Index of Terms
 * bisonVersion of YYParser:              D Parser Interface.  (line  69)
 * bisonVersion of YYParser <1>:          Java Parser Interface.
                                                               (line  91)
-* BISON_I18N:                            Enabling I18n.       (line  18)
-* BISON_LOCALEDIR:                       Enabling I18n.       (line  18)
 * BNF:                                   Language and Grammar.
                                                               (line  16)
 * braced code:                           Rules Syntax.        (line  29)
@@ -15567,19 +15564,19 @@ Index of Terms
                                                               (line   6)
 * controlling function:                  Rpcalc Main.         (line   6)
 * core, item set:                        Understanding.       (line 132)
+* counter_type:                          C++ position.        (line  11)
 * counterexample, nonunifying:           Glossary.            (line  31)
 * counterexample, unifying:              Glossary.            (line  31)
 * counterexamples:                       Counterexamples.     (line   6)
-* counter_type:                          C++ position.        (line  11)
 * dangling else:                         Shift/Reduce.        (line   6)
 * data type of locations:                Location Type.       (line   6)
 * data types in actions:                 Action Types.        (line   6)
 * data types of semantic values:         Value Type.          (line   6)
-* debugging:                             Tracing.             (line   6)
 * debug_level on parser:                 C++ Parser Interface.
                                                               (line  91)
 * debug_stream on parser:                C++ Parser Interface.
                                                               (line  86)
+* debugging:                             Tracing.             (line   6)
 * declaration summary:                   Decl Summary.        (line   6)
 * declarations:                          Prologue.            (line   6)
 * declarations section:                  Prologue.            (line   6)
@@ -15781,10 +15778,10 @@ Index of Terms
                                                               (line  27)
 * location tracking calculator:          Location Tracking Calc.
                                                               (line   6)
-* location, textual:                     Locations.           (line   6)
-* location, textual <1>:                 Tracking Locations.  (line   6)
 * location_type:                         C++ Parser Interface.
                                                               (line  49)
+* location, textual:                     Locations.           (line   6)
+* location, textual <1>:                 Tracking Locations.  (line   6)
 * lookahead correction:                  LAC.                 (line   6)
 * lookahead on context:                  C++ Parser Context.  (line  43)
 * lookahead token:                       Lookahead.           (line   6)
@@ -15824,6 +15821,10 @@ Index of Terms
 * nonunifying counterexample:            Glossary.            (line  31)
 * operator precedence:                   Precedence.          (line   6)
 * operator precedence, declaring:        Precedence Decl.     (line   6)
+* operator- on location:                 C++ location.        (line  30)
+* operator- on position:                 C++ position.        (line  45)
+* operator-= on location:                C++ location.        (line  31)
+* operator-= on position:                C++ position.        (line  44)
 * operator!= on location:                C++ location.        (line  43)
 * operator!= on position:                C++ position.        (line  49)
 * operator() on parser:                  C++ Parser Interface.
@@ -15834,10 +15835,6 @@ Index of Terms
 * operator+= on location:                C++ location.        (line  29)
 * operator+= on location <1>:            C++ location.        (line  35)
 * operator+= on position:                C++ position.        (line  42)
-* operator- on location:                 C++ location.        (line  30)
-* operator- on position:                 C++ position.        (line  45)
-* operator-= on location:                C++ location.        (line  31)
-* operator-= on position:                C++ position.        (line  44)
 * operator<<:                            C++ position.        (line  52)
 * operator<< <1>:                        C++ location.        (line  47)
 * operator== on location:                C++ location.        (line  42)
@@ -15875,14 +15872,14 @@ Index of Terms
 * pure parser:                           Pure Decl.           (line   6)
 * push parser:                           Push Decl.           (line   6)
 * push parser <1>:                       Push Decl.           (line   6)
-* pushParse on YYParser:                 D Push Parser Interface.
-                                                              (line  18)
 * push_parse on YYParser:                Java Push Parser Interface.
                                                               (line  18)
 * push_parse on YYParser <1>:            Java Push Parser Interface.
                                                               (line  19)
 * push_parse on YYParser <2>:            Java Push Parser Interface.
                                                               (line  21)
+* pushParse on YYParser:                 D Push Parser Interface.
+                                                              (line  18)
 * questions:                             FAQ.                 (line   6)
 * recovering:                            Java Action Features.
                                                               (line  54)
@@ -15897,11 +15894,11 @@ Index of Terms
 * reduce/reduce conflicts <2>:           Merging GLR Parses.  (line   6)
 * reduction:                             Algorithm.           (line   6)
 * reentrant parser:                      Pure Decl.           (line   6)
+* report_syntax_error on parser:         C++ Parser Context.  (line   9)
 * reportSyntaxError on Lexer:            Java Scanner Interface.
                                                               (line  59)
 * reportSyntaxError(YYParser.Context on Lexer: D Scanner Interface.
                                                               (line  34)
-* report_syntax_error on parser:         C++ Parser Context.  (line   9)
 * requiring a version of Bison:          Require Decl.        (line   6)
 * Reverse Polish Notation:               RPN Calc.            (line   6)
 * right recursion:                       Recursion.           (line  17)
@@ -15917,6 +15914,10 @@ Index of Terms
 * Semantic predicates in GLR parsers:    Semantic Predicates. (line   6)
 * semantic value:                        Semantic Values.     (line   6)
 * semantic value type:                   Value Type.          (line   6)
+* set_debug_level on parser:             C++ Parser Interface.
+                                                              (line  92)
+* set_debug_stream on parser:            C++ Parser Interface.
+                                                              (line  87)
 * setDebugLevel on YYParser:             Java Parser Interface.
                                                               (line  87)
 * setDebugLevel(int on YYParser:         D Parser Interface.  (line  65)
@@ -15926,10 +15927,6 @@ Index of Terms
 * setErrorVerbose on YYParser:           Java Parser Interface.
                                                               (line  65)
 * setErrorVerbose(boolean on YYParser:   D Parser Interface.  (line  44)
-* set_debug_level on parser:             C++ Parser Interface.
-                                                              (line  92)
-* set_debug_stream on parser:            C++ Parser Interface.
-                                                              (line  87)
 * shift/reduce conflicts:                GLR Parsers.         (line   6)
 * shift/reduce conflicts <1>:            Simple GLR Parsers.  (line   6)
 * shift/reduce conflicts <2>:            Shift/Reduce.        (line   6)
@@ -15950,13 +15947,6 @@ Index of Terms
 * suppressing conflict warnings:         Expect Decl.         (line   6)
 * symbol:                                Symbols.             (line   6)
 * symbol table example:                  Mfcalc Symbol Table. (line   6)
-* SymbolKind:                            D Parser Context Interface.
-                                                              (line   9)
-* SymbolKind <1>:                        Java Parser Context Interface.
-                                                              (line   9)
-* symbols (abstract):                    Language and Grammar.
-                                                              (line  46)
-* symbols in Bison, table of:            Table of Symbols.    (line   6)
 * symbol_kind_type:                      C++ Parser Context.  (line  19)
 * symbol_name on parser:                 C++ Parser Context.  (line  68)
 * symbol_type:                           Complete Symbols.    (line  17)
@@ -15964,6 +15954,13 @@ Index of Terms
 * symbol_type on parser::symbol_type <1>: Complete Symbols.   (line  34)
 * symbol_type on parser::symbol_type <2>: Complete Symbols.   (line  36)
 * symbol_type on parser::symbol_type <3>: Complete Symbols.   (line  38)
+* SymbolKind:                            D Parser Context Interface.
+                                                              (line   9)
+* SymbolKind <1>:                        Java Parser Context Interface.
+                                                              (line   9)
+* symbols (abstract):                    Language and Grammar.
+                                                              (line  46)
+* symbols in Bison, table of:            Table of Symbols.    (line   6)
 * syntactic grouping:                    Language and Grammar.
                                                               (line  46)
 * syntax error:                          Error Reporting Function.
@@ -15978,8 +15975,8 @@ Index of Terms
 * terminal symbol:                       Symbols.             (line   6)
 * textual location:                      Locations.           (line   6)
 * textual location <1>:                  Tracking Locations.  (line   6)
-* this(Lexer on YYParser:                D Parser Interface.  (line  34)
 * this(LEX_PARAM, on YYParser:           D Parser Interface.  (line  29)
+* this(Lexer on YYParser:                D Parser Interface.  (line  34)
 * this(Position on Location:             D Location Values.   (line  14)
 * this(Position on Location <1>:         D Location Values.   (line  18)
 * token:                                 Language and Grammar.
@@ -15989,9 +15986,9 @@ Index of Terms
 * token kind:                            Symbols.             (line   6)
 * token kind names, declaring:           Token Decl.          (line   6)
 * token on context:                      C++ Parser Context.  (line  46)
-* token, useless:                        Understanding.       (line  56)
 * token_kind_type:                       C++ Parser Interface.
                                                               (line  21)
+* token, useless:                        Understanding.       (line  56)
 * toString on Location:                  Java Location Values.
                                                               (line  30)
 * toString() on Location:                D Location Values.   (line  21)
@@ -16011,9 +16008,9 @@ Index of Terms
 * value types, declaring <2>:            Structured Value Type.
                                                               (line   6)
 * value types, nonterminals, declaring:  Type Decl.           (line   6)
-* value, semantic:                       Semantic Values.     (line   6)
 * value_type:                            C++ Parser Interface.
                                                               (line  46)
+* value, semantic:                       Semantic Values.     (line   6)
 * version:                               Versioning.          (line   6)
 * version requirement:                   Require Decl.        (line   6)
 * warnings, preventing:                  Expect Decl.         (line   6)
@@ -16181,270 +16178,269 @@ Index of Terms
 * YYUNDEF:                               Table of Symbols.    (line 443)
 * zoo:                                   Bison.               (line   6)
 
-
 
 Tag Table:
-Node: Top1066
-Node: Introduction18219
-Node: Conditions19794
-Node: Copying21717
-Node: Concepts59459
-Node: Language and Grammar60655
-Node: Grammar in Bison66769
-Node: Semantic Values68685
-Node: Semantic Actions70821
-Node: GLR Parsers71998
-Node: Simple GLR Parsers74773
-Node: Merging GLR Parses81253
-Ref: Merging GLR Parses-Footnote-186591
-Node: GLR Semantic Actions86732
-Node: Semantic Predicates89333
-Node: Locations91786
-Node: Bison Parser93264
-Node: Stages96464
-Node: Grammar Layout97689
-Node: Examples99051
-Node: RPN Calc100544
-Ref: RPN Calc-Footnote-1101596
-Node: Rpcalc Declarations101674
-Node: Rpcalc Rules103730
-Node: Rpcalc Input105629
-Node: Rpcalc Line107208
-Node: Rpcalc Exp108360
-Node: Rpcalc Lexer110373
-Node: Rpcalc Main113070
-Node: Rpcalc Error113481
-Node: Rpcalc Generate114509
-Node: Rpcalc Compile115757
-Node: Infix Calc116721
-Ref: Infix Calc-Footnote-1119567
-Node: Simple Error Recovery119720
-Node: Location Tracking Calc121658
-Node: Ltcalc Declarations122358
-Node: Ltcalc Rules123453
-Node: Ltcalc Lexer125295
-Node: Multi-function Calc127636
-Ref: Multi-function Calc-Footnote-1129413
-Node: Mfcalc Declarations129491
-Node: Mfcalc Rules131515
-Node: Mfcalc Symbol Table132793
-Node: Mfcalc Lexer136255
-Node: Mfcalc Main138828
-Node: Exercises139704
-Node: Grammar File140231
-Node: Grammar Outline141081
-Node: Prologue141939
-Node: Prologue Alternatives143740
-Ref: Prologue Alternatives-Footnote-1153440
-Node: Bison Declarations153545
-Node: Grammar Rules153955
-Node: Epilogue154411
-Node: Symbols155462
-Node: Rules162497
-Node: Rules Syntax162812
-Node: Empty Rules164877
-Node: Recursion165964
-Node: Semantics167622
-Node: Value Type168928
-Node: Multiple Types170216
-Node: Type Generation171666
-Node: Union Decl173596
-Node: Structured Value Type174989
-Node: Actions176015
-Node: Action Types179899
-Node: Midrule Actions181252
-Node: Using Midrule Actions181906
-Node: Typed Midrule Actions185445
-Node: Midrule Action Translation186995
-Node: Midrule Conflicts189488
-Node: Tracking Locations192097
-Node: Location Type192829
-Node: Actions and Locations194352
-Node: Printing Locations196734
-Node: Location Default Action197496
-Node: Named References201033
-Node: Declarations203630
-Node: Require Decl205319
-Node: Token Decl205833
-Node: Precedence Decl208750
-Node: Type Decl211026
-Node: Symbol Decls211977
-Node: Initial Action Decl212932
-Node: Destructor Decl213747
-Node: Printer Decl219393
-Node: Expect Decl221662
-Node: Start Decl225663
-Node: Pure Decl226057
-Node: Push Decl227805
-Node: Decl Summary232244
-Ref: %header234925
-Node: %define Summary243258
-Ref: api-filename-type245169
-Ref: api-token-prefix256117
-Node: %code Summary268123
-Node: Multiple Parsers272379
-Node: Interface276239
-Node: Parser Function277348
-Node: Push Parser Interface279841
-Ref: yypstate_new280226
-Ref: yypstate_delete280667
-Ref: yypush_parse281081
-Ref: yypull_parse282093
-Node: Lexical283096
-Node: Calling Convention284671
-Node: Special Tokens286200
-Node: Tokens from Literals287639
-Node: Token Values288720
-Node: Token Locations289888
-Node: Pure Calling290820
-Node: Error Reporting293417
-Node: Error Reporting Function293940
-Node: Syntax Error Reporting Function297312
-Node: Action Features301923
-Node: Internationalization306263
-Node: Enabling I18n307123
-Node: Token I18n309241
-Node: Algorithm310644
-Node: Lookahead313066
-Node: Shift/Reduce315280
-Node: Precedence319347
-Node: Why Precedence320119
-Node: Using Precedence322034
-Node: Precedence Only323534
-Node: Precedence Examples325336
-Node: How Precedence325860
-Node: Non Operators327005
-Node: Contextual Precedence328578
-Node: Parser States330324
-Node: Reduce/Reduce331579
-Node: Mysterious Conflicts336388
-Node: Tuning LR340015
-Node: LR Table Construction341221
-Node: Default Reductions346839
-Node: LAC351626
-Node: Unreachable States357132
-Node: Generalized LR Parsing359139
-Node: Memory Management363524
-Node: Error Recovery365908
-Node: Context Dependency371188
-Node: Semantic Tokens372045
-Node: Lexical Tie-ins375121
-Node: Tie-in Recovery376577
-Node: Debugging378709
-Node: Counterexamples380174
-Node: Understanding386180
-Ref: state-8392904
-Node: Graphviz398455
-Node: Xml402776
-Node: Tracing404514
-Node: Enabling Traces404891
-Node: Mfcalc Traces409019
-Node: Invocation414230
-Node: Bison Options416336
-Node: Operation Modes417183
-Node: Diagnostics422900
-Ref: Wconflicts-sr423208
-Ref: Wconflicts-rr423232
-Ref: Wcounterexamples423620
-Ref: Wdangling-alias423933
-Ref: Wdeprecated425263
-Ref: Wempty-rule425387
-Ref: Wmidrule-values425599
-Ref: Wprecedence426310
-Ref: Wyacc427444
-Ref: Wother427506
-Ref: Wall427810
-Ref: Wnone427930
-Ref: Werror428206
-Node: Tuning the Parser430013
-Ref: option-yacc433427
-Ref: Tuning the Parser-Footnote-1435280
-Node: Output Files435346
-Node: Option Cross Key438623
-Node: Yacc Library440761
-Node: Other Languages441834
-Node: C++ Parsers442459
-Node: A Simple C++ Example443188
-Ref: A Simple C++ Example-Footnote-1447342
-Node: C++ Bison Interface447425
-Node: C++ Parser Interface449015
-Node: C++ Semantic Values453602
-Node: C++ Unions454152
-Node: C++ Variants454945
-Node: C++ Location Values458718
-Node: C++ position459657
-Node: C++ location462026
-Node: Exposing the Location Classes464216
-Node: User Defined Location Type466115
-Node: C++ Parser Context467694
-Node: C++ Scanner Interface471661
-Node: Split Symbols472229
-Node: Complete Symbols473964
-Node: A Complete C++ Example478719
-Node: Calc++ --- C++ Calculator479662
-Node: Calc++ Parsing Driver480183
-Node: Calc++ Parser483150
-Node: Calc++ Scanner487273
-Node: Calc++ Top Level491228
-Node: D Parsers491927
-Node: D Bison Interface492631
-Node: D Semantic Values493744
-Node: D Location Values494577
-Node: D Parser Interface495448
-Node: D Parser Context Interface500364
-Node: D Scanner Interface501807
-Node: D Action Features504747
-Node: D Push Parser Interface505516
-Node: D Complete Symbols506992
-Node: Java Parsers507708
-Node: Java Bison Interface508524
-Node: Java Semantic Values510715
-Node: Java Location Values512412
-Node: Java Parser Interface514010
-Node: Java Parser Context Interface519267
-Node: Java Scanner Interface521352
-Node: Java Action Features525424
-Node: Java Push Parser Interface528175
-Node: Java Differences531170
-Ref: Java Differences-Footnote-1533833
-Node: Java Declarations Summary533987
-Node: History539020
-Node: Yacc539476
-Ref: Yacc-Footnote-1540972
-Ref: Yacc-Footnote-2541203
-Node: yacchack541273
-Node: Byacc541700
-Node: Bison542519
-Node: Other Ungulates544537
-Node: Versioning545127
-Node: FAQ548550
-Node: Memory Exhausted549577
-Node: How Can I Reset the Parser549879
-Node: Strings are Destroyed552473
-Node: Implementing Gotos/Loops554178
-Node: Multiple start-symbols555471
-Node: Secure? Conform?557051
-Node: Enabling Relocatability557505
-Node: I can't build Bison560429
-Node: Where can I find help?561701
-Node: Bug Reports562496
-Node: More Languages563975
-Node: Beta Testing564312
-Node: Mailing Lists565188
-Node: Table of Symbols565400
-Node: Glossary582432
-Node: GNU Free Documentation License592794
-Node: Bibliography618148
-Ref: Corbett 1984618288
-Ref: Denny 2008618638
-Ref: Denny 2010 May618964
-Ref: Denny 2010 November619239
-Ref: DeRemer 1982619577
-Ref: Isradisaikul 2015619849
-Ref: Johnson 1978620178
-Ref: Knuth 1965620447
-Ref: Scott 2000620683
-Node: Index of Terms621000
+Node: Top1040
+Node: Introduction18154
+Node: Conditions19727
+Node: Copying21636
+Node: Concepts59175
+Node: Language and Grammar60367
+Node: Grammar in Bison66345
+Node: Semantic Values68261
+Node: Semantic Actions70389
+Node: GLR Parsers71566
+Node: Simple GLR Parsers74339
+Node: Merging GLR Parses80810
+Ref: Merging GLR Parses-Footnote-186139
+Node: GLR Semantic Actions86280
+Node: Semantic Predicates88877
+Node: Locations91330
+Node: Bison Parser92808
+Node: Stages96001
+Node: Grammar Layout97226
+Node: Examples98588
+Node: RPN Calc100075
+Ref: RPN Calc-Footnote-1101127
+Node: Rpcalc Declarations101205
+Node: Rpcalc Rules103257
+Node: Rpcalc Input105148
+Node: Rpcalc Line106714
+Node: Rpcalc Exp107862
+Node: Rpcalc Lexer109871
+Node: Rpcalc Main112564
+Node: Rpcalc Error112975
+Node: Rpcalc Generate114003
+Node: Rpcalc Compile115247
+Node: Infix Calc116211
+Ref: Infix Calc-Footnote-1119054
+Node: Simple Error Recovery119207
+Node: Location Tracking Calc121142
+Node: Ltcalc Declarations121842
+Node: Ltcalc Rules122937
+Node: Ltcalc Lexer124777
+Node: Multi-function Calc127114
+Ref: Multi-function Calc-Footnote-1128891
+Node: Mfcalc Declarations128969
+Node: Mfcalc Rules130993
+Node: Mfcalc Symbol Table132271
+Node: Mfcalc Lexer135731
+Node: Mfcalc Main138304
+Node: Exercises139180
+Node: Grammar File139707
+Node: Grammar Outline140557
+Node: Prologue141415
+Node: Prologue Alternatives143214
+Ref: Prologue Alternatives-Footnote-1152898
+Node: Bison Declarations153003
+Node: Grammar Rules153413
+Node: Epilogue153869
+Node: Symbols154920
+Node: Rules161943
+Node: Rules Syntax162258
+Node: Empty Rules164323
+Node: Recursion165410
+Node: Semantics167068
+Node: Value Type168374
+Node: Multiple Types169658
+Node: Type Generation171108
+Node: Union Decl173038
+Node: Structured Value Type174431
+Node: Actions175457
+Node: Action Types179329
+Node: Midrule Actions180682
+Node: Using Midrule Actions181336
+Node: Typed Midrule Actions184873
+Node: Midrule Action Translation186421
+Node: Midrule Conflicts188913
+Node: Tracking Locations191522
+Node: Location Type192254
+Node: Actions and Locations193777
+Node: Printing Locations196159
+Node: Location Default Action196919
+Node: Named References200452
+Node: Declarations203048
+Node: Require Decl204735
+Node: Token Decl205249
+Node: Precedence Decl208162
+Node: Type Decl210438
+Node: Symbol Decls211389
+Node: Initial Action Decl212344
+Node: Destructor Decl213157
+Node: Printer Decl218801
+Node: Expect Decl221070
+Node: Start Decl225067
+Node: Pure Decl225461
+Node: Push Decl227209
+Node: Decl Summary231642
+Ref: %header234319
+Node: %define Summary242648
+Ref: api-filename-type244557
+Ref: api-token-prefix255495
+Node: %code Summary267498
+Node: Multiple Parsers271750
+Node: Interface275605
+Node: Parser Function276712
+Node: Push Parser Interface279203
+Ref: yypstate_new279588
+Ref: yypstate_delete280029
+Ref: yypush_parse280443
+Ref: yypull_parse281455
+Node: Lexical282458
+Node: Calling Convention284033
+Node: Special Tokens285562
+Node: Tokens from Literals286997
+Node: Token Values288078
+Node: Token Locations289242
+Node: Pure Calling290174
+Node: Error Reporting292771
+Node: Error Reporting Function293294
+Node: Syntax Error Reporting Function296664
+Node: Action Features301265
+Node: Internationalization305605
+Node: Enabling I18n306457
+Node: Token I18n308567
+Node: Algorithm309958
+Node: Lookahead312372
+Node: Shift/Reduce314582
+Node: Precedence318637
+Node: Why Precedence319409
+Node: Using Precedence321324
+Node: Precedence Only322820
+Node: Precedence Examples324622
+Node: How Precedence325146
+Node: Non Operators326287
+Node: Contextual Precedence327848
+Node: Parser States329590
+Node: Reduce/Reduce330839
+Node: Mysterious Conflicts335642
+Node: Tuning LR339264
+Node: LR Table Construction340464
+Node: Default Reductions346076
+Node: LAC350863
+Node: Unreachable States356363
+Node: Generalized LR Parsing358366
+Node: Memory Management362744
+Node: Error Recovery365128
+Node: Context Dependency370404
+Node: Semantic Tokens371257
+Node: Lexical Tie-ins374325
+Node: Tie-in Recovery375781
+Node: Debugging377911
+Node: Counterexamples379374
+Node: Understanding385376
+Ref: state-8392088
+Node: Graphviz397639
+Node: Xml401956
+Node: Tracing403694
+Node: Enabling Traces404067
+Node: Mfcalc Traces408193
+Node: Invocation413400
+Node: Bison Options415502
+Node: Operation Modes416349
+Node: Diagnostics422058
+Ref: Wconflicts-sr422366
+Ref: Wconflicts-rr422390
+Ref: Wcounterexamples422778
+Ref: Wdangling-alias423091
+Ref: Wdeprecated424416
+Ref: Wempty-rule424540
+Ref: Wmidrule-values424752
+Ref: Wprecedence425463
+Ref: Wyacc426597
+Ref: Wother426659
+Ref: Wall426963
+Ref: Wnone427083
+Ref: Werror427359
+Node: Tuning the Parser429164
+Ref: option-yacc432576
+Ref: Tuning the Parser-Footnote-1434425
+Node: Output Files434491
+Node: Option Cross Key437760
+Node: Yacc Library439898
+Node: Other Languages440965
+Node: C++ Parsers441588
+Node: A Simple C++ Example442317
+Ref: A Simple C++ Example-Footnote-1446467
+Node: C++ Bison Interface446550
+Node: C++ Parser Interface448140
+Node: C++ Semantic Values452723
+Node: C++ Unions453273
+Node: C++ Variants454066
+Node: C++ Location Values457827
+Node: C++ position458766
+Node: C++ location461135
+Node: Exposing the Location Classes463325
+Node: User Defined Location Type465218
+Node: C++ Parser Context466797
+Node: C++ Scanner Interface470760
+Node: Split Symbols471328
+Node: Complete Symbols473063
+Node: A Complete C++ Example477814
+Node: Calc++ --- C++ Calculator478757
+Node: Calc++ Parsing Driver479278
+Node: Calc++ Parser482241
+Node: Calc++ Scanner486356
+Node: Calc++ Top Level490299
+Node: D Parsers490998
+Node: D Bison Interface491702
+Node: D Semantic Values492815
+Node: D Location Values493646
+Node: D Parser Interface494517
+Node: D Parser Context Interface499433
+Node: D Scanner Interface500876
+Node: D Action Features503816
+Node: D Push Parser Interface504585
+Node: D Complete Symbols506059
+Node: Java Parsers506775
+Node: Java Bison Interface507591
+Node: Java Semantic Values509774
+Node: Java Location Values511469
+Node: Java Parser Interface513067
+Node: Java Parser Context Interface518322
+Node: Java Scanner Interface520407
+Node: Java Action Features524479
+Node: Java Push Parser Interface527230
+Node: Java Differences530223
+Ref: Java Differences-Footnote-1532886
+Node: Java Declarations Summary533040
+Node: History538073
+Node: Yacc538529
+Ref: Yacc-Footnote-1540022
+Ref: Yacc-Footnote-2540245
+Node: yacchack540315
+Node: Byacc540738
+Node: Bison541551
+Node: Other Ungulates543559
+Node: Versioning544139
+Node: FAQ547562
+Node: Memory Exhausted548589
+Node: How Can I Reset the Parser548891
+Node: Strings are Destroyed551483
+Node: Implementing Gotos/Loops553184
+Node: Multiple start-symbols554475
+Node: Secure? Conform?556055
+Node: Enabling Relocatability556505
+Node: I can't build Bison559423
+Node: Where can I find help?560683
+Node: Bug Reports561476
+Node: More Languages562951
+Node: Beta Testing563286
+Node: Mailing Lists564160
+Node: Table of Symbols564372
+Node: Glossary581398
+Node: GNU Free Documentation License591676
+Node: Bibliography616829
+Ref: Corbett 1984616969
+Ref: Denny 2008617320
+Ref: Denny 2010 May617642
+Ref: Denny 2010 November617917
+Ref: DeRemer 1982618253
+Ref: Isradisaikul 2015618523
+Ref: Johnson 1978618848
+Ref: Knuth 1965619113
+Ref: Scott 2000619347
+Node: Index of Terms619664
 
 End Tag Table
 
diff --git a/local/recipes/dev/bison/source/doc/stamp-vti b/local/recipes/dev/bison/source/doc/stamp-vti
index f0d2ff89da..ea589ebddd 100644
--- a/local/recipes/dev/bison/source/doc/stamp-vti
+++ b/local/recipes/dev/bison/source/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 12 September 2021
-@set UPDATED-MONTH September 2021
+@set UPDATED 15 May 2026
+@set UPDATED-MONTH May 2026
 @set EDITION 3.8.2
 @set VERSION 3.8.2
diff --git a/local/recipes/dev/bison/source/doc/version.texi b/local/recipes/dev/bison/source/doc/version.texi
index f0d2ff89da..ea589ebddd 100644
--- a/local/recipes/dev/bison/source/doc/version.texi
+++ b/local/recipes/dev/bison/source/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 12 September 2021
-@set UPDATED-MONTH September 2021
+@set UPDATED 15 May 2026
+@set UPDATED-MONTH May 2026
 @set EDITION 3.8.2
 @set VERSION 3.8.2
diff --git a/local/recipes/dev/bison/source/lib/config.in.h b/local/recipes/dev/bison/source/lib/config.in.h
index c93fae45a5..2776c42a12 100644
--- a/local/recipes/dev/bison/source/lib/config.in.h
+++ b/local/recipes/dev/bison/source/lib/config.in.h
@@ -585,10 +585,10 @@
 /* Define to 1 if you have the <bp-sym.h> header file. */
 #undef HAVE_BP_SYM_H
 
-/* Define to 1 if you have the `canonicalize_file_name' function. */
+/* Define to 1 if you have the 'canonicalize_file_name' function. */
 #undef HAVE_CANONICALIZE_FILE_NAME
 
-/* Define to 1 if you have the `catgets' function. */
+/* Define to 1 if you have the 'catgets' function. */
 #undef HAVE_CATGETS
 
 /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
@@ -599,16 +599,16 @@
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
-/* Define to 1 if you have the `clock_gettime' function. */
+/* Define to 1 if you have the 'clock_gettime' function. */
 #undef HAVE_CLOCK_GETTIME
 
-/* Define to 1 if you have the `clock_settime' function. */
+/* Define to 1 if you have the 'clock_settime' function. */
 #undef HAVE_CLOCK_SETTIME
 
-/* Define to 1 if you have the `closedir' function. */
+/* Define to 1 if you have the 'closedir' function. */
 #undef HAVE_CLOSEDIR
 
-/* Define to 1 if you have the `confstr' function. */
+/* Define to 1 if you have the 'confstr' function. */
 #undef HAVE_CONFSTR
 
 /* Define if the copysignf function is declared in <math.h> and available in
@@ -623,7 +623,7 @@
    libc. */
 #undef HAVE_COPYSIGN_IN_LIBC
 
-/* Define to 1 if you have the `copy_file_range' function. */
+/* Define to 1 if you have the 'copy_file_range' function. */
 #undef HAVE_COPY_FILE_RANGE
 
 /* Define to 1 if you have the <crtdefs.h> header file. */
@@ -633,127 +633,127 @@
    */
 #undef HAVE_DCGETTEXT
 
-/* Define to 1 if you have the declaration of `alarm', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'alarm', and to 0 if you don't.
    */
 #undef HAVE_DECL_ALARM
 
-/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'clearerr_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_CLEARERR_UNLOCKED
 
-/* Define to 1 if you have the declaration of `copysign', and to 0 if you
+/* Define to 1 if you have the declaration of 'copysign', and to 0 if you
    don't. */
 #undef HAVE_DECL_COPYSIGN
 
-/* Define to 1 if you have the declaration of `copysignf', and to 0 if you
+/* Define to 1 if you have the declaration of 'copysignf', and to 0 if you
    don't. */
 #undef HAVE_DECL_COPYSIGNF
 
-/* Define to 1 if you have the declaration of `copysignl', and to 0 if you
+/* Define to 1 if you have the declaration of 'copysignl', and to 0 if you
    don't. */
 #undef HAVE_DECL_COPYSIGNL
 
-/* Define to 1 if you have the declaration of `dirfd', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'dirfd', and to 0 if you don't.
    */
 #undef HAVE_DECL_DIRFD
 
-/* Define to 1 if you have the declaration of `ecvt', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'ecvt', and to 0 if you don't.
    */
 #undef HAVE_DECL_ECVT
 
-/* Define to 1 if you have the declaration of `execvpe', and to 0 if you
+/* Define to 1 if you have the declaration of 'execvpe', and to 0 if you
    don't. */
 #undef HAVE_DECL_EXECVPE
 
-/* Define to 1 if you have the declaration of `fchdir', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'fchdir', and to 0 if you don't.
    */
 #undef HAVE_DECL_FCHDIR
 
-/* Define to 1 if you have the declaration of `fcloseall', and to 0 if you
+/* Define to 1 if you have the declaration of 'fcloseall', and to 0 if you
    don't. */
 #undef HAVE_DECL_FCLOSEALL
 
-/* Define to 1 if you have the declaration of `fcvt', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'fcvt', and to 0 if you don't.
    */
 #undef HAVE_DECL_FCVT
 
-/* Define to 1 if you have the declaration of `fdopendir', and to 0 if you
+/* Define to 1 if you have the declaration of 'fdopendir', and to 0 if you
    don't. */
 #undef HAVE_DECL_FDOPENDIR
 
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
+/* Define to 1 if you have the declaration of 'feof_unlocked', and to 0 if you
    don't. */
 #undef HAVE_DECL_FEOF_UNLOCKED
 
-/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'ferror_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_FERROR_UNLOCKED
 
-/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'fflush_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_FFLUSH_UNLOCKED
 
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'fgets_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_FGETS_UNLOCKED
 
-/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'fputc_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_FPUTC_UNLOCKED
 
-/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'fputs_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_FPUTS_UNLOCKED
 
-/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'fread_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_FREAD_UNLOCKED
 
-/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'fwrite_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_FWRITE_UNLOCKED
 
-/* Define to 1 if you have the declaration of `gcvt', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'gcvt', and to 0 if you don't.
    */
 #undef HAVE_DECL_GCVT
 
-/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'getchar_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_GETCHAR_UNLOCKED
 
-/* Define to 1 if you have the declaration of `getcwd', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'getcwd', and to 0 if you don't.
    */
 #undef HAVE_DECL_GETCWD
 
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+/* Define to 1 if you have the declaration of 'getc_unlocked', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETC_UNLOCKED
 
-/* Define to 1 if you have the declaration of `getdelim', and to 0 if you
+/* Define to 1 if you have the declaration of 'getdelim', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETDELIM
 
-/* Define to 1 if you have the declaration of `getdtablesize', and to 0 if you
+/* Define to 1 if you have the declaration of 'getdtablesize', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETDTABLESIZE
 
-/* Define to 1 if you have the declaration of `gethrtime', and to 0 if you
+/* Define to 1 if you have the declaration of 'gethrtime', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETHRTIME
 
-/* Define to 1 if you have the declaration of `getline', and to 0 if you
+/* Define to 1 if you have the declaration of 'getline', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETLINE
 
-/* Define to 1 if you have the declaration of `iswblank', and to 0 if you
+/* Define to 1 if you have the declaration of 'iswblank', and to 0 if you
    don't. */
 #undef HAVE_DECL_ISWBLANK
 
-/* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you
+/* Define to 1 if you have the declaration of 'mbrtowc', and to 0 if you
    don't. */
 #undef HAVE_DECL_MBRTOWC
 
-/* Define to 1 if you have the declaration of `mbsinit', and to 0 if you
+/* Define to 1 if you have the declaration of 'mbsinit', and to 0 if you
    don't. */
 #undef HAVE_DECL_MBSINIT
 
@@ -761,122 +761,122 @@
    otherwise. */
 #undef HAVE_DECL_MBSWIDTH_IN_WCHAR_H
 
-/* Define to 1 if you have the declaration of `memrchr', and to 0 if you
+/* Define to 1 if you have the declaration of 'memrchr', and to 0 if you
    don't. */
 #undef HAVE_DECL_MEMRCHR
 
-/* Define to 1 if you have the declaration of `obstack_printf', and to 0 if
+/* Define to 1 if you have the declaration of 'obstack_printf', and to 0 if
    you don't. */
 #undef HAVE_DECL_OBSTACK_PRINTF
 
-/* Define to 1 if you have the declaration of `posix_spawn', and to 0 if you
+/* Define to 1 if you have the declaration of 'posix_spawn', and to 0 if you
    don't. */
 #undef HAVE_DECL_POSIX_SPAWN
 
-/* Define to 1 if you have the declaration of `program_invocation_name', and
+/* Define to 1 if you have the declaration of 'program_invocation_name', and
    to 0 if you don't. */
 #undef HAVE_DECL_PROGRAM_INVOCATION_NAME
 
-/* Define to 1 if you have the declaration of `program_invocation_short_name',
+/* Define to 1 if you have the declaration of 'program_invocation_short_name',
    and to 0 if you don't. */
 #undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
 
-/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
+/* Define to 1 if you have the declaration of 'putchar_unlocked', and to 0 if
    you don't. */
 #undef HAVE_DECL_PUTCHAR_UNLOCKED
 
-/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
+/* Define to 1 if you have the declaration of 'putc_unlocked', and to 0 if you
    don't. */
 #undef HAVE_DECL_PUTC_UNLOCKED
 
-/* Define to 1 if you have the declaration of `setenv', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'setenv', and to 0 if you don't.
    */
 #undef HAVE_DECL_SETENV
 
-/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
+/* Define to 1 if you have the declaration of 'snprintf', and to 0 if you
    don't. */
 #undef HAVE_DECL_SNPRINTF
 
-/* Define to 1 if you have the declaration of `stpncpy', and to 0 if you
+/* Define to 1 if you have the declaration of 'stpncpy', and to 0 if you
    don't. */
 #undef HAVE_DECL_STPNCPY
 
-/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'strdup', and to 0 if you don't.
    */
 #undef HAVE_DECL_STRDUP
 
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
+/* Define to 1 if you have the declaration of 'strerror_r', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRERROR_R
 
-/* Define to 1 if you have the declaration of `strndup', and to 0 if you
+/* Define to 1 if you have the declaration of 'strndup', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRNDUP
 
-/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
+/* Define to 1 if you have the declaration of 'strnlen', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRNLEN
 
-/* Define to 1 if you have the declaration of `towlower', and to 0 if you
+/* Define to 1 if you have the declaration of 'towlower', and to 0 if you
    don't. */
 #undef HAVE_DECL_TOWLOWER
 
-/* Define to 1 if you have the declaration of `unsetenv', and to 0 if you
+/* Define to 1 if you have the declaration of 'unsetenv', and to 0 if you
    don't. */
 #undef HAVE_DECL_UNSETENV
 
-/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
+/* Define to 1 if you have the declaration of 'vsnprintf', and to 0 if you
    don't. */
 #undef HAVE_DECL_VSNPRINTF
 
-/* Define to 1 if you have the declaration of `wcsdup', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'wcsdup', and to 0 if you don't.
    */
 #undef HAVE_DECL_WCSDUP
 
-/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
+/* Define to 1 if you have the declaration of 'wcwidth', and to 0 if you
    don't. */
 #undef HAVE_DECL_WCWIDTH
 
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
+/* Define to 1 if you have the declaration of '_snprintf', and to 0 if you
    don't. */
 #undef HAVE_DECL__SNPRINTF
 
-/* Define to 1 if you have the declaration of `__argv', and to 0 if you don't.
+/* Define to 1 if you have the declaration of '__argv', and to 0 if you don't.
    */
 #undef HAVE_DECL___ARGV
 
-/* Define to 1 if you have the declaration of `__fpending', and to 0 if you
+/* Define to 1 if you have the declaration of '__fpending', and to 0 if you
    don't. */
 #undef HAVE_DECL___FPENDING
 
 /* Define to 1 if you have the <dirent.h> header file. */
 #undef HAVE_DIRENT_H
 
-/* Define to 1 if you have the `dirfd' function. */
+/* Define to 1 if you have the 'dirfd' function. */
 #undef HAVE_DIRFD
 
 /* Define if you have the declaration of environ. */
 #undef HAVE_ENVIRON_DECL
 
-/* Define to 1 if you have the `faccessat' function. */
+/* Define to 1 if you have the 'faccessat' function. */
 #undef HAVE_FACCESSAT
 
-/* Define to 1 if you have the `fchdir' function. */
+/* Define to 1 if you have the 'fchdir' function. */
 #undef HAVE_FCHDIR
 
-/* Define to 1 if you have the `fcntl' function. */
+/* Define to 1 if you have the 'fcntl' function. */
 #undef HAVE_FCNTL
 
-/* Define to 1 if you have the `fdopendir' function. */
+/* Define to 1 if you have the 'fdopendir' function. */
 #undef HAVE_FDOPENDIR
 
 /* Define to 1 if you have the <features.h> header file. */
 #undef HAVE_FEATURES_H
 
-/* Define to 1 if you have the `ffsl' function. */
+/* Define to 1 if you have the 'ffsl' function. */
 #undef HAVE_FFSL
 
-/* Define to 1 if you have the `flockfile' function. */
+/* Define to 1 if you have the 'flockfile' function. */
 #undef HAVE_FLOCKFILE
 
 /* Define if the 'free' function is guaranteed to preserve errno. */
@@ -888,50 +888,50 @@
 /* Define if the frexp function is available in libc. */
 #undef HAVE_FREXP_IN_LIBC
 
-/* Define to 1 if you have the `fstatat' function. */
+/* Define to 1 if you have the 'fstatat' function. */
 #undef HAVE_FSTATAT
 
-/* Define to 1 if you have the `fsync' function. */
+/* Define to 1 if you have the 'fsync' function. */
 #undef HAVE_FSYNC
 
-/* Define to 1 if you have the `funlockfile' function. */
+/* Define to 1 if you have the 'funlockfile' function. */
 #undef HAVE_FUNLOCKFILE
 
-/* Define to 1 if you have the `getcwd' function. */
+/* Define to 1 if you have the 'getcwd' function. */
 #undef HAVE_GETCWD
 
 /* Define to 1 if getcwd works, but with shorter paths than is generally
    tested with the replacement. */
 #undef HAVE_GETCWD_SHORTER
 
-/* Define to 1 if you have the `getdelim' function. */
+/* Define to 1 if you have the 'getdelim' function. */
 #undef HAVE_GETDELIM
 
-/* Define to 1 if you have the `getdtablesize' function. */
+/* Define to 1 if you have the 'getdtablesize' function. */
 #undef HAVE_GETDTABLESIZE
 
-/* Define to 1 if you have the `getexecname' function. */
+/* Define to 1 if you have the 'getexecname' function. */
 #undef HAVE_GETEXECNAME
 
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
-/* Define to 1 if you have the `getopt_long_only' function. */
+/* Define to 1 if you have the 'getopt_long_only' function. */
 #undef HAVE_GETOPT_LONG_ONLY
 
 /* Define to 1 if the system has the 'getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
-/* Define to 1 if you have the `getprogname' function. */
+/* Define to 1 if you have the 'getprogname' function. */
 #undef HAVE_GETPROGNAME
 
-/* Define to 1 if you have the `getrusage' function. */
+/* Define to 1 if you have the 'getrusage' function. */
 #undef HAVE_GETRUSAGE
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define to 1 if you have the `gettimeofday' function. */
+/* Define to 1 if you have the 'gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
 /* Define if you have the iconv() function and it works. */
@@ -955,7 +955,7 @@
    declares uintmax_t. */
 #undef HAVE_INTTYPES_H_WITH_UINTMAX
 
-/* Define to 1 if you have the `isascii' function. */
+/* Define to 1 if you have the 'isascii' function. */
 #undef HAVE_ISASCII
 
 /* Define if the isnan(double) function is available in libc. */
@@ -967,10 +967,10 @@
 /* Define if the isnan(long double) function is available in libc. */
 #undef HAVE_ISNANL_IN_LIBC
 
-/* Define to 1 if you have the `iswblank' function. */
+/* Define to 1 if you have the 'iswblank' function. */
 #undef HAVE_ISWBLANK
 
-/* Define to 1 if you have the `iswcntrl' function. */
+/* Define to 1 if you have the 'iswcntrl' function. */
 #undef HAVE_ISWCNTRL
 
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
@@ -991,7 +991,7 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
-/* Define to 1 if you have the `link' function. */
+/* Define to 1 if you have the 'link' function. */
 #undef HAVE_LINK
 
 /* Define to 1 if you have the <locale.h> header file. */
@@ -1000,7 +1000,7 @@
 /* Define to 1 if the system has the type 'long long int'. */
 #undef HAVE_LONG_LONG_INT
 
-/* Define to 1 if you have the `lstat' function. */
+/* Define to 1 if you have the 'lstat' function. */
 #undef HAVE_LSTAT
 
 /* Define to 1 if you have the <mach-o/dyld.h> header file. */
@@ -1016,22 +1016,22 @@
 /* Define to 1 if you have the <math.h> header file. */
 #undef HAVE_MATH_H
 
-/* Define to 1 if you have the `mbrtowc' function. */
+/* Define to 1 if you have the 'mbrtowc' function. */
 #undef HAVE_MBRTOWC
 
-/* Define to 1 if you have the `mbsinit' function. */
+/* Define to 1 if you have the 'mbsinit' function. */
 #undef HAVE_MBSINIT
 
 /* Define to 1 if <wchar.h> declares mbstate_t. */
 #undef HAVE_MBSTATE_T
 
-/* Define to 1 if you have the `mempcpy' function. */
+/* Define to 1 if you have the 'mempcpy' function. */
 #undef HAVE_MEMPCPY
 
-/* Define to 1 if you have the `memrchr' function. */
+/* Define to 1 if you have the 'memrchr' function. */
 #undef HAVE_MEMRCHR
 
-/* Define to 1 if you have the `microuptime' function. */
+/* Define to 1 if you have the 'microuptime' function. */
 #undef HAVE_MICROUPTIME
 
 /* Define to 1 if getcwd minimally works, that is, its result can be trusted
@@ -1047,29 +1047,29 @@
 /* Define to 1 if <sys/param.h> defines the MIN and MAX macros. */
 #undef HAVE_MINMAX_IN_SYS_PARAM_H
 
-/* Define to 1 if you have the `mprotect' function. */
+/* Define to 1 if you have the 'mprotect' function. */
 #undef HAVE_MPROTECT
 
 /* Define to 1 on MSVC platforms that have the "invalid parameter handler"
    concept. */
 #undef HAVE_MSVC_INVALID_PARAMETER_HANDLER
 
-/* Define to 1 if you have the `nanouptime' function. */
+/* Define to 1 if you have the 'nanouptime' function. */
 #undef HAVE_NANOUPTIME
 
-/* Define to 1 if you have the `nl_langinfo' function. */
+/* Define to 1 if you have the 'nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
 /* Define to 1 if the system has obstacks that work with any size object. */
 #undef HAVE_OBSTACK
 
-/* Define to 1 if you have the `obstack_printf' function. */
+/* Define to 1 if you have the 'obstack_printf' function. */
 #undef HAVE_OBSTACK_PRINTF
 
-/* Define to 1 if you have the `openat' function. */
+/* Define to 1 if you have the 'openat' function. */
 #undef HAVE_OPENAT
 
-/* Define to 1 if you have the `opendir' function. */
+/* Define to 1 if you have the 'opendir' function. */
 #undef HAVE_OPENDIR
 
 /* Define to 1 if getcwd works, except it sometimes fails when it shouldn't,
@@ -1079,27 +1079,27 @@
 /* Define to 1 if you have the <paths.h> header file. */
 #undef HAVE_PATHS_H
 
-/* Define to 1 if you have the `pipe' function. */
+/* Define to 1 if you have the 'pipe' function. */
 #undef HAVE_PIPE
 
-/* Define to 1 if you have the `pipe2' function. */
+/* Define to 1 if you have the 'pipe2' function. */
 #undef HAVE_PIPE2
 
-/* Define to 1 if you have the `posix_spawn' function. */
+/* Define to 1 if you have the 'posix_spawn' function. */
 #undef HAVE_POSIX_SPAWN
 
-/* Define to 1 if the system has the type `posix_spawnattr_t'. */
+/* Define to 1 if the system has the type 'posix_spawnattr_t'. */
 #undef HAVE_POSIX_SPAWNATTR_T
 
-/* Define to 1 if you have the `posix_spawn_file_actions_addchdir' function.
+/* Define to 1 if you have the 'posix_spawn_file_actions_addchdir' function.
    */
 #undef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR
 
-/* Define to 1 if you have the `posix_spawn_file_actions_addchdir_np'
+/* Define to 1 if you have the 'posix_spawn_file_actions_addchdir_np'
    function. */
 #undef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP
 
-/* Define to 1 if the system has the type `posix_spawn_file_actions_t'. */
+/* Define to 1 if the system has the type 'posix_spawn_file_actions_t'. */
 #undef HAVE_POSIX_SPAWN_FILE_ACTIONS_T
 
 /* Define if you have the <pthread.h> header and the POSIX threads API. */
@@ -1115,13 +1115,13 @@
    reader. */
 #undef HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
 
-/* Define to 1 if you have the `raise' function. */
+/* Define to 1 if you have the 'raise' function. */
 #undef HAVE_RAISE
 
-/* Define to 1 if you have the `rawmemchr' function. */
+/* Define to 1 if you have the 'rawmemchr' function. */
 #undef HAVE_RAWMEMCHR
 
-/* Define to 1 if you have the `readdir' function. */
+/* Define to 1 if you have the 'readdir' function. */
 #undef HAVE_READDIR
 
 /* Define if you have the readline library. */
@@ -1133,19 +1133,19 @@
 /* Define to 1 if you have the <readline/readline.h> header file. */
 #undef HAVE_READLINE_READLINE_H
 
-/* Define to 1 if you have the `readlink' function. */
+/* Define to 1 if you have the 'readlink' function. */
 #undef HAVE_READLINK
 
-/* Define to 1 if you have the `readlinkat' function. */
+/* Define to 1 if you have the 'readlinkat' function. */
 #undef HAVE_READLINKAT
 
-/* Define to 1 if you have the `reallocarray' function. */
+/* Define to 1 if you have the 'reallocarray' function. */
 #undef HAVE_REALLOCARRAY
 
-/* Define to 1 if you have the `realpath' function. */
+/* Define to 1 if you have the 'realpath' function. */
 #undef HAVE_REALPATH
 
-/* Define to 1 if you have the `rewinddir' function. */
+/* Define to 1 if you have the 'rewinddir' function. */
 #undef HAVE_REWINDDIR
 
 /* Define to 1 if 'long double' and 'double' have the same representation. */
@@ -1154,10 +1154,10 @@
 /* Define to 1 if you have the <sched.h> header file. */
 #undef HAVE_SCHED_H
 
-/* Define to 1 if you have the `sched_setparam' function. */
+/* Define to 1 if you have the 'sched_setparam' function. */
 #undef HAVE_SCHED_SETPARAM
 
-/* Define to 1 if you have the `sched_setscheduler' function. */
+/* Define to 1 if you have the 'sched_setscheduler' function. */
 #undef HAVE_SCHED_SETSCHEDULER
 
 /* Define to 1 if you have the <sdkddkver.h> header file. */
@@ -1166,31 +1166,31 @@
 /* Define to 1 if you have the <search.h> header file. */
 #undef HAVE_SEARCH_H
 
-/* Define to 1 if you have the `setdtablesize' function. */
+/* Define to 1 if you have the 'setdtablesize' function. */
 #undef HAVE_SETDTABLESIZE
 
-/* Define to 1 if you have the `setegid' function. */
+/* Define to 1 if you have the 'setegid' function. */
 #undef HAVE_SETEGID
 
-/* Define to 1 if you have the `setenv' function. */
+/* Define to 1 if you have the 'setenv' function. */
 #undef HAVE_SETENV
 
-/* Define to 1 if you have the `seteuid' function. */
+/* Define to 1 if you have the 'seteuid' function. */
 #undef HAVE_SETEUID
 
-/* Define to 1 if you have the `setlocale' function. */
+/* Define to 1 if you have the 'setlocale' function. */
 #undef HAVE_SETLOCALE
 
-/* Define to 1 if you have the `sigaction' function. */
+/* Define to 1 if you have the 'sigaction' function. */
 #undef HAVE_SIGACTION
 
-/* Define to 1 if you have the `sigaltstack' function. */
+/* Define to 1 if you have the 'sigaltstack' function. */
 #undef HAVE_SIGALTSTACK
 
-/* Define to 1 if the system has the type `siginfo_t'. */
+/* Define to 1 if the system has the type 'siginfo_t'. */
 #undef HAVE_SIGINFO_T
 
-/* Define to 1 if you have the `siginterrupt' function. */
+/* Define to 1 if you have the 'siginterrupt' function. */
 #undef HAVE_SIGINTERRUPT
 
 /* Define to 1 if 'sig_atomic_t' is a signed integer type. */
@@ -1202,13 +1202,13 @@
 /* Define to 1 if 'wint_t' is a signed integer type. */
 #undef HAVE_SIGNED_WINT_T
 
-/* Define to 1 if the system has the type `sigset_t'. */
+/* Define to 1 if the system has the type 'sigset_t'. */
 #undef HAVE_SIGSET_T
 
-/* Define to 1 if the system has the type `sig_atomic_t'. */
+/* Define to 1 if the system has the type 'sig_atomic_t'. */
 #undef HAVE_SIG_ATOMIC_T
 
-/* Define to 1 if you have the `snprintf' function. */
+/* Define to 1 if you have the 'snprintf' function. */
 #undef HAVE_SNPRINTF
 
 /* Define if the return value of the snprintf function is the number of of
@@ -1239,16 +1239,16 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `stpcpy' function. */
+/* Define to 1 if you have the 'stpcpy' function. */
 #undef HAVE_STPCPY
 
 /* Define if you have the stpncpy() function and it works. */
 #undef HAVE_STPNCPY
 
-/* Define to 1 if you have the `strchrnul' function. */
+/* Define to 1 if you have the 'strchrnul' function. */
 #undef HAVE_STRCHRNUL
 
-/* Define to 1 if you have the `strerror_r' function. */
+/* Define to 1 if you have the 'strerror_r' function. */
 #undef HAVE_STRERROR_R
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -1257,43 +1257,43 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strndup' function. */
+/* Define to 1 if you have the 'strndup' function. */
 #undef HAVE_STRNDUP
 
-/* Define to 1 if you have the `strnlen' function. */
+/* Define to 1 if you have the 'strnlen' function. */
 #undef HAVE_STRNLEN
 
-/* Define to 1 if `sa_sigaction' is a member of `struct sigaction'. */
+/* Define to 1 if 'sa_sigaction' is a member of 'struct sigaction'. */
 #undef HAVE_STRUCT_SIGACTION_SA_SIGACTION
 
-/* Define to 1 if `st_atimensec' is a member of `struct stat'. */
+/* Define to 1 if 'st_atimensec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIMENSEC
 
-/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_atimespec.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC
 
-/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_atim.st__tim.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC
 
-/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_atim.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
 
-/* Define to 1 if `st_birthtimensec' is a member of `struct stat'. */
+/* Define to 1 if 'st_birthtimensec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
 
-/* Define to 1 if `st_birthtimespec.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_birthtimespec.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC
 
-/* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_birthtim.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC
 
-/* Define to 1 if the system has the type `struct tms'. */
+/* Define to 1 if the system has the type 'struct tms'. */
 #undef HAVE_STRUCT_TMS
 
-/* Define to 1 if you have the `strverscmp' function. */
+/* Define to 1 if you have the 'strverscmp' function. */
 #undef HAVE_STRVERSCMP
 
-/* Define to 1 if you have the `symlink' function. */
+/* Define to 1 if you have the 'symlink' function. */
 #undef HAVE_SYMLINK
 
 /* Define to 1 if you have the <sys/bitypes.h> header file. */
@@ -1338,28 +1338,28 @@
 /* Define to 1 if you have the <sys/wait.h> header file. */
 #undef HAVE_SYS_WAIT_H
 
-/* Define to 1 if you have the `tcdrain' function. */
+/* Define to 1 if you have the 'tcdrain' function. */
 #undef HAVE_TCDRAIN
 
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
-/* Define to 1 if you have the `thrd_create' function. */
+/* Define to 1 if you have the 'thrd_create' function. */
 #undef HAVE_THRD_CREATE
 
 /* Define to 1 if you have the <threads.h> header file. */
 #undef HAVE_THREADS_H
 
-/* Define to 1 if you have the `towlower' function. */
+/* Define to 1 if you have the 'towlower' function. */
 #undef HAVE_TOWLOWER
 
-/* Define to 1 if you have the `tsearch' function. */
+/* Define to 1 if you have the 'tsearch' function. */
 #undef HAVE_TSEARCH
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if you have the `unsetenv' function. */
+/* Define to 1 if you have the 'unsetenv' function. */
 #undef HAVE_UNSETENV
 
 /* Define to 1 if the system has the type 'unsigned long long int'. */
@@ -1368,23 +1368,23 @@
 /* Define if you have a global __progname variable */
 #undef HAVE_VAR___PROGNAME
 
-/* Define to 1 if you have the `vasnprintf' function. */
+/* Define to 1 if you have the 'vasnprintf' function. */
 #undef HAVE_VASNPRINTF
 
-/* Define to 1 if you have the `vasprintf' function. */
+/* Define to 1 if you have the 'vasprintf' function. */
 #undef HAVE_VASPRINTF
 
-/* Define to 1 if you have the `vfork' function. */
+/* Define to 1 if you have the 'vfork' function. */
 #undef HAVE_VFORK
 
 /* Define to 1 or 0, depending whether the compiler supports simple visibility
    declarations. */
 #undef HAVE_VISIBILITY
 
-/* Define to 1 if you have the `vsnprintf' function. */
+/* Define to 1 if you have the 'vsnprintf' function. */
 #undef HAVE_VSNPRINTF
 
-/* Define to 1 if you have the `waitid' function. */
+/* Define to 1 if you have the 'waitid' function. */
 #undef HAVE_WAITID
 
 /* Define to 1 if you have the <wchar.h> header file. */
@@ -1393,19 +1393,19 @@
 /* Define if you have the 'wchar_t' type. */
 #undef HAVE_WCHAR_T
 
-/* Define to 1 if you have the `wcrtomb' function. */
+/* Define to 1 if you have the 'wcrtomb' function. */
 #undef HAVE_WCRTOMB
 
-/* Define to 1 if you have the `wcslen' function. */
+/* Define to 1 if you have the 'wcslen' function. */
 #undef HAVE_WCSLEN
 
-/* Define to 1 if you have the `wcsnlen' function. */
+/* Define to 1 if you have the 'wcsnlen' function. */
 #undef HAVE_WCSNLEN
 
 /* Define to 1 if you have the <wctype.h> header file. */
 #undef HAVE_WCTYPE_H
 
-/* Define to 1 if you have the `wcwidth' function. */
+/* Define to 1 if you have the 'wcwidth' function. */
 #undef HAVE_WCWIDTH
 
 /* Define to 1 if the compiler and linker support weak declarations of
@@ -1431,13 +1431,13 @@
 /* Define to 1 if you have the <xlocale.h> header file. */
 #undef HAVE_XLOCALE_H
 
-/* Define to 1 if the system has the type `_Bool'. */
+/* Define to 1 if the system has the type '_Bool'. */
 #undef HAVE__BOOL
 
-/* Define to 1 if you have the `_NSGetExecutablePath' function. */
+/* Define to 1 if you have the '_NSGetExecutablePath' function. */
 #undef HAVE__NSGETEXECUTABLEPATH
 
-/* Define to 1 if you have the `_set_invalid_parameter_handler' function. */
+/* Define to 1 if you have the '_set_invalid_parameter_handler' function. */
 #undef HAVE__SET_INVALID_PARAMETER_HANDLER
 
 /* Define to 1 if the compiler supports __builtin_expect,
@@ -1450,13 +1450,13 @@
 #endif
     
 
-/* Define to 1 if you have the `__fseterr' function. */
+/* Define to 1 if you have the '__fseterr' function. */
 #undef HAVE___FSETERR
 
 /* Define to 1 if the compiler supports the keyword '__inline'. */
 #undef HAVE___INLINE
 
-/* Define to 1 if you have the `__xpg_strerror_r' function. */
+/* Define to 1 if you have the '__xpg_strerror_r' function. */
 #undef HAVE___XPG_STRERROR_R
 
 /* Define as const if the declaration of iconv() needs const. */
@@ -1720,10 +1720,10 @@
 	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+/* Define to 1 if the 'S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
 
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
@@ -1760,10 +1760,14 @@
    weak. */
 #undef USE_POSIX_THREADS_WEAK
 
-/* Enable extensions on AIX 3, Interix.  */
+/* Enable extensions on AIX, Interix, z/OS.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
+/* Enable extensions on Cosmopolitan Libc. */
+#ifndef _COSMO_SOURCE
+# undef _COSMO_SOURCE
+#endif
 /* Enable general extensions on macOS.  */
 #ifndef _DARWIN_C_SOURCE
 # undef _DARWIN_C_SOURCE
@@ -1821,11 +1825,15 @@
 #ifndef __STDC_WANT_IEC_60559_DFP_EXT__
 # undef __STDC_WANT_IEC_60559_DFP_EXT__
 #endif
+/* Enable extensions specified by C23 Annex F.  */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
 /* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
 #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
 # undef __STDC_WANT_IEC_60559_FUNCS_EXT__
 #endif
-/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015.  */
 #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
 # undef __STDC_WANT_IEC_60559_TYPES_EXT__
 #endif
@@ -2455,10 +2463,10 @@
 # define _GL_INLINE_HEADER_END
 #endif
 
-/* Define to `int' if <sys/types.h> doesn't define. */
+/* Define as 'int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
+/* Define to '__inline__' or '__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
@@ -2496,7 +2504,7 @@
 #define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2)))
 
 
-/* Define to `int' if <sys/types.h> does not define. */
+/* Define to 'int' if <sys/types.h> does not define. */
 #undef mode_t
 
 /* Define to the type of st_nlink in struct stat, or a supertype. */
@@ -2528,13 +2536,13 @@
    accessed atomically even in the presence of asynchronous signals. */
 #undef sig_atomic_t
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define as 'unsigned int' if <stddef.h> doesn't define. */
 #undef size_t
 
 /* Define as a signed type of the same size as size_t. */
 #undef ssize_t
 
-/* Define to `int' if <sys/types.h> doesn't define. */
+/* Define as 'int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
 
diff --git a/local/recipes/dev/flex/source/doc/flex.info b/local/recipes/dev/flex/source/doc/flex.info
index a972bcd9d2..30c02398b3 100644
--- a/local/recipes/dev/flex/source/doc/flex.info
+++ b/local/recipes/dev/flex/source/doc/flex.info
@@ -1,12 +1,12 @@
-This is flex.info, produced by makeinfo version 6.1 from flex.texi.
+This is flex.info, produced by makeinfo version 7.3 from flex.texi.
 
 The flex manual is placed under the same licensing conditions as the
 rest of flex:
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2012 The Flex
+   Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2012 The Flex
 Project.
 
-   Copyright (C) 1990, 1997 The Regents of the University of California.
+   Copyright © 1990, 1997 The Regents of the University of California.
 All rights reserved.
 
    This code is derived from software contributed to Berkeley by Vern
@@ -42,240 +42,245 @@ END-INFO-DIR-ENTRY
 
 
 Indirect:
-flex.info-1: 1622
-flex.info-2: 318745
+flex.info-1: 1620
+flex.info-2: 324917
 
 Tag Table:
 (Indirect)
-Node: Top1622
-Node: Copyright9414
-Node: Reporting Bugs10933
-Node: Introduction11189
-Node: Simple Examples12018
-Node: Format15304
-Node: Definitions Section15759
-Ref: Definitions Section-Footnote-118017
-Node: Rules Section18085
-Node: User Code Section19243
-Node: Comments in the Input19681
-Node: Patterns21051
-Ref: case and character ranges27883
-Node: Matching31886
-Node: Actions35171
-Node: Generated Scanner44133
-Node: Start Conditions49136
-Node: Multiple Input Buffers59678
-Ref: Scanning Strings66221
-Node: EOF67850
-Node: Misc Macros69436
-Node: User Values72290
-Node: Yacc74615
-Node: Scanner Options75510
-Node: Options for Specifying Filenames78299
-Ref: option-header78525
-Ref: option-outfile79239
-Ref: option-stdout79564
-Node: Options Affecting Scanner Behavior80547
-Ref: option-case-insensitive80788
-Ref: option-lex-compat81221
-Ref: option-batch81753
-Ref: option-interactive82272
-Ref: option-7bit83626
-Ref: option-8bit84930
-Ref: option-default85342
-Ref: option-always-interactive85406
-Ref: option-posix86010
-Ref: option-stack87157
-Ref: option-stdinit87265
-Ref: option-yylineno87744
-Ref: option-yywrap88187
-Node: Code-Level And API Options88454
-Ref: option-ansi-definitions88681
-Ref: option-ansi-prototypes88756
-Ref: option-bison-bridge88829
-Ref: option-bison-locations89170
-Ref: option-noline89430
-Ref: option-reentrant89944
-Ref: option-c++90556
-Ref: option-array90682
-Ref: option-pointer90780
-Ref: option-prefix90907
-Ref: option-main92435
-Ref: option-nounistd92619
-Ref: option-yyclass93130
-Node: Options for Scanner Speed and Size93614
-Ref: option-align94164
-Ref: option-ecs94666
-Ref: option-meta-ecs95705
-Ref: option-read96193
-Ref: option-full98076
-Ref: option-fast98271
-Node: Debugging Options99195
-Ref: option-backup99382
-Ref: option-debug99927
-Ref: option-perf-report100649
-Ref: option-nodefault101275
-Ref: option-trace101593
-Ref: option-nowarn101884
-Ref: option-verbose101952
-Ref: option-warn102381
-Node: Miscellaneous Options102600
-Node: Performance103056
-Node: Cxx113303
-Node: Reentrant121395
-Node: Reentrant Uses122129
-Node: Reentrant Overview123691
-Node: Reentrant Example124491
-Node: Reentrant Detail125264
-Node: Specify Reentrant125768
-Node: Extra Reentrant Argument126418
-Node: Global Replacement127670
-Node: Init and Destroy Functions128905
-Node: Accessor Methods131426
-Node: Extra Data132773
-Node: About yyscan_t135040
-Node: Reentrant Functions135437
-Ref: bison-functions136921
-Node: Lex and Posix137660
-Node: Memory Management145007
-Ref: memory-management145153
-Node: The Default Memory Management145387
-Ref: The Default Memory Management-Footnote-1149207
-Node: Overriding The Default Memory Management149360
-Ref: Overriding The Default Memory Management-Footnote-1151774
-Node: A Note About yytext And Memory151938
-Node: Serialized Tables153178
-Ref: serialization153322
-Node: Creating Serialized Tables154102
-Node: Loading and Unloading Serialized Tables155717
-Node: Tables File Format157490
-Node: Diagnostics164515
-Node: Limitations167924
-Node: Bibliography169872
-Node: FAQ170542
-Node: When was flex born?175705
-Node: How do I expand backslash-escape sequences in C-style quoted strings?176082
-Node: Why do flex scanners call fileno if it is not ANSI compatible?177385
-Node: Does flex support recursive pattern definitions?178182
-Node: How do I skip huge chunks of input (tens of megabytes) while using flex?179029
-Node: Flex is not matching my patterns in the same order that I defined them.179496
-Node: My actions are executing out of order or sometimes not at all.181242
-Node: How can I have multiple input sources feed into the same scanner at the same time?182015
-Node: Can I build nested parsers that work with the same input file?184000
-Node: How can I match text only at the end of a file?185007
-Node: How can I make REJECT cascade across start condition boundaries?185811
-Node: Why cant I use fast or full tables with interactive mode?186825
-Node: How much faster is -F or -f than -C?188082
-Node: If I have a simple grammar cant I just parse it with flex?188394
-Node: Why doesn't yyrestart() set the start state back to INITIAL?188876
-Node: How can I match C-style comments?189503
-Node: The period isn't working the way I expected.190313
-Node: Can I get the flex manual in another format?191558
-Node: Does there exist a "faster" NDFA->DFA algorithm?192048
-Node: How does flex compile the DFA so quickly?192558
-Node: How can I use more than 8192 rules?193524
-Node: How do I abandon a file in the middle of a scan and switch to a new file?194934
-Node: How do I execute code only during initialization (only before the first scan)?195488
-Node: How do I execute code at termination?196265
-Node: Where else can I find help?196591
-Node: Can I include comments in the "rules" section of the file?196965
-Node: I get an error about undefined yywrap().197345
-Node: How can I change the matching pattern at run time?197821
-Node: How can I expand macros in the input?198183
-Node: How can I build a two-pass scanner?199215
-Node: How do I match any string not matched in the preceding rules?200133
-Node: I am trying to port code from AT&T lex that uses yysptr and yysbuf.201042
-Node: Is there a way to make flex treat NULL like a regular character?201837
-Node: Whenever flex can not match the input it says "flex scanner jammed".202357
-Node: Why doesn't flex have non-greedy operators like perl does?203000
-Node: Memory leak - 16386 bytes allocated by malloc.204353
-Ref: faq-memory-leak204651
-Node: How do I track the byte offset for lseek()?205622
-Node: How do I use my own I/O classes in a C++ scanner?207131
-Node: How do I skip as many chars as possible?207974
-Node: deleteme00209049
-Node: Are certain equivalent patterns faster than others?209489
-Node: Is backing up a big deal?212907
-Node: Can I fake multi-byte character support?214813
-Node: deleteme01216254
-Node: Can you discuss some flex internals?217363
-Node: unput() messes up yy_at_bol219607
-Node: The | operator is not doing what I want220709
-Node: Why can't flex understand this variable trailing context pattern?222255
-Node: The ^ operator isn't working223504
-Node: Trailing context is getting confused with trailing optional patterns224739
-Node: Is flex GNU or not?225982
-Node: ERASEME53227655
-Node: I need to scan if-then-else blocks and while loops228425
-Node: ERASEME55229624
-Node: ERASEME56230722
-Node: ERASEME57232080
-Node: Is there a repository for flex scanners?233078
-Node: How can I conditionally compile or preprocess my flex input file?233394
-Node: Where can I find grammars for lex and yacc?233867
-Node: I get an end-of-buffer message for each character scanned.234214
-Node: unnamed-faq-62234809
-Node: unnamed-faq-63235827
-Node: unnamed-faq-64237124
-Node: unnamed-faq-65238090
-Node: unnamed-faq-66238876
-Node: unnamed-faq-67239991
-Node: unnamed-faq-68240978
-Node: unnamed-faq-69242120
-Node: unnamed-faq-70242833
-Node: unnamed-faq-71243594
-Node: unnamed-faq-72244803
-Node: unnamed-faq-73245846
-Node: unnamed-faq-74246770
-Node: unnamed-faq-75247715
-Node: unnamed-faq-76248847
-Node: unnamed-faq-77249553
-Node: unnamed-faq-78250446
-Node: unnamed-faq-79251444
-Node: unnamed-faq-80253144
-Node: unnamed-faq-81254462
-Node: unnamed-faq-82257262
-Node: unnamed-faq-83258219
-Node: unnamed-faq-84259999
-Node: unnamed-faq-85261102
-Node: unnamed-faq-86262109
-Node: unnamed-faq-87263047
-Node: unnamed-faq-88263693
-Node: unnamed-faq-90264524
-Node: unnamed-faq-91265787
-Node: unnamed-faq-92268215
-Node: unnamed-faq-93268714
-Node: unnamed-faq-94269641
-Node: unnamed-faq-95271053
-Node: unnamed-faq-96272571
-Node: unnamed-faq-97273330
-Node: unnamed-faq-98273997
-Node: unnamed-faq-99274662
-Node: unnamed-faq-100275591
-Node: unnamed-faq-101276301
-Node: What is the difference between YYLEX_PARAM and YY_DECL?277114
-Node: Why do I get "conflicting types for yylex" error?277638
-Node: How do I access the values set in a Flex action from within a Bison action?278168
-Node: Appendices278597
-Node: Makefiles and Flex278862
-Ref: Makefiles and Flex-Footnote-1282064
-Ref: Makefiles and Flex-Footnote-2282181
-Ref: Makefiles and Flex-Footnote-3282368
-Node: Bison Bridge282419
-Ref: Bison Bridge-Footnote-1285086
-Node: M4 Dependency285278
-Ref: M4 Dependency-Footnote-1286692
-Node: Common Patterns286828
-Node: Numbers287151
-Node: Identifiers288127
-Node: Quoted Constructs288954
-Node: Addresses290008
-Node: Indices291320
-Node: Concept Index291612
-Node: Index of Functions and Macros318745
-Node: Index of Variables323714
-Node: Index of Data Types325380
-Node: Index of Hooks326268
-Node: Index of Scanner Options326836
+Node: Top1620
+Node: Copyright7694
+Node: Reporting Bugs9211
+Node: Introduction9471
+Node: Simple Examples10328
+Node: Format13771
+Node: Definitions Section14192
+Ref: Definitions Section-Footnote-116550
+Node: Rules Section16626
+Node: User Code Section17800
+Node: Comments in the Input18246
+Node: Patterns19651
+Ref: case and character ranges26973
+Node: Matching31202
+Node: Actions34639
+Node: Generated Scanner43962
+Node: Start Conditions49185
+Node: Multiple Input Buffers60101
+Ref: Scanning Strings66886
+Node: EOF68579
+Node: Misc Macros70215
+Node: User Values73173
+Node: Yacc75614
+Node: Scanner Options76575
+Node: Options for Specifying Filenames79407
+Ref: option-header79633
+Ref: option-outfile80379
+Ref: option-stdout80744
+Node: Options Affecting Scanner Behavior81763
+Ref: option-case-insensitive82004
+Ref: option-lex-compat82461
+Ref: option-batch83033
+Ref: option-interactive83588
+Ref: option-7bit84990
+Ref: option-8bit86358
+Ref: option-default86798
+Ref: option-always-interactive86870
+Ref: option-posix87498
+Ref: option-stack88711
+Ref: option-stdinit88827
+Ref: option-yylineno89350
+Ref: option-yywrap89829
+Node: Code-Level And API Options90120
+Ref: option-ansi-definitions90347
+Ref: option-ansi-prototypes90430
+Ref: option-bison-bridge90511
+Ref: option-bison-locations90876
+Ref: option-noline91164
+Ref: option-reentrant91714
+Ref: option-c++92346
+Ref: option-array92480
+Ref: option-pointer92586
+Ref: option-prefix92733
+Ref: option-main94325
+Ref: option-nounistd94529
+Ref: option-yyclass95068
+Node: Options for Scanner Speed and Size95596
+Ref: option-align96158
+Ref: option-ecs96668
+Ref: option-meta-ecs97751
+Ref: option-read98259
+Ref: option-full100222
+Ref: option-fast100437
+Node: Debugging Options101389
+Ref: option-backup101576
+Ref: option-debug102145
+Ref: option-perf-report102887
+Ref: option-nodefault103545
+Ref: option-trace103875
+Ref: option-nowarn104190
+Ref: option-verbose104266
+Ref: option-warn104723
+Node: Miscellaneous Options104950
+Node: Performance105434
+Node: Cxx115909
+Node: Reentrant124503
+Node: Reentrant Uses125197
+Node: Reentrant Overview126812
+Node: Reentrant Example127650
+Node: Reentrant Detail128458
+Node: Specify Reentrant128895
+Node: Extra Reentrant Argument129557
+Node: Global Replacement130869
+Node: Init and Destroy Functions132160
+Node: Accessor Methods134796
+Node: Extra Data136183
+Node: About yyscan_t138510
+Node: Reentrant Functions138919
+Ref: bison-functions140420
+Node: Lex and Posix141191
+Node: Memory Management149030
+Ref: memory-management149176
+Node: The Default Memory Management149404
+Ref: The Default Memory Management-Footnote-1153240
+Node: Overriding The Default Memory Management153393
+Ref: Overriding The Default Memory Management-Footnote-1155904
+Node: A Note About yytext And Memory156080
+Node: Serialized Tables157324
+Ref: serialization157468
+Node: Creating Serialized Tables158238
+Node: Loading and Unloading Serialized Tables159885
+Node: Tables File Format161694
+Node: Diagnostics169019
+Node: Limitations172584
+Node: Bibliography174608
+Node: FAQ175290
+Node: When was flex born?179534
+Node: How do I expand backslash-escape sequences in C-style quoted strings?179915
+Node: Why do flex scanners call fileno if it is not ANSI compatible?181230
+Node: Does flex support recursive pattern definitions?182071
+Node: How do I skip huge chunks of input (tens of megabytes) while using flex?182922
+Node: Flex is not matching my patterns in the same order that I defined them.183401
+Node: My actions are executing out of order or sometimes not at all.185187
+Node: How can I have multiple input sources feed into the same scanner at the same time?185982
+Node: Can I build nested parsers that work with the same input file?188033
+Node: How can I match text only at the end of a file?189060
+Node: How can I make REJECT cascade across start condition boundaries?189876
+Node: Why cant I use fast or full tables with interactive mode?190902
+Node: How much faster is -F or -f than -C?192159
+Node: If I have a simple grammar cant I just parse it with flex?192471
+Node: Why doesn't yyrestart() set the start state back to INITIAL?192953
+Node: How can I match C-style comments?193588
+Node: The period isn't working the way I expected.194398
+Node: Can I get the flex manual in another format?195735
+Node: Does there exist a "faster" NDFA->DFA algorithm?196233
+Node: How does flex compile the DFA so quickly?196743
+Node: How can I use more than 8192 rules?197713
+Node: How do I abandon a file in the middle of a scan and switch to a new file?199135
+Node: How do I execute code only during initialization (only before the first scan)?199701
+Node: How do I execute code at termination?200491
+Node: Where else can I find help?200821
+Node: Can I include comments in the "rules" section of the file?201195
+Node: I get an error about undefined yywrap().201575
+Node: How can I change the matching pattern at run time?202063
+Node: How can I expand macros in the input?202425
+Node: How can I build a two-pass scanner?203462
+Node: How do I match any string not matched in the preceding rules?204380
+Node: I am trying to port code from AT&T lex that uses yysptr and yysbuf.205301
+Node: Is there a way to make flex treat NULL like a regular character?206120
+Node: Whenever flex can not match the input it says "flex scanner jammed".206652
+Node: Why doesn't flex have non-greedy operators like perl does?207304
+Node: Memory leak - 16386 bytes allocated by malloc.208669
+Ref: faq-memory-leak208967
+Node: How do I track the byte offset for lseek()?209966
+Node: How do I use my own I/O classes in a C++ scanner?211523
+Node: How do I skip as many chars as possible?212386
+Node: deleteme00213461
+Node: Are certain equivalent patterns faster than others?213906
+Node: Is backing up a big deal?217394
+Node: Can I fake multi-byte character support?219365
+Node: deleteme01220841
+Node: Can you discuss some flex internals?221965
+Node: unput() messes up yy_at_bol224254
+Node: The | operator is not doing what I want225391
+Node: Why can't flex understand this variable trailing context pattern?226982
+Node: The ^ operator isn't working228246
+Node: Trailing context is getting confused with trailing optional patterns229516
+Node: Is flex GNU or not?230784
+Node: ERASEME53232497
+Node: I need to scan if-then-else blocks and while loops233292
+Node: ERASEME55234511
+Node: ERASEME56235624
+Node: ERASEME57237017
+Node: Is there a repository for flex scanners?238050
+Node: How can I conditionally compile or preprocess my flex input file?238366
+Node: Where can I find grammars for lex and yacc?238839
+Node: I get an end-of-buffer message for each character scanned.239186
+Node: unnamed-faq-62239781
+Node: unnamed-faq-63240829
+Node: unnamed-faq-64242141
+Node: unnamed-faq-65243142
+Node: unnamed-faq-66243943
+Node: unnamed-faq-67245073
+Node: unnamed-faq-68246075
+Node: unnamed-faq-69247232
+Node: unnamed-faq-70247965
+Node: unnamed-faq-71248741
+Node: unnamed-faq-72249970
+Node: unnamed-faq-73251038
+Node: unnamed-faq-74251982
+Node: unnamed-faq-75252952
+Node: unnamed-faq-76254124
+Node: unnamed-faq-77254845
+Node: unnamed-faq-78255753
+Node: unnamed-faq-79256766
+Node: unnamed-faq-80258501
+Node: unnamed-faq-81259844
+Node: unnamed-faq-82262684
+Node: unnamed-faq-83263666
+Node: unnamed-faq-84265471
+Node: unnamed-faq-85266589
+Node: unnamed-faq-86267636
+Node: unnamed-faq-87268609
+Node: unnamed-faq-88269270
+Node: unnamed-faq-90270126
+Node: unnamed-faq-91271424
+Node: unnamed-faq-92273907
+Node: unnamed-faq-93274421
+Node: unnamed-faq-94275363
+Node: unnamed-faq-95276805
+Node: unnamed-faq-96278338
+Node: unnamed-faq-97279122
+Node: unnamed-faq-98279804
+Node: unnamed-faq-99280494
+Node: unnamed-faq-100281453
+Node: unnamed-faq-101282178
+Node: What is the difference between YYLEX_PARAM and YY_DECL?283011
+Node: Why do I get "conflicting types for yylex" error?283535
+Node: How do I access the values set in a Flex action from within a Bison action?284065
+Node: Appendices284494
+Node: Makefiles and Flex284703
+Ref: Makefiles and Flex-Footnote-1288049
+Ref: Makefiles and Flex-Footnote-2288174
+Ref: Makefiles and Flex-Footnote-3288365
+Node: Bison Bridge288416
+Ref: Bison Bridge-Footnote-1291217
+Node: M4 Dependency291409
+Ref: M4 Dependency-Footnote-1292903
+Node: Common Patterns293039
+Node: Numbers293330
+Node: Identifiers294323
+Node: Quoted Constructs295154
+Node: Addresses296228
+Node: Indices297548
+Node: Concept Index297786
+Node: Index of Functions and Macros324917
+Node: Index of Variables329886
+Node: Index of Data Types331552
+Node: Index of Hooks332440
+Node: Index of Scanner Options333008
 
 End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/local/recipes/dev/flex/source/doc/flex.info-1 b/local/recipes/dev/flex/source/doc/flex.info-1
index b79df5eda5..869bfa003e 100644
--- a/local/recipes/dev/flex/source/doc/flex.info-1
+++ b/local/recipes/dev/flex/source/doc/flex.info-1
@@ -1,12 +1,12 @@
-This is flex.info, produced by makeinfo version 6.1 from flex.texi.
+This is flex.info, produced by makeinfo version 7.3 from flex.texi.
 
 The flex manual is placed under the same licensing conditions as the
 rest of flex:
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2012 The Flex
+   Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2012 The Flex
 Project.
 
-   Copyright (C) 1990, 1997 The Regents of the University of California.
+   Copyright © 1990, 1997 The Regents of the University of California.
 All rights reserved.
 
    This code is derived from software contributed to Berkeley by Vern
@@ -46,215 +46,214 @@ File: flex.info,  Node: Top,  Next: Copyright,  Prev: (dir),  Up: (dir)
 flex
 ****
 
-This manual describes 'flex', a tool for generating programs that
+This manual describes ‘flex’, a tool for generating programs that
 perform pattern-matching on text.  The manual includes both tutorial and
 reference sections.
 
-   This edition of 'The flex Manual' documents 'flex' version 2.6.4.  It
-was last updated on 6 May 2017.
+   This edition of ‘The flex Manual’ documents ‘flex’ version 2.6.4.  It
+was last updated on 15 May 2026.
 
    This manual was written by Vern Paxson, Will Estes and John Millaway.
 
 * Menu:
 
-* Copyright::                   
-* Reporting Bugs::              
-* Introduction::                
-* Simple Examples::             
-* Format::                      
-* Patterns::                    
-* Matching::                    
-* Actions::                     
-* Generated Scanner::           
-* Start Conditions::            
-* Multiple Input Buffers::      
-* EOF::                         
-* Misc Macros::                 
-* User Values::                 
-* Yacc::                        
-* Scanner Options::             
-* Performance::                 
-* Cxx::                         
-* Reentrant::                   
-* Lex and Posix::               
-* Memory Management::           
-* Serialized Tables::           
-* Diagnostics::                 
-* Limitations::                 
-* Bibliography::                
-* FAQ::                         
-* Appendices::                  
-* Indices::                     
+* Copyright::
+* Reporting Bugs::
+* Introduction::
+* Simple Examples::
+* Format::
+* Patterns::
+* Matching::
+* Actions::
+* Generated Scanner::
+* Start Conditions::
+* Multiple Input Buffers::
+* EOF::
+* Misc Macros::
+* User Values::
+* Yacc::
+* Scanner Options::
+* Performance::
+* Cxx::
+* Reentrant::
+* Lex and Posix::
+* Memory Management::
+* Serialized Tables::
+* Diagnostics::
+* Limitations::
+* Bibliography::
+* FAQ::
+* Appendices::
+* Indices::
 
  -- The Detailed Node Listing --
 
 Format of the Input File
 
-* Definitions Section::         
-* Rules Section::               
-* User Code Section::           
-* Comments in the Input::       
+* Definitions Section::
+* Rules Section::
+* User Code Section::
+* Comments in the Input::
 
 Scanner Options
 
-* Options for Specifying Filenames::  
-* Options Affecting Scanner Behavior::  
-* Code-Level And API Options::  
-* Options for Scanner Speed and Size::  
-* Debugging Options::           
-* Miscellaneous Options::       
+* Options for Specifying Filenames::
+* Options Affecting Scanner Behavior::
+* Code-Level And API Options::
+* Options for Scanner Speed and Size::
+* Debugging Options::
+* Miscellaneous Options::
 
 Reentrant C Scanners
 
-* Reentrant Uses::              
-* Reentrant Overview::          
-* Reentrant Example::           
-* Reentrant Detail::            
-* Reentrant Functions::         
+* Reentrant Uses::
+* Reentrant Overview::
+* Reentrant Example::
+* Reentrant Detail::
+* Reentrant Functions::
 
 The Reentrant API in Detail
 
-* Specify Reentrant::           
-* Extra Reentrant Argument::    
-* Global Replacement::          
-* Init and Destroy Functions::  
-* Accessor Methods::            
-* Extra Data::                  
-* About yyscan_t::              
+* Specify Reentrant::
+* Extra Reentrant Argument::
+* Global Replacement::
+* Init and Destroy Functions::
+* Accessor Methods::
+* Extra Data::
+* About yyscan_t::
 
 Memory Management
 
-* The Default Memory Management::  
-* Overriding The Default Memory Management::  
-* A Note About yytext And Memory::  
+* The Default Memory Management::
+* Overriding The Default Memory Management::
+* A Note About yytext And Memory::
 
 Serialized Tables
 
-* Creating Serialized Tables::  
-* Loading and Unloading Serialized Tables::  
-* Tables File Format::          
+* Creating Serialized Tables::
+* Loading and Unloading Serialized Tables::
+* Tables File Format::
 
 FAQ
 
-* When was flex born?::         
-* How do I expand backslash-escape sequences in C-style quoted strings?::  
-* Why do flex scanners call fileno if it is not ANSI compatible?::  
-* Does flex support recursive pattern definitions?::  
-* How do I skip huge chunks of input (tens of megabytes) while using flex?::  
-* Flex is not matching my patterns in the same order that I defined them.::  
-* My actions are executing out of order or sometimes not at all.::  
-* How can I have multiple input sources feed into the same scanner at the same time?::  
-* Can I build nested parsers that work with the same input file?::  
-* How can I match text only at the end of a file?::  
-* How can I make REJECT cascade across start condition boundaries?::  
-* Why cant I use fast or full tables with interactive mode?::  
-* How much faster is -F or -f than -C?::  
-* If I have a simple grammar cant I just parse it with flex?::  
-* Why doesn't yyrestart() set the start state back to INITIAL?::  
-* How can I match C-style comments?::  
-* The period isn't working the way I expected.::  
-* Can I get the flex manual in another format?::  
-* Does there exist a "faster" NDFA->DFA algorithm?::  
-* How does flex compile the DFA so quickly?::  
-* How can I use more than 8192 rules?::  
-* How do I abandon a file in the middle of a scan and switch to a new file?::  
-* How do I execute code only during initialization (only before the first scan)?::  
-* How do I execute code at termination?::  
-* Where else can I find help?::  
-* Can I include comments in the "rules" section of the file?::  
-* I get an error about undefined yywrap().::  
-* How can I change the matching pattern at run time?::  
-* How can I expand macros in the input?::  
-* How can I build a two-pass scanner?::  
-* How do I match any string not matched in the preceding rules?::  
-* I am trying to port code from AT&T lex that uses yysptr and yysbuf.::  
-* Is there a way to make flex treat NULL like a regular character?::  
-* Whenever flex can not match the input it says "flex scanner jammed".::  
-* Why doesn't flex have non-greedy operators like perl does?::  
-* Memory leak - 16386 bytes allocated by malloc.::  
-* How do I track the byte offset for lseek()?::  
-* How do I use my own I/O classes in a C++ scanner?::  
-* How do I skip as many chars as possible?::  
-* deleteme00::              
-* Are certain equivalent patterns faster than others?::              
-* Is backing up a big deal?::              
-* Can I fake multi-byte character support?::              
-* deleteme01::              
-* Can you discuss some flex internals?::              
-* unput() messes up yy_at_bol::              
-* The | operator is not doing what I want::              
-* Why can't flex understand this variable trailing context pattern?::              
-* The ^ operator isn't working::              
-* Trailing context is getting confused with trailing optional patterns::              
-* Is flex GNU or not?::              
-* ERASEME53::              
-* I need to scan if-then-else blocks and while loops::              
-* ERASEME55::              
-* ERASEME56::              
-* ERASEME57::              
-* Is there a repository for flex scanners?::              
-* How can I conditionally compile or preprocess my flex input file?::              
-* Where can I find grammars for lex and yacc?::              
-* I get an end-of-buffer message for each character scanned.::              
-* unnamed-faq-62::              
-* unnamed-faq-63::              
-* unnamed-faq-64::              
-* unnamed-faq-65::              
-* unnamed-faq-66::              
-* unnamed-faq-67::              
-* unnamed-faq-68::              
-* unnamed-faq-69::              
-* unnamed-faq-70::              
-* unnamed-faq-71::              
-* unnamed-faq-72::              
-* unnamed-faq-73::              
-* unnamed-faq-74::              
-* unnamed-faq-75::              
-* unnamed-faq-76::              
-* unnamed-faq-77::              
-* unnamed-faq-78::              
-* unnamed-faq-79::              
-* unnamed-faq-80::              
-* unnamed-faq-81::              
-* unnamed-faq-82::              
-* unnamed-faq-83::              
-* unnamed-faq-84::              
-* unnamed-faq-85::              
-* unnamed-faq-86::              
-* unnamed-faq-87::              
-* unnamed-faq-88::              
-* unnamed-faq-90::              
-* unnamed-faq-91::              
-* unnamed-faq-92::              
-* unnamed-faq-93::              
-* unnamed-faq-94::              
-* unnamed-faq-95::              
-* unnamed-faq-96::              
-* unnamed-faq-97::              
-* unnamed-faq-98::              
-* unnamed-faq-99::              
-* unnamed-faq-100::             
-* unnamed-faq-101::             
+* When was flex born?::
+* How do I expand backslash-escape sequences in C-style quoted strings?::
+* Why do flex scanners call fileno if it is not ANSI compatible?::
+* Does flex support recursive pattern definitions?::
+* How do I skip huge chunks of input (tens of megabytes) while using flex?::
+* Flex is not matching my patterns in the same order that I defined them.::
+* My actions are executing out of order or sometimes not at all.::
+* How can I have multiple input sources feed into the same scanner at the same time?::
+* Can I build nested parsers that work with the same input file?::
+* How can I match text only at the end of a file?::
+* How can I make REJECT cascade across start condition boundaries?::
+* Why cant I use fast or full tables with interactive mode?::
+* How much faster is -F or -f than -C?::
+* If I have a simple grammar cant I just parse it with flex?::
+* Why doesn't yyrestart() set the start state back to INITIAL?::
+* How can I match C-style comments?::
+* The period isn't working the way I expected.::
+* Can I get the flex manual in another format?::
+* Does there exist a "faster" NDFA->DFA algorithm?::
+* How does flex compile the DFA so quickly?::
+* How can I use more than 8192 rules?::
+* How do I abandon a file in the middle of a scan and switch to a new file?::
+* How do I execute code only during initialization (only before the first scan)?::
+* How do I execute code at termination?::
+* Where else can I find help?::
+* Can I include comments in the "rules" section of the file?::
+* I get an error about undefined yywrap().::
+* How can I change the matching pattern at run time?::
+* How can I expand macros in the input?::
+* How can I build a two-pass scanner?::
+* How do I match any string not matched in the preceding rules?::
+* I am trying to port code from AT&T lex that uses yysptr and yysbuf.::
+* Is there a way to make flex treat NULL like a regular character?::
+* Whenever flex can not match the input it says "flex scanner jammed".::
+* Why doesn't flex have non-greedy operators like perl does?::
+* Memory leak - 16386 bytes allocated by malloc.::
+* How do I track the byte offset for lseek()?::
+* How do I use my own I/O classes in a C++ scanner?::
+* How do I skip as many chars as possible?::
+* deleteme00::
+* Are certain equivalent patterns faster than others?::
+* Is backing up a big deal?::
+* Can I fake multi-byte character support?::
+* deleteme01::
+* Can you discuss some flex internals?::
+* unput() messes up yy_at_bol::
+* The | operator is not doing what I want::
+* Why can't flex understand this variable trailing context pattern?::
+* The ^ operator isn't working::
+* Trailing context is getting confused with trailing optional patterns::
+* Is flex GNU or not?::
+* ERASEME53::
+* I need to scan if-then-else blocks and while loops::
+* ERASEME55::
+* ERASEME56::
+* ERASEME57::
+* Is there a repository for flex scanners?::
+* How can I conditionally compile or preprocess my flex input file?::
+* Where can I find grammars for lex and yacc?::
+* I get an end-of-buffer message for each character scanned.::
+* unnamed-faq-62::
+* unnamed-faq-63::
+* unnamed-faq-64::
+* unnamed-faq-65::
+* unnamed-faq-66::
+* unnamed-faq-67::
+* unnamed-faq-68::
+* unnamed-faq-69::
+* unnamed-faq-70::
+* unnamed-faq-71::
+* unnamed-faq-72::
+* unnamed-faq-73::
+* unnamed-faq-74::
+* unnamed-faq-75::
+* unnamed-faq-76::
+* unnamed-faq-77::
+* unnamed-faq-78::
+* unnamed-faq-79::
+* unnamed-faq-80::
+* unnamed-faq-81::
+* unnamed-faq-82::
+* unnamed-faq-83::
+* unnamed-faq-84::
+* unnamed-faq-85::
+* unnamed-faq-86::
+* unnamed-faq-87::
+* unnamed-faq-88::
+* unnamed-faq-90::
+* unnamed-faq-91::
+* unnamed-faq-92::
+* unnamed-faq-93::
+* unnamed-faq-94::
+* unnamed-faq-95::
+* unnamed-faq-96::
+* unnamed-faq-97::
+* unnamed-faq-98::
+* unnamed-faq-99::
+* unnamed-faq-100::
+* unnamed-faq-101::
 * What is the difference between YYLEX_PARAM and YY_DECL?::
 * Why do I get "conflicting types for yylex" error?::
 * How do I access the values set in a Flex action from within a Bison action?::
 
 Appendices
 
-* Makefiles and Flex::          
-* Bison Bridge::                
-* M4 Dependency::               
-* Common Patterns::               
+* Makefiles and Flex::
+* Bison Bridge::
+* M4 Dependency::
+* Common Patterns::
 
 Indices
 
-* Concept Index::               
-* Index of Functions and Macros::  
-* Index of Variables::          
-* Index of Data Types::         
-* Index of Hooks::              
-* Index of Scanner Options::    
-
+* Concept Index::
+* Index of Functions and Macros::
+* Index of Variables::
+* Index of Data Types::
+* Index of Hooks::
+* Index of Scanner Options::
 
 
 File: flex.info,  Node: Copyright,  Next: Reporting Bugs,  Prev: Top,  Up: Top
@@ -265,10 +264,10 @@ File: flex.info,  Node: Copyright,  Next: Reporting Bugs,  Prev: Top,  Up: Top
 The flex manual is placed under the same licensing conditions as the
 rest of flex:
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2012 The Flex
+   Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2012 The Flex
 Project.
 
-   Copyright (C) 1990, 1997 The Regents of the University of California.
+   Copyright © 1990, 1997 The Regents of the University of California.
 All rights reserved.
 
    This code is derived from software contributed to Berkeley by Vern
@@ -304,7 +303,7 @@ File: flex.info,  Node: Reporting Bugs,  Next: Introduction,  Prev: Copyright,
 2 Reporting Bugs
 ****************
 
-If you find a bug in 'flex', please report it using GitHub's issue
+If you find a bug in ‘flex’, please report it using GitHub's issue
 tracking facility at <https://github.com/westes/flex/issues/>
 
 
@@ -313,13 +312,13 @@ File: flex.info,  Node: Introduction,  Next: Simple Examples,  Prev: Reporting B
 3 Introduction
 **************
 
-'flex' is a tool for generating "scanners".  A scanner is a program
-which recognizes lexical patterns in text.  The 'flex' program reads the
+‘flex’ is a tool for generating “scanners”.  A scanner is a program
+which recognizes lexical patterns in text.  The ‘flex’ program reads the
 given input files, or its standard input if no file names are given, for
 a description of a scanner to generate.  The description is in the form
-of pairs of regular expressions and C code, called "rules".  'flex'
-generates as output a C source file, 'lex.yy.c' by default, which
-defines a routine 'yylex()'.  This file can be compiled and linked with
+of pairs of regular expressions and C code, called “rules”.  ‘flex’
+generates as output a C source file, ‘lex.yy.c’ by default, which
+defines a routine ‘yylex()’.  This file can be compiled and linked with
 the flex runtime library to produce an executable.  When the executable
 is run, it analyzes its input for occurrences of the regular
 expressions.  Whenever it finds one, it executes the corresponding C
@@ -331,31 +330,31 @@ File: flex.info,  Node: Simple Examples,  Next: Format,  Prev: Introduction,  Up
 4 Some Simple Examples
 **********************
 
-First some simple examples to get the flavor of how one uses 'flex'.
+First some simple examples to get the flavor of how one uses ‘flex’.
 
-   The following 'flex' input specifies a scanner which, when it
-encounters the string 'username' will replace it with the user's login
+   The following ‘flex’ input specifies a scanner which, when it
+encounters the string ‘username’ will replace it with the user's login
 name:
 
          %%
          username    printf( "%s", getlogin() );
 
-   By default, any text not matched by a 'flex' scanner is copied to the
+   By default, any text not matched by a ‘flex’ scanner is copied to the
 output, so the net effect of this scanner is to copy its input file to
-its output with each occurrence of 'username' expanded.  In this input,
-there is just one rule.  'username' is the "pattern" and the 'printf' is
-the "action".  The '%%' symbol marks the beginning of the rules.
+its output with each occurrence of ‘username’ expanded.  In this input,
+there is just one rule.  ‘username’ is the “pattern” and the ‘printf’ is
+the “action”.  The ‘%%’ symbol marks the beginning of the rules.
 
    Here's another simple example:
 
                  int num_lines = 0, num_chars = 0;
-
+     
          %%
          \n      ++num_lines; ++num_chars;
          .       ++num_chars;
-
+     
          %%
-
+     
          int main()
                  {
                  yylex();
@@ -366,52 +365,52 @@ the "action".  The '%%' symbol marks the beginning of the rules.
    This scanner counts the number of characters and the number of lines
 in its input.  It produces no output other than the final report on the
 character and line counts.  The first line declares two globals,
-'num_lines' and 'num_chars', which are accessible both inside 'yylex()'
-and in the 'main()' routine declared after the second '%%'.  There are
-two rules, one which matches a newline ('\n') and increments both the
+‘num_lines’ and ‘num_chars’, which are accessible both inside ‘yylex()’
+and in the ‘main()’ routine declared after the second ‘%%’.  There are
+two rules, one which matches a newline (‘\n’) and increments both the
 line count and the character count, and one which matches any character
-other than a newline (indicated by the '.' regular expression).
+other than a newline (indicated by the ‘.’ regular expression).
 
    A somewhat more complicated example:
 
          /* scanner for a toy Pascal-like language */
-
+     
          %{
          /* need this for the call to atof() below */
          #include <math.h>
          %}
-
+     
          DIGIT    [0-9]
          ID       [a-z][a-z0-9]*
-
+     
          %%
-
+     
          {DIGIT}+    {
                      printf( "An integer: %s (%d)\n", yytext,
                              atoi( yytext ) );
                      }
-
+     
          {DIGIT}+"."{DIGIT}*        {
                      printf( "A float: %s (%g)\n", yytext,
                              atof( yytext ) );
                      }
-
+     
          if|then|begin|end|procedure|function        {
                      printf( "A keyword: %s\n", yytext );
                      }
-
+     
          {ID}        printf( "An identifier: %s\n", yytext );
-
+     
          "+"|"-"|"*"|"/"   printf( "An operator: %s\n", yytext );
-
+     
          "{"[^{}\n]*"}"     /* eat up one-line comments */
-
+     
          [ \t\n]+          /* eat up whitespace */
-
+     
          .           printf( "Unrecognized character: %s\n", yytext );
-
+     
          %%
-
+     
          int main( int argc, char **argv )
              {
              ++argv, --argc;  /* skip over program name */
@@ -419,12 +418,12 @@ other than a newline (indicated by the '.' regular expression).
                      yyin = fopen( argv[0], "r" );
              else
                      yyin = stdin;
-
+     
              yylex();
              }
 
    This is the beginnings of a simple scanner for a language like
-Pascal.  It identifies different types of "tokens" and reports on what
+Pascal.  It identifies different types of “tokens” and reports on what
 it has seen.
 
    The details of this example will be explained in the following
@@ -436,8 +435,8 @@ File: flex.info,  Node: Format,  Next: Patterns,  Prev: Simple Examples,  Up: To
 5 Format of the Input File
 **************************
 
-The 'flex' input file consists of three sections, separated by a line
-containing only '%%'.
+The ‘flex’ input file consists of three sections, separated by a line
+containing only ‘%%’.
 
          definitions
          %%
@@ -447,10 +446,10 @@ containing only '%%'.
 
 * Menu:
 
-* Definitions Section::         
-* Rules Section::               
-* User Code Section::           
-* Comments in the Input::       
+* Definitions Section::
+* Rules Section::
+* User Code Section::
+* Comments in the Input::
 
 
 File: flex.info,  Node: Definitions Section,  Next: Rules Section,  Prev: Format,  Up: Format
@@ -458,26 +457,26 @@ File: flex.info,  Node: Definitions Section,  Next: Rules Section,  Prev: Format
 5.1 Format of the Definitions Section
 =====================================
 
-The "definitions section" contains declarations of simple "name"
+The “definitions section” contains declarations of simple “name”
 definitions to simplify the scanner specification, and declarations of
-"start conditions", which are explained in a later section.
+“start conditions”, which are explained in a later section.
 
    Name definitions have the form:
 
          name definition
 
-   The 'name' is a word beginning with a letter or an underscore ('_')
-followed by zero or more letters, digits, '_', or '-' (dash).  The
+   The ‘name’ is a word beginning with a letter or an underscore (‘_’)
+followed by zero or more letters, digits, ‘_’, or ‘-’ (dash).  The
 definition is taken to begin at the first non-whitespace character
 following the name and continuing to the end of the line.  The
-definition can subsequently be referred to using '{name}', which will
-expand to '(definition)'.  For example,
+definition can subsequently be referred to using ‘{name}’, which will
+expand to ‘(definition)’.  For example,
 
          DIGIT    [0-9]
          ID       [a-z][a-z0-9]*
 
-   Defines 'DIGIT' to be a regular expression which matches a single
-digit, and 'ID' to be a regular expression which matches a letter
+   Defines ‘DIGIT’ to be a regular expression which matches a single
+digit, and ‘ID’ to be a regular expression which matches a letter
 followed by zero-or-more letters-or-digits.  A subsequent reference to
 
          {DIGIT}+"."{DIGIT}*
@@ -486,22 +485,22 @@ followed by zero-or-more letters-or-digits.  A subsequent reference to
 
          ([0-9])+"."([0-9])*
 
-   and matches one-or-more digits followed by a '.' followed by
+   and matches one-or-more digits followed by a ‘.’ followed by
 zero-or-more digits.
 
-   An unindented comment (i.e., a line beginning with '/*') is copied
-verbatim to the output up to the next '*/'.
+   An unindented comment (i.e., a line beginning with ‘/*’) is copied
+verbatim to the output up to the next ‘*/’.
 
-   Any _indented_ text or text enclosed in '%{' and '%}' is also copied
+   Any _indented_ text or text enclosed in ‘%{’ and ‘%}’ is also copied
 verbatim to the output (with the %{ and %} symbols removed).  The %{ and
 %} symbols must appear unindented on lines by themselves.
 
-   A '%top' block is similar to a '%{' ...  '%}' block, except that the
-code in a '%top' block is relocated to the _top_ of the generated file,
-before any flex definitions (1).  The '%top' block is useful when you
+   A ‘%top’ block is similar to a ‘%{’ ...  ‘%}’ block, except that the
+code in a ‘%top’ block is relocated to the _top_ of the generated file,
+before any flex definitions (1).  The ‘%top’ block is useful when you
 want certain preprocessor macros to be defined or certain files to be
-included before the generated code.  The single characters, '{' and '}'
-are used to delimit the '%top' block, as show in the example below:
+included before the generated code.  The single characters, ‘{’ and ‘}’
+are used to delimit the ‘%top’ block, as show in the example below:
 
          %top{
              /* This code goes at the "top" of the generated file. */
@@ -509,11 +508,11 @@ are used to delimit the '%top' block, as show in the example below:
              #include <inttypes.h>
          }
 
-   Multiple '%top' blocks are allowed, and their order is preserved.
+   Multiple ‘%top’ blocks are allowed, and their order is preserved.
 
    ---------- Footnotes ----------
 
-   (1) Actually, 'yyIN_HEADER' is defined before the '%top' block.
+   (1) Actually, ‘yyIN_HEADER’ is defined before the ‘%top’ block.
 
 
 File: flex.info,  Node: Rules Section,  Next: User Code Section,  Prev: Definitions Section,  Up: Format
@@ -521,7 +520,7 @@ File: flex.info,  Node: Rules Section,  Next: User Code Section,  Prev: Definiti
 5.2 Format of the Rules Section
 ===============================
 
-The "rules" section of the 'flex' input contains a series of rules of
+The “rules” section of the ‘flex’ input contains a series of rules of
 the form:
 
          pattern   action
@@ -539,7 +538,7 @@ meaning is not well-defined and it may well cause compile-time errors
 (this feature is present for POSIX compliance.  *Note Lex and Posix::,
 for other such features).
 
-   Any _indented_ text or text enclosed in '%{' and '%}' is copied
+   Any _indented_ text or text enclosed in ‘%{’ and ‘%}’ is copied
 verbatim to the output (with the %{ and %} symbols removed).  The %{ and
 %} symbols must appear unindented on lines by themselves.
 
@@ -549,10 +548,10 @@ File: flex.info,  Node: User Code Section,  Next: Comments in the Input,  Prev:
 5.3 Format of the User Code Section
 ===================================
 
-The user code section is simply copied to 'lex.yy.c' verbatim.  It is
+The user code section is simply copied to ‘lex.yy.c’ verbatim.  It is
 used for companion routines which call or are called by the scanner.
 The presence of this section is optional; if it is missing, the second
-'%%' in the input file may be skipped, too.
+‘%%’ in the input file may be skipped, too.
 
 
 File: flex.info,  Node: Comments in the Input,  Prev: User Code Section,  Up: Format
@@ -560,31 +559,31 @@ File: flex.info,  Node: Comments in the Input,  Prev: User Code Section,  Up: Fo
 5.4 Comments in the Input
 =========================
 
-Flex supports C-style comments, that is, anything between '/*' and '*/'
+Flex supports C-style comments, that is, anything between ‘/*’ and ‘*/’
 is considered a comment.  Whenever flex encounters a comment, it copies
 the entire comment verbatim to the generated source code.  Comments may
 appear just about anywhere, but with the following exceptions:
 
-   * Comments may not appear in the Rules Section wherever flex is
+   • Comments may not appear in the Rules Section wherever flex is
      expecting a regular expression.  This means comments may not appear
      at the beginning of a line, or immediately following a list of
      scanner states.
-   * Comments may not appear on an '%option' line in the Definitions
+   • Comments may not appear on an ‘%option’ line in the Definitions
      Section.
 
    If you want to follow a simple rule, then always begin a comment on a
 new line, with one or more whitespace characters before the initial
-'/*').  This rule will work anywhere in the input file.
+‘/*’).  This rule will work anywhere in the input file.
 
    All the comments in the following example are valid:
 
      %{
      /* code block */
      %}
-
+     
      /* Definitions Section */
      %x STATE_X
-
+     
      %%
          /* Rules Section */
      ruleA   /* after regex */ { /* code block */ } /* after code block */
@@ -598,7 +597,7 @@ new line, with one or more whitespace characters before the initial
      }
      %%
      /* User Code Section */
-
+     
 
 
 File: flex.info,  Node: Patterns,  Next: Matching,  Prev: Format,  Up: Top
@@ -609,84 +608,84 @@ File: flex.info,  Node: Patterns,  Next: Matching,  Prev: Format,  Up: Top
 The patterns in the input (see *note Rules Section::) are written using
 an extended set of regular expressions.  These are:
 
-'x'
+‘x’
      match the character 'x'
 
-'.'
+‘.’
      any character (byte) except newline
 
-'[xyz]'
-     a "character class"; in this case, the pattern matches either an
+‘[xyz]’
+     a “character class”; in this case, the pattern matches either an
      'x', a 'y', or a 'z'
 
-'[abj-oZ]'
+‘[abj-oZ]’
      a "character class" with a range in it; matches an 'a', a 'b', any
      letter from 'j' through 'o', or a 'Z'
 
-'[^A-Z]'
+‘[^A-Z]’
      a "negated character class", i.e., any character but those in the
      class.  In this case, any character EXCEPT an uppercase letter.
 
-'[^A-Z\n]'
+‘[^A-Z\n]’
      any character EXCEPT an uppercase letter or a newline
 
-'[a-z]{-}[aeiou]'
+‘[a-z]{-}[aeiou]’
      the lowercase consonants
 
-'r*'
+‘r*’
      zero or more r's, where r is any regular expression
 
-'r+'
+‘r+’
      one or more r's
 
-'r?'
+‘r?’
      zero or one r's (that is, "an optional r")
 
-'r{2,5}'
+‘r{2,5}’
      anywhere from two to five r's
 
-'r{2,}'
+‘r{2,}’
      two or more r's
 
-'r{4}'
+‘r{4}’
      exactly 4 r's
 
-'{name}'
-     the expansion of the 'name' definition (*note Format::).
+‘{name}’
+     the expansion of the ‘name’ definition (*note Format::).
 
-'"[xyz]\"foo"'
-     the literal string: '[xyz]"foo'
+‘"[xyz]\"foo"’
+     the literal string: ‘[xyz]"foo’
 
-'\X'
-     if X is 'a', 'b', 'f', 'n', 'r', 't', or 'v', then the ANSI-C
-     interpretation of '\x'.  Otherwise, a literal 'X' (used to escape
-     operators such as '*')
+‘\X’
+     if X is ‘a’, ‘b’, ‘f’, ‘n’, ‘r’, ‘t’, or ‘v’, then the ANSI-C
+     interpretation of ‘\x’.  Otherwise, a literal ‘X’ (used to escape
+     operators such as ‘*’)
 
-'\0'
+‘\0’
      a NUL character (ASCII code 0)
 
-'\123'
+‘\123’
      the character with octal value 123
 
-'\x2a'
+‘\x2a’
      the character with hexadecimal value 2a
 
-'(r)'
-     match an 'r'; parentheses are used to override precedence (see
+‘(r)’
+     match an ‘r’; parentheses are used to override precedence (see
      below)
 
-'(?r-s:pattern)'
-     apply option 'r' and omit option 's' while interpreting pattern.
-     Options may be zero or more of the characters 'i', 's', or 'x'.
+‘(?r-s:pattern)’
+     apply option ‘r’ and omit option ‘s’ while interpreting pattern.
+     Options may be zero or more of the characters ‘i’, ‘s’, or ‘x’.
 
-     'i' means case-insensitive.  '-i' means case-sensitive.
+     ‘i’ means case-insensitive.  ‘-i’ means case-sensitive.
 
-     's' alters the meaning of the '.' syntax to match any single byte
-     whatsoever.  '-s' alters the meaning of '.' to match any byte
-     except '\n'.
+     ‘s’ alters the meaning of the ‘.’ syntax to match any single byte
+     whatsoever.  ‘-s’ alters the meaning of ‘.’ to match any byte
+     except ‘\n’.
 
-     'x' ignores comments and whitespace in patterns.  Whitespace is
-     ignored unless it is backslash-escaped, contained within '""'s, or
+     ‘x’ ignores comments and whitespace in patterns.  Whitespace is
+     ignored unless it is backslash-escaped, contained within ‘""’s, or
      appears inside a character class.
 
      The following are all valid:
@@ -706,66 +705,66 @@ an extended set of regular expressions.  These are:
          b
          c)          same as  (abc)
 
-'(?# comment )'
-     omit everything within '()'.  The first ')' character encountered
+‘(?# comment )’
+     omit everything within ‘()’.  The first ‘)’ character encountered
      ends the pattern.  It is not possible to for the comment to contain
-     a ')' character.  The comment may span lines.
+     a ‘)’ character.  The comment may span lines.
 
-'rs'
-     the regular expression 'r' followed by the regular expression 's';
-     called "concatenation"
+‘rs’
+     the regular expression ‘r’ followed by the regular expression ‘s’;
+     called “concatenation”
 
-'r|s'
-     either an 'r' or an 's'
+‘r|s’
+     either an ‘r’ or an ‘s’
 
-'r/s'
-     an 'r' but only if it is followed by an 's'.  The text matched by
-     's' is included when determining whether this rule is the longest
+‘r/s’
+     an ‘r’ but only if it is followed by an ‘s’.  The text matched by
+     ‘s’ is included when determining whether this rule is the longest
      match, but is then returned to the input before the action is
-     executed.  So the action only sees the text matched by 'r'.  This
-     type of pattern is called "trailing context".  (There are some
-     combinations of 'r/s' that flex cannot match correctly.  *Note
+     executed.  So the action only sees the text matched by ‘r’.  This
+     type of pattern is called “trailing context”.  (There are some
+     combinations of ‘r/s’ that flex cannot match correctly.  *Note
      Limitations::, regarding dangerous trailing context.)
 
-'^r'
-     an 'r', but only at the beginning of a line (i.e., when just
+‘^r’
+     an ‘r’, but only at the beginning of a line (i.e., when just
      starting to scan, or right after a newline has been scanned).
 
-'r$'
-     an 'r', but only at the end of a line (i.e., just before a
-     newline).  Equivalent to 'r/\n'.
+‘r$’
+     an ‘r’, but only at the end of a line (i.e., just before a
+     newline).  Equivalent to ‘r/\n’.
 
-     Note that 'flex''s notion of "newline" is exactly whatever the C
-     compiler used to compile 'flex' interprets '\n' as; in particular,
-     on some DOS systems you must either filter out '\r's in the input
-     yourself, or explicitly use 'r/\r\n' for 'r$'.
+     Note that ‘flex’'s notion of "newline" is exactly whatever the C
+     compiler used to compile ‘flex’ interprets ‘\n’ as; in particular,
+     on some DOS systems you must either filter out ‘\r’s in the input
+     yourself, or explicitly use ‘r/\r\n’ for ‘r$’.
 
-'<s>r'
-     an 'r', but only in start condition 's' (see *note Start
+‘<s>r’
+     an ‘r’, but only in start condition ‘s’ (see *note Start
      Conditions:: for discussion of start conditions).
 
-'<s1,s2,s3>r'
-     same, but in any of start conditions 's1', 's2', or 's3'.
+‘<s1,s2,s3>r’
+     same, but in any of start conditions ‘s1’, ‘s2’, or ‘s3’.
 
-'<*>r'
-     an 'r' in any start condition, even an exclusive one.
+‘<*>r’
+     an ‘r’ in any start condition, even an exclusive one.
 
-'<<EOF>>'
+‘<<EOF>>’
      an end-of-file.
 
-'<s1,s2><<EOF>>'
-     an end-of-file when in start condition 's1' or 's2'
+‘<s1,s2><<EOF>>’
+     an end-of-file when in start condition ‘s1’ or ‘s2’
 
    Note that inside of a character class, all regular expression
-operators lose their special meaning except escape ('\') and the
-character class operators, '-', ']]', and, at the beginning of the
-class, '^'.
+operators lose their special meaning except escape (‘\’) and the
+character class operators, ‘-’, ‘]]’, and, at the beginning of the
+class, ‘^’.
 
    The regular expressions listed above are grouped according to
 precedence, from highest precedence at the top to lowest at the bottom.
 Those grouped together have equal precedence (see special note on the
-precedence of the repeat operator, '{}', under the documentation for the
-'--posix' POSIX compliance option).  For example,
+precedence of the repeat operator, ‘{}’, under the documentation for the
+‘--posix’ POSIX compliance option).  For example,
 
          foo|bar*
 
@@ -773,23 +772,23 @@ precedence of the repeat operator, '{}', under the documentation for the
 
          (foo)|(ba(r*))
 
-   since the '*' operator has higher precedence than concatenation, and
-concatenation higher than alternation ('|').  This pattern therefore
-matches _either_ the string 'foo' _or_ the string 'ba' followed by
-zero-or-more 'r''s.  To match 'foo' or zero-or-more repetitions of the
-string 'bar', use:
+   since the ‘*’ operator has higher precedence than concatenation, and
+concatenation higher than alternation (‘|’).  This pattern therefore
+matches _either_ the string ‘foo’ _or_ the string ‘ba’ followed by
+zero-or-more ‘r’'s.  To match ‘foo’ or zero-or-more repetitions of the
+string ‘bar’, use:
 
          foo|(bar)*
 
-   And to match a sequence of zero or more repetitions of 'foo' and
-'bar':
+   And to match a sequence of zero or more repetitions of ‘foo’ and
+‘bar’:
 
          (foo|bar)*
 
    In addition to characters and ranges of characters, character classes
-can also contain "character class expressions".  These are expressions
-enclosed inside '[:' and ':]' delimiters (which themselves must appear
-between the '[' and ']' of the character class.  Other elements may
+can also contain “character class expressions”.  These are expressions
+enclosed inside ‘[:’ and ‘:]’ delimiters (which themselves must appear
+between the ‘[’ and ‘]’ of the character class.  Other elements may
 occur inside the character class, too).  The valid expressions are:
 
          [:alnum:] [:alpha:] [:blank:]
@@ -798,10 +797,10 @@ occur inside the character class, too).  The valid expressions are:
          [:space:] [:upper:] [:xdigit:]
 
    These expressions all designate a set of characters equivalent to the
-corresponding standard C 'isXXX' function.  For example, '[:alnum:]'
-designates those characters for which 'isalnum()' returns true - i.e.,
+corresponding standard C ‘isXXX’ function.  For example, ‘[:alnum:]’
+designates those characters for which ‘isalnum()’ returns true - i.e.,
 any alphabetic or numeric character.  Some systems don't provide
-'isblank()', so flex defines '[:blank:]' as a blank or a tab.
+‘isblank()’, so flex defines ‘[:blank:]’ as a blank or a tab.
 
    For example, the following character classes are all equivalent:
 
@@ -811,100 +810,100 @@ any alphabetic or numeric character.  Some systems don't provide
          [a-zA-Z0-9]
 
    A word of caution.  Character classes are expanded immediately when
-seen in the 'flex' input.  This means the character classes are
-sensitive to the locale in which 'flex' is executed, and the resulting
+seen in the ‘flex’ input.  This means the character classes are
+sensitive to the locale in which ‘flex’ is executed, and the resulting
 scanner will not be sensitive to the runtime locale.  This may or may
 not be desirable.
 
-   * If your scanner is case-insensitive (the '-i' flag), then
-     '[:upper:]' and '[:lower:]' are equivalent to '[:alpha:]'.
+   • If your scanner is case-insensitive (the ‘-i’ flag), then
+     ‘[:upper:]’ and ‘[:lower:]’ are equivalent to ‘[:alpha:]’.
 
-   * Character classes with ranges, such as '[a-Z]', should be used with
+   • Character classes with ranges, such as ‘[a-Z]’, should be used with
      caution in a case-insensitive scanner if the range spans upper or
      lowercase characters.  Flex does not know if you want to fold all
      upper and lowercase characters together, or if you want the literal
      numeric range specified (with no case folding).  When in doubt,
      flex will assume that you meant the literal numeric range, and will
      issue a warning.  The exception to this rule is a character range
-     such as '[a-z]' or '[S-W]' where it is obvious that you want
-     case-folding to occur.  Here are some examples with the '-i' flag
+     such as ‘[a-z]’ or ‘[S-W]’ where it is obvious that you want
+     case-folding to occur.  Here are some examples with the ‘-i’ flag
      enabled:
 
      Range        Result      Literal Range        Alternate Range
-     '[a-t]'      ok          '[a-tA-T]'
-     '[A-T]'      ok          '[a-tA-T]'
-     '[A-t]'      ambiguous   '[A-Z\[\\\]_`a-t]'   '[a-tA-T]'
-     '[_-{]'      ambiguous   '[_`a-z{]'           '[_`a-zA-Z{]'
-     '[@-C]'      ambiguous   '[@ABC]'             '[@A-Z\[\\\]_`abc]'
+     ‘[a-t]’      ok          ‘[a-tA-T]’
+     ‘[A-T]’      ok          ‘[a-tA-T]’
+     ‘[A-t]’      ambiguous   ‘[A-Z\[\\\]_`a-t]’   ‘[a-tA-T]’
+     ‘[_-{]’      ambiguous   ‘[_`a-z{]’           ‘[_`a-zA-Z{]’
+     ‘[@-C]’      ambiguous   ‘[@ABC]’             ‘[@A-Z\[\\\]_`abc]’
 
-   * A negated character class such as the example '[^A-Z]' above _will_
-     match a newline unless '\n' (or an equivalent escape sequence) is
+   • A negated character class such as the example ‘[^A-Z]’ above _will_
+     match a newline unless ‘\n’ (or an equivalent escape sequence) is
      one of the characters explicitly present in the negated character
-     class (e.g., '[^A-Z\n]').  This is unlike how many other regular
+     class (e.g., ‘[^A-Z\n]’).  This is unlike how many other regular
      expression tools treat negated character classes, but unfortunately
      the inconsistency is historically entrenched.  Matching newlines
-     means that a pattern like '[^"]*' can match the entire input unless
+     means that a pattern like ‘[^"]*’ can match the entire input unless
      there's another quote in the input.
 
      Flex allows negation of character class expressions by prepending
-     '^' to the POSIX character class name.
+     ‘^’ to the POSIX character class name.
 
               [:^alnum:] [:^alpha:] [:^blank:]
               [:^cntrl:] [:^digit:] [:^graph:]
               [:^lower:] [:^print:] [:^punct:]
               [:^space:] [:^upper:] [:^xdigit:]
 
-     Flex will issue a warning if the expressions '[:^upper:]' and
-     '[:^lower:]' appear in a case-insensitive scanner, since their
+     Flex will issue a warning if the expressions ‘[:^upper:]’ and
+     ‘[:^lower:]’ appear in a case-insensitive scanner, since their
      meaning is unclear.  The current behavior is to skip them entirely,
      but this may change without notice in future revisions of flex.
 
-   * 
-     The '{-}' operator computes the difference of two character
-     classes.  For example, '[a-c]{-}[b-z]' represents all the
-     characters in the class '[a-c]' that are not in the class '[b-z]'
-     (which in this case, is just the single character 'a').  The '{-}'
-     operator is left associative, so '[abc]{-}[b]{-}[c]' is the same as
-     '[a]'.  Be careful not to accidentally create an empty set, which
+   • 
+     The ‘{-}’ operator computes the difference of two character
+     classes.  For example, ‘[a-c]{-}[b-z]’ represents all the
+     characters in the class ‘[a-c]’ that are not in the class ‘[b-z]’
+     (which in this case, is just the single character ‘a’).  The ‘{-}’
+     operator is left associative, so ‘[abc]{-}[b]{-}[c]’ is the same as
+     ‘[a]’.  Be careful not to accidentally create an empty set, which
      will never match.
 
-   * 
-     The '{+}' operator computes the union of two character classes.
-     For example, '[a-z]{+}[0-9]' is the same as '[a-z0-9]'.  This
+   • 
+     The ‘{+}’ operator computes the union of two character classes.
+     For example, ‘[a-z]{+}[0-9]’ is the same as ‘[a-z0-9]’.  This
      operator is useful when preceded by the result of a difference
-     operation, as in, '[[:alpha:]]{-}[[:lower:]]{+}[q]', which is
-     equivalent to '[A-Zq]' in the "C" locale.
+     operation, as in, ‘[[:alpha:]]{-}[[:lower:]]{+}[q]’, which is
+     equivalent to ‘[A-Zq]’ in the "C" locale.
 
-   * A rule can have at most one instance of trailing context (the '/'
-     operator or the '$' operator).  The start condition, '^', and
-     '<<EOF>>' patterns can only occur at the beginning of a pattern,
-     and, as well as with '/' and '$', cannot be grouped inside
-     parentheses.  A '^' which does not occur at the beginning of a rule
-     or a '$' which does not occur at the end of a rule loses its
+   • A rule can have at most one instance of trailing context (the ‘/’
+     operator or the ‘$’ operator).  The start condition, ‘^’, and
+     ‘<<EOF>>’ patterns can only occur at the beginning of a pattern,
+     and, as well as with ‘/’ and ‘$’, cannot be grouped inside
+     parentheses.  A ‘^’ which does not occur at the beginning of a rule
+     or a ‘$’ which does not occur at the end of a rule loses its
      special properties and is treated as a normal character.
 
-   * The following are invalid:
+   • The following are invalid:
 
               foo/bar$
               <sc1>foo<sc2>bar
 
-     Note that the first of these can be written 'foo/bar\n'.
+     Note that the first of these can be written ‘foo/bar\n’.
 
-   * The following will result in '$' or '^' being treated as a normal
+   • The following will result in ‘$’ or ‘^’ being treated as a normal
      character:
 
               foo|(bar$)
               foo|^bar
 
-     If the desired meaning is a 'foo' or a 'bar'-followed-by-a-newline,
-     the following could be used (the special '|' action is explained
+     If the desired meaning is a ‘foo’ or a ‘bar’-followed-by-a-newline,
+     the following could be used (the special ‘|’ action is explained
      below, *note Actions::):
 
               foo      |
               bar$     /* action goes here */
 
-     A similar trick will work for matching a 'foo' or a
-     'bar'-at-the-beginning-of-a-line.
+     A similar trick will work for matching a ‘foo’ or a
+     ‘bar’-at-the-beginning-of-a-line.
 
 
 File: flex.info,  Node: Matching,  Next: Actions,  Prev: Patterns,  Up: Top
@@ -917,61 +916,61 @@ strings which match any of its patterns.  If it finds more than one
 match, it takes the one matching the most text (for trailing context
 rules, this includes the length of the trailing part, even though it
 will then be returned to the input).  If it finds two or more matches of
-the same length, the rule listed first in the 'flex' input file is
+the same length, the rule listed first in the ‘flex’ input file is
 chosen.
 
    Once the match is determined, the text corresponding to the match
-(called the "token") is made available in the global character pointer
-'yytext', and its length in the global integer 'yyleng'.  The "action"
+(called the “token”) is made available in the global character pointer
+‘yytext’, and its length in the global integer ‘yyleng’.  The “action”
 corresponding to the matched pattern is then executed (*note Actions::),
 and then the remaining input is scanned for another match.
 
-   If no match is found, then the "default rule" is executed: the next
+   If no match is found, then the “default rule” is executed: the next
 character in the input is considered matched and copied to the standard
-output.  Thus, the simplest valid 'flex' input is:
+output.  Thus, the simplest valid ‘flex’ input is:
 
          %%
 
    which generates a scanner that simply copies its input (one character
 at a time) to its output.
 
-   Note that 'yytext' can be defined in two different ways: either as a
+   Note that ‘yytext’ can be defined in two different ways: either as a
 character _pointer_ or as a character _array_.  You can control which
-definition 'flex' uses by including one of the special directives
-'%pointer' or '%array' in the first (definitions) section of your flex
-input.  The default is '%pointer', unless you use the '-l' lex
-compatibility option, in which case 'yytext' will be an array.  The
-advantage of using '%pointer' is substantially faster scanning and no
+definition ‘flex’ uses by including one of the special directives
+‘%pointer’ or ‘%array’ in the first (definitions) section of your flex
+input.  The default is ‘%pointer’, unless you use the ‘-l’ lex
+compatibility option, in which case ‘yytext’ will be an array.  The
+advantage of using ‘%pointer’ is substantially faster scanning and no
 buffer overflow when matching very large tokens (unless you run out of
 dynamic memory).  The disadvantage is that you are restricted in how
-your actions can modify 'yytext' (*note Actions::), and calls to the
-'unput()' function destroys the present contents of 'yytext', which can
-be a considerable porting headache when moving between different 'lex'
+your actions can modify ‘yytext’ (*note Actions::), and calls to the
+‘unput()’ function destroys the present contents of ‘yytext’, which can
+be a considerable porting headache when moving between different ‘lex’
 versions.
 
-   The advantage of '%array' is that you can then modify 'yytext' to
-your heart's content, and calls to 'unput()' do not destroy 'yytext'
-(*note Actions::).  Furthermore, existing 'lex' programs sometimes
-access 'yytext' externally using declarations of the form:
+   The advantage of ‘%array’ is that you can then modify ‘yytext’ to
+your heart's content, and calls to ‘unput()’ do not destroy ‘yytext’
+(*note Actions::).  Furthermore, existing ‘lex’ programs sometimes
+access ‘yytext’ externally using declarations of the form:
 
          extern char yytext[];
 
-   This definition is erroneous when used with '%pointer', but correct
-for '%array'.
+   This definition is erroneous when used with ‘%pointer’, but correct
+for ‘%array’.
 
-   The '%array' declaration defines 'yytext' to be an array of 'YYLMAX'
+   The ‘%array’ declaration defines ‘yytext’ to be an array of ‘YYLMAX’
 characters, which defaults to a fairly large value.  You can change the
-size by simply #define'ing 'YYLMAX' to a different value in the first
-section of your 'flex' input.  As mentioned above, with '%pointer'
+size by simply #define'ing ‘YYLMAX’ to a different value in the first
+section of your ‘flex’ input.  As mentioned above, with ‘%pointer’
 yytext grows dynamically to accommodate large tokens.  While this means
-your '%pointer' scanner can accommodate very large tokens (such as
+your ‘%pointer’ scanner can accommodate very large tokens (such as
 matching entire blocks of comments), bear in mind that each time the
-scanner must resize 'yytext' it also must rescan the entire token from
-the beginning, so matching such tokens can prove slow.  'yytext'
-presently does _not_ dynamically grow if a call to 'unput()' results in
+scanner must resize ‘yytext’ it also must rescan the entire token from
+the beginning, so matching such tokens can prove slow.  ‘yytext’
+presently does _not_ dynamically grow if a call to ‘unput()’ results in
 too much text being pushed back; instead, a run-time error results.
 
-   Also note that you cannot use '%array' with C++ scanner classes
+   Also note that you cannot use ‘%array’ with C++ scanner classes
 (*note Cxx::).
 
 
@@ -980,12 +979,12 @@ File: flex.info,  Node: Actions,  Next: Generated Scanner,  Prev: Matching,  Up:
 8 Actions
 *********
 
-Each pattern in a rule has a corresponding "action", which can be any
+Each pattern in a rule has a corresponding “action”, which can be any
 arbitrary C statement.  The pattern ends at the first non-escaped
 whitespace character; the remainder of the line is its action.  If the
 action is empty, then when the pattern is matched the input token is
 simply discarded.  For example, here is the specification for a program
-which deletes all occurrences of 'zap me' from its input:
+which deletes all occurrences of ‘zap me’ from its input:
 
          %%
          "zap me"
@@ -1000,62 +999,62 @@ single blank, and throws away whitespace found at the end of a line:
          [ \t]+        putchar( ' ' );
          [ \t]+$       /* ignore this token */
 
-   If the action contains a '{', then the action spans till the
-balancing '}' is found, and the action may cross multiple lines.  'flex'
+   If the action contains a ‘{’, then the action spans till the
+balancing ‘}’ is found, and the action may cross multiple lines.  ‘flex’
 knows about C strings and comments and won't be fooled by braces found
-within them, but also allows actions to begin with '%{' and will
-consider the action to be all the text up to the next '%}' (regardless
+within them, but also allows actions to begin with ‘%{’ and will
+consider the action to be all the text up to the next ‘%}’ (regardless
 of ordinary braces inside the action).
 
-   An action consisting solely of a vertical bar ('|') means "same as
+   An action consisting solely of a vertical bar (‘|’) means "same as
 the action for the next rule".  See below for an illustration.
 
-   Actions can include arbitrary C code, including 'return' statements
-to return a value to whatever routine called 'yylex()'.  Each time
-'yylex()' is called it continues processing tokens from where it last
+   Actions can include arbitrary C code, including ‘return’ statements
+to return a value to whatever routine called ‘yylex()’.  Each time
+‘yylex()’ is called it continues processing tokens from where it last
 left off until it either reaches the end of the file or executes a
 return.
 
-   Actions are free to modify 'yytext' except for lengthening it (adding
+   Actions are free to modify ‘yytext’ except for lengthening it (adding
 characters to its end-these will overwrite later characters in the input
-stream).  This however does not apply when using '%array' (*note
-Matching::).  In that case, 'yytext' may be freely modified in any way.
+stream).  This however does not apply when using ‘%array’ (*note
+Matching::).  In that case, ‘yytext’ may be freely modified in any way.
 
-   Actions are free to modify 'yyleng' except they should not do so if
-the action also includes use of 'yymore()' (see below).
+   Actions are free to modify ‘yyleng’ except they should not do so if
+the action also includes use of ‘yymore()’ (see below).
 
    There are a number of special directives which can be included within
 an action:
 
-'ECHO'
+‘ECHO’
      copies yytext to the scanner's output.
 
-'BEGIN'
+‘BEGIN’
      followed by the name of a start condition places the scanner in the
      corresponding start condition (see below).
 
-'REJECT'
+‘REJECT’
      directs the scanner to proceed on to the "second best" rule which
      matched the input (or a prefix of the input).  The rule is chosen
-     as described above in *note Matching::, and 'yytext' and 'yyleng'
+     as described above in *note Matching::, and ‘yytext’ and ‘yyleng’
      set up appropriately.  It may either be one which matched as much
-     text as the originally chosen rule but came later in the 'flex'
+     text as the originally chosen rule but came later in the ‘flex’
      input file, or one which matched less text.  For example, the
      following will both count the words in the input and call the
-     routine 'special()' whenever 'frob' is seen:
+     routine ‘special()’ whenever ‘frob’ is seen:
 
                       int word_count = 0;
               %%
-
+          
               frob        special(); REJECT;
               [^ \t\n]+   ++word_count;
 
-     Without the 'REJECT', any occurrences of 'frob' in the input would
+     Without the ‘REJECT’, any occurrences of ‘frob’ in the input would
      not be counted as words, since the scanner normally executes only
-     one action per token.  Multiple uses of 'REJECT' are allowed, each
+     one action per token.  Multiple uses of ‘REJECT’ are allowed, each
      one finding the next best choice to the currently active rule.  For
-     example, when the following scanner scans the token 'abcd', it will
-     write 'abcdabcaba' to the output:
+     example, when the following scanner scans the token ‘abcd’, it will
+     write ‘abcdabcaba’ to the output:
 
               %%
               a        |
@@ -1065,59 +1064,59 @@ an action:
               .|\n     /* eat up any unmatched character */
 
      The first three rules share the fourth's action since they use the
-     special '|' action.
+     special ‘|’ action.
 
-     'REJECT' is a particularly expensive feature in terms of scanner
+     ‘REJECT’ is a particularly expensive feature in terms of scanner
      performance; if it is used in _any_ of the scanner's actions it
      will slow down _all_ of the scanner's matching.  Furthermore,
-     'REJECT' cannot be used with the '-Cf' or '-CF' options (*note
+     ‘REJECT’ cannot be used with the ‘-Cf’ or ‘-CF’ options (*note
      Scanner Options::).
 
-     Note also that unlike the other special actions, 'REJECT' is a
+     Note also that unlike the other special actions, ‘REJECT’ is a
      _branch_.  Code immediately following it in the action will _not_
      be executed.
 
-'yymore()'
+‘yymore()’
      tells the scanner that the next time it matches a rule, the
      corresponding token should be _appended_ onto the current value of
-     'yytext' rather than replacing it.  For example, given the input
-     'mega-kludge' the following will write 'mega-mega-kludge' to the
+     ‘yytext’ rather than replacing it.  For example, given the input
+     ‘mega-kludge’ the following will write ‘mega-mega-kludge’ to the
      output:
 
               %%
               mega-    ECHO; yymore();
               kludge   ECHO;
 
-     First 'mega-' is matched and echoed to the output.  Then 'kludge'
-     is matched, but the previous 'mega-' is still hanging around at the
-     beginning of 'yytext' so the 'ECHO' for the 'kludge' rule will
-     actually write 'mega-kludge'.
+     First ‘mega-’ is matched and echoed to the output.  Then ‘kludge’
+     is matched, but the previous ‘mega-’ is still hanging around at the
+     beginning of ‘yytext’ so the ‘ECHO’ for the ‘kludge’ rule will
+     actually write ‘mega-kludge’.
 
-   Two notes regarding use of 'yymore()'.  First, 'yymore()' depends on
-the value of 'yyleng' correctly reflecting the size of the current
-token, so you must not modify 'yyleng' if you are using 'yymore()'.
-Second, the presence of 'yymore()' in the scanner's action entails a
+   Two notes regarding use of ‘yymore()’.  First, ‘yymore()’ depends on
+the value of ‘yyleng’ correctly reflecting the size of the current
+token, so you must not modify ‘yyleng’ if you are using ‘yymore()’.
+Second, the presence of ‘yymore()’ in the scanner's action entails a
 minor performance penalty in the scanner's matching speed.
 
-   'yyless(n)' returns all but the first 'n' characters of the current
+   ‘yyless(n)’ returns all but the first ‘n’ characters of the current
 token back to the input stream, where they will be rescanned when the
-scanner looks for the next match.  'yytext' and 'yyleng' are adjusted
-appropriately (e.g., 'yyleng' will now be equal to 'n').  For example,
-on the input 'foobar' the following will write out 'foobarbar':
+scanner looks for the next match.  ‘yytext’ and ‘yyleng’ are adjusted
+appropriately (e.g., ‘yyleng’ will now be equal to ‘n’).  For example,
+on the input ‘foobar’ the following will write out ‘foobarbar’:
 
          %%
          foobar    ECHO; yyless(3);
          [a-z]+    ECHO;
 
-   An argument of 0 to 'yyless()' will cause the entire current input
+   An argument of 0 to ‘yyless()’ will cause the entire current input
 string to be scanned again.  Unless you've changed how the scanner will
-subsequently process its input (using 'BEGIN', for example), this will
+subsequently process its input (using ‘BEGIN’, for example), this will
 result in an endless loop.
 
-   Note that 'yyless()' is a macro and can only be used in the flex
+   Note that ‘yyless()’ is a macro and can only be used in the flex
 input file, not from other source files.
 
-   'unput(c)' puts the character 'c' back onto the input stream.  It
+   ‘unput(c)’ puts the character ‘c’ back onto the input stream.  It
 will be the next character scanned.  The following action will take the
 current token and cause it to be rescanned enclosed in parentheses.
 
@@ -1132,34 +1131,34 @@ current token and cause it to be rescanned enclosed in parentheses.
          free( yycopy );
          }
 
-   Note that since each 'unput()' puts the given character back at the
+   Note that since each ‘unput()’ puts the given character back at the
 _beginning_ of the input stream, pushing back strings must be done
 back-to-front.
 
-   An important potential problem when using 'unput()' is that if you
-are using '%pointer' (the default), a call to 'unput()' _destroys_ the
-contents of 'yytext', starting with its rightmost character and
+   An important potential problem when using ‘unput()’ is that if you
+are using ‘%pointer’ (the default), a call to ‘unput()’ _destroys_ the
+contents of ‘yytext’, starting with its rightmost character and
 devouring one character to the left with each call.  If you need the
-value of 'yytext' preserved after a call to 'unput()' (as in the above
+value of ‘yytext’ preserved after a call to ‘unput()’ (as in the above
 example), you must either first copy it elsewhere, or build your scanner
-using '%array' instead (*note Matching::).
+using ‘%array’ instead (*note Matching::).
 
-   Finally, note that you cannot put back 'EOF' to attempt to mark the
+   Finally, note that you cannot put back ‘EOF’ to attempt to mark the
 input stream with an end-of-file.
 
-   'input()' reads the next character from the input stream.  For
+   ‘input()’ reads the next character from the input stream.  For
 example, the following is one way to eat up C comments:
 
          %%
          "/*"        {
                      int c;
-
+     
                      for ( ; ; )
                          {
                          while ( (c = input()) != '*' &&
                                  c != EOF )
                              ;    /* eat up text of comment */
-
+     
                          if ( c == '*' )
                              {
                              while ( (c = input()) == '*' )
@@ -1167,7 +1166,7 @@ example, the following is one way to eat up C comments:
                              if ( c == '/' )
                                  break;    /* found the end */
                              }
-
+     
                          if ( c == EOF )
                              {
                              error( "EOF in comment" );
@@ -1176,19 +1175,19 @@ example, the following is one way to eat up C comments:
                          }
                      }
 
-   (Note that if the scanner is compiled using 'C++', then 'input()' is
+   (Note that if the scanner is compiled using ‘C++’, then ‘input()’ is
 instead referred to as yyinput(), in order to avoid a name clash with
-the 'C++' stream by the name of 'input'.)
+the ‘C++’ stream by the name of ‘input’.)
 
-   'YY_FLUSH_BUFFER;' flushes the scanner's internal buffer so that the
+   ‘YY_FLUSH_BUFFER;’ flushes the scanner's internal buffer so that the
 next time the scanner attempts to match a token, it will first refill
-the buffer using 'YY_INPUT()' (*note Generated Scanner::).  This action
-is a special case of the more general 'yy_flush_buffer;' function,
+the buffer using ‘YY_INPUT()’ (*note Generated Scanner::).  This action
+is a special case of the more general ‘yy_flush_buffer;’ function,
 described below (*note Multiple Input Buffers::)
 
-   'yyterminate()' can be used in lieu of a return statement in an
+   ‘yyterminate()’ can be used in lieu of a return statement in an
 action.  It terminates the scanner and returns a 0 to the scanner's
-caller, indicating "all done".  By default, 'yyterminate()' is also
+caller, indicating "all done".  By default, ‘yyterminate()’ is also
 called when an end-of-file is encountered.  It is a macro and may be
 redefined.
 
@@ -1198,9 +1197,9 @@ File: flex.info,  Node: Generated Scanner,  Next: Start Conditions,  Prev: Actio
 9 The Generated Scanner
 ***********************
 
-The output of 'flex' is the file 'lex.yy.c', which contains the scanning
-routine 'yylex()', a number of tables used by it for matching tokens,
-and a number of auxiliary routines and macros.  By default, 'yylex()' is
+The output of ‘flex’ is the file ‘lex.yy.c’, which contains the scanning
+routine ‘yylex()’, a number of tables used by it for matching tokens,
+and a number of auxiliary routines and macros.  By default, ‘yylex()’ is
 declared as follows:
 
          int yylex()
@@ -1209,61 +1208,61 @@ declared as follows:
              }
 
    (If your environment supports function prototypes, then it will be
-'int yylex( void )'.)  This definition may be changed by defining the
-'YY_DECL' macro.  For example, you could use:
+‘int yylex( void )’.)  This definition may be changed by defining the
+‘YY_DECL’ macro.  For example, you could use:
 
          #define YY_DECL float lexscan( a, b ) float a, b;
 
-   to give the scanning routine the name 'lexscan', returning a float,
+   to give the scanning routine the name ‘lexscan’, returning a float,
 and taking two floats as arguments.  Note that if you give arguments to
 the scanning routine using a K&R-style/non-prototyped function
 declaration, you must terminate the definition with a semi-colon (;).
 
-   'flex' generates 'C99' function definitions by default.  Flex used to
-have the ability to generate obsolete, er, 'traditional', function
+   ‘flex’ generates ‘C99’ function definitions by default.  Flex used to
+have the ability to generate obsolete, er, ‘traditional’, function
 definitions.  This was to support bootstrapping gcc on old systems.
 Unfortunately, traditional definitions prevent us from using any
 standard data types smaller than int (such as short, char, or bool) as
 function arguments.  Furthermore, traditional definitions support added
 extra complexity in the skeleton file.  For this reason, current
-versions of 'flex' generate standard C99 code only, leaving K&R-style
+versions of ‘flex’ generate standard C99 code only, leaving K&R-style
 functions to the historians.
 
-   Whenever 'yylex()' is called, it scans tokens from the global input
-file 'yyin' (which defaults to stdin).  It continues until it either
+   Whenever ‘yylex()’ is called, it scans tokens from the global input
+file ‘yyin’ (which defaults to stdin).  It continues until it either
 reaches an end-of-file (at which point it returns the value 0) or one of
-its actions executes a 'return' statement.
+its actions executes a ‘return’ statement.
 
    If the scanner reaches an end-of-file, subsequent calls are undefined
-unless either 'yyin' is pointed at a new input file (in which case
-scanning continues from that file), or 'yyrestart()' is called.
-'yyrestart()' takes one argument, a 'FILE *' pointer (which can be NULL,
-if you've set up 'YY_INPUT' to scan from a source other than 'yyin'),
-and initializes 'yyin' for scanning from that file.  Essentially there
-is no difference between just assigning 'yyin' to a new input file or
-using 'yyrestart()' to do so; the latter is available for compatibility
-with previous versions of 'flex', and because it can be used to switch
+unless either ‘yyin’ is pointed at a new input file (in which case
+scanning continues from that file), or ‘yyrestart()’ is called.
+‘yyrestart()’ takes one argument, a ‘FILE *’ pointer (which can be NULL,
+if you've set up ‘YY_INPUT’ to scan from a source other than ‘yyin’),
+and initializes ‘yyin’ for scanning from that file.  Essentially there
+is no difference between just assigning ‘yyin’ to a new input file or
+using ‘yyrestart()’ to do so; the latter is available for compatibility
+with previous versions of ‘flex’, and because it can be used to switch
 input files in the middle of scanning.  It can also be used to throw
-away the current input buffer, by calling it with an argument of 'yyin';
-but it would be better to use 'YY_FLUSH_BUFFER' (*note Actions::).  Note
-that 'yyrestart()' does _not_ reset the start condition to 'INITIAL'
+away the current input buffer, by calling it with an argument of ‘yyin’;
+but it would be better to use ‘YY_FLUSH_BUFFER’ (*note Actions::).  Note
+that ‘yyrestart()’ does _not_ reset the start condition to ‘INITIAL’
 (*note Start Conditions::).
 
-   If 'yylex()' stops scanning due to executing a 'return' statement in
+   If ‘yylex()’ stops scanning due to executing a ‘return’ statement in
 one of the actions, the scanner may then be called again and it will
 resume scanning where it left off.
 
    By default (and for purposes of efficiency), the scanner uses
-block-reads rather than simple 'getc()' calls to read characters from
-'yyin'.  The nature of how it gets its input can be controlled by
-defining the 'YY_INPUT' macro.  The calling sequence for 'YY_INPUT()' is
-'YY_INPUT(buf,result,max_size)'.  Its action is to place up to
-'max_size' characters in the character array 'buf' and return in the
-integer variable 'result' either the number of characters read or the
-constant 'YY_NULL' (0 on Unix systems) to indicate 'EOF'.  The default
-'YY_INPUT' reads from the global file-pointer 'yyin'.
+block-reads rather than simple ‘getc()’ calls to read characters from
+‘yyin’.  The nature of how it gets its input can be controlled by
+defining the ‘YY_INPUT’ macro.  The calling sequence for ‘YY_INPUT()’ is
+‘YY_INPUT(buf,result,max_size)’.  Its action is to place up to
+‘max_size’ characters in the character array ‘buf’ and return in the
+integer variable ‘result’ either the number of characters read or the
+constant ‘YY_NULL’ (0 on Unix systems) to indicate ‘EOF’.  The default
+‘YY_INPUT’ reads from the global file-pointer ‘yyin’.
 
-   Here is a sample definition of 'YY_INPUT' (in the definitions section
+   Here is a sample definition of ‘YY_INPUT’ (in the definitions section
 of the input file):
 
          %{
@@ -1278,24 +1277,24 @@ of the input file):
 character at a time.
 
    When the scanner receives an end-of-file indication from YY_INPUT, it
-then checks the 'yywrap()' function.  If 'yywrap()' returns false
+then checks the ‘yywrap()’ function.  If ‘yywrap()’ returns false
 (zero), then it is assumed that the function has gone ahead and set up
-'yyin' to point to another input file, and scanning continues.  If it
+‘yyin’ to point to another input file, and scanning continues.  If it
 returns true (non-zero), then the scanner terminates, returning 0 to its
 caller.  Note that in either case, the start condition remains
-unchanged; it does _not_ revert to 'INITIAL'.
+unchanged; it does _not_ revert to ‘INITIAL’.
 
-   If you do not supply your own version of 'yywrap()', then you must
-either use '%option noyywrap' (in which case the scanner behaves as
-though 'yywrap()' returned 1), or you must link with '-lfl' to obtain
+   If you do not supply your own version of ‘yywrap()’, then you must
+either use ‘%option noyywrap’ (in which case the scanner behaves as
+though ‘yywrap()’ returned 1), or you must link with ‘-lfl’ to obtain
 the default version of the routine, which always returns 1.
 
    For scanning from in-memory buffers (e.g., scanning strings), see
 *note Scanning Strings::.  *Note Multiple Input Buffers::.
 
-   The scanner writes its 'ECHO' output to the 'yyout' global (default,
-'stdout'), which may be redefined by the user simply by assigning it to
-some other 'FILE' pointer.
+   The scanner writes its ‘ECHO’ output to the ‘yyout’ global (default,
+‘stdout’), which may be redefined by the user simply by assigning it to
+some other ‘FILE’ pointer.
 
 
 File: flex.info,  Node: Start Conditions,  Next: Multiple Input Buffers,  Prev: Generated Scanner,  Up: Top
@@ -1303,15 +1302,15 @@ File: flex.info,  Node: Start Conditions,  Next: Multiple Input Buffers,  Prev:
 10 Start Conditions
 *******************
 
-'flex' provides a mechanism for conditionally activating rules.  Any
-rule whose pattern is prefixed with '<sc>' will only be active when the
-scanner is in the "start condition" named 'sc'.  For example,
+‘flex’ provides a mechanism for conditionally activating rules.  Any
+rule whose pattern is prefixed with ‘<sc>’ will only be active when the
+scanner is in the “start condition” named ‘sc’.  For example,
 
          <STRING>[^"]*        { /* eat up the string body ... */
                      ...
                      }
 
-   will be active only when the scanner is in the 'STRING' start
+   will be active only when the scanner is in the ‘STRING’ start
 condition, and
 
          <INITIAL,STRING,QUOTE>\.        { /* handle an escape ... */
@@ -1319,20 +1318,20 @@ condition, and
                      }
 
    will be active only when the current start condition is either
-'INITIAL', 'STRING', or 'QUOTE'.
+‘INITIAL’, ‘STRING’, or ‘QUOTE’.
 
    Start conditions are declared in the definitions (first) section of
-the input using unindented lines beginning with either '%s' or '%x'
-followed by a list of names.  The former declares "inclusive" start
-conditions, the latter "exclusive" start conditions.  A start condition
-is activated using the 'BEGIN' action.  Until the next 'BEGIN' action is
+the input using unindented lines beginning with either ‘%s’ or ‘%x’
+followed by a list of names.  The former declares “inclusive” start
+conditions, the latter “exclusive” start conditions.  A start condition
+is activated using the ‘BEGIN’ action.  Until the next ‘BEGIN’ action is
 executed, rules with the given start condition will be active and rules
 with other start conditions will be inactive.  If the start condition is
 inclusive, then rules with no start conditions at all will also be
 active.  If it is exclusive, then _only_ rules qualified with the start
 condition will be active.  A set of rules contingent on the same
 exclusive start condition describe a scanner which is independent of any
-of the other rules in the 'flex' input.  Because of this, exclusive
+of the other rules in the ‘flex’ input.  Because of this, exclusive
 start conditions make it easy to specify "mini-scanners" which scan
 portions of the input that are syntactically different from the rest
 (e.g., comments).
@@ -1343,80 +1342,80 @@ connection between the two.  The set of rules:
 
          %s example
          %%
-
+     
          <example>foo   do_something();
-
+     
          bar            something_else();
 
    is equivalent to
 
          %x example
          %%
-
+     
          <example>foo   do_something();
-
+     
          <INITIAL,example>bar    something_else();
 
-   Without the '<INITIAL,example>' qualifier, the 'bar' pattern in the
+   Without the ‘<INITIAL,example>’ qualifier, the ‘bar’ pattern in the
 second example wouldn't be active (i.e., couldn't match) when in start
-condition 'example'.  If we just used '<example>' to qualify 'bar',
-though, then it would only be active in 'example' and not in 'INITIAL',
+condition ‘example’.  If we just used ‘<example>’ to qualify ‘bar’,
+though, then it would only be active in ‘example’ and not in ‘INITIAL’,
 while in the first example it's active in both, because in the first
-example the 'example' start condition is an inclusive '(%s)' start
+example the ‘example’ start condition is an inclusive ‘(%s)’ start
 condition.
 
-   Also note that the special start-condition specifier '<*>' matches
+   Also note that the special start-condition specifier ‘<*>’ matches
 every start condition.  Thus, the above example could also have been
 written:
 
          %x example
          %%
-
+     
          <example>foo   do_something();
-
+     
          <*>bar    something_else();
 
-   The default rule (to 'ECHO' any unmatched character) remains active
+   The default rule (to ‘ECHO’ any unmatched character) remains active
 in start conditions.  It is equivalent to:
 
          <*>.|\n     ECHO;
 
-   'BEGIN(0)' returns to the original state where only the rules with no
+   ‘BEGIN(0)’ returns to the original state where only the rules with no
 start conditions are active.  This state can also be referred to as the
-start-condition 'INITIAL', so 'BEGIN(INITIAL)' is equivalent to
-'BEGIN(0)'.  (The parentheses around the start condition name are not
+start-condition ‘INITIAL’, so ‘BEGIN(INITIAL)’ is equivalent to
+‘BEGIN(0)’.  (The parentheses around the start condition name are not
 required but are considered good style.)
 
-   'BEGIN' actions can also be given as indented code at the beginning
+   ‘BEGIN’ actions can also be given as indented code at the beginning
 of the rules section.  For example, the following will cause the scanner
-to enter the 'SPECIAL' start condition whenever 'yylex()' is called and
-the global variable 'enter_special' is true:
+to enter the ‘SPECIAL’ start condition whenever ‘yylex()’ is called and
+the global variable ‘enter_special’ is true:
 
                  int enter_special;
-
+     
          %x SPECIAL
          %%
                  if ( enter_special )
                      BEGIN(SPECIAL);
-
+     
          <SPECIAL>blahblahblah
          ...more rules follow...
 
    To illustrate the uses of start conditions, here is a scanner which
-provides two different interpretations of a string like '123.456'.  By
-default it will treat it as three tokens, the integer '123', a dot
-('.'), and the integer '456'.  But if the string is preceded earlier in
-the line by the string 'expect-floats' it will treat it as a single
-token, the floating-point number '123.456':
+provides two different interpretations of a string like ‘123.456’.  By
+default it will treat it as three tokens, the integer ‘123’, a dot
+(‘.’), and the integer ‘456’.  But if the string is preceded earlier in
+the line by the string ‘expect-floats’ it will treat it as a single
+token, the floating-point number ‘123.456’:
 
          %{
          #include <math.h>
          %}
          %s expect
-
+     
          %%
          expect-floats        BEGIN(expect);
-
+     
          <expect>[0-9]+.[0-9]+      {
                      printf( "found a float, = %f\n",
                              atof( yytext ) );
@@ -1429,12 +1428,12 @@ token, the floating-point number '123.456':
                       */
                      BEGIN(INITIAL);
                      }
-
+     
          [0-9]+      {
                      printf( "found an integer, = %d\n",
                              atoi( yytext ) );
                      }
-
+     
          "."         printf( "found a dot\n" );
 
    Here is a scanner which recognizes (and discards) C comments while
@@ -1443,9 +1442,9 @@ maintaining a count of the current input line.
          %x comment
          %%
                  int line_num = 1;
-
+     
          "/*"         BEGIN(comment);
-
+     
          <comment>[^*\n]*        /* eat anything that's not a '*' */
          <comment>"*"+[^*/\n]*   /* eat up '*'s not followed by '/'s */
          <comment>\n             ++line_num;
@@ -1464,32 +1463,32 @@ fashion:
          %%
                  int line_num = 1;
                  int comment_caller;
-
+     
          "/*"         {
                       comment_caller = INITIAL;
                       BEGIN(comment);
                       }
-
+     
          ...
-
+     
          <foo>"/*"    {
                       comment_caller = foo;
                       BEGIN(comment);
                       }
-
+     
          <comment>[^*\n]*        /* eat anything that's not a '*' */
          <comment>"*"+[^*/\n]*   /* eat up '*'s not followed by '/'s */
          <comment>\n             ++line_num;
          <comment>"*"+"/"        BEGIN(comment_caller);
 
    Furthermore, you can access the current start condition using the
-integer-valued 'YY_START' macro.  For example, the above assignments to
-'comment_caller' could instead be written
+integer-valued ‘YY_START’ macro.  For example, the above assignments to
+‘comment_caller’ could instead be written
 
          comment_caller = YY_START;
 
-   Flex provides 'YYSTATE' as an alias for 'YY_START' (since that is
-what's used by AT&T 'lex').
+   Flex provides ‘YYSTATE’ as an alias for ‘YY_START’ (since that is
+what's used by AT&T ‘lex’).
 
    For historical reasons, start conditions do not have their own
 name-space within the generated scanner.  The start condition names are
@@ -1501,14 +1500,14 @@ using exclusive start conditions, including expanded escape sequences
 (but not including checking for a string that's too long):
 
          %x str
-
+     
          %%
                  char string_buf[MAX_STR_CONST];
                  char *string_buf_ptr;
-
-
+     
+     
          \"      string_buf_ptr = string_buf; BEGIN(str);
-
+     
          <str>\"        { /* saw closing quote - all done */
                  BEGIN(INITIAL);
                  *string_buf_ptr = '\0';
@@ -1516,41 +1515,41 @@ using exclusive start conditions, including expanded escape sequences
                   * value to parser
                   */
                  }
-
+     
          <str>\n        {
                  /* error - unterminated string constant */
                  /* generate error message */
                  }
-
+     
          <str>\\[0-7]{1,3} {
                  /* octal escape sequence */
                  int result;
-
+     
                  (void) sscanf( yytext + 1, "%o", &result );
-
+     
                  if ( result > 0xff )
                          /* error, constant is out-of-bounds */
-
+     
                  *string_buf_ptr++ = result;
                  }
-
+     
          <str>\\[0-9]+ {
                  /* generate error - bad escape sequence; something
                   * like '\48' or '\0777777'
                   */
                  }
-
+     
          <str>\\n  *string_buf_ptr++ = '\n';
          <str>\\t  *string_buf_ptr++ = '\t';
          <str>\\r  *string_buf_ptr++ = '\r';
          <str>\\b  *string_buf_ptr++ = '\b';
          <str>\\f  *string_buf_ptr++ = '\f';
-
+     
          <str>\\(.|\n)  *string_buf_ptr++ = yytext[1];
-
+     
          <str>[^\\\n\"]+        {
                  char *yptr = yytext;
-
+     
                  while ( *yptr )
                          *string_buf_ptr++ = *yptr++;
                  }
@@ -1558,13 +1557,13 @@ using exclusive start conditions, including expanded escape sequences
    Often, such as in some of the examples above, you wind up writing a
 whole bunch of rules all preceded by the same start condition(s).  Flex
 makes this a little easier and cleaner by introducing a notion of start
-condition "scope".  A start condition scope is begun with:
+condition “scope”.  A start condition scope is begun with:
 
          <SCs>{
 
-   where '<SCs>' is a list of one or more start conditions.  Inside the
-start condition scope, every rule automatically has the prefix '<SCs>'
-applied to it, until a '}' which matches the initial '{'.  So, for
+   where ‘<SCs>’ is a list of one or more start conditions.  Inside the
+start condition scope, every rule automatically has the prefix ‘<SCs>’
+applied to it, until a ‘}’ which matches the initial ‘{’.  So, for
 example,
 
          <ESC>{
@@ -1586,14 +1585,14 @@ example,
    The following routines are available for manipulating stacks of start
 conditions:
 
- -- Function: void yy_push_state ( int 'new_state' )
+ -- Function: void yy_push_state ( int new_state )
      pushes the current start condition onto the top of the start
-     condition stack and switches to 'new_state' as though you had used
-     'BEGIN new_state' (recall that start condition names are also
+     condition stack and switches to ‘new_state’ as though you had used
+     ‘BEGIN new_state’ (recall that start condition names are also
      integers).
 
  -- Function: void yy_pop_state ()
-     pops the top of the stack and switches to it via 'BEGIN'.
+     pops the top of the stack and switches to it via ‘BEGIN’.
 
  -- Function: int yy_top_state ()
      returns the top of the stack without altering the stack's contents.
@@ -1601,8 +1600,8 @@ conditions:
    The start condition stack grows dynamically and so has no built-in
 size limitation.  If memory is exhausted, program execution aborts.
 
-   To use start condition stacks, your scanner must include a '%option
-stack' directive (*note Scanner Options::).
+   To use start condition stacks, your scanner must include a ‘%option
+stack’ directive (*note Scanner Options::).
 
 
 File: flex.info,  Node: Multiple Input Buffers,  Next: EOF,  Prev: Start Conditions,  Up: Top
@@ -1611,48 +1610,48 @@ File: flex.info,  Node: Multiple Input Buffers,  Next: EOF,  Prev: Start Conditi
 *************************
 
 Some scanners (such as those which support "include" files) require
-reading from several input streams.  As 'flex' scanners do a large
+reading from several input streams.  As ‘flex’ scanners do a large
 amount of buffering, one cannot control where the next input will be
-read from by simply writing a 'YY_INPUT()' which is sensitive to the
-scanning context.  'YY_INPUT()' is only called when the scanner reaches
+read from by simply writing a ‘YY_INPUT()’ which is sensitive to the
+scanning context.  ‘YY_INPUT()’ is only called when the scanner reaches
 the end of its buffer, which may be a long time after scanning a
-statement such as an 'include' statement which requires switching the
+statement such as an ‘include’ statement which requires switching the
 input source.
 
-   To negotiate these sorts of problems, 'flex' provides a mechanism for
+   To negotiate these sorts of problems, ‘flex’ provides a mechanism for
 creating and switching between multiple input buffers.  An input buffer
 is created by using:
 
  -- Function: YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size )
 
-   which takes a 'FILE' pointer and a size and creates a buffer
-associated with the given file and large enough to hold 'size'
-characters (when in doubt, use 'YY_BUF_SIZE' for the size).  It returns
-a 'YY_BUFFER_STATE' handle, which may then be passed to other routines
-(see below).  The 'YY_BUFFER_STATE' type is a pointer to an opaque
-'struct yy_buffer_state' structure, so you may safely initialize
-'YY_BUFFER_STATE' variables to '((YY_BUFFER_STATE) 0)' if you wish, and
+   which takes a ‘FILE’ pointer and a size and creates a buffer
+associated with the given file and large enough to hold ‘size’
+characters (when in doubt, use ‘YY_BUF_SIZE’ for the size).  It returns
+a ‘YY_BUFFER_STATE’ handle, which may then be passed to other routines
+(see below).  The ‘YY_BUFFER_STATE’ type is a pointer to an opaque
+‘struct yy_buffer_state’ structure, so you may safely initialize
+‘YY_BUFFER_STATE’ variables to ‘((YY_BUFFER_STATE) 0)’ if you wish, and
 also refer to the opaque structure in order to correctly declare input
 buffers in source files other than that of your scanner.  Note that the
-'FILE' pointer in the call to 'yy_create_buffer' is only used as the
-value of 'yyin' seen by 'YY_INPUT'.  If you redefine 'YY_INPUT()' so it
-no longer uses 'yyin', then you can safely pass a NULL 'FILE' pointer to
-'yy_create_buffer'.  You select a particular buffer to scan from using:
+‘FILE’ pointer in the call to ‘yy_create_buffer’ is only used as the
+value of ‘yyin’ seen by ‘YY_INPUT’.  If you redefine ‘YY_INPUT()’ so it
+no longer uses ‘yyin’, then you can safely pass a NULL ‘FILE’ pointer to
+‘yy_create_buffer’.  You select a particular buffer to scan from using:
 
  -- Function: void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer )
 
    The above function switches the scanner's input buffer so subsequent
-tokens will come from 'new_buffer'.  Note that 'yy_switch_to_buffer()'
-may be used by 'yywrap()' to set things up for continued scanning,
-instead of opening a new file and pointing 'yyin' at it.  If you are
+tokens will come from ‘new_buffer’.  Note that ‘yy_switch_to_buffer()’
+may be used by ‘yywrap()’ to set things up for continued scanning,
+instead of opening a new file and pointing ‘yyin’ at it.  If you are
 looking for a stack of input buffers, then you want to use
-'yypush_buffer_state()' instead of this function.  Note also that
-switching input sources via either 'yy_switch_to_buffer()' or 'yywrap()'
+‘yypush_buffer_state()’ instead of this function.  Note also that
+switching input sources via either ‘yy_switch_to_buffer()’ or ‘yywrap()’
 does _not_ change the start condition.
 
  -- Function: void yy_delete_buffer ( YY_BUFFER_STATE buffer )
 
-   is used to reclaim the storage associated with a buffer.  ('buffer'
+   is used to reclaim the storage associated with a buffer.  (‘buffer’
 can be NULL, in which case the routine does nothing.)  You can also
 clear the current contents of a buffer using:
 
@@ -1661,32 +1660,32 @@ clear the current contents of a buffer using:
    This function pushes the new buffer state onto an internal stack.
 The pushed state becomes the new current state.  The stack is maintained
 by flex and will grow as required.  This function is intended to be used
-instead of 'yy_switch_to_buffer', when you want to change states, but
+instead of ‘yy_switch_to_buffer’, when you want to change states, but
 preserve the current state for later use.
 
  -- Function: void yypop_buffer_state ( )
 
    This function removes the current state from the top of the stack,
-and deletes it by calling 'yy_delete_buffer'.  The next state on the
+and deletes it by calling ‘yy_delete_buffer’.  The next state on the
 stack, if any, becomes the new current state.
 
  -- Function: void yy_flush_buffer ( YY_BUFFER_STATE buffer )
 
    This function discards the buffer's contents, so the next time the
 scanner attempts to match a token from the buffer, it will first fill
-the buffer anew using 'YY_INPUT()'.
+the buffer anew using ‘YY_INPUT()’.
 
  -- Function: YY_BUFFER_STATE yy_new_buffer ( FILE *file, int size )
 
-   is an alias for 'yy_create_buffer()', provided for compatibility with
-the C++ use of 'new' and 'delete' for creating and destroying dynamic
+   is an alias for ‘yy_create_buffer()’, provided for compatibility with
+the C++ use of ‘new’ and ‘delete’ for creating and destroying dynamic
 objects.
 
-   'YY_CURRENT_BUFFER' macro returns a 'YY_BUFFER_STATE' handle to the
+   ‘YY_CURRENT_BUFFER’ macro returns a ‘YY_BUFFER_STATE’ handle to the
 current buffer.  It should not be used as an lvalue.
 
    Here are two examples of using these features for writing a scanner
-which expands include files (the '<<EOF>>' feature is discussed below).
+which expands include files (the ‘<<EOF>>’ feature is discussed below).
 
    This first example uses yypush_buffer_state and yypop_buffer_state.
 Flex maintains the stack internally.
@@ -1697,25 +1696,25 @@ Flex maintains the stack internally.
          %x incl
          %%
          include             BEGIN(incl);
-
+     
          [a-z]+              ECHO;
          [^a-z\n]*\n?        ECHO;
-
+     
          <incl>[ \t]*      /* eat the whitespace */
          <incl>[^ \t\n]+   { /* got the include file name */
                  yyin = fopen( yytext, "r" );
-
+     
                  if ( ! yyin )
                      error( ... );
-
+     
      			yypush_buffer_state(yy_create_buffer( yyin, YY_BUF_SIZE ));
-
+     
                  BEGIN(INITIAL);
                  }
-
+     
          <<EOF>> {
      			yypop_buffer_state();
-
+     
                  if ( !YY_CURRENT_BUFFER )
                      {
                      yyterminate();
@@ -1730,19 +1729,19 @@ letting flex do it).
           * of an include file
           */
          %x incl
-
+     
          %{
          #define MAX_INCLUDE_DEPTH 10
          YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
          int include_stack_ptr = 0;
          %}
-
+     
          %%
          include             BEGIN(incl);
-
+     
          [a-z]+              ECHO;
          [^a-z\n]*\n?        ECHO;
-
+     
          <incl>[ \t]*      /* eat the whitespace */
          <incl>[^ \t\n]+   { /* got the include file name */
                  if ( include_stack_ptr >= MAX_INCLUDE_DEPTH )
@@ -1750,27 +1749,27 @@ letting flex do it).
                      fprintf( stderr, "Includes nested too deeply" );
                      exit( 1 );
                      }
-
+     
                  include_stack[include_stack_ptr++] =
                      YY_CURRENT_BUFFER;
-
+     
                  yyin = fopen( yytext, "r" );
-
+     
                  if ( ! yyin )
                      error( ... );
-
+     
                  yy_switch_to_buffer(
                      yy_create_buffer( yyin, YY_BUF_SIZE ) );
-
+     
                  BEGIN(INITIAL);
                  }
-
+     
          <<EOF>> {
                  if ( --include_stack_ptr == 0 )
                      {
                      yyterminate();
                      }
-
+     
                  else
                      {
                      yy_delete_buffer( YY_CURRENT_BUFFER );
@@ -1782,9 +1781,9 @@ letting flex do it).
    The following routines are available for setting up input buffers for
 scanning in-memory strings instead of files.  All of them create a new
 input buffer for scanning the string, and return a corresponding
-'YY_BUFFER_STATE' handle (which you should delete with
-'yy_delete_buffer()' when done with it).  They also switch to the new
-buffer using 'yy_switch_to_buffer()', so the next call to 'yylex()' will
+‘YY_BUFFER_STATE’ handle (which you should delete with
+‘yy_delete_buffer()’ when done with it).  They also switch to the new
+buffer using ‘yy_switch_to_buffer()’, so the next call to ‘yylex()’ will
 start scanning the string.
 
  -- Function: YY_BUFFER_STATE yy_scan_string ( const char *str )
@@ -1792,24 +1791,24 @@ start scanning the string.
 
  -- Function: YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len
           )
-     scans 'len' bytes (including possibly 'NUL's) starting at location
-     'bytes'.
+     scans ‘len’ bytes (including possibly ‘NUL’s) starting at location
+     ‘bytes’.
 
    Note that both of these functions create and scan a _copy_ of the
-string or bytes.  (This may be desirable, since 'yylex()' modifies the
+string or bytes.  (This may be desirable, since ‘yylex()’ modifies the
 contents of the buffer it is scanning.)  You can avoid the copy by
 using:
 
  -- Function: YY_BUFFER_STATE yy_scan_buffer (char *base, yy_size_t
           size)
-     which scans in place the buffer starting at 'base', consisting of
-     'size' bytes, the last two bytes of which _must_ be
-     'YY_END_OF_BUFFER_CHAR' (ASCII NUL). These last two bytes are not
-     scanned; thus, scanning consists of 'base[0]' through
-     'base[size-2]', inclusive.
+     which scans in place the buffer starting at ‘base’, consisting of
+     ‘size’ bytes, the last two bytes of which _must_ be
+     ‘YY_END_OF_BUFFER_CHAR’ (ASCII NUL). These last two bytes are not
+     scanned; thus, scanning consists of ‘base[0]’ through
+     ‘base[size-2]’, inclusive.
 
-   If you fail to set up 'base' in this manner (i.e., forget the final
-two 'YY_END_OF_BUFFER_CHAR' bytes), then 'yy_scan_buffer()' returns a
+   If you fail to set up ‘base’ in this manner (i.e., forget the final
+two ‘YY_END_OF_BUFFER_CHAR’ bytes), then ‘yy_scan_buffer()’ returns a
 NULL pointer instead of creating a new input buffer.
 
  -- Data type: yy_size_t
@@ -1822,20 +1821,20 @@ File: flex.info,  Node: EOF,  Next: Misc Macros,  Prev: Multiple Input Buffers,
 12 End-of-File Rules
 ********************
 
-The special rule '<<EOF>>' indicates actions which are to be taken when
-an end-of-file is encountered and 'yywrap()' returns non-zero (i.e.,
+The special rule ‘<<EOF>>’ indicates actions which are to be taken when
+an end-of-file is encountered and ‘yywrap()’ returns non-zero (i.e.,
 indicates no further files to process).  The action must finish by doing
 one of the following things:
 
-   * assigning 'yyin' to a new input file (in previous versions of
-     'flex', after doing the assignment you had to call the special
-     action 'YY_NEW_FILE'.  This is no longer necessary.)
+   • assigning ‘yyin’ to a new input file (in previous versions of
+     ‘flex’, after doing the assignment you had to call the special
+     action ‘YY_NEW_FILE’.  This is no longer necessary.)
 
-   * executing a 'return' statement;
+   • executing a ‘return’ statement;
 
-   * executing the special 'yyterminate()' action.
+   • executing the special ‘yyterminate()’ action.
 
-   * or, switching to a new buffer using 'yy_switch_to_buffer()' as
+   • or, switching to a new buffer using ‘yy_switch_to_buffer()’ as
      shown in the example above.
 
    <<EOF>> rules may not be used with other patterns; they may only be
@@ -1851,9 +1850,9 @@ An example:
 
          %x quote
          %%
-
+     
          ...other rules for dealing with quotes...
-
+     
          <quote><<EOF>>   {
                   error( "unterminated quote" );
                   yyterminate();
@@ -1871,57 +1870,57 @@ File: flex.info,  Node: Misc Macros,  Next: User Values,  Prev: EOF,  Up: Top
 13 Miscellaneous Macros
 ***********************
 
-The macro 'YY_USER_ACTION' can be defined to provide an action which is
+The macro ‘YY_USER_ACTION’ can be defined to provide an action which is
 always executed prior to the matched rule's action.  For example, it
 could be #define'd to call a routine to convert yytext to lower-case.
-When 'YY_USER_ACTION' is invoked, the variable 'yy_act' gives the number
+When ‘YY_USER_ACTION’ is invoked, the variable ‘yy_act’ gives the number
 of the matched rule (rules are numbered starting with 1).  Suppose you
 want to profile how often each of your rules is matched.  The following
 would do the trick:
 
          #define YY_USER_ACTION ++ctr[yy_act]
 
-   where 'ctr' is an array to hold the counts for the different rules.
-Note that the macro 'YY_NUM_RULES' gives the total number of rules
-(including the default rule), even if you use '-s)', so a correct
-declaration for 'ctr' is:
+   where ‘ctr’ is an array to hold the counts for the different rules.
+Note that the macro ‘YY_NUM_RULES’ gives the total number of rules
+(including the default rule), even if you use ‘-s)’, so a correct
+declaration for ‘ctr’ is:
 
          int ctr[YY_NUM_RULES];
 
-   The macro 'YY_USER_INIT' may be defined to provide an action which is
+   The macro ‘YY_USER_INIT’ may be defined to provide an action which is
 always executed before the first scan (and before the scanner's internal
 initializations are done).  For example, it could be used to call a
 routine to read in a data table or open a logging file.
 
-   The macro 'yy_set_interactive(is_interactive)' can be used to control
-whether the current buffer is considered "interactive".  An interactive
+   The macro ‘yy_set_interactive(is_interactive)’ can be used to control
+whether the current buffer is considered “interactive”.  An interactive
 buffer is processed more slowly, but must be used when the scanner's
 input source is indeed interactive to avoid problems due to waiting to
-fill buffers (see the discussion of the '-I' flag in *note Scanner
+fill buffers (see the discussion of the ‘-I’ flag in *note Scanner
 Options::).  A non-zero value in the macro invocation marks the buffer
 as interactive, a zero value as non-interactive.  Note that use of this
-macro overrides '%option always-interactive' or '%option
-never-interactive' (*note Scanner Options::).  'yy_set_interactive()'
+macro overrides ‘%option always-interactive’ or ‘%option
+never-interactive’ (*note Scanner Options::).  ‘yy_set_interactive()’
 must be invoked prior to beginning to scan the buffer that is (or is
 not) to be considered interactive.
 
-   The macro 'yy_set_bol(at_bol)' can be used to control whether the
+   The macro ‘yy_set_bol(at_bol)’ can be used to control whether the
 current buffer's scanning context for the next token match is done as
 though at the beginning of a line.  A non-zero macro argument makes
-rules anchored with '^' active, while a zero argument makes '^' rules
+rules anchored with ‘^’ active, while a zero argument makes ‘^’ rules
 inactive.
 
-   The macro 'YY_AT_BOL()' returns true if the next token scanned from
-the current buffer will have '^' rules active, false otherwise.
+   The macro ‘YY_AT_BOL()’ returns true if the next token scanned from
+the current buffer will have ‘^’ rules active, false otherwise.
 
    In the generated scanner, the actions are all gathered in one large
-switch statement and separated using 'YY_BREAK', which may be redefined.
-By default, it is simply a 'break', to separate each rule's action from
-the following rule's.  Redefining 'YY_BREAK' allows, for example, C++
+switch statement and separated using ‘YY_BREAK’, which may be redefined.
+By default, it is simply a ‘break’, to separate each rule's action from
+the following rule's.  Redefining ‘YY_BREAK’ allows, for example, C++
 users to #define YY_BREAK to do nothing (while being very careful that
-every rule ends with a 'break' or a 'return'!)  to avoid suffering from
+every rule ends with a ‘break’ or a ‘return’!)  to avoid suffering from
 unreachable statement warnings where because a rule's action ends with
-'return', the 'YY_BREAK' is inaccessible.
+‘return’, the ‘YY_BREAK’ is inaccessible.
 
 
 File: flex.info,  Node: User Values,  Next: Yacc,  Prev: Misc Macros,  Up: Top
@@ -1932,52 +1931,52 @@ File: flex.info,  Node: User Values,  Next: Yacc,  Prev: Misc Macros,  Up: Top
 This chapter summarizes the various values available to the user in the
 rule actions.
 
-'char *yytext'
+‘char *yytext’
      holds the text of the current token.  It may be modified but not
      lengthened (you cannot append characters to the end).
 
-     If the special directive '%array' appears in the first section of
-     the scanner description, then 'yytext' is instead declared 'char
-     yytext[YYLMAX]', where 'YYLMAX' is a macro definition that you can
+     If the special directive ‘%array’ appears in the first section of
+     the scanner description, then ‘yytext’ is instead declared ‘char
+     yytext[YYLMAX]’, where ‘YYLMAX’ is a macro definition that you can
      redefine in the first section if you don't like the default value
-     (generally 8KB). Using '%array' results in somewhat slower
-     scanners, but the value of 'yytext' becomes immune to calls to
-     'unput()', which potentially destroy its value when 'yytext' is a
-     character pointer.  The opposite of '%array' is '%pointer', which
+     (generally 8KB). Using ‘%array’ results in somewhat slower
+     scanners, but the value of ‘yytext’ becomes immune to calls to
+     ‘unput()’, which potentially destroy its value when ‘yytext’ is a
+     character pointer.  The opposite of ‘%array’ is ‘%pointer’, which
      is the default.
 
-     You cannot use '%array' when generating C++ scanner classes (the
-     '-+' flag).
+     You cannot use ‘%array’ when generating C++ scanner classes (the
+     ‘-+’ flag).
 
-'int yyleng'
+‘int yyleng’
      holds the length of the current token.
 
-'FILE *yyin'
-     is the file which by default 'flex' reads from.  It may be
+‘FILE *yyin’
+     is the file which by default ‘flex’ reads from.  It may be
      redefined but doing so only makes sense before scanning begins or
      after an EOF has been encountered.  Changing it in the midst of
-     scanning will have unexpected results since 'flex' buffers its
-     input; use 'yyrestart()' instead.  Once scanning terminates because
-     an end-of-file has been seen, you can assign 'yyin' at the new
+     scanning will have unexpected results since ‘flex’ buffers its
+     input; use ‘yyrestart()’ instead.  Once scanning terminates because
+     an end-of-file has been seen, you can assign ‘yyin’ at the new
      input file and then call the scanner again to continue scanning.
 
-'void yyrestart( FILE *new_file )'
-     may be called to point 'yyin' at the new input file.  The
+‘void yyrestart( FILE *new_file )’
+     may be called to point ‘yyin’ at the new input file.  The
      switch-over to the new file is immediate (any previously
-     buffered-up input is lost).  Note that calling 'yyrestart()' with
-     'yyin' as an argument thus throws away the current input buffer and
+     buffered-up input is lost).  Note that calling ‘yyrestart()’ with
+     ‘yyin’ as an argument thus throws away the current input buffer and
      continues scanning the same input file.
 
-'FILE *yyout'
-     is the file to which 'ECHO' actions are done.  It can be reassigned
+‘FILE *yyout’
+     is the file to which ‘ECHO’ actions are done.  It can be reassigned
      by the user.
 
-'YY_CURRENT_BUFFER'
-     returns a 'YY_BUFFER_STATE' handle to the current buffer.
+‘YY_CURRENT_BUFFER’
+     returns a ‘YY_BUFFER_STATE’ handle to the current buffer.
 
-'YY_START'
+‘YY_START’
      returns an integer value corresponding to the current start
-     condition.  You can subsequently use this value with 'BEGIN' to
+     condition.  You can subsequently use this value with ‘BEGIN’ to
      return to that start condition.
 
 
@@ -1986,23 +1985,23 @@ File: flex.info,  Node: Yacc,  Next: Scanner Options,  Prev: User Values,  Up: T
 15 Interfacing with Yacc
 ************************
 
-One of the main uses of 'flex' is as a companion to the 'yacc'
-parser-generator.  'yacc' parsers expect to call a routine named
-'yylex()' to find the next input token.  The routine is supposed to
+One of the main uses of ‘flex’ is as a companion to the ‘yacc’
+parser-generator.  ‘yacc’ parsers expect to call a routine named
+‘yylex()’ to find the next input token.  The routine is supposed to
 return the type of the next token as well as putting any associated
-value in the global 'yylval'.  To use 'flex' with 'yacc', one specifies
-the '-d' option to 'yacc' to instruct it to generate the file 'y.tab.h'
-containing definitions of all the '%tokens' appearing in the 'yacc'
-input.  This file is then included in the 'flex' scanner.  For example,
-if one of the tokens is 'TOK_NUMBER', part of the scanner might look
+value in the global ‘yylval’.  To use ‘flex’ with ‘yacc’, one specifies
+the ‘-d’ option to ‘yacc’ to instruct it to generate the file ‘y.tab.h’
+containing definitions of all the ‘%tokens’ appearing in the ‘yacc’
+input.  This file is then included in the ‘flex’ scanner.  For example,
+if one of the tokens is ‘TOK_NUMBER’, part of the scanner might look
 like:
 
          %{
          #include "y.tab.h"
          %}
-
+     
          %%
-
+     
          [0-9]+        yylval = atoi( yytext ); return TOK_NUMBER;
 
 
@@ -2011,18 +2010,18 @@ File: flex.info,  Node: Scanner Options,  Next: Performance,  Prev: Yacc,  Up: T
 16 Scanner Options
 ******************
 
-The various 'flex' options are categorized by function in the following
+The various ‘flex’ options are categorized by function in the following
 menu.  If you want to lookup a particular option by name, *Note Index of
 Scanner Options::.
 
 * Menu:
 
-* Options for Specifying Filenames::  
-* Options Affecting Scanner Behavior::  
-* Code-Level And API Options::  
-* Options for Scanner Speed and Size::  
-* Debugging Options::           
-* Miscellaneous Options::       
+* Options for Specifying Filenames::
+* Options Affecting Scanner Behavior::
+* Code-Level And API Options::
+* Options for Scanner Speed and Size::
+* Debugging Options::
+* Miscellaneous Options::
 
    Even though there are many scanner options, a typical scanner might
 only specify the following options:
@@ -2038,41 +2037,41 @@ flex to track line numbers.  The last line tells flex what to name the
 files.  (The options can be specified in any order.  We just divided
 them.)
 
-   'flex' also provides a mechanism for controlling options within the
+   ‘flex’ also provides a mechanism for controlling options within the
 scanner specification itself, rather than from the flex command-line.
-This is done by including '%option' directives in the first section of
+This is done by including ‘%option’ directives in the first section of
 the scanner specification.  You can specify multiple options with a
-single '%option' directive, and multiple directives in the first section
+single ‘%option’ directive, and multiple directives in the first section
 of your flex input file.
 
    Most options are given simply as names, optionally preceded by the
-word 'no' (with no intervening whitespace) to negate their meaning.  The
+word ‘no’ (with no intervening whitespace) to negate their meaning.  The
 names are the same as their long-option equivalents (but without the
-leading '--' ).
+leading ‘--’ ).
 
-   'flex' scans your rule actions to determine whether you use the
-'REJECT' or 'yymore()' features.  The 'REJECT' and 'yymore' options are
+   ‘flex’ scans your rule actions to determine whether you use the
+‘REJECT’ or ‘yymore()’ features.  The ‘REJECT’ and ‘yymore’ options are
 available to override its decision as to whether you use the options,
-either by setting them (e.g., '%option reject)' to indicate the feature
+either by setting them (e.g., ‘%option reject)’ to indicate the feature
 is indeed used, or unsetting them to indicate it actually is not used
-(e.g., '%option noyymore)'.
+(e.g., ‘%option noyymore)’.
 
    A number of options are available for lint purists who want to
 suppress the appearance of unneeded routines in the generated scanner.
-Each of the following, if unset (e.g., '%option nounput'), results in
+Each of the following, if unset (e.g., ‘%option nounput’), results in
 the corresponding routine not appearing in the generated scanner:
 
          input, unput
          yy_push_state, yy_pop_state, yy_top_state
          yy_scan_buffer, yy_scan_bytes, yy_scan_string
-
+     
          yyget_extra, yyset_extra, yyget_leng, yyget_text,
          yyget_lineno, yyset_lineno, yyget_in, yyset_in,
          yyget_out, yyset_out, yyget_lval, yyset_lval,
          yyget_lloc, yyset_lloc, yyget_debug, yyset_debug
 
-   (though 'yy_push_state()' and friends won't appear anyway unless you
-use '%option stack)'.
+   (though ‘yy_push_state()’ and friends won't appear anyway unless you
+use ‘%option stack)’.
 
 
 File: flex.info,  Node: Options for Specifying Filenames,  Next: Options Affecting Scanner Behavior,  Prev: Scanner Options,  Up: Scanner Options
@@ -2080,42 +2079,42 @@ File: flex.info,  Node: Options for Specifying Filenames,  Next: Options Affecti
 16.1 Options for Specifying Filenames
 =====================================
 
-'--header-file=FILE, '%option header-file="FILE"''
-     instructs flex to write a C header to 'FILE'.  This file contains
+‘--header-file=FILE, ‘%option header-file="FILE"’’
+     instructs flex to write a C header to ‘FILE’.  This file contains
      function prototypes, extern variables, and types used by the
      scanner.  Only the external API is exported by the header file.
      Many macros that are usable from within scanner actions are not
      exported to the header file.  This is due to namespace problems and
      the goal of a clean external API.
 
-     While in the header, the macro 'yyIN_HEADER' is defined, where 'yy'
+     While in the header, the macro ‘yyIN_HEADER’ is defined, where ‘yy’
      is substituted with the appropriate prefix.
 
-     The '--header-file' option is not compatible with the '--c++'
+     The ‘--header-file’ option is not compatible with the ‘--c++’
      option, since the C++ scanner provides its own header in
-     'yyFlexLexer.h'.
+     ‘yyFlexLexer.h’.
 
-'-oFILE, --outfile=FILE, '%option outfile="FILE"''
-     directs flex to write the scanner to the file 'FILE' instead of
-     'lex.yy.c'.  If you combine '--outfile' with the '--stdout' option,
-     then the scanner is written to 'stdout' but its '#line' directives
-     (see the '-l' option above) refer to the file 'FILE'.
+‘-oFILE, --outfile=FILE, ‘%option outfile="FILE"’’
+     directs flex to write the scanner to the file ‘FILE’ instead of
+     ‘lex.yy.c’.  If you combine ‘--outfile’ with the ‘--stdout’ option,
+     then the scanner is written to ‘stdout’ but its ‘#line’ directives
+     (see the ‘-l’ option above) refer to the file ‘FILE’.
 
-'-t, --stdout, '%option stdout''
-     instructs 'flex' to write the scanner it generates to standard
-     output instead of 'lex.yy.c'.
+‘-t, --stdout, ‘%option stdout’’
+     instructs ‘flex’ to write the scanner it generates to standard
+     output instead of ‘lex.yy.c’.
 
-'-SFILE, --skel=FILE'
-     overrides the default skeleton file from which 'flex' constructs
+‘-SFILE, --skel=FILE’
+     overrides the default skeleton file from which ‘flex’ constructs
      its scanners.  You'll never need this option unless you are doing
-     'flex' maintenance or development.
+     ‘flex’ maintenance or development.
 
-'--tables-file=FILE'
+‘--tables-file=FILE’
      Write serialized scanner dfa tables to FILE. The generated scanner
      will not contain the tables, and requires them to be loaded at
      runtime.  *Note serialization::.
 
-'--tables-verify'
+‘--tables-verify’
      This option is for flex development.  We document it here in case
      you stumble upon it by accident or in case you suspect some
      inconsistency in the serialized tables.  Flex will serialize the
@@ -2130,34 +2129,34 @@ File: flex.info,  Node: Options Affecting Scanner Behavior,  Next: Code-Level An
 16.2 Options Affecting Scanner Behavior
 =======================================
 
-'-i, --case-insensitive, '%option case-insensitive''
-     instructs 'flex' to generate a "case-insensitive" scanner.  The
-     case of letters given in the 'flex' input patterns will be ignored,
+‘-i, --case-insensitive, ‘%option case-insensitive’’
+     instructs ‘flex’ to generate a “case-insensitive” scanner.  The
+     case of letters given in the ‘flex’ input patterns will be ignored,
      and tokens in the input will be matched regardless of case.  The
-     matched text given in 'yytext' will have the preserved case (i.e.,
+     matched text given in ‘yytext’ will have the preserved case (i.e.,
      it will not be folded).  For tricky behavior, see *note case and
      character ranges::.
 
-'-l, --lex-compat, '%option lex-compat''
-     turns on maximum compatibility with the original AT&T 'lex'
+‘-l, --lex-compat, ‘%option lex-compat’’
+     turns on maximum compatibility with the original AT&T ‘lex’
      implementation.  Note that this does not mean _full_ compatibility.
      Use of this option costs a considerable amount of performance, and
-     it cannot be used with the '--c++', '--full', '--fast', '-Cf', or
-     '-CF' options.  For details on the compatibilities it provides, see
+     it cannot be used with the ‘--c++’, ‘--full’, ‘--fast’, ‘-Cf’, or
+     ‘-CF’ options.  For details on the compatibilities it provides, see
      *note Lex and Posix::.  This option also results in the name
-     'YY_FLEX_LEX_COMPAT' being '#define''d in the generated scanner.
+     ‘YY_FLEX_LEX_COMPAT’ being ‘#define’'d in the generated scanner.
 
-'-B, --batch, '%option batch''
-     instructs 'flex' to generate a "batch" scanner, the opposite of
-     _interactive_ scanners generated by '--interactive' (see below).
-     In general, you use '-B' when you are _certain_ that your scanner
+‘-B, --batch, ‘%option batch’’
+     instructs ‘flex’ to generate a “batch” scanner, the opposite of
+     _interactive_ scanners generated by ‘--interactive’ (see below).
+     In general, you use ‘-B’ when you are _certain_ that your scanner
      will never be used interactively, and you want to squeeze a
      _little_ more performance out of it.  If your goal is instead to
-     squeeze out a _lot_ more performance, you should be using the '-Cf'
-     or '-CF' options, which turn on '--batch' automatically anyway.
+     squeeze out a _lot_ more performance, you should be using the ‘-Cf’
+     or ‘-CF’ options, which turn on ‘--batch’ automatically anyway.
 
-'-I, --interactive, '%option interactive''
-     instructs 'flex' to generate an interactive scanner.  An
+‘-I, --interactive, ‘%option interactive’’
+     instructs ‘flex’ to generate an interactive scanner.  An
      interactive scanner is one that only looks ahead to decide what
      token has been matched if it absolutely must.  It turns out that
      always looking one extra character ahead, even if the scanner has
@@ -2168,112 +2167,112 @@ File: flex.info,  Node: Options Affecting Scanner Behavior,  Next: Code-Level An
      newline token until they enter _another_ token, which often means
      typing in another whole line.
 
-     'flex' scanners default to 'interactive' unless you use the '-Cf'
-     or '-CF' table-compression options (*note Performance::).  That's
+     ‘flex’ scanners default to ‘interactive’ unless you use the ‘-Cf’
+     or ‘-CF’ table-compression options (*note Performance::).  That's
      because if you're looking for high-performance you should be using
-     one of these options, so if you didn't, 'flex' assumes you'd rather
+     one of these options, so if you didn't, ‘flex’ assumes you'd rather
      trade off a bit of run-time performance for intuitive interactive
-     behavior.  Note also that you _cannot_ use '--interactive' in
-     conjunction with '-Cf' or '-CF'.  Thus, this option is not really
+     behavior.  Note also that you _cannot_ use ‘--interactive’ in
+     conjunction with ‘-Cf’ or ‘-CF’.  Thus, this option is not really
      needed; it is on by default for all those cases in which it is
      allowed.
 
-     You can force a scanner to _not_ be interactive by using '--batch'
+     You can force a scanner to _not_ be interactive by using ‘--batch’
 
-'-7, --7bit, '%option 7bit''
-     instructs 'flex' to generate a 7-bit scanner, i.e., one which can
+‘-7, --7bit, ‘%option 7bit’’
+     instructs ‘flex’ to generate a 7-bit scanner, i.e., one which can
      only recognize 7-bit characters in its input.  The advantage of
-     using '--7bit' is that the scanner's tables can be up to half the
-     size of those generated using the '--8bit'.  The disadvantage is
+     using ‘--7bit’ is that the scanner's tables can be up to half the
+     size of those generated using the ‘--8bit’.  The disadvantage is
      that such scanners often hang or crash if their input contains an
      8-bit character.
 
      Note, however, that unless you generate your scanner using the
-     '-Cf' or '-CF' table compression options, use of '--7bit' will save
+     ‘-Cf’ or ‘-CF’ table compression options, use of ‘--7bit’ will save
      only a small amount of table space, and make your scanner
-     considerably less portable.  'Flex''s default behavior is to
-     generate an 8-bit scanner unless you use the '-Cf' or '-CF', in
-     which case 'flex' defaults to generating 7-bit scanners unless your
+     considerably less portable.  ‘Flex’'s default behavior is to
+     generate an 8-bit scanner unless you use the ‘-Cf’ or ‘-CF’, in
+     which case ‘flex’ defaults to generating 7-bit scanners unless your
      site was always configured to generate 8-bit scanners (as will
      often be the case with non-USA sites).  You can tell whether flex
      generated a 7-bit or an 8-bit scanner by inspecting the flag
-     summary in the '--verbose' output as described above.
+     summary in the ‘--verbose’ output as described above.
 
-     Note that if you use '-Cfe' or '-CFe' 'flex' still defaults to
+     Note that if you use ‘-Cfe’ or ‘-CFe’ ‘flex’ still defaults to
      generating an 8-bit scanner, since usually with these compression
      options full 8-bit tables are not much more expensive than 7-bit
      tables.
 
-'-8, --8bit, '%option 8bit''
-     instructs 'flex' to generate an 8-bit scanner, i.e., one which can
+‘-8, --8bit, ‘%option 8bit’’
+     instructs ‘flex’ to generate an 8-bit scanner, i.e., one which can
      recognize 8-bit characters.  This flag is only needed for scanners
-     generated using '-Cf' or '-CF', as otherwise flex defaults to
+     generated using ‘-Cf’ or ‘-CF’, as otherwise flex defaults to
      generating an 8-bit scanner anyway.
 
-     See the discussion of '--7bit' above for 'flex''s default behavior
+     See the discussion of ‘--7bit’ above for ‘flex’'s default behavior
      and the tradeoffs between 7-bit and 8-bit scanners.
 
-'--default, '%option default''
+‘--default, ‘%option default’’
      generate the default rule.
 
-'--always-interactive, '%option always-interactive''
+‘--always-interactive, ‘%option always-interactive’’
      instructs flex to generate a scanner which always considers its
      input _interactive_.  Normally, on each new input file the scanner
-     calls 'isatty()' in an attempt to determine whether the scanner's
+     calls ‘isatty()’ in an attempt to determine whether the scanner's
      input source is interactive and thus should be read a character at
      a time.  When this option is used, however, then no such call is
      made.
 
-'--never-interactive, '--never-interactive''
+‘--never-interactive, ‘--never-interactive’’
      instructs flex to generate a scanner which never considers its
-     input interactive.  This is the opposite of 'always-interactive'.
+     input interactive.  This is the opposite of ‘always-interactive’.
 
-'-X, --posix, '%option posix''
+‘-X, --posix, ‘%option posix’’
      turns on maximum compatibility with the POSIX 1003.2-1992
-     definition of 'lex'.  Since 'flex' was originally designed to
-     implement the POSIX definition of 'lex' this generally involves
+     definition of ‘lex’.  Since ‘flex’ was originally designed to
+     implement the POSIX definition of ‘lex’ this generally involves
      very few changes in behavior.  At the current writing the known
-     differences between 'flex' and the POSIX standard are:
+     differences between ‘flex’ and the POSIX standard are:
 
-        * In POSIX and AT&T 'lex', the repeat operator, '{}', has lower
-          precedence than concatenation (thus 'ab{3}' yields 'ababab').
+        • In POSIX and AT&T ‘lex’, the repeat operator, ‘{}’, has lower
+          precedence than concatenation (thus ‘ab{3}’ yields ‘ababab’).
           Most POSIX utilities use an Extended Regular Expression (ERE)
           precedence that has the precedence of the repeat operator
-          higher than concatenation (which causes 'ab{3}' to yield
-          'abbb').  By default, 'flex' places the precedence of the
+          higher than concatenation (which causes ‘ab{3}’ to yield
+          ‘abbb’).  By default, ‘flex’ places the precedence of the
           repeat operator higher than concatenation which matches the
           ERE processing of other POSIX utilities.  When either
-          '--posix' or '-l' are specified, 'flex' will use the
+          ‘--posix’ or ‘-l’ are specified, ‘flex’ will use the
           traditional AT&T and POSIX-compliant precedence for the repeat
           operator where concatenation has higher precedence than the
           repeat operator.
 
-'--stack, '%option stack''
+‘--stack, ‘%option stack’’
      enables the use of start condition stacks (*note Start
      Conditions::).
 
-'--stdinit, '%option stdinit''
-     if set (i.e., %option stdinit) initializes 'yyin' and 'yyout' to
-     'stdin' and 'stdout', instead of the default of 'NULL'.  Some
-     existing 'lex' programs depend on this behavior, even though it is
-     not compliant with ANSI C, which does not require 'stdin' and
-     'stdout' to be compile-time constant.  In a reentrant scanner,
+‘--stdinit, ‘%option stdinit’’
+     if set (i.e., %option stdinit) initializes ‘yyin’ and ‘yyout’ to
+     ‘stdin’ and ‘stdout’, instead of the default of ‘NULL’.  Some
+     existing ‘lex’ programs depend on this behavior, even though it is
+     not compliant with ANSI C, which does not require ‘stdin’ and
+     ‘stdout’ to be compile-time constant.  In a reentrant scanner,
      however, this is not a problem since initialization is performed in
-     'yylex_init' at runtime.
+     ‘yylex_init’ at runtime.
 
-'--yylineno, '%option yylineno''
-     directs 'flex' to generate a scanner that maintains the number of
+‘--yylineno, ‘%option yylineno’’
+     directs ‘flex’ to generate a scanner that maintains the number of
      the current line read from its input in the global variable
-     'yylineno'.  This option is implied by '%option lex-compat'.  In a
-     reentrant C scanner, the macro 'yylineno' is accessible regardless
-     of the value of '%option yylineno', however, its value is not
-     modified by 'flex' unless '%option yylineno' is enabled.
+     ‘yylineno’.  This option is implied by ‘%option lex-compat’.  In a
+     reentrant C scanner, the macro ‘yylineno’ is accessible regardless
+     of the value of ‘%option yylineno’, however, its value is not
+     modified by ‘flex’ unless ‘%option yylineno’ is enabled.
 
-'--yywrap, '%option yywrap''
-     if unset (i.e., '--noyywrap)', makes the scanner not call
-     'yywrap()' upon an end-of-file, but simply assume that there are no
-     more files to scan (until the user points 'yyin' at a new file and
-     calls 'yylex()' again).
+‘--yywrap, ‘%option yywrap’’
+     if unset (i.e., ‘--noyywrap)’, makes the scanner not call
+     ‘yywrap()’ upon an end-of-file, but simply assume that there are no
+     more files to scan (until the user points ‘yyin’ at a new file and
+     calls ‘yylex()’ again).
 
 
 File: flex.info,  Node: Code-Level And API Options,  Next: Options for Scanner Speed and Size,  Prev: Options Affecting Scanner Behavior,  Up: Scanner Options
@@ -2281,62 +2280,62 @@ File: flex.info,  Node: Code-Level And API Options,  Next: Options for Scanner S
 16.3 Code-Level And API Options
 ===============================
 
-'--ansi-definitions, '%option ansi-definitions''
+‘--ansi-definitions, ‘%option ansi-definitions’’
      Deprecated, ignored
 
-'--ansi-prototypes, '%option ansi-prototypes''
+‘--ansi-prototypes, ‘%option ansi-prototypes’’
      Deprecated, ignored
 
-'--bison-bridge, '%option bison-bridge''
+‘--bison-bridge, ‘%option bison-bridge’’
      instructs flex to generate a C scanner that is meant to be called
-     by a 'GNU bison' parser.  The scanner has minor API changes for
-     'bison' compatibility.  In particular, the declaration of 'yylex'
-     is modified to take an additional parameter, 'yylval'.  *Note Bison
+     by a ‘GNU bison’ parser.  The scanner has minor API changes for
+     ‘bison’ compatibility.  In particular, the declaration of ‘yylex’
+     is modified to take an additional parameter, ‘yylval’.  *Note Bison
      Bridge::.
 
-'--bison-locations, '%option bison-locations''
-     instruct flex that 'GNU bison' '%locations' are being used.  This
-     means 'yylex' will be passed an additional parameter, 'yylloc'.
-     This option implies '%option bison-bridge'.  *Note Bison Bridge::.
+‘--bison-locations, ‘%option bison-locations’’
+     instruct flex that ‘GNU bison’ ‘%locations’ are being used.  This
+     means ‘yylex’ will be passed an additional parameter, ‘yylloc’.
+     This option implies ‘%option bison-bridge’.  *Note Bison Bridge::.
 
-'-L, --noline, '%option noline''
-     instructs 'flex' not to generate '#line' directives.  Without this
-     option, 'flex' peppers the generated scanner with '#line'
+‘-L, --noline, ‘%option noline’’
+     instructs ‘flex’ not to generate ‘#line’ directives.  Without this
+     option, ‘flex’ peppers the generated scanner with ‘#line’
      directives so error messages in the actions will be correctly
-     located with respect to either the original 'flex' input file (if
-     the errors are due to code in the input file), or 'lex.yy.c' (if
-     the errors are 'flex''s fault - you should report these sorts of
+     located with respect to either the original ‘flex’ input file (if
+     the errors are due to code in the input file), or ‘lex.yy.c’ (if
+     the errors are ‘flex’'s fault - you should report these sorts of
      errors to the email address given in *note Reporting Bugs::).
 
-'-R, --reentrant, '%option reentrant''
+‘-R, --reentrant, ‘%option reentrant’’
      instructs flex to generate a reentrant C scanner.  The generated
      scanner may safely be used in a multi-threaded environment.  The
      API for a reentrant scanner is different than for a non-reentrant
      scanner *note Reentrant::).  Because of the API difference between
-     reentrant and non-reentrant 'flex' scanners, non-reentrant flex
+     reentrant and non-reentrant ‘flex’ scanners, non-reentrant flex
      code must be modified before it is suitable for use with this
-     option.  This option is not compatible with the '--c++' option.
+     option.  This option is not compatible with the ‘--c++’ option.
 
-     The option '--reentrant' does not affect the performance of the
+     The option ‘--reentrant’ does not affect the performance of the
      scanner.
 
-'-+, --c++, '%option c++''
+‘-+, --c++, ‘%option c++’’
      specifies that you want flex to generate a C++ scanner class.
      *Note Cxx::, for details.
 
-'--array, '%option array''
+‘--array, ‘%option array’’
      specifies that you want yytext to be an array instead of a char*
 
-'--pointer, '%option pointer''
-     specify that 'yytext' should be a 'char *', not an array.  This
-     default is 'char *'.
+‘--pointer, ‘%option pointer’’
+     specify that ‘yytext’ should be a ‘char *’, not an array.  This
+     default is ‘char *’.
 
-'-PPREFIX, --prefix=PREFIX, '%option prefix="PREFIX"''
-     changes the default 'yy' prefix used by 'flex' for all
+‘-PPREFIX, --prefix=PREFIX, ‘%option prefix="PREFIX"’’
+     changes the default ‘yy’ prefix used by ‘flex’ for all
      globally-visible variable and function names to instead be
-     'PREFIX'.  For example, '--prefix=foo' changes the name of 'yytext'
-     to 'footext'.  It also changes the name of the default output file
-     from 'lex.yy.c' to 'lex.foo.c'.  Here is a partial list of the
+     ‘PREFIX’.  For example, ‘--prefix=foo’ changes the name of ‘yytext’
+     to ‘footext’.  It also changes the name of the default output file
+     from ‘lex.yy.c’ to ‘lex.foo.c’.  Here is a partial list of the
      names affected:
 
               yy_create_buffer
@@ -2358,39 +2357,39 @@ File: flex.info,  Node: Code-Level And API Options,  Next: Options for Scanner S
               yyrealloc
               yyfree
 
-     (If you are using a C++ scanner, then only 'yywrap' and
-     'yyFlexLexer' are affected.)  Within your scanner itself, you can
+     (If you are using a C++ scanner, then only ‘yywrap’ and
+     ‘yyFlexLexer’ are affected.)  Within your scanner itself, you can
      still refer to the global variables and functions using either
      version of their name; but externally, they have the modified name.
 
-     This option lets you easily link together multiple 'flex' programs
+     This option lets you easily link together multiple ‘flex’ programs
      into the same executable.  Note, though, that using this option
-     also renames 'yywrap()', so you now _must_ either provide your own
+     also renames ‘yywrap()’, so you now _must_ either provide your own
      (appropriately-named) version of the routine for your scanner, or
-     use '%option noyywrap', as linking with '-lfl' no longer provides
+     use ‘%option noyywrap’, as linking with ‘-lfl’ no longer provides
      one for you by default.
 
-'--main, '%option main''
-     directs flex to provide a default 'main()' program for the scanner,
-     which simply calls 'yylex()'.  This option implies 'noyywrap' (see
+‘--main, ‘%option main’’
+     directs flex to provide a default ‘main()’ program for the scanner,
+     which simply calls ‘yylex()’.  This option implies ‘noyywrap’ (see
      below).
 
-'--nounistd, '%option nounistd''
-     suppresses inclusion of the non-ANSI header file 'unistd.h'.  This
-     option is meant to target environments in which 'unistd.h' does not
+‘--nounistd, ‘%option nounistd’’
+     suppresses inclusion of the non-ANSI header file ‘unistd.h’.  This
+     option is meant to target environments in which ‘unistd.h’ does not
      exist.  Be aware that certain options may cause flex to generate
-     code that relies on functions normally found in 'unistd.h', (e.g.
-     'isatty()', 'read()'.)  If you wish to use these functions, you
+     code that relies on functions normally found in ‘unistd.h’, (e.g.
+     ‘isatty()’, ‘read()’.)  If you wish to use these functions, you
      will have to inform your compiler where to find them.  *Note
      option-always-interactive::.  *Note option-read::.
 
-'--yyclass=NAME, '%option yyclass="NAME"''
-     only applies when generating a C++ scanner (the '--c++' option).
-     It informs 'flex' that you have derived 'NAME' as a subclass of
-     'yyFlexLexer', so 'flex' will place your actions in the member
-     function 'foo::yylex()' instead of 'yyFlexLexer::yylex()'.  It also
-     generates a 'yyFlexLexer::yylex()' member function that emits a
-     run-time error (by invoking 'yyFlexLexer::LexerError())' if called.
+‘--yyclass=NAME, ‘%option yyclass="NAME"’’
+     only applies when generating a C++ scanner (the ‘--c++’ option).
+     It informs ‘flex’ that you have derived ‘NAME’ as a subclass of
+     ‘yyFlexLexer’, so ‘flex’ will place your actions in the member
+     function ‘foo::yylex()’ instead of ‘yyFlexLexer::yylex()’.  It also
+     generates a ‘yyFlexLexer::yylex()’ member function that emits a
+     run-time error (by invoking ‘yyFlexLexer::LexerError())’ if called.
      *Note Cxx::.
 
 
@@ -2399,16 +2398,16 @@ File: flex.info,  Node: Options for Scanner Speed and Size,  Next: Debugging Opt
 16.4 Options for Scanner Speed and Size
 =======================================
 
-'-C[aefFmr]'
+‘-C[aefFmr]’
      controls the degree of table compression and, more generally,
      trade-offs between small scanners and fast scanners.
 
-     '-C'
-          A lone '-C' specifies that the scanner tables should be
+     ‘-C’
+          A lone ‘-C’ specifies that the scanner tables should be
           compressed but neither equivalence classes nor
           meta-equivalence classes should be used.
 
-     '-Ca, --align, '%option align''
+     ‘-Ca, --align, ‘%option align’’
           ("align") instructs flex to trade off larger tables in the
           generated scanner for faster performance because the elements
           of the tables are better aligned for memory access and
@@ -2417,10 +2416,10 @@ File: flex.info,  Node: Options for Scanner Speed and Size,  Next: Debugging Opt
           smaller-sized units such as shortwords.  This option can
           quadruple the size of the tables used by your scanner.
 
-     '-Ce, --ecs, '%option ecs''
-          directs 'flex' to construct "equivalence classes", i.e., sets
+     ‘-Ce, --ecs, ‘%option ecs’’
+          directs ‘flex’ to construct “equivalence classes”, i.e., sets
           of characters which have identical lexical properties (for
-          example, if the only appearance of digits in the 'flex' input
+          example, if the only appearance of digits in the ‘flex’ input
           is in the character class "[0-9]" then the digits '0', '1',
           ..., '9' will all be put in the same equivalence class).
           Equivalence classes usually give dramatic reductions in the
@@ -2428,44 +2427,44 @@ File: flex.info,  Node: Options for Scanner Speed and Size,  Next: Debugging Opt
           are pretty cheap performance-wise (one array look-up per
           character scanned).
 
-     '-Cf'
-          specifies that the "full" scanner tables should be generated -
-          'flex' should not compress the tables by taking advantages of
+     ‘-Cf’
+          specifies that the “full” scanner tables should be generated -
+          ‘flex’ should not compress the tables by taking advantages of
           similar transition functions for different states.
 
-     '-CF'
+     ‘-CF’
           specifies that the alternate fast scanner representation
-          (described above under the '--fast' flag) should be used.
-          This option cannot be used with '--c++'.
+          (described above under the ‘--fast’ flag) should be used.
+          This option cannot be used with ‘--c++’.
 
-     '-Cm, --meta-ecs, '%option meta-ecs''
-          directs 'flex' to construct "meta-equivalence classes", which
+     ‘-Cm, --meta-ecs, ‘%option meta-ecs’’
+          directs ‘flex’ to construct “meta-equivalence classes”, which
           are sets of equivalence classes (or characters, if equivalence
           classes are not being used) that are commonly used together.
           Meta-equivalence classes are often a big win when using
           compressed tables, but they have a moderate performance impact
-          (one or two 'if' tests and one array look-up per character
+          (one or two ‘if’ tests and one array look-up per character
           scanned).
 
-     '-Cr, --read, '%option read''
+     ‘-Cr, --read, ‘%option read’’
           causes the generated scanner to _bypass_ use of the standard
-          I/O library ('stdio') for input.  Instead of calling 'fread()'
-          or 'getc()', the scanner will use the 'read()' system call,
+          I/O library (‘stdio’) for input.  Instead of calling ‘fread()’
+          or ‘getc()’, the scanner will use the ‘read()’ system call,
           resulting in a performance gain which varies from system to
           system, but in general is probably negligible unless you are
-          also using '-Cf' or '-CF'.  Using '-Cr' can cause strange
-          behavior if, for example, you read from 'yyin' using 'stdio'
+          also using ‘-Cf’ or ‘-CF’.  Using ‘-Cr’ can cause strange
+          behavior if, for example, you read from ‘yyin’ using ‘stdio’
           prior to calling the scanner (because the scanner will miss
-          whatever text your previous reads left in the 'stdio' input
-          buffer).  '-Cr' has no effect if you define 'YY_INPUT()'
+          whatever text your previous reads left in the ‘stdio’ input
+          buffer).  ‘-Cr’ has no effect if you define ‘YY_INPUT()’
           (*note Generated Scanner::).
 
-     The options '-Cf' or '-CF' and '-Cm' do not make sense together -
+     The options ‘-Cf’ or ‘-CF’ and ‘-Cm’ do not make sense together -
      there is no opportunity for meta-equivalence classes if the table
      is not being compressed.  Otherwise the options may be freely
      mixed, and are cumulative.
 
-     The default setting is '-Cem', which specifies that 'flex' should
+     The default setting is ‘-Cem’, which specifies that ‘flex’ should
      generate equivalence classes and meta-equivalence classes.  This
      setting provides the highest degree of table compression.  You can
      trade off faster-executing scanners at the cost of larger tables
@@ -2485,18 +2484,18 @@ File: flex.info,  Node: Options for Scanner Speed and Size,  Next: Debugging Opt
      and compiled the quickest, so during development you will usually
      want to use the default, maximal compression.
 
-     '-Cfe' is often a good compromise between speed and size for
+     ‘-Cfe’ is often a good compromise between speed and size for
      production scanners.
 
-'-f, --full, '%option full''
-     specifies "fast scanner".  No table compression is done and 'stdio'
+‘-f, --full, ‘%option full’’
+     specifies “fast scanner”.  No table compression is done and ‘stdio’
      is bypassed.  The result is large but fast.  This option is
-     equivalent to '--Cfr'
+     equivalent to ‘--Cfr’
 
-'-F, --fast, '%option fast''
+‘-F, --fast, ‘%option fast’’
      specifies that the _fast_ scanner table representation should be
-     used (and 'stdio' bypassed).  This representation is about as fast
-     as the full table representation '--full', and for some sets of
+     used (and ‘stdio’ bypassed).  This representation is about as fast
+     as the full table representation ‘--full’, and for some sets of
      patterns will be considerably smaller (and for others, larger).  In
      general, if the pattern set contains both _keywords_ and a
      catch-all, _identifier_ rule, such as in the set:
@@ -2510,10 +2509,10 @@ File: flex.info,  Node: Options for Scanner Speed and Size,  Next: Debugging Opt
      then you're better off using the full table representation.  If
      only the _identifier_ rule is present and you then use a hash table
      or some such to detect the keywords, you're better off using
-     '--fast'.
+     ‘--fast’.
 
-     This option is equivalent to '-CFr'.  It cannot be used with
-     '--c++'.
+     This option is equivalent to ‘-CFr’.  It cannot be used with
+     ‘--c++’.
 
 
 File: flex.info,  Node: Debugging Options,  Next: Miscellaneous Options,  Prev: Options for Scanner Speed and Size,  Up: Scanner Options
@@ -2521,20 +2520,20 @@ File: flex.info,  Node: Debugging Options,  Next: Miscellaneous Options,  Prev:
 16.5 Debugging Options
 ======================
 
-'-b, --backup, '%option backup''
-     Generate backing-up information to 'lex.backup'.  This is a list of
+‘-b, --backup, ‘%option backup’’
+     Generate backing-up information to ‘lex.backup’.  This is a list of
      scanner states which require backing up and the input characters on
      which they do so.  By adding rules one can remove backing-up
-     states.  If _all_ backing-up states are eliminated and '-Cf' or
-     '-CF' is used, the generated scanner will run faster (see the
-     '--perf-report' flag).  Only users who wish to squeeze every last
+     states.  If _all_ backing-up states are eliminated and ‘-Cf’ or
+     ‘-CF’ is used, the generated scanner will run faster (see the
+     ‘--perf-report’ flag).  Only users who wish to squeeze every last
      cycle out of their scanners need worry about this option.  (*note
      Performance::).
 
-'-d, --debug, '%option debug''
-     makes the generated scanner run in "debug" mode.  Whenever a
-     pattern is recognized and the global variable 'yy_flex_debug' is
-     non-zero (which is the default), the scanner will write to 'stderr'
+‘-d, --debug, ‘%option debug’’
+     makes the generated scanner run in “debug” mode.  Whenever a
+     pattern is recognized and the global variable ‘yy_flex_debug’ is
+     non-zero (which is the default), the scanner will write to ‘stderr’
      a line of the form:
 
               -accepting rule at line 53 ("the matched text")
@@ -2546,42 +2545,42 @@ File: flex.info,  Node: Debugging Options,  Next: Miscellaneous Options,  Prev:
      NUL; at this point, the two look the same as far as the scanner's
      concerned), or reaches an end-of-file.
 
-'-p, --perf-report, '%option perf-report''
-     generates a performance report to 'stderr'.  The report consists of
-     comments regarding features of the 'flex' input file which will
+‘-p, --perf-report, ‘%option perf-report’’
+     generates a performance report to ‘stderr’.  The report consists of
+     comments regarding features of the ‘flex’ input file which will
      cause a serious loss of performance in the resulting scanner.  If
      you give the flag twice, you will also get comments regarding
      features that lead to minor performance losses.
 
-     Note that the use of 'REJECT', and variable trailing context (*note
+     Note that the use of ‘REJECT’, and variable trailing context (*note
      Limitations::) entails a substantial performance penalty; use of
-     'yymore()', the '^' operator, and the '--interactive' flag entail
+     ‘yymore()’, the ‘^’ operator, and the ‘--interactive’ flag entail
      minor performance penalties.
 
-'-s, --nodefault, '%option nodefault''
+‘-s, --nodefault, ‘%option nodefault’’
      causes the _default rule_ (that unmatched scanner input is echoed
-     to 'stdout)' to be suppressed.  If the scanner encounters input
+     to ‘stdout)’ to be suppressed.  If the scanner encounters input
      that does not match any of its rules, it aborts with an error.
      This option is useful for finding holes in a scanner's rule set.
 
-'-T, --trace, '%option trace''
-     makes 'flex' run in "trace" mode.  It will generate a lot of
-     messages to 'stderr' concerning the form of the input and the
+‘-T, --trace, ‘%option trace’’
+     makes ‘flex’ run in “trace” mode.  It will generate a lot of
+     messages to ‘stderr’ concerning the form of the input and the
      resultant non-deterministic and deterministic finite automata.
-     This option is mostly for use in maintaining 'flex'.
+     This option is mostly for use in maintaining ‘flex’.
 
-'-w, --nowarn, '%option nowarn''
+‘-w, --nowarn, ‘%option nowarn’’
      suppresses warning messages.
 
-'-v, --verbose, '%option verbose''
-     specifies that 'flex' should write to 'stderr' a summary of
+‘-v, --verbose, ‘%option verbose’’
+     specifies that ‘flex’ should write to ‘stderr’ a summary of
      statistics regarding the scanner it generates.  Most of the
-     statistics are meaningless to the casual 'flex' user, but the first
-     line identifies the version of 'flex' (same as reported by
-     '--version'), and the next line the flags used when generating the
+     statistics are meaningless to the casual ‘flex’ user, but the first
+     line identifies the version of ‘flex’ (same as reported by
+     ‘--version’), and the next line the flags used when generating the
      scanner, including those that are on by default.
 
-'--warn, '%option warn''
+‘--warn, ‘%option warn’’
      warn about certain things.  In particular, if the default rule can
      be matched but no default rule has been given, the flex will warn
      you.  We recommend using this option always.
@@ -2592,18 +2591,18 @@ File: flex.info,  Node: Miscellaneous Options,  Prev: Debugging Options,  Up: Sc
 16.6 Miscellaneous Options
 ==========================
 
-'-c'
+‘-c’
      A do-nothing option included for POSIX compliance.
 
-'-h, -?, --help'
-     generates a "help" summary of 'flex''s options to 'stdout' and then
+‘-h, -?, --help’
+     generates a "help" summary of ‘flex’'s options to ‘stdout’ and then
      exits.
 
-'-n'
+‘-n’
      Another do-nothing option included for POSIX compliance.
 
-'-V, --version'
-     prints the version number to 'stdout' and exits.
+‘-V, --version’
+     prints the version number to ‘stdout’ and exits.
 
 
 File: flex.info,  Node: Performance,  Next: Cxx,  Prev: Scanner Options,  Up: Top
@@ -2611,41 +2610,41 @@ File: flex.info,  Node: Performance,  Next: Cxx,  Prev: Scanner Options,  Up: To
 17 Performance Considerations
 *****************************
 
-The main design goal of 'flex' is that it generate high-performance
+The main design goal of ‘flex’ is that it generate high-performance
 scanners.  It has been optimized for dealing well with large sets of
 rules.  Aside from the effects on scanner speed of the table compression
-'-C' options outlined above, there are a number of options/actions which
+‘-C’ options outlined above, there are a number of options/actions which
 degrade performance.  These are, from most expensive to least:
 
          REJECT
          arbitrary trailing context
-
+     
          pattern sets that require backing up
          %option yylineno
          %array
-
+     
          %option interactive
          %option always-interactive
-
+     
          ^ beginning-of-line operator
          yymore()
 
    with the first two all being quite expensive and the last two being
-quite cheap.  Note also that 'unput()' is implemented as a routine call
-that potentially does quite a bit of work, while 'yyless()' is a
+quite cheap.  Note also that ‘unput()’ is implemented as a routine call
+that potentially does quite a bit of work, while ‘yyless()’ is a
 quite-cheap macro.  So if you are just putting back some excess text you
-scanned, use 'yyless()'.
+scanned, use ‘yyless()’.
 
-   'REJECT' should be avoided at all costs when performance is
+   ‘REJECT’ should be avoided at all costs when performance is
 important.  It is a particularly expensive option.
 
-   There is one case when '%option yylineno' can be expensive.  That is
+   There is one case when ‘%option yylineno’ can be expensive.  That is
 when your patterns match long tokens that could _possibly_ contain a
 newline character.  There is no performance penalty for rules that can
 not possibly match newlines, since flex does not need to check them for
-newlines.  In general, you should avoid rules such as '[^f]+', which
+newlines.  In general, you should avoid rules such as ‘[^f]+’, which
 match very long tokens, including newlines, and may possibly match your
-entire file!  A better approach is to separate '[^f]+' into two rules:
+entire file!  A better approach is to separate ‘[^f]+’ into two rules:
 
      %option yylineno
      %%
@@ -2656,7 +2655,7 @@ entire file!  A better approach is to separate '[^f]+' into two rules:
 
    Getting rid of backing up is messy and often may be an enormous
 amount of work for a complicated scanner.  In principal, one begins by
-using the '-b' flag to generate a 'lex.backup' file.  For example, on
+using the ‘-b’ flag to generate a ‘lex.backup’ file.  For example, on
 the input:
 
          %%
@@ -2670,19 +2669,19 @@ the input:
                 2       3
           out-transitions: [ o ]
           jam-transitions: EOF [ \001-n  p-\177 ]
-
+     
          State #8 is non-accepting -
           associated rule line numbers:
                 3
           out-transitions: [ a ]
           jam-transitions: EOF [ \001-`  b-\177 ]
-
+     
          State #9 is non-accepting -
           associated rule line numbers:
                 3
           out-transitions: [ r ]
           jam-transitions: EOF [ \001-q  s-\177 ]
-
+     
          Compressed tables always back up.
 
    The first few lines tell us that there's a scanner state in which it
@@ -2692,19 +2691,19 @@ state occurs when trying to match the rules found at lines 2 and 3 in
 the input file.  If the scanner is in that state and then reads
 something other than an 'o', it will have to back up to find a rule
 which is matched.  With a bit of headscratching one can see that this
-must be the state it's in when it has seen 'fo'.  When this has
-happened, if anything other than another 'o' is seen, the scanner will
-have to back up to simply match the 'f' (by the default rule).
+must be the state it's in when it has seen ‘fo’.  When this has
+happened, if anything other than another ‘o’ is seen, the scanner will
+have to back up to simply match the ‘f’ (by the default rule).
 
    The comment regarding State #8 indicates there's a problem when
-'foob' has been scanned.  Indeed, on any character other than an 'a',
+‘foob’ has been scanned.  Indeed, on any character other than an ‘a’,
 the scanner will have to back up to accept "foo".  Similarly, the
-comment for State #9 concerns when 'fooba' has been scanned and an 'r'
+comment for State #9 concerns when ‘fooba’ has been scanned and an ‘r’
 does not follow.
 
    The final comment reminds us that there's no point going to all the
-trouble of removing backing up from the rules unless we're using '-Cf'
-or '-CF', since there's no performance gain doing so with compressed
+trouble of removing backing up from the rules unless we're using ‘-Cf’
+or ‘-CF’, since there's no performance gain doing so with compressed
 scanners.
 
    The way to remove the backing up is to add "error" rules:
@@ -2712,7 +2711,7 @@ scanners.
          %%
          foo         return TOK_KEYWORD;
          foobar      return TOK_KEYWORD;
-
+     
          fooba       |
          foob        |
          fo          {
@@ -2726,7 +2725,7 @@ using a "catch-all" rule:
          %%
          foo         return TOK_KEYWORD;
          foobar      return TOK_KEYWORD;
-
+     
          [a-z]+      return TOK_ID;
 
    This is usually the best solution when appropriate.
@@ -2735,7 +2734,7 @@ using a "catch-all" rule:
 it's not uncommon to get hundreds of messages.  If one can decipher
 them, though, it often only takes a dozen or so rules to eliminate the
 backing up (though it's easy to make a mistake and have an error rule
-accidentally match a valid token.  A possible future 'flex' feature will
+accidentally match a valid token.  A possible future ‘flex’ feature will
 be to automatically add rules to eliminate backing up).
 
    It's important to keep in mind that you gain the benefits of
@@ -2744,7 +2743,7 @@ up.  Leaving just one means you gain nothing.
 
    _Variable_ trailing context (where both the leading and trailing
 parts do not have a fixed length) entails almost the same performance
-loss as 'REJECT' (i.e., substantial).  So when possible a rule like:
+loss as ‘REJECT’ (i.e., substantial).  So when possible a rule like:
 
          %%
          mouse|rat/(cat|dog)   run();
@@ -2769,15 +2768,15 @@ one that's easier to implement) arises from the fact that the longer the
 tokens matched, the faster the scanner will run.  This is because with
 long tokens the processing of most input characters takes place in the
 (short) inner scanning loop, and does not often have to go through the
-additional work of setting up the scanning environment (e.g., 'yytext')
+additional work of setting up the scanning environment (e.g., ‘yytext’)
 for the action.  Recall the scanner for C comments:
 
          %x comment
          %%
                  int line_num = 1;
-
+     
          "/*"         BEGIN(comment);
-
+     
          <comment>[^*\n]*
          <comment>"*"+[^*/\n]*
          <comment>\n             ++line_num;
@@ -2788,9 +2787,9 @@ for the action.  Recall the scanner for C comments:
          %x comment
          %%
                  int line_num = 1;
-
+     
          "/*"         BEGIN(comment);
-
+     
          <comment>[^*\n]*
          <comment>[^*\n]*\n      ++line_num;
          <comment>"*"+[^*/\n]*
@@ -2803,7 +2802,7 @@ keep the matched text as long as possible.  Note that _adding_ rules
 does _not_ slow down the scanner!  The speed of the scanner is
 independent of the number of rules or (modulo the considerations given
 at the beginning of this section) how complicated the rules are with
-regard to operators such as '*' and '|'.
+regard to operators such as ‘*’ and ‘|’.
 
    A final example in speeding up a scanner: suppose you want to scan
 through a file containing identifiers and keywords, one per line and
@@ -2817,7 +2816,7 @@ natural first approach is:
          ... etc ...
          volatile |
          while    /* it's a keyword */
-
+     
          .|\n     /* it's not a keyword */
 
    To eliminate the back-tracking, introduce a catch-all rule:
@@ -2829,7 +2828,7 @@ natural first approach is:
          ... etc ...
          volatile |
          while    /* it's a keyword */
-
+     
          [a-z]+   |
          .|\n     /* it's not a keyword */
 
@@ -2844,18 +2843,18 @@ recognition of newlines with that of the other tokens:
          ... etc ...
          volatile\n |
          while\n  /* it's a keyword */
-
+     
          [a-z]+\n |
          .|\n     /* it's not a keyword */
 
    One has to be careful here, as we have now reintroduced backing up
 into the scanner.  In particular, while _we_ know that there will never
 be any characters in the input stream other than letters or newlines,
-'flex' can't figure this out, and it will plan for possibly needing to
-back up when it has scanned a token like 'auto' and then the next
+‘flex’ can't figure this out, and it will plan for possibly needing to
+back up when it has scanned a token like ‘auto’ and then the next
 character is something other than a newline or a letter.  Previously it
-would then just match the 'auto' rule and be done, but now it has no
-'auto' rule, only a 'auto\n' rule.  To eliminate the possibility of
+would then just match the ‘auto’ rule and be done, but now it has no
+‘auto’ rule, only a ‘auto\n’ rule.  To eliminate the possibility of
 backing up, we could either duplicate all rules but without final
 newlines, or, since we never expect to encounter such an input and
 therefore don't how it's classified, we can introduce one more catch-all
@@ -2868,21 +2867,21 @@ rule, this one which doesn't include a newline:
          ... etc ...
          volatile\n |
          while\n  /* it's a keyword */
-
+     
          [a-z]+\n |
          [a-z]+   |
          .|\n     /* it's not a keyword */
 
-   Compiled with '-Cf', this is about as fast as one can get a 'flex'
+   Compiled with ‘-Cf’, this is about as fast as one can get a ‘flex’
 scanner to go for this particular problem.
 
-   A final note: 'flex' is slow when matching 'NUL's, particularly when
-a token contains multiple 'NUL's.  It's best to write rules which match
+   A final note: ‘flex’ is slow when matching ‘NUL’s, particularly when
+a token contains multiple ‘NUL’s.  It's best to write rules which match
 _short_ amounts of text if it's anticipated that the text will often
-include 'NUL's.
+include ‘NUL’s.
 
    Another final note regarding performance: as mentioned in *note
-Matching::, dynamically resizing 'yytext' to accommodate huge tokens is
+Matching::, dynamically resizing ‘yytext’ to accommodate huge tokens is
 a slow process because it presently requires that the (huge) token be
 rescanned from the beginning.  Thus if performance is vital, you should
 attempt to match "large" quantities of text but not "huge" quantities,
@@ -2897,158 +2896,158 @@ File: flex.info,  Node: Cxx,  Next: Reentrant,  Prev: Performance,  Up: Top
 *IMPORTANT*: the present form of the scanning class is _experimental_
 and may change considerably between major releases.
 
-   'flex' provides two different ways to generate scanners for use with
-C++.  The first way is to simply compile a scanner generated by 'flex'
+   ‘flex’ provides two different ways to generate scanners for use with
+C++.  The first way is to simply compile a scanner generated by ‘flex’
 using a C++ compiler instead of a C compiler.  You should not encounter
 any compilation errors (*note Reporting Bugs::).  You can then use C++
 code in your rule actions instead of C code.  Note that the default
-input source for your scanner remains 'yyin', and default echoing is
-still done to 'yyout'.  Both of these remain 'FILE *' variables and not
+input source for your scanner remains ‘yyin’, and default echoing is
+still done to ‘yyout’.  Both of these remain ‘FILE *’ variables and not
 C++ _streams_.
 
-   You can also use 'flex' to generate a C++ scanner class, using the
-'-+' option (or, equivalently, '%option c++)', which is automatically
-specified if the name of the 'flex' executable ends in a '+', such as
-'flex++'.  When using this option, 'flex' defaults to generating the
-scanner to the file 'lex.yy.cc' instead of 'lex.yy.c'.  The generated
-scanner includes the header file 'FlexLexer.h', which defines the
+   You can also use ‘flex’ to generate a C++ scanner class, using the
+‘-+’ option (or, equivalently, ‘%option c++)’, which is automatically
+specified if the name of the ‘flex’ executable ends in a '+', such as
+‘flex++’.  When using this option, ‘flex’ defaults to generating the
+scanner to the file ‘lex.yy.cc’ instead of ‘lex.yy.c’.  The generated
+scanner includes the header file ‘FlexLexer.h’, which defines the
 interface to two C++ classes.
 
-   The first class in 'FlexLexer.h', 'FlexLexer', provides an abstract
+   The first class in ‘FlexLexer.h’, ‘FlexLexer’, provides an abstract
 base class defining the general scanner class interface.  It provides
 the following member functions:
 
-'const char* YYText()'
+‘const char* YYText()’
      returns the text of the most recently matched token, the equivalent
-     of 'yytext'.
+     of ‘yytext’.
 
-'int YYLeng()'
+‘int YYLeng()’
      returns the length of the most recently matched token, the
-     equivalent of 'yyleng'.
+     equivalent of ‘yyleng’.
 
-'int lineno() const'
-     returns the current input line number (see '%option yylineno)', or
-     '1' if '%option yylineno' was not used.
+‘int lineno() const’
+     returns the current input line number (see ‘%option yylineno)’, or
+     ‘1’ if ‘%option yylineno’ was not used.
 
-'void set_debug( int flag )'
+‘void set_debug( int flag )’
      sets the debugging flag for the scanner, equivalent to assigning to
-     'yy_flex_debug' (*note Scanner Options::).  Note that you must
-     build the scanner using '%option debug' to include debugging
+     ‘yy_flex_debug’ (*note Scanner Options::).  Note that you must
+     build the scanner using ‘%option debug’ to include debugging
      information in it.
 
-'int debug() const'
+‘int debug() const’
      returns the current setting of the debugging flag.
 
    Also provided are member functions equivalent to
-'yy_switch_to_buffer()', 'yy_create_buffer()' (though the first argument
-is an 'istream&' object reference and not a 'FILE*)',
-'yy_flush_buffer()', 'yy_delete_buffer()', and 'yyrestart()' (again, the
-first argument is a 'istream&' object reference).
+‘yy_switch_to_buffer()’, ‘yy_create_buffer()’ (though the first argument
+is an ‘istream&’ object reference and not a ‘FILE*)’,
+‘yy_flush_buffer()’, ‘yy_delete_buffer()’, and ‘yyrestart()’ (again, the
+first argument is a ‘istream&’ object reference).
 
-   The second class defined in 'FlexLexer.h' is 'yyFlexLexer', which is
-derived from 'FlexLexer'.  It defines the following additional member
+   The second class defined in ‘FlexLexer.h’ is ‘yyFlexLexer’, which is
+derived from ‘FlexLexer’.  It defines the following additional member
 functions:
 
-'yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 )'
-'yyFlexLexer( istream& arg_yyin, ostream& arg_yyout )'
-     constructs a 'yyFlexLexer' object using the given streams for input
-     and output.  If not specified, the streams default to 'cin' and
-     'cout', respectively.  'yyFlexLexer' does not take ownership of its
+‘yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 )’
+‘yyFlexLexer( istream& arg_yyin, ostream& arg_yyout )’
+     constructs a ‘yyFlexLexer’ object using the given streams for input
+     and output.  If not specified, the streams default to ‘cin’ and
+     ‘cout’, respectively.  ‘yyFlexLexer’ does not take ownership of its
      stream arguments.  It's up to the user to ensure the streams
-     pointed to remain alive at least as long as the 'yyFlexLexer'
+     pointed to remain alive at least as long as the ‘yyFlexLexer’
      instance.
 
-'virtual int yylex()'
-     performs the same role is 'yylex()' does for ordinary 'flex'
+‘virtual int yylex()’
+     performs the same role is ‘yylex()’ does for ordinary ‘flex’
      scanners: it scans the input stream, consuming tokens, until a
-     rule's action returns a value.  If you derive a subclass 'S' from
-     'yyFlexLexer' and want to access the member functions and variables
-     of 'S' inside 'yylex()', then you need to use '%option yyclass="S"'
-     to inform 'flex' that you will be using that subclass instead of
-     'yyFlexLexer'.  In this case, rather than generating
-     'yyFlexLexer::yylex()', 'flex' generates 'S::yylex()' (and also
-     generates a dummy 'yyFlexLexer::yylex()' that calls
-     'yyFlexLexer::LexerError()' if called).
+     rule's action returns a value.  If you derive a subclass ‘S’ from
+     ‘yyFlexLexer’ and want to access the member functions and variables
+     of ‘S’ inside ‘yylex()’, then you need to use ‘%option yyclass="S"’
+     to inform ‘flex’ that you will be using that subclass instead of
+     ‘yyFlexLexer’.  In this case, rather than generating
+     ‘yyFlexLexer::yylex()’, ‘flex’ generates ‘S::yylex()’ (and also
+     generates a dummy ‘yyFlexLexer::yylex()’ that calls
+     ‘yyFlexLexer::LexerError()’ if called).
 
-'virtual void switch_streams(istream* new_in = 0, ostream* new_out = 0)'
-'virtual void switch_streams(istream& new_in, ostream& new_out)'
-     reassigns 'yyin' to 'new_in' (if non-null) and 'yyout' to 'new_out'
-     (if non-null), deleting the previous input buffer if 'yyin' is
+‘virtual void switch_streams(istream* new_in = 0, ostream* new_out = 0)’
+‘virtual void switch_streams(istream& new_in, ostream& new_out)’
+     reassigns ‘yyin’ to ‘new_in’ (if non-null) and ‘yyout’ to ‘new_out’
+     (if non-null), deleting the previous input buffer if ‘yyin’ is
      reassigned.
 
-'int yylex( istream* new_in, ostream* new_out = 0 )'
-'int yylex( istream& new_in, ostream& new_out )'
-     first switches the input streams via 'switch_streams( new_in,
-     new_out )' and then returns the value of 'yylex()'.
+‘int yylex( istream* new_in, ostream* new_out = 0 )’
+‘int yylex( istream& new_in, ostream& new_out )’
+     first switches the input streams via ‘switch_streams( new_in,
+     new_out )’ and then returns the value of ‘yylex()’.
 
-   In addition, 'yyFlexLexer' defines the following protected virtual
+   In addition, ‘yyFlexLexer’ defines the following protected virtual
 functions which you can redefine in derived classes to tailor the
 scanner:
 
-'virtual int LexerInput( char* buf, int max_size )'
-     reads up to 'max_size' characters into 'buf' and returns the number
+‘virtual int LexerInput( char* buf, int max_size )’
+     reads up to ‘max_size’ characters into ‘buf’ and returns the number
      of characters read.  To indicate end-of-input, return 0 characters.
-     Note that 'interactive' scanners (see the '-B' and '-I' flags in
-     *note Scanner Options::) define the macro 'YY_INTERACTIVE'.  If you
-     redefine 'LexerInput()' and need to take different actions
+     Note that ‘interactive’ scanners (see the ‘-B’ and ‘-I’ flags in
+     *note Scanner Options::) define the macro ‘YY_INTERACTIVE’.  If you
+     redefine ‘LexerInput()’ and need to take different actions
      depending on whether or not the scanner might be scanning an
      interactive input source, you can test for the presence of this
-     name via '#ifdef' statements.
+     name via ‘#ifdef’ statements.
 
-'virtual void LexerOutput( const char* buf, int size )'
-     writes out 'size' characters from the buffer 'buf', which, while
-     'NUL'-terminated, may also contain internal 'NUL's if the scanner's
-     rules can match text with 'NUL's in them.
+‘virtual void LexerOutput( const char* buf, int size )’
+     writes out ‘size’ characters from the buffer ‘buf’, which, while
+     ‘NUL’-terminated, may also contain internal ‘NUL’s if the scanner's
+     rules can match text with ‘NUL’s in them.
 
-'virtual void LexerError( const char* msg )'
+‘virtual void LexerError( const char* msg )’
      reports a fatal error message.  The default version of this
-     function writes the message to the stream 'cerr' and exits.
+     function writes the message to the stream ‘cerr’ and exits.
 
-   Note that a 'yyFlexLexer' object contains its _entire_ scanning
+   Note that a ‘yyFlexLexer’ object contains its _entire_ scanning
 state.  Thus you can use such objects to create reentrant scanners, but
 see also *note Reentrant::.  You can instantiate multiple instances of
-the same 'yyFlexLexer' class, and you can also combine multiple C++
-scanner classes together in the same program using the '-P' option
+the same ‘yyFlexLexer’ class, and you can also combine multiple C++
+scanner classes together in the same program using the ‘-P’ option
 discussed above.
 
-   Finally, note that the '%array' feature is not available to C++
-scanner classes; you must use '%pointer' (the default).
+   Finally, note that the ‘%array’ feature is not available to C++
+scanner classes; you must use ‘%pointer’ (the default).
 
    Here is an example of a simple C++ scanner:
 
           // An example of using the flex C++ scanner class.
-
+     
          %{
          #include <iostream>
          using namespace std;
          int mylineno = 0;
          %}
-
+     
          %option noyywrap c++
-
+     
          string  \"[^\n"]+\"
-
+     
          ws      [ \t]+
-
+     
          alpha   [A-Za-z]
          dig     [0-9]
          name    ({alpha}|{dig}|\$)({alpha}|{dig}|[_.\-/$])*
          num1    [-+]?{dig}+\.?([eE][-+]?{dig}+)?
          num2    [-+]?{dig}*\.{dig}+([eE][-+]?{dig}+)?
          number  {num1}|{num2}
-
+     
          %%
-
+     
          {ws}    /* skip blanks and tabs */
-
+     
          "/*"    {
                  int c;
-
+     
                  while((c = yyinput()) != 0)
                      {
                      if(c == '\n')
                          ++mylineno;
-
+     
                      else if(c == '*')
                          {
                          if((c = yyinput()) == '/')
@@ -3058,20 +3057,20 @@ scanner classes; you must use '%pointer' (the default).
                          }
                      }
                  }
-
+     
          {number}  cout << "number " << YYText() << '\n';
-
+     
          \n        mylineno++;
-
+     
          {name}    cout << "name " << YYText() << '\n';
-
+     
          {string}  cout << "string " << YYText() << '\n';
-
+     
          %%
-
+     
      	// This include is required if main() is an another source file.
      	//#include <FlexLexer.h>
-
+     
          int main( int /* argc */, char** /* argv */ )
          {
              FlexLexer* lexer = new yyFlexLexer;
@@ -3081,20 +3080,20 @@ scanner classes; you must use '%pointer' (the default).
          }
 
    If you want to create multiple (different) lexer classes, you use the
-'-P' flag (or the 'prefix=' option) to rename each 'yyFlexLexer' to some
-other 'xxFlexLexer'.  You then can include '<FlexLexer.h>' in your other
-sources once per lexer class, first renaming 'yyFlexLexer' as follows:
+‘-P’ flag (or the ‘prefix=’ option) to rename each ‘yyFlexLexer’ to some
+other ‘xxFlexLexer’.  You then can include ‘<FlexLexer.h>’ in your other
+sources once per lexer class, first renaming ‘yyFlexLexer’ as follows:
 
          #undef yyFlexLexer
          #define yyFlexLexer xxFlexLexer
          #include <FlexLexer.h>
-
+     
          #undef yyFlexLexer
          #define yyFlexLexer zzFlexLexer
          #include <FlexLexer.h>
 
-   if, for example, you used '%option prefix="xx"' for one of your
-scanners and '%option prefix="zz"' for the other.
+   if, for example, you used ‘%option prefix="xx"’ for one of your
+scanners and ‘%option prefix="zz"’ for the other.
 
 
 File: flex.info,  Node: Reentrant,  Next: Lex and Posix,  Prev: Cxx,  Up: Top
@@ -3102,21 +3101,21 @@ File: flex.info,  Node: Reentrant,  Next: Lex and Posix,  Prev: Cxx,  Up: Top
 19 Reentrant C Scanners
 ***********************
 
-'flex' has the ability to generate a reentrant C scanner.  This is
-accomplished by specifying '%option reentrant' ('-R') The generated
+‘flex’ has the ability to generate a reentrant C scanner.  This is
+accomplished by specifying ‘%option reentrant’ (‘-R’) The generated
 scanner is both portable, and safe to use in one or more separate
 threads of control.  The most common use for reentrant scanners is from
 within multi-threaded applications.  Any thread may create and execute a
-reentrant 'flex' scanner without the need for synchronization with other
+reentrant ‘flex’ scanner without the need for synchronization with other
 threads.
 
 * Menu:
 
-* Reentrant Uses::              
-* Reentrant Overview::          
-* Reentrant Example::           
-* Reentrant Detail::            
-* Reentrant Functions::         
+* Reentrant Uses::
+* Reentrant Overview::
+* Reentrant Example::
+* Reentrant Detail::
+* Reentrant Functions::
 
 
 File: flex.info,  Node: Reentrant Uses,  Next: Reentrant Overview,  Prev: Reentrant,  Up: Reentrant
@@ -3125,44 +3124,44 @@ File: flex.info,  Node: Reentrant Uses,  Next: Reentrant Overview,  Prev: Reentr
 ================================
 
 However, there are other uses for a reentrant scanner.  For example, you
-could scan two or more files simultaneously to implement a 'diff' at the
+could scan two or more files simultaneously to implement a ‘diff’ at the
 token level (i.e., instead of at the character level):
 
          /* Example of maintaining more than one active scanner. */
-
+     
          do {
              int tok1, tok2;
-
+     
              tok1 = yylex( scanner_1 );
              tok2 = yylex( scanner_2 );
-
+     
              if( tok1 != tok2 )
                  printf("Files are different.");
-
+     
         } while ( tok1 && tok2 );
 
    Another use for a reentrant scanner is recursion.  (Note that a
 recursive scanner can also be created using a non-reentrant scanner and
 buffer states.  *Note Multiple Input Buffers::.)
 
-   The following crude scanner supports the 'eval' command by invoking
+   The following crude scanner supports the ‘eval’ command by invoking
 another instance of itself.
 
          /* Example of recursive invocation. */
-
+     
          %option reentrant
-
+     
          %%
          "eval(".+")"  {
                            yyscan_t scanner;
                            YY_BUFFER_STATE buf;
-
+     
                            yylex_init( &scanner );
                            yytext[yyleng-1] = ' ';
-
+     
                            buf = yy_scan_string( yytext + 5, scanner );
                            yylex( scanner );
-
+     
                            yy_delete_buffer(buf,scanner);
                            yylex_destroy( scanner );
                       }
@@ -3178,20 +3177,20 @@ File: flex.info,  Node: Reentrant Overview,  Next: Reentrant Example,  Prev: Ree
 The API for reentrant scanners is different than for non-reentrant
 scanners.  Here is a quick overview of the API:
 
-     '%option reentrant' must be specified.
+     ‘%option reentrant’ must be specified.
 
-   * All functions take one additional argument: 'yyscanner'
+   • All functions take one additional argument: ‘yyscanner’
 
-   * All global variables are replaced by their macro equivalents.  (We
+   • All global variables are replaced by their macro equivalents.  (We
      tell you this because it may be important to you during debugging.)
 
-   * 'yylex_init' and 'yylex_destroy' must be called before and after
-     'yylex', respectively.
+   • ‘yylex_init’ and ‘yylex_destroy’ must be called before and after
+     ‘yylex’, respectively.
 
-   * Accessor methods (get/set functions) provide access to common
-     'flex' variables.
+   • Accessor methods (get/set functions) provide access to common
+     ‘flex’ variables.
 
-   * User-specific data can be stored in 'yyextra'.
+   • User-specific data can be stored in ‘yyextra’.
 
 
 File: flex.info,  Node: Reentrant Example,  Next: Reentrant Detail,  Prev: Reentrant Overview,  Up: Reentrant
@@ -3201,24 +3200,24 @@ File: flex.info,  Node: Reentrant Example,  Next: Reentrant Detail,  Prev: Reent
 
 First, an example of a reentrant scanner:
          /* This scanner prints "//" comments. */
-
+     
          %option reentrant stack noyywrap
          %x COMMENT
-
+     
          %%
-
+     
          "//"                 yy_push_state( COMMENT, yyscanner);
          .|\n
-
+     
          <COMMENT>\n          yy_pop_state( yyscanner );
          <COMMENT>[^\n]+      fprintf( yyout, "%s\n", yytext);
-
+     
          %%
-
+     
          int main ( int argc, char * argv[] )
          {
              yyscan_t scanner;
-
+     
              yylex_init ( &scanner );
              yylex ( scanner );
              yylex_destroy ( scanner );
@@ -3232,17 +3231,17 @@ File: flex.info,  Node: Reentrant Detail,  Next: Reentrant Functions,  Prev: Ree
 ================================
 
 Here are the things you need to do or know to use the reentrant C API of
-'flex'.
+‘flex’.
 
 * Menu:
 
-* Specify Reentrant::           
-* Extra Reentrant Argument::    
-* Global Replacement::          
-* Init and Destroy Functions::  
-* Accessor Methods::            
-* Extra Data::                  
-* About yyscan_t::              
+* Specify Reentrant::
+* Extra Reentrant Argument::
+* Global Replacement::
+* Init and Destroy Functions::
+* Accessor Methods::
+* Extra Data::
+* About yyscan_t::
 
 
 File: flex.info,  Node: Specify Reentrant,  Next: Extra Reentrant Argument,  Prev: Reentrant Detail,  Up: Reentrant Detail
@@ -3252,10 +3251,10 @@ File: flex.info,  Node: Specify Reentrant,  Next: Extra Reentrant Argument,  Pre
 
 %option reentrant (-reentrant) must be specified.
 
-   Notice that '%option reentrant' is specified in the above example
-(*note Reentrant Example::.  Had this option not been specified, 'flex'
+   Notice that ‘%option reentrant’ is specified in the above example
+(*note Reentrant Example::.  Had this option not been specified, ‘flex’
 would have happily generated a non-reentrant scanner without
-complaining.  You may explicitly specify '%option noreentrant', if you
+complaining.  You may explicitly specify ‘%option noreentrant’, if you
 do _not_ want a reentrant scanner, although it is not necessary.  The
 default is to generate a non-reentrant scanner.
 
@@ -3265,25 +3264,25 @@ File: flex.info,  Node: Extra Reentrant Argument,  Next: Global Replacement,  Pr
 19.4.2 The Extra Argument
 -------------------------
 
-All functions take one additional argument: 'yyscanner'.
+All functions take one additional argument: ‘yyscanner’.
 
-   Notice that the calls to 'yy_push_state' and 'yy_pop_state' both have
-an argument, 'yyscanner' , that is not present in a non-reentrant
-scanner.  Here are the declarations of 'yy_push_state' and
-'yy_pop_state' in the reentrant scanner:
+   Notice that the calls to ‘yy_push_state’ and ‘yy_pop_state’ both have
+an argument, ‘yyscanner’ , that is not present in a non-reentrant
+scanner.  Here are the declarations of ‘yy_push_state’ and
+‘yy_pop_state’ in the reentrant scanner:
 
          static void yy_push_state  ( int new_state , yyscan_t yyscanner ) ;
          static void yy_pop_state  ( yyscan_t yyscanner  ) ;
 
-   Notice that the argument 'yyscanner' appears in the declaration of
-both functions.  In fact, all 'flex' functions in a reentrant scanner
+   Notice that the argument ‘yyscanner’ appears in the declaration of
+both functions.  In fact, all ‘flex’ functions in a reentrant scanner
 have this additional argument.  It is always the last argument in the
-argument list, it is always of type 'yyscan_t' (which is typedef'd to
-'void *') and it is always named 'yyscanner'.  As you may have guessed,
-'yyscanner' is a pointer to an opaque data structure encapsulating the
+argument list, it is always of type ‘yyscan_t’ (which is typedef'd to
+‘void *’) and it is always named ‘yyscanner’.  As you may have guessed,
+‘yyscanner’ is a pointer to an opaque data structure encapsulating the
 current state of the scanner.  For a list of function declarations, see
 *note Reentrant Functions::.  Note that preprocessor macros, such as
-'BEGIN', 'ECHO', and 'REJECT', do not take this additional argument.
+‘BEGIN’, ‘ECHO’, and ‘REJECT’, do not take this additional argument.
 
 
 File: flex.info,  Node: Global Replacement,  Next: Init and Destroy Functions,  Prev: Extra Reentrant Argument,  Up: Reentrant Detail
@@ -3294,11 +3293,11 @@ File: flex.info,  Node: Global Replacement,  Next: Init and Destroy Functions,
 All global variables in traditional flex have been replaced by macro
 equivalents.
 
-   Note that in the above example, 'yyout' and 'yytext' are not plain
+   Note that in the above example, ‘yyout’ and ‘yytext’ are not plain
 variables.  These are macros that will expand to their equivalent
-lvalue.  All of the familiar 'flex' globals have been replaced by their
-macro equivalents.  In particular, 'yytext', 'yyleng', 'yylineno',
-'yyin', 'yyout', 'yyextra', 'yylval', and 'yylloc' are macros.  You may
+lvalue.  All of the familiar ‘flex’ globals have been replaced by their
+macro equivalents.  In particular, ‘yytext’, ‘yyleng’, ‘yylineno’,
+‘yyin’, ‘yyout’, ‘yyextra’, ‘yylval’, and ‘yylloc’ are macros.  You may
 safely use these macros in actions as if they were plain variables.  We
 only tell you this so you don't expect to link to these variables
 externally.  Currently, each macro expands to a member of an internal
@@ -3306,10 +3305,10 @@ struct, e.g.,
 
      #define yytext (((struct yyguts_t*)yyscanner)->yytext_r)
 
-   One important thing to remember about 'yytext' and friends is that
-'yytext' is not a global variable in a reentrant scanner, you can not
+   One important thing to remember about ‘yytext’ and friends is that
+‘yytext’ is not a global variable in a reentrant scanner, you can not
 access it directly from outside an action or from other functions.  You
-must use an accessor method, e.g., 'yyget_text', to accomplish this.
+must use an accessor method, e.g., ‘yyget_text’, to accomplish this.
 (See below).
 
 
@@ -3318,44 +3317,44 @@ File: flex.info,  Node: Init and Destroy Functions,  Next: Accessor Methods,  Pr
 19.4.4 Init and Destroy Functions
 ---------------------------------
 
-'yylex_init' and 'yylex_destroy' must be called before and after
-'yylex', respectively.
+‘yylex_init’ and ‘yylex_destroy’ must be called before and after
+‘yylex’, respectively.
 
          int yylex_init ( yyscan_t * ptr_yy_globals ) ;
          int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t * ptr_yy_globals ) ;
          int yylex ( yyscan_t yyscanner ) ;
          int yylex_destroy ( yyscan_t yyscanner ) ;
 
-   The function 'yylex_init' must be called before calling any other
-function.  The argument to 'yylex_init' is the address of an
-uninitialized pointer to be filled in by 'yylex_init', overwriting any
-previous contents.  The function 'yylex_init_extra' may be used instead,
-taking as its first argument a variable of type 'YY_EXTRA_TYPE'.  See
+   The function ‘yylex_init’ must be called before calling any other
+function.  The argument to ‘yylex_init’ is the address of an
+uninitialized pointer to be filled in by ‘yylex_init’, overwriting any
+previous contents.  The function ‘yylex_init_extra’ may be used instead,
+taking as its first argument a variable of type ‘YY_EXTRA_TYPE’.  See
 the section on yyextra, below, for more details.
 
-   The value stored in 'ptr_yy_globals' should thereafter be passed to
-'yylex' and 'yylex_destroy'.  Flex does not save the argument passed to
-'yylex_init', so it is safe to pass the address of a local pointer to
-'yylex_init' so long as it remains in scope for the duration of all
-calls to the scanner, up to and including the call to 'yylex_destroy'.
+   The value stored in ‘ptr_yy_globals’ should thereafter be passed to
+‘yylex’ and ‘yylex_destroy’.  Flex does not save the argument passed to
+‘yylex_init’, so it is safe to pass the address of a local pointer to
+‘yylex_init’ so long as it remains in scope for the duration of all
+calls to the scanner, up to and including the call to ‘yylex_destroy’.
 
-   The function 'yylex' should be familiar to you by now.  The reentrant
+   The function ‘yylex’ should be familiar to you by now.  The reentrant
 version takes one argument, which is the value returned (via an
-argument) by 'yylex_init'.  Otherwise, it behaves the same as the
-non-reentrant version of 'yylex'.
+argument) by ‘yylex_init’.  Otherwise, it behaves the same as the
+non-reentrant version of ‘yylex’.
 
-   Both 'yylex_init' and 'yylex_init_extra' returns 0 (zero) on success,
+   Both ‘yylex_init’ and ‘yylex_init_extra’ returns 0 (zero) on success,
 or non-zero on failure, in which case errno is set to one of the
 following values:
 
-   * ENOMEM Memory allocation error.  *Note memory-management::.
-   * EINVAL Invalid argument.
+   • ENOMEM Memory allocation error.  *Note memory-management::.
+   • EINVAL Invalid argument.
 
-   The function 'yylex_destroy' should be called to free resources used
-by the scanner.  After 'yylex_destroy' is called, the contents of
-'yyscanner' should not be used.  Of course, there is no need to destroy
-a scanner if you plan to reuse it.  A 'flex' scanner (both reentrant and
-non-reentrant) may be restarted by calling 'yyrestart'.
+   The function ‘yylex_destroy’ should be called to free resources used
+by the scanner.  After ‘yylex_destroy’ is called, the contents of
+‘yyscanner’ should not be used.  Of course, there is no need to destroy
+a scanner if you plan to reuse it.  A ‘flex’ scanner (both reentrant and
+non-reentrant) may be restarted by calling ‘yyrestart’.
 
    Below is an example of a program that creates a scanner, uses it,
 then destroys it when done:
@@ -3364,12 +3363,12 @@ then destroys it when done:
          {
              yyscan_t scanner;
              int tok;
-
+     
              yylex_init(&scanner);
-
+     
              while ((tok=yylex(scanner)) > 0)
                  printf("tok=%d  yytext=%s\n", tok, yyget_text(scanner));
-
+     
              yylex_destroy(scanner);
              return 0;
          }
@@ -3380,17 +3379,17 @@ File: flex.info,  Node: Accessor Methods,  Next: Extra Data,  Prev: Init and Des
 19.4.5 Accessing Variables with Reentrant Scanners
 --------------------------------------------------
 
-Accessor methods (get/set functions) provide access to common 'flex'
+Accessor methods (get/set functions) provide access to common ‘flex’
 variables.
 
    Many scanners that you build will be part of a larger project.
-Portions of your project will need access to 'flex' values, such as
-'yytext'.  In a non-reentrant scanner, these values are global, so there
+Portions of your project will need access to ‘flex’ values, such as
+‘yytext’.  In a non-reentrant scanner, these values are global, so there
 is no problem accessing them.  However, in a reentrant scanner, there
-are no global 'flex' values.  You can not access them directly.
-Instead, you must access 'flex' values using accessor methods (get/set
-functions).  Each accessor method is named 'yyget_NAME' or 'yyset_NAME',
-where 'NAME' is the name of the 'flex' variable you want.  For example:
+are no global ‘flex’ values.  You can not access them directly.
+Instead, you must access ‘flex’ values using accessor methods (get/set
+functions).  Each accessor method is named ‘yyget_NAME’ or ‘yyset_NAME’,
+where ‘NAME’ is the name of the ‘flex’ variable you want.  For example:
 
          /* Set the last character of yytext to NULL. */
          void chop ( yyscan_t scanner )
@@ -3404,7 +3403,7 @@ where 'NAME' is the name of the 'flex' variable you want.  For example:
          %%
          .+\n    { chop( yyscanner );}
 
-   You may find that '%option header-file' is particularly useful for
+   You may find that ‘%option header-file’ is particularly useful for
 generating prototypes of all the accessor functions.  *Note
 option-header::.
 
@@ -3414,7 +3413,7 @@ File: flex.info,  Node: Extra Data,  Next: About yyscan_t,  Prev: Accessor Metho
 19.4.6 Extra Data
 -----------------
 
-User-specific data can be stored in 'yyextra'.
+User-specific data can be stored in ‘yyextra’.
 
    In a reentrant scanner, it is unwise to use global variables to
 communicate with or maintain state between different pieces of your
@@ -3422,23 +3421,23 @@ program.  However, you may need access to external data or invoke
 external functions from within the scanner actions.  Likewise, you may
 need to pass information to your scanner (e.g., open file descriptors,
 or database connections).  In a non-reentrant scanner, the only way to
-do this would be through the use of global variables.  'Flex' allows you
+do this would be through the use of global variables.  ‘Flex’ allows you
 to store arbitrary, "extra" data in a scanner.  This data is accessible
-through the accessor methods 'yyget_extra' and 'yyset_extra' from
-outside the scanner, and through the shortcut macro 'yyextra' from
+through the accessor methods ‘yyget_extra’ and ‘yyset_extra’ from
+outside the scanner, and through the shortcut macro ‘yyextra’ from
 within the scanner itself.  They are defined as follows:
 
          #define YY_EXTRA_TYPE  void*
          YY_EXTRA_TYPE  yyget_extra ( yyscan_t scanner );
          void           yyset_extra ( YY_EXTRA_TYPE arbitrary_data , yyscan_t scanner);
 
-   In addition, an extra form of 'yylex_init' is provided,
-'yylex_init_extra'.  This function is provided so that the yyextra value
+   In addition, an extra form of ‘yylex_init’ is provided,
+‘yylex_init_extra’.  This function is provided so that the yyextra value
 can be accessed from within the very first yyalloc, used to allocate the
 scanner itself.
 
-   By default, 'YY_EXTRA_TYPE' is defined as type 'void *'.  You may
-redefine this type using '%option extra-type="your_type"' in the
+   By default, ‘YY_EXTRA_TYPE’ is defined as type ‘void *’.  You may
+redefine this type using ‘%option extra-type="your_type"’ in the
 scanner:
 
          /* An example of overriding YY_EXTRA_TYPE. */
@@ -3449,7 +3448,7 @@ scanner:
          %option reentrant
          %option extra-type="struct stat *"
          %%
-
+     
          __filesize__     printf( "%ld", yyextra->st_size  );
          __lastmod__      printf( "%ld", yyextra->st_mtime );
          %%
@@ -3458,15 +3457,15 @@ scanner:
              yyscan_t scanner;
              struct stat buf;
              FILE *in;
-
+     
              in = fopen( filename, "r" );
              stat( filename, &buf );
-
+     
              yylex_init_extra( buf, &scanner );
              yyset_in( in, scanner );
              yylex( scanner );
              yylex_destroy( scanner );
-
+     
              fclose( in );
         }
 
@@ -3476,13 +3475,13 @@ File: flex.info,  Node: About yyscan_t,  Prev: Extra Data,  Up: Reentrant Detail
 19.4.7 About yyscan_t
 ---------------------
 
-'yyscan_t' is defined as:
+‘yyscan_t’ is defined as:
 
           typedef void* yyscan_t;
 
-   It is initialized by 'yylex_init()' to point to an internal
+   It is initialized by ‘yylex_init()’ to point to an internal
 structure.  You should never access this value directly.  In particular,
-you should never attempt to free it (use 'yylex_destroy()' instead.)
+you should never attempt to free it (use ‘yylex_destroy()’ instead.)
 
 
 File: flex.info,  Node: Reentrant Functions,  Prev: Reentrant Detail,  Up: Reentrant
@@ -3499,7 +3498,7 @@ The following Functions are available in a reentrant scanner:
          int yyget_lineno ( yyscan_t scanner );
          YY_EXTRA_TYPE yyget_extra ( yyscan_t scanner );
          int  yyget_debug ( yyscan_t scanner );
-
+     
          void yyset_debug ( int flag, yyscan_t scanner );
          void yyset_in  ( FILE * in_str , yyscan_t scanner );
          void yyset_out  ( FILE * out_str , yyscan_t scanner );
@@ -3522,27 +3521,27 @@ scanner:
 
    In a reentrant C scanner, support for yylineno is always present
 (i.e., you may access yylineno), but the value is never modified by
-'flex' unless '%option yylineno' is enabled.  This is to allow the user
-to maintain the line count independently of 'flex'.
+‘flex’ unless ‘%option yylineno’ is enabled.  This is to allow the user
+to maintain the line count independently of ‘flex’.
 
-   The following functions and macros are made available when '%option
-bison-bridge' ('--bison-bridge') is specified:
+   The following functions and macros are made available when ‘%option
+bison-bridge’ (‘--bison-bridge’) is specified:
 
          YYSTYPE * yyget_lval ( yyscan_t scanner );
          void yyset_lval ( YYSTYPE * yylvalp , yyscan_t scanner );
          yylval
 
-   The following functions and macros are made available when '%option
-bison-locations' ('--bison-locations') is specified:
+   The following functions and macros are made available when ‘%option
+bison-locations’ (‘--bison-locations’) is specified:
 
          YYLTYPE *yyget_lloc ( yyscan_t scanner );
          void yyset_lloc ( YYLTYPE * yyllocp , yyscan_t scanner );
          yylloc
 
-   Support for yylval assumes that 'YYSTYPE' is a valid type.  Support
-for yylloc assumes that 'YYSLYPE' is a valid type.  Typically, these
-types are generated by 'bison', and are included in section 1 of the
-'flex' input.
+   Support for yylval assumes that ‘YYSTYPE’ is a valid type.  Support
+for yylloc assumes that ‘YYSLYPE’ is a valid type.  Typically, these
+types are generated by ‘bison’, and are included in section 1 of the
+‘flex’ input.
 
 
 File: flex.info,  Node: Lex and Posix,  Next: Memory Management,  Prev: Reentrant,  Up: Top
@@ -3550,46 +3549,46 @@ File: flex.info,  Node: Lex and Posix,  Next: Memory Management,  Prev: Reentran
 20 Incompatibilities with Lex and Posix
 ***************************************
 
-'flex' is a rewrite of the AT&T Unix _lex_ tool (the two implementations
+‘flex’ is a rewrite of the AT&T Unix _lex_ tool (the two implementations
 do not share any code, though), with some extensions and
 incompatibilities, both of which are of concern to those who wish to
-write scanners acceptable to both implementations.  'flex' is fully
-compliant with the POSIX 'lex' specification, except that when using
-'%pointer' (the default), a call to 'unput()' destroys the contents of
-'yytext', which is counter to the POSIX specification.  In this section
-we discuss all of the known areas of incompatibility between 'flex',
-AT&T 'lex', and the POSIX specification.  'flex''s '-l' option turns on
-maximum compatibility with the original AT&T 'lex' implementation, at
+write scanners acceptable to both implementations.  ‘flex’ is fully
+compliant with the POSIX ‘lex’ specification, except that when using
+‘%pointer’ (the default), a call to ‘unput()’ destroys the contents of
+‘yytext’, which is counter to the POSIX specification.  In this section
+we discuss all of the known areas of incompatibility between ‘flex’,
+AT&T ‘lex’, and the POSIX specification.  ‘flex’'s ‘-l’ option turns on
+maximum compatibility with the original AT&T ‘lex’ implementation, at
 the cost of a major loss in the generated scanner's performance.  We
-note below which incompatibilities can be overcome using the '-l'
-option.  'flex' is fully compatible with 'lex' with the following
+note below which incompatibilities can be overcome using the ‘-l’
+option.  ‘flex’ is fully compatible with ‘lex’ with the following
 exceptions:
 
-   * The undocumented 'lex' scanner internal variable 'yylineno' is not
-     supported unless '-l' or '%option yylineno' is used.
+   • The undocumented ‘lex’ scanner internal variable ‘yylineno’ is not
+     supported unless ‘-l’ or ‘%option yylineno’ is used.
 
-   * 'yylineno' should be maintained on a per-buffer basis, rather than
+   • ‘yylineno’ should be maintained on a per-buffer basis, rather than
      a per-scanner (single global variable) basis.
 
-   * 'yylineno' is not part of the POSIX specification.
+   • ‘yylineno’ is not part of the POSIX specification.
 
-   * The 'input()' routine is not redefinable, though it may be called
+   • The ‘input()’ routine is not redefinable, though it may be called
      to read characters following whatever has been matched by a rule.
-     If 'input()' encounters an end-of-file the normal 'yywrap()'
-     processing is done.  A "real" end-of-file is returned by 'input()'
-     as 'EOF'.
+     If ‘input()’ encounters an end-of-file the normal ‘yywrap()’
+     processing is done.  A "real" end-of-file is returned by ‘input()’
+     as ‘EOF’.
 
-   * Input is instead controlled by defining the 'YY_INPUT()' macro.
+   • Input is instead controlled by defining the ‘YY_INPUT()’ macro.
 
-   * The 'flex' restriction that 'input()' cannot be redefined is in
+   • The ‘flex’ restriction that ‘input()’ cannot be redefined is in
      accordance with the POSIX specification, which simply does not
      specify any way of controlling the scanner's input other than by
-     making an initial assignment to 'yyin'.
+     making an initial assignment to ‘yyin’.
 
-   * The 'unput()' routine is not redefinable.  This restriction is in
+   • The ‘unput()’ routine is not redefinable.  This restriction is in
      accordance with POSIX.
 
-   * 'flex' scanners are not as reentrant as 'lex' scanners.  In
+   • ‘flex’ scanners are not as reentrant as ‘lex’ scanners.  In
      particular, if you have an interactive scanner and an interrupt
      handler which long-jumps out of the scanner, and the scanner is
      subsequently called again, you may get the following message:
@@ -3602,117 +3601,117 @@ exceptions:
 
      Note that this call will throw away any buffered input; usually
      this isn't a problem with an interactive scanner.  *Note
-     Reentrant::, for 'flex''s reentrant API.
+     Reentrant::, for ‘flex’'s reentrant API.
 
-   * Also note that 'flex' C++ scanner classes _are_ reentrant, so if
+   • Also note that ‘flex’ C++ scanner classes _are_ reentrant, so if
      using C++ is an option for you, you should use them instead.  *Note
      Cxx::, and *note Reentrant:: for details.
 
-   * 'output()' is not supported.  Output from the ECHO macro is done to
-     the file-pointer 'yyout' (default 'stdout)'.
+   • ‘output()’ is not supported.  Output from the ECHO macro is done to
+     the file-pointer ‘yyout’ (default ‘stdout)’.
 
-   * 'output()' is not part of the POSIX specification.
+   • ‘output()’ is not part of the POSIX specification.
 
-   * 'lex' does not support exclusive start conditions (%x), though they
+   • ‘lex’ does not support exclusive start conditions (%x), though they
      are in the POSIX specification.
 
-   * When definitions are expanded, 'flex' encloses them in parentheses.
-     With 'lex', the following:
+   • When definitions are expanded, ‘flex’ encloses them in parentheses.
+     With ‘lex’, the following:
 
               NAME    [A-Z][A-Z0-9]*
               %%
               foo{NAME}?      printf( "Found it\n" );
               %%
 
-     will not match the string 'foo' because when the macro is expanded
-     the rule is equivalent to 'foo[A-Z][A-Z0-9]*?' and the precedence
-     is such that the '?' is associated with '[A-Z0-9]*'.  With 'flex',
-     the rule will be expanded to 'foo([A-Z][A-Z0-9]*)?' and so the
-     string 'foo' will match.
+     will not match the string ‘foo’ because when the macro is expanded
+     the rule is equivalent to ‘foo[A-Z][A-Z0-9]*?’ and the precedence
+     is such that the ‘?’ is associated with ‘[A-Z0-9]*’.  With ‘flex’,
+     the rule will be expanded to ‘foo([A-Z][A-Z0-9]*)?’ and so the
+     string ‘foo’ will match.
 
-   * Note that if the definition begins with '^' or ends with '$' then
+   • Note that if the definition begins with ‘^’ or ends with ‘$’ then
      it is _not_ expanded with parentheses, to allow these operators to
      appear in definitions without losing their special meanings.  But
-     the '<s>', '/', and '<<EOF>>' operators cannot be used in a 'flex'
+     the ‘<s>’, ‘/’, and ‘<<EOF>>’ operators cannot be used in a ‘flex’
      definition.
 
-   * Using '-l' results in the 'lex' behavior of no parentheses around
+   • Using ‘-l’ results in the ‘lex’ behavior of no parentheses around
      the definition.
 
-   * The POSIX specification is that the definition be enclosed in
+   • The POSIX specification is that the definition be enclosed in
      parentheses.
 
-   * Some implementations of 'lex' allow a rule's action to begin on a
+   • Some implementations of ‘lex’ allow a rule's action to begin on a
      separate line, if the rule's pattern has trailing whitespace:
 
               %%
               foo|bar<space here>
                 { foobar_action();}
 
-     'flex' does not support this feature.
+     ‘flex’ does not support this feature.
 
-   * The 'lex' '%r' (generate a Ratfor scanner) option is not supported.
+   • The ‘lex’ ‘%r’ (generate a Ratfor scanner) option is not supported.
      It is not part of the POSIX specification.
 
-   * After a call to 'unput()', _yytext_ is undefined until the next
-     token is matched, unless the scanner was built using '%array'.
-     This is not the case with 'lex' or the POSIX specification.  The
-     '-l' option does away with this incompatibility.
+   • After a call to ‘unput()’, _yytext_ is undefined until the next
+     token is matched, unless the scanner was built using ‘%array’.
+     This is not the case with ‘lex’ or the POSIX specification.  The
+     ‘-l’ option does away with this incompatibility.
 
-   * The precedence of the '{,}' (numeric range) operator is different.
-     The AT&T and POSIX specifications of 'lex' interpret 'abc{1,3}' as
-     match one, two, or three occurrences of 'abc'", whereas 'flex'
-     interprets it as "match 'ab' followed by one, two, or three
-     occurrences of 'c'".  The '-l' and '--posix' options do away with
+   • The precedence of the ‘{,}’ (numeric range) operator is different.
+     The AT&T and POSIX specifications of ‘lex’ interpret ‘abc{1,3}’ as
+     match one, two, or three occurrences of ‘abc’", whereas ‘flex’
+     interprets it as "match ‘ab’ followed by one, two, or three
+     occurrences of ‘c’".  The ‘-l’ and ‘--posix’ options do away with
      this incompatibility.
 
-   * The precedence of the '^' operator is different.  'lex' interprets
-     '^foo|bar' as "match either 'foo' at the beginning of a line, or
-     'bar' anywhere", whereas 'flex' interprets it as "match either
-     'foo' or 'bar' if they come at the beginning of a line".  The
+   • The precedence of the ‘^’ operator is different.  ‘lex’ interprets
+     ‘^foo|bar’ as "match either 'foo' at the beginning of a line, or
+     'bar' anywhere", whereas ‘flex’ interprets it as "match either
+     ‘foo’ or ‘bar’ if they come at the beginning of a line".  The
      latter is in agreement with the POSIX specification.
 
-   * The special table-size declarations such as '%a' supported by 'lex'
-     are not required by 'flex' scanners..  'flex' ignores them.
-   * The name 'FLEX_SCANNER' is '#define''d so scanners may be written
-     for use with either 'flex' or 'lex'.  Scanners also include
-     'YY_FLEX_MAJOR_VERSION', 'YY_FLEX_MINOR_VERSION' and
-     'YY_FLEX_SUBMINOR_VERSION' indicating which version of 'flex'
+   • The special table-size declarations such as ‘%a’ supported by ‘lex’
+     are not required by ‘flex’ scanners..  ‘flex’ ignores them.
+   • The name ‘FLEX_SCANNER’ is ‘#define’'d so scanners may be written
+     for use with either ‘flex’ or ‘lex’.  Scanners also include
+     ‘YY_FLEX_MAJOR_VERSION’, ‘YY_FLEX_MINOR_VERSION’ and
+     ‘YY_FLEX_SUBMINOR_VERSION’ indicating which version of ‘flex’
      generated the scanner.  For example, for the 2.5.22 release, these
      defines would be 2, 5 and 22 respectively.  If the version of
-     'flex' being used is a beta version, then the symbol 'FLEX_BETA' is
+     ‘flex’ being used is a beta version, then the symbol ‘FLEX_BETA’ is
      defined.
 
-   * The symbols '[[' and ']]' in the code sections of the input may
+   • The symbols ‘[[’ and ‘]]’ in the code sections of the input may
      conflict with the m4 delimiters.  *Note M4 Dependency::.
 
-   The following 'flex' features are not included in 'lex' or the POSIX
+   The following ‘flex’ features are not included in ‘lex’ or the POSIX
 specification:
 
-   * C++ scanners
-   * %option
-   * start condition scopes
-   * start condition stacks
-   * interactive/non-interactive scanners
-   * yy_scan_string() and friends
-   * yyterminate()
-   * yy_set_interactive()
-   * yy_set_bol()
-   * YY_AT_BOL() <<EOF>>
-   * <*>
-   * YY_DECL
-   * YY_START
-   * YY_USER_ACTION
-   * YY_USER_INIT
-   * #line directives
-   * %{}'s around actions
-   * reentrant C API
-   * multiple actions on a line
-   * almost all of the 'flex' command-line options
+   • C++ scanners
+   • %option
+   • start condition scopes
+   • start condition stacks
+   • interactive/non-interactive scanners
+   • yy_scan_string() and friends
+   • yyterminate()
+   • yy_set_interactive()
+   • yy_set_bol()
+   • YY_AT_BOL() <<EOF>>
+   • <*>
+   • YY_DECL
+   • YY_START
+   • YY_USER_ACTION
+   • YY_USER_INIT
+   • #line directives
+   • %{}'s around actions
+   • reentrant C API
+   • multiple actions on a line
+   • almost all of the ‘flex’ command-line options
 
    The feature "multiple actions on a line" refers to the fact that with
-'flex' you can put multiple actions on the same line, separated with
-semi-colons, while with 'lex', the following:
+‘flex’ you can put multiple actions on the same line, separated with
+semi-colons, while with ‘lex’, the following:
 
          foo    handle_foo(); ++num_foos_seen;
 
@@ -3720,7 +3719,7 @@ semi-colons, while with 'lex', the following:
 
          foo    handle_foo();
 
-   'flex' does not truncate the action.  Actions that are not enclosed
+   ‘flex’ does not truncate the action.  Actions that are not enclosed
 in braces are simply terminated at the end of the line.
 
 
@@ -3734,9 +3733,9 @@ override the default behavior.
 
 * Menu:
 
-* The Default Memory Management::  
-* Overriding The Default Memory Management::  
-* A Note About yytext And Memory::  
+* The Default Memory Management::
+* Overriding The Default Memory Management::
+* A Note About yytext And Memory::
 
 
 File: flex.info,  Node: The Default Memory Management,  Next: Overriding The Default Memory Management,  Prev: Memory Management,  Up: Memory Management
@@ -3748,7 +3747,7 @@ Flex allocates dynamic memory during initialization, and once in a while
 from within a call to yylex().  Initialization takes place during the
 first call to yylex().  Thereafter, flex may reallocate more memory if
 it needs to enlarge a buffer.  As of version 2.5.9 Flex will clean up
-all memory when you call 'yylex_destroy' *Note faq-memory-leak::.
+all memory when you call ‘yylex_destroy’ *Note faq-memory-leak::.
 
    Flex allocates dynamic memory for four purposes, listed below (1)
 
@@ -3763,7 +3762,7 @@ all memory when you call 'yylex_destroy' *Note faq-memory-leak::.
      for this buffer is the length of the longest token expected, in
      bytes, plus a little more.  Flex will allocate a few extra bytes
      for housekeeping.  Currently, to override the size of the input
-     buffer you must '#define YY_BUF_SIZE' to whatever number of bytes
+     buffer you must ‘#define YY_BUF_SIZE’ to whatever number of bytes
      you want.  We don't plan to change this in the near future, but we
      reserve the right to do so if we ever add a more robust memory
      management API.
@@ -3771,7 +3770,7 @@ all memory when you call 'yylex_destroy' *Note faq-memory-leak::.
 64kb for the REJECT state. This will only be allocated if you use REJECT.
      The size is large enough to hold the same number of states as
      characters in the input buffer.  If you override the size of the
-     input buffer (via 'YY_BUF_SIZE'), then you automatically override
+     input buffer (via ‘YY_BUF_SIZE’), then you automatically override
      the size of this buffer as well.
 
 100 bytes for the start condition stack.
@@ -3779,7 +3778,7 @@ all memory when you call 'yylex_destroy' *Note faq-memory-leak::.
      stack used for pushing start states, i.e., with yy_push_state().
      It will grow if necessary.  Since the states are simply integers,
      this stack doesn't consume much memory.  This stack is not present
-     if '%option stack' is not specified.  You will rarely need to tune
+     if ‘%option stack’ is not specified.  You will rarely need to tune
      this buffer.  The ideal size for this stack is the maximum depth
      expected.  The memory for this stack is automatically destroyed
      when you call yylex_destroy().  *Note option-stack::.
@@ -3818,10 +3817,10 @@ File: flex.info,  Node: Overriding The Default Memory Management,  Next: A Note
 21.2 Overriding The Default Memory Management
 =============================================
 
-Flex calls the functions 'yyalloc', 'yyrealloc', and 'yyfree' when it
+Flex calls the functions ‘yyalloc’, ‘yyrealloc’, and ‘yyfree’ when it
 needs to allocate or free memory.  By default, these functions are
-wrappers around the standard C functions, 'malloc', 'realloc', and
-'free', respectively.  You can override the default implementations by
+wrappers around the standard C functions, ‘malloc’, ‘realloc’, and
+‘free’, respectively.  You can override the default implementations by
 telling flex that you will provide your own implementations.
 
    To override the default implementations, you must do two things:
@@ -3829,9 +3828,9 @@ telling flex that you will provide your own implementations.
   1. Suppress the default implementations by specifying one or more of
      the following options:
 
-        * '%option noyyalloc'
-        * '%option noyyrealloc'
-        * '%option noyyfree'.
+        • ‘%option noyyalloc’
+        • ‘%option noyyrealloc’
+        • ‘%option noyyfree’.
 
   2. Provide your own implementation of the following functions: (1)
 
@@ -3839,7 +3838,7 @@ telling flex that you will provide your own implementations.
           void * yyalloc (size_t bytes);
           void * yyrealloc (void * ptr, size_t bytes);
           void   yyfree (void * ptr);
-
+          
           // For a reentrant scanner
           void * yyalloc (size_t bytes, void * yyscanner);
           void * yyrealloc (void * ptr, size_t bytes, void * yyscanner);
@@ -3848,45 +3847,45 @@ telling flex that you will provide your own implementations.
    In the following example, we will override all three memory routines.
 We assume that there is a custom allocator with garbage collection.  In
 order to make this example interesting, we will use a reentrant scanner,
-passing a pointer to the custom allocator through 'yyextra'.
+passing a pointer to the custom allocator through ‘yyextra’.
 
      %{
      #include "some_allocator.h"
      %}
-
+     
      /* Suppress the default implementations. */
      %option noyyalloc noyyrealloc noyyfree
      %option reentrant
-
+     
      /* Initialize the allocator. */
      %{
      #define YY_EXTRA_TYPE  struct allocator*
      #define YY_USER_INIT  yyextra = allocator_create();
      %}
-
+     
      %%
      .|\n   ;
      %%
-
+     
      /* Provide our own implementations. */
      void * yyalloc (size_t bytes, void* yyscanner) {
          return allocator_alloc (yyextra, bytes);
      }
-
+     
      void * yyrealloc (void * ptr, size_t bytes, void* yyscanner) {
          return allocator_realloc (yyextra, bytes);
      }
-
-     void yyfree (void * ptr, void * yyscanner) {
+     
+     void yyfree (void * ptr, void * yyscanner) {      
          /* Do nothing -- we leave it to the garbage collector. */
      }
-
+     
 
    ---------- Footnotes ----------
 
    (1) It is not necessary to override all (or any) of the memory
-management routines.  You may, for example, override 'yyrealloc', but
-not 'yyfree' or 'yyalloc'.
+management routines.  You may, for example, override ‘yyrealloc’, but
+not ‘yyfree’ or ‘yyalloc’.
 
 
 File: flex.info,  Node: A Note About yytext And Memory,  Prev: Overriding The Default Memory Management,  Up: Memory Management
@@ -3894,7 +3893,7 @@ File: flex.info,  Node: A Note About yytext And Memory,  Prev: Overriding The De
 21.3 A Note About yytext And Memory
 ===================================
 
-When flex finds a match, 'yytext' points to the first character of the
+When flex finds a match, ‘yytext’ points to the first character of the
 match in the input buffer.  The string itself is part of the input
 buffer, and is _NOT_ allocated separately.  The value of yytext will be
 overwritten the next time yylex() is called.  In short, the value of
@@ -3919,7 +3918,7 @@ File: flex.info,  Node: Serialized Tables,  Next: Diagnostics,  Prev: Memory Man
 22 Serialized Tables
 ********************
 
-A 'flex' scanner has the ability to save the DFA tables to a file, and
+A ‘flex’ scanner has the ability to save the DFA tables to a file, and
 load them at runtime when needed.  The motivation for this feature is to
 reduce the runtime memory footprint.  Traditionally, these tables have
 been compiled into the scanner as C arrays, and are sometimes quite
@@ -3934,9 +3933,9 @@ finished.
 
 * Menu:
 
-* Creating Serialized Tables::  
-* Loading and Unloading Serialized Tables::  
-* Tables File Format::          
+* Creating Serialized Tables::
+* Loading and Unloading Serialized Tables::
+* Tables File Format::
 
 
 File: flex.info,  Node: Creating Serialized Tables,  Next: Loading and Unloading Serialized Tables,  Prev: Serialized Tables,  Up: Serialized Tables
@@ -3956,8 +3955,8 @@ will not function on its own.  The scanner will be dependent upon the
 serialized tables.  You must load the tables from this file at runtime
 before you can scan anything.
 
-   If you do not specify a filename to '--tables-file', the tables will
-be saved to 'lex.yy.tables', where 'yy' is the appropriate prefix.
+   If you do not specify a filename to ‘--tables-file’, the tables will
+be saved to ‘lex.yy.tables’, where ‘yy’ is the appropriate prefix.
 
    If your project uses several different scanners, you can concatenate
 the serialized tables into one file, and flex will find the correct set
@@ -3968,10 +3967,10 @@ example follows:
      $ flex --tables-file --prefix=c   c.l
      $ cat lex.cpp.tables lex.c.tables  >  all.tables
 
-   The above example created two scanners, 'cpp', and 'c'.  Since we did
-not specify a filename, the tables were serialized to 'lex.c.tables' and
-'lex.cpp.tables', respectively.  Then, we concatenated the two files
-together into 'all.tables', which we will distribute with our project.
+   The above example created two scanners, ‘cpp’, and ‘c’.  Since we did
+not specify a filename, the tables were serialized to ‘lex.c.tables’ and
+‘lex.cpp.tables’, respectively.  Then, we concatenated the two files
+together into ‘all.tables’, which we will distribute with our project.
 At runtime, we will open the file and tell flex to load the tables from
 it.  Flex will find the correct tables automatically.  (See next
 section).
@@ -3982,19 +3981,19 @@ File: flex.info,  Node: Loading and Unloading Serialized Tables,  Next: Tables F
 22.2 Loading and Unloading Serialized Tables
 ============================================
 
-If you've built your scanner with '%option tables-file', then you must
+If you've built your scanner with ‘%option tables-file’, then you must
 load the scanner tables at runtime.  This can be accomplished with the
 following function:
 
  -- Function: int yytables_fload (FILE* FP [, yyscan_t SCANNER])
      Locates scanner tables in the stream pointed to by FP and loads
-     them.  Memory for the tables is allocated via 'yyalloc'.  You must
-     call this function before the first call to 'yylex'.  The argument
+     them.  Memory for the tables is allocated via ‘yyalloc’.  You must
+     call this function before the first call to ‘yylex’.  The argument
      SCANNER only appears in the reentrant scanner.  This function
-     returns '0' (zero) on success, or non-zero on error.
+     returns ‘0’ (zero) on success, or non-zero on error.
 
    The loaded tables are *not* automatically destroyed (unloaded) when
-you call 'yylex_destroy'.  The reason is that you may create several
+you call ‘yylex_destroy’.  The reason is that you may create several
 scanners of the same type (in a reentrant scanner), each of which needs
 access to these tables.  To avoid a nasty memory leak, you must call the
 following function:
@@ -4002,13 +4001,13 @@ following function:
  -- Function: int yytables_destroy ([yyscan_t SCANNER])
      Unloads the scanner tables.  The tables must be loaded again before
      you can scan any more data.  The argument SCANNER only appears in
-     the reentrant scanner.  This function returns '0' (zero) on
+     the reentrant scanner.  This function returns ‘0’ (zero) on
      success, or non-zero on error.
 
-   *The functions 'yytables_fload' and 'yytables_destroy' are not
+   *The functions ‘yytables_fload’ and ‘yytables_destroy’ are not
 thread-safe.*  You must ensure that these functions are called exactly
 once (for each scanner type) in a threaded program, before any thread
-calls 'yylex'.  After the tables are loaded, they are never written to,
+calls ‘yylex’.  After the tables are loaded, they are never written to,
 and no thread protection is required thereafter - until you destroy
 them.
 
@@ -4018,7 +4017,7 @@ File: flex.info,  Node: Tables File Format,  Prev: Loading and Unloading Seriali
 22.3 Tables File Format
 =======================
 
-This section defines the file format of serialized 'flex' tables.
+This section defines the file format of serialized ‘flex’ tables.
 
    The tables format allows for one or more sets of tables to be
 specified, where each set corresponds to a given scanner.  Scanners are
@@ -4068,118 +4067,118 @@ possible.  Remember, _all integer values are in network byte order_.
 
 Fields of a table header:
 
-'th_magic'
+‘th_magic’
      Magic number, always 0xF13C57B1.
 
-'th_hsize'
+‘th_hsize’
      Size of this entire header, in bytes, including all fields plus any
      padding.
 
-'th_ssize'
+‘th_ssize’
      Size of this entire set, in bytes, including the header, all
      tables, plus any padding.
 
-'th_flags'
+‘th_flags’
      Bit flags for this table set.  Currently unused.
 
-'th_version[]'
-     Flex version in NULL-terminated string format.  e.g., '2.5.13a'.
+‘th_version[]’
+     Flex version in NULL-terminated string format.  e.g., ‘2.5.13a’.
      This is the version of flex that was used to create the serialized
      tables.
 
-'th_name[]'
-     Contains the name of this table set.  The default is 'yytables',
-     and is prefixed accordingly, e.g., 'footables'.  Must be
+‘th_name[]’
+     Contains the name of this table set.  The default is ‘yytables’,
+     and is prefixed accordingly, e.g., ‘footables’.  Must be
      NULL-terminated.
 
-'th_pad64[]'
+‘th_pad64[]’
      Zero or more NULL bytes, padding the entire header to the next
      64-bit boundary as calculated from the beginning of the header.
 
 Fields of a table:
 
-'td_id'
+‘td_id’
      Specifies the table identifier.  Possible values are:
-     'YYTD_ID_ACCEPT (0x01)'
-          'yy_accept'
-     'YYTD_ID_BASE (0x02)'
-          'yy_base'
-     'YYTD_ID_CHK (0x03)'
-          'yy_chk'
-     'YYTD_ID_DEF (0x04)'
-          'yy_def'
-     'YYTD_ID_EC (0x05)'
-          'yy_ec '
-     'YYTD_ID_META (0x06)'
-          'yy_meta'
-     'YYTD_ID_NUL_TRANS (0x07)'
-          'yy_NUL_trans'
-     'YYTD_ID_NXT (0x08)'
-          'yy_nxt'.  This array may be two dimensional.  See the
-          'td_hilen' field below.
-     'YYTD_ID_RULE_CAN_MATCH_EOL (0x09)'
-          'yy_rule_can_match_eol'
-     'YYTD_ID_START_STATE_LIST (0x0A)'
-          'yy_start_state_list'.  This array is handled specially
+     ‘YYTD_ID_ACCEPT (0x01)’
+          ‘yy_accept’
+     ‘YYTD_ID_BASE (0x02)’
+          ‘yy_base’
+     ‘YYTD_ID_CHK (0x03)’
+          ‘yy_chk’
+     ‘YYTD_ID_DEF (0x04)’
+          ‘yy_def’
+     ‘YYTD_ID_EC (0x05)’
+          ‘yy_ec ’
+     ‘YYTD_ID_META (0x06)’
+          ‘yy_meta’
+     ‘YYTD_ID_NUL_TRANS (0x07)’
+          ‘yy_NUL_trans’
+     ‘YYTD_ID_NXT (0x08)’
+          ‘yy_nxt’.  This array may be two dimensional.  See the
+          ‘td_hilen’ field below.
+     ‘YYTD_ID_RULE_CAN_MATCH_EOL (0x09)’
+          ‘yy_rule_can_match_eol’
+     ‘YYTD_ID_START_STATE_LIST (0x0A)’
+          ‘yy_start_state_list’.  This array is handled specially
           because it is an array of pointers to structs.  See the
-          'td_flags' field below.
-     'YYTD_ID_TRANSITION (0x0B)'
-          'yy_transition'.  This array is handled specially because it
-          is an array of structs.  See the 'td_lolen' field below.
-     'YYTD_ID_ACCLIST (0x0C)'
-          'yy_acclist'
+          ‘td_flags’ field below.
+     ‘YYTD_ID_TRANSITION (0x0B)’
+          ‘yy_transition’.  This array is handled specially because it
+          is an array of structs.  See the ‘td_lolen’ field below.
+     ‘YYTD_ID_ACCLIST (0x0C)’
+          ‘yy_acclist’
 
-'td_flags'
-     Bit flags describing how to interpret the data in 'td_data'.  The
+‘td_flags’
+     Bit flags describing how to interpret the data in ‘td_data’.  The
      data arrays are one-dimensional by default, but may be two
-     dimensional as specified in the 'td_hilen' field.
+     dimensional as specified in the ‘td_hilen’ field.
 
-     'YYTD_DATA8 (0x01)'
+     ‘YYTD_DATA8 (0x01)’
           The data is serialized as an array of type int8.
-     'YYTD_DATA16 (0x02)'
+     ‘YYTD_DATA16 (0x02)’
           The data is serialized as an array of type int16.
-     'YYTD_DATA32 (0x04)'
+     ‘YYTD_DATA32 (0x04)’
           The data is serialized as an array of type int32.
-     'YYTD_PTRANS (0x08)'
+     ‘YYTD_PTRANS (0x08)’
           The data is a list of indexes of entries in the expanded
-          'yy_transition' array.  Each index should be expanded to a
-          pointer to the corresponding entry in the 'yy_transition'
-          array.  We count on the fact that the 'yy_transition' array
+          ‘yy_transition’ array.  Each index should be expanded to a
+          pointer to the corresponding entry in the ‘yy_transition’
+          array.  We count on the fact that the ‘yy_transition’ array
           has already been seen.
-     'YYTD_STRUCT (0x10)'
+     ‘YYTD_STRUCT (0x10)’
           The data is a list of yy_trans_info structs, each of which
           consists of two integers.  There is no padding between struct
           elements or between structs.  The type of each member is
-          determined by the 'YYTD_DATA*' bits.
+          determined by the ‘YYTD_DATA*’ bits.
 
-'td_hilen'
-     If 'td_hilen' is non-zero, then the data is a two-dimensional
-     array.  Otherwise, the data is a one-dimensional array.  'td_hilen'
+‘td_hilen’
+     If ‘td_hilen’ is non-zero, then the data is a two-dimensional
+     array.  Otherwise, the data is a one-dimensional array.  ‘td_hilen’
      contains the number of elements in the higher dimensional array,
-     and 'td_lolen' contains the number of elements in the lowest
+     and ‘td_lolen’ contains the number of elements in the lowest
      dimension.
 
-     Conceptually, 'td_data' is either 'sometype td_data[td_lolen]', or
-     'sometype td_data[td_hilen][td_lolen]', where 'sometype' is
-     specified by the 'td_flags' field.  It is possible for both
-     'td_lolen' and 'td_hilen' to be zero, in which case 'td_data' is a
+     Conceptually, ‘td_data’ is either ‘sometype td_data[td_lolen]’, or
+     ‘sometype td_data[td_hilen][td_lolen]’, where ‘sometype’ is
+     specified by the ‘td_flags’ field.  It is possible for both
+     ‘td_lolen’ and ‘td_hilen’ to be zero, in which case ‘td_data’ is a
      zero length array, and no data is loaded, i.e., this table is
      simply skipped.  Flex does not currently generate tables of zero
      length.
 
-'td_lolen'
+‘td_lolen’
      Specifies the number of elements in the lowest dimension array.  If
      this is a one-dimensional array, then it is simply the number of
      elements in this array.  The element size is determined by the
-     'td_flags' field.
+     ‘td_flags’ field.
 
-'td_data[]'
+‘td_data[]’
      The table data.  This array may be a one- or two-dimensional array,
-     of type 'int8', 'int16', 'int32', 'struct yy_trans_info', or
-     'struct yy_trans_info*', depending upon the values in the
-     'td_flags', 'td_hilen', and 'td_lolen' fields.
+     of type ‘int8’, ‘int16’, ‘int32’, ‘struct yy_trans_info’, or
+     ‘struct yy_trans_info*’, depending upon the values in the
+     ‘td_flags’, ‘td_hilen’, and ‘td_lolen’ fields.
 
-'td_pad64[]'
+‘td_pad64[]’
      Zero or more NULL bytes, padding the entire table to the next
      64-bit boundary as calculated from the beginning of this table.
 
@@ -4189,70 +4188,70 @@ File: flex.info,  Node: Diagnostics,  Next: Limitations,  Prev: Serialized Table
 23 Diagnostics
 **************
 
-The following is a list of 'flex' diagnostic messages:
+The following is a list of ‘flex’ diagnostic messages:
 
-   * 'warning, rule cannot be matched' indicates that the given rule
+   • ‘warning, rule cannot be matched’ indicates that the given rule
      cannot be matched because it follows other rules that will always
-     match the same text as it.  For example, in the following 'foo'
+     match the same text as it.  For example, in the following ‘foo’
      cannot be matched because it comes after an identifier "catch-all"
      rule:
 
               [a-z]+    got_identifier();
               foo       got_foo();
 
-     Using 'REJECT' in a scanner suppresses this warning.
+     Using ‘REJECT’ in a scanner suppresses this warning.
 
-   * 'warning, -s option given but default rule can be matched' means
+   • ‘warning, -s option given but default rule can be matched’ means
      that it is possible (perhaps only in a particular start condition)
      that the default rule (match any single character) is the only one
-     that will match a particular input.  Since '-s' was given,
+     that will match a particular input.  Since ‘-s’ was given,
      presumably this is not intended.
 
-   * 'reject_used_but_not_detected undefined' or
-     'yymore_used_but_not_detected undefined'.  These errors can occur
-     at compile time.  They indicate that the scanner uses 'REJECT' or
-     'yymore()' but that 'flex' failed to notice the fact, meaning that
-     'flex' scanned the first two sections looking for occurrences of
+   • ‘reject_used_but_not_detected undefined’ or
+     ‘yymore_used_but_not_detected undefined’.  These errors can occur
+     at compile time.  They indicate that the scanner uses ‘REJECT’ or
+     ‘yymore()’ but that ‘flex’ failed to notice the fact, meaning that
+     ‘flex’ scanned the first two sections looking for occurrences of
      these actions and failed to find any, but somehow you snuck some in
-     (via a #include file, for example).  Use '%option reject' or
-     '%option yymore' to indicate to 'flex' that you really do use these
+     (via a #include file, for example).  Use ‘%option reject’ or
+     ‘%option yymore’ to indicate to ‘flex’ that you really do use these
      features.
 
-   * 'flex scanner jammed'.  a scanner compiled with '-s' has
+   • ‘flex scanner jammed’.  a scanner compiled with ‘-s’ has
      encountered an input string which wasn't matched by any of its
      rules.  This error can also occur due to internal problems.
 
-   * 'token too large, exceeds YYLMAX'.  your scanner uses '%array' and
-     one of its rules matched a string longer than the 'YYLMAX' constant
+   • ‘token too large, exceeds YYLMAX’.  your scanner uses ‘%array’ and
+     one of its rules matched a string longer than the ‘YYLMAX’ constant
      (8K bytes by default).  You can increase the value by #define'ing
-     'YYLMAX' in the definitions section of your 'flex' input.
+     ‘YYLMAX’ in the definitions section of your ‘flex’ input.
 
-   * 'scanner requires -8 flag to use the character 'x''.  Your scanner
-     specification includes recognizing the 8-bit character ''x'' and
+   • ‘scanner requires -8 flag to use the character 'x'’.  Your scanner
+     specification includes recognizing the 8-bit character ‘'x'’ and
      you did not specify the -8 flag, and your scanner defaulted to
-     7-bit because you used the '-Cf' or '-CF' table compression
-     options.  See the discussion of the '-7' flag, *note Scanner
+     7-bit because you used the ‘-Cf’ or ‘-CF’ table compression
+     options.  See the discussion of the ‘-7’ flag, *note Scanner
      Options::, for details.
 
-   * 'flex scanner push-back overflow'.  you used 'unput()' to push back
+   • ‘flex scanner push-back overflow’.  you used ‘unput()’ to push back
      so much text that the scanner's buffer could not hold both the
-     pushed-back text and the current token in 'yytext'.  Ideally the
+     pushed-back text and the current token in ‘yytext’.  Ideally the
      scanner should dynamically resize the buffer in this case, but at
      present it does not.
 
-   * 'input buffer overflow, can't enlarge buffer because scanner uses
-     REJECT'.  the scanner was working on matching an extremely large
+   • ‘input buffer overflow, can't enlarge buffer because scanner uses
+     REJECT’.  the scanner was working on matching an extremely large
      token and needed to expand the input buffer.  This doesn't work
-     with scanners that use 'REJECT'.
+     with scanners that use ‘REJECT’.
 
-   * 'fatal flex scanner internal error--end of buffer missed'.  This
+   • ‘fatal flex scanner internal error--end of buffer missed’.  This
      can occur in a scanner which is reentered after a long-jump has
      jumped out (or over) the scanner's activation frame.  Before
      reentering the scanner, use:
               yyrestart( yyin );
      or, as noted above, switch to using the C++ scanner class.
 
-   * 'too many start conditions in <> construct!' you listed more start
+   • ‘too many start conditions in <> construct!’ you listed more start
      conditions in a <> construct than exist (so you must have listed at
      least one of them twice).
 
@@ -4263,16 +4262,16 @@ File: flex.info,  Node: Limitations,  Next: Bibliography,  Prev: Diagnostics,  U
 **************
 
 Some trailing context patterns cannot be properly matched and generate
-warning messages ('dangerous trailing context').  These are patterns
+warning messages (‘dangerous trailing context’).  These are patterns
 where the ending of the first part of the rule matches the beginning of
-the second part, such as 'zx*/xy*', where the 'x*' matches the 'x' at
+the second part, such as ‘zx*/xy*’, where the 'x*' matches the 'x' at
 the beginning of the trailing context.  (Note that the POSIX draft
 states that the text matched by such patterns is undefined.)  For some
 trailing context rules, parts which are actually fixed-length are not
 recognized as such, leading to the abovementioned performance loss.  In
-particular, parts using '|' or '{n}' (such as 'foo{3}') are always
+particular, parts using ‘|’ or ‘{n}’ (such as ‘foo{3}’) are always
 considered variable-length.  Combining trailing context with the special
-'|' action can result in _fixed_ trailing context being turned into the
+‘|’ action can result in _fixed_ trailing context being turned into the
 more expensive _variable_ trailing context.  For example, in the
 following:
 
@@ -4280,21 +4279,21 @@ following:
          abc      |
          xyz/def
 
-   Use of 'unput()' invalidates yytext and yyleng, unless the '%array'
-directive or the '-l' option has been used.  Pattern-matching of 'NUL's
+   Use of ‘unput()’ invalidates yytext and yyleng, unless the ‘%array’
+directive or the ‘-l’ option has been used.  Pattern-matching of ‘NUL’s
 is substantially slower than matching other characters.  Dynamic
 resizing of the input buffer is slow, as it entails rescanning all the
 text matched so far by the current (generally huge) token.  Due to both
 buffering of input and read-ahead, you cannot intermix calls to
-'<stdio.h>' routines, such as, getchar(), with 'flex' rules and expect
-it to work.  Call 'input()' instead.  The total table entries listed by
-the '-v' flag excludes the number of table entries needed to determine
+‘<stdio.h>’ routines, such as, getchar(), with ‘flex’ rules and expect
+it to work.  Call ‘input()’ instead.  The total table entries listed by
+the ‘-v’ flag excludes the number of table entries needed to determine
 what rule has been matched.  The number of entries is equal to the
-number of DFA states if the scanner does not use 'REJECT', and somewhat
-greater than the number of states if it does.  'REJECT' cannot be used
-with the '-f' or '-F' options.
+number of DFA states if the scanner does not use ‘REJECT’, and somewhat
+greater than the number of states if it does.  ‘REJECT’ cannot be used
+with the ‘-f’ or ‘-F’ options.
 
-   The 'flex' internal algorithms need documentation.
+   The ‘flex’ internal algorithms need documentation.
 
 
 File: flex.info,  Node: Bibliography,  Next: FAQ,  Prev: Limitations,  Up: Top
@@ -4303,10 +4302,10 @@ File: flex.info,  Node: Bibliography,  Next: FAQ,  Prev: Limitations,  Up: Top
 *********************
 
 You may wish to read more about the following programs:
-   * lex
-   * yacc
-   * sed
-   * awk
+   • lex
+   • yacc
+   • sed
+   • awk
 
    The following books may contain material of interest:
 
@@ -4317,7 +4316,7 @@ Associates.  Be sure to get the 2nd edition.
 
    Alfred Aho, Ravi Sethi and Jeffrey Ullman, _Compilers: Principles,
 Techniques and Tools_, Addison-Wesley (1986).  Describes the
-pattern-matching techniques used by 'flex' (deterministic finite
+pattern-matching techniques used by ‘flex’ (deterministic finite
 automata).
 
 
@@ -4326,111 +4325,111 @@ File: flex.info,  Node: FAQ,  Next: Appendices,  Prev: Bibliography,  Up: Top
 FAQ
 ***
 
-From time to time, the 'flex' maintainer receives certain questions.
+From time to time, the ‘flex’ maintainer receives certain questions.
 Rather than repeat answers to well-understood problems, we publish them
 here.
 
 * Menu:
 
-* When was flex born?::         
-* How do I expand backslash-escape sequences in C-style quoted strings?::  
-* Why do flex scanners call fileno if it is not ANSI compatible?::  
-* Does flex support recursive pattern definitions?::  
-* How do I skip huge chunks of input (tens of megabytes) while using flex?::  
-* Flex is not matching my patterns in the same order that I defined them.::  
-* My actions are executing out of order or sometimes not at all.::  
-* How can I have multiple input sources feed into the same scanner at the same time?::  
-* Can I build nested parsers that work with the same input file?::  
-* How can I match text only at the end of a file?::  
-* How can I make REJECT cascade across start condition boundaries?::  
-* Why cant I use fast or full tables with interactive mode?::  
-* How much faster is -F or -f than -C?::  
-* If I have a simple grammar cant I just parse it with flex?::  
-* Why doesn't yyrestart() set the start state back to INITIAL?::  
-* How can I match C-style comments?::  
-* The period isn't working the way I expected.::  
-* Can I get the flex manual in another format?::  
-* Does there exist a "faster" NDFA->DFA algorithm?::  
-* How does flex compile the DFA so quickly?::  
-* How can I use more than 8192 rules?::  
-* How do I abandon a file in the middle of a scan and switch to a new file?::  
-* How do I execute code only during initialization (only before the first scan)?::  
-* How do I execute code at termination?::  
-* Where else can I find help?::  
-* Can I include comments in the "rules" section of the file?::  
-* I get an error about undefined yywrap().::  
-* How can I change the matching pattern at run time?::  
-* How can I expand macros in the input?::  
-* How can I build a two-pass scanner?::  
-* How do I match any string not matched in the preceding rules?::  
-* I am trying to port code from AT&T lex that uses yysptr and yysbuf.::  
-* Is there a way to make flex treat NULL like a regular character?::  
-* Whenever flex can not match the input it says "flex scanner jammed".::  
-* Why doesn't flex have non-greedy operators like perl does?::  
-* Memory leak - 16386 bytes allocated by malloc.::  
-* How do I track the byte offset for lseek()?::  
-* How do I use my own I/O classes in a C++ scanner?::  
-* How do I skip as many chars as possible?::  
-* deleteme00::              
-* Are certain equivalent patterns faster than others?::              
-* Is backing up a big deal?::              
-* Can I fake multi-byte character support?::              
-* deleteme01::              
-* Can you discuss some flex internals?::              
-* unput() messes up yy_at_bol::              
-* The | operator is not doing what I want::              
-* Why can't flex understand this variable trailing context pattern?::              
-* The ^ operator isn't working::              
-* Trailing context is getting confused with trailing optional patterns::              
-* Is flex GNU or not?::              
-* ERASEME53::              
-* I need to scan if-then-else blocks and while loops::              
-* ERASEME55::              
-* ERASEME56::              
-* ERASEME57::              
-* Is there a repository for flex scanners?::              
-* How can I conditionally compile or preprocess my flex input file?::              
-* Where can I find grammars for lex and yacc?::              
-* I get an end-of-buffer message for each character scanned.::              
-* unnamed-faq-62::              
-* unnamed-faq-63::              
-* unnamed-faq-64::              
-* unnamed-faq-65::              
-* unnamed-faq-66::              
-* unnamed-faq-67::              
-* unnamed-faq-68::              
-* unnamed-faq-69::              
-* unnamed-faq-70::              
-* unnamed-faq-71::              
-* unnamed-faq-72::              
-* unnamed-faq-73::              
-* unnamed-faq-74::              
-* unnamed-faq-75::              
-* unnamed-faq-76::              
-* unnamed-faq-77::              
-* unnamed-faq-78::              
-* unnamed-faq-79::              
-* unnamed-faq-80::              
-* unnamed-faq-81::              
-* unnamed-faq-82::              
-* unnamed-faq-83::              
-* unnamed-faq-84::              
-* unnamed-faq-85::              
-* unnamed-faq-86::              
-* unnamed-faq-87::              
-* unnamed-faq-88::              
-* unnamed-faq-90::              
-* unnamed-faq-91::              
-* unnamed-faq-92::              
-* unnamed-faq-93::              
-* unnamed-faq-94::              
-* unnamed-faq-95::              
-* unnamed-faq-96::              
-* unnamed-faq-97::              
-* unnamed-faq-98::              
-* unnamed-faq-99::              
-* unnamed-faq-100::             
-* unnamed-faq-101::             
+* When was flex born?::
+* How do I expand backslash-escape sequences in C-style quoted strings?::
+* Why do flex scanners call fileno if it is not ANSI compatible?::
+* Does flex support recursive pattern definitions?::
+* How do I skip huge chunks of input (tens of megabytes) while using flex?::
+* Flex is not matching my patterns in the same order that I defined them.::
+* My actions are executing out of order or sometimes not at all.::
+* How can I have multiple input sources feed into the same scanner at the same time?::
+* Can I build nested parsers that work with the same input file?::
+* How can I match text only at the end of a file?::
+* How can I make REJECT cascade across start condition boundaries?::
+* Why cant I use fast or full tables with interactive mode?::
+* How much faster is -F or -f than -C?::
+* If I have a simple grammar cant I just parse it with flex?::
+* Why doesn't yyrestart() set the start state back to INITIAL?::
+* How can I match C-style comments?::
+* The period isn't working the way I expected.::
+* Can I get the flex manual in another format?::
+* Does there exist a "faster" NDFA->DFA algorithm?::
+* How does flex compile the DFA so quickly?::
+* How can I use more than 8192 rules?::
+* How do I abandon a file in the middle of a scan and switch to a new file?::
+* How do I execute code only during initialization (only before the first scan)?::
+* How do I execute code at termination?::
+* Where else can I find help?::
+* Can I include comments in the "rules" section of the file?::
+* I get an error about undefined yywrap().::
+* How can I change the matching pattern at run time?::
+* How can I expand macros in the input?::
+* How can I build a two-pass scanner?::
+* How do I match any string not matched in the preceding rules?::
+* I am trying to port code from AT&T lex that uses yysptr and yysbuf.::
+* Is there a way to make flex treat NULL like a regular character?::
+* Whenever flex can not match the input it says "flex scanner jammed".::
+* Why doesn't flex have non-greedy operators like perl does?::
+* Memory leak - 16386 bytes allocated by malloc.::
+* How do I track the byte offset for lseek()?::
+* How do I use my own I/O classes in a C++ scanner?::
+* How do I skip as many chars as possible?::
+* deleteme00::
+* Are certain equivalent patterns faster than others?::
+* Is backing up a big deal?::
+* Can I fake multi-byte character support?::
+* deleteme01::
+* Can you discuss some flex internals?::
+* unput() messes up yy_at_bol::
+* The | operator is not doing what I want::
+* Why can't flex understand this variable trailing context pattern?::
+* The ^ operator isn't working::
+* Trailing context is getting confused with trailing optional patterns::
+* Is flex GNU or not?::
+* ERASEME53::
+* I need to scan if-then-else blocks and while loops::
+* ERASEME55::
+* ERASEME56::
+* ERASEME57::
+* Is there a repository for flex scanners?::
+* How can I conditionally compile or preprocess my flex input file?::
+* Where can I find grammars for lex and yacc?::
+* I get an end-of-buffer message for each character scanned.::
+* unnamed-faq-62::
+* unnamed-faq-63::
+* unnamed-faq-64::
+* unnamed-faq-65::
+* unnamed-faq-66::
+* unnamed-faq-67::
+* unnamed-faq-68::
+* unnamed-faq-69::
+* unnamed-faq-70::
+* unnamed-faq-71::
+* unnamed-faq-72::
+* unnamed-faq-73::
+* unnamed-faq-74::
+* unnamed-faq-75::
+* unnamed-faq-76::
+* unnamed-faq-77::
+* unnamed-faq-78::
+* unnamed-faq-79::
+* unnamed-faq-80::
+* unnamed-faq-81::
+* unnamed-faq-82::
+* unnamed-faq-83::
+* unnamed-faq-84::
+* unnamed-faq-85::
+* unnamed-faq-86::
+* unnamed-faq-87::
+* unnamed-faq-88::
+* unnamed-faq-90::
+* unnamed-faq-91::
+* unnamed-faq-92::
+* unnamed-faq-93::
+* unnamed-faq-94::
+* unnamed-faq-95::
+* unnamed-faq-96::
+* unnamed-faq-97::
+* unnamed-faq-98::
+* unnamed-faq-99::
+* unnamed-faq-100::
+* unnamed-faq-101::
 * What is the difference between YYLEX_PARAM and YY_DECL?::
 * Why do I get "conflicting types for yylex" error?::
 * How do I access the values set in a Flex action from within a Bison action?::
@@ -4441,7 +4440,7 @@ File: flex.info,  Node: When was flex born?,  Next: How do I expand backslash-es
 When was flex born?
 ===================
 
-Vern Paxson took over the 'Software Tools' lex project from Jef
+Vern Paxson took over the ‘Software Tools’ lex project from Jef
 Poskanzer in 1982.  At that point it was written in Ratfor.  Around 1987
 or so, Paxson translated it into C, and a legend was born :-).
 
@@ -4462,10 +4461,10 @@ one for matching non-escaped text, one for matching a single escape, one
 for matching an embedded newline, and one for recognizing the end of the
 string.  Each of these rules is then faced with the question of where to
 put its intermediary results.  The best solution is for the rules to
-append their local value of 'yytext' to the end of a "string literal"
+append their local value of ‘yytext’ to the end of a "string literal"
 buffer.  A rule like the escape-matcher will append to the buffer the
-meaning of the escape sequence rather than the literal text in 'yytext'.
-In this way, 'yytext' does not need to be modified at all.
+meaning of the escape sequence rather than the literal text in ‘yytext’.
+In this way, ‘yytext’ does not need to be modified at all.
 
 
 File: flex.info,  Node: Why do flex scanners call fileno if it is not ANSI compatible?,  Next: Does flex support recursive pattern definitions?,  Prev: How do I expand backslash-escape sequences in C-style quoted strings?,  Up: FAQ
@@ -4473,13 +4472,13 @@ File: flex.info,  Node: Why do flex scanners call fileno if it is not ANSI compa
 Why do flex scanners call fileno if it is not ANSI compatible?
 ==============================================================
 
-Flex scanners call 'fileno()' in order to get the file descriptor
-corresponding to 'yyin'.  The file descriptor may be passed to
-'isatty()' or 'read()', depending upon which '%options' you specified.
-If your system does not have 'fileno()' support, to get rid of the
-'read()' call, do not specify '%option read'.  To get rid of the
-'isatty()' call, you must specify one of '%option always-interactive' or
-'%option never-interactive'.
+Flex scanners call ‘fileno()’ in order to get the file descriptor
+corresponding to ‘yyin’.  The file descriptor may be passed to
+‘isatty()’ or ‘read()’, depending upon which ‘%options’ you specified.
+If your system does not have ‘fileno()’ support, to get rid of the
+‘read()’ call, do not specify ‘%option read’.  To get rid of the
+‘isatty()’ call, you must specify one of ‘%option always-interactive’ or
+‘%option never-interactive’.
 
 
 File: flex.info,  Node: Does flex support recursive pattern definitions?,  Next: How do I skip huge chunks of input (tens of megabytes) while using flex?,  Prev: Why do flex scanners call fileno if it is not ANSI compatible?,  Up: FAQ
@@ -4498,7 +4497,7 @@ too) is limited.  In particular, regular expressions cannot "balance"
 parentheses to an arbitrary degree.  For example, it's impossible to
 write a regular expression that matches all strings containing the same
 number of '{'s as '}'s.  For more powerful pattern matching, you need a
-parser, such as 'GNU bison'.
+parser, such as ‘GNU bison’.
 
 
 File: flex.info,  Node: How do I skip huge chunks of input (tens of megabytes) while using flex?,  Next: Flex is not matching my patterns in the same order that I defined them.,  Prev: Does flex support recursive pattern definitions?,  Up: FAQ
@@ -4506,7 +4505,7 @@ File: flex.info,  Node: How do I skip huge chunks of input (tens of megabytes) w
 How do I skip huge chunks of input (tens of megabytes) while using flex?
 ========================================================================
 
-Use 'fseek()' (or 'lseek()') to position yyin, then call 'yyrestart()'.
+Use ‘fseek()’ (or ‘lseek()’) to position yyin, then call ‘yyrestart()’.
 
 
 File: flex.info,  Node: Flex is not matching my patterns in the same order that I defined them.,  Next: My actions are executing out of order or sometimes not at all.,  Prev: How do I skip huge chunks of input (tens of megabytes) while using flex?,  Up: FAQ
@@ -4514,32 +4513,32 @@ File: flex.info,  Node: Flex is not matching my patterns in the same order that
 Flex is not matching my patterns in the same order that I defined them.
 =======================================================================
 
-'flex' picks the rule that matches the most text (i.e., the longest
-possible input string).  This is because 'flex' uses an entirely
+‘flex’ picks the rule that matches the most text (i.e., the longest
+possible input string).  This is because ‘flex’ uses an entirely
 different matching technique ("deterministic finite automata") that
 actually does all of the matching simultaneously, in parallel.  (Seems
 impossible, but it's actually a fairly simple technique once you
 understand the principles.)
 
    A side-effect of this parallel matching is that when the input
-matches more than one rule, 'flex' scanners pick the rule that matched
+matches more than one rule, ‘flex’ scanners pick the rule that matched
 the _most_ text.  This is explained further in the manual, in the
 section *Note Matching::.
 
-   If you want 'flex' to choose a shorter match, then you can work
+   If you want ‘flex’ to choose a shorter match, then you can work
 around this behavior by expanding your short rule to match more text,
 then put back the extra:
 
      data_.*        yyless( 5 ); BEGIN BLOCKIDSTATE;
 
    Another fix would be to make the second rule active only during the
-'<BLOCKIDSTATE>' start condition, and make that start condition
-exclusive by declaring it with '%x' instead of '%s'.
+‘<BLOCKIDSTATE>’ start condition, and make that start condition
+exclusive by declaring it with ‘%x’ instead of ‘%s’.
 
    A final fix is to change the input language so that the ambiguity for
-'data_' is removed, by adding characters to it that don't match the
-identifier rule, or by removing characters (such as '_') from the
-identifier rule so it no longer matches 'data_'.  (Of course, you might
+‘data_’ is removed, by adding characters to it that don't match the
+identifier rule, or by removing characters (such as ‘_’) from the
+identifier rule so it no longer matches ‘data_’.  (Of course, you might
 also not have the option of changing the input language.)
 
 
@@ -4548,20 +4547,20 @@ File: flex.info,  Node: My actions are executing out of order or sometimes not a
 My actions are executing out of order or sometimes not at all.
 ==============================================================
 
-Most likely, you have (in error) placed the opening '{' of the action
+Most likely, you have (in error) placed the opening ‘{’ of the action
 block on a different line than the rule, e.g.,
 
      ^(foo|bar)
      {  <<<--- WRONG!
-
+     
      }
 
-   'flex' requires that the opening '{' of an action associated with a
+   ‘flex’ requires that the opening ‘{’ of an action associated with a
 rule begin on the same line as does the rule.  You need instead to write
 your rules as follows:
 
      ^(foo|bar)   {  // CORRECT!
-
+     
      }
 
 
@@ -4571,34 +4570,34 @@ How can I have multiple input sources feed into the same scanner at the same tim
 ==================================================================================
 
 If ...
-   * your scanner is free of backtracking (verified using 'flex''s '-b'
+   • your scanner is free of backtracking (verified using ‘flex’'s ‘-b’
      flag),
-   * AND you run your scanner interactively ('-I' option; default unless
+   • AND you run your scanner interactively (‘-I’ option; default unless
      using special table compression options),
-   * AND you feed it one character at a time by redefining 'YY_INPUT' to
+   • AND you feed it one character at a time by redefining ‘YY_INPUT’ to
      do so,
 
    then every time it matches a token, it will have exhausted its input
 buffer (because the scanner is free of backtracking).  This means you
-can safely use 'select()' at the point and only call 'yylex()' for
-another token if 'select()' indicates there's data available.
+can safely use ‘select()’ at the point and only call ‘yylex()’ for
+another token if ‘select()’ indicates there's data available.
 
-   That is, move the 'select()' out from the input function to a point
-where it determines whether 'yylex()' gets called for the next token.
+   That is, move the ‘select()’ out from the input function to a point
+where it determines whether ‘yylex()’ gets called for the next token.
 
    With this approach, you will still have problems if your input can
-arrive piecemeal; 'select()' could inform you that the beginning of a
-token is available, you call 'yylex()' to get it, but it winds up
+arrive piecemeal; ‘select()’ could inform you that the beginning of a
+token is available, you call ‘yylex()’ to get it, but it winds up
 blocking waiting for the later characters in the token.
 
    Here's another way: Move your input multiplexing inside of
-'YY_INPUT'.  That is, whenever 'YY_INPUT' is called, it 'select()''s to
+‘YY_INPUT’.  That is, whenever ‘YY_INPUT’ is called, it ‘select()’'s to
 see where input is available.  If input is available for the scanner, it
 reads and returns the next byte.  If input is available from another
 source, it calls whatever function is responsible for reading from that
 source.  (If no input is available, it blocks until some input is
 available.)  I've used this technique in an interpreter I wrote that
-both reads keyboard input using a 'flex' scanner and IPC traffic from
+both reads keyboard input using a ‘flex’ scanner and IPC traffic from
 sockets, and it works fine.
 
 
@@ -4608,11 +4607,11 @@ Can I build nested parsers that work with the same input file?
 ==============================================================
 
 This is not going to work without some additional effort.  The reason is
-that 'flex' block-buffers the input it reads from 'yyin'.  This means
-that the "outermost" 'yylex()', when called, will automatically slurp up
+that ‘flex’ block-buffers the input it reads from ‘yyin’.  This means
+that the "outermost" ‘yylex()’, when called, will automatically slurp up
 the first 8K of input available on yyin, and subsequent calls to other
-'yylex()''s won't see that input.  You might be tempted to work around
-this problem by redefining 'YY_INPUT' to only return a small amount of
+‘yylex()’'s won't see that input.  You might be tempted to work around
+this problem by redefining ‘YY_INPUT’ to only return a small amount of
 text, but it turns out that that approach is quite difficult.  Instead,
 the best solution is to combine all of your scanners into one large
 scanner, using a different exclusive start condition for each.
@@ -4626,9 +4625,9 @@ How can I match text only at the end of a file?
 There is no way to write a rule which is "match this text, but only if
 it comes at the end of the file".  You can fake it, though, if you
 happen to have a character lying around that you don't allow in your
-input.  Then you redefine 'YY_INPUT' to call your own routine which, if
-it sees an 'EOF', returns the magic character first (and remembers to
-return a real 'EOF' next time it's called).  Then you could write:
+input.  Then you redefine ‘YY_INPUT’ to call your own routine which, if
+it sees an ‘EOF’, returns the magic character first (and remembers to
+return a real ‘EOF’ next time it's called).  Then you could write:
 
      <COMMENT>(.|\n)*{EOF_CHAR}    /* saw comment at EOF */
 
@@ -4638,9 +4637,9 @@ File: flex.info,  Node: How can I make REJECT cascade across start condition bou
 How can I make REJECT cascade across start condition boundaries?
 ================================================================
 
-You can do this as follows.  Suppose you have a start condition 'A', and
-after exhausting all of the possible matches in '<A>', you want to try
-matches in '<INITIAL>'.  Then you could use the following:
+You can do this as follows.  Suppose you have a start condition ‘A’, and
+after exhausting all of the possible matches in ‘<A>’, you want to try
+matches in ‘<INITIAL>’.  Then you could use the following:
 
      %x A
      %%
@@ -4707,7 +4706,7 @@ Why doesn't yyrestart() set the start state back to INITIAL?
 
 There are two reasons.  The first is that there might be programs that
 rely on the start state not changing across file changes.  The second is
-that beginning with 'flex' version 2.4, use of 'yyrestart()' is no
+that beginning with ‘flex’ version 2.4, use of ‘yyrestart()’ is no
 longer required, so fixing the problem there doesn't solve the more
 general problem.
 
@@ -4747,26 +4746,26 @@ File: flex.info,  Node: The period isn't working the way I expected.,  Next: Can
 The '.' isn't working the way I expected.
 =========================================
 
-Here are some tips for using '.':
+Here are some tips for using ‘.’:
 
-   * A common mistake is to place the grouping parenthesis AFTER an
+   • A common mistake is to place the grouping parenthesis AFTER an
      operator, when you really meant to place the parenthesis BEFORE the
-     operator, e.g., you probably want this '(foo|bar)+' and NOT this
-     '(foo|bar+)'.
+     operator, e.g., you probably want this ‘(foo|bar)+’ and NOT this
+     ‘(foo|bar+)’.
 
-     The first pattern matches the words 'foo' or 'bar' any number of
-     times, e.g., it matches the text 'barfoofoobarfoo'.  The second
-     pattern matches a single instance of 'foo' or a single instance of
-     'bar' followed by one or more 'r's, e.g., it matches the text
-     'barrrr' .
-   * A '.' inside '[]''s just means a literal'.' (period), and NOT "any
+     The first pattern matches the words ‘foo’ or ‘bar’ any number of
+     times, e.g., it matches the text ‘barfoofoobarfoo’.  The second
+     pattern matches a single instance of ‘foo’ or a single instance of
+     ‘bar’ followed by one or more ‘r’s, e.g., it matches the text
+     ‘barrrr’ .
+   • A ‘.’ inside ‘[]’'s just means a literal‘.’ (period), and NOT "any
      character except newline".
-   * Remember that '.' matches any character EXCEPT '\n' (and 'EOF').
+   • Remember that ‘.’ matches any character EXCEPT ‘\n’ (and ‘EOF’).
      If you really want to match ANY character, including newlines, then
-     use '(.|\n)' Beware that the regex '(.|\n)+' will match your entire
+     use ‘(.|\n)’ Beware that the regex ‘(.|\n)+’ will match your entire
      input!
-   * Finally, if you want to match a literal '.' (a period), then use
-     '[.]' or '"."'
+   • Finally, if you want to match a literal ‘.’ (a period), then use
+     ‘[.]’ or ‘"."’
 
 
 File: flex.info,  Node: Can I get the flex manual in another format?,  Next: Does there exist a "faster" NDFA->DFA algorithm?,  Prev: The period isn't working the way I expected.,  Up: FAQ
@@ -4774,8 +4773,8 @@ File: flex.info,  Node: Can I get the flex manual in another format?,  Next: Doe
 Can I get the flex manual in another format?
 ============================================
 
-The 'flex' source distribution includes a texinfo manual.  You are free
-to convert that texinfo into whatever format you desire.  The 'texinfo'
+The ‘flex’ source distribution includes a texinfo manual.  You are free
+to convert that texinfo into whatever format you desire.  The ‘texinfo’
 package includes tools for conversion to a number of formats.
 
 
@@ -4795,7 +4794,7 @@ File: flex.info,  Node: How does flex compile the DFA so quickly?,  Next: How ca
 How does flex compile the DFA so quickly?
 =========================================
 
-There are two big speed wins that 'flex' uses:
+There are two big speed wins that ‘flex’ uses:
 
   1. It analyzes the input rules to construct equivalence classes for
      those characters that always make the same transitions.  It then
@@ -4814,9 +4813,9 @@ File: flex.info,  Node: How can I use more than 8192 rules?,  Next: How do I aba
 How can I use more than 8192 rules?
 ===================================
 
-'Flex' is compiled with an upper limit of 8192 rules per scanner.  If
+‘Flex’ is compiled with an upper limit of 8192 rules per scanner.  If
 you need more than 8192 rules in your scanner, you'll have to recompile
-'flex' with the following changes in 'flexdef.h':
+‘flex’ with the following changes in ‘flexdef.h’:
 
      <    #define YY_TRAILING_MASK 0x2000
      <    #define YY_TRAILING_HEAD_MASK 0x4000
@@ -4849,9 +4848,9 @@ File: flex.info,  Node: How do I abandon a file in the middle of a scan and swit
 How do I abandon a file in the middle of a scan and switch to a new file?
 =========================================================================
 
-Just call 'yyrestart(newfile)'.  Be sure to reset the start state if you
-want a "fresh start, since 'yyrestart' does NOT reset the start state
-back to 'INITIAL'.
+Just call ‘yyrestart(newfile)’.  Be sure to reset the start state if you
+want a "fresh start, since ‘yyrestart’ does NOT reset the start state
+back to ‘INITIAL’.
 
 
 File: flex.info,  Node: How do I execute code only during initialization (only before the first scan)?,  Next: How do I execute code at termination?,  Prev: How do I abandon a file in the middle of a scan and switch to a new file?,  Up: FAQ
@@ -4859,14 +4858,14 @@ File: flex.info,  Node: How do I execute code only during initialization (only b
 How do I execute code only during initialization (only before the first scan)?
 ==============================================================================
 
-You can specify an initial action by defining the macro 'YY_USER_INIT'
-(though note that 'yyout' may not be available at the time this macro is
+You can specify an initial action by defining the macro ‘YY_USER_INIT’
+(though note that ‘yyout’ may not be available at the time this macro is
 executed).  Or you can add to the beginning of your rules section:
 
      %%
          /* Must be indented! */
          static int did_init = 0;
-
+     
          if ( ! did_init ){
      do_my_init();
              did_init = 1;
@@ -4878,7 +4877,7 @@ File: flex.info,  Node: How do I execute code at termination?,  Next: Where else
 How do I execute code at termination?
 =====================================
 
-You can specify an action for the '<<EOF>>' rule.
+You can specify an action for the ‘<<EOF>>’ rule.
 
 
 File: flex.info,  Node: Where else can I find help?,  Next: Can I include comments in the "rules" section of the file?,  Prev: How do I execute code at termination?,  Up: FAQ
@@ -4905,12 +4904,12 @@ File: flex.info,  Node: I get an error about undefined yywrap().,  Next: How can
 I get an error about undefined yywrap().
 ========================================
 
-You must supply a 'yywrap()' function of your own, or link to 'libfl.a'
+You must supply a ‘yywrap()’ function of your own, or link to ‘libfl.a’
 (which provides one), or use
 
      %option noyywrap
 
-   in your source to say you don't want a 'yywrap()' function.
+   in your source to say you don't want a ‘yywrap()’ function.
 
 
 File: flex.info,  Node: How can I change the matching pattern at run time?,  Next: How can I expand macros in the input?,  Prev: I get an error about undefined yywrap().,  Up: FAQ
@@ -4939,7 +4938,7 @@ parser.
      expansion_buffer = yy_scan_string(expand(yytext));
      yy_switch_to_buffer(expansion_buffer);
      }
-
+     
      <<EOF>>	{
      if ( expansion_buffer )
      {
@@ -4982,16 +4981,16 @@ How do I match any string not matched in the preceding rules?
 
 One way to assign precedence, is to place the more specific rules first.
 If two rules would match the same input (same sequence of characters)
-then the first rule listed in the 'flex' input wins, e.g.,
+then the first rule listed in the ‘flex’ input wins, e.g.,
 
      %%
      foo[a-zA-Z_]+    return FOO_ID;
      bar[a-zA-Z_]+    return BAR_ID;
      [a-zA-Z_]+       return GENERIC_ID;
 
-   Note that the rule '[a-zA-Z_]+' must come *after* the others.  It
+   Note that the rule ‘[a-zA-Z_]+’ must come *after* the others.  It
 will match the same amount of text as the more specific rules, and in
-that case the 'flex' scanner will pick the first rule listed in your
+that case the ‘flex’ scanner will pick the first rule listed in your
 scanner as the one to match.
 
 
@@ -5002,10 +5001,10 @@ I am trying to port code from AT&T lex that uses yysptr and yysbuf.
 
 Those are internal variables pointing into the AT&T scanner's input
 buffer.  I imagine they're being manipulated in user versions of the
-'input()' and 'unput()' functions.  If so, what you need to do is
+‘input()’ and ‘unput()’ functions.  If so, what you need to do is
 analyze those functions to figure out what they're doing, and then
-replace 'input()' with an appropriate definition of 'YY_INPUT'.  You
-shouldn't need to (and must not) replace 'flex''s 'unput()' function.
+replace ‘input()’ with an appropriate definition of ‘YY_INPUT’.  You
+shouldn't need to (and must not) replace ‘flex’'s ‘unput()’ function.
 
 
 File: flex.info,  Node: Is there a way to make flex treat NULL like a regular character?,  Next: Whenever flex can not match the input it says "flex scanner jammed".,  Prev: I am trying to port code from AT&T lex that uses yysptr and yysbuf.,  Up: FAQ
@@ -5013,8 +5012,8 @@ File: flex.info,  Node: Is there a way to make flex treat NULL like a regular ch
 Is there a way to make flex treat NULL like a regular character?
 ================================================================
 
-Yes, '\0' and '\x00' should both do the trick.  Perhaps you have an
-ancient version of 'flex'.  The latest release is version 2.6.4.
+Yes, ‘\0’ and ‘\x00’ should both do the trick.  Perhaps you have an
+ancient version of ‘flex’.  The latest release is version 2.6.4.
 
 
 File: flex.info,  Node: Whenever flex can not match the input it says "flex scanner jammed".,  Next: Why doesn't flex have non-greedy operators like perl does?,  Prev: Is there a way to make flex treat NULL like a regular character?,  Up: FAQ
@@ -5027,10 +5026,10 @@ You need to add a rule that matches the otherwise-unmatched text, e.g.,
      %option yylineno
      %%
      [[a bunch of rules here]]
-
+     
      .	printf("bad input character '%s' at line %d\n", yytext, yylineno);
 
-   See '%option default' for more information.
+   See ‘%option default’ for more information.
 
 
 File: flex.info,  Node: Why doesn't flex have non-greedy operators like perl does?,  Next: Memory leak - 16386 bytes allocated by malloc.,  Prev: Whenever flex can not match the input it says "flex scanner jammed".,  Up: FAQ
@@ -5051,9 +5050,9 @@ decent job.  Better is to either introduce a separate parser, or to
 split the scanner into multiple scanners using (exclusive) start
 conditions.
 
-   You might have a separate start state once you've seen the 'BEGIN'.
-In that state, you might then have a regex that will match 'END' (to
-kick you out of the state), and perhaps '(.|\n)' to get a single
+   You might have a separate start state once you've seen the ‘BEGIN’.
+In that state, you might then have a regex that will match ‘END’ (to
+kick you out of the state), and perhaps ‘(.|\n)’ to get a single
 character within the chunk ...
 
    This approach also has much better error-reporting properties.
@@ -5064,18 +5063,18 @@ File: flex.info,  Node: Memory leak - 16386 bytes allocated by malloc.,  Next: H
 Memory leak - 16386 bytes allocated by malloc.
 ==============================================
 
-UPDATED 2002-07-10: As of 'flex' version 2.5.9, this leak means that you
-did not call 'yylex_destroy()'.  If you are using an earlier version of
-'flex', then read on.
+UPDATED 2002-07-10: As of ‘flex’ version 2.5.9, this leak means that you
+did not call ‘yylex_destroy()’.  If you are using an earlier version of
+‘flex’, then read on.
 
    The leak is about 16426 bytes.  That is, (8192 * 2 + 2) for the
-read-buffer, and about 40 for 'struct yy_buffer_state' (depending upon
+read-buffer, and about 40 for ‘struct yy_buffer_state’ (depending upon
 alignment).  The leak is in the non-reentrant C scanner only (NOT in the
-reentrant scanner, NOT in the C++ scanner).  Since 'flex' doesn't know
+reentrant scanner, NOT in the C++ scanner).  Since ‘flex’ doesn't know
 when you are done, the buffer is never freed.
 
    However, the leak won't multiply since the buffer is reused no matter
-how many times you call 'yylex()'.
+how many times you call ‘yylex()’.
 
    If you want to reclaim the memory when you are completely done
 scanning, then you might try this:
@@ -5084,7 +5083,7 @@ scanning, then you might try this:
      yy_delete_buffer(YY_CURRENT_BUFFER);
      yy_init = 1;
 
-   Note: 'yy_init' is an "internal variable", and hasn't been tested in
+   Note: ‘yy_init’ is an "internal variable", and hasn't been tested in
 this situation.  It is possible that some other globals may need
 resetting as well.
 
@@ -5100,24 +5099,24 @@ How do I track the byte offset for lseek()?
      >   seek_position = (no_buffers)*YY_READ_BUF_SIZE + yy_c_buf_p - YY_CURRENT_BUFFER->yy_ch_buf
 
    While this is the right idea, it has two problems.  The first is that
-it's possible that 'flex' will request less than 'YY_READ_BUF_SIZE'
-during an invocation of 'YY_INPUT' (or that your input source will
-return less even though 'YY_READ_BUF_SIZE' bytes were requested).  The
-second problem is that when refilling its internal buffer, 'flex' keeps
+it's possible that ‘flex’ will request less than ‘YY_READ_BUF_SIZE’
+during an invocation of ‘YY_INPUT’ (or that your input source will
+return less even though ‘YY_READ_BUF_SIZE’ bytes were requested).  The
+second problem is that when refilling its internal buffer, ‘flex’ keeps
 some characters from the previous buffer (because usually it's in the
-middle of a match, and needs those characters to construct 'yytext' for
-the match once it's done).  Because of this, 'yy_c_buf_p -
-YY_CURRENT_BUFFER->yy_ch_buf' won't be exactly the number of characters
+middle of a match, and needs those characters to construct ‘yytext’ for
+the match once it's done).  Because of this, ‘yy_c_buf_p -
+YY_CURRENT_BUFFER->yy_ch_buf’ won't be exactly the number of characters
 already read from the current buffer.
 
    An alternative solution is to count the number of characters you've
 matched since starting to scan.  This can be done by using
-'YY_USER_ACTION'.  For example,
+‘YY_USER_ACTION’.  For example,
 
      #define YY_USER_ACTION num_chars += yyleng;
 
    (You need to be careful to update your bookkeeping if you use
-'yymore('), 'yyless()', 'unput()', or 'input()'.)
+‘yymore(’), ‘yyless()’, ‘unput()’, or ‘input()’.)
 
 
 File: flex.info,  Node: How do I use my own I/O classes in a C++ scanner?,  Next: How do I skip as many chars as possible?,  Prev: How do I track the byte offset for lseek()?,  Up: FAQ
@@ -5129,11 +5128,11 @@ When the flex C++ scanning class rewrite finally happens, then this sort
 of thing should become much easier.
 
    You can do this by passing the various functions (such as
-'LexerInput()' and 'LexerOutput()') NULL 'iostream*''s, and then dealing
+‘LexerInput()’ and ‘LexerOutput()’) NULL ‘iostream*’'s, and then dealing
 with your own I/O classes surreptitiously (i.e., stashing them in
 special member variables).  This works because the only assumption about
 the lexer regarding what's done with the iostream's is that they're
-ultimately passed to 'LexerInput()' and 'LexerOutput', which then do
+ultimately passed to ‘LexerInput()’ and ‘LexerOutput’, which then do
 whatever is necessary with them.
 
 
@@ -5178,7 +5177,7 @@ deleteme00
 
      QUESTION:
      When was flex born?
-
+     
      Vern Paxson took over
      the Software Tools lex project from Jef Poskanzer in 1982.  At that point it
      was written in Ratfor.  Around 1987 or so, Paxson translated it into C, and
@@ -5195,29 +5194,29 @@ Are certain equivalent patterns faster than others?
      In-reply-to: Your message of Wed, 18 Sep 96 11:12:17 EDT.
      Date: Wed, 18 Sep 96 10:51:02 PDT
      From: Vern Paxson <vern>
-
+     
      [Note, the most recent flex release is 2.5.4, which you can get from
      ftp.ee.lbl.gov.  It has bug fixes over 2.5.2 and 2.5.3.]
-
+     
      > 1. Using the pattern
      >    ([Ff](oot)?)?[Nn](ote)?(\.)?
      >    instead of
      >    (((F|f)oot(N|n)ote)|((N|n)ote)|((N|n)\.)|((F|f)(N|n)(\.)))
      >    (in a very complicated flex program) caused the program to slow from
      >    300K+/min to 100K/min (no other changes were done).
-
+     
      These two are not equivalent.  For example, the first can match "footnote."
      but the second can only match "footnote".  This is almost certainly the
      cause in the discrepancy - the slower scanner run is matching more tokens,
      and/or having to do more backing up.
-
+     
      > 2. Which of these two are better: [Ff]oot or (F|f)oot ?
-
+     
      From a performance point of view, they're equivalent (modulo presumably
      minor effects such as memory cache hit rates; and the presence of trailing
      context, see below).  From a space point of view, the first is slightly
      preferable.
-
+     
      > 3. I have a pattern that look like this:
      >    pats {p1}|{p2}|{p3}|...|{p50}     (50 patterns ORd)
      >
@@ -5225,22 +5224,22 @@ Are certain equivalent patterns faster than others?
      >    <snext>{and}/{no4}{bb}{pats}
      >
      >    gets me to "too complicated - over 32,000 states"...
-
+     
      I can't tell from this example whether the trailing context is variable-length
      or fixed-length (it could be the latter if {and} is fixed-length).  If it's
      variable length, which flex -p will tell you, then this reflects a basic
      performance problem, and if you can eliminate it by restructuring your
      scanner, you will see significant improvement.
-
+     
      >    so I divided {pats} to {pats1}, {pats2},..., {pats5} each consists of about
      >    10 patterns and changed the rule to be 5 rules.
      >    This did compile, but what is the rule of thumb here ?
-
+     
      The rule is to avoid trailing context other than fixed-length, in which for
      a/b, either the 'a' pattern or the 'b' pattern have a fixed length.  Use
      of the '|' operator automatically makes the pattern variable length, so in
      this case '[Ff]oot' is preferred to '(F|f)oot'.
-
+     
      > 4. I changed a rule that looked like this:
      >    <snext8>{and}{bb}/{ROMAN}[^A-Za-z] { BEGIN...
      >
@@ -5249,16 +5248,16 @@ Are certain equivalent patterns faster than others?
      >    <snext8>{and}{bb}/{ROMAN}         { BEGIN...
      >
      >    Again, I understand the using [^...] will cause a great performance loss
-
+     
      Actually, it doesn't cause any sort of performance loss.  It's a surprising
      fact about regular expressions that they always match in linear time
      regardless of how complex they are.
-
+     
      >    but are there any specific rules about it ?
-
+     
      See the "Performance Considerations" section of the man page, and also
      the example in MISC/fastwc/.
-
+     
      		Vern
 
 
@@ -5272,45 +5271,45 @@ Is backing up a big deal?
      In-reply-to: Your message of Thu, 19 Sep 96 10:16:04 EDT.
      Date: Thu, 19 Sep 96 09:58:00 PDT
      From: Vern Paxson <vern>
-
+     
      > a lot about the backing up problem.
      > I believe that there lies my biggest problem, and I'll try to improve
      > it.
-
+     
      Since you have variable trailing context, this is a bigger performance
      problem.  Fixing it is usually easier than fixing backing up, which in a
      complicated scanner (yours seems to fit the bill) can be extremely
      difficult to do correctly.
-
+     
      You also don't mention what flags you are using for your scanner.
      -f makes a large speed difference, and -Cfe buys you nearly as much
      speed but the resulting scanner is considerably smaller.
-
+     
      > I have an | operator in {and} and in {pats} so both of them are variable
      > length.
-
+     
      -p should have reported this.
-
+     
      > Is changing one of them to fixed-length is enough ?
-
+     
      Yes.
-
+     
      > Is it possible to change the 32,000 states limit ?
-
+     
      Yes.  I've appended instructions on how.  Before you make this change,
      though, you should think about whether there are ways to fundamentally
      simplify your scanner - those are certainly preferable!
-
+     
      		Vern
-
+     
      To increase the 32K limit (on a machine with 32 bit integers), you increase
      the magnitude of the following in flexdef.h:
-
+     
      #define JAMSTATE -32766 /* marks a reference to the state that always jams */
      #define MAXIMUM_MNS 31999
      #define BAD_SUBSCRIPT -32767
      #define MAX_SHORT 32700
-
+     
      Adding a 0 or two after each should do the trick.
 
 
@@ -5324,31 +5323,31 @@ Can I fake multi-byte character support?
      In-reply-to: Your message of Thu, 03 Oct 1996 17:24:04 PDT.
      Date: Fri, 04 Oct 1996 11:42:18 PDT
      From: Vern Paxson <vern>
-
+     
      >      I assume as long as my *.l file defines the
      >      range of expected character code values (in octal format), flex will
      >      scan the file and read multi-byte characters correctly. But I have no
      >      confidence in this assumption.
-
+     
      Your lack of confidence is justified - this won't work.
-
+     
      Flex has in it a widespread assumption that the input is processed
      one byte at a time.  Fixing this is on the to-do list, but is involved,
      so it won't happen any time soon.  In the interim, the best I can suggest
      (unless you want to try fixing it yourself) is to write your rules in
      terms of pairs of bytes, using definitions in the first section:
-
+     
      	X	\xfe\xc2
      	...
      	%%
      	foo{X}bar	found_foo_fe_c2_bar();
-
+     
      etc.  Definitely a pain - sorry about that.
-
+     
      By the way, the email address you used for me is ancient, indicating you
      have a very old version of flex.  You can get the most recent, 2.5.4, from
      ftp.ee.lbl.gov.
-
+     
      		Vern
 
 
@@ -5362,7 +5361,7 @@ deleteme01
      In-reply-to: Your message of Tue, 22 Oct 1996 10:15:42 PDT.
      Date: Tue, 22 Oct 1996 11:06:13 PDT
      From: Vern Paxson <vern>
-
+     
      Unfortunately flex at the moment has a widespread assumption within it
      that characters are processed 8 bits at a time.  I don't see any easy
      fix for this (other than writing your rules in terms of double characters -
@@ -5370,11 +5369,11 @@ deleteme01
      the Plan 9 stuff because I know it's a Unicode system, and also the PCCT
      toolkit (try searching say Alta Vista for "Purdue Compiler Construction
      Toolkit").
-
+     
      Fixing flex to handle wider characters is on the long-term to-do list.
      But since flex is a strictly spare-time project these days, this probably
      won't happen for quite a while, unless someone else does it first.
-
+     
      		Vern
 
 
@@ -5388,30 +5387,30 @@ Can you discuss some flex internals?
      In-reply-to: Your message of Sun, 10 Nov 1996 09:16:36 PST.
      Date: Mon, 11 Nov 1996 10:33:50 PST
      From: Vern Paxson <vern>
-
+     
      > I'm working for the Swedish team translating GNU program, and I'm currently
      > working with flex. I have a few questions about some of the messages which
      > I hope you can answer.
-
+     
      All of the things you're wondering about, by the way, concerning flex
      internals - probably the only person who understands what they mean in
      English is me!  So I wouldn't worry too much about getting them right.
      That said ...
-
+     
      > #: main.c:545
      > msgid "  %d protos created\n"
      >
      > Does proto mean prototype?
-
+     
      Yes - prototypes of state compression tables.
-
+     
      > #: main.c:539
      > msgid "  %d/%d (peak %d) template nxt-chk entries created\n"
      >
      > Here I'm mainly puzzled by 'nxt-chk'. I guess it means 'next-check'. (?)
      > However, 'template next-check entries' doesn't make much sense to me. To be
      > able to find a good translation I need to know a little bit more about it.
-
+     
      There is a scheme in the Aho/Sethi/Ullman compiler book for compressing
      scanner tables.  It involves creating two pairs of tables.  The first has
      "base" and "default" entries, the second has "next" and "check" entries.
@@ -5422,14 +5421,14 @@ Can you discuss some flex internals?
      correct for the current state.  Flex creates templates of series of
      next/check entries and then encodes differences from these templates as a
      way to compress the tables.
-
+     
      > #: main.c:533
      > msgid "  %d/%d base-def entries created\n"
      >
      > The same problem here for 'base-def'.
-
+     
      See above.
-
+     
      		Vern
 
 
@@ -5443,23 +5442,23 @@ unput() messes up yy_at_bol
      In-reply-to: Your message of Wed, 13 Nov 1996 17:28:38 PST.
      Date: Wed, 13 Nov 1996 19:51:54 PST
      From: Vern Paxson <vern>
-
+     
      > "unput()" them to input flow, question occurs. If I do this after I scan
      > a carriage, the variable "YY_CURRENT_BUFFER->yy_at_bol" is changed. That
      > means the carriage flag has gone.
-
+     
      You can control this by calling yy_set_bol().  It's described in the manual.
-
+     
      >      And if in pre-reading it goes to the end of file, is anything done
      > to control the end of curren buffer and end of file?
-
+     
      No, there's no way to put back an end-of-file.
-
+     
      >      By the way I am using flex 2.5.2 and using the "-l".
-
+     
      The latest release is 2.5.4, by the way.  It fixes some bugs in 2.5.2 and
      2.5.3.  You can get it from ftp.ee.lbl.gov.
-
+     
      		Vern
 
 
@@ -5473,33 +5472,33 @@ The | operator is not doing what I want
      In-reply-to: Your message of Mon, 18 Nov 1996 09:45:02 PST.
      Date: Mon, 18 Nov 1996 10:41:34 PST
      From: Vern Paxson <vern>
-
+     
      > I am not able to use the start condition scope and to use the | (OR) with
      > rules having start conditions.
-
+     
      The problem is that if you use '|' as a regular expression operator, for
      example "a|b" meaning "match either 'a' or 'b'", then it must *not* have
      any blanks around it.  If you instead want the special '|' *action* (which
      from your scanner appears to be the case), which is a way of giving two
      different rules the same action:
-
+     
      	foo	|
      	bar	matched_foo_or_bar();
-
+     
      then '|' *must* be separated from the first rule by whitespace and *must*
      be followed by a new line.  You *cannot* write it as:
-
+     
      	foo | bar	matched_foo_or_bar();
-
+     
      even though you might think you could because yacc supports this syntax.
      The reason for this unfortunately incompatibility is historical, but it's
      unlikely to be changed.
-
+     
      Your problems with start condition scope are simply due to syntax errors
      from your use of '|' later confusing flex.
-
+     
      Let me know if you still have problems.
-
+     
      		Vern
 
 
@@ -5513,10 +5512,10 @@ Why can't flex understand this variable trailing context pattern?
      In-reply-to: Your message of Sat, 23 Nov 1996 16:50:09 PST.
      Date: Sat, 23 Nov 1996 17:07:32 PST
      From: Vern Paxson <vern>
-
+     
      > Enclosed is a lex file that "real" lex will process, but I cannot get
      > flex to process it.  Could you try it and maybe point me in the right direction?
-
+     
      Your problem is that some of the definitions in the scanner use the '/'
      trailing context operator, and have it enclosed in ()'s.  Flex does not
      allow this operator to be enclosed in ()'s because doing so allows undefined
@@ -5524,7 +5523,7 @@ Why can't flex understand this variable trailing context pattern?
      parentheses.  Note that you must also be building the scanner with the -l
      option for AT&T lex compatibility.  Without this option, flex automatically
      encloses the definitions in parentheses.
-
+     
      		Vern
 
 
@@ -5538,29 +5537,29 @@ The ^ operator isn't working
      In-reply-to: Your message of Tue, 26 Nov 1996 14:35:01 PST.
      Date: Tue, 26 Nov 1996 11:15:05 PST
      From: Vern Paxson <vern>
-
+     
      > In my lexer code, i have the line :
      > ^\*.*          { }
      >
      > Thus all lines starting with an astrix (*) are comment lines.
      > This does not work !
-
+     
      I can't get this problem to reproduce - it works fine for me.  Note
      though that if what you have is slightly different:
-
+     
      	COMMENT	^\*.*
      	%%
      	{COMMENT}	{ }
-
+     
      then it won't work, because flex pushes back macro definitions enclosed
      in ()'s, so the rule becomes
-
+     
      	(^\*.*)		{ }
-
+     
      and now that the '^' operator is not at the immediate beginning of the
      line, it's interpreted as just a regular character.  You can avoid this
      behavior by using the "-l" lex-compatibility flag, or "%option lex-compat".
-
+     
      		Vern
 
 
@@ -5574,23 +5573,23 @@ Trailing context is getting confused with trailing optional patterns
      In-reply-to: Your message of Tue, 26 Nov 1996 16:10:41 PST.
      Date: Wed, 27 Nov 1996 10:56:25 PST
      From: Vern Paxson <vern>
-
+     
      >     Organization(s)?/[a-z]
      >
      > This matched "Organizations" (looking in debug mode, the trailing s
      > was matched with trailing context instead of the optional (s) in the
      > end of the word.
-
+     
      That should only happen with lex.  Flex can properly match this pattern.
      (That might be what you're saying, I'm just not sure.)
-
+     
      > Is there a way to avoid this dangerous trailing context problem ?
-
+     
      Unfortunately, there's no easy way.  On the other hand, I don't see why
      it should be a problem.  Lex's matching is clearly wrong, and I'd hope
      that usually the intent remains the same as expressed with the pattern,
      so flex's matching will be correct.
-
+     
      		Vern
 
 
@@ -5604,33 +5603,33 @@ Is flex GNU or not?
      In-reply-to: Your message of Mon, 02 Dec 1996 00:07:08 PST.
      Date: Sun, 01 Dec 1996 22:29:39 PST
      From: Vern Paxson <vern>
-
+     
      > I'm not sure how or where to submit bug reports (documentation or
      > otherwise) for the GNU project stuff ...
-
+     
      Well, strictly speaking flex isn't part of the GNU project.  They just
      distribute it because no one's written a decent GPL'd lex replacement.
      So you should send bugs directly to me.  Those sent to the GNU folks
      sometimes find there way to me, but some may drop between the cracks.
-
+     
      > In GNU Info, under the section 'Start Conditions', and also in the man
      > page (mine's dated April '95) is a nice little snippet showing how to
      > parse C quoted strings into a buffer, defined to be MAX_STR_CONST in
      > size. Unfortunately, no overflow checking is ever done ...
-
+     
      This is already mentioned in the manual:
-
+     
      Finally, here's an example of how to  match  C-style  quoted
      strings using exclusive start conditions, including expanded
      escape sequences (but not including checking  for  a  string
      that's too long):
-
+     
      The reason for not doing the overflow checking is that it will needlessly
      clutter up an example whose main purpose is just to demonstrate how to
      use flex.
-
+     
      The latest release is 2.5.4, by the way, available from ftp.ee.lbl.gov.
-
+     
      		Vern
 
 
@@ -5644,18 +5643,18 @@ ERASEME53
      In-reply-to: Your message of Thu, 06 Mar 1997 23:50:16 PST.
      Date: Thu, 06 Mar 1997 15:54:19 PST
      From: Vern Paxson <vern>
-
+     
      > [:alpha:] ([:alnum:] | \\_)*
-
+     
      If your rule really has embedded blanks as shown above, then it won't
      work, as the first blank delimits the rule from the action.  (It wouldn't
      even compile ...)  You need instead:
-
+     
      [:alpha:]([:alnum:]|\\_)*
-
+     
      and that should work fine - there's no restriction on what can go inside
      of ()'s except for the trailing context operator, '/'.
-
+     
      		Vern
 
 
@@ -5669,21 +5668,21 @@ I need to scan if-then-else blocks and while loops
      In-reply-to: Your message of Fri, 30 May 1997 13:33:27 PDT.
      Date: Fri, 30 May 1997 10:46:35 PDT
      From: Vern Paxson <vern>
-
+     
      > We'd like to add "if-then-else", "while", and "for" statements to our
      > language ...
      > We've investigated many possible solutions.  The one solution that seems
      > the most reasonable involves knowing the position of a TOKEN in yyin.
-
+     
      I strongly advise you to instead build a parse tree (abstract syntax tree)
      and loop over that instead.  You'll find this has major benefits in keeping
      your interpreter simple and extensible.
-
+     
      That said, the functionality you mention for get_position and set_position
      have been on the to-do list for a while.  As flex is a purely spare-time
      project for me, no guarantees when this will be added (in particular, it
      for sure won't be for many months to come).
-
+     
      		Vern
 
 
@@ -5697,7 +5696,7 @@ ERASEME55
      In-reply-to: Your message of 09 Aug 1997 17:11:41 PDT.
      Date: Fri, 15 Aug 1997 10:48:19 PDT
      From: Vern Paxson <vern>
-
+     
      > #define YY_DECL   int yylex (YYSTYPE *lvalp, struct parser_control
      > *parm)
      >
@@ -5708,11 +5707,11 @@ ERASEME55
      > Is this supposed to be possible, or is it being worked on (I DID
      > notice the comment that scanner classes are still experimental, so I'm
      > not too hopeful)?
-
+     
      What you need to do is derive a subclass from yyFlexLexer that provides
      the above yylex() method, squirrels away lvalp and parm into member
      variables, and then invokes yyFlexLexer::yylex() to do the regular scanning.
-
+     
      		Vern
 
 
@@ -5726,29 +5725,29 @@ ERASEME56
      In-reply-to: Your message of Fri, 05 Sep 1997 16:07:24 PDT.
      Date: Fri, 05 Sep 1997 10:01:54 PDT
      From: Vern Paxson <vern>
-
+     
      > In that example you show how to count comment lines when using
      > C style /* ... */ comments. My question is, shouldn't you take into
      > account a scenario where end of a comment marker occurs inside
      > character or string literals?
-
+     
      The scanner certainly needs to also scan character and string literals.
      However it does that (there's an example in the man page for strings), the
      lexer will recognize the beginning of the literal before it runs across the
      embedded "/*".  Consequently, it will finish scanning the literal before it
      even considers the possibility of matching "/*".
-
+     
      Example:
-
+     
      	'([^']*|{ESCAPE_SEQUENCE})'
-
+     
      will match all the text between the ''s (inclusive).  So the lexer
      considers this as a token beginning at the first ', and doesn't even
      attempt to match other tokens inside it.
-
+     
      I thinnk this subtlety is not worth putting in the manual, as I suspect
      it would confuse more people than it would enlighten.
-
+     
      		Vern
 
 
@@ -5762,25 +5761,25 @@ ERASEME57
      In-reply-to: Your message of Sat, 06 Sep 1997 11:27:21 PDT.
      Date: Mon, 08 Sep 1997 11:38:08 PDT
      From: Vern Paxson <vern>
-
+     
      > %%
      > [a-zA-Z]+       /* skip a line */
      >                 {  printf("got %s\n", yytext); }
      > %%
-
+     
      What version of flex are you using?  If I feed this to 2.5.4, it complains:
-
+     
      	"bug.l", line 5: EOF encountered inside an action
      	"bug.l", line 5: unrecognized rule
      	"bug.l", line 5: fatal parse error
-
+     
      Not the world's greatest error message, but it manages to flag the problem.
-
+     
      (With the introduction of start condition scopes, flex can't accommodate
      an action on a separate line, since it's ambiguous with an indented rule.)
-
+     
      You can get 2.5.4 from ftp.ee.lbl.gov.
-
+     
      		Vern
 
 
@@ -5833,26 +5832,26 @@ unnamed-faq-62
      In-reply-to: Your message of Mon, 17 Nov 1997 17:16:06 PST.
      Date: Mon, 17 Nov 1997 17:16:15 PST
      From: Vern Paxson <vern>
-
+     
      > I took a quick look into the flex-sources and altered some #defines in
      > flexdefs.h:
      >
      > 	#define INITIAL_MNS 64000
      > 	#define MNS_INCREMENT 1024000
      > 	#define MAXIMUM_MNS 64000
-
+     
      The things to fix are to add a couple of zeroes to:
-
+     
      #define JAMSTATE -32766 /* marks a reference to the state that always jams */
      #define MAXIMUM_MNS 31999
      #define BAD_SUBSCRIPT -32767
      #define MAX_SHORT 32700
-
+     
      and, if you get complaints about too many rules, make the following change too:
-
+     
      	#define YY_TRAILING_MASK 0x200000
      	#define YY_TRAILING_HEAD_MASK 0x400000
-
+     
      - Vern
 
 
@@ -5866,7 +5865,7 @@ unnamed-faq-63
      In-reply-to: Your message of Mon, 08 Dec 1997 15:54:15 PST.
      Date: Mon, 15 Dec 1997 13:21:35 PST
      From: Vern Paxson <vern>
-
+     
      >         stdin_handle = YY_CURRENT_BUFFER;
      >         ifstream fin( "aFile" );
      >         yy_switch_to_buffer( yy_create_buffer( fin, YY_BUF_SIZE ) );
@@ -5880,11 +5879,11 @@ unnamed-faq-63
      > first argument (as stated in the man page). However, fin is a ifstream
      > object. Any ideas on what I might be doing wrong? Any help would be
      > appreciated. Thanks!!
-
+     
      You need to pass &fin, to turn it into an ifstream* instead of an ifstream.
      Then its type will be compatible with the expected istream*, because ifstream
      is derived from istream.
-
+     
      		Vern
 
 
@@ -5898,22 +5897,22 @@ unnamed-faq-64
      In-reply-to: Your message of Tue, 16 Dec 1997 15:17:34 PST.
      Date: Tue, 16 Dec 1997 14:17:09 PST
      From: Vern Paxson <vern>
-
+     
      > Can you explain to me what is ment by a long-jump in relation to flex?
-
+     
      Using the longjmp() function while inside yylex() or a routine called by it.
-
+     
      > what is the flex activation frame.
-
+     
      Just yylex()'s stack frame.
-
+     
      > As far as I can see yyrestart will bring me back to the sart of the input
      > file and using flex++ isnot really an option!
-
+     
      No, yyrestart() doesn't imply a rewind, even though its name might sound
      like it does.  It tells the scanner to flush its internal buffers and
      start reading from the given file at its present location.
-
+     
      		Vern
 
 
@@ -5927,7 +5926,7 @@ unnamed-faq-65
      In-reply-to: Your message of Sat, 20 Dec 1997 19:38:19 PST.
      Date: Sun, 21 Dec 1997 21:30:46 PST
      From: Vern Paxson <vern>
-
+     
      > /usr/lib/yaccpar: In function `int yyparse()':
      > /usr/lib/yaccpar:184: warning: implicit declaration of function `int yylex(...)'
      >
@@ -5935,11 +5934,11 @@ unnamed-faq-65
      >    _yylex
      >    _yyparse
      >    _yyin
-
+     
      This is a known problem with Solaris C++ (and/or Solaris yacc).  I believe
      the fix is to explicitly insert some 'extern "C"' statements for the
      corresponding routines/symbols.
-
+     
      		Vern
 
 
@@ -5954,7 +5953,7 @@ unnamed-faq-66
      In-reply-to: Your message of Fri, 12 Dec 1997 17:57:29 PST.
      Date: Sun, 21 Dec 1997 22:33:37 PST
      From: Vern Paxson <vern>
-
+     
      > This is my definition for float and integer types:
      > . . .
      > NZD          [1-9]
@@ -5962,14 +5961,14 @@ unnamed-faq-66
      > I've tested my program on other lex version (on UNIX Sun Solaris an HP
      > UNIX) and it work well, so I think that my definitions are correct.
      > There are any differences between Lex and Flex?
-
+     
      There are indeed differences, as discussed in the man page.  The one
      you are probably running into is that when flex expands a name definition,
      it puts parentheses around the expansion, while lex does not.  There's
      an example in the man page of how this can lead to different matching.
      Flex's behavior complies with the POSIX standard (or at least with the
      last POSIX draft I saw).
-
+     
      		Vern
 
 
@@ -5983,18 +5982,18 @@ unnamed-faq-67
      In-reply-to: Your message of Mon, 22 Dec 1997 16:06:35 PST.
      Date: Mon, 22 Dec 1997 14:35:05 PST
      From: Vern Paxson <vern>
-
+     
      > Thank you very much for your help. I compile and link well with C++ while
      > declaring 'yylex ...' extern, But a little problem remains. I get a
      > segmentation default when executing ( I linked with lfl library) while it
      > works well when using LEX instead of flex. Do you have some ideas about the
      > reason for this ?
-
+     
      The one possible reason for this that comes to mind is if you've defined
      yytext as "extern char yytext[]" (which is what lex uses) instead of
      "extern char *yytext" (which is what flex uses).  If it's not that, then
      I'm afraid I don't know what the problem might be.
-
+     
      		Vern
 
 
@@ -6008,10 +6007,10 @@ unnamed-faq-68
      In-reply-to: Your message of Tue, 06 Jan 1998 10:34:21 PST.
      Date: Tue, 06 Jan 1998 19:19:30 PST
      From: Vern Paxson <vern>
-
+     
      > The problem is that when I do this (using %option c++) start
      > conditions seem to not apply.
-
+     
      The BEGIN macro modifies the yy_start variable.  For C scanners, this
      is a static with scope visible through the whole file.  For C++ scanners,
      it's a member variable, so it only has visible scope within a member
@@ -6021,7 +6020,7 @@ unnamed-faq-68
      a declaration of yy_start in order to get your scanner to compile when
      using C++; instead, the correct fix is to make lexbegin() a member
      function (by deriving from yyFlexLexer).
-
+     
      		Vern
 
 
@@ -6035,15 +6034,15 @@ unnamed-faq-69
      In-reply-to: Your message of Mon, 12 Jan 1998 18:58:23 PST.
      Date: Mon, 12 Jan 1998 12:03:15 PST
      From: Vern Paxson <vern>
-
+     
      > The problem is how to determine the current position in flex active
      > buffer when a rule is matched....
-
+     
      You will need to keep track of this explicitly, such as by redefining
      YY_USER_ACTION to count the number of characters matched.
-
+     
      The latest flex release, by the way, is 2.5.4, available from ftp.ee.lbl.gov.
-
+     
      		Vern
 
 
@@ -6057,16 +6056,16 @@ unnamed-faq-70
      In-reply-to: Your message of Mon, 26 Jan 1998 13:05:35 PST.
      Date: Tue, 27 Jan 1998 22:41:52 PST
      From: Vern Paxson <vern>
-
+     
      > That requirement involves knowing
      > the character position at which a particular token was matched
      > in the lexer.
-
+     
      The way you have to do this is by explicitly keeping track of where
      you are in the file, by counting the number of characters scanned
      for each token (available in yyleng).  It may prove convenient to
      do this by redefining YY_USER_ACTION, as described in the manual.
-
+     
      		Vern
 
 
@@ -6080,22 +6079,22 @@ unnamed-faq-71
      In-reply-to: Your message of Mon, 26 Jan 1998 05:50:16 PST.
      Date: Tue, 27 Jan 1998 22:45:37 PST
      From: Vern Paxson <vern>
-
+     
      > It seems useful for the parser to be able to tell the lexer about such
      > context dependencies, because then they don't have to be limited to
      > local or sequential context.
-
+     
      One way to do this is to have the parser call a stub routine that's
      included in the scanner's .l file, and consequently that has access ot
      BEGIN.  The only ugliness is that the parser can't pass in the state
      it wants, because those aren't visible - but if you don't have many
      such states, then using a different set of names doesn't seem like
      to much of a burden.
-
+     
      While generating a .h file like you suggests is certainly cleaner,
      flex development has come to a virtual stand-still :-(, so a workaround
      like the above is much more pragmatic than waiting for a new feature.
-
+     
      		Vern
 
 
@@ -6109,16 +6108,16 @@ unnamed-faq-72
      In-reply-to: Your message of Fri, 30 Jan 1998 12:00:43 PST.
      Date: Fri, 30 Jan 1998 12:42:32 PST
      From: Vern Paxson <vern>
-
+     
      > lex.yy.c:1996: parse error before `='
-
+     
      This is the key, identifying this error.  (It may help to pinpoint
      it by using flex -L, so it doesn't generate #line directives in its
      output.)  I will bet you heavy money that you have a start condition
      name that is also a variable name, or something like that; flex spits
      out #define's for each start condition name, mapping them to a number,
      so you can wind up with:
-
+     
      	%x foo
      	%%
      		...
@@ -6127,10 +6126,10 @@ unnamed-faq-72
      		{
      		int foo = 3;
      		}
-
+     
      and the penultimate will turn into "int 1 = 3" after C preprocessing,
      since flex will put "#define foo 1" in the generated scanner.
-
+     
      		Vern
 
 
@@ -6144,19 +6143,19 @@ unnamed-faq-73
      In-reply-to: Your message of Mon, 02 Feb 1998 14:10:01 PST.
      Date: Mon, 02 Feb 1998 11:15:12 PST
      From: Vern Paxson <vern>
-
+     
      > I am curious as to
      > whether there is a simple way to backtrack from the generated source to
      > reproduce the lost list of tokens we are searching on.
-
+     
      In theory, it's straight-forward to go from the DFA representation
      back to a regular-expression representation - the two are isomorphic.
      In practice, a huge headache, because you have to unpack all the tables
      back into a single DFA representation, and then write a program to munch
      on that and translate it into an RE.
-
+     
      Sorry for the less-than-happy news ...
-
+     
      		Vern
 
 
@@ -6170,21 +6169,21 @@ unnamed-faq-74
      In-reply-to: Your message of Thu, 19 Feb 1998 11:01:17 PST.
      Date: Thu, 19 Feb 1998 08:48:51 PST
      From: Vern Paxson <vern>
-
+     
      > What I have found, is that the smaller the data chunk, the faster the
      > program executes. This is the opposite of what I expected. Should this be
      > happening this way?
-
+     
      This is exactly what will happen if your input file has embedded NULs.
      From the man page:
-
+     
      A final note: flex is slow when matching NUL's, particularly
      when  a  token  contains multiple NUL's.  It's best to write
      rules which match short amounts of text if it's  anticipated
      that the text will often include NUL's.
-
+     
      So that's the first thing to look for.
-
+     
      		Vern
 
 
@@ -6198,31 +6197,31 @@ unnamed-faq-75
      In-reply-to: Your message of Thu, 19 Feb 1998 11:01:17 PST.
      Date: Thu, 19 Feb 1998 15:42:25 PST
      From: Vern Paxson <vern>
-
+     
      So there are several problems.
-
+     
      First, to go fast, you want to match as much text as possible, which
      your scanners don't in the case that what they're scanning is *not*
      a <RN> tag.  So you want a rule like:
-
+     
      	[^<]+
-
+     
      Second, C++ scanners are particularly slow if they're interactive,
      which they are by default.  Using -B speeds it up by a factor of 3-4
      on my workstation.
-
+     
      Third, C++ scanners that use the istream interface are slow, because
      of how poorly implemented istream's are.  I built two versions of
      the following scanner:
-
+     
      	%%
      	.*\n
      	.*
      	%%
-
+     
      and the C version inhales a 2.5MB file on my workstation in 0.8 seconds.
      The C++ istream version, using -B, takes 3.8 seconds.
-
+     
      		Vern
 
 
@@ -6236,14 +6235,14 @@ unnamed-faq-76
      In-reply-to: Your message of Wed, 03 Jun 1998 11:26:22 PDT.
      Date: Wed, 03 Jun 1998 10:22:26 PDT
      From: Vern Paxson <vern>
-
+     
      > I am researching the Y2K problem with General Electric R&D
      > and need to know if there are any known issues concerning
      > the above mentioned software and Y2K regardless of version.
-
+     
      There shouldn't be, all it ever does with the date is ask the system
      for it and then print it out.
-
+     
      		Vern
 
 
@@ -6257,16 +6256,16 @@ unnamed-faq-77
      In-reply-to: Your message of Wed, 15 Jul 1998 21:30:13 PDT.
      Date: Tue, 21 Jul 1998 14:23:34 PDT
      From: Vern Paxson <vern>
-
+     
      > To overcome this, I gets() the stdin into a string and lex the string. The
      > string is lexed OK except that the end of string isn't lexed properly
      > (yy_scan_string()), that is the lexer dosn't recognise the end of string.
-
+     
      Flex doesn't contain mechanisms for recognizing buffer endpoints.  But if
      you use fgets instead (which you should anyway, to protect against buffer
      overflows), then the final \n will be preserved in the string, and you can
      scan that in order to find the end of the string.
-
+     
      		Vern
 
 
@@ -6280,7 +6279,7 @@ unnamed-faq-78
      In-reply-to: Your message of Mon, 27 Jul 1998 02:10:04 PDT.
      Date: Tue, 28 Jul 1998 01:10:34 PDT
      From: Vern Paxson <vern>
-
+     
      > %{
      > int mylineno = 0;
      > %}
@@ -6296,9 +6295,9 @@ unnamed-faq-78
      >
      > How will this work if I want to run a multi-threaded application with each
      > thread creating a FlexLexer instance?
-
+     
      Derive your own subclass and make mylineno a member variable of it.
-
+     
      		Vern
 
 
@@ -6312,7 +6311,7 @@ unnamed-faq-79
      In-reply-to: Your message of Tue, 04 Aug 1998 16:55:39 PDT.
      Date: Tue, 04 Aug 1998 22:28:45 PDT
      From: Vern Paxson <vern>
-
+     
      > Vern Paxson,
      >
      > I followed your advice, posted on Usenet bu you, and emailed to me
@@ -6327,25 +6326,25 @@ unnamed-faq-79
      >
      > and compiled.
      > All looked fine, including check and bigcheck, so I installed.
-
+     
      Hmmm, you shouldn't increase MAX_SHORT, though looking through my email
      archives I see that I did indeed recommend doing so.  Try setting it back
      to 32700; that should suffice that you no longer need -Ca.  If it still
      hangs, then the interesting question is - where?
-
+     
      > Compiling the same hanged program with a out-of-the-box (RedHat 4.2
      > distribution of Linux)
      > flex 2.5.4 binary works.
-
+     
      Since Linux comes with source code, you should diff it against what
      you have to see what problems they missed.
-
+     
      > Should I always compile with the -Ca option now ? even short and simple
      > filters ?
-
+     
      No, definitely not.  It's meant to be for those situations where you
      absolutely must squeeze every last cycle out of your scanner.
-
+     
      		Vern
 
 
@@ -6359,10 +6358,10 @@ unnamed-faq-80
      In-reply-to: Your message of Tue, 11 Aug 1998 11:55:30 PDT.
      Date: Mon, 17 Aug 1998 23:57:42 PDT
      From: Vern Paxson <vern>
-
+     
      > I would like to use flex under the hood to generate a binary file
      > containing the data structures that control the parse.
-
+     
      This has been on the wish-list for a long time.  In principle it's
      straight-forward - you redirect mkdata() et al's I/O to another file,
      and modify the skeleton to have a start-up function that slurps these
@@ -6371,12 +6370,12 @@ unnamed-faq-80
      going down this path :-( ; and (2) being careful about buffering so
      that when the tables change you make sure the scanner starts in the
      correct state and reading at the right point in the input file.
-
+     
      > I was wondering if you know of anyone who has used flex in this way.
-
+     
      I don't - but it seems like a reasonable project to undertake (unlike
      numerous other flex tweaks :-).
-
+     
      		Vern
 
 
@@ -6404,30 +6403,30 @@ unnamed-faq-81
      MIME-Version: 1.0
      Content-Type: text/plain; charset=US-ASCII
      Content-Transfer-Encoding: 7bit
-
+     
      Hi Vern,
-
+     
      Yesterday, I encountered a strange problem: I use the macro processor m4
      to include some lengthy lists into a .l file. Following is a flex macro
      definition that causes some serious pain in my neck:
-
+     
      AUTHOR           ("A. Boucard / L. Boucard"|"A. Dastarac / M. Levent"|"A.Boucaud / L.Boucaud"|"Abderrahim Lamchichi"|"Achmat Dangor"|"Adeline Toullier"|"Adewale Maja-Pearce"|"Ahmed Ziri"|"Akram Ellyas"|"Alain Bihr"|"Alain Gresh"|"Alain Guillemoles"|"Alain Joxe"|"Alain Morice"|"Alain Renon"|"Alain Zecchini"|"Albert Memmi"|"Alberto Manguel"|"Alex De Waal"|"Alfonso Artico"| [...])
-
+     
      The complete list contains about 10kB. When I try to "flex" this file
      (on a Solaris 2.6 machine, using a modified flex 2.5.4 (I only increased
      some of the predefined values in flexdefs.h) I get the error:
-
+     
      myflex/flex -8  sentag.tmp.l
      flex scanner push-back overflow
-
+     
      When I remove the slashes in the macro definition everything works fine.
      As I understand it, the double quotes escape the slash-character so it
      really means "/" and not "trailing context". Furthermore, I tried to
      escape the slashes with backslashes, but with no use, the same error message
      appeared when flexing the code.
-
+     
      Do you have an idea what's going on here?
-
+     
      Greetings from Germany,
      	Georg
      --
@@ -6445,21 +6444,21 @@ unnamed-faq-82
      In-reply-to: Your message of Thu, 20 Aug 1998 09:47:54 PDT.
      Date: Thu, 20 Aug 1998 07:05:35 PDT
      From: Vern Paxson <vern>
-
+     
      > myflex/flex -8  sentag.tmp.l
      > flex scanner push-back overflow
-
+     
      Flex itself uses a flex scanner.  That scanner is running out of buffer
      space when it tries to unput() the humongous macro you've defined.  When
      you remove the '/'s, you make it small enough so that it fits in the buffer;
      removing spaces would do the same thing.
-
+     
      The fix is to either rethink how come you're using such a big macro and
      perhaps there's another/better way to do it; or to rebuild flex's own
      scan.c with a larger value for
-
+     
      	#define YY_BUF_SIZE 16384
-
+     
      - Vern
 
 
@@ -6473,7 +6472,7 @@ unnamed-faq-83
      In-reply-to: Your message of Fri, 04 Sep 1998 12:18:43 +0200.
      Date: Sat, 05 Sep 1998 00:59:49 PDT
      From: Vern Paxson <vern>
-
+     
      > %%
      >
      > "TEST1\n"       { fprintf(stderr, "TEST1\n"); yyless(5); }
@@ -6488,7 +6487,7 @@ unnamed-faq-83
      > TEST1
      > empty line
      > ------------------------------------------------
-
+     
      IMHO, it's not clear whether or not this is in fact a bug.  It depends
      on whether you view yyless() as backing up in the input stream, or as
      pushing new characters onto the beginning of the input stream.  Flex
@@ -6496,16 +6495,16 @@ unnamed-faq-83
      and so considers the newline as in fact matching at the beginning of a
      line, as after all the last token scanned an entire line and so the
      scanner is now at the beginning of a new line.
-
+     
      I agree that this is counter-intuitive for yyless(), given its
      functional description (it's less so for unput(), depending on whether
      you're unput()'ing new text or scanned text).  But I don't plan to
      change it any time soon, as it's a pain to do so.  Consequently,
      you do indeed need to use yy_set_bol() and YY_AT_BOL() to tweak
      your scanner into the behavior you desire.
-
+     
      Sorry for the less-than-completely-satisfactory answer.
-
+     
      		Vern
 
 
@@ -6519,19 +6518,19 @@ unnamed-faq-84
      In-reply-to: Your message of Thu, 24 Sep 1998 10:14:07 PDT.
      Date: Thu, 24 Sep 1998 23:28:43 PDT
      From: Vern Paxson <vern>
-
+     
      > I am using flex-2.5.2 and bison 1.25 for Solaris and I am desperately
      > trying to make my scanner restart with a new file after my parser stops
      > with a parse error. When my compiler restarts, the parser always
      > receives the token after the token (in the old file!) that caused the
      > parser error.
-
+     
      I suspect the problem is that your parser has read ahead in order
      to attempt to resolve an ambiguity, and when it's restarted it picks
      up with that token rather than reading a fresh one.  If you're using
      yacc, then the special "error" production can sometimes be used to
      consume tokens in an attempt to get the parser into a consistent state.
-
+     
      		Vern
 
 
@@ -6545,26 +6544,26 @@ unnamed-faq-85
      In-reply-to: Your message of Tue, 27 Oct 1998 16:41:42 PST.
      Date: Tue, 27 Oct 1998 16:50:14 PST
      From: Vern Paxson <vern>
-
+     
      > This brings up a feature request:  How about a command line
      > option to specify the filename when reading from stdin?  That way one
      > doesn't need to create a temporary file in order to get the "#line"
      > directives to make sense.
-
+     
      Use -o combined with -t (per the man page description of -o).
-
+     
      > P.S., Is there any simple way to use non-blocking IO to parse multiple
      > streams?
-
+     
      Simple, no.
-
+     
      One approach might be to return a magic character on EWOULDBLOCK and
      have a rule
-
+     
      	.*<magic-character>	// put back .*, eat magic character
-
+     
      This is off the top of my head, not sure it'll work.
-
+     
      		Vern
 
 
@@ -6578,25 +6577,25 @@ unnamed-faq-86
      In-reply-to: Your message of Wed, 13 Jan 1999 10:52:47 PST.
      Date: Thu, 14 Jan 1999 00:25:30 PST
      From: Vern Paxson <vern>
-
+     
      > It appears that maybe it cannot find the lfl library.
-
+     
      The Makefile in the distribution builds it, so you should have it.
      It's exceedingly trivial, just a main() that calls yylex() and
      a yyrap() that always returns 1.
-
+     
      > %%
      >       \n      ++num_lines; ++num_chars;
      >       .       ++num_chars;
-
+     
      You can't indent your rules like this - that's where the errors are coming
      from.  Flex copies indented text to the output file, it's how you do things
      like
-
+     
      	int num_lines_seen = 0;
-
+     
      to declare local variables.
-
+     
      		Vern
 
 
@@ -6610,13 +6609,13 @@ unnamed-faq-87
      In-reply-to: Your message of Tue, 09 Feb 1999 13:53:46 PST.
      Date: Tue, 09 Feb 1999 21:03:37 PST
      From: Vern Paxson <vern>
-
+     
      > In the flex.skl file the size of the default input buffers is set.  Can you
      > explain why this size is set and why it is such a high number.
-
+     
      It's large to optimize performance when scanning large files.  You can
      safely make it a lot lower if needed.
-
+     
      		Vern
 
 
@@ -6630,20 +6629,20 @@ unnamed-faq-88
      In-reply-to: Your message of Wed, 24 Feb 1999 15:31:46 PST.
      Date: Thu, 25 Feb 1999 00:11:31 PST
      From: Vern Paxson <vern>
-
+     
      > I'm extending a larger scanner written in Flex and I keep running into
      > problems. More specifically, I get the error message:
      > "flex: input rules are too complicated (>= 32000 NFA states)"
-
+     
      Increase the definitions in flexdef.h for:
-
+     
      #define JAMSTATE -32766 /* marks a reference to the state that always j
      ams */
      #define MAXIMUM_MNS 31999
      #define BAD_SUBSCRIPT -32767
-
+     
      recompile everything, and it should all work.
-
+     
      		Vern
 
 
@@ -6657,28 +6656,28 @@ unnamed-faq-90
      In-reply-to: Your message of Mon, 31 May 1999 18:44:49 PDT.
      Date: Tue, 01 Jun 1999 00:15:07 PDT
      From: Vern Paxson <vern>
-
+     
      >   I have a trouble with FLEX. Why rule "/*".*"*/" work properly,=20
      > but rule "/*"(.|\n)*"*/" don't work ?
-
+     
      The second of these will have to scan the entire input stream (because
      "(.|\n)*" matches an arbitrary amount of any text) in order to see if
      it ends with "*/", terminating the comment.  That potentially will overflow
      the input buffer.
-
+     
      >   More complex rule "/*"([^*]|(\*/[^/]))*"*/ give an error
      > 'unrecognized rule'.
-
+     
      You can't use the '/' operator inside parentheses.  It's not clear
      what "(a/b)*" actually means.
-
+     
      >   I now use workaround with state <comment>, but single-rule is
      > better, i think.
-
+     
      Single-rule is nice but will always have the problem of either setting
      restrictions on comments (like not allowing multi-line comments) and/or
      running the risk of consuming the entire input stream, as noted above.
-
+     
      		Vern
 
 
@@ -6705,47 +6704,47 @@ unnamed-faq-91
      Organization: My Deja Email  (http://www.my-deja.com:80)
      Content-Type: text/plain; charset=us-ascii
      Content-Transfer-Encoding: 7bit
-
+     
      Dear Dr. Paxon,
-
+     
      I have been using flex for years.
      It works very well on many projects.
      Most case, I used it to generate a scanner on C language.
      However, one project I needed to generate  a scanner
      on C++ lanuage. Thanks to your enhancement, flex did
      the job.
-
+     
      Currently, I'm working on enhancing my previous project.
      I need to deal with multiple input streams (recursive
      inclusion) in this scanner (C++).
      I did similar thing for another scanner (C) as you
      explained in your documentation.
-
+     
      The generated scanner (C++) has necessary methods:
      - switch_to_buffer(struct yy_buffer_state *b)
      - yy_create_buffer(istream *is, int sz)
      - yy_delete_buffer(struct yy_buffer_state *b)
-
+     
      However, I couldn't figure out how to access current
      buffer (yy_current_buffer).
-
+     
      yy_current_buffer is a protected member of yyFlexLexer.
      I can't access it directly.
      Then, I thought yy_create_buffer() with is = 0 might
      return current stream buffer. But it seems not as far
      as I checked the source. (flex 2.5.4)
-
+     
      I went through the Web in addition to Flex documentation.
      However, it hasn't been successful, so far.
-
+     
      It is not my intention to bother you, but, can you
      comment about how to obtain the current stream buffer?
-
+     
      Your response would be highly appreciated.
-
+     
      Best regards,
      Aki Niimura
-
+     
      --== Sent via Deja.com http://www.deja.com/ ==--
      Share what you know. Learn what you don't.
 
@@ -6760,12 +6759,12 @@ unnamed-faq-92
      In-reply-to: Your message of Tue, 15 Jun 1999 08:55:43 PDT.
      Date: Tue, 15 Jun 1999 09:04:24 PDT
      From: Vern Paxson <vern>
-
+     
      > However, I couldn't figure out how to access current
      > buffer (yy_current_buffer).
-
+     
      Derive your own subclass from yyFlexLexer.
-
+     
      		Vern
 
 
@@ -6779,17 +6778,17 @@ unnamed-faq-93
      In-reply-to: Your message of Wed, 23 Jun 1999 11:10:29 PDT.
      Date: Wed, 23 Jun 1999 09:01:40 PDT
      From: Vern Paxson <vern>
-
+     
      > I hope you can help me.  I am using Flex and Bison to produce an interpreted
      > language.  However all goes well until I try to implement an IF statement or
      > a WHILE.  I cannot get this to work as the parser parses all the conditions
      > eg. the TRUE and FALSE conditons to check for a rule match.  So I cannot
      > make a decision!!
-
+     
      You need to use the parser to build a parse tree (= abstract syntax trwee),
      and when that's all done you recursively evaluate the tree, binding variables
      to values at that time.
-
+     
      		Vern
 
 
@@ -6803,29 +6802,29 @@ unnamed-faq-94
      In-reply-to: Your message of Mon, 28 Jun 1999 19:21:41 PDT.
      Date: Fri, 02 Jul 1999 16:52:13 PDT
      From: Vern Paxson <vern>
-
+     
      > file, it takes an enormous amount of time. It is funny, because the
      > source code has only 12 rules!!! I think it looks like an exponencial
      > growth.
-
+     
      Right, that's the problem - some patterns (those with a lot of
      ambiguity, where yours has because at any given time the scanner can
      be in the middle of all sorts of combinations of the different
      rules) blow up exponentially.
-
+     
      For your rules, there is an easy fix.  Change the ".*" that comes fater
      the directory name to "[^ ]*".  With that in place, the rules are no
      longer nearly so ambiguous, because then once one of the directories
      has been matched, no other can be matched (since they all require a
      leading blank).
-
+     
      If that's not an acceptable solution, then you can enter a start state
      to pick up the .*\n after each directory is matched.
-
+     
      Also note that for speed, you'll want to add a ".*" rule at the end,
      otherwise rules that don't match any of the patterns will be matched
      very slowly, a character at a time.
-
+     
      		Vern
 
 
@@ -6839,7 +6838,7 @@ unnamed-faq-95
      In-reply-to: Your message of Thu, 08 Jul 1999 13:20:37 PDT.
      Date: Thu, 08 Jul 1999 08:20:39 PDT
      From: Vern Paxson <vern>
-
+     
      > I was hoping you could help me with my problem.
      >
      > I tried compiling (gnu)flex on a Solaris 2.4 machine
@@ -6861,12 +6860,12 @@ unnamed-faq-95
      > using flex or lex?
      >
      > Thanks so much for your time.
-
+     
      You managed to step on the bootstrap sequence, which first copies
      initscan.c to scan.c in order to build flex.  Try fetching a fresh
      distribution from ftp.ee.lbl.gov.  (Or you can first try removing
      ".bootstrap" and doing a make again.)
-
+     
      		Vern
 
 
@@ -6880,20 +6879,20 @@ unnamed-faq-96
      In-reply-to: Your message of Fri, 09 Jul 1999 09:16:14 PDT.
      Date: Fri, 09 Jul 1999 00:27:20 PDT
      From: Vern Paxson <vern>
-
+     
      > First I removed .bootstrap (and ran make) - no luck. I downloaded the
      > software but I still have the same problem. Is there anything else I
      > could try.
-
+     
      Try:
-
+     
      	cp initscan.c scan.c
      	touch scan.c
      	make scan.o
-
+     
      If this last tries to first build scan.c from scan.l using ./flex, then
      your "make" is broken, in which case compile scan.c to scan.o by hand.
-
+     
      		Vern
 
 
@@ -6907,13 +6906,13 @@ unnamed-faq-97
      In-reply-to: Your message of Mon, 19 Jul 1999 23:08:41 PDT.
      Date: Tue, 20 Jul 1999 00:18:26 PDT
      From: Vern Paxson <vern>
-
+     
      > I am getting a compilation error. The error is given as "unknown symbol- yylex".
-
+     
      The parser relies on calling yylex(), but you're instead using the C++ scanning
      class, so you need to supply a yylex() "glue" function that calls an instance
      scanner of the scanner (e.g., "scanner->yylex()").
-
+     
      		Vern
 
 
@@ -6927,16 +6926,16 @@ unnamed-faq-98
      In-reply-to: Your message of Mon, 22 Nov 1999 11:19:04 PST.
      Date: Tue, 23 Nov 1999 15:54:30 PST
      From: Vern Paxson <vern>
-
+     
      Well, your problem is the
-
+     
      switch (yybgin-yysvec-1) {      /* witchcraft */
-
+     
      at the beginning of lex rules.  "witchcraft" == "non-portable".  It's
      assuming knowledge of the AT&T lex's internal variables.
-
+     
      For flex, you can probably do the equivalent using a switch on YYSTATE.
-
+     
      		Vern
 
 
@@ -6950,21 +6949,21 @@ unnamed-faq-99
      In-reply-to: Your message of Sun, 19 Dec 1999 17:50:24 +0530.
      Date: Wed, 22 Dec 1999 01:56:24 PST
      From: Vern Paxson <vern>
-
+     
      > When we provide the customer with an object code distribution, is it
      > necessary for us to provide source
      > for the generated C files from flex and bison since they are generated by
      > flex and bison ?
-
+     
      For flex, no.  I don't know what the current state of this is for bison.
-
+     
      > Also, is there any requrirement for us to neccessarily  provide source for
      > the grammar files which are fed into flex and bison ?
-
+     
      Again, for flex, no.
-
+     
      See the file "COPYING" in the flex distribution for the legalese.
-
+     
      		Vern
 
 
@@ -6978,15 +6977,15 @@ unnamed-faq-100
      In-reply-to: Your message of Sun, 20 Feb 2000 01:01:21 PST.
      Date: Sat, 19 Feb 2000 18:33:16 PST
      From: Vern Paxson <vern>
-
+     
      > However, I do not use unput anywhere. I do use self-referencing
      > rules like this:
      >
      > UnaryExpr               ({UnionExpr})|("-"{UnaryExpr})
-
+     
      You can't do this - flex is *not* a parser like yacc (which does indeed
      allow recursion), it is a scanner that's confined to regular expressions.
-
+     
      		Vern
 
 
@@ -7000,9 +6999,9 @@ unnamed-faq-101
      In-reply-to: Your message of Thu, 02 Mar 2000 12:29:04 PST.
      Date: Thu, 02 Mar 2000 23:00:46 PST
      From: Vern Paxson <vern>
-
+     
      If this is exactly your program:
-
+     
      > digit [0-9]
      > digits {digit}+
      > whitespace [ \t\n]+
@@ -7014,9 +7013,9 @@ unnamed-faq-101
      > "*" { printf("multop\n");}
      > {digits} { printf("NUMBER = %s\n", yytext);}
      > whitespace ;
-
+     
      then the problem is that the last rule needs to be "{whitespace}" !
-
+     
      		Vern
 
 
@@ -7060,10 +7059,10 @@ Appendix A Appendices
 
 * Menu:
 
-* Makefiles and Flex::          
-* Bison Bridge::                
-* M4 Dependency::               
-* Common Patterns::               
+* Makefiles and Flex::
+* Bison Bridge::
+* M4 Dependency::
+* Common Patterns::
 
 
 File: flex.info,  Node: Makefiles and Flex,  Next: Bison Bridge,  Prev: Appendices,  Up: Appendices
@@ -7074,17 +7073,17 @@ A.1 Makefiles and Flex
 In this appendix, we provide tips for writing Makefiles to build your
 scanners.
 
-   In a traditional build environment, we say that the '.c' files are
-the sources, and the '.o' files are the intermediate files.  When using
-'flex', however, the '.l' files are the sources, and the generated '.c'
-files (along with the '.o' files) are the intermediate files.  This
+   In a traditional build environment, we say that the ‘.c’ files are
+the sources, and the ‘.o’ files are the intermediate files.  When using
+‘flex’, however, the ‘.l’ files are the sources, and the generated ‘.c’
+files (along with the ‘.o’ files) are the intermediate files.  This
 requires you to carefully plan your Makefile.
 
-   Modern 'make' programs understand that 'foo.l' is intended to
-generate 'lex.yy.c' or 'foo.c', and will behave accordingly(1)(2).  The
-following Makefile does not explicitly instruct 'make' how to build
-'foo.c' from 'foo.l'.  Instead, it relies on the implicit rules of the
-'make' program to build the intermediate file, 'scan.c':
+   Modern ‘make’ programs understand that ‘foo.l’ is intended to
+generate ‘lex.yy.c’ or ‘foo.c’, and will behave accordingly(1)(2).  The
+following Makefile does not explicitly instruct ‘make’ how to build
+‘foo.c’ from ‘foo.l’.  Instead, it relies on the implicit rules of the
+‘make’ program to build the intermediate file, ‘scan.c’:
 
          # Basic Makefile -- relies on implicit rules
          # Creates "myprogram" from "scan.l" and "myprogram.c"
@@ -7092,10 +7091,10 @@ following Makefile does not explicitly instruct 'make' how to build
          LEX=flex
          myprogram: scan.o myprogram.o
          scan.o: scan.l
-
+     
 
    For simple cases, the above may be sufficient.  For other cases, you
-may have to explicitly instruct 'make' how to build your scanner.  The
+may have to explicitly instruct ‘make’ how to build your scanner.  The
 following is an example of a Makefile containing explicit rules:
 
          # Basic Makefile -- provides explicit rules
@@ -7104,28 +7103,28 @@ following is an example of a Makefile containing explicit rules:
          LEX=flex
          myprogram: scan.o myprogram.o
                  $(CC) -o $@  $(LDFLAGS) $^
-
+     
          myprogram.o: myprogram.c
                  $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $^
-
+     
          scan.o: scan.c
                  $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $^
-
+     
          scan.c: scan.l
                  $(LEX) $(LFLAGS) -o $@ $^
-
+     
          clean:
                  $(RM) *.o scan.c
+     
 
-
-   Notice in the above example that 'scan.c' is in the 'clean' target.
-This is because we consider the file 'scan.c' to be an intermediate
+   Notice in the above example that ‘scan.c’ is in the ‘clean’ target.
+This is because we consider the file ‘scan.c’ to be an intermediate
 file.
 
-   Finally, we provide a realistic example of a 'flex' scanner used with
-a 'bison' parser(3).  There is a tricky problem we have to deal with.
-Since a 'flex' scanner will typically include a header file (e.g.,
-'y.tab.h') generated by the parser, we need to be sure that the header
+   Finally, we provide a realistic example of a ‘flex’ scanner used with
+a ‘bison’ parser(3).  There is a tricky problem we have to deal with.
+Since a ‘flex’ scanner will typically include a header file (e.g.,
+‘y.tab.h’) generated by the parser, we need to be sure that the header
 file is generated BEFORE the scanner is compiled.  We handle this case
 in the following example:
 
@@ -7136,31 +7135,31 @@ in the following example:
          YACC    = bison -y
          YFLAGS  = -d
          objects = scan.o parse.o myprogram.o
-
+     
          myprogram: $(objects)
          scan.o: scan.l parse.c
          parse.o: parse.y
          myprogram.o: myprogram.c
-
+     
 
    In the above example, notice the line,
 
          scan.o: scan.l parse.c
 
-   , which lists the file 'parse.c' (the generated parser) as a
-dependency of 'scan.o'.  We want to ensure that the parser is created
+   , which lists the file ‘parse.c’ (the generated parser) as a
+dependency of ‘scan.o’.  We want to ensure that the parser is created
 before the scanner is compiled, and the above line seems to do the
 trick.  Feel free to experiment with your specific implementation of
-'make'.
+‘make’.
 
    For more details on writing Makefiles, see *note (make)Top::.
 
    ---------- Footnotes ----------
 
-   (1) GNU 'make' and GNU 'automake' are two such programs that provide
+   (1) GNU ‘make’ and GNU ‘automake’ are two such programs that provide
 implicit rules for flex-generated scanners.
 
-   (2) GNU 'automake' may generate code to execute flex in
+   (2) GNU ‘automake’ may generate code to execute flex in
 lex-compatible mode, or to stdout.  If this is not what you want, then
 you should provide an explicit rule in your Makefile.am
 
@@ -7172,52 +7171,52 @@ File: flex.info,  Node: Bison Bridge,  Next: M4 Dependency,  Prev: Makefiles and
 A.2 C Scanners with Bison Parsers
 =================================
 
-This section describes the 'flex' features useful when integrating
-'flex' with 'GNU bison'(1).  Skip this section if you are not using
-'bison' with your scanner.  Here we discuss only the 'flex' half of the
-'flex' and 'bison' pair.  We do not discuss 'bison' in any detail.  For
-more information about generating 'bison' parsers, see *note
+This section describes the ‘flex’ features useful when integrating
+‘flex’ with ‘GNU bison’(1).  Skip this section if you are not using
+‘bison’ with your scanner.  Here we discuss only the ‘flex’ half of the
+‘flex’ and ‘bison’ pair.  We do not discuss ‘bison’ in any detail.  For
+more information about generating ‘bison’ parsers, see *note
 (bison)Top::.
 
-   A compatible 'bison' scanner is generated by declaring '%option
-bison-bridge' or by supplying '--bison-bridge' when invoking 'flex' from
-the command line.  This instructs 'flex' that the macro 'yylval' may be
-used.  The data type for 'yylval', 'YYSTYPE', is typically defined in a
-header file, included in section 1 of the 'flex' input file.  For a list
+   A compatible ‘bison’ scanner is generated by declaring ‘%option
+bison-bridge’ or by supplying ‘--bison-bridge’ when invoking ‘flex’ from
+the command line.  This instructs ‘flex’ that the macro ‘yylval’ may be
+used.  The data type for ‘yylval’, ‘YYSTYPE’, is typically defined in a
+header file, included in section 1 of the ‘flex’ input file.  For a list
 of functions and macros available, *Note bison-functions::.
 
    The declaration of yylex becomes,
 
            int yylex ( YYSTYPE * lvalp, yyscan_t scanner );
 
-   If '%option bison-locations' is specified, then the declaration
+   If ‘%option bison-locations’ is specified, then the declaration
 becomes,
 
            int yylex ( YYSTYPE * lvalp, YYLTYPE * llocp, yyscan_t scanner );
 
-   Note that the macros 'yylval' and 'yylloc' evaluate to pointers.
-Support for 'yylloc' is optional in 'bison', so it is optional in 'flex'
-as well.  The following is an example of a 'flex' scanner that is
-compatible with 'bison'.
+   Note that the macros ‘yylval’ and ‘yylloc’ evaluate to pointers.
+Support for ‘yylloc’ is optional in ‘bison’, so it is optional in ‘flex’
+as well.  The following is an example of a ‘flex’ scanner that is
+compatible with ‘bison’.
 
          /* Scanner for "C" assignment statements... sort of. */
          %{
          #include "y.tab.h"  /* Generated by bison. */
          %}
-
+     
          %option bison-bridge bison-locations
          %
-
+     
          [[:digit:]]+  { yylval->num = atoi(yytext);   return NUMBER;}
          [[:alnum:]]+  { yylval->str = strdup(yytext); return STRING;}
          "="|";"       { return yytext[0];}
          .  {}
          %
 
-   As you can see, there really is no magic here.  We just use 'yylval'
-as we would any other variable.  The data type of 'yylval' is generated
-by 'bison', and included in the file 'y.tab.h'.  Here is the
-corresponding 'bison' parser:
+   As you can see, there really is no magic here.  We just use ‘yylval’
+as we would any other variable.  The data type of ‘yylval’ is generated
+by ‘bison’, and included in the file ‘y.tab.h’.  Here is the
+corresponding ‘bison’ parser:
 
          /* Parser to convert "C" assignments to lisp. */
          %{
@@ -7252,28 +7251,28 @@ File: flex.info,  Node: M4 Dependency,  Next: Common Patterns,  Prev: Bison Brid
 A.3 M4 Dependency
 =================
 
-The macro processor 'm4'(1) must be installed wherever flex is
-installed.  'flex' invokes 'm4', found by searching the directories in
-the 'PATH' environment variable.  Any code you place in section 1 or in
+The macro processor ‘m4’(1) must be installed wherever flex is
+installed.  ‘flex’ invokes ‘m4’, found by searching the directories in
+the ‘PATH’ environment variable.  Any code you place in section 1 or in
 the actions will be sent through m4.  Please follow these rules to
-protect your code from unwanted 'm4' processing.
+protect your code from unwanted ‘m4’ processing.
 
-   * Do not use symbols that begin with, 'm4_', such as, 'm4_define', or
-     'm4_include', since those are reserved for 'm4' macro names.  If
+   • Do not use symbols that begin with, ‘m4_’, such as, ‘m4_define’, or
+     ‘m4_include’, since those are reserved for ‘m4’ macro names.  If
      for some reason you need m4_ as a prefix, use a preprocessor
      #define to get your symbol past m4 unmangled.
 
-   * Do not use the strings '[[' or ']]' anywhere in your code.  The
+   • Do not use the strings ‘[[’ or ‘]]’ anywhere in your code.  The
      former is not valid in C, except within comments and strings, but
-     the latter is valid in code such as 'x[y[z]]'.  The solution is
-     simple.  To get the literal string '"]]"', use '"]""]"'.  To get
-     the array notation 'x[y[z]]', use 'x[y[z] ]'.  Flex will attempt to
+     the latter is valid in code such as ‘x[y[z]]’.  The solution is
+     simple.  To get the literal string ‘"]]"’, use ‘"]""]"’.  To get
+     the array notation ‘x[y[z]]’, use ‘x[y[z] ]’.  Flex will attempt to
      detect these sequences in user code, and escape them.  However,
      it's best to avoid this complexity where possible, by removing such
      sequences from your code.
 
-   'm4' is only required at the time you run 'flex'.  The generated
-scanner is ordinary C or C++, and does _not_ require 'm4'.
+   ‘m4’ is only required at the time you run ‘flex’.  The generated
+scanner is ordinary C or C++, and does _not_ require ‘m4’.
 
    ---------- Footnotes ----------
 
@@ -7291,10 +7290,10 @@ use in your scanner.
 
 * Menu:
 
-* Numbers::         
-* Identifiers::         
-* Quoted Constructs::       
-* Addresses::       
+* Numbers::
+* Identifiers::
+* Quoted Constructs::
+* Addresses::
 
 
 File: flex.info,  Node: Numbers,  Next: Identifiers,  Up: Common Patterns
@@ -7303,13 +7302,13 @@ A.4.1 Numbers
 -------------
 
 C99 decimal constant
-     '([[:digit:]]{-}[0])[[:digit:]]*'
+     ‘([[:digit:]]{-}[0])[[:digit:]]*’
 
 C99 hexadecimal constant
-     '0[xX][[:xdigit:]]+'
+     ‘0[xX][[:xdigit:]]+’
 
 C99 octal constant
-     '0[01234567]*'
+     ‘0[01234567]*’
 
 C99 floating point constant
       {dseq}      ([[:digit:]]+)
@@ -7326,7 +7325,7 @@ C99 floating point constant
       {bexp}      ([pP][+-]?{dseq})
       {dfc}       (({frac}{exp_opt}{fsuff_opt})|({dseq}{exp}{fsuff_opt}))
       {hfc}       (({hpref}{hfrac}{bexp}{fsuff_opt})|({hpref}{hdseq}{bexp}{fsuff_opt}))
-
+     
       {c99_floating_point_constant}  ({dfc}|{hfc})
 
      See C99 section 6.4.4.2 for the gory details.
@@ -7345,7 +7344,7 @@ C99 Identifier
      Technically, the above pattern does not encompass all possible C99
      identifiers, since C99 allows for "implementation-defined"
      characters.  In practice, C compilers follow the above pattern,
-     with the addition of the '$' character.
+     with the addition of the ‘$’ character.
 
 UTF-8 Encoded Unicode Code Point
      [\x09\x0A\x0D\x20-\x7E]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF]([\x80-\xBF]{2})|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF]([\x80-\xBF]{2})|[\xF1-\xF3]([\x80-\xBF]{3})|\xF4[\x80-\x8F]([\x80-\xBF]{2})
@@ -7357,16 +7356,16 @@ A.4.3 Quoted Constructs
 -----------------------
 
 C99 String Literal
-     'L?\"([^\"\\\n]|(\\['\"?\\abfnrtv])|(\\([0123456]{1,3}))|(\\x[[:xdigit:]]+)|(\\u([[:xdigit:]]{4}))|(\\U([[:xdigit:]]{8})))*\"'
+     ‘L?\"([^\"\\\n]|(\\['\"?\\abfnrtv])|(\\([0123456]{1,3}))|(\\x[[:xdigit:]]+)|(\\u([[:xdigit:]]{4}))|(\\U([[:xdigit:]]{8})))*\"’
 
 C99 Comment
-     '("/*"([^*]|"*"[^/])*"*/")|("/"(\\\n)*"/"[^\n]*)'
+     ‘("/*"([^*]|"*"[^/])*"*/")|("/"(\\\n)*"/"[^\n]*)’
 
-     Note that in C99, a '//'-style comment may be split across lines,
-     and, contrary to popular belief, does not include the trailing '\n'
+     Note that in C99, a ‘//’-style comment may be split across lines,
+     and, contrary to popular belief, does not include the trailing ‘\n’
      character.
 
-     A better way to scan '/* */' comments is by line, rather than
+     A better way to scan ‘/* */’ comments is by line, rather than
      matching possibly huge comments all at once.  This will allow you
      to scan comments of unlimited length, as long as line breaks appear
      at sane intervals.  This is also more efficient when used with
@@ -7406,11 +7405,11 @@ IPv6 Address
                    (({h16}:){0,6}{h16})?::
 
      See RFC 2373 (http://www.ietf.org/rfc/rfc2373.txt) for details.
-     Note that you have to fold the definition of 'IPv6address' into one
+     Note that you have to fold the definition of ‘IPv6address’ into one
      line and that it also matches the "unspecified address" "::".
 
 URI
-     '(([^:/?#]+):)?("//"([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?'
+     ‘(([^:/?#]+):)?("//"([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?’
 
      This pattern is nearly useless, since it allows just about any
      character to appear in a URI, including spaces and control
@@ -7425,12 +7424,12 @@ Indices
 
 * Menu:
 
-* Concept Index::               
-* Index of Functions and Macros::  
-* Index of Variables::          
-* Index of Data Types::         
-* Index of Hooks::              
-* Index of Scanner Options::    
+* Concept Index::
+* Index of Functions and Macros::
+* Index of Variables::
+* Index of Data Types::
+* Index of Hooks::
+* Index of Scanner Options::
 
 
 File: flex.info,  Node: Concept Index,  Next: Index of Functions and Macros,  Prev: Indices,  Up: Indices
@@ -7441,7 +7440,9 @@ Concept Index
 [index]
 * Menu:
 
-* $ as normal character in patterns:     Patterns.            (line 275)
+* [] in patterns:                        Patterns.            (line  15)
+* %{ and %}, in Definitions Section:     Definitions Section. (line  40)
+* %{ and %}, in Rules Section:           Actions.             (line  26)
 * %array, advantages of:                 Matching.            (line  43)
 * %array, use of:                        Matching.            (line  29)
 * %array, with C++:                      Matching.            (line  65)
@@ -7449,13 +7450,11 @@ Concept Index
 * %pointer, and unput():                 Actions.             (line 162)
 * %pointer, use of:                      Matching.            (line  29)
 * %top:                                  Definitions Section. (line  44)
-* %{ and %}, in Definitions Section:     Definitions Section. (line  40)
-* %{ and %}, in Rules Section:           Actions.             (line  26)
-* <<EOF>>, use of:                       EOF.                 (line  33)
-* [] in patterns:                        Patterns.            (line  15)
 * ^ as non-special character in patterns: Patterns.           (line 275)
+* <<EOF>>, use of:                       EOF.                 (line  33)
 * |, in actions:                         Actions.             (line  33)
 * |, use of:                             Actions.             (line  83)
+* $ as normal character in patterns:     Patterns.            (line 275)
 * accessor functions, use of:            Accessor Methods.    (line  18)
 * actions:                               Actions.             (line   6)
 * actions, embedded C strings:           Actions.             (line  26)
@@ -7480,6 +7479,7 @@ Concept Index
 * braces in patterns:                    Patterns.            (line  42)
 * bugs, reporting:                       Reporting Bugs.      (line   6)
 * C code in flex input:                  Definitions Section. (line  40)
+* C-strings, in actions:                 Actions.             (line  26)
 * C++:                                   Cxx.                 (line   9)
 * C++ and %array:                        User Values.         (line  23)
 * C++ I/O, customizing:                  How do I use my own I/O classes in a C++ scanner?.
@@ -7488,7 +7488,6 @@ Concept Index
 * C++ scanners, use of:                  Cxx.                 (line 128)
 * c++, experimental form of scanner class: Cxx.               (line   6)
 * C++, multiple different scanners:      Cxx.                 (line 192)
-* C-strings, in actions:                 Actions.             (line  26)
 * case-insensitive, effect on character classes: Patterns.    (line 216)
 * character classes in patterns:         Patterns.            (line 186)
 * character classes in patterns, syntax of: Patterns.         (line  15)
@@ -7565,10 +7564,10 @@ Concept Index
 * input file, Definitions section:       Definitions Section. (line   6)
 * input file, Rules Section:             Rules Section.       (line   6)
 * input file, user code Section:         User Code Section.   (line   6)
-* input():                               Actions.             (line 173)
-* input(), and C++:                      Actions.             (line 202)
 * input, format of:                      Format.              (line   6)
 * input, matching:                       Matching.            (line   6)
+* input():                               Actions.             (line 173)
+* input(), and C++:                      Actions.             (line 202)
 * keywords, for performance:             Performance.         (line 200)
 * lex (traditional) and POSIX:           Lex and Posix.       (line   6)
 * LexerInput, overriding:                How do I use my own I/O classes in a C++ scanner?.
@@ -7746,6 +7745,15 @@ Concept Index
 * whitespace, compressing:               Actions.             (line  22)
 * yacc interface:                        Yacc.                (line  17)
 * yacc, interface:                       Yacc.                (line   6)
+* YY_CURRENT_BUFFER, and multiple buffers Finally, the macro: Multiple Input Buffers.
+                                                              (line  78)
+* YY_EXTRA_TYPE, defining your own type: Extra Data.          (line  33)
+* YY_FLUSH_BUFFER:                       Actions.             (line 206)
+* YY_INPUT:                              Generated Scanner.   (line  61)
+* YY_INPUT, overriding:                  Generated Scanner.   (line  71)
+* YY_START, example:                     Start Conditions.    (line 185)
+* YY_USER_ACTION to track each time a rule is matched: Misc Macros.
+                                                              (line  14)
 * yyalloc, overriding:                   Overriding The Default Memory Management.
                                                               (line   6)
 * yyfree, overriding:                    Overriding The Default Memory Management.
@@ -7756,16 +7764,16 @@ Concept Index
 * yyleng, modification of:               Actions.             (line  47)
 * yyless():                              Actions.             (line 125)
 * yyless(), pushing back characters:     Actions.             (line 131)
+* yylex, overriding the prototype of:    Generated Scanner.   (line  20)
 * yylex(), in generated scanner:         Generated Scanner.   (line   6)
 * yylex(), overriding:                   Generated Scanner.   (line  16)
-* yylex, overriding the prototype of:    Generated Scanner.   (line  20)
 * yylineno, in a reentrant scanner:      Reentrant Functions. (line  36)
 * yylineno, performance costs:           Performance.         (line  12)
+* yymore, and yyleng:                    Actions.             (line  47)
+* yymore, performance penalty of:        Actions.             (line 119)
 * yymore():                              Actions.             (line 104)
 * yymore() to append token to previous token: Actions.        (line 110)
 * yymore(), mega-kludge:                 Actions.             (line 110)
-* yymore, and yyleng:                    Actions.             (line  47)
-* yymore, performance penalty of:        Actions.             (line 119)
 * yyout:                                 Generated Scanner.   (line 101)
 * yyrealloc, overriding:                 Overriding The Default Memory Management.
                                                               (line   6)
@@ -7777,15 +7785,6 @@ Concept Index
                                                               (line   6)
 * yytext, modification of:               Actions.             (line  42)
 * yytext, two types of:                  Matching.            (line  29)
-* yywrap():                              Generated Scanner.   (line  85)
 * yywrap, default for:                   Generated Scanner.   (line  93)
-* YY_CURRENT_BUFFER, and multiple buffers Finally, the macro: Multiple Input Buffers.
-                                                              (line  78)
-* YY_EXTRA_TYPE, defining your own type: Extra Data.          (line  33)
-* YY_FLUSH_BUFFER:                       Actions.             (line 206)
-* YY_INPUT:                              Generated Scanner.   (line  61)
-* YY_INPUT, overriding:                  Generated Scanner.   (line  71)
-* YY_START, example:                     Start Conditions.    (line 185)
-* YY_USER_ACTION to track each time a rule is matched: Misc Macros.
-                                                              (line  14)
+* yywrap():                              Generated Scanner.   (line  85)
 
diff --git a/local/recipes/dev/flex/source/doc/flex.info-2 b/local/recipes/dev/flex/source/doc/flex.info-2
index 32356d6fc0..4908ef22eb 100644
Binary files a/local/recipes/dev/flex/source/doc/flex.info-2 and b/local/recipes/dev/flex/source/doc/flex.info-2 differ
diff --git a/local/recipes/dev/flex/source/doc/stamp-vti b/local/recipes/dev/flex/source/doc/stamp-vti
index fa020ed7ac..19f7b019d8 100644
--- a/local/recipes/dev/flex/source/doc/stamp-vti
+++ b/local/recipes/dev/flex/source/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 6 May 2017
-@set UPDATED-MONTH May 2017
+@set UPDATED 15 May 2026
+@set UPDATED-MONTH May 2026
 @set EDITION 2.6.4
 @set VERSION 2.6.4
diff --git a/local/recipes/dev/flex/source/doc/version.texi b/local/recipes/dev/flex/source/doc/version.texi
index fa020ed7ac..19f7b019d8 100644
--- a/local/recipes/dev/flex/source/doc/version.texi
+++ b/local/recipes/dev/flex/source/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 6 May 2017
-@set UPDATED-MONTH May 2017
+@set UPDATED 15 May 2026
+@set UPDATED-MONTH May 2026
 @set EDITION 2.6.4
 @set VERSION 2.6.4
diff --git a/local/recipes/dev/flex/source/src/config.h.in b/local/recipes/dev/flex/source/src/config.h.in
index 475650558e..03154f5c29 100644
--- a/local/recipes/dev/flex/source/src/config.h.in
+++ b/local/recipes/dev/flex/source/src/config.h.in
@@ -1,30 +1,18 @@
 /* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
+/* Define to 1 if using 'alloca.c'. */
 #undef C_ALLOCA
 
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
 
-/* Define to 1 if you have `alloca', as a function or macro. */
+/* Define to 1 if you have 'alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
+/* Define to 1 if <alloca.h> works. */
 #undef HAVE_ALLOCA_H
 
-/* Define to 1 if you have the `available.' function. */
-#undef HAVE_AVAILABLE_
-
-/* Define to 1 if you have the `by' function. */
-#undef HAVE_BY
-
 /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
@@ -40,43 +28,25 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the `dnl' function. */
-#undef HAVE_DNL
-
-/* Define to 1 if you have the `dup2' function. */
+/* Define to 1 if you have the 'dup2' function. */
 #undef HAVE_DUP2
 
-/* Define to 1 if you have the `enabled' function. */
-#undef HAVE_ENABLED
-
-/* Define to 1 if you have the `fork' function. */
+/* Define to 1 if you have the 'fork' function. */
 #undef HAVE_FORK
 
-/* Define to 1 if you have the `function.' function. */
-#undef HAVE_FUNCTION_
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define to 1 if you have the `have' function. */
-#undef HAVE_HAVE
-
 /* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
-/* Define to 1 if you have the `if' function. */
-#undef HAVE_IF
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `is' function. */
-#undef HAVE_IS
-
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
-/* Define to 1 if you have the `m' library (-lm). */
+/* Define to 1 if you have the 'm' library (-lm). */
 #undef HAVE_LIBM
 
 /* Define to 1 if you have the <limits.h> header file. */
@@ -85,60 +55,39 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+/* Define to 1 if your system has a GNU libc compatible 'malloc' function, and
    to 0 otherwise. */
 #undef HAVE_MALLOC
 
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
+/* Define to 1 if you have the 'memset' function. */
 #undef HAVE_MEMSET
 
-/* Define to 1 if you have the `Needed' function. */
-#undef HAVE_NEEDED
-
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
-/* Define to 1 if you have the `NLS' function. */
-#undef HAVE_NLS
-
-/* Define to 1 if you have the `not' function. */
-#undef HAVE_NOT
-
-/* Define to 1 if you have the `only' function. */
-#undef HAVE_ONLY
-
-/* Define to 1 if you have the `OpenBSD' function. */
-#undef HAVE_OPENBSD
-
-/* Define to 1 if you have the `pow' function. */
+/* Define to 1 if you have the 'pow' function. */
 #undef HAVE_POW
 
 /* Define to 1 if you have the <pthread.h> header file. */
 #undef HAVE_PTHREAD_H
 
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+/* Define to 1 if your system has a GNU libc compatible 'realloc' function,
    and to 0 otherwise. */
 #undef HAVE_REALLOC
 
-/* Define to 1 if you have the `reallocarray' function. */
+/* Define to 1 if you have the 'reallocarray' function. */
 #undef HAVE_REALLOCARRAY
 
-/* Define to 1 if you have the `regcomp' function. */
+/* Define to 1 if you have the 'regcomp' function. */
 #undef HAVE_REGCOMP
 
 /* Define to 1 if you have the <regex.h> header file. */
 #undef HAVE_REGEX_H
 
-/* Define to 1 if you have the `replacement' function. */
-#undef HAVE_REPLACEMENT
-
-/* Define to 1 if you have the `setlocale' function. */
+/* Define to 1 if you have the 'setlocale' function. */
 #undef HAVE_SETLOCALE
 
 /* Define to 1 if stdbool.h conforms to C99. */
@@ -147,16 +96,19 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
+/* Define to 1 if you have the 'strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
-/* Define to 1 if you have the `strchr' function. */
+/* Define to 1 if you have the 'strchr' function. */
 #undef HAVE_STRCHR
 
-/* Define to 1 if you have the `strdup' function. */
+/* Define to 1 if you have the 'strdup' function. */
 #undef HAVE_STRDUP
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -165,7 +117,7 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strtol' function. */
+/* Define to 1 if you have the 'strtol' function. */
 #undef HAVE_STRTOL
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
@@ -180,25 +132,19 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if you have the `Used' function. */
-#undef HAVE_USED
-
-/* Define to 1 if you have the `vfork' function. */
+/* Define to 1 if you have the 'vfork' function. */
 #undef HAVE_VFORK
 
 /* Define to 1 if you have the <vfork.h> header file. */
 #undef HAVE_VFORK_H
 
-/* Define to 1 if you have the `We' function. */
-#undef HAVE_WE
-
-/* Define to 1 if `fork' works. */
+/* Define to 1 if 'fork' works. */
 #undef HAVE_WORKING_FORK
 
-/* Define to 1 if `vfork' works. */
+/* Define to 1 if 'vfork' works. */
 #undef HAVE_WORKING_VFORK
 
-/* Define to 1 if the system has the type `_Bool'. */
+/* Define to 1 if the system has the type '_Bool'. */
 #undef HAVE__BOOL
 
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
@@ -236,30 +182,32 @@
 	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-   `char[]'. */
+/* Define to 1 if 'lex' declares 'yytext' as a 'char *' by default, not a
+   'char[]'. */
 #undef YYTEXT_POINTER
 
-/* Define to empty if `const' does not conform to ANSI C. */
+/* Define to empty if 'const' does not conform to ANSI C. */
 #undef const
 
 /* Define to rpl_malloc if the replacement function should be used. */
 #undef malloc
 
-/* Define to `int' if <sys/types.h> does not define. */
+/* Define as a signed integer type capable of holding a process identifier. */
 #undef pid_t
 
 /* Define to rpl_realloc if the replacement function should be used. */
 #undef realloc
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define as 'unsigned int' if <stddef.h> doesn't define. */
 #undef size_t
 
-/* Define as `fork' if `vfork' does not work. */
+/* Define as 'fork' if 'vfork' does not work. */
 #undef vfork
diff --git a/local/recipes/dev/m4/recipe.toml b/local/recipes/dev/m4/recipe.toml
index 0e77e26e48..147b5d5901 100644
--- a/local/recipes/dev/m4/recipe.toml
+++ b/local/recipes/dev/m4/recipe.toml
@@ -6,16 +6,121 @@ patches = ["redox.patch"]
 template = "custom"
 script = """
 DYNAMIC_INIT
+
+# Add relibc system headers to the include path.
+# The cookbook sets CPPFLAGS="-I${COOKBOOK_SYSROOT}/include" but the recipe
+# sysroot is empty for packages with no header-providing deps. The relibc
+# headers are at prefix/${TARGET}/relibc-install/${TARGET}/include/ — not in
+# the compiler's default search path. Without this, gnulib's #include_next
+# can't find the system headers and every wrapper fails.
+RELIBC_INCLUDE="${COOKBOOK_ROOT}/prefix/${TARGET}/relibc-install/${TARGET}/include"
+export CPPFLAGS="${CPPFLAGS} -isystem ${RELIBC_INCLUDE}"
+
+# relibc's float.h is missing LDBL_DIG (and possibly other LDBL_* macros).
+# For x86_64 80-bit extended precision: LDBL_DIG = floor(63 * log10(2)) = 18
+export CPPFLAGS="${CPPFLAGS} -DLDBL_DIG=18"
+
+# The redoxer toolchain has a stale libc without __fseterr/__freadahead.
+# Add the relibc library path so the linker finds the updated library.
+RELIBC_LIB="${COOKBOOK_ROOT}/prefix/${TARGET}/relibc-install/${TARGET}/lib"
+export LDFLAGS="${LDFLAGS} -L${RELIBC_LIB}"
+
+# Gnulib cross-compilation: relibc provides standard POSIX headers and types
+# but gnulib's configure can't run test programs during cross-compilation.
+export ac_cv_header_stdio_h=yes
+export ac_cv_header_stdlib_h=yes
+export ac_cv_header_string_h=yes
+export ac_cv_header_strings_h=yes
+export ac_cv_header_inttypes_h=yes
+export ac_cv_header_stdint_h=yes
+export ac_cv_header_unistd_h=yes
+export ac_cv_header_sys_types_h=yes
+export ac_cv_header_sys_stat_h=yes
+export ac_cv_header_time_h=yes
+export ac_cv_header_sys_time_h=yes
+export ac_cv_header_sys_select_h=yes
+export ac_cv_header_wchar_h=yes
+export ac_cv_header_wctype_h=yes
+export ac_cv_header_signal_h=yes
+export ac_cv_header_dirent_h=yes
+export ac_cv_header_fcntl_h=yes
+export ac_cv_header_locale_h=yes
+export ac_cv_header_errno_h=yes
+export ac_cv_header_ctype_h=yes
+export ac_cv_header_limits_h=yes
+export ac_cv_header_stdarg_h=yes
+export ac_cv_header_stddef_h=yes
+export ac_cv_header_spawn_h=yes
+
+# Standard types
+export ac_cv_type_intmax_t=yes
+export ac_cv_type_uintmax_t=yes
+export ac_cv_type_gid_t=yes
+export ac_cv_type_uid_t=yes
+export ac_cv_type_pid_t=yes
+export ac_cv_type_mode_t=yes
+export ac_cv_type_off_t=yes
+export ac_cv_type_size_t=yes
+export ac_cv_type_ssize_t=yes
+export ac_cv_type_ptrdiff_t=yes
+export ac_cv_type_nlink_t=yes
+export ac_cv_type_mbstate_t=yes
+export ac_cv_type_sigset_t=yes
+export ac_cv_type_posix_spawnattr_t=yes
+export ac_cv_type_posix_spawn_file_actions_t=yes
+export gl_cv_type_intmax_t=yes
+export gl_cv_type_ptrdiff_t_signed=yes
+export gl_cv_header_inttypes_h=yes
+export gl_cv_header_stdint_h=yes
+export gl_cv_header_inttypes_h_with_uintmax=yes
+export ac_cv_have_inttypes_h_with_uintmax=yes
+
+# m4-specific gnulib function checks
+export ac_cv_func___freadahead=yes
+export ac_cv_have_decl___freadahead=yes
+export gl_cv_header_wchar_h_correct_inline=yes
+export gl_cv_func_btowc_nul=yes
+export gl_cv_func_btowc_consistent=yes
+export gl_cv_onwards_func___freadahead=yes
+export gl_cv_socklen_t_equiv=socklen_t
+export ac_cv_func_getpagesize=yes
+export ac_cv_func_memcmp_working=yes
+
+# Tell gnulib these wide-char functions exist and work
+export ac_cv_func_btowc=yes
+export ac_cv_func_mbrtowc=yes
+export ac_cv_func_mbsinit=yes
+export ac_cv_func_wcrtomb=yes
+export ac_cv_func_wctob=yes
+export ac_cv_func_mbsrtowcs=yes
+export ac_cv_func_wcswidth=yes
+export ac_cv_func_wcwidth=yes
+export gl_cv_func_btowc=yes
+export gl_cv_func_mbrtowc=yes
+export gl_cv_func_mbsinit=yes
+export gl_cv_func_wcrtomb=yes
+export gl_cv_func_wctob=yes
+export gl_cv_func_wcwidth=yes
+export gl_cv_func_wcswidth=yes
+
+# Functions that relibc provides but gnulib can't detect during cross-compilation
+export ac_cv_func___fseterr=yes
+export ac_cv_func_getlocalename_l=yes
+
 COOKBOOK_CONFIGURE_FLAGS+=(
     --disable-nls
-    ac_cv_func___freadahead=yes
-    ac_cv_have_decl___freadahead=yes
-    gl_cv_header_wchar_h_correct_inline=yes
-    gl_cv_func_btowc_nul=yes
-    gl_cv_func_btowc_consistent=yes
-    gl_cv_onwards_func___freadahead=yes
 )
-cookbook_configure
+
+"${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"
+
+# Fix gnulib cross-compilation misdetections in config.h
+"${COOKBOOK_ROOT}/local/scripts/gnulib-cross-fix.sh" "${COOKBOOK_BUILD}/lib/config.h"
+
+# Prevent man page regeneration (help2man not available in cross-env)
+touch "${COOKBOOK_SOURCE}/doc/m4.1"
+
+"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" HELP2MAN=true
+"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}" HELP2MAN=true
 """
 
 [package]
diff --git a/local/recipes/dev/m4/redox.patch b/local/recipes/dev/m4/redox.patch
index 646b442b25..630a5dc398 100644
--- a/local/recipes/dev/m4/redox.patch
+++ b/local/recipes/dev/m4/redox.patch
@@ -4,7 +4,7 @@
        };
        const char *name = ((struct __locale_t *) locale)->mb_cur_max == 4 ? "C.UTF-8" : "C";
        return (struct string_with_storage) { name, STORAGE_INDEFINITE };
-+#elif defined __redox__ && HAVE_GETLOCALENAME_L
++#elif defined __RELIBC__ && HAVE_GETLOCALENAME_L
 +      const char *name = getlocalename_l (category, locale);
 +      return (struct string_with_storage) { name != NULL ? name : "", STORAGE_OBJECT };
  #else
diff --git a/local/recipes/dev/m4/source/aclocal.m4 b/local/recipes/dev/m4/source/aclocal.m4
index c05dd7f0f6..e4ac6f4138 100644
--- a/local/recipes/dev/m4/source/aclocal.m4
+++ b/local/recipes/dev/m4/source/aclocal.m4
@@ -14,8 +14,8 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72.90],,
-[m4_warning([this file was generated for autoconf 2.72.90.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.73],,
+[m4_warning([this file was generated for autoconf 2.73.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
diff --git a/local/recipes/dev/m4/source/configure b/local/recipes/dev/m4/source/configure
index 3f4df68ebb..6061184b56 100755
--- a/local/recipes/dev/m4/source/configure
+++ b/local/recipes/dev/m4/source/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72.90 for GNU M4 1.4.21.
+# Generated by GNU Autoconf 2.73 for GNU M4 1.4.21.
 #
 # Report bugs to <bug-m4@gnu.org>.
 #
@@ -634,7 +634,7 @@ gl_getopt_required=POSIX
 gl_trunc_required=plain
 gl_truncl_required=plain
 gt_needs=
-enable_year2038=no
+: ${enable_year2038:=no}
 ac_subst_vars='M4tests_libm4_LIBOBJDEPS
 M4tests_libm4_LTLIBOBJS
 M4tests_libm4_LIBOBJS
@@ -3969,7 +3969,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU M4 configure 1.4.21
-generated by GNU Autoconf 2.72.90
+generated by GNU Autoconf 2.73
 
 Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -4692,7 +4692,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU M4 $as_me 1.4.21, which was
-generated by GNU Autoconf 2.72.90.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -61929,14 +61929,14 @@ int
 main (void)
 {
 #if defined _AIX && !defined _AIX51
-            #error "AIX pre 5.1 is buggy"
-           #endif
-           #ifdef __ANDROID__
-            #include <android/api-level.h>
-            #if __ANDROID_API__ < 22
-             #error "Android API < 22 is buggy"
-            #endif
-           #endif
+	    #error "AIX pre 5.1 is buggy"
+	   #endif
+	   #ifdef __ANDROID__
+	    #include <android/api-level.h>
+	    #if __ANDROID_API__ < 22
+	     #error "Android API < 22 is buggy"
+	    #endif
+	   #endif
 
   ;
   return 0;
@@ -61955,27 +61955,27 @@ else case e in #(
 /* end confdefs.h.  */
 $ac_includes_default
        /* Use pstrnlen to test; 'volatile' prevents the compiler
-           from optimizing the strnlen calls away.  */
-        size_t (*volatile pstrnlen) (char const *, size_t) = strnlen;
-        char const s[] = "foobar";
-        int s_len = sizeof s - 1;
+	   from optimizing the strnlen calls away.  */
+	size_t (*volatile pstrnlen) (char const *, size_t) = strnlen;
+	char const s[] = "foobar";
+	int s_len = sizeof s - 1;
 
 int
 main (void)
 {
 
-        /* AIX 4.3 is buggy: strnlen (S, 1) == 3.  */
-        int i;
-        for (i = 0; i < s_len + 1; ++i)
-          {
-            int expected = i <= s_len ? i : s_len;
-            if (pstrnlen (s, i) != expected)
-              return 1;
-          }
+	/* AIX 4.3 is buggy: strnlen (S, 1) == 3.  */
+	int i;
+	for (i = 0; i < s_len + 1; ++i)
+	  {
+	    int expected = i <= s_len ? i : s_len;
+	    if (pstrnlen (s, i) != expected)
+	      return 1;
+	  }
 
-        /* Android 5.0 (API 21) strnlen ("", SIZE_MAX) incorrectly crashes.  */
-        if (pstrnlen ("", -1) != 0)
-          return 1;
+	/* Android 5.0 (API 21) strnlen ("", SIZE_MAX) incorrectly crashes.  */
+	if (pstrnlen ("", -1) != 0)
+	  return 1;
   ;
   return 0;
 }
@@ -75126,7 +75126,7 @@ cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by GNU M4 $as_me 1.4.21, which was
-generated by GNU Autoconf 2.72.90.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -75200,7 +75200,7 @@ cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 GNU M4 config.status 1.4.21
-configured by $0, generated by GNU Autoconf 2.72.90,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2026 Free Software Foundation, Inc.
diff --git a/local/recipes/dev/m4/source/doc/m4.info b/local/recipes/dev/m4/source/doc/m4.info
index 419e183330..2c4a13ed59 100644
--- a/local/recipes/dev/m4/source/doc/m4.info
+++ b/local/recipes/dev/m4/source/doc/m4.info
@@ -1,6 +1,6 @@
-This is m4.info, produced by makeinfo version 7.2 from m4.texi.
+This is m4.info, produced by makeinfo version 7.3 from m4.texi.
 
-This manual (6 February 2026) is for GNU M4 (version 1.4.21), a package
+This manual (15 May 2026) is for GNU M4 (version 1.4.21), a package
 containing an implementation of the m4 macro language.
 
    Copyright © 1989-1994, 2004-2014, 2016-2017, 2020-2026 Free Software
@@ -19,117 +19,117 @@ END-INFO-DIR-ENTRY
 
 
 Indirect:
-m4.info-1: 832
-m4.info-2: 317307
+m4.info-1: 828
+m4.info-2: 317295
 
 Tag Table:
 (Indirect)
-Node: Top832
-Node: Preliminaries9778
-Node: Intro10484
-Node: History12175
-Node: Bugs16228
-Node: Manual17491
-Node: Invoking m420994
-Node: Operation modes23198
-Node: Preprocessor features26297
-Node: Limits control29467
-Node: Frozen state33478
-Node: Debugging options34317
-Node: Command line files36369
-Node: Syntax38020
-Node: Names39175
-Node: Quoted strings39657
-Node: Comments40324
-Node: Other tokens41227
-Node: Input processing41821
-Ref: Input processing-Footnote-150258
-Node: Macros50455
-Node: Invocation50949
-Node: Inhibiting Invocation51750
-Node: Macro Arguments55992
-Node: Quoting Arguments59112
-Node: Macro expansion61248
-Node: Definitions61966
-Node: Define62751
-Node: Arguments65269
-Node: Pseudo Arguments69035
-Node: Undefine72664
-Node: Defn73823
-Node: Pushdef78886
-Node: Indir81626
-Node: Builtin83793
-Node: Conditionals86068
-Node: Ifdef87014
-Node: Ifelse87896
-Node: Shift91282
-Node: Forloop102102
-Node: Foreach104783
-Node: Stacks110405
-Node: Composition113540
-Node: Debugging121217
-Node: Dumpdef121810
-Node: Trace123228
-Node: Debug Levels126880
-Node: Debug Output131750
-Node: Input Control133063
-Node: Dnl133604
-Node: Changequote135546
-Node: Changecom145278
-Node: Changeword149164
-Node: M4wrap154769
-Node: File Inclusion158854
-Node: Include159175
-Node: Search Path161992
-Node: Diversions162941
-Node: Divert164648
-Node: Undivert167214
-Node: Divnum170599
-Node: Cleardivert171072
-Node: Text handling172293
-Node: Len173020
-Node: Index macro173414
-Node: Regexp174307
-Node: Substr177468
-Node: Translit178526
-Node: Patsubst181317
-Node: Format185958
-Node: Arithmetic189366
-Node: Incr189819
-Node: Eval191494
-Node: Shell commands200238
-Node: Platform macros201176
-Node: Syscmd203378
-Node: Esyscmd205753
-Node: Sysval207336
-Node: Mkstemp209303
-Node: Miscellaneous213360
-Node: Errprint213797
-Node: Location215049
-Node: M4exit217926
-Node: Frozen files220052
-Node: Using frozen files220850
-Node: Frozen file format224231
-Node: Compatibility227381
-Node: Extensions228463
-Node: Incompatibilities232517
-Node: Other Incompatibilities241821
-Node: Answers244551
-Node: Improved exch245365
-Node: Improved forloop245918
-Node: Improved foreach251374
-Node: Improved copy264752
-Node: Improved m4wrap268809
-Node: Improved cleardivert271305
-Node: Improved capitalize272303
-Node: Improved fatal_error277339
-Node: Copying This Package278436
-Node: GNU General Public License278915
-Node: Copying This Manual317307
-Node: GNU Free Documentation License317831
-Node: Indices342955
-Node: Macro index343239
-Node: Concept index349849
+Node: Top828
+Node: Preliminaries9770
+Node: Intro10476
+Node: History12167
+Node: Bugs16220
+Node: Manual17483
+Node: Invoking m420986
+Node: Operation modes23190
+Node: Preprocessor features26289
+Node: Limits control29459
+Node: Frozen state33470
+Node: Debugging options34309
+Node: Command line files36361
+Node: Syntax38012
+Node: Names39167
+Node: Quoted strings39649
+Node: Comments40316
+Node: Other tokens41219
+Node: Input processing41813
+Ref: Input processing-Footnote-150250
+Node: Macros50447
+Node: Invocation50941
+Node: Inhibiting Invocation51742
+Node: Macro Arguments55984
+Node: Quoting Arguments59104
+Node: Macro expansion61240
+Node: Definitions61958
+Node: Define62743
+Node: Arguments65261
+Node: Pseudo Arguments69027
+Node: Undefine72656
+Node: Defn73815
+Node: Pushdef78878
+Node: Indir81618
+Node: Builtin83785
+Node: Conditionals86060
+Node: Ifdef87006
+Node: Ifelse87888
+Node: Shift91274
+Node: Forloop102094
+Node: Foreach104775
+Node: Stacks110397
+Node: Composition113532
+Node: Debugging121209
+Node: Dumpdef121802
+Node: Trace123220
+Node: Debug Levels126872
+Node: Debug Output131742
+Node: Input Control133055
+Node: Dnl133596
+Node: Changequote135538
+Node: Changecom145270
+Node: Changeword149156
+Node: M4wrap154761
+Node: File Inclusion158846
+Node: Include159167
+Node: Search Path161984
+Node: Diversions162933
+Node: Divert164640
+Node: Undivert167206
+Node: Divnum170591
+Node: Cleardivert171064
+Node: Text handling172285
+Node: Len173012
+Node: Index macro173406
+Node: Regexp174299
+Node: Substr177460
+Node: Translit178518
+Node: Patsubst181309
+Node: Format185950
+Node: Arithmetic189358
+Node: Incr189811
+Node: Eval191486
+Node: Shell commands200230
+Node: Platform macros201168
+Node: Syscmd203370
+Node: Esyscmd205745
+Node: Sysval207328
+Node: Mkstemp209295
+Node: Miscellaneous213352
+Node: Errprint213789
+Node: Location215041
+Node: M4exit217918
+Node: Frozen files220044
+Node: Using frozen files220842
+Node: Frozen file format224223
+Node: Compatibility227373
+Node: Extensions228455
+Node: Incompatibilities232509
+Node: Other Incompatibilities241813
+Node: Answers244543
+Node: Improved exch245357
+Node: Improved forloop245910
+Node: Improved foreach251366
+Node: Improved copy264744
+Node: Improved m4wrap268801
+Node: Improved cleardivert271297
+Node: Improved capitalize272295
+Node: Improved fatal_error277331
+Node: Copying This Package278428
+Node: GNU General Public License278907
+Node: Copying This Manual317295
+Node: GNU Free Documentation License317819
+Node: Indices342943
+Node: Macro index343227
+Node: Concept index349837
 
 End Tag Table
 
diff --git a/local/recipes/dev/m4/source/doc/m4.info-1 b/local/recipes/dev/m4/source/doc/m4.info-1
index 9863b94282..788022e5c0 100644
--- a/local/recipes/dev/m4/source/doc/m4.info-1
+++ b/local/recipes/dev/m4/source/doc/m4.info-1
@@ -1,6 +1,6 @@
-This is m4.info, produced by makeinfo version 7.2 from m4.texi.
+This is m4.info, produced by makeinfo version 7.3 from m4.texi.
 
-This manual (6 February 2026) is for GNU M4 (version 1.4.21), a package
+This manual (15 May 2026) is for GNU M4 (version 1.4.21), a package
 containing an implementation of the m4 macro language.
 
    Copyright © 1989-1994, 2004-2014, 2016-2017, 2020-2026 Free Software
@@ -23,7 +23,7 @@ File: m4.info,  Node: Top,  Next: Preliminaries,  Up: (dir)
 GNU M4
 ******
 
-This manual (6 February 2026) is for GNU M4 (version 1.4.21), a package
+This manual (15 May 2026) is for GNU M4 (version 1.4.21), a package
 containing an implementation of the m4 macro language.
 
    Copyright © 1989-1994, 2004-2014, 2016-2017, 2020-2026 Free Software
diff --git a/local/recipes/dev/m4/source/doc/m4.info-2 b/local/recipes/dev/m4/source/doc/m4.info-2
index f83d3e8f70..aa9403bb0f 100644
--- a/local/recipes/dev/m4/source/doc/m4.info-2
+++ b/local/recipes/dev/m4/source/doc/m4.info-2
@@ -1,6 +1,6 @@
-This is m4.info, produced by makeinfo version 7.2 from m4.texi.
+This is m4.info, produced by makeinfo version 7.3 from m4.texi.
 
-This manual (6 February 2026) is for GNU M4 (version 1.4.21), a package
+This manual (15 May 2026) is for GNU M4 (version 1.4.21), a package
 containing an implementation of the m4 macro language.
 
    Copyright © 1989-1994, 2004-2014, 2016-2017, 2020-2026 Free Software
diff --git a/local/recipes/dev/m4/source/doc/stamp-vti b/local/recipes/dev/m4/source/doc/stamp-vti
index 745a8bdb1c..174211ab7d 100644
--- a/local/recipes/dev/m4/source/doc/stamp-vti
+++ b/local/recipes/dev/m4/source/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 6 February 2026
-@set UPDATED-MONTH February 2026
+@set UPDATED 15 May 2026
+@set UPDATED-MONTH May 2026
 @set EDITION 1.4.21
 @set VERSION 1.4.21
diff --git a/local/recipes/dev/m4/source/doc/version.texi b/local/recipes/dev/m4/source/doc/version.texi
index 745a8bdb1c..174211ab7d 100644
--- a/local/recipes/dev/m4/source/doc/version.texi
+++ b/local/recipes/dev/m4/source/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 6 February 2026
-@set UPDATED-MONTH February 2026
+@set UPDATED 15 May 2026
+@set UPDATED-MONTH May 2026
 @set EDITION 1.4.21
 @set VERSION 1.4.21
diff --git a/local/recipes/dev/ninja-build/recipe.toml b/local/recipes/dev/ninja-build/recipe.toml
index 425ee7e608..743eec1e31 100644
--- a/local/recipes/dev/ninja-build/recipe.toml
+++ b/local/recipes/dev/ninja-build/recipe.toml
@@ -1,9 +1,31 @@
 [source]
 git = "https://github.com/ninja-build/ninja"
 rev = "v1.13.1"
+patches = ["redox.patch"]
 
 [build]
-template = "cmake"
+template = "custom"
+script = """
+DYNAMIC_INIT
+
+# Add relibc include/lib paths (same as m4/flex gnulib packages)
+RELIBC_INCLUDE="${COOKBOOK_ROOT}/prefix/${TARGET}/relibc-install/${TARGET}/include"
+RELIBC_LIB="${COOKBOOK_ROOT}/prefix/${TARGET}/relibc-install/${TARGET}/lib"
+export CPPFLAGS="${CPPFLAGS} -isystem ${RELIBC_INCLUDE}"
+export LDFLAGS="${LDFLAGS} -L${RELIBC_LIB}"
+
+# Copy updated relibc headers into sysroot so they take precedence over
+# the stale toolchain headers at ~/.redoxer/. The C++ <cstdlib> wrapper
+# explicitly includes the toolchain's stdlib.h which lacks newer functions
+# like getloadavg. The -I path (sysroot/include) takes priority over all
+# other include paths, so this ensures our headers win.
+mkdir -p "${COOKBOOK_SYSROOT}/include"
+cp -a "${RELIBC_INCLUDE}/"* "${COOKBOOK_SYSROOT}/include/"
+
+# Disable tests — build_test.cc includes host headers that conflict with
+# relibc's headers during cross-compilation.
+cookbook_cmake -DBUILD_TESTING=OFF
+"""
 
 [package]
 description = "Ninja build system"
diff --git a/local/recipes/dev/ninja-build/redox.patch b/local/recipes/dev/ninja-build/redox.patch
index 04218d3218..ae61b549c1 100644
--- a/local/recipes/dev/ninja-build/redox.patch
+++ b/local/recipes/dev/ninja-build/redox.patch
@@ -1,67 +1,14 @@
---- a/src/subprocess-posix.cc
-+++ b/src/subprocess-posix.cc
-@@ -72,6 +72,45 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
-     SetCloseOnExec(fd_);
-   }
- 
-+#if defined(__redox__)
-+  pid_ = fork();
-+  if (pid_ < 0)
-+    Fatal("fork: %s", strerror(errno));
-+  if (pid_ == 0) {
-+    if (sigprocmask(SIG_SETMASK, &set->old_mask_, 0) < 0) {
-+      perror("ninja: sigprocmask");
-+      _exit(1);
-+    }
-+    if (!use_console_) {
-+      if (setpgid(0, 0) < 0) {
-+        perror("ninja: setpgid");
-+        _exit(1);
-+      }
-+      int devnull = open("/dev/null", O_RDONLY);
-+      if (devnull < 0) {
-+        perror("ninja: open /dev/null");
-+        _exit(1);
-+      }
-+      if (dup2(devnull, 0) < 0 || dup2(subproc_stdout_fd, 1) < 0 ||
-+          dup2(subproc_stdout_fd, 2) < 0) {
-+        perror("ninja: dup2");
-+        _exit(1);
-+      }
-+      close(devnull);
-+      close(fd_);
-+      close(subproc_stdout_fd);
-+    }
-+
-+    const char* spawned_args[] = { "/bin/sh", "-c", command.c_str(), NULL };
-+    execve("/bin/sh", const_cast<char**>(spawned_args), environ);
-+    perror("ninja: execve /bin/sh");
-+    _exit(127);
-+  }
-+
-+  if (!use_console_)
-+    close(subproc_stdout_fd);
-+  return true;
-+#else
-   posix_spawn_file_actions_t action;
-   int err = posix_spawn_file_actions_init(&action);
-   if (err != 0)
-@@ -145,6 +184,7 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
-   if (!use_console_)
-     close(subproc_stdout_fd);
-   return true;
-+#endif
- }
- 
- void Subprocess::OnPipeReady() {
 --- a/src/util.cc
 +++ b/src/util.cc
-@@ -973,7 +973,7 @@ double GetLoadAverage() {
-     return -0.0f;
-   return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0];
- }
--#elif defined(__HAIKU__)
-+#elif defined(__HAIKU__) || defined(__redox__)
- double GetLoadAverage() {
-     return -0.0f;
- }
+@@ -30,6 +30,11 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++// Redox: the C++ <cstdlib> wrapper pulls in a stale toolchain stdlib.h that
++// lacks getloadavg. Re-declare it here since relibc provides the implementation.
++#if defined(__redox__)
++extern "C" int getloadavg(double loadavg[], int nelem);
++#endif
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
diff --git a/recipes/core/base/audiod/Cargo.toml b/recipes/core/base/audiod/Cargo.toml
deleted file mode 100644
index 762a080b9a..0000000000
--- a/recipes/core/base/audiod/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "audiod"
-description = "Sound daemon"
-version = "0.1.0"
-authors = ["Jeremy Soller <jackpot51@gmail.com>"]
-edition = "2021"
-
-[dependencies]
-daemon = { path = "../daemon" }
-redox_syscall = { workspace = true, features = ["std"] }
-libc.workspace = true
-libredox = { workspace =  true, features = ["mkns"] }
-redox-scheme.workspace = true
-scheme-utils = { path = "../scheme-utils" }
-anyhow.workspace = true
-ioslice = "0.6.0"
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/audiod/src/main.rs b/recipes/core/base/audiod/src/main.rs
deleted file mode 100644
index 51b103afa6..0000000000
--- a/recipes/core/base/audiod/src/main.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-//! The audio daemon for RedoxOS.
-use std::mem::MaybeUninit;
-use std::ptr::addr_of_mut;
-use std::sync::{Arc, Mutex};
-use std::{mem, process, slice, thread};
-
-use anyhow::Context;
-use ioslice::IoSlice;
-use libredox::flag;
-use libredox::{error::Result, Fd};
-
-use redox_scheme::Socket;
-use scheme_utils::ReadinessBased;
-
-use daemon::SchemeDaemon;
-
-use self::scheme::AudioScheme;
-
-mod scheme;
-
-extern "C" fn sigusr_handler(_sig: usize) {}
-
-fn thread(scheme: Arc<Mutex<AudioScheme>>, pid: usize, hw_file: Fd) -> Result<()> {
-    loop {
-        let buffer = scheme.lock().unwrap().buffer();
-        let buffer_u8 = unsafe {
-            slice::from_raw_parts(buffer.as_ptr() as *const u8, mem::size_of_val(&buffer))
-        };
-
-        // Wake up the scheme thread
-        libredox::call::kill(pid, libredox::flag::SIGUSR1 as u32)?;
-
-        hw_file.write(&buffer_u8)?;
-    }
-}
-
-fn daemon(daemon: SchemeDaemon) -> anyhow::Result<()> {
-    // Handle signals from the hw thread
-
-    let new_sigaction = unsafe {
-        let mut sigaction = MaybeUninit::<libc::sigaction>::uninit();
-        addr_of_mut!((*sigaction.as_mut_ptr()).sa_flags).write(0);
-        libc::sigemptyset(addr_of_mut!((*sigaction.as_mut_ptr()).sa_mask));
-        addr_of_mut!((*sigaction.as_mut_ptr()).sa_sigaction).write(sigusr_handler as usize);
-        sigaction.assume_init()
-    };
-    libredox::call::sigaction(flag::SIGUSR1, Some(&new_sigaction), None)?;
-
-    let pid = libredox::call::getpid()?;
-
-    let hw_file = Fd::open("/scheme/audiohw", flag::O_WRONLY | flag::O_CLOEXEC, 0)?;
-
-    let socket = Socket::create().context("failed to create scheme")?;
-
-    let scheme = Arc::new(Mutex::new(AudioScheme::new()));
-
-    let _ = daemon.ready_sync_scheme(&socket, &mut *scheme.lock().unwrap());
-
-    // Enter a constrained namespace
-    let ns = libredox::call::mkns(&[
-        IoSlice::new(b"memory"),
-        IoSlice::new(b"rand"), // for HashMap
-    ])
-    .context("failed to make namespace")?;
-    libredox::call::setns(ns).context("failed to set namespace")?;
-
-    // Spawn a thread to mix and send audio data
-    let scheme_thread = scheme.clone();
-    let _thread = thread::spawn(move || thread(scheme_thread, pid, hw_file));
-
-    let mut readiness = ReadinessBased::new(&socket, 16);
-
-    loop {
-        readiness.read_and_process_requests(&mut *scheme.lock().unwrap())?;
-        readiness.poll_all_requests(&mut *scheme.lock().unwrap())?;
-        readiness.write_responses()?;
-    }
-}
-
-fn main() {
-    SchemeDaemon::new(inner);
-}
-
-fn inner(x: SchemeDaemon) -> ! {
-    match daemon(x) {
-        Ok(()) => {
-            process::exit(0);
-        }
-        Err(err) => {
-            eprintln!("audiod: {}", err);
-            process::exit(1);
-        }
-    }
-}
diff --git a/recipes/core/base/audiod/src/scheme.rs b/recipes/core/base/audiod/src/scheme.rs
deleted file mode 100644
index 62d9b9ede2..0000000000
--- a/recipes/core/base/audiod/src/scheme.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-use redox_scheme::{CallerCtx, OpenResult};
-use scheme_utils::HandleMap;
-use std::collections::VecDeque;
-use std::str;
-use syscall::error::{Error, Result, EACCES, EBADF, EINVAL, ENOENT, EWOULDBLOCK};
-
-use redox_scheme::scheme::SchemeSync;
-use syscall::schemev2::NewFdFlags;
-
-// The strict buffer size of the audiohw: driver
-const HW_BUFFER_SIZE: usize = 512;
-// The desired buffer size of each handle
-const HANDLE_BUFFER_SIZE: usize = 4096;
-
-enum Handle {
-    Audio { buffer: VecDeque<(i16, i16)> },
-    // TODO: move volume to audiohw:?
-    // TODO: Use SYS_CALL to handle this better?
-    Volume,
-    SchemeRoot,
-}
-
-pub struct AudioScheme {
-    handles: HandleMap<Handle>,
-    volume: i32,
-}
-
-impl AudioScheme {
-    pub fn new() -> Self {
-        AudioScheme {
-            handles: HandleMap::new(),
-            volume: 50,
-        }
-    }
-
-    pub fn buffer(&mut self) -> [(i16, i16); HW_BUFFER_SIZE] {
-        let mut mix_buffer = [(0i16, 0i16); HW_BUFFER_SIZE];
-
-        // Multiply each sample by the cube of volume divided by 100
-        // This mimics natural perception of loudness
-        let volume_factor = ((self.volume as f32) / 100.0).powi(3);
-        for (_id, handle) in self.handles.iter_mut() {
-            match handle {
-                Handle::Audio { ref mut buffer } => {
-                    let mut i = 0;
-                    while i < mix_buffer.len() {
-                        if let Some(sample) = buffer.pop_front() {
-                            let left = (sample.0 as f32 * volume_factor) as i16;
-                            let right = (sample.1 as f32 * volume_factor) as i16;
-                            mix_buffer[i].0 = mix_buffer[i].0.saturating_add(left);
-                            mix_buffer[i].1 = mix_buffer[i].1.saturating_add(right);
-                        } else {
-                            break;
-                        }
-                        i += 1;
-                    }
-                }
-                _ => (),
-            }
-        }
-
-        mix_buffer
-    }
-}
-
-impl SchemeSync for AudioScheme {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(self.handles.get(dirfd)?, Handle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-
-        let (handle, flags) = match path.trim_matches('/') {
-            "" => (
-                Handle::Audio {
-                    buffer: VecDeque::new(),
-                },
-                NewFdFlags::empty(),
-            ),
-            "volume" => (Handle::Volume, NewFdFlags::POSITIONED),
-            _ => return Err(Error::new(ENOENT)),
-        };
-
-        let id = self.handles.insert(handle);
-
-        Ok(OpenResult::ThisScheme { number: id, flags })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        off: u64,
-        _flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        //TODO: check flags for readable
-        match self.handles.get_mut(id)? {
-            Handle::Audio { buffer: _ } => {
-                //TODO: audio input?
-                Err(Error::new(EBADF))
-            }
-            Handle::Volume => {
-                let Ok(off) = usize::try_from(off) else {
-                    return Ok(0);
-                };
-                //TODO: should we allocate every time?
-                let bytes = format!("{}", self.volume).into_bytes();
-                let src = bytes.get(off..).unwrap_or(&[]);
-                let len = src.len().min(buf.len());
-                buf[..len].copy_from_slice(&src[..len]);
-
-                Ok(len)
-            }
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-        }
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        offset: u64,
-        _flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        //TODO: check flags for writable
-        match self.handles.get_mut(id)? {
-            Handle::Audio { ref mut buffer } => {
-                if buffer.len() >= HANDLE_BUFFER_SIZE {
-                    Err(Error::new(EWOULDBLOCK))
-                } else {
-                    let mut i = 0;
-                    while i + 4 <= buf.len() {
-                        buffer.push_back((
-                            (buf[i] as i16) | ((buf[i + 1] as i16) << 8),
-                            (buf[i + 2] as i16) | ((buf[i + 3] as i16) << 8),
-                        ));
-
-                        i += 4;
-                    }
-
-                    Ok(i)
-                }
-            }
-            Handle::Volume => {
-                //TODO: support other offsets?
-                if offset == 0 {
-                    let value = str::from_utf8(buf)
-                        .map_err(|_| Error::new(EINVAL))?
-                        .trim()
-                        .parse::<i32>()
-                        .map_err(|_| Error::new(EINVAL))?;
-                    if value >= 0 && value <= 100 {
-                        self.volume = value;
-                        Ok(buf.len())
-                    } else {
-                        Err(Error::new(EINVAL))
-                    }
-                } else {
-                    // EOF
-                    Ok(0)
-                }
-            }
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-        }
-    }
-}
diff --git a/recipes/core/base/bootstrap/.cargo/config.toml b/recipes/core/base/bootstrap/.cargo/config.toml
deleted file mode 100644
index b69619dd83..0000000000
--- a/recipes/core/base/bootstrap/.cargo/config.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[unstable]
-build-std = ["core", "alloc", "compiler_builtins"]
-build-std-features = ["compiler-builtins-mem"]
diff --git a/recipes/core/base/bootstrap/Cargo.toml b/recipes/core/base/bootstrap/Cargo.toml
deleted file mode 100644
index 82120c213d..0000000000
--- a/recipes/core/base/bootstrap/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-name = "bootstrap"
-description = "Userspace bootstrapper"
-version = "0.0.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-edition = "2024"
-license = "MIT"
-
-[dependencies]
-hashbrown = { version = "0.15", default-features = false, features = [
-    "inline-more",
-    "default-hasher",
-] }
-linked_list_allocator = "0.10"
-libredox = { version = "0.1.16", default-features = false, features = ["protocol"] }
-log = { version = "0.4", default-features = false }
-plain = "0.2"
-redox-initfs = { path = "../initfs", default-features = false }
-redox_syscall = "0.7.4"
-redox-scheme = { version = "0.11.0", default-features = false }
-redox-path = "0.3.1"
-slab = { version = "0.4.9", default-features = false }
-arrayvec = { version = "0.7.6", default-features = false }
-
-[target.'cfg(target_os = "redox")'.dependencies]
-redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-features = false }
-
-[profile.release]
-panic = "abort"
-lto = "fat"
-opt-level = "s"
-
-[profile.dev]
-panic = "abort"
-opt-level = "s"
diff --git a/recipes/core/base/bootstrap/build.rs b/recipes/core/base/bootstrap/build.rs
deleted file mode 100644
index dae28f09ff..0000000000
--- a/recipes/core/base/bootstrap/build.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use std::env;
-
-fn main() {
-    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-    let mut arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
-    if arch == "x86" {
-        arch = "i586".to_owned();
-    }
-
-    println!("cargo::rustc-link-arg=-z");
-    println!("cargo::rustc-link-arg=max-page-size=4096");
-    println!("cargo::rustc-link-arg=-T");
-    println!("cargo::rustc-link-arg={manifest_dir}/src/{arch}.ld");
-}
diff --git a/recipes/core/base/bootstrap/src/aarch64.ld b/recipes/core/base/bootstrap/src/aarch64.ld
deleted file mode 100644
index 4a0804b8c2..0000000000
--- a/recipes/core/base/bootstrap/src/aarch64.ld
+++ /dev/null
@@ -1,55 +0,0 @@
-ENTRY(_start)
-OUTPUT_FORMAT("elf64-littleaarch64", "elf64-littleaarch64", "elf64-littleaarch64")
-
-SECTIONS {
-  . = 4096 + 4096; /* Reserved for the null page and the initfs header prepended by redox-initfs-ar */
-  __initfs_header = . - 4096;
-  . += SIZEOF_HEADERS;
-  . = ALIGN(4096);
-
-  .text : {
-    __text_start = .;
-    *(.text*)
-    . = ALIGN(4096);
-    __text_end = .;
-  }
-  .rodata : {
-    __rodata_start = .;
-    *(.rodata*)
-  }
-  .data.rel.ro : {
-    *(.data.rel.ro*)
-  }
-  .got : {
-    *(.got)
-  }
-  .got.plt : {
-    *(.got.plt)
-    . = ALIGN(4096);
-    __rodata_end = .;
-  }
-  .data : {
-    __data_start = .;
-    *(.data*)
-    . = ALIGN(4096);
-    __data_end = .;
-
-    *(.tbss*)
-    . = ALIGN(4096);
-    *(.tdata*)
-    . = ALIGN(4096);
-
-    __bss_start = .;
-    *(.bss*)
-    . = ALIGN(4096);
-    __bss_end = .;
-  }
-
-  /DISCARD/ : {
-      *(.comment*)
-      *(.eh_frame*)
-      *(.gcc_except_table*)
-      *(.note*)
-      *(.rel.eh_frame*)
-  }
-}
diff --git a/recipes/core/base/bootstrap/src/aarch64.rs b/recipes/core/base/bootstrap/src/aarch64.rs
deleted file mode 100644
index ee39725f86..0000000000
--- a/recipes/core/base/bootstrap/src/aarch64.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use core::mem;
-use syscall::{data::Map, flag::MapFlags, number::SYS_FMAP};
-
-pub const USERMODE_END: usize = 0x0000_8000_0000_0000;
-pub const STACK_START: usize = USERMODE_END - syscall::KERNEL_METADATA_SIZE - STACK_SIZE;
-
-const STACK_SIZE: usize = 64 * 1024; // 64 KiB
-static MAP: Map = Map {
-    offset: 0,
-    size: STACK_SIZE,
-    flags: MapFlags::PROT_READ
-        .union(MapFlags::PROT_WRITE)
-        .union(MapFlags::MAP_PRIVATE)
-        .union(MapFlags::MAP_FIXED_NOREPLACE),
-    address: STACK_START, // highest possible user address
-};
-
-core::arch::global_asm!(
-    "
-    .globl _start
-    _start:
-    // Setup a stack.
-    ldr x8, ={number}
-    ldr x0, ={fd}
-    ldr x1, ={map} // pointer to Map struct
-    ldr x2, ={map_size} // size of Map struct
-    svc 0
-
-    // Failure if return value is zero
-    cbz x0, 1f
-
-    // Failure if return value is negative
-    tbnz x0, 63, 1f
-
-    // Set up stack frame
-    mov sp, x0
-    add sp, sp, #{stack_size}
-    mov fp, sp
-
-    // Stack has the same alignment as `size`.
-    bl start
-    // `start` must never return.
-
-    // failure, emit undefined instruction
-    1:
-    udf #0
-    ",
-    fd = const usize::MAX, // dummy fd indicates anonymous map
-    map = sym MAP,
-    map_size = const mem::size_of::<Map>(),
-    number = const SYS_FMAP,
-    stack_size = const STACK_SIZE,
-);
diff --git a/recipes/core/base/bootstrap/src/exec.rs b/recipes/core/base/bootstrap/src/exec.rs
deleted file mode 100644
index 8425e3b5e1..0000000000
--- a/recipes/core/base/bootstrap/src/exec.rs
+++ /dev/null
@@ -1,354 +0,0 @@
-use alloc::string::ToString;
-use alloc::sync::Arc;
-use alloc::vec::Vec;
-use core::ffi::CStr;
-use core::str::FromStr;
-use hashbrown::HashMap;
-use redox_scheme::Socket;
-
-use syscall::CallFlags;
-use syscall::data::{GlobalSchemes, KernelSchemeInfo};
-use syscall::flag::{O_CLOEXEC, O_RDONLY, O_STAT};
-use syscall::{EINTR, Error};
-
-use redox_rt::proc::*;
-
-use crate::KernelSchemeMap;
-
-struct Logger;
-
-impl log::Log for Logger {
-    fn enabled(&self, metadata: &log::Metadata) -> bool {
-        metadata.level() <= log::max_level()
-    }
-    fn log(&self, record: &log::Record) {
-        let file = record.file().unwrap_or("");
-        let line = record.line().unwrap_or(0);
-        let level = record.level();
-        let msg = record.args();
-        let _ = syscall::write(
-            1,
-            alloc::format!("[{file}:{line} {level}] {msg}\n").as_bytes(),
-        );
-    }
-    fn flush(&self) {}
-}
-
-const KERNEL_METADATA_BASE: usize = crate::arch::USERMODE_END - syscall::KERNEL_METADATA_SIZE;
-
-pub fn main() -> ! {
-    let mut cursor = KERNEL_METADATA_BASE;
-    let kernel_scheme_infos = unsafe {
-        let base_ptr = cursor as *const u8;
-        let infos_len = *(base_ptr as *const usize);
-        let infos_ptr = base_ptr.add(core::mem::size_of::<usize>()) as *const KernelSchemeInfo;
-        let slice = core::slice::from_raw_parts(infos_ptr, infos_len);
-        cursor += core::mem::size_of::<usize>() // kernel scheme number size
-            + infos_len // kernel scheme number
-            * core::mem::size_of::<KernelSchemeInfo>();
-        slice
-    };
-    let scheme_creation_cap = unsafe {
-        let base_ptr = cursor as *const u8;
-        FdGuard::new(*(base_ptr as *const usize))
-    };
-
-    let mut kernel_schemes = KernelSchemeMap::new(kernel_scheme_infos);
-
-    let auth = kernel_schemes
-        .0
-        .remove(&GlobalSchemes::Proc)
-        .expect("failed to get proc fd");
-
-    let this_thr_fd = auth
-        .dup(b"cur-context")
-        .expect("failed to open open_via_dup")
-        .to_upper()
-        .unwrap();
-    let this_thr_fd = unsafe { redox_rt::initialize_freestanding(this_thr_fd) };
-
-    let mut env_bytes = [0_u8; 4096];
-    let mut envs = {
-        let fd = FdGuard::new(
-            syscall::openat(
-                kernel_schemes
-                    .get(GlobalSchemes::Sys)
-                    .expect("failed to get sys fd")
-                    .as_raw_fd(),
-                "env",
-                O_RDONLY | O_CLOEXEC,
-                0,
-            )
-            .expect("bootstrap: failed to open env"),
-        );
-        let bytes_read = fd
-            .read(&mut env_bytes)
-            .expect("bootstrap: failed to read env");
-
-        if bytes_read >= env_bytes.len() {
-            // TODO: Handle this, we can allocate as much as we want in theory.
-            panic!("env is too large");
-        }
-        let env_bytes = &mut env_bytes[..bytes_read];
-
-        env_bytes
-            .split(|&c| c == b'\n')
-            .filter(|var| !var.is_empty())
-            .filter(|var| !var.starts_with(b"INITFS_"))
-            .collect::<Vec<_>>()
-    };
-    envs.push(b"RUST_BACKTRACE=1");
-    //envs.push(b"LD_DEBUG=all");
-    envs.push(b"LD_LIBRARY_PATH=/scheme/initfs/lib");
-
-    log::set_max_level(log::LevelFilter::Warn);
-
-    if let Some(log_env) = envs
-        .iter()
-        .find_map(|var| var.strip_prefix(b"BOOTSTRAP_LOG_LEVEL="))
-    {
-        if let Ok(Ok(log_level)) = str::from_utf8(&log_env).map(|s| log::LevelFilter::from_str(s)) {
-            log::set_max_level(log_level);
-        }
-    }
-
-    let _ = log::set_logger(&Logger);
-
-    unsafe extern "C" {
-        // The linker script will define this as the location of the initfs header.
-        static __initfs_header: u8;
-
-        // The linker script will define this as the end of the executable (excluding initfs).
-        static __bss_end: u8;
-    }
-
-    let initfs_start = core::ptr::addr_of!(__initfs_header);
-    let initfs_length = unsafe {
-        (*(core::ptr::addr_of!(__initfs_header) as *const redox_initfs::types::Header))
-            .initfs_size
-            .get() as usize
-    };
-
-    let (scheme_creation_cap, auth, kernel_schemes, initfs_fd) = spawn(
-        "initfs daemon",
-        auth,
-        &this_thr_fd,
-        scheme_creation_cap,
-        kernel_schemes,
-        false,
-        |write_fd, socket, _, _| unsafe {
-            crate::initfs::run(
-                core::slice::from_raw_parts(initfs_start, initfs_length),
-                write_fd,
-                socket,
-            );
-        },
-    );
-
-    // Unmap initfs data as only the initfs scheme implementation needs it.
-    unsafe {
-        let executable_end = core::ptr::addr_of!(__bss_end)
-            .add(core::ptr::addr_of!(__bss_end).align_offset(syscall::PAGE_SIZE));
-        syscall::funmap(
-            executable_end as usize,
-            initfs_length.next_multiple_of(syscall::PAGE_SIZE)
-                - (executable_end.offset_from(initfs_start) as usize),
-        )
-        .unwrap();
-    }
-
-    let (scheme_creation_cap, auth, kernel_schemes, proc_fd) = spawn(
-        "process manager",
-        auth,
-        &this_thr_fd,
-        scheme_creation_cap,
-        kernel_schemes,
-        true,
-        |write_fd, socket, auth, mut kernel_schemes| {
-            let event = kernel_schemes
-                .0
-                .remove(&GlobalSchemes::Event)
-                .expect("failed to get event fd");
-            drop(kernel_schemes);
-            crate::procmgr::run(write_fd, socket, auth, event)
-        },
-    );
-
-    let scheme_creation_cap_dup = scheme_creation_cap
-        .dup(b"")
-        .expect("failed to dup scheme creation cap");
-    let (_, _, _, initns_fd) = spawn(
-        "init namespace manager",
-        auth,
-        &this_thr_fd,
-        scheme_creation_cap,
-        kernel_schemes,
-        false,
-        |write_fd, socket, _, kernel_schemes| {
-            let mut schemes = HashMap::default();
-            for (scheme, fd) in kernel_schemes.0.into_iter() {
-                schemes.insert(scheme.as_str().to_string(), Arc::new(fd));
-            }
-            schemes.insert(
-                "proc".to_string(),
-                // A bit dirty, but necessary as the parent process still needs access to it. Rust
-                // doesn't know that the fd got cloned by fork.
-                Arc::new(FdGuard::new(proc_fd.as_raw_fd())),
-            );
-            schemes.insert("initfs".to_string(), Arc::new(initfs_fd));
-
-            crate::initnsmgr::run(write_fd, socket, schemes, scheme_creation_cap_dup)
-        },
-    );
-
-    let (init_proc_fd, init_thr_fd) = unsafe { make_init(proc_fd.take()) };
-    // from this point, this_thr_fd is no longer valid
-
-    const CWD: &[u8] = b"/scheme/initfs";
-    let cwd_fd = FdGuard::new(
-        syscall::openat(initns_fd.as_raw_fd(), "/scheme/initfs", O_STAT, 0)
-            .expect("failed to open cwd fd"),
-    )
-    .to_upper()
-    .unwrap();
-    let extrainfo = ExtraInfo {
-        cwd: Some(CWD),
-        sigprocmask: 0,
-        sigignmask: 0,
-        umask: redox_rt::sys::get_umask(),
-        thr_fd: init_thr_fd.as_raw_fd(),
-        proc_fd: init_proc_fd.as_raw_fd(),
-        ns_fd: Some(initns_fd.take()),
-        cwd_fd: Some(cwd_fd.as_raw_fd()),
-    };
-
-    let exe_path = "/scheme/initfs/bin/init";
-
-    let image_file = FdGuard::new(
-        syscall::openat(extrainfo.ns_fd.unwrap(), exe_path, O_RDONLY | O_CLOEXEC, 0)
-            .expect("failed to open init"),
-    )
-    .to_upper()
-    .unwrap();
-
-    let FexecResult::Interp {
-        path: interp_path,
-        interp_override,
-    } = fexec_impl(
-        image_file,
-        init_thr_fd,
-        init_proc_fd,
-        exe_path.as_bytes(),
-        &[exe_path.as_bytes()],
-        &envs,
-        &extrainfo,
-        None,
-    )
-    .expect("failed to execute init");
-
-    // According to elf(5), PT_INTERP requires that the interpreter path be
-    // null-terminated. Violating this should therefore give the "format error" ENOEXEC.
-    let interp_cstr = CStr::from_bytes_with_nul(&interp_path).expect("interpreter not valid C str");
-    let interp_file = FdGuard::new(
-        syscall::openat(
-            extrainfo.ns_fd.unwrap(), // initns, not initfs!
-            interp_cstr.to_str().expect("interpreter not UTF-8"),
-            O_RDONLY | O_CLOEXEC,
-            0,
-        )
-        .expect("failed to open dynamic linker"),
-    )
-    .to_upper()
-    .unwrap();
-
-    fexec_impl(
-        interp_file,
-        init_thr_fd,
-        init_proc_fd,
-        exe_path.as_bytes(),
-        &[exe_path.as_bytes()],
-        &envs,
-        &extrainfo,
-        Some(interp_override),
-    )
-    .expect("failed to execute init");
-
-    unreachable!()
-}
-
-pub(crate) fn spawn(
-    name: &str,
-    auth: FdGuard,
-    this_thr_fd: &FdGuardUpper,
-    scheme_creation_cap: FdGuard,
-    kernel_schemes: KernelSchemeMap,
-    nonblock: bool,
-    inner: impl FnOnce(FdGuard, Socket, FdGuard, KernelSchemeMap) -> !,
-) -> (FdGuard, FdGuard, KernelSchemeMap, FdGuard) {
-    let read = FdGuard::new(
-        syscall::openat(
-            kernel_schemes
-                .get(GlobalSchemes::Pipe)
-                .expect("failed to get pipe fd")
-                .as_raw_fd(),
-            "",
-            O_CLOEXEC,
-            0,
-        )
-        .expect("failed to open sync read pipe"),
-    );
-
-    // The write pipe will not inherit O_CLOEXEC, but is closed by the daemon later.
-    let write = FdGuard::new(
-        syscall::dup(read.as_raw_fd(), b"write").expect("failed to open sync write pipe"),
-    );
-
-    match fork_impl(&ForkArgs::Init {
-        this_thr_fd,
-        auth: &auth,
-    }) {
-        Err(err) => {
-            panic!("Failed to fork in order to start {name}: {err}");
-        }
-        // Continue serving the scheme as the child.
-        Ok(0) => {
-            drop(read);
-
-            let socket = Socket::create_inner(scheme_creation_cap.as_raw_fd(), nonblock)
-                .expect("failed to open proc scheme socket");
-            drop(scheme_creation_cap);
-
-            inner(write, socket, auth, kernel_schemes)
-        }
-        // Return in order to execute init, as the parent.
-        Ok(_) => {
-            drop(write);
-
-            let mut new_fd = usize::MAX;
-            let fd_bytes = unsafe {
-                core::slice::from_raw_parts_mut(
-                    core::slice::from_mut(&mut new_fd).as_mut_ptr() as *mut u8,
-                    core::mem::size_of::<usize>(),
-                )
-            };
-            loop {
-                match syscall::call_ro(
-                    read.as_raw_fd(),
-                    fd_bytes,
-                    CallFlags::FD | CallFlags::FD_UPPER,
-                    &[],
-                ) {
-                    Err(Error { errno: EINTR }) => continue,
-                    _ => break,
-                }
-            }
-
-            (
-                scheme_creation_cap,
-                auth,
-                kernel_schemes,
-                FdGuard::new(new_fd),
-            )
-        }
-    }
-}
diff --git a/recipes/core/base/bootstrap/src/i586.ld b/recipes/core/base/bootstrap/src/i586.ld
deleted file mode 100644
index f53877f039..0000000000
--- a/recipes/core/base/bootstrap/src/i586.ld
+++ /dev/null
@@ -1,55 +0,0 @@
-ENTRY(_start)
-OUTPUT_FORMAT(elf32-i386)
-
-SECTIONS {
-  . = 4096 + 4096; /* Reserved for the null page and the initfs header prepended by redox-initfs-ar */
-  __initfs_header = . - 4096;
-  . += SIZEOF_HEADERS;
-  . = ALIGN(4096);
-
-  .text : {
-    __text_start = .;
-    *(.text*)
-    . = ALIGN(4096);
-    __text_end = .;
-  }
-  .rodata : {
-    __rodata_start = .;
-    *(.rodata*)
-  }
-  .data.rel.ro : {
-    *(.data.rel.ro*)
-  }
-  .got : {
-    *(.got)
-  }
-  .got.plt : {
-    *(.got.plt)
-    . = ALIGN(4096);
-    __rodata_end = .;
-  }
-  .data : {
-    __data_start = .;
-    *(.data*)
-    . = ALIGN(4096);
-    __data_end = .;
-
-    *(.tbss*)
-    . = ALIGN(4096);
-    *(.tdata*)
-    . = ALIGN(4096);
-
-    __bss_start = .;
-    *(.bss*)
-    . = ALIGN(4096);
-    __bss_end = .;
-  }
-
-  /DISCARD/ : {
-      *(.comment*)
-      *(.eh_frame*)
-      *(.gcc_except_table*)
-      *(.note*)
-      *(.rel.eh_frame*)
-  }
-}
diff --git a/recipes/core/base/bootstrap/src/i686.ld b/recipes/core/base/bootstrap/src/i686.ld
deleted file mode 100644
index f53877f039..0000000000
--- a/recipes/core/base/bootstrap/src/i686.ld
+++ /dev/null
@@ -1,55 +0,0 @@
-ENTRY(_start)
-OUTPUT_FORMAT(elf32-i386)
-
-SECTIONS {
-  . = 4096 + 4096; /* Reserved for the null page and the initfs header prepended by redox-initfs-ar */
-  __initfs_header = . - 4096;
-  . += SIZEOF_HEADERS;
-  . = ALIGN(4096);
-
-  .text : {
-    __text_start = .;
-    *(.text*)
-    . = ALIGN(4096);
-    __text_end = .;
-  }
-  .rodata : {
-    __rodata_start = .;
-    *(.rodata*)
-  }
-  .data.rel.ro : {
-    *(.data.rel.ro*)
-  }
-  .got : {
-    *(.got)
-  }
-  .got.plt : {
-    *(.got.plt)
-    . = ALIGN(4096);
-    __rodata_end = .;
-  }
-  .data : {
-    __data_start = .;
-    *(.data*)
-    . = ALIGN(4096);
-    __data_end = .;
-
-    *(.tbss*)
-    . = ALIGN(4096);
-    *(.tdata*)
-    . = ALIGN(4096);
-
-    __bss_start = .;
-    *(.bss*)
-    . = ALIGN(4096);
-    __bss_end = .;
-  }
-
-  /DISCARD/ : {
-      *(.comment*)
-      *(.eh_frame*)
-      *(.gcc_except_table*)
-      *(.note*)
-      *(.rel.eh_frame*)
-  }
-}
diff --git a/recipes/core/base/bootstrap/src/i686.rs b/recipes/core/base/bootstrap/src/i686.rs
deleted file mode 100644
index 5fbbf47908..0000000000
--- a/recipes/core/base/bootstrap/src/i686.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use core::mem;
-use syscall::{data::Map, flag::MapFlags, number::SYS_FMAP};
-
-const STACK_SIZE: usize = 64 * 1024; // 64 KiB
-pub const USERMODE_END: usize = 0x8000_0000;
-pub const STACK_START: usize = USERMODE_END - syscall::KERNEL_METADATA_SIZE - STACK_SIZE;
-
-static MAP: Map = Map {
-    offset: 0,
-    size: STACK_SIZE,
-    flags: MapFlags::PROT_READ
-        .union(MapFlags::PROT_WRITE)
-        .union(MapFlags::MAP_PRIVATE)
-        .union(MapFlags::MAP_FIXED_NOREPLACE),
-    address: STACK_START, // highest possible user address
-};
-
-core::arch::global_asm!(
-    "
-    .globl _start
-    _start:
-    # Setup a stack.
-    mov eax, {number}
-    mov ebx, {fd}
-    mov ecx, offset {map} # pointer to Map struct
-    mov edx, {map_size} # size of Map struct
-    int 0x80
-
-    # Test for success (nonzero value).
-    cmp eax, 0
-    jg 1f
-    # (failure)
-    ud2
-    1:
-    # Subtract 16 since all instructions seem to hate non-canonical ESP values :)
-    lea esp, [eax+{stack_size}-16]
-    mov ebp, esp
-
-    # Stack has the same alignment as `size`.
-    call start
-    # `start` must never return.
-    ud2
-    ",
-    fd = const usize::MAX, // dummy fd indicates anonymous map
-    map = sym MAP,
-    map_size = const mem::size_of::<Map>(),
-    number = const SYS_FMAP,
-    stack_size = const STACK_SIZE,
-);
diff --git a/recipes/core/base/bootstrap/src/initfs.rs b/recipes/core/base/bootstrap/src/initfs.rs
deleted file mode 100644
index 04d3cfe033..0000000000
--- a/recipes/core/base/bootstrap/src/initfs.rs
+++ /dev/null
@@ -1,485 +0,0 @@
-use core::convert::TryFrom;
-#[allow(deprecated)]
-use core::hash::{BuildHasherDefault, SipHasher};
-use core::str;
-
-use alloc::string::String;
-
-use hashbrown::HashMap;
-use redox_initfs::{InitFs, Inode, InodeDir, InodeKind, InodeStruct};
-
-use redox_rt::proc::FdGuard;
-use redox_scheme::{
-    CallerCtx, OpenResult, RequestKind,
-    scheme::{SchemeState, SchemeSync},
-};
-
-use redox_scheme::{SignalBehavior, Socket};
-use syscall::PAGE_SIZE;
-use syscall::data::Stat;
-use syscall::dirent::DirEntry;
-use syscall::dirent::DirentBuf;
-use syscall::dirent::DirentKind;
-use syscall::error::*;
-use syscall::flag::*;
-use syscall::schemev2::NewFdFlags;
-
-enum Handle {
-    Node(Node),
-    SchemeRoot,
-}
-impl Handle {
-    fn as_node(&self) -> Result<&Node> {
-        match self {
-            Handle::Node(n) => Ok(n),
-            _ => Err(Error::new(EBADF)),
-        }
-    }
-    fn as_node_mut(&mut self) -> Result<&mut Node> {
-        match self {
-            Handle::Node(n) => Ok(n),
-            _ => Err(Error::new(EBADF)),
-        }
-    }
-}
-
-struct Node {
-    inode: Inode,
-    // TODO: Any better way to implement fpath? Or maybe work around it, e.g. by giving paths such
-    // as `initfs:__inodes__/<inode>`?
-    filename: String,
-}
-pub struct InitFsScheme {
-    #[allow(deprecated)]
-    handles: HashMap<usize, Handle, BuildHasherDefault<SipHasher>>,
-    next_id: usize,
-    fs: InitFs<'static>,
-}
-impl InitFsScheme {
-    pub fn new(bytes: &'static [u8]) -> Self {
-        Self {
-            handles: HashMap::default(),
-            next_id: 0,
-            fs: InitFs::new(bytes, Some(PAGE_SIZE.try_into().unwrap()))
-                .expect("failed to parse initfs"),
-        }
-    }
-
-    fn get_inode(fs: &InitFs<'static>, inode: Inode) -> Result<InodeStruct<'static>> {
-        fs.get_inode(inode).ok_or_else(|| Error::new(EIO))
-    }
-    fn next_id(&mut self) -> usize {
-        assert_ne!(self.next_id, usize::MAX, "usize overflow in initfs scheme");
-        self.next_id += 1;
-        self.next_id
-    }
-}
-
-struct Iter {
-    dir: InodeDir<'static>,
-    idx: u32,
-}
-impl Iterator for Iter {
-    type Item = Result<redox_initfs::Entry<'static>>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let entry = self.dir.get_entry(self.idx).map_err(|_| Error::new(EIO));
-        self.idx += 1;
-        entry.transpose()
-    }
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        match self.dir.entry_count().ok() {
-            Some(size) => {
-                let size =
-                    usize::try_from(size).expect("expected u32 to be convertible into usize");
-                (size, Some(size))
-            }
-            None => (0, None),
-        }
-    }
-}
-
-fn inode_len(inode: InodeStruct<'static>) -> Result<usize> {
-    Ok(match inode.kind() {
-        InodeKind::File(file) => file.data().map_err(|_| Error::new(EIO))?.len(),
-        InodeKind::Dir(dir) => (Iter { dir, idx: 0 }).fold(0, |len, entry| {
-            len + entry
-                .and_then(|entry| entry.name().map_err(|_| Error::new(EIO)))
-                .map_or(0, |name| name.len() + 1)
-        }),
-        InodeKind::Link(link) => link.data().map_err(|_| Error::new(EIO))?.len(),
-        InodeKind::Unknown => return Err(Error::new(EIO)),
-    })
-}
-
-impl SchemeSync for InitFsScheme {
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(
-            self.handles.get(&dirfd).ok_or(Error::new(EBADF))?,
-            Handle::SchemeRoot
-        ) {
-            return Err(Error::new(EACCES));
-        }
-        let mut components = path
-            // trim leading and trailing slash
-            .trim_matches('/')
-            // divide into components
-            .split('/')
-            // filter out double slashes (e.g. /usr//bin/...)
-            .filter(|c| !c.is_empty());
-
-        let mut current_inode = self.fs.root_inode();
-
-        while let Some(component) = components.next() {
-            match component {
-                "." => continue,
-                ".." => {
-                    let _ = components.next_back();
-                    continue;
-                }
-
-                _ => (),
-            }
-
-            let current_inode_struct = Self::get_inode(&self.fs, current_inode)?;
-
-            let dir = match current_inode_struct.kind() {
-                InodeKind::Dir(dir) => dir,
-
-                // TODO: Support symlinks in other position than xopen target
-                InodeKind::Link(_) => {
-                    return Err(Error::new(EOPNOTSUPP));
-                }
-
-                // If we still have more components in the path, and the file tree for that
-                // particular branch is not all directories except the last, then that file cannot
-                // exist.
-                InodeKind::File(_) | InodeKind::Unknown => return Err(Error::new(ENOENT)),
-            };
-
-            let mut entries = Iter { dir, idx: 0 };
-
-            current_inode = loop {
-                let entry_res = match entries.next() {
-                    Some(e) => e,
-                    None => return Err(Error::new(ENOENT)),
-                };
-                let entry = entry_res?;
-                let name = entry.name().map_err(|_| Error::new(EIO))?;
-                if name == component.as_bytes() {
-                    break entry.inode();
-                }
-            };
-        }
-
-        // xopen target is link -- return EXDEV so that the file is opened as a link.
-        // TODO: Maybe follow initfs-local symlinks here? Would be faster
-        let is_link = matches!(
-            Self::get_inode(&self.fs, current_inode)?.kind(),
-            InodeKind::Link(_)
-        );
-        let o_stat_nofollow = flags & O_STAT != 0 && flags & O_NOFOLLOW != 0;
-        let o_symlink = flags & O_SYMLINK != 0;
-        if is_link && !o_stat_nofollow && !o_symlink {
-            return Err(Error::new(EXDEV));
-        }
-
-        let id = self.next_id();
-        let old = self.handles.insert(
-            id,
-            Handle::Node(Node {
-                inode: current_inode,
-                filename: path.into(),
-            }),
-        );
-        assert!(old.is_none());
-
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::POSITIONED,
-        })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buffer: &mut [u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let Ok(offset) = usize::try_from(offset) else {
-            return Ok(0);
-        };
-
-        let handle = self
-            .handles
-            .get_mut(&id)
-            .ok_or(Error::new(EBADF))?
-            .as_node_mut()?;
-
-        match Self::get_inode(&self.fs, handle.inode)?.kind() {
-            InodeKind::File(file) => {
-                let data = file.data().map_err(|_| Error::new(EIO))?;
-                let src_buf = &data[core::cmp::min(offset, data.len())..];
-
-                let to_copy = core::cmp::min(src_buf.len(), buffer.len());
-                buffer[..to_copy].copy_from_slice(&src_buf[..to_copy]);
-
-                Ok(to_copy)
-            }
-            InodeKind::Dir(_) => Err(Error::new(EISDIR)),
-            InodeKind::Link(link) => {
-                let link_data = link.data().map_err(|_| Error::new(EIO))?;
-                let src_buf = &link_data[core::cmp::min(offset, link_data.len())..];
-
-                let to_copy = core::cmp::min(src_buf.len(), buffer.len());
-                buffer[..to_copy].copy_from_slice(&src_buf[..to_copy]);
-
-                Ok(to_copy)
-            }
-            InodeKind::Unknown => Err(Error::new(EIO)),
-        }
-    }
-    fn getdents<'buf>(
-        &mut self,
-        id: usize,
-        mut buf: DirentBuf<&'buf mut [u8]>,
-        opaque_offset: u64,
-    ) -> Result<DirentBuf<&'buf mut [u8]>> {
-        let Ok(offset) = u32::try_from(opaque_offset) else {
-            return Ok(buf);
-        };
-        let handle = self.handles.get(&id).ok_or(Error::new(EBADF))?.as_node()?;
-        let InodeKind::Dir(dir) = Self::get_inode(&self.fs, handle.inode)?.kind() else {
-            return Err(Error::new(ENOTDIR));
-        };
-        let iter = Iter { dir, idx: offset };
-        for (index, entry) in iter.enumerate() {
-            let entry = entry?;
-            buf.entry(DirEntry {
-                // TODO: Add getter
-                //inode: entry.inode(),
-                inode: 0,
-
-                name: entry
-                    .name()
-                    .ok()
-                    .and_then(|utf8| core::str::from_utf8(utf8).ok())
-                    .ok_or(Error::new(EIO))?,
-                next_opaque_id: index as u64 + 1,
-                kind: DirentKind::Unspecified,
-            })?;
-        }
-        Ok(buf)
-    }
-
-    fn fsize(&mut self, id: usize, _ctx: &CallerCtx) -> Result<u64> {
-        let handle = self
-            .handles
-            .get_mut(&id)
-            .ok_or(Error::new(EBADF))?
-            .as_node_mut()?;
-
-        Ok(inode_len(Self::get_inode(&self.fs, handle.inode)?)? as u64)
-    }
-
-    fn fcntl(&mut self, id: usize, _cmd: usize, _arg: usize, _ctx: &CallerCtx) -> Result<usize> {
-        let _handle = self.handles.get(&id).ok_or(Error::new(EBADF))?.as_node()?;
-
-        Ok(0)
-    }
-
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        let handle = self.handles.get(&id).ok_or(Error::new(EBADF))?.as_node()?;
-
-        // TODO: Copy scheme part in kernel
-        let scheme_path = b"/scheme/initfs";
-        let scheme_bytes = core::cmp::min(scheme_path.len(), buf.len());
-        buf[..scheme_bytes].copy_from_slice(&scheme_path[..scheme_bytes]);
-
-        let source = handle.filename.as_bytes();
-        let path_bytes = core::cmp::min(buf.len() - scheme_bytes, source.len());
-        buf[scheme_bytes..scheme_bytes + path_bytes].copy_from_slice(&source[..path_bytes]);
-
-        Ok(scheme_bytes + path_bytes)
-    }
-
-    fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        let handle = self.handles.get(&id).ok_or(Error::new(EBADF))?.as_node()?;
-
-        let inode = Self::get_inode(&self.fs, handle.inode)?;
-
-        stat.st_ino = inode.id();
-        stat.st_mode = inode.mode()
-            | match inode.kind() {
-                InodeKind::Dir(_) => MODE_DIR,
-                InodeKind::File(_) => MODE_FILE,
-                InodeKind::Link(_) => MODE_SYMLINK,
-                _ => 0,
-            };
-        stat.st_uid = 0;
-        stat.st_gid = 0;
-        stat.st_size = u64::try_from(inode_len(inode)?).unwrap_or(u64::MAX);
-
-        stat.st_ctime = 0;
-        stat.st_ctime_nsec = 0;
-        stat.st_mtime = 0;
-        stat.st_mtime_nsec = 0;
-
-        Ok(())
-    }
-
-    fn fsync(&mut self, id: usize, _ctx: &CallerCtx) -> Result<()> {
-        if !self.handles.contains_key(&id) {
-            return Err(Error::new(EBADF));
-        }
-
-        Ok(())
-    }
-
-    fn mmap_prep(
-        &mut self,
-        id: usize,
-        offset: u64,
-        size: usize,
-        flags: MapFlags,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<usize> {
-        let handle = self.handles.get(&id).ok_or(Error::new(EBADF))?;
-        let Handle::Node(node) = handle else {
-            return Err(Error::new(EBADF));
-        };
-        let data = match Self::get_inode(&self.fs, node.inode)?.kind() {
-            InodeKind::File(file) => file.data().map_err(|_| Error::new(EIO))?,
-            InodeKind::Dir(_) => return Err(Error::new(EISDIR)),
-            InodeKind::Link(_) => return Err(Error::new(ELOOP)),
-            InodeKind::Unknown => return Err(Error::new(EIO)),
-        };
-
-        if flags.contains(MapFlags::PROT_WRITE) {
-            return Err(Error::new(EPERM));
-        }
-
-        let Some(last_addr) = offset.checked_add(size as u64) else {
-            return Err(Error::new(EINVAL));
-        };
-
-        if last_addr > data.len().next_multiple_of(PAGE_SIZE) as u64 {
-            return Err(Error::new(EINVAL));
-        }
-
-        Ok(data.as_ptr() as usize)
-    }
-}
-
-pub fn run(bytes: &'static [u8], sync_pipe: FdGuard, socket: Socket) -> ! {
-    log::info!("bootstrap: starting initfs scheme");
-    let mut state = SchemeState::new();
-    let mut scheme = InitFsScheme::new(bytes);
-
-    // send open-capability to bootstrap
-    let new_id = scheme.next_id();
-    scheme.handles.insert(new_id, Handle::SchemeRoot);
-    let cap_fd = socket
-        .create_this_scheme_fd(0, new_id, 0, 0)
-        .expect("failed to issue initfs root fd");
-    let _ = syscall::call_rw(
-        sync_pipe.as_raw_fd(),
-        &mut cap_fd.to_ne_bytes(),
-        CallFlags::FD,
-        &[],
-    );
-    drop(sync_pipe);
-
-    loop {
-        let Some(req) = socket
-            .next_request(SignalBehavior::Restart)
-            .expect("bootstrap: failed to read scheme request from kernel")
-        else {
-            break;
-        };
-        match req.kind() {
-            RequestKind::Call(req) => {
-                let resp = req.handle_sync(&mut scheme, &mut state);
-
-                if !socket
-                    .write_response(resp, SignalBehavior::Restart)
-                    .expect("bootstrap: failed to write scheme response to kernel")
-                {
-                    break;
-                }
-            }
-            RequestKind::OnClose { id } => {
-                scheme.handles.remove(&id);
-            }
-            _ => (),
-        }
-    }
-
-    unreachable!()
-}
-
-// TODO: Restructure bootstrap so it calls into relibc, or a split-off derivative without the C
-// parts, such as "redox-rt".
-
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn redox_read_v1(fd: usize, ptr: *mut u8, len: usize) -> isize {
-    Error::mux(syscall::read(fd, unsafe {
-        core::slice::from_raw_parts_mut(ptr, len)
-    })) as isize
-}
-
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn redox_write_v1(fd: usize, ptr: *const u8, len: usize) -> isize {
-    Error::mux(syscall::write(fd, unsafe {
-        core::slice::from_raw_parts(ptr, len)
-    })) as isize
-}
-
-#[unsafe(no_mangle)]
-pub unsafe fn redox_dup_v1(fd: usize, buf: *const u8, len: usize) -> isize {
-    Error::mux(syscall::dup(fd, unsafe {
-        core::slice::from_raw_parts(buf, len)
-    })) as isize
-}
-
-#[unsafe(no_mangle)]
-pub extern "C" fn redox_close_v1(fd: usize) -> isize {
-    Error::mux(syscall::close(fd)) as isize
-}
-
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn redox_sys_call_v0(
-    fd: usize,
-    payload: *mut u8,
-    payload_len: usize,
-    flags: usize,
-    metadata: *const u64,
-    metadata_len: usize,
-) -> isize {
-    let flags = CallFlags::from_bits_retain(flags);
-
-    let metadata = unsafe { core::slice::from_raw_parts(metadata, metadata_len) };
-
-    let result = if flags.contains(CallFlags::READ) {
-        let payload = unsafe { core::slice::from_raw_parts_mut(payload, payload_len) };
-        if flags.contains(CallFlags::WRITE) {
-            syscall::call_rw(fd, payload, flags, metadata)
-        } else {
-            syscall::call_ro(fd, payload, flags, metadata)
-        }
-    } else {
-        let payload = unsafe { core::slice::from_raw_parts(payload, payload_len) };
-        syscall::call_wo(fd, payload, flags, metadata)
-    };
-
-    Error::mux(result) as isize
-}
diff --git a/recipes/core/base/bootstrap/src/initnsmgr.rs b/recipes/core/base/bootstrap/src/initnsmgr.rs
deleted file mode 100644
index fa8b728a10..0000000000
--- a/recipes/core/base/bootstrap/src/initnsmgr.rs
+++ /dev/null
@@ -1,560 +0,0 @@
-use alloc::rc::Rc;
-use alloc::string::{String, ToString};
-use alloc::sync::Arc;
-use alloc::vec::Vec;
-use core::cell::RefCell;
-use core::fmt::Debug;
-use core::mem;
-use hashbrown::HashMap;
-use libredox::protocol::{NsDup, NsPermissions};
-use log::{error, warn};
-use redox_path::RedoxPath;
-use redox_path::RedoxScheme;
-use redox_rt::proc::FdGuard;
-use redox_scheme::{
-    CallerCtx, OpenResult, RequestKind, Response, SendFdRequest, SignalBehavior, Socket,
-    scheme::{SchemeState, SchemeSync},
-};
-use syscall::Stat;
-use syscall::dirent::{DirEntry, DirentBuf, DirentKind};
-use syscall::{CallFlags, FobtainFdFlags, error::*, schemev2::NewFdFlags};
-
-#[derive(Debug, Clone)]
-struct Namespace {
-    schemes: HashMap<String, Arc<FdGuard>>,
-}
-
-impl Namespace {
-    fn fork(&self, buf: &[u8]) -> Result<Self> {
-        let mut schemes = HashMap::new();
-        let mut cursor = 0;
-        while cursor < buf.len() {
-            let len = read_num::<usize>(&buf[cursor..])?;
-            cursor += mem::size_of::<usize>();
-            let name = String::from_utf8(Vec::from(&buf[cursor..cursor + len]))
-                .map_err(|_| Error::new(EINVAL))?;
-            cursor += len;
-            if name.ends_with('*') {
-                let prefix = &name[..name.len() - 1];
-                for (registered_name, fd) in &self.schemes {
-                    if registered_name.starts_with(prefix) {
-                        schemes.insert(registered_name.clone(), fd.clone());
-                    }
-                }
-            } else {
-                let Some(fd) = self.schemes.get(&name) else {
-                    warn!("Scheme {} not found in namespace", name);
-                    continue;
-                };
-                schemes.insert(name, fd.clone());
-            }
-        }
-        Ok(Self { schemes })
-    }
-    fn get_scheme_fd(&self, scheme: &str) -> Option<&Arc<FdGuard>> {
-        self.schemes.get(scheme)
-    }
-    fn remove_scheme(&mut self, scheme: &str) -> Option<()> {
-        self.schemes.remove(scheme).map(|_| ())
-    }
-}
-
-#[derive(Debug, Clone)]
-struct NamespaceAccess {
-    namespace: Rc<RefCell<Namespace>>,
-    permission: NsPermissions,
-}
-
-impl NamespaceAccess {
-    fn has_permission(&self, permission: NsPermissions) -> bool {
-        self.permission.contains(permission)
-    }
-}
-
-#[derive(Debug, Clone)]
-struct SchemeRegister {
-    target_namespace: Rc<RefCell<Namespace>>,
-    scheme_name: String,
-}
-
-impl SchemeRegister {
-    fn register(&self, fd: FdGuard) -> Result<()> {
-        let mut ns = self.target_namespace.borrow_mut();
-        if ns.schemes.contains_key(&self.scheme_name) {
-            return Err(Error::new(EEXIST));
-        }
-        ns.schemes.insert(self.scheme_name.clone(), Arc::new(fd));
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone)]
-enum Handle {
-    Access(NamespaceAccess),
-    Register(SchemeRegister),
-    List(NamespaceAccess),
-}
-
-pub struct NamespaceScheme<'sock> {
-    socket: &'sock Socket,
-    handles: HashMap<usize, Handle>,
-    root_namespace: Namespace,
-    next_id: usize,
-    scheme_creation_cap: FdGuard,
-}
-
-const HIGH_PERMISSIONS: NsPermissions = NsPermissions::SCHEME_CREATE;
-
-impl<'sock> NamespaceScheme<'sock> {
-    pub fn new(
-        socket: &'sock Socket,
-        schemes: HashMap<String, Arc<FdGuard>>,
-        scheme_creation_cap: FdGuard,
-    ) -> Self {
-        Self {
-            socket,
-            handles: HashMap::new(),
-            root_namespace: Namespace { schemes },
-            next_id: 0,
-            scheme_creation_cap,
-        }
-    }
-
-    fn add_namespace(&mut self, id: usize, schemes: Namespace, permission: NsPermissions) {
-        let handle = Handle::Access(NamespaceAccess {
-            namespace: Rc::new(RefCell::new(schemes)),
-            permission,
-        });
-        self.handles.insert(id, handle);
-    }
-
-    fn get_ns_access(&self, id: usize) -> Option<&NamespaceAccess> {
-        let handle = self.handles.get(&id);
-        match handle {
-            Some(Handle::Access(access)) => Some(access),
-            _ => None,
-        }
-    }
-
-    fn open_namespace_resource(
-        &self,
-        ns_access: &NamespaceAccess,
-        reference: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        match reference {
-            "scheme-creation-cap" => {
-                if !ns_access.has_permission(NsPermissions::SCHEME_CREATE) {
-                    error!("Permission denied to get scheme creation capability");
-                    return Err(Error::new(EACCES));
-                }
-                Ok(syscall::dup(self.scheme_creation_cap.as_raw_fd(), &[])?)
-            }
-            _ => {
-                error!("Unknown special reference: {}", reference);
-                return Err(Error::new(EINVAL));
-            }
-        }
-    }
-
-    fn open_scheme_resource(
-        &self,
-        ns: &Namespace,
-        scheme: &str,
-        reference: &str,
-        flags: usize,
-        fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let Some(cap_fd) = ns.get_scheme_fd(scheme) else {
-            log::info!("Scheme {:?} not found in namespace", scheme);
-            return Err(Error::new(ENODEV));
-        };
-
-        let scheme_fd = syscall::openat_with_filter(
-            cap_fd.as_raw_fd(),
-            reference,
-            flags,
-            fcntl_flags as usize,
-            ctx.uid,
-            ctx.gid,
-        )?;
-
-        Ok(scheme_fd)
-    }
-
-    fn fork_namespace(&mut self, namespace: Rc<RefCell<Namespace>>, names: &[u8]) -> Result<usize> {
-        let new_id = self.next_id;
-        let new_namespace = namespace.borrow().fork(names).map_err(|e| {
-            error!("Failed to fork namespace {}: {}", new_id, e);
-            e
-        })?;
-        self.add_namespace(
-            new_id,
-            new_namespace,
-            NsPermissions::all().difference(HIGH_PERMISSIONS),
-        );
-        self.next_id += 1;
-        Ok(new_id)
-    }
-
-    fn shrink_permissions(
-        &mut self,
-        mut ns: NamespaceAccess,
-        permission: NsPermissions,
-    ) -> Result<usize> {
-        ns.permission = ns.permission.intersection(permission);
-        let next_id = self.next_id;
-        self.handles.insert(next_id, Handle::Access(ns));
-        self.next_id += 1;
-        Ok(next_id)
-    }
-}
-
-impl<'sock> SchemeSync for NamespaceScheme<'sock> {
-    fn openat(
-        &mut self,
-        fd: usize,
-        path: &str,
-        flags: usize,
-        fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        let ns_access = {
-            let handle = self.handles.get(&fd);
-            match handle {
-                Some(Handle::Access(access)) => Some(access),
-                _ => None,
-            }
-        }
-        .ok_or_else(|| {
-            error!("Namespace with ID {} not found", fd);
-            Error::new(ENOENT)
-        })?;
-        let redox_path = RedoxPath::from_absolute(path).ok_or(Error::new(EINVAL))?;
-        let (scheme, reference) = redox_path.as_parts().ok_or(Error::new(EINVAL))?;
-
-        let res_fd = match scheme.as_ref() {
-            "namespace" => self.open_namespace_resource(
-                ns_access,
-                reference.as_ref(),
-                flags,
-                fcntl_flags,
-                ctx,
-            )?,
-            "" => {
-                if !ns_access.has_permission(NsPermissions::LIST) {
-                    error!("Permission denied to list schemes in namespace {}", fd);
-                    return Err(Error::new(EACCES));
-                }
-
-                let new_id = self.next_id;
-                self.next_id += 1;
-
-                self.handles.insert(new_id, Handle::List(ns_access.clone()));
-
-                return Ok(OpenResult::ThisScheme {
-                    number: new_id,
-                    flags: NewFdFlags::empty(),
-                });
-            }
-            _ => self.open_scheme_resource(
-                &ns_access.namespace.borrow(),
-                scheme.as_ref(),
-                reference.as_ref(),
-                flags,
-                fcntl_flags,
-                ctx,
-            )?,
-        };
-
-        Ok(OpenResult::OtherScheme { fd: res_fd })
-    }
-
-    fn dup(&mut self, id: usize, buf: &[u8], _ctx: &CallerCtx) -> Result<OpenResult> {
-        let ns_access = self.get_ns_access(id).ok_or_else(|| {
-            error!("Namespace with ID {} not found", id);
-            Error::new(ENOENT)
-        })?;
-
-        let raw_kind = read_num::<usize>(buf)?;
-        let Some(kind) = NsDup::try_from_raw(raw_kind) else {
-            error!("Unknown dup kind: {}", raw_kind);
-            return Err(Error::new(EINVAL));
-        };
-        let payload = &buf[mem::size_of::<NsDup>()..];
-        let new_id = match kind {
-            NsDup::ForkNs => {
-                let ns = ns_access.namespace.clone();
-                let _ = ns_access;
-                self.fork_namespace(ns, payload)?
-            }
-            NsDup::ShrinkPermissions => self.shrink_permissions(
-                ns_access.clone(),
-                NsPermissions::from_bits_truncate(read_num::<usize>(payload)?),
-            )?,
-            NsDup::IssueRegister => {
-                let name = core::str::from_utf8(payload).map_err(|_| Error::new(EINVAL))?;
-                let scheme_name = RedoxScheme::new(name).ok_or_else(|| {
-                    error!("Invalid scheme name: {}", name);
-                    Error::new(EINVAL)
-                })?;
-
-                if !ns_access.has_permission(NsPermissions::INSERT) {
-                    error!(
-                        "Permission denied to issue register capability for namespace {}",
-                        id
-                    );
-                    return Err(Error::new(EACCES));
-                }
-                let new_id = self.next_id;
-                let register_cap = Handle::Register(SchemeRegister {
-                    target_namespace: ns_access.namespace.clone(),
-                    scheme_name: scheme_name.as_ref().to_string(),
-                });
-                self.handles.insert(new_id, register_cap);
-                self.next_id += 1;
-                new_id
-            }
-        };
-
-        Ok(OpenResult::ThisScheme {
-            number: new_id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn unlinkat(&mut self, fd: usize, path: &str, flags: usize, ctx: &CallerCtx) -> Result<()> {
-        let ns_access = self.get_ns_access(fd).ok_or_else(|| {
-            error!("Namespace with ID {} not found", fd);
-            Error::new(ENOENT)
-        })?;
-        let mut ns = ns_access.namespace.borrow_mut();
-
-        let redox_path = RedoxPath::from_absolute(path).ok_or(Error::new(EINVAL))?;
-        let (scheme, reference) = redox_path.as_parts().ok_or(Error::new(EINVAL))?;
-        if reference.as_ref().is_empty() {
-            if !ns_access.has_permission(NsPermissions::DELETE) {
-                error!("Permission denied to remove scheme for namespace {}", fd);
-                return Err(Error::new(EACCES));
-            }
-            match ns.remove_scheme(scheme.as_ref()) {
-                Some(_) => return Ok(()),
-                None => {
-                    error!("Scheme {} not found in namespace", scheme);
-                    return Err(Error::new(ENODEV));
-                }
-            }
-        }
-        let Some(cap_fd) = ns.get_scheme_fd(scheme.as_ref()) else {
-            error!("Scheme {} not found in namespace", scheme);
-            return Err(Error::new(ENODEV));
-        };
-
-        syscall::unlinkat_with_filter(cap_fd.as_raw_fd(), reference, flags, ctx.uid, ctx.gid)?;
-
-        Ok(())
-    }
-
-    fn on_close(&mut self, id: usize) {
-        self.handles.remove(&id);
-    }
-
-    fn on_sendfd(&mut self, sendfd_request: &SendFdRequest) -> Result<usize> {
-        let namespace_id = sendfd_request.id();
-        let num_fds = sendfd_request.num_fds();
-
-        let handle = self.handles.get(&namespace_id).ok_or_else(|| {
-            error!("Namespace with ID {} not found", namespace_id);
-            Error::new(ENOENT)
-        })?;
-        let Handle::Register(register_cap) = handle else {
-            error!(
-                "Handle with ID {} is not a register capability",
-                namespace_id
-            );
-            return Err(Error::new(EACCES));
-        };
-
-        if num_fds == 0 {
-            return Ok(0);
-        }
-        if num_fds > 1 {
-            error!("Can only send one fd at a time");
-            return Err(Error::new(EINVAL));
-        }
-        let mut new_fd = usize::MAX;
-        if let Err(e) = sendfd_request.obtain_fd(
-            &self.socket,
-            FobtainFdFlags::UPPER_TBL,
-            core::slice::from_mut(&mut new_fd),
-        ) {
-            error!("on_sendfd: obtain_fd failed with error: {:?}", e);
-            return Err(e);
-        }
-        register_cap.register(FdGuard::new(new_fd))?;
-
-        Ok(num_fds)
-    }
-
-    fn getdents<'buf>(
-        &mut self,
-        id: usize,
-        mut buf: DirentBuf<&'buf mut [u8]>,
-        opaque_offset: u64,
-    ) -> Result<DirentBuf<&'buf mut [u8]>> {
-        let Handle::List(ns_access) = self.handles.get(&id).ok_or(Error::new(EBADF))? else {
-            return Err(Error::new(ENOTDIR));
-        };
-
-        if !ns_access.has_permission(NsPermissions::LIST) {
-            return Err(Error::new(EACCES));
-        }
-
-        let ns = ns_access.namespace.borrow();
-
-        let opaque_offset = opaque_offset as usize;
-        for (i, (name, _)) in ns.schemes.iter().enumerate().skip(opaque_offset) {
-            if name.is_empty() {
-                continue;
-            }
-            if let Err(err) = buf.entry(DirEntry {
-                kind: DirentKind::Unspecified,
-                name: &name.clone(),
-                inode: 0,
-                next_opaque_id: i as u64 + 1,
-            }) {
-                if err.errno == EINVAL && i > opaque_offset {
-                    // POSIX allows partial result of getdents
-                    break;
-                } else {
-                    return Err(err);
-                }
-            }
-        }
-
-        Ok(buf)
-    }
-
-    fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        let resource_stat = match self.handles.get(&id).ok_or(Error::new(EBADF))? {
-            Handle::List(_) => Stat {
-                st_mode: 0o444 | syscall::MODE_DIR,
-                st_uid: 0,
-                st_gid: 0,
-                st_size: 0,
-                ..Default::default()
-            },
-            Handle::Access(_) | Handle::Register(_) => Stat {
-                st_mode: 0o666 | syscall::MODE_FILE,
-                st_uid: 0,
-                st_gid: 0,
-                st_size: 0,
-                ..Default::default()
-            },
-        };
-        *stat = resource_stat;
-        Ok(())
-    }
-}
-
-trait NumFromBytes: Sized + Debug {
-    fn from_le_bytes_slice(buffer: &[u8]) -> Result<Self, Error>;
-}
-
-macro_rules! num_from_bytes_impl {
-    ($($t:ty),*) => {
-        $(
-            impl NumFromBytes for $t {
-                fn from_le_bytes_slice(buffer: &[u8]) -> Result<Self, Error> {
-                    let size = mem::size_of::<Self>();
-                    let buffer_slice = buffer.get(..size).and_then(|s| s.try_into().ok());
-
-                    if let Some(slice) = buffer_slice {
-                        Ok(Self::from_le_bytes(slice))
-                    } else {
-                        error!(
-                            "read_num: buffer is too short to read num of size {} (buffer len: {})",
-                            size, buffer.len()
-                        );
-                        Err(Error::new(EINVAL))
-                    }
-                }
-            }
-        )*
-    };
-}
-
-num_from_bytes_impl!(usize);
-
-fn read_num<T>(buffer: &[u8]) -> Result<T, Error>
-where
-    T: NumFromBytes,
-{
-    T::from_le_bytes_slice(buffer)
-}
-
-pub fn run(
-    sync_pipe: FdGuard,
-    socket: Socket,
-    schemes: HashMap<String, Arc<FdGuard>>,
-    scheme_creation_cap: FdGuard,
-) -> ! {
-    let mut state = SchemeState::new();
-    let mut scheme = NamespaceScheme::new(&socket, schemes, scheme_creation_cap);
-
-    // send namespace fd to bootstrap
-    let new_id = scheme.next_id;
-    scheme.add_namespace(new_id, scheme.root_namespace.clone(), NsPermissions::all());
-    scheme.next_id += 1;
-    let cap_fd = scheme
-        .socket
-        .create_this_scheme_fd(0, new_id, 0, 0)
-        .expect("nsmgr: failed to create namespace fd");
-    let _ = syscall::call_wo(
-        sync_pipe.as_raw_fd(),
-        &cap_fd.to_ne_bytes(),
-        CallFlags::FD,
-        &[],
-    );
-    drop(sync_pipe);
-
-    log::info!("bootstrap: namespace scheme start!");
-    loop {
-        let Some(req) = socket
-            .next_request(SignalBehavior::Restart)
-            .expect("bootstrap: failed to read scheme request from kernel")
-        else {
-            break;
-        };
-        match req.kind() {
-            RequestKind::Call(req) => {
-                let resp = req.handle_sync(&mut scheme, &mut state);
-
-                if !socket
-                    .write_response(resp, SignalBehavior::Restart)
-                    .expect("bootstrap: failed to write scheme response to kernel")
-                {
-                    break;
-                }
-            }
-            RequestKind::OnClose { id } => scheme.on_close(id),
-            RequestKind::SendFd(sendfd_request) => {
-                let result = scheme.on_sendfd(&sendfd_request);
-                let resp = Response::new(result, sendfd_request);
-                if !socket
-                    .write_response(resp, SignalBehavior::Restart)
-                    .expect("bootstrap: failed to write scheme response to kernel")
-                {
-                    break;
-                }
-            }
-
-            _ => (),
-        }
-    }
-
-    unreachable!()
-}
diff --git a/recipes/core/base/bootstrap/src/main.rs b/recipes/core/base/bootstrap/src/main.rs
deleted file mode 100644
index f7dcd537cc..0000000000
--- a/recipes/core/base/bootstrap/src/main.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-#![no_std]
-#![no_main]
-#![allow(internal_features)]
-#![feature(core_intrinsics, str_from_raw_parts, never_type)]
-
-#[cfg(target_arch = "aarch64")]
-#[path = "aarch64.rs"]
-pub mod arch;
-
-#[cfg(target_arch = "x86")]
-#[path = "i686.rs"]
-pub mod arch;
-
-#[cfg(target_arch = "x86_64")]
-#[path = "x86_64.rs"]
-pub mod arch;
-
-#[cfg(target_arch = "riscv64")]
-#[path = "riscv64.rs"]
-pub mod arch;
-
-pub mod exec;
-pub mod initfs;
-pub mod initnsmgr;
-pub mod procmgr;
-pub mod start;
-
-extern crate alloc;
-
-use core::cell::UnsafeCell;
-
-use alloc::collections::btree_map::BTreeMap;
-use redox_rt::proc::FdGuard;
-use syscall::data::Map;
-use syscall::data::{GlobalSchemes, KernelSchemeInfo};
-use syscall::flag::MapFlags;
-
-#[panic_handler]
-fn panic_handler(info: &core::panic::PanicInfo) -> ! {
-    use core::fmt::Write;
-
-    struct Writer;
-
-    impl Write for Writer {
-        fn write_str(&mut self, s: &str) -> core::fmt::Result {
-            syscall::write(1, s.as_bytes())
-                .map_err(|_| core::fmt::Error)
-                .map(|_| ())
-        }
-    }
-
-    let _ = writeln!(&mut Writer, "{}", info);
-    core::intrinsics::abort();
-}
-
-const HEAP_OFF: usize = arch::USERMODE_END / 2;
-
-struct Allocator;
-#[global_allocator]
-static ALLOCATOR: Allocator = Allocator;
-
-struct AllocStateInner {
-    heap: Option<linked_list_allocator::Heap>,
-    heap_top: usize,
-}
-struct AllocState(UnsafeCell<AllocStateInner>);
-unsafe impl Send for AllocState {}
-unsafe impl Sync for AllocState {}
-static ALLOC_STATE: AllocState = AllocState(UnsafeCell::new(AllocStateInner {
-    heap: None,
-    heap_top: HEAP_OFF + SIZE,
-}));
-
-const SIZE: usize = 1024 * 1024;
-const HEAP_INCREASE_BY: usize = SIZE;
-
-unsafe impl alloc::alloc::GlobalAlloc for Allocator {
-    unsafe fn alloc(&self, layout: core::alloc::Layout) -> *mut u8 {
-        let state = unsafe { &mut (*ALLOC_STATE.0.get()) };
-        let heap = state.heap.get_or_insert_with(|| {
-            state.heap_top = HEAP_OFF + SIZE;
-            let _ = unsafe {
-                syscall::fmap(
-                    !0,
-                    &Map {
-                        offset: 0,
-                        size: SIZE,
-                        address: HEAP_OFF,
-                        flags: MapFlags::PROT_WRITE
-                            | MapFlags::PROT_READ
-                            | MapFlags::MAP_PRIVATE
-                            | MapFlags::MAP_FIXED_NOREPLACE,
-                    },
-                )
-            }
-            .expect("failed to map initial heap");
-            unsafe { linked_list_allocator::Heap::new(HEAP_OFF as *mut u8, SIZE) }
-        });
-
-        match heap.allocate_first_fit(layout) {
-            Ok(p) => p.as_ptr(),
-            Err(_) => {
-                if layout.size() > HEAP_INCREASE_BY || layout.align() > 4096 {
-                    return core::ptr::null_mut();
-                }
-
-                let _ = unsafe {
-                    syscall::fmap(
-                        !0,
-                        &Map {
-                            offset: 0,
-                            size: HEAP_INCREASE_BY,
-                            address: state.heap_top,
-                            flags: MapFlags::PROT_WRITE
-                                | MapFlags::PROT_READ
-                                | MapFlags::MAP_PRIVATE
-                                | MapFlags::MAP_FIXED_NOREPLACE,
-                        },
-                    )
-                }
-                .expect("failed to extend heap");
-                unsafe { heap.extend(HEAP_INCREASE_BY) };
-                state.heap_top += HEAP_INCREASE_BY;
-
-                return unsafe { self.alloc(layout) };
-            }
-        }
-    }
-    unsafe fn dealloc(&self, ptr: *mut u8, layout: core::alloc::Layout) {
-        unsafe {
-            (&mut *ALLOC_STATE.0.get())
-                .heap
-                .as_mut()
-                .unwrap()
-                .deallocate(core::ptr::NonNull::new(ptr).unwrap(), layout)
-        }
-    }
-}
-
-pub struct KernelSchemeMap(BTreeMap<GlobalSchemes, FdGuard>);
-impl KernelSchemeMap {
-    fn new(kernel_scheme_infos: &[KernelSchemeInfo]) -> Self {
-        let mut map = BTreeMap::new();
-        for info in kernel_scheme_infos {
-            if let Some(scheme_id) = GlobalSchemes::try_from_raw(info.scheme_id) {
-                map.insert(scheme_id, FdGuard::new(info.fd));
-            }
-        }
-        Self(map)
-    }
-    fn get(&self, scheme: GlobalSchemes) -> Option<&FdGuard> {
-        self.0.get(&scheme)
-    }
-}
diff --git a/recipes/core/base/bootstrap/src/procmgr.rs b/recipes/core/base/bootstrap/src/procmgr.rs
deleted file mode 100644
index b1268e0362..0000000000
--- a/recipes/core/base/bootstrap/src/procmgr.rs
+++ /dev/null
@@ -1,2640 +0,0 @@
-use core::cell::RefCell;
-use core::cmp;
-use core::mem::size_of;
-use core::num::{NonZeroU8, NonZeroUsize};
-use core::ops::Deref;
-use core::ptr::NonNull;
-use core::str::FromStr;
-use core::sync::atomic::Ordering;
-use core::task::Poll::{self, *};
-
-use alloc::collections::VecDeque;
-use alloc::collections::btree_map::BTreeMap;
-use alloc::rc::{Rc, Weak};
-use alloc::vec;
-use alloc::vec::Vec;
-
-use arrayvec::ArrayString;
-use hashbrown::hash_map::{Entry, OccupiedEntry, VacantEntry};
-use hashbrown::{DefaultHashBuilder, HashMap, HashSet};
-
-use libredox::protocol::{
-    ProcCall, ProcKillTarget, ProcMeta, RtSigInfo, SIGCHLD, SIGCONT, SIGHUP, SIGKILL, SIGSTOP,
-    SIGTSTP, SIGTTIN, SIGTTOU, ThreadCall, WaitFlags,
-};
-use redox_rt::proc::FdGuard;
-use redox_scheme::scheme::{IntoTag, Op, OpCall};
-use redox_scheme::{
-    CallerCtx, Id, OpenResult, Request, RequestKind, Response, SendFdRequest, SignalBehavior,
-    Socket, Tag,
-};
-use slab::Slab;
-use syscall::schemev2::NewFdFlags;
-use syscall::{
-    CallFlags, ContextStatus, ContextVerb, CtxtStsBuf, EACCES, EAGAIN, EBADF, EBADFD, ECANCELED,
-    ECHILD, EEXIST, EINTR, EINVAL, ENOENT, ENOSYS, EOPNOTSUPP, EOWNERDEAD, EPERM, ERESTART, ESRCH,
-    EWOULDBLOCK, Error, Event, EventFlags, FobtainFdFlags, MapFlags, O_ACCMODE, O_CREAT, O_RDONLY,
-    PAGE_SIZE, ProcSchemeAttrs, Result, SenderInfo, SetSighandlerData, SigProcControl, Sigcontrol,
-    sig_bit,
-};
-
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-enum VirtualId {
-    KernelId(Id),
-    // TODO: slab or something for better ID reuse
-    InternalId(u64),
-}
-
-pub fn run(write_fd: FdGuard, socket: Socket, auth: FdGuard, event: FdGuard) -> ! {
-    // TODO?
-    let socket_ident = socket.inner().raw();
-
-    let queue = RawEventQueue::new(event.as_raw_fd()).expect("failed to create event queue");
-    drop(event);
-
-    queue
-        .subscribe(socket.inner().raw(), socket_ident, EventFlags::EVENT_READ)
-        .expect("failed to listen to scheme socket events");
-
-    let mut scheme = ProcScheme::new(auth, &queue);
-
-    // send open-capability to bootstrap
-    let new_id = scheme.handles.insert(Handle::SchemeRoot);
-    let cap_fd = socket
-        .create_this_scheme_fd(0, new_id, 0, 0)
-        .expect("failed to issue procmgr root fd");
-
-    log::debug!("process manager started");
-    let _ = syscall::call_wo(
-        write_fd.as_raw_fd(),
-        &cap_fd.to_ne_bytes(),
-        CallFlags::FD,
-        &[],
-    );
-    drop(write_fd);
-
-    let mut states = HashMap::<VirtualId, PendingState, DefaultHashBuilder>::new();
-    let mut awoken = VecDeque::<VirtualId>::new();
-    let mut new_awoken = VecDeque::new();
-
-    'outer: loop {
-        log::trace!("AWOKEN {awoken:#?}");
-        while !awoken.is_empty() || !new_awoken.is_empty() {
-            awoken.append(&mut new_awoken);
-            for awoken in awoken.drain(..) {
-                //log::trace!("ALL STATES {states:#?}, AWOKEN {awoken:#?}");
-                let Entry::Occupied(state) = states.entry(awoken) else {
-                    continue;
-                };
-                match scheme.work_on(state, &mut new_awoken) {
-                    Ready(resp) => loop {
-                        match socket.write_response(resp, SignalBehavior::Interrupt) {
-                            Ok(false) => break 'outer,
-                            Ok(_) => break,
-                            Err(err) if err.errno == EINTR => continue,
-                            Err(err) => {
-                                panic!(
-                                    "bootstrap: failed to write scheme response to kernel: {err}"
-                                )
-                            }
-                        }
-                    },
-                    Pending => continue,
-                }
-            }
-        }
-        // TODO: multiple events?
-        let event = queue.next_event().expect("failed to get next event");
-
-        if event.data == socket_ident {
-            'reqs: loop {
-                let req = loop {
-                    match socket.next_request(SignalBehavior::Interrupt) {
-                        Ok(None) => break 'outer,
-                        Ok(Some(req)) => break req,
-                        Err(e) if e.errno == EINTR => continue,
-                        // spurious event
-                        Err(e) if e.errno == EWOULDBLOCK || e.errno == EAGAIN => break 'reqs,
-                        Err(other) => {
-                            panic!("bootstrap: failed to read scheme request from kernel: {other}")
-                        }
-                    }
-                };
-                log::trace!("REQ{req:#?}");
-                let Ready(resp) =
-                    handle_scheme(req, &socket, &mut scheme, &mut states, &mut awoken)
-                else {
-                    continue 'reqs;
-                };
-                loop {
-                    match socket.write_response(resp, SignalBehavior::Interrupt) {
-                        Ok(false) => break 'outer,
-                        Ok(_) => break,
-                        Err(err) if err.errno == EINTR => continue,
-                        Err(err) => {
-                            panic!("bootstrap: failed to write scheme response to kernel: {err}")
-                        }
-                    }
-                }
-            }
-        } else if let Some(thread) = scheme.thread_lookup.get(&event.data) {
-            let Some(thread_rc) = thread.upgrade() else {
-                log::trace!("DEAD THREAD EVENT FROM {}", event.data,);
-                continue;
-            };
-            let thread = thread_rc.borrow();
-            let pid = thread.pid;
-            let Some(proc_rc) = scheme.processes.get(&pid) else {
-                // TODO(err)?
-                continue;
-            };
-            let mut proc = proc_rc.borrow_mut();
-            log::trace!("THREAD EVENT FROM {}, {}", event.data, thread.pid.0);
-            let mut sts_buf = CtxtStsBuf::default();
-            thread.status_hndl.read(&mut sts_buf).unwrap();
-
-            let status = if sts_buf.status == ContextStatus::Dead as usize {
-                // dont-care, already called explicit exit()
-                0
-            } else if sts_buf.status == ContextStatus::ForceKilled as usize {
-                (SIGKILL << 8) as u16
-            } else if sts_buf.status == ContextStatus::UnhandledExcp as usize {
-                // TODO: translate arch-specific exception kind
-                // TODO: generate coredump (or let some other process do that)
-                // into signal (SIGSEGV, SIGBUS, SIGILL, SIGFPE)
-                1
-            } else {
-                // spurious event
-                continue;
-            };
-
-            log::trace!("--THREAD DIED {}, {}", event.data, thread.pid.0);
-
-            if let Err(err) = scheme.queue.unsubscribe(event.data, event.data) {
-                log::error!("failed to unsubscribe from fd {}: {err}", event.data);
-            }
-            scheme.thread_lookup.remove(&event.data);
-            proc.threads.retain(|rc| !Rc::ptr_eq(rc, &thread_rc));
-
-            if matches!(proc.status, ProcessStatus::Exiting { .. }) {
-                log::trace!("WAKING UP {}", proc.awaiting_threads_term.len(),);
-                awoken.extend(proc.awaiting_threads_term.drain(..)); // TODO(opt)
-            } else if proc.threads.is_empty() {
-                let internal_id = scheme.next_internal_id;
-                scheme.next_internal_id += 1;
-                let Entry::Vacant(entry) = states.entry(VirtualId::InternalId(internal_id)) else {
-                    log::error!("internal ID reuse!");
-                    continue;
-                };
-                drop(thread);
-                drop(proc);
-                let Pending = scheme.on_exit_start(pid, status, entry, &mut awoken, None) else {
-                    unreachable!("not possible with tag=None");
-                };
-            }
-        } else {
-            log::warn!("TODO: UNKNOWN EVENT {event:?}");
-        }
-    }
-
-    unreachable!()
-}
-fn handle_scheme<'a>(
-    req: Request,
-    socket: &'a Socket,
-    scheme: &mut ProcScheme<'a>,
-    states: &mut HashMap<VirtualId, PendingState>,
-    awoken: &mut VecDeque<VirtualId>,
-) -> Poll<Response> {
-    match req.kind() {
-        RequestKind::Call(req) => {
-            let caller = req.caller();
-            let req_id = VirtualId::KernelId(req.request_id());
-            let op = match req.op() {
-                Ok(op) => op,
-                Err(req) => return Response::ready_err(ENOSYS, req),
-            };
-            match op {
-                Op::OpenAt(op) => Ready(Response::open_dup_like(
-                    scheme.on_openat(op.fd, op.path(), *op.flags(), op.fcntl_flags, &caller),
-                    op,
-                )),
-                Op::Dup(op) => Ready(Response::open_dup_like(scheme.on_dup(op.fd, op.buf()), op)),
-                Op::Read(mut op) => Ready(Response::new(
-                    scheme.on_read(op.fd, op.offset, op.buf()),
-                    op,
-                )),
-                Op::Call(op) => scheme.on_call(
-                    {
-                        // TODO: cleanup
-                        states.remove(&req_id);
-                        if let Entry::Vacant(entry) = states.entry(req_id) {
-                            entry
-                        } else {
-                            unreachable!()
-                        }
-                    },
-                    op,
-                    awoken,
-                ),
-                Op::Fpath(mut op) => {
-                    //TODO: fill in useful path?
-                    let buf = op.buf();
-                    let scheme_path = b"/scheme/proc/";
-                    let scheme_bytes = core::cmp::min(scheme_path.len(), buf.len());
-                    buf[..scheme_bytes].copy_from_slice(&scheme_path[..scheme_bytes]);
-                    Response::ready_ok(scheme_bytes, op)
-                }
-                Op::Fsize { req, fd } => {
-                    if let Handle::Ps(b) = &scheme.handles[fd] {
-                        Response::ready_ok(b.len(), req)
-                    } else {
-                        Response::ready_err(EOPNOTSUPP, req)
-                    }
-                }
-                Op::Fstat(mut op) => {
-                    if let Handle::Ps(b) = &scheme.handles[op.fd] {
-                        op.buf().st_size = b.len() as _;
-                        op.buf().st_mode = syscall::MODE_FILE | 0o444;
-                        Response::ready_ok(0, op)
-                    } else {
-                        Response::ready_err(EOPNOTSUPP, op)
-                    }
-                }
-                _ => {
-                    log::trace!("UNKNOWN: {op:?}");
-                    Response::ready_err(ENOSYS, op)
-                }
-            }
-        }
-        RequestKind::Cancellation(req) => {
-            if let Entry::Occupied(state) = states.entry(VirtualId::KernelId(req.id)) {
-                match state.remove() {
-                    PendingState::AwaitingStatusChange { op, .. } => {
-                        Response::ready_err(ECANCELED, op)
-                    }
-                    // TODO: Test this by calling exit() on behalf of another process using the IPC
-                    // call Exit, then cancel. Keep in mind this won't cancel the underlying exit, just
-                    // detach the waiter from it.
-                    PendingState::AwaitingThreadsTermination(pid, tag) => {
-                        let resp = if let Some(tag) = tag {
-                            Ready(Response::err(ECANCELED, tag))
-                        } else {
-                            Pending
-                        };
-
-                        let vid = VirtualId::InternalId(scheme.next_internal_id);
-                        scheme.next_internal_id += 1;
-                        states.insert(vid, PendingState::AwaitingThreadsTermination(pid, None));
-                        awoken.push_back(vid);
-
-                        resp
-                    }
-                    PendingState::Placeholder => {
-                        log::warn!("State {:?} was placeholder!", req.id);
-                        Pending
-                    }
-                }
-            } else {
-                log::warn!("Cancellation for unknown id {:?}", req.id);
-                Pending
-            }
-        }
-        RequestKind::OnClose { id } => {
-            scheme.on_close(id);
-            // no response associated
-            Pending
-        }
-        RequestKind::SendFd(req) => Ready(scheme.on_sendfd(socket, req)),
-
-        // ignore
-        _ => Pending,
-    }
-}
-#[derive(Debug)]
-enum PendingState {
-    AwaitingStatusChange {
-        waiter: ProcessId,
-        target: WaitpidTarget,
-        flags: WaitFlags,
-        op: OpCall,
-    },
-    AwaitingThreadsTermination(ProcessId, Option<Tag>),
-    Placeholder,
-}
-/*impl IntoTag for PendingState {
-    fn into_tag(self) -> Tag {
-        match self {
-            Self::AwaitingThreadsTermination(_, tag) => tag,
-            Self::AwaitingStatusChange { op, .. } => op.into_tag(),
-            Self::Placeholder => unreachable!(),
-        }
-    }
-}*/
-
-#[derive(Debug)]
-pub struct Page<T> {
-    ptr: NonNull<T>,
-    off: u16,
-}
-impl<T> Page<T> {
-    pub fn map(fd: &FdGuard, req_offset: usize, displacement: u16) -> Result<Self> {
-        Ok(Self {
-            off: displacement,
-            ptr: NonNull::new(unsafe {
-                syscall::fmap(
-                    fd.as_raw_fd(),
-                    &syscall::Map {
-                        offset: req_offset,
-                        size: PAGE_SIZE,
-                        flags: MapFlags::PROT_READ | MapFlags::PROT_WRITE | MapFlags::MAP_SHARED,
-                        address: 0,
-                    },
-                )? as *mut T
-            })
-            .unwrap(),
-        })
-    }
-}
-impl<T> Deref for Page<T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        unsafe { &*self.ptr.as_ptr().byte_add(self.off.into()) }
-    }
-}
-impl<T> Drop for Page<T> {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = syscall::funmap(self.ptr.as_ptr() as usize, PAGE_SIZE);
-        }
-    }
-}
-
-const NAME_CAPAC: usize = 32;
-
-#[derive(Debug)]
-struct Process {
-    threads: Vec<Rc<RefCell<Thread>>>,
-    pid: ProcessId,
-    ppid: ProcessId,
-    pgid: ProcessId,
-    sid: ProcessId,
-    name: ArrayString<NAME_CAPAC>,
-    prio: u32,
-
-    ruid: u32,
-    euid: u32,
-    suid: u32,
-    rgid: u32,
-    egid: u32,
-    sgid: u32,
-
-    status: ProcessStatus,
-    disabled_setpgid: bool,
-
-    awaiting_threads_term: Vec<VirtualId>,
-
-    waitpid: BTreeMap<WaitpidKey, (ProcessId, WaitpidStatus)>,
-    waitpid_waiting: VecDeque<VirtualId>,
-
-    sig_pctl: Option<Page<SigProcControl>>,
-    rtqs: Vec<VecDeque<RtSigInfo>>,
-}
-#[derive(Copy, Clone, Debug)]
-struct WaitpidKey {
-    pid: Option<ProcessId>,
-    pgid: Option<ProcessId>,
-}
-
-// TODO: Is this valid? (transitive?)
-impl Ord for WaitpidKey {
-    fn cmp(&self, other: &WaitpidKey) -> cmp::Ordering {
-        // If both have pid set, compare that
-        if let Some(s_pid) = self.pid {
-            if let Some(o_pid) = other.pid {
-                return s_pid.cmp(&o_pid);
-            }
-        }
-
-        // If both have pgid set, compare that
-        if let Some(s_pgid) = self.pgid {
-            if let Some(o_pgid) = other.pgid {
-                return s_pgid.cmp(&o_pgid);
-            }
-        }
-
-        // If either has pid set, it is greater
-        if self.pid.is_some() {
-            return cmp::Ordering::Greater;
-        }
-
-        if other.pid.is_some() {
-            return cmp::Ordering::Less;
-        }
-
-        // If either has pgid set, it is greater
-        if self.pgid.is_some() {
-            return cmp::Ordering::Greater;
-        }
-
-        if other.pgid.is_some() {
-            return cmp::Ordering::Less;
-        }
-
-        // If all pid and pgid are None, they are equal
-        cmp::Ordering::Equal
-    }
-}
-
-impl PartialOrd for WaitpidKey {
-    fn partial_cmp(&self, other: &WaitpidKey) -> Option<cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl PartialEq for WaitpidKey {
-    fn eq(&self, other: &WaitpidKey) -> bool {
-        self.cmp(other) == cmp::Ordering::Equal
-    }
-}
-
-impl Eq for WaitpidKey {}
-#[derive(Debug, Clone, Copy)]
-enum ProcessStatus {
-    PossiblyRunnable,
-    Stopped(usize),
-    Exiting {
-        signal: Option<NonZeroU8>,
-        status: u8,
-    },
-    Exited {
-        signal: Option<NonZeroU8>,
-        status: u8,
-    },
-}
-#[derive(Debug)]
-struct Thread {
-    fd: FdGuard,
-    status_hndl: FdGuard,
-    pid: ProcessId,
-    sig_ctrl: Option<Page<Sigcontrol>>,
-}
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-struct ProcessId(usize);
-
-const INIT_PID: ProcessId = ProcessId(1);
-
-struct ProcScheme<'a> {
-    processes: HashMap<ProcessId, Rc<RefCell<Process>>, DefaultHashBuilder>,
-    groups: HashMap<ProcessId, Rc<RefCell<Pgrp>>>,
-    sessions: HashSet<ProcessId, DefaultHashBuilder>,
-    handles: Slab<Handle>,
-
-    thread_lookup: HashMap<usize, Weak<RefCell<Thread>>>,
-
-    next_internal_id: u64,
-
-    init_claimed: bool,
-    next_id: ProcessId,
-
-    queue: &'a RawEventQueue,
-    auth: FdGuard,
-}
-#[derive(Debug, Default)]
-struct Pgrp {
-    processes: Vec<Weak<RefCell<Process>>>,
-}
-#[derive(Clone, Copy, Debug)]
-enum WaitpidStatus {
-    Continued,
-    Stopped {
-        signal: NonZeroU8,
-    },
-    Terminated {
-        signal: Option<NonZeroU8>,
-        status: u8,
-    },
-}
-
-#[derive(Debug)]
-enum Handle {
-    Init,
-    Proc(ProcessId),
-
-    // Needs to be weak so the thread is owned only by the process. Otherwise there would be a
-    // cyclic reference since the underlying context's file table almost certainly contains the
-    // thread fd itself, linked to this handle.
-    Thread(Weak<RefCell<Thread>>),
-
-    // TODO: stateless API, perhaps using intermediate daemon for providing a file-like API
-    Ps(Vec<u8>),
-
-    // A handle that grants the holder the capability to obtain process credentials.
-    ProcCredsCapability,
-
-    // A handle that grants the holder the capability to open process scheme resource.
-    SchemeRoot,
-}
-
-#[derive(Clone, Copy, Debug)]
-enum WaitpidTarget {
-    SingleProc(ProcessId),
-    ProcGroup(ProcessId),
-    AnyChild,
-    AnyGroupMember,
-}
-// TODO(feat): Add 'syscall' backend for redox-event so it can act both as library-ABI frontend and
-// backend
-struct RawEventQueue(FdGuard);
-impl RawEventQueue {
-    pub fn new(cap_fd: usize) -> Result<Self> {
-        syscall::openat(cap_fd, "", O_CREAT, 0)
-            .map(FdGuard::new)
-            .map(Self)
-    }
-    pub fn subscribe(&self, fd: usize, ident: usize, flags: EventFlags) -> Result<()> {
-        self.0.write(&Event {
-            id: fd,
-            data: ident,
-            flags,
-        })?;
-        Ok(())
-    }
-    pub fn unsubscribe(&self, fd: usize, ident: usize) -> Result<()> {
-        self.subscribe(fd, ident, EventFlags::empty())
-    }
-    pub fn next_event(&self) -> Result<Event> {
-        let mut event = Event::default();
-        let read = self.0.read(&mut event)?;
-        assert_eq!(
-            read,
-            size_of::<Event>(),
-            "event queue EOF currently undefined"
-        );
-        Ok(event)
-    }
-}
-
-impl<'a> ProcScheme<'a> {
-    pub fn new(auth: FdGuard, queue: &'a RawEventQueue) -> ProcScheme<'a> {
-        ProcScheme {
-            processes: HashMap::new(),
-            groups: HashMap::new(),
-            sessions: HashSet::new(),
-            thread_lookup: HashMap::new(),
-            handles: Slab::new(),
-            init_claimed: false,
-            next_id: ProcessId(2),
-            next_internal_id: 1,
-            queue,
-            auth,
-        }
-    }
-    fn new_id(&mut self) -> ProcessId {
-        let id = self.next_id;
-        self.next_id.0 += 1;
-        id
-    }
-    fn on_sendfd(&mut self, socket: &Socket, req: SendFdRequest) -> Response {
-        match self.handles[req.id()] {
-            ref mut st @ Handle::Init => {
-                let mut fd_out = usize::MAX;
-                if let Err(e) = req.obtain_fd(
-                    socket,
-                    FobtainFdFlags::empty(),
-                    core::slice::from_mut(&mut fd_out),
-                ) {
-                    return Response::new(Err(e), req);
-                };
-                let fd = FdGuard::new(fd_out);
-
-                // TODO: Use global thread id etc. rather than reusing fd for identifier?
-                self.queue
-                    .subscribe(fd_out, fd_out, EventFlags::EVENT_READ)
-                    .expect("TODO");
-                let status_hndl = fd
-                    .dup(alloc::format!("auth-{}-status", self.auth.as_raw_fd()).as_bytes())
-                    .expect("TODO");
-
-                let thread = Rc::new(RefCell::new(Thread {
-                    fd,
-                    status_hndl,
-                    pid: INIT_PID,
-                    sig_ctrl: None,
-                }));
-                let thread_weak = Rc::downgrade(&thread);
-                let process = Rc::new(RefCell::new(Process {
-                    threads: vec![thread],
-                    pid: INIT_PID,
-                    ppid: INIT_PID,
-                    sid: INIT_PID,
-                    pgid: INIT_PID,
-                    ruid: 0,
-                    euid: 0,
-                    suid: 0,
-                    rgid: 0,
-                    egid: 0,
-                    sgid: 0,
-                    name: ArrayString::<32>::from_str("[init]").unwrap(),
-                    prio: 20,
-
-                    status: ProcessStatus::PossiblyRunnable,
-                    disabled_setpgid: false,
-                    awaiting_threads_term: Vec::new(),
-                    waitpid: BTreeMap::new(),
-                    waitpid_waiting: VecDeque::new(),
-
-                    sig_pctl: None,
-                    rtqs: Vec::new(),
-                }));
-                self.groups.insert(
-                    INIT_PID,
-                    Rc::new(RefCell::new(Pgrp {
-                        processes: vec![Rc::downgrade(&process)],
-                    })),
-                );
-                self.processes.insert(INIT_PID, process);
-                self.sessions.insert(INIT_PID);
-
-                self.thread_lookup.insert(fd_out, thread_weak);
-
-                *st = Handle::Proc(INIT_PID);
-                Response::ok(0, req)
-            }
-            _ => Response::err(EBADF, req),
-        }
-    }
-    fn fork(&mut self, parent_pid: ProcessId) -> Result<ProcessId> {
-        let child_pid = self.new_id();
-
-        let proc_guard = self.processes.get(&parent_pid).ok_or(Error::new(EBADFD))?;
-
-        let Process {
-            pgid,
-            sid,
-            ruid,
-            euid,
-            suid,
-            rgid,
-            egid,
-            sgid,
-            name,
-            prio,
-            ..
-        } = *proc_guard.borrow();
-
-        let new_ctxt_fd = self.auth.dup(b"new-context")?;
-        let status_fd =
-            new_ctxt_fd.dup(alloc::format!("auth-{}-status", self.auth.as_raw_fd()).as_bytes())?;
-
-        let thread_ident = new_ctxt_fd.as_raw_fd();
-        self.queue
-            .subscribe(thread_ident, thread_ident, EventFlags::EVENT_READ)
-            .expect("TODO");
-
-        let thread = Rc::new(RefCell::new(Thread {
-            fd: new_ctxt_fd,
-            status_hndl: status_fd,
-            pid: child_pid,
-            sig_ctrl: None, // TODO
-        }));
-        let thread_weak = Rc::downgrade(&thread);
-        let new_process = Rc::new(RefCell::new(Process {
-            threads: vec![thread],
-            ppid: parent_pid,
-            pid: child_pid,
-            pgid,
-            sid,
-            ruid,
-            euid,
-            suid,
-            rgid,
-            egid,
-            sgid,
-            name,
-            prio,
-
-            status: ProcessStatus::PossiblyRunnable,
-            disabled_setpgid: false,
-            awaiting_threads_term: Vec::new(),
-
-            waitpid: BTreeMap::new(),
-            waitpid_waiting: VecDeque::new(),
-
-            sig_pctl: None, // TODO
-            rtqs: Vec::new(),
-        }));
-        if let Err(err) = new_process
-            .borrow_mut()
-            .sync_kernel_attrs(&self.auth)
-        {
-            log::warn!("Failed to set kernel attrs when forking: {err}");
-        }
-
-        if let Some(group) = self.groups.get(&pgid) {
-            group
-                .borrow_mut()
-                .processes
-                .push(Rc::downgrade(&new_process));
-        }
-
-        self.processes.insert(child_pid, new_process);
-        self.thread_lookup.insert(thread_ident, thread_weak);
-        Ok(child_pid)
-    }
-    fn new_thread(&mut self, pid: ProcessId) -> Result<Rc<RefCell<Thread>>> {
-        // TODO: deduplicate code with fork
-        let proc_rc = self.processes.get_mut(&pid).ok_or(Error::new(EBADFD))?;
-        let mut proc = proc_rc.borrow_mut();
-
-        let ctxt_fd = self.auth.dup(b"new-context")?;
-
-        // TODO: sync_kernel_attrs?
-        let attr_fd =
-            ctxt_fd.dup(alloc::format!("auth-{}-attrs", self.auth.as_raw_fd()).as_bytes())?;
-        attr_fd.write(&ProcSchemeAttrs {
-            pid: pid.0 as u32,
-            euid: proc.euid,
-            egid: proc.egid,
-            prio: proc.prio,
-            debug_name: arraystring_to_bytes(proc.name),
-        })?;
-
-        let status_hndl =
-            ctxt_fd.dup(alloc::format!("auth-{}-status", self.auth.as_raw_fd()).as_bytes())?;
-
-        let ident = ctxt_fd.as_raw_fd();
-        self.queue
-            .subscribe(ident, ident, EventFlags::EVENT_READ)
-            .expect("TODO");
-
-        let thread = Rc::new(RefCell::new(Thread {
-            fd: ctxt_fd,
-            status_hndl,
-            pid,
-            sig_ctrl: None,
-        }));
-        let thread_weak = Rc::downgrade(&thread);
-        proc.threads.push(Rc::clone(&thread));
-        self.thread_lookup.insert(ident, thread_weak);
-        Ok(thread)
-    }
-    fn on_openat(
-        &mut self,
-        fd: usize,
-        path: &str,
-        flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        match self.handles[fd] {
-            Handle::SchemeRoot => {}
-            _ => return Err(Error::new(EACCES)),
-        };
-        let path = path.trim_start_matches('/');
-        Ok(match path {
-            "init" => {
-                if core::mem::replace(&mut self.init_claimed, true) {
-                    return Err(Error::new(EEXIST));
-                }
-                OpenResult::ThisScheme {
-                    number: self.handles.insert(Handle::Init),
-                    flags: NewFdFlags::empty(),
-                }
-            }
-            "ps" => {
-                let data = self.ps_data(ctx)?;
-                OpenResult::ThisScheme {
-                    number: self.handles.insert(Handle::Ps(data)),
-                    flags: NewFdFlags::POSITIONED,
-                }
-            }
-            "proc-creds-capability" => {
-                if ctx.uid != 0 {
-                    return Err(Error::new(EACCES));
-                }
-                if flags & O_ACCMODE != O_RDONLY {
-                    return Err(Error::new(EINVAL));
-                }
-                OpenResult::ThisScheme {
-                    number: self.handles.insert(Handle::ProcCredsCapability),
-                    flags: NewFdFlags::empty(),
-                }
-            }
-
-            _ => return Err(Error::new(ENOENT)),
-        })
-    }
-    fn read_process_metadata(&self, pid: ProcessId, buf: &mut [u8]) -> Result<usize> {
-        let proc_rc = self.processes.get(&pid).ok_or(Error::new(ESRCH))?;
-        let process = proc_rc.borrow();
-        let metadata = ProcMeta {
-            pid: pid.0 as u32,
-            pgid: process.pgid.0 as u32,
-            ppid: process.ppid.0 as u32,
-            ruid: process.ruid,
-            euid: process.euid,
-            suid: process.suid,
-            rgid: process.rgid,
-            egid: process.egid,
-            sgid: process.sgid,
-            ens: 1,
-            rns: 1,
-        };
-        *buf.get_mut(..size_of::<ProcMeta>())
-            .and_then(|b| plain::from_mut_bytes(b).ok())
-            .ok_or(Error::new(EBADF))? = metadata;
-        Ok(size_of::<ProcMeta>())
-    }
-    fn on_read(&mut self, id: usize, offset: u64, buf: &mut [u8]) -> Result<usize> {
-        match self.handles[id] {
-            Handle::Proc(pid) => self.read_process_metadata(pid, buf),
-            Handle::Ps(ref src_buf) => {
-                let src_buf = usize::try_from(offset)
-                    .ok()
-                    .and_then(|o| src_buf.get(o..))
-                    .unwrap_or(&[]);
-                let len = src_buf.len().min(buf.len());
-                buf[..len].copy_from_slice(&src_buf[..len]);
-                Ok(len)
-            }
-            Handle::Init | Handle::Thread(_) | Handle::ProcCredsCapability | Handle::SchemeRoot => {
-                return Err(Error::new(EBADF));
-            }
-        }
-    }
-    fn on_dup(&mut self, old_id: usize, buf: &[u8]) -> Result<OpenResult> {
-        log::trace!("Dup request");
-        match self.handles[old_id] {
-            Handle::Proc(pid) => match buf {
-                b"fork" => {
-                    log::trace!("Forking {pid:?}");
-                    let child_pid = self.fork(pid)?;
-                    Ok(OpenResult::ThisScheme {
-                        number: self.handles.insert(Handle::Proc(child_pid)),
-                        flags: NewFdFlags::empty(),
-                    })
-                }
-                b"new-thread" => {
-                    let thread = self.new_thread(pid)?;
-                    Ok(OpenResult::ThisScheme {
-                        number: self.handles.insert(Handle::Thread(Rc::downgrade(&thread))),
-                        flags: NewFdFlags::empty(),
-                    })
-                }
-                w if w.starts_with(b"thread-") => {
-                    let idx = core::str::from_utf8(&w["thread-".len()..])
-                        .ok()
-                        .and_then(|s| s.parse::<usize>().ok())
-                        .ok_or(Error::new(EINVAL))?;
-                    let process = self.processes.get(&pid).ok_or(Error::new(EBADFD))?.borrow();
-                    let thread = Rc::downgrade(process.threads.get(idx).ok_or(Error::new(ENOENT))?);
-
-                    return Ok(OpenResult::ThisScheme {
-                        number: self.handles.insert(Handle::Thread(thread)),
-                        flags: NewFdFlags::empty(),
-                    });
-                }
-                _ => return Err(Error::new(EINVAL)),
-            },
-            Handle::Thread(ref thread_weak) => {
-                let thread_rc = thread_weak.upgrade().ok_or(Error::new(EOWNERDEAD))?;
-                let thread = thread_rc.borrow();
-
-                // By forwarding all dup calls to the kernel, this fd is now effectively the same
-                // as the underlying fd since that fd can't do anything itself.
-                Ok(OpenResult::OtherScheme {
-                    fd: thread.fd.dup(buf)?.take(),
-                })
-            }
-            Handle::Init | Handle::Ps(_) | Handle::ProcCredsCapability | Handle::SchemeRoot => {
-                Err(Error::new(EBADF))
-            }
-        }
-    }
-    fn on_call(
-        &mut self,
-        state: VacantEntry<VirtualId, PendingState, DefaultHashBuilder>,
-        mut op: OpCall,
-        awoken: &mut VecDeque<VirtualId>,
-    ) -> Poll<Response> {
-        let id = op.fd;
-        let (payload, metadata) = op.payload_and_metadata();
-        match self.handles[id] {
-            Handle::Init => Response::ready_err(EBADF, op),
-            Handle::Thread(ref thr_weak) => {
-                let Some(thr) = thr_weak.upgrade() else {
-                    return Response::ready_err(EOWNERDEAD, op);
-                };
-                let Some(verb) = ThreadCall::try_from_raw(metadata[0] as usize) else {
-                    return Response::ready_err(EINVAL, op);
-                };
-                match verb {
-                    ThreadCall::SyncSigTctl => Ready(Response::new(
-                        Self::on_sync_sigtctl(&mut *thr.borrow_mut()).map(|()| 0),
-                        op,
-                    )),
-                    ThreadCall::SignalThread => Ready(Response::new(
-                        self.on_kill_thread(&thr, metadata[1] as u8, awoken)
-                            .map(|()| 0),
-                        op,
-                    )),
-                }
-            }
-            Handle::Proc(fd_pid) => {
-                let Some(verb) = ProcCall::try_from_raw(metadata[0] as usize) else {
-                    log::trace!("Invalid proc call: {metadata:?}");
-                    return Response::ready_err(EINVAL, op);
-                };
-                match verb {
-                    ProcCall::Exit => self.on_exit_start(
-                        fd_pid,
-                        metadata[1] as u16,
-                        state,
-                        awoken,
-                        Some(op.into_tag()),
-                    ),
-                    ProcCall::Waitpid | ProcCall::Waitpgid => {
-                        let req_pid = ProcessId(metadata[1] as usize);
-                        let target = match (verb, metadata[1] == 0) {
-                            (ProcCall::Waitpid, true) => WaitpidTarget::AnyChild,
-                            (ProcCall::Waitpid, false) => WaitpidTarget::SingleProc(req_pid),
-                            (ProcCall::Waitpgid, true) => WaitpidTarget::AnyGroupMember,
-                            (ProcCall::Waitpgid, false) => WaitpidTarget::ProcGroup(req_pid),
-                            _ => unreachable!(),
-                        };
-                        let flags = match WaitFlags::from_bits(metadata[2] as usize) {
-                            Some(fl) => fl,
-                            None => {
-                                return Response::ready_err(EINVAL, op);
-                            }
-                        };
-                        let state = state.insert_entry(PendingState::AwaitingStatusChange {
-                            waiter: fd_pid,
-                            target,
-                            flags,
-                            op,
-                        });
-                        self.work_on(state, awoken)
-                    }
-                    ProcCall::Setpgid => {
-                        let target_pid = NonZeroUsize::new(metadata[1] as usize)
-                            .map_or(fd_pid, |n| ProcessId(n.get()));
-
-                        let new_pgid = NonZeroUsize::new(metadata[2] as usize)
-                            .map_or(target_pid, |n| ProcessId(n.get()));
-                        if new_pgid.0 == usize::wrapping_neg(1) {
-                            Ready(Response::new(
-                                self.on_getpgid(fd_pid, target_pid).map(|ProcessId(p)| p),
-                                op,
-                            ))
-                        } else {
-                            Ready(Response::new(
-                                self.on_setpgid(fd_pid, target_pid, new_pgid, awoken)
-                                    .map(|()| 0),
-                                op,
-                            ))
-                        }
-                    }
-                    ProcCall::Getsid => {
-                        let req_pid = NonZeroUsize::new(metadata[1] as usize)
-                            .map_or(fd_pid, |n| ProcessId(n.get()));
-                        Ready(Response::new(
-                            self.on_getsid(fd_pid, req_pid).map(|ProcessId(s)| s),
-                            op,
-                        ))
-                    }
-                    ProcCall::Getppid => Ready(Response::new(
-                        self.on_getppid(fd_pid).map(|ProcessId(p)| p),
-                        op,
-                    )),
-                    ProcCall::Setsid => Ready(Response::new(
-                        self.on_setsid(fd_pid, awoken).map(|()| 0),
-                        op,
-                    )),
-                    ProcCall::SetResugid => Ready(Response::new(
-                        self.on_setresugid(fd_pid, payload).map(|()| 0),
-                        op,
-                    )),
-                    ProcCall::Kill | ProcCall::Sigq => {
-                        let (payload, metadata) = op.payload_and_metadata();
-                        let target = ProcKillTarget::from_raw(metadata[1] as usize);
-                        let Some(signal) = u8::try_from(metadata[2]).ok().filter(|s| *s <= 64)
-                        else {
-                            return Response::ready_err(EINVAL, op);
-                        };
-                        let mode = match verb {
-                            ProcCall::Kill => KillMode::Idempotent,
-                            ProcCall::Sigq => KillMode::Queued({
-                                let mut buf = [0_u8; size_of::<RtSigInfo>()];
-                                if payload.len() != size_of::<RtSigInfo>() {
-                                    return Response::ready_err(EINVAL, op);
-                                }
-                                buf.copy_from_slice(payload);
-                                *plain::from_bytes(&buf).unwrap()
-                            }),
-                            _ => unreachable!(),
-                        };
-
-                        Ready(Response::new(
-                            self.on_kill(fd_pid, target, signal, mode, awoken)
-                                .map(|()| 0),
-                            op,
-                        ))
-                    }
-                    ProcCall::SyncSigPctl => {
-                        Ready(Response::new(self.on_sync_sigpctl(fd_pid).map(|()| 0), op))
-                    }
-                    ProcCall::Sigdeq => Ready(Response::new(
-                        self.on_sigdeq(fd_pid, payload).map(|()| 0),
-                        op,
-                    )),
-                    ProcCall::Rename => Ready(Response::new(
-                        self.on_proc_rename(fd_pid, payload).map(|()| 0),
-                        op,
-                    )),
-                    ProcCall::DisableSetpgid => {
-                        if let Some(proc) = self.processes.get(&fd_pid) {
-                            proc.borrow_mut().disabled_setpgid = true;
-                            Response::ready_ok(0, op)
-                        } else {
-                            Response::ready_err(ESRCH, op)
-                        }
-                    }
-                    ProcCall::GetProcCredentials => Response::ready_err(EACCES, op),
-
-                    // setrens is no longer implemented as procmgr call
-                    // FIXME remove this ProcCall variant
-                    ProcCall::Setrens => Response::ready_err(EINVAL, op),
-                    ProcCall::SetProcPriority => {
-                        let target_pid = NonZeroUsize::new(metadata[1] as usize).map_or(fd_pid, |n| ProcessId(n.get()));
-
-                        let new_prio = metadata[2] as u32;
-
-                        Ready(Response::new(
-                            self.on_setprocprio(fd_pid, target_pid, new_prio).map(|()| 0),
-                            op
-                        ))
-                    },
-                    ProcCall::GetProcPriority => {
-                        let target_pid = NonZeroUsize::new(metadata[1] as usize)
-                            .map_or(fd_pid, |n| ProcessId(n.get()));
-
-                        Ready(Response::new(
-                            self.on_getprocprio(fd_pid, target_pid).map(|prio| prio as usize),
-                            op,
-                        ))
-                    },
-
-                }
-            }
-            Handle::Ps(_) => Response::ready_err(EOPNOTSUPP, op),
-            Handle::ProcCredsCapability => {
-                let Some(verb) = ProcCall::try_from_raw(metadata[0] as usize) else {
-                    log::trace!("Invalid proc call: {metadata:?}");
-                    return Response::ready_err(EINVAL, op);
-                };
-                match verb {
-                    ProcCall::GetProcCredentials => Ready(Response::new(
-                        self.read_process_metadata(ProcessId(metadata[1] as usize), payload),
-                        op,
-                    )),
-                    _ => Response::ready_err(EINVAL, op),
-                }
-            }
-            Handle::SchemeRoot => Response::ready_err(EBADF, op),
-        }
-    }
-    fn on_getpgid(&mut self, caller_pid: ProcessId, target_pid: ProcessId) -> Result<ProcessId> {
-        log::trace!("GETPGID from {caller_pid:?} target {target_pid:?}");
-        let caller_proc = self
-            .processes
-            .get(&caller_pid)
-            .ok_or(Error::new(ESRCH))?
-            .borrow();
-        let target_proc = self
-            .processes
-            .get(&target_pid)
-            .ok_or(Error::new(ESRCH))?
-            .borrow();
-
-        // Although not required, POSIX allows the impl to forbid getting the pgid of processes
-        // outside of the caller's session.
-        if caller_proc.sid != target_proc.sid && caller_proc.euid != 0 {
-            return Err(Error::new(EPERM));
-        }
-
-        Ok(target_proc.pgid)
-    }
-    fn on_setsid(&mut self, caller_pid: ProcessId, awoken: &mut VecDeque<VirtualId>) -> Result<()> {
-        // TODO: more efficient?
-        // POSIX: any other process's pgid matches the caller pid
-        if self
-            .processes
-            .iter()
-            .any(|(pid, rc)| *pid != caller_pid && rc.borrow().pgid == caller_pid)
-        {
-            return Err(Error::new(EPERM));
-        }
-
-        let caller_proc_rc = self.processes.get(&caller_pid).ok_or(Error::new(ESRCH))?;
-        let mut caller_proc = caller_proc_rc.borrow_mut();
-        let mut parent = (caller_proc.ppid != caller_pid)
-            .then(|| {
-                self.processes
-                    .get(&caller_proc.ppid)
-                    .map(|p| p.borrow_mut())
-            })
-            .ok_or(Error::new(ESRCH))?;
-
-        // POSIX: already a process group leader
-        if caller_proc.pgid == caller_pid {
-            return Err(Error::new(EPERM));
-        }
-
-        Self::set_pgid(
-            caller_proc_rc,
-            &mut *caller_proc,
-            parent.as_deref_mut(),
-            &mut self.groups,
-            caller_pid,
-            awoken,
-        )?;
-        caller_proc.sid = caller_pid;
-
-        // TODO: Remove controlling terminal
-        Ok(())
-    }
-    fn on_getppid(&mut self, caller_pid: ProcessId) -> Result<ProcessId> {
-        log::trace!("GETPPID {caller_pid:?}");
-        let ppid = self
-            .processes
-            .get(&caller_pid)
-            .ok_or(Error::new(ESRCH))?
-            .borrow()
-            .ppid;
-        log::trace!("GETPPID {caller_pid:?} -> {ppid:?}");
-        Ok(ppid)
-    }
-    fn on_getsid(&mut self, caller_pid: ProcessId, req_pid: ProcessId) -> Result<ProcessId> {
-        let caller_proc = self
-            .processes
-            .get(&caller_pid)
-            .ok_or(Error::new(ESRCH))?
-            .borrow();
-        let requested_proc = self
-            .processes
-            .get(&req_pid)
-            .ok_or(Error::new(ESRCH))?
-            .borrow();
-
-        // POSIX allows, but does not require, the implementation to forbid getting the session ID of processes outside
-        // the current session.
-        if caller_proc.sid != requested_proc.sid && caller_proc.euid != 0 {
-            return Err(Error::new(EPERM));
-        }
-
-        Ok(requested_proc.sid)
-    }
-    fn on_setpgid(
-        &mut self,
-        caller_pid: ProcessId,
-        target_pid: ProcessId,
-        new_pgid: ProcessId,
-        awoken: &mut VecDeque<VirtualId>,
-    ) -> Result<()> {
-        let caller_proc = self.processes.get(&caller_pid).ok_or(Error::new(ESRCH))?;
-        let caller_sid = caller_proc.borrow().sid;
-
-        let proc_rc = self.processes.get(&target_pid).ok_or(Error::new(ESRCH))?;
-        let mut proc = proc_rc.borrow_mut();
-
-        if proc.ppid != caller_pid && target_pid != caller_pid {
-            return Err(Error::new(ESRCH));
-        }
-
-        let mut parent = if proc.ppid == target_pid {
-            None // init
-        } else {
-            Some(
-                self.processes
-                    .get(&proc.ppid)
-                    .ok_or(Error::new(ESRCH))?
-                    .borrow_mut(),
-            )
-        };
-
-        // Session leaders cannot have their pgid changed.
-        if proc.sid == target_pid {
-            return Err(Error::new(EPERM));
-        }
-
-        // Cannot change the pgid of a process in a different session.
-        if caller_sid != proc.sid {
-            return Err(Error::new(EPERM));
-        }
-
-        // New pgid must either already exit, or be the same as the target pid.
-        if new_pgid != target_pid && !self.groups.contains_key(&new_pgid) {
-            return Err(Error::new(EPERM));
-        }
-
-        // After execv(), i.e. ProcCall::DisableSetpgid, setpgid where target_pid is a child
-        // process of the calling process, shall return EACCESS.
-        if proc.ppid == caller_pid && proc.disabled_setpgid {
-            return Err(Error::new(EACCES));
-        }
-
-        if proc.pgid == new_pgid {
-            return Ok(());
-        }
-
-        Self::set_pgid(
-            proc_rc,
-            &mut *proc,
-            parent.as_deref_mut(),
-            &mut self.groups,
-            new_pgid,
-            awoken,
-        )?;
-
-        Ok(())
-    }
-    fn set_pgid(
-        proc_rc: &Rc<RefCell<Process>>,
-        proc: &mut Process,
-        parent: Option<&mut Process>,
-        groups: &mut HashMap<ProcessId, Rc<RefCell<Pgrp>>>,
-        new_pgid: ProcessId,
-        awoken: &mut VecDeque<VirtualId>,
-    ) -> Result<()> {
-        let old_pgid = proc.pgid;
-        assert_ne!(old_pgid, new_pgid);
-
-        if let Some(parent) = parent {
-            // Some waitpid waiters may end up waiting for no children, if a child sets its pgid
-            // and the parent was waiting with a pgid filter. Ensure the waiter is awoken and
-            // possibly returns ECHILD.
-            awoken.extend(parent.waitpid_waiting.drain(..));
-        }
-
-        let proc_weak = Rc::downgrade(proc_rc);
-        let shall_remove = {
-            let mut old_group = groups.get(&old_pgid).ok_or(Error::new(ESRCH))?.borrow_mut();
-            old_group.processes.retain(|w| !Weak::ptr_eq(w, &proc_weak));
-            old_group.processes.is_empty()
-        };
-        if shall_remove {
-            groups.remove(&old_pgid);
-        }
-        groups
-            .entry(new_pgid)
-            .or_default()
-            .borrow_mut()
-            .processes
-            .push(proc_weak);
-        proc.pgid = new_pgid;
-        Ok(())
-    }
-    fn on_exit_start(
-        &mut self,
-        pid: ProcessId,
-        status: u16,
-        state: VacantEntry<VirtualId, PendingState, DefaultHashBuilder>,
-        awoken: &mut VecDeque<VirtualId>,
-        tag: Option<Tag>,
-    ) -> Poll<Response> {
-        log::trace!("ON_EXIT_START {pid:?} status {status:#x}");
-        let Some(proc_rc) = self.processes.get(&pid) else {
-            return if let Some(tag) = tag {
-                Response::ready_err(EBADFD, tag)
-            } else {
-                Pending
-            };
-        };
-        let mut process_guard = proc_rc.borrow_mut();
-        let process = &mut *process_guard;
-
-        match process.status {
-            ProcessStatus::Stopped(_) | ProcessStatus::PossiblyRunnable => (),
-            //ProcessStatus::Exiting => return Pending,
-            ProcessStatus::Exiting { .. } => {
-                return if let Some(tag) = tag {
-                    Response::ready_err(EAGAIN, tag)
-                } else {
-                    Pending
-                };
-            }
-            ProcessStatus::Exited { .. } => {
-                return if let Some(tag) = tag {
-                    Response::ready_err(ESRCH, tag)
-                } else {
-                    Pending
-                };
-            }
-        }
-
-        // Forbid the caller from giving statuses corresponding to e.g. WIFCONTINUED which exit()
-        // obviously can never be.
-
-        log::trace!("Killed with raw status {status:?}");
-
-        // TODO: Are WIFEXITED and WIFSIGNALED mutually exclusive?
-        let (status, signal) = if status & 0xff == status {
-            (status as u8, None)
-        } else {
-            // TODO: Only allow valid and catchable signal numbers.
-            let sig = (status >> 8) as u8;
-            if !matches!(sig, 1..=64) {
-                return if let Some(tag) = tag {
-                    Response::ready_err(EINVAL, tag)
-                } else {
-                    Pending
-                };
-            }
-            (0, NonZeroU8::new(sig))
-        };
-
-        process.status = ProcessStatus::Exiting { status, signal };
-        if !process.threads.is_empty() {
-            // terminate all threads (possibly including the caller, resulting in EINTR and a
-            // to-be-ignored cancellation request to this scheme).
-            for thread in &process.threads {
-                let thread = thread.borrow_mut();
-                // TODO: cancel all threads anyway on error?
-                if let Err(err) = thread.status_hndl.write(&usize::MAX.to_ne_bytes()) {
-                    if let Some(tag) = tag {
-                        return Response::ready_err(err.errno, tag);
-                    }
-                }
-            }
-
-            log::trace!("EXIT PENDING");
-            //self.debug();
-            // TODO: check?
-            process.awaiting_threads_term.push(*state.key());
-        }
-        drop(process_guard);
-        self.work_on(
-            state.insert_entry(PendingState::AwaitingThreadsTermination(pid, tag)),
-            awoken,
-        )
-    }
-    fn on_waitpid(
-        &mut self,
-        this_pid: ProcessId,
-        target: WaitpidTarget,
-        flags: WaitFlags,
-        req_id: VirtualId,
-    ) -> Poll<Result<(usize, i32)>> {
-        if matches!(
-            target,
-            WaitpidTarget::AnyChild | WaitpidTarget::AnyGroupMember
-        ) {
-            // Check for existence of child.
-            // TODO(opt): inefficient, keep refcount?
-            if !self.processes.values().any(|p| p.borrow().ppid == this_pid) {
-                return Ready(Err(Error::new(ECHILD)));
-            }
-        }
-
-        let proc_rc = self.processes.get(&this_pid).ok_or(Error::new(EBADFD))?;
-
-        log::trace!("PROCS {:#?}", self.processes);
-
-        let mut proc_guard = proc_rc.borrow_mut();
-        let proc = &mut *proc_guard;
-
-        let recv_nonblock = |waitpid: &mut BTreeMap<WaitpidKey, (ProcessId, WaitpidStatus)>,
-                             key: &WaitpidKey|
-         -> Option<(ProcessId, WaitpidStatus)> {
-            if let Some((pid, sts)) = waitpid.get(key).map(|(k, v)| (*k, *v)) {
-                waitpid.remove(key);
-                /*while let Some((_, new_sts)) = waitpid.remove(&WaitpidKey { pid: Some(pid), pgid: None }) {
-                    sts = new_sts;
-                }*/
-                Some((pid, sts))
-            } else {
-                None
-            }
-        };
-        let grim_reaper =
-            |w_pid: ProcessId, status: WaitpidStatus, scheme: &mut ProcScheme| match status {
-                WaitpidStatus::Continued => {
-                    if flags.contains(WaitFlags::WCONTINUED) {
-                        Ready((w_pid.0, 0xffff))
-                    } else {
-                        Pending
-                    }
-                }
-                WaitpidStatus::Stopped { signal } => {
-                    if flags.contains(WaitFlags::WUNTRACED) {
-                        Ready((w_pid.0, 0x7f | (i32::from(signal.get()) << 8)))
-                    } else {
-                        Pending
-                    }
-                }
-                WaitpidStatus::Terminated { signal, status } => {
-                    scheme.reap(w_pid);
-                    Ready((
-                        w_pid.0,
-                        i32::from(signal.map_or(0, NonZeroU8::get)) | (i32::from(status) << 8),
-                    ))
-                }
-            };
-
-        match target {
-            WaitpidTarget::AnyChild | WaitpidTarget::AnyGroupMember => {
-                let kv = (if matches!(target, WaitpidTarget::AnyChild) {
-                    proc.waitpid.first_key_value()
-                } else {
-                    proc.waitpid.get_key_value(&WaitpidKey {
-                        pid: None,
-                        pgid: Some(proc.pgid),
-                    })
-                })
-                .map(|(k, v)| (*k, *v));
-                if let Some((wid, (w_pid, status))) = kv {
-                    let _ = proc.waitpid.remove(&wid);
-                    drop(proc_guard);
-                    grim_reaper(w_pid, status, self).map(Ok)
-                } else if flags.contains(WaitFlags::WNOHANG) {
-                    Ready(Ok((0, 0)))
-                } else {
-                    proc.waitpid_waiting.push_back(req_id);
-                    Pending
-                }
-            }
-            WaitpidTarget::SingleProc(pid) => {
-                if this_pid == pid {
-                    return Ready(Err(Error::new(EINVAL)));
-                }
-                let target_proc_rc = self.processes.get(&pid).ok_or(Error::new(ECHILD))?;
-                let target_proc = target_proc_rc.borrow_mut();
-
-                if target_proc.ppid != this_pid {
-                    return Ready(Err(Error::new(ECHILD)));
-                }
-                let key = WaitpidKey {
-                    pid: Some(pid),
-                    pgid: None,
-                };
-                if let ProcessStatus::Exited { status, signal } = target_proc.status {
-                    let _ = recv_nonblock(&mut proc.waitpid, &key);
-                    drop(proc_guard);
-                    drop(target_proc);
-                    grim_reaper(pid, WaitpidStatus::Terminated { signal, status }, self).map(Ok)
-                } else {
-                    let res = recv_nonblock(&mut proc.waitpid, &key);
-                    if let Some((w_pid, status)) = res {
-                        drop(proc_guard);
-                        drop(target_proc);
-                        grim_reaper(w_pid, status, self).map(Ok)
-                    } else if flags.contains(WaitFlags::WNOHANG) {
-                        Ready(Ok((0, 0)))
-                    } else {
-                        proc.waitpid_waiting.push_back(req_id);
-                        Pending
-                    }
-                }
-            }
-            WaitpidTarget::ProcGroup(pgid) => {
-                if let Some(group_rc) = self.groups.get(&pgid) {
-                    let group = group_rc.borrow();
-                    if !group
-                        .processes
-                        .iter()
-                        .filter_map(Weak::upgrade)
-                        .filter(|r| !Rc::ptr_eq(r, proc_rc))
-                        .any(|p| p.borrow().ppid == this_pid)
-                    {
-                        return Ready(Err(Error::new(ECHILD)));
-                    }
-                } else {
-                    return Ready(Err(Error::new(ECHILD)));
-                }
-
-                let key = WaitpidKey {
-                    pid: None,
-                    pgid: Some(pgid),
-                };
-                if let Some(&(w_pid, status)) = proc.waitpid.get(&key) {
-                    let _ = proc.waitpid.remove(&key);
-                    drop(proc_guard);
-                    grim_reaper(w_pid, status, self).map(Ok)
-                } else if flags.contains(WaitFlags::WNOHANG) {
-                    Ready(Ok((0, 0)))
-                } else {
-                    proc.waitpid_waiting.push_back(req_id);
-                    Pending
-                }
-            }
-        }
-    }
-    fn reap(&mut self, pid: ProcessId) {
-        let Entry::Occupied(entry) = self.processes.entry(pid) else {
-            return;
-        };
-        let pgid = {
-            let proc = entry.get().borrow();
-            if !proc.threads.is_empty() {
-                log::error!(
-                    "reaping process (pid {pid:?} with remaining threads: {:#?}",
-                    proc.threads
-                );
-                return;
-            }
-            proc.pgid
-        };
-        let proc_rc = entry.remove();
-        let proc_weak = Rc::downgrade(&proc_rc);
-
-        let Entry::Occupied(group) = self.groups.entry(pgid) else {
-            log::error!("Process missing from its group");
-            return;
-        };
-        group
-            .get()
-            .borrow_mut()
-            .processes
-            .retain(|p| !Weak::ptr_eq(&proc_weak, p));
-        if group.get().borrow_mut().processes.is_empty() {
-            group.remove();
-        }
-        // TODO: notify parent's other waiters if ECHILD would now occur?
-    }
-    fn on_setresugid(&mut self, pid: ProcessId, raw_buf: &[u8]) -> Result<()> {
-        let [new_ruid, new_euid, new_suid, new_rgid, new_egid, new_sgid] = {
-            let raw_ids: [u32; 6] = plain::slice_from_bytes::<u32>(raw_buf)
-                .unwrap()
-                .try_into()
-                .map_err(|_| Error::new(EINVAL))?;
-            raw_ids.map(|i| if i == u32::MAX { None } else { Some(i) })
-        };
-        let mut proc = self
-            .processes
-            .get(&pid)
-            .ok_or(Error::new(ESRCH))?
-            .borrow_mut();
-
-        if proc.euid != 0 {
-            if ![new_ruid, new_euid, new_suid]
-                .iter()
-                .filter_map(|x| *x)
-                .all(|new_id| [proc.ruid, proc.euid, proc.suid].contains(&new_id))
-            {
-                return Err(Error::new(EPERM));
-            }
-            if ![new_rgid, new_egid, new_sgid]
-                .iter()
-                .filter_map(|x| *x)
-                .all(|new_id| [proc.rgid, proc.egid, proc.sgid].contains(&new_id))
-            {
-                return Err(Error::new(EPERM));
-            }
-        }
-
-        if let Some(new_ruid) = new_ruid {
-            proc.ruid = new_ruid;
-        }
-        if let Some(new_euid) = new_euid {
-            proc.euid = new_euid;
-        }
-        if let Some(new_suid) = new_suid {
-            proc.suid = new_suid;
-        }
-        if let Some(new_rgid) = new_rgid {
-            proc.rgid = new_rgid;
-        }
-        if let Some(new_egid) = new_egid {
-            proc.egid = new_egid;
-        }
-        if let Some(new_sgid) = new_sgid {
-            proc.sgid = new_sgid;
-        }
-        if let Err(err) = proc.sync_kernel_attrs(&self.auth) {
-            log::warn!("Failed to sync proc attrs in setresugid: {err}");
-        }
-        Ok(())
-    }
-    fn ancestors(&self, pid: ProcessId) -> impl Iterator<Item = ProcessId> + '_ {
-        struct Iter<'a> {
-            cur: Option<ProcessId>,
-            procs: &'a HashMap<ProcessId, Rc<RefCell<Process>>, DefaultHashBuilder>,
-        }
-        impl Iterator for Iter<'_> {
-            type Item = ProcessId;
-
-            fn next(&mut self) -> Option<Self::Item> {
-                let proc = self.procs.get(&self.cur?)?;
-                let ppid = proc.borrow().ppid;
-                self.cur = Some(ppid);
-                Some(ppid)
-            }
-        }
-        Iter {
-            cur: Some(pid),
-            procs: &self.processes,
-        }
-    }
-    fn work_on(
-        &mut self,
-        mut state_entry: OccupiedEntry<VirtualId, PendingState, DefaultHashBuilder>,
-        awoken: &mut VecDeque<VirtualId>,
-    ) -> Poll<Response> {
-        let req_id = *state_entry.key();
-        let state = state_entry.get_mut();
-        let this_state = core::mem::replace(state, PendingState::Placeholder);
-        match this_state {
-            PendingState::Placeholder => return Pending, // unreachable!(),
-            PendingState::AwaitingThreadsTermination(current_pid, tag) => {
-                let Some(proc_rc) = self.processes.get(&current_pid) else {
-                    return if let Some(tag) = tag {
-                        Response::ready_err(ESRCH, tag)
-                    } else {
-                        state_entry.remove();
-                        Pending
-                    };
-                };
-                let mut proc_guard = proc_rc.borrow_mut();
-                let proc = &mut *proc_guard;
-
-                if proc.threads.is_empty() {
-                    log::trace!("WORKING ON AWAIT TERM");
-                    let (signal, status) = match proc.status {
-                        ProcessStatus::Exiting { signal, status } => (signal, status),
-                        ProcessStatus::Exited { .. } => {
-                            return if let Some(tag) = tag {
-                                Response::ready_ok(0, tag)
-                            } else {
-                                state_entry.remove();
-                                Pending
-                            };
-                        }
-                        _ => {
-                            return if let Some(tag) = tag {
-                                Response::ready_err(ESRCH, tag) // TODO?
-                            } else {
-                                state_entry.remove();
-                                Pending
-                            };
-                        }
-                    };
-                    // TODO: Properly remove state
-                    state_entry.remove();
-
-                    proc.status = ProcessStatus::Exited { signal, status };
-
-                    let (ppid, pgid) = (proc.ppid, proc.pgid);
-                    drop(proc_guard);
-
-                    if let Some(parent_rc) = self.processes.get(&ppid) {
-                        // When a process exits, the parent is sent SIGCHLD. The process has no threads
-                        // at this point.
-                        if let Err(err) = self.on_send_sig(
-                            current_pid,
-                            KillTarget::Proc(ppid),
-                            SIGCHLD as u8,
-                            &mut false,
-                            KillMode::Idempotent,
-                            false, // stop_or_continue
-                            awoken,
-                        ) {
-                            // EPERM on SIGCHLD to PID 1 is a known kernel limitation.
-                            // The procmgr continues correctly after this; downgrade to debug.
-                            log::debug!("failed to send SIGCHLD to parent PID {ppid:?}: {err}");
-                        }
-
-                        if let Some(init_rc) = self.processes.get(&INIT_PID) {
-                            awoken.extend(init_rc.borrow_mut().waitpid_waiting.drain(..));
-
-                            // TODO(opt): Store list of children in each process?
-                            let children_iter = || {
-                                self.processes
-                                    .values()
-                                    .filter(|p| !Rc::ptr_eq(p, init_rc))
-                                    .filter(|p| p.borrow().ppid == current_pid)
-                            };
-
-                            // TODO(opt): Avoid allocation?
-                            let affected_pgids = children_iter()
-                                .map(|child_rc| {
-                                    let child_pgid = child_rc.borrow().pgid;
-                                    (child_pgid, self.pgrp_is_orphaned(child_pgid))
-                                })
-                                .chain(Some((pgid, self.pgrp_is_orphaned(pgid))))
-                                .collect::<HashMap<ProcessId, Option<bool>>>();
-
-                            // Transfer children to init
-                            for child_rc in children_iter() {
-                                let mut child = child_rc.borrow_mut();
-                                log::trace!(
-                                    "Reparenting {:?} (ppid {:?}) => {:?}",
-                                    child.pid,
-                                    child.ppid,
-                                    INIT_PID
-                                );
-                                child.ppid = INIT_PID;
-                                init_rc.borrow_mut().waitpid.append(&mut child.waitpid);
-                                drop(child);
-                            }
-                            // Check if any process group ID would become orphaned as a result of
-                            // this exit.
-                            for (affected_pgid, was_orphaned) in affected_pgids {
-                                let is_orphaned = self.pgrp_is_orphaned(affected_pgid);
-
-                                if !was_orphaned.unwrap_or(false)
-                                    && is_orphaned.unwrap_or(false)
-                                    && let Some(group) =
-                                        self.groups.get(&affected_pgid).map(|r| r.borrow())
-                                {
-                                    for process_rc in
-                                        group.processes.iter().filter_map(|w| Weak::upgrade(&w))
-                                    {
-                                        if !matches!(
-                                            process_rc.borrow().status,
-                                            ProcessStatus::Stopped(_)
-                                        ) {
-                                            continue;
-                                        }
-                                        let sighup_pid = process_rc.borrow().pid;
-                                        log::trace!("SENDING SIGCONT TO {sighup_pid:?}");
-                                        if let Err(err) = self.on_send_sig(
-                                            INIT_PID,
-                                            KillTarget::Proc(sighup_pid),
-                                            SIGCONT as u8,
-                                            &mut false,
-                                            KillMode::Idempotent,
-                                            false,
-                                            awoken,
-                                        ) {
-                                            log::warn!(
-                                                "Failed to send newly-orphaned-pgid SIGHUP to PID {sighup_pid:?}: {err}"
-                                            );
-                                        }
-                                        log::trace!("SENDING SIGHUP TO {sighup_pid:?}");
-                                        if let Err(err) = self.on_send_sig(
-                                            INIT_PID,
-                                            KillTarget::Proc(sighup_pid),
-                                            SIGHUP as u8,
-                                            &mut false,
-                                            KillMode::Idempotent,
-                                            false,
-                                            awoken,
-                                        ) {
-                                            log::warn!(
-                                                "Failed to send newly-orphaned-pgid SIGHUP to PID {sighup_pid:?}: {err}"
-                                            );
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        let mut parent = parent_rc.borrow_mut();
-
-                        parent.waitpid.insert(
-                            WaitpidKey {
-                                pid: Some(current_pid),
-                                pgid: Some(pgid),
-                            },
-                            (current_pid, WaitpidStatus::Terminated { signal, status }),
-                        );
-                        log::trace!("AWAKING WAITPID {:?}", parent.waitpid_waiting);
-                        // TODO(opt): inefficient
-                        awoken.extend(parent.waitpid_waiting.drain(..));
-                    }
-                    if let Some(tag) = tag {
-                        Ready(Response::new(Ok(0), tag))
-                    } else {
-                        // state was removed earlier
-                        Pending
-                    }
-                } else {
-                    log::trace!("WAITING AGAIN");
-                    proc.awaiting_threads_term.push(req_id);
-                    *state = PendingState::AwaitingThreadsTermination(current_pid, tag);
-                    Pending
-                }
-            }
-            PendingState::AwaitingStatusChange {
-                waiter,
-                target,
-                flags,
-                mut op,
-            } => {
-                log::trace!("WAITPID {req_id:?}, {waiter:?}: {target:?} flags {flags:?}");
-                let res = self.on_waitpid(waiter, target, flags, req_id);
-                log::trace!(
-                    "WAITPID {req_id:?}, {waiter:?}: {target:?} flags {flags:?} -> {res:?}"
-                );
-
-                match res {
-                    Ready(Ok((pid, status))) => {
-                        if let Ok(status_out) = plain::from_mut_bytes::<i32>(op.payload()) {
-                            *status_out = status;
-                        }
-                        Response::ready_ok(pid, op)
-                    }
-                    Ready(Err(e)) => Response::ready_err(e.errno, op),
-                    Pending => {
-                        *state = PendingState::AwaitingStatusChange {
-                            waiter,
-                            target,
-                            flags,
-                            op,
-                        };
-                        Pending
-                    }
-                }
-            }
-        }
-    }
-    fn debug(&self) {
-        log::trace!("PROCESSES\n{:#?}", self.processes);
-        log::trace!("HANDLES\n{:#?}", self.handles);
-    }
-    fn on_kill_thread(
-        &mut self,
-        thread: &Rc<RefCell<Thread>>,
-        signal: u8,
-        awoken: &mut VecDeque<VirtualId>,
-    ) -> Result<()> {
-        let mut killed_self = false;
-
-        let stop_or_continue = false;
-
-        let caller_pid = thread.borrow().pid; // TODO(feat): allow this to be specified?
-
-        self.on_send_sig(
-            caller_pid,
-            KillTarget::Thread(Rc::clone(thread)),
-            signal,
-            &mut killed_self,
-            KillMode::Idempotent,
-            stop_or_continue,
-            awoken,
-        )?;
-
-        if killed_self {
-            // TODO: is this the most accurate error code?
-            Err(Error::new(ERESTART))
-        } else {
-            Ok(())
-        }
-    }
-    fn on_kill(
-        &mut self,
-        caller_pid: ProcessId,
-        target: ProcKillTarget,
-        signal: u8,
-        mode: KillMode,
-        awoken: &mut VecDeque<VirtualId>,
-    ) -> Result<()> {
-        log::trace!("KILL(from {caller_pid:?}) TARGET {target:?} {signal} {mode:?}");
-
-        // if this is set and we would otherwise have succeeded, return EINTR so it can check its
-        // own mask
-        let mut killed_self = false;
-
-        // SIGCHLD to parent are not generated by on_kill, but by on_send_sig itself
-        let stop_or_continue = false;
-
-        let match_grp = match target {
-            ProcKillTarget::SingleProc(pid) => {
-                self.on_send_sig(
-                    caller_pid,
-                    KillTarget::Proc(ProcessId(pid)),
-                    signal,
-                    &mut killed_self,
-                    mode,
-                    stop_or_continue,
-                    awoken,
-                )?;
-                return if killed_self {
-                    Err(Error::new(ERESTART))
-                } else {
-                    Ok(())
-                };
-            }
-            ProcKillTarget::All => None,
-            ProcKillTarget::ProcGroup(grp) => Some(ProcessId(grp)),
-            ProcKillTarget::ThisGroup => Some(
-                self.processes
-                    .get(&caller_pid)
-                    .ok_or(Error::new(ESRCH))?
-                    .borrow()
-                    .pgid,
-            ),
-        };
-        log::trace!("match group {match_grp:?}");
-
-        let mut err_opt = None;
-        // Number of processes successfully signaled.
-        let mut num_succeeded = 0;
-
-        for (pid, proc_rc) in self.processes.iter() {
-            if match_grp.map_or(false, |g| proc_rc.borrow().pgid != g) {
-                continue;
-            }
-            let res = self.on_send_sig(
-                caller_pid,
-                KillTarget::Proc(*pid),
-                signal,
-                &mut killed_self,
-                mode,
-                stop_or_continue,
-                awoken,
-            );
-            match res {
-                Ok(()) => num_succeeded += 1,
-                Err(err) => err_opt = Some(err),
-            }
-        }
-
-        // > POSIX Issue 8: The `kill()` function is successful if the process has
-        // > permission to send `sig` to *any* of the processes specified by
-        // > `pid`.
-        //
-        // Thus, if *at least one* process was successfully signaled, `kill()`
-        // returns success.
-        if num_succeeded == 0 {
-            if let Some(err) = err_opt {
-                Err(err)
-            } else {
-                // No process or process group could be found corrsponding to
-                // that specified by `target`.
-                Err(Error::new(ESRCH))
-            }
-        } else if killed_self {
-            Err(Error::new(ERESTART))
-        } else {
-            Ok(())
-        }
-    }
-    fn on_send_sig(
-        &self,
-        caller_pid: ProcessId,
-        target: KillTarget,
-        signal: u8,
-        killed_self: &mut bool,
-        mode: KillMode,
-        stop_or_continue: bool,
-        awoken: &mut VecDeque<VirtualId>,
-    ) -> Result<()> {
-        log::trace!("SEND_SIG(from {caller_pid:?}) TARGET {target:?} {signal} {mode:?}");
-        let sig = usize::from(signal);
-
-        if sig > 64 {
-            return Err(Error::new(EINVAL));
-        }
-
-        let sig_group = (sig - 1) / 32;
-        let sig_idx = (sig - 1) % 32;
-
-        let target_pid = match target {
-            KillTarget::Proc(pid) => pid,
-            KillTarget::Thread(ref thread) => thread.borrow().pid,
-        };
-        let target_proc_rc = self.processes.get(&target_pid).ok_or(Error::new(ESRCH))?;
-
-        let sender = SenderInfo {
-            pid: caller_pid.0 as u32,
-            ruid: self
-                .processes
-                .get(&caller_pid)
-                .ok_or(Error::new(ESRCH))?
-                .borrow()
-                .ruid,
-        };
-
-        enum SendResult {
-            LacksPermission,
-            Succeeded,
-            SucceededSigchld {
-                orig_signal: NonZeroU8,
-                ppid: ProcessId,
-                pgid: ProcessId,
-            },
-            SucceededSigcont {
-                ppid: ProcessId,
-                pgid: ProcessId,
-            },
-            FullQ,
-            Invalid,
-        }
-        let (caller_euid, caller_ruid) = {
-            let caller = self
-                .processes
-                .get(&caller_pid)
-                .ok_or(Error::new(ESRCH))?
-                .borrow();
-            (caller.euid, caller.ruid)
-        };
-
-        let result = (|| {
-            // XXX: It's not currently possible for procmgr to know what thread called, so the
-            // EINTR will be coarser. That shouldn't affect program logic though, since the
-            // trampoline always checks the masks anyway.
-            // TODO(feat): allow regular kill (alongside thread-kill) to operate on *thread fds*?
-            let is_self = target_pid == caller_pid;
-
-            let mut target_proc_guard = target_proc_rc.borrow_mut();
-            let mut target_proc = &mut *target_proc_guard;
-
-            if caller_euid != 0
-                && caller_euid != target_proc.ruid
-                && caller_ruid != target_proc.ruid
-            {
-                return SendResult::LacksPermission;
-            }
-
-            // If sig = 0, test that process exists and can be signalled, but don't send any
-            // signal.
-            let Some(nz_signal) = NonZeroU8::new(signal) else {
-                return SendResult::Succeeded;
-            };
-
-            // Similarly, don't send anything for already exiting or exited processes. It would be
-            // bad if e.g. SIGCONT could cause these to become PossiblyRunnable again.
-            if matches!(
-                target_proc.status,
-                ProcessStatus::Exited { .. } | ProcessStatus::Exiting { .. }
-            ) {
-                return SendResult::Succeeded;
-            }
-
-            let Some(mut sig_pctl) = target_proc.sig_pctl.as_ref() else {
-                log::trace!("No pctl {caller_pid:?} => {target_pid:?}");
-                return SendResult::Invalid;
-            };
-            log::trace!("PCTL {:#x?}", &**sig_pctl);
-            log::trace!(
-                "STS {:?} NTHRD {}",
-                target_proc.status,
-                target_proc.threads.len()
-            );
-
-            if sig == SIGCONT
-                && let ProcessStatus::Stopped(_sig) = target_proc.status
-            {
-                // Convert stopped processes to blocked if sending SIGCONT, regardless of whether
-                // SIGCONT is blocked or ignored. It can however be controlled whether the process
-                // will additionally ignore, defer, or handle that signal.
-                target_proc.status = ProcessStatus::PossiblyRunnable;
-
-                if !sig_pctl.signal_will_ign(SIGCONT, false) {
-                    sig_pctl
-                        .pending
-                        .fetch_or(sig_bit(SIGCONT), Ordering::Relaxed);
-                }
-
-                // TODO: which threads should become Runnable?
-                for thread_rc in target_proc.threads.iter() {
-                    let thread = thread_rc.borrow_mut();
-                    if let Some(ref tctl) = thread.sig_ctrl {
-                        tctl.word[0].fetch_and(
-                            !(sig_bit(SIGSTOP)
-                                | sig_bit(SIGTTIN)
-                                | sig_bit(SIGTTOU)
-                                | sig_bit(SIGTSTP)),
-                            Ordering::Relaxed,
-                        );
-                    }
-                    thread
-                        .status_hndl
-                        .write(&(ContextVerb::Unstop as usize).to_ne_bytes())
-                        .expect("TODO");
-                }
-                // POSIX XSI allows but does not reqiure SIGCHLD to be sent when SIGCONT occurs.
-                return SendResult::SucceededSigcont {
-                    ppid: target_proc.ppid,
-                    pgid: target_proc.pgid,
-                };
-            }
-            let is_conditional_stop = matches!(sig, SIGTTIN | SIGTTOU | SIGTSTP);
-            if sig == SIGSTOP
-                || (is_conditional_stop
-                    && target_proc
-                        .sig_pctl
-                        .as_ref()
-                        .map_or(false, |proc| proc.signal_will_stop(sig)))
-            {
-                if is_conditional_stop {
-                    let pgid = target_proc.pgid;
-                    drop(target_proc_guard);
-
-                    if self.pgrp_is_orphaned(pgid).unwrap_or(true) {
-                        // POSIX requires that processes in orphaned process groups never be stopped in
-                        // due to SIGTTIN/SIGTTOU/SIGTSTP.
-                        return SendResult::Succeeded;
-                    }
-
-                    target_proc_guard = target_proc_rc.borrow_mut();
-                    target_proc = &mut *target_proc_guard;
-                    sig_pctl = target_proc.sig_pctl.as_mut().expect("already checked");
-                }
-
-                target_proc.status = ProcessStatus::Stopped(sig);
-
-                for thread in &target_proc.threads {
-                    let thread = thread.borrow();
-                    match thread
-                        .status_hndl
-                        .write(&(ContextVerb::Stop as usize).to_ne_bytes())
-                    {
-                        Ok(_) => (),
-                        // TODO: Write a test that this actually results in the thread eventually
-                        // being removed from `threads`. A "dead thread" event should already have
-                        // been triggered, but it is possible that happens during this code, or
-                        // just before that event.
-                        //
-                        // Thread has state Dead, so ignore.
-                        Err(Error { errno: EOWNERDEAD }) => continue,
-                        Err(other) => {
-                            log::error!(
-                                "Unexpected error when stopping context: {other}, pid {target_pid:?} thread fd {}",
-                                thread.status_hndl.as_raw_fd()
-                            );
-                            continue;
-                        }
-                    }
-                    if let Some(ref tctl) = thread.sig_ctrl {
-                        tctl.word[0].fetch_and(!sig_bit(SIGCONT), Ordering::Relaxed);
-                    }
-                }
-
-                // TODO: Actually wait for, or IPI the context first, then clear bit. Not atomically safe otherwise?
-                sig_pctl
-                    .pending
-                    .fetch_and(!sig_bit(SIGCONT), Ordering::Relaxed);
-
-                log::trace!("SUCCEEDED SIGCHILD MY_PID {target_pid:?}");
-                return SendResult::SucceededSigchld {
-                    orig_signal: nz_signal,
-                    ppid: target_proc.ppid,
-                    pgid: target_proc.pgid,
-                };
-            }
-            if sig == SIGKILL {
-                for thread in &target_proc.threads {
-                    let thread = thread.borrow();
-                    thread
-                        .status_hndl
-                        .write(&(ContextVerb::ForceKill as usize).to_ne_bytes())
-                        .expect("TODO");
-                }
-
-                *killed_self |= is_self;
-
-                // exit() will signal the parent, rather than immediately in kill()
-                return SendResult::Succeeded;
-            }
-            if !sig_pctl.signal_will_ign(sig, stop_or_continue) {
-                match target {
-                    KillTarget::Thread(ref thread_rc) => {
-                        let thread = thread_rc.borrow();
-                        let Some(ref tctl) = thread.sig_ctrl else {
-                            log::trace!("No tctl");
-                            return SendResult::Invalid;
-                        };
-
-                        tctl.sender_infos[sig_idx].store(sender.raw(), Ordering::Relaxed);
-                        let bit = 1 << sig_idx;
-
-                        let _was_new = tctl.word[sig_group].fetch_or(bit, Ordering::Release);
-                        if (tctl.word[sig_group].load(Ordering::Relaxed) >> 32) & bit != 0 {
-                            *killed_self |= is_self;
-                            thread
-                                .status_hndl
-                                .write(&(ContextVerb::Interrupt as usize).to_ne_bytes())
-                                .expect("TODO");
-                        }
-                    }
-                    KillTarget::Proc(proc) => {
-                        match mode {
-                            KillMode::Queued(arg) => {
-                                if sig_group != 1 {
-                                    log::trace!("Out of range");
-                                    return SendResult::Invalid;
-                                }
-                                let rtidx = sig_idx;
-                                //log::trace!("QUEUEING {arg:?} RTIDX {rtidx}");
-                                if rtidx >= target_proc.rtqs.len() {
-                                    target_proc.rtqs.resize_with(rtidx + 1, VecDeque::new);
-                                }
-                                let rtq = target_proc.rtqs.get_mut(rtidx).unwrap();
-
-                                // TODO(feat): configurable limit?
-                                if rtq.len() >= 32 {
-                                    return SendResult::FullQ;
-                                }
-
-                                rtq.push_back(arg);
-                            }
-                            KillMode::Idempotent => {
-                                if sig_pctl.pending.load(Ordering::Acquire) & sig_bit(sig) != 0 {
-                                    // If already pending, do not send this signal. While possible that
-                                    // another thread is concurrently clearing pending, and that other
-                                    // spuriously awoken threads would benefit from actually receiving
-                                    // this signal, there is no requirement by POSIX for such signals
-                                    // not to be mergeable. So unless the signal handler is observed to
-                                    // happen-before this syscall, it can be ignored. The pending bits
-                                    // would certainly have been cleared, thus contradicting this
-                                    // already reached statement.
-                                    return SendResult::Succeeded;
-                                }
-
-                                if sig_group != 0 {
-                                    log::trace!("Invalid sig group");
-                                    return SendResult::Invalid;
-                                }
-                                sig_pctl.sender_infos[sig_idx]
-                                    .store(sender.raw(), Ordering::Relaxed);
-                            }
-                        }
-
-                        sig_pctl.pending.fetch_or(sig_bit(sig), Ordering::Release);
-
-                        for thread in target_proc.threads.iter() {
-                            let thread = thread.borrow();
-                            let Some(ref tctl) = thread.sig_ctrl else {
-                                continue;
-                            };
-                            log::trace!("TCTL {:#x?}", &**tctl);
-                            if (tctl.word[sig_group].load(Ordering::Relaxed) >> 32) & (1 << sig_idx)
-                                != 0
-                            {
-                                thread
-                                    .status_hndl
-                                    .write(&(ContextVerb::Interrupt as usize).to_ne_bytes())
-                                    .expect("TODO");
-                                *killed_self |= is_self;
-                                break;
-                            }
-                        }
-                    }
-                }
-                SendResult::Succeeded
-            } else {
-                // Discard signals if sighandler is unset. This includes both special contexts such
-                // as bootstrap, and child processes or threads that have not yet been started.
-                // This is semantically equivalent to having all signals except SIGSTOP and SIGKILL
-                // blocked/ignored (SIGCONT can be ignored and masked, but will always continue
-                // stopped processes first).
-                SendResult::Succeeded
-            }
-        })();
-
-        match result {
-            // TODO: succeed even if *some* (when group/all procs is specified) fail?
-            SendResult::LacksPermission => return Err(Error::new(EPERM)),
-
-            SendResult::Succeeded => (),
-            SendResult::FullQ => return Err(Error::new(EAGAIN)),
-            SendResult::Invalid => {
-                log::trace!("Invalid signal configuration for {target_pid:?}");
-                return Err(Error::new(ESRCH));
-            }
-            SendResult::SucceededSigchld {
-                ppid,
-                pgid,
-                orig_signal,
-            } => {
-                {
-                    let mut parent = self
-                        .processes
-                        .get(&ppid)
-                        .ok_or(Error::new(ESRCH))?
-                        .borrow_mut();
-                    parent.waitpid.insert(
-                        WaitpidKey {
-                            pid: Some(target_pid),
-                            pgid: Some(pgid),
-                        },
-                        (
-                            target_pid,
-                            WaitpidStatus::Stopped {
-                                signal: orig_signal,
-                            },
-                        ),
-                    );
-                    awoken.extend(parent.waitpid_waiting.drain(..));
-                }
-                // TODO(err): Just ignore EINVAL (missing signal config), otherwise handle error?
-                if ppid != INIT_PID {
-                    log::trace!("SIGCHLDing {ppid:?}");
-                    if let Err(err) = self.on_send_sig(
-                        INIT_PID, // caller, TODO?
-                        KillTarget::Proc(ppid),
-                        SIGCHLD as u8,
-                        killed_self,
-                        KillMode::Idempotent,
-                        true, // stop_or_continue
-                        awoken,
-                    ) {
-                        log::trace!("failed to SIGCHLD parent (SIGSTOP): {err}");
-                    }
-                }
-            }
-            SendResult::SucceededSigcont { ppid, pgid } => {
-                {
-                    let mut parent = self
-                        .processes
-                        .get(&ppid)
-                        .ok_or(Error::new(ESRCH))?
-                        .borrow_mut();
-                    parent.waitpid.insert(
-                        WaitpidKey {
-                            pid: Some(target_pid),
-                            pgid: Some(pgid),
-                        },
-                        (target_pid, WaitpidStatus::Continued),
-                    );
-                    awoken.extend(parent.waitpid_waiting.drain(..));
-                }
-                // POSIX XSI allows but does not require SIGCONT to send signals to the parent.
-                // TODO(err): Just ignore EINVAL (missing signal config), otherwise handle error?
-                if ppid != INIT_PID {
-                    if let Err(err) = self.on_send_sig(
-                        INIT_PID, // caller, TODO?
-                        KillTarget::Proc(ppid),
-                        SIGCHLD as u8,
-                        killed_self,
-                        KillMode::Idempotent,
-                        true, // stop_or_continue
-                        awoken,
-                    ) {
-                        log::trace!("failed to SIGCHLD parent (SIGCONT): {err}");
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-    fn real_tctl_pctl_intra_page_offsets(fd: &FdGuard) -> Result<[u16; 2]> {
-        let mut buf = SetSighandlerData::default();
-        fd.read(&mut buf)?;
-        Ok([
-            (buf.thread_control_addr % PAGE_SIZE) as u16,
-            (buf.proc_control_addr % PAGE_SIZE) as u16,
-        ])
-    }
-    fn on_proc_rename(&mut self, pid: ProcessId, new_name_raw: &[u8]) -> Result<()> {
-        let name_len = new_name_raw
-            .iter()
-            .position(|c| *c == 0)
-            .unwrap_or(new_name_raw.len());
-
-        let new_name =
-            core::str::from_utf8(&new_name_raw[..name_len]).map_err(|_| Error::new(EINVAL))?;
-        let mut proc = self
-            .processes
-            .get(&pid)
-            .ok_or(Error::new(ESRCH))?
-            .borrow_mut();
-
-        proc.name = ArrayString::from_str(&new_name[..new_name.len().min(NAME_CAPAC)]).unwrap();
-        if let Err(err) = proc.sync_kernel_attrs(&self.auth) {
-            log::warn!("Failed to set kernel attrs when renaming proc: {err}");
-        }
-        Ok(())
-    }
-    fn on_sync_sigtctl(thread: &mut Thread) -> Result<()> {
-        log::trace!("Sync tctl {:?}", thread.pid);
-        let sigcontrol_fd = thread.fd.dup(b"sighandler")?;
-        let [tctl_off, _] = Self::real_tctl_pctl_intra_page_offsets(&sigcontrol_fd)?;
-        log::trace!("read intra offsets");
-        thread
-            .sig_ctrl
-            .replace(Page::map(&sigcontrol_fd, 0, tctl_off)?);
-        Ok(())
-    }
-    fn on_sync_sigpctl(&mut self, pid: ProcessId) -> Result<()> {
-        log::trace!("Sync pctl {pid:?}");
-        let mut proc = self
-            .processes
-            .get(&pid)
-            .ok_or(Error::new(ESRCH))?
-            .borrow_mut();
-        let any_thread = proc.threads.first().ok_or(Error::new(EINVAL))?;
-        let sigcontrol_fd = any_thread.borrow().fd.dup(b"sighandler")?;
-        let [_, pctl_off] = Self::real_tctl_pctl_intra_page_offsets(&sigcontrol_fd)?;
-        proc.sig_pctl
-            .replace(Page::map(&sigcontrol_fd, PAGE_SIZE, pctl_off)?);
-        Ok(())
-    }
-    fn on_sigdeq(&mut self, pid: ProcessId, payload: &mut [u8]) -> Result<()> {
-        let sig_idx = {
-            let bytes = <[u8; 4]>::try_from(payload.get(..4).ok_or(Error::new(EINVAL))?).unwrap();
-            u32::from_ne_bytes(bytes)
-        };
-        log::trace!("SIGDEQ {pid:?} idx {sig_idx}");
-        let dst = payload
-            .get_mut(..size_of::<RtSigInfo>())
-            .ok_or(Error::new(EINVAL))?;
-        if sig_idx >= 32 {
-            return Err(Error::new(EINVAL));
-        }
-        let mut proc = self
-            .processes
-            .get_mut(&pid)
-            .ok_or(Error::new(ESRCH))?
-            .borrow_mut();
-        let proc = &mut *proc;
-
-        let pctl = proc.sig_pctl.as_ref().ok_or(Error::new(EBADF))?;
-
-        let q = proc
-            .rtqs
-            .get_mut(sig_idx as usize)
-            .ok_or(Error::new(EAGAIN))?;
-        let Some(front) = q.pop_front() else {
-            return Err(Error::new(EAGAIN));
-        };
-
-        if q.is_empty() {
-            pctl.pending
-                .fetch_and(!(1 << (32 + sig_idx as usize)), Ordering::Relaxed);
-        }
-        dst.copy_from_slice(unsafe { plain::as_bytes(&front) });
-        Ok(())
-    }
-    fn on_close(&mut self, id: usize) {
-        if self.handles.try_remove(id).is_none() {
-            log::error!("on_close for nonexistent handle, id={id}");
-        }
-    }
-    fn pgrp_is_orphaned(&self, grp: ProcessId) -> Option<bool> {
-        let group = self.groups.get(&grp)?.borrow();
-
-        let mut still_true = true;
-
-        for process_rc in group.processes.iter().filter_map(Weak::upgrade) {
-            let process = process_rc.borrow();
-            let Some(parent_rc) = self.processes.get(&process_rc.borrow().ppid) else {
-                // TODO(err): what to do here?
-                continue;
-            };
-            let parent = parent_rc.borrow();
-
-            // POSIX defines orphaned process groups as those where
-            //
-            // forall process in group, parent = process.parent,
-            //   parent's pgid == process's pgid
-            //   OR
-            //   parent's session id != process's session id
-            let cond = parent.pgid == process.pgid || parent.sid != process.sid;
-            if !cond {
-                log::trace!(
-                    "COUNTEREXAMPLE: process {:#?} parent {:#?}",
-                    process,
-                    parent
-                );
-            }
-            still_true &= cond;
-        }
-        Some(still_true)
-    }
-    fn ps_data(&mut self, _ctx: &CallerCtx) -> Result<Vec<u8>> {
-        // TODO: enforce uid == 0?
-
-        let mut string = alloc::format!(
-            "{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<8}{:<16}\n",
-            "PID",
-            "PGID",
-            "PPID",
-            "SID",
-            "RUID",
-            "RGID",
-            "EUID",
-            "EGID",
-            "NTHRD",
-            "STATUS",
-            "NAME",
-        );
-        for (pid, process_rc) in self.processes.iter() {
-            let process = process_rc.borrow();
-            let status = match process.status {
-                ProcessStatus::PossiblyRunnable => "R",
-                ProcessStatus::Stopped(_) => "S",
-                ProcessStatus::Exiting { .. } => "E",
-                ProcessStatus::Exited { .. } => "X",
-            };
-            use core::fmt::Write;
-            writeln!(
-                string,
-                "{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<8}{:<16}",
-                pid.0,
-                process.pgid.0,
-                process.ppid.0,
-                process.sid.0,
-                process.ruid,
-                process.rgid,
-                process.euid,
-                process.egid,
-                process.threads.len(),
-                status,
-                process.name,
-            )
-            .unwrap();
-        }
-
-        // Useful for debugging memory leaks.
-        log::trace!("NEXT FD: {}", {
-            let nextfd = syscall::dup(0, &[]).unwrap();
-            let _ = syscall::close(nextfd);
-            nextfd
-        });
-        log::trace!("{} processes", self.processes.len());
-        log::trace!("{} groups", self.groups.len());
-        log::trace!("{} sessions", self.sessions.len());
-        log::trace!("{} handles", self.handles.len());
-        log::trace!("{} thread_lookup", self.thread_lookup.len());
-        log::trace!("{} next_id", self.next_internal_id);
-
-        Ok(string.into_bytes())
-    }
-
-    fn on_setprocprio(
-        &mut self,
-        caller_pid: ProcessId,
-        target_pid: ProcessId,
-        new_prio: u32,
-    ) -> Result<()> {
-        if new_prio >= 40 {
-            return Err(Error::new(EINVAL));
-        }
-
-        let caller_euid = self.processes.get(&caller_pid).ok_or(Error::new(ESRCH))?.borrow().euid;
-
-        let target_rc = self.processes.get(&target_pid).ok_or(Error::new(ESRCH))?;
-        let mut target = target_rc.borrow_mut();
-
-        if caller_euid != 0 && caller_euid != target.euid {
-            return Err(Error::new(EPERM));
-        }
-
-        target.prio = new_prio;
-
-        if let Err(err) = target.sync_kernel_attrs(&self.auth) {
-            log::warn!("Failed to sync proc attrs in setprocprio: {err}");
-        }
-        Ok(())
-    }
-
-    fn on_getprocprio(
-        &self,
-        caller_pid: ProcessId,
-        target_pid: ProcessId,
-    ) -> Result<u32> {
-        let target_rc = self.processes.get(&target_pid).ok_or(Error::new(ESRCH))?;
-        Ok(target_rc.borrow().prio)
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-enum KillMode {
-    Idempotent,
-    Queued(RtSigInfo),
-}
-#[derive(Debug)]
-enum KillTarget {
-    Proc(ProcessId),
-    Thread(Rc<RefCell<Thread>>),
-}
-fn arraystring_to_bytes<const C: usize>(s: ArrayString<C>) -> [u8; C] {
-    let mut buf = [0_u8; C];
-    let min = buf.len().min(s.len());
-    buf[..min].copy_from_slice(&s.as_bytes()[..min]);
-    buf
-}
-
-impl Process {
-    fn sync_kernel_attrs(&mut self, auth: &FdGuard) -> Result<()> {
-        // TODO: continue with other threads if one fails?
-        for thread_rc in &self.threads {
-            let mut thread = thread_rc.borrow_mut();
-            thread.sync_kernel_attrs(self, auth)?;
-        }
-        Ok(())
-    }
-}
-
-impl Thread {
-    fn sync_kernel_attrs(&mut self, process: &Process, auth: &FdGuard) -> Result<()> {
-        let attr_fd = self
-            .fd
-            .dup(alloc::format!("auth-{}-attrs", auth.as_raw_fd()).as_bytes())?;
-        attr_fd.write(&ProcSchemeAttrs {
-            pid: process.pid.0 as u32,
-            euid: process.euid,
-            egid: process.egid,
-            prio: process.prio,
-            debug_name: arraystring_to_bytes(process.name),
-        })?;
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/bootstrap/src/riscv64.ld b/recipes/core/base/bootstrap/src/riscv64.ld
deleted file mode 100644
index c37274b9f3..0000000000
--- a/recipes/core/base/bootstrap/src/riscv64.ld
+++ /dev/null
@@ -1,52 +0,0 @@
-ENTRY(_start)
-OUTPUT_FORMAT(elf64-littleriscv)
-
-SECTIONS {
-  . = 4096 + 4096; /* Reserved for the null page and the initfs header prepended by redox-initfs-ar */
-  __initfs_header = . - 4096;
-  . += SIZEOF_HEADERS;
-  . = ALIGN(4096);
-
-  .text : {
-    __text_start = .;
-    *(.text*)
-    . = ALIGN(4096);
-    __text_end = .;
-  }
-  .rodata : {
-    __rodata_start = .;
-    *(.rodata*)
-  }
-  .data.rel.ro : {
-    *(.data.rel.ro*)
-  }
-  .got : {
-    *(.got)
-  }
-  .got.plt : {
-    *(.got.plt)
-    . = ALIGN(4096);
-    __rodata_end = .;
-  }
-  .data : {
-    __data_start = .;
-    *(.data*)
-    *(.sdata*)
-    . = ALIGN(4096);
-    __data_end = .;
-
-    __bss_start = .;
-    *(.bss*)
-    *(.sbss*)
-    . = ALIGN(4096);
-    __bss_end = .;
-  }
-
-  /DISCARD/ : {
-      *(.comment*)
-      *(.eh_frame*)
-      *(.gcc_except_table*)
-      *(.note*)
-      *(.rel.eh_frame*)
-  }
-}
diff --git a/recipes/core/base/bootstrap/src/riscv64.rs b/recipes/core/base/bootstrap/src/riscv64.rs
deleted file mode 100644
index 6bec4c2ec6..0000000000
--- a/recipes/core/base/bootstrap/src/riscv64.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use core::mem;
-use syscall::{data::Map, flag::MapFlags, number::SYS_FMAP};
-
-const STACK_SIZE: usize = 64 * 1024; // 64 KiB
-pub const USERMODE_END: usize = 1 << 38; // Assuming Sv39
-pub const STACK_START: usize = USERMODE_END - syscall::KERNEL_METADATA_SIZE - STACK_SIZE;
-
-static MAP: Map = Map {
-    offset: 0,
-    size: STACK_SIZE,
-    flags: MapFlags::PROT_READ
-        .union(MapFlags::PROT_WRITE)
-        .union(MapFlags::MAP_PRIVATE)
-        .union(MapFlags::MAP_FIXED_NOREPLACE),
-    address: STACK_START, // highest possible user address
-};
-
-core::arch::global_asm!(
-    "
-    .globl _start
-_start:
-    # Setup a stack.
-    li a7, {number}
-    li a0, {fd}
-    la a1, {map} # pointer to Map struct
-    li a2, {map_size} # size of Map struct
-    ecall
-
-    # Test for success (nonzero value).
-    bne a0, x0, 2f
-    # (failure)
-    unimp
-2:
-    li sp, {stack_size}
-    add sp, sp, a0
-    mv fp, x0
-
-    jal start
-    # `start` must never return.
-    unimp
-    ",
-    fd = const usize::MAX, // dummy fd indicates anonymous map
-    map = sym MAP,
-    map_size = const mem::size_of::<Map>(),
-    number = const SYS_FMAP,
-    stack_size = const STACK_SIZE,
-);
diff --git a/recipes/core/base/bootstrap/src/start.rs b/recipes/core/base/bootstrap/src/start.rs
deleted file mode 100644
index 14a97ac2ad..0000000000
--- a/recipes/core/base/bootstrap/src/start.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use syscall::flag::MapFlags;
-
-mod offsets {
-    unsafe extern "C" {
-        // text (R-X)
-        static __text_start: u8;
-        static __text_end: u8;
-        // rodata (R--)
-        static __rodata_start: u8;
-        static __rodata_end: u8;
-        // data+bss (RW-)
-        static __data_start: u8;
-        static __bss_end: u8;
-    }
-    pub fn text() -> (usize, usize) {
-        unsafe {
-            (
-                &__text_start as *const u8 as usize,
-                &__text_end as *const u8 as usize,
-            )
-        }
-    }
-    pub fn rodata() -> (usize, usize) {
-        unsafe {
-            (
-                &__rodata_start as *const u8 as usize,
-                &__rodata_end as *const u8 as usize,
-            )
-        }
-    }
-    pub fn data_and_bss() -> (usize, usize) {
-        unsafe {
-            (
-                &__data_start as *const u8 as usize,
-                &__bss_end as *const u8 as usize,
-            )
-        }
-    }
-}
-
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn start() -> ! {
-    // Remap self, from the previous RWX
-
-    let (text_start, text_end) = offsets::text();
-    let (rodata_start, rodata_end) = offsets::rodata();
-    let (data_start, data_end) = offsets::data_and_bss();
-
-    // NOTE: Assuming the debug scheme root fd is always placed at this position
-    let debug_fd = syscall::UPPER_FDTBL_TAG + syscall::data::GlobalSchemes::Debug as usize;
-    let _ = syscall::openat(debug_fd, "", syscall::O_RDONLY, 0); // stdin
-    let _ = syscall::openat(debug_fd, "", syscall::O_WRONLY, 0); // stdout
-    let _ = syscall::openat(debug_fd, "", syscall::O_WRONLY, 0); // stderr
-
-    unsafe {
-        let _ = syscall::mprotect(4096, 4096, MapFlags::PROT_READ | MapFlags::MAP_PRIVATE)
-            .expect("mprotect failed for initfs header page");
-
-        let _ = syscall::mprotect(
-            text_start,
-            text_end - text_start,
-            MapFlags::PROT_READ | MapFlags::PROT_EXEC | MapFlags::MAP_PRIVATE,
-        )
-        .expect("mprotect failed for .text");
-        let _ = syscall::mprotect(
-            rodata_start,
-            rodata_end - rodata_start,
-            MapFlags::PROT_READ | MapFlags::MAP_PRIVATE,
-        )
-        .expect("mprotect failed for .rodata");
-        let _ = syscall::mprotect(
-            data_start,
-            data_end - data_start,
-            MapFlags::PROT_READ | MapFlags::PROT_WRITE | MapFlags::MAP_PRIVATE,
-        )
-        .expect("mprotect failed for .data/.bss");
-        let _ = syscall::mprotect(
-            data_end,
-            crate::arch::STACK_START - data_end,
-            MapFlags::PROT_READ | MapFlags::MAP_PRIVATE,
-        )
-        .expect("mprotect failed for rest of memory");
-    }
-
-    crate::exec::main();
-}
diff --git a/recipes/core/base/bootstrap/src/x86_64.ld b/recipes/core/base/bootstrap/src/x86_64.ld
deleted file mode 100644
index 375f4acb0d..0000000000
--- a/recipes/core/base/bootstrap/src/x86_64.ld
+++ /dev/null
@@ -1,55 +0,0 @@
-ENTRY(_start)
-OUTPUT_FORMAT(elf64-x86-64)
-
-SECTIONS {
-  . = 4096 + 4096; /* Reserved for the null page and the initfs header prepended by redox-initfs-ar */
-  __initfs_header = . - 4096;
-  . += SIZEOF_HEADERS;
-  . = ALIGN(4096);
-
-  .text : {
-    __text_start = .;
-    *(.text*)
-    . = ALIGN(4096);
-    __text_end = .;
-  }
-  .rodata : {
-    __rodata_start = .;
-    *(.rodata*)
-  }
-  .data.rel.ro : {
-    *(.data.rel.ro*)
-  }
-  .got : {
-    *(.got)
-  }
-  .got.plt : {
-    *(.got.plt)
-    . = ALIGN(4096);
-    __rodata_end = .;
-  }
-  .data : {
-    __data_start = .;
-    *(.data*)
-    . = ALIGN(4096);
-    __data_end = .;
-
-    *(.tbss*)
-    . = ALIGN(4096);
-    *(.tdata*)
-    . = ALIGN(4096);
-
-    __bss_start = .;
-    *(.bss*)
-    . = ALIGN(4096);
-    __bss_end = .;
-  }
-
-  /DISCARD/ : {
-      *(.comment*)
-      *(.eh_frame*)
-      *(.gcc_except_table*)
-      *(.note*)
-      *(.rel.eh_frame*)
-  }
-}
diff --git a/recipes/core/base/bootstrap/src/x86_64.rs b/recipes/core/base/bootstrap/src/x86_64.rs
deleted file mode 100644
index 23d52cf4dc..0000000000
--- a/recipes/core/base/bootstrap/src/x86_64.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use core::mem;
-use syscall::{data::Map, flag::MapFlags, number::SYS_FMAP};
-
-const STACK_SIZE: usize = 64 * 1024; // 64 KiB
-pub const USERMODE_END: usize = 0x0000_8000_0000_0000;
-pub const STACK_START: usize = USERMODE_END - syscall::KERNEL_METADATA_SIZE - STACK_SIZE;
-
-static MAP: Map = Map {
-    offset: 0,
-    size: STACK_SIZE,
-    flags: MapFlags::PROT_READ
-        .union(MapFlags::PROT_WRITE)
-        .union(MapFlags::MAP_PRIVATE)
-        .union(MapFlags::MAP_FIXED_NOREPLACE),
-    address: STACK_START, // highest possible user address
-};
-
-core::arch::global_asm!(
-    "
-    .globl _start
-    _start:
-    # Setup a stack.
-    mov rax, {number}
-    mov rdi, {fd}
-    mov rsi, offset {map} # pointer to Map struct
-    mov rdx, {map_size} # size of Map struct
-    syscall
-
-    # Test for success (nonzero value).
-    cmp rax, 0
-    jg 1f
-    # (failure)
-    ud2
-    1:
-    # Subtract 16 since all instructions seem to hate non-canonical RSP values :)
-    lea rsp, [rax+{stack_size}-16]
-    mov rbp, rsp
-
-    # Stack has the same alignment as `size`.
-    call start
-    # `start` must never return.
-    ud2
-    ",
-    fd = const usize::MAX, // dummy fd indicates anonymous map
-    map = sym MAP,
-    map_size = const mem::size_of::<Map>(),
-    number = const SYS_FMAP,
-    stack_size = const STACK_SIZE,
-);
diff --git a/recipes/core/base/config/Cargo.toml b/recipes/core/base/config/Cargo.toml
deleted file mode 100644
index c7fb85c442..0000000000
--- a/recipes/core/base/config/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "config"
-description = "Configuration override library"
-version = "0.0.0"
-edition = "2024"
-
-[dependencies]
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/config/src/lib.rs b/recipes/core/base/config/src/lib.rs
deleted file mode 100644
index e7ba434d23..0000000000
--- a/recipes/core/base/config/src/lib.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
-use std::{fs, io};
-
-pub fn config(name: &str) -> Result<Vec<PathBuf>, io::Error> {
-    config_for_dirs(&[
-        &Path::new("/usr/lib").join(format!("{name}.d")),
-        &Path::new("/etc").join(format!("{name}.d")),
-    ])
-}
-
-pub fn config_for_initfs(name: &str) -> Result<Vec<PathBuf>, io::Error> {
-    config_for_dirs(&[
-        &Path::new("/scheme/initfs/lib").join(format!("{name}.d")),
-        &Path::new("/scheme/initfs/etc").join(format!("{name}.d")),
-    ])
-}
-
-pub fn config_for_dirs(dirs: &[impl AsRef<Path>]) -> Result<Vec<PathBuf>, io::Error> {
-    // This must be a BTreeMap to iterate in sorted order.
-    let mut entries = BTreeMap::new();
-
-    for dir in dirs {
-        let dir = dir.as_ref();
-        if !dir.exists() {
-            // Skip non-existent dirs
-            continue;
-        }
-
-        for entry_res in fs::read_dir(&dir)? {
-            // This intentionally overwrites older entries with
-            // the same filename to allow overriding entries in
-            // one search dir with those in a later search dir.
-            let entry = entry_res?;
-            entries.insert(entry.file_name(), entry.path());
-        }
-    }
-
-    Ok(entries.into_values().collect())
-}
diff --git a/recipes/core/base/daemon/Cargo.toml b/recipes/core/base/daemon/Cargo.toml
deleted file mode 100644
index a390eaf044..0000000000
--- a/recipes/core/base/daemon/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "daemon"
-description = "Redox daemon library"
-version = "0.0.0"
-edition = "2024"
-
-[dependencies]
-libc.workspace = true
-libredox.workspace = true
-redox-scheme.workspace = true
-redox_syscall.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/daemon/src/lib.rs b/recipes/core/base/daemon/src/lib.rs
deleted file mode 100644
index a16d34dc31..0000000000
--- a/recipes/core/base/daemon/src/lib.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-//! A library for creating and managing daemons for RedoxOS.
-#![feature(never_type)]
-
-use std::io::{self, PipeWriter, Read, Write};
-use std::os::fd::{AsRawFd, FromRawFd, OwnedFd, RawFd};
-use std::os::unix::process::CommandExt;
-use std::process::Command;
-
-use libredox::Fd;
-use redox_scheme::scheme::{SchemeAsync, SchemeSync};
-use redox_scheme::Socket;
-
-unsafe fn get_fd(var: &str) -> Option<RawFd> {
-    let value = match std::env::var(var) {
-        Ok(value) => value,
-        Err(_) => {
-            let exe = std::env::args()
-                .next()
-                .unwrap_or_else(|| "daemon".to_string());
-            eprintln!("daemon: {var} not set for {exe}; readiness notification disabled");
-            return None;
-        }
-    };
-    let fd: RawFd = match value.parse() {
-        Ok(fd) => fd,
-        Err(err) => {
-            let exe = std::env::args()
-                .next()
-                .unwrap_or_else(|| "daemon".to_string());
-            eprintln!("daemon: invalid {var} value {value:?} for {exe}: {err}; readiness notification disabled");
-            return None;
-        }
-    };
-    if unsafe { libc::fcntl(fd, libc::F_SETFD, libc::FD_CLOEXEC) } == -1 {
-        eprintln!(
-            "daemon: failed to set CLOEXEC flag for {var} fd: {}",
-            io::Error::last_os_error()
-        );
-        return None;
-    }
-    Some(fd)
-}
-
-unsafe fn pass_fd(cmd: &mut Command, env: &str, fd: OwnedFd) {
-    cmd.env(env, format!("{}", fd.as_raw_fd()));
-    unsafe {
-        cmd.pre_exec(move || {
-            // Pass notify pipe to child
-            if libc::fcntl(fd.as_raw_fd(), libc::F_SETFD, 0) == -1 {
-                Err(io::Error::last_os_error())
-            } else {
-                Ok(())
-            }
-        });
-    }
-}
-
-/// A long running background process that handles requests.
-#[must_use = "Daemon::ready must be called"]
-pub struct Daemon {
-    write_pipe: Option<PipeWriter>,
-}
-
-impl Daemon {
-    /// Create a new daemon.
-    pub fn new(f: impl FnOnce(Daemon) -> !) -> ! {
-        let write_pipe = unsafe { get_fd("INIT_NOTIFY").map(io::PipeWriter::from_raw_fd) };
-
-        f(Daemon { write_pipe })
-    }
-
-    /// Notify the process that the daemon is ready to accept requests.
-    pub fn ready(mut self) {
-        if let Some(write_pipe) = self.write_pipe.as_mut() {
-            write_pipe.write_all(&[0]).unwrap();
-        }
-    }
-
-    /// Executes `Command` as a child process.
-    // FIXME remove once the service spawning of hwd and pcid-spawner is moved to init
-    #[deprecated]
-    pub fn spawn(mut cmd: Command) {
-        let (mut read_pipe, write_pipe) = io::pipe().unwrap();
-
-        unsafe { pass_fd(&mut cmd, "INIT_NOTIFY", write_pipe.into()) };
-
-        if let Err(err) = cmd.spawn() {
-            eprintln!("daemon: failed to execute {cmd:?}: {err}");
-            return;
-        }
-
-        let mut data = [0];
-        match read_pipe.read_exact(&mut data) {
-            Ok(()) => {}
-            Err(err) if err.kind() == io::ErrorKind::UnexpectedEof => {
-                eprintln!("daemon: {cmd:?} exited without notifying readiness");
-            }
-            Err(err) => {
-                eprintln!("daemon: failed to wait for {cmd:?}: {err}");
-            }
-        }
-    }
-}
-
-/// A long running background process that handles requests using schemes.
-#[must_use = "SchemeDaemon::ready must be called"]
-pub struct SchemeDaemon {
-    write_pipe: Option<PipeWriter>,
-}
-
-impl SchemeDaemon {
-    /// Create a new daemon for use with schemes.
-    pub fn new(f: impl FnOnce(SchemeDaemon) -> !) -> ! {
-        let write_pipe = unsafe { get_fd("INIT_NOTIFY").map(io::PipeWriter::from_raw_fd) };
-
-        f(SchemeDaemon { write_pipe })
-    }
-
-    /// Notify the process that the scheme daemon is ready to accept requests.
-    pub fn ready_with_fd(self, cap_fd: Fd) -> syscall::Result<()> {
-        if let Some(write_pipe) = self.write_pipe {
-            syscall::call_wo(
-                write_pipe.as_raw_fd() as usize,
-                &cap_fd.into_raw().to_ne_bytes(),
-                syscall::CallFlags::FD,
-                &[],
-            )?;
-        }
-        Ok(())
-    }
-
-    /// Notify the process that the synchronous scheme daemon is ready to accept requests.
-    pub fn ready_sync_scheme<S: SchemeSync>(
-        self,
-        socket: &Socket,
-        scheme: &mut S,
-    ) -> syscall::Result<()> {
-        let cap_id = scheme.scheme_root()?;
-        let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0)?;
-        self.ready_with_fd(Fd::new(cap_fd))
-    }
-
-    /// Notify the process that the asynchronous scheme daemon is ready to accept requests.
-    pub fn ready_async_scheme<S: SchemeAsync>(
-        self,
-        socket: &Socket,
-        scheme: &mut S,
-    ) -> syscall::Result<()> {
-        let cap_id = scheme.scheme_root()?;
-        let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0)?;
-        self.ready_with_fd(Fd::new(cap_fd))
-    }
-}
diff --git a/recipes/core/base/dhcpd/src/dhcp/mod.rs b/recipes/core/base/dhcpd/src/dhcp/mod.rs
deleted file mode 100644
index d57f380778..0000000000
--- a/recipes/core/base/dhcpd/src/dhcp/mod.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-#[repr(C, packed)]
-pub struct Dhcp {
-    pub op: u8,
-    pub htype: u8,
-    pub hlen: u8,
-    pub hops: u8,
-    pub tid: u32,
-    pub secs: u16,
-    pub flags: u16,
-    pub ciaddr: [u8; 4],
-    pub yiaddr: [u8; 4],
-    pub siaddr: [u8; 4],
-    pub giaddr: [u8; 4],
-    pub chaddr: [u8; 16],
-    pub sname: [u8; 64],
-    pub file: [u8; 128],
-    pub magic: u32,
-    pub options: [u8; 308],
-}
diff --git a/recipes/core/base/dhcpd/src/main.rs b/recipes/core/base/dhcpd/src/main.rs
deleted file mode 100644
index a95b703eea..0000000000
--- a/recipes/core/base/dhcpd/src/main.rs
+++ /dev/null
@@ -1,497 +0,0 @@
-use std::fs::{File, OpenOptions};
-use std::io::{Read, Write};
-use std::net::{SocketAddr, UdpSocket};
-use std::time::Duration;
-use std::{env, process, time};
-
-use dhcp::Dhcp;
-
-mod dhcp;
-
-macro_rules! try_fmt {
-    ($e:expr, $m:expr) => {
-        match $e {
-            Ok(ok) => ok,
-            Err(err) => return Err(format!("{}: {}", $m, err)),
-        }
-    };
-}
-
-fn get_cfg_value(path: &str) -> Result<String, String> {
-    let path = format!("/scheme/netcfg/{path}");
-    let mut file = File::open(&path).map_err(|_| format!("Can't open {path}"))?;
-    let mut result = String::new();
-    file.read_to_string(&mut result)
-        .map_err(|_| format!("Can't read {path}"))?;
-    Ok(result)
-}
-
-fn get_iface_cfg_value(iface: &str, cfg: &str) -> Result<String, String> {
-    let path = format!("ifaces/{iface}/{cfg}");
-    get_cfg_value(&path)
-}
-
-fn set_cfg_value(path: &str, value: &str) -> Result<(), String> {
-    let path = format!("/scheme/netcfg/{path}");
-    let mut file = OpenOptions::new()
-        .read(false)
-        .write(true)
-        .create(false)
-        .open(&path)
-        .map_err(|_| format!("Can't open {path}"))?;
-    file.write(value.as_bytes())
-        .map(|_| ())
-        .map_err(|_| format!("Can't write {value} to {path}"))?;
-    file.sync_data()
-        .map_err(|_| format!("Can't commit {value} to {path}"))
-}
-
-fn set_iface_cfg_value(iface: &str, cfg: &str, value: &str) -> Result<(), String> {
-    let path = format!("ifaces/{iface}/{cfg}");
-    set_cfg_value(&path, value)
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Default)]
-struct MacAddr {
-    bytes: [u8; 6],
-}
-
-impl MacAddr {
-    fn from_str(string: &str) -> Self {
-        MacAddr::try_parse_with_delimeter(string, ':')
-            .or_else(|| MacAddr::try_parse_with_delimeter(string, '-'))
-            .unwrap_or_default()
-    }
-
-    fn try_parse_with_delimeter(string: &str, delimeter: char) -> Option<MacAddr> {
-        let mut addr = MacAddr::default();
-        let mut segments = 0;
-
-        for part in string.split(delimeter) {
-            if segments >= addr.bytes.len() {
-                return None;
-            }
-            addr.bytes[segments] = match u8::from_str_radix(part, 16) {
-                Ok(b) => b,
-                _ => return None,
-            };
-            segments += 1;
-        }
-
-        if segments == addr.bytes.len() {
-            Some(addr)
-        } else {
-            None
-        }
-    }
-
-    fn to_string(&self) -> String {
-        format!(
-            "{:>02X}-{:>02X}-{:>02X}-{:>02X}-{:>02X}-{:>02X}",
-            self.bytes[0],
-            self.bytes[1],
-            self.bytes[2],
-            self.bytes[3],
-            self.bytes[4],
-            self.bytes[5]
-        )
-    }
-}
-
-fn dhcp(iface: &str, verbose: bool) -> Result<(), String> {
-    let current_mac = MacAddr::from_str(get_iface_cfg_value(iface, "mac")?.trim());
-
-    let current_ip = get_iface_cfg_value(iface, "addr/list")?
-        .lines()
-        .next()
-        .map(|l| l.to_owned())
-        .unwrap_or("0.0.0.0".to_string());
-
-    if verbose {
-        println!(
-            "DHCP: MAC: {} Current IP: {}",
-            current_mac.to_string(),
-            current_ip.trim()
-        );
-    }
-
-    let tid = try_fmt!(
-        time::SystemTime::now().duration_since(time::UNIX_EPOCH),
-        "failed to get time"
-    )
-    .subsec_nanos();
-
-    let socket = try_fmt!(UdpSocket::bind(("0.0.0.0", 68)), "failed to bind udp");
-    try_fmt!(
-        socket.connect(SocketAddr::from(([255, 255, 255, 255], 67))),
-        "failed to connect udp"
-    );
-    try_fmt!(
-        socket.set_read_timeout(Some(Duration::new(30, 0))),
-        "failed to set read timeout"
-    );
-    try_fmt!(
-        socket.set_write_timeout(Some(Duration::new(30, 0))),
-        "failed to set write timeout"
-    );
-
-    {
-        let mut discover = Dhcp {
-            op: 1,
-            htype: 1,
-            hlen: 6,
-            hops: 0,
-            tid,
-            secs: 0,
-            flags: 0x8000u16.to_be(),
-            ciaddr: [0, 0, 0, 0],
-            yiaddr: [0, 0, 0, 0],
-            siaddr: [0, 0, 0, 0],
-            giaddr: [0, 0, 0, 0],
-            chaddr: [
-                current_mac.bytes[0],
-                current_mac.bytes[1],
-                current_mac.bytes[2],
-                current_mac.bytes[3],
-                current_mac.bytes[4],
-                current_mac.bytes[5],
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-            ],
-            sname: [0; 64],
-            file: [0; 128],
-            magic: 0x63825363u32.to_be(),
-            options: [0; 308],
-        };
-
-        for (s, d) in [
-            // DHCP Message Type (Discover)
-            53, 1, 1, // End
-            255,
-        ]
-        .iter()
-        .zip(discover.options.iter_mut())
-        {
-            *d = *s;
-        }
-
-        let discover_data = unsafe {
-            std::slice::from_raw_parts(
-                (&discover as *const Dhcp) as *const u8,
-                std::mem::size_of::<Dhcp>(),
-            )
-        };
-
-        let _sent = try_fmt!(socket.send(discover_data), "failed to send discover");
-
-        if verbose {
-            println!("DHCP: Sent Discover");
-        }
-    }
-
-    let mut offer_data = [0; 65536];
-    try_fmt!(socket.recv(&mut offer_data), "failed to receive offer");
-    let offer = unsafe { &*(offer_data.as_ptr() as *const Dhcp) };
-    if verbose {
-        println!(
-            "DHCP: Offer IP: {:?}, Server IP: {:?}",
-            offer.yiaddr, offer.siaddr
-        );
-    }
-
-    let mut subnet_option = None;
-    let mut router_option = None;
-    let mut dns_option = None;
-    let mut server_id_option = None;
-    {
-        let mut options = offer.options.iter();
-        while let Some(option) = options.next() {
-            match *option {
-                0 => (),
-                255 => break,
-                _ => {
-                    if let Some(len) = options.next() {
-                        if *len as usize <= options.as_slice().len() {
-                            let data = &options.as_slice()[..*len as usize];
-                            for _data_i in 0..*len {
-                                options.next();
-                            }
-                            match *option {
-                                1 => {
-                                    if verbose {
-                                        println!("DHCP: Subnet Mask: {data:?}");
-                                    }
-                                    if data.len() == 4 && subnet_option.is_none() {
-                                        subnet_option = Some(Vec::from(data));
-                                    }
-                                }
-                                3 => {
-                                    if verbose {
-                                        println!("DHCP: Router: {data:?}");
-                                    }
-                                    if data.len() == 4 && router_option.is_none() {
-                                        router_option = Some(Vec::from(data));
-                                    }
-                                }
-                                6 => {
-                                    if verbose {
-                                        println!("DHCP: Domain Name Server: {data:?}");
-                                    }
-                                    if data.len() == 4 && dns_option.is_none() {
-                                        dns_option = Some(Vec::from(data));
-                                    }
-                                }
-                                51 => {
-                                    if verbose {
-                                        println!("DHCP: Lease Time: {data:?}");
-                                    }
-                                }
-                                53 => {
-                                    if verbose {
-                                        println!("DHCP: Message Type: {data:?}");
-                                    }
-                                }
-                                54 => {
-                                    if verbose {
-                                        println!("DHCP: Server ID: {data:?}");
-                                    }
-                                    if data.len() == 4 {
-                                        // Store the server ID
-                                        server_id_option =
-                                            Some([data[0], data[1], data[2], data[3]]);
-                                    }
-                                }
-                                _ => {
-                                    if verbose {
-                                        println!("DHCP: {option}: {data:?}");
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        let mask_len = if let Some(subnet) = subnet_option {
-            let mut subnet: u32 = (subnet[0] as u32) << 24
-                | (subnet[1] as u32) << 16
-                | (subnet[2] as u32) << 8
-                | subnet[3] as u32;
-            subnet = !subnet;
-            subnet.leading_zeros()
-        } else {
-            0
-        };
-
-        let new_ips = format!(
-            "{}.{}.{}.{}/{}\n",
-            offer.yiaddr[0], offer.yiaddr[1], offer.yiaddr[2], offer.yiaddr[3], mask_len
-        );
-        try_fmt!(
-            set_iface_cfg_value(iface, "addr/set", &new_ips),
-            "failed to set ip"
-        );
-
-        if verbose {
-            let new_ip = try_fmt!(get_iface_cfg_value(iface, "addr/list"), "failed to get ip");
-            println!("DHCP: New IP: {}", new_ip.trim());
-        }
-
-        if let Some(router) = router_option {
-            let default_route = format!(
-                "default via {}.{}.{}.{}",
-                router[0], router[1], router[2], router[3]
-            );
-
-            try_fmt!(
-                set_cfg_value("route/add", &default_route),
-                "failed to set default route"
-            );
-
-            if verbose {
-                let new_router = try_fmt!(get_cfg_value("route/list"), "failed to get ip router");
-                println!("DHCP: New Router: {}", new_router.trim());
-            }
-        }
-
-        if let Some(mut dns) = dns_option {
-            if dns[0] == 127 {
-                let quad9 = [9, 9, 9, 9].to_vec();
-                if verbose {
-                    println!(
-                        "DHCP: Received sarcastic DNS suggestion {}.{}.{}.{}, using {}.{}.{}.{} instead",
-                        dns[0], dns[1], dns[2], dns[3], quad9[0], quad9[1], quad9[2], quad9[3]
-                    );
-                }
-                dns = quad9;
-            }
-
-            let nameserver = format!("{}.{}.{}.{}", dns[0], dns[1], dns[2], dns[3]);
-
-            try_fmt!(
-                set_cfg_value("resolv/nameserver", &nameserver),
-                "failed to set name server"
-            );
-
-            if verbose {
-                let new_dns = try_fmt!(get_cfg_value("resolv/nameserver"), "failed to get dns");
-                println!("DHCP: New DNS: {}", new_dns.trim());
-            }
-        }
-    }
-
-    {
-        let mut request = Dhcp {
-            op: 1,
-            htype: 1,
-            hlen: 6,
-            hops: 0,
-            tid,
-            secs: 0,
-            flags: 0,
-            ciaddr: [0; 4],
-            yiaddr: [0; 4],
-            siaddr: [0; 4],
-            giaddr: [0; 4],
-            chaddr: [
-                current_mac.bytes[0],
-                current_mac.bytes[1],
-                current_mac.bytes[2],
-                current_mac.bytes[3],
-                current_mac.bytes[4],
-                current_mac.bytes[5],
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-            ],
-            sname: [0; 64],
-            file: [0; 128],
-            magic: 0x63825363u32.to_be(),
-            options: [0; 308],
-        };
-
-        // If the server_id_option was None, use "0.0.0.0"
-        let server_id = server_id_option.unwrap_or([0, 0, 0, 0]);
-
-        for (s, d) in [
-            // DHCP Message Type (Request)
-            53,
-            1,
-            3,
-            // Requested IP Address
-            50,
-            4,
-            offer.yiaddr[0],
-            offer.yiaddr[1],
-            offer.yiaddr[2],
-            offer.yiaddr[3],
-            // Server Identifier - use Option 54 from the Offer
-            54,
-            4,
-            server_id[0],
-            server_id[1],
-            server_id[2],
-            server_id[3],
-            // End
-            255,
-        ]
-        .iter()
-        .zip(request.options.iter_mut())
-        {
-            *d = *s;
-        }
-
-        let request_data = unsafe {
-            std::slice::from_raw_parts(
-                (&request as *const Dhcp) as *const u8,
-                std::mem::size_of::<Dhcp>(),
-            )
-        };
-
-        let _sent = try_fmt!(socket.send(request_data), "failed to send request");
-
-        if verbose {
-            println!("DHCP: Sent Request");
-        }
-    }
-
-    {
-        let mut ack_data = [0; 65536];
-        try_fmt!(socket.recv(&mut ack_data), "failed to receive ack");
-        let ack = unsafe { &*(ack_data.as_ptr() as *const Dhcp) };
-        if verbose {
-            println!(
-                "DHCP: Ack IP: {:?}, Server IP: {:?}",
-                ack.yiaddr, ack.siaddr
-            );
-        }
-    }
-
-    Ok(())
-}
-
-fn main() {
-    let mut verbose = false;
-    let iface = "eth0";
-
-    //TODO: parse iface from the args
-    for arg in env::args().skip(1) {
-        match arg.as_ref() {
-            "-v" => verbose = true,
-            _ => (),
-        }
-    }
-
-    if let Err(err) = dhcp(iface, verbose) {
-        eprintln!("dhcpd: {err}");
-        process::exit(1);
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::MacAddr;
-
-    #[test]
-    fn from_str_test() {
-        let mac = MacAddr {
-            bytes: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab],
-        };
-        let empty_mac = MacAddr::default();
-
-        assert_eq!(mac, MacAddr::from_str("01:23:45:67:89:ab"));
-        assert_eq!(mac, MacAddr::from_str("1:23:45:67:89:ab"));
-        assert_eq!(mac, MacAddr::from_str("01:23:45:67:89:AB"));
-        assert_eq!(mac, MacAddr::from_str("01-23-45-67-89-ab"));
-        assert_eq!(empty_mac, MacAddr::from_str(""));
-        assert_eq!(empty_mac, MacAddr::from_str("01:23:45:67:89"));
-        assert_eq!(empty_mac, MacAddr::from_str("01:23:45:67:89:ab:cd"));
-        assert_eq!(empty_mac, MacAddr::from_str("x1:23:45:67:89:ab"));
-        assert_eq!(empty_mac, MacAddr::from_str("01:23-45-67-89-ab"));
-        assert_eq!(empty_mac, MacAddr::from_str("01-23-45-67-89-ag"));
-        assert_eq!(empty_mac, MacAddr::from_str("01.23.45.67.89.ab"));
-        assert_eq!(empty_mac, MacAddr::from_str("01234-23-45-67-89-ab"));
-        assert_eq!(empty_mac, MacAddr::from_str("01--23-45-67-89-ab"));
-        assert_eq!(empty_mac, MacAddr::from_str("12"));
-        assert_eq!(empty_mac, MacAddr::from_str("0:0:0:0:0:0"));
-
-        assert_eq!(mac, MacAddr::from_str(&mac.to_string()));
-        assert_eq!(empty_mac, MacAddr::from_str(&empty_mac.to_string()));
-    }
-}
diff --git a/recipes/core/base/drivers/COMMUNITY-HW.md b/recipes/core/base/drivers/COMMUNITY-HW.md
deleted file mode 100644
index bf91a7a4dc..0000000000
--- a/recipes/core/base/drivers/COMMUNITY-HW.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# Community Hardware
-
-This document tracks the devices from developers or community that need a driver.
-
-This document was created because unfortunately we can't know the most sold device models of the world to measure our device porting priority, thus we will use our community data to measure our device priorities, if you find a "device model users" survey (similar to [Debian Popularity Contest](https://popcon.debian.org/) and [Steam Hardware/Software Survey](https://store.steampowered.com/hwsurvey/Steam-Hardware-Software-Survey-Welcome-to-Steam)), please comment.
-
-If you want to contribute to this table, install [pciutils](https://mj.ucw.cz/sw/pciutils/) on your Linux or Unix-like distribution (it may have a package on your distribution), run the `lspci -v` command to see your hardware devices, their kernel drivers and give the results of these items on each device:
-
-- The first field (each device has an unique name for this item)
-- Kernel driver
-- Kernel module
-
-If you are unsure of what to do, you can talk with us on the [chat](https://doc.redox-os.org/book/chat.html).
-
-## Template
-
-You will use this template to insert your devices on the table.
-
-```
-|  |  |  | No |
-```
-
-- Remove the `#` characters in the port numbers to avoid GitLab issues to be wrongly mentioned
-
-## Devices
-
-| **Device model** | **Kernel driver?** | **Kernel module?** | **There's a Redox driver?** |
-|------------------|--------------------|--------------------|-----------------------------|
-| Realtek RTL8821CE 802.11ac (Wi-Fi) | rtw_8821ce | rtw88_8821ce | No |
-| Intel Ice Lake-LP SPI Controller | intel-spi | spi_intel_pci | No |
-| Intel Ice Lake-LP SMBus Controller | i801_smbus | i2c_i801 | No |
-| Intel Ice Lake-LP Smart Sound Technology Audio Controller | snd_hda_intel | snd_hda_intel, snd_sof_pci_intel_icl | No |
-| Intel Ice Lake-LP Serial IO SPI Controller | intel-lpss | No | No |
-| Intel Ice Lake-LP Serial IO UART Controller | intel-lpss | No | No |
-| Intel Ice Lake-LP Serial IO I2C Controller | intel-lpss | No | No |
-| Ice Lake-LP USB 3.1 xHCI Host Controller | xhci_hcd | No | No |
-| Intel Processor Power and Thermal Controller | proc_thermal | processor_thermal_device_pci_legacy | No |
-| Intel Device 8a02 | icl_uncore | No | No |
-| Iris Plus Graphics G1 (Ice Lake) | i915 | i915 | No |
-| Intel Corporation Raptor Lake-P 6p+8e cores Host Bridge/DRAM Controller | No | No | No |
-| Intel Corporation Raptor Lake PCI Express 5.0 Graphics Port (PEG010) (prog-if 00 [Normal decode]) | pcieport | No | No |
-| Intel Corporation Raptor Lake-P [UHD Graphics] (rev 04) (prog-if 00 [VGA controller]) | i915 | i915 | No |
-| Intel Corporation Raptor Lake Dynamic Platform and Thermal Framework Processor Participant | proc_thermal_pci | processor_thermal_device_pci | No |
-| Intel Corporation Raptor Lake PCIe 4.0 Graphics Port (prog-if 00 [Normal decode]) | pcieport | No | No |
-| Intel Corporation Raptor Lake-P Thunderbolt 4 PCI Express Root Port 0 (prog-if 00 [Normal decode]) | pcieport | No | No |
-| Intel Corporation GNA Scoring Accelerator module | No | No | No |
-| Intel Corporation Raptor Lake-P Thunderbolt 4 USB Controller (prog-if 30 [XHCI]) | xhci_hcd | xhci_pci | No |
-| Intel Corporation Raptor Lake-P Thunderbolt 4 NHI 0 (prog-if 40 [USB4 Host Interface]) | thunderbolt | thunderbolt | No |
-| Intel Corporation Raptor Lake-P Thunderbolt 4 NHI 1 (prog-if 40 [USB4 Host Interface]) | thunderbolt | thunderbolt | No |
-| Intel Corporation Alder Lake PCH USB 3.2 xHCI Host Controller (rev 01) (prog-if 30 [XHCI]) | xhci_hcd | xhci_pci | No |
-| Intel Corporation Alder Lake PCH Shared SRAM (rev 01) | No | No | No |
-| Intel Corporation Raptor Lake PCH CNVi WiFi (rev 01) | iwlwifi | iwlwifi | No |
-| Intel Corporation Alder Lake PCH Serial IO I2C Controller #0 (rev 01) | intel-lpss | intel_lpss_pci | No |
-| Intel Corporation Alder Lake PCH HECI Controller (rev 01) | mei_me | mei_me | No |
-| Intel Corporation Device 51b8 (rev 01) (prog-if 00 [Normal decode]) | pcieport | No | No |
-| Intel Corporation Alder Lake-P PCH PCIe Root Port 6 (rev 01) (prog-if 00 [Normal decode]) | pcieport | No | No |
-| Intel Corporation Raptor Lake LPC/eSPI Controller (rev 01) | No | No | No |
-| Intel Corporation Raptor Lake-P/U/H cAVS (rev 01) (prog-if 80) | sof-audio-pci-intel-tgl | snd_hda_intel, snd_sof_pci_intel_tgl | No |
-| Intel Corporation Alder Lake PCH-P SMBus Host Controller | i801_smbus | i2c_i801 | No |
-| Intel Corporation Alder Lake-P PCH SPI Controller (rev 01) | intel-spi | spi_intel_pci | No |
-| NVIDIA Corporation GA107GLM [RTX A1000 6GB Laptop GPU] (rev a1) | nvidia | nouveau, nvidia_drm, nvidia | No |
-| SK hynix Platinum P41/PC801 NVMe Solid State Drive (prog-if 02 [NVM Express]) | nvme | nvme | No |
-| Realtek Semiconductor Co., Ltd. RTS5261 PCI Express Card Reader (rev 01) | rtsx_pci | rtsx_pci | No |
diff --git a/recipes/core/base/drivers/README.md b/recipes/core/base/drivers/README.md
deleted file mode 100644
index 5f33f2c70a..0000000000
--- a/recipes/core/base/drivers/README.md
+++ /dev/null
@@ -1,160 +0,0 @@
-# Drivers
-
-- [Libraries](#libraries)
-- [Services](#services)
-- [Hardware Interfaces](#hardware-interfaces)
-- [Devices](#devices)
-  - [CPU](#cpu)
-  - [Controllers](#controllers)
-  - [Storage](#storage)
-  - [Graphics](#graphics)
-  - [Input](#input)
-  - [Sound](#sound)
-  - [Networking](#networking)
-  - [Virtualization](#virtualization)
-- [System Interfaces](#system-interfaces)
-- [System Calls](#system-calls)
-- [Schemes](#schemes)
-- [Contribution Details](#contribution-details)
-
-## Libraries
-
-- amlserde - Library to provide serialization/deserialization of the AML symbol table from ACPI
-- common - Library with shared driver code
-- executor - Library to run Rust futures and integrate the executor in an interrupt+queue model without a separated reactor thread
-- [graphics/console-draw](graphics/console-draw/) - Library with shared terminal drawing code
-- [graphics/driver-graphics](graphics/driver-graphics/) - Library with shared graphics code
-- [graphics/graphics-ipc](graphics/graphics-ipc/) - Library with graphics IPC shared code
-- [net/driver-network](net/driver-network/) - Library with shared networking code
-- [storage/partitionlib](storage/partitionlib/) - Library with MBR and GPT code
-- [storage/driver-block](storage/driver-block/) - Library with shared storage code
-- virtio-core - VirtIO driver library
-
-## Services
-
-- [graphics/fbbootlogd](graphics/fbbootlogd/) - Daemon for boot log drawing
-- [graphics/fbcond](graphics/fbcond/) - Terminal daemon
-- hwd - Daemon that handle the ACPI and DeviceTree booting
-- inputd - Multiplexes input from multiple input drivers and provides that to Orbital
-- pcid-spawner - Daemon for PCI-based device driver spawn
-- [storage/lived](storage/lived/) - Daemon for live disk
-- redoxerd - Daemon that send/receive terminal text between the host system and QEMU
-
-## Hardware Interfaces
-
-- acpid - ACPI interface driver
-- pcid - PCI and PCI Express driver
-
-## Devices
-
-### CPU
-
-- rtcd - x86 Real Time Clock driver
-
-### Controllers
-
-- [usb/xhcid](usb/xhcid/) - xHCI USB controller driver
-
-### Storage
-
-- [storage/ahcid](storage/ahcid/) - AHCI (SATA) driver
-- [storage/bcm2835-sdhcid](storage/bcm2835-sdhcid/) - BCM2835 storage driver
-- [storage/ided](storage/ided/) - PATA (IDE) driver
-- [storage/nvmed](storage/nvmed/) - NVMe driver
-- [storage/virtio-blkd](storage/virtio-blkd/) - VirtIO block device driver
-- [storage/usbscsid](storage/usbscsid/) - USB SCSI driver
-
-### Graphics
-
-- [graphics/ihdgd](graphics/ihdgd/) - Intel graphics driver
-- [graphics/vesad](graphics/vesad/) - VESA video driver
-- [graphics/virtio-gpud](graphics/virtio-gpud/) - VirtIO-GPU device driver
-
-### Input
-
-- [input/ps2d](input/ps2d/) - PS/2 interface driver
-- [input/usbhidd](input/usbhidd/) - USB HID driver
-- [usb/usbhubd](usb/usbhubd/) - USB Hub driver
-- [usb/usbctl](usb/usbctl/) - TODO
-
-### Sound
-
-- [audio/ac97d](audio/ac97d/) - AC'97 codec driver
-- [audio/ihdad](audio/ihdad/) - Intel HD Audio chipset driver
-- [audio/sb16d](audio/sb16d/) - Sound Blaster sound card driver
-
-### Networking
-
-- [net/e1000d](net/e1000d/) - Intel Gigabit ethernet driver
-- [net/ixgbed](net/ixgbed/) - Intel 10 Gigabit ethernet driver
-- [net/rtl8139d](net/rtl8139d/), [net/rtl8168d](net/rtl8168d/) - Realtek ethernet drivers
-- [net/virtio-netd](net/virtio-netd/) - VirtIO network device driver
-
-### Virtualization
-
-- vboxd - VirtualBox driver
-
-Some drivers are work-in-progress and incomplete, read [this](https://gitlab.redox-os.org/redox-os/base/-/issues/56) tracking issue to verify.
-
-## System Interfaces
-
-This section explain the system interfaces used by drivers.
-
-### System Calls
-
-- `iopl` : system call that sets the I/O privilege level. x86 has four privilege rings (0/1/2/3), of which the kernel runs in ring 0 and userspace in ring 3. IOPL can only be changed by the kernel, for obvious security reasons, and therefore the Redox kernel needs root to set it. It is unique for each process. Processes with IOPL=3 can access I/O ports, and the kernel can access them as well.
-
-### Schemes
-
-- `/scheme/memory/physical` : Allows mapping physical memory frames to driver-accessible virtual memory pages, with various available memory types:
-    - `/scheme/memory/physical` : Default memory type (currently writeback)
-    - `/scheme/memory/physical@wb` Writeback cached memory
-    - `/scheme/memory/physical@uc` : Uncacheable memory
-    - `/scheme/memory/physical@wc` : Write-combining memory
-- `/scheme/irq` : Allows getting events from interrupts. It is used primarily by listening for its file descriptors using the `/scheme/event` scheme.
-
-## Contribution Details
-
-### Driver Design
-
-A device driver on Redox is an user-space daemon that use system calls and schemes to work, while operating systems with monolithic kernels drivers use internal kernel APIs instead of common program APIs.
-
-If you want to port a driver from a monolithic operating system to Redox you will need to rewrite the driver with reverse enginnering of the code logic, because the logic is adapted to internal kernel APIs (it's a hard task if the device is complex, datasheets are much more easy).
-
-### Write a Driver
-
-Datasheets are preferable (much more easy depending on device complexity), when they are freely available. Be aware that datasheets are often provided under a [Non-Disclosure Agreement](https://en.wikipedia.org/wiki/Non-disclosure_agreement) from hardware vendors, which can affect the ability to create an MIT-licensed driver.
-
-If datasheets aren't available you need to do reverse-engineering of BSD or Linux drivers (if you want use a Linux driver as reference for your Redox driver please ask in the [Chat](https://doc.redox-os.org/book/chat.html) before the implementation to know/satisfy the license requirements and not waste your time, also if you use a BSD driver not licensed as BSD as reference).
-
-### Libraries
-
-You should use the [redox-scheme](https://crates.io/crates/redox-scheme) and [redox_event](https://crates.io/crates/redox_event) libraries to create your drivers, you can also read the [example driver](https://gitlab.redox-os.org/redox-os/exampled) or read the code of other drivers with the same type of your device.
-
-Before testing your changes be aware of [this](https://doc.redox-os.org/book/coding-and-building.html#how-to-update-initfs).
-
-### References
-
-If you want to reverse enginner the existing drivers, you can access the BSD code using these links:
-
-- [FreeBSD drivers](https://github.com/freebsd/freebsd-src/tree/main/sys/dev)
-- [NetBSD drivers](https://github.com/NetBSD/src/tree/trunk/sys/dev)
-- [OpenBSD drivers](https://github.com/openbsd/src/tree/master/sys/dev)
-
-## How To Contribute
-
-To learn how to contribute to this system component you need to read the following document:
-
-- [CONTRIBUTING.md](https://gitlab.redox-os.org/redox-os/redox/-/blob/master/CONTRIBUTING.md)
-
-## Development
-
-To learn how to do development with this system component inside the Redox build system you need to read the [Build System](https://doc.redox-os.org/book/build-system-reference.html) and [Coding and Building](https://doc.redox-os.org/book/coding-and-building.html) pages.
-
-### How To Build
-
-To build this system component you need to download the Redox build system, you can learn how to do it on the [Building Redox](https://doc.redox-os.org/book/podman-build.html) page.
-
-This is necessary because they only work with cross-compilation to a Redox virtual machine or real hardware, but you can do some testing from Linux.
-
-[Back to top](#drivers)
diff --git a/recipes/core/base/drivers/acpi-resource/Cargo.toml b/recipes/core/base/drivers/acpi-resource/Cargo.toml
deleted file mode 100644
index f30c6d023c..0000000000
--- a/recipes/core/base/drivers/acpi-resource/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "acpi-resource"
-description = "Shared ACPI resource template decoder"
-version = "0.0.1"
-authors = ["Red Bear OS"]
-repository = "https://gitlab.redox-os.org/redox-os/drivers"
-categories = ["hardware-support"]
-license = "MIT/Apache-2.0"
-edition = "2021"
-
-[dependencies]
-serde.workspace = true
-thiserror.workspace = true
diff --git a/recipes/core/base/drivers/acpi-resource/src/lib.rs b/recipes/core/base/drivers/acpi-resource/src/lib.rs
deleted file mode 100644
index 57ae4b4b86..0000000000
--- a/recipes/core/base/drivers/acpi-resource/src/lib.rs
+++ /dev/null
@@ -1,688 +0,0 @@
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-const SMALL_IRQ: u8 = 0x20;
-const SMALL_END_TAG: u8 = 0x78;
-
-const LARGE_MEMORY32: u8 = 0x85;
-const LARGE_FIXED_MEMORY32: u8 = 0x86;
-const LARGE_ADDRESS32: u8 = 0x87;
-const LARGE_EXTENDED_IRQ: u8 = 0x89;
-const LARGE_ADDRESS64: u8 = 0x8A;
-const LARGE_GPIO: u8 = 0x8C;
-const LARGE_SERIAL_BUS: u8 = 0x8E;
-
-const SERIAL_BUS_I2C: u8 = 1;
-const I2C_TYPE_DATA_LEN: usize = 6;
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InterruptTrigger {
-    Edge,
-    Level,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InterruptPolarity {
-    ActiveHigh,
-    ActiveLow,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AddressResourceType {
-    MemoryRange,
-    IoRange,
-    BusNumberRange,
-    Unknown(u8),
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ResourceSource {
-    pub index: u8,
-    pub source: String,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct IrqDescriptor {
-    pub interrupts: Vec<u8>,
-    pub triggering: InterruptTrigger,
-    pub polarity: InterruptPolarity,
-    pub shareable: bool,
-    pub wake_capable: bool,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ExtendedIrqDescriptor {
-    pub producer_consumer: bool,
-    pub interrupts: Vec<u32>,
-    pub triggering: InterruptTrigger,
-    pub polarity: InterruptPolarity,
-    pub shareable: bool,
-    pub wake_capable: bool,
-    pub resource_source: Option<ResourceSource>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct GpioDescriptor {
-    pub revision_id: u8,
-    pub producer_consumer: bool,
-    pub pin_config: u8,
-    pub shareable: bool,
-    pub wake_capable: bool,
-    pub io_restriction: u8,
-    pub triggering: InterruptTrigger,
-    pub polarity: InterruptPolarity,
-    pub drive_strength: u16,
-    pub debounce_timeout: u16,
-    pub pins: Vec<u16>,
-    pub resource_source: Option<ResourceSource>,
-    pub vendor_data: Vec<u8>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct I2cSerialBusDescriptor {
-    pub revision_id: u8,
-    pub producer_consumer: bool,
-    pub slave_mode: bool,
-    pub connection_sharing: bool,
-    pub type_revision_id: u8,
-    pub access_mode_10bit: bool,
-    pub slave_address: u16,
-    pub connection_speed: u32,
-    pub resource_source: Option<ResourceSource>,
-    pub vendor_data: Vec<u8>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Memory32RangeDescriptor {
-    pub write_protect: bool,
-    pub minimum: u32,
-    pub maximum: u32,
-    pub alignment: u32,
-    pub address_length: u32,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct FixedMemory32Descriptor {
-    pub write_protect: bool,
-    pub address: u32,
-    pub address_length: u32,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Address32Descriptor {
-    pub resource_type: AddressResourceType,
-    pub producer_consumer: bool,
-    pub decode: bool,
-    pub min_address_fixed: bool,
-    pub max_address_fixed: bool,
-    pub specific_flags: u8,
-    pub granularity: u32,
-    pub minimum: u32,
-    pub maximum: u32,
-    pub translation_offset: u32,
-    pub address_length: u32,
-    pub resource_source: Option<ResourceSource>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Address64Descriptor {
-    pub resource_type: AddressResourceType,
-    pub producer_consumer: bool,
-    pub decode: bool,
-    pub min_address_fixed: bool,
-    pub max_address_fixed: bool,
-    pub specific_flags: u8,
-    pub granularity: u64,
-    pub minimum: u64,
-    pub maximum: u64,
-    pub translation_offset: u64,
-    pub address_length: u64,
-    pub resource_source: Option<ResourceSource>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ResourceDescriptor {
-    Irq(IrqDescriptor),
-    ExtendedIrq(ExtendedIrqDescriptor),
-    GpioInt(GpioDescriptor),
-    GpioIo(GpioDescriptor),
-    I2cSerialBus(I2cSerialBusDescriptor),
-    Memory32Range(Memory32RangeDescriptor),
-    FixedMemory32(FixedMemory32Descriptor),
-    Address32(Address32Descriptor),
-    Address64(Address64Descriptor),
-}
-
-#[derive(Debug, Error, PartialEq, Eq)]
-pub enum ResourceDecodeError {
-    #[error("descriptor at offset {offset} overruns the resource template")]
-    TruncatedDescriptor { offset: usize },
-
-    #[error("unsupported small descriptor length {length} for tag {tag:#04x} at offset {offset}")]
-    InvalidSmallLength {
-        offset: usize,
-        tag: u8,
-        length: usize,
-    },
-
-    #[error("descriptor {descriptor} at offset {offset} is shorter than {minimum} bytes")]
-    InvalidLargeLength {
-        offset: usize,
-        descriptor: &'static str,
-        minimum: usize,
-    },
-
-    #[error("descriptor {descriptor} at offset {offset} has an invalid internal offset")]
-    InvalidInternalOffset {
-        offset: usize,
-        descriptor: &'static str,
-    },
-}
-
-pub fn decode_resource_template(
-    bytes: &[u8],
-) -> Result<Vec<ResourceDescriptor>, ResourceDecodeError> {
-    let mut resources = Vec::new();
-    let mut offset = 0usize;
-
-    while offset < bytes.len() {
-        let descriptor = *bytes
-            .get(offset)
-            .ok_or(ResourceDecodeError::TruncatedDescriptor { offset })?;
-
-        if descriptor & 0x80 == 0 {
-            let length = usize::from(descriptor & 0x07);
-            let end = offset + 1 + length;
-            let desc = bytes
-                .get(offset..end)
-                .ok_or(ResourceDecodeError::TruncatedDescriptor { offset })?;
-            let body = &desc[1..];
-
-            match descriptor & 0x78 {
-                SMALL_IRQ => resources.push(ResourceDescriptor::Irq(parse_irq(body, offset)?)),
-                SMALL_END_TAG => break,
-                _ => {}
-            }
-
-            offset = end;
-            continue;
-        }
-
-        let length = usize::from(read_u16(bytes, offset + 1)?);
-        let end = offset + 3 + length;
-        let desc = bytes
-            .get(offset..end)
-            .ok_or(ResourceDecodeError::TruncatedDescriptor { offset })?;
-        let body = &desc[3..];
-
-        match descriptor {
-            LARGE_MEMORY32 => resources.push(ResourceDescriptor::Memory32Range(parse_memory32(
-                body, offset,
-            )?)),
-            LARGE_FIXED_MEMORY32 => resources.push(ResourceDescriptor::FixedMemory32(
-                parse_fixed_memory32(body, offset)?,
-            )),
-            LARGE_ADDRESS32 => {
-                resources.push(ResourceDescriptor::Address32(parse_address32(
-                    desc, body, offset,
-                )?));
-            }
-            LARGE_ADDRESS64 => {
-                resources.push(ResourceDescriptor::Address64(parse_address64(
-                    desc, body, offset,
-                )?));
-            }
-            LARGE_EXTENDED_IRQ => resources.push(ResourceDescriptor::ExtendedIrq(
-                parse_extended_irq(desc, body, offset)?,
-            )),
-            LARGE_GPIO => {
-                let (is_interrupt, descriptor) = parse_gpio(desc, body, offset)?;
-                resources.push(if is_interrupt {
-                    ResourceDescriptor::GpioInt(descriptor)
-                } else {
-                    ResourceDescriptor::GpioIo(descriptor)
-                });
-            }
-            LARGE_SERIAL_BUS => {
-                if let Some(descriptor) = parse_i2c_serial_bus(desc, body, offset)? {
-                    resources.push(ResourceDescriptor::I2cSerialBus(descriptor));
-                }
-            }
-            _ => {}
-        }
-
-        offset = end;
-    }
-
-    Ok(resources)
-}
-
-fn parse_irq(body: &[u8], offset: usize) -> Result<IrqDescriptor, ResourceDecodeError> {
-    if body.len() != 2 && body.len() != 3 {
-        return Err(ResourceDecodeError::InvalidSmallLength {
-            offset,
-            tag: SMALL_IRQ,
-            length: body.len(),
-        });
-    }
-
-    let mask = u16::from_le_bytes([body[0], body[1]]);
-    let flags = body.get(2).copied().unwrap_or(0);
-    let interrupts = (0..16)
-        .filter(|irq| mask & (1 << irq) != 0)
-        .map(|irq| irq as u8)
-        .collect();
-
-    Ok(IrqDescriptor {
-        interrupts,
-        triggering: if flags & 0x01 != 0 {
-            InterruptTrigger::Level
-        } else {
-            InterruptTrigger::Edge
-        },
-        polarity: if flags & 0x08 != 0 {
-            InterruptPolarity::ActiveLow
-        } else {
-            InterruptPolarity::ActiveHigh
-        },
-        shareable: flags & 0x10 != 0,
-        wake_capable: flags & 0x20 != 0,
-    })
-}
-
-fn parse_extended_irq(
-    desc: &[u8],
-    body: &[u8],
-    offset: usize,
-) -> Result<ExtendedIrqDescriptor, ResourceDecodeError> {
-    ensure_length(body, 2, offset, "ExtendedIrq")?;
-
-    let flags = body[0];
-    let count = usize::from(body[1]);
-    let ints_len = count * 4;
-    ensure_length(body, 2 + ints_len, offset, "ExtendedIrq")?;
-
-    let interrupts = (0..count)
-        .map(|index| read_u32(body, 2 + index * 4))
-        .collect::<Result<Vec<_>, _>>()?;
-    let resource_source = if body.len() > 2 + ints_len {
-        Some(parse_source_inline(&body[2 + ints_len..]))
-    } else {
-        None
-    };
-
-    let _ = desc;
-
-    Ok(ExtendedIrqDescriptor {
-        producer_consumer: flags & 0x01 != 0,
-        triggering: if flags & 0x02 != 0 {
-            InterruptTrigger::Level
-        } else {
-            InterruptTrigger::Edge
-        },
-        polarity: if flags & 0x04 != 0 {
-            InterruptPolarity::ActiveLow
-        } else {
-            InterruptPolarity::ActiveHigh
-        },
-        shareable: flags & 0x08 != 0,
-        wake_capable: flags & 0x10 != 0,
-        interrupts,
-        resource_source,
-    })
-}
-
-fn parse_gpio(
-    desc: &[u8],
-    body: &[u8],
-    offset: usize,
-) -> Result<(bool, GpioDescriptor), ResourceDecodeError> {
-    ensure_length(body, 20, offset, "Gpio")?;
-
-    let connection_type = body[1];
-    let flags = read_u16(body, 2)?;
-    let int_flags = read_u16(body, 4)?;
-    let pin_table_offset = usize::from(read_u16(body, 11)?);
-    let resource_source_index = body[13];
-    let resource_source_offset = usize::from(read_u16(body, 14)?);
-    let vendor_offset = usize::from(read_u16(body, 16)?);
-    let vendor_length = usize::from(read_u16(body, 18)?);
-
-    let pins_end = min_nonzero([resource_source_offset, vendor_offset, desc.len()]);
-    let pins = parse_u16_list(desc, pin_table_offset, pins_end, offset, "Gpio")?;
-    let resource_source = parse_source_absolute(
-        desc,
-        resource_source_offset,
-        min_nonzero([vendor_offset, desc.len()]),
-        resource_source_index,
-        offset,
-        "Gpio",
-    )?;
-    let vendor_data = parse_blob_absolute(desc, vendor_offset, vendor_length, offset, "Gpio")?;
-
-    Ok((
-        connection_type == 0,
-        GpioDescriptor {
-            revision_id: body[0],
-            producer_consumer: flags & 0x0001 != 0,
-            pin_config: body[6],
-            shareable: int_flags & 0x0008 != 0,
-            wake_capable: int_flags & 0x0010 != 0,
-            io_restriction: (int_flags & 0x0003) as u8,
-            triggering: if int_flags & 0x0001 != 0 {
-                InterruptTrigger::Level
-            } else {
-                InterruptTrigger::Edge
-            },
-            polarity: if int_flags & 0x0002 != 0 {
-                InterruptPolarity::ActiveLow
-            } else {
-                InterruptPolarity::ActiveHigh
-            },
-            drive_strength: read_u16(body, 7)?,
-            debounce_timeout: read_u16(body, 9)?,
-            pins,
-            resource_source,
-            vendor_data,
-        },
-    ))
-}
-
-fn parse_i2c_serial_bus(
-    desc: &[u8],
-    body: &[u8],
-    offset: usize,
-) -> Result<Option<I2cSerialBusDescriptor>, ResourceDecodeError> {
-    ensure_length(body, 15, offset, "SerialBus")?;
-    if body[2] != SERIAL_BUS_I2C {
-        return Ok(None);
-    }
-
-    let type_data_length = usize::from(read_u16(body, 7)?);
-    if type_data_length < I2C_TYPE_DATA_LEN {
-        return Err(ResourceDecodeError::InvalidLargeLength {
-            offset,
-            descriptor: "I2cSerialBus",
-            minimum: 15,
-        });
-    }
-
-    let vendor_length = type_data_length - I2C_TYPE_DATA_LEN;
-    let vendor_data = parse_blob_absolute(desc, 18, vendor_length, offset, "I2cSerialBus")?;
-    let resource_source = parse_source_absolute(
-        desc,
-        12 + type_data_length,
-        desc.len(),
-        body[1],
-        offset,
-        "I2cSerialBus",
-    )?;
-
-    Ok(Some(I2cSerialBusDescriptor {
-        revision_id: body[0],
-        producer_consumer: body[3] & 0x02 != 0,
-        slave_mode: body[3] & 0x01 != 0,
-        connection_sharing: body[3] & 0x04 != 0,
-        type_revision_id: body[6],
-        access_mode_10bit: read_u16(body, 4)? & 0x0001 != 0,
-        connection_speed: read_u32(body, 9)?,
-        slave_address: read_u16(body, 13)?,
-        resource_source,
-        vendor_data,
-    }))
-}
-
-fn parse_memory32(
-    body: &[u8],
-    offset: usize,
-) -> Result<Memory32RangeDescriptor, ResourceDecodeError> {
-    ensure_length(body, 17, offset, "Memory32Range")?;
-    Ok(Memory32RangeDescriptor {
-        write_protect: body[0] & 0x01 != 0,
-        minimum: read_u32(body, 1)?,
-        maximum: read_u32(body, 5)?,
-        alignment: read_u32(body, 9)?,
-        address_length: read_u32(body, 13)?,
-    })
-}
-
-fn parse_fixed_memory32(
-    body: &[u8],
-    offset: usize,
-) -> Result<FixedMemory32Descriptor, ResourceDecodeError> {
-    ensure_length(body, 9, offset, "FixedMemory32")?;
-    Ok(FixedMemory32Descriptor {
-        write_protect: body[0] & 0x01 != 0,
-        address: read_u32(body, 1)?,
-        address_length: read_u32(body, 5)?,
-    })
-}
-
-fn parse_address32(
-    desc: &[u8],
-    body: &[u8],
-    offset: usize,
-) -> Result<Address32Descriptor, ResourceDecodeError> {
-    ensure_length(body, 23, offset, "Address32")?;
-    Ok(Address32Descriptor {
-        resource_type: parse_address_type(body[0]),
-        producer_consumer: body[1] & 0x01 != 0,
-        decode: body[1] & 0x02 != 0,
-        min_address_fixed: body[1] & 0x04 != 0,
-        max_address_fixed: body[1] & 0x08 != 0,
-        specific_flags: body[2],
-        granularity: read_u32(body, 3)?,
-        minimum: read_u32(body, 7)?,
-        maximum: read_u32(body, 11)?,
-        translation_offset: read_u32(body, 15)?,
-        address_length: read_u32(body, 19)?,
-        resource_source: if desc.len() > 26 {
-            parse_source_absolute(desc, 26, desc.len(), desc[26], offset, "Address32")?
-        } else {
-            None
-        },
-    })
-}
-
-fn parse_address64(
-    desc: &[u8],
-    body: &[u8],
-    offset: usize,
-) -> Result<Address64Descriptor, ResourceDecodeError> {
-    ensure_length(body, 43, offset, "Address64")?;
-    Ok(Address64Descriptor {
-        resource_type: parse_address_type(body[0]),
-        producer_consumer: body[1] & 0x01 != 0,
-        decode: body[1] & 0x02 != 0,
-        min_address_fixed: body[1] & 0x04 != 0,
-        max_address_fixed: body[1] & 0x08 != 0,
-        specific_flags: body[2],
-        granularity: read_u64(body, 3)?,
-        minimum: read_u64(body, 11)?,
-        maximum: read_u64(body, 19)?,
-        translation_offset: read_u64(body, 27)?,
-        address_length: read_u64(body, 35)?,
-        resource_source: if desc.len() > 46 {
-            parse_source_absolute(desc, 46, desc.len(), desc[46], offset, "Address64")?
-        } else {
-            None
-        },
-    })
-}
-
-fn ensure_length(
-    body: &[u8],
-    minimum: usize,
-    offset: usize,
-    descriptor: &'static str,
-) -> Result<(), ResourceDecodeError> {
-    if body.len() < minimum {
-        return Err(ResourceDecodeError::InvalidLargeLength {
-            offset,
-            descriptor,
-            minimum,
-        });
-    }
-    Ok(())
-}
-
-fn parse_source_inline(bytes: &[u8]) -> ResourceSource {
-    let index = bytes.first().copied().unwrap_or(0);
-    let source = bytes.get(1..).map(parse_nul_string).unwrap_or_default();
-    ResourceSource { index, source }
-}
-
-fn parse_source_absolute(
-    desc: &[u8],
-    start: usize,
-    end: usize,
-    index: u8,
-    offset: usize,
-    descriptor: &'static str,
-) -> Result<Option<ResourceSource>, ResourceDecodeError> {
-    if start == 0 || start >= end || start > desc.len() {
-        return Ok(None);
-    }
-    let slice = desc
-        .get(start..end)
-        .ok_or(ResourceDecodeError::InvalidInternalOffset { offset, descriptor })?;
-    Ok(Some(ResourceSource {
-        index,
-        source: parse_nul_string(slice),
-    }))
-}
-
-fn parse_blob_absolute(
-    desc: &[u8],
-    start: usize,
-    length: usize,
-    offset: usize,
-    descriptor: &'static str,
-) -> Result<Vec<u8>, ResourceDecodeError> {
-    if start == 0 || length == 0 {
-        return Ok(Vec::new());
-    }
-    let end = start + length;
-    Ok(desc
-        .get(start..end)
-        .ok_or(ResourceDecodeError::InvalidInternalOffset { offset, descriptor })?
-        .to_vec())
-}
-
-fn parse_u16_list(
-    desc: &[u8],
-    start: usize,
-    end: usize,
-    offset: usize,
-    descriptor: &'static str,
-) -> Result<Vec<u16>, ResourceDecodeError> {
-    if start == 0 || start >= end || start > desc.len() {
-        return Ok(Vec::new());
-    }
-    let slice = desc
-        .get(start..end)
-        .ok_or(ResourceDecodeError::InvalidInternalOffset { offset, descriptor })?;
-    if slice.len() % 2 != 0 {
-        return Err(ResourceDecodeError::InvalidInternalOffset { offset, descriptor });
-    }
-    slice
-        .chunks_exact(2)
-        .map(|chunk| Ok(u16::from_le_bytes([chunk[0], chunk[1]])))
-        .collect()
-}
-
-fn parse_nul_string(bytes: &[u8]) -> String {
-    let end = bytes
-        .iter()
-        .position(|byte| *byte == 0)
-        .unwrap_or(bytes.len());
-    String::from_utf8_lossy(&bytes[..end]).to_string()
-}
-
-fn parse_address_type(value: u8) -> AddressResourceType {
-    match value {
-        0 => AddressResourceType::MemoryRange,
-        1 => AddressResourceType::IoRange,
-        2 => AddressResourceType::BusNumberRange,
-        other => AddressResourceType::Unknown(other),
-    }
-}
-
-fn read_u16(bytes: &[u8], offset: usize) -> Result<u16, ResourceDecodeError> {
-    let slice = bytes
-        .get(offset..offset + 2)
-        .ok_or(ResourceDecodeError::TruncatedDescriptor { offset })?;
-    Ok(u16::from_le_bytes([slice[0], slice[1]]))
-}
-
-fn read_u32(bytes: &[u8], offset: usize) -> Result<u32, ResourceDecodeError> {
-    let slice = bytes
-        .get(offset..offset + 4)
-        .ok_or(ResourceDecodeError::TruncatedDescriptor { offset })?;
-    Ok(u32::from_le_bytes([slice[0], slice[1], slice[2], slice[3]]))
-}
-
-fn read_u64(bytes: &[u8], offset: usize) -> Result<u64, ResourceDecodeError> {
-    let slice = bytes
-        .get(offset..offset + 8)
-        .ok_or(ResourceDecodeError::TruncatedDescriptor { offset })?;
-    Ok(u64::from_le_bytes([
-        slice[0], slice[1], slice[2], slice[3], slice[4], slice[5], slice[6], slice[7],
-    ]))
-}
-
-fn min_nonzero<const N: usize>(values: [usize; N]) -> usize {
-    values
-        .into_iter()
-        .filter(|value| *value != 0)
-        .min()
-        .unwrap_or(0)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{decode_resource_template, ResourceDescriptor};
-
-    #[test]
-    fn decodes_small_irq_descriptor() {
-        let resources = decode_resource_template(&[0x23, 0x0A, 0x00, 0x19, 0x79, 0x00]).unwrap();
-
-        assert!(matches!(
-            &resources[0],
-            ResourceDescriptor::Irq(descriptor)
-                if descriptor.interrupts == vec![1, 3]
-                    && descriptor.shareable
-                    && descriptor.wake_capable == false
-        ));
-    }
-
-    #[test]
-    fn decodes_i2c_serial_bus_descriptor() {
-        let template = [
-            0x8E, 0x14, 0x00, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x06, 0x00, 0x80, 0x1A,
-            0x06, 0x00, 0x15, 0x00, b'I', b'2', b'C', b'0', 0x00, 0x79, 0x00,
-        ];
-        let resources = decode_resource_template(&template).unwrap();
-
-        assert!(matches!(
-            &resources[0],
-            ResourceDescriptor::I2cSerialBus(descriptor)
-                if descriptor.connection_speed == 400_000
-                    && descriptor.slave_address == 0x15
-                    && descriptor.resource_source.as_ref().map(|source| source.source.as_str())
-                        == Some("I2C0")
-        ));
-    }
-
-    #[test]
-    fn decodes_gpio_interrupt_descriptor() {
-        let template = [
-            0x8C, 0x1B, 0x00, 0x01, 0x00, 0x01, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17,
-            0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x12, b'\\', b'_', b'S', b'B',
-            0x00, 0x79, 0x00,
-        ];
-        let resources = decode_resource_template(&template).unwrap();
-
-        assert!(matches!(&resources[0], ResourceDescriptor::GpioInt(_)));
-    }
-}
diff --git a/recipes/core/base/drivers/acpid/Cargo.toml b/recipes/core/base/drivers/acpid/Cargo.toml
deleted file mode 100644
index 737fe34c68..0000000000
--- a/recipes/core/base/drivers/acpid/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[package]
-name = "acpid"
-description = "ACPI daemon"
-version = "0.1.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-acpi.workspace = true
-arrayvec = "0.7.6"
-log.workspace = true
-num-derive = "0.3"
-num-traits = "0.2"
-parking_lot.workspace = true
-plain.workspace = true
-redox_syscall.workspace = true
-redox_event.workspace = true
-rustc-hash = "1.1.0"
-thiserror.workspace = true
-ron.workspace = true
-serde.workspace = true
-
-amlserde = { path = "../amlserde" }
-common = { path = "../common" }
-daemon = { path = "../../daemon" }
-libredox.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/acpid/src/acpi.rs b/recipes/core/base/drivers/acpid/src/acpi.rs
deleted file mode 100644
index 3521bfc7b3..0000000000
--- a/recipes/core/base/drivers/acpid/src/acpi.rs
+++ /dev/null
@@ -1,874 +0,0 @@
-use acpi::aml::object::{Object, WrappedObject};
-use acpi::aml::op_region::{RegionHandler, RegionSpace};
-use rustc_hash::FxHashMap;
-use std::convert::{TryFrom, TryInto};
-use std::error::Error;
-use std::ops::Deref;
-use std::str::FromStr;
-use std::sync::{Arc, Mutex};
-use std::{fmt, mem};
-use syscall::PAGE_SIZE;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-use common::io::{Io, Pio};
-
-use parking_lot::{RwLock, RwLockReadGuard, RwLockWriteGuard};
-use thiserror::Error;
-
-use acpi::{
-    aml::{namespace::AmlName, AmlError, Interpreter},
-    platform::AcpiPlatform,
-    AcpiTables,
-};
-use amlserde::aml_serde_name::aml_to_symbol;
-use amlserde::{AmlSerde, AmlSerdeValue};
-
-#[cfg(target_arch = "x86_64")]
-pub mod dmar;
-use crate::aml_physmem::{AmlPageCache, AmlPhysMemHandler};
-
-/// The raw SDT header struct, as defined by the ACPI specification.
-#[derive(Copy, Clone, Debug)]
-#[repr(C, packed)]
-pub struct SdtHeader {
-    pub signature: [u8; 4],
-    pub length: u32,
-    pub revision: u8,
-    pub checksum: u8,
-    pub oem_id: [u8; 6],
-    pub oem_table_id: [u8; 8],
-    pub oem_revision: u32,
-    pub creator_id: u32,
-    pub creator_revision: u32,
-}
-unsafe impl plain::Plain for SdtHeader {}
-
-impl SdtHeader {
-    pub fn signature(&self) -> SdtSignature {
-        SdtSignature {
-            signature: self.signature,
-            oem_id: self.oem_id,
-            oem_table_id: self.oem_table_id,
-        }
-    }
-    pub fn length(&self) -> usize {
-        self.length
-            .try_into()
-            .expect("expected usize to be at least 32 bits")
-    }
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct SdtSignature {
-    pub signature: [u8; 4],
-    pub oem_id: [u8; 6],
-    pub oem_table_id: [u8; 8],
-}
-
-impl fmt::Display for SdtSignature {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}-{}-{}",
-            String::from_utf8_lossy(&self.signature),
-            String::from_utf8_lossy(&self.oem_id),
-            String::from_utf8_lossy(&self.oem_table_id)
-        )
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum TablePhysLoadError {
-    // TODO: Make syscall::Error implement std::error::Error, when enabling a Cargo feature.
-    #[error("i/o error: {0}")]
-    Io(#[from] std::io::Error),
-
-    #[error("invalid SDT: {0}")]
-    Validity(#[from] InvalidSdtError),
-}
-#[derive(Debug, Error)]
-pub enum InvalidSdtError {
-    #[error("invalid size")]
-    InvalidSize,
-
-    #[error("invalid checksum")]
-    BadChecksum,
-}
-
-struct PhysmapGuard {
-    virt: *const u8,
-    size: usize,
-}
-impl PhysmapGuard {
-    fn map(page: usize, page_count: usize) -> std::io::Result<Self> {
-        let size = page_count * PAGE_SIZE;
-        let virt = unsafe {
-            common::physmap(page, size, common::Prot::RO, common::MemoryType::default())
-                .map_err(|error| std::io::Error::from_raw_os_error(error.errno()))?
-        };
-
-        Ok(Self {
-            virt: virt as *const u8,
-            size,
-        })
-    }
-}
-impl Deref for PhysmapGuard {
-    type Target = [u8];
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { std::slice::from_raw_parts(self.virt as *const u8, self.size) }
-    }
-}
-impl Drop for PhysmapGuard {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libredox::call::munmap(self.virt as *mut (), self.size);
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct Sdt(Arc<[u8]>);
-
-impl Sdt {
-    pub fn new(slice: Arc<[u8]>) -> Result<Self, InvalidSdtError> {
-        let header = match plain::from_bytes::<SdtHeader>(&slice) {
-            Ok(header) => header,
-            Err(plain::Error::TooShort) => return Err(InvalidSdtError::InvalidSize),
-            Err(plain::Error::BadAlignment) => {
-                log::error!("acpid: plain::from_bytes failed due to alignment, but SdtHeader is #[repr(packed)] - internal inconsistency");
-                return Err(InvalidSdtError::InvalidSize);
-            }
-        };
-
-        if header.length() != slice.len() {
-            return Err(InvalidSdtError::InvalidSize);
-        }
-
-        let checksum = slice
-            .iter()
-            .copied()
-            .fold(0_u8, |current_sum, item| current_sum.wrapping_add(item));
-
-        if checksum != 0 {
-            return Err(InvalidSdtError::BadChecksum);
-        }
-
-        Ok(Self(slice))
-    }
-    pub fn load_from_physical(physaddr: usize) -> Result<Self, TablePhysLoadError> {
-        let physaddr_start_page = physaddr / PAGE_SIZE * PAGE_SIZE;
-        let physaddr_page_offset = physaddr % PAGE_SIZE;
-
-        // Begin by reading and validating the header first. The SDT header is always 36 bytes
-        // long, and can thus span either one or two page table frames.
-        let needs_extra_page = (PAGE_SIZE - physaddr_page_offset)
-            .checked_sub(mem::size_of::<SdtHeader>())
-            .is_none();
-        let page_table_count = 1 + if needs_extra_page { 1 } else { 0 };
-
-        let pages = PhysmapGuard::map(physaddr_start_page, page_table_count)?;
-        assert!(pages.len() >= mem::size_of::<SdtHeader>());
-        let sdt_mem = &pages[physaddr_page_offset..];
-
-        let sdt = plain::from_bytes::<SdtHeader>(&sdt_mem[..mem::size_of::<SdtHeader>()])
-            .expect("either alignment is wrong, or the length is too short, both of which are already checked for");
-
-        let total_length = sdt.length();
-        let base_length = std::cmp::min(total_length, sdt_mem.len());
-        let extended_length = total_length - base_length;
-
-        let mut loaded = sdt_mem[..base_length].to_owned();
-        loaded.reserve(extended_length);
-
-        const SIMULTANEOUS_PAGE_COUNT: usize = 4;
-
-        let mut left = extended_length;
-        let mut offset = physaddr_start_page + page_table_count * PAGE_SIZE;
-
-        let length_per_iteration = PAGE_SIZE * SIMULTANEOUS_PAGE_COUNT;
-
-        while left > 0 {
-            let to_copy = std::cmp::min(left, length_per_iteration);
-            let additional_pages = PhysmapGuard::map(offset, to_copy.div_ceil(PAGE_SIZE))?;
-
-            loaded.extend(&additional_pages[..to_copy]);
-
-            left -= to_copy;
-            offset += to_copy;
-        }
-        assert_eq!(left, 0);
-
-        Self::new(loaded.into()).map_err(Into::into)
-    }
-    pub fn as_slice(&self) -> &[u8] {
-        &self.0
-    }
-}
-
-impl Deref for Sdt {
-    type Target = SdtHeader;
-
-    fn deref(&self) -> &Self::Target {
-        plain::from_bytes::<SdtHeader>(&self.0)
-            .expect("expected already validated Sdt to be able to get its header")
-    }
-}
-
-impl Sdt {
-    pub fn data(&self) -> &[u8] {
-        &self.0[mem::size_of::<SdtHeader>()..]
-    }
-}
-
-impl fmt::Debug for Sdt {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Sdt")
-            .field("header", &*self as &SdtHeader)
-            .field("extra_len", &self.data().len())
-            .finish()
-    }
-}
-
-pub struct Dsdt(Sdt);
-pub struct Ssdt(Sdt);
-
-// Current AML implementation builds the aml_context.namespace at startup,
-// but the cache for symbols is lazy-loaded when someone
-// reads from the acpi:/symbols scheme.
-// If you dynamically add an SDT, you can add to the namespace, but you
-// must empty the cache so it is rebuilt.
-// If you modify an SDT, you must discard the aml_context and rebuild it.
-pub struct AmlSymbols {
-    aml_context: Option<Interpreter<AmlPhysMemHandler>>,
-    // k = name, v = description
-    symbol_cache: FxHashMap<String, String>,
-    page_cache: Arc<Mutex<AmlPageCache>>,
-    aml_region_handlers: Vec<(RegionSpace, Box<dyn RegionHandler>)>,
-}
-
-impl AmlSymbols {
-    pub fn new(aml_region_handlers: Vec<(RegionSpace, Box<dyn RegionHandler>)>) -> Self {
-        Self {
-            aml_context: None,
-            symbol_cache: FxHashMap::default(),
-            page_cache: Arc::new(Mutex::new(AmlPageCache::default())),
-            aml_region_handlers,
-        }
-    }
-
-    pub fn init(&mut self, pci_fd: Option<&libredox::Fd>) -> Result<(), Box<dyn Error>> {
-        if self.aml_context.is_some() {
-            return Err("AML interpreter already initialized".into());
-        }
-        let format_err = |err| format!("{:?}", err);
-        let handler = AmlPhysMemHandler::new(pci_fd, Arc::clone(&self.page_cache));
-        //TODO: use these parsed tables for the rest of acpid
-        let rsdp_address = usize::from_str_radix(&std::env::var("RSDP_ADDR")?, 16)?;
-        let tables =
-            unsafe { AcpiTables::from_rsdp(handler.clone(), rsdp_address).map_err(format_err)? };
-        let platform = AcpiPlatform::new(tables, handler).map_err(format_err)?;
-        let interpreter = Interpreter::new_from_platform(&platform).map_err(format_err)?;
-        for (region, handler) in self.aml_region_handlers.drain(..) {
-            interpreter.install_region_handler(region, handler);
-        }
-        self.aml_context = Some(interpreter);
-        Ok(())
-    }
-
-    pub fn aml_context_mut(
-        &mut self,
-        pci_fd: Option<&libredox::Fd>,
-    ) -> Result<&mut Interpreter<AmlPhysMemHandler>, AmlEvalError> {
-        if self.aml_context.is_none() {
-            match self.init(pci_fd) {
-                Ok(()) => (),
-                Err(err) => {
-                    log::error!("failed to initialize AML context: {}", err);
-                }
-            }
-        }
-        self.aml_context
-            .as_mut()
-            .ok_or(AmlEvalError::NotInitialized)
-    }
-
-    pub fn symbols_cache(&self) -> &FxHashMap<String, String> {
-        &self.symbol_cache
-    }
-
-    pub fn lookup(&self, symbol: &str) -> Option<String> {
-        if let Some(description) = self.symbol_cache.get(symbol) {
-            log::trace!("Found symbol in cache, {}, {}", symbol, description);
-            return Some(description.to_owned());
-        }
-        None
-    }
-
-    pub fn build_cache(&mut self, pci_fd: Option<&libredox::Fd>) {
-        let Ok(aml_context) = self.aml_context_mut(pci_fd) else {
-            return;
-        };
-
-        let mut symbol_list: Vec<(AmlName, String)> = Vec::with_capacity(5000);
-
-        if aml_context
-            .namespace
-            .lock()
-            .traverse(|level_aml_name, level| {
-                for (child_seg, handle) in level.values.iter() {
-                    if let Ok(aml_name) =
-                        AmlName::from_name_seg(child_seg.to_owned()).resolve(level_aml_name)
-                    {
-                        let name = aml_to_symbol(&aml_name);
-                        symbol_list.push((aml_name, name));
-                    } else {
-                        log::error!(
-                            "AmlName resolve failed, {:?}:{:?}",
-                            level_aml_name,
-                            child_seg
-                        );
-                    }
-                }
-                Ok(true)
-            })
-            .is_err()
-        {
-            log::error!("Namespace traverse failed");
-            return;
-        }
-
-        let mut symbol_cache: FxHashMap<String, String> = FxHashMap::default();
-
-        for (aml_name, name) in &symbol_list {
-            // create an empty entry, in case something goes wrong with serialization
-            symbol_cache.insert(name.to_owned(), "".to_owned());
-            if let Some(ser_value) = AmlSerde::from_aml(aml_context, aml_name) {
-                if let Ok(ser_string) = ron::ser::to_string_pretty(&ser_value, Default::default()) {
-                    // replace the empty entry
-                    symbol_cache.insert(name.to_owned(), ser_string);
-                }
-            }
-        }
-
-        // Cache the new list
-        log::trace!("Updating symbols list");
-
-        self.symbol_cache = symbol_cache;
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum AmlEvalError {
-    #[error("AML error")]
-    AmlError(AmlError),
-    #[error("Failed to serialize argument")]
-    SerializationError,
-    #[error("Failed to deserialize")]
-    DeserializationError,
-    #[error("AML not initialized")]
-    NotInitialized,
-}
-impl From<AmlError> for AmlEvalError {
-    fn from(value: AmlError) -> Self {
-        AmlEvalError::AmlError(value)
-    }
-}
-
-pub struct AcpiContext {
-    tables: Vec<Sdt>,
-    dsdt: Option<Dsdt>,
-    fadt: Option<Fadt>,
-
-    aml_symbols: RwLock<AmlSymbols>,
-
-    // TODO: The kernel ACPI code seemed to use load_table quite ubiquitously, however ACPI 5.1
-    // states that DDBHandles can only be obtained when loading XSDT-pointed tables. So, we'll
-    // generate an index only for those.
-    sdt_order: RwLock<Vec<Option<SdtSignature>>>,
-
-    pub next_ctx: RwLock<u64>,
-}
-
-impl AcpiContext {
-    pub fn aml_eval(
-        &self,
-        symbol: AmlName,
-        args: Vec<AmlSerdeValue>,
-    ) -> Result<AmlSerdeValue, AmlEvalError> {
-        let mut symbols = self.aml_symbols.write();
-        let interpreter = symbols.aml_context_mut(None)?;
-        interpreter.acquire_global_lock(16)?;
-
-        let args = args
-            .into_iter()
-            .map(|aml_serde_value| {
-                aml_serde_value
-                    .to_aml_object()
-                    .map(Object::wrap)
-                    .ok_or(AmlEvalError::DeserializationError)
-            })
-            .collect::<Result<Vec<WrappedObject>, AmlEvalError>>()?;
-
-        let result = interpreter.evaluate(symbol, args);
-        interpreter
-            .release_global_lock()
-            .expect("Failed to release GIL!"); //TODO: check if this should panic
-
-        result
-            .map_err(AmlEvalError::from)
-            .map(|object| {
-                AmlSerdeValue::from_aml_value(object.deref())
-                    .ok_or(AmlEvalError::SerializationError)
-            })
-            .flatten()
-    }
-
-    pub fn init(
-        rxsdt_physaddrs: impl Iterator<Item = u64>,
-        ec: Vec<(RegionSpace, Box<dyn RegionHandler>)>,
-    ) -> Self {
-        let tables = rxsdt_physaddrs
-            .map(|physaddr| {
-                let physaddr: usize = physaddr
-                    .try_into()
-                    .expect("expected ACPI addresses to be compatible with the current word size");
-
-                log::trace!("TABLE AT {:#>08X}", physaddr);
-
-                Sdt::load_from_physical(physaddr).expect("failed to load physical SDT")
-            })
-            .collect::<Vec<Sdt>>();
-
-        let mut this = Self {
-            tables,
-            dsdt: None,
-            fadt: None,
-
-            // Temporary values
-            aml_symbols: RwLock::new(AmlSymbols::new(ec)),
-
-            next_ctx: RwLock::new(0),
-
-            sdt_order: RwLock::new(Vec::new()),
-        };
-
-        for table in &this.tables {
-            this.new_index(&table.signature());
-        }
-
-        Fadt::init(&mut this);
-        //TODO (hangs on real hardware): Dmar::init(&this);
-
-        this
-    }
-
-    pub fn dsdt(&self) -> Option<&Dsdt> {
-        self.dsdt.as_ref()
-    }
-    pub fn ssdts(&self) -> impl Iterator<Item = Ssdt> + '_ {
-        self.find_multiple_sdts(*b"SSDT")
-            .map(|sdt| Ssdt(sdt.clone()))
-    }
-    fn find_single_sdt_pos(&self, signature: [u8; 4]) -> Option<usize> {
-        let count = self
-            .tables
-            .iter()
-            .filter(|sdt| sdt.signature == signature)
-            .count();
-
-        if count > 1 {
-            log::warn!(
-                "Expected only a single SDT of signature `{}` ({:?}), but there were {}",
-                String::from_utf8_lossy(&signature),
-                signature,
-                count
-            );
-        }
-
-        self.tables
-            .iter()
-            .position(|sdt| sdt.signature == signature)
-    }
-    pub fn find_multiple_sdts<'a>(&'a self, signature: [u8; 4]) -> impl Iterator<Item = &'a Sdt> {
-        self.tables
-            .iter()
-            .filter(move |sdt| sdt.signature == signature)
-    }
-    pub fn take_single_sdt(&self, signature: [u8; 4]) -> Option<Sdt> {
-        self.find_single_sdt_pos(signature)
-            .map(|pos| self.tables[pos].clone())
-    }
-    pub fn fadt(&self) -> Option<&Fadt> {
-        self.fadt.as_ref()
-    }
-    pub fn sdt_from_signature(&self, signature: &SdtSignature) -> Option<&Sdt> {
-        self.tables.iter().find(|sdt| {
-            sdt.signature == signature.signature
-                && sdt.oem_id == signature.oem_id
-                && sdt.oem_table_id == signature.oem_table_id
-        })
-    }
-    pub fn get_signature_from_index(&self, index: usize) -> Option<SdtSignature> {
-        self.sdt_order.read().get(index).copied().flatten()
-    }
-    pub fn get_index_from_signature(&self, signature: &SdtSignature) -> Option<usize> {
-        self.sdt_order
-            .read()
-            .iter()
-            .rposition(|sig| sig.map_or(false, |sig| &sig == signature))
-    }
-    pub fn tables(&self) -> &[Sdt] {
-        &self.tables
-    }
-    pub fn new_index(&self, signature: &SdtSignature) {
-        self.sdt_order.write().push(Some(*signature));
-    }
-
-    pub fn aml_lookup(&self, symbol: &str) -> Option<String> {
-        if let Ok(aml_symbols) = self.aml_symbols(None) {
-            aml_symbols.lookup(symbol)
-        } else {
-            None
-        }
-    }
-
-    pub fn aml_symbols(
-        &self,
-        pci_fd: Option<&libredox::Fd>,
-    ) -> Result<RwLockReadGuard<'_, AmlSymbols>, AmlError> {
-        // return the cached value if it exists
-        let symbols = self.aml_symbols.read();
-        if !symbols.symbols_cache().is_empty() {
-            return Ok(symbols);
-        }
-        // free the read lock
-        drop(symbols);
-
-        // List has not been initialized, we have to build it
-        log::trace!("Creating symbols list");
-
-        let mut aml_symbols = self.aml_symbols.write();
-
-        aml_symbols.build_cache(pci_fd);
-
-        // return the cached value
-        Ok(RwLockWriteGuard::downgrade(aml_symbols))
-    }
-
-    /// Discard any cached symbols list. To be called if the AML namespace changes.
-    pub fn aml_symbols_reset(&self) {
-        let mut aml_symbols = self.aml_symbols.write();
-        aml_symbols.symbol_cache = FxHashMap::default();
-    }
-
-    /// Set Power State
-    /// See https://uefi.org/sites/default/files/resources/ACPI_6_1.pdf
-    /// - search for PM1a
-    /// See https://forum.osdev.org/viewtopic.php?t=16990 for practical details
-    pub fn set_global_s_state(&self, state: u8) {
-        if state != 5 {
-            return;
-        }
-        let fadt = match self.fadt() {
-            Some(fadt) => fadt,
-            None => {
-                log::error!("Cannot set global S-state due to missing FADT.");
-                return;
-            }
-        };
-
-        let port = fadt.pm1a_control_block as u16;
-        let mut val = 1 << 13;
-
-        let aml_symbols = self.aml_symbols.read();
-
-        let s5_aml_name = match acpi::aml::namespace::AmlName::from_str("\\_S5") {
-            Ok(aml_name) => aml_name,
-            Err(error) => {
-                log::error!("Could not build AmlName for \\_S5, {:?}", error);
-                return;
-            }
-        };
-
-        let s5 = match &aml_symbols.aml_context {
-            Some(aml_context) => match aml_context.namespace.lock().get(s5_aml_name) {
-                Ok(s5) => s5,
-                Err(error) => {
-                    log::error!("Cannot set S-state, missing \\_S5, {:?}", error);
-                    return;
-                }
-            },
-            None => {
-                log::error!("Cannot set S-state, AML context not initialized");
-                return;
-            }
-        };
-
-        let package = match s5.deref() {
-            acpi::aml::object::Object::Package(package) => package,
-            _ => {
-                log::error!("Cannot set S-state, \\_S5 is not a package");
-                return;
-            }
-        };
-
-        let slp_typa = match package[0].deref() {
-            acpi::aml::object::Object::Integer(i) => i.to_owned(),
-            _ => {
-                log::error!("typa is not an Integer");
-                return;
-            }
-        };
-        let slp_typb = match package[1].deref() {
-            acpi::aml::object::Object::Integer(i) => i.to_owned(),
-            _ => {
-                log::error!("typb is not an Integer");
-                return;
-            }
-        };
-
-        log::trace!("Shutdown SLP_TYPa {:X}, SLP_TYPb {:X}", slp_typa, slp_typb);
-        val |= slp_typa as u16;
-
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        {
-            log::warn!("Shutdown with ACPI outw(0x{:X}, 0x{:X})", port, val);
-            Pio::<u16>::new(port).write(val);
-        }
-
-        // TODO: Handle SLP_TYPb
-
-        #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-        {
-            log::error!(
-                "Cannot shutdown with ACPI outw(0x{:X}, 0x{:X}) on this architecture",
-                port,
-                val
-            );
-        }
-
-        loop {
-            core::hint::spin_loop();
-        }
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct FadtStruct {
-    pub header: SdtHeader,
-    pub firmware_ctrl: u32,
-    pub dsdt: u32,
-
-    // field used in ACPI 1.0; no longer in use, for compatibility only
-    reserved: u8,
-
-    pub preferred_power_managament: u8,
-    pub sci_interrupt: u16,
-    pub smi_command_port: u32,
-    pub acpi_enable: u8,
-    pub acpi_disable: u8,
-    pub s4_bios_req: u8,
-    pub pstate_control: u8,
-    pub pm1a_event_block: u32,
-    pub pm1b_event_block: u32,
-    pub pm1a_control_block: u32,
-    pub pm1b_control_block: u32,
-    pub pm2_control_block: u32,
-    pub pm_timer_block: u32,
-    pub gpe0_block: u32,
-    pub gpe1_block: u32,
-    pub pm1_event_length: u8,
-    pub pm1_control_length: u8,
-    pub pm2_control_length: u8,
-    pub pm_timer_length: u8,
-    pub gpe0_ength: u8,
-    pub gpe1_length: u8,
-    pub gpe1_base: u8,
-    pub c_state_control: u8,
-    pub worst_c2_latency: u16,
-    pub worst_c3_latency: u16,
-    pub flush_size: u16,
-    pub flush_stride: u16,
-    pub duty_offset: u8,
-    pub duty_width: u8,
-    pub day_alarm: u8,
-    pub month_alarm: u8,
-    pub century: u8,
-
-    // reserved in ACPI 1.0; used since ACPI 2.0+
-    pub boot_architecture_flags: u16,
-
-    reserved2: u8,
-    pub flags: u32,
-}
-unsafe impl plain::Plain for FadtStruct {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct GenericAddressStructure {
-    address_space: u8,
-    bit_width: u8,
-    bit_offset: u8,
-    access_size: u8,
-    address: u64,
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct FadtAcpi2Struct {
-    // 12 byte structure; see below for details
-    pub reset_reg: GenericAddressStructure,
-
-    pub reset_value: u8,
-    reserved3: [u8; 3],
-
-    // 64bit pointers - Available on ACPI 2.0+
-    pub x_firmware_control: u64,
-    pub x_dsdt: u64,
-
-    pub x_pm1a_event_block: GenericAddressStructure,
-    pub x_pm1b_event_block: GenericAddressStructure,
-    pub x_pm1a_control_block: GenericAddressStructure,
-    pub x_pm1b_control_block: GenericAddressStructure,
-    pub x_pm2_control_block: GenericAddressStructure,
-    pub x_pm_timer_block: GenericAddressStructure,
-    pub x_gpe0_block: GenericAddressStructure,
-    pub x_gpe1_block: GenericAddressStructure,
-}
-unsafe impl plain::Plain for FadtAcpi2Struct {}
-
-#[derive(Clone)]
-pub struct Fadt(Sdt);
-
-impl Fadt {
-    pub fn acpi_2_struct(&self) -> Option<&FadtAcpi2Struct> {
-        let bytes = &self.0 .0[mem::size_of::<FadtStruct>()..];
-
-        match plain::from_bytes::<FadtAcpi2Struct>(bytes) {
-            Ok(fadt2) => Some(fadt2),
-            Err(plain::Error::TooShort) => None,
-            Err(plain::Error::BadAlignment) => unreachable!(
-                "plain::from_bytes reported bad alignment, but FadtAcpi2Struct is #[repr(packed)]"
-            ),
-        }
-    }
-}
-
-impl Deref for Fadt {
-    type Target = FadtStruct;
-
-    fn deref(&self) -> &Self::Target {
-        plain::from_bytes::<FadtStruct>(&self.0 .0)
-            .expect("expected FADT struct to already be validated in Deref impl")
-    }
-}
-
-impl Fadt {
-    pub fn new(sdt: Sdt) -> Option<Fadt> {
-        if sdt.signature != *b"FACP" || sdt.length() < mem::size_of::<Fadt>() {
-            return None;
-        }
-        Some(Fadt(sdt))
-    }
-
-    pub fn init(context: &mut AcpiContext) {
-        let fadt_sdt = context
-            .take_single_sdt(*b"FACP")
-            .expect("expected ACPI to always have a FADT");
-
-        let fadt = match Fadt::new(fadt_sdt) {
-            Some(fadt) => fadt,
-            None => {
-                log::error!("Failed to find FADT");
-                return;
-            }
-        };
-
-        let dsdt_ptr = match fadt.acpi_2_struct() {
-            Some(fadt2) => usize::try_from(fadt2.x_dsdt).unwrap_or_else(|_| {
-                usize::try_from(fadt.dsdt).expect("expected any given u32 to fit within usize")
-            }),
-            None => usize::try_from(fadt.dsdt).expect("expected any given u32 to fit within usize"),
-        };
-
-        log::debug!("FACP at {:X}", { dsdt_ptr });
-
-        let dsdt_sdt = match Sdt::load_from_physical(fadt.dsdt as usize) {
-            Ok(dsdt) => dsdt,
-            Err(error) => {
-                log::error!("Failed to load DSDT: {}", error);
-                return;
-            }
-        };
-
-        context.fadt = Some(fadt.clone());
-        context.dsdt = Some(Dsdt(dsdt_sdt.clone()));
-
-        context.tables.push(dsdt_sdt);
-    }
-}
-
-pub enum PossibleAmlTables {
-    Dsdt(Dsdt),
-    Ssdt(Ssdt),
-}
-impl PossibleAmlTables {
-    pub fn try_new(inner: Sdt) -> Option<Self> {
-        match &inner.signature {
-            b"DSDT" => Some(Self::Dsdt(Dsdt(inner))),
-            b"SSDT" => Some(Self::Ssdt(Ssdt(inner))),
-            _ => None,
-        }
-    }
-}
-impl AmlContainingTable for PossibleAmlTables {
-    fn aml(&self) -> &[u8] {
-        match self {
-            Self::Dsdt(dsdt) => dsdt.aml(),
-            Self::Ssdt(ssdt) => ssdt.aml(),
-        }
-    }
-    fn header(&self) -> &SdtHeader {
-        match self {
-            Self::Dsdt(dsdt) => dsdt.header(),
-            Self::Ssdt(ssdt) => ssdt.header(),
-        }
-    }
-}
-
-pub trait AmlContainingTable {
-    fn aml(&self) -> &[u8];
-    fn header(&self) -> &SdtHeader;
-}
-
-impl<T> AmlContainingTable for &T
-where
-    T: AmlContainingTable,
-{
-    fn aml(&self) -> &[u8] {
-        T::aml(*self)
-    }
-    fn header(&self) -> &SdtHeader {
-        T::header(*self)
-    }
-}
-
-impl AmlContainingTable for Dsdt {
-    fn aml(&self) -> &[u8] {
-        self.0.data()
-    }
-    fn header(&self) -> &SdtHeader {
-        &*self.0
-    }
-}
-impl AmlContainingTable for Ssdt {
-    fn aml(&self) -> &[u8] {
-        self.0.data()
-    }
-    fn header(&self) -> &SdtHeader {
-        &*self.0
-    }
-}
diff --git a/recipes/core/base/drivers/acpid/src/acpi/dmar/drhd.rs b/recipes/core/base/drivers/acpid/src/acpi/dmar/drhd.rs
deleted file mode 100644
index f33f3bf6e2..0000000000
--- a/recipes/core/base/drivers/acpid/src/acpi/dmar/drhd.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use std::ops::{Deref, DerefMut};
-
-use common::io::Mmio;
-
-// TODO: Only wrap with Mmio where there are hardware-registers. (Some of these structs seem to be
-// ring buffer entries, which are not to be treated the same way).
-
-pub struct DrhdPage {
-    virt: *mut Drhd,
-}
-impl DrhdPage {
-    pub fn map(base_phys: usize) -> syscall::Result<Self> {
-        assert_eq!(
-            base_phys % crate::acpi::PAGE_SIZE,
-            0,
-            "DRHD registers must be page-aligned"
-        );
-
-        // TODO: Uncachable? Can reads have side-effects?
-        let virt = unsafe {
-            common::physmap(
-                base_phys,
-                crate::acpi::PAGE_SIZE,
-                common::Prot::RO,
-                common::MemoryType::default(),
-            )?
-        } as *mut Drhd;
-
-        Ok(Self { virt })
-    }
-}
-impl Deref for DrhdPage {
-    type Target = Drhd;
-
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*self.virt }
-    }
-}
-impl DerefMut for DrhdPage {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        unsafe { &mut *self.virt }
-    }
-}
-impl Drop for DrhdPage {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libredox::call::munmap(self.virt.cast(), crate::acpi::PAGE_SIZE);
-        }
-    }
-}
-
-#[repr(C, packed)]
-pub struct DrhdFault {
-    pub sts: Mmio<u32>,
-    pub ctrl: Mmio<u32>,
-    pub data: Mmio<u32>,
-    pub addr: [Mmio<u32>; 2],
-    _rsv: [Mmio<u64>; 2],
-    pub log: Mmio<u64>,
-}
-
-#[repr(C, packed)]
-pub struct DrhdProtectedMemory {
-    pub en: Mmio<u32>,
-    pub low_base: Mmio<u32>,
-    pub low_limit: Mmio<u32>,
-    pub high_base: Mmio<u64>,
-    pub high_limit: Mmio<u64>,
-}
-
-#[repr(C, packed)]
-pub struct DrhdInvalidation {
-    pub queue_head: Mmio<u64>,
-    pub queue_tail: Mmio<u64>,
-    pub queue_addr: Mmio<u64>,
-    _rsv: Mmio<u32>,
-    pub cmpl_sts: Mmio<u32>,
-    pub cmpl_ctrl: Mmio<u32>,
-    pub cmpl_data: Mmio<u32>,
-    pub cmpl_addr: [Mmio<u32>; 2],
-}
-
-#[repr(C, packed)]
-pub struct DrhdPageRequest {
-    pub queue_head: Mmio<u64>,
-    pub queue_tail: Mmio<u64>,
-    pub queue_addr: Mmio<u64>,
-    _rsv: Mmio<u32>,
-    pub sts: Mmio<u32>,
-    pub ctrl: Mmio<u32>,
-    pub data: Mmio<u32>,
-    pub addr: [Mmio<u32>; 2],
-}
-
-#[repr(C, packed)]
-pub struct DrhdMtrrVariable {
-    pub base: Mmio<u64>,
-    pub mask: Mmio<u64>,
-}
-
-#[repr(C, packed)]
-pub struct DrhdMtrr {
-    pub cap: Mmio<u64>,
-    pub def_type: Mmio<u64>,
-    pub fixed: [Mmio<u64>; 11],
-    pub variable: [DrhdMtrrVariable; 10],
-}
-
-#[repr(C, packed)]
-pub struct Drhd {
-    pub version: Mmio<u32>,
-    _rsv: Mmio<u32>,
-    pub cap: Mmio<u64>,
-    pub ext_cap: Mmio<u64>,
-    pub gl_cmd: Mmio<u32>,
-    pub gl_sts: Mmio<u32>,
-    pub root_table: Mmio<u64>,
-    pub ctx_cmd: Mmio<u64>,
-    _rsv1: Mmio<u32>,
-    pub fault: DrhdFault,
-    _rsv2: Mmio<u32>,
-    pub pm: DrhdProtectedMemory,
-    pub invl: DrhdInvalidation,
-    _rsv3: Mmio<u64>,
-    pub intr_table: Mmio<u64>,
-    pub page_req: DrhdPageRequest,
-    pub mtrr: DrhdMtrr,
-}
diff --git a/recipes/core/base/drivers/acpid/src/acpi/dmar/mod.rs b/recipes/core/base/drivers/acpid/src/acpi/dmar/mod.rs
deleted file mode 100644
index c42b379a10..0000000000
--- a/recipes/core/base/drivers/acpid/src/acpi/dmar/mod.rs
+++ /dev/null
@@ -1,528 +0,0 @@
-//! DMA Remapping Table -- `DMAR`. This is Intel's implementation of IOMMU functionality, known as
-//! VT-d.
-//!
-//! Too understand what all of these structs mean, refer to the "Intel(R) Virtualization
-//! Technology for Directed I/O" specification.
-
-// TODO: Move this code to a separate driver as well?
-
-use std::convert::TryFrom;
-use std::ops::Deref;
-use std::{fmt, mem};
-
-use common::io::Io as _;
-
-use num_derive::FromPrimitive;
-use num_traits::FromPrimitive;
-
-use self::drhd::DrhdPage;
-use crate::acpi::{AcpiContext, Sdt, SdtHeader};
-
-pub mod drhd;
-
-#[repr(C, packed)]
-pub struct DmarStruct {
-    pub sdt_header: SdtHeader,
-    pub host_addr_width: u8,
-    pub flags: u8,
-    pub _rsvd: [u8; 10],
-    // This header is followed by N remapping structures.
-}
-unsafe impl plain::Plain for DmarStruct {}
-
-/// The DMA Remapping Table
-#[derive(Debug)]
-pub struct Dmar(Sdt);
-
-impl Dmar {
-    fn remmapping_structs_area(&self) -> &[u8] {
-        &self.0.as_slice()[mem::size_of::<DmarStruct>()..]
-    }
-}
-
-impl Deref for Dmar {
-    type Target = DmarStruct;
-
-    fn deref(&self) -> &Self::Target {
-        plain::from_bytes(self.0.as_slice())
-            .expect("expected Dmar struct to already have checked the length, and alignment issues should be impossible due to #[repr(packed)]")
-    }
-}
-
-impl Dmar {
-    // TODO: Again, perhaps put this code into a different driver, and read the table the regular
-    // way via the acpi scheme?
-    pub fn init(acpi_ctx: &AcpiContext) {
-        let dmar_sdt = match acpi_ctx.take_single_sdt(*b"DMAR") {
-            Some(dmar_sdt) => dmar_sdt,
-            None => {
-                log::warn!("Unable to find `DMAR` ACPI table.");
-                return;
-            }
-        };
-        let dmar = match Dmar::new(dmar_sdt) {
-            Some(dmar) => dmar,
-            None => {
-                log::error!("Failed to parse DMAR table, possibly malformed.");
-                return;
-            }
-        };
-
-        log::info!("Found DMAR: {}: {}", dmar.host_addr_width, dmar.flags);
-        log::debug!("DMAR: {:?}", dmar);
-
-        for dmar_entry in dmar.iter() {
-            log::debug!("DMAR entry: {:?}", dmar_entry);
-            match dmar_entry {
-                DmarEntry::Drhd(dmar_drhd) => {
-                    let drhd = dmar_drhd.map();
-
-                    log::debug!("VER: {:X}", drhd.version.read());
-                    log::debug!("CAP: {:X}", drhd.cap.read());
-                    log::debug!("EXT_CAP: {:X}", drhd.ext_cap.read());
-                    log::debug!("GCMD: {:X}", drhd.gl_cmd.read());
-                    log::debug!("GSTS: {:X}", drhd.gl_sts.read());
-                    log::debug!("RT: {:X}", drhd.root_table.read());
-                }
-                _ => (),
-            }
-        }
-    }
-
-    fn new(sdt: Sdt) -> Option<Dmar> {
-        assert_eq!(
-            sdt.signature, *b"DMAR",
-            "signature already checked against `DMAR`"
-        );
-        if sdt.length() < mem::size_of::<DmarStruct>() {
-            log::error!(
-                "The DMAR table was too small ({} B < {} B).",
-                sdt.length(),
-                mem::size_of::<Dmar>()
-            );
-            return None;
-        }
-        // No need to check alignment for #[repr(packed)] structs.
-
-        Some(Dmar(sdt))
-    }
-
-    pub fn iter(&self) -> DmarIter<'_> {
-        DmarIter(DmarRawIter {
-            bytes: self.remmapping_structs_area(),
-        })
-    }
-}
-
-/// DMAR DMA Remapping Hardware Unit Definition
-#[derive(Clone, Copy, Debug)]
-#[repr(C, packed)]
-pub struct DmarDrhdHeader {
-    pub kind: u16,
-    pub length: u16,
-
-    pub flags: u8,
-    pub _rsv: u8,
-    pub segment: u16,
-    pub base: u64,
-}
-unsafe impl plain::Plain for DmarDrhdHeader {}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(C, packed)]
-pub struct DeviceScopeHeader {
-    pub ty: u8,
-    pub len: u8,
-    pub _rsvd: u16,
-    pub enumeration_id: u8,
-    pub start_bus_num: u8,
-    // The variable-sized path comes after.
-}
-unsafe impl plain::Plain for DeviceScopeHeader {}
-
-pub struct DeviceScope(Box<[u8]>);
-
-impl DeviceScope {
-    pub fn try_new(raw: &[u8]) -> Option<Self> {
-        // TODO: Check ty.
-
-        let header_bytes = match raw.get(..mem::size_of::<DeviceScopeHeader>()) {
-            Some(bytes) => bytes,
-            None => return None,
-        };
-        let header = plain::from_bytes::<DeviceScopeHeader>(header_bytes)
-            .expect("length already checked, and alignment 1 (#[repr(packed)] should suffice");
-
-        let len = usize::from(header.len);
-
-        if len > raw.len() {
-            log::warn!("Device scope smaller than len field.");
-            return None;
-        }
-
-        Some(Self(raw.into()))
-    }
-}
-
-impl fmt::Debug for DeviceScope {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DeviceScope")
-            .field("header", &*self as &DeviceScopeHeader)
-            .field("path", &self.path())
-            .finish()
-    }
-}
-
-impl Deref for DeviceScope {
-    type Target = DeviceScopeHeader;
-
-    fn deref(&self) -> &Self::Target {
-        plain::from_bytes(&self.0)
-            .expect("expected length to be sufficient, and alignment (due to #[repr(packed)]")
-    }
-}
-impl DeviceScope {
-    pub fn path(&self) -> &[u8] {
-        &self.0[mem::size_of::<DeviceScopeHeader>()..]
-    }
-}
-
-pub struct DmarDrhd(Box<[u8]>);
-
-impl DmarDrhd {
-    pub fn try_new(raw: &[u8]) -> Option<Self> {
-        if raw.len() < mem::size_of::<DmarDrhdHeader>() {
-            return None;
-        }
-
-        Some(Self(raw.into()))
-    }
-    pub fn device_scope_area(&self) -> &[u8] {
-        &self.0[mem::size_of::<DmarDrhdHeader>()..]
-    }
-    pub fn map(&self) -> DrhdPage {
-        let base = usize::try_from(self.base).expect("expected u64 to fit within usize");
-
-        DrhdPage::map(base).expect("failed to map DRHD registers")
-    }
-}
-impl Deref for DmarDrhd {
-    type Target = DmarDrhdHeader;
-
-    fn deref(&self) -> &Self::Target {
-        plain::from_bytes::<DmarDrhdHeader>(&self.0[..mem::size_of::<DmarDrhdHeader>()])
-            .expect("length is already checked, and alignment 1 (#[repr(packed)] should suffice")
-    }
-}
-impl fmt::Debug for DmarDrhd {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DmarDrhd")
-            .field("header", &*self as &DmarDrhd)
-            // TODO: print out device scopes
-            .finish()
-    }
-}
-
-/// DMAR Reserved Memory Region Reporting
-#[derive(Clone, Copy, Debug)]
-#[repr(C, packed)]
-pub struct DmarRmrrHeader {
-    pub kind: u16,
-    pub length: u16,
-    pub _rsv: u16,
-    pub segment: u16,
-    pub base: u64,
-    pub limit: u64,
-    // The device scopes come after.
-}
-unsafe impl plain::Plain for DmarRmrrHeader {}
-
-pub struct DmarRmrr(Box<[u8]>);
-
-impl DmarRmrr {
-    pub fn try_new(raw: &[u8]) -> Option<Self> {
-        if raw.len() < mem::size_of::<DmarRmrrHeader>() {
-            return None;
-        }
-
-        Some(Self(raw.into()))
-    }
-}
-impl Deref for DmarRmrr {
-    type Target = DmarRmrrHeader;
-
-    fn deref(&self) -> &Self::Target {
-        plain::from_bytes(&self.0[..mem::size_of::<DmarRmrrHeader>()])
-            .expect("length already checked, and with #[repr(packed)] alignment should be okay")
-    }
-}
-impl fmt::Debug for DmarRmrr {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DmarRmrr")
-            .field("header", &*self as &DmarRmrrHeader)
-            // TODO: print out device scopes
-            .finish()
-    }
-}
-
-/// DMAR Root Port ATS Capability Reporting
-#[derive(Clone, Copy, Debug)]
-#[repr(C, packed)]
-pub struct DmarAtsrHeader {
-    kind: u16,
-    length: u16,
-    flags: u8,
-    _rsv: u8,
-    segment: u16,
-    // The device scopes come after.
-}
-unsafe impl plain::Plain for DmarAtsrHeader {}
-
-pub struct DmarAtsr(Box<[u8]>);
-
-impl DmarAtsr {
-    pub fn try_new(raw: &[u8]) -> Option<Self> {
-        if raw.len() < mem::size_of::<DmarAtsrHeader>() {
-            return None;
-        }
-
-        Some(Self(raw.into()))
-    }
-}
-impl Deref for DmarAtsr {
-    type Target = DmarAtsrHeader;
-
-    fn deref(&self) -> &Self::Target {
-        plain::from_bytes(&self.0[..mem::size_of::<DmarAtsrHeader>()])
-            .expect("length already checked, and with #[repr(packed)] alignment should be okay")
-    }
-}
-impl fmt::Debug for DmarAtsr {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DmarAtsr")
-            .field("header", &*self as &DmarAtsrHeader)
-            // TODO: print out device scopes
-            .finish()
-    }
-}
-
-/// DMAR Remapping Hardware Static Affinity
-#[derive(Clone, Copy, Debug)]
-#[repr(C, packed)]
-pub struct DmarRhsa {
-    pub kind: u16,
-    pub length: u16,
-
-    pub _rsv: u32,
-    pub base: u64,
-    pub domain: u32,
-}
-unsafe impl plain::Plain for DmarRhsa {}
-impl DmarRhsa {
-    pub fn try_new(raw: &[u8]) -> Option<Self> {
-        let bytes = raw.get(..mem::size_of::<DmarRhsa>())?;
-
-        let this = plain::from_bytes(bytes)
-            .expect("length is already checked, and alignment 1 should suffice (#[repr(packed)])");
-
-        Some(*this)
-    }
-}
-
-/// DMAR ACPI Name-space Device Declaration
-#[derive(Clone, Copy, Debug)]
-#[repr(C, packed)]
-pub struct DmarAnddHeader {
-    pub kind: u16,
-    pub length: u16,
-
-    pub _rsv: [u8; 3],
-    pub acpi_dev: u8,
-    // The device scopes come after.
-}
-unsafe impl plain::Plain for DmarAnddHeader {}
-
-pub struct DmarAndd(Box<[u8]>);
-
-impl DmarAndd {
-    pub fn try_new(raw: &[u8]) -> Option<Self> {
-        if raw.len() < mem::size_of::<DmarAnddHeader>() {
-            return None;
-        }
-
-        Some(Self(raw.into()))
-    }
-}
-impl Deref for DmarAndd {
-    type Target = DmarAnddHeader;
-
-    fn deref(&self) -> &Self::Target {
-        plain::from_bytes(&self.0[..mem::size_of::<DmarAnddHeader>()])
-            .expect("length already checked, and with #[repr(packed)] alignment should be okay")
-    }
-}
-impl fmt::Debug for DmarAndd {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DmarAndd")
-            .field("header", &*self as &DmarAnddHeader)
-            // TODO: print out device scopes
-            .finish()
-    }
-}
-
-/// DMAR ACPI Name-space Device Declaration
-#[derive(Clone, Copy, Debug)]
-#[repr(C, packed)]
-pub struct DmarSatcHeader {
-    pub kind: u16,
-    pub length: u16,
-
-    pub flags: u8,
-    pub _rsvd: u8,
-    pub seg_num: u16,
-    // The device scopes come after.
-}
-unsafe impl plain::Plain for DmarSatcHeader {}
-
-pub struct DmarSatc(Box<[u8]>);
-
-impl DmarSatc {
-    pub fn try_new(raw: &[u8]) -> Option<Self> {
-        if raw.len() < mem::size_of::<DmarSatcHeader>() {
-            return None;
-        }
-
-        Some(Self(raw.into()))
-    }
-}
-
-impl Deref for DmarSatc {
-    type Target = DmarSatcHeader;
-
-    fn deref(&self) -> &Self::Target {
-        plain::from_bytes(&self.0[..mem::size_of::<DmarSatcHeader>()])
-            .expect("length already checked, and with #[repr(packed)] alignment should be okay")
-    }
-}
-impl fmt::Debug for DmarSatc {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DmarSatc")
-            .field("header", &*self as &DmarSatcHeader)
-            // TODO: print out device scopes
-            .finish()
-    }
-}
-
-/// The list of different "Remapping Structure Types".
-///
-/// Refer to section 8.2 in the VTIO spec (as of revision 3.2).
-#[derive(Clone, Copy, Debug, FromPrimitive)]
-#[repr(u16)]
-pub enum EntryType {
-    Drhd = 0,
-    Rmrr = 1,
-    Atsr = 2,
-    Rhsa = 3,
-    Andd = 4,
-    Satc = 5,
-}
-
-/// DMAR Entries
-#[derive(Debug)]
-pub enum DmarEntry {
-    Drhd(DmarDrhd),
-    Rmrr(DmarRmrr),
-    Atsr(DmarAtsr),
-    Rhsa(DmarRhsa),
-    Andd(DmarAndd),
-
-    // TODO: "SoC Integrated Address Translation Cache Reporting Structure".
-    Satc(DmarSatc),
-
-    TooShort(EntryType),
-    Unknown(u16),
-}
-
-struct DmarRawIter<'sdt> {
-    bytes: &'sdt [u8],
-}
-
-impl<'sdt> Iterator for DmarRawIter<'sdt> {
-    type Item = (u16, &'sdt [u8]);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let type_bytes = match self.bytes.get(..2) {
-            Some(bytes) => bytes,
-            None => {
-                if !self.bytes.is_empty() {
-                    log::warn!("DMAR table ended between two entries.");
-                }
-                return None;
-            }
-        };
-        let len_bytes = match self.bytes.get(2..4) {
-            Some(bytes) => bytes,
-            None => {
-                log::warn!("DMAR table ended between two entries.");
-                return None;
-            }
-        };
-        let remainder = &self.bytes[4..];
-
-        let type_bytes = <[u8; 2]>::try_from(type_bytes)
-            .expect("expected a 2-byte slice to be convertible to [u8; 2]");
-        let len_bytes = <[u8; 2]>::try_from(type_bytes)
-            .expect("expected a 2-byte slice to be convertible to [u8; 2]");
-
-        let ty = u16::from_ne_bytes(type_bytes);
-        let len = u16::from_ne_bytes(len_bytes);
-
-        let len = usize::try_from(len).expect("expected u16 to fit within usize");
-
-        if len > remainder.len() {
-            log::warn!("DMAR remapping structure length was smaller than the remaining length of the table.");
-            return None;
-        }
-
-        let (current, residue) = self.bytes.split_at(len);
-        self.bytes = residue;
-
-        Some((ty, current))
-    }
-}
-
-pub struct DmarIter<'sdt>(DmarRawIter<'sdt>);
-
-impl Iterator for DmarIter<'_> {
-    type Item = DmarEntry;
-    fn next(&mut self) -> Option<Self::Item> {
-        let (raw_type, raw) = self.0.next()?;
-
-        // NOTE: If any of these entries look incorrect, we should simply continue the iterator,
-        // and instead print a warning.
-
-        let entry_type = match EntryType::from_u16(raw_type) {
-            Some(ty) => ty,
-            None => {
-                log::warn!(
-                    "Encountered invalid entry type {} (length {})",
-                    raw_type,
-                    raw.len()
-                );
-                return Some(DmarEntry::Unknown(raw_type));
-            }
-        };
-
-        let item_opt = match entry_type {
-            EntryType::Drhd => DmarDrhd::try_new(raw).map(DmarEntry::Drhd),
-            EntryType::Rmrr => DmarRmrr::try_new(raw).map(DmarEntry::Rmrr),
-            EntryType::Atsr => DmarAtsr::try_new(raw).map(DmarEntry::Atsr),
-            EntryType::Rhsa => DmarRhsa::try_new(raw).map(DmarEntry::Rhsa),
-            EntryType::Andd => DmarAndd::try_new(raw).map(DmarEntry::Andd),
-            EntryType::Satc => DmarSatc::try_new(raw).map(DmarEntry::Satc),
-        };
-        let item = item_opt.unwrap_or(DmarEntry::TooShort(entry_type));
-
-        Some(item)
-    }
-}
diff --git a/recipes/core/base/drivers/acpid/src/aml_physmem.rs b/recipes/core/base/drivers/acpid/src/aml_physmem.rs
deleted file mode 100644
index 2bdd667ba2..0000000000
--- a/recipes/core/base/drivers/acpid/src/aml_physmem.rs
+++ /dev/null
@@ -1,430 +0,0 @@
-use acpi::{aml::AmlError, Handle, PciAddress, PhysicalMapping};
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-use common::io::{Io, Pio};
-use num_traits::PrimInt;
-use rustc_hash::FxHashMap;
-use std::fmt::LowerHex;
-use std::mem::size_of;
-use std::ptr::NonNull;
-use std::sync::{Arc, Mutex};
-use syscall::PAGE_SIZE;
-
-const PAGE_MASK: usize = !(PAGE_SIZE - 1);
-const OFFSET_MASK: usize = PAGE_SIZE - 1;
-
-struct MappedPage {
-    phys_page: usize,
-    virt_page: usize,
-}
-
-impl MappedPage {
-    fn new(phys_page: usize) -> std::io::Result<Self> {
-        let virt_page = unsafe {
-            common::physmap(
-                phys_page,
-                PAGE_SIZE,
-                common::Prot::RW,
-                common::MemoryType::default(),
-            )
-            .map_err(|error| std::io::Error::from_raw_os_error(error.errno()))?
-        } as usize;
-        Ok(Self {
-            phys_page,
-            virt_page,
-        })
-    }
-}
-
-impl Drop for MappedPage {
-    fn drop(&mut self) {
-        log::trace!("Drop page {:#x}", self.phys_page);
-        if let Err(e) = unsafe { libredox::call::munmap(self.virt_page as *mut (), PAGE_SIZE) } {
-            log::error!("funmap (phys): {:?}", e);
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct AmlPageCache {
-    page_cache: FxHashMap<usize, MappedPage>,
-}
-
-impl AmlPageCache {
-    /// get a virtual address for the given physical page
-    fn get_page(&mut self, phys_target: usize) -> std::io::Result<&MappedPage> {
-        let phys_page = phys_target & PAGE_MASK;
-        if self.page_cache.contains_key(&phys_page) {
-            log::trace!("re-using cached page {:#x}", phys_page);
-
-            Ok(self
-                .page_cache
-                .get(&phys_page)
-                .expect("could not get page after contains=true"))
-        } else {
-            let mapped_page = MappedPage::new(phys_page)?;
-            log::trace!("adding page {:#x} to cache", mapped_page.phys_page);
-            self.page_cache.insert(phys_page, mapped_page);
-            Ok(self
-                .page_cache
-                .get(&phys_page)
-                .expect("can't find page that was just inserted"))
-        }
-    }
-
-    /// The offset into the virtual slice of T that matches the physical target
-    fn sized_index<T>(phys_target: usize) -> usize {
-        assert_eq!(
-            phys_target & !(size_of::<T>() - 1),
-            phys_target,
-            "address {} is not aligned",
-            phys_target
-        );
-        (phys_target & OFFSET_MASK) / size_of::<T>()
-    }
-    /// Read from the given physical address
-    fn read_from_phys<T: PrimInt + LowerHex>(&mut self, phys_target: usize) -> std::io::Result<T> {
-        let mapped_page = self.get_page(phys_target)?;
-        let page_as_slice = unsafe {
-            std::slice::from_raw_parts(
-                mapped_page.virt_page as *const T,
-                PAGE_SIZE / size_of::<T>(),
-            )
-        };
-        // for debugging only
-        let _virt_ptr = page_as_slice[Self::sized_index::<T>(phys_target)..].as_ptr() as usize;
-
-        let val = page_as_slice[Self::sized_index::<T>(phys_target)];
-
-        log::trace!(
-            "read {:#x}, virt {:#x}, val {:#x}",
-            phys_target,
-            _virt_ptr,
-            val
-        );
-        Ok(val)
-    }
-
-    /// Write to the given physical address
-    fn write_to_phys<T: PrimInt + LowerHex>(
-        &mut self,
-        phys_target: usize,
-        val: T,
-    ) -> std::io::Result<()> {
-        let mapped_page = self.get_page(phys_target)?;
-        let page_as_slice = unsafe {
-            std::slice::from_raw_parts_mut(
-                mapped_page.virt_page as *mut T,
-                PAGE_SIZE / size_of::<T>(),
-            )
-        };
-        // for debugging only
-        let _virt_ptr = page_as_slice[Self::sized_index::<T>(phys_target)..].as_ptr() as usize;
-
-        page_as_slice[Self::sized_index::<T>(phys_target)] = val;
-
-        log::trace!(
-            "write {:#x}, virt {:#x}, val {:#x}",
-            phys_target,
-            _virt_ptr,
-            val
-        );
-        Ok(())
-    }
-
-    pub fn clear(&mut self) {
-        log::trace!("Clear page cache");
-        self.page_cache.clear();
-    }
-}
-
-#[derive(Clone)]
-pub struct AmlPhysMemHandler {
-    page_cache: Arc<Mutex<AmlPageCache>>,
-    pci_fd: Arc<Option<libredox::Fd>>,
-}
-
-/// Read from a physical address.
-/// Generic parameter must be u8, u16, u32 or u64.
-impl AmlPhysMemHandler {
-    pub fn new(pci_fd_opt: Option<&libredox::Fd>, page_cache: Arc<Mutex<AmlPageCache>>) -> Self {
-        let pci_fd = if let Some(pci_fd) = pci_fd_opt {
-            Some(libredox::Fd::new(pci_fd.raw()))
-        } else {
-            log::error!("pci_fd is not registered");
-            None
-        };
-        Self {
-            page_cache,
-            pci_fd: Arc::new(pci_fd),
-        }
-    }
-
-    fn pci_call_metadata(kind: u8, addr: PciAddress, off: u16) -> [u64; 2] {
-        // Segment: u16, at 28 bits
-        // Bus: u8, 8 bits, 256 total, at 20 bits
-        // Device: u8, 5 bits, 32 total, at 15 bits
-        // Function: u8, 3 bits, 8 total, at 12 bits
-        // Offset: u16, 12 bits, 4096 total, at 0 bits
-        [
-            kind.into(),
-            (u64::from(addr.segment()) << 28)
-                | (u64::from(addr.bus()) << 20)
-                | (u64::from(addr.device()) << 15)
-                | (u64::from(addr.function()) << 12)
-                | u64::from(off),
-        ]
-    }
-
-    fn read_pci(&self, addr: PciAddress, off: u16, value: &mut [u8]) {
-        let metadata = Self::pci_call_metadata(1, addr, off);
-        match &*self.pci_fd {
-            Some(pci_fd) => match pci_fd.call_ro(value, syscall::CallFlags::empty(), &metadata) {
-                Ok(_) => {}
-                Err(err) => {
-                    log::error!("read pci {addr}@{off:04X}:{:02X}: {}", value.len(), err);
-                }
-            },
-            None => {
-                log::error!(
-                    "read pci {addr}@{off:04X}:{:02X}: pci access not available",
-                    value.len()
-                );
-            }
-        }
-    }
-
-    fn write_pci(&self, addr: PciAddress, off: u16, value: &[u8]) {
-        let metadata = Self::pci_call_metadata(2, addr, off);
-        match &*self.pci_fd {
-            Some(pci_fd) => match pci_fd.call_wo(value, syscall::CallFlags::empty(), &metadata) {
-                Ok(_) => {}
-                Err(err) => {
-                    log::error!("write pci {addr}@{off:04X}={value:02X?}: {}", err);
-                }
-            },
-            None => {
-                log::error!("write pci {addr}@{off:04X}={value:02X?}: pci access not available");
-            }
-        }
-    }
-}
-
-impl acpi::Handler for AmlPhysMemHandler {
-    unsafe fn map_physical_region<T>(&self, phys: usize, size: usize) -> PhysicalMapping<Self, T> {
-        let phys_page = phys & PAGE_MASK;
-        let offset = phys & OFFSET_MASK;
-        let pages = (offset + size + PAGE_SIZE - 1) / PAGE_SIZE;
-        let map_size = pages * PAGE_SIZE;
-        let virt_page = common::physmap(
-            phys_page,
-            map_size,
-            common::Prot::RW,
-            common::MemoryType::default(),
-        )
-        .expect("failed to map physical region") as usize;
-        PhysicalMapping {
-            physical_start: phys,
-            virtual_start: NonNull::new((virt_page + offset) as *mut T).unwrap(),
-            region_length: size,
-            mapped_length: map_size,
-            handler: self.clone(),
-        }
-    }
-    fn unmap_physical_region<T>(region: &PhysicalMapping<Self, T>) {
-        let virt_page = region.virtual_start.addr().get() & PAGE_MASK;
-        unsafe {
-            libredox::call::munmap(virt_page as *mut (), region.mapped_length)
-                .expect("failed to unmap physical region")
-        }
-    }
-
-    fn read_u8(&self, address: usize) -> u8 {
-        log::trace!("read u8 {:X}", address);
-        if let Ok(mut page_cache) = self.page_cache.lock() {
-            if let Ok(value) = page_cache.read_from_phys::<u8>(address) {
-                return value;
-            }
-        }
-        log::error!("failed to read u8 {:#x}", address);
-        0
-    }
-    fn read_u16(&self, address: usize) -> u16 {
-        log::trace!("read u16 {:X}", address);
-        if let Ok(mut page_cache) = self.page_cache.lock() {
-            if let Ok(value) = page_cache.read_from_phys::<u16>(address) {
-                return value;
-            }
-        }
-        log::error!("failed to read u16 {:#x}", address);
-        0
-    }
-    fn read_u32(&self, address: usize) -> u32 {
-        log::trace!("read u32 {:X}", address);
-        if let Ok(mut page_cache) = self.page_cache.lock() {
-            if let Ok(value) = page_cache.read_from_phys::<u32>(address) {
-                return value;
-            }
-        }
-        log::error!("failed to read u32 {:#x}", address);
-        0
-    }
-    fn read_u64(&self, address: usize) -> u64 {
-        log::trace!("read u64 {:X}", address);
-        if let Ok(mut page_cache) = self.page_cache.lock() {
-            if let Ok(value) = page_cache.read_from_phys::<u64>(address) {
-                return value;
-            }
-        }
-        log::error!("failed to read u64 {:#x}", address);
-        0
-    }
-
-    fn write_u8(&self, address: usize, value: u8) {
-        log::trace!("write u8 {:X} = {:X}", address, value);
-        if let Ok(mut page_cache) = self.page_cache.lock() {
-            if page_cache.write_to_phys::<u8>(address, value).is_ok() {
-                return;
-            }
-        }
-        log::error!("failed to write u8 {:#x}", address);
-    }
-    fn write_u16(&self, address: usize, value: u16) {
-        log::trace!("write u16 {:X} = {:X}", address, value);
-        if let Ok(mut page_cache) = self.page_cache.lock() {
-            if page_cache.write_to_phys::<u16>(address, value).is_ok() {
-                return;
-            }
-        }
-        log::error!("failed to write u16 {:#x}", address);
-    }
-    fn write_u32(&self, address: usize, value: u32) {
-        log::trace!("write u32 {:X} = {:X}", address, value);
-        if let Ok(mut page_cache) = self.page_cache.lock() {
-            if page_cache.write_to_phys::<u32>(address, value).is_ok() {
-                return;
-            }
-        }
-        log::error!("failed to write u32 {:#x}", address);
-    }
-    fn write_u64(&self, address: usize, value: u64) {
-        log::trace!("write u64 {:X} = {:X}", address, value);
-        if let Ok(mut page_cache) = self.page_cache.lock() {
-            if page_cache.write_to_phys::<u64>(address, value).is_ok() {
-                return;
-            }
-        }
-        log::error!("failed to write u64 {:#x}", address);
-    }
-
-    // Pio must be enabled via syscall::iopl
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn read_io_u8(&self, port: u16) -> u8 {
-        Pio::<u8>::new(port).read()
-    }
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn read_io_u16(&self, port: u16) -> u16 {
-        Pio::<u16>::new(port).read()
-    }
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn read_io_u32(&self, port: u16) -> u32 {
-        Pio::<u32>::new(port).read()
-    }
-
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn write_io_u8(&self, port: u16, value: u8) {
-        Pio::<u8>::new(port).write(value)
-    }
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn write_io_u16(&self, port: u16, value: u16) {
-        Pio::<u16>::new(port).write(value)
-    }
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    fn write_io_u32(&self, port: u16, value: u32) {
-        Pio::<u32>::new(port).write(value)
-    }
-
-    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-    fn read_io_u8(&self, port: u16) -> u8 {
-        log::error!("cannot read u8 from port 0x{port:04X}");
-        0
-    }
-    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-    fn read_io_u16(&self, port: u16) -> u16 {
-        log::error!("cannot read u16 from port 0x{port:04X}");
-        0
-    }
-    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-    fn read_io_u32(&self, port: u16) -> u32 {
-        log::error!("cannot read u32 from port 0x{port:04X}");
-        0
-    }
-
-    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-    fn write_io_u8(&self, port: u16, value: u8) {
-        log::error!("cannot write 0x{value:02X} to port 0x{port:04X}");
-    }
-    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-    fn write_io_u16(&self, port: u16, value: u16) {
-        log::error!("cannot write 0x{value:04X} to port 0x{port:04X}");
-    }
-    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-    fn write_io_u32(&self, port: u16, value: u32) {
-        log::error!("cannot write 0x{value:08X} to port 0x{port:04X}");
-    }
-
-    fn read_pci_u8(&self, addr: PciAddress, off: u16) -> u8 {
-        let mut value = [0u8];
-        self.read_pci(addr, off, &mut value);
-        value[0]
-    }
-    fn read_pci_u16(&self, addr: PciAddress, off: u16) -> u16 {
-        let mut value = [0u8; 2];
-        self.read_pci(addr, off, &mut value);
-        u16::from_le_bytes(value)
-    }
-    fn read_pci_u32(&self, addr: PciAddress, off: u16) -> u32 {
-        let mut value = [0u8; 4];
-        self.read_pci(addr, off, &mut value);
-        u32::from_le_bytes(value)
-    }
-    fn write_pci_u8(&self, addr: PciAddress, off: u16, value: u8) {
-        self.write_pci(addr, off, &[value]);
-    }
-    fn write_pci_u16(&self, addr: PciAddress, off: u16, value: u16) {
-        self.write_pci(addr, off, &value.to_le_bytes());
-    }
-    fn write_pci_u32(&self, addr: PciAddress, off: u16, value: u32) {
-        self.write_pci(addr, off, &value.to_le_bytes());
-    }
-
-    fn nanos_since_boot(&self) -> u64 {
-        let ts = libredox::call::clock_gettime(libredox::flag::CLOCK_MONOTONIC)
-            .expect("failed to get time");
-        (ts.tv_sec as u64) * 1_000_000_000 + (ts.tv_nsec as u64)
-    }
-
-    fn stall(&self, microseconds: u64) {
-        let start = std::time::Instant::now();
-        while start.elapsed().as_micros() < microseconds.into() {
-            std::hint::spin_loop();
-        }
-    }
-
-    fn sleep(&self, milliseconds: u64) {
-        std::thread::sleep(std::time::Duration::from_millis(milliseconds));
-    }
-
-    fn create_mutex(&self) -> Handle {
-        log::debug!("TODO: Handler::create_mutex");
-        Handle(0)
-    }
-
-    fn acquire(&self, mutex: Handle, timeout: u16) -> Result<(), AmlError> {
-        log::debug!("TODO: Handler::acquire");
-        Ok(())
-    }
-
-    fn release(&self, mutex: Handle) {
-        log::debug!("TODO: Handler::release");
-    }
-}
diff --git a/recipes/core/base/drivers/acpid/src/ec.rs b/recipes/core/base/drivers/acpid/src/ec.rs
deleted file mode 100644
index c322790af6..0000000000
--- a/recipes/core/base/drivers/acpid/src/ec.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-use std::time::Duration;
-
-use acpi::aml::{
-    op_region::{OpRegion, RegionHandler, RegionSpace},
-    AmlError,
-};
-use common::{
-    io::{Io, Pio},
-    timeout::Timeout,
-};
-use log::*;
-
-const EC_DATA: u16 = 0x62;
-const EC_SC: u16 = 0x66;
-
-const OBF: u8 = 1 << 0; // output full / data ready for host <> empty
-const IBF: u8 = 1 << 1; // input full / data ready for ec <> empty
-const CMD: u8 = 1 << 3; // byte in data reg is command <> data
-const BURST: u8 = 1 << 4; // burst mode <> normal mode
-const SCI_EVT: u8 = 1 << 5; // sci event pending <> not
-const SMI_EVT: u8 = 1 << 6; // smi event pending <> not
-
-const RD_EC: u8 = 0x80;
-const WR_EC: u8 = 0x81;
-const BE_EC: u8 = 0x82;
-const BD_EC: u8 = 0x83;
-const QR_EC: u8 = 0x84;
-
-const BURST_ACK: u8 = 0x90;
-
-pub const DEFAULT_EC_TIMEOUT: Duration = Duration::from_millis(10);
-
-#[repr(transparent)]
-pub struct ScBits(u8);
-#[allow(dead_code)]
-impl ScBits {
-    const fn obf(&self) -> bool {
-        (self.0 & OBF) != 0
-    }
-    const fn ibf(&self) -> bool {
-        (self.0 & IBF) != 0
-    }
-    const fn cmd(&self) -> bool {
-        (self.0 & CMD) != 0
-    }
-    const fn burst(&self) -> bool {
-        (self.0 & BURST) != 0
-    }
-    const fn sci_evt(&self) -> bool {
-        (self.0 & SCI_EVT) != 0
-    }
-    const fn smi_evt(&self) -> bool {
-        (self.0 & SMI_EVT) != 0
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct Ec {
-    sc: u16,
-    data: u16,
-
-    timeout: Duration,
-}
-impl Ec {
-    pub fn new() -> Self {
-        Self {
-            sc: EC_SC,
-            data: EC_DATA,
-            timeout: DEFAULT_EC_TIMEOUT,
-        }
-    }
-    #[allow(dead_code)]
-    pub fn with_address(sc: u16, data: u16, timeout: Duration) -> Self {
-        Self { sc, data, timeout }
-    }
-    #[inline]
-    fn read_reg_sc(&self) -> ScBits {
-        ScBits(Pio::<u8>::new(self.sc).read())
-    }
-    #[inline]
-    fn read_reg_data(&self) -> u8 {
-        Pio::<u8>::new(self.data).read()
-    }
-    #[inline]
-    fn write_reg_sc(&self, value: u8) {
-        Pio::<u8>::new(self.sc).write(value);
-    }
-    #[inline]
-    fn write_reg_data(&self, value: u8) {
-        Pio::<u8>::new(self.data).write(value);
-    }
-    #[inline]
-    fn wait_for_write_ready(&self) -> Option<()> {
-        let timeout = Timeout::new(self.timeout);
-        loop {
-            if !self.read_reg_sc().ibf() {
-                return Some(());
-            }
-            timeout.run().ok()?;
-        }
-    }
-    #[inline]
-    fn wait_for_read_ready(&self) -> Option<()> {
-        let timeout = Timeout::new(self.timeout);
-        loop {
-            if self.read_reg_sc().obf() {
-                return Some(());
-            }
-            timeout.run().ok()?;
-        }
-    }
-
-    //https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/12_ACPI_Embedded_Controller_Interface_Specification/embedded-controller-command-set.html
-    pub fn read(&self, address: u8) -> Option<u8> {
-        trace!("ec read addr: {:x}", address);
-        self.wait_for_write_ready()?;
-
-        self.write_reg_sc(RD_EC);
-
-        self.wait_for_write_ready()?;
-
-        self.write_reg_data(address);
-
-        self.wait_for_read_ready()?;
-
-        let val = self.read_reg_data();
-        trace!("got: {:x}", val);
-        Some(val)
-    }
-    pub fn write(&self, address: u8, value: u8) -> Option<()> {
-        trace!("ec write addr: {:x}, with: {:x}", address, value);
-        self.wait_for_write_ready()?;
-
-        self.write_reg_sc(WR_EC);
-
-        self.wait_for_write_ready()?;
-
-        self.write_reg_data(address);
-
-        self.wait_for_write_ready()?;
-
-        self.write_reg_data(value);
-        trace!("done");
-        Some(())
-    }
-    // disabled if not met
-    //    First Access - 400 microseconds
-    //    Subsequent Accesses - 50 microseconds each
-    //    Total Burst Time - 1 millisecond
-    //Accesses should be responded to within 50 microseconds.
-    #[allow(dead_code)]
-    fn enable_burst(&self) -> bool {
-        trace!("ec burst enable");
-        self.wait_for_write_ready();
-
-        self.write_reg_sc(BE_EC);
-
-        self.wait_for_read_ready();
-
-        let res = self.read_reg_data() == BURST_ACK;
-        trace!("success: {}", res);
-        res
-    }
-    #[allow(dead_code)]
-    fn disable_burst(&self) {
-        trace!("ec burst disable");
-        self.wait_for_write_ready();
-        self.write_reg_sc(BD_EC);
-        trace!("done");
-    }
-    //OSPM driver sends this command when the SCI_EVT flag in the EC_SC register is set.
-    #[allow(dead_code)]
-    fn queue_query(&mut self) -> u8 {
-        trace!("ec query");
-        self.wait_for_write_ready();
-
-        self.write_reg_sc(QR_EC);
-
-        self.wait_for_read_ready();
-
-        let val = self.read_reg_data();
-        trace!("got: {}", val);
-        val
-    }
-}
-impl RegionHandler for Ec {
-    fn read_u8(
-        &self,
-        region: &acpi::aml::op_region::OpRegion,
-        offset: usize,
-    ) -> Result<u8, acpi::aml::AmlError> {
-        assert_eq!(region.space, RegionSpace::EmbeddedControl);
-        self.read(offset as u8).ok_or(AmlError::MutexAcquireTimeout) // TODO proper error type
-    }
-    fn write_u8(
-        &self,
-        region: &OpRegion,
-        offset: usize,
-        value: u8,
-    ) -> Result<(), acpi::aml::AmlError> {
-        assert_eq!(region.space, RegionSpace::EmbeddedControl);
-        self.write(offset as u8, value)
-            .ok_or(AmlError::MutexAcquireTimeout) // TODO proper error type
-    }
-    fn read_u16(&self, _region: &OpRegion, _offset: usize) -> Result<u16, acpi::aml::AmlError> {
-        warn!("Got u16 EC read from AML!");
-        Err(acpi::aml::AmlError::NoHandlerForRegionAccess(
-            RegionSpace::EmbeddedControl,
-        )) // TODO proper error type
-    }
-    fn read_u32(&self, _region: &OpRegion, _offset: usize) -> Result<u32, acpi::aml::AmlError> {
-        warn!("Got u32 EC read from AML!");
-        Err(acpi::aml::AmlError::NoHandlerForRegionAccess(
-            RegionSpace::EmbeddedControl,
-        )) // TODO proper error type
-    }
-    fn read_u64(&self, _region: &OpRegion, _offset: usize) -> Result<u64, acpi::aml::AmlError> {
-        warn!("Got u64 EC read from AML!");
-        Err(acpi::aml::AmlError::NoHandlerForRegionAccess(
-            RegionSpace::EmbeddedControl,
-        )) // TODO proper error type
-    }
-    fn write_u16(
-        &self,
-        _region: &OpRegion,
-        _offset: usize,
-        _value: u16,
-    ) -> Result<(), acpi::aml::AmlError> {
-        warn!("Got u16 EC write from AML!");
-        Err(acpi::aml::AmlError::NoHandlerForRegionAccess(
-            RegionSpace::EmbeddedControl,
-        )) // TODO proper error type
-    }
-    fn write_u32(
-        &self,
-        _region: &OpRegion,
-        _offset: usize,
-        _value: u32,
-    ) -> Result<(), acpi::aml::AmlError> {
-        warn!("Got u32 EC write from AML!");
-        Err(acpi::aml::AmlError::NoHandlerForRegionAccess(
-            RegionSpace::EmbeddedControl,
-        )) // TODO proper error type
-    }
-    fn write_u64(
-        &self,
-        _region: &OpRegion,
-        _offset: usize,
-        _value: u64,
-    ) -> Result<(), acpi::aml::AmlError> {
-        warn!("Got u64 EC write from AML!");
-        Err(acpi::aml::AmlError::NoHandlerForRegionAccess(
-            RegionSpace::EmbeddedControl,
-        )) // TODO proper error type
-    }
-}
diff --git a/recipes/core/base/drivers/acpid/src/main.rs b/recipes/core/base/drivers/acpid/src/main.rs
deleted file mode 100644
index 8f99f2ea9f..0000000000
--- a/recipes/core/base/drivers/acpid/src/main.rs
+++ /dev/null
@@ -1,191 +0,0 @@
-use std::convert::TryFrom;
-use std::fs::File;
-use std::mem;
-use std::ops::ControlFlow;
-use std::os::unix::io::AsRawFd;
-use std::sync::Arc;
-
-use ::acpi::aml::op_region::{RegionHandler, RegionSpace};
-use event::{EventFlags, RawEventQueue};
-use redox_scheme::{scheme::register_sync_scheme, Socket};
-use scheme_utils::Blocking;
-
-mod acpi;
-mod aml_physmem;
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-mod ec;
-
-mod scheme;
-
-fn daemon(daemon: daemon::Daemon) -> ! {
-    common::setup_logging(
-        "misc",
-        "acpi",
-        "acpid",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    log::info!("acpid start");
-
-    let rxsdt_raw_data: Arc<[u8]> = match std::fs::read("/scheme/kernel.acpi/rxsdt") {
-        Ok(data) => data.into(),
-        Err(err) => {
-            log::error!("acpid: failed to read `/scheme/kernel.acpi/rxsdt`: {}", err);
-            std::process::exit(1);
-        }
-    };
-
-    if rxsdt_raw_data.is_empty() {
-        log::info!("System doesn't use ACPI");
-        daemon.ready();
-        std::process::exit(0);
-    }
-
-    let sdt = match self::acpi::Sdt::new(rxsdt_raw_data) {
-        Ok(sdt) => sdt,
-        Err(err) => {
-            log::error!("acpid: failed to parse [RX]SDT: {:?}", err);
-            std::process::exit(1);
-        }
-    };
-
-    let mut thirty_two_bit;
-    let mut sixty_four_bit;
-
-    let physaddrs_iter = match &sdt.signature {
-        b"RSDT" => {
-            thirty_two_bit = sdt
-                .data()
-                .chunks(mem::size_of::<u32>())
-                // TODO: With const generics, the compiler has some way of doing this for static sizes.
-                .map(|chunk| <[u8; mem::size_of::<u32>()]>::try_from(chunk).unwrap())
-                .map(|chunk| u32::from_le_bytes(chunk))
-                .map(u64::from);
-
-            &mut thirty_two_bit as &mut dyn Iterator<Item = u64>
-        }
-        b"XSDT" => {
-            sixty_four_bit = sdt
-                .data()
-                .chunks(mem::size_of::<u64>())
-                .map(|chunk| <[u8; mem::size_of::<u64>()]>::try_from(chunk).unwrap())
-                .map(|chunk| u64::from_le_bytes(chunk));
-
-            &mut sixty_four_bit as &mut dyn Iterator<Item = u64>
-        }
-        _ => {
-            log::error!("acpid: expected [RX]SDT from kernel to be RSDT or XSDT");
-            std::process::exit(1);
-        }
-    };
-
-    let region_handlers: Vec<(RegionSpace, Box<dyn RegionHandler + 'static>)> = vec![
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        (RegionSpace::EmbeddedControl, Box::new(ec::Ec::new())),
-    ];
-    let acpi_context = self::acpi::AcpiContext::init(physaddrs_iter, region_handlers);
-
-    // TODO: I/O permission bitmap?
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    if let Err(err) = common::acquire_port_io_rights() {
-        log::error!("acpid: failed to set I/O privilege level to Ring 3: {:?}", err);
-        std::process::exit(1);
-    }
-
-    let shutdown_pipe = match File::open("/scheme/kernel.acpi/kstop") {
-        Ok(f) => f,
-        Err(err) => {
-            log::error!("acpid: failed to open `/scheme/kernel.acpi/kstop`: {}", err);
-            std::process::exit(1);
-        }
-    };
-
-    let mut event_queue = match RawEventQueue::new() {
-        Ok(q) => q,
-        Err(err) => {
-            log::error!("acpid: failed to create event queue: {:?}", err);
-            std::process::exit(1);
-        }
-    };
-    let socket = match Socket::nonblock() {
-        Ok(s) => s,
-        Err(err) => {
-            log::error!("acpid: failed to create scheme socket: {:?}", err);
-            std::process::exit(1);
-        }
-    };
-
-    let mut scheme = self::scheme::AcpiScheme::new(&acpi_context, &socket);
-    let mut handler = Blocking::new(&socket, 16);
-
-    if let Err(err) = event_queue
-        .subscribe(shutdown_pipe.as_raw_fd() as usize, 0, EventFlags::READ)
-    {
-        log::error!("acpid: failed to register shutdown pipe for event queue: {:?}", err);
-        std::process::exit(1);
-    }
-    if let Err(err) = event_queue
-        .subscribe(socket.inner().raw(), 1, EventFlags::READ)
-    {
-        log::error!("acpid: failed to register scheme socket for event queue: {:?}", err);
-        std::process::exit(1);
-    }
-
-    if let Err(err) = register_sync_scheme(&socket, "acpi", &mut scheme) {
-        log::error!("acpid: failed to register acpi scheme to namespace: {:?}", err);
-        std::process::exit(1);
-    }
-
-    daemon.ready();
-
-    if let Err(err) = libredox::call::setrens(0, 0) {
-        log::error!("acpid: failed to enter null namespace: {}", err);
-        std::process::exit(1);
-    }
-
-    let mut mounted = true;
-    while mounted {
-        let event = match event_queue.next().transpose() {
-            Ok(Some(ev)) => ev,
-            Ok(None) => break,
-            Err(err) => {
-                log::error!("acpid: failed to read event file: {:?}", err);
-                break;
-            }
-        };
-
-        if event.fd == socket.inner().raw() {
-            loop {
-                match handler.process_requests_nonblocking(&mut scheme) {
-                    Ok(flow) => match flow {
-                        ControlFlow::Continue(()) => {}
-                        ControlFlow::Break(()) => break,
-                    },
-                    Err(err) => {
-                        log::error!("acpid: failed to process requests: {:?}", err);
-                        break;
-                    }
-                }
-            }
-        } else if event.fd == shutdown_pipe.as_raw_fd() as usize {
-            log::info!("Received shutdown request from kernel.");
-            mounted = false;
-        } else {
-            log::debug!("Received request to unknown fd: {}", event.fd);
-            continue;
-        }
-    }
-
-    drop(shutdown_pipe);
-    drop(event_queue);
-
-    acpi_context.set_global_s_state(5);
-
-    unreachable!("System should have shut down before this is entered");
-}
-
-fn main() {
-    common::init();
-    daemon::Daemon::new(daemon);
-}
diff --git a/recipes/core/base/drivers/acpid/src/scheme.rs b/recipes/core/base/drivers/acpid/src/scheme.rs
deleted file mode 100644
index 5a5040c385..0000000000
--- a/recipes/core/base/drivers/acpid/src/scheme.rs
+++ /dev/null
@@ -1,485 +0,0 @@
-use acpi::aml::namespace::AmlName;
-use amlserde::aml_serde_name::to_aml_format;
-use amlserde::AmlSerdeValue;
-use core::str;
-use libredox::Fd;
-use parking_lot::RwLockReadGuard;
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult, SendFdRequest, Socket};
-use ron::de::SpannedError;
-use scheme_utils::HandleMap;
-use std::convert::{TryFrom, TryInto};
-use std::str::FromStr;
-use syscall::dirent::{DirEntry, DirentBuf, DirentKind};
-use syscall::schemev2::NewFdFlags;
-use syscall::FobtainFdFlags;
-
-use syscall::data::Stat;
-use syscall::error::{Error, Result};
-use syscall::error::{EACCES, EBADF, EBADFD, EINVAL, EIO, EISDIR, ENOENT, ENOTDIR};
-use syscall::flag::{MODE_DIR, MODE_FILE};
-use syscall::flag::{O_ACCMODE, O_DIRECTORY, O_RDONLY, O_STAT, O_SYMLINK};
-use syscall::{EOVERFLOW, EPERM};
-
-use crate::acpi::{AcpiContext, AmlSymbols, SdtSignature};
-
-pub struct AcpiScheme<'acpi, 'sock> {
-    ctx: &'acpi AcpiContext,
-    handles: HandleMap<Handle<'acpi>>,
-    pci_fd: Option<Fd>,
-    socket: &'sock Socket,
-}
-
-struct Handle<'a> {
-    kind: HandleKind<'a>,
-    stat: bool,
-    allowed_to_eval: bool,
-}
-enum HandleKind<'a> {
-    TopLevel,
-    Tables,
-    Table(SdtSignature),
-    Symbols(RwLockReadGuard<'a, AmlSymbols>),
-    Symbol { name: String, description: String },
-    SchemeRoot,
-    RegisterPci,
-}
-
-impl HandleKind<'_> {
-    fn is_dir(&self) -> bool {
-        match self {
-            Self::TopLevel => true,
-            Self::Tables => true,
-            Self::Table(_) => false,
-            Self::Symbols(_) => true,
-            Self::Symbol { .. } => false,
-            Self::SchemeRoot => false,
-            Self::RegisterPci => false,
-        }
-    }
-    fn len(&self, acpi_ctx: &AcpiContext) -> Result<usize> {
-        Ok(match self {
-            // Files
-            Self::Table(signature) => acpi_ctx
-                .sdt_from_signature(signature)
-                .ok_or(Error::new(EBADFD))?
-                .length(),
-            Self::Symbol { description, .. } => description.len(),
-            // Directories
-            Self::TopLevel | Self::Symbols(_) | Self::Tables => 0,
-            Self::SchemeRoot | Self::RegisterPci => return Err(Error::new(EBADF)),
-        })
-    }
-}
-
-impl<'acpi, 'sock> AcpiScheme<'acpi, 'sock> {
-    pub fn new(ctx: &'acpi AcpiContext, socket: &'sock Socket) -> Self {
-        Self {
-            ctx,
-            handles: HandleMap::new(),
-            pci_fd: None,
-            socket,
-        }
-    }
-}
-
-fn parse_hex_digit(hex: u8) -> Option<u8> {
-    let hex = hex.to_ascii_lowercase();
-
-    if hex >= b'a' && hex <= b'f' {
-        Some(hex - b'a' + 10)
-    } else if hex >= b'0' && hex <= b'9' {
-        Some(hex - b'0')
-    } else {
-        None
-    }
-}
-
-fn parse_hex_2digit(hex: &[u8]) -> Option<u8> {
-    parse_hex_digit(hex[0])
-        .and_then(|most_significant| Some((most_significant << 4) | parse_hex_digit(hex[1])?))
-}
-
-fn parse_oem_id(hex: [u8; 12]) -> Option<[u8; 6]> {
-    Some([
-        parse_hex_2digit(&hex[0..2])?,
-        parse_hex_2digit(&hex[2..4])?,
-        parse_hex_2digit(&hex[4..6])?,
-        parse_hex_2digit(&hex[6..8])?,
-        parse_hex_2digit(&hex[8..10])?,
-        parse_hex_2digit(&hex[10..12])?,
-    ])
-}
-fn parse_oem_table_id(hex: [u8; 16]) -> Option<[u8; 8]> {
-    Some([
-        parse_hex_2digit(&hex[0..2])?,
-        parse_hex_2digit(&hex[2..4])?,
-        parse_hex_2digit(&hex[4..6])?,
-        parse_hex_2digit(&hex[6..8])?,
-        parse_hex_2digit(&hex[8..10])?,
-        parse_hex_2digit(&hex[10..12])?,
-        parse_hex_2digit(&hex[12..14])?,
-        parse_hex_2digit(&hex[14..16])?,
-    ])
-}
-
-fn parse_table(table: &[u8]) -> Option<SdtSignature> {
-    let signature_part = table.get(..4)?;
-    let first_hyphen = table.get(4)?;
-    let oem_id_part = table.get(5..17)?;
-    let second_hyphen = table.get(17)?;
-    let oem_table_part = table.get(18..34)?;
-
-    if *first_hyphen != b'-' {
-        return None;
-    }
-    if *second_hyphen != b'-' {
-        return None;
-    }
-
-    if table.len() > 34 {
-        return None;
-    }
-
-    Some(SdtSignature {
-        signature: <[u8; 4]>::try_from(signature_part)
-            .expect("expected 4-byte slice to be convertible into [u8; 4]"),
-        oem_id: {
-            let hex = <[u8; 12]>::try_from(oem_id_part)
-                .expect("expected 12-byte slice to be convertible into [u8; 12]");
-            parse_oem_id(hex)?
-        },
-        oem_table_id: {
-            let hex = <[u8; 16]>::try_from(oem_table_part)
-                .expect("expected 16-byte slice to be convertible into [u8; 16]");
-            parse_oem_table_id(hex)?
-        },
-    })
-}
-
-impl SchemeSync for AcpiScheme<'_, '_> {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(Handle {
-            stat: false,
-            kind: HandleKind::SchemeRoot,
-            allowed_to_eval: false,
-        }))
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        let handle = self.handles.get(dirfd)?;
-
-        let path = path.trim_start_matches('/');
-
-        let flag_stat = flags & O_STAT == O_STAT;
-        let flag_dir = flags & O_DIRECTORY == O_DIRECTORY;
-
-        let kind = match handle.kind {
-            HandleKind::SchemeRoot => {
-                // TODO: arrayvec
-                let components = {
-                    let mut v = arrayvec::ArrayVec::<&str, 3>::new();
-                    let it = path.split('/');
-                    for component in it.take(3) {
-                        v.push(component);
-                    }
-
-                    v
-                };
-
-                match &*components {
-                    [""] => HandleKind::TopLevel,
-                    ["register_pci"] => HandleKind::RegisterPci,
-                    ["tables"] => HandleKind::Tables,
-
-                    ["tables", table] => {
-                        let signature = parse_table(table.as_bytes()).ok_or(Error::new(ENOENT))?;
-                        HandleKind::Table(signature)
-                    }
-
-                    ["symbols"] => {
-                        if let Ok(aml_symbols) = self.ctx.aml_symbols(self.pci_fd.as_ref()) {
-                            HandleKind::Symbols(aml_symbols)
-                        } else {
-                            return Err(Error::new(EIO));
-                        }
-                    }
-
-                    ["symbols", symbol] => {
-                        if let Some(description) = self.ctx.aml_lookup(symbol) {
-                            HandleKind::Symbol {
-                                name: (*symbol).to_owned(),
-                                description,
-                            }
-                        } else {
-                            return Err(Error::new(ENOENT));
-                        }
-                    }
-
-                    _ => return Err(Error::new(ENOENT)),
-                }
-            }
-            HandleKind::Symbols(ref aml_symbols) => {
-                if let Some(description) = aml_symbols.lookup(path) {
-                    HandleKind::Symbol {
-                        name: (*path).to_owned(),
-                        description,
-                    }
-                } else {
-                    return Err(Error::new(ENOENT));
-                }
-            }
-            _ => return Err(Error::new(EACCES)),
-        };
-
-        if kind.is_dir() && !flag_dir && !flag_stat {
-            return Err(Error::new(EISDIR));
-        } else if !kind.is_dir() && flag_dir && !flag_stat {
-            return Err(Error::new(ENOTDIR));
-        }
-
-        let allowed_to_eval = if flags & O_ACCMODE == O_RDONLY || flag_stat {
-            false
-        } else if ctx.uid == 0 {
-            true
-        } else {
-            return Err(Error::new(EINVAL));
-        };
-
-        if flags & O_SYMLINK == O_SYMLINK && !flag_stat {
-            return Err(Error::new(EINVAL));
-        }
-
-        let fd = self.handles.insert(Handle {
-            stat: flag_stat,
-            kind,
-            allowed_to_eval,
-        });
-
-        Ok(OpenResult::ThisScheme {
-            number: fd,
-            flags: NewFdFlags::POSITIONED,
-        })
-    }
-
-    fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        let handle = self.handles.get(id)?;
-
-        stat.st_size = handle
-            .kind
-            .len(self.ctx)?
-            .try_into()
-            .unwrap_or(u64::max_value());
-
-        if handle.kind.is_dir() {
-            stat.st_mode = MODE_DIR;
-        } else {
-            stat.st_mode = MODE_FILE;
-        }
-
-        Ok(())
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        offset: u64,
-        _fcntl: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let offset: usize = offset.try_into().map_err(|_| Error::new(EINVAL))?;
-
-        let handle = self.handles.get_mut(id)?;
-
-        if handle.stat {
-            return Err(Error::new(EBADF));
-        }
-
-        let src_buf = match &handle.kind {
-            HandleKind::Table(ref signature) => self
-                .ctx
-                .sdt_from_signature(signature)
-                .ok_or(Error::new(EBADFD))?
-                .as_slice(),
-            HandleKind::Symbol { description, .. } => description.as_bytes(),
-            _ => return Err(Error::new(EINVAL)),
-        };
-
-        let offset = std::cmp::min(src_buf.len(), offset);
-        let src_buf = &src_buf[offset..];
-
-        let to_copy = std::cmp::min(src_buf.len(), buf.len());
-
-        buf[..to_copy].copy_from_slice(&src_buf[..to_copy]);
-
-        Ok(to_copy)
-    }
-
-    fn getdents<'buf>(
-        &mut self,
-        id: usize,
-        mut buf: DirentBuf<&'buf mut [u8]>,
-        opaque_offset: u64,
-    ) -> Result<DirentBuf<&'buf mut [u8]>> {
-        let handle = self.handles.get_mut(id)?;
-
-        match &handle.kind {
-            HandleKind::TopLevel => {
-                const TOPLEVEL_ENTRIES: &[&str] = &["tables", "symbols"];
-
-                for (idx, name) in TOPLEVEL_ENTRIES
-                    .iter()
-                    .enumerate()
-                    .skip(opaque_offset as usize)
-                {
-                    buf.entry(DirEntry {
-                        inode: 0,
-                        next_opaque_id: idx as u64 + 1,
-                        name,
-                        kind: DirentKind::Directory,
-                    })?;
-                }
-            }
-            HandleKind::Symbols(aml_symbols) => {
-                for (idx, (symbol_name, _value)) in aml_symbols
-                    .symbols_cache()
-                    .iter()
-                    .enumerate()
-                    .skip(opaque_offset as usize)
-                {
-                    buf.entry(DirEntry {
-                        inode: 0,
-                        next_opaque_id: idx as u64 + 1,
-                        name: symbol_name.as_str(),
-                        kind: DirentKind::Regular,
-                    })?;
-                }
-            }
-            HandleKind::Tables => {
-                for (idx, table) in self
-                    .ctx
-                    .tables()
-                    .iter()
-                    .enumerate()
-                    .skip(opaque_offset as usize)
-                {
-                    let utf8_or_eio = |bytes| str::from_utf8(bytes).map_err(|_| Error::new(EIO));
-
-                    let mut name = String::new();
-                    name.push_str(utf8_or_eio(&table.signature[..])?);
-                    name.push('-');
-                    for byte in table.oem_id.iter() {
-                        std::fmt::write(&mut name, format_args!("{:>02X}", byte)).unwrap();
-                    }
-                    name.push('-');
-                    for byte in table.oem_table_id.iter() {
-                        std::fmt::write(&mut name, format_args!("{:>02X}", byte)).unwrap();
-                    }
-
-                    buf.entry(DirEntry {
-                        inode: 0,
-                        next_opaque_id: idx as u64 + 1,
-                        name: &name,
-                        kind: DirentKind::Regular,
-                    })?;
-                }
-            }
-            _ => return Err(Error::new(EIO)),
-        }
-
-        Ok(buf)
-    }
-
-    fn call(
-        &mut self,
-        id: usize,
-        payload: &mut [u8],
-        _metadata: &[u64],
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.handles.get_mut(id)?;
-        if !handle.allowed_to_eval {
-            return Err(Error::new(EPERM));
-        }
-
-        let Ok(args): Result<Vec<AmlSerdeValue>, SpannedError> = ron::de::from_bytes(payload)
-        else {
-            return Err(Error::new(EINVAL));
-        };
-
-        let HandleKind::Symbol { name, .. } = &handle.kind else {
-            return Err(Error::new(EBADF));
-        };
-
-        let Ok(aml_name) = AmlName::from_str(&to_aml_format(name)) else {
-            log::error!("Failed to convert symbol name: \"{name}\" to aml name!");
-            return Err(Error::new(EBADF));
-        };
-
-        let Ok(result) = self.ctx.aml_eval(aml_name, args) else {
-            return Err(Error::new(EINVAL));
-        };
-
-        let Ok(serialized_result) = ron::ser::to_string(&result) else {
-            log::error!("Failed to serialize aml result!");
-            return Err(Error::new(EINVAL));
-        };
-
-        let byte_result = serialized_result.as_bytes();
-        let result_len = byte_result.len();
-
-        if result_len > payload.len() {
-            return Err(Error::new(EOVERFLOW));
-        }
-
-        payload[..result_len].copy_from_slice(byte_result);
-
-        Ok(result_len)
-    }
-
-    fn on_sendfd(&mut self, sendfd_request: &SendFdRequest) -> Result<usize> {
-        let id = sendfd_request.id();
-        let num_fds = sendfd_request.num_fds();
-
-        let handle = self.handles.get(id)?;
-        if !matches!(handle.kind, HandleKind::RegisterPci) {
-            return Err(Error::new(EACCES));
-        }
-
-        if num_fds == 0 {
-            return Ok(0);
-        }
-
-        if num_fds > 1 {
-            return Err(Error::new(EINVAL));
-        }
-        let mut new_fd = usize::MAX;
-        if let Err(e) = sendfd_request.obtain_fd(
-            &self.socket,
-            FobtainFdFlags::UPPER_TBL,
-            std::slice::from_mut(&mut new_fd),
-        ) {
-            return Err(e);
-        }
-        let new_fd = libredox::Fd::new(new_fd);
-
-        if self.pci_fd.is_some() {
-            return Err(Error::new(EINVAL));
-        } else {
-            self.pci_fd = Some(new_fd);
-        }
-
-        Ok(num_fds)
-    }
-
-    fn on_close(&mut self, id: usize) {
-        self.handles.remove(id);
-    }
-}
diff --git a/recipes/core/base/drivers/amlserde/Cargo.toml b/recipes/core/base/drivers/amlserde/Cargo.toml
deleted file mode 100644
index 3a47c9588e..0000000000
--- a/recipes/core/base/drivers/amlserde/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "amlserde"
-description = "Library for serializing AML symbols"
-version = "0.0.1"
-authors = ["Ron Williams"]
-repository = "https://gitlab.redox-os.org/redox-os/drivers"
-categories = ["hardware-support"]
-license = "MIT/Apache-2.0"
-edition = "2021"
-
-[dependencies]
-acpi.workspace = true
-serde.workspace = true
-toml.workspace = true
diff --git a/recipes/core/base/drivers/amlserde/src/lib.rs b/recipes/core/base/drivers/amlserde/src/lib.rs
deleted file mode 100644
index 918b8ee599..0000000000
--- a/recipes/core/base/drivers/amlserde/src/lib.rs
+++ /dev/null
@@ -1,484 +0,0 @@
-use acpi::{
-    aml::{
-        namespace::AmlName,
-        object::{
-            FieldAccessType, FieldFlags, FieldUnit, FieldUnitKind, FieldUpdateRule, MethodFlags,
-            Object, ReferenceKind, WrappedObject,
-        },
-        op_region::{OpRegion, RegionSpace},
-        Interpreter,
-    },
-    Handle, Handler,
-};
-use serde::{Deserialize, Serialize};
-use std::{
-    ops::{Deref, Shl},
-    str::FromStr,
-    sync::{
-        atomic::{AtomicU64, Ordering},
-        Arc,
-    },
-};
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct AmlSerde {
-    pub name: String,
-    pub value: AmlSerdeValue,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum AmlSerdeValue {
-    Uninitialized,
-    Integer(u64),
-    String(String),
-    OpRegion {
-        region: AmlSerdeRegionSpace,
-        offset: u64,
-        length: u64,
-        parent_device: String,
-    },
-    Field {
-        kind: AmlSerdeFieldKind,
-        flags: AmlSerdeFieldFlags,
-        offset: u64,
-        length: u64,
-    },
-    Device,
-    Event(u64),
-    Method {
-        arg_count: usize,
-        serialize: bool,
-        sync_level: u8,
-    },
-    Buffer(Vec<u8>),
-    BufferField {
-        offset: u64,
-        length: u64,
-        data: Box<AmlSerdeValue>,
-    },
-    Processor {
-        id: u8,
-        pblk_address: u32,
-        pblk_len: u8,
-    },
-    Mutex {
-        mutex: u32,
-        sync_level: u8,
-    },
-    Reference {
-        kind: AmlSerdeReferenceKind,
-        inner: Box<AmlSerdeValue>,
-    },
-    Package {
-        contents: Vec<AmlSerdeValue>,
-    },
-    PowerResource {
-        system_level: u8,
-        resource_order: u16,
-    },
-    RawDataBuffer,
-    ThermalZone,
-    Debug,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum AmlSerdeRegionSpace {
-    SystemMemory,
-    SystemIo,
-    PciConfig,
-    EmbeddedControl,
-    SMBus,
-    SystemCmos,
-    PciBarTarget,
-    IPMI,
-    GeneralPurposeIo,
-    GenericSerialBus,
-    Pcc,
-    OemDefined(u8),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum AmlSerdeFieldKind {
-    Normal {
-        region: Box<AmlSerdeValue>,
-    },
-    Bank {
-        region: Box<AmlSerdeValue>,
-        bank: Box<AmlSerdeValue>,
-        bank_value: u64,
-    },
-    Index {
-        index: Box<AmlSerdeValue>,
-        data: Box<AmlSerdeValue>,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct AmlSerdeFieldFlags {
-    pub access_type: AmlSerdeFieldAccessType,
-    pub lock_rule: bool, // bit 4
-    pub update_rule: AmlSerdeFieldUpdateRule,
-}
-impl Into<u8> for AmlSerdeFieldFlags {
-    fn into(self) -> u8 {
-        // bits 0..4
-        (self.access_type as u8) +
-        // bit 4
-        (self.lock_rule as u8).shl(4) +
-        // bits 5..7
-        (self.update_rule as u8).shl(5)
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[repr(u8)]
-pub enum AmlSerdeFieldAccessType {
-    Any = 0,
-    Byte = 1,
-    Word = 2,
-    DWord = 3,
-    QWord = 4,
-    Buffer = 5,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[repr(u8)]
-pub enum AmlSerdeFieldUpdateRule {
-    Preserve = 0,
-    WriteAsOnes = 1,
-    WriteAsZeros = 2,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum AmlSerdeReferenceKind {
-    RefOf,
-    Local,
-    Arg,
-    Index,
-    Named,
-    Unresolved,
-}
-
-impl AmlSerde {
-    pub fn default() -> Self {
-        Self {
-            name: "name".to_owned(),
-            value: AmlSerdeValue::String(String::default()),
-        }
-    }
-
-    pub fn from_aml<H: Handler>(aml_context: &Interpreter<H>, aml_name: &AmlName) -> Option<Self> {
-        //TODO: why does namespace.get not take a reference to aml_name
-        let aml_value = if let Ok(aml_value) = aml_context.namespace.lock().get(aml_name.clone()) {
-            aml_value
-        } else {
-            return None;
-        };
-
-        let value = if let Some(value) = AmlSerdeValue::from_aml_value(aml_value.deref()) {
-            value
-        } else {
-            return None;
-        };
-
-        Some(AmlSerde {
-            name: aml_name.to_string(),
-            value,
-        })
-    }
-}
-
-impl AmlSerdeValue {
-    pub fn default() -> Self {
-        AmlSerdeValue::String("".to_owned())
-    }
-
-    pub fn from_aml_value(aml_value: &Object) -> Option<Self> {
-        Some(match aml_value {
-            Object::Uninitialized => AmlSerdeValue::Uninitialized,
-            Object::Integer(n) => AmlSerdeValue::Integer(n.to_owned()),
-            Object::String(s) => AmlSerdeValue::String(s.to_owned()),
-            Object::OpRegion(region) => AmlSerdeValue::OpRegion {
-                region: match region.space {
-                    RegionSpace::SystemMemory => AmlSerdeRegionSpace::SystemMemory,
-                    RegionSpace::SystemIO => AmlSerdeRegionSpace::SystemIo,
-                    RegionSpace::PciConfig => AmlSerdeRegionSpace::PciConfig,
-                    RegionSpace::EmbeddedControl => AmlSerdeRegionSpace::EmbeddedControl,
-                    RegionSpace::SmBus => AmlSerdeRegionSpace::SMBus,
-                    RegionSpace::SystemCmos => AmlSerdeRegionSpace::SystemCmos,
-                    RegionSpace::PciBarTarget => AmlSerdeRegionSpace::PciBarTarget,
-                    RegionSpace::Ipmi => AmlSerdeRegionSpace::IPMI,
-                    RegionSpace::GeneralPurposeIo => AmlSerdeRegionSpace::GeneralPurposeIo,
-                    RegionSpace::GenericSerialBus => AmlSerdeRegionSpace::GenericSerialBus,
-                    RegionSpace::Pcc => AmlSerdeRegionSpace::Pcc,
-                    RegionSpace::Oem(n) => AmlSerdeRegionSpace::OemDefined(n.to_owned()),
-                },
-                offset: region.base,
-                length: region.length,
-                parent_device: region.parent_device_path.to_string(),
-            },
-            Object::FieldUnit(field) => AmlSerdeValue::Field {
-                kind: match &field.kind {
-                    FieldUnitKind::Normal { region } => AmlSerdeFieldKind::Normal {
-                        region: AmlSerdeValue::from_aml_value(region.deref()).map(Box::new)?,
-                    },
-                    FieldUnitKind::Bank {
-                        region,
-                        bank,
-                        bank_value,
-                    } => AmlSerdeFieldKind::Bank {
-                        region: AmlSerdeValue::from_aml_value(region.deref()).map(Box::new)?,
-                        bank: AmlSerdeValue::from_aml_value(bank.deref()).map(Box::new)?,
-                        bank_value: bank_value.to_owned(),
-                    },
-                    FieldUnitKind::Index { index, data } => AmlSerdeFieldKind::Index {
-                        index: AmlSerdeValue::from_aml_value(index.deref()).map(Box::new)?,
-                        data: AmlSerdeValue::from_aml_value(data.deref()).map(Box::new)?,
-                    },
-                },
-                flags: AmlSerdeFieldFlags {
-                    access_type: match field.flags.access_type() {
-                        Ok(FieldAccessType::Any) => AmlSerdeFieldAccessType::Any,
-                        Ok(FieldAccessType::Byte) => AmlSerdeFieldAccessType::Byte,
-                        Ok(FieldAccessType::Word) => AmlSerdeFieldAccessType::Word,
-                        Ok(FieldAccessType::DWord) => AmlSerdeFieldAccessType::DWord,
-                        Ok(FieldAccessType::QWord) => AmlSerdeFieldAccessType::QWord,
-                        Ok(FieldAccessType::Buffer) => AmlSerdeFieldAccessType::Buffer,
-                        _ => return None,
-                    },
-                    lock_rule: field.flags.lock_rule(),
-                    update_rule: match field.flags.update_rule() {
-                        FieldUpdateRule::Preserve => AmlSerdeFieldUpdateRule::Preserve,
-                        FieldUpdateRule::WriteAsOnes => AmlSerdeFieldUpdateRule::WriteAsOnes,
-                        FieldUpdateRule::WriteAsZeros => AmlSerdeFieldUpdateRule::WriteAsZeros,
-                    },
-                },
-                offset: field.bit_index as u64,
-                length: field.bit_length as u64,
-            },
-            Object::Device => AmlSerdeValue::Device,
-            Object::Event(event) => AmlSerdeValue::Event(event.load(Ordering::Relaxed)),
-            Object::Method { flags, code: _ } => AmlSerdeValue::Method {
-                arg_count: flags.arg_count(),
-                serialize: flags.serialize(),
-                sync_level: flags.sync_level(),
-            },
-            //TODO: distinguish from Method?
-            Object::NativeMethod { f: _, flags } => AmlSerdeValue::Method {
-                arg_count: flags.arg_count(),
-                serialize: flags.serialize(),
-                sync_level: flags.sync_level(),
-            },
-            Object::Buffer(buffer_data) => AmlSerdeValue::Buffer(buffer_data.to_owned()),
-            Object::BufferField {
-                buffer,
-                offset,
-                length,
-            } => AmlSerdeValue::BufferField {
-                offset: offset.to_owned() as u64,
-                length: length.to_owned() as u64,
-                data: AmlSerdeValue::from_aml_value(buffer.deref()).map(Box::new)?,
-            },
-            Object::Processor {
-                proc_id,
-                pblk_address,
-                pblk_length,
-            } => AmlSerdeValue::Processor {
-                id: proc_id.to_owned(),
-                pblk_address: pblk_address.to_owned(),
-                pblk_len: pblk_length.to_owned(),
-            },
-            Object::Mutex { mutex, sync_level } => AmlSerdeValue::Mutex {
-                mutex: mutex.0,
-                sync_level: sync_level.to_owned(),
-            },
-            Object::Reference { kind, inner } => AmlSerdeValue::Reference {
-                kind: match kind {
-                    ReferenceKind::RefOf => AmlSerdeReferenceKind::RefOf,
-                    ReferenceKind::Local => AmlSerdeReferenceKind::Local,
-                    ReferenceKind::Arg => AmlSerdeReferenceKind::Arg,
-                    ReferenceKind::Index => AmlSerdeReferenceKind::Index,
-                    ReferenceKind::Named => AmlSerdeReferenceKind::Named,
-                    ReferenceKind::Unresolved => AmlSerdeReferenceKind::Unresolved,
-                },
-                inner: AmlSerdeValue::from_aml_value(inner.deref()).map(Box::new)?,
-            },
-            Object::Package(aml_contents) => AmlSerdeValue::Package {
-                contents: aml_contents
-                    .iter()
-                    .filter_map(|item| AmlSerdeValue::from_aml_value(item))
-                    .collect(),
-            },
-            Object::PowerResource {
-                system_level,
-                resource_order,
-            } => AmlSerdeValue::PowerResource {
-                system_level: system_level.to_owned(),
-                resource_order: resource_order.to_owned(),
-            },
-            Object::RawDataBuffer => AmlSerdeValue::RawDataBuffer,
-            Object::ThermalZone => AmlSerdeValue::ThermalZone,
-            Object::Debug => AmlSerdeValue::Debug,
-        })
-    }
-    pub fn to_aml_object(self) -> Option<Object> {
-        Some(match self {
-            AmlSerdeValue::Uninitialized => Object::Uninitialized,
-            AmlSerdeValue::Integer(n) => Object::Integer(n),
-            AmlSerdeValue::String(s) => Object::String(s),
-            AmlSerdeValue::OpRegion {
-                region,
-                offset,
-                length,
-                parent_device,
-            } => Object::OpRegion(OpRegion {
-                space: match region {
-                    AmlSerdeRegionSpace::PciConfig => RegionSpace::PciConfig,
-                    AmlSerdeRegionSpace::EmbeddedControl => RegionSpace::EmbeddedControl,
-                    AmlSerdeRegionSpace::SMBus => RegionSpace::SmBus,
-                    AmlSerdeRegionSpace::SystemCmos => RegionSpace::SystemCmos,
-                    AmlSerdeRegionSpace::PciBarTarget => RegionSpace::PciBarTarget,
-                    AmlSerdeRegionSpace::IPMI => RegionSpace::Ipmi,
-                    AmlSerdeRegionSpace::GeneralPurposeIo => RegionSpace::GeneralPurposeIo,
-                    AmlSerdeRegionSpace::GenericSerialBus => RegionSpace::GenericSerialBus,
-                    AmlSerdeRegionSpace::SystemMemory => RegionSpace::SystemMemory,
-                    AmlSerdeRegionSpace::SystemIo => RegionSpace::SystemIO,
-                    AmlSerdeRegionSpace::Pcc => RegionSpace::Pcc,
-                    AmlSerdeRegionSpace::OemDefined(n) => RegionSpace::Oem(n),
-                },
-                base: offset,
-                length,
-                //
-                parent_device_path: AmlName::from_str(&parent_device).ok()?, // TODO: Error value hidden
-            }),
-            AmlSerdeValue::Field {
-                kind,
-                flags,
-                offset,
-                length,
-            } => Object::FieldUnit(FieldUnit {
-                kind: match kind {
-                    AmlSerdeFieldKind::Normal { region } => FieldUnitKind::Normal {
-                        region: region.to_aml_object()?.wrap(),
-                    },
-                    AmlSerdeFieldKind::Bank {
-                        region,
-                        bank,
-                        bank_value,
-                    } => FieldUnitKind::Bank {
-                        region: region.to_aml_object()?.wrap(),
-                        bank: bank.to_aml_object()?.wrap(),
-                        bank_value: bank_value.to_owned(),
-                    },
-                    AmlSerdeFieldKind::Index { index, data } => FieldUnitKind::Index {
-                        index: index.to_aml_object()?.wrap(),
-                        data: data.to_aml_object()?.wrap(),
-                    },
-                },
-                flags: FieldFlags(flags.into()),
-                bit_index: offset as usize,
-                bit_length: length as usize,
-            }),
-            AmlSerdeValue::Device => Object::Device,
-            AmlSerdeValue::Event(event) => Object::Event(Arc::new(AtomicU64::new(event))),
-            AmlSerdeValue::Method {
-                arg_count,
-                serialize,
-                sync_level,
-            } => Object::Method {
-                code: (return None), //TODO figure out what to do here
-                //TODO check specs to see if all bit patterns are allowed
-                flags: MethodFlags(
-                    (arg_count as u8).clamp(0, 7)
-                        + (serialize as u8).shl(3)
-                        + sync_level.clamp(0, 15).shl(4),
-                ),
-            },
-            //TODO: handle native method?
-            AmlSerdeValue::Buffer(buffer_data) => Object::Buffer(buffer_data),
-            AmlSerdeValue::BufferField {
-                data,
-                offset,
-                length,
-            } => Object::BufferField {
-                offset: offset as usize,
-                length: length as usize,
-                buffer: data.to_aml_object()?.wrap(),
-            },
-            AmlSerdeValue::Processor {
-                id,
-                pblk_address,
-                pblk_len,
-            } => Object::Processor {
-                proc_id: id,
-                pblk_address,
-                pblk_length: pblk_len,
-            },
-            AmlSerdeValue::Mutex { mutex, sync_level } => Object::Mutex {
-                mutex: Handle(mutex),
-                sync_level: sync_level,
-            },
-            AmlSerdeValue::Reference { kind, inner } => Object::Reference {
-                kind: match kind {
-                    AmlSerdeReferenceKind::RefOf => ReferenceKind::RefOf,
-                    AmlSerdeReferenceKind::Local => ReferenceKind::Local,
-                    AmlSerdeReferenceKind::Arg => ReferenceKind::Arg,
-                    AmlSerdeReferenceKind::Index => ReferenceKind::Index,
-                    AmlSerdeReferenceKind::Named => ReferenceKind::Named,
-                    AmlSerdeReferenceKind::Unresolved => ReferenceKind::Unresolved,
-                },
-                inner: inner.to_aml_object()?.wrap(),
-            },
-            AmlSerdeValue::Package { contents } => Object::Package(
-                contents
-                    .into_iter()
-                    .map(|item| item.to_aml_object().map(Object::wrap)) // TODO: see if errors should be ignored here
-                    .collect::<Option<Vec<WrappedObject>>>()?,
-            ),
-            AmlSerdeValue::PowerResource {
-                system_level,
-                resource_order,
-            } => Object::PowerResource {
-                system_level: system_level.to_owned(),
-                resource_order: resource_order.to_owned(),
-            },
-            AmlSerdeValue::RawDataBuffer => Object::RawDataBuffer,
-            AmlSerdeValue::ThermalZone => Object::ThermalZone,
-            AmlSerdeValue::Debug => Object::Debug,
-        })
-    }
-}
-
-pub mod aml_serde_name {
-    use acpi::aml::namespace::AmlName;
-
-    /// Add a leading backslash to make the name a valid
-    /// namespace reference
-    pub fn to_aml_format(pretty_name: &String) -> String {
-        format!("\\{}", pretty_name)
-    }
-
-    /// convert a string from AML namespace style to
-    /// acpi symbol style
-    pub fn to_symbol(aml_style_name: &String) -> String {
-        let mut name = aml_style_name.to_owned();
-
-        // remove leading slash
-        name = name.trim_start_matches("\\").to_owned();
-        // remove unnecessary underscores
-        while let Some(index) = name.find("_.") {
-            name.remove(index);
-        }
-        while name.len() > 0 && &name[name.len() - 1..] == "_" {
-            name.pop();
-        }
-        name.shrink_to_fit();
-        name
-    }
-
-    /// Convert to string and remove
-    /// trailing underscores from each name segment
-    pub fn aml_to_symbol(aml_name: &AmlName) -> String {
-        to_symbol(&aml_name.as_string())
-    }
-}
diff --git a/recipes/core/base/drivers/audio/ac97d/Cargo.toml b/recipes/core/base/drivers/audio/ac97d/Cargo.toml
deleted file mode 100644
index 97b163dbe9..0000000000
--- a/recipes/core/base/drivers/audio/ac97d/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "ac97d"
-description = "AC'97 driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-common = { path = "../../common" }
-libredox.workspace = true
-log.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-spin.workspace = true
-
-daemon = { path = "../../../daemon" }
-pcid = { path = "../../pcid" }
-redox-scheme.workspace = true
-scheme-utils = { path = "../../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/audio/ac97d/config.toml b/recipes/core/base/drivers/audio/ac97d/config.toml
deleted file mode 100644
index 106ce703a3..0000000000
--- a/recipes/core/base/drivers/audio/ac97d/config.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[[drivers]]
-name = "AC97 Audio"
-class = 0x04
-subclass = 0x01
-command = ["ac97d"]
diff --git a/recipes/core/base/drivers/audio/ac97d/src/device.rs b/recipes/core/base/drivers/audio/ac97d/src/device.rs
deleted file mode 100644
index a9217dbab6..0000000000
--- a/recipes/core/base/drivers/audio/ac97d/src/device.rs
+++ /dev/null
@@ -1,333 +0,0 @@
-use common::io::Pio;
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::CallerCtx;
-use redox_scheme::OpenResult;
-use scheme_utils::{FpathWriter, HandleMap};
-use syscall::error::{Error, Result, EACCES, EBADF, EINVAL, ENOENT};
-use syscall::schemev2::NewFdFlags;
-use syscall::EWOULDBLOCK;
-
-use common::{
-    dma::Dma,
-    io::{Io, Mmio},
-};
-use spin::Mutex;
-
-const NUM_SUB_BUFFS: usize = 32;
-const SUB_BUFF_SIZE: usize = 2048;
-
-enum Handle {
-    Todo,
-    SchemeRoot,
-}
-
-#[allow(dead_code)]
-struct MixerRegs {
-    /* 0x00 */ reset: Pio<u16>,
-    /* 0x02 */ master_volume: Pio<u16>,
-    /* 0x04 */ aux_out_volume: Pio<u16>,
-    /* 0x06 */ mono_volume: Pio<u16>,
-    /* 0x08 */ master_tone: Pio<u16>,
-    /* 0x0A */ pc_beep_volume: Pio<u16>,
-    /* 0x0C */ phone_volume: Pio<u16>,
-    /* 0x0E */ mic_volume: Pio<u16>,
-    /* 0x10 */ line_in_volume: Pio<u16>,
-    /* 0x12 */ cd_volume: Pio<u16>,
-    /* 0x14 */ video_volume: Pio<u16>,
-    /* 0x16 */ aux_in_volume: Pio<u16>,
-    /* 0x18 */ pcm_out_volume: Pio<u16>,
-    /* 0x1A */ record_select: Pio<u16>,
-    /* 0x1C */ record_gain: Pio<u16>,
-    /* 0x1E */ record_gain_mic: Pio<u16>,
-    /* 0x20 */ general_purpose: Pio<u16>,
-    /* 0x22 */ control_3d: Pio<u16>,
-    /* 0x24 */ audio_int_paging: Pio<u16>,
-    /* 0x26 */ powerdown: Pio<u16>,
-    /* 0x28 */ extended_id: Pio<u16>,
-    /* 0x2A */ extended_ctrl: Pio<u16>,
-    /* 0x2C */ vra_pcm_front: Pio<u16>,
-}
-
-impl MixerRegs {
-    fn new(bar0: u16) -> Self {
-        Self {
-            reset: Pio::new(bar0 + 0x00),
-            master_volume: Pio::new(bar0 + 0x02),
-            aux_out_volume: Pio::new(bar0 + 0x04),
-            mono_volume: Pio::new(bar0 + 0x06),
-            master_tone: Pio::new(bar0 + 0x08),
-            pc_beep_volume: Pio::new(bar0 + 0x0A),
-            phone_volume: Pio::new(bar0 + 0x0C),
-            mic_volume: Pio::new(bar0 + 0x0E),
-            line_in_volume: Pio::new(bar0 + 0x10),
-            cd_volume: Pio::new(bar0 + 0x12),
-            video_volume: Pio::new(bar0 + 0x14),
-            aux_in_volume: Pio::new(bar0 + 0x16),
-            pcm_out_volume: Pio::new(bar0 + 0x18),
-            record_select: Pio::new(bar0 + 0x1A),
-            record_gain: Pio::new(bar0 + 0x1C),
-            record_gain_mic: Pio::new(bar0 + 0x1E),
-            general_purpose: Pio::new(bar0 + 0x20),
-            control_3d: Pio::new(bar0 + 0x22),
-            audio_int_paging: Pio::new(bar0 + 0x24),
-            powerdown: Pio::new(bar0 + 0x26),
-            extended_id: Pio::new(bar0 + 0x28),
-            extended_ctrl: Pio::new(bar0 + 0x2A),
-            vra_pcm_front: Pio::new(bar0 + 0x2C),
-        }
-    }
-}
-
-#[allow(dead_code)]
-struct BusBoxRegs {
-    /// Buffer descriptor list base address
-    /* 0x00 */
-    bdbar: Pio<u32>,
-    /// Current index value
-    /* 0x04 */
-    civ: Pio<u8>,
-    /// Last valid index
-    /* 0x05 */
-    lvi: Pio<u8>,
-    /// Status
-    /* 0x06 */
-    sr: Pio<u16>,
-    /// Position in current buffer
-    /* 0x08 */
-    picb: Pio<u16>,
-    /// Prefetched index value
-    /* 0x0A */
-    piv: Pio<u8>,
-    /// Control
-    /* 0x0B */
-    cr: Pio<u8>,
-}
-
-impl BusBoxRegs {
-    fn new(base: u16) -> Self {
-        Self {
-            bdbar: Pio::new(base + 0x00),
-            civ: Pio::new(base + 0x04),
-            lvi: Pio::new(base + 0x05),
-            sr: Pio::new(base + 0x06),
-            picb: Pio::new(base + 0x08),
-            piv: Pio::new(base + 0x0A),
-            cr: Pio::new(base + 0x0B),
-        }
-    }
-}
-
-#[allow(dead_code)]
-struct BusRegs {
-    /// PCM in register box
-    /* 0x00 */
-    pi: BusBoxRegs,
-    /// PCM out register box
-    /* 0x10 */
-    po: BusBoxRegs,
-    /// Microphone register box
-    /* 0x20 */
-    mc: BusBoxRegs,
-}
-
-impl BusRegs {
-    fn new(bar1: u16) -> Self {
-        Self {
-            pi: BusBoxRegs::new(bar1 + 0x00),
-            po: BusBoxRegs::new(bar1 + 0x10),
-            mc: BusBoxRegs::new(bar1 + 0x20),
-        }
-    }
-}
-
-#[repr(C, packed)]
-pub struct BufferDescriptor {
-    /* 0x00 */ addr: Mmio<u32>,
-    /* 0x04 */ samples: Mmio<u16>,
-    /* 0x06 */ flags: Mmio<u16>,
-}
-
-pub struct Ac97 {
-    mixer: MixerRegs,
-    bus: BusRegs,
-    bdl: Dma<[BufferDescriptor; NUM_SUB_BUFFS]>,
-    buf: Dma<[u8; NUM_SUB_BUFFS * SUB_BUFF_SIZE]>,
-    handles: Mutex<HandleMap<Handle>>,
-}
-
-impl Ac97 {
-    pub unsafe fn new(bar0: u16, bar1: u16) -> Result<Self> {
-        let mut module = Ac97 {
-            mixer: MixerRegs::new(bar0),
-            bus: BusRegs::new(bar1),
-            bdl: Dma::zeroed(
-                //TODO: PhysBox::new_in_32bit_space(bdl_size)?
-            )?
-            .assume_init(),
-            buf: Dma::zeroed(
-                //TODO: PhysBox::new_in_32bit_space(buf_size)?
-            )?
-            .assume_init(),
-            handles: Mutex::new(HandleMap::new()),
-        };
-
-        module.init()?;
-
-        Ok(module)
-    }
-
-    fn init(&mut self) -> Result<()> {
-        //TODO: support other sample rates, or just the default of 48000 Hz
-        {
-            // Check if VRA is supported
-            if !self.mixer.extended_id.readf(1 << 0) {
-                println!("ac97d: VRA not supported and is currently required");
-                return Err(Error::new(ENOENT));
-            }
-
-            // Enable VRA
-            self.mixer.extended_ctrl.writef(1 << 0, true);
-
-            // Attempt to set sample rate for PCM front to 44100 Hz
-            let desired_sample_rate = 44100;
-            self.mixer.vra_pcm_front.write(desired_sample_rate);
-
-            // Read back real sample rate
-            let real_sample_rate = self.mixer.vra_pcm_front.read();
-            println!("ac97d: set sample rate to {}", real_sample_rate);
-
-            // Error if we cannot set the sample rate as desired
-            if real_sample_rate != desired_sample_rate {
-                println!(
-                    "ac97d: sample rate is {} but only {} is supported",
-                    real_sample_rate, desired_sample_rate
-                );
-                return Err(Error::new(ENOENT));
-            }
-        }
-
-        // Ensure PCM out is stopped
-        self.bus.po.cr.writef(1, false);
-
-        // Reset PCM out
-        self.bus.po.cr.writef(1 << 1, true);
-        while self.bus.po.cr.readf(1 << 1) {
-            // Spinning on resetting PCM out
-            //TODO: relax
-        }
-
-        // Initialize BDL for PCM out
-        for i in 0..NUM_SUB_BUFFS {
-            self.bdl[i]
-                .addr
-                .write((self.buf.physical() + i * SUB_BUFF_SIZE) as u32);
-            self.bdl[i]
-                .samples
-                .write((SUB_BUFF_SIZE / 2/* Each sample is i16 or 2 bytes */) as u16);
-            self.bdl[i]
-                .flags
-                .write(1 << 15 /* Interrupt on completion */);
-        }
-        self.bus.po.bdbar.write(self.bdl.physical() as u32);
-
-        // Enable interrupt on completion
-        self.bus.po.cr.writef(1 << 4, true);
-
-        // Start bus master
-        self.bus.po.cr.writef(1 << 0, true);
-
-        // Set master volume to 0 db (loudest output, DANGER!)
-        self.mixer.master_volume.write(0);
-
-        // Set PCM output volume to 0 db (medium)
-        self.mixer.pcm_out_volume.write(0x808);
-
-        Ok(())
-    }
-
-    pub fn irq(&mut self) -> bool {
-        let ints = self.bus.po.sr.read() & 0b11100;
-        if ints != 0 {
-            self.bus.po.sr.write(ints);
-            true
-        } else {
-            false
-        }
-    }
-}
-
-impl SchemeSync for Ac97 {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.lock().insert(Handle::SchemeRoot))
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        _path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        {
-            let handles = self.handles.lock();
-            let handle = handles.get(dirfd)?;
-            if !matches!(handle, Handle::SchemeRoot) {
-                return Err(Error::new(EACCES));
-            }
-        }
-        if ctx.uid == 0 {
-            let id = self.handles.lock().insert(Handle::Todo);
-            Ok(OpenResult::ThisScheme {
-                number: id,
-                flags: NewFdFlags::empty(),
-            })
-        } else {
-            Err(Error::new(EACCES))
-        }
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        {
-            let mut handles = self.handles.lock();
-            let handle = handles.get_mut(id)?;
-            if !matches!(handle, Handle::Todo) {
-                return Err(Error::new(EBADF));
-            }
-        }
-
-        if buf.len() != SUB_BUFF_SIZE {
-            return Err(Error::new(EINVAL));
-        }
-
-        let civ = self.bus.po.civ.read() as usize;
-        let mut lvi = self.bus.po.lvi.read() as usize;
-        if lvi == (civ + 3) % NUM_SUB_BUFFS {
-            // Block if we already are 3 buffers ahead
-            Err(Error::new(EWOULDBLOCK))
-        } else {
-            // Fill next buffer
-            lvi = (lvi + 1) % NUM_SUB_BUFFS;
-            for i in 0..SUB_BUFF_SIZE {
-                self.buf[lvi * SUB_BUFF_SIZE + i] = buf[i];
-            }
-            self.bus.po.lvi.write(lvi as u8);
-
-            Ok(SUB_BUFF_SIZE)
-        }
-    }
-
-    fn fpath(&mut self, _id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, "audiohw", |_| Ok(()))
-    }
-
-    fn on_close(&mut self, id: usize) {
-        self.handles.lock().remove(id);
-    }
-}
diff --git a/recipes/core/base/drivers/audio/ac97d/src/main.rs b/recipes/core/base/drivers/audio/ac97d/src/main.rs
deleted file mode 100644
index ffa8a94b7a..0000000000
--- a/recipes/core/base/drivers/audio/ac97d/src/main.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use std::io::{Read, Write};
-use std::os::unix::io::AsRawFd;
-use std::usize;
-
-use event::{user_data, EventQueue};
-use pcid_interface::PciFunctionHandle;
-use redox_scheme::scheme::register_sync_scheme;
-use redox_scheme::Socket;
-use scheme_utils::ReadinessBased;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub mod device;
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-fn daemon(daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_ac97");
-
-    let bar0 = pci_config.func.bars[0].expect_port();
-    let bar1 = pci_config.func.bars[1].expect_port();
-
-    let irq = pci_config
-        .func
-        .legacy_interrupt_line
-        .expect("ac97d: no legacy interrupts supported");
-
-    println!(" + ac97 {}", pci_config.func.display());
-
-    common::setup_logging(
-        "audio",
-        "pci",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    common::acquire_port_io_rights().expect("ac97d: failed to set I/O privilege level to Ring 3");
-
-    let mut irq_file = irq.irq_handle("ac97d");
-
-    let socket = Socket::nonblock().expect("ac97d: failed to create socket");
-    let mut device =
-        unsafe { device::Ac97::new(bar0, bar1).expect("ac97d: failed to allocate device") };
-    let mut readiness_based = ReadinessBased::new(&socket, 16);
-
-    user_data! {
-        enum Source {
-            Irq,
-            Scheme,
-        }
-    }
-
-    let event_queue = EventQueue::<Source>::new().expect("ac97d: Could not create event queue.");
-    event_queue
-        .subscribe(
-            irq_file.as_raw_fd() as usize,
-            Source::Irq,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-    event_queue
-        .subscribe(
-            socket.inner().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    register_sync_scheme(&socket, "audiohw", &mut device)
-        .expect("ac97d: failed to register audiohw scheme to namespace");
-    daemon.ready();
-
-    libredox::call::setrens(0, 0).expect("ac97d: failed to enter null namespace");
-
-    let all = [Source::Irq, Source::Scheme];
-    for event in all
-        .into_iter()
-        .chain(event_queue.map(|e| e.expect("ac97d: failed to get next event").user_data))
-    {
-        match event {
-            Source::Irq => {
-                let mut irq = [0; 8];
-                irq_file.read(&mut irq).unwrap();
-
-                if !device.irq() {
-                    continue;
-                }
-                irq_file.write(&mut irq).unwrap();
-
-                readiness_based
-                    .poll_all_requests(&mut device)
-                    .expect("ac97d: failed to poll requests");
-                readiness_based
-                    .write_responses()
-                    .expect("ac97d: failed to write to socket");
-
-                /*
-                let next_read = device_irq.next_read();
-                if next_read > 0 {
-                return Ok(Some(next_read));
-                }
-                */
-            }
-            Source::Scheme => {
-                readiness_based
-                    .read_and_process_requests(&mut device)
-                    .expect("ac97d: failed to read from socket");
-                readiness_based
-                    .write_responses()
-                    .expect("ac97d: failed to write to socket");
-
-                /*
-                let next_read = device.borrow().next_read();
-                if next_read > 0 {
-                return Ok(Some(next_read));
-                }
-                */
-            }
-        }
-    }
-
-    std::process::exit(0);
-}
-
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-fn daemon(daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
-    unimplemented!()
-}
diff --git a/recipes/core/base/drivers/audio/ihdad/Cargo.toml b/recipes/core/base/drivers/audio/ihdad/Cargo.toml
deleted file mode 100644
index 49f8171525..0000000000
--- a/recipes/core/base/drivers/audio/ihdad/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "ihdad"
-description = "Intel HD Audio chipset driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-bitflags.workspace = true
-libredox.workspace = true
-log.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-spin.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-pcid = { path = "../../pcid" }
-redox-scheme.workspace = true
-scheme-utils = { path = "../../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/audio/ihdad/config.toml b/recipes/core/base/drivers/audio/ihdad/config.toml
deleted file mode 100644
index 8be0418577..0000000000
--- a/recipes/core/base/drivers/audio/ihdad/config.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[[drivers]]
-name = "Intel HD Audio"
-class = 0x04
-subclass = 0x03
-command = ["ihdad"]
diff --git a/recipes/core/base/drivers/audio/ihdad/src/hda/cmdbuff.rs b/recipes/core/base/drivers/audio/ihdad/src/hda/cmdbuff.rs
deleted file mode 100644
index f968f0dcce..0000000000
--- a/recipes/core/base/drivers/audio/ihdad/src/hda/cmdbuff.rs
+++ /dev/null
@@ -1,501 +0,0 @@
-use common::dma::Dma;
-use common::io::{Io, Mmio};
-use common::timeout::Timeout;
-use syscall::error::{Error, Result, EIO};
-
-use super::common::*;
-
-// CORBCTL
-const CMEIE: u8 = 1 << 0; // 1 bit
-const CORBRUN: u8 = 1 << 1; // 1 bit
-
-// CORBSIZE
-const CORBSZCAP: (u8, u8) = (4, 4);
-const CORBSIZE: (u8, u8) = (0, 2);
-
-// CORBRP
-const CORBRPRST: u16 = 1 << 15;
-
-// RIRBWP
-const RIRBWPRST: u16 = 1 << 15;
-
-// RIRBCTL
-const RINTCTL: u8 = 1 << 0; // 1 bit
-const RIRBDMAEN: u8 = 1 << 1; // 1 bit
-
-const CORB_OFFSET: usize = 0x00;
-const RIRB_OFFSET: usize = 0x10;
-const ICMD_OFFSET: usize = 0x20;
-
-// ICS
-const ICB: u16 = 1 << 0;
-const IRV: u16 = 1 << 1;
-
-// CORB and RIRB offset
-
-const COMMAND_BUFFER_OFFSET: usize = 0x40;
-const CORB_BUFF_MAX_SIZE: usize = 1024;
-
-struct CommandBufferRegs {
-    corblbase: Mmio<u32>,
-    corbubase: Mmio<u32>,
-    corbwp: Mmio<u16>,
-    corbrp: Mmio<u16>,
-    corbctl: Mmio<u8>,
-    corbsts: Mmio<u8>,
-    corbsize: Mmio<u8>,
-    rsvd5: Mmio<u8>,
-
-    rirblbase: Mmio<u32>,
-    rirbubase: Mmio<u32>,
-    rirbwp: Mmio<u16>,
-    rintcnt: Mmio<u16>,
-    rirbctl: Mmio<u8>,
-    rirbsts: Mmio<u8>,
-    rirbsize: Mmio<u8>,
-    rsvd6: Mmio<u8>,
-}
-
-struct CorbRegs {
-    corblbase: Mmio<u32>,
-    corbubase: Mmio<u32>,
-    corbwp: Mmio<u16>,
-    corbrp: Mmio<u16>,
-    corbctl: Mmio<u8>,
-    corbsts: Mmio<u8>,
-    corbsize: Mmio<u8>,
-    rsvd5: Mmio<u8>,
-}
-
-struct Corb {
-    regs: &'static mut CorbRegs,
-    corb_base: *mut u32,
-    corb_base_phys: usize,
-    corb_count: usize,
-}
-
-impl Corb {
-    pub fn new(regs_addr: usize, corb_buff_phys: usize, corb_buff_virt: *mut u32) -> Corb {
-        unsafe {
-            Corb {
-                regs: &mut *(regs_addr as *mut CorbRegs),
-                corb_base: corb_buff_virt,
-                corb_base_phys: corb_buff_phys,
-                corb_count: 0,
-            }
-        }
-    }
-
-    //Intel 4.4.1.3
-    pub fn init(&mut self) -> Result<()> {
-        self.stop()?;
-        //Determine CORB and RIRB size and allocate buffer
-
-        //3.3.24
-        let corbsize_reg = self.regs.corbsize.read();
-        let corbszcap = (corbsize_reg >> 4) & 0xF;
-
-        let mut corbsize_bytes: usize = 0;
-        let mut corbsize: u8 = 0;
-
-        if (corbszcap & 4) == 4 {
-            corbsize = 2;
-            corbsize_bytes = 1024;
-
-            self.corb_count = 256;
-        } else if (corbszcap & 2) == 2 {
-            corbsize = 1;
-            corbsize_bytes = 64;
-
-            self.corb_count = 16;
-        } else if (corbszcap & 1) == 1 {
-            corbsize = 0;
-            corbsize_bytes = 8;
-
-            self.corb_count = 2;
-        }
-
-        assert!(self.corb_count != 0);
-        let addr = self.corb_base_phys;
-        self.set_address(addr);
-        self.regs.corbsize.write((corbsize_reg & 0xFC) | corbsize);
-
-        self.reset_read_pointer()?;
-        let old_wp = self.regs.corbwp.read();
-        self.regs.corbwp.write(old_wp & 0xFF00);
-
-        Ok(())
-    }
-
-    pub fn start(&mut self) {
-        self.regs.corbctl.writef(CORBRUN, true);
-    }
-
-    #[inline(never)]
-    pub fn stop(&mut self) -> Result<()> {
-        let timeout = Timeout::from_secs(1);
-        while self.regs.corbctl.readf(CORBRUN) {
-            self.regs.corbctl.writef(CORBRUN, false);
-            timeout.run().map_err(|()| {
-                log::error!("timeout on clearing CORBRUN");
-                Error::new(EIO)
-            })?;
-        }
-        Ok(())
-    }
-
-    pub fn set_address(&mut self, addr: usize) {
-        self.regs.corblbase.write((addr & 0xFFFFFFFF) as u32);
-        self.regs.corbubase.write(((addr as u64) >> 32) as u32);
-    }
-
-    pub fn reset_read_pointer(&mut self) -> Result<()> {
-        // 3.3.21
-
-        self.stop()?;
-
-        // Set CORBRPRST to 1
-        log::trace!("CORBRP {:X}", self.regs.corbrp.read());
-        self.regs.corbrp.writef(CORBRPRST, true);
-        log::trace!("CORBRP {:X}", self.regs.corbrp.read());
-
-        {
-            // Wait for it to become 1
-            let timeout = Timeout::from_secs(1);
-            while !self.regs.corbrp.readf(CORBRPRST) {
-                self.regs.corbrp.writef(CORBRPRST, true);
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on setting CORBRPRST");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        // Clear the bit again
-        self.regs.corbrp.writef(CORBRPRST, false);
-
-        {
-            // Read back the bit until zero to verify that it is cleared.
-            let timeout = Timeout::from_secs(1);
-            loop {
-                if !self.regs.corbrp.readf(CORBRPRST) {
-                    break;
-                }
-                self.regs.corbrp.writef(CORBRPRST, false);
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on clearing CORBRPRST");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        Ok(())
-    }
-
-    fn send_command(&mut self, cmd: u32) -> Result<()> {
-        {
-            // wait for the commands to finish
-            let timeout = Timeout::from_secs(1);
-            while (self.regs.corbwp.read() & 0xff) != (self.regs.corbrp.read() & 0xff) {
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on CORB command");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-        let write_pos: usize = ((self.regs.corbwp.read() as usize & 0xFF) + 1) % self.corb_count;
-        unsafe {
-            *self.corb_base.offset(write_pos as isize) = cmd;
-        }
-
-        self.regs.corbwp.write(write_pos as u16);
-
-        log::trace!("Corb: {:08X}", cmd);
-        Ok(())
-    }
-}
-
-struct RirbRegs {
-    rirblbase: Mmio<u32>,
-    rirbubase: Mmio<u32>,
-    rirbwp: Mmio<u16>,
-    rintcnt: Mmio<u16>,
-    rirbctl: Mmio<u8>,
-    rirbsts: Mmio<u8>,
-    rirbsize: Mmio<u8>,
-    rsvd6: Mmio<u8>,
-}
-
-struct Rirb {
-    regs: &'static mut RirbRegs,
-    rirb_base: *mut u64,
-    rirb_base_phys: usize,
-    rirb_rp: u16,
-    rirb_count: usize,
-}
-
-impl Rirb {
-    pub fn new(regs_addr: usize, rirb_buff_phys: usize, rirb_buff_virt: *mut u64) -> Rirb {
-        unsafe {
-            Rirb {
-                regs: &mut *(regs_addr as *mut RirbRegs),
-                rirb_base: rirb_buff_virt,
-                rirb_rp: 0,
-                rirb_base_phys: rirb_buff_phys,
-                rirb_count: 0,
-            }
-        }
-    }
-    //Intel 4.4.1.3
-    pub fn init(&mut self) -> Result<()> {
-        self.stop()?;
-
-        let rirbsize_reg = self.regs.rirbsize.read();
-        let rirbszcap = (rirbsize_reg >> 4) & 0xF;
-
-        let mut rirbsize_bytes: usize = 0;
-        let mut rirbsize: u8 = 0;
-
-        if (rirbszcap & 4) == 4 {
-            rirbsize = 2;
-            rirbsize_bytes = 2048;
-
-            self.rirb_count = 256;
-        } else if (rirbszcap & 2) == 2 {
-            rirbsize = 1;
-            rirbsize_bytes = 128;
-
-            self.rirb_count = 8;
-        } else if (rirbszcap & 1) == 1 {
-            rirbsize = 0;
-            rirbsize_bytes = 16;
-
-            self.rirb_count = 2;
-        }
-
-        assert!(self.rirb_count != 0);
-
-        let addr = self.rirb_base_phys;
-        self.set_address(addr);
-
-        self.reset_write_pointer();
-        self.rirb_rp = 0;
-
-        self.regs.rintcnt.write(1);
-
-        Ok(())
-    }
-
-    pub fn start(&mut self) {
-        self.regs.rirbctl.writef(RIRBDMAEN | RINTCTL, true);
-    }
-
-    pub fn stop(&mut self) -> Result<()> {
-        let timeout = Timeout::from_secs(1);
-        while self.regs.rirbctl.readf(RIRBDMAEN) {
-            self.regs.rirbctl.writef(RIRBDMAEN, false);
-            timeout.run().map_err(|()| {
-                log::error!("timeout on clearing RIRBDMAEN");
-                Error::new(EIO)
-            })?;
-        }
-        Ok(())
-    }
-
-    pub fn set_address(&mut self, addr: usize) {
-        self.regs.rirblbase.write((addr & 0xFFFFFFFF) as u32);
-        self.regs.rirbubase.write(((addr as u64) >> 32) as u32);
-    }
-
-    pub fn reset_write_pointer(&mut self) {
-        self.regs.rirbwp.writef(RIRBWPRST, true);
-    }
-
-    fn read_response(&mut self) -> Result<u64> {
-        {
-            // wait for response
-            let timeout = Timeout::from_secs(1);
-            while (self.regs.rirbwp.read() & 0xff) == (self.rirb_rp & 0xff) {
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on RIRB response");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-        let read_pos: u16 = (self.rirb_rp + 1) % self.rirb_count as u16;
-
-        let res: u64;
-        unsafe {
-            res = *self.rirb_base.offset(read_pos as isize);
-        }
-        self.rirb_rp = read_pos;
-        log::trace!("Rirb: {:08X}", res);
-        Ok(res)
-    }
-}
-
-struct ImmediateCommandRegs {
-    icoi: Mmio<u32>,
-    irii: Mmio<u32>,
-    ics: Mmio<u16>,
-    rsvd7: [Mmio<u8>; 6],
-}
-
-pub struct ImmediateCommand {
-    regs: &'static mut ImmediateCommandRegs,
-}
-
-impl ImmediateCommand {
-    pub fn new(regs_addr: usize) -> ImmediateCommand {
-        unsafe {
-            ImmediateCommand {
-                regs: &mut *(regs_addr as *mut ImmediateCommandRegs),
-            }
-        }
-    }
-
-    pub fn cmd(&mut self, cmd: u32) -> Result<u64> {
-        {
-            // wait for ready
-            let timeout = Timeout::from_secs(1);
-            while self.regs.ics.readf(ICB) {
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on immediate command");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        // write command
-        self.regs.icoi.write(cmd);
-
-        // set ICB bit to send command
-        self.regs.ics.writef(ICB, true);
-
-        {
-            // wait for IRV bit to be set to indicate a response is latched
-            let timeout = Timeout::from_secs(1);
-            while !self.regs.ics.readf(IRV) {
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on immediate response");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        // read the result register twice, total of 8 bytes
-        // highest 4 will most likely be zeros (so I've heard)
-        let mut res: u64 = self.regs.irii.read() as u64;
-        res |= (self.regs.irii.read() as u64) << 32;
-
-        // clear the bit so we know when the next response comes
-        self.regs.ics.writef(IRV, false);
-
-        Ok(res)
-    }
-}
-
-pub struct CommandBuffer {
-    // regs: &'static mut CommandBufferRegs,
-    corb: Corb,
-    rirb: Rirb,
-    icmd: ImmediateCommand,
-
-    use_immediate_cmd: bool,
-    mem: Dma<[u8; 0x1000]>,
-}
-
-impl CommandBuffer {
-    pub fn new(regs_addr: usize, mut cmd_buff: Dma<[u8; 0x1000]>) -> CommandBuffer {
-        let corb = Corb::new(
-            regs_addr + CORB_OFFSET,
-            cmd_buff.physical(),
-            cmd_buff.as_mut_ptr().cast(),
-        );
-        let rirb = Rirb::new(
-            regs_addr + RIRB_OFFSET,
-            cmd_buff.physical() + CORB_BUFF_MAX_SIZE,
-            cmd_buff
-                .as_mut_ptr()
-                .cast::<u8>()
-                .wrapping_add(CORB_BUFF_MAX_SIZE)
-                .cast(),
-        );
-
-        let icmd = ImmediateCommand::new(regs_addr + ICMD_OFFSET);
-
-        let cmdbuff = CommandBuffer {
-            corb,
-            rirb,
-            icmd,
-
-            use_immediate_cmd: false,
-
-            mem: cmd_buff,
-        };
-
-        cmdbuff
-    }
-
-    pub fn init(&mut self, use_imm_cmds: bool) -> Result<()> {
-        self.corb.init()?;
-        self.rirb.init()?;
-        self.set_use_imm_cmds(use_imm_cmds)?;
-        Ok(())
-    }
-
-    pub fn stop(&mut self) -> Result<()> {
-        self.corb.stop()?;
-        self.rirb.stop()?;
-        Ok(())
-    }
-
-    pub fn cmd12(&mut self, addr: WidgetAddr, command: u32, data: u8) -> Result<u64> {
-        let mut ncmd: u32 = 0;
-
-        ncmd |= (addr.0 as u32 & 0x00F) << 28;
-        ncmd |= (addr.1 as u32 & 0x0FF) << 20;
-        ncmd |= (command & 0xFFF) << 8;
-        ncmd |= (data as u32 & 0x0FF) << 0;
-        self.cmd(ncmd)
-    }
-    pub fn cmd4(&mut self, addr: WidgetAddr, command: u32, data: u16) -> Result<u64> {
-        let mut ncmd: u32 = 0;
-
-        ncmd |= (addr.0 as u32 & 0x000F) << 28;
-        ncmd |= (addr.1 as u32 & 0x00FF) << 20;
-        ncmd |= (command & 0x000F) << 16;
-        ncmd |= (data as u32 & 0xFFFF) << 0;
-        self.cmd(ncmd)
-    }
-
-    pub fn cmd(&mut self, cmd: u32) -> Result<u64> {
-        if self.use_immediate_cmd {
-            self.cmd_imm(cmd)
-        } else {
-            self.cmd_buff(cmd)
-        }
-    }
-
-    pub fn cmd_imm(&mut self, cmd: u32) -> Result<u64> {
-        self.icmd.cmd(cmd)
-    }
-
-    pub fn cmd_buff(&mut self, cmd: u32) -> Result<u64> {
-        self.corb.send_command(cmd)?;
-        self.rirb.read_response()
-    }
-
-    pub fn set_use_imm_cmds(&mut self, use_imm: bool) -> Result<()> {
-        self.use_immediate_cmd = use_imm;
-
-        if self.use_immediate_cmd {
-            self.corb.stop()?;
-            self.rirb.stop()?;
-        } else {
-            self.corb.start();
-            self.rirb.start();
-        }
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/audio/ihdad/src/hda/common.rs b/recipes/core/base/drivers/audio/ihdad/src/hda/common.rs
deleted file mode 100644
index c2d5215e94..0000000000
--- a/recipes/core/base/drivers/audio/ihdad/src/hda/common.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use std::fmt;
-use std::mem::transmute;
-
-pub type HDANodeAddr = u16;
-pub type HDACodecAddr = u8;
-
-pub type NodeAddr = u16;
-pub type CodecAddr = u8;
-
-pub type WidgetAddr = (CodecAddr, NodeAddr);
-/*
-impl fmt::Display for WidgetAddr {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:01X}:{:02X}\n", self.0, self.1)
-    }
-}*/
-
-#[derive(Debug, PartialEq)]
-#[repr(u8)]
-pub enum HDAWidgetType {
-    AudioOutput = 0x0,
-    AudioInput = 0x1,
-    AudioMixer = 0x2,
-    AudioSelector = 0x3,
-    PinComplex = 0x4,
-    Power = 0x5,
-    VolumeKnob = 0x6,
-    BeepGenerator = 0x7,
-
-    VendorDefined = 0xf,
-}
-
-impl fmt::Display for HDAWidgetType {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self)
-    }
-}
-
-#[derive(Debug, PartialEq)]
-#[repr(u8)]
-pub enum DefaultDevice {
-    LineOut = 0x0,
-    Speaker = 0x1,
-    HPOut = 0x2,
-    CD = 0x3,
-    SPDIF = 0x4,
-    DigitalOtherOut = 0x5,
-    ModemLineSide = 0x6,
-    ModemHandsetSide = 0x7,
-    LineIn = 0x8,
-    AUX = 0x9,
-    MicIn = 0xA,
-    Telephony = 0xB,
-    SPDIFIn = 0xC,
-    DigitalOtherIn = 0xD,
-    Reserved = 0xE,
-    Other = 0xF,
-}
-
-#[derive(Debug)]
-#[repr(u8)]
-pub enum PortConnectivity {
-    ConnectedToJack = 0x0,
-    NoPhysicalConnection = 0x1,
-    FixedFunction = 0x2,
-    JackAndInternal = 0x3,
-}
-
-#[derive(Debug)]
-#[repr(u8)]
-pub enum GrossLocation {
-    ExternalOnPrimary = 0x0,
-    Internal = 0x1,
-    SeperateChasis = 0x2,
-    Other = 0x3,
-}
-
-#[derive(Debug)]
-#[repr(u8)]
-pub enum GeometricLocation {
-    NA = 0x0,
-    Rear = 0x1,
-    Front = 0x2,
-    Left = 0x3,
-    Right = 0x4,
-    Top = 0x5,
-    Bottom = 0x6,
-    Special1 = 0x7,
-    Special2 = 0x8,
-    Special3 = 0x9,
-    Resvd1 = 0xA,
-    Resvd2 = 0xB,
-    Resvd3 = 0xC,
-    Resvd4 = 0xD,
-    Resvd5 = 0xE,
-    Resvd6 = 0xF,
-}
-
-#[derive(Debug)]
-#[repr(u8)]
-pub enum Color {
-    Unknown = 0x0,
-    Black = 0x1,
-    Grey = 0x2,
-    Blue = 0x3,
-    Green = 0x4,
-    Red = 0x5,
-    Orange = 0x6,
-    Yellow = 0x7,
-    Purple = 0x8,
-    Pink = 0x9,
-    Resvd1 = 0xA,
-    Resvd2 = 0xB,
-    Resvd3 = 0xC,
-    Resvd4 = 0xD,
-    White = 0xE,
-    Other = 0xF,
-}
-
-pub struct ConfigurationDefault {
-    value: u32,
-}
-
-impl ConfigurationDefault {
-    pub fn from_u32(value: u32) -> ConfigurationDefault {
-        ConfigurationDefault { value: value }
-    }
-
-    pub fn color(&self) -> Color {
-        unsafe { transmute(((self.value >> 12) & 0xF) as u8) }
-    }
-
-    pub fn default_device(&self) -> DefaultDevice {
-        unsafe { transmute(((self.value >> 20) & 0xF) as u8) }
-    }
-
-    pub fn port_connectivity(&self) -> PortConnectivity {
-        unsafe { transmute(((self.value >> 30) & 0x3) as u8) }
-    }
-
-    pub fn gross_location(&self) -> GrossLocation {
-        unsafe { transmute(((self.value >> 28) & 0x3) as u8) }
-    }
-
-    pub fn geometric_location(&self) -> GeometricLocation {
-        unsafe { transmute(((self.value >> 24) & 0x7) as u8) }
-    }
-
-    pub fn is_output(&self) -> bool {
-        match self.default_device() {
-            DefaultDevice::LineOut
-            | DefaultDevice::Speaker
-            | DefaultDevice::HPOut
-            | DefaultDevice::CD
-            | DefaultDevice::SPDIF
-            | DefaultDevice::DigitalOtherOut
-            | DefaultDevice::ModemLineSide => true,
-            _ => false,
-        }
-    }
-
-    pub fn is_input(&self) -> bool {
-        match self.default_device() {
-            DefaultDevice::ModemHandsetSide
-            | DefaultDevice::LineIn
-            | DefaultDevice::AUX
-            | DefaultDevice::MicIn
-            | DefaultDevice::Telephony
-            | DefaultDevice::SPDIFIn
-            | DefaultDevice::DigitalOtherIn => true,
-            _ => false,
-        }
-    }
-
-    pub fn sequence(&self) -> u8 {
-        (self.value & 0xF) as u8
-    }
-
-    pub fn default_association(&self) -> u8 {
-        ((self.value >> 4) & 0xF) as u8
-    }
-}
-
-impl fmt::Display for ConfigurationDefault {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "{:?} {:?} {:?} {:?}",
-            self.default_device(),
-            self.color(),
-            self.gross_location(),
-            self.geometric_location()
-        )
-    }
-}
diff --git a/recipes/core/base/drivers/audio/ihdad/src/hda/device.rs b/recipes/core/base/drivers/audio/ihdad/src/hda/device.rs
deleted file mode 100755
index 78e8f0a281..0000000000
--- a/recipes/core/base/drivers/audio/ihdad/src/hda/device.rs
+++ /dev/null
@@ -1,1086 +0,0 @@
-#![allow(dead_code)]
-
-use std::collections::HashMap;
-use std::fmt::Write;
-use std::str;
-use std::task::Poll;
-use std::thread;
-use std::time::Duration;
-
-use common::dma::Dma;
-use common::io::{Io, Mmio};
-use common::timeout::Timeout;
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::CallerCtx;
-use redox_scheme::OpenResult;
-use scheme_utils::{FpathWriter, HandleMap};
-use syscall::error::{Error, Result, EACCES, EBADF, EIO, ENODEV, EWOULDBLOCK};
-
-use spin::Mutex;
-use syscall::schemev2::NewFdFlags;
-
-use super::common::*;
-use super::BitsPerSample;
-use super::BufferDescriptorListEntry;
-use super::CommandBuffer;
-use super::HDANode;
-use super::OutputStream;
-use super::StreamBuffer;
-use super::StreamDescriptorRegs;
-
-// GCTL - Global Control
-const CRST: u32 = 1 << 0; // 1 bit
-const FNCTRL: u32 = 1 << 1; // 1 bit
-const UNSOL: u32 = 1 << 8; // 1 bit
-
-// CORBCTL
-const CMEIE: u8 = 1 << 0; // 1 bit
-const CORBRUN: u8 = 1 << 1; // 1 bit
-
-// CORBSIZE
-const CORBSZCAP: (u8, u8) = (4, 4);
-const CORBSIZE: (u8, u8) = (0, 2);
-
-// CORBRP
-const CORBRPRST: u16 = 1 << 15;
-
-// RIRBWP
-const RIRBWPRST: u16 = 1 << 15;
-
-// RIRBCTL
-const RINTCTL: u8 = 1 << 0; // 1 bit
-const RIRBDMAEN: u8 = 1 << 1; // 1 bit
-
-// ICS
-const ICB: u16 = 1 << 0;
-const IRV: u16 = 1 << 1;
-
-// CORB and RIRB offset
-
-const COMMAND_BUFFER_OFFSET: usize = 0x40;
-
-const NUM_SUB_BUFFS: usize = 32;
-const SUB_BUFF_SIZE: usize = 2048;
-
-enum Handle {
-    Todo,
-    Pcmout(usize, usize, usize), // Card, index, block_ptr
-    Pcmin(usize, usize, usize),  // Card, index, block_ptr
-    StrBuf(Vec<u8>),
-    SchemeRoot,
-}
-
-#[repr(C, packed)]
-#[allow(dead_code)]
-struct Regs {
-    gcap: Mmio<u16>,
-    vmin: Mmio<u8>,
-    vmaj: Mmio<u8>,
-    outpay: Mmio<u16>,
-    inpay: Mmio<u16>,
-    gctl: Mmio<u32>,
-    wakeen: Mmio<u16>,
-    statests: Mmio<u16>,
-    gsts: Mmio<u16>,
-    rsvd0: [Mmio<u8>; 6],
-    outstrmpay: Mmio<u16>,
-    instrmpay: Mmio<u16>,
-    rsvd1: [Mmio<u8>; 4],
-    intctl: Mmio<u32>,
-    intsts: Mmio<u32>,
-    rsvd2: [Mmio<u8>; 8],
-    walclk: Mmio<u32>,
-    rsvd3: Mmio<u32>,
-    ssync: Mmio<u32>,
-    rsvd4: Mmio<u32>,
-
-    corblbase: Mmio<u32>,
-    corbubase: Mmio<u32>,
-    corbwp: Mmio<u16>,
-    corbrp: Mmio<u16>,
-    corbctl: Mmio<u8>,
-    corbsts: Mmio<u8>,
-    corbsize: Mmio<u8>,
-    rsvd5: Mmio<u8>,
-
-    rirblbase: Mmio<u32>,
-    rirbubase: Mmio<u32>,
-    rirbwp: Mmio<u16>,
-    rintcnt: Mmio<u16>,
-    rirbctl: Mmio<u8>,
-    rirbsts: Mmio<u8>,
-    rirbsize: Mmio<u8>,
-    rsvd6: Mmio<u8>,
-
-    icoi: Mmio<u32>,
-    irii: Mmio<u32>,
-    ics: Mmio<u16>,
-    rsvd7: [Mmio<u8>; 6],
-
-    dplbase: Mmio<u32>, // 0x70
-    dpubase: Mmio<u32>, // 0x74
-}
-
-pub struct IntelHDA {
-    vend_prod: u32,
-
-    base: usize,
-    regs: &'static mut Regs,
-
-    //corb_rirb_base_phys: usize,
-    cmd: CommandBuffer,
-
-    codecs: Vec<CodecAddr>,
-
-    outputs: Vec<WidgetAddr>,
-    inputs: Vec<WidgetAddr>,
-
-    widget_map: HashMap<WidgetAddr, HDANode>,
-
-    output_pins: Vec<WidgetAddr>,
-    input_pins: Vec<WidgetAddr>,
-
-    beep_addr: WidgetAddr,
-
-    buff_desc: Dma<[BufferDescriptorListEntry; 256]>,
-
-    output_streams: Vec<OutputStream>,
-
-    buffs: Vec<Vec<StreamBuffer>>,
-
-    int_counter: usize,
-    handles: Mutex<HandleMap<Handle>>,
-}
-
-impl IntelHDA {
-    pub unsafe fn new(base: usize, vend_prod: u32) -> Result<Self> {
-        let regs = &mut *(base as *mut Regs);
-
-        let buff_desc = Dma::<[BufferDescriptorListEntry; 256]>::zeroed()
-            .expect("Could not allocate physical memory for buffer descriptor list.")
-            .assume_init();
-
-        log::debug!(
-            "Virt: {:016X}, Phys: {:016X}",
-            buff_desc.as_ptr() as usize,
-            buff_desc.physical()
-        );
-
-        let cmd_buff = Dma::<[u8; 0x1000]>::zeroed()
-            .expect("Could not allocate physical memory for CORB and RIRB.")
-            .assume_init();
-
-        log::debug!(
-            "Virt: {:016X}, Phys: {:016X}",
-            cmd_buff.as_ptr() as usize,
-            cmd_buff.physical()
-        );
-        let mut module = IntelHDA {
-            vend_prod,
-            base,
-            regs,
-
-            cmd: CommandBuffer::new(base + COMMAND_BUFFER_OFFSET, cmd_buff),
-
-            beep_addr: (0, 0),
-
-            widget_map: HashMap::<WidgetAddr, HDANode>::new(),
-
-            codecs: Vec::<CodecAddr>::new(),
-
-            outputs: Vec::<WidgetAddr>::new(),
-            inputs: Vec::<WidgetAddr>::new(),
-
-            output_pins: Vec::<WidgetAddr>::new(),
-            input_pins: Vec::<WidgetAddr>::new(),
-
-            buff_desc,
-
-            output_streams: Vec::<OutputStream>::new(),
-
-            buffs: Vec::<Vec<StreamBuffer>>::new(),
-
-            int_counter: 0,
-            handles: Mutex::new(HandleMap::new()),
-        };
-
-        module.init()?;
-
-        module.info();
-        module.enumerate()?;
-
-        module.configure()?;
-        log::debug!("IHDA: Initialization finished.");
-        Ok(module)
-    }
-
-    pub fn init(&mut self) -> Result<()> {
-        self.reset_controller()?;
-
-        let use_immediate_command_interface = match self.vend_prod {
-            0x8086_2668 => false,
-            _ => true,
-        };
-
-        self.cmd.init(use_immediate_command_interface)?;
-        self.init_interrupts();
-
-        Ok(())
-    }
-
-    pub fn init_interrupts(&mut self) {
-        // TODO: provide a function to enable certain interrupts
-        // This just enables the first output stream interupt and the global interrupt
-
-        let iss = self.num_input_streams();
-        self.regs
-            .intctl
-            .write((1 << 31) | /* (1 << 30) |*/ (1 << iss));
-    }
-
-    pub fn irq(&mut self) -> bool {
-        self.int_counter += 1;
-
-        self.handle_interrupts()
-    }
-
-    pub fn int_count(&self) -> usize {
-        self.int_counter
-    }
-
-    pub fn read_node(&mut self, addr: WidgetAddr) -> Result<HDANode> {
-        let mut node = HDANode::new();
-        let mut temp: u64;
-
-        node.addr = addr;
-
-        temp = self.cmd.cmd12(addr, 0xF00, 0x04)?;
-
-        node.subnode_count = (temp & 0xff) as u16;
-        node.subnode_start = ((temp >> 16) & 0xff) as u16;
-
-        if addr == (0, 0) {
-            return Ok(node);
-        }
-        temp = self.cmd.cmd12(addr, 0xF00, 0x04)?;
-
-        node.function_group_type = (temp & 0xff) as u8;
-
-        temp = self.cmd.cmd12(addr, 0xF00, 0x09)?;
-        node.capabilities = temp as u32;
-
-        temp = self.cmd.cmd12(addr, 0xF00, 0x0E)?;
-
-        node.conn_list_len = (temp & 0xFF) as u8;
-
-        node.connections = self.node_get_connection_list(&node)?;
-
-        node.connection_default = self.cmd.cmd12(addr, 0xF01, 0x00)? as u8;
-
-        node.config_default = self.cmd.cmd12(addr, 0xF1C, 0x00)? as u32;
-
-        Ok(node)
-    }
-
-    pub fn node_get_connection_list(&mut self, node: &HDANode) -> Result<Vec<WidgetAddr>> {
-        let len_field: u8 = (self.cmd.cmd12(node.addr, 0xF00, 0x0E)? & 0xFF) as u8;
-
-        // Highest bit is if addresses are represented in longer notation
-        // lower 7 is actual count
-
-        let count: u8 = len_field & 0x7F;
-        let use_long_addr: bool = (len_field >> 7) & 0x1 == 1;
-
-        let mut current: u8 = 0;
-
-        let mut list = Vec::<WidgetAddr>::new();
-
-        while current < count {
-            let response: u32 = (self.cmd.cmd12(node.addr, 0xF02, current)? & 0xFFFFFFFF) as u32;
-
-            if use_long_addr {
-                for i in 0..2 {
-                    let addr_field = ((response >> (16 * i)) & 0xFFFF) as u16;
-                    let addr = addr_field & 0x7FFF;
-
-                    if addr == 0 {
-                        break;
-                    }
-
-                    if (addr_field >> 15) & 0x1 == 0x1 {
-                        for i in list.pop().unwrap().1..(addr + 1) {
-                            list.push((node.addr.0, i));
-                        }
-                    } else {
-                        list.push((node.addr.0, addr));
-                    }
-                }
-            } else {
-                for i in 0..4 {
-                    let addr_field = ((response >> (8 * i)) & 0xff) as u16;
-                    let addr = addr_field & 0x7F;
-
-                    if addr == 0 {
-                        break;
-                    }
-
-                    if (addr_field >> 7) & 0x1 == 0x1 {
-                        for i in list.pop().unwrap().1..(addr + 1) {
-                            list.push((node.addr.0, i));
-                        }
-                    } else {
-                        list.push((node.addr.0, addr));
-                    }
-                }
-            }
-
-            current = list.len() as u8;
-        }
-
-        Ok(list)
-    }
-
-    pub fn enumerate(&mut self) -> Result<()> {
-        self.output_pins.clear();
-        self.input_pins.clear();
-
-        let codec: u8 = 0;
-
-        let root = self.read_node((codec, 0))?;
-
-        log::debug!("{}", root);
-
-        let root_count = root.subnode_count;
-        let root_start = root.subnode_start;
-
-        //FIXME: So basically the way this is set up is to only support one codec and hopes the first one is an audio
-        for i in 0..root_count {
-            let afg = self.read_node((codec, root_start + i))?;
-            log::debug!("{}", afg);
-            let afg_count = afg.subnode_count;
-            let afg_start = afg.subnode_start;
-
-            for j in 0..afg_count {
-                let mut widget = self.read_node((codec, afg_start + j))?;
-                widget.is_widget = true;
-                match widget.widget_type() {
-                    HDAWidgetType::AudioOutput => self.outputs.push(widget.addr),
-                    HDAWidgetType::AudioInput => self.inputs.push(widget.addr),
-                    HDAWidgetType::BeepGenerator => self.beep_addr = widget.addr,
-                    HDAWidgetType::PinComplex => {
-                        let config = widget.configuration_default();
-                        if config.is_output() {
-                            self.output_pins.push(widget.addr);
-                        } else if config.is_input() {
-                            self.input_pins.push(widget.addr);
-                        }
-                    }
-                    _ => {}
-                }
-
-                log::debug!("{}", widget);
-                self.widget_map.insert(widget.addr(), widget);
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn find_best_output_pin(&mut self) -> Result<WidgetAddr> {
-        let outs = &self.output_pins;
-        if outs.len() == 1 {
-            return Ok(outs[0]);
-        } else if outs.len() > 1 {
-            //TODO: change output based on "unsolicited response" interrupts
-            // Check for devices in this order: Headphone, Speaker, Line Out
-            for supported_device in &[DefaultDevice::HPOut, DefaultDevice::Speaker] {
-                for &out in outs {
-                    let widget = self.widget_map.get(&out).unwrap();
-                    let cd = widget.configuration_default();
-                    if cd.sequence() == 0 && &cd.default_device() == supported_device {
-                        // Check for jack detect bit
-                        let pin_caps = self.cmd.cmd12(widget.addr, 0xF00, 0x0C)?;
-                        if pin_caps & (1 << 2) != 0 {
-                            // Check for presence
-                            let pin_sense = self.cmd.cmd12(widget.addr, 0xF09, 0)?;
-                            if pin_sense & (1 << 31) == 0 {
-                                // Skip if nothing is plugged in
-                                continue;
-                            }
-                        }
-                        return Ok(out);
-                    }
-                }
-            }
-        }
-        Err(Error::new(ENODEV))
-    }
-
-    pub fn find_path_to_dac(&self, addr: WidgetAddr) -> Option<Vec<WidgetAddr>> {
-        let widget = self.widget_map.get(&addr).unwrap();
-        if widget.widget_type() == HDAWidgetType::AudioOutput {
-            Some(vec![addr])
-        } else {
-            let connection = widget.connections.get(widget.connection_default as usize)?;
-            let mut path = self.find_path_to_dac(*connection)?;
-            path.insert(0, addr);
-            Some(path)
-        }
-    }
-
-    /*
-      Here we update the buffers and split them into 128 byte sub chunks
-      because each BufferDescriptorList needs to be 128 byte aligned,
-      this makes it so each of the streams can have up to 128/16 (8) buffer descriptors
-    */
-    /*
-      Vec of a Vec was doing something weird and causing the driver to hang.
-      So now we have a set of variables instead.
-
-
-      Fixed?
-    */
-
-    pub fn update_sound_buffers(&mut self) {
-        /*
-        for i in 0..self.buffs.len(){
-            for j in 0.. min(self.buffs[i].len(), 128/16 ) {
-                self.buff_desc[i * 128/16 + j].set_address(self.buffs[i][j].phys());
-                self.buff_desc[i * 128/16 + j].set_length(self.buffs[i][j].length() as u32);
-                self.buff_desc[i * 128/16 + j].set_interrupt_on_complete(true);
-            }
-        }*/
-
-        let r = self.get_output_stream_descriptor(0).unwrap();
-
-        self.output_streams
-            .push(OutputStream::new(NUM_SUB_BUFFS, SUB_BUFF_SIZE, r));
-
-        let o = self.output_streams.get_mut(0).unwrap();
-
-        for i in 0..NUM_SUB_BUFFS {
-            self.buff_desc[i].set_address((o.phys() + o.block_size() * i) as u64);
-            self.buff_desc[i].set_length(o.block_size() as u32);
-            self.buff_desc[i].set_interrupt_on_complete(true);
-        }
-    }
-
-    pub fn configure(&mut self) -> Result<()> {
-        let outpin = self.find_best_output_pin()?;
-
-        log::debug!("Best pin: {:01X}:{:02X}", outpin.0, outpin.1);
-
-        let path = self.find_path_to_dac(outpin).unwrap();
-
-        let dac = *path.last().unwrap();
-        let pin = *path.first().unwrap();
-
-        log::debug!("Path to DAC: {:X?}", path);
-
-        // Set power state 0 (on) for all widgets in path
-        for &addr in &path {
-            self.set_power_state(addr, 0)?;
-        }
-
-        // Pin enable (0x80 = headphone amp enable, 0x40 = output enable)
-        self.cmd.cmd12(pin, 0x707, 0xC0)?;
-
-        // EAPD enable
-        self.cmd.cmd12(pin, 0x70C, 2)?;
-
-        // Set DAC stream and channel
-        self.set_stream_channel(dac, 1, 0)?;
-
-        self.update_sound_buffers();
-
-        log::debug!(
-            "Supported Formats: {:08X}",
-            self.get_supported_formats((0, 0x1))?
-        );
-        log::debug!("Capabilities: {:08X}", self.get_capabilities(path[0])?);
-
-        // Create output stream
-        let output = self.get_output_stream_descriptor(0).unwrap();
-        output.set_address(self.buff_desc.physical());
-        output.set_pcm_format(&super::SR_44_1, BitsPerSample::Bits16, 2);
-        output.set_cyclic_buffer_length((NUM_SUB_BUFFS * SUB_BUFF_SIZE) as u32); // number of bytes
-        output.set_stream_number(1);
-        output.set_last_valid_index((NUM_SUB_BUFFS - 1) as u16);
-        output.set_interrupt_on_completion(true);
-
-        // Set DAC converter format
-        self.set_converter_format(dac, &super::SR_44_1, BitsPerSample::Bits16, 2)?;
-
-        // Get DAC converter format
-        //TODO: should validate?
-        self.cmd.cmd12(dac, 0xA00, 0)?;
-
-        // Unmute and set gain to 0db for input and output amplifiers on all widgets in path
-        for &addr in &path {
-            // Read widget capabilities
-            let caps = self.cmd.cmd12(addr, 0xF00, 0x09)?;
-
-            //TODO: do we need to set any other indexes?
-            let left = true;
-            let right = true;
-            let index = 0;
-            let mute = false;
-
-            // Check for input amp
-            if (caps & (1 << 1)) != 0 {
-                // Read input capabilities
-                let in_caps = self.cmd.cmd12(addr, 0xF00, 0x0D)?;
-                let in_gain = (in_caps & 0x7f) as u8;
-                // Set input gain
-                let output = false;
-                let input = true;
-                self.set_amplifier_gain_mute(
-                    addr, output, input, left, right, index, mute, in_gain,
-                )?;
-                log::debug!("Set {:X?} input gain to 0x{:X}", addr, in_gain);
-            }
-
-            // Check for output amp
-            if (caps & (1 << 2)) != 0 {
-                // Read output capabilities
-                let out_caps = self.cmd.cmd12(addr, 0xF00, 0x12)?;
-                let out_gain = (out_caps & 0x7f) as u8;
-                // Set output gain
-                let output = true;
-                let input = false;
-                self.set_amplifier_gain_mute(
-                    addr, output, input, left, right, index, mute, out_gain,
-                )?;
-                log::debug!("Set {:X?} output gain to 0x{:X}", addr, out_gain);
-            }
-        }
-
-        //TODO: implement hda-verb?
-
-        output.run();
-        {
-            log::debug!("Waiting for output 0 to start running...");
-            let timeout = Timeout::from_secs(1);
-            while output.control() & (1 << 1) == 0 {
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on output running");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        log::debug!(
-            "Output 0 CONTROL {:#X} STATUS {:#X} POS {:#X}",
-            output.control(),
-            output.status(),
-            output.link_position()
-        );
-        Ok(())
-    }
-    /*
-
-    pub fn configure_vbox(&mut self) {
-
-        let outpin = self.find_best_output_pin().expect("IHDA: No output pins?!");
-
-        log::debug!("Best pin: {:01X}:{:02X}", outpin.0, outpin.1);
-
-        let path = self.find_path_to_dac(outpin).unwrap();
-        log::debug!("Path to DAC: {:X?}", path);
-
-        // Pin enable
-        self.cmd.cmd12((0,0xC), 0x707, 0x40);
-
-
-        // EAPD enable
-        self.cmd.cmd12((0,0xC), 0x70C, 2);
-
-        self.set_stream_channel((0,0x3), 1, 0);
-
-        self.update_sound_buffers();
-
-
-        log::debug!("Supported Formats: {:08X}", self.get_supported_formats((0,0x1)));
-        log::debug!("Capabilities: {:08X}", self.get_capabilities((0,0x1)));
-
-        let output = self.get_output_stream_descriptor(0).unwrap();
-
-        output.set_address(self.buff_desc_phys);
-
-        output.set_pcm_format(&super::SR_44_1, BitsPerSample::Bits16, 2);
-        output.set_cyclic_buffer_length((NUM_SUB_BUFFS * SUB_BUFF_SIZE) as u32);
-        output.set_stream_number(1);
-        output.set_last_valid_index((NUM_SUB_BUFFS - 1) as u16);
-        output.set_interrupt_on_completion(true);
-
-
-        self.set_power_state((0,0x3), 0); // Power state 0 is fully on
-        self.set_converter_format((0,0x3), &super::SR_44_1, BitsPerSample::Bits16, 2);
-
-
-        self.cmd.cmd12((0,0x3), 0xA00, 0);
-
-        // Unmute and set gain for pin complex and DAC
-        self.set_amplifier_gain_mute((0,0x3), true, true, true, true, 0, false, 0x7f);
-        self.set_amplifier_gain_mute((0,0xC), true, true, true, true, 0, false, 0x7f);
-
-        output.run();
-
-        self.beep(1);
-
-    }
-
-    */
-
-    pub fn dump_codec(&self, codec: u8) -> String {
-        let mut string = String::new();
-
-        for (_, widget) in self.widget_map.iter() {
-            let _ = writeln!(string, "{}", widget);
-        }
-
-        string
-    }
-
-    // BEEP!!
-    pub fn beep(&mut self, div: u8) {
-        let addr = self.beep_addr;
-        if addr != (0, 0) {
-            let _ = self.cmd.cmd12(addr, 0xF0A, div);
-        }
-    }
-
-    pub fn reset_controller(&mut self) -> Result<()> {
-        self.cmd.stop()?;
-
-        self.regs.statests.write(0x7FFF);
-
-        // 3.3.7
-        {
-            let timeout = Timeout::from_secs(1);
-            self.regs.gctl.writef(CRST, false);
-            loop {
-                if !self.regs.gctl.readf(CRST) {
-                    break;
-                }
-                timeout.run().map_err(|()| {
-                    log::error!("failed to start reset");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        thread::sleep(Duration::from_millis(1));
-
-        {
-            let timeout = Timeout::from_secs(1);
-            self.regs.gctl.writef(CRST, true);
-            loop {
-                if self.regs.gctl.readf(CRST) {
-                    break;
-                }
-                timeout.run().map_err(|()| {
-                    log::error!("failed to finish reset");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        thread::sleep(Duration::from_millis(2));
-
-        let mut ticks: u32 = 0;
-        while self.regs.statests.read() == 0 {
-            ticks += 1;
-            if ticks > 10000 {
-                break;
-            }
-        }
-
-        let statests = self.regs.statests.read();
-        log::debug!("Statests: {:04X}", statests);
-
-        for i in 0..15 {
-            if (statests >> i) & 0x1 == 1 {
-                self.codecs.push(i as CodecAddr);
-            }
-        }
-        Ok(())
-    }
-
-    pub fn num_output_streams(&self) -> usize {
-        let gcap = self.regs.gcap.read();
-        ((gcap >> 12) & 0xF) as usize
-    }
-
-    pub fn num_input_streams(&self) -> usize {
-        let gcap = self.regs.gcap.read();
-        ((gcap >> 8) & 0xF) as usize
-    }
-
-    pub fn num_bidirectional_streams(&self) -> usize {
-        let gcap = self.regs.gcap.read();
-        ((gcap >> 3) & 0xF) as usize
-    }
-
-    pub fn num_serial_data_out(&self) -> usize {
-        let gcap = self.regs.gcap.read();
-        ((gcap >> 1) & 0x3) as usize
-    }
-
-    pub fn info(&self) {
-        log::debug!(
-            "Intel HD Audio Version {}.{}",
-            self.regs.vmaj.read(),
-            self.regs.vmin.read()
-        );
-        log::debug!("IHDA: Input Streams: {}", self.num_input_streams());
-        log::debug!("IHDA: Output Streams: {}", self.num_output_streams());
-        log::debug!(
-            "IHDA: Bidirectional Streams: {}",
-            self.num_bidirectional_streams()
-        );
-        log::debug!("IHDA: Serial Data Outputs: {}", self.num_serial_data_out());
-        log::debug!("IHDA: 64-Bit: {}", self.regs.gcap.read() & 1 == 1);
-    }
-
-    fn get_input_stream_descriptor(
-        &self,
-        index: usize,
-    ) -> Option<&'static mut StreamDescriptorRegs> {
-        unsafe {
-            if index < self.num_input_streams() {
-                Some(&mut *((self.base + 0x80 + index * 0x20) as *mut StreamDescriptorRegs))
-            } else {
-                None
-            }
-        }
-    }
-
-    fn get_output_stream_descriptor(
-        &self,
-        index: usize,
-    ) -> Option<&'static mut StreamDescriptorRegs> {
-        unsafe {
-            if index < self.num_output_streams() {
-                Some(
-                    &mut *((self.base + 0x80 + self.num_input_streams() * 0x20 + index * 0x20)
-                        as *mut StreamDescriptorRegs),
-                )
-            } else {
-                None
-            }
-        }
-    }
-
-    fn get_bidirectional_stream_descriptor(
-        &self,
-        index: usize,
-    ) -> Option<&'static mut StreamDescriptorRegs> {
-        unsafe {
-            if index < self.num_bidirectional_streams() {
-                Some(
-                    &mut *((self.base
-                        + 0x80
-                        + self.num_input_streams() * 0x20
-                        + self.num_output_streams() * 0x20
-                        + index * 0x20) as *mut StreamDescriptorRegs),
-                )
-            } else {
-                None
-            }
-        }
-    }
-
-    fn set_dma_position_buff_addr(&mut self, addr: u64) {
-        let addr_val = addr & !0x7F;
-        self.regs.dplbase.write((addr_val & 0xFFFFFFFF) as u32);
-        self.regs.dpubase.write((addr_val >> 32) as u32);
-    }
-
-    fn set_stream_channel(&mut self, addr: WidgetAddr, stream: u8, channel: u8) -> Result<()> {
-        let val = ((stream & 0xF) << 4) | (channel & 0xF);
-        self.cmd.cmd12(addr, 0x706, val)?;
-        Ok(())
-    }
-
-    fn set_power_state(&mut self, addr: WidgetAddr, state: u8) -> Result<()> {
-        self.cmd.cmd12(addr, 0x705, state & 0xF)?;
-        Ok(())
-    }
-
-    fn get_supported_formats(&mut self, addr: WidgetAddr) -> Result<u32> {
-        Ok(self.cmd.cmd12(addr, 0xF00, 0x0A)? as u32)
-    }
-
-    fn get_capabilities(&mut self, addr: WidgetAddr) -> Result<u32> {
-        Ok(self.cmd.cmd12(addr, 0xF00, 0x09)? as u32)
-    }
-
-    fn set_converter_format(
-        &mut self,
-        addr: WidgetAddr,
-        sr: &super::SampleRate,
-        bps: BitsPerSample,
-        channels: u8,
-    ) -> Result<()> {
-        let fmt = super::format_to_u16(sr, bps, channels);
-        self.cmd.cmd4(addr, 0x2, fmt)?;
-        Ok(())
-    }
-
-    fn set_amplifier_gain_mute(
-        &mut self,
-        addr: WidgetAddr,
-        output: bool,
-        input: bool,
-        left: bool,
-        right: bool,
-        index: u8,
-        mute: bool,
-        gain: u8,
-    ) -> Result<()> {
-        let mut payload: u16 = 0;
-
-        if output {
-            payload |= 1 << 15;
-        }
-        if input {
-            payload |= 1 << 14;
-        }
-        if left {
-            payload |= 1 << 13;
-        }
-        if right {
-            payload |= 1 << 12;
-        }
-        if mute {
-            payload |= 1 << 7;
-        }
-        payload |= ((index as u16) & 0x0F) << 8;
-        payload |= (gain as u16) & 0x7F;
-
-        self.cmd.cmd4(addr, 0x3, payload)?;
-        Ok(())
-    }
-
-    pub fn write_to_output(&mut self, index: u8, buf: &[u8]) -> Poll<Result<usize>> {
-        let output = self.get_output_stream_descriptor(index as usize).unwrap();
-        let os = self.output_streams.get_mut(index as usize).unwrap();
-
-        //let sample_size:usize = output.sample_size();
-        let open_block = (output.link_position() as usize) / os.block_size();
-
-        //log::trace!("Status: {:02X} Pos: {:08X} Output CTL: {:06X}", output.status(), output.link_position(), output.control());
-
-        if os.current_block() == (open_block + 3) % NUM_SUB_BUFFS {
-            // Block if we already are 3 buffers ahead
-            Poll::Pending
-        } else {
-            Poll::Ready(os.write_block(buf))
-        }
-    }
-
-    pub fn handle_interrupts(&mut self) -> bool {
-        let intsts = self.regs.intsts.read();
-        if ((intsts >> 31) & 1) == 1 {
-            // Global Interrupt Status
-            if ((intsts >> 30) & 1) == 1 {
-                // Controller Interrupt Status
-                self.handle_controller_interrupt();
-            }
-
-            let sis = intsts & 0x3FFFFFFF;
-            if sis != 0 {
-                self.handle_stream_interrupts(sis);
-            }
-        }
-        intsts != 0
-    }
-
-    pub fn handle_controller_interrupt(&mut self) {}
-
-    pub fn handle_stream_interrupts(&mut self, sis: u32) {
-        let iss = self.num_input_streams();
-        let oss = self.num_output_streams();
-        let bss = self.num_bidirectional_streams();
-
-        for i in 0..iss {
-            if ((sis >> i) & 1) == 1 {
-                let input = self.get_input_stream_descriptor(i).unwrap();
-                input.clear_interrupts();
-            }
-        }
-
-        for i in 0..oss {
-            if ((sis >> (i + iss)) & 1) == 1 {
-                let output = self.get_output_stream_descriptor(i).unwrap();
-                output.clear_interrupts();
-            }
-        }
-
-        for i in 0..bss {
-            if ((sis >> (i + iss + oss)) & 1) == 1 {
-                let bid = self.get_bidirectional_stream_descriptor(i).unwrap();
-                bid.clear_interrupts();
-            }
-        }
-    }
-
-    fn validate_path(&mut self, path: &Vec<&str>) -> bool {
-        log::debug!("Path: {:?}", path);
-        let mut it = path.iter();
-        match it.next() {
-            Some(card_str) if (*card_str).starts_with("card") => {
-                match usize::from_str_radix(&(*card_str)[4..], 10) {
-                    Ok(card_num) => {
-                        log::debug!("Card# {}", card_num);
-                        match it.next() {
-                            Some(codec_str) if (*codec_str).starts_with("codec#") => {
-                                match usize::from_str_radix(&(*codec_str)[6..], 10) {
-                                    Ok(_codec_num) => {
-                                        //let id = self.next_id.fetch_add(1, Ordering::SeqCst);
-                                        //self.handles.lock().insert(id, Handle::Disk(disk.clone(), 0));
-                                        true
-                                    }
-                                    _ => false,
-                                }
-                            }
-                            Some(pcmout_str) if (*pcmout_str).starts_with("pcmout") => {
-                                match usize::from_str_radix(&(*pcmout_str)[6..], 10) {
-                                    Ok(pcmout_num) => {
-                                        log::debug!("pcmout {}", pcmout_num);
-                                        true
-                                    }
-                                    _ => false,
-                                }
-                            }
-                            Some(pcmin_str) if (*pcmin_str).starts_with("pcmin") => {
-                                match usize::from_str_radix(&(*pcmin_str)[6..], 10) {
-                                    Ok(pcmin_num) => {
-                                        log::debug!("pcmin {}", pcmin_num);
-                                        true
-                                    }
-                                    _ => false,
-                                }
-                            }
-                            _ => false,
-                        }
-                    }
-                    _ => false,
-                }
-            }
-            Some(cards_str) if *cards_str == "cards" => true,
-            _ => false,
-        }
-    }
-}
-
-impl Drop for IntelHDA {
-    fn drop(&mut self) {
-        log::debug!("IHDA: Deallocating IHDA driver.");
-    }
-}
-
-impl SchemeSync for IntelHDA {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.lock().insert(Handle::SchemeRoot))
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        {
-            let handles = self.handles.lock();
-            let handle = handles.get(dirfd)?;
-            if !matches!(handle, Handle::SchemeRoot) {
-                return Err(Error::new(EACCES));
-            }
-        }
-        //let path: Vec<&str>;
-        /*
-        match str::from_utf8(_path) {
-            Ok(p)  => {
-                    path = p.split("/").collect();
-                    if !self.validate_path(&path) {
-                        return Err(Error::new(EINVAL));
-
-                },
-            Err(_) => {return Err(Error::new(EINVAL));},
-        }*/
-
-        // TODO:
-        if ctx.uid != 0 {
-            return Err(Error::new(EACCES));
-        }
-        let handle = match path.trim_matches('/') {
-            //TODO: allow multiple codecs
-            "codec" => Handle::StrBuf(self.dump_codec(0).into_bytes()),
-            _ => Handle::Todo,
-        };
-        let id = self.handles.lock().insert(handle);
-
-        // TODO: always positioned?
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::POSITIONED,
-        })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        offset: u64,
-        _flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handles = self.handles.lock();
-        let Handle::StrBuf(strbuf) = handles.get(id)? else {
-            return Err(Error::new(EBADF));
-        };
-
-        let src = usize::try_from(offset)
-            .ok()
-            .and_then(|o| strbuf.get(o..))
-            .unwrap_or(&[]);
-        let len = src.len().min(buf.len());
-        buf[..len].copy_from_slice(&src[..len]);
-        Ok(len)
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let index = {
-            let mut handles = self.handles.lock();
-            match handles.get_mut(id)? {
-                Handle::Todo => 0,
-                _ => return Err(Error::new(EBADF)),
-            }
-        };
-
-        //log::debug!("Int count: {}", self.int_counter);
-
-        match self.write_to_output(index, buf) {
-            Poll::Ready(r) => r,
-            Poll::Pending => Err(Error::new(EWOULDBLOCK)),
-        }
-    }
-
-    fn fpath(&mut self, _id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, "audiohw", |_| Ok(()))
-    }
-
-    fn on_close(&mut self, id: usize) {
-        self.handles.lock().remove(id);
-    }
-}
diff --git a/recipes/core/base/drivers/audio/ihdad/src/hda/mod.rs b/recipes/core/base/drivers/audio/ihdad/src/hda/mod.rs
deleted file mode 100644
index 7f01daf8ca..0000000000
--- a/recipes/core/base/drivers/audio/ihdad/src/hda/mod.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#![allow(dead_code)]
-pub mod cmdbuff;
-pub mod common;
-pub mod device;
-pub mod node;
-pub mod stream;
-
-pub use self::node::*;
-pub use self::stream::*;
-
-pub use self::cmdbuff::*;
-pub use self::device::IntelHDA;
-pub use self::stream::BitsPerSample;
-pub use self::stream::BufferDescriptorListEntry;
-pub use self::stream::StreamBuffer;
-pub use self::stream::StreamDescriptorRegs;
diff --git a/recipes/core/base/drivers/audio/ihdad/src/hda/node.rs b/recipes/core/base/drivers/audio/ihdad/src/hda/node.rs
deleted file mode 100644
index 06c5121fd7..0000000000
--- a/recipes/core/base/drivers/audio/ihdad/src/hda/node.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use super::common::*;
-use std::{fmt, mem};
-
-#[derive(Clone)]
-pub struct HDANode {
-    pub addr: WidgetAddr,
-
-    // 0x4
-    pub subnode_count: u16,
-    pub subnode_start: u16,
-
-    // 0x5
-    pub function_group_type: u8,
-
-    // 0x9
-    pub capabilities: u32,
-
-    // 0xE
-    pub conn_list_len: u8,
-
-    pub connections: Vec<WidgetAddr>,
-
-    pub connection_default: u8,
-
-    pub is_widget: bool,
-
-    pub config_default: u32,
-}
-
-impl HDANode {
-    pub fn new() -> HDANode {
-        HDANode {
-            addr: (0, 0),
-            subnode_count: 0,
-            subnode_start: 0,
-            function_group_type: 0,
-            capabilities: 0,
-            conn_list_len: 0,
-
-            config_default: 0,
-            is_widget: false,
-            connections: Vec::<WidgetAddr>::new(),
-            connection_default: 0,
-        }
-    }
-
-    pub fn widget_type(&self) -> HDAWidgetType {
-        unsafe { mem::transmute(((self.capabilities >> 20) & 0xF) as u8) }
-    }
-
-    pub fn device_default(&self) -> Option<DefaultDevice> {
-        if self.widget_type() != HDAWidgetType::PinComplex {
-            None
-        } else {
-            Some(unsafe { mem::transmute(((self.config_default >> 20) & 0xF) as u8) })
-        }
-    }
-
-    pub fn configuration_default(&self) -> ConfigurationDefault {
-        ConfigurationDefault::from_u32(self.config_default)
-    }
-
-    pub fn addr(&self) -> WidgetAddr {
-        self.addr
-    }
-}
-
-impl fmt::Display for HDANode {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if self.addr == (0, 0) {
-            write!(
-                f,
-                "Addr: {:02X}:{:02X}, Root Node.",
-                self.addr.0, self.addr.1
-            )
-        } else if self.is_widget {
-            match self.widget_type() {
-                HDAWidgetType::PinComplex => write!(
-                    f,
-                    "Addr: {:02X}:{:02X}, Type: {:?}: {:?}, Inputs: {}/{}: {:X?}.",
-                    self.addr.0,
-                    self.addr.1,
-                    self.widget_type(),
-                    self.device_default().unwrap(),
-                    self.connection_default,
-                    self.conn_list_len,
-                    self.connections
-                ),
-                _ => write!(
-                    f,
-                    "Addr: {:02X}:{:02X}, Type: {:?}, Inputs: {}/{}: {:X?}.",
-                    self.addr.0,
-                    self.addr.1,
-                    self.widget_type(),
-                    self.connection_default,
-                    self.conn_list_len,
-                    self.connections
-                ),
-            }
-        } else {
-            write!(
-                f,
-                "Addr: {:02X}:{:02X}, AFG: {}, Widget count {}.",
-                self.addr.0, self.addr.1, self.function_group_type, self.subnode_count
-            )
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/audio/ihdad/src/hda/stream.rs b/recipes/core/base/drivers/audio/ihdad/src/hda/stream.rs
deleted file mode 100644
index caa3c36445..0000000000
--- a/recipes/core/base/drivers/audio/ihdad/src/hda/stream.rs
+++ /dev/null
@@ -1,387 +0,0 @@
-use common::dma::Dma;
-use common::io::{Io, Mmio};
-use std::cmp::min;
-use std::ptr::copy_nonoverlapping;
-use std::result;
-use syscall::error::{Error, Result, EIO};
-use syscall::PAGE_SIZE;
-
-extern crate syscall;
-
-pub enum BaseRate {
-    BR44_1,
-    BR48,
-}
-
-pub struct SampleRate {
-    base: BaseRate,
-    mult: u16,
-    div: u16,
-}
-
-use self::BaseRate::{BR44_1, BR48};
-
-pub const SR_8: SampleRate = SampleRate {
-    base: BR48,
-    mult: 1,
-    div: 6,
-};
-pub const SR_11_025: SampleRate = SampleRate {
-    base: BR44_1,
-    mult: 1,
-    div: 4,
-};
-pub const SR_16: SampleRate = SampleRate {
-    base: BR48,
-    mult: 1,
-    div: 3,
-};
-pub const SR_22_05: SampleRate = SampleRate {
-    base: BR44_1,
-    mult: 1,
-    div: 2,
-};
-pub const SR_32: SampleRate = SampleRate {
-    base: BR48,
-    mult: 2,
-    div: 3,
-};
-
-pub const SR_44_1: SampleRate = SampleRate {
-    base: BR44_1,
-    mult: 1,
-    div: 1,
-};
-pub const SR_48: SampleRate = SampleRate {
-    base: BR48,
-    mult: 1,
-    div: 1,
-};
-pub const SR_88_1: SampleRate = SampleRate {
-    base: BR44_1,
-    mult: 2,
-    div: 1,
-};
-pub const SR_96: SampleRate = SampleRate {
-    base: BR48,
-    mult: 2,
-    div: 1,
-};
-pub const SR_176_4: SampleRate = SampleRate {
-    base: BR44_1,
-    mult: 4,
-    div: 1,
-};
-pub const SR_192: SampleRate = SampleRate {
-    base: BR48,
-    mult: 4,
-    div: 1,
-};
-
-#[repr(u8)]
-pub enum BitsPerSample {
-    Bits8 = 0,
-    Bits16 = 1,
-    Bits20 = 2,
-    Bits24 = 3,
-    Bits32 = 4,
-}
-
-pub fn format_to_u16(sr: &SampleRate, bps: BitsPerSample, channels: u8) -> u16 {
-    // 3.3.41
-
-    let base: u16 = match sr.base {
-        BaseRate::BR44_1 => 1 << 14,
-        BaseRate::BR48 => 0,
-    };
-
-    let mult = ((sr.mult - 1) & 0x7) << 11;
-
-    let div = ((sr.div - 1) & 0x7) << 8;
-
-    let bits = (bps as u16) << 4;
-
-    let chan = ((channels - 1) & 0xF) as u16;
-
-    let val: u16 = base | mult | div | bits | chan;
-
-    val
-}
-
-#[repr(C, packed)]
-pub struct StreamDescriptorRegs {
-    ctrl_lo: Mmio<u16>,
-    ctrl_hi: Mmio<u8>,
-    status: Mmio<u8>,
-    link_pos: Mmio<u32>,
-    buff_length: Mmio<u32>,
-    last_valid_index: Mmio<u16>,
-    resv1: Mmio<u16>,
-    fifo_size_: Mmio<u16>,
-    format: Mmio<u16>,
-    resv2: Mmio<u32>,
-    buff_desc_list_lo: Mmio<u32>,
-    buff_desc_list_hi: Mmio<u32>,
-}
-
-impl StreamDescriptorRegs {
-    pub fn status(&self) -> u8 {
-        self.status.read()
-    }
-
-    pub fn set_status(&mut self, status: u8) {
-        self.status.write(status);
-    }
-
-    pub fn control(&self) -> u32 {
-        let mut ctrl = self.ctrl_lo.read() as u32;
-        ctrl |= (self.ctrl_hi.read() as u32) << 16;
-        ctrl
-    }
-
-    pub fn set_control(&mut self, control: u32) {
-        self.ctrl_lo.write((control & 0xFFFF) as u16);
-        self.ctrl_hi.write(((control >> 16) & 0xFF) as u8);
-    }
-
-    pub fn set_pcm_format(&mut self, sr: &SampleRate, bps: BitsPerSample, channels: u8) {
-        // 3.3.41
-
-        let val = format_to_u16(sr, bps, channels);
-        self.format.write(val);
-    }
-
-    pub fn fifo_size(&self) -> u16 {
-        self.fifo_size_.read()
-    }
-
-    pub fn set_cyclic_buffer_length(&mut self, length: u32) {
-        self.buff_length.write(length);
-    }
-
-    pub fn cyclic_buffer_length(&self) -> u32 {
-        self.buff_length.read()
-    }
-
-    pub fn run(&mut self) {
-        let val = self.control() | (1 << 1);
-        self.set_control(val);
-    }
-
-    pub fn stop(&mut self) {
-        let val = self.control() & !(1 << 1);
-        self.set_control(val);
-    }
-
-    pub fn stream_number(&self) -> u8 {
-        ((self.control() >> 20) & 0xF) as u8
-    }
-
-    pub fn set_stream_number(&mut self, stream_number: u8) {
-        let val = (self.control() & 0x00FFFF) | (((stream_number & 0xF) as u32) << 20);
-        self.set_control(val);
-    }
-
-    pub fn set_address(&mut self, addr: usize) {
-        self.buff_desc_list_lo.write((addr & 0xFFFFFFFF) as u32);
-        self.buff_desc_list_hi
-            .write((((addr as u64) >> 32) & 0xFFFFFFFF) as u32);
-    }
-
-    pub fn set_last_valid_index(&mut self, index: u16) {
-        self.last_valid_index.write(index);
-    }
-
-    pub fn link_position(&self) -> u32 {
-        self.link_pos.read()
-    }
-
-    pub fn set_interrupt_on_completion(&mut self, enable: bool) {
-        let mut ctrl = self.control();
-        if enable {
-            ctrl |= 1 << 2;
-        } else {
-            ctrl &= !(1 << 2);
-        }
-        self.set_control(ctrl);
-    }
-
-    pub fn buffer_complete(&self) -> bool {
-        self.status.readf(1 << 2)
-    }
-
-    pub fn clear_interrupts(&mut self) {
-        self.status.write(0x7 << 2);
-    }
-
-    // get sample size in bytes
-    pub fn sample_size(&self) -> usize {
-        let format = self.format.read();
-        let chan = (format & 0xF) as usize;
-        let bits = ((format >> 4) & 0xF) as usize;
-        match bits {
-            0 => 1 * (chan + 1),
-            1 => 2 * (chan + 1),
-            _ => 4 * (chan + 1),
-        }
-    }
-}
-
-pub struct OutputStream {
-    buff: StreamBuffer,
-
-    desc_regs: &'static mut StreamDescriptorRegs,
-}
-
-impl OutputStream {
-    pub fn new(
-        block_count: usize,
-        block_length: usize,
-        regs: &'static mut StreamDescriptorRegs,
-    ) -> OutputStream {
-        OutputStream {
-            buff: StreamBuffer::new(block_length, block_count).unwrap(),
-
-            desc_regs: regs,
-        }
-    }
-
-    pub fn write_block(&mut self, buf: &[u8]) -> Result<usize> {
-        self.buff.write_block(buf)
-    }
-
-    pub fn block_size(&self) -> usize {
-        self.buff.block_size()
-    }
-
-    pub fn block_count(&self) -> usize {
-        self.buff.block_count()
-    }
-
-    pub fn current_block(&self) -> usize {
-        self.buff.current_block()
-    }
-
-    pub fn addr(&self) -> usize {
-        self.buff.addr()
-    }
-
-    pub fn phys(&self) -> usize {
-        self.buff.phys()
-    }
-}
-
-#[repr(C, packed)]
-pub struct BufferDescriptorListEntry {
-    addr_low: Mmio<u32>,
-    addr_high: Mmio<u32>,
-    len: Mmio<u32>,
-    ioc_resv: Mmio<u32>,
-}
-
-impl BufferDescriptorListEntry {
-    pub fn address(&self) -> u64 {
-        (self.addr_low.read() as u64) | ((self.addr_high.read() as u64) << 32)
-    }
-
-    pub fn set_address(&mut self, addr: u64) {
-        self.addr_low.write(addr as u32);
-        self.addr_high.write((addr >> 32) as u32);
-    }
-
-    pub fn length(&self) -> u32 {
-        self.len.read()
-    }
-
-    pub fn set_length(&mut self, length: u32) {
-        self.len.write(length)
-    }
-
-    pub fn interrupt_on_completion(&self) -> bool {
-        (self.ioc_resv.read() & 0x1) == 0x1
-    }
-
-    pub fn set_interrupt_on_complete(&mut self, ioc: bool) {
-        self.ioc_resv.writef(1, ioc);
-    }
-}
-
-pub struct StreamBuffer {
-    mem: Dma<[u8]>,
-
-    block_cnt: usize,
-    block_len: usize,
-
-    cur_pos: usize,
-}
-
-impl StreamBuffer {
-    pub fn new(
-        block_length: usize,
-        block_count: usize,
-    ) -> result::Result<StreamBuffer, &'static str> {
-        let page_aligned_size = (block_length * block_count).next_multiple_of(PAGE_SIZE);
-        let mem = unsafe {
-            Dma::zeroed_slice(page_aligned_size)
-                .map_err(|_| "Could not allocate physical memory for buffer.")?
-                .assume_init()
-        };
-
-        Ok(StreamBuffer {
-            mem,
-            block_len: block_length,
-            block_cnt: block_count,
-            cur_pos: 0,
-        })
-    }
-
-    pub fn length(&self) -> usize {
-        self.block_len * self.block_cnt
-    }
-
-    pub fn addr(&self) -> usize {
-        self.mem.as_ptr() as usize
-    }
-
-    pub fn phys(&self) -> usize {
-        self.mem.physical()
-    }
-
-    pub fn block_size(&self) -> usize {
-        self.block_len
-    }
-
-    pub fn block_count(&self) -> usize {
-        self.block_cnt
-    }
-
-    pub fn current_block(&self) -> usize {
-        self.cur_pos
-    }
-
-    pub fn write_block(&mut self, buf: &[u8]) -> Result<usize> {
-        if buf.len() != self.block_size() {
-            return Err(Error::new(EIO));
-        }
-        let len = min(self.block_size(), buf.len());
-
-        //log::trace!("Phys: {:X} Virt: {:X} Offset: {:X} Len: {:X}", self.phys(), self.addr(), self.current_block() * self.block_size(), len);
-        unsafe {
-            copy_nonoverlapping(
-                buf.as_ptr(),
-                (self.addr() + self.current_block() * self.block_size()) as *mut u8,
-                len,
-            );
-        }
-
-        self.cur_pos += 1;
-        self.cur_pos %= self.block_count();
-
-        Ok(len)
-    }
-}
-impl Drop for StreamBuffer {
-    fn drop(&mut self) {
-        log::debug!("IHDA: Deallocating buffer.");
-    }
-}
diff --git a/recipes/core/base/drivers/audio/ihdad/src/main.rs b/recipes/core/base/drivers/audio/ihdad/src/main.rs
deleted file mode 100755
index 31a2add737..0000000000
--- a/recipes/core/base/drivers/audio/ihdad/src/main.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use redox_scheme::scheme::register_sync_scheme;
-use redox_scheme::Socket;
-use scheme_utils::ReadinessBased;
-use std::io::{Read, Write};
-use std::os::unix::io::AsRawFd;
-use std::usize;
-
-use event::{user_data, EventQueue};
-use pcid_interface::irq_helpers::pci_allocate_interrupt_vector;
-use pcid_interface::PciFunctionHandle;
-
-pub mod hda;
-
-/*
-VEND:PROD
-Virtualbox   8086:2668
-QEMU ICH9    8086:293E
-82801H ICH8  8086:284B
-*/
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_ihda");
-
-    common::setup_logging(
-        "audio",
-        "pci",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    log::info!("IHDA {}", pci_config.func.display());
-
-    let address = unsafe { pcid_handle.map_bar(0) }.ptr.as_ptr() as usize;
-
-    let irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "ihdad");
-
-    {
-        let vend_prod: u32 = ((pci_config.func.full_device_id.vendor_id as u32) << 16)
-            | (pci_config.func.full_device_id.device_id as u32);
-
-        user_data! {
-            enum Source {
-                Irq,
-                Scheme,
-            }
-        }
-
-        let event_queue =
-            EventQueue::<Source>::new().expect("ihdad: Could not create event queue.");
-        let socket = Socket::nonblock().expect("ihdad: failed to create socket");
-        let mut device = unsafe {
-            hda::IntelHDA::new(address, vend_prod).expect("ihdad: failed to allocate device")
-        };
-        let mut readiness_based = ReadinessBased::new(&socket, 16);
-
-        register_sync_scheme(&socket, "audiohw", &mut device)
-            .expect("ihdad: failed to register audiohw scheme to namespace");
-        daemon.ready();
-
-        event_queue
-            .subscribe(
-                socket.inner().raw(),
-                Source::Scheme,
-                event::EventFlags::READ,
-            )
-            .unwrap();
-        event_queue
-            .subscribe(
-                irq_file.irq_handle().as_raw_fd() as usize,
-                Source::Irq,
-                event::EventFlags::READ,
-            )
-            .unwrap();
-
-        libredox::call::setrens(0, 0).expect("ihdad: failed to enter null namespace");
-
-        let all = [Source::Irq, Source::Scheme];
-
-        for event in all
-            .into_iter()
-            .chain(event_queue.map(|e| e.expect("failed to get next event").user_data))
-        {
-            match event {
-                Source::Irq => {
-                    let mut irq = [0; 8];
-                    irq_file.irq_handle().read(&mut irq).unwrap();
-
-                    if !device.irq() {
-                        continue;
-                    }
-                    irq_file.irq_handle().write(&mut irq).unwrap();
-
-                    readiness_based
-                        .poll_all_requests(&mut device)
-                        .expect("ihdad: failed to poll requests");
-                    readiness_based
-                        .write_responses()
-                        .expect("ihdad: failed to write to socket");
-
-                    /*
-                    let next_read = device_irq.next_read();
-                    if next_read > 0 {
-                    return Ok(Some(next_read));
-                    }
-                    */
-                }
-                Source::Scheme => {
-                    readiness_based
-                        .read_and_process_requests(&mut device)
-                        .expect("ihdad: failed to read from socket");
-                    readiness_based
-                        .write_responses()
-                        .expect("ihdad: failed to write to socket");
-
-                    /*
-                    let next_read = device.borrow().next_read();
-                    if next_read > 0 {
-                    return Ok(Some(next_read));
-                    }
-                    */
-                }
-            }
-        }
-
-        std::process::exit(0);
-    }
-}
diff --git a/recipes/core/base/drivers/audio/sb16d/Cargo.toml b/recipes/core/base/drivers/audio/sb16d/Cargo.toml
deleted file mode 100644
index a54c7287a8..0000000000
--- a/recipes/core/base/drivers/audio/sb16d/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "sb16d"
-description = "Sound Blaster sound card driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-bitflags.workspace = true
-common = { path = "../../common" }
-libredox.workspace = true
-log.workspace = true
-daemon = { path = "../../../daemon" }
-redox_event.workspace = true
-redox_syscall.workspace = true
-spin.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/audio/sb16d/src/device.rs b/recipes/core/base/drivers/audio/sb16d/src/device.rs
deleted file mode 100644
index 5667ce764a..0000000000
--- a/recipes/core/base/drivers/audio/sb16d/src/device.rs
+++ /dev/null
@@ -1,232 +0,0 @@
-use std::{thread, time};
-
-use common::io::{Io, Pio, ReadOnly, WriteOnly};
-
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::CallerCtx;
-use redox_scheme::OpenResult;
-use scheme_utils::{FpathWriter, HandleMap};
-use syscall::error::{Error, Result, EACCES, EBADF, ENODEV};
-use syscall::schemev2::NewFdFlags;
-
-use spin::Mutex;
-
-const NUM_SUB_BUFFS: usize = 32;
-const SUB_BUFF_SIZE: usize = 2048;
-
-enum Handle {
-    Todo,
-    SchemeRoot,
-}
-
-#[allow(dead_code)]
-pub struct Sb16 {
-    handles: Mutex<HandleMap<Handle>>,
-    pub(crate) irqs: Vec<u8>,
-    dmas: Vec<u8>,
-    // Regs
-    /* 0x04 */ mixer_addr: WriteOnly<Pio<u8>>,
-    /* 0x05 */ mixer_data: Pio<u8>,
-    /* 0x06 */ dsp_reset: WriteOnly<Pio<u8>>,
-    /* 0x0A */ dsp_read_data: ReadOnly<Pio<u8>>,
-    /* 0x0C */ dsp_write_data: WriteOnly<Pio<u8>>,
-    /* 0x0C */ dsp_write_status: ReadOnly<Pio<u8>>,
-    /* 0x0E */ dsp_read_status: ReadOnly<Pio<u8>>,
-}
-
-impl Sb16 {
-    pub unsafe fn new(addr: u16) -> Result<Self> {
-        let mut module = Sb16 {
-            handles: Mutex::new(HandleMap::new()),
-            irqs: Vec::new(),
-            dmas: Vec::new(),
-            // Regs
-            mixer_addr: WriteOnly::new(Pio::new(addr + 0x04)),
-            mixer_data: Pio::new(addr + 0x05),
-            dsp_reset: WriteOnly::new(Pio::new(addr + 0x06)),
-            dsp_read_data: ReadOnly::new(Pio::new(addr + 0x0A)),
-            dsp_write_data: WriteOnly::new(Pio::new(addr + 0x0C)),
-            dsp_write_status: ReadOnly::new(Pio::new(addr + 0x0C)),
-            dsp_read_status: ReadOnly::new(Pio::new(addr + 0x0E)),
-        };
-
-        module.init()?;
-
-        Ok(module)
-    }
-
-    fn mixer_read(&mut self, index: u8) -> u8 {
-        self.mixer_addr.write(index);
-        self.mixer_data.read()
-    }
-
-    fn mixer_write(&mut self, index: u8, value: u8) {
-        self.mixer_addr.write(index);
-        self.mixer_data.write(value);
-    }
-
-    fn dsp_read(&mut self) -> Result<u8> {
-        // Bit 7 must be 1 before data can be sent
-        while !self.dsp_read_status.readf(1 << 7) {
-            //TODO: timeout!
-            std::thread::yield_now();
-        }
-
-        Ok(self.dsp_read_data.read())
-    }
-
-    fn dsp_write(&mut self, value: u8) -> Result<()> {
-        // Bit 7 must be 0 before data can be sent
-        while self.dsp_write_status.readf(1 << 7) {
-            //TODO: timeout!
-            std::thread::yield_now();
-        }
-
-        self.dsp_write_data.write(value);
-        Ok(())
-    }
-
-    fn init(&mut self) -> Result<()> {
-        // Perform DSP reset
-        {
-            // Write 1 to reset port
-            self.dsp_reset.write(1);
-
-            // Wait 3us
-            thread::sleep(time::Duration::from_micros(3));
-
-            // Write 0 to reset port
-            self.dsp_reset.write(0);
-
-            //TODO: Wait for ready byte (0xAA) using read status
-            thread::sleep(time::Duration::from_micros(100));
-
-            let ready = self.dsp_read()?;
-            if ready != 0xAA {
-                log::error!("ready byte was 0x{:02X} instead of 0xAA", ready);
-                return Err(Error::new(ENODEV));
-            }
-        }
-
-        // Read DSP version
-        {
-            self.dsp_write(0xE1)?;
-
-            let major = self.dsp_read()?;
-            let minor = self.dsp_read()?;
-            log::info!("DSP version {}.{:02}", major, minor);
-
-            if major != 4 {
-                log::error!("Unsupported DSP major version {}", major);
-                return Err(Error::new(ENODEV));
-            }
-        }
-
-        // Get available IRQs and DMAs
-        {
-            self.irqs.clear();
-            let irq_mask = self.mixer_read(0x80);
-            if (irq_mask & (1 << 0)) != 0 {
-                self.irqs.push(2);
-            }
-            if (irq_mask & (1 << 1)) != 0 {
-                self.irqs.push(5);
-            }
-            if (irq_mask & (1 << 2)) != 0 {
-                self.irqs.push(7);
-            }
-            if (irq_mask & (1 << 3)) != 0 {
-                self.irqs.push(10);
-            }
-
-            self.dmas.clear();
-            let dma_mask = self.mixer_read(0x81);
-            if (dma_mask & (1 << 0)) != 0 {
-                self.dmas.push(0);
-            }
-            if (dma_mask & (1 << 1)) != 0 {
-                self.dmas.push(1);
-            }
-            if (dma_mask & (1 << 3)) != 0 {
-                self.dmas.push(3);
-            }
-            if (dma_mask & (1 << 5)) != 0 {
-                self.dmas.push(5);
-            }
-            if (dma_mask & (1 << 6)) != 0 {
-                self.dmas.push(6);
-            }
-            if (dma_mask & (1 << 7)) != 0 {
-                self.dmas.push(7);
-            }
-
-            log::info!("IRQs {:02X?} DMAs {:02X?}", self.irqs, self.dmas);
-        }
-
-        // Set output sample rate to 44100 Hz (Redox OS standard)
-        {
-            let rate = 44100u16;
-            self.dsp_write(0x41)?;
-            self.dsp_write((rate >> 8) as u8)?;
-            self.dsp_write(rate as u8)?;
-        }
-
-        Ok(())
-    }
-
-    pub fn irq(&mut self) -> bool {
-        //TODO
-        false
-    }
-}
-
-impl SchemeSync for Sb16 {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.lock().insert(Handle::SchemeRoot))
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        _path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        {
-            let handles = self.handles.lock();
-            let handle = handles.get(dirfd)?;
-            if !matches!(handle, Handle::SchemeRoot) {
-                return Err(Error::new(EACCES));
-            }
-        }
-        if ctx.uid == 0 {
-            let id = self.handles.lock().insert(Handle::Todo);
-            Ok(OpenResult::ThisScheme {
-                number: id,
-                flags: NewFdFlags::empty(),
-            })
-        } else {
-            Err(Error::new(EACCES))
-        }
-    }
-
-    fn write(
-        &mut self,
-        _id: usize,
-        _buf: &[u8],
-        _offset: u64,
-        _flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        //TODO
-        Err(Error::new(EBADF))
-    }
-
-    fn fpath(&mut self, _id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, "audiohw", |_| Ok(()))
-    }
-
-    fn on_close(&mut self, id: usize) {
-        self.handles.lock().remove(id);
-    }
-}
diff --git a/recipes/core/base/drivers/audio/sb16d/src/main.rs b/recipes/core/base/drivers/audio/sb16d/src/main.rs
deleted file mode 100644
index 9e351629d3..0000000000
--- a/recipes/core/base/drivers/audio/sb16d/src/main.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use libredox::{flag, Fd};
-use redox_scheme::scheme::register_sync_scheme;
-use redox_scheme::Socket;
-use scheme_utils::ReadinessBased;
-use std::{env, usize};
-
-use event::{user_data, EventQueue};
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub mod device;
-
-fn main() {
-    daemon::Daemon::new(daemon);
-}
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-fn daemon(daemon: daemon::Daemon) -> ! {
-    let mut args = env::args().skip(1);
-
-    let addr_str = args.next().unwrap_or("220".to_string());
-    let addr = u16::from_str_radix(&addr_str, 16).expect("sb16: failed to parse address");
-
-    println!(" + sb16 at 0x{:X}\n", addr);
-
-    common::setup_logging(
-        "audio",
-        "pci",
-        "sb16",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    common::acquire_port_io_rights().expect("sb16d: failed to acquire port IO rights");
-
-    let socket = Socket::nonblock().expect("sb16d: failed to create socket");
-    let mut device = unsafe { device::Sb16::new(addr).expect("sb16d: failed to allocate device") };
-    let mut readiness_based = ReadinessBased::new(&socket, 16);
-
-    //TODO: error on multiple IRQs?
-    let irq_file = match device.irqs.first() {
-        Some(irq) => Fd::open(&format!("/scheme/irq/{}", irq), flag::O_RDWR, 0)
-            .expect("sb16d: failed to open IRQ file"),
-        None => panic!("sb16d: no IRQs found"),
-    };
-    user_data! {
-        enum Source {
-            Irq,
-            Scheme,
-        }
-    }
-
-    let event_queue = EventQueue::<Source>::new().expect("sb16d: Could not create event queue.");
-    event_queue
-        .subscribe(irq_file.raw(), Source::Irq, event::EventFlags::READ)
-        .unwrap();
-    event_queue
-        .subscribe(
-            socket.inner().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    register_sync_scheme(&socket, "sb16d", &mut device)
-        .expect("sb16d: failed to register audiohw scheme to namespace");
-
-    daemon.ready();
-
-    libredox::call::setrens(0, 0).expect("sb16d: failed to enter null namespace");
-
-    let all = [Source::Irq, Source::Scheme];
-
-    for event in all
-        .into_iter()
-        .chain(event_queue.map(|e| e.expect("sb16d: failed to get next event").user_data))
-    {
-        match event {
-            Source::Irq => {
-                let mut irq = [0; 8];
-                irq_file.read(&mut irq).unwrap();
-
-                if !device.irq() {
-                    continue;
-                }
-                irq_file.write(&mut irq).unwrap();
-
-                readiness_based
-                    .poll_all_requests(&mut device)
-                    .expect("sb16d: failed to poll requests");
-                readiness_based
-                    .write_responses()
-                    .expect("sb16d: failed to write to socket");
-
-                /*
-                let next_read = device_irq.next_read();
-                if next_read > 0 {
-                    return Ok(Some(next_read));
-                }
-                */
-            }
-            Source::Scheme => {
-                readiness_based
-                    .read_and_process_requests(&mut device)
-                    .expect("sb16d: failed to read from socket");
-                readiness_based
-                    .write_responses()
-                    .expect("sb16d: failed to write to socket");
-            }
-        }
-    }
-
-    std::process::exit(0);
-}
-
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-fn daemon(daemon: daemon::Daemon) -> ! {
-    unimplemented!()
-}
diff --git a/recipes/core/base/drivers/common/Cargo.toml b/recipes/core/base/drivers/common/Cargo.toml
deleted file mode 100644
index b61be20f66..0000000000
--- a/recipes/core/base/drivers/common/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "common"
-description = "Shared driver code library"
-version = "0.1.0"
-edition = "2021"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-libredox.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-redox-log.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/common/src/dma.rs b/recipes/core/base/drivers/common/src/dma.rs
deleted file mode 100644
index 3d359f4b3b..0000000000
--- a/recipes/core/base/drivers/common/src/dma.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use std::mem::{self, size_of, MaybeUninit};
-use std::ops::{Deref, DerefMut};
-use std::ptr;
-use std::sync::LazyLock;
-
-use libredox::call::MmapArgs;
-use libredox::{error::Result, flag, Fd};
-use syscall::PAGE_SIZE;
-
-use crate::{memory_root_fd, MemoryType, VirtaddrTranslationHandle};
-
-/// Defines the platform-specific memory type for DMA operations
-///
-/// - On x86 systems, DMA uses Write-back memory ([`MemoryType::Writeback`])
-/// - On aarch64 systems, DMA uses uncacheable memory ([`MemoryType::Uncacheable`])
-const DMA_MEMTY: MemoryType = {
-    if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
-        // x86 ensures cache coherence with DMA memory
-        MemoryType::Writeback
-    } else if cfg!(target_arch = "aarch64") {
-        // aarch64 currently must map DMA memory without caching to ensure coherence
-        MemoryType::Uncacheable
-    } else if cfg!(target_arch = "riscv64") {
-        // FIXME check this out more
-        MemoryType::Uncacheable
-    } else {
-        panic!("invalid arch")
-    }
-};
-
-/// Returns a file descriptor for zeroized physically-contiguous DMA memory.
-///
-/// # Returns
-///
-/// A [Result] containing:
-/// - '[Ok]' - A [Fd] (file descriptor) to zeroized, physically continuous DMA usable memory
-/// - '[Err]' - The error returned by the provider of the /scheme/memory/zeroed scheme.
-///
-/// # Errors
-///
-/// This function can return an error in the following case:
-///
-/// - The request for the physical memory fails.
-pub(crate) fn phys_contiguous_fd() -> Result<Fd> {
-    memory_root_fd().openat(
-        &format!("zeroed@{DMA_MEMTY}?phys_contiguous"),
-        flag::O_CLOEXEC,
-        0,
-    )
-}
-
-/// Allocates a chunk of physical memory for DMA, and then maps it to virtual memory.
-///
-/// # Arguments
-/// 'length: [usize]' - The length of the memory region. Must be a multiple of [`PAGE_SIZE`]
-///
-/// # Returns
-///
-/// This function returns a [Result] containing the following:
-/// - A  '[Ok]([usize], *[mut] ())' containing a Tuple of the physical address of the region, and a raw pointer to that region in virtual memory.
-/// - An '[Err]' - containing the error for the operation.
-///
-/// # Errors
-///
-/// This function asserts if:
-/// - length is not a multiple of [`PAGE_SIZE`]
-///
-/// This function returns an error if:
-/// - A file descriptor to physically contiguous memory of type [`DMA_MEMTY`] could not be acquired
-/// - A virtual mapping for the physically contiguous memory could not be created
-/// - The virtual address returned by the memory manager was invalid.
-fn alloc_and_map(length: usize, handle: &VirtaddrTranslationHandle) -> Result<(usize, *mut ())> {
-    assert_eq!(length % PAGE_SIZE, 0);
-    unsafe {
-        let fd = phys_contiguous_fd()?;
-        let virt = libredox::call::mmap(MmapArgs {
-            fd: fd.raw(),
-            offset: 0,                   // ignored
-            addr: core::ptr::null_mut(), // ignored
-            length,
-            flags: flag::MAP_PRIVATE,
-            prot: flag::PROT_READ | flag::PROT_WRITE,
-        })?;
-        let phys = handle.translate(virt as usize)?;
-        for i in 1..length.div_ceil(PAGE_SIZE) {
-            debug_assert_eq!(
-                handle.translate(virt as usize + i * PAGE_SIZE),
-                Ok(phys + i * PAGE_SIZE),
-                "NOT CONTIGUOUS"
-            );
-        }
-        Ok((phys, virt as *mut ()))
-    }
-}
-
-/// A safe accessor for DMA memory.
-pub struct Dma<T: ?Sized> {
-    /// The physical address of the memory
-    phys: usize,
-    /// The page-aligned length of the memory. Will be a multiple of [`PAGE_SIZE`]
-    aligned_len: usize,
-    /// The pointer to the Dma memory in the virtual address space.
-    virt: *mut T,
-}
-
-impl<T> Dma<T> {
-    /// [Dma] constructor that allocates and initializes a region of DMA memory with the page-aligned
-    /// size and initial value of some T
-    ///
-    /// # Arguments
-    /// 'value: T' - The initial value to write to the allocated region
-    ///
-    /// # Returns
-    ///
-    /// This function returns a [Result] containing the following:
-    ///
-    /// - A '[Ok] (`[Dma]<T>`)' containing the initialized region
-    /// - An '[Err]' containing an error.
-    pub fn new(value: T) -> Result<Self> {
-        unsafe {
-            let mut zeroed = Self::zeroed()?;
-            zeroed.as_mut_ptr().write(value);
-            Ok(zeroed.assume_init())
-        }
-    }
-
-    /// [Dma] constructor that allocates and zeroizes a memory region of the page-aligned size of T
-    ///
-    /// # Returns
-    ///
-    /// This function returns a [Result] containing the following:
-    ///
-    /// - A '[Ok] (`[Dma]<[MaybeUninit]<T>>`)' containing the allocated and zeroized memory
-    /// - An '[Err]' containing an error.
-    pub fn zeroed() -> Result<Dma<MaybeUninit<T>>> {
-        let aligned_len = size_of::<T>().next_multiple_of(PAGE_SIZE);
-        let (phys, virt) = alloc_and_map(aligned_len, &*VIRTTOPHYS_HANDLE)?;
-        Ok(Dma {
-            phys,
-            virt: virt.cast(),
-            aligned_len,
-        })
-    }
-}
-
-impl<T> Dma<MaybeUninit<T>> {
-    /// Assumes that possibly uninitialized DMA memory has been initialized, and returns a new
-    /// instance of an object of type `[Dma]<T>`.
-    ///
-    /// # Returns
-    /// - `[Dma]<T>` - The original structure without the [`MaybeUninit`] wrapper around its contents.
-    ///
-    /// # Notes
-    /// - This is unsafe because it assumes that the memory stored within the `[Dma]<T>` is a valid
-    ///   instance of T. If it isn't (for example -- if it was initialized with [`Dma::zeroed`]),
-    ///   then the underlying memory may not contain the expected T structure.
-    pub unsafe fn assume_init(self) -> Dma<T> {
-        let Dma {
-            phys,
-            aligned_len,
-            virt,
-        } = self;
-        mem::forget(self);
-
-        Dma {
-            phys,
-            aligned_len,
-            virt: virt.cast(),
-        }
-    }
-}
-impl<T: ?Sized> Dma<T> {
-    /// Returns the physical address of the physical memory that this [Dma] structure references.
-    ///
-    /// # Returns
-    /// [usize] - The physical address of the memory.
-    pub fn physical(&self) -> usize {
-        self.phys
-    }
-}
-// TODO: there should exist a "context" struct that drivers create at start, which would be passed
-// to the respective functions
-static VIRTTOPHYS_HANDLE: LazyLock<VirtaddrTranslationHandle> = LazyLock::new(|| {
-    VirtaddrTranslationHandle::new().expect("failed to acquire virttophys translation handle")
-});
-
-impl<T> Dma<[T]> {
-    /// Returns a [Dma] object containing a zeroized slice of T with a given count.
-    ///
-    /// # Arguments
-    ///
-    /// - 'count: [usize]' - The number of elements of type T in the allocated slice.
-    pub fn zeroed_slice(count: usize) -> Result<Dma<[MaybeUninit<T>]>> {
-        let aligned_len = count
-            .checked_mul(size_of::<T>())
-            .unwrap()
-            .next_multiple_of(PAGE_SIZE);
-        let (phys, virt) = alloc_and_map(aligned_len, &*VIRTTOPHYS_HANDLE)?;
-
-        Ok(Dma {
-            phys,
-            aligned_len,
-            virt: ptr::slice_from_raw_parts_mut(virt.cast(), count),
-        })
-    }
-
-    /// Casts the slice from type T to type U.
-    ///
-    /// # Returns
-    /// '`[DMA]<U>`' - A cast handle to the Dma memory.
-    pub unsafe fn cast_slice<U>(self) -> Dma<[U]> {
-        let Dma {
-            phys,
-            virt,
-            aligned_len,
-        } = self;
-        core::mem::forget(self);
-
-        Dma {
-            phys,
-            virt: virt as *mut [U],
-            aligned_len,
-        }
-    }
-}
-impl<T> Dma<[MaybeUninit<T>]> {
-    /// See [`Dma<MaybeUninit<T>>::assume_init`]
-    pub unsafe fn assume_init(self) -> Dma<[T]> {
-        let &Dma {
-            phys,
-            aligned_len,
-            virt,
-        } = &self;
-        mem::forget(self);
-
-        Dma {
-            phys,
-            aligned_len,
-            virt: virt as *mut [T],
-        }
-    }
-}
-
-impl<T: ?Sized> Deref for Dma<T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        unsafe { &*self.virt }
-    }
-}
-
-impl<T: ?Sized> DerefMut for Dma<T> {
-    fn deref_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.virt }
-    }
-}
-
-impl<T: ?Sized> Drop for Dma<T> {
-    fn drop(&mut self) {
-        unsafe {
-            ptr::drop_in_place(self.virt);
-            let _ = libredox::call::munmap(self.virt as *mut (), self.aligned_len);
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/common/src/io.rs b/recipes/core/base/drivers/common/src/io.rs
deleted file mode 100644
index 6c7ad20839..0000000000
--- a/recipes/core/base/drivers/common/src/io.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use core::{
-    cmp::PartialEq,
-    ops::{BitAnd, BitOr, Not},
-};
-
-mod mmio;
-mod mmio_ptr;
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-mod pio;
-
-pub use mmio::*;
-pub use mmio_ptr::*;
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub use pio::*;
-
-/// IO abstraction
-pub trait Io {
-    /// Value type for IO, usually some unsigned number
-    type Value: Copy
-        + PartialEq
-        + BitAnd<Output = Self::Value>
-        + BitOr<Output = Self::Value>
-        + Not<Output = Self::Value>;
-
-    /// Read the underlying valu2e
-    fn read(&self) -> Self::Value;
-    /// Write the underlying value
-    fn write(&mut self, value: Self::Value);
-
-    /// Check whether the underlying value contains bit flags
-    #[inline(always)]
-    fn readf(&self, flags: Self::Value) -> bool {
-        (self.read() & flags) as Self::Value == flags
-    }
-
-    /// Enable or disable specific bit flags
-    #[inline(always)]
-    fn writef(&mut self, flags: Self::Value, value: bool) {
-        let tmp: Self::Value = match value {
-            true => self.read() | flags,
-            false => self.read() & !flags,
-        };
-        self.write(tmp);
-    }
-}
-
-/// Read-only IO
-#[repr(transparent)]
-pub struct ReadOnly<I> {
-    inner: I,
-}
-
-impl<I: Io> ReadOnly<I> {
-    /// Wraps IO
-    pub const fn new(inner: I) -> ReadOnly<I> {
-        ReadOnly { inner }
-    }
-}
-
-impl<I: Io> ReadOnly<I> {
-    /// Calls [`Io::read`]
-    #[inline(always)]
-    pub fn read(&self) -> I::Value {
-        self.inner.read()
-    }
-
-    /// Calls [`Io::readf`]
-    #[inline(always)]
-    pub fn readf(&self, flags: I::Value) -> bool {
-        self.inner.readf(flags)
-    }
-}
-
-#[repr(transparent)]
-/// Write-only IO
-pub struct WriteOnly<I> {
-    inner: I,
-}
-
-impl<I: Io> WriteOnly<I> {
-    /// Wraps IO
-    pub const fn new(inner: I) -> WriteOnly<I> {
-        WriteOnly { inner }
-    }
-}
-
-impl<I: Io> WriteOnly<I> {
-    /// Calls [`Io::write`]
-    #[inline(always)]
-    pub fn write(&mut self, value: I::Value) {
-        self.inner.write(value)
-    }
-
-    // writef requires read which is not valid when write-only
-}
diff --git a/recipes/core/base/drivers/common/src/io/mmio.rs b/recipes/core/base/drivers/common/src/io/mmio.rs
deleted file mode 100644
index 1edb71014c..0000000000
--- a/recipes/core/base/drivers/common/src/io/mmio.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-use core::{mem::MaybeUninit, ptr};
-
-use super::Io;
-
-/// MMIO abstraction
-#[repr(C, packed)]
-pub struct Mmio<T> {
-    value: MaybeUninit<T>,
-}
-
-impl<T> Mmio<T> {
-    /// Creates a zeroed instance
-    pub unsafe fn zeroed() -> Self {
-        Self {
-            value: MaybeUninit::zeroed(),
-        }
-    }
-
-    /// Creates an unitialized instance
-    pub unsafe fn uninit() -> Self {
-        Self {
-            value: MaybeUninit::uninit(),
-        }
-    }
-
-    /// Creates a new instance
-    pub const fn new(value: T) -> Self {
-        Self {
-            value: MaybeUninit::new(value),
-        }
-    }
-}
-
-// Generic implementation (WARNING: requires aligned pointers!)
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-impl<T> Io for Mmio<T>
-where
-    T: Copy
-        + PartialEq
-        + core::ops::BitAnd<Output = T>
-        + core::ops::BitOr<Output = T>
-        + core::ops::Not<Output = T>,
-{
-    type Value = T;
-
-    fn read(&self) -> T {
-        unsafe { ptr::read_volatile(ptr::addr_of!(self.value).cast::<T>()) }
-    }
-
-    fn write(&mut self, value: T) {
-        unsafe { ptr::write_volatile(ptr::addr_of_mut!(self.value).cast::<T>(), value) };
-    }
-}
-
-// x86 u8 implementation
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-impl Io for Mmio<u8> {
-    type Value = u8;
-
-    fn read(&self) -> Self::Value {
-        unsafe {
-            let value: Self::Value;
-            let ptr: *const Self::Value = ptr::addr_of!(self.value).cast::<Self::Value>();
-            core::arch::asm!(
-                "mov {}, [{}]",
-                out(reg_byte) value,
-                in(reg) ptr
-            );
-            value
-        }
-    }
-
-    fn write(&mut self, value: Self::Value) {
-        unsafe {
-            let ptr: *mut Self::Value = ptr::addr_of_mut!(self.value).cast::<Self::Value>();
-            core::arch::asm!(
-                "mov [{}], {}",
-                in(reg) ptr,
-                in(reg_byte) value,
-            );
-        }
-    }
-}
-
-// x86 u16 implementation
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-impl Io for Mmio<u16> {
-    type Value = u16;
-
-    fn read(&self) -> Self::Value {
-        unsafe {
-            let value: Self::Value;
-            let ptr: *const Self::Value = ptr::addr_of!(self.value).cast::<Self::Value>();
-            core::arch::asm!(
-                "mov {:x}, [{}]",
-                out(reg) value,
-                in(reg) ptr
-            );
-            value
-        }
-    }
-
-    fn write(&mut self, value: Self::Value) {
-        unsafe {
-            let ptr: *mut Self::Value = ptr::addr_of_mut!(self.value).cast::<Self::Value>();
-            core::arch::asm!(
-                "mov [{}], {:x}",
-                in(reg) ptr,
-                in(reg) value,
-            );
-        }
-    }
-}
-
-// x86 u32 implementation
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-impl Io for Mmio<u32> {
-    type Value = u32;
-
-    fn read(&self) -> Self::Value {
-        unsafe {
-            let value: Self::Value;
-            let ptr: *const Self::Value = ptr::addr_of!(self.value).cast::<Self::Value>();
-            core::arch::asm!(
-                "mov {:e}, [{}]",
-                out(reg) value,
-                in(reg) ptr
-            );
-            value
-        }
-    }
-
-    fn write(&mut self, value: Self::Value) {
-        unsafe {
-            let ptr: *mut Self::Value = ptr::addr_of_mut!(self.value).cast::<Self::Value>();
-            core::arch::asm!(
-                "mov [{}], {:e}",
-                in(reg) ptr,
-                in(reg) value,
-            );
-        }
-    }
-}
-
-// x86 u64 implementation (x86_64 only)
-#[cfg(target_arch = "x86_64")]
-impl Io for Mmio<u64> {
-    type Value = u64;
-
-    fn read(&self) -> Self::Value {
-        unsafe {
-            let value: Self::Value;
-            let ptr: *const Self::Value = ptr::addr_of!(self.value).cast::<Self::Value>();
-            core::arch::asm!(
-                "mov {:r}, [{}]",
-                out(reg) value,
-                in(reg) ptr
-            );
-            value
-        }
-    }
-
-    fn write(&mut self, value: Self::Value) {
-        unsafe {
-            let ptr: *mut Self::Value = ptr::addr_of_mut!(self.value).cast::<Self::Value>();
-            core::arch::asm!(
-                "mov [{}], {:r}",
-                in(reg) ptr,
-                in(reg) value,
-            );
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/common/src/io/mmio_ptr.rs b/recipes/core/base/drivers/common/src/io/mmio_ptr.rs
deleted file mode 100644
index 07c31fec64..0000000000
--- a/recipes/core/base/drivers/common/src/io/mmio_ptr.rs
+++ /dev/null
@@ -1,157 +0,0 @@
-use super::Io;
-
-/// MMIO using pointer instead of wrapped type
-pub struct MmioPtr<T> {
-    ptr: *mut T,
-}
-
-impl<T> MmioPtr<T> {
-    //TODO: reads and writes are unsafe, not new.
-    /// Creates a `MmioPtr`.
-    pub unsafe fn new(ptr: *mut T) -> Self {
-        Self { ptr }
-    }
-
-    /// Creates a const pointer from a `MmioPtr`.
-    pub const fn as_ptr(&self) -> *const T {
-        self.ptr
-    }
-
-    /// Creates a mutable pointer from a `MmioPtr`.
-    pub const fn as_mut_ptr(&mut self) -> *mut T {
-        self.ptr
-    }
-}
-
-// Generic implementation (WARNING: requires aligned pointers!)
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-impl<T> Io for MmioPtr<T>
-where
-    T: Copy
-        + PartialEq
-        + core::ops::BitAnd<Output = T>
-        + core::ops::BitOr<Output = T>
-        + core::ops::Not<Output = T>,
-{
-    type Value = T;
-
-    fn read(&self) -> T {
-        unsafe { core::ptr::read_volatile(self.ptr) }
-    }
-
-    fn write(&mut self, value: T) {
-        unsafe { core::ptr::write_volatile(self.ptr, value) };
-    }
-}
-
-// x86 u8 implementation
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-impl Io for MmioPtr<u8> {
-    type Value = u8;
-
-    fn read(&self) -> Self::Value {
-        unsafe {
-            let value: Self::Value;
-            core::arch::asm!(
-                "mov {}, [{}]",
-                out(reg_byte) value,
-                in(reg) self.ptr
-            );
-            value
-        }
-    }
-
-    fn write(&mut self, value: Self::Value) {
-        unsafe {
-            core::arch::asm!(
-                "mov [{}], {}",
-                in(reg) self.ptr,
-                in(reg_byte) value,
-            );
-        }
-    }
-}
-
-// x86 u16 implementation
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-impl Io for MmioPtr<u16> {
-    type Value = u16;
-
-    fn read(&self) -> Self::Value {
-        unsafe {
-            let value: Self::Value;
-            core::arch::asm!(
-                "mov {:x}, [{}]",
-                out(reg) value,
-                in(reg) self.ptr
-            );
-            value
-        }
-    }
-
-    fn write(&mut self, value: Self::Value) {
-        unsafe {
-            core::arch::asm!(
-                "mov [{}], {:x}",
-                in(reg) self.ptr,
-                in(reg) value,
-            );
-        }
-    }
-}
-
-// x86 u32 implementation
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-impl Io for MmioPtr<u32> {
-    type Value = u32;
-
-    fn read(&self) -> Self::Value {
-        unsafe {
-            let value: Self::Value;
-            core::arch::asm!(
-                "mov {:e}, [{}]",
-                out(reg) value,
-                in(reg) self.ptr
-            );
-            value
-        }
-    }
-
-    fn write(&mut self, value: Self::Value) {
-        unsafe {
-            core::arch::asm!(
-                "mov [{}], {:e}",
-                in(reg) self.ptr,
-                in(reg) value,
-            );
-        }
-    }
-}
-
-// x86 u64 implementation (x86_64 only)
-#[cfg(target_arch = "x86_64")]
-impl Io for MmioPtr<u64> {
-    type Value = u64;
-
-    fn read(&self) -> Self::Value {
-        unsafe {
-            let value: Self::Value;
-            core::arch::asm!(
-                "mov {:r}, [{}]",
-                out(reg) value,
-                in(reg) self.ptr
-            );
-            value
-        }
-    }
-
-    fn write(&mut self, value: Self::Value) {
-        unsafe {
-            core::arch::asm!(
-                "mov [{}], {:r}",
-                in(reg) self.ptr,
-                in(reg) value,
-            );
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/common/src/io/pio.rs b/recipes/core/base/drivers/common/src/io/pio.rs
deleted file mode 100644
index 187e4734c3..0000000000
--- a/recipes/core/base/drivers/common/src/io/pio.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use core::{arch::asm, marker::PhantomData};
-
-use super::Io;
-
-/// Generic PIO
-#[derive(Copy, Clone)]
-pub struct Pio<T> {
-    port: u16,
-    value: PhantomData<T>,
-}
-
-impl<T> Pio<T> {
-    /// Create a PIO from a given port
-    pub const fn new(port: u16) -> Self {
-        Pio::<T> {
-            port,
-            value: PhantomData,
-        }
-    }
-}
-
-/// Read/Write for byte PIO
-impl Io for Pio<u8> {
-    type Value = u8;
-
-    /// Read
-    #[inline(always)]
-    fn read(&self) -> u8 {
-        let value: u8;
-        unsafe {
-            asm!("in al, dx", in("dx") self.port, out("al") value, options(nostack, nomem, preserves_flags));
-        }
-        value
-    }
-
-    /// Write
-    #[inline(always)]
-    fn write(&mut self, value: u8) {
-        unsafe {
-            asm!("out dx, al", in("dx") self.port, in("al") value, options(nostack, nomem, preserves_flags));
-        }
-    }
-}
-
-/// Read/Write for word PIO
-impl Io for Pio<u16> {
-    type Value = u16;
-
-    /// Read
-    #[inline(always)]
-    fn read(&self) -> u16 {
-        let value: u16;
-        unsafe {
-            asm!("in ax, dx", in("dx") self.port, out("ax") value, options(nostack, nomem, preserves_flags));
-        }
-        value
-    }
-
-    /// Write
-    #[inline(always)]
-    fn write(&mut self, value: u16) {
-        unsafe {
-            asm!("out dx, ax", in("dx") self.port, in("ax") value, options(nostack, nomem, preserves_flags));
-        }
-    }
-}
-
-/// Read/Write for doubleword PIO
-impl Io for Pio<u32> {
-    type Value = u32;
-
-    /// Read
-    #[inline(always)]
-    fn read(&self) -> u32 {
-        let value: u32;
-        unsafe {
-            asm!("in eax, dx", in("dx") self.port, out("eax") value, options(nostack, nomem, preserves_flags));
-        }
-        value
-    }
-
-    /// Write
-    #[inline(always)]
-    fn write(&mut self, value: u32) {
-        unsafe {
-            asm!("out dx, eax", in("dx") self.port, in("eax") value, options(nostack, nomem, preserves_flags));
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/common/src/lib.rs b/recipes/core/base/drivers/common/src/lib.rs
deleted file mode 100644
index b6661e3aaa..0000000000
--- a/recipes/core/base/drivers/common/src/lib.rs
+++ /dev/null
@@ -1,331 +0,0 @@
-//! This crate provides various abstractions for use by all drivers in the Redox drivers repo.
-//!
-//! This includes direct memory access via [dma], and Scatter-Gather List support via [sgl].  It also
-//! provides various memory management structures for use with drivers, and some logging support.
-
-use libredox::call::MmapArgs;
-use libredox::flag::{self, O_CLOEXEC, O_RDONLY, O_RDWR, O_WRONLY};
-use libredox::{
-    errno::EINVAL,
-    error::{Error, Result},
-    Fd,
-};
-use syscall::{ProcSchemeVerb, PAGE_SIZE};
-
-/// The Direct Memory Access (DMA) API for drivers
-pub mod dma;
-/// MMIO utilities
-pub mod io;
-mod logger;
-/// The Scatter Gather List (SGL) API for drivers.
-pub mod sgl;
-/// Low latency timeout for driver loops
-pub mod timeout;
-
-pub use logger::{file_level, output_level, setup_logging};
-
-use std::sync::OnceLock;
-
-static MEMORY_ROOT_FD: OnceLock<libredox::Fd> = OnceLock::new();
-
-/// Initializes a file descriptor to be used as the root memory for a driver.
-///
-/// # Panics
-///
-/// This function will panic if:
-/// - `libredox` is unable to open a file descriptor.
-/// - The memory root file descriptor has already been set (this function has already been called).
-pub fn init() {
-    if MEMORY_ROOT_FD
-        .set(
-            libredox::Fd::open("/scheme/memory/scheme-root", 0, 0)
-                .expect("drivers common: failed to open memory root fd"),
-        )
-        .is_err()
-    {
-        panic!("drivers common: failed to set memory root fd");
-    }
-}
-
-/// Gets the memory root file descriptor.
-///
-/// # Panics
-///
-/// This function will panic if `init` has not already been called first.
-pub fn memory_root_fd() -> &'static libredox::Fd {
-    MEMORY_ROOT_FD
-        .get()
-        .expect("drivers common: memory root fd not initialized. Please call `common::init` in your main function.")
-}
-
-/// Specifies the write behavior for a specific region of memory
-///
-/// These types indicate to the driver how writes to a specific memory region are handled by the
-/// system. This usually refers to the caching behavior that the processor or I/O device responsible
-/// for that memory implements.
-///
-/// aarch64 and x86 have very different cache-coherency rules, so this API as written is likely
-/// not sufficient to describe the memory caching behavior in a cross-platform manner. As such,
-/// consider this API unstable.
-#[derive(Clone, Copy, Debug)]
-pub enum MemoryType {
-    /// A region of memory that implements Write-back caching.
-    ///
-    /// In write-back caching, the processor will first store data in its local cache, and then
-    /// flush it to the actual storage location at regular intervals, or as applications access
-    /// the data.
-    Writeback,
-    /// A region of memory that does not implement caching. Writes to these regions are immediate.
-    Uncacheable,
-    /// A region of memory that implements write combining.
-    ///
-    /// Write combining memory regions store all writes in a temporary buffer called a Write
-    /// Combine Buffer. Multiple writes to the location are stored in a single buffer, and then
-    /// released to the memory location in an unspecified order. Write-Combine memory does not
-    /// guarantee that the order at which you write to it is the order at which those writes are
-    /// committed to memory.
-    WriteCombining,
-    /// Memory stored in an intermediate Write Combine Buffer and released later
-    /// Memory-Mapped I/O. This is an aarch64-specific term.
-    DeviceMemory,
-}
-impl Default for MemoryType {
-    fn default() -> Self {
-        Self::Writeback
-    }
-}
-
-/// Represents the protection level of an area of memory.
-///
-/// This structure shouldn't be used directly -- instead, use the [`Prot::RO`] (Read-Only),
-/// [`Prot::WO`] (Write-Only) and [`Prot::RW`] (Read-Write) constants to specify the memory's protection
-/// level.
-#[derive(Clone, Copy, Debug)]
-pub struct Prot {
-    /// The memory is readable
-    pub read: bool,
-    /// The memory is writeable
-    pub write: bool,
-}
-
-/// Implements the memory protection level constants
-impl Prot {
-    /// A constant representing Read-Only memory.
-    pub const RO: Self = Self {
-        read: true,
-        write: false,
-    };
-
-    /// A constant representing Write-Only memory
-    pub const WO: Self = Self {
-        read: false,
-        write: true,
-    };
-
-    /// A constant representing Read-Write memory
-    pub const RW: Self = Self {
-        read: true,
-        write: true,
-    };
-}
-
-/// Maps physical memory to virtual memory
-///
-/// # Arguments
-///
-/// * '`base_phys`: [usize]' - The base address of the physical memory to map.
-/// * 'len: [usize]'       - The length of the physical memory to map (Should be a multiple of [`PAGE_SIZE`]
-/// * '_: [Prot]'          - The memory protection level of the mapping.
-/// * 'type: [`MemoryType`]' - The caching behavior specification of the memory.
-///
-/// # Returns
-///
-/// A '[Result]<*mut ()>' which is:
-/// - '[Ok]'  containing a raw pointer to the mapped memory.
-/// - '[Err]' which contains an error on failure.
-///
-/// # Errors
-///
-/// This function will return an error if:
-/// - An invalid value is provided to 'read' or 'write'
-/// - The system could not open a file descriptor to the memory scheme for the specified [`MemoryType`].
-/// - The system failed to map the physical address to a virtual address. See [`libredox::call::mmap`]
-///
-/// # Safety
-///
-/// Safe, as the kernel ensures it doesn't conflict with any other memory described in the memory
-/// map for regular RAM.
-///
-/// # Notes
-/// - This function is unsafe, and upon using it you will be responsible for freeing the memory with
-///   [`libredox::call::munmap`]. If you want a safe accessor, use [`PhysBorrowed`] instead.
-/// - The `MemoryType` specified is used to tell the function which memory scheme to access. (i.e
-///   /scheme/memory/physical@wb, /scheme/memory/physical@uc, etc).
-pub unsafe fn physmap(
-    base_phys: usize,
-    len: usize,
-    Prot { read, write }: Prot,
-    ty: MemoryType,
-) -> Result<*mut ()> {
-    // TODO: arraystring?
-
-    //Return an error rather than potentially crash the kernel.
-    if base_phys == 0 {
-        return Err(Error::new(EINVAL));
-    }
-
-    let path = format!(
-        "physical@{}",
-        match ty {
-            MemoryType::Writeback => "wb",
-            MemoryType::Uncacheable => "uc",
-            MemoryType::WriteCombining => "wc",
-            MemoryType::DeviceMemory => "dev",
-        }
-    );
-    let mode = match (read, write) {
-        (true, true) => O_RDWR,
-        (true, false) => O_RDONLY,
-        (false, true) => O_WRONLY,
-        (false, false) => return Err(Error::new(EINVAL)),
-    };
-    let mut prot = 0;
-    if read {
-        prot |= flag::PROT_READ;
-    }
-    if write {
-        prot |= flag::PROT_WRITE;
-    }
-
-    let fd = memory_root_fd().openat(&path, O_CLOEXEC | mode, 0)?;
-    Ok(libredox::call::mmap(MmapArgs {
-        fd: fd.raw(),
-        offset: base_phys as u64,
-        length: len.next_multiple_of(PAGE_SIZE),
-        flags: flag::MAP_SHARED,
-        prot,
-        addr: core::ptr::null_mut(),
-    })? as *mut ())
-}
-
-impl std::fmt::Display for MemoryType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Self::Writeback => "wb",
-                Self::Uncacheable => "uc",
-                Self::WriteCombining => "wc",
-                Self::DeviceMemory => "dev",
-            }
-        )
-    }
-}
-
-/// A safe virtual mapping to physical memory that unmaps the memory when the structure goes out
-/// of scope.
-///
-/// This function provides a safe binding to [physmap]. It implements Drop to free the mapped memory
-/// when the structure goes out of scope.
-pub struct PhysBorrowed {
-    mem: *mut (),
-    len: usize,
-}
-impl PhysBorrowed {
-    /// Constructs a `PhysBorrowed` instance.
-    ///
-    /// # Arguments
-    /// See [physmap] for a description of the parameters.
-    ///
-    /// # Returns
-    /// A '[Result]' which contains the following:
-    /// - A '[`PhysBorrowed`]' which represents the newly mapped region.
-    /// - An 'Err' if a memory mapping error occurs.
-    ///
-    /// # Errors
-    /// See [physmap] for a description of the error cases.
-    pub fn map(base_phys: usize, len: usize, prot: Prot, ty: MemoryType) -> Result<Self> {
-        let mem = unsafe { physmap(base_phys, len, prot, ty)? };
-        Ok(Self {
-            mem,
-            len: len.next_multiple_of(PAGE_SIZE),
-        })
-    }
-
-    /// Gets a raw pointer to the borrowed region.
-    ///
-    /// # Returns
-    /// - self.mem - A pointer to the mapped region in virtual memory.
-    ///
-    /// # Notes
-    /// - The pointer may live beyond the lifetime of [`PhysBorrowed`], so dereferences to the pointer
-    ///   must be treated as unsafe.
-    ///
-    pub fn as_ptr(&self) -> *mut () {
-        self.mem
-    }
-
-    /// Gets the length of the mapped region.
-    ///
-    /// # Returns
-    /// - self.len - The length of the mapped region. It should be a multiple of [`PAGE_SIZE`]
-    pub fn mapped_len(&self) -> usize {
-        self.len
-    }
-}
-
-impl Drop for PhysBorrowed {
-    /// Frees the mapped memory region.
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libredox::call::munmap(self.mem, self.len);
-        }
-    }
-}
-
-/// Instructs the kernel to enable I/O ports for this (usermode) process (x86-specific).
-///
-/// On Redox, x86 privilege ring 3 represents userspace. Most Redox drivers run in userspace to
-/// prevent system instability caused by a faulty driver. Processes with (bitmap-enabled) IO port
-/// rights can use the IN/OUT instructions. This is not the same as IOPL 3; the CLI instruction is
-/// still not allowed.
-pub fn acquire_port_io_rights() -> Result<()> {
-    extern "C" {
-        fn redox_cur_thrfd_v0() -> usize;
-    }
-    let kernel_fd = syscall::dup(unsafe { redox_cur_thrfd_v0() }, b"open_via_dup")?;
-    let res = libredox::call::call_wo(
-        kernel_fd,
-        &[],
-        syscall::CallFlags::empty(),
-        &[ProcSchemeVerb::Iopl as u64],
-    );
-    let _ = syscall::close(kernel_fd);
-    res?;
-    Ok(())
-}
-
-/// Kernel handle for translating virtual addresses in the current address space, to their
-/// underlying physical addresses.
-///
-/// It is currently unspecified whether this handle is specific to the address space at the time it
-/// was created, or whether all calls reference the currently active address space.
-pub struct VirtaddrTranslationHandle {
-    fd: Fd,
-}
-
-impl VirtaddrTranslationHandle {
-    /// Create a new handle, requires uid=0 but this may change.
-    pub fn new() -> Result<Self> {
-        Ok(Self {
-            fd: memory_root_fd().openat("translation", O_CLOEXEC, 0)?,
-        })
-    }
-    /// Translate physical => virtual.
-    pub fn translate(&self, physical: usize) -> Result<usize> {
-        let mut buf = physical.to_ne_bytes();
-        libredox::call::call_ro(self.fd.raw(), &mut buf, syscall::CallFlags::empty(), &[])?;
-        Ok(usize::from_ne_bytes(buf))
-    }
-}
diff --git a/recipes/core/base/drivers/common/src/logger.rs b/recipes/core/base/drivers/common/src/logger.rs
deleted file mode 100644
index 82ec2bd054..0000000000
--- a/recipes/core/base/drivers/common/src/logger.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use std::str::FromStr;
-
-use libredox::{flag, Fd};
-use redox_log::{OutputBuilder, RedoxLogger};
-
-/// Get the log verbosity for the output level.
-pub fn output_level() -> log::LevelFilter {
-    log::LevelFilter::Info
-}
-
-/// Get the log verbosity for the file level.
-pub fn file_level() -> log::LevelFilter {
-    log::LevelFilter::Info
-}
-
-/// Configures logging for a single driver.
-#[cfg_attr(not(target_os = "redox"), allow(unused_variables, unused_mut))]
-pub fn setup_logging(
-    category: &str,
-    subcategory: &str,
-    logfile_base: &str,
-    mut output_level: log::LevelFilter,
-    file_level: log::LevelFilter,
-) {
-    RedoxLogger::init_timezone();
-    if let Some(log_level) = read_bootloader_log_level_env(category, subcategory) {
-        output_level = log_level;
-    }
-
-    let mut logger = RedoxLogger::new().with_output(
-        OutputBuilder::stderr()
-            .with_filter(output_level) // limit global output to important info
-            .with_ansi_escape_codes()
-            .flush_on_newline(true)
-            .build(),
-    );
-
-    #[cfg(target_os = "redox")]
-    match OutputBuilder::in_redox_logging_scheme(
-        category,
-        subcategory,
-        format!("{logfile_base}.log"),
-    ) {
-        Ok(b) => {
-            logger = logger.with_output(b.with_filter(file_level).flush_on_newline(true).build())
-        }
-        Err(error) => eprintln!("Failed to create {logfile_base}.log: {}", error),
-    }
-
-    #[cfg(target_os = "redox")]
-    match OutputBuilder::in_redox_logging_scheme(
-        category,
-        subcategory,
-        format!("{logfile_base}.ansi.log"),
-    ) {
-        Ok(b) => {
-            logger = logger.with_output(
-                b.with_filter(file_level)
-                    .with_ansi_escape_codes()
-                    .flush_on_newline(true)
-                    .build(),
-            )
-        }
-        Err(error) => eprintln!("Failed to create {logfile_base}.ansi.log: {}", error),
-    }
-
-    logger.enable().expect("failed to set default logger");
-}
-
-fn read_bootloader_log_level_env(category: &str, subcategory: &str) -> Option<log::LevelFilter> {
-    let mut env_bytes = [0_u8; 4096];
-
-    // TODO: Have the kernel env can specify prefixed env key instead of having to read all of them
-    let envs = {
-        let Ok(fd) = Fd::open("/scheme/sys/env", flag::O_RDONLY | flag::O_CLOEXEC, 0) else {
-            return None;
-        };
-        let Ok(bytes_read) = fd.read(&mut env_bytes) else {
-            return None;
-        };
-        if bytes_read >= env_bytes.len() {
-            return None;
-        }
-        let env_bytes = &mut env_bytes[..bytes_read];
-
-        env_bytes
-            .split(|&c| c == b'\n')
-            .filter(|var| var.starts_with(b"DRIVER_"))
-            .collect::<Vec<_>>()
-    };
-
-    let log_env_keys = [
-        format!("DRIVER_{}_LOG_LEVEL=", subcategory.to_ascii_uppercase()),
-        format!("DRIVER_{}_LOG_LEVEL=", category.to_ascii_uppercase()),
-        "DRIVER_LOG_LEVEL=".to_string(),
-    ];
-
-    for log_env_key in log_env_keys {
-        let log_env_key = log_env_key.as_bytes();
-        if let Some(log_env) = envs.iter().find_map(|var| var.strip_prefix(log_env_key)) {
-            if let Ok(Ok(log_level)) = str::from_utf8(&log_env).map(log::LevelFilter::from_str) {
-                return Some(log_level);
-            }
-        }
-    }
-
-    None
-}
diff --git a/recipes/core/base/drivers/common/src/sgl.rs b/recipes/core/base/drivers/common/src/sgl.rs
deleted file mode 100644
index e5d781a4bd..0000000000
--- a/recipes/core/base/drivers/common/src/sgl.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use std::num::NonZeroUsize;
-
-use libredox::call::MmapArgs;
-use libredox::errno::EINVAL;
-use libredox::error::{Error, Result};
-use libredox::flag::{MAP_PRIVATE, PROT_NONE, PROT_READ, PROT_WRITE};
-use syscall::{MAP_FIXED, PAGE_SIZE};
-
-use crate::dma::phys_contiguous_fd;
-use crate::VirtaddrTranslationHandle;
-
-/// A Scatter-Gather List data structure
-///
-/// See: <https://en.wikipedia.org/wiki/Gather/scatter_(vector_addressing)>
-#[derive(Debug)]
-pub struct Sgl {
-    /// A raw pointer to the SGL in virtual memory
-    virt: *mut u8,
-    /// The length of the allocated memory, guaranteed to be a multiple of [`PAGE_SIZE`].
-    aligned_length: usize,
-    /// The length of the allocated memory. This value is NOT guaranteed to be a multiple of [`PAGE_SIZE`]
-    unaligned_length: NonZeroUsize,
-    /// The vector of chunks tracked by this [Sgl] object. This is the sparsely-populated vector in the SGL algorithm.
-    chunks: Vec<Chunk>,
-}
-
-/// A structure representing a chunk of memory in the sparsely-populated vector of the SGL
-#[derive(Debug)]
-pub struct Chunk {
-    /// The offset of the chunk in the sparsely-populated vector.
-    pub offset: usize,
-    /// The physical address of the chunk
-    pub phys: usize,
-    /// A raw pointer to the chunk in virtual memory
-    pub virt: *mut u8,
-    /// The length of the chunk in bytes.
-    pub length: usize,
-}
-
-impl Sgl {
-    /// Constructor for the scatter/gather list.
-    ///
-    /// # Arguments
-    ///
-    /// '`unaligned_length`: [usize]' - The length of the SGL, not necessarily aligned to the nearest
-    /// page.
-    pub fn new(unaligned_length: usize) -> Result<Self> {
-        let unaligned_length = NonZeroUsize::new(unaligned_length).ok_or(Error::new(EINVAL))?;
-
-        // TODO: Both PAGE_SIZE and MAX_ALLOC_SIZE should be dynamic.
-        let aligned_length = unaligned_length.get().next_multiple_of(PAGE_SIZE);
-        const MAX_ALLOC_SIZE: usize = 1 << 22;
-
-        unsafe {
-            let virt = libredox::call::mmap(MmapArgs {
-                flags: MAP_PRIVATE,
-                prot: PROT_NONE,
-                length: aligned_length,
-
-                offset: 0,
-                fd: !0,
-                addr: core::ptr::null_mut(),
-            })?
-            .cast::<u8>();
-
-            let mut this = Self {
-                virt,
-                aligned_length,
-                unaligned_length,
-                chunks: Vec::new(),
-            };
-
-            // TODO: SglContext to avoid reopening these fds?
-            let phys_contiguous_fd = phys_contiguous_fd()?;
-            let virttophys_handle = VirtaddrTranslationHandle::new()?;
-
-            let mut offset = 0;
-            while offset < aligned_length {
-                let preferred_chunk_length = (aligned_length - offset)
-                    .min(MAX_ALLOC_SIZE)
-                    .next_power_of_two();
-                let chunk_length = if preferred_chunk_length > aligned_length - offset {
-                    preferred_chunk_length / 2
-                } else {
-                    preferred_chunk_length
-                };
-                libredox::call::mmap(MmapArgs {
-                    addr: virt.add(offset).cast(),
-                    flags: MAP_PRIVATE | (MAP_FIXED.bits() as u32),
-                    prot: PROT_READ | PROT_WRITE,
-                    length: chunk_length,
-                    fd: phys_contiguous_fd.raw(),
-
-                    offset: 0,
-                })?;
-                let phys = virttophys_handle.translate(virt as usize + offset)?;
-                this.chunks.push(Chunk {
-                    offset,
-                    phys,
-                    length: (unaligned_length.get() - offset).min(chunk_length),
-                    virt: virt.add(offset),
-                });
-                offset += chunk_length;
-            }
-
-            Ok(this)
-        }
-    }
-    /// Returns an immutable reference to the vector of chunks
-    pub fn chunks(&self) -> &[Chunk] {
-        &self.chunks
-    }
-
-    /// Returns a raw pointer to the vector of chunks in virtual memory
-    pub fn as_ptr(&self) -> *mut u8 {
-        self.virt
-    }
-    /// Returns the length of the scatter-gather list.
-    pub fn len(&self) -> usize {
-        self.unaligned_length.get()
-    }
-}
-
-impl Drop for Sgl {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libredox::call::munmap(self.virt.cast(), self.aligned_length);
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/common/src/timeout.rs b/recipes/core/base/drivers/common/src/timeout.rs
deleted file mode 100644
index 4a2b19814c..0000000000
--- a/recipes/core/base/drivers/common/src/timeout.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::time::{Duration, Instant};
-
-/// Represents an amount of time for a driver to give up to the OS scheduler.
-pub struct Timeout {
-    instant: Instant,
-    duration: Duration,
-}
-
-impl Timeout {
-    /// Create a new `Timeout` from a `Duration`.
-    #[inline]
-    pub fn new(duration: Duration) -> Self {
-        Self {
-            instant: Instant::now(),
-            duration,
-        }
-    }
-
-    /// Create a new `Timeout` by specifying the amount of microseconds.
-    #[inline]
-    pub fn from_micros(micros: u64) -> Self {
-        Self::new(Duration::from_micros(micros))
-    }
-
-    /// Create a new `Timeout` by specifying the amount of milliseconds.
-    #[inline]
-    pub fn from_millis(millis: u64) -> Self {
-        Self::new(Duration::from_millis(millis))
-    }
-
-    /// Create a new `Timeout` by specifying the amount of seconds.
-    #[inline]
-    pub fn from_secs(secs: u64) -> Self {
-        Self::new(Duration::from_secs(secs))
-    }
-
-    /// Execute the `Timeout`.
-    ///
-    /// # Errors
-    ///
-    /// Returns an `Err` if the duration of the `Timeout` has already elapsed
-    /// between creating the `Timeout` and calling this function.
-    #[inline]
-    pub fn run(&self) -> Result<(), ()> {
-        if self.instant.elapsed() < self.duration {
-            // Sleeps in Redox are only evaluated on PIT ticks (a few ms), which is not
-            // short enough for a reasonably responsive timeout. However, the clock is
-            // highly accurate. So, we yield instead of sleep to reduce latency.
-            //TODO: allow timeout that spins instead of yields?
-            std::thread::yield_now();
-            Ok(())
-        } else {
-            Err(())
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/executor/Cargo.toml b/recipes/core/base/drivers/executor/Cargo.toml
deleted file mode 100644
index a910e3c24e..0000000000
--- a/recipes/core/base/drivers/executor/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "executor"
-description = "Asynchronous framework for queue-based hardware interfaces"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-version = "0.1.0"
-edition = "2021"
-license = "MIT"
-
-[dependencies]
-log.workspace = true
-redox_event.workspace = true
-slab.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/executor/src/lib.rs b/recipes/core/base/drivers/executor/src/lib.rs
deleted file mode 100644
index 6b54e07bc1..0000000000
--- a/recipes/core/base/drivers/executor/src/lib.rs
+++ /dev/null
@@ -1,396 +0,0 @@
-use std::cell::{Cell, RefCell};
-use std::collections::{HashMap, VecDeque};
-use std::fmt::Debug;
-use std::fs::File;
-use std::future::{Future, IntoFuture};
-use std::hash::Hash;
-use std::io::{Read, Write};
-use std::marker::PhantomData;
-use std::os::fd::AsRawFd;
-use std::panic::AssertUnwindSafe;
-use std::pin::Pin;
-use std::ptr::NonNull;
-use std::rc::Rc;
-use std::task;
-
-use event::{EventFlags, RawEventQueue};
-use slab::Slab;
-
-type EventUserData = usize;
-
-type FutIdx = usize;
-
-pub trait Hardware: Sized {
-    type CmdId: Clone + Copy + Debug + Hash + Eq + PartialEq;
-    type CqId: Clone + Copy + Debug + Hash + Eq + PartialEq;
-    type SqId: Clone + Copy + Debug + Hash + Eq + PartialEq;
-    type Sqe: Debug + Clone + Copy;
-    type Cqe;
-    type Iv: Clone + Copy + Debug;
-
-    type GlobalCtxt;
-
-    // TODO: the kernel should also do this automatically before sending EOI messages to the IC
-    fn mask_vector(ctxt: &Self::GlobalCtxt, iv: Self::Iv);
-    fn unmask_vector(ctxt: &Self::GlobalCtxt, iv: Self::Iv);
-
-    fn set_sqe_cmdid(sqe: &mut Self::Sqe, id: Self::CmdId);
-    fn get_cqe_cmdid(cqe: &Self::Cqe) -> Self::CmdId;
-
-    // TODO: support multiple SQs per CQ or vice versa?
-    fn sq_cq(ctxt: &Self::GlobalCtxt, id: Self::CqId) -> Self::SqId;
-
-    fn current() -> Rc<LocalExecutor<Self>>;
-    fn vtable() -> &'static task::RawWakerVTable;
-
-    fn try_submit(
-        ctxt: &Self::GlobalCtxt,
-        sq_id: Self::SqId,
-        success: impl FnOnce(Self::CmdId) -> Self::Sqe,
-        fail: impl FnOnce(),
-    ) -> Option<(Self::CqId, Self::CmdId)>;
-    fn poll_cqes(ctxt: &Self::GlobalCtxt, handle: impl FnMut(Self::CqId, Self::Cqe));
-}
-
-/// Async executor, single IV, thread-per-core architecture
-pub struct LocalExecutor<Hw: Hardware> {
-    global_ctxt: Hw::GlobalCtxt,
-
-    queue: RawEventQueue,
-    vector: Hw::Iv,
-    irq_handle: File,
-    intx: bool,
-
-    // TODO: One IV and SQ/CQ per core (where the admin queue can be managed by the main thread).
-    awaiting_submission: RefCell<HashMap<Hw::SqId, VecDeque<FutIdx>>>,
-    awaiting_completion:
-        RefCell<HashMap<Hw::CqId, HashMap<Hw::CmdId, (FutIdx, NonNull<Option<Hw::Cqe>>)>>>,
-
-    external_event: RefCell<HashMap<EventUserData, (FutIdx, NonNull<EventFlags>)>>,
-    next_user_data: Cell<usize>,
-
-    ready_futures: RefCell<VecDeque<FutIdx>>,
-    futures: RefCell<Slab<Pin<Box<dyn Future<Output = ()> + 'static>>>>,
-    is_polling: Cell<bool>,
-}
-
-impl<Hw: Hardware> LocalExecutor<Hw> {
-    pub fn register_external_event(
-        &self,
-        fd: usize,
-        flags: event::EventFlags,
-    ) -> ExternalEventSource<Hw> {
-        let user_data = self.next_user_data.get();
-        self.next_user_data.set(user_data.checked_add(1).unwrap());
-
-        self.queue
-            .subscribe(fd, user_data, flags)
-            .expect("failed to subscribe to event");
-
-        ExternalEventSource {
-            flags: event::EventFlags::empty(),
-            user_data,
-            _not_send_or_unpin: PhantomData,
-        }
-    }
-    pub fn current() -> Rc<Self> {
-        Hw::current()
-    }
-    pub fn poll(&self) -> usize {
-        assert!(!self.is_polling.replace(true));
-
-        let mut finished = 0;
-
-        for future_idx in self.ready_futures.borrow_mut().drain(..) {
-            let waker = waker::<Hw>(future_idx);
-
-            let mut futures = self.futures.borrow_mut();
-            let res = match std::panic::catch_unwind(AssertUnwindSafe(|| {
-                futures[future_idx]
-                    .as_mut()
-                    .poll(&mut task::Context::from_waker(&waker))
-            })) {
-                Ok(r) => r,
-                Err(_) => {
-                    log::error!("Task panicked!");
-                    core::mem::forget(futures.remove(future_idx));
-                    continue;
-                }
-            };
-            if res.is_ready() {
-                drop(futures.remove(future_idx));
-                finished += 1;
-            }
-        }
-        self.is_polling.set(false);
-
-        finished
-    }
-    pub fn spawn(&self, fut: impl IntoFuture<Output = ()> + 'static) {
-        let idx = self
-            .futures
-            .borrow_mut()
-            .insert(Box::pin(fut.into_future()));
-        self.ready_futures.borrow_mut().push_back(idx);
-    }
-    pub fn block_on<'a, O: 'a>(&self, fut: impl IntoFuture<Output = O> + 'a) -> O {
-        let retval = Rc::new(RefCell::new(None));
-
-        let retval2 = Rc::clone(&retval);
-        let idx = self.futures.borrow_mut().insert({
-            let t1: Pin<Box<dyn Future<Output = ()> + 'a>> = Box::pin(async move {
-                *retval2.borrow_mut() = Some(fut.await);
-            });
-            // SAFETY: Apart from the lifetimes, the types are exactly the same. We also know
-            // block_on simply cannot return without having fully awaited and dropped the future,
-            // even if that future panics (cf. the catch_unwind invocation).
-            let t2: Pin<Box<dyn Future<Output = ()> + 'static>> =
-                unsafe { std::mem::transmute(t1) };
-
-            t2
-        });
-
-        self.ready_futures.borrow_mut().push_front(idx);
-
-        loop {
-            let finished = self.poll();
-            if retval.borrow().is_some() {
-                break;
-            }
-            if finished == 0 {
-                self.react();
-            }
-        }
-
-        let o = retval.borrow_mut().take().unwrap();
-        o
-    }
-    fn react(&self) {
-        let event = self.queue.next_event().expect("failed to get next event");
-
-        if event.user_data != 0 {
-            let Some((fut_idx, flags_ptr)) =
-                self.external_event.borrow_mut().remove(&event.user_data)
-            else {
-                // Spurious event
-                return;
-            };
-            unsafe {
-                flags_ptr
-                    .as_ptr()
-                    .write(event::EventFlags::from_bits_retain(event.flags));
-            }
-            self.ready_futures.borrow_mut().push_back(fut_idx);
-            return;
-        }
-
-        if self.intx {
-            let mut buf = [0_u8; core::mem::size_of::<usize>()];
-            if (&self.irq_handle).read(&mut buf).unwrap() != 0 {
-                (&self.irq_handle).write(&buf).unwrap();
-            }
-        }
-
-        // TODO: The kernel should probably do the masking (when using MSI/MSI-X at least), which
-        // should happen before EOI messages to the interrupt controller.
-        Hw::mask_vector(&self.global_ctxt, self.vector);
-        Hw::poll_cqes(&self.global_ctxt, |cq_id, cqe| {
-            if let Some((fut_idx, comp_ptr)) = self
-                .awaiting_completion
-                .borrow_mut()
-                .get_mut(&cq_id)
-                .and_then(|per_cmd| per_cmd.remove(&Hw::get_cqe_cmdid(&cqe)))
-            {
-                unsafe {
-                    comp_ptr.as_ptr().write(Some(cqe));
-                }
-                self.ready_futures.borrow_mut().push_back(fut_idx);
-
-                if let Some(submitting) = self
-                    .awaiting_submission
-                    .borrow_mut()
-                    .get_mut(&Hw::sq_cq(&self.global_ctxt, cq_id))
-                    .and_then(|q| q.pop_front())
-                {
-                    self.ready_futures.borrow_mut().push_back(submitting);
-                }
-            }
-        });
-        Hw::unmask_vector(&self.global_ctxt, self.vector);
-    }
-    pub async fn submit(&self, sq_id: Hw::SqId, cmd: Hw::Sqe) -> Hw::Cqe {
-        CqeFuture::<Hw> {
-            state: State::<Hw>::Submitting { sq_id, cmd },
-            comp: None,
-            _not_send: PhantomData,
-        }
-        .await
-    }
-}
-
-struct CqeFuture<Hw: Hardware> {
-    pub state: State<Hw>,
-    pub comp: Option<Hw::Cqe>,
-    pub _not_send: PhantomData<*const ()>,
-}
-enum State<Hw: Hardware> {
-    Submitting { sq_id: Hw::SqId, cmd: Hw::Sqe },
-    Completing { cq_id: Hw::CqId, cmd_id: Hw::CmdId },
-}
-
-fn current_executor_and_idx<Hw: Hardware>(
-    cx: &mut task::Context<'_>,
-) -> (Rc<LocalExecutor<Hw>>, FutIdx) {
-    let executor = LocalExecutor::current();
-
-    let idx = cx.waker().data() as FutIdx;
-    assert_eq!(
-        cx.waker().vtable() as *const _,
-        Hw::vtable(),
-        "incompatible executor for CqeFuture"
-    );
-
-    (executor, idx)
-}
-
-impl<Hw: Hardware> Future for CqeFuture<Hw> {
-    type Output = Hw::Cqe;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> task::Poll<Self::Output> {
-        let this = unsafe { self.get_unchecked_mut() };
-
-        let (executor, idx) = current_executor_and_idx::<Hw>(cx);
-
-        match this.state {
-            State::Submitting { sq_id, mut cmd } => {
-                let mut awaiting = executor.awaiting_submission.borrow_mut();
-
-                if let Some((cq_id, cmd_id)) = Hw::try_submit(
-                    &executor.global_ctxt,
-                    sq_id,
-                    |cmd_id| {
-                        Hw::set_sqe_cmdid(&mut cmd, cmd_id);
-                        log::trace!("About to submit {cmd:?}");
-                        cmd
-                    },
-                    || {
-                        awaiting.entry(sq_id).or_default().push_back(idx);
-                    },
-                ) {
-                    executor
-                        .awaiting_completion
-                        .borrow_mut()
-                        .entry(cq_id)
-                        .or_default()
-                        .insert(cmd_id, (idx, (&mut this.comp).into()));
-                    this.state = State::Completing { cq_id, cmd_id };
-                }
-                task::Poll::Pending
-            }
-            State::Completing { cq_id, cmd_id } => match this.comp.take() {
-                Some(comp) => {
-                    log::trace!("ready!");
-                    task::Poll::Ready(comp)
-                }
-
-                // Shouldn't technically be possible
-                None => {
-                    log::trace!("spurious poll");
-                    executor
-                        .awaiting_completion
-                        .borrow_mut()
-                        .entry(cq_id)
-                        .or_default()
-                        .insert(cmd_id, (idx, (&mut this.comp).into()));
-                    task::Poll::Pending
-                }
-            },
-        }
-    }
-}
-
-unsafe fn vt_clone<Hw: Hardware>(idx: *const ()) -> task::RawWaker {
-    task::RawWaker::new(idx, Hw::vtable())
-}
-unsafe fn vt_drop(_idx: *const ()) {}
-unsafe fn vt_wake<Hw: Hardware>(idx: *const ()) {
-    Hw::current()
-        .ready_futures
-        .borrow_mut()
-        .push_back(idx as FutIdx);
-}
-
-fn waker<Hw: Hardware>(idx: FutIdx) -> task::Waker {
-    unsafe { task::Waker::from_raw(task::RawWaker::new(idx as *const (), Hw::vtable())) }
-}
-pub const fn vtable<Hw: Hardware>() -> task::RawWakerVTable {
-    task::RawWakerVTable::new(vt_clone::<Hw>, vt_wake::<Hw>, vt_wake::<Hw>, vt_drop)
-}
-
-pub struct ExternalEventSource<Hw: Hardware> {
-    flags: event::EventFlags,
-    user_data: EventUserData,
-    _not_send_or_unpin: PhantomData<(*const (), fn() -> Hw)>,
-}
-pub struct Event {
-    flags: event::EventFlags,
-    _not_send: PhantomData<*const ()>,
-}
-impl Event {
-    pub fn flags(&self) -> event::EventFlags {
-        self.flags
-    }
-}
-impl<Hw: Hardware> ExternalEventSource<Hw> {
-    fn poll_next(self: Pin<&mut Self>, cx: &mut task::Context) -> task::Poll<Option<Event>> {
-        let this = unsafe { self.get_unchecked_mut() };
-
-        let flags = std::mem::take(&mut this.flags);
-
-        if flags.is_empty() {
-            let (executor, idx) = current_executor_and_idx::<Hw>(cx);
-            executor
-                .external_event
-                .borrow_mut()
-                .insert(this.user_data, (idx, (&mut this.flags).into()));
-            return task::Poll::Pending;
-        }
-        task::Poll::Ready(Some(Event {
-            flags,
-            _not_send: PhantomData,
-        }))
-    }
-    pub async fn next(mut self: Pin<&mut Self>) -> Option<Event> {
-        core::future::poll_fn(|cx| self.as_mut().poll_next(cx)).await
-    }
-}
-pub fn init_raw<Hw: Hardware>(
-    global_ctxt: Hw::GlobalCtxt,
-    vector: Hw::Iv,
-    intx: bool,
-    irq_handle: File,
-) -> LocalExecutor<Hw> {
-    let queue = RawEventQueue::new().expect("failed to allocate event queue for local executor");
-
-    // TODO: Multiple CPUs
-    queue
-        .subscribe(irq_handle.as_raw_fd() as usize, 0, EventFlags::READ)
-        .expect("failed to subscribe to IRQ event");
-
-    LocalExecutor {
-        global_ctxt,
-
-        queue,
-        vector,
-        intx,
-        irq_handle,
-
-        awaiting_submission: RefCell::new(HashMap::new()),
-        awaiting_completion: RefCell::new(HashMap::new()),
-        external_event: RefCell::new(HashMap::new()),
-        next_user_data: Cell::new(1),
-        ready_futures: RefCell::new(VecDeque::new()),
-        futures: RefCell::new(Slab::with_capacity(16)),
-        is_polling: Cell::new(false),
-    }
-}
diff --git a/recipes/core/base/drivers/gpio/gpiod/Cargo.toml b/recipes/core/base/drivers/gpio/gpiod/Cargo.toml
deleted file mode 100644
index 7e087bd776..0000000000
--- a/recipes/core/base/drivers/gpio/gpiod/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "gpiod"
-description = "GPIO controller registry daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-redox-scheme.workspace = true
-ron.workspace = true
-serde.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-scheme-utils = { path = "../../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/gpio/gpiod/src/main.rs b/recipes/core/base/drivers/gpio/gpiod/src/main.rs
deleted file mode 100644
index 41618ba1ac..0000000000
--- a/recipes/core/base/drivers/gpio/gpiod/src/main.rs
+++ /dev/null
@@ -1,496 +0,0 @@
-use std::collections::BTreeMap;
-use std::process;
-
-use anyhow::{Context, Result};
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult, Socket};
-use scheme_utils::{Blocking, HandleMap};
-use serde::{Deserialize, Serialize};
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error as SysError, EACCES, EBADF, EINVAL, ENOENT};
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct GpioControllerInfo {
-    pub id: u32,
-    pub name: String,
-    pub pin_count: usize,
-    pub supports_interrupt: bool,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum GpioControlRequest {
-    RegisterController { info: GpioControllerInfo },
-    ReadPin { controller_id: u32, pin: u32 },
-    WritePin { controller_id: u32, pin: u32, value: bool },
-    ConfigurePin { controller_id: u32, pin: u32, config: PinConfig },
-    ListControllers,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct PinConfig {
-    pub direction: PinDirection,
-    pub pull: PullMode,
-    pub interrupt_mode: Option<InterruptMode>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum PinDirection {
-    Input,
-    Output,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum PullMode {
-    None,
-    Up,
-    Down,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum InterruptMode {
-    EdgeRising,
-    EdgeFalling,
-    EdgeBoth,
-    LevelHigh,
-    LevelLow,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-enum GpioControlResponse {
-    ControllerRegistered { id: u32 },
-    Controllers(Vec<GpioControllerInfo>),
-    Controller(GpioControllerInfo),
-    PinValue(bool),
-    Ack,
-    Error(String),
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-enum PinOpKind {
-    Read,
-    Write,
-    Configure,
-}
-
-enum Handle {
-    SchemeRoot,
-    Register { pending: Vec<u8> },
-    Provider { controller_id: u32, pending: Vec<u8> },
-    ControllersDir { pending: Vec<u8> },
-    ControllerDetail { id: u32, pending: Vec<u8> },
-    PinOp { kind: PinOpKind, pending: Vec<u8> },
-}
-
-struct ControllerEntry {
-    info: GpioControllerInfo,
-    provider_handle: usize,
-}
-
-struct GpioDaemon {
-    handles: HandleMap<Handle>,
-    controllers: BTreeMap<u32, ControllerEntry>,
-    next_id: u32,
-}
-
-impl GpioDaemon {
-    fn new() -> Self {
-        Self {
-            handles: HandleMap::new(),
-            controllers: BTreeMap::new(),
-            next_id: 0,
-        }
-    }
-
-    fn controller_list(&self) -> Vec<GpioControllerInfo> {
-        self.controllers
-            .values()
-            .map(|entry| entry.info.clone())
-            .collect()
-    }
-
-    fn serialize_response(response: &GpioControlResponse) -> syscall::Result<Vec<u8>> {
-        ron::ser::to_string(response)
-            .map(|text| text.into_bytes())
-            .map_err(|err| {
-                log::error!("gpiod: failed to serialize control response: {err}");
-                SysError::new(EINVAL)
-            })
-    }
-
-    fn deserialize_request(buf: &[u8]) -> syscall::Result<GpioControlRequest> {
-        let text = std::str::from_utf8(buf).map_err(|err| {
-            log::warn!("gpiod: invalid UTF-8 request payload: {err}");
-            SysError::new(EINVAL)
-        })?;
-
-        ron::from_str(text).map_err(|err| {
-            log::warn!("gpiod: failed to decode control request: {err}");
-            SysError::new(EINVAL)
-        })
-    }
-
-    fn set_pending_response(handle: &mut Handle, response: GpioControlResponse) -> syscall::Result<()> {
-        let pending = Self::serialize_response(&response)?;
-        Self::set_pending_bytes(handle, pending)
-    }
-
-    fn set_pending_bytes(handle: &mut Handle, pending: Vec<u8>) -> syscall::Result<()> {
-        match handle {
-            Handle::Register { pending: slot }
-            | Handle::Provider { pending: slot, .. }
-            | Handle::ControllersDir { pending: slot }
-            | Handle::ControllerDetail { pending: slot, .. }
-            | Handle::PinOp { pending: slot, .. } => {
-                *slot = pending;
-                Ok(())
-            }
-            Handle::SchemeRoot => Err(SysError::new(EBADF)),
-        }
-    }
-
-    fn copy_pending(handle: &mut Handle, buf: &mut [u8], offset: u64) -> syscall::Result<usize> {
-        let pending = match handle {
-            Handle::Register { pending }
-            | Handle::Provider { pending, .. }
-            | Handle::ControllersDir { pending }
-            | Handle::ControllerDetail { pending, .. }
-            | Handle::PinOp { pending, .. } => pending,
-            Handle::SchemeRoot => return Err(SysError::new(EBADF)),
-        };
-
-        let offset = usize::try_from(offset).map_err(|_| SysError::new(EINVAL))?;
-        if offset >= pending.len() {
-            return Ok(0);
-        }
-
-        let copy_len = buf.len().min(pending.len() - offset);
-        buf[..copy_len].copy_from_slice(&pending[offset..offset + copy_len]);
-        Ok(copy_len)
-    }
-
-    fn validate_pin_target(
-        &self,
-        controller_id: u32,
-        pin: u32,
-    ) -> std::result::Result<GpioControllerInfo, String> {
-        let entry = self
-            .controllers
-            .get(&controller_id)
-            .ok_or_else(|| format!("unknown controller {controller_id}"))?;
-        if usize::try_from(pin)
-            .ok()
-            .filter(|pin| *pin < entry.info.pin_count)
-            .is_none()
-        {
-            return Err(format!(
-                "pin {pin} is out of range for controller {} (pin_count={})",
-                entry.info.name, entry.info.pin_count
-            ));
-        }
-        Ok(entry.info.clone())
-    }
-}
-
-impl SchemeSync for GpioDaemon {
-    fn scheme_root(&mut self) -> syscall::Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<OpenResult> {
-        let handle = self.handles.get(dirfd)?;
-        let segments = path.trim_matches('/');
-
-        let new_handle = match handle {
-            Handle::SchemeRoot => {
-                if segments.is_empty() {
-                    return Err(SysError::new(EINVAL));
-                }
-
-                let mut parts = segments.split('/');
-                match parts.next() {
-                    Some("register") if parts.next().is_none() => Handle::Register {
-                        pending: Vec::new(),
-                    },
-                    Some("controllers") => match parts.next() {
-                        None => Handle::ControllersDir {
-                            pending: Vec::new(),
-                        },
-                        Some(id) if parts.next().is_none() => Handle::ControllerDetail {
-                            id: id.parse::<u32>().map_err(|_| SysError::new(EINVAL))?,
-                            pending: Vec::new(),
-                        },
-                        _ => return Err(SysError::new(EINVAL)),
-                    },
-                    Some("read_pin") if parts.next().is_none() => Handle::PinOp {
-                        kind: PinOpKind::Read,
-                        pending: Vec::new(),
-                    },
-                    Some("write_pin") if parts.next().is_none() => Handle::PinOp {
-                        kind: PinOpKind::Write,
-                        pending: Vec::new(),
-                    },
-                    Some("configure_pin") if parts.next().is_none() => Handle::PinOp {
-                        kind: PinOpKind::Configure,
-                        pending: Vec::new(),
-                    },
-                    _ => return Err(SysError::new(ENOENT)),
-                }
-            }
-            Handle::ControllersDir { .. } => {
-                if segments.is_empty() {
-                    return Err(SysError::new(EINVAL));
-                }
-
-                Handle::ControllerDetail {
-                    id: segments.parse::<u32>().map_err(|_| SysError::new(EINVAL))?,
-                    pending: Vec::new(),
-                }
-            }
-            _ => return Err(SysError::new(EACCES)),
-        };
-
-        let fd = self.handles.insert(new_handle);
-        Ok(OpenResult::ThisScheme {
-            number: fd,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<usize> {
-        let controllers = self.controller_list();
-        let detail = match self.handles.get(id)? {
-            Handle::ControllerDetail { id, .. } => self.controllers.get(id).map(|entry| entry.info.clone()),
-            _ => None,
-        };
-
-        let handle = self.handles.get_mut(id)?;
-        match handle {
-            Handle::ControllersDir { pending } if pending.is_empty() => {
-                *pending = Self::serialize_response(&GpioControlResponse::Controllers(controllers))?;
-            }
-            Handle::ControllerDetail { id, pending } if pending.is_empty() => {
-                let info = detail.ok_or(SysError::new(ENOENT))?;
-                *pending = Self::serialize_response(&GpioControlResponse::Controller(info))?;
-                log::debug!("gpiod: served controller detail for id={id}");
-            }
-            _ => {}
-        }
-
-        Self::copy_pending(handle, buf, offset)
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<usize> {
-        let request = Self::deserialize_request(buf)?;
-
-        match request {
-            GpioControlRequest::RegisterController { mut info } => {
-                if !matches!(self.handles.get(id)?, Handle::Register { .. }) {
-                    return Err(SysError::new(EINVAL));
-                }
-
-                let controller_id = self.next_id;
-                self.next_id = self.next_id.checked_add(1).ok_or(SysError::new(EINVAL))?;
-                info.id = controller_id;
-                self.controllers.insert(
-                    controller_id,
-                    ControllerEntry {
-                        info: info.clone(),
-                        provider_handle: id,
-                    },
-                );
-
-                let handle = self.handles.get_mut(id)?;
-                *handle = Handle::Provider {
-                    controller_id,
-                    pending: Self::serialize_response(&GpioControlResponse::ControllerRegistered {
-                        id: controller_id,
-                    })?,
-                };
-
-                log::info!(
-                    "RB_GPIOD_CONTROLLER_REGISTERED id={} name={} pin_count={} supports_interrupt={}",
-                    info.id,
-                    info.name,
-                    info.pin_count,
-                    info.supports_interrupt,
-                );
-                Ok(buf.len())
-            }
-            GpioControlRequest::ListControllers => {
-                let controllers = self.controller_list();
-                let handle = self.handles.get_mut(id)?;
-                Self::set_pending_response(handle, GpioControlResponse::Controllers(controllers))?;
-                Ok(buf.len())
-            }
-            GpioControlRequest::ReadPin { controller_id, pin } => {
-                let validation = self.validate_pin_target(controller_id, pin);
-                let handle = self.handles.get_mut(id)?;
-                match handle {
-                    Handle::PinOp {
-                        kind: PinOpKind::Read,
-                        ..
-                    } => {
-                        match validation {
-                            Ok(info) => {
-                                log::info!(
-                                    "RB_GPIOD_PIN_READ controller_id={} name={} pin={} routed=stub",
-                                    controller_id,
-                                    info.name,
-                                    pin,
-                                );
-                                Self::set_pending_response(handle, GpioControlResponse::PinValue(false))?;
-                            }
-                            Err(message) => {
-                                Self::set_pending_response(handle, GpioControlResponse::Error(message))?;
-                            }
-                        }
-                        Ok(buf.len())
-                    }
-                    _ => Err(SysError::new(EINVAL)),
-                }
-            }
-            GpioControlRequest::WritePin {
-                controller_id,
-                pin,
-                value,
-            } => {
-                let validation = self.validate_pin_target(controller_id, pin);
-                let handle = self.handles.get_mut(id)?;
-                match handle {
-                    Handle::PinOp {
-                        kind: PinOpKind::Write,
-                        ..
-                    } => {
-                        match validation {
-                            Ok(info) => {
-                                log::info!(
-                                    "RB_GPIOD_PIN_WRITE controller_id={} name={} pin={} value={} routed=stub",
-                                    controller_id,
-                                    info.name,
-                                    pin,
-                                    value,
-                                );
-                                Self::set_pending_response(handle, GpioControlResponse::Ack)?;
-                            }
-                            Err(message) => {
-                                Self::set_pending_response(handle, GpioControlResponse::Error(message))?;
-                            }
-                        }
-                        Ok(buf.len())
-                    }
-                    _ => Err(SysError::new(EINVAL)),
-                }
-            }
-            GpioControlRequest::ConfigurePin {
-                controller_id,
-                pin,
-                config,
-            } => {
-                let validation = self.validate_pin_target(controller_id, pin);
-                let handle = self.handles.get_mut(id)?;
-                match handle {
-                    Handle::PinOp {
-                        kind: PinOpKind::Configure,
-                        ..
-                    } => {
-                        match validation {
-                            Ok(info) => {
-                                log::info!(
-                                    "RB_GPIOD_PIN_CONFIG controller_id={} name={} pin={} direction={:?} pull={:?} interrupt={:?} routed=stub",
-                                    controller_id,
-                                    info.name,
-                                    pin,
-                                    config.direction,
-                                    config.pull,
-                                    config.interrupt_mode,
-                                );
-                                Self::set_pending_response(handle, GpioControlResponse::Ack)?;
-                            }
-                            Err(message) => {
-                                Self::set_pending_response(handle, GpioControlResponse::Error(message))?;
-                            }
-                        }
-                        Ok(buf.len())
-                    }
-                    _ => Err(SysError::new(EINVAL)),
-                }
-            }
-        }
-    }
-
-    fn on_close(&mut self, id: usize) {
-        let Some(handle) = self.handles.remove(id) else {
-            return;
-        };
-        if let Handle::Provider { controller_id, .. } = handle {
-            if let Some(entry) = self.controllers.remove(&controller_id) {
-                log::info!(
-                    "RB_GPIOD_CONTROLLER_REMOVED id={} name={} provider_handle={}",
-                    controller_id,
-                    entry.info.name,
-                    entry.provider_handle,
-                );
-            }
-        }
-    }
-}
-
-fn run_daemon(daemon: daemon::SchemeDaemon) -> Result<()> {
-    let socket = Socket::create().context("failed to create gpio scheme socket")?;
-    let mut scheme = GpioDaemon::new();
-    let handler = Blocking::new(&socket, 16);
-
-    daemon
-        .ready_sync_scheme(&socket, &mut scheme)
-        .context("failed to publish gpio scheme root")?;
-
-    log::info!("RB_GPIOD_SCHEMA version=1");
-
-    libredox::call::setrens(0, 0).context("failed to enter null namespace")?;
-
-    handler
-        .process_requests_blocking(scheme)
-        .context("failed to process gpiod requests")?;
-}
-
-fn daemon_runner(daemon: daemon::SchemeDaemon) -> ! {
-    if let Err(err) = run_daemon(daemon) {
-        log::error!("gpiod: {err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn main() {
-    common::setup_logging(
-        "gpio",
-        "gpio",
-        "gpiod",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    daemon::SchemeDaemon::new(daemon_runner);
-}
diff --git a/recipes/core/base/drivers/gpio/i2c-gpio-expanderd/Cargo.toml b/recipes/core/base/drivers/gpio/i2c-gpio-expanderd/Cargo.toml
deleted file mode 100644
index 3e168e968f..0000000000
--- a/recipes/core/base/drivers/gpio/i2c-gpio-expanderd/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "i2c-gpio-expanderd"
-description = "I2C GPIO expander bridge daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-serde.workspace = true
-ron.workspace = true
-
-acpi-resource = { path = "../../acpi-resource" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-i2c-interface = { path = "../../i2c/i2c-interface" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/gpio/i2c-gpio-expanderd/src/main.rs b/recipes/core/base/drivers/gpio/i2c-gpio-expanderd/src/main.rs
deleted file mode 100644
index d457d2df6d..0000000000
--- a/recipes/core/base/drivers/gpio/i2c-gpio-expanderd/src/main.rs
+++ /dev/null
@@ -1,454 +0,0 @@
-use std::collections::BTreeMap;
-use std::fs::{self, File, OpenOptions};
-use std::io::{Read, Write};
-use std::path::Path;
-use std::process;
-
-use acpi_resource::{GpioDescriptor, I2cSerialBusDescriptor, ResourceDescriptor};
-use anyhow::{Context, Result};
-use i2c_interface::{
-    I2cAdapterInfo, I2cControlRequest, I2cControlResponse, I2cTransferRequest,
-    I2cTransferResponse, I2cTransferSegment,
-};
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Deserialize)]
-struct AmlSymbol {
-    name: String,
-    value: AmlValue,
-}
-
-#[derive(Debug, Deserialize)]
-enum AmlValue {
-    Integer(u64),
-    String(String),
-}
-
-#[derive(Clone, Debug)]
-struct ExpanderResources {
-    i2c: I2cSerialBusDescriptor,
-    pin_count: usize,
-    gpio_int_count: usize,
-    gpio_io_count: usize,
-}
-
-#[derive(Debug)]
-struct ExpanderDescriptor {
-    device: String,
-    hid: String,
-    resources: ExpanderResources,
-}
-
-struct RegisteredExpander {
-    _registration: File,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-struct GpioControllerInfo {
-    id: u32,
-    name: String,
-    pin_count: usize,
-    supports_interrupt: bool,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-enum GpioControlRequest {
-    RegisterController { info: GpioControllerInfo },
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-enum GpioControlResponse {
-    ControllerRegistered { id: u32 },
-    Error(String),
-}
-
-fn main() {
-    common::setup_logging(
-        "gpio",
-        "i2c-gpio-expander",
-        "i2c-gpio-expanderd",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    daemon::Daemon::new(daemon_runner);
-}
-
-fn daemon_runner(daemon: daemon::Daemon) -> ! {
-    if let Err(err) = daemon_main(daemon) {
-        log::error!("i2c-gpio-expanderd: {err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn daemon_main(daemon: daemon::Daemon) -> Result<()> {
-    let expanders = discover_expanders().context("failed to discover ACPI I2C GPIO expanders")?;
-    if expanders.is_empty() {
-        log::info!("i2c-gpio-expanderd: no probable ACPI I2C GPIO expanders found");
-    }
-
-    let adapters = list_i2c_adapters().unwrap_or_else(|err| {
-        log::warn!("i2c-gpio-expanderd: unable to query i2cd adapters: {err:#}");
-        Vec::new()
-    });
-
-    let mut registered = Vec::new();
-    for expander in expanders {
-        match register_expander(expander, &adapters) {
-            Ok(expander) => registered.push(expander),
-            Err(err) => log::warn!("i2c-gpio-expanderd: expander registration skipped: {err:#}"),
-        }
-    }
-
-    daemon.ready();
-    libredox::call::setrens(0, 0).context("failed to enter null namespace")?;
-
-    log::info!("i2c-gpio-expanderd: registered {} expander(s)", registered.len());
-
-    loop {
-        std::thread::park();
-    }
-}
-
-fn discover_expanders() -> Result<Vec<ExpanderDescriptor>> {
-    let mut matched = BTreeMap::new();
-
-    let entries = match fs::read_dir("/scheme/acpi/symbols") {
-        Ok(entries) => entries,
-        Err(err) if err.kind() == std::io::ErrorKind::WouldBlock || err.raw_os_error() == Some(11) => {
-            log::debug!("i2c-gpio-expanderd: ACPI symbols are not ready yet");
-            return Ok(Vec::new());
-        }
-        Err(err) => return Err(err).context("failed to read /scheme/acpi/symbols"),
-    };
-
-    for entry in entries {
-        let entry = entry.context("failed to read ACPI symbol directory entry")?;
-        let Some(file_name) = entry.file_name().to_str().map(str::to_owned) else {
-            continue;
-        };
-        if !file_name.ends_with("_HID") && !file_name.ends_with("_CID") {
-            continue;
-        }
-
-        let Some(id) = read_symbol_id(&entry.path())? else {
-            continue;
-        };
-        if is_excluded_device_id(&id) {
-            continue;
-        }
-
-        let Some(device) = file_name
-            .strip_suffix("_HID")
-            .or_else(|| file_name.strip_suffix("_CID"))
-            .map(str::to_owned)
-        else {
-            continue;
-        };
-
-        let resources = match read_expander_resources(&device) {
-            Ok(resources) => resources,
-            Err(err) => {
-                log::debug!("i2c-gpio-expanderd: skipping {device}: {err:#}");
-                continue;
-            }
-        };
-        if resources.gpio_int_count == 0 && resources.gpio_io_count == 0 {
-            continue;
-        }
-
-        matched.entry(device).or_insert((id, resources));
-    }
-
-    let mut expanders = Vec::new();
-    for (device, (hid, resources)) in matched {
-        expanders.push(ExpanderDescriptor {
-            device,
-            hid,
-            resources,
-        });
-    }
-    Ok(expanders)
-}
-
-fn read_symbol_id(path: &Path) -> Result<Option<String>> {
-    let contents = fs::read_to_string(path)
-        .with_context(|| format!("failed to read ACPI symbol {}", path.display()))?;
-    let symbol = match ron::from_str::<AmlSymbol>(&contents) {
-        Ok(symbol) => symbol,
-        Err(err) => {
-            log::debug!(
-                "i2c-gpio-expanderd: skipping {} because the symbol payload was not a scalar ID: {err}",
-                path.display(),
-            );
-            return Ok(None);
-        }
-    };
-
-    let id = match symbol.value {
-        AmlValue::Integer(integer) => eisa_id_from_integer(integer),
-        AmlValue::String(string) => string,
-    };
-
-    log::debug!("i2c-gpio-expanderd: {} -> {id}", symbol.name);
-    Ok(Some(id))
-}
-
-fn read_expander_resources(device: &str) -> Result<ExpanderResources> {
-    let contents = fs::read_to_string(format!("/scheme/acpi/resources/{device}"))
-        .with_context(|| format!("failed to read /scheme/acpi/resources/{device}"))?;
-    let resources = ron::from_str::<Vec<ResourceDescriptor>>(&contents)
-        .with_context(|| format!("failed to decode RON resources for {device}"))?;
-
-    let mut i2c = None;
-    let mut pin_count = 0usize;
-    let mut gpio_int_count = 0usize;
-    let mut gpio_io_count = 0usize;
-
-    for resource in resources {
-        match resource {
-            ResourceDescriptor::I2cSerialBus(bus) if i2c.is_none() => i2c = Some(bus),
-            ResourceDescriptor::GpioInt(descriptor) => {
-                gpio_int_count += 1;
-                pin_count = pin_count.max(pin_count_from_descriptor(&descriptor));
-            }
-            ResourceDescriptor::GpioIo(descriptor) => {
-                gpio_io_count += 1;
-                pin_count = pin_count.max(pin_count_from_descriptor(&descriptor));
-            }
-            _ => {}
-        }
-    }
-
-    Ok(ExpanderResources {
-        i2c: i2c.context("no I2cSerialBus resource was found")?,
-        pin_count,
-        gpio_int_count,
-        gpio_io_count,
-    })
-}
-
-fn pin_count_from_descriptor(descriptor: &GpioDescriptor) -> usize {
-    descriptor
-        .pins
-        .iter()
-        .copied()
-        .max()
-        .map(|pin| usize::from(pin).saturating_add(1))
-        .unwrap_or(0)
-}
-
-fn is_excluded_device_id(id: &str) -> bool {
-    matches!(
-        id,
-        "PNP0C50"
-            | "ACPI0C50"
-            | "INT34C5"
-            | "INTC1055"
-            | "INT33C2"
-            | "INT33C3"
-            | "INT3432"
-            | "INT3433"
-            | "INTC10EF"
-            | "AMDI0010"
-            | "AMDI0019"
-            | "AMDI0510"
-            | "PNP0CA0"
-            | "AMDI0042"
-    ) || id.starts_with("ELAN")
-        || id.starts_with("CYAP")
-        || id.starts_with("SYNA")
-}
-
-fn register_expander(expander: ExpanderDescriptor, adapters: &[I2cAdapterInfo]) -> Result<RegisteredExpander> {
-    let ExpanderDescriptor {
-        device,
-        hid,
-        resources,
-    } = expander;
-
-    let adapter_name = resources
-        .i2c
-        .resource_source
-        .as_ref()
-        .map(|source| source.source.clone())
-        .filter(|source| !source.is_empty())
-        .unwrap_or_else(|| String::from("ACPI-I2C"));
-    let adapter = match match_i2c_adapter(adapters, &adapter_name) {
-        Some(adapter) => Some(adapter.clone()),
-        None => {
-            log::warn!(
-                "i2c-gpio-expanderd: unable to resolve I2C adapter {} for {}",
-                adapter_name,
-                device,
-            );
-            None
-        }
-    };
-
-    if let Some(adapter) = adapter.as_ref() {
-        if let Err(err) = probe_expander(adapter, &adapter_name, resources.i2c.slave_address) {
-            log::warn!(
-                "i2c-gpio-expanderd: expander {} probe on {}@{:04x} failed: {err:#}",
-                device,
-                adapter_name,
-                resources.i2c.slave_address,
-            );
-        }
-    }
-
-    let info = GpioControllerInfo {
-        id: 0,
-        name: format!("i2c-gpio-expander:{device}"),
-        pin_count: resources.pin_count,
-        supports_interrupt: resources.gpio_int_count > 0,
-    };
-    let mut registration = register_with_gpiod(&info)
-        .with_context(|| format!("failed to register {device} with gpiod"))?;
-    let response = read_gpio_registration_response(&mut registration)
-        .with_context(|| format!("failed to read gpiod registration response for {device}"))?;
-
-    match response {
-        GpioControlResponse::ControllerRegistered { id } => {
-            log::info!(
-                "RB_I2C_GPIO_EXPANDERD_DEVICE device={} hid={} controller_id={} adapter={} addr={:04x} pin_count={} gpio_int={} gpio_io={}",
-                device,
-                hid,
-                id,
-                adapter_name,
-                resources.i2c.slave_address,
-                info.pin_count,
-                resources.gpio_int_count,
-                resources.gpio_io_count,
-            );
-        }
-        GpioControlResponse::Error(message) => {
-            anyhow::bail!("gpiod rejected expander {device}: {message}");
-        }
-    }
-
-    Ok(RegisteredExpander {
-        _registration: registration,
-    })
-}
-
-fn list_i2c_adapters() -> Result<Vec<I2cAdapterInfo>> {
-    let mut file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .open("/scheme/i2c/adapters")
-        .context("failed to open /scheme/i2c/adapters")?;
-
-    let payload = ron::ser::to_string(&I2cControlRequest::ListAdapters)
-        .context("failed to encode I2C list-adapters request")?;
-    file.write_all(payload.as_bytes())
-        .context("failed to request I2C adapter list")?;
-
-    let response = read_i2c_control_response(&mut file)?;
-    match response {
-        I2cControlResponse::AdapterList(adapters) => Ok(adapters),
-        I2cControlResponse::Error(message) => anyhow::bail!("i2cd returned an error: {message}"),
-        other => anyhow::bail!("unexpected i2cd list-adapters response: {other:?}"),
-    }
-}
-
-fn match_i2c_adapter<'a>(adapters: &'a [I2cAdapterInfo], wanted: &str) -> Option<&'a I2cAdapterInfo> {
-    adapters
-        .iter()
-        .find(|adapter| adapter.name == wanted)
-        .or_else(|| adapters.iter().find(|adapter| adapter.name.ends_with(wanted)))
-        .or_else(|| adapters.iter().find(|adapter| wanted.ends_with(&adapter.name)))
-}
-
-fn probe_expander(adapter: &I2cAdapterInfo, adapter_name: &str, address: u16) -> Result<I2cTransferResponse> {
-    let request = I2cTransferRequest {
-        adapter: adapter_name.to_string(),
-        segments: vec![I2cTransferSegment::read(address, 1)],
-        stop: true,
-    };
-
-    let mut file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .open("/scheme/i2c/transfer")
-        .context("failed to open /scheme/i2c/transfer")?;
-    let payload = ron::ser::to_string(&I2cControlRequest::Transfer {
-        adapter_id: adapter.id,
-        request,
-    })
-    .context("failed to encode I2C expander probe request")?;
-    file.write_all(payload.as_bytes())
-        .context("failed to send I2C expander probe request")?;
-
-    let response = read_i2c_control_response(&mut file)?;
-    match response {
-        I2cControlResponse::TransferResult(result) => {
-            if !result.ok {
-                let detail = result
-                    .error
-                    .clone()
-                    .unwrap_or_else(|| String::from("unknown I2C transfer failure"));
-                anyhow::bail!("I2C probe failed: {detail}");
-            }
-            Ok(result)
-        }
-        I2cControlResponse::Error(message) => anyhow::bail!("i2cd returned an error: {message}"),
-        other => anyhow::bail!("unexpected I2C transfer response: {other:?}"),
-    }
-}
-
-fn register_with_gpiod(info: &GpioControllerInfo) -> Result<File> {
-    let mut file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .open("/scheme/gpio/register")
-        .context("failed to open /scheme/gpio/register")?;
-    let payload = ron::ser::to_string(&GpioControlRequest::RegisterController { info: info.clone() })
-        .context("failed to encode GPIO controller registration")?;
-    file.write_all(payload.as_bytes())
-        .context("failed to send GPIO controller registration")?;
-    Ok(file)
-}
-
-fn read_gpio_registration_response(file: &mut File) -> Result<GpioControlResponse> {
-    let mut buffer = vec![0_u8; 4096];
-    let count = file
-        .read(&mut buffer)
-        .context("failed to read GPIO registration response")?;
-    buffer.truncate(count);
-    let text = std::str::from_utf8(&buffer).context("GPIO registration response was not UTF-8")?;
-    ron::from_str(text).context("failed to decode GPIO registration response")
-}
-
-fn read_i2c_control_response(file: &mut File) -> Result<I2cControlResponse> {
-    let mut buffer = vec![0_u8; 4096];
-    let count = file
-        .read(&mut buffer)
-        .context("failed to read I2C control response")?;
-    buffer.truncate(count);
-    let text = std::str::from_utf8(&buffer).context("I2C control response was not UTF-8")?;
-    let trimmed = text.trim();
-    if trimmed.is_empty() {
-        return Ok(I2cControlResponse::AdapterList(Vec::new()));
-    }
-    ron::from_str(trimmed).context("failed to decode I2C control response")
-}
-
-fn eisa_id_from_integer(integer: u64) -> String {
-    let vendor = integer & 0xFFFF;
-    let device = (integer >> 16) & 0xFFFF;
-    let vendor_rev = ((vendor & 0xFF) << 8) | (vendor >> 8);
-    let vendor_1 = (((vendor_rev >> 10) & 0x1F) as u8 + 64) as char;
-    let vendor_2 = (((vendor_rev >> 5) & 0x1F) as u8 + 64) as char;
-    let vendor_3 = (((vendor_rev >> 0) & 0x1F) as u8 + 64) as char;
-    let device_1 = (device >> 4) & 0xF;
-    let device_2 = (device >> 0) & 0xF;
-    let device_3 = (device >> 12) & 0xF;
-    let device_4 = (device >> 8) & 0xF;
-
-    format!(
-        "{vendor_1}{vendor_2}{vendor_3}{device_1:01X}{device_2:01X}{device_3:01X}{device_4:01X}"
-    )
-}
diff --git a/recipes/core/base/drivers/gpio/intel-gpiod/Cargo.toml b/recipes/core/base/drivers/gpio/intel-gpiod/Cargo.toml
deleted file mode 100644
index f5ac93554a..0000000000
--- a/recipes/core/base/drivers/gpio/intel-gpiod/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "intel-gpiod"
-description = "Intel ACPI GPIO registrar daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-serde.workspace = true
-ron.workspace = true
-
-acpi-resource = { path = "../../acpi-resource" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/gpio/intel-gpiod/src/main.rs b/recipes/core/base/drivers/gpio/intel-gpiod/src/main.rs
deleted file mode 100644
index 78e6099076..0000000000
--- a/recipes/core/base/drivers/gpio/intel-gpiod/src/main.rs
+++ /dev/null
@@ -1,401 +0,0 @@
-use std::collections::BTreeMap;
-use std::fs::{self, File, OpenOptions};
-use std::io::{Read, Write};
-use std::path::Path;
-use std::process;
-
-use acpi_resource::{
-    AddressResourceType, ExtendedIrqDescriptor, FixedMemory32Descriptor, GpioDescriptor,
-    IrqDescriptor, Memory32RangeDescriptor, ResourceDescriptor,
-};
-use anyhow::{Context, Result};
-use common::{MemoryType, PhysBorrowed, Prot};
-use serde::{Deserialize, Serialize};
-
-const SUPPORTED_IDS: &[&str] = &["INT34C5", "INTC1055"];
-
-const PADNFGPIO_OWN_BASE: usize = 0x20;
-const PADNFGPIO_PADCFG_BASE: usize = 0x700;
-const GPI_INT_STATUS: usize = 0x100;
-const GPI_INT_EN: usize = 0x120;
-const INTEL_GPIO_MMIO_WINDOW: usize = PADNFGPIO_PADCFG_BASE + core::mem::size_of::<u32>();
-
-#[derive(Debug, Deserialize)]
-struct AmlSymbol {
-    name: String,
-    value: AmlValue,
-}
-
-#[derive(Debug, Deserialize)]
-enum AmlValue {
-    Integer(u64),
-    String(String),
-}
-
-#[derive(Clone, Debug)]
-struct ControllerResources {
-    mmio_base: usize,
-    mmio_len: usize,
-    pin_count: usize,
-    supports_interrupt: bool,
-    gpio_int_count: usize,
-    gpio_io_count: usize,
-}
-
-#[derive(Debug)]
-struct ControllerDescriptor {
-    device: String,
-    hid: String,
-    resources: ControllerResources,
-}
-
-struct RegisteredController {
-    _mmio: Option<PhysBorrowed>,
-    _registration: File,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-struct GpioControllerInfo {
-    id: u32,
-    name: String,
-    pin_count: usize,
-    supports_interrupt: bool,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-enum GpioControlRequest {
-    RegisterController { info: GpioControllerInfo },
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-enum GpioControlResponse {
-    ControllerRegistered { id: u32 },
-    Error(String),
-}
-
-fn main() {
-    common::setup_logging(
-        "gpio",
-        "intel-gpio",
-        "intel-gpiod",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    daemon::Daemon::new(daemon_runner);
-}
-
-fn daemon_runner(daemon: daemon::Daemon) -> ! {
-    if let Err(err) = daemon_main(daemon) {
-        log::error!("intel-gpiod: {err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn daemon_main(daemon: daemon::Daemon) -> Result<()> {
-    common::init();
-
-    let controllers =
-        discover_controllers(SUPPORTED_IDS).context("failed to discover Intel GPIO controllers")?;
-    if controllers.is_empty() {
-        log::info!("intel-gpiod: no supported Intel GPIO ACPI controllers found");
-    }
-
-    let mut registered = Vec::new();
-    for controller in controllers {
-        match register_controller(controller) {
-            Ok(controller) => registered.push(controller),
-            Err(err) => log::warn!("intel-gpiod: controller registration skipped: {err:#}"),
-        }
-    }
-
-    daemon.ready();
-    libredox::call::setrens(0, 0).context("failed to enter null namespace")?;
-
-    log::info!("intel-gpiod: registered {} controller(s)", registered.len());
-
-    loop {
-        std::thread::park();
-    }
-}
-
-fn discover_controllers(supported_ids: &[&str]) -> Result<Vec<ControllerDescriptor>> {
-    let mut matched = BTreeMap::new();
-
-    let entries = match fs::read_dir("/scheme/acpi/symbols") {
-        Ok(entries) => entries,
-        Err(err) if err.kind() == std::io::ErrorKind::WouldBlock || err.raw_os_error() == Some(11) => {
-            log::debug!("intel-gpiod: ACPI symbols are not ready yet");
-            return Ok(Vec::new());
-        }
-        Err(err) => return Err(err).context("failed to read /scheme/acpi/symbols"),
-    };
-
-    for entry in entries {
-        let entry = entry.context("failed to read ACPI symbol directory entry")?;
-        let Some(file_name) = entry.file_name().to_str().map(str::to_owned) else {
-            continue;
-        };
-        if !file_name.ends_with("_HID") && !file_name.ends_with("_CID") {
-            continue;
-        }
-
-        let Some(id) = read_symbol_id(&entry.path())? else {
-            continue;
-        };
-        if !supported_ids.iter().any(|candidate| *candidate == id) {
-            continue;
-        }
-
-        let device = file_name
-            .strip_suffix("_HID")
-            .or_else(|| file_name.strip_suffix("_CID"))
-            .map(str::to_owned);
-        if let Some(device) = device {
-            matched.entry(device).or_insert(id);
-        }
-    }
-
-    let mut controllers = Vec::new();
-    for (device, hid) in matched {
-        let resources = read_controller_resources(&device)
-            .with_context(|| format!("failed to read resources for {device}"))?;
-        controllers.push(ControllerDescriptor {
-            device,
-            hid,
-            resources,
-        });
-    }
-
-    Ok(controllers)
-}
-
-fn read_symbol_id(path: &Path) -> Result<Option<String>> {
-    let contents = fs::read_to_string(path)
-        .with_context(|| format!("failed to read ACPI symbol {}", path.display()))?;
-    let symbol = match ron::from_str::<AmlSymbol>(&contents) {
-        Ok(symbol) => symbol,
-        Err(err) => {
-            log::debug!(
-                "intel-gpiod: skipping {} because the symbol payload was not a scalar ID: {err}",
-                path.display(),
-            );
-            return Ok(None);
-        }
-    };
-
-    let id = match symbol.value {
-        AmlValue::Integer(integer) => eisa_id_from_integer(integer),
-        AmlValue::String(string) => string,
-    };
-
-    log::debug!("intel-gpiod: {} -> {id}", symbol.name);
-    Ok(Some(id))
-}
-
-fn read_controller_resources(device: &str) -> Result<ControllerResources> {
-    let contents = fs::read_to_string(format!("/scheme/acpi/resources/{device}"))
-        .with_context(|| format!("failed to read /scheme/acpi/resources/{device}"))?;
-    let resources = ron::from_str::<Vec<ResourceDescriptor>>(&contents)
-        .with_context(|| format!("failed to decode RON resources for {device}"))?;
-
-    let mut mmio = None;
-    let mut supports_interrupt = false;
-    let mut gpio_int_count = 0usize;
-    let mut gpio_io_count = 0usize;
-    let mut pin_count = 0usize;
-
-    for resource in &resources {
-        match resource {
-            ResourceDescriptor::FixedMemory32(FixedMemory32Descriptor {
-                address,
-                address_length,
-                ..
-            }) if mmio.is_none() => {
-                mmio = Some((
-                    *address as usize,
-                    (*address_length as usize).max(INTEL_GPIO_MMIO_WINDOW),
-                ));
-            }
-            ResourceDescriptor::Memory32Range(Memory32RangeDescriptor {
-                minimum,
-                maximum,
-                address_length,
-                ..
-            }) if mmio.is_none() && maximum >= minimum => {
-                let span = maximum.saturating_sub(*minimum).saturating_add(1) as usize;
-                mmio = Some((
-                    *minimum as usize,
-                    span.max((*address_length as usize).max(INTEL_GPIO_MMIO_WINDOW)),
-                ));
-            }
-            ResourceDescriptor::Address32(descriptor)
-                if mmio.is_none()
-                    && matches!(descriptor.resource_type, AddressResourceType::MemoryRange) =>
-            {
-                mmio = Some((
-                    descriptor.minimum as usize,
-                    (descriptor.address_length as usize).max(INTEL_GPIO_MMIO_WINDOW),
-                ));
-            }
-            ResourceDescriptor::Address64(descriptor)
-                if mmio.is_none()
-                    && matches!(descriptor.resource_type, AddressResourceType::MemoryRange) =>
-            {
-                let base = usize::try_from(descriptor.minimum)
-                    .context("64-bit MMIO base does not fit in usize")?;
-                let len = usize::try_from(descriptor.address_length)
-                    .context("64-bit MMIO length does not fit in usize")?;
-                mmio = Some((base, len.max(INTEL_GPIO_MMIO_WINDOW)));
-            }
-            ResourceDescriptor::Irq(IrqDescriptor { interrupts, .. }) => {
-                supports_interrupt |= !interrupts.is_empty();
-            }
-            ResourceDescriptor::ExtendedIrq(ExtendedIrqDescriptor { interrupts, .. }) => {
-                supports_interrupt |= !interrupts.is_empty();
-            }
-            ResourceDescriptor::GpioInt(descriptor) => {
-                gpio_int_count += 1;
-                supports_interrupt = true;
-                pin_count = pin_count.max(pin_count_from_descriptor(descriptor));
-            }
-            ResourceDescriptor::GpioIo(descriptor) => {
-                gpio_io_count += 1;
-                pin_count = pin_count.max(pin_count_from_descriptor(descriptor));
-            }
-            _ => {}
-        }
-    }
-
-    let (mmio_base, mmio_len) = mmio.context("no MMIO resource was found")?;
-    Ok(ControllerResources {
-        mmio_base,
-        mmio_len,
-        pin_count,
-        supports_interrupt,
-        gpio_int_count,
-        gpio_io_count,
-    })
-}
-
-fn pin_count_from_descriptor(descriptor: &GpioDescriptor) -> usize {
-    descriptor
-        .pins
-        .iter()
-        .copied()
-        .max()
-        .map(|pin| usize::from(pin).saturating_add(1))
-        .unwrap_or(0)
-}
-
-fn register_controller(controller: ControllerDescriptor) -> Result<RegisteredController> {
-    let ControllerDescriptor {
-        device,
-        hid,
-        resources,
-    } = controller;
-
-    let mmio = match PhysBorrowed::map(
-        resources.mmio_base,
-        resources.mmio_len,
-        Prot::RW,
-        MemoryType::Uncacheable,
-    ) {
-        Ok(mapping) => Some(mapping),
-        Err(err) => {
-            log::warn!(
-                "intel-gpiod: failed to map MMIO for {device} ({:#x}, len {:#x}): {err}",
-                resources.mmio_base,
-                resources.mmio_len,
-            );
-            None
-        }
-    };
-
-    log::info!(
-        "intel-gpiod: discovered {device} hid={hid} mmio={:#x}+{:#x} pin_count={} gpio_int={} gpio_io={} supports_interrupt={}",
-        resources.mmio_base,
-        resources.mmio_len,
-        resources.pin_count,
-        resources.gpio_int_count,
-        resources.gpio_io_count,
-        resources.supports_interrupt,
-    );
-    log::debug!(
-        "intel-gpiod: register model own={PADNFGPIO_OWN_BASE:#x} padcfg={PADNFGPIO_PADCFG_BASE:#x} gpi_int_status={GPI_INT_STATUS:#x} gpi_int_en={GPI_INT_EN:#x}",
-    );
-
-    let info = GpioControllerInfo {
-        id: 0,
-        name: format!("intel-gpio:{device}"),
-        pin_count: resources.pin_count,
-        supports_interrupt: resources.supports_interrupt,
-    };
-    let mut registration = register_with_gpiod(&info)
-        .with_context(|| format!("failed to register {device} with gpiod"))?;
-    let response = read_registration_response(&mut registration)
-        .with_context(|| format!("failed to read gpiod registration response for {device}"))?;
-
-    match response {
-        GpioControlResponse::ControllerRegistered { id } => {
-            log::info!(
-                "RB_INTEL_GPIOD_DEVICE device={} hid={} controller_id={} pin_count={} supports_interrupt={}",
-                device,
-                hid,
-                id,
-                info.pin_count,
-                info.supports_interrupt,
-            );
-        }
-        GpioControlResponse::Error(message) => {
-            anyhow::bail!("gpiod rejected Intel GPIO controller {device}: {message}");
-        }
-    }
-
-    Ok(RegisteredController {
-        _mmio: mmio,
-        _registration: registration,
-    })
-}
-
-fn register_with_gpiod(info: &GpioControllerInfo) -> Result<File> {
-    let mut file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .open("/scheme/gpio/register")
-        .context("failed to open /scheme/gpio/register")?;
-    let payload = ron::ser::to_string(&GpioControlRequest::RegisterController { info: info.clone() })
-        .context("failed to encode GPIO controller registration")?;
-    file.write_all(payload.as_bytes())
-        .context("failed to send GPIO controller registration")?;
-    Ok(file)
-}
-
-fn read_registration_response(file: &mut File) -> Result<GpioControlResponse> {
-    let mut buffer = vec![0_u8; 4096];
-    let count = file
-        .read(&mut buffer)
-        .context("failed to read GPIO registration response")?;
-    buffer.truncate(count);
-    let text = std::str::from_utf8(&buffer).context("GPIO registration response was not UTF-8")?;
-    ron::from_str(text).context("failed to decode GPIO registration response")
-}
-
-fn eisa_id_from_integer(integer: u64) -> String {
-    let vendor = integer & 0xFFFF;
-    let device = (integer >> 16) & 0xFFFF;
-    let vendor_rev = ((vendor & 0xFF) << 8) | (vendor >> 8);
-    let vendor_1 = (((vendor_rev >> 10) & 0x1F) as u8 + 64) as char;
-    let vendor_2 = (((vendor_rev >> 5) & 0x1F) as u8 + 64) as char;
-    let vendor_3 = (((vendor_rev >> 0) & 0x1F) as u8 + 64) as char;
-    let device_1 = (device >> 4) & 0xF;
-    let device_2 = (device >> 0) & 0xF;
-    let device_3 = (device >> 12) & 0xF;
-    let device_4 = (device >> 8) & 0xF;
-
-    format!(
-        "{vendor_1}{vendor_2}{vendor_3}{device_1:01X}{device_2:01X}{device_3:01X}{device_4:01X}"
-    )
-}
diff --git a/recipes/core/base/drivers/graphics/console-draw/Cargo.toml b/recipes/core/base/drivers/graphics/console-draw/Cargo.toml
deleted file mode 100644
index c92a7b9f42..0000000000
--- a/recipes/core/base/drivers/graphics/console-draw/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "console-draw"
-description = "Shared terminal drawing code library"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-drm.workspace = true
-orbclient.workspace = true
-ransid.workspace = true
-
-graphics-ipc = { path = "../graphics-ipc" }
-
-[features]
-default = []
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/graphics/console-draw/src/lib.rs b/recipes/core/base/drivers/graphics/console-draw/src/lib.rs
deleted file mode 100644
index 5eb951df54..0000000000
--- a/recipes/core/base/drivers/graphics/console-draw/src/lib.rs
+++ /dev/null
@@ -1,460 +0,0 @@
-extern crate ransid;
-
-use std::collections::VecDeque;
-use std::convert::{TryFrom, TryInto};
-use std::{cmp, io, mem, ptr};
-
-use drm::buffer::{Buffer, DrmFourcc};
-use drm::control::{connector, crtc, framebuffer, ClipRect, Device, Mode};
-use graphics_ipc::{CpuBackedBuffer, V2GraphicsHandle};
-use orbclient::FONT;
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct Damage {
-    pub x: u32,
-    pub y: u32,
-    pub width: u32,
-    pub height: u32,
-}
-
-impl Damage {
-    pub const NONE: Self = Damage {
-        x: 0,
-        y: 0,
-        width: 0,
-        height: 0,
-    };
-
-    pub fn merge(self, other: Self) -> Self {
-        if self.width == 0 || self.height == 0 {
-            return other;
-        }
-
-        if other.width == 0 || other.height == 0 {
-            return self;
-        }
-
-        let x = cmp::min(self.x, other.x);
-        let y = cmp::min(self.y, other.y);
-        let x2 = cmp::max(self.x + self.width, other.x + other.width);
-        let y2 = cmp::max(self.y + self.height, other.y + other.height);
-
-        Damage {
-            x,
-            y,
-            width: x2 - x,
-            height: y2 - y,
-        }
-    }
-}
-
-pub struct V2DisplayMap {
-    pub display_handle: V2GraphicsHandle,
-    connector: connector::Handle,
-    crtc: crtc::Handle,
-    fb: framebuffer::Handle,
-    pub buffer: CpuBackedBuffer,
-}
-
-impl V2DisplayMap {
-    pub fn new(display_handle: V2GraphicsHandle) -> io::Result<Self> {
-        let connector = display_handle.first_display().unwrap();
-        let connector_info = display_handle.get_connector(connector, true).unwrap();
-
-        let mode = connector_info.modes()[0];
-        let (width, height) = mode.size();
-
-        // FIXME do something smarter that avoids conflicts
-        let crtc = display_handle.resource_handles().unwrap().filter_crtcs(
-            display_handle
-                .get_encoder(connector_info.encoders()[0])
-                .unwrap()
-                .possible_crtcs(),
-        )[0];
-
-        let buffer = CpuBackedBuffer::new(
-            &display_handle,
-            (width.into(), height.into()),
-            DrmFourcc::Argb8888,
-            32,
-        )?;
-        let fb = display_handle.add_framebuffer(buffer.buffer(), 32, 32)?;
-
-        display_handle.set_crtc(crtc, Some(fb), (0, 0), &[connector], Some(mode))?;
-
-        Ok(Self {
-            display_handle,
-            connector,
-            crtc,
-            fb,
-            buffer,
-        })
-    }
-
-    unsafe fn console_map(&mut self) -> DisplayMap {
-        let size = self.buffer.buffer().size();
-        let shadow_buf = self.buffer.shadow_buf();
-
-        DisplayMap {
-            offscreen: ptr::slice_from_raw_parts_mut(
-                shadow_buf.as_mut_ptr() as *mut u32,
-                shadow_buf.len() / 4,
-            ),
-            width: size.0 as usize,
-            height: size.1 as usize,
-        }
-    }
-
-    pub fn dirty_fb(&mut self, damage: Damage) -> io::Result<()> {
-        self.buffer
-            .sync_rect(damage.x, damage.y, damage.width, damage.height);
-
-        self.display_handle.dirty_framebuffer(
-            self.fb,
-            &[ClipRect::new(
-                damage.x as u16,
-                damage.y as u16,
-                (damage.x + damage.width) as u16,
-                (damage.y + damage.height) as u16,
-            )],
-        )
-    }
-}
-
-struct DisplayMap {
-    offscreen: *mut [u32],
-    width: usize,
-    height: usize,
-}
-
-pub struct TextScreen {
-    console: ransid::Console,
-}
-
-impl TextScreen {
-    pub fn new() -> TextScreen {
-        TextScreen {
-            // Width and height will be filled in on the next write to the console
-            console: ransid::Console::new(0, 0),
-        }
-    }
-
-    /// Draw a rectangle
-    fn rect(map: &mut DisplayMap, x: usize, y: usize, w: usize, h: usize, color: u32) {
-        let start_y = cmp::min(map.height, y);
-        let end_y = cmp::min(map.height, y + h);
-
-        let start_x = cmp::min(map.width, x);
-        let len = cmp::min(map.width, x + w) - start_x;
-
-        let mut offscreen_ptr = map.offscreen as *mut u8 as usize;
-
-        let stride = map.width * 4;
-
-        let offset = y * stride + start_x * 4;
-        offscreen_ptr += offset;
-
-        let mut rows = end_y - start_y;
-        while rows > 0 {
-            for i in 0..len {
-                unsafe {
-                    *(offscreen_ptr as *mut u32).add(i) = color;
-                }
-            }
-            offscreen_ptr += stride;
-            rows -= 1;
-        }
-    }
-
-    /// Invert a rectangle
-    fn invert(map: &mut DisplayMap, x: usize, y: usize, w: usize, h: usize) {
-        let start_y = cmp::min(map.height, y);
-        let end_y = cmp::min(map.height, y + h);
-
-        let start_x = cmp::min(map.width, x);
-        let len = cmp::min(map.width, x + w) - start_x;
-
-        let mut offscreen_ptr = map.offscreen as *mut u8 as usize;
-
-        let stride = map.width * 4;
-
-        let offset = y * stride + start_x * 4;
-        offscreen_ptr += offset;
-
-        let mut rows = end_y - start_y;
-        while rows > 0 {
-            let mut row_ptr = offscreen_ptr;
-            let mut cols = len;
-            while cols > 0 {
-                unsafe {
-                    let color = *(row_ptr as *mut u32);
-                    *(row_ptr as *mut u32) = !color;
-                }
-                row_ptr += 4;
-                cols -= 1;
-            }
-            offscreen_ptr += stride;
-            rows -= 1;
-        }
-    }
-
-    /// Draw a character
-    fn char(
-        map: &mut DisplayMap,
-        x: usize,
-        y: usize,
-        character: char,
-        color: u32,
-        _bold: bool,
-        _italic: bool,
-    ) {
-        if x + 8 <= map.width && y + 16 <= map.height {
-            let mut dst = map.offscreen as *mut u8 as usize + (y * map.width + x) * 4;
-
-            let font_i = 16 * (character as usize);
-            if font_i + 16 <= FONT.len() {
-                for row in 0..16 {
-                    let row_data = FONT[font_i + row];
-                    for col in 0..8 {
-                        if (row_data >> (7 - col)) & 1 == 1 {
-                            unsafe {
-                                *((dst + col * 4) as *mut u32) = color;
-                            }
-                        }
-                    }
-                    dst += map.width * 4;
-                }
-            }
-        }
-    }
-}
-
-impl TextScreen {
-    pub fn write(
-        &mut self,
-        map: &mut V2DisplayMap,
-        buf: &[u8],
-        input: &mut VecDeque<u8>,
-    ) -> Damage {
-        let map = unsafe { &mut map.console_map() };
-
-        let mut min_changed = map.height;
-        let mut max_changed = 0;
-        let mut line_changed = |line| {
-            if line < min_changed {
-                min_changed = line;
-            }
-            if line > max_changed {
-                max_changed = line;
-            }
-        };
-
-        self.console.resize(map.width / 8, map.height / 16);
-        if self.console.state.x >= self.console.state.w {
-            self.console.state.x = self.console.state.w - 1;
-        }
-        if self.console.state.y >= self.console.state.h {
-            self.console.state.y = self.console.state.h - 1;
-        }
-
-        if self.console.state.cursor
-            && self.console.state.x < self.console.state.w
-            && self.console.state.y < self.console.state.h
-        {
-            let x = self.console.state.x;
-            let y = self.console.state.y;
-            Self::invert(map, x * 8, y * 16, 8, 16);
-            line_changed(y);
-        }
-
-        self.console.write(buf, |event| match event {
-            ransid::Event::Char {
-                x,
-                y,
-                c,
-                color,
-                bold,
-                ..
-            } => {
-                Self::char(map, x * 8, y * 16, c, color.as_rgb(), bold, false);
-                line_changed(y);
-            }
-            ransid::Event::Input { data } => input.extend(data),
-            ransid::Event::Rect { x, y, w, h, color } => {
-                Self::rect(map, x * 8, y * 16, w * 8, h * 16, color.as_rgb());
-                for y2 in y..y + h {
-                    line_changed(y2);
-                }
-            }
-            ransid::Event::ScreenBuffer { .. } => (),
-            ransid::Event::Move {
-                from_x,
-                from_y,
-                to_x,
-                to_y,
-                w,
-                h,
-            } => {
-                let width = map.width;
-                let pixels = unsafe { &mut *map.offscreen };
-
-                for raw_y in 0..h {
-                    let y = if from_y > to_y { raw_y } else { h - raw_y - 1 };
-
-                    for pixel_y in 0..16 {
-                        {
-                            let off_from = ((from_y + y) * 16 + pixel_y) * width + from_x * 8;
-                            let off_to = ((to_y + y) * 16 + pixel_y) * width + to_x * 8;
-                            let len = w * 8;
-
-                            if off_from + len <= pixels.len() && off_to + len <= pixels.len() {
-                                unsafe {
-                                    let data_ptr = pixels.as_mut_ptr() as *mut u32;
-                                    ptr::copy(
-                                        data_ptr.offset(off_from as isize),
-                                        data_ptr.offset(off_to as isize),
-                                        len,
-                                    );
-                                }
-                            }
-                        }
-                    }
-
-                    line_changed(to_y + y);
-                }
-            }
-            ransid::Event::Resize { .. } => (),
-            ransid::Event::Title { .. } => (),
-        });
-
-        if self.console.state.cursor
-            && self.console.state.x < self.console.state.w
-            && self.console.state.y < self.console.state.h
-        {
-            let x = self.console.state.x;
-            let y = self.console.state.y;
-            Self::invert(map, x * 8, y * 16, 8, 16);
-            line_changed(y);
-        }
-
-        let width = map.width.try_into().unwrap();
-        let damage = Damage {
-            x: 0,
-            y: u32::try_from(min_changed).unwrap() * 16,
-            width,
-            height: u32::try_from(max_changed.saturating_sub(min_changed) + 1).unwrap() * 16,
-        };
-
-        damage
-    }
-
-    pub fn resize(&mut self, map: &mut V2DisplayMap, mode: Mode) -> io::Result<()> {
-        // FIXME fold row when target is narrower and maybe unfold when it is wider
-        fn copy_row(
-            old_map: &mut DisplayMap,
-            new_map: &mut DisplayMap,
-            from_row: usize,
-            to_row: usize,
-        ) {
-            for x in 0..cmp::min(old_map.width, new_map.width) {
-                let old_idx = from_row * old_map.width + x;
-                let new_idx = to_row * new_map.width + x;
-                unsafe {
-                    (*new_map.offscreen)[new_idx] = (*old_map.offscreen)[old_idx];
-                }
-            }
-        }
-
-        let mut new_buffer = CpuBackedBuffer::new(
-            &map.display_handle,
-            (u32::from(mode.size().0), u32::from(mode.size().1)),
-            DrmFourcc::Argb8888,
-            32,
-        )?;
-        let new_fb = map
-            .display_handle
-            .add_framebuffer(new_buffer.buffer(), 24, 32)?;
-
-        new_buffer.shadow_buf().fill(0);
-
-        {
-            let old_map = unsafe { &mut map.console_map() };
-
-            let new_size = new_buffer.buffer().size();
-            let new_shadow_buf = new_buffer.shadow_buf();
-            let new_map = &mut DisplayMap {
-                offscreen: ptr::slice_from_raw_parts_mut(
-                    new_shadow_buf.as_mut_ptr() as *mut u32,
-                    new_shadow_buf.len() / 4,
-                ),
-                width: new_size.0 as usize,
-                height: new_size.1 as usize,
-            };
-
-            if new_map.height >= old_map.height {
-                for row in 0..old_map.height {
-                    copy_row(old_map, new_map, row, row);
-                }
-            } else {
-                let deleted_rows = (old_map.height - new_map.height).div_ceil(16);
-                for row in 0..new_map.height {
-                    if row + (deleted_rows + 1) * 16 >= old_map.height {
-                        break;
-                    }
-                    copy_row(old_map, new_map, row + deleted_rows * 16, row);
-                }
-                self.console.state.y = self.console.state.y.saturating_sub(deleted_rows);
-            }
-        }
-
-        let old_buffer = mem::replace(&mut map.buffer, new_buffer);
-        old_buffer.destroy(&map.display_handle)?;
-
-        let old_fb = mem::replace(&mut map.fb, new_fb);
-        map.display_handle.set_crtc(
-            map.crtc,
-            Some(map.fb),
-            (0, 0),
-            &[map.connector],
-            Some(mode),
-        )?;
-        let _ = map.display_handle.destroy_framebuffer(old_fb);
-
-        Ok(())
-    }
-}
-
-pub struct TextBuffer {
-    pub lines: VecDeque<Vec<u8>>,
-    pub lines_max: usize,
-}
-
-impl TextBuffer {
-    pub fn new(max: usize) -> Self {
-        let mut lines = VecDeque::new();
-        lines.push_back(Vec::new());
-        Self {
-            lines,
-            lines_max: max,
-        }
-    }
-    pub fn write(&mut self, buf: &[u8]) {
-        if buf.is_empty() {
-            return;
-        }
-
-        for &byte in buf {
-            self.lines.back_mut().unwrap().push(byte);
-
-            if byte == b'\n' {
-                self.lines.push_back(Vec::new());
-            }
-        }
-
-        let max_len = self.lines_max;
-        while self.lines.len() > max_len {
-            self.lines.pop_front();
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/driver-graphics/Cargo.toml b/recipes/core/base/drivers/graphics/driver-graphics/Cargo.toml
deleted file mode 100644
index 31e02335c8..0000000000
--- a/recipes/core/base/drivers/graphics/driver-graphics/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "driver-graphics"
-description = "Shared video and graphics code library"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-drm-fourcc = "2.2.0"
-drm-sys.workspace = true
-edid.workspace = true #TODO: edid is abandoned, fork it and maintain?
-log.workspace = true
-redox-ioctl.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../../../scheme-utils" }
-redox_syscall.workspace = true
-libredox.workspace = true
-
-common = { path = "../../common" }
-inputd = { path = "../../inputd" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/graphics/driver-graphics/src/kms/connector.rs b/recipes/core/base/drivers/graphics/driver-graphics/src/kms/connector.rs
deleted file mode 100644
index c885f41351..0000000000
--- a/recipes/core/base/drivers/graphics/driver-graphics/src/kms/connector.rs
+++ /dev/null
@@ -1,249 +0,0 @@
-use std::ffi::c_char;
-use std::fmt::Debug;
-use std::sync::Mutex;
-
-use drm_sys::{
-    drm_mode_modeinfo, DRM_MODE_CONNECTOR_Unknown, DRM_MODE_DPMS_OFF, DRM_MODE_DPMS_ON,
-    DRM_MODE_DPMS_STANDBY, DRM_MODE_DPMS_SUSPEND, DRM_MODE_TYPE_PREFERRED,
-};
-use syscall::Result;
-
-use crate::kms::objects::{KmsObjectId, KmsObjects};
-use crate::kms::properties::{define_object_props, KmsPropertyData, CRTC_ID, DPMS, EDID};
-use crate::GraphicsAdapter;
-
-impl<T: GraphicsAdapter> KmsObjects<T> {
-    pub fn add_connector(
-        &mut self,
-        driver_data: T::Connector,
-        driver_data_state: <T::Connector as KmsConnectorDriver>::State,
-        crtcs: &[KmsObjectId],
-    ) -> KmsObjectId {
-        let mut possible_crtcs = 0;
-        for &crtc in crtcs {
-            possible_crtcs = 1 << self.get_crtc(crtc).unwrap().lock().unwrap().crtc_index;
-        }
-
-        let encoder_id = self.add(KmsEncoder {
-            crtc_id: KmsObjectId::INVALID,
-            possible_crtcs: possible_crtcs,
-            possible_clones: 1 << self.encoders.len(),
-        });
-        self.encoders.push(encoder_id);
-
-        let connector_id = self.add(Mutex::new(KmsConnector {
-            encoder_id,
-            modes: vec![],
-            connector_type: DRM_MODE_CONNECTOR_Unknown,
-            connector_type_id: self.connectors.len() as u32, // FIXME maybe pick unique id within connector type?
-            connection: KmsConnectorStatus::Unknown,
-            mm_width: 0,
-            mm_height: 0,
-            subpixel: DrmSubpixelOrder::Unknown,
-            properties: KmsConnector::base_properties(),
-            edid: KmsObjectId::INVALID,
-            state: KmsConnectorState {
-                dpms: KmsDpms::On,
-                crtc_id: KmsObjectId::INVALID,
-                driver_data: driver_data_state,
-            },
-            driver_data,
-        }));
-        self.connectors.push(connector_id);
-
-        connector_id
-    }
-
-    pub fn connector_ids(&self) -> &[KmsObjectId] {
-        &self.connectors
-    }
-
-    pub fn connectors(&self) -> impl Iterator<Item = &Mutex<KmsConnector<T>>> + use<'_, T> {
-        self.connectors
-            .iter()
-            .map(|&id| self.get_connector(id).unwrap())
-    }
-
-    pub fn get_connector(&self, id: KmsObjectId) -> Result<&Mutex<KmsConnector<T>>> {
-        self.get(id)
-    }
-
-    pub fn encoder_ids(&self) -> &[KmsObjectId] {
-        &self.encoders
-    }
-
-    pub fn get_encoder(&self, id: KmsObjectId) -> Result<&KmsEncoder> {
-        self.get(id)
-    }
-}
-
-pub trait KmsConnectorDriver: Debug {
-    type State: Clone + Debug;
-}
-
-impl KmsConnectorDriver for () {
-    type State = ();
-}
-
-#[derive(Debug)]
-pub struct KmsConnector<T: GraphicsAdapter> {
-    pub encoder_id: KmsObjectId,
-    pub modes: Vec<drm_mode_modeinfo>,
-    pub connector_type: u32,
-    pub connector_type_id: u32,
-    pub connection: KmsConnectorStatus,
-    pub mm_width: u32,
-    pub mm_height: u32,
-    pub subpixel: DrmSubpixelOrder,
-    pub properties: Vec<KmsPropertyData<Self>>,
-    pub edid: KmsObjectId,
-    pub state: KmsConnectorState<T>,
-    pub driver_data: T::Connector,
-}
-
-#[derive(Debug)]
-pub struct KmsConnectorState<T: GraphicsAdapter> {
-    pub dpms: KmsDpms,
-    pub crtc_id: KmsObjectId,
-    pub driver_data: <T::Connector as KmsConnectorDriver>::State,
-}
-
-impl<T: GraphicsAdapter> Clone for KmsConnectorState<T> {
-    fn clone(&self) -> Self {
-        Self {
-            dpms: self.dpms.clone(),
-            crtc_id: self.crtc_id.clone(),
-            driver_data: self.driver_data.clone(),
-        }
-    }
-}
-
-define_object_props!(object, KmsConnector<T: GraphicsAdapter> {
-    EDID {
-        get => u64::from(object.edid.0),
-    }
-    DPMS {
-        get => object.state.dpms as u64,
-    }
-    CRTC_ID {
-        get => u64::from(object.state.crtc_id.0),
-    }
-});
-
-impl<T: GraphicsAdapter> KmsConnector<T> {
-    pub fn update_from_size(&mut self, width: u32, height: u32) {
-        self.modes = vec![modeinfo_for_size(width, height)];
-    }
-
-    pub fn update_from_edid(&mut self, edid: &[u8]) {
-        let edid = edid::parse(edid).unwrap().1;
-
-        if let Some(first_detailed_timing) =
-            edid.descriptors
-                .iter()
-                .find_map(|descriptor| match descriptor {
-                    edid::Descriptor::DetailedTiming(detailed_timing) => Some(detailed_timing),
-                    _ => None,
-                })
-        {
-            self.mm_width = first_detailed_timing.horizontal_size.into();
-            self.mm_height = first_detailed_timing.vertical_size.into();
-        } else {
-            log::error!("No edid timing descriptor detected");
-        }
-
-        self.modes = edid
-            .descriptors
-            .iter()
-            .filter_map(|descriptor| {
-                match descriptor {
-                    edid::Descriptor::DetailedTiming(detailed_timing) => {
-                        // FIXME extract full information
-                        Some(modeinfo_for_size(
-                            u32::from(detailed_timing.horizontal_active_pixels),
-                            u32::from(detailed_timing.vertical_active_lines),
-                        ))
-                    }
-                    _ => None,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        // First detailed timing descriptor indicates preferred mode.
-        for mode in self.modes.iter_mut().skip(1) {
-            mode.flags &= !DRM_MODE_TYPE_PREFERRED;
-        }
-
-        // FIXME update the EDID property
-    }
-}
-
-pub(crate) fn modeinfo_for_size(width: u32, height: u32) -> drm_mode_modeinfo {
-    let mut modeinfo = drm_mode_modeinfo {
-        // The actual visible display size
-        hdisplay: width as u16,
-        vdisplay: height as u16,
-
-        // These are used to calculate the refresh rate
-        clock: 60 * width * height / 1000,
-        htotal: width as u16,
-        vtotal: height as u16,
-        vscan: 0,
-        vrefresh: 60,
-
-        type_: drm_sys::DRM_MODE_TYPE_PREFERRED | drm_sys::DRM_MODE_TYPE_DRIVER,
-        name: [0; 32],
-
-        // These only matter when modesetting physical display adapters. For
-        // those we should be able to parse the EDID blob.
-        hsync_start: width as u16,
-        hsync_end: width as u16,
-        hskew: 0,
-        vsync_start: height as u16,
-        vsync_end: height as u16,
-        flags: 0,
-    };
-
-    let name = format!("{width}x{height}").into_bytes();
-    for (to, from) in modeinfo.name.iter_mut().zip(name) {
-        *to = from as c_char;
-    }
-
-    modeinfo
-}
-
-#[derive(Debug, Copy, Clone)]
-#[repr(u32)]
-pub enum KmsConnectorStatus {
-    Disconnected = 0,
-    Connected = 1,
-    Unknown = 2,
-}
-
-#[derive(Debug, Copy, Clone)]
-#[repr(u32)]
-pub enum DrmSubpixelOrder {
-    Unknown = 0,
-    HorizontalRGB,
-    HorizontalBGR,
-    VerticalRGB,
-    VerticalBGR,
-    None,
-}
-
-#[derive(Debug, Copy, Clone)]
-#[repr(u64)]
-pub enum KmsDpms {
-    On = DRM_MODE_DPMS_ON as u64,
-    Standby = DRM_MODE_DPMS_STANDBY as u64,
-    Suspend = DRM_MODE_DPMS_SUSPEND as u64,
-    Off = DRM_MODE_DPMS_OFF as u64,
-}
-
-// FIXME can we represent connector and encoder using a single struct?
-#[derive(Debug)]
-pub struct KmsEncoder {
-    pub crtc_id: KmsObjectId,
-    pub possible_crtcs: u32,
-    pub possible_clones: u32,
-}
diff --git a/recipes/core/base/drivers/graphics/driver-graphics/src/kms/mod.rs b/recipes/core/base/drivers/graphics/driver-graphics/src/kms/mod.rs
deleted file mode 100644
index 0181030ff2..0000000000
--- a/recipes/core/base/drivers/graphics/driver-graphics/src/kms/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod connector;
-pub mod objects;
-pub mod properties;
diff --git a/recipes/core/base/drivers/graphics/driver-graphics/src/kms/objects.rs b/recipes/core/base/drivers/graphics/driver-graphics/src/kms/objects.rs
deleted file mode 100644
index 1daf32212d..0000000000
--- a/recipes/core/base/drivers/graphics/driver-graphics/src/kms/objects.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-use std::collections::HashMap;
-use std::fmt::Debug;
-use std::marker::PhantomData;
-use std::sync::{Arc, Mutex};
-
-use drm_sys::{
-    drm_mode_modeinfo, DRM_MODE_OBJECT_BLOB, DRM_MODE_OBJECT_CONNECTOR, DRM_MODE_OBJECT_CRTC,
-    DRM_MODE_OBJECT_ENCODER, DRM_MODE_OBJECT_FB, DRM_MODE_OBJECT_PROPERTY,
-};
-use syscall::{Error, Result, EINVAL};
-
-use crate::kms::connector::{KmsConnector, KmsEncoder};
-use crate::kms::properties::{
-    define_object_props, init_standard_props, KmsBlob, KmsProperty, KmsPropertyData,
-};
-use crate::GraphicsAdapter;
-
-#[derive(Debug)]
-pub struct KmsObjects<T: GraphicsAdapter> {
-    next_id: KmsObjectId,
-    pub(crate) connectors: Vec<KmsObjectId>,
-    pub(crate) encoders: Vec<KmsObjectId>,
-    crtcs: Vec<KmsObjectId>,
-    framebuffers: Vec<KmsObjectId>,
-    pub(crate) objects: HashMap<KmsObjectId, KmsObject<T>>,
-    _marker: PhantomData<T>,
-}
-
-impl<T: GraphicsAdapter> KmsObjects<T> {
-    pub(crate) fn new() -> Self {
-        let mut objects = KmsObjects {
-            next_id: KmsObjectId(1),
-            connectors: vec![],
-            encoders: vec![],
-            crtcs: vec![],
-            framebuffers: vec![],
-            objects: HashMap::new(),
-            _marker: PhantomData,
-        };
-        init_standard_props(&mut objects);
-        objects
-    }
-
-    pub(crate) fn add<U: Into<KmsObject<T>>>(&mut self, data: U) -> KmsObjectId {
-        let id = self.next_id;
-        self.objects.insert(id, data.into());
-        self.next_id.0 += 1;
-
-        id
-    }
-
-    pub(crate) fn get<'a, U: 'a>(&'a self, id: KmsObjectId) -> Result<&'a U>
-    where
-        &'a U: TryFrom<&'a KmsObject<T>>,
-    {
-        let object = self.objects.get(&id).ok_or(Error::new(EINVAL))?;
-        if let Ok(object) = object.try_into() {
-            Ok(object)
-        } else {
-            Err(Error::new(EINVAL))
-        }
-    }
-
-    pub fn object_type(&self, id: KmsObjectId) -> Result<u32> {
-        let object = self.objects.get(&id).ok_or(Error::new(EINVAL))?;
-        Ok(object.object_type())
-    }
-
-    pub fn add_crtc(
-        &mut self,
-        driver_data: T::Crtc,
-        driver_data_state: <T::Crtc as KmsCrtcDriver>::State,
-    ) -> KmsObjectId {
-        let crtc_index = self.crtcs.len() as u32;
-        let id = self.add(Mutex::new(KmsCrtc {
-            crtc_index,
-            gamma_size: 0,
-            properties: KmsCrtc::base_properties(),
-            state: KmsCrtcState {
-                fb_id: None,
-                mode: None,
-                driver_data: driver_data_state,
-            },
-            driver_data,
-        }));
-        self.crtcs.push(id);
-
-        id
-    }
-
-    pub fn crtc_ids(&self) -> &[KmsObjectId] {
-        &self.crtcs
-    }
-
-    pub fn crtcs(&self) -> impl Iterator<Item = &Mutex<KmsCrtc<T>>> + use<'_, T> {
-        self.crtcs
-            .iter()
-            .map(|&id| self.get::<Mutex<KmsCrtc<T>>>(id).unwrap())
-    }
-
-    pub fn get_crtc(&self, id: KmsObjectId) -> Result<&Mutex<KmsCrtc<T>>> {
-        self.get(id)
-    }
-
-    pub fn add_framebuffer(&mut self, fb: KmsFramebuffer<T>) -> KmsObjectId {
-        let id = self.add(fb);
-        self.framebuffers.push(id);
-        id
-    }
-
-    pub fn remove_framebuffer(&mut self, id: KmsObjectId) -> Result<()> {
-        let Some(object) = self.objects.get(&id) else {
-            return Err(Error::new(EINVAL));
-        };
-        let KmsObject::Framebuffer(_) = object else {
-            return Err(Error::new(EINVAL));
-        };
-        self.objects.remove(&id).unwrap();
-
-        Ok(())
-    }
-
-    pub fn fb_ids(&self) -> &[KmsObjectId] {
-        &self.framebuffers
-    }
-
-    pub fn get_framebuffer(&self, id: KmsObjectId) -> Result<&KmsFramebuffer<T>> {
-        self.get(id)
-    }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub struct KmsObjectId(pub(crate) u32);
-
-impl KmsObjectId {
-    pub const INVALID: KmsObjectId = KmsObjectId(0);
-}
-
-impl From<KmsObjectId> for u64 {
-    fn from(value: KmsObjectId) -> Self {
-        value.0.into()
-    }
-}
-
-macro_rules! define_object_kinds {
-    (<$T:ident> $(
-        $variant:ident($data:ty) = $type:ident,
-    )*) => {
-        #[derive(Debug)]
-        pub(crate) enum KmsObject<$T: GraphicsAdapter> {
-            $($variant($data),)*
-        }
-
-        impl<$T: GraphicsAdapter> KmsObject<$T> {
-            fn object_type(&self) -> u32 {
-                match self {
-                    $(Self::$variant(_) => $type,)*
-                }
-            }
-        }
-
-        $(
-            impl<$T: GraphicsAdapter> From<$data> for KmsObject<$T> {
-                fn from(value: $data) -> Self {
-                    Self::$variant(value)
-                }
-            }
-
-            impl<'a, $T: GraphicsAdapter> TryFrom<&'a KmsObject<$T>> for &'a $data {
-                type Error = ();
-
-                fn try_from(value: &'a KmsObject<T>) -> Result<Self, Self::Error> {
-                    match value {
-                        KmsObject::$variant(data) => Ok(data),
-                        _ => Err(()),
-                    }
-                }
-            }
-        )*
-    };
-}
-
-define_object_kinds! { <T>
-    Crtc(Mutex<KmsCrtc<T>>) = DRM_MODE_OBJECT_CRTC,
-    Connector(Mutex<KmsConnector<T>>) = DRM_MODE_OBJECT_CONNECTOR,
-    Encoder(KmsEncoder) = DRM_MODE_OBJECT_ENCODER,
-    Property(KmsProperty) = DRM_MODE_OBJECT_PROPERTY,
-    Framebuffer(KmsFramebuffer<T>) = DRM_MODE_OBJECT_FB,
-    Blob(KmsBlob) = DRM_MODE_OBJECT_BLOB,
-}
-
-pub trait KmsCrtcDriver: Debug {
-    type State: Clone + Debug;
-}
-
-impl KmsCrtcDriver for () {
-    type State = ();
-}
-
-#[derive(Debug)]
-pub struct KmsCrtc<T: GraphicsAdapter> {
-    pub crtc_index: u32,
-    pub gamma_size: u32,
-    pub properties: Vec<KmsPropertyData<Self>>,
-    pub state: KmsCrtcState<T>,
-    pub driver_data: T::Crtc,
-}
-
-#[derive(Debug)]
-pub struct KmsCrtcState<T: GraphicsAdapter> {
-    pub fb_id: Option<KmsObjectId>,
-    pub mode: Option<drm_mode_modeinfo>,
-    pub driver_data: <T::Crtc as KmsCrtcDriver>::State,
-}
-
-impl<T: GraphicsAdapter> Clone for KmsCrtcState<T> {
-    fn clone(&self) -> Self {
-        Self {
-            fb_id: self.fb_id.clone(),
-            mode: self.mode.clone(),
-            driver_data: self.driver_data.clone(),
-        }
-    }
-}
-
-define_object_props!(object, KmsCrtc<T: GraphicsAdapter> {});
-
-#[derive(Debug)]
-pub struct KmsFramebuffer<T: GraphicsAdapter> {
-    pub width: u32,
-    pub height: u32,
-    pub pitch: u32,
-    pub bpp: u32,
-    pub depth: u32,
-    pub buffer: Arc<T::Buffer>,
-    pub driver_data: T::Framebuffer,
-}
diff --git a/recipes/core/base/drivers/graphics/driver-graphics/src/kms/properties.rs b/recipes/core/base/drivers/graphics/driver-graphics/src/kms/properties.rs
deleted file mode 100644
index e22527a702..0000000000
--- a/recipes/core/base/drivers/graphics/driver-graphics/src/kms/properties.rs
+++ /dev/null
@@ -1,241 +0,0 @@
-use std::ffi::c_char;
-use std::fmt::Debug;
-use std::mem;
-
-use drm_sys::{
-    DRM_MODE_DPMS_OFF, DRM_MODE_DPMS_ON, DRM_MODE_DPMS_STANDBY, DRM_MODE_DPMS_SUSPEND,
-    DRM_MODE_OBJECT_CRTC, DRM_MODE_OBJECT_FB, DRM_PLANE_TYPE_CURSOR, DRM_PLANE_TYPE_OVERLAY,
-    DRM_PLANE_TYPE_PRIMARY, DRM_PROP_NAME_LEN,
-};
-use syscall::{Error, Result, EINVAL};
-
-use crate::kms::objects::{KmsObject, KmsObjectId, KmsObjects};
-use crate::GraphicsAdapter;
-
-impl<T: GraphicsAdapter> KmsObjects<T> {
-    pub fn add_property(
-        &mut self,
-        name: &str,
-        immutable: bool,
-        atomic: bool,
-        kind: KmsPropertyKind,
-    ) -> KmsObjectId {
-        match &kind {
-            KmsPropertyKind::Range(start, end) => assert!(start < end),
-            KmsPropertyKind::Enum(_variants) => {
-                // FIXME check duplicate variant numbers
-            }
-            KmsPropertyKind::Blob => {}
-            KmsPropertyKind::Bitmask(_bitmask_flags) => {
-                // FIXME check overlapping flag numbers
-            }
-            KmsPropertyKind::Object { type_: _ } => {}
-            KmsPropertyKind::SignedRange(start, end) => assert!(start < end),
-        }
-
-        let mut name_bytes = [0; DRM_PROP_NAME_LEN as usize];
-        for (to, &from) in name_bytes.iter_mut().zip(name.as_bytes()) {
-            *to = from as c_char;
-        }
-
-        self.add(KmsProperty {
-            name: KmsPropertyName::new("Property name", name),
-            immutable,
-            atomic,
-            kind,
-        })
-    }
-
-    pub fn get_property(&self, id: KmsObjectId) -> Result<&KmsProperty> {
-        self.get(id)
-    }
-
-    pub fn get_object_properties_data(&self, id: KmsObjectId) -> Result<(Vec<u32>, Vec<u64>)> {
-        let object = self.objects.get(&id).ok_or(Error::new(EINVAL))?;
-        match object {
-            KmsObject::Crtc(crtc) => {
-                let crtc = crtc.lock().unwrap();
-                let props = &crtc.properties;
-                Ok((
-                    props.iter().map(|prop| prop.id.0).collect::<Vec<_>>(),
-                    props
-                        .iter()
-                        .map(|prop| (prop.getter)(&crtc))
-                        .collect::<Vec<_>>(),
-                ))
-            }
-            KmsObject::Connector(connector) => {
-                let connector = connector.lock().unwrap();
-                let props = &connector.properties;
-                Ok((
-                    props.iter().map(|prop| prop.id.0).collect::<Vec<_>>(),
-                    props
-                        .iter()
-                        .map(|prop| (prop.getter)(&connector))
-                        .collect::<Vec<_>>(),
-                ))
-            }
-            KmsObject::Encoder(_)
-            | KmsObject::Property(_)
-            | KmsObject::Framebuffer(_)
-            | KmsObject::Blob(_) => Ok((vec![], vec![])),
-        }
-    }
-
-    pub fn add_blob(&mut self, data: Vec<u8>) -> KmsObjectId {
-        self.add(KmsBlob { data })
-    }
-
-    pub fn get_blob(&self, id: KmsObjectId) -> Result<&[u8]> {
-        Ok(&self.get::<KmsBlob>(id)?.data)
-    }
-}
-
-#[derive(Copy, Clone)]
-pub struct KmsPropertyName(pub [c_char; DRM_PROP_NAME_LEN as usize]);
-
-impl KmsPropertyName {
-    fn new(context: &str, name: &str) -> KmsPropertyName {
-        if name.len() > DRM_PROP_NAME_LEN as usize {
-            panic!("{context} {name} is too long");
-        }
-
-        let mut name_bytes = [0; DRM_PROP_NAME_LEN as usize];
-        for (to, &from) in name_bytes.iter_mut().zip(name.as_bytes()) {
-            *to = from as c_char;
-        }
-
-        KmsPropertyName(name_bytes)
-    }
-}
-
-impl Debug for KmsPropertyName {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let u8_bytes = unsafe { mem::transmute::<&[c_char], &[u8]>(&self.0) };
-        f.write_str(&String::from_utf8_lossy(u8_bytes).trim_end_matches('\0'))
-    }
-}
-
-#[derive(Debug)]
-pub struct KmsProperty {
-    pub name: KmsPropertyName,
-    pub immutable: bool,
-    pub atomic: bool,
-    pub kind: KmsPropertyKind,
-}
-
-#[derive(Debug)]
-pub enum KmsPropertyKind {
-    Range(u64, u64),
-    Enum(Vec<(KmsPropertyName, u64)>),
-    Blob,
-    Bitmask(Vec<(KmsPropertyName, u64)>),
-    Object { type_: u32 },
-    SignedRange(i64, i64),
-}
-
-#[derive(Debug)]
-pub struct KmsPropertyData<T> {
-    pub id: KmsObjectId,
-    pub getter: fn(&T) -> u64,
-}
-
-#[derive(Debug)]
-pub struct KmsBlob {
-    data: Vec<u8>,
-}
-
-macro_rules! define_properties {
-    ($($prop:ident $($prop_name:literal)?: $prop_type:ident $({$($prop_content:tt)*})? [$($prop_flag:ident)?],)*) => {
-        $(#[allow(non_upper_case_globals)] pub const $prop: KmsObjectId = KmsObjectId(1 + ${index()});)*
-
-        pub(super) fn init_standard_props<T: GraphicsAdapter>(objects: &mut KmsObjects<T>) {
-            $(
-                assert_eq!(objects.add_property(
-                    define_properties!(@prop_name $prop $($prop_name)?),
-                    define_properties!(@is_immutable $($prop_flag)?),
-                    define_properties!(@is_atomic $($prop_flag)?),
-                    define_properties!(@prop_kind $prop_type $({$($prop_content)*})?),
-                ), $prop);
-            )*
-        }
-    };
-    (@prop_name $prop:ident $prop_name:literal) => { $prop_name };
-    (@prop_name $prop:ident) => { stringify!($prop) };
-    (@is_immutable) => { false };
-    (@is_immutable immutable) => { true };
-    (@is_immutable atomic) => { false };
-    (@is_atomic) => { false };
-    (@is_atomic immutable) => { false };
-    (@is_atomic atomic) => { true };
-    (@prop_kind range { $start:expr, $end:expr }) => {
-        KmsPropertyKind::Range($start, $end)
-    };
-    (@prop_kind enum { $($variant:ident = $value:expr,)* }) => {
-        KmsPropertyKind::Enum(vec![
-            $((KmsPropertyName::new("Property variant name", stringify!($variant)), $value)),*]
-        )
-    };
-    (@prop_kind blob) => {
-        KmsPropertyKind::Blob
-    };
-    (@prop_kind object { $type:ident }) => {
-        KmsPropertyKind::Object { type_: $type }
-    };
-    (@prop_kind srange { $start:expr, $end:expr }) => {
-        KmsPropertyKind::SignedRange($start, $end)
-    };
-}
-
-define_properties! {
-    // Connector + Plane
-    CRTC_ID: object { DRM_MODE_OBJECT_CRTC } [atomic],
-
-    // Connector
-    EDID: blob [immutable],
-    DPMS: enum {
-        On = u64::from(DRM_MODE_DPMS_ON),
-        Standby = u64::from(DRM_MODE_DPMS_STANDBY),
-        Suspend = u64::from(DRM_MODE_DPMS_SUSPEND),
-        Off = u64::from(DRM_MODE_DPMS_OFF),
-    } [],
-
-    // CRTC
-    ACTIVE: range { 0,1 } [atomic],
-    MODE_ID: blob [atomic],
-
-    // Plane
-    type_ "type": enum {
-        Overlay = u64::from(DRM_PLANE_TYPE_OVERLAY),
-        Primary = u64::from(DRM_PLANE_TYPE_PRIMARY),
-        Cursor = u64::from(DRM_PLANE_TYPE_CURSOR),
-    } [immutable],
-    FB_ID: object { DRM_MODE_OBJECT_FB } [atomic],
-    CRTC_X: srange { i64::from(i32::MIN), i64::from(i32::MAX) } [atomic],
-    CRTC_Y: srange { i64::from(i32::MIN), i64::from(i32::MAX) } [atomic],
-    CRTC_W: range { 0, u64::from(u32::MAX) } [atomic],
-    CRTC_H: range { 0, u64::from(u32::MAX) } [atomic],
-    SRC_X: range { 0, u64::from(u32::MAX) } [atomic],
-    SRC_Y: range { 0, u64::from(u32::MAX) } [atomic],
-    SRC_W: range { 0, u64::from(u32::MAX) } [atomic],
-    SRC_H: range { 0, u64::from(u32::MAX) } [atomic],
-    FB_DAMAGE_CLIPS: blob [atomic],
-}
-
-macro_rules! define_object_props {
-    ($object:ident, $obj:ident$(<$($T:ident$(: $bound:ident)?),*>)? { $(
-        $prop:ident {
-            get => $get:expr,
-        }
-    )* }) => {
-        impl$(<$($T$(: $bound)?),*>)? $obj$(<$($T),*>)? {
-            pub(super) fn base_properties() -> Vec<KmsPropertyData<Self>> {
-                vec![$(KmsPropertyData {
-                    id: $prop,
-                    getter: |$object| $get
-                }),*]
-            }
-        }
-    };
-}
-pub(super) use define_object_props;
diff --git a/recipes/core/base/drivers/graphics/driver-graphics/src/lib.rs b/recipes/core/base/drivers/graphics/driver-graphics/src/lib.rs
deleted file mode 100644
index eab0be9c3e..0000000000
--- a/recipes/core/base/drivers/graphics/driver-graphics/src/lib.rs
+++ /dev/null
@@ -1,986 +0,0 @@
-#![feature(macro_metavar_expr)]
-
-use std::collections::HashMap;
-use std::fmt::Debug;
-use std::fs::File;
-use std::io::{self, Write};
-use std::os::fd::BorrowedFd;
-use std::sync::{Arc, Mutex};
-use std::{cmp, mem};
-
-use drm_fourcc::DrmFourcc;
-use drm_sys::{
-    drm_mode_property_enum, DRM_MODE_CURSOR_BO, DRM_MODE_CURSOR_MOVE, DRM_MODE_PROP_ATOMIC,
-    DRM_MODE_PROP_BITMASK, DRM_MODE_PROP_BLOB, DRM_MODE_PROP_ENUM, DRM_MODE_PROP_IMMUTABLE,
-    DRM_MODE_PROP_OBJECT, DRM_MODE_PROP_RANGE, DRM_MODE_PROP_SIGNED_RANGE,
-};
-use inputd::{DisplayHandle, VtEventKind};
-use libredox::Fd;
-use redox_scheme::scheme::{register_scheme_inner, SchemeState, SchemeSync};
-use redox_scheme::{CallerCtx, OpenResult, RequestKind, SignalBehavior, Socket};
-use scheme_utils::{FpathWriter, HandleMap};
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error, MapFlags, Result, EACCES, EAGAIN, EINVAL, ENOENT, EOPNOTSUPP};
-
-use crate::kms::connector::{KmsConnectorDriver, KmsConnectorState};
-use crate::kms::objects::{self, KmsCrtc, KmsCrtcDriver, KmsCrtcState, KmsObjectId, KmsObjects};
-use crate::kms::properties::KmsPropertyKind;
-
-pub mod kms;
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct Damage {
-    pub x: u32,
-    pub y: u32,
-    pub width: u32,
-    pub height: u32,
-}
-
-impl Damage {
-    fn merge(self, other: Self) -> Self {
-        if self.width == 0 || self.height == 0 {
-            return other;
-        }
-
-        if other.width == 0 || other.height == 0 {
-            return self;
-        }
-
-        let x = cmp::min(self.x, other.x);
-        let y = cmp::min(self.y, other.y);
-        let x2 = cmp::max(self.x + self.width, other.x + other.width);
-        let y2 = cmp::max(self.y + self.height, other.y + other.height);
-
-        Damage {
-            x,
-            y,
-            width: x2 - x,
-            height: y2 - y,
-        }
-    }
-
-    #[must_use]
-    pub fn clip(mut self, width: u32, height: u32) -> Self {
-        // Clip damage
-        let x2 = self.x + self.width;
-        self.x = cmp::min(self.x, width);
-        if x2 > width {
-            self.width = width - self.x;
-        }
-
-        let y2 = self.y + self.height;
-        self.y = cmp::min(self.y, height);
-        if y2 > height {
-            self.height = height - self.y;
-        }
-        self
-    }
-}
-
-pub trait GraphicsAdapter: Sized + Debug {
-    type Connector: KmsConnectorDriver;
-    type Crtc: KmsCrtcDriver;
-
-    type Buffer: Buffer;
-    type Framebuffer: Framebuffer;
-
-    fn name(&self) -> &'static [u8];
-    fn desc(&self) -> &'static [u8];
-
-    fn init(&mut self, objects: &mut KmsObjects<Self>);
-
-    fn get_cap(&self, cap: u32) -> Result<u64>;
-    fn set_client_cap(&self, cap: u32, value: u64) -> Result<()>;
-
-    fn probe_connector(&mut self, objects: &mut KmsObjects<Self>, id: KmsObjectId);
-
-    fn create_dumb_buffer(&mut self, width: u32, height: u32) -> (Self::Buffer, u32);
-    fn map_dumb_buffer(&mut self, buffer: &Self::Buffer) -> *mut u8;
-
-    fn create_framebuffer(&mut self, buffer: &Self::Buffer) -> Self::Framebuffer;
-
-    fn set_crtc(
-        &mut self,
-        objects: &KmsObjects<Self>,
-        crtc: &Mutex<KmsCrtc<Self>>,
-        new_state: KmsCrtcState<Self>,
-        damage: Damage,
-    ) -> syscall::Result<()>;
-
-    fn hw_cursor_size(&self) -> Option<(u32, u32)>;
-    fn handle_cursor(&mut self, cursor: &CursorPlane<Self::Buffer>, dirty_fb: bool);
-}
-
-pub trait Buffer: Debug {
-    fn size(&self) -> usize;
-}
-
-pub trait Framebuffer: Debug {}
-
-impl Framebuffer for () {}
-
-pub struct CursorPlane<C: Buffer> {
-    pub x: i32,
-    pub y: i32,
-    pub hot_x: i32,
-    pub hot_y: i32,
-    pub buffer: Option<Arc<C>>,
-}
-
-pub struct GraphicsScheme<T: GraphicsAdapter> {
-    inner: GraphicsSchemeInner<T>,
-    inputd_handle: DisplayHandle,
-    state: SchemeState,
-}
-
-impl<T: GraphicsAdapter> GraphicsScheme<T> {
-    pub fn new(mut adapter: T, scheme_name: String, early: bool) -> Self {
-        assert!(scheme_name.starts_with("display"));
-        let socket = Socket::nonblock().expect("failed to create graphics scheme");
-
-        let disable_graphical_debug = Some(
-            File::open("/scheme/debug/disable-graphical-debug")
-                .expect("vesad: Failed to open /scheme/debug/disable-graphical-debug"),
-        );
-
-        let mut objects = KmsObjects::new();
-        adapter.init(&mut objects);
-        for connector_id in objects.connector_ids().to_vec() {
-            adapter.probe_connector(&mut objects, connector_id)
-        }
-
-        let mut inner = GraphicsSchemeInner {
-            adapter,
-            scheme_name,
-            disable_graphical_debug,
-            socket,
-            objects,
-            handles: HandleMap::new(),
-            active_vt: 0,
-            vts: HashMap::new(),
-        };
-
-        let cap_id = inner.scheme_root().expect("failed to get this scheme root");
-        register_scheme_inner(&inner.socket, &inner.scheme_name, cap_id)
-            .expect("failed to register graphics scheme root");
-
-        let display_handle = if early {
-            DisplayHandle::new_early(&inner.scheme_name).unwrap()
-        } else {
-            DisplayHandle::new(&inner.scheme_name).unwrap()
-        };
-
-        Self {
-            inner,
-            inputd_handle: display_handle,
-            state: SchemeState::new(),
-        }
-    }
-
-    pub fn event_handle(&self) -> &Fd {
-        self.inner.socket.inner()
-    }
-
-    pub fn inputd_event_handle(&self) -> BorrowedFd<'_> {
-        self.inputd_handle.inner()
-    }
-
-    pub fn adapter(&self) -> &T {
-        &self.inner.adapter
-    }
-
-    pub fn adapter_mut(&mut self) -> &mut T {
-        &mut self.inner.adapter
-    }
-
-    pub fn kms_objects(&self) -> &KmsObjects<T> {
-        &self.inner.objects
-    }
-
-    pub fn kms_objects_mut(&mut self) -> &mut KmsObjects<T> {
-        &mut self.inner.objects
-    }
-
-    pub fn adapter_and_kms_objects_mut(&mut self) -> (&mut T, &mut KmsObjects<T>) {
-        (&mut self.inner.adapter, &mut self.inner.objects)
-    }
-
-    pub fn handle_vt_events(&mut self) {
-        while let Some(vt_event) = self
-            .inputd_handle
-            .read_vt_event()
-            .expect("driver-graphics: failed to read display handle")
-        {
-            match vt_event.kind {
-                VtEventKind::Activate => self.inner.activate_vt(vt_event.vt),
-            }
-        }
-    }
-
-    pub fn notify_displays_changed(&mut self) {
-        // FIXME notify clients
-    }
-
-    /// Process new scheme requests.
-    ///
-    /// This needs to be called each time there is a new event on the scheme
-    /// file.
-    pub fn tick(&mut self) -> io::Result<()> {
-        loop {
-            let request = match self.inner.socket.next_request(SignalBehavior::Restart) {
-                Ok(Some(request)) => request,
-                Ok(None) => {
-                    // Scheme likely got unmounted
-                    std::process::exit(0);
-                }
-                Err(err) if err.errno == EAGAIN => break,
-                Err(err) => panic!("driver-graphics: failed to read display scheme: {err}"),
-            };
-
-            match request.kind() {
-                RequestKind::Call(call) => {
-                    let response = call.handle_sync(&mut self.inner, &mut self.state);
-                    self.inner
-                        .socket
-                        .write_response(response, SignalBehavior::Restart)
-                        .expect("driver-graphics: failed to write response");
-                }
-                RequestKind::OnClose { id } => {
-                    self.inner.on_close(id);
-                }
-                _ => (),
-            }
-        }
-
-        Ok(())
-    }
-}
-
-struct GraphicsSchemeInner<T: GraphicsAdapter> {
-    adapter: T,
-
-    scheme_name: String,
-    disable_graphical_debug: Option<File>,
-    socket: Socket,
-    objects: KmsObjects<T>,
-    handles: HandleMap<Handle<T>>,
-
-    active_vt: usize,
-    vts: HashMap<usize, VtState<T>>,
-}
-
-struct VtState<T: GraphicsAdapter> {
-    connector_state: Vec<KmsConnectorState<T>>,
-    crtc_state: Vec<KmsCrtcState<T>>,
-    cursor_plane: CursorPlane<T::Buffer>,
-}
-
-enum Handle<T: GraphicsAdapter> {
-    V2 {
-        vt: usize,
-        next_id: u32,
-        buffers: HashMap<u32, Arc<T::Buffer>>,
-    },
-    SchemeRoot,
-}
-
-impl<T: GraphicsAdapter> GraphicsSchemeInner<T> {
-    fn get_or_create_vt<'a>(
-        objects: &KmsObjects<T>,
-        vts: &'a mut HashMap<usize, VtState<T>>,
-        vt: usize,
-    ) -> &'a mut VtState<T> {
-        vts.entry(vt).or_insert_with(|| VtState {
-            connector_state: objects
-                .connectors()
-                .map(|connector| connector.lock().unwrap().state.clone())
-                .collect(),
-            crtc_state: objects
-                .crtcs()
-                .map(|crtc| crtc.lock().unwrap().state.clone())
-                .collect(),
-            cursor_plane: CursorPlane {
-                x: 0,
-                y: 0,
-                hot_x: 0,
-                hot_y: 0,
-                buffer: None,
-            },
-        })
-    }
-
-    fn activate_vt(&mut self, vt: usize) {
-        log::info!("activate {}", vt);
-
-        // Disable the kernel graphical debug writing once switching vt's for the
-        // first time. This way the kernel graphical debug remains enabled if the
-        // userspace logging infrastructure doesn't start up because for example a
-        // kernel panic happened prior to it starting up or logd crashed.
-        if let Some(mut disable_graphical_debug) = self.disable_graphical_debug.take() {
-            let _ = disable_graphical_debug.write(&[1]);
-        }
-
-        self.active_vt = vt;
-
-        let vt_state = GraphicsSchemeInner::get_or_create_vt(&self.objects, &mut self.vts, vt);
-
-        for (connector_idx, connector_state) in vt_state.connector_state.iter().enumerate() {
-            let connector_id = self.objects.connector_ids()[connector_idx];
-            let mut connector = self
-                .objects
-                .get_connector(connector_id)
-                .unwrap()
-                .lock()
-                .unwrap();
-            connector.state = connector_state.clone();
-        }
-
-        for (crtc_idx, crtc_state) in vt_state.crtc_state.iter().enumerate() {
-            let crtc_id = self.objects.crtc_ids()[crtc_idx];
-            let crtc = self.objects.get_crtc(crtc_id).unwrap();
-            let connector_id = self.objects.connector_ids()[crtc_idx];
-
-            let fb = crtc_state.fb_id.map(|fb_id| {
-                self.objects
-                    .get_framebuffer(fb_id)
-                    .expect("removed framebuffers should be unset")
-            });
-
-            self.adapter
-                .set_crtc(
-                    &self.objects,
-                    crtc,
-                    crtc_state.clone(),
-                    Damage {
-                        x: 0,
-                        y: 0,
-                        width: fb.map_or(0, |fb| fb.width),
-                        height: fb.map_or(0, |fb| fb.height),
-                    },
-                )
-                .unwrap();
-
-            self.objects
-                .get_connector(connector_id)
-                .unwrap()
-                .lock()
-                .unwrap()
-                .state
-                .crtc_id = crtc_id;
-        }
-
-        if self.adapter.hw_cursor_size().is_some() {
-            self.adapter.handle_cursor(&vt_state.cursor_plane, true);
-        }
-    }
-}
-
-const MAP_FAKE_OFFSET_MULTIPLIER: usize = 0x10_000_000;
-
-impl<T: GraphicsAdapter> SchemeSync for GraphicsSchemeInner<T> {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(self.handles.get(dirfd)?, Handle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-        if path.is_empty() {
-            return Err(Error::new(EINVAL));
-        }
-
-        let handle = if path.starts_with("v") {
-            if !path.starts_with("v2/") {
-                return Err(Error::new(ENOENT));
-            }
-            let vt = path["v2/".len()..]
-                .parse::<usize>()
-                .map_err(|_| Error::new(EINVAL))?;
-
-            // Ensure the VT exists such that the rest of the methods can freely access it.
-            Self::get_or_create_vt(&self.objects, &mut self.vts, vt);
-
-            Handle::V2 {
-                vt,
-                next_id: 0,
-                buffers: HashMap::new(),
-            }
-        } else {
-            return Err(Error::new(EINVAL));
-        };
-        let id = self.handles.insert(handle);
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> syscall::Result<usize> {
-        FpathWriter::with(buf, &self.scheme_name, |w| {
-            match self.handles.get(id)? {
-                Handle::V2 {
-                    vt,
-                    next_id: _,
-                    buffers: _,
-                } => write!(w, "v2/{vt}").unwrap(),
-                Handle::SchemeRoot => return Err(Error::new(EOPNOTSUPP)),
-            };
-            Ok(())
-        })
-    }
-
-    fn call(
-        &mut self,
-        id: usize,
-        payload: &mut [u8],
-        metadata: &[u64],
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        use redox_ioctl::drm as ipc;
-
-        fn id_index(id: u32) -> u32 {
-            id & 0xFF
-        }
-
-        fn plane_id(i: u32) -> u32 {
-            id_index(i) | (1 << 13)
-        }
-
-        match self.handles.get_mut(id)? {
-            Handle::SchemeRoot => return Err(Error::new(EOPNOTSUPP)),
-            Handle::V2 {
-                vt,
-                next_id,
-                buffers,
-            } => match metadata[0] {
-                ipc::VERSION => ipc::DrmVersion::with(payload, |mut data| {
-                    data.set_version_major(1);
-                    data.set_version_minor(4);
-                    data.set_version_patchlevel(0);
-
-                    data.set_name(unsafe { mem::transmute(self.adapter.name()) });
-                    data.set_date(unsafe { mem::transmute(&b"0"[..]) });
-                    data.set_desc(unsafe { mem::transmute(self.adapter.desc()) });
-
-                    Ok(0)
-                }),
-                ipc::GET_CAP => ipc::DrmGetCap::with(payload, |mut data| {
-                    data.set_value(
-                        self.adapter.get_cap(
-                            data.capability()
-                                .try_into()
-                                .map_err(|_| syscall::Error::new(EINVAL))?,
-                        )?,
-                    );
-                    Ok(0)
-                }),
-                ipc::SET_CLIENT_CAP => ipc::DrmSetClientCap::with(payload, |data| {
-                    self.adapter.set_client_cap(
-                        data.capability()
-                            .try_into()
-                            .map_err(|_| syscall::Error::new(EINVAL))?,
-                        data.value(),
-                    )?;
-                    Ok(0)
-                }),
-                ipc::MODE_CARD_RES => ipc::DrmModeCardRes::with(payload, |mut data| {
-                    let conn_ids = self
-                        .objects
-                        .connector_ids()
-                        .iter()
-                        .map(|id| id.0)
-                        .collect::<Vec<_>>();
-                    let crtc_ids = self
-                        .objects
-                        .crtc_ids()
-                        .iter()
-                        .map(|id| id.0)
-                        .collect::<Vec<_>>();
-                    let enc_ids = self
-                        .objects
-                        .encoder_ids()
-                        .iter()
-                        .map(|id| id.0)
-                        .collect::<Vec<_>>();
-                    let fb_ids = self
-                        .objects
-                        .fb_ids()
-                        .iter()
-                        .map(|id| id.0)
-                        .collect::<Vec<_>>();
-                    data.set_fb_id_ptr(&fb_ids);
-                    data.set_crtc_id_ptr(&crtc_ids);
-                    data.set_connector_id_ptr(&conn_ids);
-                    data.set_encoder_id_ptr(&enc_ids);
-                    data.set_min_width(0);
-                    data.set_max_width(16384);
-                    data.set_min_height(0);
-                    data.set_max_height(16384);
-                    Ok(0)
-                }),
-                ipc::MODE_GET_CRTC => ipc::DrmModeCrtc::with(payload, |mut data| {
-                    let crtc = self
-                        .objects
-                        .get_crtc(KmsObjectId(data.crtc_id()))?
-                        .lock()
-                        .unwrap();
-                    // Don't touch set_connectors, that is only used by MODE_SET_CRTC
-                    data.set_fb_id(crtc.state.fb_id.unwrap_or(KmsObjectId::INVALID).0);
-                    // FIXME fill x and y with the data from the primary plane
-                    data.set_x(0);
-                    data.set_y(0);
-                    data.set_gamma_size(crtc.gamma_size);
-                    if let Some(mode) = crtc.state.mode {
-                        data.set_mode_valid(1);
-                        data.set_mode(mode);
-                    } else {
-                        data.set_mode_valid(0);
-                        data.set_mode(Default::default());
-                    }
-                    Ok(0)
-                }),
-                ipc::MODE_SET_CRTC => ipc::DrmModeCrtc::with(payload, |data| {
-                    let crtc = self.objects.get_crtc(KmsObjectId(data.crtc_id()))?;
-                    let connector_ids: Vec<KmsObjectId> = data
-                        .set_connectors_ptr()
-                        .iter()
-                        .take(data.count_connectors() as usize)
-                        .map(|&id| KmsObjectId(id))
-                        .collect();
-                    let fb_id = if data.fb_id() != 0 {
-                        Some(KmsObjectId(data.fb_id()))
-                    } else {
-                        None
-                    };
-                    let mode = if data.mode_valid() != 0 {
-                        Some(data.mode())
-                    } else {
-                        None
-                    };
-                    let mut new_state = crtc.lock().unwrap().state.clone();
-                    new_state.fb_id = fb_id;
-                    new_state.mode = mode;
-                    if *vt == self.active_vt {
-                        self.adapter.set_crtc(
-                            &self.objects,
-                            crtc,
-                            new_state.clone(),
-                            Damage {
-                                x: data.x(),
-                                y: data.y(),
-                                width: mode.map_or(0, |m| m.hdisplay as u32),
-                                height: mode.map_or(0, |m| m.vdisplay as u32),
-                            },
-                        )?;
-
-                        for connector in connector_ids {
-                            self.objects
-                                .get_connector(connector)?
-                                .lock()
-                                .unwrap()
-                                .state
-                                .crtc_id = KmsObjectId(data.crtc_id());
-                        }
-                    }
-                    self.vts.get_mut(vt).unwrap().crtc_state
-                        [crtc.lock().unwrap().crtc_index as usize] = new_state;
-                    Ok(0)
-                }),
-                ipc::MODE_CURSOR => ipc::DrmModeCursor::with(payload, |data| {
-                    let vt_state = self.vts.get_mut(vt).unwrap();
-
-                    let cursor_plane = &mut vt_state.cursor_plane;
-
-                    let update_buffer = data.flags() & DRM_MODE_CURSOR_BO != 0;
-                    if update_buffer {
-                        cursor_plane.buffer = if data.handle() == 0 {
-                            None
-                        } else if let Some(buffer) = buffers.get(&data.handle()) {
-                            Some(buffer.clone())
-                        } else {
-                            return Err(Error::new(EINVAL));
-                        };
-                    }
-
-                    if data.flags() & DRM_MODE_CURSOR_MOVE != 0 {
-                        cursor_plane.x = data.x();
-                        cursor_plane.y = data.y();
-                    }
-
-                    self.adapter.handle_cursor(cursor_plane, update_buffer);
-
-                    Ok(0)
-                }),
-                ipc::MODE_GET_ENCODER => ipc::DrmModeGetEncoder::with(payload, |mut data| {
-                    let encoder = self.objects.get_encoder(KmsObjectId(data.encoder_id()))?;
-                    data.set_crtc_id(encoder.crtc_id.0);
-                    data.set_possible_crtcs(encoder.possible_crtcs);
-                    data.set_possible_clones(encoder.possible_clones);
-                    Ok(0)
-                }),
-                ipc::MODE_GET_CONNECTOR => ipc::DrmModeGetConnector::with(payload, |mut data| {
-                    if data.count_modes() == 0 {
-                        self.adapter
-                            .probe_connector(&mut self.objects, KmsObjectId(data.connector_id()));
-                    }
-                    let connector = self
-                        .objects
-                        .get_connector(KmsObjectId(data.connector_id()))?
-                        .lock()
-                        .unwrap();
-                    data.set_encoders_ptr(&[connector.encoder_id.0]);
-                    data.set_modes_ptr(&connector.modes);
-                    data.set_connector_type(data.connector_type());
-                    data.set_connector_type_id(data.connector_type_id());
-                    data.set_connection(connector.connection as u32);
-                    data.set_mm_width(connector.mm_width);
-                    data.set_mm_height(connector.mm_width);
-                    data.set_subpixel(connector.subpixel as u32);
-                    drop(connector);
-                    let (props, prop_vals) = self
-                        .objects
-                        .get_object_properties_data(KmsObjectId(data.connector_id()))?;
-                    data.set_props_ptr(&props);
-                    data.set_prop_values_ptr(&prop_vals);
-                    Ok(0)
-                }),
-                ipc::MODE_GET_PROPERTY => ipc::DrmModeGetProperty::with(payload, |mut data| {
-                    let property = self.objects.get_property(KmsObjectId(data.prop_id()))?;
-                    data.set_name(property.name.0);
-                    let mut flags = 0;
-                    if property.immutable {
-                        flags |= DRM_MODE_PROP_IMMUTABLE;
-                    }
-                    if property.atomic {
-                        flags |= DRM_MODE_PROP_ATOMIC;
-                    }
-                    match &property.kind {
-                        &KmsPropertyKind::Range(start, end) => {
-                            data.set_flags(flags | DRM_MODE_PROP_RANGE);
-                            data.set_values_ptr(&[start, end]);
-                            data.set_enum_blob_ptr(&[]);
-                        }
-                        KmsPropertyKind::Enum(variants) => {
-                            data.set_flags(flags | DRM_MODE_PROP_ENUM);
-                            data.set_values_ptr(
-                                &variants.iter().map(|&(_, value)| value).collect::<Vec<_>>(),
-                            );
-                            data.set_enum_blob_ptr(
-                                &variants
-                                    .iter()
-                                    .map(|&(name, value)| drm_mode_property_enum {
-                                        name: name.0,
-                                        value,
-                                    })
-                                    .collect::<Vec<_>>(),
-                            );
-                        }
-                        KmsPropertyKind::Blob => {
-                            data.set_flags(flags | DRM_MODE_PROP_BLOB);
-                            data.set_values_ptr(&[]);
-                            data.set_enum_blob_ptr(&[]);
-                        }
-                        KmsPropertyKind::Bitmask(bitmask_flags) => {
-                            data.set_flags(flags | DRM_MODE_PROP_BITMASK);
-                            data.set_values_ptr(
-                                &bitmask_flags
-                                    .iter()
-                                    .map(|&(_, value)| value)
-                                    .collect::<Vec<_>>(),
-                            );
-                            data.set_enum_blob_ptr(
-                                &bitmask_flags
-                                    .iter()
-                                    .map(|&(name, value)| drm_mode_property_enum {
-                                        name: name.0,
-                                        value,
-                                    })
-                                    .collect::<Vec<_>>(),
-                            );
-                        }
-                        KmsPropertyKind::Object { type_ } => {
-                            data.set_flags(flags | DRM_MODE_PROP_OBJECT);
-                            data.set_values_ptr(&[u64::from(*type_)]);
-                            data.set_enum_blob_ptr(&[]);
-                        }
-                        &KmsPropertyKind::SignedRange(start, end) => {
-                            data.set_flags(flags | DRM_MODE_PROP_SIGNED_RANGE);
-                            data.set_values_ptr(&[start as u64, end as u64]);
-                            data.set_enum_blob_ptr(&[]);
-                        }
-                    }
-                    Ok(0)
-                }),
-                ipc::MODE_GET_PROP_BLOB => ipc::DrmModeGetBlob::with(payload, |mut data| {
-                    let blob = self.objects.get_blob(KmsObjectId(data.blob_id()))?;
-                    data.set_data(&blob);
-                    Ok(0)
-                }),
-                ipc::MODE_GET_FB => ipc::DrmModeFbCmd::with(payload, |mut data| {
-                    let fb = self.objects.get_framebuffer(KmsObjectId(data.fb_id()))?;
-
-                    *next_id += 1;
-                    buffers.insert(*next_id, fb.buffer.clone());
-
-                    data.set_width(fb.width);
-                    data.set_height(fb.height);
-                    data.set_pitch(fb.pitch);
-                    data.set_bpp(fb.bpp);
-                    data.set_depth(fb.depth);
-                    data.set_handle(*next_id);
-                    Ok(0)
-                }),
-                ipc::MODE_ADD_FB => ipc::DrmModeFbCmd::with(payload, |mut data| {
-                    let buffer = buffers.get(&data.handle()).ok_or(Error::new(EINVAL))?;
-
-                    let fb = self.adapter.create_framebuffer(buffer);
-
-                    let id = self.objects.add_framebuffer(objects::KmsFramebuffer {
-                        width: data.width(),
-                        height: data.height(),
-                        pitch: data.pitch(),
-                        bpp: data.bpp(),
-                        depth: data.depth(),
-                        buffer: buffer.clone(),
-                        driver_data: fb,
-                    });
-
-                    data.set_fb_id(id.0);
-
-                    Ok(0)
-                }),
-                ipc::MODE_RM_FB => ipc::StandinForUint::with(payload, |data| {
-                    let fb_id = KmsObjectId(data.inner());
-                    self.objects.remove_framebuffer(fb_id)?;
-
-                    // Disable planes that use this framebuffer.
-                    for (vt, vt_data) in &mut self.vts {
-                        for (crtc_idx, crtc_state) in vt_data.crtc_state.iter_mut().enumerate() {
-                            if crtc_state.fb_id != Some(fb_id) {
-                                continue;
-                            }
-                            crtc_state.fb_id = None;
-
-                            if *vt != self.active_vt {
-                                continue;
-                            }
-                            let crtc = self.objects.crtcs().nth(crtc_idx).unwrap();
-                            self.adapter
-                                .set_crtc(
-                                    &self.objects,
-                                    crtc,
-                                    crtc_state.clone(),
-                                    Damage {
-                                        x: 0,
-                                        y: 0,
-                                        width: 0,
-                                        height: 0,
-                                    },
-                                )
-                                .unwrap();
-                        }
-                    }
-
-                    Ok(0)
-                }),
-                ipc::MODE_DIRTYFB => ipc::DrmModeFbDirtyCmd::with(payload, |data| {
-                    let fb = self.objects.get_framebuffer(KmsObjectId(data.fb_id()))?;
-
-                    let damage = data
-                        .clips_ptr()
-                        .iter()
-                        .map(|rect| Damage {
-                            x: u32::from(rect.x1),
-                            y: u32::from(rect.y1),
-                            width: u32::from(rect.x2 - rect.x1),
-                            height: u32::from(rect.y2 - rect.y1),
-                        })
-                        .reduce(Damage::merge)
-                        .unwrap_or(Damage {
-                            x: 0,
-                            y: 0,
-                            width: fb.width,
-                            height: fb.height,
-                        });
-
-                    if *vt == self.active_vt {
-                        for crtc in self.objects.crtcs() {
-                            let state = crtc.lock().unwrap().state.clone();
-                            if state.fb_id == Some(KmsObjectId(data.fb_id())) {
-                                self.adapter.set_crtc(&self.objects, crtc, state, damage)?;
-                            }
-                        }
-                    }
-
-                    Ok(0)
-                }),
-                ipc::MODE_CREATE_DUMB => ipc::DrmModeCreateDumb::with(payload, |mut data| {
-                    if data.bpp() != 32 || data.flags() != 0 {
-                        return Err(Error::new(EINVAL));
-                    }
-
-                    let (buffer, pitch) =
-                        self.adapter.create_dumb_buffer(data.width(), data.height());
-
-                    data.set_pitch(pitch);
-                    data.set_size(buffer.size() as u64);
-
-                    *next_id += 1;
-                    buffers.insert(*next_id, Arc::new(buffer));
-                    data.set_handle(*next_id as u32);
-                    Ok(0)
-                }),
-                ipc::MODE_MAP_DUMB => ipc::DrmModeMapDumb::with(payload, |mut data| {
-                    if data.offset() != 0 {
-                        return Err(Error::new(EINVAL));
-                    }
-
-                    let buffer_id = data.handle();
-
-                    if !buffers.contains_key(&buffer_id) {
-                        return Err(Error::new(EINVAL));
-                    }
-
-                    // FIXME use a better scheme for creating map offsets
-                    assert!(buffers[&buffer_id].size() < MAP_FAKE_OFFSET_MULTIPLIER);
-
-                    data.set_offset((buffer_id as usize * MAP_FAKE_OFFSET_MULTIPLIER) as u64);
-
-                    Ok(0)
-                }),
-                ipc::MODE_DESTROY_DUMB => ipc::DrmModeDestroyDumb::with(payload, |data| {
-                    if buffers.remove(&data.handle()).is_none() {
-                        return Err(Error::new(ENOENT));
-                    }
-                    Ok(0)
-                }),
-                ipc::MODE_GET_PLANE_RES => ipc::DrmModeGetPlaneRes::with(payload, |mut data| {
-                    let count = self.objects.crtc_ids().len();
-                    let mut ids = Vec::with_capacity(count);
-                    for i in 0..(count as u32) {
-                        ids.push(plane_id(i));
-                    }
-                    data.set_plane_id_ptr(&ids);
-                    Ok(0)
-                }),
-                ipc::MODE_GET_PLANE => ipc::DrmModeGetPlane::with(payload, |mut data| {
-                    let i = id_index(data.plane_id());
-                    let crtc_id = self.objects.crtc_ids()[i as usize];
-                    let crtc = self.objects.get_crtc(crtc_id).unwrap();
-                    data.set_crtc_id(crtc_id.0);
-                    data.set_fb_id(
-                        crtc.lock()
-                            .unwrap()
-                            .state
-                            .fb_id
-                            .unwrap_or(KmsObjectId::INVALID)
-                            .0,
-                    );
-                    data.set_possible_crtcs(1 << i);
-                    data.set_format_type_ptr(&[DrmFourcc::Argb8888 as u32]);
-                    Ok(0)
-                }),
-                ipc::MODE_OBJ_GET_PROPERTIES => {
-                    ipc::DrmModeObjGetProperties::with(payload, |mut data| {
-                        // FIXME remove once all drm objects are materialized in self.objects
-                        if data.obj_id() >= 1 << 11 {
-                            data.set_props_ptr(&[]);
-                            data.set_prop_values_ptr(&[]);
-                            return Ok(0);
-                        }
-
-                        let (props, prop_vals) = self
-                            .objects
-                            .get_object_properties_data(KmsObjectId(data.obj_id()))?;
-                        data.set_props_ptr(&props);
-                        data.set_prop_values_ptr(&prop_vals);
-                        data.set_obj_type(self.objects.object_type(KmsObjectId(data.obj_id()))?);
-                        Ok(0)
-                    })
-                }
-                ipc::MODE_CURSOR2 => ipc::DrmModeCursor2::with(payload, |data| {
-                    let vt_state = self.vts.get_mut(vt).unwrap();
-
-                    let cursor_plane = &mut vt_state.cursor_plane;
-
-                    let update_buffer = data.flags() & DRM_MODE_CURSOR_BO != 0;
-                    if update_buffer {
-                        cursor_plane.buffer = if data.handle() == 0 {
-                            None
-                        } else if let Some(buffer) = buffers.get(&data.handle()) {
-                            Some(buffer.clone())
-                        } else {
-                            return Err(Error::new(EINVAL));
-                        };
-                        cursor_plane.hot_x = data.hot_x();
-                        cursor_plane.hot_y = data.hot_y();
-                    }
-
-                    if data.flags() & DRM_MODE_CURSOR_MOVE != 0 {
-                        cursor_plane.x = data.x();
-                        cursor_plane.y = data.y();
-                    }
-
-                    self.adapter.handle_cursor(cursor_plane, update_buffer);
-
-                    Ok(0)
-                }),
-                ipc::MODE_GET_FB2 => ipc::DrmModeFbCmd2::with(payload, |mut data| {
-                    let fb = self.objects.get_framebuffer(KmsObjectId(data.fb_id()))?;
-
-                    *next_id += 1;
-                    buffers.insert(*next_id, fb.buffer.clone());
-
-                    data.set_width(fb.width);
-                    data.set_height(fb.height);
-                    data.set_pixel_format(DrmFourcc::Argb8888 as u32);
-                    data.set_handles([*next_id, 0, 0, 0]);
-                    data.set_pitches([fb.width * 4, 0, 0, 0]);
-                    data.set_offsets([0; 4]);
-                    data.set_modifier([0; 4]);
-                    Ok(0)
-                }),
-                _ => return Err(Error::new(EINVAL)),
-            },
-        }
-    }
-
-    fn mmap_prep(
-        &mut self,
-        id: usize,
-        offset: u64,
-        _size: usize,
-        _flags: MapFlags,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<usize> {
-        // log::trace!("KSMSG MMAP {} {:?} {} {}", id, _flags, _offset, _size);
-        let (framebuffer, offset) = match self.handles.get(id)? {
-            Handle::V2 {
-                vt: _,
-                next_id: _,
-                buffers,
-            } => (
-                buffers
-                    .get(&((offset as usize / MAP_FAKE_OFFSET_MULTIPLIER) as u32))
-                    .ok_or(Error::new(EINVAL))
-                    .unwrap(),
-                offset & (MAP_FAKE_OFFSET_MULTIPLIER as u64 - 1),
-            ),
-            Handle::SchemeRoot => return Err(Error::new(EOPNOTSUPP)),
-        };
-        let ptr = T::map_dumb_buffer(&mut self.adapter, framebuffer);
-        Ok(unsafe { ptr.add(offset as usize) } as usize)
-    }
-
-    fn on_close(&mut self, id: usize) {
-        self.handles.remove(id);
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/fbbootlogd/Cargo.toml b/recipes/core/base/drivers/graphics/fbbootlogd/Cargo.toml
deleted file mode 100644
index a891507842..0000000000
--- a/recipes/core/base/drivers/graphics/fbbootlogd/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "fbbootlogd"
-description = "Boot log drawing daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-drm.workspace = true
-orbclient.workspace = true
-ransid.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../../../scheme-utils" }
-
-console-draw = { path = "../console-draw" }
-daemon = { path = "../../../daemon" }
-graphics-ipc = { path = "../graphics-ipc" }
-inputd = { path = "../../inputd" }
-libredox.workspace = true
-
-[features]
-default = []
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/graphics/fbbootlogd/src/main.rs b/recipes/core/base/drivers/graphics/fbbootlogd/src/main.rs
deleted file mode 100644
index 3e42d590ca..0000000000
--- a/recipes/core/base/drivers/graphics/fbbootlogd/src/main.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-//! Fbbootlogd renders the boot log and presents it on VT1.
-//!
-//! While fbbootlogd is superficially similar to fbcond, the major difference is:
-//!
-//! * Fbbootlogd doesn't accept input coming from the keyboard. It only allows getting written to.
-//!
-//! In the future fbbootlogd may also pull from logd as opposed to have logd push logs to it. And it
-//! it could display a boot splash like plymouth instead of a boot log when booting in quiet mode.
-
-use std::ops::ControlFlow;
-use std::os::fd::AsRawFd;
-
-use event::EventQueue;
-use inputd::ConsumerHandleEvent;
-use orbclient::Event;
-use redox_scheme::Socket;
-use scheme_utils::Blocking;
-
-use crate::scheme::FbbootlogScheme;
-
-mod scheme;
-
-fn main() {
-    daemon::SchemeDaemon::new(daemon);
-}
-fn daemon(daemon: daemon::SchemeDaemon) -> ! {
-    let event_queue = EventQueue::new().expect("fbbootlogd: failed to create event queue");
-
-    event::user_data! {
-        enum Source {
-            Scheme,
-            Input,
-        }
-    }
-
-    let socket = Socket::nonblock().expect("fbbootlogd: failed to create fbbootlog scheme");
-
-    let mut scheme = FbbootlogScheme::new();
-    let mut handler = Blocking::new(&socket, 16);
-
-    event_queue
-        .subscribe(
-            socket.inner().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .expect("fbbootlogd: failed to subscribe to scheme events");
-
-    event_queue
-        .subscribe(
-            scheme.input_handle.event_handle().as_raw_fd() as usize,
-            Source::Input,
-            event::EventFlags::READ,
-        )
-        .expect("fbbootlogd: failed to subscribe to scheme events");
-
-    {
-        let log_fd = socket
-            .create_this_scheme_fd(0, 0, 0, 0)
-            .expect("fbbootlogd: failed to create log fd");
-        // Add ourself as log sink
-        let log_file = libredox::Fd::open(
-            "/scheme/log/add_sink",
-            libredox::flag::O_WRONLY | libredox::flag::O_CLOEXEC,
-            0,
-        )
-        .expect("fbbootlogd: failed to open log/add_sink");
-        log_file
-            .call_wo(&log_fd.to_ne_bytes(), syscall::CallFlags::FD, &[])
-            .expect("fbbootlogd: failed to send log fd to log scheme.");
-    }
-
-    let _ = daemon.ready_sync_scheme(&socket, &mut scheme);
-
-    // This is not possible for now as fbbootlogd needs to open new displays at runtime for graphics
-    // driver handoff. In the future inputd may directly pass a handle to the display instead.
-    //libredox::call::setrens(0, 0).expect("fbbootlogd: failed to enter null namespace");
-
-    for event in event_queue {
-        match event.expect("fbbootlogd: failed to get event").user_data {
-            Source::Scheme => loop {
-                match handler
-                    .process_requests_nonblocking(&mut scheme)
-                    .expect("fbbootlogd: failed to process requests")
-                {
-                    ControlFlow::Continue(()) => {}
-                    ControlFlow::Break(()) => break,
-                }
-            },
-            Source::Input => {
-                let mut events = [Event::new(); 16];
-                loop {
-                    match scheme
-                        .input_handle
-                        .read_events(&mut events)
-                        .expect("fbbootlogd: error while reading events")
-                    {
-                        ConsumerHandleEvent::Events(&[]) => break,
-                        ConsumerHandleEvent::Events(events) => {
-                            for event in events {
-                                scheme.handle_input(&event);
-                            }
-                        }
-                        ConsumerHandleEvent::Handoff => {
-                            eprintln!("fbbootlogd: handoff requested");
-                            scheme.handle_handoff();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    std::process::exit(0);
-}
diff --git a/recipes/core/base/drivers/graphics/fbbootlogd/src/scheme.rs b/recipes/core/base/drivers/graphics/fbbootlogd/src/scheme.rs
deleted file mode 100644
index 812c4a5bc3..0000000000
--- a/recipes/core/base/drivers/graphics/fbbootlogd/src/scheme.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-use std::cmp;
-use std::collections::VecDeque;
-
-use console_draw::{Damage, TextScreen, V2DisplayMap};
-use drm::buffer::Buffer;
-use drm::control::Device;
-use graphics_ipc::V2GraphicsHandle;
-use inputd::ConsumerHandle;
-use orbclient::{Event, EventOption};
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult};
-use scheme_utils::FpathWriter;
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error, Result, EACCES, EBADF, EINVAL, ENOENT};
-
-pub struct FbbootlogScheme {
-    pub input_handle: ConsumerHandle,
-    display_map: Option<V2DisplayMap>,
-    text_screen: console_draw::TextScreen,
-    text_buffer: console_draw::TextBuffer,
-    is_scrollback: bool,
-    scrollback_offset: usize,
-    shift: bool,
-}
-
-impl FbbootlogScheme {
-    pub fn new() -> FbbootlogScheme {
-        let mut scheme = FbbootlogScheme {
-            input_handle: ConsumerHandle::bootlog_vt().expect("fbbootlogd: Failed to open vt"),
-            display_map: None,
-            text_screen: console_draw::TextScreen::new(),
-            text_buffer: console_draw::TextBuffer::new(1000),
-            is_scrollback: false,
-            scrollback_offset: 1000,
-            shift: false,
-        };
-
-        scheme.handle_handoff();
-
-        scheme
-    }
-
-    pub fn handle_handoff(&mut self) {
-        let new_display_handle = match self.input_handle.open_display_v2() {
-            Ok(display) => V2GraphicsHandle::from_file(display).unwrap(),
-            Err(err) => {
-                eprintln!("fbbootlogd: No display present yet: {err}");
-                return;
-            }
-        };
-
-        match V2DisplayMap::new(new_display_handle) {
-            Ok(display_map) => self.display_map = Some(display_map),
-            Err(err) => {
-                eprintln!("fbbootlogd: failed to open display: {}", err);
-                return;
-            }
-        };
-
-        eprintln!("fbbootlogd: mapped display");
-    }
-
-    pub fn handle_input(&mut self, ev: &Event) {
-        match ev.to_option() {
-            EventOption::Key(key_event) => {
-                if key_event.scancode == 0x2A || key_event.scancode == 0x36 {
-                    self.shift = key_event.pressed;
-                } else if !key_event.pressed || !self.shift {
-                    return;
-                }
-                match key_event.scancode {
-                    0x48 => {
-                        // Up
-                        if self.scrollback_offset >= 1 {
-                            self.scrollback_offset -= 1;
-                        }
-                    }
-                    0x49 => {
-                        // Page up
-                        if self.scrollback_offset >= 10 {
-                            self.scrollback_offset -= 10;
-                        } else {
-                            self.scrollback_offset = 0;
-                        }
-                    }
-                    0x50 => {
-                        // Down
-                        self.scrollback_offset += 1;
-                    }
-                    0x51 => {
-                        // Page down
-                        self.scrollback_offset += 10;
-                    }
-                    0x47 => {
-                        // Home
-                        self.scrollback_offset = 0;
-                    }
-                    0x4F => {
-                        // End
-                        self.scrollback_offset = self.text_buffer.lines_max;
-                    }
-                    _ => return,
-                }
-            }
-            _ => return,
-        }
-        self.handle_scrollback_render();
-    }
-
-    fn handle_scrollback_render(&mut self) {
-        let Some(map) = &mut self.display_map else {
-            return;
-        };
-        let buffer_len = self.text_buffer.lines.len();
-        // for both extra space on wrapping text and a scrollback indicator
-        let spare_lines = 3;
-        self.is_scrollback = true;
-        self.scrollback_offset = cmp::min(
-            self.scrollback_offset,
-            buffer_len - map.buffer.buffer().size().1 as usize / 16 + spare_lines,
-        );
-        let mut i = self.scrollback_offset;
-        self.text_screen
-            .write(map, b"\x1B[1;1H\x1B[2J", &mut VecDeque::new());
-
-        let mut total_damage = Damage::NONE;
-        while i < buffer_len {
-            let mut damage =
-                self.text_screen
-                    .write(map, &self.text_buffer.lines[i][..], &mut VecDeque::new());
-            i += 1;
-            let yd = (damage.y + damage.height) as usize;
-            if i == buffer_len || yd + spare_lines * 16 > map.buffer.buffer().size().1 as usize {
-                // render until end of screen
-                damage.height = map.buffer.buffer().size().1 - damage.y;
-                total_damage = total_damage.merge(damage);
-                self.is_scrollback = i < buffer_len;
-                break;
-            } else {
-                total_damage = total_damage.merge(damage);
-            }
-        }
-        map.dirty_fb(total_damage).unwrap();
-    }
-
-    fn handle_resize(map: &mut V2DisplayMap, text_screen: &mut TextScreen) {
-        let mode = match map
-            .display_handle
-            .first_display()
-            .and_then(|handle| Ok(map.display_handle.get_connector(handle, true)?.modes()[0]))
-        {
-            Ok(mode) => mode,
-            Err(err) => {
-                eprintln!("fbbootlogd: failed to get display size: {}", err);
-                return;
-            }
-        };
-
-        if (u32::from(mode.size().0), u32::from(mode.size().1)) != map.buffer.buffer().size() {
-            match text_screen.resize(map, mode) {
-                Ok(()) => eprintln!("fbbootlogd: mapped display"),
-                Err(err) => {
-                    eprintln!("fbbootlogd: failed to create or map framebuffer: {}", err);
-                    return;
-                }
-            }
-        }
-    }
-}
-
-const SCHEME_ROOT_ID: usize = 1;
-
-impl SchemeSync for FbbootlogScheme {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(SCHEME_ROOT_ID)
-    }
-
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path_str: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if dirfd != SCHEME_ROOT_ID {
-            return Err(Error::new(EACCES));
-        }
-        if !path_str.is_empty() {
-            return Err(Error::new(ENOENT));
-        }
-
-        Ok(OpenResult::ThisScheme {
-            number: 0,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn fpath(&mut self, _id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with_legacy(buf, "fbbootlog", |_| Ok(()))
-    }
-
-    fn fsync(&mut self, _id: usize, _ctx: &CallerCtx) -> Result<()> {
-        Ok(())
-    }
-
-    fn read(
-        &mut self,
-        _id: usize,
-        _buf: &mut [u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        Err(Error::new(EINVAL))
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        if id == SCHEME_ROOT_ID {
-            return Err(Error::new(EBADF));
-        }
-        if let Some(map) = &mut self.display_map {
-            Self::handle_resize(map, &mut self.text_screen);
-            self.text_buffer.write(buf);
-
-            if !self.is_scrollback {
-                let damage = self.text_screen.write(map, buf, &mut VecDeque::new());
-
-                if let Some(map) = &mut self.display_map {
-                    map.dirty_fb(damage).unwrap();
-                }
-            }
-        }
-
-        Ok(buf.len())
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/fbcond/Cargo.toml b/recipes/core/base/drivers/graphics/fbcond/Cargo.toml
deleted file mode 100644
index ea9e2d6759..0000000000
--- a/recipes/core/base/drivers/graphics/fbcond/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "fbcond"
-description = "Terminal daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-drm.workspace = true
-log.workspace = true
-orbclient.workspace = true
-ransid.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../../../scheme-utils" }
-
-common = { path = "../../common" }
-console-draw = { path = "../console-draw" }
-daemon = { path = "../../../daemon" }
-graphics-ipc = { path = "../graphics-ipc" }
-inputd = { path = "../../inputd" }
-libredox.workspace = true
-
-[features]
-default = []
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/graphics/fbcond/src/display.rs b/recipes/core/base/drivers/graphics/fbcond/src/display.rs
deleted file mode 100644
index eb09b97e9c..0000000000
--- a/recipes/core/base/drivers/graphics/fbcond/src/display.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use console_draw::{Damage, TextScreen, V2DisplayMap};
-use drm::buffer::Buffer;
-use drm::control::Device;
-use graphics_ipc::V2GraphicsHandle;
-use inputd::ConsumerHandle;
-use std::io;
-
-pub struct Display {
-    pub input_handle: ConsumerHandle,
-    pub map: Option<V2DisplayMap>,
-}
-
-impl Display {
-    pub fn open_new_vt() -> io::Result<Self> {
-        let mut display = Self {
-            input_handle: ConsumerHandle::new_vt()?,
-            map: None,
-        };
-
-        display.reopen_for_handoff();
-
-        Ok(display)
-    }
-
-    /// Re-open the display after a handoff.
-    pub fn reopen_for_handoff(&mut self) {
-        let display_file = match self.input_handle.open_display_v2() {
-            Ok(display_file) => display_file,
-            Err(err) => {
-                log::error!("fbcond: No display present yet: {err}");
-                return;
-            }
-        };
-        let new_display_handle = V2GraphicsHandle::from_file(display_file).unwrap();
-
-        log::debug!("fbcond: Opened new display");
-
-        match V2DisplayMap::new(new_display_handle) {
-            Ok(map) => {
-                log::debug!(
-                    "fbcond: Mapped new display with size {}x{}",
-                    map.buffer.buffer().size().0,
-                    map.buffer.buffer().size().1,
-                );
-                self.map = Some(map)
-            }
-            Err(err) => {
-                log::error!("fbcond: failed to map new display: {err}");
-                return;
-            }
-        }
-    }
-
-    pub fn handle_resize(map: &mut V2DisplayMap, text_screen: &mut TextScreen) {
-        let mode = match map
-            .display_handle
-            .first_display()
-            .and_then(|handle| Ok(map.display_handle.get_connector(handle, true)?.modes()[0]))
-        {
-            Ok(mode) => mode,
-            Err(err) => {
-                eprintln!("fbcond: failed to get display size: {}", err);
-                return;
-            }
-        };
-
-        if (u32::from(mode.size().0), u32::from(mode.size().1)) != map.buffer.buffer().size() {
-            match text_screen.resize(map, mode) {
-                Ok(()) => eprintln!("fbcond: mapped display"),
-                Err(err) => {
-                    eprintln!("fbcond: failed to create or map framebuffer: {}", err);
-                    return;
-                }
-            }
-        }
-    }
-
-    pub fn sync_rect(&mut self, damage: Damage) {
-        if let Some(map) = &mut self.map {
-            map.dirty_fb(damage).unwrap();
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/fbcond/src/main.rs b/recipes/core/base/drivers/graphics/fbcond/src/main.rs
deleted file mode 100644
index eb4f9addb8..0000000000
--- a/recipes/core/base/drivers/graphics/fbcond/src/main.rs
+++ /dev/null
@@ -1,253 +0,0 @@
-use event::EventQueue;
-use inputd::ConsumerHandleEvent;
-use libredox::errno::{EAGAIN, EINTR};
-use orbclient::Event;
-use redox_scheme::{
-    scheme::{Op, SchemeResponse, SchemeState, SchemeSync},
-    CallerCtx, RequestKind, Response, SignalBehavior, Socket,
-};
-use std::env;
-use syscall::{EOPNOTSUPP, EVENT_READ};
-
-use crate::scheme::{FbconScheme, Handle, VtIndex};
-
-mod display;
-mod scheme;
-mod text;
-
-fn main() {
-    daemon::SchemeDaemon::new(daemon);
-}
-fn daemon(daemon: daemon::SchemeDaemon) -> ! {
-    let vt_ids = env::args()
-        .skip(1)
-        .map(|arg| arg.parse().expect("invalid vt number"))
-        .collect::<Vec<_>>();
-
-    common::setup_logging(
-        "graphics",
-        "fbcond",
-        "fbcond",
-        common::output_level(),
-        common::file_level(),
-    );
-    let mut event_queue = EventQueue::new().expect("fbcond: failed to create event queue");
-
-    // FIXME listen for resize events from inputd and handle them
-
-    let mut socket = Socket::nonblock().expect("fbcond: failed to create fbcon scheme");
-    event_queue
-        .subscribe(
-            socket.inner().raw(),
-            VtIndex::SCHEMA_SENTINEL,
-            event::EventFlags::READ,
-        )
-        .expect("fbcond: failed to subscribe to scheme events");
-
-    let mut state = SchemeState::new();
-    let mut scheme = FbconScheme::new(&vt_ids, &mut event_queue);
-
-    let _ = daemon.ready_sync_scheme(&socket, &mut scheme);
-
-    // This is not possible for now as fbcond needs to open new displays at runtime for graphics
-    // driver handoff. In the future inputd may directly pass a handle to the display instead.
-    // libredox::call::setrens(0, 0).expect("fbcond: failed to enter null namespace");
-
-    let mut blocked = Vec::new();
-
-    // Handle all events that could have happened before registering with the event queue.
-    handle_event(
-        &mut socket,
-        &mut scheme,
-        &mut state,
-        &mut blocked,
-        VtIndex::SCHEMA_SENTINEL,
-    );
-    for vt_i in scheme.vts.keys().copied().collect::<Vec<_>>() {
-        handle_event(&mut socket, &mut scheme, &mut state, &mut blocked, vt_i);
-    }
-
-    for event in event_queue {
-        let event = event.expect("fbcond: failed to read event from event queue");
-        handle_event(
-            &mut socket,
-            &mut scheme,
-            &mut state,
-            &mut blocked,
-            event.user_data,
-        );
-    }
-
-    std::process::exit(0);
-}
-
-fn handle_event(
-    socket: &mut Socket,
-    scheme: &mut FbconScheme,
-    state: &mut SchemeState,
-    blocked: &mut Vec<(Op, CallerCtx)>,
-    event: VtIndex,
-) {
-    match event {
-        VtIndex::SCHEMA_SENTINEL => loop {
-            let request = match socket.next_request(SignalBehavior::Restart) {
-                Ok(Some(request)) => request,
-                Ok(None) => {
-                    // Scheme likely got unmounted
-                    std::process::exit(0);
-                }
-                Err(err) if err.errno == EAGAIN => {
-                    break;
-                }
-                Err(err) => panic!("fbcond: failed to read display scheme: {err}"),
-            };
-
-            match request.kind() {
-                RequestKind::Call(req) => {
-                    let caller = req.caller();
-                    let mut op = match req.op() {
-                        Ok(op) => op,
-                        Err(req) => {
-                            let _ = socket
-                                .write_response(
-                                    Response::err(EOPNOTSUPP, req),
-                                    SignalBehavior::Restart,
-                                )
-                                .expect("fbcond: failed to write responses to fbcon scheme");
-                            continue;
-                        }
-                    };
-                    match op.handle_sync_dont_consume(&caller, scheme, state) {
-                        SchemeResponse::Opened(Err(e)) | SchemeResponse::Regular(Err(e))
-                            if libredox::error::Error::from(e).is_wouldblock()
-                                && !op.is_explicitly_nonblock() =>
-                        {
-                            blocked.push((op, caller));
-                        }
-                        SchemeResponse::Regular(r) => {
-                            let _ = socket
-                                .write_response(Response::new(r, op), SignalBehavior::Restart)
-                                .expect("fbcond: failed to write responses to fbcon scheme");
-                        }
-                        SchemeResponse::Opened(o) => {
-                            let _ = socket
-                                .write_response(
-                                    Response::open_dup_like(o, op),
-                                    SignalBehavior::Restart,
-                                )
-                                .expect("fbcond: failed to write responses to fbcon scheme");
-                        }
-                        SchemeResponse::RegularAndNotifyOnDetach(status) => {
-                            let _ = socket
-                                .write_response(
-                                    Response::new_notify_on_detach(status, op),
-                                    SignalBehavior::Restart,
-                                )
-                                .expect("fbcond: failed to write scheme");
-                        }
-                    }
-                }
-                RequestKind::OnClose { id } => {
-                    scheme.on_close(id);
-                }
-                RequestKind::Cancellation(cancellation_request) => {
-                    if let Some(i) = blocked
-                        .iter()
-                        .position(|(_op, caller)| caller.id == cancellation_request.id)
-                    {
-                        let (blocked_req, _) = blocked.remove(i);
-                        let resp = Response::err(EINTR, blocked_req);
-                        socket
-                            .write_response(resp, SignalBehavior::Restart)
-                            .expect("vesad: failed to write display scheme");
-                    }
-                }
-                _ => {}
-            }
-        },
-        vt_i => {
-            let vt = scheme.vts.get_mut(&vt_i).unwrap();
-
-            let mut events = [Event::new(); 16];
-            loop {
-                match vt
-                    .display
-                    .input_handle
-                    .read_events(&mut events)
-                    .expect("fbcond: Error while reading events")
-                {
-                    ConsumerHandleEvent::Events(&[]) => break,
-
-                    ConsumerHandleEvent::Events(events) => {
-                        for event in events {
-                            vt.input(event)
-                        }
-                    }
-                    ConsumerHandleEvent::Handoff => vt.handle_handoff(),
-                }
-            }
-        }
-    }
-
-    // If there are blocked readers, try to handle them.
-    {
-        let mut i = 0;
-        while i < blocked.len() {
-            let (op, caller) = blocked
-                .get_mut(i)
-                .expect("vesad: Failed to get blocked request");
-            let resp = match op.handle_sync_dont_consume(&caller, scheme, state) {
-                SchemeResponse::Opened(Err(e)) | SchemeResponse::Regular(Err(e))
-                    if libredox::error::Error::from(e).is_wouldblock()
-                        && !op.is_explicitly_nonblock() =>
-                {
-                    i += 1;
-                    continue;
-                }
-                SchemeResponse::Regular(r) => {
-                    let (op, _) = blocked.remove(i);
-                    Response::new(r, op)
-                }
-                SchemeResponse::Opened(o) => {
-                    let (op, _) = blocked.remove(i);
-                    Response::open_dup_like(o, op)
-                }
-                SchemeResponse::RegularAndNotifyOnDetach(status) => {
-                    let (op, _) = blocked.remove(i);
-                    Response::new_notify_on_detach(status, op)
-                }
-            };
-            let _ = socket
-                .write_response(resp, SignalBehavior::Restart)
-                .expect("vesad: failed to write display scheme");
-        }
-    }
-
-    for (handle_id, handle) in scheme.handles.iter_mut() {
-        let handle = match handle {
-            Handle::SchemeRoot => continue,
-            Handle::Vt(handle) => handle,
-        };
-
-        if !handle.events.contains(EVENT_READ) {
-            continue;
-        }
-
-        let can_read = scheme
-            .vts
-            .get(&handle.vt_i)
-            .map_or(false, |console| console.can_read());
-
-        if can_read {
-            if !handle.notified_read {
-                handle.notified_read = true;
-                let response = Response::post_fevent(*handle_id, EVENT_READ.bits());
-                socket
-                    .write_response(response, SignalBehavior::Restart)
-                    .expect("fbcond: failed to write display event");
-            }
-        } else {
-            handle.notified_read = false;
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/fbcond/src/scheme.rs b/recipes/core/base/drivers/graphics/fbcond/src/scheme.rs
deleted file mode 100644
index 1bee134e29..0000000000
--- a/recipes/core/base/drivers/graphics/fbcond/src/scheme.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-use std::collections::BTreeMap;
-use std::os::fd::AsRawFd;
-
-use event::{EventQueue, UserData};
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult};
-use scheme_utils::{FpathWriter, HandleMap};
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error, EventFlags, Result, EACCES, EAGAIN, EBADF, ENOENT, O_NONBLOCK};
-
-use crate::display::Display;
-use crate::text::TextScreen;
-
-#[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd, Debug)]
-pub struct VtIndex(usize);
-
-impl VtIndex {
-    pub const SCHEMA_SENTINEL: VtIndex = VtIndex(usize::MAX);
-}
-
-impl UserData for VtIndex {
-    fn into_user_data(self) -> usize {
-        self.0
-    }
-
-    fn from_user_data(user_data: usize) -> Self {
-        VtIndex(user_data)
-    }
-}
-
-pub struct FdHandle {
-    pub vt_i: VtIndex,
-    pub flags: usize,
-    pub events: EventFlags,
-    pub notified_read: bool,
-}
-
-pub enum Handle {
-    Vt(FdHandle),
-    SchemeRoot,
-}
-
-pub struct FbconScheme {
-    pub vts: BTreeMap<VtIndex, TextScreen>,
-    pub handles: HandleMap<Handle>,
-}
-
-impl FbconScheme {
-    pub fn new(vt_ids: &[usize], event_queue: &mut EventQueue<VtIndex>) -> FbconScheme {
-        let mut vts = BTreeMap::new();
-
-        for &vt_i in vt_ids {
-            let display = Display::open_new_vt().expect("Failed to open display for vt");
-            event_queue
-                .subscribe(
-                    display.input_handle.event_handle().as_raw_fd() as usize,
-                    VtIndex(vt_i),
-                    event::EventFlags::READ,
-                )
-                .expect("Failed to subscribe to input events for vt");
-            vts.insert(VtIndex(vt_i), TextScreen::new(display));
-        }
-
-        FbconScheme {
-            vts,
-            handles: HandleMap::new(),
-        }
-    }
-
-    fn get_vt_handle_mut(&mut self, id: usize) -> Result<&mut FdHandle> {
-        match self.handles.get_mut(id)? {
-            Handle::Vt(handle) => Ok(handle),
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-        }
-    }
-}
-
-impl SchemeSync for FbconScheme {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path_str: &str,
-        flags: usize,
-        fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(self.handles.get(dirfd)?, Handle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-
-        let vt_i = VtIndex(path_str.parse::<usize>().map_err(|_| Error::new(ENOENT))?);
-        if self.vts.contains_key(&vt_i) {
-            let id = self.handles.insert(Handle::Vt(FdHandle {
-                vt_i,
-                flags: flags | fcntl_flags as usize,
-                events: EventFlags::empty(),
-                notified_read: false,
-            }));
-
-            Ok(OpenResult::ThisScheme {
-                number: id,
-                flags: NewFdFlags::empty(),
-            })
-        } else {
-            Err(Error::new(ENOENT))
-        }
-    }
-
-    fn fevent(
-        &mut self,
-        id: usize,
-        flags: syscall::EventFlags,
-        _ctx: &CallerCtx,
-    ) -> Result<syscall::EventFlags> {
-        let handle = self.get_vt_handle_mut(id)?;
-
-        handle.notified_read = false;
-        handle.events = flags;
-
-        Ok(syscall::EventFlags::empty())
-    }
-
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with_legacy(buf, "fbcon", |w| {
-            let handle = self.get_vt_handle_mut(id)?;
-            write!(w, "{}", handle.vt_i.0).unwrap();
-            Ok(())
-        })
-    }
-
-    fn fsync(&mut self, id: usize, _ctx: &CallerCtx) -> Result<()> {
-        let _handle = self.get_vt_handle_mut(id)?;
-        Ok(())
-    }
-
-    fn fcntl(&mut self, id: usize, _cmd: usize, _arg: usize, _ctx: &CallerCtx) -> Result<usize> {
-        self.handles.get(id)?;
-        Ok(0)
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = match self.handles.get(id)? {
-            Handle::Vt(handle) => Ok(handle),
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-        }?;
-
-        if let Some(screen) = self.vts.get_mut(&handle.vt_i) {
-            if !screen.can_read() {
-                if handle.flags & O_NONBLOCK != 0 {
-                    Err(Error::new(EAGAIN))
-                } else {
-                    Err(Error::new(EAGAIN))
-                }
-            } else {
-                screen.read(buf)
-            }
-        } else {
-            Err(Error::new(EBADF))
-        }
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let vt_i = self.get_vt_handle_mut(id)?.vt_i;
-
-        if let Some(console) = self.vts.get_mut(&vt_i) {
-            console.write(buf)
-        } else {
-            Err(Error::new(EBADF))
-        }
-    }
-
-    fn on_close(&mut self, id: usize) {
-        self.handles.remove(id);
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/fbcond/src/text.rs b/recipes/core/base/drivers/graphics/fbcond/src/text.rs
deleted file mode 100644
index 8a24bbebe6..0000000000
--- a/recipes/core/base/drivers/graphics/fbcond/src/text.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use std::collections::VecDeque;
-
-use orbclient::{Event, EventOption};
-use syscall::error::*;
-
-use crate::display::Display;
-
-pub struct TextScreen {
-    pub display: Display,
-    inner: console_draw::TextScreen,
-    ctrl: bool,
-    input: VecDeque<u8>,
-}
-
-impl TextScreen {
-    pub fn new(display: Display) -> TextScreen {
-        TextScreen {
-            display,
-            inner: console_draw::TextScreen::new(),
-            ctrl: false,
-            input: VecDeque::new(),
-        }
-    }
-
-    pub fn handle_handoff(&mut self) {
-        log::info!("fbcond: Performing handoff");
-        self.display.reopen_for_handoff();
-    }
-
-    pub fn input(&mut self, event: &Event) {
-        let mut buf = vec![];
-
-        match event.to_option() {
-            EventOption::Key(key_event) => {
-                if key_event.scancode == 0x1D {
-                    self.ctrl = key_event.pressed;
-                } else if key_event.pressed {
-                    match key_event.scancode {
-                        0x0E => {
-                            // Backspace
-                            buf.extend_from_slice(b"\x7F");
-                        }
-                        0x47 => {
-                            // Home
-                            buf.extend_from_slice(b"\x1B[H");
-                        }
-                        0x48 => {
-                            // Up
-                            buf.extend_from_slice(b"\x1B[A");
-                        }
-                        0x49 => {
-                            // Page up
-                            buf.extend_from_slice(b"\x1B[5~");
-                        }
-                        0x4B => {
-                            // Left
-                            buf.extend_from_slice(b"\x1B[D");
-                        }
-                        0x4D => {
-                            // Right
-                            buf.extend_from_slice(b"\x1B[C");
-                        }
-                        0x4F => {
-                            // End
-                            buf.extend_from_slice(b"\x1B[F");
-                        }
-                        0x50 => {
-                            // Down
-                            buf.extend_from_slice(b"\x1B[B");
-                        }
-                        0x51 => {
-                            // Page down
-                            buf.extend_from_slice(b"\x1B[6~");
-                        }
-                        0x52 => {
-                            // Insert
-                            buf.extend_from_slice(b"\x1B[2~");
-                        }
-                        0x53 => {
-                            // Delete
-                            buf.extend_from_slice(b"\x1B[3~");
-                        }
-                        _ => {
-                            let c = match key_event.character {
-                                c @ 'A'..='Z' if self.ctrl => ((c as u8 - b'A') + b'\x01') as char,
-                                c @ 'a'..='z' if self.ctrl => ((c as u8 - b'a') + b'\x01') as char,
-                                c => c,
-                            };
-
-                            if c != '\0' {
-                                let mut b = [0; 4];
-                                buf.extend_from_slice(c.encode_utf8(&mut b).as_bytes());
-                            }
-                        }
-                    }
-                }
-            }
-            _ => (), //TODO: Mouse in terminal
-        }
-
-        for &b in buf.iter() {
-            self.input.push_back(b);
-        }
-    }
-
-    pub fn can_read(&self) -> bool {
-        !self.input.is_empty()
-    }
-}
-
-impl TextScreen {
-    pub fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-        let mut i = 0;
-
-        while i < buf.len() && !self.input.is_empty() {
-            buf[i] = self.input.pop_front().unwrap();
-            i += 1;
-        }
-
-        Ok(i)
-    }
-
-    pub fn write(&mut self, buf: &[u8]) -> Result<usize> {
-        if let Some(map) = &mut self.display.map {
-            Display::handle_resize(map, &mut self.inner);
-
-            let damage = self.inner.write(map, buf, &mut self.input);
-
-            self.display.sync_rect(damage);
-        }
-
-        Ok(buf.len())
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/graphics-ipc/Cargo.toml b/recipes/core/base/drivers/graphics/graphics-ipc/Cargo.toml
deleted file mode 100644
index edeb40f80d..0000000000
--- a/recipes/core/base/drivers/graphics/graphics-ipc/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "graphics-ipc"
-description = "Shared graphics IPC code library"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-drm.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/graphics/graphics-ipc/src/lib.rs b/recipes/core/base/drivers/graphics/graphics-ipc/src/lib.rs
deleted file mode 100644
index 285b304372..0000000000
--- a/recipes/core/base/drivers/graphics/graphics-ipc/src/lib.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use std::fs::File;
-use std::os::fd::{AsFd, BorrowedFd};
-use std::{io, mem, ptr};
-
-use drm::buffer::Buffer;
-use drm::control::connector::{self, State};
-use drm::control::dumbbuffer::{DumbBuffer, DumbMapping};
-use drm::control::Device as _;
-use drm::{Device as _, DriverCapability};
-
-/// A graphics handle using the v2 graphics API.
-///
-/// The v2 graphics API allows creating framebuffers on the fly, using them for page flipping and
-/// handles all displays using a single fd. This is basically a subset of the Linux DRM interface
-/// with a couple of custom ioctls in the place of the KMS ioctls that are missing.
-pub struct V2GraphicsHandle {
-    file: File,
-}
-
-impl AsFd for V2GraphicsHandle {
-    fn as_fd(&self) -> BorrowedFd<'_> {
-        self.file.as_fd()
-    }
-}
-
-impl drm::Device for V2GraphicsHandle {}
-impl drm::control::Device for V2GraphicsHandle {}
-
-impl V2GraphicsHandle {
-    pub fn from_file(file: File) -> io::Result<Self> {
-        let handle = V2GraphicsHandle { file };
-        assert!(handle.get_driver_capability(DriverCapability::DumbBuffer)? == 1);
-        Ok(handle)
-    }
-
-    pub fn first_display(&self) -> io::Result<connector::Handle> {
-        for &connector in self.resource_handles().unwrap().connectors() {
-            if self.get_connector(connector, true)?.state() == State::Connected {
-                return Ok(connector);
-            }
-        }
-        Err(io::Error::other("no connected display"))
-    }
-}
-
-pub struct CpuBackedBuffer {
-    buffer: DumbBuffer,
-    map: DumbMapping<'static>,
-    shadow: Option<Box<[u8]>>,
-}
-
-impl CpuBackedBuffer {
-    pub fn new(
-        display_handle: &V2GraphicsHandle,
-        size: (u32, u32),
-        format: drm::buffer::DrmFourcc,
-        bpp: u32,
-    ) -> io::Result<CpuBackedBuffer> {
-        let mut buffer = display_handle.create_dumb_buffer(size, format, bpp)?;
-
-        let map = display_handle.map_dumb_buffer(&mut buffer)?;
-        let map = unsafe { mem::transmute::<DumbMapping<'_>, DumbMapping<'static>>(map) };
-
-        let shadow = if display_handle
-            .get_driver_capability(DriverCapability::DumbPreferShadow)
-            .unwrap_or(1)
-            == 0
-        {
-            None
-        } else {
-            Some(vec![0; map.len()].into_boxed_slice())
-        };
-
-        Ok(CpuBackedBuffer {
-            buffer,
-            map,
-            shadow,
-        })
-    }
-
-    pub fn buffer(&self) -> &DumbBuffer {
-        &self.buffer
-    }
-
-    pub fn has_shadow_buf(&self) -> bool {
-        self.shadow.is_some()
-    }
-
-    pub fn shadow_buf(&mut self) -> &mut [u8] {
-        self.shadow.as_deref_mut().unwrap_or(&mut *self.map)
-    }
-
-    pub fn sync_rect(&mut self, x: u32, y: u32, width: u32, height: u32) {
-        let Some(shadow) = &self.shadow else {
-            return; // No shadow buffer; all writes are already propagated to the GPU.
-        };
-
-        assert!(x.checked_add(width).unwrap() <= self.buffer.size().0);
-        assert!(y.checked_add(height).unwrap() <= self.buffer.size().1);
-
-        let start_x: usize = x.try_into().unwrap();
-        let start_y: usize = y.try_into().unwrap();
-        let w: usize = width.try_into().unwrap();
-        let h: usize = height.try_into().unwrap();
-
-        let offscreen_ptr = shadow.as_ptr().cast::<u32>();
-        let onscreen_ptr = self.map.as_mut_ptr().cast::<u32>();
-
-        for row in start_y..start_y + h {
-            unsafe {
-                ptr::copy_nonoverlapping(
-                    offscreen_ptr.add(row * self.buffer.pitch() as usize / 4 + start_x),
-                    onscreen_ptr.add(row * self.buffer.pitch() as usize / 4 + start_x),
-                    w,
-                );
-            }
-        }
-
-        // No need for a wbinvd to flush the write combining writes as they are
-        // already flushed on the next syscall anyway. And the user will need
-        // to do a DRM ioctl to actually present the changes on the display.
-    }
-
-    pub fn destroy(self, display_handle: &V2GraphicsHandle) -> io::Result<()> {
-        display_handle.destroy_dumb_buffer(self.buffer)
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/Cargo.toml b/recipes/core/base/drivers/graphics/ihdgd/Cargo.toml
deleted file mode 100644
index 25d04eac8b..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "ihdgd"
-description = "Intel graphics driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-bitbang-hal = "0.3"
-drm-sys.workspace = true
-edid.workspace = true #TODO: edid is abandoned, fork it and maintain?
-#TODO: waiting for bitbang-hal to update to embedded-hal 1.0
-embedded-hal = { version = "0.2.7", features = ["unproven"] }
-log.workspace = true
-nb = "1.0"
-# Patched to allow for exact range allocation
-range-alloc = { git = "https://github.com/jackpot51/range-alloc.git" }
-void = "1.0"
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-graphics = { path = "../driver-graphics" }
-pcid = { path = "../../pcid" }
-
-libredox.workspace = true
-redox-scheme.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/graphics/ihdgd/config.toml b/recipes/core/base/drivers/graphics/ihdgd/config.toml
deleted file mode 100644
index acbb4e7879..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/config.toml
+++ /dev/null
@@ -1,55 +0,0 @@
-[[drivers]]
-name = "Intel HD Graphics"
-class = 0x03
-ids = { 0x8086 = [
-    # Kaby Lake from Volume 4: Configurations in
-    # https://www.intel.com/content/www/us/en/docs/graphics-for-linux/developer-reference/1-0/kaby-lake.html
-    0x5912,
-    0x5916,
-    0x591B,
-    0x591E,
-    0x5926,
-    # Comet Lake from Volume 1: Configurations in
-    # https://www.intel.com/content/www/us/en/docs/graphics-for-linux/developer-reference/1-0/comet-lake.html
-    0x9B21,
-    0x9B41,
-    0x9BA4,
-    0x9BAA,
-    0x9BAC,
-    0x9BC4,
-    0x9BC5,
-    0x9BC6,
-    0x9BC8,
-    0x9BCA,
-    0x9BCC,
-    0x9BE6,
-    0x9BF6,
-    # Tiger Lake Mobile from Volume 4: Configurations in
-    # https://www.intel.com/content/www/us/en/docs/graphics-for-linux/developer-reference/1-0/tiger-lake.html
-    0x9A40,
-    0x9A49,
-    0x9A60,
-    0x9A68,
-    0x9A70,
-    0x9A78,
-    # Alchemist from Volume 4: Configurations in
-    # https://www.intel.com/content/www/us/en/docs/graphics-for-linux/developer-reference/1-0/alchemist-arctic-sound-m.html
-    0x5690, # A770M
-    0x5691, # A730M
-    0x5692, # A550M
-    0x5693, # A370M
-    0x5694, # A350M
-    0x5696, # A570M
-    0x5697, # A530M
-    0x56A0, # A770
-    0x56A1, # A750
-    0x56A5, # A380
-    0x56A6, # A310
-    0x56B0, # Pro A30M
-    0x56B1, # Pro A40/A50
-    0x56B2, # Pro A60M
-    0x56B3, # Pro A60
-    0x56C0, # GPU Flex 170
-    0x56C1, # GPU Flex 140
-] }
-command = ["ihdgd"]
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/aux.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/aux.rs
deleted file mode 100644
index 5a33f516d2..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/aux.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-use common::{io::Io, timeout::Timeout};
-use embedded_hal::blocking::i2c::{self, Operation, SevenBitAddress, Transactional};
-
-use super::ddi::*;
-
-pub struct Aux<'a> {
-    ddi: &'a mut Ddi,
-}
-
-impl<'a> Aux<'a> {
-    pub fn new(ddi: &'a mut Ddi) -> Self {
-        Self { ddi }
-    }
-}
-
-impl<'a> Transactional for Aux<'a> {
-    type Error = ();
-    fn exec(&mut self, addr7: SevenBitAddress, full_ops: &mut [Operation<'_>]) -> Result<(), ()> {
-        // Break ops into 16-byte chunks that will fit into aux data
-        let mut ops = Vec::new();
-        for op in full_ops.iter_mut() {
-            match op {
-                Operation::Read(buf) => {
-                    for chunk in buf.chunks_mut(16) {
-                        ops.push(Operation::Read(chunk));
-                    }
-                }
-                Operation::Write(buf) => {
-                    for chunk in buf.chunks(16) {
-                        ops.push(Operation::Write(chunk));
-                    }
-                }
-            }
-        }
-
-        let ops_len = ops.len();
-        for (i, op) in ops.iter_mut().enumerate() {
-            // Write header and data
-            let mut header = 0;
-            match op {
-                Operation::Read(_) => {
-                    header |= 1 << 4;
-                }
-                Operation::Write(_) => (),
-            }
-            if (i + 1) < ops_len {
-                // Middle of transaction
-                header |= 1 << 6;
-            }
-            let mut aux_datas = [0u8; 20];
-            let mut aux_data_i = 0;
-            aux_datas[aux_data_i] = header;
-            aux_data_i += 1;
-            //TODO: what is this byte?
-            aux_datas[aux_data_i] = 0;
-            aux_data_i += 1;
-            aux_datas[aux_data_i] = addr7;
-            aux_data_i += 1;
-            match op {
-                Operation::Read(buf) => {
-                    if !buf.is_empty() {
-                        aux_datas[aux_data_i] = (buf.len() - 1) as u8;
-                        aux_data_i += 1;
-                    }
-                }
-                Operation::Write(buf) => {
-                    if !buf.is_empty() {
-                        aux_datas[aux_data_i] = (buf.len() - 1) as u8;
-                        aux_data_i += 1;
-                        for b in buf.iter() {
-                            aux_datas[aux_data_i] = *b;
-                            aux_data_i += 1;
-                        }
-                    }
-                }
-            }
-
-            // Write data to registers (big endian, dword access only)
-            for (i, chunk) in aux_datas.chunks(4).enumerate() {
-                let mut bytes = [0; 4];
-                bytes[..chunk.len()].copy_from_slice(&chunk);
-                self.ddi.aux_datas[i].write(u32::from_be_bytes(bytes));
-            }
-
-            let mut v = self.ddi.aux_ctl.read();
-            // Set length
-            v &= !DDI_AUX_CTL_SIZE_MASK;
-            v |= (aux_data_i as u32) << DDI_AUX_CTL_SIZE_SHIFT;
-            // Set timeout
-            v &= !DDI_AUX_CTL_TIMEOUT_MASK;
-            v |= DDI_AUX_CTL_TIMEOUT_4000US;
-            // Set I/O select to legacy (cleared)
-            //TODO: TBT support?
-            v &= !DDI_AUX_CTL_IO_SELECT;
-            // Start transaction
-            v |= DDI_AUX_CTL_BUSY;
-            self.ddi.aux_ctl.write(v);
-
-            // Wait while busy
-            let timeout = Timeout::from_secs(1);
-            while self.ddi.aux_ctl.readf(DDI_AUX_CTL_BUSY) {
-                timeout.run().map_err(|()| {
-                    log::debug!(
-                        "AUX I2C transaction wait timeout 0x{:08X}",
-                        self.ddi.aux_ctl.read()
-                    );
-                    ()
-                })?;
-            }
-
-            // Read result
-            v = self.ddi.aux_ctl.read();
-            if (v & DDI_AUX_CTL_TIMEOUT_ERROR) != 0 {
-                log::debug!("AUX I2C transaction timeout error");
-                return Err(());
-            }
-            if (v & DDI_AUX_CTL_RECEIVE_ERROR) != 0 {
-                log::debug!("AUX I2C transaction receive error");
-                return Err(());
-            }
-            if (v & DDI_AUX_CTL_DONE) == 0 {
-                log::debug!("AUX I2C transaction done not set");
-                return Err(());
-            }
-
-            // Read data from registers (big endian, dword access only)
-            for (i, chunk) in aux_datas.chunks_mut(4).enumerate() {
-                let bytes = self.ddi.aux_datas[i].read().to_be_bytes();
-                chunk.copy_from_slice(&bytes[..chunk.len()]);
-            }
-
-            aux_data_i = 0;
-            let response = aux_datas[aux_data_i];
-            if response != 0 {
-                log::debug!("AUX I2C unexpected response {:02X}", response);
-                return Err(());
-            }
-            aux_data_i += 1;
-            match op {
-                Operation::Read(buf) => {
-                    if !buf.is_empty() {
-                        for b in buf.iter_mut() {
-                            *b = aux_datas[aux_data_i];
-                            aux_data_i += 1;
-                        }
-                    }
-                }
-                Operation::Write(_) => (),
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl<'a> i2c::WriteRead for Aux<'a> {
-    type Error = ();
-    fn write_read(
-        &mut self,
-        addr7: SevenBitAddress,
-        bytes: &[u8],
-        buffer: &mut [u8],
-    ) -> Result<(), ()> {
-        self.exec(
-            addr7,
-            &mut [Operation::Write(bytes), Operation::Read(buffer)],
-        )
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/bios.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/bios.rs
deleted file mode 100644
index cd19af07be..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/bios.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-use common::io::{Io, Mmio, ReadOnly};
-use std::mem;
-use syscall::error::{Error, Result, EIO};
-
-use super::MmioRegion;
-
-const MBOX_VBT: u32 = 1 << 3;
-
-fn read_bios_string(array: &[ReadOnly<Mmio<u8>>]) -> String {
-    let mut string = String::new();
-    for reg in array.iter() {
-        let b = reg.read();
-        if b == 0 {
-            break;
-        }
-        string.push(b as char);
-    }
-    string
-}
-
-#[repr(C, packed)]
-pub struct BiosHeader {
-    signature: [ReadOnly<Mmio<u8>>; 16],
-    size: ReadOnly<Mmio<u32>>,
-    struct_version: ReadOnly<Mmio<u32>>,
-    system_bios_version: [ReadOnly<Mmio<u8>>; 32],
-    video_bios_version: [ReadOnly<Mmio<u8>>; 16],
-    //TODO: should we write graphics driver version?
-    graphics_driver_version: [ReadOnly<Mmio<u8>>; 16],
-    mailboxes: ReadOnly<Mmio<u32>>,
-    driver_model: Mmio<u32>,
-    platform_config: ReadOnly<Mmio<u32>>,
-    gop_version: [ReadOnly<Mmio<u8>>; 32],
-}
-
-impl BiosHeader {
-    pub fn dump(&self) {
-        eprint!("  op region header");
-        eprint!(" signature {:?}", read_bios_string(&self.signature));
-        eprint!(" size {:08X}", self.size.read());
-        eprint!(" struct_version {:08X}", self.struct_version.read());
-        eprint!(
-            " system_bios_version {:?}",
-            read_bios_string(&self.system_bios_version)
-        );
-        eprint!(
-            " video_bios_version {:?}",
-            read_bios_string(&self.video_bios_version)
-        );
-        eprint!(
-            " graphics_driver_version {:?}",
-            read_bios_string(&self.graphics_driver_version)
-        );
-        eprint!(" mailboxes {:08X}", self.mailboxes.read());
-        eprint!(" driver_model {:08X}", self.driver_model.read());
-        eprint!(" platform_config {:08X}", self.platform_config.read());
-        eprint!(" gop_version {:?}", read_bios_string(&self.gop_version));
-        eprintln!();
-    }
-}
-
-#[repr(C, packed)]
-pub struct VbtHeader {
-    signature: [ReadOnly<Mmio<u8>>; 20],
-    version: Mmio<u16>,
-    header_size: Mmio<u16>,
-    vbt_size: Mmio<u16>,
-    vbt_checksum: Mmio<u8>,
-    _rsvd: Mmio<u8>,
-    bdb_offset: Mmio<u32>,
-    aim_offsets: [Mmio<u32>; 4],
-}
-
-impl VbtHeader {
-    pub fn dump(&self) {
-        eprint!("  VBT header");
-        eprint!(" signature {:?}", read_bios_string(&self.signature));
-        eprint!(" version {:04X}", self.version.read());
-        eprint!(" header_size {:04X}", self.header_size.read());
-        eprint!(" vbt_size {:04X}", self.vbt_size.read());
-        eprint!(" vbt_checksum {:02X}", self.vbt_checksum.read());
-        eprint!(" bdb_offset {:08X}", self.bdb_offset.read());
-        for (i, aim_offset) in self.aim_offsets.iter().enumerate() {
-            eprint!(" aim_offset{} {:08X}", i, aim_offset.read());
-        }
-        eprintln!();
-    }
-}
-
-#[repr(C, packed)]
-pub struct BdbHeader {
-    signature: [ReadOnly<Mmio<u8>>; 16],
-    version: Mmio<u16>,
-    header_size: Mmio<u16>,
-    bdb_size: Mmio<u16>,
-}
-
-impl BdbHeader {
-    pub fn dump(&self) {
-        eprint!("    BDB header");
-        eprint!(" signature {:?}", read_bios_string(&self.signature));
-        eprint!(" version {:04X}", self.version.read());
-        eprint!(" header_size {:04X}", self.header_size.read());
-        eprint!(" bdb_size {:04X}", self.bdb_size.read());
-        eprintln!();
-    }
-}
-
-#[repr(C, packed)]
-pub struct BdbBlock {
-    id: Mmio<u8>,
-    size: Mmio<u16>,
-}
-
-impl BdbBlock {
-    pub fn dump(&self) {
-        eprint!("    BDB block");
-        eprint!(" id {}", self.id.read());
-        eprint!(" size {}", self.size.read());
-        eprintln!();
-    }
-}
-
-#[repr(C, packed)]
-pub struct BdbGeneralDefinitions {
-    crt_ddc_gmbus_pin: Mmio<u8>,
-    dpms: Mmio<u8>,
-    boot_displays: [Mmio<u8>; 2],
-    child_dev_size: Mmio<u8>,
-}
-
-impl BdbGeneralDefinitions {
-    pub fn dump(&self) {
-        eprint!("      BDB general definitions");
-        eprint!(" crt_ddc_gmbus_pin {:02X}", self.crt_ddc_gmbus_pin.read());
-        eprint!(" dpms {:02X}", self.dpms.read());
-        for (i, boot_display) in self.boot_displays.iter().enumerate() {
-            eprint!(" boot_display{} {:02X}", i, boot_display.read());
-        }
-        eprint!(" child_dev_size {:02X}", self.child_dev_size.read());
-        eprintln!();
-    }
-}
-
-pub struct Bios {
-    region: MmioRegion,
-    header: &'static mut BiosHeader,
-}
-
-impl Bios {
-    pub fn new(region: MmioRegion) -> Result<Self> {
-        let header = unsafe { &mut *(region.virt as *mut BiosHeader) };
-        header.dump();
-
-        {
-            let sig = read_bios_string(&header.signature);
-            if sig != "IntelGraphicsMem" {
-                log::warn!("invalid op region signature {:?}", sig);
-                return Err(Error::new(EIO));
-            }
-        }
-
-        let size = (header.size.read() as usize) * 1024;
-        if size != region.size {
-            log::warn!("invalid op region size {}", size);
-            return Err(Error::new(EIO));
-        }
-
-        //TODO: other mailboxes?
-
-        if header.mailboxes.read() & MBOX_VBT == 0 {
-            log::warn!("op region does not support VBT mailbox");
-            return Err(Error::new(EIO));
-        }
-
-        //TODO: read VBT from mailbox 3 RVDA (0x3BA) and RVDS (0x3C2) if missing in mailbox 4
-        let vbt_addr = region.virt + 1024;
-        let vbt_header = unsafe { &*(vbt_addr as *const VbtHeader) };
-        vbt_header.dump();
-
-        //TODO: check vbt checksum
-        {
-            let sig = read_bios_string(&vbt_header.signature);
-            if !sig.starts_with("$VBT") {
-                log::warn!("invalid VBT signature {:?}", sig);
-                return Err(Error::new(EIO));
-            }
-        }
-
-        let bdb_addr = vbt_addr + (vbt_header.bdb_offset.read() as usize);
-        let bdb_header = unsafe { &*(bdb_addr as *const BdbHeader) };
-        bdb_header.dump();
-        {
-            let sig = read_bios_string(&bdb_header.signature);
-            if sig != "BIOS_DATA_BLOCK " {
-                log::warn!("invalid BDB signature {:?}", sig);
-                bdb_header.dump();
-                return Err(Error::new(EIO));
-            }
-        }
-
-        let mut block_addr = bdb_addr + bdb_header.header_size.read() as usize;
-        let block_end = bdb_addr + bdb_header.bdb_size.read() as usize;
-        while block_addr + mem::size_of::<BdbBlock>() <= block_end {
-            let block = unsafe { &*(block_addr as *const BdbBlock) };
-            //TODO: mipi sequence v3 has different size field
-            let id = block.id.read();
-            let size = block.size.read() as usize;
-            block_addr += mem::size_of::<BdbBlock>();
-            if block_addr + size <= block_end {
-                match id {
-                    2 => {
-                        if size >= mem::size_of::<BdbGeneralDefinitions>() {
-                            let gen_defs =
-                                unsafe { &*(block_addr as *const BdbGeneralDefinitions) };
-                            gen_defs.dump();
-                        } else {
-                            log::warn!("BDB general definitions too small");
-                            block.dump();
-                        }
-                    }
-                    _ => block.dump(),
-                }
-                block_addr += block.size.read() as usize;
-            } else {
-                log::warn!("truncated block id {} size {}", id, size);
-                break;
-            }
-        }
-
-        Ok(Self { region, header })
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/buffer.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/buffer.rs
deleted file mode 100644
index 4ffbc8937f..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/buffer.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use std::{ptr, slice};
-
-use crate::device::ggtt::GlobalGtt;
-use crate::device::MmioRegion;
-
-#[derive(Debug)]
-pub struct GpuBuffer {
-    pub virt: *mut u8,
-    pub gm_offset: u32,
-    pub size: u32,
-}
-
-impl GpuBuffer {
-    pub unsafe fn new(gm: &MmioRegion, gm_offset: u32, size: u32, clear: bool) -> Self {
-        let virt = ptr::with_exposed_provenance_mut::<u8>(gm.virt + gm_offset as usize);
-
-        if clear {
-            let onscreen = slice::from_raw_parts_mut(virt, size as usize);
-            onscreen.fill(0);
-        }
-
-        Self {
-            virt,
-            gm_offset,
-            size,
-        }
-    }
-
-    pub fn alloc(gm: &MmioRegion, ggtt: &mut GlobalGtt, size: u32) -> syscall::Result<Self> {
-        let gm_offset = ggtt.alloc_phys_mem(size)?;
-
-        Ok(unsafe { GpuBuffer::new(gm, gm_offset, size, true) })
-    }
-
-    pub fn alloc_dumb(
-        gm: &MmioRegion,
-        ggtt: &mut GlobalGtt,
-        width: u32,
-        height: u32,
-    ) -> syscall::Result<(Self, u32)> {
-        //TODO: documentation on this is not great
-        let stride = (width * 4).next_multiple_of(64);
-
-        Ok((GpuBuffer::alloc(gm, ggtt, stride * height)?, stride))
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/ddi.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/ddi.rs
deleted file mode 100644
index ac4ce1bd87..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/ddi.rs
+++ /dev/null
@@ -1,758 +0,0 @@
-use common::io::{Io, MmioPtr, WriteOnly};
-use common::timeout::Timeout;
-use embedded_hal::prelude::*;
-use std::sync::Arc;
-use syscall::error::{Error, Result, EIO};
-
-use crate::device::aux::Aux;
-use crate::device::power::PowerWells;
-use crate::device::{CallbackGuard, Gmbus};
-
-use super::{GpioPort, MmioRegion};
-
-// IHD-OS-TGL-Vol 2c-12.21 DDI_AUX_CTL
-pub const DDI_AUX_CTL_BUSY: u32 = 1 << 31;
-pub const DDI_AUX_CTL_DONE: u32 = 1 << 30;
-pub const DDI_AUX_CTL_TIMEOUT_ERROR: u32 = 1 << 28;
-pub const DDI_AUX_CTL_TIMEOUT_SHIFT: u32 = 26;
-pub const DDI_AUX_CTL_TIMEOUT_MASK: u32 = 0b11 << DDI_AUX_CTL_TIMEOUT_SHIFT;
-pub const DDI_AUX_CTL_TIMEOUT_4000US: u32 = 0b11 << DDI_AUX_CTL_TIMEOUT_SHIFT;
-pub const DDI_AUX_CTL_RECEIVE_ERROR: u32 = 1 << 25;
-pub const DDI_AUX_CTL_SIZE_SHIFT: u32 = 20;
-pub const DDI_AUX_CTL_SIZE_MASK: u32 = 0b11111 << 20;
-pub const DDI_AUX_CTL_IO_SELECT: u32 = 1 << 11;
-
-// IHD-OS-TGL-Vol 2c-12.21 DDI_BUF_CTL
-pub const DDI_BUF_CTL_ENABLE: u32 = 1 << 31;
-pub const DDI_BUF_CTL_IDLE: u32 = 1 << 7;
-
-// IHD-OS-TGL-Vol 2c-12.21 PORT_CL_DW5
-pub const PORT_CL_DW5_SUS_CLOCK_MASK: u32 = 0b11 << 0;
-
-// IHD-OS-TGL-Vol 2c-12.21 PORT_CL_DW10
-pub const PORT_CL_DW10_EDP4K2K_MODE_OVRD_EN: u32 = 1 << 3;
-pub const PORT_CL_DW10_EDP4K2K_MODE_OVRD_VAL: u32 = 1 << 2;
-
-// IHD-OS-TGL-Vol 2c-12.21 PORT_PCS_DW9
-pub const PORT_PCS_DW1_CMNKEEPER_ENABLE: u32 = 1 << 26;
-
-// IHD-OS-TGL-Vol 2c-12.21 PORT_TX_DW2
-pub const PORT_TX_DW2_SWING_SEL_UPPER_SHIFT: u32 = 15;
-pub const PORT_TX_DW2_SWING_SEL_UPPER_MASK: u32 = 1 << PORT_TX_DW2_SWING_SEL_UPPER_SHIFT;
-pub const PORT_TX_DW2_SWING_SEL_LOWER_SHIFT: u32 = 11;
-pub const PORT_TX_DW2_SWING_SEL_LOWER_MASK: u32 = 0b111 << PORT_TX_DW2_SWING_SEL_LOWER_SHIFT;
-pub const PORT_TX_DW2_RCOMP_SCALAR_SHIFT: u32 = 0;
-pub const PORT_TX_DW2_RCOMP_SCALAR_MASK: u32 = 0xFF << PORT_TX_DW2_RCOMP_SCALAR_SHIFT;
-
-// IHD-OS-TGL-Vol 2c-12.21 PORT_TX_DW4
-pub const PORT_TX_DW4_SELECT: u32 = 1 << 31;
-pub const PORT_TX_DW4_POST_CURSOR_1_SHIFT: u32 = 12;
-pub const PORT_TX_DW4_POST_CURSOR_1_MASK: u32 = 0b111111 << PORT_TX_DW4_POST_CURSOR_1_SHIFT;
-pub const PORT_TX_DW4_POST_CURSOR_2_SHIFT: u32 = 6;
-pub const PORT_TX_DW4_POST_CURSOR_2_MASK: u32 = 0b111111 << PORT_TX_DW4_POST_CURSOR_2_SHIFT;
-pub const PORT_TX_DW4_CURSOR_COEFF_SHIFT: u32 = 0;
-pub const PORT_TX_DW4_CURSOR_COEFF_MASK: u32 = 0b111111 << PORT_TX_DW4_CURSOR_COEFF_SHIFT;
-
-// IHD-OS-TGL-Vol 2c-12.21 PORT_TX_DW5
-pub const PORT_TX_DW5_TRAINING_ENABLE: u32 = 1 << 31;
-pub const PORT_TX_DW5_DISABLE_2_TAP_SHIFT: u32 = 29;
-pub const PORT_TX_DW5_DISABLE_2_TAP: u32 = 1 << PORT_TX_DW5_DISABLE_2_TAP_SHIFT;
-pub const PORT_TX_DW5_DISABLE_3_TAP: u32 = 1 << 29;
-pub const PORT_TX_DW5_CURSOR_PROGRAM: u32 = 1 << 26;
-pub const PORT_TX_DW5_COEFF_POLARITY: u32 = 1 << 25;
-pub const PORT_TX_DW5_SCALING_MODE_SEL_SHIFT: u32 = 18;
-pub const PORT_TX_DW5_SCALING_MODE_SEL_MASK: u32 = 0b111 << PORT_TX_DW5_SCALING_MODE_SEL_SHIFT;
-pub const PORT_TX_DW5_RTERM_SELECT_SHIFT: u32 = 3;
-pub const PORT_TX_DW5_RTERM_SELECT_MASK: u32 = 0b111 << PORT_TX_DW5_RTERM_SELECT_SHIFT;
-
-// IHD-OS-TGL-Vol 2c-12.21 PORT_TX_DW7
-pub const PORT_TX_DW7_N_SCALAR_SHIFT: u32 = 24;
-
-#[derive(Clone, Copy, Debug)]
-#[repr(usize)]
-pub enum PortClReg {
-    Dw5 = 0x14,
-    Dw10 = 0x28,
-    Dw12 = 0x30,
-    Dw15 = 0x3C,
-    Dw16 = 0x40,
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(usize)]
-pub enum PortCompReg {
-    Dw0 = 0x100,
-    Dw1 = 0x104,
-    Dw3 = 0x10C,
-    Dw8 = 0x120,
-    Dw9 = 0x124,
-    Dw10 = 0x128,
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(usize)]
-pub enum PortPcsReg {
-    Dw1 = 0x04,
-    Dw9 = 0x24,
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(usize)]
-pub enum PortTxReg {
-    Dw0 = 0x80,
-    Dw1 = 0x84,
-    Dw2 = 0x88,
-    Dw4 = 0x90,
-    Dw5 = 0x94,
-    Dw6 = 0x98,
-    Dw7 = 0x9C,
-    Dw8 = 0xA0,
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(usize)]
-pub enum PortLane {
-    Aux = 0x300,
-    Grp = 0x600,
-    Ln0 = 0x800,
-    Ln1 = 0x900,
-    Ln2 = 0xA00,
-    Ln3 = 0xB00,
-}
-
-pub struct Ddi {
-    pub name: &'static str,
-    pub index: usize,
-    pub gttmm: Arc<MmioRegion>,
-    pub port_base: Option<usize>,
-    pub aux_ctl: MmioPtr<u32>,
-    pub aux_datas: [MmioPtr<u32>; 5],
-    pub buf_ctl: MmioPtr<u32>,
-    pub dpclka_cfgcr0_clock_shift: Option<u32>,
-    pub dpclka_cfgcr0_clock_off: Option<u32>,
-    pub gmbus_pin_pair: Option<u8>,
-    pub gpio_port: Option<GpioPort>,
-    pub pwr_well_ctl_aux_request: u32,
-    pub pwr_well_ctl_aux_state: u32,
-    pub pwr_well_ctl_ddi_request: u32,
-    pub pwr_well_ctl_ddi_state: u32,
-    pub sde_interrupt_hotplug: Option<u32>,
-    pub transcoder_index: Option<u32>,
-}
-
-//TODO: verify offsets and count using DeviceKind?
-impl Ddi {
-    pub fn dump(&self) {
-        eprint!("Ddi {} {}", self.name, self.index);
-        eprint!(" buf_ctl {:08X}", self.buf_ctl.read());
-        let lanes = [PortLane::Ln0, PortLane::Ln1, PortLane::Ln2, PortLane::Ln3];
-        for reg in [
-            PortClReg::Dw5,
-            PortClReg::Dw10,
-            PortClReg::Dw12,
-            PortClReg::Dw15,
-            PortClReg::Dw16,
-        ] {
-            if let Some(mmio) = self.port_cl(reg) {
-                eprint!(" CL_{:?} {:08X}", reg, mmio.read());
-            }
-        }
-        for reg in [PortPcsReg::Dw1, PortPcsReg::Dw9] {
-            for lane in lanes {
-                if let Some(mmio) = self.port_pcs(reg, lane) {
-                    eprint!(" PCS_{:?}_{:?} {:08X}", reg, lane, mmio.read());
-                }
-            }
-        }
-        for reg in [
-            PortTxReg::Dw0,
-            PortTxReg::Dw1,
-            PortTxReg::Dw2,
-            PortTxReg::Dw4,
-            PortTxReg::Dw5,
-            PortTxReg::Dw6,
-            PortTxReg::Dw7,
-            PortTxReg::Dw8,
-        ] {
-            for lane in lanes {
-                if let Some(mmio) = self.port_tx(reg, lane) {
-                    eprint!(" TX_{:?}_{:?} {:08X}", reg, lane, mmio.read());
-                }
-            }
-        }
-        eprintln!();
-    }
-
-    fn port_reg(&self, offset: usize) -> Option<MmioPtr<u32>> {
-        //TODO: handle gttmm.mmio error?
-        unsafe { self.gttmm.mmio(self.port_base? + offset).ok() }
-    }
-
-    pub fn port_cl(&self, reg: PortClReg) -> Option<MmioPtr<u32>> {
-        self.port_reg(reg as usize)
-    }
-
-    pub fn port_comp(&self, reg: PortCompReg) -> Option<MmioPtr<u32>> {
-        self.port_reg(reg as usize)
-    }
-
-    //TODO: return WriteOnly if PortLane::Grp?
-    pub fn port_pcs(&self, reg: PortPcsReg, lane: PortLane) -> Option<MmioPtr<u32>> {
-        self.port_reg((reg as usize) + (lane as usize))
-    }
-
-    //TODO: return WriteOnly if PortLane::Grp?
-    pub fn port_tx(&self, reg: PortTxReg, lane: PortLane) -> Option<MmioPtr<u32>> {
-        self.port_reg((reg as usize) + (lane as usize))
-    }
-
-    pub fn probe_edid(
-        &mut self,
-        power_wells: &mut PowerWells,
-        gttmm: &MmioRegion,
-        gmbus: &mut Gmbus,
-    ) -> Result<Option<(&'static str, [u8; 128])>, Error> {
-        if let Some(port_comp_dw0) = self.port_comp(PortCompReg::Dw0) {
-            log::debug!("PORT_COMP_DW0_{}: {:08X}", self.name, port_comp_dw0.read());
-        }
-        let mut aux_read_edid = |ddi: &mut Ddi| -> Result<[u8; 128]> {
-            //TODO: BLOCK TCCOLD?
-
-            //TODO: the request can be shared by multiple DDIs
-            let pwr_well_ctl_aux_request = ddi.pwr_well_ctl_aux_request;
-            let pwr_well_ctl_aux_state = ddi.pwr_well_ctl_aux_state;
-            let mut pwr_well_ctl_aux = unsafe { MmioPtr::new(power_wells.ctl_aux.as_mut_ptr()) };
-            let _pwr_guard = CallbackGuard::new(
-                &mut pwr_well_ctl_aux,
-                |pwr_well_ctl_aux| {
-                    // Enable aux power
-                    pwr_well_ctl_aux.writef(pwr_well_ctl_aux_request, true);
-                    let timeout = Timeout::from_micros(1500);
-                    while !pwr_well_ctl_aux.readf(pwr_well_ctl_aux_state) {
-                        timeout.run().map_err(|()| {
-                            log::debug!("timeout while requesting DDI {} aux power", ddi.name);
-                            Error::new(EIO)
-                        })?;
-                    }
-                    Ok(())
-                },
-                |pwr_well_ctl_aux| {
-                    // Disable aux power
-                    pwr_well_ctl_aux.writef(pwr_well_ctl_aux_request, false);
-                },
-            )?;
-
-            let mut edid_data = [0; 128];
-            Aux::new(ddi)
-                .write_read(0x50, &[0x00], &mut edid_data)
-                .map_err(|_err| Error::new(EIO))?;
-
-            Ok(edid_data)
-        };
-        let mut gmbus_read_edid = |ddi: &mut Ddi| -> Result<[u8; 128]> {
-            let Some(pin_pair) = ddi.gmbus_pin_pair else {
-                return Err(Error::new(EIO));
-            };
-
-            let mut edid_data = [0; 128];
-            gmbus
-                .pin_pair(pin_pair)
-                .write_read(0x50, &[0x00], &mut edid_data)
-                .map_err(|_err| Error::new(EIO))?;
-
-            Ok(edid_data)
-        };
-        let gpio_read_edid = |ddi: &mut Ddi| -> Result<[u8; 128]> {
-            let Some(port) = &ddi.gpio_port else {
-                return Err(Error::new(EIO));
-            };
-
-            let mut edid_data = [0; 128];
-            unsafe { port.i2c(gttmm)? }
-                .write_read(0x50, &[0x00], &mut edid_data)
-                .map_err(|_err| Error::new(EIO))?;
-
-            Ok(edid_data)
-        };
-        match aux_read_edid(self) {
-            Ok(edid_data) => return Ok(Some(("AUX", edid_data))),
-            Err(err) => {
-                log::debug!("DDI {} failed to read EDID from AUX: {}", self.name, err);
-            }
-        }
-        match gmbus_read_edid(self) {
-            Ok(edid_data) => return Ok(Some(("GMBUS", edid_data))),
-            Err(err) => {
-                log::debug!("DDI {} failed to read EDID from GMBUS: {}", self.name, err);
-            }
-        }
-        match gpio_read_edid(self) {
-            Ok(edid_data) => return Ok(Some(("GPIO", edid_data))),
-            Err(err) => {
-                log::debug!("DDI {} failed to read EDID from GPIO: {}", self.name, err);
-            }
-        }
-        // Will try again but not fail the driver
-        Ok(None)
-    }
-
-    pub fn voltage_swing_hdmi(
-        &mut self,
-        gttmm: &MmioRegion,
-        timing: &edid::DetailedTiming,
-    ) -> Result<()> {
-        struct Setting {
-            dw2_swing_sel: u32,
-            dw7_n_scalar: u32,
-            dw4_cursor_coeff: u32,
-            dw4_post_cursor_1: u32,
-            dw5_2_tap_disable: u32,
-        }
-
-        impl Setting {
-            pub fn new(
-                dw2_swing_sel: u32,
-                dw7_n_scalar: u32,
-                dw4_cursor_coeff: u32,
-                dw4_post_cursor_1: u32,
-                dw5_2_tap_disable: u32,
-            ) -> Self {
-                Self {
-                    dw2_swing_sel,
-                    dw7_n_scalar,
-                    dw4_cursor_coeff,
-                    dw4_post_cursor_1,
-                    dw5_2_tap_disable,
-                }
-            }
-        }
-
-        // IHD-OS-TGL-Vol 12-1.22-Rev2.0 "Voltage Swing Programming"
-        let settings = vec![
-            // HDMI 450mV, 450mV, 0.0dB
-            Setting::new(0b1010, 0x60, 0x3F, 0x00, 0b0),
-            // HDMI 450mV, 650mV, 3.2dB
-            Setting::new(0b1011, 0x73, 0x36, 0x09, 0b0),
-            // HDMI 450mV, 850mV, 5.5dB
-            Setting::new(0b0110, 0x7F, 0x31, 0x0E, 0b0),
-            // HDMI 650mV, 650mV, 0.0dB
-            Setting::new(0b1011, 0x73, 0x3F, 0x00, 0b0),
-            // HDMI 650mV, 850mV, 2.3dB
-            Setting::new(0b0110, 0x7F, 0x37, 0x08, 0b0),
-            // HDMI 850mV, 850mV, 0.0dB
-            Setting::new(0b0110, 0x7F, 0x3F, 0x00, 0b0),
-            // HDMI 600mV, 850mV, 3.0dB
-            Setting::new(0b0110, 0x7F, 0x35, 0x0A, 0b0),
-        ];
-
-        // Last setting is the default
-        //TODO: get correct setting index from BIOS
-        let setting = settings.last().unwrap();
-
-        // This allows unwraps on port functions below without panic
-        if self.port_base.is_none() {
-            log::error!("HDMI voltage swing procedure only implemented on combo DDI");
-            return Err(Error::new(EIO));
-        };
-
-        // Clear cmnkeeper_enable for HDMI
-        {
-            // It is not possible to read from GRP register, so use LN0 as template
-            let pcs_dw1_ln0 = self.port_pcs(PortPcsReg::Dw1, PortLane::Ln0).unwrap();
-            let mut pcs_dw1_grp =
-                WriteOnly::new(self.port_pcs(PortPcsReg::Dw1, PortLane::Grp).unwrap());
-            let mut v = pcs_dw1_ln0.read();
-            v &= !PORT_PCS_DW1_CMNKEEPER_ENABLE;
-            pcs_dw1_grp.write(v);
-        }
-
-        // Program loadgen select
-        //TODO: this assumes bit rate <= 6 GHz and 4 lanes enabled
-        {
-            let mut tx_dw4_ln0 = self.port_tx(PortTxReg::Dw4, PortLane::Ln0).unwrap();
-            tx_dw4_ln0.writef(PORT_TX_DW4_SELECT, false);
-
-            let mut tx_dw4_ln1 = self.port_tx(PortTxReg::Dw4, PortLane::Ln1).unwrap();
-            tx_dw4_ln1.writef(PORT_TX_DW4_SELECT, true);
-
-            let mut tx_dw4_ln2 = self.port_tx(PortTxReg::Dw4, PortLane::Ln2).unwrap();
-            tx_dw4_ln2.writef(PORT_TX_DW4_SELECT, true);
-
-            let mut tx_dw4_ln3 = self.port_tx(PortTxReg::Dw4, PortLane::Ln3).unwrap();
-            tx_dw4_ln3.writef(PORT_TX_DW4_SELECT, true);
-        }
-
-        // Set PORT_CL_DW5 sus clock config to 11b
-        {
-            let mut cl_dw5 = self.port_cl(PortClReg::Dw5).unwrap();
-            cl_dw5.writef(PORT_CL_DW5_SUS_CLOCK_MASK, true);
-        }
-
-        // Clear training enable to change swing values
-        let tx_dw5_ln0 = self.port_tx(PortTxReg::Dw5, PortLane::Ln0).unwrap();
-        let mut tx_dw5_grp = WriteOnly::new(self.port_tx(PortTxReg::Dw5, PortLane::Grp).unwrap());
-        {
-            let mut v = tx_dw5_ln0.read();
-            v &= !PORT_TX_DW5_TRAINING_ENABLE;
-            tx_dw5_grp.write(v);
-        }
-
-        // Program swing and de-emphasis
-
-        // Disable eDP bits in PORT_CL_DW10
-        let mut cl_dw10 = self.port_cl(PortClReg::Dw10).unwrap();
-        cl_dw10.writef(
-            PORT_CL_DW10_EDP4K2K_MODE_OVRD_EN | PORT_CL_DW10_EDP4K2K_MODE_OVRD_VAL,
-            false,
-        );
-
-        // For PORT_TX_DW5:
-        // - Set 2 tap disable from settings
-        // - Set scaling mode sel to 010b
-        // - Set rterm select to 110b
-        // - Set 3 tap disable to 1
-        // - Set cursor program to 0
-        // - Set coeff polarity to 0
-        {
-            let mut v = tx_dw5_ln0.read();
-            v &= !(PORT_TX_DW5_DISABLE_2_TAP
-                | PORT_TX_DW5_CURSOR_PROGRAM
-                | PORT_TX_DW5_COEFF_POLARITY
-                | PORT_TX_DW5_SCALING_MODE_SEL_MASK
-                | PORT_TX_DW5_RTERM_SELECT_MASK);
-            v |= (setting.dw5_2_tap_disable << PORT_TX_DW5_DISABLE_2_TAP_SHIFT)
-                | PORT_TX_DW5_DISABLE_3_TAP
-                | (0b010 << PORT_TX_DW5_SCALING_MODE_SEL_SHIFT)
-                | (0b110 << PORT_TX_DW5_RTERM_SELECT_SHIFT);
-            tx_dw5_grp.write(v);
-        }
-
-        // Individual lane settings are used to avoid overwriting lane-specific settings, and because
-        // group registers cannot be read
-        let lanes = [PortLane::Ln0, PortLane::Ln1, PortLane::Ln2, PortLane::Ln3];
-
-        // For PORT_TX_DW2:
-        // - Set swing sel from settings
-        // - Set rcomp scalar to 0x98
-        for lane in lanes {
-            let mut tx_dw2 = self.port_tx(PortTxReg::Dw2, lane).unwrap();
-            let mut v = tx_dw2.read();
-            v &= !(PORT_TX_DW2_SWING_SEL_UPPER_MASK
-                | PORT_TX_DW2_SWING_SEL_LOWER_MASK
-                | PORT_TX_DW2_RCOMP_SCALAR_MASK);
-            v |= (((setting.dw2_swing_sel >> 3) & 1) << PORT_TX_DW2_SWING_SEL_UPPER_SHIFT)
-                | ((setting.dw2_swing_sel & 0b111) << PORT_TX_DW2_SWING_SEL_LOWER_SHIFT)
-                | (0x98 << PORT_TX_DW2_RCOMP_SCALAR_SHIFT);
-            tx_dw2.write(v);
-        }
-
-        // For PORT_TX_DW4:
-        // - Set post cursor 1 from settings
-        // - Set post cursor 2 to 0x0
-        // - Set cursor coeff from settings
-        for lane in lanes {
-            let mut tx_dw4 = self.port_tx(PortTxReg::Dw4, lane).unwrap();
-            let mut v = tx_dw4.read();
-            v &= !(PORT_TX_DW4_POST_CURSOR_1_MASK
-                | PORT_TX_DW4_POST_CURSOR_2_MASK
-                | PORT_TX_DW4_CURSOR_COEFF_MASK);
-            v |= (setting.dw4_post_cursor_1 << PORT_TX_DW4_POST_CURSOR_1_SHIFT)
-                | (setting.dw4_cursor_coeff << PORT_TX_DW4_CURSOR_COEFF_SHIFT);
-            tx_dw4.write(v);
-        }
-
-        // For PORT_TX_DW7:
-        // - Set n scalar from settings
-        for lane in lanes {
-            let mut tx_dw7 = self.port_tx(PortTxReg::Dw7, lane).unwrap();
-            // All other bits are spare
-            tx_dw7.write(setting.dw7_n_scalar << PORT_TX_DW7_N_SCALAR_SHIFT);
-        }
-
-        // Set training enable to trigger update
-        {
-            let mut v = tx_dw5_ln0.read();
-            v |= PORT_TX_DW5_TRAINING_ENABLE;
-            tx_dw5_grp.write(v);
-        }
-
-        Ok(())
-    }
-
-    pub fn kabylake(gttmm: &Arc<MmioRegion>) -> Result<Vec<Self>> {
-        let mut ddis = Vec::new();
-        for (i, name) in [
-            "A", "B", "C", "D",
-            //TODO: missing AUX regs? "E",
-        ]
-        .iter()
-        .enumerate()
-        {
-            ddis.push(Self {
-                name,
-                index: i,
-                port_base: None, //TODO: port regs
-                gttmm: gttmm.clone(),
-                // IHD-OS-KBL-Vol 2c-1.17 DDI_AUX_CTL
-                aux_ctl: unsafe { gttmm.mmio(0x64010 + i * 0x100)? },
-                // IHD-OS-KBL-Vol 2c-1.17 DDI_AUX_DATA
-                aux_datas: [
-                    unsafe { gttmm.mmio(0x64014 + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x64018 + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x6401C + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x64020 + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x64024 + i * 0x100)? },
-                ],
-                // IHD-OS-KBL-Vol 2c-1.17 DDI_BUF_CTL
-                buf_ctl: unsafe { gttmm.mmio(0x64000 + i * 0x100)? },
-                // N/A
-                dpclka_cfgcr0_clock_shift: None,
-                dpclka_cfgcr0_clock_off: None,
-                // IHD-OS-KBL-Vol 2c-1.17 GMBUS0
-                gmbus_pin_pair: match *name {
-                    "B" => Some(0b101),
-                    "C" => Some(0b100),
-                    "D" => Some(0b110),
-                    _ => None,
-                },
-                // IHD-OS-KBL-Vol 12-1.17 GMBUS and GPIO
-                gpio_port: match *name {
-                    "B" => Some(GpioPort::Port4),
-                    "C" => Some(GpioPort::Port3),
-                    "D" => Some(GpioPort::Port5),
-                    _ => None,
-                },
-                // IHD-OS-KBL-Vol 2c-1.17 PWR_WELL_CTL
-                // All auxes go through the same Misc IO request
-                pwr_well_ctl_aux_request: 1 << 1,
-                pwr_well_ctl_aux_state: 1 << 0,
-                pwr_well_ctl_ddi_request: match *name {
-                    "A" | "E" => 1 << 3,
-                    "B" => 1 << 5,
-                    "C" => 1 << 7,
-                    "D" => 1 << 9,
-                    _ => unreachable!(),
-                },
-                pwr_well_ctl_ddi_state: match *name {
-                    "A" | "E" => 1 << 2,
-                    "B" => 1 << 4,
-                    "C" => 1 << 6,
-                    "D" => 1 << 8,
-                    _ => unreachable!(),
-                },
-                // IHD-OS-KBL-Vol 2c-1.17 SDE_INTERRUPT
-                sde_interrupt_hotplug: match *name {
-                    "A" => Some(1 << 24),
-                    "B" => Some(1 << 21),
-                    "C" => Some(1 << 22),
-                    "D" => Some(1 << 23),
-                    "E" => Some(1 << 25),
-                    _ => None,
-                },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_CLK_SEL
-                transcoder_index: match *name {
-                    "B" => Some(0b010),
-                    "C" => Some(0b011),
-                    "D" => Some(0b100),
-                    "E" => Some(0b101),
-                    _ => None,
-                },
-            });
-        }
-        Ok(ddis)
-    }
-
-    pub fn tigerlake(gttmm: &Arc<MmioRegion>) -> Result<Vec<Self>> {
-        let mut ddis = Vec::new();
-        for (i, name) in [
-            "A", "B", "C", "USBC1", "USBC2", "USBC3", "USBC4", "USBC5", "USBC6",
-        ]
-        .iter()
-        .enumerate()
-        {
-            let port_base = match i {
-                0 => Some(0x162000),
-                1 => Some(0x6C000),
-                2 => Some(0x160000),
-                _ => None,
-            };
-            ddis.push(Self {
-                name,
-                index: i,
-                port_base,
-                gttmm: gttmm.clone(),
-                // IHD-OS-TGL-Vol 2c-12.21 DDI_AUX_CTL
-                aux_ctl: unsafe { gttmm.mmio(0x64010 + i * 0x100)? },
-                // IHD-OS-TGL-Vol 2c-12.21 DDI_AUX_DATA
-                aux_datas: [
-                    unsafe { gttmm.mmio(0x64014 + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x64018 + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x6401C + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x64020 + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x64024 + i * 0x100)? },
-                ],
-                // IHD-OS-TGL-Vol 2c-12.21 DDI_BUF_CTL
-                buf_ctl: unsafe { gttmm.mmio(0x64000 + i * 0x100)? },
-                // IHD-OS-TGL-Vol 2c-12.21 DPCLKA_CFGCR0
-                dpclka_cfgcr0_clock_shift: match i {
-                    0 => Some(0),
-                    1 => Some(2),
-                    2 => Some(4),
-                    _ => None,
-                },
-                dpclka_cfgcr0_clock_off: match i {
-                    // DDI
-                    0 => Some(1 << 10),
-                    1 => Some(1 << 11),
-                    2 => Some(1 << 24),
-                    // Type C
-                    3 => Some(1 << 12),
-                    4 => Some(1 << 13),
-                    5 => Some(1 << 14),
-                    6 => Some(1 << 21),
-                    7 => Some(1 << 22),
-                    8 => Some(1 << 23),
-                    _ => None,
-                },
-                //TODO: link to docs
-                gmbus_pin_pair: match i {
-                    // DDI pins
-                    0 => Some(1),
-                    1 => Some(2),
-                    2 => Some(3),
-                    // Type C pins
-                    3 => Some(9),
-                    4 => Some(10),
-                    5 => Some(11),
-                    6 => Some(12),
-                    7 => Some(13),
-                    8 => Some(14),
-                    _ => None,
-                },
-                // IHD-OS-TGL-Vol 12-1.22-Rev2.0 GMBUS and GPIO
-                gpio_port: match *name {
-                    "A" => Some(GpioPort::Port1),
-                    "B" => Some(GpioPort::Port2),
-                    "C" => Some(GpioPort::Port3),
-                    "USBC1" => Some(GpioPort::Port9),
-                    "USBC2" => Some(GpioPort::Port10),
-                    "USBC3" => Some(GpioPort::Port11),
-                    "USBC4" => Some(GpioPort::Port12),
-                    "USBC5" => Some(GpioPort::Port13),
-                    "USBC6" => Some(GpioPort::Port14),
-                    _ => None,
-                },
-                // IHD-OS-TGL-Vol 2c-12.21 PWR_WELL_CTL_AUX
-                pwr_well_ctl_aux_request: 2 << (i * 2),
-                pwr_well_ctl_aux_state: 1 << (i * 2),
-                // IHD-OS-TGL-Vol 2c-12.21 PWR_WELL_CTL_DDI
-                pwr_well_ctl_ddi_request: 2 << (i * 2),
-                pwr_well_ctl_ddi_state: 1 << (i * 2),
-                // IHD-OS-TGL-Vol 2c-12.21 SDE_INTERRUPT
-                sde_interrupt_hotplug: match i {
-                    0 => Some(1 << 16),
-                    1 => Some(1 << 17),
-                    2 => Some(1 << 18),
-                    _ => None,
-                },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_CLK_SEL
-                transcoder_index: Some((i + 1) as u32),
-            })
-        }
-        Ok(ddis)
-    }
-
-    pub fn alchemist(gttmm: &Arc<MmioRegion>) -> Result<Vec<Self>> {
-        let mut ddis = Vec::new();
-        for (i, name) in ["A", "B", "C", "USBC1", "USBC2", "USBC3", "USBC4", "D", "E"]
-            .iter()
-            .enumerate()
-        {
-            let port_base = match i {
-                0 => Some(0x162000),
-                1 => Some(0x6C000),
-                2 => Some(0x160000),
-                _ => None,
-            };
-            ddis.push(Self {
-                name,
-                index: i,
-                port_base,
-                gttmm: gttmm.clone(),
-                // IHD-OS-ACM-Vol 2c-3.23 DDI_AUX_CTL
-                aux_ctl: unsafe { gttmm.mmio(0x64010 + i * 0x100)? },
-                // IHD-OS-ACM-Vol 2c-3.23 DDI_AUX_DATA
-                aux_datas: [
-                    unsafe { gttmm.mmio(0x64014 + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x64018 + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x6401C + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x64020 + i * 0x100)? },
-                    unsafe { gttmm.mmio(0x64024 + i * 0x100)? },
-                ],
-                // IHD-OS-ACM-Vol 2c-3.23 DDI_BUF_CTL
-                buf_ctl: unsafe { gttmm.mmio(0x64000 + i * 0x100)? },
-                // IHD-OS-ACM-Vol 2c-3.23 DPCLKA_CFGCR0
-                dpclka_cfgcr0_clock_shift: match i {
-                    0 => Some(0),
-                    1 => Some(2),
-                    2 => Some(4),
-                    _ => None,
-                },
-                dpclka_cfgcr0_clock_off: match i {
-                    // DDI
-                    0 => Some(1 << 10),
-                    1 => Some(1 << 11),
-                    2 => Some(1 << 24),
-                    // Type C
-                    3 => Some(1 << 12),
-                    4 => Some(1 << 13),
-                    5 => Some(1 << 14),
-                    6 => Some(1 << 21),
-                    7 => Some(1 << 22),
-                    8 => Some(1 << 23),
-                    _ => None,
-                },
-                //TODO: link to docs
-                gmbus_pin_pair: match i {
-                    // DDI pins
-                    0 => Some(1),
-                    1 => Some(2),
-                    2 => Some(3),
-                    // Type C pins
-                    3 => Some(9),
-                    4 => Some(10),
-                    5 => Some(11),
-                    6 => Some(12),
-                    7 => Some(13),
-                    8 => Some(14),
-                    _ => None,
-                },
-                // IHD-OS-ACM-Vol 12-3.23 GMBUS and GPIO
-                gpio_port: match *name {
-                    "A" => Some(GpioPort::Port1),
-                    "B" => Some(GpioPort::Port2),
-                    "C" => Some(GpioPort::Port3),
-                    "D" => Some(GpioPort::Port4),
-                    "USBC1" => Some(GpioPort::Port9),
-                    _ => None,
-                },
-                // IHD-OS-ACM-Vol 2c-3.23 PWR_WELL_CTL_AUX
-                pwr_well_ctl_aux_request: 2 << (i * 2),
-                pwr_well_ctl_aux_state: 1 << (i * 2),
-                // IHD-OS-ACM-Vol 2c-3.23 PWR_WELL_CTL_DDI
-                pwr_well_ctl_ddi_request: 2 << (i * 2),
-                pwr_well_ctl_ddi_state: 1 << (i * 2),
-                // IHD-OS-ACM-Vol 2c-3.23 SDE_INTERRUPT
-                sde_interrupt_hotplug: match i {
-                    0 => Some(1 << 16),
-                    1 => Some(1 << 17),
-                    2 => Some(1 << 18),
-                    _ => None,
-                },
-                // IHD-OS-ACM-Vol 2c-3.23 TRANS_CLK_SEL
-                transcoder_index: Some((i + 1) as u32),
-            })
-        }
-        Ok(ddis)
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/dpll.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/dpll.rs
deleted file mode 100644
index 1e4dfdf681..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/dpll.rs
+++ /dev/null
@@ -1,197 +0,0 @@
-use common::io::{Io, MmioPtr};
-use syscall::error::{Error, Result, EIO};
-
-use super::MmioRegion;
-
-pub const DPLL_CFGCR1_QDIV_RATIO_SHIFT: u32 = 10;
-pub const DPLL_CFGCR1_QDIV_RATIO_MASK: u32 = 0xFF << DPLL_CFGCR1_QDIV_RATIO_SHIFT;
-pub const DPLL_CFGCR1_QDIV_MODE: u32 = 1 << 9;
-pub const DPLL_CFGCR1_KDIV_1: u32 = 0b001 << 6;
-pub const DPLL_CFGCR1_KDIV_2: u32 = 0b010 << 6;
-pub const DPLL_CFGCR1_KDIV_3: u32 = 0b100 << 6;
-pub const DPLL_CFGCR1_KDIV_MASK: u32 = 0b111 << 6;
-pub const DPLL_CFGCR1_PDIV_2: u32 = 0b0001 << 2;
-pub const DPLL_CFGCR1_PDIV_3: u32 = 0b0010 << 2;
-pub const DPLL_CFGCR1_PDIV_5: u32 = 0b0100 << 2;
-pub const DPLL_CFGCR1_PDIV_7: u32 = 0b1000 << 2;
-pub const DPLL_CFGCR1_PDIV_MASK: u32 = 0b1111 << 2;
-
-pub const DPLL_ENABLE_ENABLE: u32 = 1 << 31;
-pub const DPLL_ENABLE_LOCK: u32 = 1 << 30;
-pub const DPLL_ENABLE_POWER_ENABLE: u32 = 1 << 27;
-pub const DPLL_ENABLE_POWER_STATE: u32 = 1 << 26;
-
-pub const DPLL_SSC_ENABLE: u32 = 1 << 9;
-
-pub struct Dpll {
-    pub name: &'static str,
-    // IHD-OS-TGL-Vol 2c-12.21 DPLL_CFGCR0
-    pub cfgcr0: MmioPtr<u32>,
-    // IHD-OS-TGL-Vol 2c-12.21 DPLL_CFGCR1
-    pub cfgcr1: MmioPtr<u32>,
-    // IHD-OS-TGL-Vol 2c-12.21 DPLL_DIV0
-    pub div0: MmioPtr<u32>,
-    // IHD-OS-TGL-Vol 2c-12.21 DPCLKA_CFGCR0
-    pub dpclka_cfgcr0_clock_value: u32,
-    // IHD-OS-TGL-Vol 2c-12.21 DPLL_ENABLE
-    pub enable: MmioPtr<u32>,
-    // IHD-OS-TGL-Vol 2c-12.21 DPLL_SSC
-    pub ssc: MmioPtr<u32>,
-}
-
-//TODO: verify offsets and count using DeviceKind?
-impl Dpll {
-    pub fn dump(&self) {
-        eprint!("Dpll {}", self.name);
-        eprint!(" cfgcr0 {:08X}", self.cfgcr0.read());
-        eprint!(" cfgcr1 {:08X}", self.cfgcr1.read());
-        eprint!(" div0 {:08X}", self.div0.read());
-        eprint!(" enable {:08X}", self.enable.read());
-        eprint!(" ssc {:08X}", self.ssc.read());
-        eprintln!();
-    }
-
-    pub fn set_freq_hdmi(
-        &mut self,
-        mut ref_freq: u64,
-        timing: &edid::DetailedTiming,
-    ) -> Result<()> {
-        // IHD-OS-TGL-Vol 12-1.22-Rev2.0 "Formula for HDMI Mode DPLL Programming"
-        const KHz: u64 = 1_000;
-        const MHz: u64 = KHz * 1_000;
-        let dco_min: u64 = 7_998 * MHz;
-        let dco_mid: u64 = 8_999 * MHz;
-        let dco_max: u64 = 10_000 * MHz;
-
-        // If reference frequency is 38.4, use 19.2 because the DPLL automatically divides that by 2.
-        if ref_freq == 38_400_000 {
-            ref_freq /= 2;
-        }
-
-        //TODO: this symbol frequency is only valid for RGB 8 bits per color
-        let symbol_freq = (timing.pixel_clock as u64) * KHz;
-        let pll_freq = symbol_freq * 5;
-
-        #[derive(Debug)]
-        struct Setting {
-            pdiv: u64,
-            kdiv: u64,
-            qdiv: u64,
-            cfgcr1: u32,
-            dco: u64,
-            dco_dist: u64,
-        }
-
-        let mut best_setting: Option<Setting> = None;
-        for (pdiv, pdiv_reg) in [
-            (2, DPLL_CFGCR1_PDIV_2),
-            (3, DPLL_CFGCR1_PDIV_3),
-            (5, DPLL_CFGCR1_PDIV_5),
-            (7, DPLL_CFGCR1_PDIV_7),
-        ] {
-            for (kdiv, kdiv_reg) in [
-                (1, DPLL_CFGCR1_KDIV_1),
-                (2, DPLL_CFGCR1_KDIV_2),
-                (3, DPLL_CFGCR1_KDIV_3),
-            ] {
-                let qdiv_range = if kdiv == 2 { 1..=0xFF } else { 1..=1 };
-                for qdiv in qdiv_range {
-                    let qdiv_reg = if qdiv == 1 {
-                        0
-                    } else {
-                        ((qdiv as u32) << DPLL_CFGCR1_QDIV_RATIO_SHIFT) | DPLL_CFGCR1_QDIV_MODE
-                    };
-
-                    let dco = pll_freq * pdiv * kdiv * qdiv;
-                    if dco <= dco_min || dco >= dco_max {
-                        // DCO outside of valid range
-                        continue;
-                    }
-
-                    let dco_dist = dco.abs_diff(dco_mid);
-
-                    let setting = Setting {
-                        pdiv,
-                        kdiv,
-                        qdiv,
-                        cfgcr1: pdiv_reg | kdiv_reg | qdiv_reg,
-                        dco,
-                        dco_dist,
-                    };
-
-                    best_setting = match best_setting.take() {
-                        Some(other) if other.dco_dist < setting.dco_dist => Some(other),
-                        _ => Some(setting),
-                    };
-                }
-            }
-        }
-
-        let Some(setting) = best_setting else {
-            log::error!("failed to find valid DPLL setting");
-            return Err(Error::new(EIO));
-        };
-
-        eprintln!("{:?}", setting);
-
-        // Configure DPLL_CFGCR0 to set DCO frequency
-        {
-            let dco_int = setting.dco / ref_freq;
-            let dco_fract = ((setting.dco - (dco_int * ref_freq)) << 15) / ref_freq;
-            self.cfgcr0
-                .write(((dco_fract as u32) << 10) | (dco_int as u32));
-        }
-
-        // Configure DPLL_CFGCR1 to set the dividers
-        {
-            let mut v = self.cfgcr1.read();
-            let mask = DPLL_CFGCR1_QDIV_RATIO_MASK
-                | DPLL_CFGCR1_QDIV_MODE
-                | DPLL_CFGCR1_KDIV_MASK
-                | DPLL_CFGCR1_PDIV_MASK;
-            v &= !mask;
-            v |= setting.cfgcr1 & mask;
-            self.cfgcr1.write(v);
-        }
-
-        // Read back DPLL_CFGCR0 and DPLL_CFGCR1 to ensure writes are complete
-        let _ = self.cfgcr0.read();
-        let _ = self.cfgcr1.read();
-
-        Ok(())
-    }
-
-    pub fn tigerlake(gttmm: &MmioRegion) -> Result<Vec<Self>> {
-        let mut dplls = Vec::new();
-        dplls.push(Self {
-            name: "0",
-            cfgcr0: unsafe { gttmm.mmio(0x164284)? },
-            cfgcr1: unsafe { gttmm.mmio(0x164288)? },
-            div0: unsafe { gttmm.mmio(0x164B00)? },
-            dpclka_cfgcr0_clock_value: 0b00,
-            enable: unsafe { gttmm.mmio(0x46010)? },
-            ssc: unsafe { gttmm.mmio(0x164B10)? },
-        });
-        dplls.push(Self {
-            name: "1",
-            cfgcr0: unsafe { gttmm.mmio(0x16428C)? },
-            cfgcr1: unsafe { gttmm.mmio(0x164290)? },
-            div0: unsafe { gttmm.mmio(0x164C00)? },
-            dpclka_cfgcr0_clock_value: 0b01,
-            enable: unsafe { gttmm.mmio(0x46014)? },
-            ssc: unsafe { gttmm.mmio(0x164C10)? },
-        });
-        /*TODO: not present on U-class CPUs
-        dplls.push(Self {
-            name: "4",
-            cfgcr0: unsafe { gttmm.mmio(0x164294)? },
-            cfgcr1: unsafe { gttmm.mmio(0x164298)? },
-            div0: unsafe { gttmm.mmio(0x164E00)? },
-            dpclka_cfgcr0_clock_value: 0b10,
-            enable: unsafe { gttmm.mmio(0x46018)? },
-            ssc: unsafe { gttmm.mmio(0x164E10)? },
-        });
-        */
-        Ok(dplls)
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/ggtt.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/ggtt.rs
deleted file mode 100644
index 5e39827aa6..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/ggtt.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use std::sync::Arc;
-use std::{mem, ptr};
-
-use pcid_interface::PciFunctionHandle;
-use range_alloc::RangeAllocator;
-use syscall::{Error, EIO};
-
-use crate::device::MmioRegion;
-
-/// Global Graphics Translation Table (global GTT)
-///
-/// The global GTT is a page table used by all parts of the GPU that don't use
-/// the PPGTT (Per-Process GTT). This includes the display engine and the GM
-/// aperture that the CPU can access.
-///
-/// The global GTT is located in the GTTMM BAR at offset 8MiB, is up to 8MiB big
-/// and consists of 64bit entries. Each entry has a present bit as LSB and the
-/// address of the frame at bits 12 through 38. The rest of the bits are ignored.
-///
-/// Source: Pages 6 and 75 of intel-gfx-prm-osrc-kbl-vol05-memory_views.pdf
-pub struct GlobalGtt {
-    gttmm: Arc<MmioRegion>,
-    /// Base the GTT
-    gtt_base: *mut u64,
-    /// Size of the GTT
-    gtt_size: usize,
-
-    /// Allocator for GM aperture pages
-    gm_alloc: RangeAllocator<u32>,
-
-    // FIXME reuse DSM memory for something useful
-    /// Base Data of Stolen Memory (DSM)
-    base_dsm: *mut (),
-    /// Size of DSM
-    size_data_stolen_memory: usize,
-}
-
-const GTT_PAGE_SIZE: u32 = 4096;
-
-impl GlobalGtt {
-    pub unsafe fn new(
-        pcid_handle: &mut PciFunctionHandle,
-        gttmm: Arc<MmioRegion>,
-        gm_size: u32,
-    ) -> Self {
-        let gtt_offset = 8 * 1024 * 1024;
-        let gtt_base = ptr::with_exposed_provenance_mut(gttmm.virt + gtt_offset);
-
-        let base_dsm = unsafe { pcid_handle.read_config(0x5C) };
-        let ggc = unsafe { pcid_handle.read_config(0x50) };
-
-        let dsm_size = match (ggc >> 8) & 0xFF {
-            size if size & 0xF0 == 0 => size * 32 * 1024 * 1024,
-            size => (size & !0xF0) * 4 * 1024 * 1024,
-        } as usize;
-        let gtt_size = match (ggc >> 6) & 0x3 {
-            0 => 0,
-            1 => 2 * 1024 * 1024,
-            2 => 4 * 1024 * 1024,
-            3 => 8 * 1024 * 1024,
-            _ => unreachable!(),
-        } as usize;
-
-        log::info!("Base DSM: {:X}", base_dsm);
-        log::info!(
-            "GGC: {:X} => global GTT size: {}MiB; DSM size: {}MiB",
-            ggc,
-            gtt_size / 1024 / 1024,
-            dsm_size / 1024 / 1024,
-        );
-
-        let gm_alloc = RangeAllocator::new(0..gm_size / 4096);
-
-        GlobalGtt {
-            gttmm,
-            gtt_base,
-            gtt_size,
-            gm_alloc,
-            base_dsm: core::ptr::with_exposed_provenance_mut(base_dsm as usize),
-            size_data_stolen_memory: dsm_size,
-        }
-    }
-
-    /// Reset the global GTT by clearing out all existing mappings.
-    pub unsafe fn reset(&mut self) {
-        for i in 0..self.gtt_size / 8 {
-            unsafe { *self.gtt_base.add(i) = 0 };
-        }
-    }
-
-    pub fn reserve(&mut self, surf: u32, surf_size: u32) {
-        assert!(surf.is_multiple_of(GTT_PAGE_SIZE));
-        assert!(surf_size.is_multiple_of(GTT_PAGE_SIZE));
-
-        self.gm_alloc
-            .allocate_exact_range(
-                surf / GTT_PAGE_SIZE..surf / GTT_PAGE_SIZE + surf_size / GTT_PAGE_SIZE,
-            )
-            .unwrap_or_else(|err| {
-                panic!(
-                    "failed to allocate pre-existing surface at 0x{:x} of size {}: {:?}",
-                    surf, surf_size, err
-                );
-            });
-    }
-
-    pub fn alloc_phys_mem(&mut self, size: u32) -> syscall::Result<u32> {
-        let size = size.next_multiple_of(GTT_PAGE_SIZE);
-
-        let sgl = common::sgl::Sgl::new(size as usize)?;
-
-        let range = self
-            .gm_alloc
-            .allocate_range(size / GTT_PAGE_SIZE)
-            .map_err(|err| {
-                log::warn!("failed to allocate buffer of size {}: {:?}", size, err);
-                Error::new(EIO)
-            })?;
-
-        for chunk in sgl.chunks() {
-            for i in 0..chunk.length / GTT_PAGE_SIZE as usize {
-                unsafe {
-                    *self
-                        .gtt_base
-                        .add(range.start as usize + chunk.offset / GTT_PAGE_SIZE as usize + i) =
-                        chunk.phys as u64 + i as u64 * u64::from(GTT_PAGE_SIZE) + 1;
-                }
-            }
-        }
-        mem::forget(sgl);
-
-        Ok(range.start * 4096)
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/gmbus.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/gmbus.rs
deleted file mode 100644
index a8e16bfe95..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/gmbus.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-use common::{
-    io::{Io, MmioPtr},
-    timeout::Timeout,
-};
-use embedded_hal::blocking::i2c::{self, Operation, SevenBitAddress, Transactional};
-
-use super::MmioRegion;
-
-const GMBUS1_SW_RDY: u32 = 1 << 30;
-const GMBUS1_CYCLE_STOP: u32 = 1 << 27;
-const GMBUS1_CYCLE_INDEX: u32 = 1 << 26;
-const GMBUS1_CYCLE_WAIT: u32 = 1 << 25;
-const GMBUS1_SIZE_SHIFT: u32 = 16;
-const GMBUS1_INDEX_SHIFT: u32 = 8;
-
-const GMBUS2_HW_RDY: u32 = 1 << 11;
-const GMBUS2_ACTIVE: u32 = 1 << 9;
-
-pub struct Gmbus {
-    regs: [MmioPtr<u32>; 6],
-}
-
-impl Gmbus {
-    pub unsafe fn new(gttmm: &MmioRegion) -> syscall::Result<Self> {
-        Ok(Self {
-            regs: [
-                gttmm.mmio(0xC5100)?,
-                gttmm.mmio(0xC5104)?,
-                gttmm.mmio(0xC5108)?,
-                gttmm.mmio(0xC510C)?,
-                gttmm.mmio(0xC5110)?,
-                gttmm.mmio(0xC5120)?,
-            ],
-        })
-    }
-
-    pub fn pin_pair<'a>(&'a mut self, pin_pair: u8) -> GmbusPinPair<'a> {
-        GmbusPinPair {
-            regs: &mut self.regs,
-            pin_pair,
-        }
-    }
-}
-
-pub struct GmbusPinPair<'a> {
-    regs: &'a mut [MmioPtr<u32>; 6],
-    pin_pair: u8,
-}
-
-impl<'a> Transactional for GmbusPinPair<'a> {
-    type Error = ();
-    fn exec(&mut self, addr7: SevenBitAddress, ops: &mut [Operation<'_>]) -> Result<(), ()> {
-        let mut ops_iter = ops.iter_mut();
-        //TODO: gmbus is actually smbus, not fully i2c compatible!
-        // The first operation MUST be a write of the index
-        let index = match ops_iter.next() {
-            Some(Operation::Write(buf)) if buf.len() == 1 => buf[0],
-            unsupported => {
-                log::error!("GMBUS unsupported first operation {:?}", unsupported);
-                return Err(());
-            }
-        };
-
-        // Reset
-        self.regs[1].write(0);
-
-        // Set pin pair, enabling interface
-        self.regs[0].write(self.pin_pair as u32);
-
-        for op in ops_iter {
-            // Start operation
-            let (addr8, size) = match op {
-                Operation::Read(buf) => ((addr7 << 1) | 1, buf.len() as u32),
-                Operation::Write(buf) => (addr7 << 1, buf.len() as u32),
-            };
-            if size >= 512 {
-                log::error!("GMBUS transaction size {} too large", size);
-                return Err(());
-            }
-            self.regs[1].write(
-                GMBUS1_SW_RDY
-                    | GMBUS1_CYCLE_INDEX
-                    | GMBUS1_CYCLE_WAIT
-                    | (size << GMBUS1_SIZE_SHIFT)
-                    | (index as u32) << GMBUS1_INDEX_SHIFT
-                    | (addr8 as u32),
-            );
-
-            // Perform transaction
-            match op {
-                Operation::Read(buf) => {
-                    for chunk in buf.chunks_mut(4) {
-                        {
-                            //TODO: ideal timeout for gmbus read?
-                            let timeout = Timeout::from_millis(10);
-                            while !self.regs[2].readf(GMBUS2_HW_RDY) {
-                                timeout.run().map_err(|()| {
-                                    log::debug!(
-                                        "timeout on GMBUS read 0x{:08x}",
-                                        self.regs[2].read()
-                                    );
-                                    ()
-                                })?;
-                            }
-                        }
-
-                        let bytes = self.regs[3].read().to_le_bytes();
-                        chunk.copy_from_slice(&bytes[..chunk.len()]);
-                    }
-                }
-                Operation::Write(buf) => {
-                    log::warn!("TODO: GMBUS WRITE");
-                    return Err(());
-                }
-            }
-        }
-
-        // Stop transaction
-        self.regs[1].write(GMBUS1_SW_RDY | GMBUS1_CYCLE_STOP);
-
-        // Wait idle
-        let timeout = Timeout::from_millis(10);
-        while self.regs[2].readf(GMBUS2_ACTIVE) {
-            timeout.run().map_err(|()| {
-                log::debug!("timeout on GMBUS active 0x{:08x}", self.regs[2].read());
-                ()
-            })?;
-        }
-
-        // Disable GMBUS interface
-        self.regs[0].write(0);
-
-        Ok(())
-    }
-}
-
-impl<'a> i2c::WriteRead for GmbusPinPair<'a> {
-    type Error = ();
-    fn write_read(
-        &mut self,
-        addr7: SevenBitAddress,
-        bytes: &[u8],
-        buffer: &mut [u8],
-    ) -> Result<(), ()> {
-        self.exec(
-            addr7,
-            &mut [Operation::Write(bytes), Operation::Read(buffer)],
-        )
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/gpio.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/gpio.rs
deleted file mode 100644
index fe87e6b108..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/gpio.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use std::convert::Infallible;
-use std::time::Duration;
-
-use common::io::{Io, MmioPtr};
-use embedded_hal::digital::v2 as digital;
-
-use crate::device::HalTimer;
-
-use super::MmioRegion;
-
-const GPIO_DIR_MASK: u32 = 1 << 0;
-const GPIO_DIR_OUT: u32 = 1 << 1;
-const GPIO_VAL_MASK: u32 = 1 << 2;
-const GPIO_VAL_OUT: u32 = 1 << 3;
-const GPIO_VAL_IN: u32 = 1 << 4;
-const GPIO_CLOCK_SHIFT: u32 = 0;
-const GPIO_DATA_SHIFT: u32 = 8;
-
-#[derive(Copy, Clone, Debug)]
-#[repr(usize)]
-pub enum GpioPort {
-    Port0 = 0xC5010,
-    Port1 = 0xC5014,
-    Port2 = 0xC5018,
-    Port3 = 0xC501C,
-    Port4 = 0xC5020,
-    Port5 = 0xC5024,
-    Port6 = 0xC5028,
-    Port7 = 0xC502C,
-    Port8 = 0xC5030,
-    Port9 = 0xC5034,
-    Port10 = 0xC5038,
-    Port11 = 0xC503C,
-    Port12 = 0xC5040,
-    Port13 = 0xC5044,
-    Port14 = 0xC5048,
-    Port15 = 0xC504C,
-}
-
-impl GpioPort {
-    pub unsafe fn i2c(
-        &self,
-        gttmm: &MmioRegion,
-    ) -> syscall::Result<bitbang_hal::i2c::I2cBB<GpioPin, GpioPin, HalTimer>> {
-        let i2c_freq = 100_000.0;
-        let (scl, sda) = unsafe {
-            (
-                GpioPin {
-                    ctl: gttmm.mmio(*self as usize)?,
-                    shift: GPIO_CLOCK_SHIFT,
-                },
-                GpioPin {
-                    ctl: gttmm.mmio(*self as usize)?,
-                    shift: GPIO_DATA_SHIFT,
-                },
-            )
-        };
-        Ok(bitbang_hal::i2c::I2cBB::new(
-            scl,
-            sda,
-            HalTimer::new(Duration::from_secs_f64(1.0 / i2c_freq)),
-        ))
-    }
-}
-
-pub struct GpioPin {
-    ctl: MmioPtr<u32>,
-    shift: u32,
-}
-
-impl digital::InputPin for GpioPin {
-    type Error = Infallible;
-
-    fn is_high(&self) -> Result<bool, Infallible> {
-        Ok(((self.ctl.read() >> self.shift) & GPIO_VAL_IN) == GPIO_VAL_IN)
-    }
-
-    fn is_low(&self) -> Result<bool, Infallible> {
-        Ok(((self.ctl.read() >> self.shift) & GPIO_VAL_IN) == 0)
-    }
-}
-
-impl digital::OutputPin for GpioPin {
-    type Error = Infallible;
-
-    fn set_low(&mut self) -> Result<(), Infallible> {
-        // Set GPIO to output with value 0
-        let value = GPIO_DIR_MASK | GPIO_DIR_OUT | GPIO_VAL_MASK;
-        self.ctl.write(value << self.shift);
-        Ok(())
-    }
-
-    fn set_high(&mut self) -> Result<(), Infallible> {
-        // Assuming external pull-up, set GPIO to input
-        let value = GPIO_DIR_MASK;
-        self.ctl.write(value << self.shift);
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/hal/mod.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/hal/mod.rs
deleted file mode 100644
index f3f81d2de5..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/hal/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod timer;
-pub use self::timer::*;
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/hal/timer.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/hal/timer.rs
deleted file mode 100644
index 35552692e3..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/hal/timer.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use embedded_hal::timer;
-use std::time::{Duration, Instant};
-use void::Void;
-
-pub struct HalTimer {
-    instant: Instant,
-    duration: Duration,
-}
-
-impl HalTimer {
-    pub fn new(duration: Duration) -> Self {
-        Self {
-            instant: Instant::now(),
-            duration,
-        }
-    }
-}
-
-impl timer::CountDown for HalTimer {
-    type Time = Duration;
-    fn start<T: Into<Duration>>(&mut self, duration: T) {
-        self.instant = Instant::now();
-        self.duration = duration.into();
-    }
-
-    fn wait(&mut self) -> nb::Result<(), Void> {
-        if self.instant.elapsed() < self.duration {
-            std::thread::yield_now();
-            Err(nb::Error::WouldBlock)
-        } else {
-            // Since this is periodic it must trigger at the next duration
-            self.instant += self.duration;
-            Ok(())
-        }
-    }
-}
-
-impl timer::Periodic for HalTimer {}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/mod.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/mod.rs
deleted file mode 100644
index ced9dd561a..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/mod.rs
+++ /dev/null
@@ -1,966 +0,0 @@
-use common::{
-    io::{Io, MmioPtr},
-    timeout::Timeout,
-};
-use pcid_interface::{PciFunction, PciFunctionHandle};
-use range_alloc::RangeAllocator;
-use std::{collections::VecDeque, fmt, mem, sync::Arc};
-use syscall::error::{Error, Result, EIO, ENODEV, ERANGE};
-
-mod aux;
-mod bios;
-use self::bios::*;
-mod buffer;
-mod ddi;
-use self::ddi::*;
-mod dpll;
-use self::dpll::*;
-mod gmbus;
-pub use self::gmbus::*;
-mod gpio;
-pub use self::gpio::*;
-mod ggtt;
-use ggtt::*;
-mod hal;
-pub use self::hal::*;
-mod pipe;
-use self::pipe::*;
-mod power;
-use self::power::*;
-mod scheme;
-mod transcoder;
-use self::transcoder::*;
-
-//TODO: move to common?
-pub struct CallbackGuard<'a, T, F: FnOnce(&mut T)> {
-    value: &'a mut T,
-    fini: Option<F>,
-}
-
-impl<'a, T, F: FnOnce(&mut T)> CallbackGuard<'a, T, F> {
-    // Note that fini will also run if init fails
-    pub fn new(value: &'a mut T, init: impl FnOnce(&mut T) -> Result<()>, fini: F) -> Result<Self> {
-        let mut this = Self {
-            value,
-            fini: Some(fini),
-        };
-        init(&mut this.value)?;
-        Ok(this)
-    }
-}
-
-impl<'a, T, F: FnOnce(&mut T)> Drop for CallbackGuard<'a, T, F> {
-    fn drop(&mut self) {
-        let fini = self.fini.take().unwrap();
-        fini(&mut self.value);
-    }
-}
-
-pub struct ChangeDetect {
-    name: &'static str,
-    reg: MmioPtr<u32>,
-    value: u32,
-}
-
-impl ChangeDetect {
-    fn new(name: &'static str, reg: MmioPtr<u32>) -> Self {
-        let value = reg.read();
-        Self { name, reg, value }
-    }
-
-    fn log(&self) {
-        log::info!("{} {:08X}", self.name, self.value);
-    }
-
-    fn check(&mut self) {
-        let value = self.reg.read();
-        if value != self.value {
-            self.value = value;
-            self.log();
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum DeviceKind {
-    KabyLake,
-    TigerLake,
-    Alchemist,
-}
-
-pub enum Event {
-    DdiHotplug(&'static str),
-}
-
-pub struct InterruptRegs {
-    // Interrupt status register, has live status of interrupts
-    pub isr: MmioPtr<u32>,
-    // Interrupt mask register, masks isr for iir, 0 is unmasked
-    pub imr: MmioPtr<u32>,
-    // Interrupt identity register, write 1 to clear
-    pub iir: MmioPtr<u32>,
-    // Interrupt enable register, 1 allows interrupt to propogate
-    pub ier: MmioPtr<u32>,
-}
-
-pub struct Interrupter {
-    change_detects: Vec<ChangeDetect>,
-    display_int_ctl: MmioPtr<u32>,
-    display_int_ctl_enable: u32,
-    display_int_ctl_sde: u32,
-    gfx_mstr_intr: Option<MmioPtr<u32>>,
-    gfx_mstr_intr_display: u32,
-    gfx_mstr_intr_enable: u32,
-    sde_interrupt: InterruptRegs,
-}
-
-#[derive(Debug)]
-pub struct MmioRegion {
-    phys: usize,
-    virt: usize,
-    size: usize,
-}
-
-impl MmioRegion {
-    fn new(phys: usize, size: usize, memory_type: common::MemoryType) -> Result<Self> {
-        let virt = unsafe { common::physmap(phys, size, common::Prot::RW, memory_type)? as usize };
-        Ok(Self { phys, virt, size })
-    }
-
-    unsafe fn mmio(&self, offset: usize) -> Result<MmioPtr<u32>> {
-        // Any errors here will return ERANGE
-        let err = Error::new(ERANGE);
-        if offset.checked_add(mem::size_of::<u32>()).ok_or(err)? > self.size {
-            return Err(err);
-        }
-        let addr = self.virt.checked_add(offset).ok_or(err)?;
-        Ok(unsafe { MmioPtr::new(addr as *mut u32) })
-    }
-}
-
-impl Drop for MmioRegion {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = libredox::call::munmap(self.virt as *mut (), self.size);
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-enum VideoInput {
-    Hdmi,
-    Dp,
-}
-
-pub struct Device {
-    kind: DeviceKind,
-    alloc_buffers: RangeAllocator<u32>,
-    bios: Option<Bios>,
-    ddis: Vec<Ddi>,
-    dpclka_cfgcr0: Option<MmioPtr<u32>>,
-    dplls: Vec<Dpll>,
-    events: VecDeque<Event>,
-    framebuffers: Vec<DeviceFb>,
-    int: Interrupter,
-    gttmm: Arc<MmioRegion>,
-    ggtt: GlobalGtt,
-    gm: MmioRegion,
-    gmbus: Gmbus,
-    pipes: Vec<Pipe>,
-    power_wells: PowerWells,
-    ref_freq: u64,
-    transcoders: Vec<Transcoder>,
-}
-
-impl fmt::Debug for Device {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Device")
-            .field("kind", &self.kind)
-            .field("alloc_buffers", &self.alloc_buffers)
-            .field("gttmm", &self.gttmm)
-            .field("gm", &self.gm)
-            .field("ref_freq", &self.ref_freq)
-            .finish_non_exhaustive()
-    }
-}
-
-impl Device {
-    pub fn new(pcid_handle: &mut PciFunctionHandle, func: &PciFunction) -> Result<Self> {
-        let kind = match (func.full_device_id.vendor_id, func.full_device_id.device_id) {
-            // Kaby Lake
-            (0x8086, 0x5912) |
-            (0x8086, 0x5916) |
-            (0x8086, 0x591B) |
-            (0x8086, 0x591E) |
-            (0x8086, 0x5926) |
-            // Comet Lake, seems to be compatible with Kaby Lake
-            (0x8086, 0x9B21) |
-            (0x8086, 0x9B41) |
-            (0x8086, 0x9BA4) |
-            (0x8086, 0x9BAA) |
-            (0x8086, 0x9BAC) |
-            (0x8086, 0x9BC4) |
-            (0x8086, 0x9BC5) |
-            (0x8086, 0x9BC6) |
-            (0x8086, 0x9BC8) |
-            (0x8086, 0x9BCA) |
-            (0x8086, 0x9BCC) |
-            (0x8086, 0x9BE6) |
-            (0x8086, 0x9BF6) => {
-                DeviceKind::KabyLake
-            }
-            // Tiger Lake
-            (0x8086, 0x9A40) |
-            (0x8086, 0x9A49) |
-            (0x8086, 0x9A60) |
-            (0x8086, 0x9A68) |
-            (0x8086, 0x9A70) |
-            (0x8086, 0x9A78) => {
-                DeviceKind::TigerLake
-            }
-            // Alchemist
-            (0x8086, 0x5690) | // A770M
-            (0x8086, 0x5691) | // A730M
-            (0x8086, 0x5692) | // A550M
-            (0x8086, 0x5693) | // A370M
-            (0x8086, 0x5694) | // A350M
-            (0x8086, 0x5696) | // A570M
-            (0x8086, 0x5697) | // A530M
-            (0x8086, 0x56A0) | // A770
-            (0x8086, 0x56A1) | // A750
-            (0x8086, 0x56A5) | // A380
-            (0x8086, 0x56A6) | // A310
-            (0x8086, 0x56B0) | // Pro A30M
-            (0x8086, 0x56B1) | // Pro A40/A50
-            (0x8086, 0x56B2) | // Pro A60M
-            (0x8086, 0x56B3) | // Pro A60
-            (0x8086, 0x56C0) | // GPU Flex 170
-            (0x8086, 0x56C1)   // GPU Flex 140
-            => {
-                DeviceKind::Alchemist
-            }
-            (vendor_id, device_id) => {
-                log::error!("unsupported ID {:04X}:{:04X}", vendor_id, device_id);
-                return Err(Error::new(ENODEV));
-            }
-        };
-
-        let gttmm = {
-            let (phys, size) = func.bars[0].expect_mem();
-            Arc::new(MmioRegion::new(
-                phys,
-                size,
-                common::MemoryType::Uncacheable,
-            )?)
-        };
-        log::info!("GTTMM {:X?}", gttmm);
-        let gm = {
-            let (phys, size) = func.bars[2].expect_mem();
-            MmioRegion::new(phys, size, common::MemoryType::WriteCombining)?
-        };
-        log::info!("GM {:X?}", gm);
-        /* IOBAR not used, not present on all generations
-        let iobar = func.bars[4].expect_port();
-        log::debug!("IOBAR {:X?}", iobar);
-        */
-
-        // IGD OpRegion/Software SCI/_DSM for Skylake Processors
-        let bios_base = unsafe { pcid_handle.read_config(0xFC) };
-        let bios = if bios_base != 0 {
-            log::info!("BIOS {:X?}", bios_base);
-            // This is the default BIOS size
-            let bios_size = 8 * 1024;
-            match MmioRegion::new(
-                bios_base as usize,
-                bios_size,
-                common::MemoryType::Uncacheable,
-            ) {
-                Ok(region) => match Bios::new(region) {
-                    Ok(bios) => Some(bios),
-                    Err(err) => {
-                        log::warn!("failed to parse BIOS at {:08X}: {}", bios_base, err);
-                        None
-                    }
-                },
-                Err(err) => {
-                    log::warn!("failed to map BIOS at {:08X}: {}", bios_base, err);
-                    None
-                }
-            }
-        } else {
-            None
-        };
-
-        let ggtt = unsafe {
-            GlobalGtt::new(
-                pcid_handle,
-                gttmm.clone(),
-                //TODO: how to use 64-bit surface addresses?
-                gm.size.min(u32::MAX as usize) as u32,
-            )
-        };
-        //unsafe { ggtt.reset() };
-
-        // GMBUS seems to be stable for all generations
-        let gmbus = unsafe { Gmbus::new(&gttmm)? };
-
-        let dpclka_cfgcr0;
-        let int;
-        let ref_freq;
-        match kind {
-            DeviceKind::KabyLake => {
-                dpclka_cfgcr0 = None;
-
-                int = Interrupter {
-                    change_detects: Vec::new(),
-                    // IHD-OS-KBL-Vol 2c-1.17 MASTER_INT_CTL
-                    display_int_ctl: unsafe { gttmm.mmio(0x44200)? },
-                    display_int_ctl_enable: 1 << 31,
-                    display_int_ctl_sde: 1 << 23,
-                    gfx_mstr_intr: None,
-                    gfx_mstr_intr_display: 0,
-                    gfx_mstr_intr_enable: 0,
-                    sde_interrupt: InterruptRegs {
-                        isr: unsafe { gttmm.mmio(0xC4000)? },
-                        imr: unsafe { gttmm.mmio(0xC4004)? },
-                        iir: unsafe { gttmm.mmio(0xC4008)? },
-                        ier: unsafe { gttmm.mmio(0xC400C)? },
-                    },
-                };
-
-                // IHD-OS-KBL-Vol 12-1.17
-                ref_freq = 24_000_000;
-            }
-            DeviceKind::TigerLake | DeviceKind::Alchemist => {
-                // TigerLake: IHD-OS-TGL-Vol 2c-12.21
-                // Alchemist: IHD-OS-ACM-Vol 2c-3.23
-
-                dpclka_cfgcr0 = Some(unsafe { gttmm.mmio(0x164280)? });
-
-                let dssm = unsafe { gttmm.mmio(0x51004)? };
-                log::debug!("dssm {:08X}", dssm.read());
-
-                const DSSM_REF_FREQ_24_MHZ: u32 = 0b000 << 29;
-                const DSSM_REF_FREQ_19_2_MHZ: u32 = 0b001 << 29;
-                const DSSM_REF_FREQ_38_4_MHZ: u32 = 0b010 << 29;
-                const DSSM_REF_FREQ_MASK: u32 = 0b111 << 29;
-                ref_freq = match dssm.read() & DSSM_REF_FREQ_MASK {
-                    DSSM_REF_FREQ_24_MHZ => 24_000_000,
-                    DSSM_REF_FREQ_19_2_MHZ => 19_200_000,
-                    DSSM_REF_FREQ_38_4_MHZ => 38_400_000,
-                    unknown => {
-                        log::error!("unknown DSSM reference frequency {}", unknown);
-                        return Err(Error::new(EIO));
-                    }
-                };
-
-                int = Interrupter {
-                    change_detects: vec![
-                        ChangeDetect::new("de_hpd_interrupt", unsafe { gttmm.mmio(0x44470)? }),
-                        ChangeDetect::new("de_port_interrupt", unsafe { gttmm.mmio(0x44440)? }),
-                        ChangeDetect::new("shotplug_ctl_ddi", unsafe { gttmm.mmio(0xC4030)? }),
-                        ChangeDetect::new("shotplug_ctl_tc", unsafe { gttmm.mmio(0xC4034)? }),
-                        ChangeDetect::new("tbt_hotplug_ctl", unsafe { gttmm.mmio(0x44030)? }),
-                        ChangeDetect::new("tc_hotplug_ctl", unsafe { gttmm.mmio(0x44038)? }),
-                    ],
-                    display_int_ctl: unsafe { gttmm.mmio(0x44200)? },
-                    display_int_ctl_enable: 1 << 31,
-                    display_int_ctl_sde: 1 << 23,
-                    gfx_mstr_intr: Some(unsafe { gttmm.mmio(0x190010)? }),
-                    gfx_mstr_intr_display: 1 << 16,
-                    gfx_mstr_intr_enable: 1 << 31,
-                    sde_interrupt: InterruptRegs {
-                        isr: unsafe { gttmm.mmio(0xC4000)? },
-                        imr: unsafe { gttmm.mmio(0xC4004)? },
-                        iir: unsafe { gttmm.mmio(0xC4008)? },
-                        ier: unsafe { gttmm.mmio(0xC400C)? },
-                    },
-                };
-            }
-        }
-
-        let ddis;
-        let dplls;
-        let pipes;
-        let power_wells;
-        let transcoders;
-        match kind {
-            DeviceKind::KabyLake => {
-                ddis = Ddi::kabylake(&gttmm)?;
-                //TODO: kaby lake dplls
-                dplls = Vec::new();
-                pipes = Pipe::kabylake(&gttmm)?;
-                power_wells = PowerWells::kabylake(&gttmm)?;
-                transcoders = Transcoder::kabylake(&gttmm)?;
-            }
-            DeviceKind::TigerLake => {
-                ddis = Ddi::tigerlake(&gttmm)?;
-                dplls = Dpll::tigerlake(&gttmm)?;
-                pipes = Pipe::tigerlake(&gttmm)?;
-                power_wells = PowerWells::tigerlake(&gttmm)?;
-                transcoders = Transcoder::tigerlake(&gttmm)?;
-            }
-            DeviceKind::Alchemist => {
-                // Many registers are identical to tigerlake
-                dplls = Dpll::tigerlake(&gttmm)?;
-                pipes = Pipe::alchemist(&gttmm)?;
-                // FIXME transcoders are probably different too
-                transcoders = Transcoder::tigerlake(&gttmm)?;
-                // Power wells are distinct
-                ddis = Ddi::alchemist(&gttmm)?;
-                power_wells = PowerWells::alchemist(&gttmm)?;
-            }
-        }
-
-        //TODO: get number of available buffers
-        let buffers = 1024;
-        Ok(Self {
-            kind,
-            alloc_buffers: RangeAllocator::new(0..buffers),
-            bios,
-            ddis,
-            dpclka_cfgcr0,
-            dplls,
-            events: VecDeque::new(),
-            framebuffers: Vec::new(),
-            int,
-            gttmm,
-            ggtt,
-            gm,
-            gmbus,
-            pipes,
-            power_wells,
-            ref_freq,
-            transcoders,
-        })
-    }
-
-    pub fn init_inner(&mut self) {
-        // Discover current framebuffers
-        self.alloc_buffers.reset();
-        self.framebuffers.clear();
-        for pipe in self.pipes.iter() {
-            for plane in pipe.planes.iter() {
-                if plane.ctl.readf(PLANE_CTL_ENABLE) {
-                    plane.fetch_modeset(&mut self.alloc_buffers);
-
-                    self.framebuffers
-                        .push(plane.fetch_framebuffer(&self.gm, &mut self.ggtt));
-                }
-            }
-        }
-
-        // Probe all DDIs
-        let ddi_names: Vec<&str> = self.ddis.iter().map(|ddi| ddi.name).collect();
-        for ddi_name in ddi_names {
-            self.probe_ddi(ddi_name).expect("failed to probe DDI");
-        }
-
-        self.dump();
-
-        log::info!(
-            "device initialized with {} framebuffers",
-            self.framebuffers.len()
-        );
-
-        // Enable SDE interrupts
-        {
-            let mut mask = 0;
-            for ddi in self.ddis.iter() {
-                if let Some(sde_interrupt_hotplug) = ddi.sde_interrupt_hotplug {
-                    mask |= sde_interrupt_hotplug;
-                }
-            }
-            let sde_int = &mut self.int.sde_interrupt;
-            // Enable DDI hotplug interrupts
-            sde_int.ier.write(mask);
-            // Clear identity register
-            sde_int.iir.write(sde_int.iir.read());
-            // Unmask all interrupts
-            sde_int.imr.write(0);
-        }
-        // Enable display interrupts
-        self.int
-            .display_int_ctl
-            .write(self.int.display_int_ctl_enable);
-        if let Some(gfx_mstr_intr) = &mut self.int.gfx_mstr_intr {
-            // Enable graphics interrupts
-            gfx_mstr_intr.write(self.int.gfx_mstr_intr_enable);
-        }
-        for change_detect in self.int.change_detects.iter_mut() {
-            change_detect.log();
-        }
-    }
-
-    pub fn dump(&self) {
-        for ddi in self.ddis.iter() {
-            if ddi.buf_ctl.readf(DDI_BUF_CTL_ENABLE) {
-                ddi.dump();
-            }
-        }
-
-        if let Some(dpclka_cfgcr0) = &self.dpclka_cfgcr0 {
-            eprintln!("dpclka_cfgcr0 {:08X}", dpclka_cfgcr0.read());
-        }
-        for dpll in self.dplls.iter() {
-            if dpll.enable.readf(DPLL_ENABLE_ENABLE) {
-                dpll.dump();
-            }
-        }
-
-        for (transcoder, pipe) in self.transcoders.iter().zip(self.pipes.iter()) {
-            if transcoder.conf.readf(TRANS_CONF_ENABLE) {
-                transcoder.dump();
-                pipe.dump();
-                for plane in pipe.planes.iter() {
-                    if plane.index == 0 || plane.ctl.readf(PLANE_CTL_ENABLE) {
-                        eprint!("  ");
-                        plane.dump();
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn probe_ddi(&mut self, name: &str) -> Result<bool> {
-        let Some(ddi) = self.ddis.iter_mut().find(|ddi| ddi.name == name) else {
-            log::warn!("DDI {} not found", name);
-            return Err(Error::new(EIO));
-        };
-
-        // Enable DDI power well
-        self.power_wells.enable_well_by_ddi(ddi.name)?;
-
-        let Some((source, edid_data)) =
-            ddi.probe_edid(&mut self.power_wells, &self.gttmm, &mut self.gmbus)?
-        else {
-            return Ok(false);
-        };
-
-        let edid = match edid::parse(&edid_data).to_full_result() {
-            Ok(edid) => {
-                log::info!("DDI {} EDID from {}: {:?}", ddi.name, source, edid);
-                edid
-            }
-            Err(err) => {
-                log::warn!(
-                    "DDI {} failed to parse EDID from {}: {:?}",
-                    ddi.name,
-                    source,
-                    err
-                );
-                // Will try again but not fail the driver
-                return Ok(false);
-            }
-        };
-
-        let timing_opt = edid.descriptors.iter().find_map(|desc| match desc {
-            edid::Descriptor::DetailedTiming(timing) => Some(timing),
-            _ => None,
-        });
-        let Some(timing) = timing_opt else {
-            log::warn!(
-                "DDI {} EDID from {} missing detailed timing",
-                ddi.name,
-                source
-            );
-            // Will try again but not fail the driver
-            return Ok(false);
-        };
-
-        let mut modeset = |ddi: &mut Ddi, input: VideoInput| -> Result<()> {
-            // IHD-OS-TGL-Vol 12-1.22-Rev2.0 "Sequences for HDMI and DVI"
-
-            // Power wells should already be enabled
-
-            //TODO: Type-C needs aux power enabled and max lanes set
-
-            // Enable port PLL without SSC. Not required on Type-C ports
-            if let Some(clock_shift) = ddi.dpclka_cfgcr0_clock_shift {
-                // Find free DPLL
-                let dpll = self
-                    .dplls
-                    .iter_mut()
-                    .find(|dpll| !dpll.enable.readf(DPLL_ENABLE_ENABLE))
-                    .ok_or_else(|| {
-                        log::error!("failed to find free DPLL");
-                        Error::new(EIO)
-                    })?;
-
-                // DPLL power guard
-                let mut dpll_enable = unsafe { MmioPtr::new(dpll.enable.as_mut_ptr()) };
-                let dpll_power_guard = CallbackGuard::new(
-                    &mut dpll_enable,
-                    |dpll_enable| {
-                        // Enable DPLL power
-                        dpll_enable.writef(DPLL_ENABLE_POWER_ENABLE, true);
-                        //TODO: timeout not specified in docs, should be very fast
-                        let timeout = Timeout::from_micros(1);
-                        while !dpll_enable.readf(DPLL_ENABLE_POWER_STATE) {
-                            timeout.run().map_err(|()| {
-                                log::debug!("timeout while enabling DPLL {} power", dpll.name);
-                                Error::new(EIO)
-                            })?;
-                        }
-                        Ok(())
-                    },
-                    |dpll_enable| {
-                        // Disable DPLL power
-                        dpll_enable.writef(DPLL_ENABLE_POWER_ENABLE, false);
-                    },
-                )?;
-
-                match input {
-                    VideoInput::Hdmi => {
-                        // Set SSC enable/disable. For HDMI, always disable
-                        dpll.ssc.writef(DPLL_SSC_ENABLE, false);
-
-                        // Configure DPLL frequency
-                        dpll.set_freq_hdmi(self.ref_freq, &timing)?;
-                    }
-                    VideoInput::Dp => {
-                        log::warn!("DPLL for DisplayPort not implemented");
-                        return Err(Error::new(EIO));
-                    }
-                }
-
-                //TODO: "Sequence Before Frequency Change"
-
-                // Enable DPLL
-                //TODO: use guard?
-                {
-                    dpll.enable.writef(DPLL_ENABLE_ENABLE, true);
-                    let timeout = Timeout::from_micros(50);
-                    while !dpll.enable.readf(DPLL_ENABLE_LOCK) {
-                        timeout.run().map_err(|()| {
-                            log::debug!("timeout while enabling DPLL {}", dpll.name);
-                            Error::new(EIO)
-                        })?;
-                    }
-                }
-
-                //TODO: "Sequence After Frequency Change"
-
-                // Update DPLL mapping
-                if let Some(dpclka_cfgcr0) = &mut self.dpclka_cfgcr0 {
-                    const DPCLKA_CFGCR0_CLOCK_MASK: u32 = 0b11;
-
-                    let mut v = dpclka_cfgcr0.read();
-                    v &= !(DPCLKA_CFGCR0_CLOCK_MASK << clock_shift);
-                    v |= dpll.dpclka_cfgcr0_clock_value << clock_shift;
-                    dpclka_cfgcr0.write(v);
-                }
-
-                // Continue to allow DPLL power
-                mem::forget(dpll_power_guard);
-            }
-
-            // Enable DPLL clock (must be done separately from PLL mapping)
-            if let Some(dpclka_cfgcr0) = &mut self.dpclka_cfgcr0 {
-                if let Some(clock_off) = ddi.dpclka_cfgcr0_clock_off {
-                    dpclka_cfgcr0.writef(clock_off, false);
-                }
-            }
-
-            // Enable IO power
-            //TODO: the request can be shared by multiple DDIs
-            //TODO: skip if TBT
-            let pwr_well_ctl_ddi_request = ddi.pwr_well_ctl_ddi_request;
-            let pwr_well_ctl_ddi_state = ddi.pwr_well_ctl_ddi_state;
-            let mut pwr_well_ctl_ddi =
-                unsafe { MmioPtr::new(self.power_wells.ctl_ddi.as_mut_ptr()) };
-            let pwr_guard = CallbackGuard::new(
-                &mut pwr_well_ctl_ddi,
-                |pwr_well_ctl_ddi| {
-                    // Enable IO power
-                    pwr_well_ctl_ddi.writef(pwr_well_ctl_ddi_request, true);
-                    let timeout = Timeout::from_micros(30);
-                    while !pwr_well_ctl_ddi.readf(pwr_well_ctl_ddi_state) {
-                        timeout.run().map_err(|()| {
-                            log::debug!("timeout while requesting DDI {} IO power", ddi.name);
-                            Error::new(EIO)
-                        })?;
-                    }
-                    Ok(())
-                },
-                |pwr_well_ctl_ddi| {
-                    // Disable IO power
-                    pwr_well_ctl_ddi.writef(pwr_well_ctl_ddi_request, false);
-                },
-            )?;
-
-            //TODO: Type-C DP_MODE
-
-            // Enable planes, pipe, and transcoder
-            {
-                // Find free transcoder with free pipe
-                let mut transcoder_pipe = None;
-                for (transcoder, pipe) in self.transcoders.iter_mut().zip(self.pipes.iter_mut()) {
-                    if transcoder.conf.readf(TRANS_CONF_ENABLE) {
-                        continue;
-                    }
-                    //TODO: how would we know if pipe is in use?
-                    transcoder_pipe = Some((transcoder, pipe));
-                    break;
-                }
-                let Some((transcoder, pipe)) = transcoder_pipe else {
-                    log::error!("free transcoder and pipe not found");
-                    return Err(Error::new(EIO));
-                };
-
-                // Enable pipe and transcoder power wells
-                self.power_wells.enable_well_by_pipe(pipe.name)?;
-                self.power_wells
-                    .enable_well_by_transcoder(transcoder.name)?;
-
-                // Configure transcoder clock select
-                if let Some(transcoder_index) = ddi.transcoder_index {
-                    transcoder
-                        .clk_sel
-                        .write(transcoder_index << transcoder.clk_sel_shift);
-                }
-
-                // Set pipe bottom color to blue for debugging
-                pipe.bottom_color.write(0x3FF);
-
-                // Configure and enable planes
-                //TODO: THIS IS HACKY
-                if let Some(plane) = pipe.planes.first_mut() {
-                    let width = timing.horizontal_active_pixels as u32;
-                    let height = timing.vertical_active_lines as u32;
-
-                    let fb = DeviceFb::alloc(&self.gm, &mut self.ggtt, width, height)?;
-
-                    plane.modeset(&mut self.alloc_buffers)?;
-                    plane.set_framebuffer(&fb);
-
-                    self.framebuffers.push(fb);
-                }
-
-                //TODO: VGA and panel fitter steps?
-
-                // Configure transcoder timings and other pipe and transcoder settings
-                transcoder.modeset(pipe, &timing);
-
-                // Configure and enable TRANS_DDI_FUNC_CTL
-                {
-                    let mut ddi_func_ctl = TRANS_DDI_FUNC_CTL_ENABLE |
-                        //TODO: allow different bits per color
-                        TRANS_DDI_FUNC_CTL_BPC_8 |
-                        //TODO: correct port width selection
-                        TRANS_DDI_FUNC_CTL_PORT_WIDTH_4;
-
-                    if let Some(transcoder_index) = ddi.transcoder_index {
-                        ddi_func_ctl |= transcoder_index << transcoder.ddi_func_ctl_ddi_shift;
-                    }
-
-                    match input {
-                        VideoInput::Hdmi => {
-                            ddi_func_ctl |= TRANS_DDI_FUNC_CTL_MODE_HDMI;
-
-                            // Set HDMI scrambling and high TMDS char rate based on symbol rate > 340 MHz
-                            if timing.pixel_clock > 340_000 {
-                                ddi_func_ctl |= transcoder.ddi_func_ctl_hdmi_scrambling
-                                    | transcoder.ddi_func_ctl_high_tmds_char_rate;
-                            }
-                        }
-                        VideoInput::Dp => {
-                            //TODO: MST
-                            ddi_func_ctl |= TRANS_DDI_FUNC_CTL_MODE_DP_SST;
-                        }
-                    }
-
-                    match (timing.features >> 3) & 0b11 {
-                        // Digital sync, separate
-                        0b11 => {
-                            if (timing.features & (1 << 2)) != 0 {
-                                ddi_func_ctl |= TRANS_DDI_FUNC_CTL_SYNC_POLARITY_VSHIGH;
-                            }
-                            if (timing.features & (1 << 1)) != 0 {
-                                ddi_func_ctl |= TRANS_DDI_FUNC_CTL_SYNC_POLARITY_HSHIGH;
-                            }
-                        }
-                        unsupported => {
-                            log::warn!("unsupported sync {:#x}", unsupported);
-                        }
-                    }
-
-                    transcoder.ddi_func_ctl.write(ddi_func_ctl);
-                }
-
-                // Configure and enable TRANS_CONF
-                let mut conf = transcoder.conf.read();
-                // Set mode to progressive
-                conf &= !TRANS_CONF_MODE_MASK;
-                // Enable transcoder
-                conf |= TRANS_CONF_ENABLE;
-                transcoder.conf.write(conf);
-                //TODO: what is the correct timeout?
-                let timeout = Timeout::from_millis(100);
-                while !transcoder.conf.readf(TRANS_CONF_STATE) {
-                    timeout.run().map_err(|()| {
-                        log::error!(
-                            "timeout on DDI {} transcoder {} enable",
-                            ddi.name,
-                            transcoder.name
-                        );
-                        Error::new(EIO)
-                    })?;
-                }
-            }
-
-            // Enable port
-            {
-                // Configure voltage swing and related IO settings
-                match input {
-                    VideoInput::Hdmi => {
-                        ddi.voltage_swing_hdmi(&self.gttmm, &timing)?;
-                    }
-                    VideoInput::Dp => {
-                        //TODO ddi.voltage_swing_dp(&self.gttmm)?;
-                        log::error!("voltage swing for DP not implemented");
-                        return Err(Error::new(EIO));
-                    }
-                }
-
-                // Configure PORT_CL_DW10 static power down to power up all lanes
-                //TODO: only power up required lanes
-                if let Some(mut port_cl_dw10) = ddi.port_cl(PortClReg::Dw10) {
-                    port_cl_dw10.writef(0b1111 << 4, false);
-                }
-
-                // Configure and enable DDI_BUF_CTL
-                //TODO: more DDI_BUF_CTL bits?
-                ddi.buf_ctl.writef(DDI_BUF_CTL_ENABLE, true);
-
-                // Wait for DDI_BUF_CTL IDLE = 0, timeout after 500 us
-                let timeout = Timeout::from_micros(500);
-                while ddi.buf_ctl.readf(DDI_BUF_CTL_IDLE) {
-                    timeout.run().map_err(|()| {
-                        log::warn!("timeout while waiting for DDI {} active", ddi.name);
-                        Error::new(EIO)
-                    })?;
-                }
-            }
-
-            // Keep IO power on if finished
-            mem::forget(pwr_guard);
-
-            Ok(())
-        };
-
-        if ddi.buf_ctl.readf(DDI_BUF_CTL_IDLE) {
-            log::info!("DDI {} idle, will attempt mode setting", ddi.name);
-            const EDID_VIDEO_INPUT_UNDEFINED: u8 = (1 << 7) | 0b0000;
-            const EDID_VIDEO_INPUT_DVI: u8 = (1 << 7) | 0b0001;
-            const EDID_VIDEO_INPUT_HDMI_A: u8 = (1 << 7) | 0b0010;
-            const EDID_VIDEO_INPUT_HDMI_B: u8 = (1 << 7) | 0b0011;
-            const EDID_VIDEO_INPUT_DP: u8 = (1 << 7) | 0b0101;
-            const EDID_VIDEO_INPUT_MASK: u8 = (1 << 7) | 0b1111;
-            let input = match edid_data[20] & EDID_VIDEO_INPUT_MASK {
-                //TODO: how to accurately discover input type?
-                //TODO: HDMI often shows up as undefined, do others?
-                EDID_VIDEO_INPUT_UNDEFINED
-                | EDID_VIDEO_INPUT_DVI
-                | EDID_VIDEO_INPUT_HDMI_A
-                | EDID_VIDEO_INPUT_HDMI_B => VideoInput::Hdmi,
-                EDID_VIDEO_INPUT_DP => VideoInput::Dp,
-                unknown => {
-                    log::warn!("EDID video input 0x{:02X} not supported", unknown);
-                    return Err(Error::new(EIO));
-                }
-            };
-            //TODO: DisplayPort modeset not complete
-            match modeset(ddi, input) {
-                Ok(()) => {
-                    log::info!("DDI {} modeset {:?} finished", ddi.name, input);
-                }
-                Err(err) => {
-                    log::warn!("DDI {} modeset {:?} failed: {}", ddi.name, input, err);
-                    // Will try again but not fail the driver
-                    return Ok(false);
-                }
-            }
-        } else {
-            log::info!("DDI {} already active", ddi.name);
-        }
-
-        Ok(true)
-    }
-
-    pub fn handle_display_irq(&mut self) -> bool {
-        let display_ints = self.int.display_int_ctl.read() & !self.int.display_int_ctl_enable;
-        if display_ints != 0 {
-            log::info!("  display ints {:08X}", display_ints);
-            if display_ints & self.int.display_int_ctl_sde != 0 {
-                let sde_ints = self.int.sde_interrupt.iir.read();
-                self.int.sde_interrupt.iir.write(sde_ints);
-                log::info!("    south display engine ints {:08X}", sde_ints);
-                for ddi in self.ddis.iter() {
-                    if let Some(sde_interrupt_hotplug) = ddi.sde_interrupt_hotplug {
-                        if sde_ints & sde_interrupt_hotplug == sde_interrupt_hotplug {
-                            self.events.push_back(Event::DdiHotplug(ddi.name));
-                        }
-                    }
-                }
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn handle_irq(&mut self) -> bool {
-        let had_irq = if let Some(gfx_mstr_intr) = &mut self.int.gfx_mstr_intr {
-            let gfx_ints = gfx_mstr_intr.read() & !self.int.gfx_mstr_intr_enable;
-            if gfx_ints != 0 {
-                log::info!("gfx ints {:08X}", gfx_ints);
-                gfx_mstr_intr.write(gfx_ints | self.int.gfx_mstr_intr_enable);
-
-                if gfx_ints & self.int.gfx_mstr_intr_display != 0 {
-                    self.handle_display_irq();
-                }
-
-                true
-            } else {
-                false
-            }
-        } else {
-            self.handle_display_irq()
-        };
-
-        if had_irq {
-            for change_detect in self.int.change_detects.iter_mut() {
-                change_detect.check();
-            }
-        }
-
-        had_irq
-    }
-
-    pub fn handle_events(&mut self) {
-        while let Some(event) = self.events.pop_front() {
-            match event {
-                Event::DdiHotplug(ddi_name) => {
-                    log::info!("DDI {} plugged", ddi_name);
-                    for _attempt in 0..4 {
-                        //TODO: gmbus times out!
-                        match self.probe_ddi(ddi_name) {
-                            Ok(true) => {
-                                break;
-                            }
-                            Ok(false) => {
-                                log::warn!("timeout probing {}", ddi_name);
-                            }
-                            Err(err) => {
-                                log::warn!("failed to probe {}: {}", ddi_name, err);
-                            }
-                        }
-                        //TODO: do this asynchronously so scheme events can be handled
-                        std::thread::sleep(std::time::Duration::from_secs(1));
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/pipe.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/pipe.rs
deleted file mode 100644
index 0e99ffe431..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/pipe.rs
+++ /dev/null
@@ -1,356 +0,0 @@
-use common::io::{Io, MmioPtr};
-use range_alloc::RangeAllocator;
-use syscall::error::Result;
-use syscall::{Error, EIO};
-
-use super::buffer::GpuBuffer;
-use super::{GlobalGtt, MmioRegion};
-
-pub const PLANE_CTL_ENABLE: u32 = 1 << 31;
-
-pub const PLANE_WM_ENABLE: u32 = 1 << 31;
-pub const PLANE_WM_LINES_SHIFT: u32 = 14;
-
-#[derive(Debug)]
-pub struct DeviceFb {
-    pub buffer: GpuBuffer,
-    pub width: u32,
-    pub height: u32,
-    pub stride: u32,
-}
-
-impl DeviceFb {
-    pub unsafe fn new(
-        gm: &MmioRegion,
-        surf: u32,
-        width: u32,
-        height: u32,
-        stride: u32,
-        clear: bool,
-    ) -> Self {
-        Self {
-            buffer: unsafe { GpuBuffer::new(gm, surf, stride * height, clear) },
-            width,
-            height,
-            stride,
-        }
-    }
-
-    pub fn alloc(
-        gm: &MmioRegion,
-        ggtt: &mut GlobalGtt,
-        width: u32,
-        height: u32,
-    ) -> syscall::Result<Self> {
-        let (buffer, stride) = GpuBuffer::alloc_dumb(gm, ggtt, width, height)?;
-
-        Ok(DeviceFb {
-            buffer,
-            width,
-            height,
-            stride,
-        })
-    }
-}
-
-pub struct Plane {
-    pub name: &'static str,
-    pub index: usize,
-    pub buf_cfg: MmioPtr<u32>,
-    pub color_ctl: Option<MmioPtr<u32>>,
-    pub color_ctl_gamma_disable: u32,
-    pub ctl: MmioPtr<u32>,
-    pub ctl_source_rgb_8888: u32,
-    pub ctl_source_mask: u32,
-    pub offset: MmioPtr<u32>,
-    pub pos: MmioPtr<u32>,
-    pub size: MmioPtr<u32>,
-    pub stride: MmioPtr<u32>,
-    pub surf: MmioPtr<u32>,
-    pub wm: [MmioPtr<u32>; 8],
-    pub wm_trans: MmioPtr<u32>,
-}
-
-impl Plane {
-    pub fn fetch_modeset(&self, alloc_buffers: &mut RangeAllocator<u32>) {
-        let buf_cfg = self.buf_cfg.read();
-        let buffer_start = buf_cfg & 0x7FF;
-        let buffer_end = (buf_cfg >> 16) & 0x7FF;
-        alloc_buffers
-            .allocate_exact_range(buffer_start..(buffer_end + 1))
-            .unwrap_or_else(|err| {
-                panic!(
-                    "failed to allocate pre-existing buffer blocks {} to {}: {:?}",
-                    buffer_start, buffer_end, err
-                );
-            });
-    }
-
-    pub fn modeset(&mut self, alloc_buffers: &mut RangeAllocator<u32>) -> syscall::Result<()> {
-        // FIXME handle runtime buffer reconfiguration
-        //TODO: enable DBUF if more buffers needed
-        //TODO: more blocks would mean better power usage
-        // Minimum is 8 blocks for linear planes, 160 blocks is recommended for pre-OS init
-        let buffer_size = 160;
-        let buffer = alloc_buffers.allocate_range(buffer_size).map_err(|err| {
-            log::warn!(
-                "failed to allocate {} buffer blocks: {:?}",
-                buffer_size,
-                err
-            );
-            Error::new(EIO)
-        })?;
-        self.buf_cfg.write(buffer.start | (buffer.end << 16));
-
-        //TODO: correct watermark calculation
-        self.wm[0].write(PLANE_WM_ENABLE | (2 << PLANE_WM_LINES_SHIFT) | buffer.len() as u32);
-        for i in 1..self.wm.len() {
-            self.wm[i].writef(PLANE_WM_ENABLE, false);
-        }
-        self.wm_trans.writef(PLANE_WM_ENABLE, false);
-
-        Ok(())
-    }
-
-    pub fn fetch_framebuffer(&self, gm: &MmioRegion, ggtt: &mut GlobalGtt) -> DeviceFb {
-        let size = self.size.read();
-        let width = (size & 0xFFFF) + 1;
-        let height = ((size >> 16) & 0xFFFF) + 1;
-        let stride_64 = self.stride.read() & 0x7FF;
-        //TODO: this will be wrong for tiled planes
-        let stride = stride_64 * 64;
-        let surf = self.surf.read() & 0xFFFFF000;
-        //TODO: read bits per pixel
-        let surf_size = (stride * height).next_multiple_of(4096);
-        ggtt.reserve(surf, surf_size);
-
-        unsafe { DeviceFb::new(gm, surf, width, height, stride, true) }
-    }
-
-    pub fn set_framebuffer(&mut self, fb: &DeviceFb) {
-        //TODO: documentation on this is not great
-        let stride_64 = fb.stride / 64;
-
-        self.size.write((fb.width - 1) | ((fb.height - 1) << 16));
-        self.stride.write(stride_64);
-
-        self.surf.write(fb.buffer.gm_offset);
-
-        // Disable gamma
-        if let Some(color_ctl) = &mut self.color_ctl {
-            color_ctl.write(self.color_ctl_gamma_disable);
-        }
-
-        //TODO: more PLANE_CTL bits
-        self.ctl.write(PLANE_CTL_ENABLE | self.ctl_source_rgb_8888);
-    }
-
-    pub fn dump(&self) {
-        eprint!("Plane {}", self.name);
-        eprint!(" buf_cfg {:08X}", self.buf_cfg.read());
-        if let Some(reg) = &self.color_ctl {
-            eprint!(" color_ctl {:08X}", reg.read());
-        }
-        eprint!(" ctl {:08X}", self.ctl.read());
-        eprint!(" offset {:08X}", self.offset.read());
-        eprint!(" pos {:08X}", self.offset.read());
-        eprint!(" size {:08X}", self.size.read());
-        eprint!(" stride {:08X}", self.stride.read());
-        eprint!(" surf {:08X}", self.surf.read());
-        for i in 0..self.wm.len() {
-            eprint!(" wm_{} {:08X}", i, self.wm[i].read());
-        }
-        eprint!(" wm_trans {:08X}", self.wm_trans.read());
-        eprintln!();
-    }
-}
-
-pub struct Pipe {
-    pub name: &'static str,
-    pub index: usize,
-    pub planes: Vec<Plane>,
-    pub bottom_color: MmioPtr<u32>,
-    pub misc: MmioPtr<u32>,
-    pub srcsz: MmioPtr<u32>,
-}
-
-impl Pipe {
-    pub fn dump(&self) {
-        eprint!("Pipe {}", self.name);
-        eprint!(" bottom_color {:08X}", self.bottom_color.read());
-        eprint!(" misc {:08X}", self.misc.read());
-        eprint!(" srcsz {:08X}", self.srcsz.read());
-        eprintln!();
-    }
-
-    pub fn kabylake(gttmm: &MmioRegion) -> Result<Vec<Self>> {
-        let mut pipes = Vec::with_capacity(3);
-        for (i, name) in ["A", "B", "C"].iter().enumerate() {
-            let mut planes = Vec::new();
-            //TODO: cursor plane
-            for (j, name) in ["1", "2", "3"].iter().enumerate() {
-                planes.push(Plane {
-                    name,
-                    index: j,
-                    // IHD-OS-KBL-Vol 2c-1.17 PLANE_BUF_CFG
-                    buf_cfg: unsafe { gttmm.mmio(0x7027C + i * 0x1000 + j * 0x100)? },
-                    // N/A
-                    color_ctl: None,
-                    color_ctl_gamma_disable: 0,
-                    // IHD-OS-KBL-Vol 2c-1.17 PLANE_CTL
-                    ctl: unsafe { gttmm.mmio(0x70180 + i * 0x1000 + j * 0x100)? },
-                    ctl_source_rgb_8888: 0b0100 << 24,
-                    ctl_source_mask: 0b1111 << 24,
-                    // IHD-OS-KBL-Vol 2c-1.17 PLANE_OFFSET
-                    offset: unsafe { gttmm.mmio(0x701A4 + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-KBL-Vol 2c-1.17 PLANE_POS
-                    pos: unsafe { gttmm.mmio(0x7018C + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-KBL-Vol 2c-1.17 PLANE_SIZE
-                    size: unsafe { gttmm.mmio(0x70190 + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-KBL-Vol 2c-1.17 PLANE_STRIDE
-                    stride: unsafe { gttmm.mmio(0x70188 + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-KBL-Vol 2c-1.17 PLANE_SURF
-                    surf: unsafe { gttmm.mmio(0x7019C + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-KBL-Vol 2c-1.17 PLANE_WM
-                    wm: [
-                        unsafe { gttmm.mmio(0x70240 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70244 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70248 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x7024C + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70250 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70254 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70258 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x7025C + i * 0x1000 + j * 0x100)? },
-                    ],
-                    wm_trans: unsafe { gttmm.mmio(0x70268 + i * 0x1000 + j * 0x100)? },
-                });
-            }
-            pipes.push(Pipe {
-                name,
-                index: i,
-                planes,
-                // IHD-OS-KBL-Vol 2c-1.17 PIPE_BOTTOM_COLOR
-                bottom_color: unsafe { gttmm.mmio(0x70034 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 PIPE_MISC
-                misc: unsafe { gttmm.mmio(0x70030 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 PIPE_SRCSZ
-                srcsz: unsafe { gttmm.mmio(0x6001C + i * 0x1000)? },
-            })
-        }
-        Ok(pipes)
-    }
-
-    pub fn tigerlake(gttmm: &MmioRegion) -> Result<Vec<Self>> {
-        let mut pipes = Vec::with_capacity(4);
-        for (i, name) in ["A", "B", "C", "D"].iter().enumerate() {
-            let mut planes = Vec::new();
-            //TODO: cursor plane
-            for (j, name) in ["1", "2", "3", "4", "5", "6", "7"].iter().enumerate() {
-                planes.push(Plane {
-                    name,
-                    index: j,
-                    // IHD-OS-TGL-Vol 2c-12.21 PLANE_BUF_CFG
-                    buf_cfg: unsafe { gttmm.mmio(0x7027C + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-TGL-Vol 2c-12.21 PLANE_COLOR_CTL
-                    color_ctl: Some(unsafe { gttmm.mmio(0x701CC + i * 0x1000 + j * 0x100)? }),
-                    color_ctl_gamma_disable: 1 << 13,
-                    // IHD-OS-TGL-Vol 2c-12.21 PLANE_CTL
-                    ctl: unsafe { gttmm.mmio(0x70180 + i * 0x1000 + j * 0x100)? },
-                    ctl_source_rgb_8888: 0b01000 << 23,
-                    ctl_source_mask: 0b11111 << 23,
-                    // IHD-OS-TGL-Vol 2c-12.21 PLANE_OFFSET
-                    offset: unsafe { gttmm.mmio(0x701A4 + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-TGL-Vol 2c-12.21 PLANE_POS
-                    pos: unsafe { gttmm.mmio(0x7018C + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-TGL-Vol 2c-12.21 PLANE_SIZE
-                    size: unsafe { gttmm.mmio(0x70190 + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-TGL-Vol 2c-12.21 PLANE_STRIDE
-                    stride: unsafe { gttmm.mmio(0x70188 + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-TGL-Vol 2c-12.21 PLANE_SURF
-                    surf: unsafe { gttmm.mmio(0x7019C + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-TGL-Vol 2c-12.21 PLANE_WM
-                    wm: [
-                        unsafe { gttmm.mmio(0x70240 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70244 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70248 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x7024C + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70250 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70254 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70258 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x7025C + i * 0x1000 + j * 0x100)? },
-                    ],
-                    wm_trans: unsafe { gttmm.mmio(0x70268 + i * 0x1000 + j * 0x100)? },
-                });
-            }
-            pipes.push(Pipe {
-                name,
-                index: i,
-                planes,
-                // IHD-OS-TGL-Vol 2c-12.21 PIPE_BOTTOM_COLOR
-                bottom_color: unsafe { gttmm.mmio(0x70034 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 PIPE_MISC
-                misc: unsafe { gttmm.mmio(0x70030 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 PIPE_SRCSZ
-                srcsz: unsafe { gttmm.mmio(0x6001C + i * 0x1000)? },
-            })
-        }
-        Ok(pipes)
-    }
-
-    pub fn alchemist(gttmm: &MmioRegion) -> Result<Vec<Self>> {
-        let mut pipes = Vec::with_capacity(4);
-        for (i, name) in ["A", "B", "C", "D"].iter().enumerate() {
-            let mut planes = Vec::new();
-            //TODO: cursor plane
-            for (j, name) in ["1", "2", "3", "4", "5"].iter().enumerate() {
-                planes.push(Plane {
-                    name,
-                    index: j,
-                    // IHD-OS-ACM-Vol 2c-3.23 PLANE_BUF_CFG
-                    buf_cfg: unsafe { gttmm.mmio(0x7057C + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-ACM-Vol 2c-3.23 PLANE_COLOR_CTL
-                    color_ctl: Some(unsafe { gttmm.mmio(0x704CC + i * 0x1000 + j * 0x100)? }),
-                    color_ctl_gamma_disable: 1 << 13,
-                    // IHD-OS-ACM-Vol 2c-3.23 PLANE_CTL
-                    ctl: unsafe { gttmm.mmio(0x70480 + i * 0x1000 + j * 0x100)? },
-                    ctl_source_rgb_8888: 0b01000 << 23,
-                    ctl_source_mask: 0b11111 << 23,
-                    // IHD-OS-ACM-Vol 2c-3.23 PLANE_OFFSET
-                    offset: unsafe { gttmm.mmio(0x704A4 + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-ACM-Vol 2c-3.23 PLANE_POS
-                    pos: unsafe { gttmm.mmio(0x7048C + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-ACM-Vol 2c-3.23 PLANE_SIZE
-                    size: unsafe { gttmm.mmio(0x70490 + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-ACM-Vol 2c-3.23 PLANE_STRIDE
-                    stride: unsafe { gttmm.mmio(0x70488 + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-ACM-Vol 2c-3.23 PLANE_SURF
-                    surf: unsafe { gttmm.mmio(0x7049C + i * 0x1000 + j * 0x100)? },
-                    // IHD-OS-ACM-Vol 2c-3.23 PLANE_WM
-                    wm: [
-                        unsafe { gttmm.mmio(0x70540 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70544 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70548 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x7054C + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70550 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70554 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x70558 + i * 0x1000 + j * 0x100)? },
-                        unsafe { gttmm.mmio(0x7055C + i * 0x1000 + j * 0x100)? },
-                    ],
-                    wm_trans: unsafe { gttmm.mmio(0x70568 + i * 0x1000 + j * 0x100)? },
-                });
-            }
-            pipes.push(Pipe {
-                name,
-                index: i,
-                planes,
-                // IHD-OS-ACM-Vol 2c-3.23 PIPE_BOTTOM_COLOR
-                bottom_color: unsafe { gttmm.mmio(0x70034 + i * 0x1000)? },
-                // IHD-OS-ACM-Vol 2c-3.23 PIPE_MISC
-                misc: unsafe { gttmm.mmio(0x70030 + i * 0x1000)? },
-                // IHD-OS-ACM-Vol 2c-3.23 PIPE_SRCSZ
-                srcsz: unsafe { gttmm.mmio(0x6001C + i * 0x1000)? },
-            })
-        }
-        Ok(pipes)
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/power.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/power.rs
deleted file mode 100644
index 77335ae064..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/power.rs
+++ /dev/null
@@ -1,323 +0,0 @@
-use common::{
-    io::{Io, MmioPtr},
-    timeout::Timeout,
-};
-use syscall::error::{Error, Result, EIO};
-
-use super::MmioRegion;
-
-#[derive(Clone, Copy)]
-pub struct PowerWell {
-    pub name: &'static str,
-    pub depends: &'static [&'static str],
-    pub ddis: &'static [&'static str],
-    pub pipes: &'static [&'static str],
-    pub transcoders: &'static [&'static str],
-    pub request: u32,
-    pub state: u32,
-    pub fuse_status: u32,
-}
-
-pub struct PowerWells {
-    pub ctl: MmioPtr<u32>,
-    pub ctl_aux: MmioPtr<u32>,
-    pub ctl_ddi: MmioPtr<u32>,
-    pub fuse_status: MmioPtr<u32>,
-    pub fuse_status_pg0: u32,
-    pub wells: Vec<PowerWell>,
-}
-
-impl PowerWells {
-    //TODO: return guard?
-    pub fn enable_well(&mut self, name: &'static str) -> Result<()> {
-        // Wait 20us for distribution of PG0
-        {
-            let timeout = Timeout::from_micros(20);
-            while !self.fuse_status.readf(self.fuse_status_pg0) {
-                timeout.run().map_err(|()| {
-                    log::warn!("timeout on distribution of power well 0");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        // self.wells iter copied to allow mutable self.enable_well later
-        for well in self.wells.iter().copied() {
-            if well.name == name {
-                // Enable dependent wells
-                for depend in well.depends.iter() {
-                    self.enable_well(depend)?;
-                }
-
-                if !self.ctl.readf(well.request) {
-                    log::info!("enabling power well {}", well.name);
-                }
-
-                // Set request bit
-                self.ctl.writef(well.request, true);
-
-                // Wait 100us for enabled state
-                {
-                    let timeout = Timeout::from_micros(100);
-                    while !self.ctl.readf(well.state) {
-                        timeout.run().map_err(|()| {
-                            log::warn!("timeout enabling power well {}", well.name);
-                            Error::new(EIO)
-                        })?;
-                    }
-                }
-
-                // Wait 20us for distribution
-                {
-                    let timeout = Timeout::from_micros(20);
-                    while !self.fuse_status.readf(well.fuse_status) {
-                        timeout.run().map_err(|()| {
-                            log::warn!("timeout on distribution of power well {}", well.name);
-                            Error::new(EIO)
-                        })?;
-                    }
-                }
-
-                return Ok(());
-            }
-        }
-        log::warn!("power well {} not found", name);
-        Err(Error::new(EIO))
-    }
-
-    pub fn enable_well_by_ddi(&mut self, name: &'static str) -> Result<()> {
-        for well in self.wells.iter() {
-            if well.ddis.contains(&name) {
-                return self.enable_well(well.name);
-            }
-        }
-        log::warn!("power well for DDI {} not found", name);
-        Err(Error::new(EIO))
-    }
-
-    pub fn enable_well_by_pipe(&mut self, name: &'static str) -> Result<()> {
-        for well in self.wells.iter() {
-            if well.pipes.contains(&name) {
-                return self.enable_well(well.name);
-            }
-        }
-        log::warn!("power well for pipe {} not found", name);
-        Err(Error::new(EIO))
-    }
-
-    pub fn enable_well_by_transcoder(&mut self, name: &'static str) -> Result<()> {
-        for well in self.wells.iter() {
-            if well.transcoders.contains(&name) {
-                return self.enable_well(well.name);
-            }
-        }
-        log::warn!("power well for transcoder {} not found", name);
-        Err(Error::new(EIO))
-    }
-
-    pub fn kabylake(gttmm: &MmioRegion) -> Result<Self> {
-        // IHD-OS-KBL-Vol 2c-1.17 PWR_WELL_CTL
-        let ctl = unsafe { gttmm.mmio(0x45404)? };
-        // Hack since these power ctl registers are combined
-        let ctl_aux = unsafe { gttmm.mmio(0x45404)? };
-        let ctl_ddi = unsafe { gttmm.mmio(0x45404)? };
-        // IHD-OS-KBL-Vol 2c-1.17 FUSE_STATUS
-        let fuse_status = unsafe { gttmm.mmio(0x42000)? };
-        let fuse_status_pg0 = 1 << 27;
-        let wells = vec![
-            PowerWell {
-                name: "1",
-                depends: &[],
-                ddis: &["A"],
-                pipes: &["A"],
-                transcoders: &["EDP"],
-                request: 1 << 29,
-                state: 1 << 28,
-                fuse_status: 1 << 26,
-            },
-            PowerWell {
-                name: "2",
-                depends: &["1"],
-                ddis: &["B", "C", "D", "E"],
-                pipes: &["B", "C"],
-                transcoders: &["A", "B", "C"],
-                request: 1 << 31,
-                state: 1 << 30,
-                fuse_status: 1 << 25,
-            },
-        ];
-        Ok(Self {
-            ctl,
-            ctl_aux,
-            ctl_ddi,
-            fuse_status,
-            fuse_status_pg0,
-            wells,
-        })
-    }
-
-    pub fn tigerlake(gttmm: &MmioRegion) -> Result<Self> {
-        // IHD-OS-TGL-Vol 2c-12.21 PWR_WELL_CTL
-        let ctl = unsafe { gttmm.mmio(0x45404)? };
-        // IHD-OS-TGL-Vol 2c-12.21 PWR_WELL_CTL_AUX
-        let ctl_aux = unsafe { gttmm.mmio(0x45444)? };
-        // IHD-OS-TGL-Vol 2c-12.21 PWR_WELL_CTL_DDI
-        let ctl_ddi = unsafe { gttmm.mmio(0x45454)? };
-        // IHD-OS-TGL-Vol 2c-12.21 FUSE_STATUS
-        let fuse_status = unsafe { gttmm.mmio(0x42000)? };
-        let fuse_status_pg0 = 1 << 27;
-        let wells = vec![
-            // DBUF functionality, Pipe A, Transcoder A and DSI, DDI A-C, FBC, DSS
-            PowerWell {
-                name: "1",
-                depends: &[],
-                ddis: &["A", "B", "C"],
-                pipes: &["A"],
-                transcoders: &["A"],
-                request: 1 << 1,
-                state: 1 << 0,
-                fuse_status: 1 << 26,
-            },
-            // VDSC for pipe A
-            PowerWell {
-                name: "2",
-                depends: &["1"],
-                ddis: &[],
-                pipes: &[],
-                transcoders: &[],
-                request: 1 << 3,
-                state: 1 << 2,
-                fuse_status: 1 << 25,
-            },
-            // Pipe B, Audio, Transcoder WD, VGA, Transcoder B, DDI USBC1-6, KVMR
-            PowerWell {
-                name: "3",
-                depends: &["2"],
-                ddis: &["USBC1", "USBC2", "USBC3", "USBC4", "USBC5", "USBC6"],
-                pipes: &["B"],
-                transcoders: &["B"],
-                request: 1 << 5,
-                state: 1 << 4,
-                fuse_status: 1 << 24,
-            },
-            // Pipe C, Transcoder C
-            PowerWell {
-                name: "4",
-                depends: &["3"],
-                ddis: &[],
-                pipes: &["C"],
-                transcoders: &["C"],
-                request: 1 << 7,
-                state: 1 << 6,
-                fuse_status: 1 << 23,
-            },
-            // Pipe D, Transcoder D
-            PowerWell {
-                name: "5",
-                depends: &["4"],
-                ddis: &[],
-                pipes: &["D"],
-                transcoders: &["D"],
-                request: 1 << 9,
-                state: 1 << 8,
-                fuse_status: 1 << 22,
-            },
-        ];
-        Ok(Self {
-            ctl,
-            ctl_aux,
-            ctl_ddi,
-            fuse_status,
-            fuse_status_pg0,
-            wells,
-        })
-    }
-
-    pub fn alchemist(gttmm: &MmioRegion) -> Result<Self> {
-        // IHD-OS-ACM-Vol 2c-3.23 PWR_WELL_CTL
-        let ctl = unsafe { gttmm.mmio(0x45404)? };
-        // IHD-OS-ACM-Vol 2c-3.23 PWR_WELL_CTL_AUX
-        let ctl_aux = unsafe { gttmm.mmio(0x45444)? };
-        // IHD-OS-ACM-Vol 2c-3.23 PWR_WELL_CTL_DDI
-        let ctl_ddi = unsafe { gttmm.mmio(0x45454)? };
-        // IHD-OS-ACM-Vol 2c-3.23 FUSE_STATUS
-        let fuse_status = unsafe { gttmm.mmio(0x42000)? };
-        let fuse_status_pg0 = 1 << 27;
-        let wells = vec![
-            // DBUF functionality, Transcoder A, DDI A-B
-            PowerWell {
-                name: "1",
-                depends: &[],
-                ddis: &["A", "B"],
-                pipes: &[],
-                transcoders: &["A"],
-                request: 1 << 1,
-                state: 1 << 0,
-                fuse_status: 1 >> 26,
-            },
-            // Audio playback, Transcoder WD, VGA, DDI C-E, Type-C, KVMR
-            PowerWell {
-                name: "2",
-                depends: &["1"],
-                ddis: &["C", "D", "E", "USBC1", "USBC2", "USBC3", "USBC4"],
-                pipes: &[],
-                transcoders: &[],
-                request: 1 << 3,
-                state: 1 << 2,
-                fuse_status: 1 << 25,
-            },
-            // Pipe A, FBC
-            PowerWell {
-                name: "A",
-                depends: &["1"],
-                ddis: &[],
-                pipes: &["A"],
-                transcoders: &[],
-                request: 1 << 11,
-                state: 1 << 10,
-                fuse_status: 1 << 21,
-            },
-            // Pipe B, Transcoder B
-            PowerWell {
-                name: "B",
-                depends: &["2"],
-                ddis: &[],
-                pipes: &["B"],
-                transcoders: &["B"],
-                request: 1 << 13,
-                state: 1 << 12,
-                fuse_status: 1 << 20,
-            },
-            // Pipe C, Transcoder C
-            PowerWell {
-                name: "C",
-                depends: &["2"],
-                ddis: &[],
-                pipes: &["C"],
-                transcoders: &["C"],
-                request: 1 << 15,
-                state: 1 << 14,
-                fuse_status: 1 << 19,
-            },
-            // Pipe D, Transcoder D
-            PowerWell {
-                name: "D",
-                depends: &["2"],
-                ddis: &[],
-                pipes: &["D"],
-                transcoders: &["D"],
-                request: 1 << 17,
-                state: 1 << 16,
-                fuse_status: 1 << 18,
-            },
-        ];
-        Ok(Self {
-            ctl,
-            ctl_aux,
-            ctl_ddi,
-            fuse_status,
-            fuse_status_pg0,
-            wells,
-        })
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/scheme.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/scheme.rs
deleted file mode 100644
index 95db5bbffb..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/scheme.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-//TODO: this is copied from vesad and should be adapted
-
-use std::alloc::{self, Layout};
-use std::convert::TryInto;
-use std::ptr::{self, NonNull};
-use std::sync::Mutex;
-
-use driver_graphics::kms::connector::{KmsConnectorDriver, KmsConnectorStatus};
-use driver_graphics::kms::objects::{KmsCrtc, KmsCrtcState, KmsObjectId, KmsObjects};
-use driver_graphics::{Buffer, CursorPlane, Damage, GraphicsAdapter};
-use drm_sys::{
-    DRM_CAP_DUMB_BUFFER, DRM_CAP_DUMB_PREFER_SHADOW, DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT,
-};
-use syscall::{error::EINVAL, PAGE_SIZE};
-
-use super::pipe::DeviceFb;
-use super::Device;
-
-#[derive(Debug)]
-pub struct Connector {
-    framebuffer_id: usize,
-}
-
-impl KmsConnectorDriver for Connector {
-    type State = ();
-}
-
-impl GraphicsAdapter for Device {
-    type Connector = Connector;
-    type Crtc = ();
-
-    type Buffer = DumbFb;
-    type Framebuffer = ();
-
-    fn name(&self) -> &'static [u8] {
-        b"ihdgd"
-    }
-
-    fn desc(&self) -> &'static [u8] {
-        b"Intel HD Graphics"
-    }
-
-    fn init(&mut self, objects: &mut KmsObjects<Self>) {
-        self.init_inner();
-
-        // FIXME enumerate actual connectors
-        for (framebuffer_id, _) in self.framebuffers.iter().enumerate() {
-            let crtc = objects.add_crtc((), ());
-
-            objects.add_connector(Connector { framebuffer_id }, (), &[crtc]);
-        }
-    }
-
-    fn get_cap(&self, cap: u32) -> syscall::Result<u64> {
-        match cap {
-            DRM_CAP_DUMB_BUFFER => Ok(1),
-            DRM_CAP_DUMB_PREFER_SHADOW => Ok(0),
-            _ => Err(syscall::Error::new(EINVAL)),
-        }
-    }
-
-    fn set_client_cap(&self, cap: u32, _value: u64) -> syscall::Result<()> {
-        match cap {
-            // FIXME hide cursor plane unless this client cap is set
-            DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT => Ok(()),
-            _ => Err(syscall::Error::new(EINVAL)),
-        }
-    }
-
-    fn probe_connector(&mut self, objects: &mut KmsObjects<Self>, id: KmsObjectId) {
-        let mut connector = objects.get_connector(id).unwrap().lock().unwrap();
-        let framebuffer = &self.framebuffers[connector.driver_data.framebuffer_id];
-        connector.connection = KmsConnectorStatus::Connected;
-        connector.update_from_size(framebuffer.width as u32, framebuffer.height as u32);
-        // FIXME fetch EDID
-    }
-
-    fn create_dumb_buffer(&mut self, width: u32, height: u32) -> (Self::Buffer, u32) {
-        (DumbFb::new(width as usize, height as usize), width * 4)
-    }
-
-    fn map_dumb_buffer(&mut self, framebuffer: &Self::Buffer) -> *mut u8 {
-        framebuffer.ptr.as_ptr().cast::<u8>()
-    }
-
-    fn create_framebuffer(&mut self, _buffer: &Self::Buffer) -> Self::Framebuffer {
-        ()
-    }
-
-    fn set_crtc(
-        &mut self,
-        objects: &KmsObjects<Self>,
-        crtc: &Mutex<KmsCrtc<Self>>,
-        state: KmsCrtcState<Self>,
-        damage: Damage,
-    ) -> syscall::Result<()> {
-        let mut crtc = crtc.lock().unwrap();
-        let buffer = state
-            .fb_id
-            .map(|fb_id| objects.get_framebuffer(fb_id))
-            .transpose()?;
-        crtc.state = state;
-
-        for connector in objects.connectors() {
-            let connector = connector.lock().unwrap();
-
-            if connector.state.crtc_id != objects.crtc_ids()[crtc.crtc_index as usize] {
-                continue;
-            }
-
-            let framebuffer_id = connector.driver_data.framebuffer_id;
-
-            let framebuffer = &mut self.framebuffers[framebuffer_id];
-            if let Some(buffer) = buffer {
-                buffer.buffer.sync(framebuffer, damage)
-            } else {
-                let onscreen_ptr = framebuffer.buffer.virt.cast::<u32>();
-                for row in 0..framebuffer.height {
-                    unsafe {
-                        ptr::write_bytes(
-                            onscreen_ptr.add((row * framebuffer.stride) as usize),
-                            0,
-                            framebuffer.width as usize,
-                        );
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn hw_cursor_size(&self) -> Option<(u32, u32)> {
-        None
-    }
-
-    fn handle_cursor(&mut self, _cursor: &CursorPlane<Self::Buffer>, _dirty_fb: bool) {
-        unimplemented!("ihdgd does not support this function");
-    }
-}
-
-#[derive(Debug)]
-pub struct DumbFb {
-    width: usize,
-    height: usize,
-    ptr: NonNull<[u32]>,
-}
-
-impl DumbFb {
-    fn new(width: usize, height: usize) -> DumbFb {
-        let len = width * height;
-        let layout = Self::layout(len);
-        let ptr = unsafe { alloc::alloc_zeroed(layout) };
-        let ptr = ptr::slice_from_raw_parts_mut(ptr.cast(), len);
-        let ptr = NonNull::new(ptr).unwrap_or_else(|| alloc::handle_alloc_error(layout));
-
-        DumbFb { width, height, ptr }
-    }
-
-    #[inline]
-    fn layout(len: usize) -> Layout {
-        // optimizes to an integer mul
-        Layout::array::<u32>(len)
-            .unwrap()
-            .align_to(PAGE_SIZE)
-            .unwrap()
-    }
-}
-
-impl Drop for DumbFb {
-    fn drop(&mut self) {
-        let layout = Self::layout(self.ptr.len());
-        unsafe { alloc::dealloc(self.ptr.as_ptr().cast(), layout) };
-    }
-}
-
-impl Buffer for DumbFb {
-    fn size(&self) -> usize {
-        self.width * self.height * 4
-    }
-}
-
-impl DumbFb {
-    fn sync(&self, framebuffer: &mut DeviceFb, sync_rect: Damage) {
-        let sync_rect = sync_rect.clip(
-            self.width.try_into().unwrap(),
-            self.height.try_into().unwrap(),
-        );
-
-        let start_x: usize = sync_rect.x.try_into().unwrap();
-        let start_y: usize = sync_rect.y.try_into().unwrap();
-        let w: usize = sync_rect.width.try_into().unwrap();
-        let h: usize = sync_rect.height.try_into().unwrap();
-
-        let offscreen_ptr = self.ptr.as_ptr() as *mut u32;
-        let onscreen_ptr = framebuffer.buffer.virt.cast::<u32>();
-
-        for row in start_y..start_y + h {
-            unsafe {
-                ptr::copy(
-                    offscreen_ptr.add(row * self.width + start_x),
-                    onscreen_ptr.add(row * framebuffer.stride as usize / 4 + start_x),
-                    w,
-                );
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/device/transcoder.rs b/recipes/core/base/drivers/graphics/ihdgd/src/device/transcoder.rs
deleted file mode 100644
index f5a23be1e2..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/device/transcoder.rs
+++ /dev/null
@@ -1,258 +0,0 @@
-use common::io::{Io, MmioPtr};
-use syscall::error::Result;
-
-use super::{MmioRegion, Pipe};
-
-// IHD-OS-KBL-Vol 2c-1.17 TRANS_CONF
-// IHD-OS-TGL-Vol 2c-12.21 TRANS_CONF
-pub const TRANS_CONF_ENABLE: u32 = 1 << 31;
-pub const TRANS_CONF_STATE: u32 = 1 << 30;
-pub const TRANS_CONF_MODE_MASK: u32 = 0b11 << 21;
-
-// IHD-OS-KBL-Vol 2c-1.17 TRANS_DDI_FUNC_CTL
-// IHD-OS-TGL-Vol 2c-12.21 TRANS_DDI_FUNC_CTL
-pub const TRANS_DDI_FUNC_CTL_ENABLE: u32 = 1 << 31;
-pub const TRANS_DDI_FUNC_CTL_MODE_HDMI: u32 = 0b000 << 24;
-pub const TRANS_DDI_FUNC_CTL_MODE_DVI: u32 = 0b001 << 24;
-pub const TRANS_DDI_FUNC_CTL_MODE_DP_SST: u32 = 0b010 << 24;
-pub const TRANS_DDI_FUNC_CTL_MODE_DP_MST: u32 = 0b011 << 24;
-pub const TRANS_DDI_FUNC_CTL_BPC_8: u32 = 0b000 << 20;
-pub const TRANS_DDI_FUNC_CTL_BPC_10: u32 = 0b001 << 20;
-pub const TRANS_DDI_FUNC_CTL_BPC_6: u32 = 0b010 << 20;
-pub const TRANS_DDI_FUNC_CTL_BPC_12: u32 = 0b011 << 20;
-pub const TRANS_DDI_FUNC_CTL_SYNC_POLARITY_HSHIGH: u32 = 0b01 << 16;
-pub const TRANS_DDI_FUNC_CTL_SYNC_POLARITY_VSHIGH: u32 = 0b10 << 16;
-pub const TRANS_DDI_FUNC_CTL_DSI_INPUT_PIPE_SHIFT: u32 = 12;
-pub const TRANS_DDI_FUNC_CTL_PORT_WIDTH_1: u32 = 0b000 << 1;
-pub const TRANS_DDI_FUNC_CTL_PORT_WIDTH_2: u32 = 0b001 << 1;
-pub const TRANS_DDI_FUNC_CTL_PORT_WIDTH_3: u32 = 0b010 << 1;
-pub const TRANS_DDI_FUNC_CTL_PORT_WIDTH_4: u32 = 0b011 << 1;
-
-pub struct Transcoder {
-    pub name: &'static str,
-    pub index: usize,
-    pub clk_sel: MmioPtr<u32>,
-    pub clk_sel_shift: u32,
-    pub conf: MmioPtr<u32>,
-    pub ddi_func_ctl: MmioPtr<u32>,
-    pub ddi_func_ctl_ddi_shift: u32,
-    pub ddi_func_ctl_hdmi_scrambling: u32,
-    pub ddi_func_ctl_high_tmds_char_rate: u32,
-    pub ddi_func_ctl2: Option<MmioPtr<u32>>,
-    pub hblank: MmioPtr<u32>,
-    pub hsync: MmioPtr<u32>,
-    pub htotal: MmioPtr<u32>,
-    pub msa_misc: MmioPtr<u32>,
-    pub mult: MmioPtr<u32>,
-    pub push: Option<MmioPtr<u32>>,
-    pub space: MmioPtr<u32>,
-    pub stereo3d_ctl: MmioPtr<u32>,
-    pub vblank: MmioPtr<u32>,
-    pub vrr_ctl: Option<MmioPtr<u32>>,
-    pub vrr_flipline: Option<MmioPtr<u32>>,
-    pub vrr_status: Option<MmioPtr<u32>>,
-    pub vrr_status2: Option<MmioPtr<u32>>,
-    pub vrr_vmax: Option<MmioPtr<u32>>,
-    pub vrr_vmaxshift: Option<MmioPtr<u32>>,
-    pub vrr_vmin: Option<MmioPtr<u32>>,
-    pub vrr_vtotal_prev: Option<MmioPtr<u32>>,
-    pub vsync: MmioPtr<u32>,
-    pub vsyncshift: MmioPtr<u32>,
-    pub vtotal: MmioPtr<u32>,
-}
-
-impl Transcoder {
-    pub fn dump(&self) {
-        eprint!("Transcoder {} {}", self.name, self.index);
-        eprint!(" clk_sel {:08X}", self.clk_sel.read());
-        eprint!(" conf {:08X}", self.conf.read());
-        eprint!(" ddi_func_ctl {:08X}", self.ddi_func_ctl.read());
-        if let Some(reg) = &self.ddi_func_ctl2 {
-            eprint!(" ddi_func_ctl2 {:08X}", reg.read());
-        }
-        eprint!(" hblank {:08X}", self.hblank.read());
-        eprint!(" hsync {:08X}", self.hsync.read());
-        eprint!(" htotal {:08X}", self.htotal.read());
-        eprint!(" msa_misc {:08X}", self.msa_misc.read());
-        eprint!(" mult {:08X}", self.mult.read());
-        if let Some(reg) = &self.push {
-            eprint!(" push {:08X}", reg.read());
-        }
-        eprint!(" space {:08X}", self.space.read());
-        eprint!(" stereo3d_ctl {:08X}", self.stereo3d_ctl.read());
-        eprint!(" vblank {:08X}", self.vblank.read());
-        if let Some(reg) = &self.vrr_ctl {
-            eprint!(" vrr_ctl {:08X}", reg.read());
-        }
-        if let Some(reg) = &self.vrr_flipline {
-            eprint!(" vrr_flipline {:08X}", reg.read());
-        }
-        if let Some(reg) = &self.vrr_status {
-            eprint!(" vrr_status {:08X}", reg.read());
-        }
-        if let Some(reg) = &self.vrr_status2 {
-            eprint!(" vrr_status2 {:08X}", reg.read());
-        }
-        if let Some(reg) = &self.vrr_vmax {
-            eprint!(" vrr_vmax {:08X}", reg.read());
-        }
-        if let Some(reg) = &self.vrr_vmaxshift {
-            eprint!(" vrr_vmaxshift {:08X}", reg.read());
-        }
-        if let Some(reg) = &self.vrr_vmin {
-            eprint!(" vrr_vmin {:08X}", reg.read());
-        }
-        if let Some(reg) = &self.vrr_vtotal_prev {
-            eprint!(" vrr_vtotal_prev {:08X}", reg.read());
-        }
-        eprint!(" vsync {:08X}", self.vsync.read());
-        eprint!(" vsyncshift {:08X}", self.vsyncshift.read());
-        eprint!(" vtotal {:08X}", self.vtotal.read());
-        eprintln!();
-    }
-
-    pub fn modeset(&mut self, pipe: &mut Pipe, timing: &edid::DetailedTiming) {
-        let hactive = (timing.horizontal_active_pixels as u32) - 1;
-        let htotal = hactive + (timing.horizontal_blanking_pixels as u32);
-        let hsync_start = hactive + (timing.horizontal_front_porch as u32);
-        let hsync_end = hsync_start + (timing.horizontal_sync_width as u32);
-        let vactive = (timing.vertical_active_lines as u32) - 1;
-        let vtotal = vactive + (timing.vertical_blanking_lines as u32);
-        let vsync_start = vactive + (timing.vertical_front_porch as u32);
-        let vsync_end = vsync_start + (timing.vertical_sync_width as u32);
-
-        // Configure horizontal sync
-        self.htotal.write(hactive | (htotal << 16));
-        self.hblank.write(hactive | (htotal << 16));
-        self.hsync.write(hsync_start | (hsync_end << 16));
-
-        // Configure vertical sync
-        self.vtotal.write(vactive | (vtotal << 16));
-        self.vblank.write(vactive | (vtotal << 16));
-        self.vsync.write(vsync_start | (vsync_end << 16));
-
-        // Configure pipe
-        pipe.srcsz.write(vactive | (hactive << 16));
-    }
-
-    pub fn kabylake(gttmm: &MmioRegion) -> Result<Vec<Self>> {
-        let mut transcoders = Vec::with_capacity(4);
-        //TODO: Transcoder EDP
-        for (i, name) in ["A", "B", "C"].iter().enumerate() {
-            transcoders.push(Transcoder {
-                name,
-                index: i,
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_CLK_SEL
-                clk_sel: unsafe { gttmm.mmio(0x46140 + i * 0x4)? },
-                clk_sel_shift: 29,
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_CONF
-                conf: unsafe { gttmm.mmio(0x70008 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_DDI_FUNC_CTL
-                ddi_func_ctl: unsafe { gttmm.mmio(0x60400 + i * 0x1000)? },
-                ddi_func_ctl_ddi_shift: 28,
-                // HDMI scrambling not supported on Kaby Lake
-                ddi_func_ctl_hdmi_scrambling: 0,
-                ddi_func_ctl_high_tmds_char_rate: 0,
-                // N/A
-                ddi_func_ctl2: None,
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_HBLANK
-                hblank: unsafe { gttmm.mmio(0x60004 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_HSYNC
-                hsync: unsafe { gttmm.mmio(0x60008 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_HTOTAL
-                htotal: unsafe { gttmm.mmio(0x60000 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_MSA_MISC
-                msa_misc: unsafe { gttmm.mmio(0x60410 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_MULT
-                mult: unsafe { gttmm.mmio(0x6002C + i * 0x1000)? },
-                // N/A
-                push: None,
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_SPACE
-                space: unsafe { gttmm.mmio(0x60020 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_STEREO3D_CTL
-                stereo3d_ctl: unsafe { gttmm.mmio(0x70020 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_VBLANK
-                vblank: unsafe { gttmm.mmio(0x60010 + i * 0x1000)? },
-                // N/A
-                vrr_ctl: None,
-                vrr_flipline: None,
-                vrr_status: None,
-                vrr_status2: None,
-                vrr_vmax: None,
-                vrr_vmaxshift: None,
-                vrr_vmin: None,
-                vrr_vtotal_prev: None,
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_VSYNC
-                vsync: unsafe { gttmm.mmio(0x60014 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_VSYNCSHIFT
-                vsyncshift: unsafe { gttmm.mmio(0x60028 + i * 0x1000)? },
-                // IHD-OS-KBL-Vol 2c-1.17 TRANS_VTOTAL
-                vtotal: unsafe { gttmm.mmio(0x6000C + i * 0x1000)? },
-            });
-        }
-        Ok(transcoders)
-    }
-
-    pub fn tigerlake(gttmm: &MmioRegion) -> Result<Vec<Self>> {
-        let mut transcoders = Vec::with_capacity(4);
-        for (i, name) in ["A", "B", "C", "D"].iter().enumerate() {
-            transcoders.push(Transcoder {
-                name,
-                index: i,
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_CLK_SEL
-                clk_sel: unsafe { gttmm.mmio(0x46140 + i * 0x4)? },
-                clk_sel_shift: 28,
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_CONF
-                conf: unsafe { gttmm.mmio(0x70008 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_DDI_FUNC_CTL
-                ddi_func_ctl: unsafe { gttmm.mmio(0x60400 + i * 0x1000)? },
-                ddi_func_ctl_ddi_shift: 27,
-                ddi_func_ctl_hdmi_scrambling: 1 << 0,
-                ddi_func_ctl_high_tmds_char_rate: 1 << 4,
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_DDI_FUNC_CTL2
-                ddi_func_ctl2: Some(unsafe { gttmm.mmio(0x60404 + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_HBLANK
-                hblank: unsafe { gttmm.mmio(0x60004 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_HSYNC
-                hsync: unsafe { gttmm.mmio(0x60008 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_HTOTAL
-                htotal: unsafe { gttmm.mmio(0x60000 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_MSA_MISC
-                msa_misc: unsafe { gttmm.mmio(0x60410 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_MULT
-                mult: unsafe { gttmm.mmio(0x6002C + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_PUSH
-                push: Some(unsafe { gttmm.mmio(0x60A70 + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_SPACE
-                space: unsafe { gttmm.mmio(0x60020 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_STEREO3D_CTL
-                stereo3d_ctl: unsafe { gttmm.mmio(0x70020 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VBLANK
-                vblank: unsafe { gttmm.mmio(0x60010 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VRR_CTL
-                vrr_ctl: Some(unsafe { gttmm.mmio(0x60420 + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VRR_FLIPLINE
-                vrr_flipline: Some(unsafe { gttmm.mmio(0x60438 + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VRR_STATUS
-                vrr_status: Some(unsafe { gttmm.mmio(0x6042C + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VRR_STATUS2
-                vrr_status2: Some(unsafe { gttmm.mmio(0x6043C + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VRR_VMAX
-                vrr_vmax: Some(unsafe { gttmm.mmio(0x60424 + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VRR_VMAXSHIFT
-                vrr_vmaxshift: Some(unsafe { gttmm.mmio(0x60428 + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VRR_VMIN
-                vrr_vmin: Some(unsafe { gttmm.mmio(0x60434 + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VRR_VTOTAL_PREV
-                vrr_vtotal_prev: Some(unsafe { gttmm.mmio(0x60480 + i * 0x1000)? }),
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VSYNC
-                vsync: unsafe { gttmm.mmio(0x60014 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VSYNCSHIFT
-                vsyncshift: unsafe { gttmm.mmio(0x60028 + i * 0x1000)? },
-                // IHD-OS-TGL-Vol 2c-12.21 TRANS_VTOTAL
-                vtotal: unsafe { gttmm.mmio(0x6000C + i * 0x1000)? },
-            })
-        }
-        Ok(transcoders)
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/ihdgd/src/main.rs b/recipes/core/base/drivers/graphics/ihdgd/src/main.rs
deleted file mode 100644
index a8b6cc6038..0000000000
--- a/recipes/core/base/drivers/graphics/ihdgd/src/main.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use driver_graphics::GraphicsScheme;
-use event::{user_data, EventQueue};
-use pcid_interface::{irq_helpers::pci_allocate_interrupt_vector, PciFunctionHandle};
-use std::{
-    io::{Read, Write},
-    os::fd::AsRawFd,
-};
-
-mod device;
-use self::device::Device;
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_ihdg");
-
-    common::setup_logging(
-        "graphics",
-        "pci",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    log::info!("IHDG {}", pci_config.func.display());
-
-    let device = Device::new(&mut pcid_handle, &pci_config.func)
-        .expect("ihdgd: failed to initialize device");
-
-    let irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "ihdgd");
-
-    // Needs to be before GraphicsScheme::new to avoid a deadlock due to initnsmgr blocking on
-    // /scheme/event as it is already blocked on opening /scheme/display.ihdg.*.
-    // FIXME change the initnsmgr to not block on openat for the target scheme.
-    let event_queue: EventQueue<Source> =
-        EventQueue::new().expect("ihdgd: failed to create event queue");
-
-    let mut scheme = GraphicsScheme::new(device, format!("display.ihdg.{}", name), false);
-
-    user_data! {
-        enum Source {
-            Input,
-            Irq,
-            Scheme,
-        }
-    }
-
-    event_queue
-        .subscribe(
-            scheme.inputd_event_handle().as_raw_fd() as usize,
-            Source::Input,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-    event_queue
-        .subscribe(
-            irq_file.irq_handle().as_raw_fd() as usize,
-            Source::Irq,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    libredox::call::setrens(0, 0).expect("ihdgd: failed to enter null namespace");
-
-    daemon.ready();
-
-    let all = [Source::Input, Source::Irq, Source::Scheme];
-    for event in all
-        .into_iter()
-        .chain(event_queue.map(|e| e.expect("ihdgd: failed to get next event").user_data))
-    {
-        match event {
-            Source::Input => scheme.handle_vt_events(),
-            Source::Irq => {
-                let mut irq = [0; 8];
-                irq_file.irq_handle().read(&mut irq).unwrap();
-                if scheme.adapter_mut().handle_irq() {
-                    irq_file.irq_handle().write(&mut irq).unwrap();
-
-                    scheme.adapter_mut().handle_events();
-                    scheme.tick().unwrap();
-                }
-            }
-            Source::Scheme => {
-                scheme
-                    .tick()
-                    .expect("ihdgd: failed to handle scheme events");
-            }
-        }
-    }
-
-    std::process::exit(0);
-}
diff --git a/recipes/core/base/drivers/graphics/vesad/Cargo.toml b/recipes/core/base/drivers/graphics/vesad/Cargo.toml
deleted file mode 100644
index a248b31488..0000000000
--- a/recipes/core/base/drivers/graphics/vesad/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "vesad"
-description = "VESA driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-drm-sys.workspace = true
-orbclient.workspace = true
-ransid.workspace = true
-redox_syscall.workspace = true
-redox_event.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-graphics = { path = "../driver-graphics" }
-libredox.workspace = true
-
-[features]
-default = []
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/graphics/vesad/src/main.rs b/recipes/core/base/drivers/graphics/vesad/src/main.rs
deleted file mode 100644
index a4c07d1ee5..0000000000
--- a/recipes/core/base/drivers/graphics/vesad/src/main.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-extern crate orbclient;
-extern crate syscall;
-
-use driver_graphics::GraphicsScheme;
-use event::{user_data, EventQueue};
-use std::collections::HashMap;
-use std::env;
-use std::os::fd::AsRawFd;
-
-use crate::scheme::{FbAdapter, FrameBuffer};
-
-mod scheme;
-
-fn main() {
-    common::init();
-    daemon::Daemon::new(daemon);
-}
-fn daemon(daemon: daemon::Daemon) -> ! {
-    if env::var("FRAMEBUFFER_WIDTH").is_err() {
-        println!("vesad: No boot framebuffer");
-        daemon.ready();
-        std::process::exit(0);
-    }
-
-    let width = usize::from_str_radix(
-        &env::var("FRAMEBUFFER_WIDTH").expect("FRAMEBUFFER_WIDTH not set"),
-        16,
-    )
-    .expect("failed to parse FRAMEBUFFER_WIDTH");
-    let height = usize::from_str_radix(
-        &env::var("FRAMEBUFFER_HEIGHT").expect("FRAMEBUFFER_HEIGHT not set"),
-        16,
-    )
-    .expect("failed to parse FRAMEBUFFER_HEIGHT");
-    let phys = usize::from_str_radix(
-        &env::var("FRAMEBUFFER_ADDR").expect("FRAMEBUFFER_ADDR not set"),
-        16,
-    )
-    .expect("failed to parse FRAMEBUFFER_ADDR");
-    let stride = usize::from_str_radix(
-        &env::var("FRAMEBUFFER_STRIDE").expect("FRAMEBUFFER_STRIDE not set"),
-        16,
-    )
-    .expect("failed to parse FRAMEBUFFER_STRIDE");
-
-    println!(
-        "vesad: {}x{} stride {} at 0x{:X}",
-        width, height, stride, phys
-    );
-
-    if phys == 0 {
-        println!("vesad: Boot framebuffer at address 0");
-        daemon.ready();
-        std::process::exit(0);
-    }
-
-    let mut framebuffers = vec![unsafe { FrameBuffer::new(phys, width, height, stride) }];
-
-    //TODO: ideal maximum number of outputs?
-    let bootloader_env = std::fs::read_to_string("/scheme/sys/env")
-        .expect("failed to read env")
-        .lines()
-        .map(|line| {
-            let (env, value) = line.split_once('=').unwrap();
-            (env.to_owned(), value.to_owned())
-        })
-        .collect::<HashMap<String, String>>();
-    for i in 1..1024 {
-        match bootloader_env.get(&format!("FRAMEBUFFER{}", i)) {
-            Some(var) => match unsafe { FrameBuffer::parse(&var) } {
-                Some(fb) => {
-                    println!(
-                        "vesad: framebuffer {}: {}x{} stride {} at 0x{:X}",
-                        i, fb.width, fb.height, fb.stride, fb.phys
-                    );
-                    framebuffers.push(fb);
-                }
-                None => {
-                    eprintln!("vesad: framebuffer {}: failed to parse '{}'", i, var);
-                }
-            },
-            None => break,
-        };
-    }
-
-    let mut scheme =
-        GraphicsScheme::new(FbAdapter { framebuffers }, "display.vesa".to_owned(), true);
-
-    user_data! {
-        enum Source {
-            Input,
-            Scheme,
-        }
-    }
-
-    let event_queue: EventQueue<Source> =
-        EventQueue::new().expect("vesad: failed to create event queue");
-    event_queue
-        .subscribe(
-            scheme.inputd_event_handle().as_raw_fd() as usize,
-            Source::Input,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    libredox::call::setrens(0, 0).expect("vesad: failed to enter null namespace");
-
-    daemon.ready();
-
-    let all = [Source::Input, Source::Scheme];
-    for event in all
-        .into_iter()
-        .chain(event_queue.map(|e| e.expect("vesad: failed to get next event").user_data))
-    {
-        match event {
-            Source::Input => scheme.handle_vt_events(),
-            Source::Scheme => {
-                scheme
-                    .tick()
-                    .expect("vesad: failed to handle scheme events");
-            }
-        }
-    }
-
-    panic!();
-}
diff --git a/recipes/core/base/drivers/graphics/vesad/src/scheme.rs b/recipes/core/base/drivers/graphics/vesad/src/scheme.rs
deleted file mode 100644
index 5bf2be9125..0000000000
--- a/recipes/core/base/drivers/graphics/vesad/src/scheme.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-use std::alloc::{self, Layout};
-use std::convert::TryInto;
-use std::ptr::{self, NonNull};
-use std::sync::Mutex;
-
-use driver_graphics::kms::connector::{KmsConnectorDriver, KmsConnectorStatus};
-use driver_graphics::kms::objects::{KmsCrtc, KmsCrtcState, KmsObjectId, KmsObjects};
-use driver_graphics::{Buffer, CursorPlane, Damage, GraphicsAdapter};
-use drm_sys::{
-    DRM_CAP_DUMB_BUFFER, DRM_CAP_DUMB_PREFER_SHADOW, DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT,
-};
-use syscall::{EINVAL, PAGE_SIZE};
-
-#[derive(Debug)]
-pub struct FbAdapter {
-    pub framebuffers: Vec<FrameBuffer>,
-}
-
-#[derive(Debug)]
-pub struct Connector {
-    width: u32,
-    height: u32,
-    framebuffer_id: usize,
-}
-
-impl KmsConnectorDriver for Connector {
-    type State = ();
-}
-
-impl GraphicsAdapter for FbAdapter {
-    type Connector = Connector;
-    type Crtc = ();
-
-    type Buffer = GraphicScreen;
-    type Framebuffer = ();
-
-    fn name(&self) -> &'static [u8] {
-        b"vesad"
-    }
-
-    fn desc(&self) -> &'static [u8] {
-        b"VESA"
-    }
-
-    fn init(&mut self, objects: &mut KmsObjects<Self>) {
-        for (framebuffer_id, framebuffer) in self.framebuffers.iter().enumerate() {
-            let crtc = objects.add_crtc((), ());
-
-            objects.add_connector(
-                Connector {
-                    width: framebuffer.width as u32,
-                    height: framebuffer.height as u32,
-                    framebuffer_id,
-                },
-                (),
-                &[crtc],
-            );
-        }
-    }
-
-    fn get_cap(&self, cap: u32) -> syscall::Result<u64> {
-        match cap {
-            DRM_CAP_DUMB_BUFFER => Ok(1),
-            DRM_CAP_DUMB_PREFER_SHADOW => Ok(0),
-            _ => Err(syscall::Error::new(EINVAL)),
-        }
-    }
-
-    fn set_client_cap(&self, cap: u32, _value: u64) -> syscall::Result<()> {
-        match cap {
-            DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT => Ok(()),
-            _ => Err(syscall::Error::new(EINVAL)),
-        }
-    }
-
-    fn probe_connector(&mut self, objects: &mut KmsObjects<Self>, id: KmsObjectId) {
-        let mut connector = objects.get_connector(id).unwrap().lock().unwrap();
-        let connector = &mut *connector;
-        connector.connection = KmsConnectorStatus::Connected;
-        connector.update_from_size(connector.driver_data.width, connector.driver_data.height);
-    }
-
-    fn create_dumb_buffer(&mut self, width: u32, height: u32) -> (Self::Buffer, u32) {
-        (
-            GraphicScreen::new(width as usize, height as usize),
-            width * 4,
-        )
-    }
-
-    fn map_dumb_buffer(&mut self, framebuffer: &Self::Buffer) -> *mut u8 {
-        framebuffer.ptr.as_ptr().cast::<u8>()
-    }
-
-    fn create_framebuffer(&mut self, _buffer: &Self::Buffer) -> Self::Framebuffer {
-        ()
-    }
-
-    fn set_crtc(
-        &mut self,
-        objects: &KmsObjects<Self>,
-        crtc: &Mutex<KmsCrtc<Self>>,
-        state: KmsCrtcState<Self>,
-        damage: Damage,
-    ) -> syscall::Result<()> {
-        let mut crtc = crtc.lock().unwrap();
-        let buffer = state
-            .fb_id
-            .map(|fb_id| objects.get_framebuffer(fb_id))
-            .transpose()?;
-        crtc.state = state;
-
-        for connector in objects.connectors() {
-            let connector = connector.lock().unwrap();
-
-            if connector.state.crtc_id != objects.crtc_ids()[crtc.crtc_index as usize] {
-                continue;
-            }
-
-            let framebuffer_id = connector.driver_data.framebuffer_id;
-            let framebuffer = &mut self.framebuffers[framebuffer_id];
-
-            if let Some(buffer) = buffer {
-                buffer.buffer.sync(framebuffer, damage)
-            } else {
-                let onscreen_ptr = framebuffer.onscreen as *mut u32; // FIXME use as_mut_ptr once stable
-                for row in 0..framebuffer.height {
-                    unsafe {
-                        ptr::write_bytes(
-                            onscreen_ptr.add(row * framebuffer.stride),
-                            0,
-                            framebuffer.width,
-                        );
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn hw_cursor_size(&self) -> Option<(u32, u32)> {
-        None
-    }
-
-    fn handle_cursor(&mut self, _cursor: &CursorPlane<Self::Buffer>, _dirty_fb: bool) {
-        unimplemented!("Vesad does not support this function");
-    }
-}
-
-#[derive(Debug)]
-pub struct FrameBuffer {
-    pub onscreen: *mut [u32],
-    pub phys: usize,
-    pub width: usize,
-    pub height: usize,
-    pub stride: usize,
-}
-
-impl FrameBuffer {
-    pub unsafe fn new(phys: usize, width: usize, height: usize, stride: usize) -> Self {
-        let size = stride * height;
-        let virt = common::physmap(
-            phys,
-            size * 4,
-            common::Prot {
-                read: true,
-                write: true,
-            },
-            common::MemoryType::WriteCombining,
-        )
-        .expect("vesad: failed to map framebuffer") as *mut u32;
-
-        let onscreen = ptr::slice_from_raw_parts_mut(virt, size);
-
-        Self {
-            onscreen,
-            phys,
-            width,
-            height,
-            stride,
-        }
-    }
-
-    pub unsafe fn parse(var: &str) -> Option<Self> {
-        fn parse_number(part: &str) -> Option<usize> {
-            let (start, radix) = if part.starts_with("0x") {
-                (2, 16)
-            } else {
-                (0, 10)
-            };
-            match usize::from_str_radix(&part[start..], radix) {
-                Ok(ok) => Some(ok),
-                Err(err) => {
-                    eprintln!("vesad: failed to parse '{}': {}", part, err);
-                    None
-                }
-            }
-        }
-
-        let mut parts = var.split(',');
-        let phys = parse_number(parts.next()?)?;
-        let width = parse_number(parts.next()?)?;
-        let height = parse_number(parts.next()?)?;
-        let stride = parse_number(parts.next()?)?;
-        Some(Self::new(phys, width, height, stride))
-    }
-}
-
-#[derive(Debug)]
-pub struct GraphicScreen {
-    width: usize,
-    height: usize,
-    ptr: NonNull<[u32]>,
-}
-
-impl GraphicScreen {
-    fn new(width: usize, height: usize) -> GraphicScreen {
-        let len = width * height;
-        let layout = Self::layout(len);
-        let ptr = unsafe { alloc::alloc_zeroed(layout) };
-        let ptr = ptr::slice_from_raw_parts_mut(ptr.cast(), len);
-        let ptr = NonNull::new(ptr).unwrap_or_else(|| alloc::handle_alloc_error(layout));
-
-        GraphicScreen { width, height, ptr }
-    }
-
-    #[inline]
-    fn layout(len: usize) -> Layout {
-        // optimizes to an integer mul
-        Layout::array::<u32>(len)
-            .unwrap()
-            .align_to(PAGE_SIZE)
-            .unwrap()
-    }
-}
-
-impl Drop for GraphicScreen {
-    fn drop(&mut self) {
-        let layout = Self::layout(self.ptr.len());
-        unsafe { alloc::dealloc(self.ptr.as_ptr().cast(), layout) };
-    }
-}
-
-impl Buffer for GraphicScreen {
-    fn size(&self) -> usize {
-        self.width * self.height * 4
-    }
-}
-
-impl GraphicScreen {
-    fn sync(&self, framebuffer: &mut FrameBuffer, sync_rect: Damage) {
-        let sync_rect = sync_rect.clip(
-            self.width.try_into().unwrap(),
-            self.height.try_into().unwrap(),
-        );
-
-        let start_x: usize = sync_rect.x.try_into().unwrap();
-        let start_y: usize = sync_rect.y.try_into().unwrap();
-        let w: usize = sync_rect.width.try_into().unwrap();
-        let h: usize = sync_rect.height.try_into().unwrap();
-
-        let offscreen_ptr = self.ptr.as_ptr() as *mut u32;
-        let onscreen_ptr = framebuffer.onscreen as *mut u32; // FIXME use as_mut_ptr once stable
-
-        for row in start_y..start_y + h {
-            unsafe {
-                ptr::copy(
-                    offscreen_ptr.add(row * self.width + start_x),
-                    onscreen_ptr.add(row * framebuffer.stride + start_x),
-                    w,
-                );
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/graphics/virtio-gpud/Cargo.toml b/recipes/core/base/drivers/graphics/virtio-gpud/Cargo.toml
deleted file mode 100644
index c36b783f1b..0000000000
--- a/recipes/core/base/drivers/graphics/virtio-gpud/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "virtio-gpud"
-description = "VirtIO-GPU driver"
-version = "0.1.0"
-edition = "2021"
-authors = ["Anhad Singh <andypython@protonmail.com>"]
-
-[dependencies]
-drm-sys.workspace = true
-log.workspace = true
-static_assertions.workspace = true
-futures = { version = "0.3.28", features = ["executor"] }
-anyhow.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-graphics = { path = "../driver-graphics" }
-virtio-core = { path = "../../virtio-core" }
-pcid = { path = "../../pcid" }
-
-redox_event.workspace = true
-redox_syscall.workspace = true
-orbclient.workspace = true
-spin.workspace = true
-libredox.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/graphics/virtio-gpud/src/main.rs b/recipes/core/base/drivers/graphics/virtio-gpud/src/main.rs
deleted file mode 100644
index 57e25ba70c..0000000000
--- a/recipes/core/base/drivers/graphics/virtio-gpud/src/main.rs
+++ /dev/null
@@ -1,615 +0,0 @@
-//! `virtio-gpu` is a virtio based graphics adapter. It can operate in 2D mode and in 3D mode.
-//!
-//! XXX: 3D mode will offload rendering ops to the host gpu and therefore requires a GPU with 3D support
-//! on the host machine.
-
-// Notes for the future:
-//
-// `virtio-gpu` 2D acceleration is just blitting. 3D acceleration has 2 kinds:
-//      - virgl - OpenGL
-//      - venus - Vulkan
-//
-// The Venus driver requires support for the following from the `virtio-gpu` kernel driver:
-//     - VIRTGPU_PARAM_3D_FEATURES
-//     - VIRTGPU_PARAM_CAPSET_QUERY_FIX
-//     - VIRTGPU_PARAM_RESOURCE_BLOB
-//     - VIRTGPU_PARAM_HOST_VISIBLE
-//     - VIRTGPU_PARAM_CROSS_DEVICE
-//     - VIRTGPU_PARAM_CONTEXT_INIT
-//
-// cc https://docs.mesa3d.org/drivers/venus.html
-// cc https://docs.mesa3d.org/drivers/virgl.html
-
-use std::os::fd::AsRawFd;
-use std::sync::atomic::{AtomicU32, Ordering};
-
-use driver_graphics::GraphicsAdapter;
-use event::{user_data, EventQueue};
-use pcid_interface::PciFunctionHandle;
-
-use virtio_core::utils::VolatileCell;
-use virtio_core::MSIX_PRIMARY_VECTOR;
-
-mod scheme;
-
-//const VIRTIO_GPU_F_VIRGL: u32 = 0;
-const VIRTIO_GPU_F_EDID: u32 = 1;
-//const VIRTIO_GPU_F_RESOURCE_UUID: u32 = 2;
-//const VIRTIO_GPU_F_RESOURCE_BLOB: u32 = 3;
-//const VIRTIO_GPU_F_CONTEXT_INIT: u32 = 4;
-
-const VIRTIO_GPU_EVENT_DISPLAY: u32 = 1 << 0;
-const VIRTIO_GPU_MAX_SCANOUTS: usize = 16;
-
-#[repr(C)]
-pub struct GpuConfig {
-    /// Signals pending events to the driver.
-    pub events_read: VolatileCell<u32>, // read-only
-    /// Clears pending events in the device (write-to-clear).
-    pub events_clear: VolatileCell<u32>, // write-only
-
-    pub num_scanouts: VolatileCell<u32>,
-    pub num_capsets: VolatileCell<u32>,
-}
-
-impl GpuConfig {
-    #[inline]
-    pub fn num_scanouts(&self) -> u32 {
-        self.num_scanouts.get()
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq)]
-#[repr(u32)]
-pub enum CommandTy {
-    Undefined = 0,
-
-    // 2D commands
-    GetDisplayInfo = 0x0100,
-    ResourceCreate2d,
-    ResourceUnref,
-    SetScanout,
-    ResourceFlush,
-    TransferToHost2d,
-    ResourceAttachBacking,
-    ResourceDetachBacking,
-    GetCapsetInfo,
-    GetCapset,
-    GetEdid,
-    ResourceAssignUuid,
-    ResourceCreateBlob,
-    SetScanoutBlob,
-
-    // 3D commands
-    CtxCreate = 0x0200,
-    CtxDestroy,
-    CtxAttachResource,
-    CtxDetachResource,
-    ResourceCreate3d,
-    TransferToHost3d,
-    TransferFromHost3d,
-    Submit3d,
-    ResourceMapBlob,
-    ResourceUnmapBlob,
-
-    // cursor commands
-    UpdateCursor = 0x0300,
-    MoveCursor,
-
-    // success responses
-    RespOkNodata = 0x1100,
-    RespOkDisplayInfo,
-    RespOkCapsetInfo,
-    RespOkCapset,
-    RespOkEdid,
-    RespOkResourceUuid,
-    RespOkMapInfo,
-
-    // error responses
-    RespErrUnspec = 0x1200,
-    RespErrOutOfMemory,
-    RespErrInvalidScanoutId,
-    RespErrInvalidResourceId,
-    RespErrInvalidContextId,
-    RespErrInvalidParameter,
-}
-
-static_assertions::const_assert_eq!(core::mem::size_of::<CommandTy>(), 4);
-
-const VIRTIO_GPU_FLAG_FENCE: u32 = 1 << 0;
-//const VIRTIO_GPU_FLAG_INFO_RING_IDX: u32 = 1 << 1;
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct ControlHeader {
-    pub ty: CommandTy,
-    pub flags: u32,
-    pub fence_id: u64,
-    pub ctx_id: u32,
-    pub ring_index: u8,
-    padding: [u8; 3],
-}
-
-impl ControlHeader {
-    pub fn with_ty(ty: CommandTy) -> Self {
-        Self {
-            ty,
-            ..Default::default()
-        }
-    }
-}
-
-impl Default for ControlHeader {
-    fn default() -> Self {
-        Self {
-            ty: CommandTy::Undefined,
-            flags: 0,
-            fence_id: 0,
-            ctx_id: 0,
-            ring_index: 0,
-            padding: [0; 3],
-        }
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C)]
-pub struct GpuRect {
-    pub x: u32,
-    pub y: u32,
-    pub width: u32,
-    pub height: u32,
-}
-
-impl GpuRect {
-    pub fn new(x: u32, y: u32, width: u32, height: u32) -> Self {
-        Self {
-            x,
-            y,
-            width,
-            height,
-        }
-    }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct DisplayInfo {
-    rect: GpuRect,
-    pub enabled: u32,
-    pub flags: u32,
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct GetDisplayInfo {
-    pub header: ControlHeader,
-    pub display_info: [DisplayInfo; VIRTIO_GPU_MAX_SCANOUTS],
-}
-
-impl Default for GetDisplayInfo {
-    fn default() -> Self {
-        Self {
-            header: ControlHeader {
-                ty: CommandTy::GetDisplayInfo,
-                ..Default::default()
-            },
-
-            display_info: unsafe { core::mem::zeroed() },
-        }
-    }
-}
-
-static RESOURCE_ALLOC: AtomicU32 = AtomicU32::new(1); // XXX: 0 is reserved for whatever that takes `resource_id`.
-
-#[derive(PartialEq, Eq, Debug, Copy, Clone)]
-#[repr(C)]
-pub struct ResourceId(u32);
-
-impl ResourceId {
-    const NONE: ResourceId = ResourceId(0);
-
-    fn alloc() -> Self {
-        ResourceId(RESOURCE_ALLOC.fetch_add(1, Ordering::SeqCst))
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-#[repr(u32)]
-pub enum ResourceFormat {
-    Unknown = 0,
-
-    Bgrx = 2,
-    Xrgb = 4,
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct ResourceCreate2d {
-    pub header: ControlHeader,
-    resource_id: ResourceId,
-    format: ResourceFormat,
-    width: u32,
-    height: u32,
-}
-
-impl ResourceCreate2d {
-    fn new(resource_id: ResourceId, format: ResourceFormat, width: u32, height: u32) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::ResourceCreate2d),
-            resource_id,
-            format,
-            width,
-            height,
-        }
-    }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct MemEntry {
-    pub address: u64,
-    pub length: u32,
-    pub padding: u32,
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct AttachBacking {
-    pub header: ControlHeader,
-    pub resource_id: ResourceId,
-    pub num_entries: u32,
-}
-
-impl AttachBacking {
-    pub fn new(resource_id: ResourceId, num_entries: u32) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::ResourceAttachBacking),
-            resource_id,
-            num_entries,
-        }
-    }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct DetachBacking {
-    pub header: ControlHeader,
-    pub resource_id: ResourceId,
-    pub padding: u32,
-}
-
-impl DetachBacking {
-    pub fn new(resource_id: ResourceId) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::ResourceDetachBacking),
-            resource_id,
-            padding: 0,
-        }
-    }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct ResourceFlush {
-    pub header: ControlHeader,
-    pub rect: GpuRect,
-    pub resource_id: ResourceId,
-    pub padding: u32,
-}
-
-impl ResourceFlush {
-    pub fn new(resource_id: ResourceId, rect: GpuRect) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::ResourceFlush),
-            rect,
-            resource_id,
-            padding: 0,
-        }
-    }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct ResourceUnref {
-    pub header: ControlHeader,
-    pub resource_id: ResourceId,
-    pub padding: u32,
-}
-
-impl ResourceUnref {
-    pub fn new(resource_id: ResourceId) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::ResourceUnref),
-            resource_id,
-            padding: 0,
-        }
-    }
-}
-
-#[repr(C)]
-#[derive(Debug)]
-pub struct SetScanout {
-    pub header: ControlHeader,
-    pub rect: GpuRect,
-    pub scanout_id: u32,
-    pub resource_id: ResourceId,
-}
-
-impl SetScanout {
-    pub fn new(scanout_id: u32, resource_id: ResourceId, rect: GpuRect) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::SetScanout),
-
-            rect,
-            scanout_id,
-            resource_id,
-        }
-    }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct XferToHost2d {
-    pub header: ControlHeader,
-    pub rect: GpuRect,
-    pub offset: u64,
-    pub resource_id: ResourceId,
-    pub padding: u32,
-}
-
-impl XferToHost2d {
-    pub fn new(resource_id: ResourceId, rect: GpuRect, offset: u64) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::TransferToHost2d),
-            rect,
-            offset,
-            resource_id,
-            padding: 0,
-        }
-    }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct GetEdid {
-    pub header: ControlHeader,
-    pub scanout: u32,
-    pub padding: u32,
-}
-
-impl GetEdid {
-    pub fn new(scanout_id: u32) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::GetEdid),
-            scanout: scanout_id,
-            padding: 0,
-        }
-    }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct GetEdidResp {
-    pub header: ControlHeader,
-    pub size: u32,
-    pub padding: u32,
-    pub edid: [u8; 1024],
-}
-
-impl GetEdidResp {
-    pub fn new() -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::GetEdid),
-            size: 0,
-            padding: 0,
-            edid: [0; 1024],
-        }
-    }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct CursorPos {
-    pub scanout_id: u32,
-    pub x: i32,
-    pub y: i32,
-    _padding: u32,
-}
-
-impl CursorPos {
-    pub fn new(scanout_id: u32, x: i32, y: i32) -> Self {
-        Self {
-            scanout_id,
-            x,
-            y,
-            _padding: 0,
-        }
-    }
-}
-
-/* VIRTIO_GPU_CMD_UPDATE_CURSOR, VIRTIO_GPU_CMD_MOVE_CURSOR */
-#[derive(Debug)]
-#[repr(C)]
-pub struct UpdateCursor {
-    pub header: ControlHeader,
-    pub pos: CursorPos,
-    pub resource_id: ResourceId,
-    pub hot_x: i32,
-    pub hot_y: i32,
-    _padding: u32,
-}
-
-impl UpdateCursor {
-    pub fn update_cursor(x: i32, y: i32, hot_x: i32, hot_y: i32, resource_id: ResourceId) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::UpdateCursor),
-            pos: CursorPos::new(0, x, y),
-            resource_id,
-            hot_x,
-            hot_y,
-            _padding: 0,
-        }
-    }
-}
-
-pub struct MoveCursor {
-    pub header: ControlHeader,
-    pub pos: CursorPos,
-    pub resource_id: ResourceId,
-    pub hot_x: i32,
-    pub hot_y: i32,
-    _padding: u32,
-}
-
-impl MoveCursor {
-    pub fn move_cursor(x: i32, y: i32) -> Self {
-        Self {
-            header: ControlHeader::with_ty(CommandTy::MoveCursor),
-            pos: CursorPos::new(0, x, y),
-            resource_id: ResourceId(0),
-            hot_x: 0,
-            hot_y: 0,
-            _padding: 0,
-        }
-    }
-}
-
-static DEVICE: spin::Once<virtio_core::Device> = spin::Once::new();
-
-fn main() {
-    pcid_interface::pci_daemon(daemon_runner);
-}
-
-fn daemon_runner(redox_daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
-    daemon(redox_daemon, pcid_handle).unwrap();
-    unreachable!();
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> anyhow::Result<()> {
-    common::setup_logging(
-        "graphics",
-        "pci",
-        "virtio-gpud",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    // Double check that we have the right device.
-    //
-    // 0x1050 - virtio-gpu
-    let pci_config = pcid_handle.config();
-
-    assert_eq!(pci_config.func.full_device_id.device_id, 0x1050);
-    log::info!("virtio-gpu: initiating startup sequence :^)");
-
-    let device = DEVICE.try_call_once(|| virtio_core::probe_device(&mut pcid_handle))?;
-    let config = unsafe { &mut *(device.device_space as *mut GpuConfig) };
-
-    // Negotiate features.
-    let has_edid = device.transport.check_device_feature(VIRTIO_GPU_F_EDID);
-    if has_edid {
-        device.transport.ack_driver_feature(VIRTIO_GPU_F_EDID);
-    }
-    device.transport.finalize_features();
-
-    // Queue for sending control commands.
-    let control_queue = device
-        .transport
-        .setup_queue(MSIX_PRIMARY_VECTOR, &device.irq_handle)?;
-
-    // Queue for sending cursor updates.
-    let cursor_queue = device
-        .transport
-        .setup_queue(MSIX_PRIMARY_VECTOR, &device.irq_handle)?;
-
-    device.transport.setup_config_notify(MSIX_PRIMARY_VECTOR);
-
-    device.transport.run_device();
-
-    // Needs to be before GpuScheme::new to avoid a deadlock due to initnsmgr blocking on
-    // /scheme/event as it is already blocked on opening /scheme/display.virtio-gpu.
-    // FIXME change the initnsmgr to not block on openat for the target scheme.
-    let event_queue: EventQueue<Source> =
-        EventQueue::new().expect("virtio-gpud: failed to create event queue");
-
-    let mut scheme = scheme::GpuScheme::new(
-        config,
-        control_queue.clone(),
-        cursor_queue.clone(),
-        device.transport.clone(),
-        has_edid,
-    )?;
-    daemon.ready();
-
-    user_data! {
-        enum Source {
-            Input,
-            Scheme,
-            Interrupt,
-        }
-    }
-
-    event_queue
-        .subscribe(
-            scheme.inputd_event_handle().as_raw_fd() as usize,
-            Source::Input,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-    event_queue
-        .subscribe(
-            device.irq_handle.as_raw_fd() as usize,
-            Source::Interrupt,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    let all = [Source::Input, Source::Scheme, Source::Interrupt];
-    for event in all
-        .into_iter()
-        .chain(event_queue.map(|e| e.expect("virtio-gpud: failed to get next event").user_data))
-    {
-        match event {
-            Source::Input => scheme.handle_vt_events(),
-            Source::Scheme => {
-                scheme
-                    .tick()
-                    .expect("virtio-gpud: failed to process scheme events");
-            }
-            Source::Interrupt => loop {
-                let before_gen = device.transport.config_generation();
-
-                let events = scheme.adapter().config.events_read.get();
-
-                if events & VIRTIO_GPU_EVENT_DISPLAY != 0 {
-                    let (adapter, objects) = scheme.adapter_and_kms_objects_mut();
-                    futures::executor::block_on(async { adapter.update_displays().await.unwrap() });
-                    for connector_id in objects.connector_ids().to_vec() {
-                        adapter.probe_connector(objects, connector_id);
-                    }
-                    scheme.notify_displays_changed();
-                    scheme
-                        .adapter_mut()
-                        .config
-                        .events_clear
-                        .set(VIRTIO_GPU_EVENT_DISPLAY);
-                }
-
-                let after_gen = device.transport.config_generation();
-                if before_gen == after_gen {
-                    break;
-                }
-            },
-        }
-    }
-
-    std::process::exit(0);
-}
diff --git a/recipes/core/base/drivers/graphics/virtio-gpud/src/scheme.rs b/recipes/core/base/drivers/graphics/virtio-gpud/src/scheme.rs
deleted file mode 100644
index 22a985ee4e..0000000000
--- a/recipes/core/base/drivers/graphics/virtio-gpud/src/scheme.rs
+++ /dev/null
@@ -1,528 +0,0 @@
-use std::fmt;
-use std::sync::{Arc, Mutex};
-
-use common::{dma::Dma, sgl};
-use driver_graphics::kms::connector::{KmsConnectorDriver, KmsConnectorStatus};
-use driver_graphics::kms::objects::{KmsCrtc, KmsCrtcState, KmsObjectId, KmsObjects};
-use driver_graphics::{Buffer as DrmBuffer, CursorPlane, Damage, GraphicsAdapter, GraphicsScheme};
-use drm_sys::{
-    DRM_CAP_CURSOR_HEIGHT, DRM_CAP_CURSOR_WIDTH, DRM_CAP_DUMB_BUFFER, DRM_CAP_DUMB_PREFER_SHADOW,
-    DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT,
-};
-
-use syscall::{EINVAL, PAGE_SIZE};
-
-use virtio_core::spec::{Buffer, ChainBuilder, DescriptorFlags};
-use virtio_core::transport::{Error, Queue, Transport};
-
-use crate::*;
-
-impl Into<GpuRect> for Damage {
-    fn into(self) -> GpuRect {
-        GpuRect {
-            x: self.x,
-            y: self.y,
-            width: self.width,
-            height: self.height,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct VirtGpuConnector {
-    display_id: u32,
-}
-
-impl KmsConnectorDriver for VirtGpuConnector {
-    type State = ();
-}
-
-pub struct VirtGpuFramebuffer<'a> {
-    queue: Arc<Queue<'a>>,
-    id: ResourceId,
-    sgl: sgl::Sgl,
-    width: u32,
-    height: u32,
-}
-
-impl<'a> fmt::Debug for VirtGpuFramebuffer<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("VirtGpuFramebuffer")
-            .field("id", &self.id)
-            .field("sgl", &self.sgl)
-            .field("width", &self.width)
-            .field("height", &self.height)
-            .finish_non_exhaustive()
-    }
-}
-
-impl DrmBuffer for VirtGpuFramebuffer<'_> {
-    fn size(&self) -> usize {
-        (self.width * self.height * 4) as usize
-    }
-}
-
-impl Drop for VirtGpuFramebuffer<'_> {
-    fn drop(&mut self) {
-        futures::executor::block_on(async {
-            let request = Dma::new(ResourceUnref::new(self.id)).unwrap();
-
-            let header = Dma::new(ControlHeader::default()).unwrap();
-            let command = ChainBuilder::new()
-                .chain(Buffer::new(&request))
-                .chain(Buffer::new(&header).flags(DescriptorFlags::WRITE_ONLY))
-                .build();
-
-            self.queue.send(command).await;
-        });
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Display {
-    enabled: bool,
-    width: u32,
-    height: u32,
-    edid: Vec<u8>,
-    active_resource: Option<ResourceId>,
-}
-
-pub struct VirtGpuAdapter<'a> {
-    pub config: &'a mut GpuConfig,
-    control_queue: Arc<Queue<'a>>,
-    cursor_queue: Arc<Queue<'a>>,
-    transport: Arc<dyn Transport>,
-    has_edid: bool,
-    displays: Vec<Display>,
-    hidden_cursor: Option<Arc<VirtGpuFramebuffer<'a>>>,
-}
-
-impl<'a> fmt::Debug for VirtGpuAdapter<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("VirtGpuAdapter")
-            .field("displays", &self.displays)
-            .finish_non_exhaustive()
-    }
-}
-
-impl VirtGpuAdapter<'_> {
-    pub async fn update_displays(&mut self) -> Result<(), Error> {
-        let display_info = self.get_display_info().await?;
-        let raw_displays = &display_info.display_info[..self.config.num_scanouts() as usize];
-
-        self.displays.resize(
-            raw_displays.len(),
-            Display {
-                enabled: false,
-                width: 0,
-                height: 0,
-                edid: vec![],
-                active_resource: None,
-            },
-        );
-        for (i, info) in raw_displays.iter().enumerate() {
-            log::info!(
-                "virtio-gpu: display {i} ({}x{}px)",
-                info.rect.width,
-                info.rect.height
-            );
-
-            self.displays[i].enabled = info.enabled != 0;
-
-            if info.rect.width == 0 || info.rect.height == 0 {
-                // QEMU gives all displays other than the first a zero width and height, but trying
-                // to attach a zero sized framebuffer to the display will result an error, so
-                // default to 640x480px.
-                self.displays[i].width = 640;
-                self.displays[i].height = 480;
-            } else {
-                self.displays[i].width = info.rect.width;
-                self.displays[i].height = info.rect.height;
-            }
-
-            if self.has_edid {
-                let edid = self.get_edid(i as u32).await?;
-                self.displays[i].edid = edid.edid[..edid.size as usize].to_vec();
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn send_request<T>(&self, request: Dma<T>) -> Result<Dma<ControlHeader>, Error> {
-        let header = Dma::new(ControlHeader::default())?;
-        let command = ChainBuilder::new()
-            .chain(Buffer::new(&request))
-            .chain(Buffer::new(&header).flags(DescriptorFlags::WRITE_ONLY))
-            .build();
-
-        self.control_queue.send(command).await;
-        Ok(header)
-    }
-
-    async fn send_request_fenced<T>(&self, request: Dma<T>) -> Result<Dma<ControlHeader>, Error> {
-        let mut header = Dma::new(ControlHeader::default())?;
-        header.flags |= VIRTIO_GPU_FLAG_FENCE;
-        let command = ChainBuilder::new()
-            .chain(Buffer::new(&request))
-            .chain(Buffer::new(&header).flags(DescriptorFlags::WRITE_ONLY))
-            .build();
-
-        self.control_queue.send(command).await;
-        Ok(header)
-    }
-
-    async fn get_display_info(&self) -> Result<Dma<GetDisplayInfo>, Error> {
-        let header = Dma::new(ControlHeader::with_ty(CommandTy::GetDisplayInfo))?;
-
-        let response = Dma::new(GetDisplayInfo::default())?;
-        let command = ChainBuilder::new()
-            .chain(Buffer::new(&header))
-            .chain(Buffer::new(&response).flags(DescriptorFlags::WRITE_ONLY))
-            .build();
-
-        self.control_queue.send(command).await;
-        assert!(response.header.ty == CommandTy::RespOkDisplayInfo);
-
-        Ok(response)
-    }
-
-    async fn get_edid(&self, scanout_id: u32) -> Result<Dma<GetEdidResp>, Error> {
-        let header = Dma::new(GetEdid::new(scanout_id))?;
-
-        let response = Dma::new(GetEdidResp::new())?;
-        let command = ChainBuilder::new()
-            .chain(Buffer::new(&header))
-            .chain(Buffer::new(&response).flags(DescriptorFlags::WRITE_ONLY))
-            .build();
-
-        self.control_queue.send(command).await;
-        assert!(response.header.ty == CommandTy::RespOkEdid);
-
-        Ok(response)
-    }
-
-    fn update_cursor(
-        &mut self,
-        cursor: &VirtGpuFramebuffer,
-        x: i32,
-        y: i32,
-        hot_x: i32,
-        hot_y: i32,
-    ) {
-        //Transfering cursor resource to host
-        futures::executor::block_on(async {
-            let transfer_request = Dma::new(XferToHost2d::new(
-                cursor.id,
-                GpuRect {
-                    x: 0,
-                    y: 0,
-                    width: 64,
-                    height: 64,
-                },
-                0,
-            ))
-            .unwrap();
-            let header = self.send_request_fenced(transfer_request).await.unwrap();
-            assert_eq!(header.ty, CommandTy::RespOkNodata);
-        });
-
-        //Update the cursor position
-        let request = Dma::new(UpdateCursor::update_cursor(x, y, hot_x, hot_y, cursor.id)).unwrap();
-        futures::executor::block_on(async {
-            let command = ChainBuilder::new().chain(Buffer::new(&request)).build();
-            self.cursor_queue.send(command).await;
-        });
-    }
-
-    fn move_cursor(&mut self, x: i32, y: i32) {
-        let request = Dma::new(MoveCursor::move_cursor(x, y)).unwrap();
-
-        futures::executor::block_on(async {
-            let command = ChainBuilder::new().chain(Buffer::new(&request)).build();
-            self.cursor_queue.send(command).await;
-        });
-    }
-
-    fn disable_cursor(&mut self) {
-        if self.hidden_cursor.is_none() {
-            let (width, height) = self.hw_cursor_size().unwrap();
-            let (cursor, stride) = self.create_dumb_buffer(width, height);
-            unsafe {
-                core::ptr::write_bytes(
-                    cursor.sgl.as_ptr() as *mut u8,
-                    0,
-                    (stride * height) as usize,
-                );
-            }
-            self.hidden_cursor = Some(Arc::new(cursor));
-        }
-        let hidden_cursor = self.hidden_cursor.as_ref().unwrap().clone();
-
-        self.update_cursor(&hidden_cursor, 0, 0, 0, 0);
-    }
-}
-
-impl<'a> GraphicsAdapter for VirtGpuAdapter<'a> {
-    type Connector = VirtGpuConnector;
-    type Crtc = ();
-
-    type Buffer = VirtGpuFramebuffer<'a>;
-    type Framebuffer = ();
-
-    fn name(&self) -> &'static [u8] {
-        b"virtio-gpud"
-    }
-
-    fn desc(&self) -> &'static [u8] {
-        b"VirtIO GPU"
-    }
-
-    fn init(&mut self, objects: &mut KmsObjects<Self>) {
-        futures::executor::block_on(async {
-            self.update_displays().await.unwrap();
-        });
-
-        for display_id in 0..self.config.num_scanouts.get() {
-            let crtc = objects.add_crtc((), ());
-
-            objects.add_connector(VirtGpuConnector { display_id }, (), &[crtc]);
-        }
-    }
-
-    fn get_cap(&self, cap: u32) -> syscall::Result<u64> {
-        match cap {
-            DRM_CAP_DUMB_BUFFER => Ok(1),
-            DRM_CAP_DUMB_PREFER_SHADOW => Ok(0),
-            DRM_CAP_CURSOR_WIDTH => Ok(64),
-            DRM_CAP_CURSOR_HEIGHT => Ok(64),
-            _ => Err(syscall::Error::new(EINVAL)),
-        }
-    }
-
-    fn set_client_cap(&self, cap: u32, _value: u64) -> syscall::Result<()> {
-        match cap {
-            // FIXME hide cursor plane unless this client cap is set
-            DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT => Ok(()),
-            _ => Err(syscall::Error::new(EINVAL)),
-        }
-    }
-
-    fn probe_connector(&mut self, objects: &mut KmsObjects<Self>, id: KmsObjectId) {
-        futures::executor::block_on(async {
-            let mut connector = objects.get_connector(id).unwrap().lock().unwrap();
-            let display = &self.displays[connector.driver_data.display_id as usize];
-
-            connector.connection = if display.enabled {
-                KmsConnectorStatus::Connected
-            } else {
-                KmsConnectorStatus::Disconnected
-            };
-
-            if self.has_edid {
-                connector.update_from_edid(&display.edid);
-
-                drop(connector);
-
-                let blob = objects.add_blob(display.edid.clone());
-                objects.get_connector(id).unwrap().lock().unwrap().edid = blob;
-            } else {
-                connector.update_from_size(display.width, display.height);
-            }
-        });
-    }
-
-    fn create_dumb_buffer(&mut self, width: u32, height: u32) -> (Self::Buffer, u32) {
-        futures::executor::block_on(async {
-            let bpp = 32;
-            let fb_size = width as usize * height as usize * bpp / 8;
-            let sgl = sgl::Sgl::new(fb_size).unwrap();
-
-            unsafe {
-                core::ptr::write_bytes(sgl.as_ptr() as *mut u8, 255, fb_size);
-            }
-
-            let res_id = ResourceId::alloc();
-
-            // Create a host resource using `VIRTIO_GPU_CMD_RESOURCE_CREATE_2D`.
-            let request = Dma::new(ResourceCreate2d::new(
-                res_id,
-                ResourceFormat::Bgrx,
-                width,
-                height,
-            ))
-            .unwrap();
-
-            let header = self.send_request(request).await.unwrap();
-            assert_eq!(header.ty, CommandTy::RespOkNodata);
-
-            // Use the allocated framebuffer from the guest ram, and attach it as backing
-            // storage to the resource just created, using `VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING`.
-
-            let mut mem_entries =
-                unsafe { Dma::zeroed_slice(sgl.chunks().len()).unwrap().assume_init() };
-            for (entry, chunk) in mem_entries.iter_mut().zip(sgl.chunks().iter()) {
-                *entry = MemEntry {
-                    address: chunk.phys as u64,
-                    length: chunk.length.next_multiple_of(PAGE_SIZE) as u32,
-                    padding: 0,
-                };
-            }
-
-            let attach_request =
-                Dma::new(AttachBacking::new(res_id, mem_entries.len() as u32)).unwrap();
-            let header = Dma::new(ControlHeader::default()).unwrap();
-            let command = ChainBuilder::new()
-                .chain(Buffer::new(&attach_request))
-                .chain(Buffer::new_unsized(&mem_entries))
-                .chain(Buffer::new(&header).flags(DescriptorFlags::WRITE_ONLY))
-                .build();
-
-            self.control_queue.send(command).await;
-            assert_eq!(header.ty, CommandTy::RespOkNodata);
-
-            (
-                VirtGpuFramebuffer {
-                    queue: self.control_queue.clone(),
-                    id: res_id,
-                    sgl,
-                    width,
-                    height,
-                },
-                width * 4,
-            )
-        })
-    }
-
-    fn map_dumb_buffer(&mut self, buffer: &Self::Buffer) -> *mut u8 {
-        buffer.sgl.as_ptr()
-    }
-
-    fn create_framebuffer(&mut self, _buffer: &Self::Buffer) -> Self::Framebuffer {
-        ()
-    }
-
-    fn set_crtc(
-        &mut self,
-        objects: &KmsObjects<Self>,
-        crtc: &Mutex<KmsCrtc<Self>>,
-        state: KmsCrtcState<Self>,
-        damage: Damage,
-    ) -> syscall::Result<()> {
-        futures::executor::block_on(async {
-            let mut crtc = crtc.lock().unwrap();
-            let framebuffer = state
-                .fb_id
-                .map(|fb_id| objects.get_framebuffer(fb_id))
-                .transpose()?;
-            crtc.state = state;
-
-            for connector in objects.connectors() {
-                let connector = connector.lock().unwrap();
-
-                if connector.state.crtc_id != objects.crtc_ids()[crtc.crtc_index as usize] {
-                    continue;
-                }
-
-                let display_id = connector.driver_data.display_id;
-
-                let Some(framebuffer) = framebuffer else {
-                    let scanout_request = Dma::new(SetScanout::new(
-                        display_id,
-                        ResourceId::NONE,
-                        GpuRect::new(0, 0, 0, 0),
-                    ))
-                    .unwrap();
-                    let header = self.send_request(scanout_request).await.unwrap();
-                    assert_eq!(header.ty, CommandTy::RespOkNodata);
-                    self.displays[display_id as usize].active_resource = None;
-                    return Ok(());
-                };
-
-                let req = Dma::new(XferToHost2d::new(
-                    framebuffer.buffer.id,
-                    GpuRect {
-                        x: 0,
-                        y: 0,
-                        width: framebuffer.width,
-                        height: framebuffer.height,
-                    },
-                    0,
-                ))
-                .unwrap();
-                let header = self.send_request(req).await.unwrap();
-                assert_eq!(header.ty, CommandTy::RespOkNodata);
-
-                // FIXME once we support resizing we also need to check that the current and target size match
-                if self.displays[display_id as usize].active_resource != Some(framebuffer.buffer.id)
-                {
-                    let scanout_request = Dma::new(SetScanout::new(
-                        display_id,
-                        framebuffer.buffer.id,
-                        GpuRect::new(0, 0, framebuffer.width, framebuffer.height),
-                    ))
-                    .unwrap();
-                    let header = self.send_request(scanout_request).await.unwrap();
-                    assert_eq!(header.ty, CommandTy::RespOkNodata);
-                    self.displays[display_id as usize].active_resource =
-                        Some(framebuffer.buffer.id);
-                }
-
-                let flush = ResourceFlush::new(
-                    framebuffer.buffer.id,
-                    damage.clip(framebuffer.width, framebuffer.height).into(),
-                );
-                let header = self.send_request(Dma::new(flush).unwrap()).await.unwrap();
-                assert_eq!(header.ty, CommandTy::RespOkNodata);
-            }
-
-            Ok(())
-        })
-    }
-
-    fn hw_cursor_size(&self) -> Option<(u32, u32)> {
-        Some((64, 64))
-    }
-
-    fn handle_cursor(&mut self, cursor: &CursorPlane<Self::Buffer>, dirty_fb: bool) {
-        if let Some(buffer) = &cursor.buffer {
-            if dirty_fb {
-                self.update_cursor(buffer, cursor.x, cursor.y, cursor.hot_x, cursor.hot_y);
-            } else {
-                self.move_cursor(cursor.x, cursor.y);
-            }
-        } else {
-            if dirty_fb {
-                self.disable_cursor();
-            }
-        }
-    }
-}
-
-pub struct GpuScheme {}
-
-impl<'a> GpuScheme {
-    pub fn new(
-        config: &'a mut GpuConfig,
-        control_queue: Arc<Queue<'a>>,
-        cursor_queue: Arc<Queue<'a>>,
-        transport: Arc<dyn Transport>,
-        has_edid: bool,
-    ) -> Result<GraphicsScheme<VirtGpuAdapter<'a>>, Error> {
-        let adapter = VirtGpuAdapter {
-            config,
-            control_queue,
-            cursor_queue,
-            transport,
-            has_edid,
-            displays: vec![],
-            hidden_cursor: None,
-        };
-
-        Ok(GraphicsScheme::new(
-            adapter,
-            "display.virtio-gpu".to_owned(),
-            false,
-        ))
-    }
-}
diff --git a/recipes/core/base/drivers/hwd/.gitignore b/recipes/core/base/drivers/hwd/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/hwd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/hwd/Cargo.toml b/recipes/core/base/drivers/hwd/Cargo.toml
deleted file mode 100644
index 3d37cfb3f3..0000000000
--- a/recipes/core/base/drivers/hwd/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "hwd"
-description = "ACPI and DeviceTree handling daemon"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-fdt.workspace = true
-log.workspace = true
-ron.workspace = true
-libredox = { workspace = true, default-features = false, features = ["std", "call"] }
-
-amlserde = { path = "../amlserde" }
-common = { path = "../common" }
-daemon = { path = "../../daemon" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/hwd/src/backend/acpi.rs b/recipes/core/base/drivers/hwd/src/backend/acpi.rs
deleted file mode 100644
index 3da41d6382..0000000000
--- a/recipes/core/base/drivers/hwd/src/backend/acpi.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use amlserde::{AmlSerde, AmlSerdeValue};
-use std::{error::Error, fs, process::Command};
-
-use super::Backend;
-
-pub struct AcpiBackend {
-    rxsdt: Vec<u8>,
-}
-
-impl Backend for AcpiBackend {
-    fn new() -> Result<Self, Box<dyn Error>> {
-        let rxsdt = fs::read("/scheme/kernel.acpi/rxsdt")?;
-
-        // Spawn acpid
-        //TODO: pass rxsdt data to acpid?
-        #[allow(deprecated, reason = "we can't yet move this to init")]
-        daemon::Daemon::spawn(Command::new("acpid"));
-
-        Ok(Self { rxsdt })
-    }
-
-    fn probe(&mut self) -> Result<(), Box<dyn Error>> {
-        // Read symbols from acpi scheme
-        let entries = fs::read_dir("/scheme/acpi/symbols")?;
-        // TODO: Reimplement with getdents?
-        let symbols_fd = libredox::Fd::open(
-            "/scheme/acpi/symbols",
-            libredox::flag::O_DIRECTORY | libredox::flag::O_RDONLY,
-            0,
-        )?;
-        for entry_res in entries {
-            let entry = entry_res?;
-            if let Some(file_name) = entry.file_name().to_str() {
-                if file_name.ends_with("_CID") || file_name.ends_with("_HID") {
-                    let symbol_fd = symbols_fd.openat(file_name, libredox::flag::O_RDONLY, 0)?;
-                    let stat = symbol_fd.stat()?;
-                    let mut buf: Vec<u8> = vec![0u8; stat.st_size as usize];
-                    let count = symbol_fd.read(&mut buf)?;
-                    buf.truncate(count);
-                    let ron = String::from_utf8(buf)?;
-                    let AmlSerde { name, value } = ron::from_str(&ron)?;
-                    let id = match value {
-                        AmlSerdeValue::Integer(integer) => {
-                            let vendor = integer & 0xFFFF;
-                            let device = (integer >> 16) & 0xFFFF;
-                            let vendor_rev = ((vendor & 0xFF) << 8) | vendor >> 8;
-                            let vendor_1 = (((vendor_rev >> 10) & 0x1f) as u8 + 64) as char;
-                            let vendor_2 = (((vendor_rev >> 5) & 0x1f) as u8 + 64) as char;
-                            let vendor_3 = (((vendor_rev >> 0) & 0x1f) as u8 + 64) as char;
-                            //TODO: simplify this nibble swap
-                            let device_1 = (device >> 4) & 0xF;
-                            let device_2 = (device >> 0) & 0xF;
-                            let device_3 = (device >> 12) & 0xF;
-                            let device_4 = (device >> 8) & 0xF;
-                            format!(
-                                "{}{}{}{:01X}{:01X}{:01X}{:01X}",
-                                vendor_1,
-                                vendor_2,
-                                vendor_3,
-                                device_1,
-                                device_2,
-                                device_3,
-                                device_4
-                            )
-                        }
-                        AmlSerdeValue::String(string) => string,
-                        _ => {
-                            log::warn!("{}: unsupported value {:x?}", name, value);
-                            continue;
-                        }
-                    };
-                    let what = match id.as_str() {
-                        // https://uefi.org/specs/ACPI/6.5/05_ACPI_Software_Programming_Model.html
-                        "ACPI0003" => "Power source",
-                        "ACPI0006" => "GPE block",
-                        "ACPI0007" => "Processor",
-                        "ACPI0010" => "Processor control",
-                        // https://uefi.org/sites/default/files/resources/devids%20%285%29.txt
-                        "PNP0000" => "AT interrupt controller",
-                        "PNP0100" => "AT timer",
-                        "PNP0103" => "HPET",
-                        "PNP0200" => "AT DMA controller",
-                        "PNP0303" => "IBM Enhanced (101/102-key, PS/2 mouse support)",
-                        "PNP030B" => "PS/2 keyboard",
-                        "PNP0400" => "Standard LPT printer port",
-                        "PNP0501" => "16550A-compatible COM port",
-                        "PNP0A03" | "PNP0A08" => "PCI bus",
-                        "PNP0A05" => "Generic ACPI bus",
-                        "PNP0A06" => "Generic ACPI Extended-IO bus (EIO bus)",
-                        "PNP0B00" => "AT real-time clock",
-                        "PNP0C01" => "System board",
-                        "PNP0C02" => "Reserved resources",
-                        "PNP0C04" => "Math coprocessor",
-                        "PNP0C09" => "Embedded controller",
-                        "PNP0C0A" => "Battery",
-                        "PNP0C0B" => "Fan",
-                        "PNP0C0C" => "Power button",
-                        "PNP0C0D" => "Lid sensor",
-                        "PNP0C0E" => "Sleep button",
-                        "PNP0C0F" => "PCI interrupt link",
-                        "PNP0C50" => "I2C HID",
-                        "PNP0F13" => "PS/2 port for PS/2-style mouse",
-                        _ => "?",
-                    };
-                    log::debug!("{}: {} ({})", name, id, what);
-                }
-            }
-        }
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/hwd/src/backend/devicetree.rs b/recipes/core/base/drivers/hwd/src/backend/devicetree.rs
deleted file mode 100644
index 8a91d04e42..0000000000
--- a/recipes/core/base/drivers/hwd/src/backend/devicetree.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::{error::Error, fs};
-
-use super::Backend;
-
-pub struct DeviceTreeBackend {
-    dtb: Vec<u8>,
-}
-
-impl DeviceTreeBackend {
-    fn dump(node: &fdt::node::FdtNode<'_, '_>, level: usize) {
-        let mut line = String::new();
-        for _ in 0..level {
-            line.push_str("  ");
-        }
-        line.push_str(node.name);
-        if let Some(compatible) = node.compatible() {
-            line.push_str(":");
-            for id in compatible.all() {
-                line.push_str(" ");
-                line.push_str(id);
-            }
-        }
-        log::debug!("{}", line);
-        for child in node.children() {
-            Self::dump(&child, level + 1);
-        }
-    }
-}
-
-impl Backend for DeviceTreeBackend {
-    fn new() -> Result<Self, Box<dyn Error>> {
-        let dtb = fs::read("/scheme/kernel.dtb")?;
-        let dt = fdt::Fdt::new(&dtb).map_err(|err| format!("failed to parse dtb: {}", err))?;
-        Ok(Self { dtb })
-    }
-
-    fn probe(&mut self) -> Result<(), Box<dyn Error>> {
-        let dt = fdt::Fdt::new(&self.dtb).map_err(|err| format!("failed to parse dtb: {}", err))?;
-        let root = dt
-            .find_node("/")
-            .ok_or_else(|| format!("failed to find root node"))?;
-        Self::dump(&root, 0);
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/hwd/src/backend/legacy.rs b/recipes/core/base/drivers/hwd/src/backend/legacy.rs
deleted file mode 100644
index 23e9c1f24f..0000000000
--- a/recipes/core/base/drivers/hwd/src/backend/legacy.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use std::error::Error;
-
-use super::Backend;
-
-pub struct LegacyBackend;
-
-impl Backend for LegacyBackend {
-    fn new() -> Result<Self, Box<dyn Error>> {
-        Ok(Self)
-    }
-
-    fn probe(&mut self) -> Result<(), Box<dyn Error>> {
-        log::info!("TODO: handle driver spawning from legacy backend");
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/hwd/src/backend/mod.rs b/recipes/core/base/drivers/hwd/src/backend/mod.rs
deleted file mode 100644
index 815b48aa75..0000000000
--- a/recipes/core/base/drivers/hwd/src/backend/mod.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use std::error::Error;
-
-mod acpi;
-mod devicetree;
-mod legacy;
-
-pub use self::{acpi::AcpiBackend, devicetree::DeviceTreeBackend, legacy::LegacyBackend};
-
-pub trait Backend {
-    fn new() -> Result<Self, Box<dyn Error>>
-    where
-        Self: Sized;
-    fn probe(&mut self) -> Result<(), Box<dyn Error>>;
-}
diff --git a/recipes/core/base/drivers/hwd/src/main.rs b/recipes/core/base/drivers/hwd/src/main.rs
deleted file mode 100644
index 79360e34ee..0000000000
--- a/recipes/core/base/drivers/hwd/src/main.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use std::process;
-
-mod backend;
-use self::backend::{AcpiBackend, Backend, DeviceTreeBackend, LegacyBackend};
-
-fn daemon(daemon: daemon::Daemon) -> ! {
-    common::setup_logging(
-        "misc",
-        "hwd",
-        "hwd",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    // Prefer DTB if available (matches kernel preference)
-    let mut backend: Box<dyn Backend> = match DeviceTreeBackend::new() {
-        Ok(ok) => {
-            log::info!("using devicetree backend");
-            Box::new(ok)
-        }
-        Err(err) => {
-            log::debug!("cannot use devicetree backend: {}", err);
-            match AcpiBackend::new() {
-                Ok(ok) => {
-                    log::info!("using ACPI backend");
-                    Box::new(ok)
-                }
-                Err(err) => {
-                    log::debug!("cannot use ACPI backend: {}", err);
-
-                    log::info!("using legacy backend");
-                    Box::new(LegacyBackend)
-                }
-            }
-        }
-    };
-
-    //TODO: launch pcid based on backend information?
-    // Must launch after acpid but before probe calls /scheme/acpi/symbols
-    #[allow(deprecated, reason = "we can't yet move this to init")]
-    daemon::Daemon::spawn(process::Command::new("pcid"));
-
-    daemon.ready();
-
-    //TODO: HWD is meant to locate PCI/XHCI/etc devices in ACPI and DeviceTree definitions and start their drivers
-    match backend.probe() {
-        Ok(()) => {
-            process::exit(0);
-        }
-        Err(err) => {
-            log::error!("failed to probe with error {}", err);
-            process::exit(1);
-        }
-    }
-}
-
-fn main() {
-    daemon::Daemon::new(daemon);
-}
diff --git a/recipes/core/base/drivers/i2c/amd-mp2-i2cd/Cargo.toml b/recipes/core/base/drivers/i2c/amd-mp2-i2cd/Cargo.toml
deleted file mode 100644
index 357ca948c7..0000000000
--- a/recipes/core/base/drivers/i2c/amd-mp2-i2cd/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "amd-mp2-i2cd"
-description = "AMD MP2 PCI I2C controller driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-serde.workspace = true
-ron.workspace = true
-
-acpi-resource = { path = "../../acpi-resource" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-i2c-interface = { path = "../i2c-interface" }
-pcid = { path = "../../pcid" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/i2c/amd-mp2-i2cd/src/main.rs b/recipes/core/base/drivers/i2c/amd-mp2-i2cd/src/main.rs
deleted file mode 100644
index 925b45e75f..0000000000
--- a/recipes/core/base/drivers/i2c/amd-mp2-i2cd/src/main.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use std::fs::{File, OpenOptions};
-use std::io::{Read, Write};
-use std::process;
-
-use anyhow::{Context, Result};
-use i2c_interface::{I2cAdapterInfo, I2cControlRequest, I2cControlResponse};
-use pcid_interface::PciFunctionHandle;
-
-const MP2_MAILBOX_STATUS: usize = 0x00;
-const MP2_MAILBOX_COMMAND: usize = 0x04;
-const MP2_MAILBOX_ARGUMENT0: usize = 0x08;
-const MP2_MAILBOX_ARGUMENT1: usize = 0x0C;
-
-fn main() {
-    pcid_interface::pci_daemon(daemon_runner);
-}
-
-fn daemon_runner(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    if let Err(err) = daemon_main(daemon, &mut pcid_handle) {
-        log::error!("amd-mp2-i2cd: {err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn daemon_main(daemon: daemon::Daemon, pcid_handle: &mut PciFunctionHandle) -> Result<()> {
-    let pci_config = pcid_handle.config();
-    let log_name = format!("{}_amd-mp2-i2c", pci_config.func.name());
-
-    common::setup_logging(
-        "bus",
-        "i2c",
-        &log_name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    let mapped_bar = unsafe { pcid_handle.map_bar(0) };
-    let bar_addr = mapped_bar.ptr.as_ptr() as usize;
-    let bar_size = mapped_bar.bar_size;
-
-    log::info!(
-        "amd-mp2-i2cd: {} BAR0={:#x}+{:#x} mapped={:p}+{:#x}",
-        pci_config.func.display(),
-        bar_addr,
-        bar_size,
-        mapped_bar.ptr.as_ptr(),
-        mapped_bar.bar_size,
-    );
-    log::debug!(
-        "amd-mp2-i2cd: MP2 mailbox regs status={MP2_MAILBOX_STATUS:#x} cmd={MP2_MAILBOX_COMMAND:#x} arg0={MP2_MAILBOX_ARGUMENT0:#x} arg1={MP2_MAILBOX_ARGUMENT1:#x}",
-    );
-
-    let info = I2cAdapterInfo {
-        id: 0,
-        name: format!("amd-mp2:{}", pci_config.func.name()),
-        max_transaction_size: 0,
-        supports_10bit_addr: false,
-    };
-    let mut registration = register_adapter(&info)
-        .context("failed to register AMD MP2 controller with i2cd")?;
-    let response = read_registration_response(&mut registration)
-        .context("failed to read AMD MP2 i2cd registration response")?;
-
-    match response {
-        I2cControlResponse::AdapterRegistered { id } => {
-            log::info!("amd-mp2-i2cd: controller registered with i2cd as adapter {id}");
-        }
-        other => anyhow::bail!("unexpected i2cd registration response: {other:?}"),
-    }
-
-    daemon.ready();
-    libredox::call::setrens(0, 0).context("failed to enter null namespace")?;
-
-    let _keep_registration = registration;
-    let _keep_pcid = pcid_handle;
-
-    loop {
-        std::thread::park();
-    }
-}
-
-fn register_adapter(info: &I2cAdapterInfo) -> Result<File> {
-    let mut file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .open("/scheme/i2c/register")
-        .context("failed to open /scheme/i2c/register")?;
-    let payload = ron::ser::to_string(&I2cControlRequest::RegisterAdapter { info: info.clone() })
-        .context("failed to encode AMD MP2 I2C registration payload")?;
-    file.write_all(payload.as_bytes())
-        .context("failed to send AMD MP2 I2C registration payload")?;
-    Ok(file)
-}
-
-fn read_registration_response(file: &mut File) -> Result<I2cControlResponse> {
-    let mut buffer = vec![0_u8; 4096];
-    let count = file
-        .read(&mut buffer)
-        .context("failed to read AMD MP2 I2C registration response")?;
-    buffer.truncate(count);
-    let text = std::str::from_utf8(&buffer)
-        .context("AMD MP2 I2C registration response was not UTF-8")?;
-    ron::from_str(text).context("failed to decode AMD MP2 I2C registration response")
-}
diff --git a/recipes/core/base/drivers/i2c/dw-acpi-i2cd/Cargo.toml b/recipes/core/base/drivers/i2c/dw-acpi-i2cd/Cargo.toml
deleted file mode 100644
index a90b48cce3..0000000000
--- a/recipes/core/base/drivers/i2c/dw-acpi-i2cd/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "dw-acpi-i2cd"
-description = "Generic DesignWare ACPI I2C controller driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-serde.workspace = true
-ron.workspace = true
-
-acpi-resource = { path = "../../acpi-resource" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-i2c-interface = { path = "../i2c-interface" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/i2c/dw-acpi-i2cd/src/main.rs b/recipes/core/base/drivers/i2c/dw-acpi-i2cd/src/main.rs
deleted file mode 100644
index b22a27739d..0000000000
--- a/recipes/core/base/drivers/i2c/dw-acpi-i2cd/src/main.rs
+++ /dev/null
@@ -1,361 +0,0 @@
-use std::collections::BTreeMap;
-use std::fs::{self, File, OpenOptions};
-use std::io::{Read, Write};
-use std::path::Path;
-use std::process;
-
-use acpi_resource::{
-    AddressResourceType, ExtendedIrqDescriptor, FixedMemory32Descriptor, I2cSerialBusDescriptor,
-    IrqDescriptor, Memory32RangeDescriptor, ResourceDescriptor,
-};
-use anyhow::{Context, Result};
-use common::{MemoryType, PhysBorrowed, Prot};
-use i2c_interface::{I2cAdapterInfo, I2cControlRequest, I2cControlResponse};
-use serde::Deserialize;
-
-const SUPPORTED_IDS: &[&str] = &["80860F41", "808622C1", "AMDI0010", "AMDI0019", "AMDI0510"];
-
-const DW_IC_CON: usize = 0x00;
-const DW_IC_TAR: usize = 0x04;
-const DW_IC_SS_SCL_HCNT: usize = 0x14;
-const DW_IC_SS_SCL_LCNT: usize = 0x18;
-const DW_IC_DATA_CMD: usize = 0x10;
-const DW_IC_INTR_MASK: usize = 0x30;
-const DW_IC_CLR_INTR: usize = 0x40;
-const DW_IC_ENABLE: usize = 0x6C;
-const DW_IC_STATUS: usize = 0x70;
-const DW_MMIO_WINDOW: usize = DW_IC_STATUS + core::mem::size_of::<u32>();
-
-#[derive(Debug, Deserialize)]
-struct AmlSymbol {
-    name: String,
-    value: AmlValue,
-}
-
-#[derive(Debug, Deserialize)]
-enum AmlValue {
-    Integer(u64),
-    String(String),
-}
-
-#[derive(Clone, Debug)]
-struct ControllerResources {
-    mmio_base: usize,
-    mmio_len: usize,
-    irq: Option<u32>,
-    serial_bus: Option<I2cSerialBusDescriptor>,
-}
-
-#[derive(Debug)]
-struct ControllerDescriptor {
-    device: String,
-    hid: String,
-    resources: ControllerResources,
-}
-
-struct RegisteredController {
-    _mmio: Option<PhysBorrowed>,
-    _registration: File,
-}
-
-fn main() {
-    common::setup_logging(
-        "bus",
-        "i2c",
-        "dw-acpi-i2cd",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    daemon::Daemon::new(daemon_runner);
-}
-
-fn daemon_runner(daemon: daemon::Daemon) -> ! {
-    if let Err(err) = daemon_main(daemon) {
-        log::error!("dw-acpi-i2cd: {err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn daemon_main(daemon: daemon::Daemon) -> Result<()> {
-    common::init();
-
-    let controllers = discover_controllers(SUPPORTED_IDS)
-        .context("failed to discover DesignWare ACPI I2C controllers")?;
-    if controllers.is_empty() {
-        log::info!("dw-acpi-i2cd: no supported ACPI controllers found");
-    }
-
-    let mut registered = Vec::new();
-    for controller in controllers {
-        match register_controller("dw-acpi", controller) {
-            Ok(controller) => registered.push(controller),
-            Err(err) => log::warn!("dw-acpi-i2cd: controller registration skipped: {err:#}"),
-        }
-    }
-
-    daemon.ready();
-    libredox::call::setrens(0, 0).context("failed to enter null namespace")?;
-
-    log::info!("dw-acpi-i2cd: registered {} controller(s)", registered.len());
-
-    loop {
-        std::thread::park();
-    }
-}
-
-fn discover_controllers(supported_ids: &[&str]) -> Result<Vec<ControllerDescriptor>> {
-    let mut matched = BTreeMap::new();
-
-    let entries = match fs::read_dir("/scheme/acpi/symbols") {
-        Ok(entries) => entries,
-        Err(err)
-            if err.kind() == std::io::ErrorKind::WouldBlock || err.raw_os_error() == Some(11) =>
-        {
-            log::debug!("dw-acpi-i2cd: ACPI symbols are not ready yet");
-            return Ok(Vec::new());
-        }
-        Err(err) => return Err(err).context("failed to read /scheme/acpi/symbols"),
-    };
-
-    for entry in entries {
-        let entry = entry.context("failed to read ACPI symbol directory entry")?;
-        let Some(file_name) = entry.file_name().to_str().map(str::to_owned) else {
-            continue;
-        };
-        if !file_name.ends_with("_HID") && !file_name.ends_with("_CID") {
-            continue;
-        }
-
-        let Some(id) = read_symbol_id(&entry.path())? else {
-            continue;
-        };
-        if !supported_ids.iter().any(|candidate| *candidate == id) {
-            continue;
-        }
-
-        let device = file_name
-            .strip_suffix("_HID")
-            .or_else(|| file_name.strip_suffix("_CID"))
-            .map(str::to_owned);
-        if let Some(device) = device {
-            matched.entry(device).or_insert(id);
-        }
-    }
-
-    let mut controllers = Vec::new();
-    for (device, hid) in matched {
-        let resources = read_controller_resources(&device)
-            .with_context(|| format!("failed to read resources for {device}"))?;
-        controllers.push(ControllerDescriptor {
-            device,
-            hid,
-            resources,
-        });
-    }
-
-    Ok(controllers)
-}
-
-fn read_symbol_id(path: &Path) -> Result<Option<String>> {
-    let contents = fs::read_to_string(path)
-        .with_context(|| format!("failed to read ACPI symbol {}", path.display()))?;
-    let symbol = match ron::from_str::<AmlSymbol>(&contents) {
-        Ok(symbol) => symbol,
-        Err(err) => {
-            log::debug!(
-                "dw-acpi-i2cd: skipping {} because the symbol payload was not a scalar ID: {err}",
-                path.display(),
-            );
-            return Ok(None);
-        }
-    };
-
-    let id = match symbol.value {
-        AmlValue::Integer(integer) => eisa_id_from_integer(integer),
-        AmlValue::String(string) => string,
-    };
-
-    log::debug!("dw-acpi-i2cd: {} -> {id}", symbol.name);
-    Ok(Some(id))
-}
-
-fn read_controller_resources(device: &str) -> Result<ControllerResources> {
-    let contents = fs::read_to_string(format!("/scheme/acpi/resources/{device}"))
-        .with_context(|| format!("failed to read /scheme/acpi/resources/{device}"))?;
-    let resources = ron::from_str::<Vec<ResourceDescriptor>>(&contents)
-        .with_context(|| format!("failed to decode RON resources for {device}"))?;
-
-    let mut mmio = None;
-    let mut irq = None;
-    let mut serial_bus = None;
-
-    for resource in &resources {
-        match resource {
-            ResourceDescriptor::FixedMemory32(FixedMemory32Descriptor {
-                address,
-                address_length,
-                ..
-            }) if mmio.is_none() => {
-                mmio = Some((*address as usize, (*address_length as usize).max(DW_MMIO_WINDOW)));
-            }
-            ResourceDescriptor::Memory32Range(Memory32RangeDescriptor {
-                minimum,
-                maximum,
-                address_length,
-                ..
-            }) if mmio.is_none() && maximum >= minimum => {
-                let span = maximum.saturating_sub(*minimum).saturating_add(1) as usize;
-                mmio = Some((
-                    *minimum as usize,
-                    span.max((*address_length as usize).max(DW_MMIO_WINDOW)),
-                ));
-            }
-            ResourceDescriptor::Address32(descriptor)
-                if mmio.is_none()
-                    && matches!(descriptor.resource_type, AddressResourceType::MemoryRange) =>
-            {
-                mmio = Some((
-                    descriptor.minimum as usize,
-                    (descriptor.address_length as usize).max(DW_MMIO_WINDOW),
-                ));
-            }
-            ResourceDescriptor::Address64(descriptor)
-                if mmio.is_none()
-                    && matches!(descriptor.resource_type, AddressResourceType::MemoryRange) =>
-            {
-                let base = usize::try_from(descriptor.minimum)
-                    .context("64-bit MMIO base does not fit in usize")?;
-                let len = usize::try_from(descriptor.address_length)
-                    .context("64-bit MMIO length does not fit in usize")?;
-                mmio = Some((base, len.max(DW_MMIO_WINDOW)));
-            }
-            ResourceDescriptor::Irq(IrqDescriptor { interrupts, .. }) if irq.is_none() => {
-                irq = interrupts.first().copied().map(u32::from);
-            }
-            ResourceDescriptor::ExtendedIrq(ExtendedIrqDescriptor { interrupts, .. })
-                if irq.is_none() =>
-            {
-                irq = interrupts.first().copied();
-            }
-            ResourceDescriptor::I2cSerialBus(descriptor) if serial_bus.is_none() => {
-                serial_bus = Some(descriptor.clone());
-            }
-            _ => {}
-        }
-    }
-
-    let (mmio_base, mmio_len) = mmio.context("no MMIO resource was found")?;
-    Ok(ControllerResources {
-        mmio_base,
-        mmio_len,
-        irq,
-        serial_bus,
-    })
-}
-
-fn register_controller(prefix: &str, controller: ControllerDescriptor) -> Result<RegisteredController> {
-    let ControllerDescriptor {
-        device,
-        hid,
-        resources,
-    } = controller;
-
-    let mmio = match PhysBorrowed::map(
-        resources.mmio_base,
-        resources.mmio_len,
-        Prot::RW,
-        MemoryType::Uncacheable,
-    ) {
-        Ok(mapping) => Some(mapping),
-        Err(err) => {
-            log::warn!(
-                "dw-acpi-i2cd: failed to map MMIO for {device} ({:#x}, len {:#x}): {err}",
-                resources.mmio_base,
-                resources.mmio_len,
-            );
-            None
-        }
-    };
-
-    log::info!(
-        "dw-acpi-i2cd: discovered {device} hid={hid} mmio={:#x}+{:#x} irq={:?}",
-        resources.mmio_base,
-        resources.mmio_len,
-        resources.irq,
-    );
-    log::debug!(
-        "dw-acpi-i2cd: DesignWare regs con={DW_IC_CON:#x} tar={DW_IC_TAR:#x} data_cmd={DW_IC_DATA_CMD:#x} intr_mask={DW_IC_INTR_MASK:#x} clr_intr={DW_IC_CLR_INTR:#x} enable={DW_IC_ENABLE:#x} ss_hcnt={DW_IC_SS_SCL_HCNT:#x} ss_lcnt={DW_IC_SS_SCL_LCNT:#x}",
-    );
-
-    let info = I2cAdapterInfo {
-        id: 0,
-        name: format!("{prefix}:{device}"),
-        max_transaction_size: 0,
-        supports_10bit_addr: resources
-            .serial_bus
-            .as_ref()
-            .map(|bus| bus.access_mode_10bit)
-            .unwrap_or(false),
-    };
-    let mut registration = register_adapter(&info)
-        .with_context(|| format!("failed to register {device} with i2cd"))?;
-    let response = read_registration_response(&mut registration)
-        .with_context(|| format!("failed to read i2cd registration response for {device}"))?;
-
-    match response {
-        I2cControlResponse::AdapterRegistered { id } => {
-            log::info!("dw-acpi-i2cd: adapter {device} registered with i2cd as {id}");
-        }
-        other => {
-            anyhow::bail!("unexpected i2cd registration response for {device}: {other:?}");
-        }
-    }
-
-    Ok(RegisteredController {
-        _mmio: mmio,
-        _registration: registration,
-    })
-}
-
-fn register_adapter(info: &I2cAdapterInfo) -> Result<File> {
-    let mut file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .open("/scheme/i2c/register")
-        .context("failed to open /scheme/i2c/register")?;
-    let payload = ron::ser::to_string(&I2cControlRequest::RegisterAdapter { info: info.clone() })
-        .context("failed to encode I2C adapter registration")?;
-    file.write_all(payload.as_bytes())
-        .context("failed to send I2C adapter registration")?;
-    Ok(file)
-}
-
-fn read_registration_response(file: &mut File) -> Result<I2cControlResponse> {
-    let mut buffer = vec![0_u8; 4096];
-    let count = file
-        .read(&mut buffer)
-        .context("failed to read I2C registration response")?;
-    buffer.truncate(count);
-    let text = std::str::from_utf8(&buffer).context("I2C registration response was not UTF-8")?;
-    ron::from_str(text).context("failed to decode I2C registration response")
-}
-
-fn eisa_id_from_integer(integer: u64) -> String {
-    let vendor = integer & 0xFFFF;
-    let device = (integer >> 16) & 0xFFFF;
-    let vendor_rev = ((vendor & 0xFF) << 8) | (vendor >> 8);
-    let vendor_1 = (((vendor_rev >> 10) & 0x1F) as u8 + 64) as char;
-    let vendor_2 = (((vendor_rev >> 5) & 0x1F) as u8 + 64) as char;
-    let vendor_3 = (((vendor_rev >> 0) & 0x1F) as u8 + 64) as char;
-    let device_1 = (device >> 4) & 0xF;
-    let device_2 = (device >> 0) & 0xF;
-    let device_3 = (device >> 12) & 0xF;
-    let device_4 = (device >> 8) & 0xF;
-
-    format!(
-        "{vendor_1}{vendor_2}{vendor_3}{device_1:01X}{device_2:01X}{device_3:01X}{device_4:01X}"
-    )
-}
diff --git a/recipes/core/base/drivers/i2c/i2c-interface/Cargo.toml b/recipes/core/base/drivers/i2c/i2c-interface/Cargo.toml
deleted file mode 100644
index fa9bbe4f85..0000000000
--- a/recipes/core/base/drivers/i2c/i2c-interface/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "i2c-interface"
-description = "Shared I2C transfer and registry types"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-serde.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/i2c/i2c-interface/src/lib.rs b/recipes/core/base/drivers/i2c/i2c-interface/src/lib.rs
deleted file mode 100644
index 9e5ab4448e..0000000000
--- a/recipes/core/base/drivers/i2c/i2c-interface/src/lib.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-pub use syscall;
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum I2cTransferOp {
-    Write(Vec<u8>),
-    Read(usize),
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct I2cTransferSegment {
-    pub address: u16,
-    pub ten_bit_address: bool,
-    pub op: I2cTransferOp,
-}
-
-impl I2cTransferSegment {
-    pub fn write(address: u16, payload: impl Into<Vec<u8>>) -> Self {
-        Self {
-            address,
-            ten_bit_address: false,
-            op: I2cTransferOp::Write(payload.into()),
-        }
-    }
-
-    pub fn read(address: u16, len: usize) -> Self {
-        Self {
-            address,
-            ten_bit_address: false,
-            op: I2cTransferOp::Read(len),
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct I2cTransferRequest {
-    pub adapter: String,
-    pub segments: Vec<I2cTransferSegment>,
-    pub stop: bool,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct I2cTransferResponse {
-    pub ok: bool,
-    pub read_data: Vec<Vec<u8>>,
-    pub error: Option<String>,
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-pub struct I2cAdapterRegistration {
-    pub name: String,
-    pub description: String,
-    pub acpi_companion: Option<String>,
-    pub slave_address_override: Option<u16>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct I2cAdapterInfo {
-    pub id: u32,
-    pub name: String,
-    pub max_transaction_size: usize,
-    pub supports_10bit_addr: bool,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum I2cTransferStatus {
-    Ok,
-    Nack,
-    Timeout,
-    Error,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum I2cControlRequest {
-    RegisterAdapter { info: I2cAdapterInfo },
-    OpenAdapter { id: u32 },
-    Transfer {
-        adapter_id: u32,
-        request: I2cTransferRequest,
-    },
-    ListAdapters,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum I2cControlResponse {
-    AdapterRegistered { id: u32 },
-    AdapterOpened,
-    TransferResult(I2cTransferResponse),
-    AdapterList(Vec<I2cAdapterInfo>),
-    Error(String),
-}
diff --git a/recipes/core/base/drivers/i2c/i2cd/Cargo.toml b/recipes/core/base/drivers/i2c/i2cd/Cargo.toml
deleted file mode 100644
index 0fdd6911fe..0000000000
--- a/recipes/core/base/drivers/i2c/i2cd/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "i2cd"
-description = "I2C adapter registry scheme daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-redox-scheme.workspace = true
-serde.workspace = true
-ron.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-scheme-utils = { path = "../../../scheme-utils" }
-i2c-interface = { path = "../i2c-interface" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/i2c/i2cd/src/main.rs b/recipes/core/base/drivers/i2c/i2cd/src/main.rs
deleted file mode 100644
index b7b7d89aab..0000000000
--- a/recipes/core/base/drivers/i2c/i2cd/src/main.rs
+++ /dev/null
@@ -1,377 +0,0 @@
-use std::collections::BTreeMap;
-use std::process;
-
-use anyhow::{Context, Result};
-use i2c_interface::{
-    I2cAdapterInfo, I2cControlRequest, I2cControlResponse, I2cTransferRequest,
-    I2cTransferResponse,
-};
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult, Socket};
-use scheme_utils::{Blocking, HandleMap};
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error as SysError, EACCES, EBADF, EINVAL, ENOENT};
-
-enum Handle {
-    SchemeRoot,
-    Register { pending: Vec<u8> },
-    Provider { adapter_id: u32, pending: Vec<u8> },
-    Adapters { pending: Vec<u8> },
-    AdapterDetail { id: u32, pending: Vec<u8> },
-    Transfer { pending: Vec<u8> },
-}
-
-struct AdapterEntry {
-    info: I2cAdapterInfo,
-    provider_handle: usize,
-}
-
-struct I2cDaemon {
-    handles: HandleMap<Handle>,
-    adapters: BTreeMap<u32, AdapterEntry>,
-    next_id: u32,
-}
-
-impl I2cDaemon {
-    fn new() -> Self {
-        Self {
-            handles: HandleMap::new(),
-            adapters: BTreeMap::new(),
-            next_id: 0,
-        }
-    }
-
-    fn adapter_list(&self) -> Vec<I2cAdapterInfo> {
-        self.adapters.values().map(|entry| entry.info.clone()).collect()
-    }
-
-    fn serialize_response(response: &I2cControlResponse) -> syscall::Result<Vec<u8>> {
-        ron::ser::to_string(response)
-            .map(|text| text.into_bytes())
-            .map_err(|err| {
-                log::error!("i2cd: failed to serialize control response: {err}");
-                SysError::new(EINVAL)
-            })
-    }
-
-    fn deserialize_request(buf: &[u8]) -> syscall::Result<I2cControlRequest> {
-        let text = std::str::from_utf8(buf).map_err(|err| {
-            log::warn!("i2cd: invalid UTF-8 control payload: {err}");
-            SysError::new(EINVAL)
-        })?;
-
-        ron::from_str(text).map_err(|err| {
-            log::warn!("i2cd: failed to decode control request: {err}");
-            SysError::new(EINVAL)
-        })
-    }
-
-    fn set_pending_response(handle: &mut Handle, response: I2cControlResponse) -> syscall::Result<()> {
-        let pending = Self::serialize_response(&response)?;
-        match handle {
-            Handle::Register { pending: slot }
-            | Handle::Provider { pending: slot, .. }
-            | Handle::Adapters { pending: slot }
-            | Handle::AdapterDetail { pending: slot, .. }
-            | Handle::Transfer { pending: slot } => {
-                *slot = pending;
-                Ok(())
-            }
-            Handle::SchemeRoot => Err(SysError::new(EBADF)),
-        }
-    }
-
-    fn queue_adapter_list(handle: &mut Handle, adapters: Vec<I2cAdapterInfo>) -> syscall::Result<()> {
-        Self::set_pending_response(handle, I2cControlResponse::AdapterList(adapters))
-    }
-
-    fn queue_transfer_stub(
-        handle: &mut Handle,
-        adapter: &I2cAdapterInfo,
-        request: &I2cTransferRequest,
-    ) -> syscall::Result<()> {
-        let write_bytes = request
-            .segments
-            .iter()
-            .filter_map(|segment| match &segment.op {
-                i2c_interface::I2cTransferOp::Write(bytes) => Some(bytes.len()),
-                i2c_interface::I2cTransferOp::Read(_) => None,
-            })
-            .sum::<usize>();
-        let read_segments = request
-            .segments
-            .iter()
-            .filter(|segment| matches!(segment.op, i2c_interface::I2cTransferOp::Read(_)))
-            .count();
-
-        log::info!(
-            "i2cd: routing transfer to adapter {} ({}) name={} segments={} write_bytes={} read_segments={} stop={} (stubbed)",
-            adapter.id,
-            adapter.name,
-            request.adapter,
-            request.segments.len(),
-            write_bytes,
-            read_segments,
-            request.stop,
-        );
-
-        Self::set_pending_response(
-            handle,
-            I2cControlResponse::TransferResult(I2cTransferResponse {
-                ok: false,
-                read_data: Vec::new(),
-                error: Some(String::from("I2C controller transfer path is not implemented yet")),
-            }),
-        )
-    }
-
-    fn copy_pending(handle: &mut Handle, buf: &mut [u8], offset: u64) -> syscall::Result<usize> {
-        let pending = match handle {
-            Handle::Register { pending }
-            | Handle::Provider { pending, .. }
-            | Handle::Adapters { pending }
-            | Handle::AdapterDetail { pending, .. }
-            | Handle::Transfer { pending } => pending,
-            Handle::SchemeRoot => return Err(SysError::new(EBADF)),
-        };
-
-        let offset = usize::try_from(offset).map_err(|_| SysError::new(EINVAL))?;
-        if offset >= pending.len() {
-            return Ok(0);
-        }
-
-        let copy_len = buf.len().min(pending.len() - offset);
-        buf[..copy_len].copy_from_slice(&pending[offset..offset + copy_len]);
-        Ok(copy_len)
-    }
-}
-
-impl SchemeSync for I2cDaemon {
-    fn scheme_root(&mut self) -> syscall::Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<OpenResult> {
-        let handle = self.handles.get(dirfd)?;
-        let segments = path.trim_matches('/');
-
-        let new_handle = match handle {
-            Handle::SchemeRoot => {
-                if segments.is_empty() {
-                    return Err(SysError::new(EINVAL));
-                }
-
-                let mut parts = segments.split('/');
-                match parts.next() {
-                    Some("register") if parts.next().is_none() => Handle::Register {
-                        pending: Vec::new(),
-                    },
-                    Some("adapters") => match parts.next() {
-                        None => Handle::Adapters {
-                            pending: Vec::new(),
-                        },
-                        Some(id) if parts.next().is_none() => {
-                            let id = id.parse::<u32>().map_err(|_| SysError::new(EINVAL))?;
-                            Handle::AdapterDetail {
-                                id,
-                                pending: Vec::new(),
-                            }
-                        }
-                        _ => return Err(SysError::new(EINVAL)),
-                    },
-                    Some("transfer") if parts.next().is_none() => Handle::Transfer {
-                        pending: Vec::new(),
-                    },
-                    _ => return Err(SysError::new(ENOENT)),
-                }
-            }
-            Handle::Adapters { .. } => {
-                if segments.is_empty() {
-                    return Err(SysError::new(EINVAL));
-                }
-
-                let id = segments.parse::<u32>().map_err(|_| SysError::new(EINVAL))?;
-                Handle::AdapterDetail {
-                    id,
-                    pending: Vec::new(),
-                }
-            }
-            _ => return Err(SysError::new(EACCES)),
-        };
-
-        let fd = self.handles.insert(new_handle);
-        Ok(OpenResult::ThisScheme {
-            number: fd,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<usize> {
-        let adapters = self.adapter_list();
-        let handle = self.handles.get_mut(id)?;
-
-        match handle {
-            Handle::Adapters { pending } if pending.is_empty() => {
-                *pending = Self::serialize_response(&I2cControlResponse::AdapterList(adapters))?;
-            }
-            Handle::AdapterDetail { id, pending } if pending.is_empty() => {
-                let info = self
-                    .adapters
-                    .get(id)
-                    .map(|entry| entry.info.clone())
-                    .ok_or(SysError::new(ENOENT))?;
-                *pending = Self::serialize_response(&I2cControlResponse::AdapterList(vec![info]))?;
-            }
-            _ => {}
-        }
-
-        Self::copy_pending(handle, buf, offset)
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<usize> {
-        let request = Self::deserialize_request(buf)?;
-
-        match request {
-            I2cControlRequest::RegisterAdapter { mut info } => {
-                let adapter_id = self.next_id;
-                self.next_id = self.next_id.checked_add(1).ok_or(SysError::new(EINVAL))?;
-                info.id = adapter_id;
-
-                self.adapters.insert(
-                    adapter_id,
-                    AdapterEntry {
-                        info: info.clone(),
-                        provider_handle: id,
-                    },
-                );
-
-                let handle = self.handles.get_mut(id)?;
-                *handle = Handle::Provider {
-                    adapter_id,
-                    pending: Self::serialize_response(&I2cControlResponse::AdapterRegistered {
-                        id: adapter_id,
-                    })?,
-                };
-
-                log::info!(
-                    "RB_I2CD_ADAPTER_REGISTERED id={} name={} max_transaction_size={} supports_10bit_addr={}",
-                    info.id,
-                    info.name,
-                    info.max_transaction_size,
-                    info.supports_10bit_addr,
-                );
-                Ok(buf.len())
-            }
-            I2cControlRequest::ListAdapters => {
-                let adapters = self.adapter_list();
-                let handle = self.handles.get_mut(id)?;
-                Self::queue_adapter_list(handle, adapters)?;
-                Ok(buf.len())
-            }
-            I2cControlRequest::OpenAdapter { id: adapter_id } => {
-                if !self.adapters.contains_key(&adapter_id) {
-                    return Err(SysError::new(ENOENT));
-                }
-
-                let handle = self.handles.get_mut(id)?;
-                match handle {
-                    Handle::Adapters { .. } | Handle::AdapterDetail { .. } => {
-                        Self::set_pending_response(handle, I2cControlResponse::AdapterOpened)?;
-                        Ok(buf.len())
-                    }
-                    _ => Err(SysError::new(EINVAL)),
-                }
-            }
-            I2cControlRequest::Transfer {
-                adapter_id,
-                request,
-            } => {
-                let entry = self.adapters.get(&adapter_id).ok_or(SysError::new(ENOENT))?;
-                log::debug!(
-                    "i2cd: transfer requested for adapter {} via provider fd {}",
-                    adapter_id,
-                    entry.provider_handle,
-                );
-
-                let adapter_info = entry.info.clone();
-                let handle = self.handles.get_mut(id)?;
-                match handle {
-                    Handle::Transfer { .. } => {
-                        Self::queue_transfer_stub(handle, &adapter_info, &request)?;
-                        Ok(buf.len())
-                    }
-                    _ => Err(SysError::new(EINVAL)),
-                }
-            }
-        }
-    }
-
-    fn on_close(&mut self, id: usize) {
-        let Some(handle) = self.handles.remove(id) else {
-            return;
-        };
-        if let Handle::Provider { adapter_id, .. } = handle {
-            self.adapters.remove(&adapter_id);
-        }
-    }
-}
-
-fn run_daemon(daemon: daemon::SchemeDaemon) -> Result<()> {
-    let socket = Socket::create().context("failed to create i2c scheme socket")?;
-    let mut scheme = I2cDaemon::new();
-    let handler = Blocking::new(&socket, 16);
-
-    daemon
-        .ready_sync_scheme(&socket, &mut scheme)
-        .context("failed to publish i2c scheme root")?;
-
-    log::info!("RB_I2CD_SCHEMA");
-
-    libredox::call::setrens(0, 0).context("failed to enter null namespace")?;
-
-    handler
-        .process_requests_blocking(scheme)
-        .context("failed to process i2cd requests")?;
-}
-
-fn daemon_runner(daemon: daemon::SchemeDaemon) -> ! {
-    if let Err(err) = run_daemon(daemon) {
-        log::error!("i2cd: {err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn main() {
-    common::setup_logging(
-        "bus",
-        "i2c",
-        "i2cd",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    daemon::SchemeDaemon::new(daemon_runner);
-}
diff --git a/recipes/core/base/drivers/i2c/intel-lpss-i2cd/Cargo.toml b/recipes/core/base/drivers/i2c/intel-lpss-i2cd/Cargo.toml
deleted file mode 100644
index 0e74cf94d6..0000000000
--- a/recipes/core/base/drivers/i2c/intel-lpss-i2cd/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "intel-lpss-i2cd"
-description = "Intel LPSS ACPI I2C controller driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-serde.workspace = true
-ron.workspace = true
-
-acpi-resource = { path = "../../acpi-resource" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-i2c-interface = { path = "../i2c-interface" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/i2c/intel-lpss-i2cd/src/main.rs b/recipes/core/base/drivers/i2c/intel-lpss-i2cd/src/main.rs
deleted file mode 100644
index ca3ead4374..0000000000
--- a/recipes/core/base/drivers/i2c/intel-lpss-i2cd/src/main.rs
+++ /dev/null
@@ -1,361 +0,0 @@
-use std::collections::BTreeMap;
-use std::fs::{self, File, OpenOptions};
-use std::io::{Read, Write};
-use std::path::Path;
-use std::process;
-
-use acpi_resource::{
-    AddressResourceType, ExtendedIrqDescriptor, FixedMemory32Descriptor, I2cSerialBusDescriptor,
-    IrqDescriptor, Memory32RangeDescriptor, ResourceDescriptor,
-};
-use anyhow::{Context, Result};
-use common::{MemoryType, PhysBorrowed, Prot};
-use i2c_interface::{I2cAdapterInfo, I2cControlRequest, I2cControlResponse};
-use serde::Deserialize;
-
-const SUPPORTED_IDS: &[&str] = &["INT33C2", "INT33C3", "INT3432", "INT3433", "INTC10EF"];
-
-const DW_IC_CON: usize = 0x00;
-const DW_IC_TAR: usize = 0x04;
-const DW_IC_SS_SCL_HCNT: usize = 0x14;
-const DW_IC_SS_SCL_LCNT: usize = 0x18;
-const DW_IC_DATA_CMD: usize = 0x10;
-const DW_IC_INTR_MASK: usize = 0x30;
-const DW_IC_CLR_INTR: usize = 0x40;
-const DW_IC_ENABLE: usize = 0x6C;
-const DW_IC_STATUS: usize = 0x70;
-const DW_MMIO_WINDOW: usize = DW_IC_STATUS + core::mem::size_of::<u32>();
-
-#[derive(Debug, Deserialize)]
-struct AmlSymbol {
-    name: String,
-    value: AmlValue,
-}
-
-#[derive(Debug, Deserialize)]
-enum AmlValue {
-    Integer(u64),
-    String(String),
-}
-
-#[derive(Clone, Debug)]
-struct ControllerResources {
-    mmio_base: usize,
-    mmio_len: usize,
-    irq: Option<u32>,
-    serial_bus: Option<I2cSerialBusDescriptor>,
-}
-
-#[derive(Debug)]
-struct ControllerDescriptor {
-    device: String,
-    hid: String,
-    resources: ControllerResources,
-}
-
-struct RegisteredController {
-    _mmio: Option<PhysBorrowed>,
-    _registration: File,
-}
-
-fn main() {
-    common::setup_logging(
-        "bus",
-        "i2c",
-        "intel-lpss-i2cd",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    daemon::Daemon::new(daemon_runner);
-}
-
-fn daemon_runner(daemon: daemon::Daemon) -> ! {
-    if let Err(err) = daemon_main(daemon) {
-        log::error!("intel-lpss-i2cd: {err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn daemon_main(daemon: daemon::Daemon) -> Result<()> {
-    common::init();
-
-    let controllers = discover_controllers(SUPPORTED_IDS)
-        .context("failed to discover Intel LPSS ACPI I2C controllers")?;
-    if controllers.is_empty() {
-        log::info!("intel-lpss-i2cd: no supported ACPI controllers found");
-    }
-
-    let mut registered = Vec::new();
-    for controller in controllers {
-        match register_controller("intel-lpss", controller) {
-            Ok(controller) => registered.push(controller),
-            Err(err) => log::warn!("intel-lpss-i2cd: controller registration skipped: {err:#}"),
-        }
-    }
-
-    daemon.ready();
-    libredox::call::setrens(0, 0).context("failed to enter null namespace")?;
-
-    log::info!("intel-lpss-i2cd: registered {} controller(s)", registered.len());
-
-    loop {
-        std::thread::park();
-    }
-}
-
-fn discover_controllers(supported_ids: &[&str]) -> Result<Vec<ControllerDescriptor>> {
-    let mut matched = BTreeMap::new();
-
-    let entries = match fs::read_dir("/scheme/acpi/symbols") {
-        Ok(entries) => entries,
-        Err(err)
-            if err.kind() == std::io::ErrorKind::WouldBlock || err.raw_os_error() == Some(11) =>
-        {
-            log::debug!("intel-lpss-i2cd: ACPI symbols are not ready yet");
-            return Ok(Vec::new());
-        }
-        Err(err) => return Err(err).context("failed to read /scheme/acpi/symbols"),
-    };
-
-    for entry in entries {
-        let entry = entry.context("failed to read ACPI symbol directory entry")?;
-        let Some(file_name) = entry.file_name().to_str().map(str::to_owned) else {
-            continue;
-        };
-        if !file_name.ends_with("_HID") && !file_name.ends_with("_CID") {
-            continue;
-        }
-
-        let Some(id) = read_symbol_id(&entry.path())? else {
-            continue;
-        };
-        if !supported_ids.iter().any(|candidate| *candidate == id) {
-            continue;
-        }
-
-        let device = file_name
-            .strip_suffix("_HID")
-            .or_else(|| file_name.strip_suffix("_CID"))
-            .map(str::to_owned);
-        if let Some(device) = device {
-            matched.entry(device).or_insert(id);
-        }
-    }
-
-    let mut controllers = Vec::new();
-    for (device, hid) in matched {
-        let resources = read_controller_resources(&device)
-            .with_context(|| format!("failed to read resources for {device}"))?;
-        controllers.push(ControllerDescriptor {
-            device,
-            hid,
-            resources,
-        });
-    }
-
-    Ok(controllers)
-}
-
-fn read_symbol_id(path: &Path) -> Result<Option<String>> {
-    let contents = fs::read_to_string(path)
-        .with_context(|| format!("failed to read ACPI symbol {}", path.display()))?;
-    let symbol = match ron::from_str::<AmlSymbol>(&contents) {
-        Ok(symbol) => symbol,
-        Err(err) => {
-            log::debug!(
-                "intel-lpss-i2cd: skipping {} because the symbol payload was not a scalar ID: {err}",
-                path.display(),
-            );
-            return Ok(None);
-        }
-    };
-
-    let id = match symbol.value {
-        AmlValue::Integer(integer) => eisa_id_from_integer(integer),
-        AmlValue::String(string) => string,
-    };
-
-    log::debug!("intel-lpss-i2cd: {} -> {id}", symbol.name);
-    Ok(Some(id))
-}
-
-fn read_controller_resources(device: &str) -> Result<ControllerResources> {
-    let contents = fs::read_to_string(format!("/scheme/acpi/resources/{device}"))
-        .with_context(|| format!("failed to read /scheme/acpi/resources/{device}"))?;
-    let resources = ron::from_str::<Vec<ResourceDescriptor>>(&contents)
-        .with_context(|| format!("failed to decode RON resources for {device}"))?;
-
-    let mut mmio = None;
-    let mut irq = None;
-    let mut serial_bus = None;
-
-    for resource in &resources {
-        match resource {
-            ResourceDescriptor::FixedMemory32(FixedMemory32Descriptor {
-                address,
-                address_length,
-                ..
-            }) if mmio.is_none() => {
-                mmio = Some((*address as usize, (*address_length as usize).max(DW_MMIO_WINDOW)));
-            }
-            ResourceDescriptor::Memory32Range(Memory32RangeDescriptor {
-                minimum,
-                maximum,
-                address_length,
-                ..
-            }) if mmio.is_none() && maximum >= minimum => {
-                let span = maximum.saturating_sub(*minimum).saturating_add(1) as usize;
-                mmio = Some((
-                    *minimum as usize,
-                    span.max((*address_length as usize).max(DW_MMIO_WINDOW)),
-                ));
-            }
-            ResourceDescriptor::Address32(descriptor)
-                if mmio.is_none()
-                    && matches!(descriptor.resource_type, AddressResourceType::MemoryRange) =>
-            {
-                mmio = Some((
-                    descriptor.minimum as usize,
-                    (descriptor.address_length as usize).max(DW_MMIO_WINDOW),
-                ));
-            }
-            ResourceDescriptor::Address64(descriptor)
-                if mmio.is_none()
-                    && matches!(descriptor.resource_type, AddressResourceType::MemoryRange) =>
-            {
-                let base = usize::try_from(descriptor.minimum)
-                    .context("64-bit MMIO base does not fit in usize")?;
-                let len = usize::try_from(descriptor.address_length)
-                    .context("64-bit MMIO length does not fit in usize")?;
-                mmio = Some((base, len.max(DW_MMIO_WINDOW)));
-            }
-            ResourceDescriptor::Irq(IrqDescriptor { interrupts, .. }) if irq.is_none() => {
-                irq = interrupts.first().copied().map(u32::from);
-            }
-            ResourceDescriptor::ExtendedIrq(ExtendedIrqDescriptor { interrupts, .. })
-                if irq.is_none() =>
-            {
-                irq = interrupts.first().copied();
-            }
-            ResourceDescriptor::I2cSerialBus(descriptor) if serial_bus.is_none() => {
-                serial_bus = Some(descriptor.clone());
-            }
-            _ => {}
-        }
-    }
-
-    let (mmio_base, mmio_len) = mmio.context("no MMIO resource was found")?;
-    Ok(ControllerResources {
-        mmio_base,
-        mmio_len,
-        irq,
-        serial_bus,
-    })
-}
-
-fn register_controller(prefix: &str, controller: ControllerDescriptor) -> Result<RegisteredController> {
-    let ControllerDescriptor {
-        device,
-        hid,
-        resources,
-    } = controller;
-
-    let mmio = match PhysBorrowed::map(
-        resources.mmio_base,
-        resources.mmio_len,
-        Prot::RW,
-        MemoryType::Uncacheable,
-    ) {
-        Ok(mapping) => Some(mapping),
-        Err(err) => {
-            log::warn!(
-                "intel-lpss-i2cd: failed to map MMIO for {device} ({:#x}, len {:#x}): {err}",
-                resources.mmio_base,
-                resources.mmio_len,
-            );
-            None
-        }
-    };
-
-    log::info!(
-        "intel-lpss-i2cd: discovered {device} hid={hid} mmio={:#x}+{:#x} irq={:?}",
-        resources.mmio_base,
-        resources.mmio_len,
-        resources.irq,
-    );
-    log::debug!(
-        "intel-lpss-i2cd: DesignWare regs con={DW_IC_CON:#x} tar={DW_IC_TAR:#x} data_cmd={DW_IC_DATA_CMD:#x} intr_mask={DW_IC_INTR_MASK:#x} clr_intr={DW_IC_CLR_INTR:#x} enable={DW_IC_ENABLE:#x} ss_hcnt={DW_IC_SS_SCL_HCNT:#x} ss_lcnt={DW_IC_SS_SCL_LCNT:#x}",
-    );
-
-    let info = I2cAdapterInfo {
-        id: 0,
-        name: format!("{prefix}:{device}"),
-        max_transaction_size: 0,
-        supports_10bit_addr: resources
-            .serial_bus
-            .as_ref()
-            .map(|bus| bus.access_mode_10bit)
-            .unwrap_or(false),
-    };
-    let mut registration = register_adapter(&info)
-        .with_context(|| format!("failed to register {device} with i2cd"))?;
-    let response = read_registration_response(&mut registration)
-        .with_context(|| format!("failed to read i2cd registration response for {device}"))?;
-
-    match response {
-        I2cControlResponse::AdapterRegistered { id } => {
-            log::info!("intel-lpss-i2cd: adapter {device} registered with i2cd as {id}");
-        }
-        other => {
-            anyhow::bail!("unexpected i2cd registration response for {device}: {other:?}");
-        }
-    }
-
-    Ok(RegisteredController {
-        _mmio: mmio,
-        _registration: registration,
-    })
-}
-
-fn register_adapter(info: &I2cAdapterInfo) -> Result<File> {
-    let mut file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .open("/scheme/i2c/register")
-        .context("failed to open /scheme/i2c/register")?;
-    let payload = ron::ser::to_string(&I2cControlRequest::RegisterAdapter { info: info.clone() })
-        .context("failed to encode I2C adapter registration")?;
-    file.write_all(payload.as_bytes())
-        .context("failed to send I2C adapter registration")?;
-    Ok(file)
-}
-
-fn read_registration_response(file: &mut File) -> Result<I2cControlResponse> {
-    let mut buffer = vec![0_u8; 4096];
-    let count = file
-        .read(&mut buffer)
-        .context("failed to read I2C registration response")?;
-    buffer.truncate(count);
-    let text = std::str::from_utf8(&buffer).context("I2C registration response was not UTF-8")?;
-    ron::from_str(text).context("failed to decode I2C registration response")
-}
-
-fn eisa_id_from_integer(integer: u64) -> String {
-    let vendor = integer & 0xFFFF;
-    let device = (integer >> 16) & 0xFFFF;
-    let vendor_rev = ((vendor & 0xFF) << 8) | (vendor >> 8);
-    let vendor_1 = (((vendor_rev >> 10) & 0x1F) as u8 + 64) as char;
-    let vendor_2 = (((vendor_rev >> 5) & 0x1F) as u8 + 64) as char;
-    let vendor_3 = (((vendor_rev >> 0) & 0x1F) as u8 + 64) as char;
-    let device_1 = (device >> 4) & 0xF;
-    let device_2 = (device >> 0) & 0xF;
-    let device_3 = (device >> 12) & 0xF;
-    let device_4 = (device >> 8) & 0xF;
-
-    format!(
-        "{vendor_1}{vendor_2}{vendor_3}{device_1:01X}{device_2:01X}{device_3:01X}{device_4:01X}"
-    )
-}
diff --git a/recipes/core/base/drivers/initfs.toml b/recipes/core/base/drivers/initfs.toml
deleted file mode 100644
index 12290f9b38..0000000000
--- a/recipes/core/base/drivers/initfs.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-## Drivers for InitFS ##
-
-# ahcid
-[[drivers]]
-name = "AHCI storage"
-class = 1
-subclass = 6
-command = ["/scheme/initfs/lib/drivers/ahcid"]
-
-# ided
-[[drivers]]
-name = "IDE storage"
-class = 1
-subclass = 1
-command = ["/scheme/initfs/lib/drivers/ided"]
-
-# nvmed
-[[drivers]]
-name = "NVME storage"
-class = 1
-subclass = 8
-command = ["/scheme/initfs/lib/drivers/nvmed"]
-
-[[drivers]]
-name = "virtio-blk"
-class = 1
-subclass = 0
-vendor = 0x1AF4
-device = 0x1001
-command = ["/scheme/initfs/lib/drivers/virtio-blkd"]
-
-[[drivers]]
-name = "virtio-gpu"
-class = 3
-vendor = 0x1AF4
-device = 0x1050
-command = ["/scheme/initfs/lib/drivers/virtio-gpud"]
diff --git a/recipes/core/base/drivers/input/i2c-hidd/Cargo.toml b/recipes/core/base/drivers/input/i2c-hidd/Cargo.toml
deleted file mode 100644
index db7b3f03ba..0000000000
--- a/recipes/core/base/drivers/input/i2c-hidd/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "i2c-hidd"
-description = "I2C HID client daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-orbclient.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-redox-scheme.workspace = true
-ron.workspace = true
-serde.workspace = true
-
-acpi-resource = { path = "../../acpi-resource" }
-amlserde = { path = "../../amlserde" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-i2c-interface = { path = "../../i2c/i2c-interface" }
-inputd = { path = "../../inputd" }
-scheme-utils = { path = "../../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/input/i2c-hidd/src/acpi.rs b/recipes/core/base/drivers/input/i2c-hidd/src/acpi.rs
deleted file mode 100644
index 1132154cf1..0000000000
--- a/recipes/core/base/drivers/input/i2c-hidd/src/acpi.rs
+++ /dev/null
@@ -1,307 +0,0 @@
-use acpi_resource::{GpioDescriptor, ResourceDescriptor};
-use amlserde::{AmlSerde, AmlSerdeValue};
-use anyhow::{anyhow, bail, Context, Result};
-use libredox::flag::{O_CLOEXEC, O_RDWR};
-use std::collections::BTreeSet;
-use std::fs::{self, OpenOptions};
-use std::io::{ErrorKind, Read};
-
-use crate::quirks::ProbeFailureQuirk;
-
-const I2C_HID_DSM_GUID: [u8; 16] = [
-    0xF7, 0xF6, 0xDF, 0x3C, 0x67, 0x42, 0x55, 0x45, 0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x41, 0x76,
-];
-
-#[derive(Clone, Debug)]
-pub struct I2cBinding {
-    pub adapter: String,
-    pub address: u16,
-}
-
-#[derive(Clone, Debug)]
-pub struct AcpiDeviceResources {
-    pub i2c: I2cBinding,
-    pub irq: Option<u32>,
-    pub gpio_int: Vec<GpioDescriptor>,
-    pub gpio_io: Vec<GpioDescriptor>,
-}
-
-pub fn scan_acpi_i2c_hid_devices() -> Result<Vec<String>> {
-    let entries = match fs::read_dir("/scheme/acpi/symbols") {
-        Ok(entries) => entries,
-        Err(err) if err.kind() == ErrorKind::WouldBlock || err.raw_os_error() == Some(11) => {
-            return Ok(Vec::new());
-        }
-        Err(err) => return Err(err).context("failed to read /scheme/acpi/symbols"),
-    };
-
-    let mut devices = BTreeSet::new();
-    for entry in entries {
-        let entry = entry.context("failed to enumerate ACPI symbol entry")?;
-        let Some(file_name) = entry.file_name().to_str().map(str::to_owned) else {
-            continue;
-        };
-        if !file_name.ends_with("._HID") && !file_name.ends_with("._CID") {
-            continue;
-        }
-
-        let symbol = read_aml_symbol(&file_name)
-            .with_context(|| format!("failed to read ACPI symbol {file_name}"))?;
-        let Some(id) = decode_hardware_id(&symbol.value) else {
-            continue;
-        };
-
-        if matches!(id.as_str(), "PNP0C50" | "ACPI0C50") {
-            let device = symbol
-                .name
-                .strip_suffix("._HID")
-                .or_else(|| symbol.name.strip_suffix("._CID"))
-                .unwrap_or(&symbol.name)
-                .trim_start_matches('\\')
-                .trim_matches('/')
-                .replace('/', ".");
-            if !device.is_empty() {
-                devices.insert(device);
-            }
-        }
-    }
-
-    Ok(devices.into_iter().collect())
-}
-
-pub fn read_decoded_resources(path: &str) -> Result<AcpiDeviceResources> {
-    let resource_path = format!("/scheme/acpi/resources/{}", normalize_device_path(path));
-    let serialized = fs::read_to_string(&resource_path)
-        .with_context(|| format!("failed to read {resource_path}"))?;
-    let descriptors: Vec<ResourceDescriptor> = ron::from_str(&serialized)
-        .with_context(|| format!("invalid ACPI resources in {resource_path}"))?;
-
-    let mut i2c = None;
-    let mut irq = None;
-    let mut gpio_int = Vec::new();
-    let mut gpio_io = Vec::new();
-
-    for descriptor in descriptors {
-        match descriptor {
-            ResourceDescriptor::I2cSerialBus(bus) => {
-                if i2c.is_none() {
-                    let adapter = bus
-                        .resource_source
-                        .as_ref()
-                        .map(|source| source.source.clone())
-                        .filter(|source| !source.is_empty())
-                        .unwrap_or_else(|| "ACPI-I2C".to_string());
-                    i2c = Some(I2cBinding {
-                        adapter,
-                        address: bus.slave_address,
-                    });
-                }
-            }
-            ResourceDescriptor::Irq(descriptor) => {
-                if irq.is_none() {
-                    irq = descriptor.interrupts.first().copied().map(u32::from);
-                }
-            }
-            ResourceDescriptor::ExtendedIrq(descriptor) => {
-                if irq.is_none() {
-                    irq = descriptor.interrupts.first().copied();
-                }
-            }
-            ResourceDescriptor::GpioInt(descriptor) => gpio_int.push(descriptor),
-            ResourceDescriptor::GpioIo(descriptor) => gpio_io.push(descriptor),
-            _ => {}
-        }
-    }
-
-    let mut resources = AcpiDeviceResources {
-        i2c: i2c.ok_or_else(|| anyhow!("no I2cSerialBus resource in _CRS"))?,
-        irq,
-        gpio_int,
-        gpio_io,
-    };
-
-    if let Some(override_address) = companion_icrs_override(path)? {
-        log::info!(
-            "{}: applying THC companion ICRS override {:04x} -> {:04x}",
-            path,
-            resources.i2c.address,
-            override_address
-        );
-        resources.i2c.address = override_address;
-    }
-
-    Ok(resources)
-}
-
-pub fn prepare_acpi_device(path: &str) -> Result<()> {
-    let sta = evaluate_integer_method(path, "_STA").ok();
-    if let Some(sta) = sta {
-        if sta & 0x01 == 0 {
-            bail!("ACPI device is not present according to _STA={sta:#x}");
-        }
-    }
-
-    let _ = evaluate_method(path, "_PS0", &[]);
-    let _ = evaluate_method(path, "_INI", &[]);
-    Ok(())
-}
-
-pub fn recover_acpi_device(
-    path: &str,
-    resources: &AcpiDeviceResources,
-    quirk: Option<&ProbeFailureQuirk>,
-) -> Result<()> {
-    let _ = evaluate_method(path, "_PS3", &[]);
-
-    if let Some(quirk) = quirk {
-        if !resources.gpio_io.is_empty() {
-            log::warn!(
-                "{}: applying GPIO probe-failure recovery quirk {} vendor={:?} product={:?} board={:?} across {} GPIO IO resources",
-                path,
-                quirk.name,
-                quirk.system_vendor,
-                quirk.product_name,
-                quirk.board_name,
-                resources.gpio_io.len()
-            );
-        } else {
-            log::warn!(
-                "{}: quirk {} vendor={:?} product={:?} board={:?} matched but no GPIO IO resource was exposed",
-                path,
-                quirk.name
-                ,
-                quirk.system_vendor,
-                quirk.product_name,
-                quirk.board_name
-            );
-        }
-    }
-
-    let _ = evaluate_method(path, "_PS0", &[]);
-    let _ = evaluate_method(path, "_INI", &[]);
-    Ok(())
-}
-
-pub fn hid_descriptor_address(path: &str) -> Result<u16> {
-    let args = [
-        AmlSerdeValue::Buffer(I2C_HID_DSM_GUID.to_vec()),
-        AmlSerdeValue::Integer(1),
-        AmlSerdeValue::Integer(1),
-        AmlSerdeValue::Package {
-            contents: Vec::new(),
-        },
-    ];
-
-    match evaluate_method(path, "_DSM", &args) {
-        Ok(AmlSerdeValue::Integer(value)) => {
-            return u16::try_from(value).context("_DSM descriptor address out of range")
-        }
-        Ok(other) => log::warn!(
-            "{}._DSM returned unexpected value {:?}; retrying fallback index",
-            path,
-            other
-        ),
-        Err(err) => log::warn!(
-            "{}._DSM function 1 failed: {err}; retrying function 0",
-            path
-        ),
-    }
-
-    let fallback = [
-        AmlSerdeValue::Buffer(I2C_HID_DSM_GUID.to_vec()),
-        AmlSerdeValue::Integer(1),
-        AmlSerdeValue::Integer(0),
-        AmlSerdeValue::Package {
-            contents: Vec::new(),
-        },
-    ];
-
-    match evaluate_method(path, "_DSM", &fallback)? {
-        AmlSerdeValue::Integer(value) => {
-            u16::try_from(value).context("fallback _DSM descriptor address out of range")
-        }
-        other => bail!("fallback _DSM returned unexpected value {other:?}"),
-    }
-}
-
-fn companion_icrs_override(path: &str) -> Result<Option<u16>> {
-    let value = match evaluate_integer_method(path, "ICRS") {
-        Ok(value) => value,
-        Err(_) => return Ok(None),
-    };
-    Ok(Some(
-        u16::try_from(value).context("ICRS override out of range")?,
-    ))
-}
-
-pub fn evaluate_integer_method(path: &str, method: &str) -> Result<u64> {
-    match evaluate_method(path, method, &[])? {
-        AmlSerdeValue::Integer(value) => Ok(value),
-        other => bail!(
-            "{}.{} returned non-integer AML value {other:?}",
-            path,
-            method
-        ),
-    }
-}
-
-pub fn evaluate_method(path: &str, method: &str, args: &[AmlSerdeValue]) -> Result<AmlSerdeValue> {
-    let symbol_name = format!("{}.{}", normalize_device_path(path), method);
-    let symbol_path = format!("/scheme/acpi/symbols/{symbol_name}");
-    let fd = libredox::Fd::open(&symbol_path, O_RDWR | O_CLOEXEC, 0)
-        .with_context(|| format!("failed to open {symbol_path} for ACPI evaluation"))?;
-
-    let serialized = ron::to_string(args)
-        .with_context(|| format!("failed to serialize ACPI arguments for {symbol_name}"))?;
-    let mut payload = serialized.into_bytes();
-    payload.resize(payload.len() + 4096, 0);
-
-    let used = libredox::call::call_ro(fd.raw(), &mut payload, syscall::CallFlags::empty(), &[])
-        .with_context(|| format!("ACPI evaluation failed for {symbol_name}"))?;
-    let response = std::str::from_utf8(&payload[..used])
-        .with_context(|| format!("invalid UTF-8 ACPI response for {symbol_name}"))?;
-    ron::from_str(response)
-        .with_context(|| format!("failed to decode ACPI response for {symbol_name}"))
-}
-
-fn read_aml_symbol(file_name: &str) -> Result<AmlSerde> {
-    let path = format!("/scheme/acpi/symbols/{file_name}");
-    let mut file = OpenOptions::new()
-        .read(true)
-        .open(&path)
-        .with_context(|| format!("failed to open {path}"))?;
-    let mut ron_text = String::new();
-    file.read_to_string(&mut ron_text)
-        .with_context(|| format!("failed to read {path}"))?;
-    ron::from_str(&ron_text).with_context(|| format!("failed to decode {path}"))
-}
-
-fn decode_hardware_id(value: &AmlSerdeValue) -> Option<String> {
-    match value {
-        AmlSerdeValue::String(value) => Some(value.clone()),
-        AmlSerdeValue::Integer(integer) => {
-            let vendor = integer & 0xFFFF;
-            let device = (integer >> 16) & 0xFFFF;
-            let vendor_rev = ((vendor & 0xFF) << 8) | (vendor >> 8);
-            let vendor_1 = (((vendor_rev >> 10) & 0x1f) as u8 + 64) as char;
-            let vendor_2 = (((vendor_rev >> 5) & 0x1f) as u8 + 64) as char;
-            let vendor_3 = (((vendor_rev >> 0) & 0x1f) as u8 + 64) as char;
-            let device_1 = (device >> 4) & 0xF;
-            let device_2 = (device >> 0) & 0xF;
-            let device_3 = (device >> 12) & 0xF;
-            let device_4 = (device >> 8) & 0xF;
-
-            Some(format!(
-                "{}{}{}{:01X}{:01X}{:01X}{:01X}",
-                vendor_1, vendor_2, vendor_3, device_1, device_2, device_3, device_4
-            ))
-        }
-        _ => None,
-    }
-}
-
-pub fn normalize_device_path(path: &str) -> String {
-    path.trim_start_matches('\\')
-        .trim_matches('/')
-        .replace('/', ".")
-}
diff --git a/recipes/core/base/drivers/input/i2c-hidd/src/hid.rs b/recipes/core/base/drivers/input/i2c-hidd/src/hid.rs
deleted file mode 100644
index dd18e36c58..0000000000
--- a/recipes/core/base/drivers/input/i2c-hidd/src/hid.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use std::fs::OpenOptions;
-use std::io::{Read, Write};
-
-use anyhow::{bail, Context, Result};
-use i2c_interface::{I2cTransferRequest, I2cTransferResponse, I2cTransferSegment};
-use serde::{Deserialize, Serialize};
-
-use crate::acpi::I2cBinding;
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct HidDescriptor {
-    pub hid_desc_length: u16,
-    pub bcd_version: u16,
-    pub report_desc_length: u16,
-    pub report_desc_register: u16,
-    pub input_register: u16,
-    pub max_input_length: u16,
-    pub output_register: u16,
-    pub max_output_length: u16,
-    pub command_register: u16,
-    pub data_register: u16,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct ReportDescriptorSummary {
-    pub has_keyboard_page: bool,
-    pub has_pointer_page: bool,
-    pub report_ids: bool,
-}
-
-#[derive(Clone, Debug)]
-pub struct I2cAdapterClient {
-    binding: I2cBinding,
-}
-
-impl I2cAdapterClient {
-    pub fn new(binding: I2cBinding) -> Self {
-        Self { binding }
-    }
-    pub fn transfer(&self, segments: Vec<I2cTransferSegment>) -> Result<I2cTransferResponse> {
-        let request = I2cTransferRequest {
-            adapter: self.binding.adapter.clone(),
-            segments,
-            stop: true,
-        };
-
-        let serialized = ron::to_string(&request).context("failed to serialize I2C request")?;
-        let mut handle = OpenOptions::new()
-            .read(true)
-            .write(true)
-            .open("/scheme/i2c/transfer")
-            .context("failed to open /scheme/i2c/transfer")?;
-        handle
-            .write_all(serialized.as_bytes())
-            .context("failed to write I2C transfer request")?;
-
-        let mut response = String::new();
-        handle
-            .read_to_string(&mut response)
-            .context("failed to read I2C transfer response")?;
-
-        let transfer: I2cTransferResponse =
-            ron::from_str(&response).context("failed to decode I2C transfer response")?;
-        if !transfer.ok {
-            bail!(
-                "I2C transfer failed: {}",
-                transfer
-                    .error
-                    .unwrap_or_else(|| "unspecified transfer error".to_string())
-            );
-        }
-        Ok(transfer)
-    }
-
-    pub fn write_read(&self, address: u16, write_data: &[u8], read_len: usize) -> Result<Vec<u8>> {
-        let response = self.transfer(vec![
-            I2cTransferSegment::write(address, write_data.to_vec()),
-            I2cTransferSegment::read(address, read_len),
-        ])?;
-
-        response
-            .read_data
-            .last()
-            .cloned()
-            .ok_or_else(|| anyhow::anyhow!("I2C transfer returned no readable segment payload"))
-    }
-}
-
-pub fn fetch_hid_descriptor(
-    adapter: &I2cAdapterClient,
-    address: u16,
-    hid_desc_addr: u16,
-) -> Result<HidDescriptor> {
-    let prefix = adapter
-        .write_read(address, &hid_desc_addr.to_le_bytes(), 2)
-        .context("failed to read HID descriptor length prefix")?;
-    if prefix.len() < 2 {
-        bail!("short HID descriptor prefix: {} bytes", prefix.len());
-    }
-
-    let hid_desc_length = u16::from_le_bytes([prefix[0], prefix[1]]);
-    if hid_desc_length < 18 {
-        bail!("invalid HID descriptor length {hid_desc_length}");
-    }
-
-    let raw = adapter
-        .write_read(
-            address,
-            &hid_desc_addr.to_le_bytes(),
-            usize::from(hid_desc_length),
-        )
-        .context("failed to read full HID descriptor")?;
-    parse_hid_descriptor(&raw)
-}
-
-pub fn fetch_report_descriptor(
-    adapter: &I2cAdapterClient,
-    address: u16,
-    desc: &HidDescriptor,
-) -> Result<Vec<u8>> {
-    adapter
-        .write_read(
-            address,
-            &desc.report_desc_register.to_le_bytes(),
-            usize::from(desc.report_desc_length),
-        )
-        .context("failed to read HID report descriptor")
-}
-
-pub fn stream_input_reports(
-    adapter: &I2cAdapterClient,
-    address: u16,
-    desc: &HidDescriptor,
-    report_desc: &[u8],
-    sink: &mut crate::input::InputForwarder,
-) -> Result<()> {
-    let summary = summarize_report_descriptor(report_desc);
-    let input_len = usize::from(desc.max_input_length.max(4));
-
-    loop {
-        let report = adapter
-            .write_read(address, &desc.input_register.to_le_bytes(), input_len)
-            .context("failed to fetch I2C HID input report")?;
-        sink.forward_report(&summary, &report)?;
-    }
-}
-
-fn parse_hid_descriptor(bytes: &[u8]) -> Result<HidDescriptor> {
-    if bytes.len() < 18 {
-        bail!("short HID descriptor: {} bytes", bytes.len());
-    }
-
-    Ok(HidDescriptor {
-        hid_desc_length: le16(bytes, 0)?,
-        bcd_version: le16(bytes, 2)?,
-        report_desc_length: le16(bytes, 4)?,
-        report_desc_register: le16(bytes, 6)?,
-        input_register: le16(bytes, 8)?,
-        max_input_length: le16(bytes, 10)?,
-        output_register: le16(bytes, 12)?,
-        max_output_length: le16(bytes, 14)?,
-        command_register: le16(bytes, 16)?,
-        data_register: if bytes.len() >= 20 {
-            le16(bytes, 18)?
-        } else {
-            0
-        },
-    })
-}
-
-fn summarize_report_descriptor(report_desc: &[u8]) -> ReportDescriptorSummary {
-    let mut summary = ReportDescriptorSummary::default();
-
-    for window in report_desc.windows(2) {
-        match window {
-            [0x05, 0x01] => summary.has_pointer_page = true,
-            [0x05, 0x07] => summary.has_keyboard_page = true,
-            [0x85, _] => summary.report_ids = true,
-            _ => {}
-        }
-    }
-
-    if !summary.has_keyboard_page && !summary.has_pointer_page {
-        summary.has_pointer_page = true;
-    }
-
-    summary
-}
-
-fn le16(bytes: &[u8], offset: usize) -> Result<u16> {
-    let slice = bytes
-        .get(offset..offset + 2)
-        .ok_or_else(|| anyhow::anyhow!("short LE16 field at offset {offset}"))?;
-    Ok(u16::from_le_bytes([slice[0], slice[1]]))
-}
diff --git a/recipes/core/base/drivers/input/i2c-hidd/src/input.rs b/recipes/core/base/drivers/input/i2c-hidd/src/input.rs
deleted file mode 100644
index 432a0782f6..0000000000
--- a/recipes/core/base/drivers/input/i2c-hidd/src/input.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-use std::collections::BTreeSet;
-
-use anyhow::Result;
-use inputd::ProducerHandle;
-use orbclient::{
-    ButtonEvent, KeyEvent, MouseRelativeEvent, ScrollEvent, K_ALT, K_ALT_GR, K_BKSP, K_BRACE_CLOSE,
-    K_BRACE_OPEN, K_CAPS, K_COMMA, K_ENTER, K_EQUALS, K_ESC, K_LEFT_CTRL, K_LEFT_SHIFT,
-    K_LEFT_SUPER, K_MINUS, K_PERIOD, K_QUOTE, K_RIGHT_CTRL, K_RIGHT_SHIFT, K_RIGHT_SUPER,
-    K_SEMICOLON, K_SLASH, K_SPACE, K_TAB, K_TICK,
-};
-
-use crate::hid::ReportDescriptorSummary;
-
-pub struct InputForwarder {
-    producer: ProducerHandle,
-    keyboard_state: BTreeSet<u8>,
-    last_buttons: u8,
-}
-
-impl InputForwarder {
-    pub fn new() -> Result<Self> {
-        Ok(Self {
-            producer: ProducerHandle::new()?,
-            keyboard_state: BTreeSet::new(),
-            last_buttons: 0,
-        })
-    }
-
-    pub fn forward_report(
-        &mut self,
-        summary: &ReportDescriptorSummary,
-        report: &[u8],
-    ) -> Result<()> {
-        if report.is_empty() {
-            return Ok(());
-        }
-
-        if summary.has_keyboard_page && report.len() >= 8 {
-            self.forward_boot_keyboard(report)?;
-            return Ok(());
-        }
-
-        if summary.has_pointer_page && report.len() >= 3 {
-            self.forward_boot_pointer(report)?;
-            return Ok(());
-        }
-
-        Ok(())
-    }
-
-    fn forward_boot_keyboard(&mut self, report: &[u8]) -> Result<()> {
-        let modifiers = report[0];
-        for (bit, scancode) in [
-            (0_u8, K_LEFT_CTRL),
-            (1, K_LEFT_SHIFT),
-            (2, K_ALT),
-            (3, K_LEFT_SUPER),
-            (4, K_RIGHT_CTRL),
-            (5, K_RIGHT_SHIFT),
-            (6, K_ALT_GR),
-            (7, K_RIGHT_SUPER),
-        ] {
-            self.producer.write_event(
-                KeyEvent {
-                    character: '\0',
-                    scancode,
-                    pressed: modifiers & (1 << bit) != 0,
-                }
-                .to_event(),
-            )?;
-        }
-
-        let current = report[2..8]
-            .iter()
-            .copied()
-            .filter(|code| *code != 0)
-            .collect::<BTreeSet<_>>();
-
-        for code in current.difference(&self.keyboard_state) {
-            if let Some(scancode) = map_boot_keyboard_usage(*code) {
-                self.producer.write_event(
-                    KeyEvent {
-                        character: '\0',
-                        scancode,
-                        pressed: true,
-                    }
-                    .to_event(),
-                )?;
-            }
-        }
-        for code in self.keyboard_state.difference(&current) {
-            if let Some(scancode) = map_boot_keyboard_usage(*code) {
-                self.producer.write_event(
-                    KeyEvent {
-                        character: '\0',
-                        scancode,
-                        pressed: false,
-                    }
-                    .to_event(),
-                )?;
-            }
-        }
-
-        self.keyboard_state = current;
-        Ok(())
-    }
-
-    fn forward_boot_pointer(&mut self, report: &[u8]) -> Result<()> {
-        let dx = i8::from_ne_bytes([report[1]]) as i32;
-        let dy = i8::from_ne_bytes([report[2]]) as i32;
-        if dx != 0 || dy != 0 {
-            self.producer
-                .write_event(MouseRelativeEvent { dx, dy }.to_event())?;
-        }
-
-        if let Some(scroll) = report.get(3).copied() {
-            let scroll = i8::from_ne_bytes([scroll]) as i32;
-            if scroll != 0 {
-                self.producer
-                    .write_event(ScrollEvent { x: 0, y: scroll }.to_event())?;
-            }
-        }
-
-        let buttons = report[0] & 0x07;
-        for index in 0..3 {
-            let mask = 1 << index;
-            if (buttons & mask) != (self.last_buttons & mask) {
-                self.producer.write_event(
-                    ButtonEvent {
-                        left: buttons & 0x01 != 0,
-                        middle: buttons & 0x04 != 0,
-                        right: buttons & 0x02 != 0,
-                    }
-                    .to_event(),
-                )?;
-                break;
-            }
-        }
-        self.last_buttons = buttons;
-        Ok(())
-    }
-}
-
-fn map_boot_keyboard_usage(usage: u8) -> Option<u8> {
-    Some(match usage {
-        0x04..=0x1D => b'a' + (usage - 0x04),
-        0x1E => b'1',
-        0x1F => b'2',
-        0x20 => b'3',
-        0x21 => b'4',
-        0x22 => b'5',
-        0x23 => b'6',
-        0x24 => b'7',
-        0x25 => b'8',
-        0x26 => b'9',
-        0x27 => b'0',
-        0x28 => K_ENTER,
-        0x29 => K_ESC,
-        0x2A => K_BKSP,
-        0x2B => K_TAB,
-        0x2C => K_SPACE,
-        0x2D => K_MINUS,
-        0x2E => K_EQUALS,
-        0x2F => K_BRACE_OPEN,
-        0x30 => K_BRACE_CLOSE,
-        0x33 => K_SEMICOLON,
-        0x34 => K_QUOTE,
-        0x35 => K_TICK,
-        0x36 => K_COMMA,
-        0x37 => K_PERIOD,
-        0x38 => K_SLASH,
-        0x39 => K_CAPS,
-        _ => return None,
-    })
-}
diff --git a/recipes/core/base/drivers/input/i2c-hidd/src/main.rs b/recipes/core/base/drivers/input/i2c-hidd/src/main.rs
deleted file mode 100644
index 88270e37b8..0000000000
--- a/recipes/core/base/drivers/input/i2c-hidd/src/main.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use std::process;
-use std::thread;
-use std::time::Duration;
-
-use anyhow::{Context, Result};
-
-mod acpi;
-mod hid;
-mod input;
-mod quirks;
-
-use acpi::{
-    hid_descriptor_address, prepare_acpi_device, read_decoded_resources, recover_acpi_device,
-    scan_acpi_i2c_hid_devices,
-};
-use hid::{fetch_hid_descriptor, fetch_report_descriptor, stream_input_reports, I2cAdapterClient};
-use input::InputForwarder;
-use quirks::match_probe_failure_quirk;
-
-fn main() {
-    daemon::Daemon::new(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon) -> ! {
-    common::setup_logging(
-        "input",
-        "i2c-hid",
-        "i2c-hidd",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    if let Err(err) = run(daemon) {
-        log::error!("RB_I2C_HIDD_BLOCKER stage=startup error={err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn run(daemon: daemon::Daemon) -> Result<()> {
-    log::info!("RB_I2C_HIDD_SCHEMA version=1");
-
-    let devices = scan_acpi_i2c_hid_devices().context("failed to scan ACPI I2C HID devices")?;
-    if devices.is_empty() {
-        log::warn!("RB_I2C_HIDD_BLOCKER stage=scan error=no PNP0C50/ACPI0C50 devices found");
-    }
-
-    let mut workers = Vec::new();
-    for device in devices {
-        log::info!("RB_I2C_HIDD_SNAPSHOT device={device}");
-        workers.push(thread::spawn(move || {
-            if let Err(err) = bind_device(&device) {
-                log::error!("RB_I2C_HIDD_BLOCKER device={} error={:#}", device, err);
-            }
-        }));
-    }
-
-    daemon.ready();
-
-    if workers.is_empty() {
-        loop {
-            thread::sleep(Duration::from_secs(5));
-        }
-    }
-
-    for worker in workers {
-        let _ = worker.join();
-    }
-    Ok(())
-}
-
-pub fn bind_device(device_path: &str) -> Result<()> {
-    prepare_acpi_device(device_path)
-        .with_context(|| format!("failed to prepare ACPI device {device_path}"))?;
-
-    let resources = read_decoded_resources(device_path)
-        .with_context(|| format!("failed to decode _CRS for {device_path}"))?;
-    log::info!(
-        "RB_I2C_HIDD_SNAPSHOT device={} adapter={} addr={:04x} irq={:?} gpio_int={} gpio_io={}",
-        device_path,
-        resources.i2c.adapter,
-        resources.i2c.address,
-        resources.irq,
-        resources.gpio_int.len(),
-        resources.gpio_io.len()
-    );
-
-    let hid_desc_addr = hid_descriptor_address(device_path)
-        .with_context(|| format!("failed to evaluate _DSM for {device_path}"))?;
-    let adapter = I2cAdapterClient::new(resources.i2c.clone());
-    let hid_desc = fetch_hid_descriptor(&adapter, resources.i2c.address, hid_desc_addr)
-        .with_context(|| format!("failed to fetch HID descriptor for {device_path}"))?;
-    let report_desc = fetch_report_descriptor(&adapter, resources.i2c.address, &hid_desc)
-        .with_context(|| format!("failed to fetch report descriptor for {device_path}"))?;
-    let mut forwarder = InputForwarder::new().context("failed to connect to inputd producer")?;
-
-    match stream_input_reports(
-        &adapter,
-        resources.i2c.address,
-        &hid_desc,
-        &report_desc,
-        &mut forwarder,
-    ) {
-        Ok(()) => Ok(()),
-        Err(err) => {
-            let quirk =
-                match_probe_failure_quirk().context("failed to evaluate DMI recovery quirks")?;
-            recover_acpi_device(device_path, &resources, quirk.as_ref())
-                .with_context(|| format!("failed ACPI recovery for {device_path}"))?;
-            Err(err).with_context(|| format!("streaming input reports failed for {device_path}"))
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/input/i2c-hidd/src/quirks.rs b/recipes/core/base/drivers/input/i2c-hidd/src/quirks.rs
deleted file mode 100644
index 450cb19b1b..0000000000
--- a/recipes/core/base/drivers/input/i2c-hidd/src/quirks.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use std::fs;
-
-use anyhow::{Context, Result};
-use serde::Deserialize;
-
-#[derive(Clone, Debug)]
-pub struct ProbeFailureQuirk {
-    pub name: String,
-    pub system_vendor: Option<String>,
-    pub product_name: Option<String>,
-    pub board_name: Option<String>,
-}
-
-#[derive(Clone, Debug, Default, Deserialize)]
-struct ProbeFailureQuirkFile {
-    quirks: Vec<ProbeFailureQuirkEntry>,
-}
-
-#[derive(Clone, Debug, Deserialize)]
-struct ProbeFailureQuirkEntry {
-    name: String,
-    system_vendor: Option<String>,
-    product_name: Option<String>,
-    board_name: Option<String>,
-}
-
-#[derive(Default)]
-struct DmiSnapshot {
-    system_vendor: String,
-    product_name: String,
-    board_name: String,
-}
-
-pub fn match_probe_failure_quirk() -> Result<Option<ProbeFailureQuirk>> {
-    let snapshot = read_dmi_snapshot()?;
-    for entry in load_quirks()? {
-        if field_matches(&entry.system_vendor, &snapshot.system_vendor)
-            && field_matches(&entry.product_name, &snapshot.product_name)
-            && field_matches(&entry.board_name, &snapshot.board_name)
-        {
-            return Ok(Some(ProbeFailureQuirk {
-                name: entry.name,
-                system_vendor: entry.system_vendor,
-                product_name: entry.product_name,
-                board_name: entry.board_name,
-            }));
-        }
-    }
-
-    Ok(None)
-}
-
-fn load_quirks() -> Result<Vec<ProbeFailureQuirkEntry>> {
-    let path = "/etc/i2c-hidd-quirks.ron";
-    let text = match fs::read_to_string(path) {
-        Ok(text) => text,
-        Err(err) if err.kind() == std::io::ErrorKind::NotFound => return Ok(Vec::new()),
-        Err(err) => return Err(err).with_context(|| format!("failed to read {path}")),
-    };
-
-    let file: ProbeFailureQuirkFile =
-        ron::from_str(&text).with_context(|| format!("failed to decode {path}"))?;
-    Ok(file.quirks)
-}
-
-fn read_dmi_snapshot() -> Result<DmiSnapshot> {
-    Ok(DmiSnapshot {
-        system_vendor: read_dmi_field("system_vendor")?,
-        product_name: read_dmi_field("product_name")?,
-        board_name: read_dmi_field("board_name")?,
-    })
-}
-
-fn read_dmi_field(field: &str) -> Result<String> {
-    let path = format!("/scheme/acpi/dmi/{field}");
-    match fs::read_to_string(&path) {
-        Ok(value) => Ok(value.trim().to_string()),
-        Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(String::new()),
-        Err(err) => Err(err).with_context(|| format!("failed to read {path}")),
-    }
-}
-
-fn field_matches(expected: &Option<String>, actual: &str) -> bool {
-    expected
-        .as_deref()
-        .map(|expected| actual.eq_ignore_ascii_case(expected))
-        .unwrap_or(true)
-}
diff --git a/recipes/core/base/drivers/input/intel-thc-hidd/Cargo.toml b/recipes/core/base/drivers/input/intel-thc-hidd/Cargo.toml
deleted file mode 100644
index f6aa224832..0000000000
--- a/recipes/core/base/drivers/input/intel-thc-hidd/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "intel-thc-hidd"
-description = "Intel THC QuickI2C HID transport daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-pci_types = "0.10.1"
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-redox-scheme.workspace = true
-ron.workspace = true
-serde.workspace = true
-
-acpi-resource = { path = "../../acpi-resource" }
-amlserde = { path = "../../amlserde" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-i2c-interface = { path = "../../i2c/i2c-interface" }
-pcid = { path = "../../pcid" }
-scheme-utils = { path = "../../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/input/intel-thc-hidd/src/main.rs b/recipes/core/base/drivers/input/intel-thc-hidd/src/main.rs
deleted file mode 100644
index 423977e05d..0000000000
--- a/recipes/core/base/drivers/input/intel-thc-hidd/src/main.rs
+++ /dev/null
@@ -1,260 +0,0 @@
-use std::collections::BTreeSet;
-use std::fs::{self, OpenOptions};
-use std::io::Read;
-use std::process;
-use std::thread;
-use std::time::Duration;
-
-use acpi_resource::ResourceDescriptor;
-use amlserde::{AmlSerde, AmlSerdeValue};
-use anyhow::{bail, Context, Result};
-use libredox::flag::{O_CLOEXEC, O_RDWR};
-use pcid_interface::PciFunctionHandle;
-
-mod quicki2c;
-mod thc;
-
-use quicki2c::QuickI2cTransport;
-use thc::{ThcController, SUPPORTED_PCI_IDS};
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    common::setup_logging(
-        "input",
-        "intel-thc",
-        "intel-thc-hidd",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    if let Err(err) = run(daemon, &mut pcid_handle) {
-        log::error!("RB_THC_HIDD_FATAL error={err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn run(daemon: daemon::Daemon, pcid_handle: &mut PciFunctionHandle) -> Result<()> {
-    log::info!("RB_THC_HIDD_SCHEMA version=1");
-
-    let pci_config = pcid_handle.config();
-    let id = (
-        pci_config.func.full_device_id.vendor_id,
-        pci_config.func.full_device_id.device_id,
-    );
-    if !SUPPORTED_PCI_IDS.contains(&id) {
-        bail!("unsupported Intel THC PCI device {:04x}:{:04x}", id.0, id.1);
-    }
-
-    pcid_handle.enable_device();
-    let bar = unsafe { pcid_handle.map_bar(0) };
-    let controller = ThcController::new(bar.ptr.as_ptr(), bar.bar_size)
-        .context("failed to create THC controller")?;
-
-    let companion = resolve_acpi_companion(&pci_config.func.addr)
-        .context("failed to resolve ACPI companion for THC device")?;
-    let override_address = companion
-        .as_deref()
-        .map(companion_slave_address_override)
-        .transpose()
-        .context("failed to evaluate THC slave-address override")?
-        .flatten();
-    let hid_devices = scan_bound_i2c_hid_devices(companion.as_deref())
-        .context("failed to scan PNP0C50 devices for THC controller")?;
-
-    let effective_address = override_address.unwrap_or(0x0015);
-    let transport = QuickI2cTransport::new(controller, effective_address);
-    transport.prime_controller();
-    transport.emulate_transfer(&[]);
-    log::debug!("RB_THC_HIDD status={:#x}", transport.status());
-
-    match transport.register_with_i2cd(companion.as_deref(), override_address) {
-        Ok(()) => {}
-        Err(err) => {
-            log::warn!("RB_THC_HIDD registration error={err:#}");
-        }
-    }
-
-    log::info!(
-        "RB_THC_HIDD pci={} companion={:?} override={:?} hid_devices={}",
-        pci_config.func.name(),
-        companion,
-        override_address,
-        hid_devices.len()
-    );
-
-    daemon.ready();
-
-    loop {
-        thread::sleep(Duration::from_secs(5));
-    }
-}
-
-fn resolve_acpi_companion(addr: &pci_types::PciAddress) -> Result<Option<String>> {
-    let entries =
-        fs::read_dir("/scheme/acpi/symbols").context("failed to read /scheme/acpi/symbols")?;
-    let expected_adr = (u64::from(addr.device()) << 16) | u64::from(addr.function());
-
-    for entry in entries {
-        let entry = entry.context("failed to enumerate ACPI symbol entry")?;
-        let Some(file_name) = entry.file_name().to_str().map(str::to_owned) else {
-            continue;
-        };
-        if !file_name.ends_with("._ADR") {
-            continue;
-        }
-
-        let symbol = read_aml_symbol(&file_name)?;
-        if !matches!(symbol.value, AmlSerdeValue::Integer(value) if value == expected_adr) {
-            continue;
-        }
-
-        let device = symbol
-            .name
-            .strip_suffix("._ADR")
-            .unwrap_or(&symbol.name)
-            .trim_start_matches('\\')
-            .replace('/', ".");
-        return Ok(Some(device));
-    }
-
-    Ok(None)
-}
-
-fn companion_slave_address_override(path: &str) -> Result<Option<u16>> {
-    let icrs = evaluate_integer_method(path, "ICRS").ok();
-    let isub = evaluate_integer_method(path, "ISUB").ok();
-    Ok(icrs
-        .or(isub)
-        .map(|value| u16::try_from(value))
-        .transpose()
-        .context("THC ACPI override out of range")?)
-}
-
-fn scan_bound_i2c_hid_devices(companion: Option<&str>) -> Result<Vec<String>> {
-    let entries =
-        fs::read_dir("/scheme/acpi/symbols").context("failed to read /scheme/acpi/symbols")?;
-    let mut devices = BTreeSet::new();
-
-    for entry in entries {
-        let entry = entry.context("failed to enumerate ACPI HID entry")?;
-        let Some(file_name) = entry.file_name().to_str().map(str::to_owned) else {
-            continue;
-        };
-        if !file_name.ends_with("._HID") && !file_name.ends_with("._CID") {
-            continue;
-        }
-
-        let symbol = read_aml_symbol(&file_name)?;
-        let is_hid = matches!(
-            decode_hardware_id(&symbol.value).as_deref(),
-            Some("PNP0C50" | "ACPI0C50")
-        );
-        if !is_hid {
-            continue;
-        }
-
-        let device = symbol
-            .name
-            .strip_suffix("._HID")
-            .or_else(|| symbol.name.strip_suffix("._CID"))
-            .unwrap_or(&symbol.name)
-            .trim_start_matches('\\')
-            .replace('/', ".");
-        if let Some(companion) = companion {
-            if !is_bound_to_companion(&device, companion)? {
-                continue;
-            }
-        }
-        devices.insert(device);
-    }
-
-    Ok(devices.into_iter().collect())
-}
-
-fn is_bound_to_companion(device: &str, companion: &str) -> Result<bool> {
-    let resource_path = format!("/scheme/acpi/resources/{device}");
-    let serialized = match fs::read_to_string(&resource_path) {
-        Ok(serialized) => serialized,
-        Err(err) if err.kind() == std::io::ErrorKind::NotFound => return Ok(false),
-        Err(err) => return Err(err).with_context(|| format!("failed to read {resource_path}")),
-    };
-
-    let resources: Vec<ResourceDescriptor> =
-        ron::from_str(&serialized).with_context(|| format!("failed to decode {resource_path}"))?;
-    Ok(resources.into_iter().any(|resource| match resource {
-        ResourceDescriptor::I2cSerialBus(bus) => bus
-            .resource_source
-            .as_ref()
-            .map(|source| source.source == companion)
-            .unwrap_or(false),
-        _ => false,
-    }))
-}
-
-fn evaluate_integer_method(path: &str, method: &str) -> Result<u64> {
-    let symbol_name = format!("{}.{}", normalize_device_path(path), method);
-    let symbol_path = format!("/scheme/acpi/symbols/{symbol_name}");
-    let fd = libredox::Fd::open(&symbol_path, O_RDWR | O_CLOEXEC, 0)
-        .with_context(|| format!("failed to open {symbol_path}"))?;
-
-    let mut payload = ron::to_string(&Vec::<AmlSerdeValue>::new())
-        .context("failed to serialize ACPI call arguments")?
-        .into_bytes();
-    payload.resize(payload.len() + 2048, 0);
-    let used = libredox::call::call_ro(fd.raw(), &mut payload, syscall::CallFlags::empty(), &[])
-        .with_context(|| format!("ACPI evaluation failed for {symbol_name}"))?;
-    let response = std::str::from_utf8(&payload[..used])
-        .with_context(|| format!("invalid UTF-8 ACPI response for {symbol_name}"))?;
-    match ron::from_str::<AmlSerdeValue>(response)
-        .with_context(|| format!("failed to decode ACPI response for {symbol_name}"))?
-    {
-        AmlSerdeValue::Integer(value) => Ok(value),
-        other => bail!("{}.{} returned non-integer value {other:?}", path, method),
-    }
-}
-
-fn read_aml_symbol(file_name: &str) -> Result<AmlSerde> {
-    let path = format!("/scheme/acpi/symbols/{file_name}");
-    let mut file = OpenOptions::new()
-        .read(true)
-        .open(&path)
-        .with_context(|| format!("failed to open {path}"))?;
-    let mut ron_text = String::new();
-    file.read_to_string(&mut ron_text)
-        .with_context(|| format!("failed to read {path}"))?;
-    ron::from_str(&ron_text).with_context(|| format!("failed to decode {path}"))
-}
-
-fn decode_hardware_id(value: &AmlSerdeValue) -> Option<String> {
-    match value {
-        AmlSerdeValue::String(value) => Some(value.clone()),
-        AmlSerdeValue::Integer(integer) => {
-            let vendor = integer & 0xFFFF;
-            let device = (integer >> 16) & 0xFFFF;
-            let vendor_rev = ((vendor & 0xFF) << 8) | (vendor >> 8);
-            let vendor_1 = (((vendor_rev >> 10) & 0x1f) as u8 + 64) as char;
-            let vendor_2 = (((vendor_rev >> 5) & 0x1f) as u8 + 64) as char;
-            let vendor_3 = (((vendor_rev >> 0) & 0x1f) as u8 + 64) as char;
-            let device_1 = (device >> 4) & 0xF;
-            let device_2 = (device >> 0) & 0xF;
-            let device_3 = (device >> 12) & 0xF;
-            let device_4 = (device >> 8) & 0xF;
-            Some(format!(
-                "{}{}{}{:01X}{:01X}{:01X}{:01X}",
-                vendor_1, vendor_2, vendor_3, device_1, device_2, device_3, device_4
-            ))
-        }
-        _ => None,
-    }
-}
-
-fn normalize_device_path(path: &str) -> String {
-    path.trim_start_matches('\\')
-        .trim_matches('/')
-        .replace('/', ".")
-}
diff --git a/recipes/core/base/drivers/input/intel-thc-hidd/src/quicki2c.rs b/recipes/core/base/drivers/input/intel-thc-hidd/src/quicki2c.rs
deleted file mode 100644
index 721f0be3b8..0000000000
--- a/recipes/core/base/drivers/input/intel-thc-hidd/src/quicki2c.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use std::fs::OpenOptions;
-use std::io::Write;
-
-use anyhow::{Context, Result};
-use i2c_interface::{I2cAdapterRegistration, I2cTransferSegment};
-
-use crate::thc::ThcController;
-
-const QUICKI2C_OPCODE_WRITE: u32 = 0x1;
-const QUICKI2C_OPCODE_READ: u32 = 0x2;
-
-pub struct QuickI2cTransport {
-    controller: ThcController,
-    slave_address: u16,
-}
-
-impl QuickI2cTransport {
-    pub fn new(controller: ThcController, slave_address: u16) -> Self {
-        Self {
-            controller,
-            slave_address,
-        }
-    }
-
-    pub fn prime_controller(&self) {
-        self.controller.initialize_quicki2c_mode();
-    }
-
-    pub fn emulate_transfer(&self, segments: &[I2cTransferSegment]) {
-        for segment in segments {
-            match &segment.op {
-                i2c_interface::I2cTransferOp::Write(data) => {
-                    self.controller.program_subip_transaction(
-                        QUICKI2C_OPCODE_WRITE,
-                        segment.address,
-                        data.len(),
-                    );
-                    for (index, chunk) in data.chunks(4).enumerate() {
-                        let mut word = [0_u8; 4];
-                        word[..chunk.len()].copy_from_slice(chunk);
-                        self.controller
-                            .write_subip_data(index * 4, u32::from_le_bytes(word));
-                    }
-                }
-                i2c_interface::I2cTransferOp::Read(len) => {
-                    self.controller.program_subip_transaction(
-                        QUICKI2C_OPCODE_READ,
-                        segment.address,
-                        *len,
-                    );
-                    let _ = self.controller.read_subip_data(0);
-                }
-            }
-        }
-    }
-
-    pub fn status(&self) -> u32 {
-        self.controller.status()
-    }
-
-    pub fn register_with_i2cd(
-        &self,
-        acpi_companion: Option<&str>,
-        override_address: Option<u16>,
-    ) -> Result<()> {
-        let registration = I2cAdapterRegistration {
-            name: "intel-thc-quicki2c".to_string(),
-            description: format!(
-                "Intel THC QuickI2C adapter for slave {:04x}",
-                self.slave_address
-            ),
-            acpi_companion: acpi_companion.map(str::to_owned),
-            slave_address_override: override_address,
-        };
-        let payload =
-            ron::to_string(&registration).context("failed to serialize i2cd registration")?;
-
-        let mut file = OpenOptions::new()
-            .write(true)
-            .open("/scheme/i2c/register")
-            .context("failed to open /scheme/i2c/register")?;
-        file.write_all(payload.as_bytes())
-            .context("failed to write i2cd adapter registration")?;
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/input/intel-thc-hidd/src/thc.rs b/recipes/core/base/drivers/input/intel-thc-hidd/src/thc.rs
deleted file mode 100644
index e06a6f8a6d..0000000000
--- a/recipes/core/base/drivers/input/intel-thc-hidd/src/thc.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use std::ptr::NonNull;
-
-use anyhow::{bail, Result};
-
-pub const SUPPORTED_PCI_IDS: &[(u16, u16)] = &[
-    (0x8086, 0x7eb8),
-    (0x8086, 0x7eb9),
-    (0x8086, 0x7ebd),
-    (0x8086, 0x7ebe),
-    (0x8086, 0xa8b8),
-    (0x8086, 0xa8b9),
-];
-
-pub const REG_CONTROL: usize = 0x0000;
-pub const REG_STATUS: usize = 0x0004;
-pub const REG_MODE: usize = 0x0010;
-pub const REG_SUBIP_OPCODE: usize = 0x0800;
-pub const REG_SUBIP_ADDRESS: usize = 0x0804;
-pub const REG_SUBIP_LENGTH: usize = 0x0808;
-pub const REG_SUBIP_DOORBELL: usize = 0x080C;
-pub const REG_SUBIP_DATA: usize = 0x0810;
-
-#[derive(Clone, Copy)]
-pub struct ThcController {
-    base: NonNull<u8>,
-    len: usize,
-}
-
-impl ThcController {
-    pub fn new(base: *mut u8, len: usize) -> Result<Self> {
-        let Some(base) = NonNull::new(base) else {
-            bail!("THC BAR mapping returned null base pointer");
-        };
-        Ok(Self { base, len })
-    }
-
-    pub fn initialize_quicki2c_mode(&self) {
-        self.write32(REG_MODE, 0x1);
-        self.write32(REG_CONTROL, 0x1);
-    }
-
-    pub fn status(&self) -> u32 {
-        self.read32(REG_STATUS)
-    }
-
-    pub fn program_subip_transaction(&self, opcode: u32, address: u16, len: usize) {
-        self.write32(REG_SUBIP_OPCODE, opcode);
-        self.write32(REG_SUBIP_ADDRESS, u32::from(address));
-        self.write32(REG_SUBIP_LENGTH, len as u32);
-        self.write32(REG_SUBIP_DOORBELL, 1);
-    }
-
-    pub fn write_subip_data(&self, offset: usize, value: u32) {
-        self.write32(REG_SUBIP_DATA + offset, value);
-    }
-
-    pub fn read_subip_data(&self, offset: usize) -> u32 {
-        self.read32(REG_SUBIP_DATA + offset)
-    }
-
-    fn read32(&self, offset: usize) -> u32 {
-        if offset + 4 > self.len {
-            return 0;
-        }
-
-        let ptr = unsafe { self.base.as_ptr().add(offset).cast::<u32>() };
-        unsafe { ptr.read_volatile() }
-    }
-
-    fn write32(&self, offset: usize, value: u32) {
-        if offset + 4 > self.len {
-            return;
-        }
-
-        let ptr = unsafe { self.base.as_ptr().add(offset).cast::<u32>() };
-        unsafe { ptr.write_volatile(value) };
-    }
-}
diff --git a/recipes/core/base/drivers/input/ps2d/.gitignore b/recipes/core/base/drivers/input/ps2d/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/input/ps2d/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/input/ps2d/Cargo.toml b/recipes/core/base/drivers/input/ps2d/Cargo.toml
deleted file mode 100644
index fdba06b634..0000000000
--- a/recipes/core/base/drivers/input/ps2d/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "ps2d"
-description = "PS/2 driver"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-bitflags.workspace = true
-log.workspace = true
-orbclient.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-redox-scheme.workspace = true
-libredox.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-inputd = { path = "../../inputd" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/input/ps2d/src/controller.rs b/recipes/core/base/drivers/input/ps2d/src/controller.rs
deleted file mode 100644
index d7af4cba2c..0000000000
--- a/recipes/core/base/drivers/input/ps2d/src/controller.rs
+++ /dev/null
@@ -1,389 +0,0 @@
-//! PS/2 controller, see:
-//! - https://wiki.osdev.org/I8042_PS/2_Controller
-//! - http://www.mcamafia.de/pdf/ibm_hitrc07.pdf
-
-use common::{
-    io::{Io, ReadOnly, WriteOnly},
-    timeout::Timeout,
-};
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-use common::io::Pio;
-
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-use common::io::Mmio;
-
-use log::{debug, error, info, trace, warn};
-
-use std::fmt;
-
-#[derive(Debug)]
-pub enum Error {
-    CommandRetry,
-    NoMoreTries,
-    ReadTimeout,
-    WriteTimeout,
-    CommandTimeout(Command),
-    WriteConfigTimeout(ConfigFlags),
-    KeyboardCommandFail(KeyboardCommand),
-    KeyboardCommandDataFail(KeyboardCommandData),
-}
-
-bitflags! {
-    pub struct StatusFlags: u8 {
-        const OUTPUT_FULL = 1;
-        const INPUT_FULL = 1 << 1;
-        const SYSTEM = 1 << 2;
-        const COMMAND = 1 << 3;
-        // Chipset specific
-        const KEYBOARD_LOCK = 1 << 4;
-        // Chipset specific
-        const SECOND_OUTPUT_FULL = 1 << 5;
-        const TIME_OUT = 1 << 6;
-        const PARITY = 1 << 7;
-    }
-}
-
-bitflags! {
-    #[derive(Clone, Copy, Debug)]
-    pub struct ConfigFlags: u8 {
-        const FIRST_INTERRUPT = 1 << 0;
-        const SECOND_INTERRUPT = 1 << 1;
-        const POST_PASSED = 1 << 2;
-        // 1 << 3 should be zero
-        const CONFIG_RESERVED_3 = 1 << 3;
-        const FIRST_DISABLED = 1 << 4;
-        const SECOND_DISABLED = 1 << 5;
-        const FIRST_TRANSLATE = 1 << 6;
-        // 1 << 7 should be zero
-        const CONFIG_RESERVED_7 = 1 << 7;
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-#[allow(dead_code)]
-enum Command {
-    ReadConfig = 0x20,
-    WriteConfig = 0x60,
-    DisableSecond = 0xA7,
-    EnableSecond = 0xA8,
-    TestSecond = 0xA9,
-    TestController = 0xAA,
-    TestFirst = 0xAB,
-    Diagnostic = 0xAC,
-    DisableFirst = 0xAD,
-    EnableFirst = 0xAE,
-    WriteSecond = 0xD4,
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-#[allow(dead_code)]
-enum KeyboardCommand {
-    EnableReporting = 0xF4,
-    SetDefaultsDisable = 0xF5,
-    SetDefaults = 0xF6,
-    Reset = 0xFF,
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-enum KeyboardCommandData {
-    ScancodeSet = 0xF0,
-}
-
-// Default timeout in microseconds
-const DEFAULT_TIMEOUT: u64 = 50_000;
-// Reset timeout in microseconds
-const RESET_TIMEOUT: u64 = 1_000_000;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub struct Ps2 {
-    data: Pio<u8>,
-    status: ReadOnly<Pio<u8>>,
-    command: WriteOnly<Pio<u8>>,
-    //TODO: keep in state instead
-    pub mouse_resets: usize,
-}
-
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-pub struct Ps2 {
-    data: Mmio<u8>,
-    status: ReadOnly<Mmio<u8>>,
-    command: WriteOnly<Mmio<u8>>,
-    //TODO: keep in state instead
-    pub mouse_resets: usize,
-}
-
-impl Ps2 {
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    pub fn new() -> Self {
-        Ps2 {
-            data: Pio::new(0x60),
-            status: ReadOnly::new(Pio::new(0x64)),
-            command: WriteOnly::new(Pio::new(0x64)),
-            mouse_resets: 0,
-        }
-    }
-
-    #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-    pub fn new() -> Self {
-        unimplemented!()
-    }
-
-    fn status(&mut self) -> StatusFlags {
-        StatusFlags::from_bits_truncate(self.status.read())
-    }
-
-    fn wait_read(&mut self, micros: u64) -> Result<(), Error> {
-        let timeout = Timeout::from_micros(micros);
-        loop {
-            if self.status().contains(StatusFlags::OUTPUT_FULL) {
-                return Ok(());
-            }
-            timeout.run().map_err(|()| Error::ReadTimeout)?
-        }
-    }
-
-    fn wait_write(&mut self, micros: u64) -> Result<(), Error> {
-        let timeout = Timeout::from_micros(micros);
-        loop {
-            if !self.status().contains(StatusFlags::INPUT_FULL) {
-                return Ok(());
-            }
-            timeout.run().map_err(|()| Error::WriteTimeout)?
-        }
-    }
-
-    fn command(&mut self, command: Command) -> Result<(), Error> {
-        self.wait_write(DEFAULT_TIMEOUT)
-            .map_err(|_| Error::CommandTimeout(command))?;
-        self.command.write(command as u8);
-        Ok(())
-    }
-
-    fn read(&mut self) -> Result<u8, Error> {
-        self.read_timeout(DEFAULT_TIMEOUT)
-    }
-
-    fn read_timeout(&mut self, micros: u64) -> Result<u8, Error> {
-        self.wait_read(micros)?;
-        let data = self.data.read();
-        Ok(data)
-    }
-
-    fn write(&mut self, data: u8) -> Result<(), Error> {
-        self.wait_write(DEFAULT_TIMEOUT)?;
-        self.data.write(data);
-        Ok(())
-    }
-
-    fn retry<T, F: Fn(&mut Self) -> Result<T, Error>>(
-        &mut self,
-        name: fmt::Arguments,
-        retries: usize,
-        f: F,
-    ) -> Result<T, Error> {
-        trace!("{}", name);
-        let mut res = Err(Error::NoMoreTries);
-        for retry in 0..retries {
-            res = f(self);
-            match res {
-                Ok(ok) => {
-                    return Ok(ok);
-                }
-                Err(ref err) => {
-                    debug!("{}: retry {}/{}: {:?}", name, retry + 1, retries, err);
-                }
-            }
-        }
-        res
-    }
-
-    fn config(&mut self) -> Result<ConfigFlags, Error> {
-        self.retry(format_args!("read config"), 4, |x| {
-            x.command(Command::ReadConfig)?;
-            x.read()
-        })
-        .map(ConfigFlags::from_bits_truncate)
-    }
-
-    fn set_config(&mut self, config: ConfigFlags) -> Result<(), Error> {
-        self.retry(format_args!("write config {:?}", config), 4, |x| {
-            x.command(Command::WriteConfig)?;
-            x.write(config.bits())
-                .map_err(|_| Error::WriteConfigTimeout(config))?;
-            Ok(0)
-        })?;
-        Ok(())
-    }
-
-    fn keyboard_command_inner(&mut self, command: u8) -> Result<u8, Error> {
-        self.write(command)?;
-        match self.read()? {
-            0xFE => Err(Error::CommandRetry),
-            value => Ok(value),
-        }
-    }
-
-    fn keyboard_command(&mut self, command: KeyboardCommand) -> Result<u8, Error> {
-        self.retry(format_args!("keyboard command {:?}", command), 4, |x| {
-            x.keyboard_command_inner(command as u8)
-                .map_err(|_| Error::KeyboardCommandFail(command))
-        })
-    }
-
-    fn keyboard_command_data(
-        &mut self,
-        command: KeyboardCommandData,
-        data: u8,
-    ) -> Result<u8, Error> {
-        self.retry(
-            format_args!("keyboard command {:?} {:#x}", command, data),
-            4,
-            |x| {
-                let res = x
-                    .keyboard_command_inner(command as u8)
-                    .map_err(|_| Error::KeyboardCommandDataFail(command))?;
-                if res != 0xFA {
-                    warn!("keyboard incorrect result of set command: {command:?} {res:02X}");
-                    return Ok(res);
-                }
-                x.write(data)?;
-                x.read()
-            },
-        )
-    }
-
-    pub fn mouse_command_async(&mut self, command: u8) -> Result<(), Error> {
-        self.command(Command::WriteSecond)?;
-        self.write(command as u8)
-    }
-
-    pub fn next(&mut self) -> Option<(bool, u8)> {
-        let status = self.status();
-        if status.contains(StatusFlags::OUTPUT_FULL) {
-            let data = self.data.read();
-            Some((!status.contains(StatusFlags::SECOND_OUTPUT_FULL), data))
-        } else {
-            None
-        }
-    }
-
-    pub fn init_keyboard(&mut self) -> Result<(), Error> {
-        let mut b;
-
-        {
-            // Enable first device
-            self.command(Command::EnableFirst)?;
-        }
-
-        {
-            // Reset keyboard
-            b = self.keyboard_command(KeyboardCommand::Reset)?;
-            if b == 0xFA {
-                b = self.read().unwrap_or(0);
-                if b != 0xAA {
-                    error!("keyboard failed self test: {:02X}", b);
-                }
-            } else {
-                error!("keyboard failed to reset: {:02X}", b);
-            }
-        }
-
-        {
-            // Set scancode set to 2
-            let scancode_set = 2;
-            b = self.keyboard_command_data(KeyboardCommandData::ScancodeSet, scancode_set)?;
-            if b != 0xFA {
-                error!(
-                    "keyboard failed to set scancode set {}: {:02X}",
-                    scancode_set, b
-                );
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn init(&mut self) -> Result<(), Error> {
-        {
-            // Disable devices
-            self.command(Command::DisableFirst)?;
-            self.command(Command::DisableSecond)?;
-        }
-
-        // Disable clocks, disable interrupts, and disable translate
-        {
-            // Since the default config may have interrupts enabled, and the kernel may eat up
-            // our data in that case, we will write a config without reading the current one
-            let config = ConfigFlags::POST_PASSED
-                | ConfigFlags::FIRST_DISABLED
-                | ConfigFlags::SECOND_DISABLED;
-            self.set_config(config)?;
-        }
-
-        // The keyboard seems to still collect bytes even when we disable
-        // the port, so we must disable the keyboard too
-        self.retry(format_args!("keyboard defaults"), 4, |x| {
-            // Set defaults and disable scanning
-            let b = x.keyboard_command(KeyboardCommand::SetDefaultsDisable)?;
-            if b != 0xFA {
-                error!("keyboard failed to set defaults: {:02X}", b);
-                return Err(Error::CommandRetry);
-            }
-
-            Ok(b)
-        })?;
-
-        {
-            // Perform the self test
-            self.command(Command::TestController)?;
-            let r = self.read()?;
-            if r != 0x55 {
-                warn!("self test unexpected value: {:02X}", r);
-            }
-        }
-
-        // Initialize keyboard
-        if let Err(err) = self.init_keyboard() {
-            error!("failed to initialize keyboard: {:?}", err);
-            return Err(err);
-        }
-
-        // Enable second device
-        let enable_mouse = match self.command(Command::EnableSecond) {
-            Ok(()) => true,
-            Err(err) => {
-                error!("failed to initialize mouse: {:?}", err);
-                false
-            }
-        };
-
-        {
-            // Enable keyboard data reporting
-            // Use inner function to prevent retries
-            // Response is ignored since scanning is now on
-            if let Err(err) = self.keyboard_command_inner(KeyboardCommand::EnableReporting as u8) {
-                error!("failed to initialize keyboard reporting: {:?}", err);
-                //TODO: fix by using interrupts?
-            }
-        }
-
-        // Enable clocks and interrupts
-        {
-            let config = ConfigFlags::POST_PASSED
-                | ConfigFlags::FIRST_INTERRUPT
-                | ConfigFlags::FIRST_TRANSLATE
-                | if enable_mouse {
-                    ConfigFlags::SECOND_INTERRUPT
-                } else {
-                    ConfigFlags::SECOND_DISABLED
-                };
-            self.set_config(config)?;
-        }
-
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/input/ps2d/src/main.rs b/recipes/core/base/drivers/input/ps2d/src/main.rs
deleted file mode 100644
index db17de2a62..0000000000
--- a/recipes/core/base/drivers/input/ps2d/src/main.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-#[macro_use]
-extern crate bitflags;
-extern crate orbclient;
-extern crate syscall;
-
-use std::fs::OpenOptions;
-use std::io::Read;
-use std::os::unix::fs::OpenOptionsExt;
-use std::os::unix::io::AsRawFd;
-use std::process;
-
-use common::acquire_port_io_rights;
-use event::{user_data, EventQueue};
-use inputd::ProducerHandle;
-
-use crate::state::Ps2d;
-
-mod controller;
-mod mouse;
-mod state;
-mod vm;
-
-fn daemon(daemon: daemon::Daemon) -> ! {
-    common::setup_logging(
-        "input",
-        "ps2",
-        "ps2",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    acquire_port_io_rights().expect("ps2d: failed to get I/O permission");
-
-    let input = ProducerHandle::new().expect("ps2d: failed to open input producer");
-
-    user_data! {
-        enum Source {
-            Keyboard,
-            Mouse,
-            Time,
-        }
-    }
-
-    let event_queue: EventQueue<Source> =
-        EventQueue::new().expect("ps2d: failed to create event queue");
-
-    let mut key_file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .custom_flags(syscall::O_NONBLOCK as i32)
-        .open("/scheme/serio/0")
-        .expect("ps2d: failed to open /scheme/serio/0");
-
-    event_queue
-        .subscribe(
-            key_file.as_raw_fd() as usize,
-            Source::Keyboard,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    let mut mouse_file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .custom_flags(syscall::O_NONBLOCK as i32)
-        .open("/scheme/serio/1")
-        .expect("ps2d: failed to open /scheme/serio/1");
-
-    event_queue
-        .subscribe(
-            mouse_file.as_raw_fd() as usize,
-            Source::Mouse,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    let time_file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .custom_flags(syscall::O_NONBLOCK as i32)
-        .open(format!("/scheme/time/{}", syscall::CLOCK_MONOTONIC))
-        .expect("ps2d: failed to open /scheme/time");
-
-    event_queue
-        .subscribe(
-            time_file.as_raw_fd() as usize,
-            Source::Time,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    libredox::call::setrens(0, 0).expect("ps2d: failed to enter null namespace");
-
-    daemon.ready();
-
-    let mut ps2d = Ps2d::new(input, time_file);
-
-    let mut data = [0; 256];
-    for event in event_queue.map(|e| e.expect("ps2d: failed to get next event").user_data) {
-        // There are some gotchas with ps/2 controllers that require this weird
-        // way of doing things. You read key and mouse data from the same
-        // place. There is a status register that may show you which the data
-        // came from, but if it is even implemented it can have a race
-        // condition causing keyboard data to be read as mouse data.
-        //
-        // Due to this, we have a kernel driver doing a small amount of work
-        // to grab bytes and sort them based on the source
-
-        let (file, keyboard) = match event {
-            Source::Keyboard => (&mut key_file, true),
-            Source::Mouse => (&mut mouse_file, false),
-            Source::Time => {
-                ps2d.time_event();
-                continue;
-            }
-        };
-
-        loop {
-            let count = match file.read(&mut data) {
-                Ok(0) => break,
-                Ok(count) => count,
-                Err(_) => break,
-            };
-            for i in 0..count {
-                ps2d.handle(keyboard, data[i]);
-            }
-        }
-    }
-
-    process::exit(0);
-}
-
-fn main() {
-    daemon::Daemon::new(daemon);
-}
diff --git a/recipes/core/base/drivers/input/ps2d/src/mouse.rs b/recipes/core/base/drivers/input/ps2d/src/mouse.rs
deleted file mode 100644
index 9e95ab889b..0000000000
--- a/recipes/core/base/drivers/input/ps2d/src/mouse.rs
+++ /dev/null
@@ -1,387 +0,0 @@
-use crate::controller::Ps2;
-use std::time::Duration;
-
-pub const RESET_RETRIES: usize = 10;
-pub const RESET_TIMEOUT: Duration = Duration::from_millis(1000);
-pub const COMMAND_TIMEOUT: Duration = Duration::from_millis(100);
-
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-#[allow(dead_code)]
-enum MouseCommand {
-    SetScaling1To1 = 0xE6,
-    SetScaling2To1 = 0xE7,
-    StatusRequest = 0xE9,
-    GetDeviceId = 0xF2,
-    EnableReporting = 0xF4,
-    SetDefaultsDisable = 0xF5,
-    SetDefaults = 0xF6,
-    Reset = 0xFF,
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-enum MouseCommandData {
-    SetResolution = 0xE8,
-    SetSampleRate = 0xF3,
-}
-
-#[derive(Debug)]
-struct MouseTx {
-    write: &'static [u8],
-    write_i: usize,
-    read: Vec<u8>,
-    read_bytes: usize,
-}
-
-impl MouseTx {
-    fn new(write: &'static [u8], read_bytes: usize, ps2: &mut Ps2) -> Result<Self, ()> {
-        let mut this = Self {
-            write,
-            write_i: 0,
-            read: Vec::with_capacity(read_bytes),
-            read_bytes,
-        };
-        this.try_write(ps2)?;
-        Ok(this)
-    }
-
-    fn try_write(&mut self, ps2: &mut Ps2) -> Result<(), ()> {
-        if let Some(write) = self.write.get(self.write_i) {
-            if let Err(err) = ps2.mouse_command_async(*write) {
-                log::error!("failed to write {:02X} to mouse: {:?}", write, err);
-                return Err(());
-            }
-        }
-        Ok(())
-    }
-
-    fn handle(&mut self, data: u8, ps2: &mut Ps2) -> Result<bool, ()> {
-        if self.write_i < self.write.len() {
-            if data == 0xFA {
-                self.write_i += 1;
-                self.try_write(ps2)?;
-            } else {
-                log::error!("unknown mouse response {:02X}", data);
-                return Err(());
-            }
-        } else {
-            self.read.push(data);
-        }
-        Ok(self.write_i >= self.write.len() && self.read.len() >= self.read_bytes)
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-#[allow(dead_code)]
-enum MouseId {
-    /// Mouse sends three bytes
-    Base = 0x00,
-    /// Mouse sends fourth byte with scroll
-    Intellimouse1 = 0x03,
-    /// Mouse sends fourth byte with scroll, button 4, and button 5
-    //TODO: support this mouse type
-    Intellimouse2 = 0x04,
-}
-
-// From Synaptics TouchPad Interfacing Guide
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-pub enum TouchpadCommand {
-    Identify = 0x00,
-}
-
-#[derive(Debug)]
-pub enum MouseState {
-    /// No mouse found
-    None,
-    /// Ready to initialize mouse
-    Init,
-    /// Reset command is sent
-    Reset,
-    /// BAT completion code returned
-    Bat,
-    /// Identify touchpad
-    IdentifyTouchpad { tx: MouseTx },
-    /// Enable intellimouse features
-    EnableIntellimouse { tx: MouseTx },
-    /// Status request
-    Status { index: usize },
-    /// Device ID update
-    DeviceId,
-    /// Enable reporting command sent
-    EnableReporting { id: u8 },
-    /// Mouse is streaming
-    Streaming { id: u8 },
-}
-
-#[derive(Debug)]
-#[must_use]
-pub enum MouseResult {
-    None,
-    Packet(u8, bool),
-    Timeout(Duration),
-}
-
-impl MouseState {
-    pub fn reset(&mut self, ps2: &mut Ps2) -> MouseResult {
-        if ps2.mouse_resets < RESET_RETRIES {
-            ps2.mouse_resets += 1;
-        } else {
-            log::error!("tried to reset mouse {} times, giving up", ps2.mouse_resets);
-            *self = MouseState::None;
-            return MouseResult::None;
-        }
-        match ps2.mouse_command_async(MouseCommand::Reset as u8) {
-            Ok(()) => {
-                *self = MouseState::Reset;
-                MouseResult::Timeout(RESET_TIMEOUT)
-            }
-            Err(err) => {
-                log::error!("failed to send mouse reset command: {:?}", err);
-                //TODO: retry reset?
-                *self = MouseState::None;
-                MouseResult::None
-            }
-        }
-    }
-
-    fn enable_reporting(&mut self, id: u8, ps2: &mut Ps2) -> MouseResult {
-        match ps2.mouse_command_async(MouseCommand::EnableReporting as u8) {
-            Ok(()) => {
-                *self = MouseState::EnableReporting { id };
-                MouseResult::Timeout(COMMAND_TIMEOUT)
-            }
-            Err(err) => {
-                log::error!("failed to enable mouse reporting: {:?}", err);
-                //TODO: reset mouse?
-                *self = MouseState::None;
-                MouseResult::None
-            }
-        }
-    }
-
-    fn request_status(&mut self, ps2: &mut Ps2) -> MouseResult {
-        match ps2.mouse_command_async(MouseCommand::StatusRequest as u8) {
-            Ok(()) => {
-                *self = MouseState::Status { index: 0 };
-                MouseResult::Timeout(COMMAND_TIMEOUT)
-            }
-            Err(err) => {
-                log::error!("failed to request mouse status: {:?}", err);
-                //TODO: reset mouse instead?
-                self.request_id(ps2)
-            }
-        }
-    }
-
-    fn request_id(&mut self, ps2: &mut Ps2) -> MouseResult {
-        match ps2.mouse_command_async(MouseCommand::GetDeviceId as u8) {
-            Ok(()) => {
-                *self = MouseState::DeviceId;
-                MouseResult::Timeout(COMMAND_TIMEOUT)
-            }
-            Err(err) => {
-                log::error!("failed to request mouse id: {:?}", err);
-                //TODO: reset mouse instead?
-                self.enable_reporting(MouseId::Base as u8, ps2)
-            }
-        }
-    }
-
-    fn identify_touchpad(&mut self, ps2: &mut Ps2) -> MouseResult {
-        let cmd = TouchpadCommand::Identify as u8;
-        match MouseTx::new(
-            &[
-                // Ensure command alignment
-                MouseCommand::SetScaling1To1 as u8,
-                // Send special identify touchpad command
-                MouseCommandData::SetResolution as u8,
-                0,
-                MouseCommandData::SetResolution as u8,
-                0,
-                MouseCommandData::SetResolution as u8,
-                0,
-                MouseCommandData::SetResolution as u8,
-                0,
-                // Status request
-                MouseCommand::StatusRequest as u8,
-            ],
-            3,
-            ps2,
-        ) {
-            Ok(tx) => {
-                *self = MouseState::IdentifyTouchpad { tx };
-                MouseResult::Timeout(COMMAND_TIMEOUT)
-            }
-            Err(()) => self.enable_intellimouse(ps2),
-        }
-    }
-
-    fn enable_intellimouse(&mut self, ps2: &mut Ps2) -> MouseResult {
-        match MouseTx::new(
-            &[
-                MouseCommandData::SetSampleRate as u8,
-                200,
-                MouseCommandData::SetSampleRate as u8,
-                100,
-                MouseCommandData::SetSampleRate as u8,
-                80,
-            ],
-            0,
-            ps2,
-        ) {
-            Ok(tx) => {
-                *self = MouseState::EnableIntellimouse { tx };
-                MouseResult::Timeout(COMMAND_TIMEOUT)
-            }
-            Err(()) => self.request_id(ps2),
-        }
-    }
-
-    pub fn handle(&mut self, data: u8, ps2: &mut Ps2) -> MouseResult {
-        match *self {
-            MouseState::None | MouseState::Init => {
-                //TODO: enable port in this case, mouse hotplug may send 0xAA 0x00
-                log::error!(
-                    "received mouse byte {:02X} when mouse not initialized",
-                    data
-                );
-                MouseResult::None
-            }
-            MouseState::Reset => {
-                if data == 0xFA {
-                    log::debug!("mouse reset ok");
-                    MouseResult::Timeout(RESET_TIMEOUT)
-                } else if data == 0xAA {
-                    log::debug!("BAT completed");
-                    *self = MouseState::Bat;
-                    MouseResult::Timeout(COMMAND_TIMEOUT)
-                } else {
-                    log::warn!("unknown mouse response {:02X} after reset", data);
-                    self.reset(ps2)
-                }
-            }
-            MouseState::Bat => {
-                if data == MouseId::Base as u8 {
-                    // Enable intellimouse features
-                    log::debug!("BAT mouse id {:02X} (base)", data);
-                    self.identify_touchpad(ps2)
-                } else if data == MouseId::Intellimouse1 as u8 {
-                    // Extra packet already enabled
-                    log::debug!("BAT mouse id {:02X} (intellimouse)", data);
-                    self.enable_reporting(data, ps2)
-                } else {
-                    log::warn!("unknown mouse id {:02X} after BAT", data);
-                    MouseResult::Timeout(RESET_TIMEOUT)
-                }
-            }
-            MouseState::IdentifyTouchpad { ref mut tx } => {
-                match tx.handle(data, ps2) {
-                    Ok(done) => {
-                        if done {
-                            //TODO: handle touchpad identification
-                            // If tx.read[1] == 0x47, this is a synaptics touchpad
-                            self.request_status(ps2)
-                        } else {
-                            MouseResult::Timeout(COMMAND_TIMEOUT)
-                        }
-                    }
-                    Err(()) => self.enable_intellimouse(ps2),
-                }
-            }
-            MouseState::EnableIntellimouse { ref mut tx } => match tx.handle(data, ps2) {
-                Ok(done) => {
-                    if done {
-                        self.request_status(ps2)
-                    } else {
-                        MouseResult::Timeout(COMMAND_TIMEOUT)
-                    }
-                }
-                Err(()) => self.request_status(ps2),
-            },
-            MouseState::Status { index } => {
-                match index {
-                    0 => {
-                        //TODO: check response
-                        *self = MouseState::Status { index: 1 };
-                        MouseResult::Timeout(COMMAND_TIMEOUT)
-                    }
-                    1 => {
-                        *self = MouseState::Status { index: 2 };
-                        MouseResult::Timeout(COMMAND_TIMEOUT)
-                    }
-                    2 => {
-                        *self = MouseState::Status { index: 3 };
-                        MouseResult::Timeout(COMMAND_TIMEOUT)
-                    }
-                    _ => self.request_id(ps2),
-                }
-            }
-            MouseState::DeviceId => {
-                if data == 0xFA {
-                    // Command OK response
-                    //TODO: handle this separately?
-                    MouseResult::Timeout(COMMAND_TIMEOUT)
-                } else if data == MouseId::Base as u8 || data == MouseId::Intellimouse1 as u8 {
-                    log::debug!("mouse id {:02X}", data);
-                    self.enable_reporting(data, ps2)
-                } else {
-                    log::warn!("unknown mouse id {:02X} after requesting id", data);
-                    self.reset(ps2)
-                }
-            }
-            MouseState::EnableReporting { id } => {
-                log::debug!("mouse id {:02X} enable reporting {:02X}", id, data);
-                //TODO: handle response ok/error
-                *self = MouseState::Streaming { id };
-                MouseResult::None
-            }
-            MouseState::Streaming { id } => {
-                MouseResult::Packet(data, id == MouseId::Intellimouse1 as u8)
-            }
-        }
-    }
-
-    pub fn handle_timeout(&mut self, ps2: &mut Ps2) -> MouseResult {
-        match *self {
-            MouseState::None | MouseState::Streaming { .. } => MouseResult::None,
-            MouseState::Init => {
-                // The state uses a timeout on init to request a reset
-                self.reset(ps2)
-            }
-            MouseState::Reset => {
-                log::warn!("timeout waiting for mouse reset");
-                self.reset(ps2)
-            }
-            MouseState::Bat => {
-                log::warn!("timeout waiting for BAT completion");
-                self.reset(ps2)
-            }
-            MouseState::IdentifyTouchpad { .. } => {
-                //TODO: retry?
-                log::warn!("timeout identifying touchpad");
-                self.request_status(ps2)
-            }
-            MouseState::EnableIntellimouse { .. } => {
-                //TODO: retry?
-                log::warn!("timeout enabling intellimouse");
-                self.request_status(ps2)
-            }
-            MouseState::Status { index } => {
-                log::warn!("timeout waiting for mouse status {}", index);
-                self.request_id(ps2)
-            }
-            MouseState::DeviceId => {
-                log::warn!("timeout requesting mouse id");
-                self.enable_reporting(0, ps2)
-            }
-            MouseState::EnableReporting { id } => {
-                log::warn!("timeout enabling reporting");
-                //TODO: limit number of retries
-                self.enable_reporting(id, ps2)
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/input/ps2d/src/state.rs b/recipes/core/base/drivers/input/ps2d/src/state.rs
deleted file mode 100644
index 9018dc6b31..0000000000
--- a/recipes/core/base/drivers/input/ps2d/src/state.rs
+++ /dev/null
@@ -1,487 +0,0 @@
-use inputd::ProducerHandle;
-use log::{error, warn};
-use orbclient::{ButtonEvent, KeyEvent, MouseEvent, MouseRelativeEvent, ScrollEvent};
-use std::{
-    convert::TryInto,
-    fs::File,
-    io::{Read, Write},
-    time::Duration,
-};
-use syscall::TimeSpec;
-
-use crate::controller::Ps2;
-use crate::mouse::{MouseResult, MouseState};
-use crate::vm;
-
-bitflags! {
-    pub struct MousePacketFlags: u8 {
-        const LEFT_BUTTON = 1;
-        const RIGHT_BUTTON = 1 << 1;
-        const MIDDLE_BUTTON = 1 << 2;
-        const ALWAYS_ON = 1 << 3;
-        const X_SIGN = 1 << 4;
-        const Y_SIGN = 1 << 5;
-        const X_OVERFLOW = 1 << 6;
-        const Y_OVERFLOW = 1 << 7;
-    }
-}
-
-fn timespec_from_duration(duration: Duration) -> TimeSpec {
-    TimeSpec {
-        tv_sec: duration.as_secs().try_into().unwrap(),
-        tv_nsec: duration.subsec_nanos().try_into().unwrap(),
-    }
-}
-
-fn duration_from_timespec(timespec: TimeSpec) -> Duration {
-    Duration::new(
-        timespec.tv_sec.try_into().unwrap(),
-        timespec.tv_nsec.try_into().unwrap(),
-    )
-}
-
-pub struct Ps2d {
-    ps2: Ps2,
-    vmmouse: bool,
-    vmmouse_relative: bool,
-    input: ProducerHandle,
-    time_file: File,
-    extended: bool,
-    mouse_x: i32,
-    mouse_y: i32,
-    mouse_left: bool,
-    mouse_middle: bool,
-    mouse_right: bool,
-    mouse_state: MouseState,
-    mouse_timeout: Option<TimeSpec>,
-    packets: [u8; 4],
-    packet_i: usize,
-}
-
-impl Ps2d {
-    pub fn new(input: ProducerHandle, time_file: File) -> Self {
-        let mut ps2 = Ps2::new();
-        ps2.init().expect("failed to initialize");
-
-        // FIXME add an option for orbital to disable this when an app captures the mouse.
-        let vmmouse_relative = false;
-        let vmmouse = vm::enable(vmmouse_relative);
-
-        // TODO: QEMU hack, maybe do this when Init timed out?
-        if vmmouse {
-            // 3 = MouseId::Intellimouse1
-            MouseState::Bat.handle(3, &mut ps2);
-        }
-
-        let mut this = Ps2d {
-            ps2,
-            vmmouse,
-            vmmouse_relative,
-            input,
-            time_file,
-            extended: false,
-            mouse_x: 0,
-            mouse_y: 0,
-            mouse_left: false,
-            mouse_middle: false,
-            mouse_right: false,
-            mouse_state: MouseState::Init,
-            mouse_timeout: None,
-            packets: [0; 4],
-            packet_i: 0,
-        };
-
-        if !this.vmmouse {
-            // This triggers initializing the mouse
-            this.handle_mouse(None);
-        }
-
-        this
-    }
-
-    pub fn irq(&mut self) {
-        while let Some((keyboard, data)) = self.ps2.next() {
-            self.handle(keyboard, data);
-        }
-    }
-
-    pub fn time_event(&mut self) {
-        let mut time = TimeSpec::default();
-        match self.time_file.read(&mut time) {
-            Ok(_count) => {}
-            Err(err) => {
-                log::error!("failed to read time file: {}", err);
-                return;
-            }
-        }
-        if let Some(mouse_timeout) = self.mouse_timeout {
-            if time.tv_sec > mouse_timeout.tv_sec
-                || (time.tv_sec == mouse_timeout.tv_sec && time.tv_nsec >= mouse_timeout.tv_nsec)
-            {
-                self.handle_mouse(None);
-            }
-        }
-    }
-
-    pub fn handle(&mut self, keyboard: bool, data: u8) {
-        if keyboard {
-            if data == 0xE0 {
-                self.extended = true;
-            } else {
-                let (ps2_scancode, pressed) = if data >= 0x80 {
-                    (data - 0x80, false)
-                } else {
-                    (data, true)
-                };
-
-                let scancode = if self.extended {
-                    self.extended = false;
-                    match ps2_scancode {
-                        0x1C => orbclient::K_NUM_ENTER,
-                        0x1D => orbclient::K_RIGHT_CTRL,
-                        0x20 => orbclient::K_VOLUME_TOGGLE,
-                        0x22 => orbclient::K_MEDIA_PLAY_PAUSE,
-                        0x24 => orbclient::K_MEDIA_STOP,
-                        0x10 => orbclient::K_MEDIA_REWIND,
-                        0x19 => orbclient::K_MEDIA_FAST_FORWARD,
-                        0x2E => orbclient::K_VOLUME_DOWN,
-                        0x30 => orbclient::K_VOLUME_UP,
-                        0x35 => orbclient::K_NUM_SLASH,
-                        0x38 => orbclient::K_ALT_GR,
-                        0x47 => orbclient::K_HOME,
-                        0x48 => orbclient::K_UP,
-                        0x49 => orbclient::K_PGUP,
-                        0x4B => orbclient::K_LEFT,
-                        0x4D => orbclient::K_RIGHT,
-                        0x4F => orbclient::K_END,
-                        0x50 => orbclient::K_DOWN,
-                        0x51 => orbclient::K_PGDN,
-                        0x52 => orbclient::K_INS,
-                        0x53 => orbclient::K_DEL,
-                        0x5B => orbclient::K_LEFT_SUPER,
-                        0x5C => orbclient::K_RIGHT_SUPER,
-                        0x5D => orbclient::K_APP,
-                        0x5E => orbclient::K_POWER,
-                        0x5F => orbclient::K_SLEEP,
-                        /* 0x80 to 0xFF used for press/release detection */
-                        _ => {
-                            if pressed {
-                                warn!("unknown extended scancode {:02X}", ps2_scancode);
-                            }
-                            0
-                        }
-                    }
-                } else {
-                    match ps2_scancode {
-                        /* 0x00 unused */
-                        0x01 => orbclient::K_ESC,
-                        0x02 => orbclient::K_1,
-                        0x03 => orbclient::K_2,
-                        0x04 => orbclient::K_3,
-                        0x05 => orbclient::K_4,
-                        0x06 => orbclient::K_5,
-                        0x07 => orbclient::K_6,
-                        0x08 => orbclient::K_7,
-                        0x09 => orbclient::K_8,
-                        0x0A => orbclient::K_9,
-                        0x0B => orbclient::K_0,
-                        0x0C => orbclient::K_MINUS,
-                        0x0D => orbclient::K_EQUALS,
-                        0x0E => orbclient::K_BKSP,
-                        0x0F => orbclient::K_TAB,
-                        0x10 => orbclient::K_Q,
-                        0x11 => orbclient::K_W,
-                        0x12 => orbclient::K_E,
-                        0x13 => orbclient::K_R,
-                        0x14 => orbclient::K_T,
-                        0x15 => orbclient::K_Y,
-                        0x16 => orbclient::K_U,
-                        0x17 => orbclient::K_I,
-                        0x18 => orbclient::K_O,
-                        0x19 => orbclient::K_P,
-                        0x1A => orbclient::K_BRACE_OPEN,
-                        0x1B => orbclient::K_BRACE_CLOSE,
-                        0x1C => orbclient::K_ENTER,
-                        0x1D => orbclient::K_CTRL,
-                        0x1E => orbclient::K_A,
-                        0x1F => orbclient::K_S,
-                        0x20 => orbclient::K_D,
-                        0x21 => orbclient::K_F,
-                        0x22 => orbclient::K_G,
-                        0x23 => orbclient::K_H,
-                        0x24 => orbclient::K_J,
-                        0x25 => orbclient::K_K,
-                        0x26 => orbclient::K_L,
-                        0x27 => orbclient::K_SEMICOLON,
-                        0x28 => orbclient::K_QUOTE,
-                        0x29 => orbclient::K_TICK,
-                        0x2A => orbclient::K_LEFT_SHIFT,
-                        0x2B => orbclient::K_BACKSLASH,
-                        0x2C => orbclient::K_Z,
-                        0x2D => orbclient::K_X,
-                        0x2E => orbclient::K_C,
-                        0x2F => orbclient::K_V,
-                        0x30 => orbclient::K_B,
-                        0x31 => orbclient::K_N,
-                        0x32 => orbclient::K_M,
-                        0x33 => orbclient::K_COMMA,
-                        0x34 => orbclient::K_PERIOD,
-                        0x35 => orbclient::K_SLASH,
-                        0x36 => orbclient::K_RIGHT_SHIFT,
-                        0x37 => orbclient::K_NUM_ASTERISK,
-                        0x38 => orbclient::K_ALT,
-                        0x39 => orbclient::K_SPACE,
-                        0x3A => orbclient::K_CAPS,
-                        0x3B => orbclient::K_F1,
-                        0x3C => orbclient::K_F2,
-                        0x3D => orbclient::K_F3,
-                        0x3E => orbclient::K_F4,
-                        0x3F => orbclient::K_F5,
-                        0x40 => orbclient::K_F6,
-                        0x41 => orbclient::K_F7,
-                        0x42 => orbclient::K_F8,
-                        0x43 => orbclient::K_F9,
-                        0x44 => orbclient::K_F10,
-                        0x45 => orbclient::K_NUM,
-                        0x46 => orbclient::K_SCROLL,
-                        0x47 => orbclient::K_NUM_7,
-                        0x48 => orbclient::K_NUM_8,
-                        0x49 => orbclient::K_NUM_9,
-                        0x4A => orbclient::K_NUM_MINUS,
-                        0x4B => orbclient::K_NUM_4,
-                        0x4C => orbclient::K_NUM_5,
-                        0x4D => orbclient::K_NUM_6,
-                        0x4E => orbclient::K_NUM_PLUS,
-                        0x4F => orbclient::K_NUM_1,
-                        0x50 => orbclient::K_NUM_2,
-                        0x51 => orbclient::K_NUM_3,
-                        0x52 => orbclient::K_NUM_0,
-                        0x53 => orbclient::K_NUM_PERIOD,
-                        /* 0x54 to 0x55 unused */
-                        0x56 => 0x56, // UK Backslash
-                        0x57 => orbclient::K_F11,
-                        0x58 => orbclient::K_F12,
-                        /* 0x59 to 0x7F unused */
-                        /* 0x80 to 0xFF used for press/release detection */
-                        _ => {
-                            if pressed {
-                                warn!("unknown scancode {:02X}", ps2_scancode);
-                            }
-                            0
-                        }
-                    }
-                };
-
-                if scancode != 0 {
-                    self.input
-                        .write_event(
-                            KeyEvent {
-                                character: '\0',
-                                scancode,
-                                pressed,
-                            }
-                            .to_event(),
-                        )
-                        .expect("failed to write key event");
-                }
-            }
-        } else if self.vmmouse {
-            for _i in 0..256 {
-                let (status, _, _, _) = unsafe { vm::cmd(vm::ABSPOINTER_STATUS, 0) };
-                //TODO if ((status & VMMOUSE_ERROR) == VMMOUSE_ERROR)
-
-                let queue_length = status & 0xffff;
-                if queue_length == 0 {
-                    break;
-                }
-
-                if queue_length % 4 != 0 {
-                    error!("queue length not a multiple of 4: {}", queue_length);
-                    break;
-                }
-
-                let (status, dx, dy, dz) = unsafe { vm::cmd(vm::ABSPOINTER_DATA, 4) };
-
-                if self.vmmouse_relative {
-                    if dx != 0 || dy != 0 {
-                        self.input
-                            .write_event(
-                                MouseRelativeEvent {
-                                    dx: dx as i32,
-                                    dy: dy as i32,
-                                }
-                                .to_event(),
-                            )
-                            .expect("ps2d: failed to write mouse event");
-                    }
-                } else {
-                    let x = dx as i32;
-                    let y = dy as i32;
-                    if x != self.mouse_x || y != self.mouse_y {
-                        self.mouse_x = x;
-                        self.mouse_y = y;
-                        self.input
-                            .write_event(MouseEvent { x, y }.to_event())
-                            .expect("ps2d: failed to write mouse event");
-                    }
-                };
-
-                if dz != 0 {
-                    self.input
-                        .write_event(
-                            ScrollEvent {
-                                x: 0,
-                                y: -(dz as i32),
-                            }
-                            .to_event(),
-                        )
-                        .expect("ps2d: failed to write scroll event");
-                }
-
-                let left = status & vm::LEFT_BUTTON == vm::LEFT_BUTTON;
-                let middle = status & vm::MIDDLE_BUTTON == vm::MIDDLE_BUTTON;
-                let right = status & vm::RIGHT_BUTTON == vm::RIGHT_BUTTON;
-                if left != self.mouse_left
-                    || middle != self.mouse_middle
-                    || right != self.mouse_right
-                {
-                    self.mouse_left = left;
-                    self.mouse_middle = middle;
-                    self.mouse_right = right;
-                    self.input
-                        .write_event(
-                            ButtonEvent {
-                                left,
-                                middle,
-                                right,
-                            }
-                            .to_event(),
-                        )
-                        .expect("ps2d: failed to write button event");
-                }
-            }
-        } else {
-            self.handle_mouse(Some(data));
-        }
-    }
-
-    pub fn handle_mouse(&mut self, data_opt: Option<u8>) {
-        // log::trace!(
-        //     "handle_mouse state {:?} data {:?}",
-        //     self.mouse_state,
-        //     data_opt
-        // );
-        let mouse_res = match data_opt {
-            Some(data) => self.mouse_state.handle(data, &mut self.ps2),
-            None => self.mouse_state.handle_timeout(&mut self.ps2),
-        };
-        self.mouse_timeout = None;
-        let (packet_data, extra_packet) = match mouse_res {
-            MouseResult::None => {
-                return;
-            }
-            MouseResult::Packet(packet_data, extra_packet) => (packet_data, extra_packet),
-            MouseResult::Timeout(duration) => {
-                // Read current time
-                let mut time = TimeSpec::default();
-                match self.time_file.read(&mut time) {
-                    Ok(_count) => {}
-                    Err(err) => {
-                        log::error!("failed to read time file: {}", err);
-                        return;
-                    }
-                }
-
-                // Add duration to time
-                time = timespec_from_duration(duration_from_timespec(time) + duration);
-
-                // Write next time
-                match self.time_file.write(&time) {
-                    Ok(_count) => {}
-                    Err(err) => {
-                        log::error!("failed to write time file: {}", err);
-                    }
-                }
-
-                self.mouse_timeout = Some(time);
-                return;
-            }
-        };
-
-        self.packets[self.packet_i] = packet_data;
-        self.packet_i += 1;
-
-        let flags = MousePacketFlags::from_bits_truncate(self.packets[0]);
-        if !flags.contains(MousePacketFlags::ALWAYS_ON) {
-            error!("mouse misalign {:X}", self.packets[0]);
-
-            self.packets = [0; 4];
-            self.packet_i = 0;
-        } else if self.packet_i >= self.packets.len() || (!extra_packet && self.packet_i >= 3) {
-            if !flags.contains(MousePacketFlags::X_OVERFLOW)
-                && !flags.contains(MousePacketFlags::Y_OVERFLOW)
-            {
-                let mut dx = self.packets[1] as i32;
-                if flags.contains(MousePacketFlags::X_SIGN) {
-                    dx -= 0x100;
-                }
-
-                let mut dy = -(self.packets[2] as i32);
-                if flags.contains(MousePacketFlags::Y_SIGN) {
-                    dy += 0x100;
-                }
-
-                let mut dz = 0;
-                if extra_packet {
-                    let mut scroll = (self.packets[3] & 0xF) as i8;
-                    if scroll & (1 << 3) == 1 << 3 {
-                        scroll -= 16;
-                    }
-                    dz = -scroll as i32;
-                }
-
-                if dx != 0 || dy != 0 {
-                    self.input
-                        .write_event(MouseRelativeEvent { dx, dy }.to_event())
-                        .expect("ps2d: failed to write mouse event");
-                }
-
-                if dz != 0 {
-                    self.input
-                        .write_event(ScrollEvent { x: 0, y: dz }.to_event())
-                        .expect("ps2d: failed to write scroll event");
-                }
-
-                let left = flags.contains(MousePacketFlags::LEFT_BUTTON);
-                let middle = flags.contains(MousePacketFlags::MIDDLE_BUTTON);
-                let right = flags.contains(MousePacketFlags::RIGHT_BUTTON);
-                if left != self.mouse_left
-                    || middle != self.mouse_middle
-                    || right != self.mouse_right
-                {
-                    self.mouse_left = left;
-                    self.mouse_middle = middle;
-                    self.mouse_right = right;
-                    self.input
-                        .write_event(
-                            ButtonEvent {
-                                left,
-                                middle,
-                                right,
-                            }
-                            .to_event(),
-                        )
-                        .expect("ps2d: failed to write button event");
-                }
-            } else {
-                warn!(
-                    "overflow {:X} {:X} {:X} {:X}",
-                    self.packets[0], self.packets[1], self.packets[2], self.packets[3]
-                );
-            }
-
-            self.packets = [0; 4];
-            self.packet_i = 0;
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/input/ps2d/src/vm.rs b/recipes/core/base/drivers/input/ps2d/src/vm.rs
deleted file mode 100644
index 71b7141704..0000000000
--- a/recipes/core/base/drivers/input/ps2d/src/vm.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-// This code is informed by the QEMU implementation found here:
-// https://github.com/qemu/qemu/blob/master/hw/input/vmmouse.c
-//
-// As well as the Linux implementation here:
-// http://elixir.free-electrons.com/linux/v4.1/source/drivers/input/mouse/vmmouse.c
-
-use core::arch::asm;
-
-use log::{error, info, trace};
-
-const MAGIC: u32 = 0x564D5868;
-const PORT: u16 = 0x5658;
-
-pub const GETVERSION: u32 = 10;
-pub const ABSPOINTER_DATA: u32 = 39;
-pub const ABSPOINTER_STATUS: u32 = 40;
-pub const ABSPOINTER_COMMAND: u32 = 41;
-
-pub const CMD_ENABLE: u32 = 0x45414552;
-pub const CMD_DISABLE: u32 = 0x000000f5;
-pub const CMD_REQUEST_ABSOLUTE: u32 = 0x53424152;
-pub const CMD_REQUEST_RELATIVE: u32 = 0x4c455252;
-
-const VERSION: u32 = 0x3442554a;
-
-pub const RELATIVE_PACKET: u32 = 0x00010000;
-
-pub const LEFT_BUTTON: u32 = 0x20;
-pub const RIGHT_BUTTON: u32 = 0x10;
-pub const MIDDLE_BUTTON: u32 = 0x08;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub unsafe fn cmd(cmd: u32, arg: u32) -> (u32, u32, u32, u32) {
-    let a: u32;
-    let b: u32;
-    let c: u32;
-    let d: u32;
-
-    // ebx can't be used as input or output constraint in rust as LLVM reserves it.
-    // Use xchg to pass it through r9 instead while restoring the original value in
-    // rbx when leaving the inline asm block. si and di are clobbered too.
-    #[cfg(not(target_arch = "x86"))]
-    asm!(
-        "xchg r9, rbx; in eax, dx; xchg r9, rbx",
-        inout("eax") MAGIC => a,
-        inout("r9") arg => b,
-        inout("ecx") cmd => c,
-        inout("edx") PORT as u32 => d,
-        out("rsi") _,
-        out("rdi") _,
-    );
-
-    // On x86 we don't have a spare register, so push ebx to the stack instead.
-    #[cfg(target_arch = "x86")]
-    asm!(
-        "push ebx; mov ebx, edi; in eax, dx; mov edi, ebx; pop ebx",
-        inout("eax") MAGIC => a,
-        inout("edi") arg => b,
-        inout("ecx") cmd => c,
-        inout("edx") PORT as u32 => d,
-    );
-
-    (a, b, c, d)
-}
-
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-pub unsafe fn cmd(cmd: u32, arg: u32) -> (u32, u32, u32, u32) {
-    unimplemented!()
-}
-
-pub fn enable(relative: bool) -> bool {
-    trace!("Enable vmmouse");
-
-    unsafe {
-        let (eax, ebx, _, _) = cmd(GETVERSION, 0);
-        if ebx != MAGIC || eax == 0xFFFFFFFF {
-            info!("No vmmouse support");
-            return false;
-        }
-
-        let _ = cmd(ABSPOINTER_COMMAND, CMD_ENABLE);
-
-        let (status, _, _, _) = cmd(ABSPOINTER_STATUS, 0);
-        if (status & 0x0000ffff) == 0 {
-            info!("No vmmouse");
-            return false;
-        }
-
-        let (version, _, _, _) = cmd(ABSPOINTER_DATA, 1);
-        if version != VERSION {
-            error!(
-                "Invalid vmmouse version: {} instead of {}",
-                version, VERSION
-            );
-            let _ = cmd(ABSPOINTER_COMMAND, CMD_DISABLE);
-            return false;
-        }
-
-        if relative {
-            cmd(ABSPOINTER_COMMAND, CMD_REQUEST_RELATIVE);
-        } else {
-            cmd(ABSPOINTER_COMMAND, CMD_REQUEST_ABSOLUTE);
-        }
-    }
-
-    return true;
-}
diff --git a/recipes/core/base/drivers/input/usbhidd/.gitignore b/recipes/core/base/drivers/input/usbhidd/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/input/usbhidd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/input/usbhidd/Cargo.toml b/recipes/core/base/drivers/input/usbhidd/Cargo.toml
deleted file mode 100644
index 2c0cda1915..0000000000
--- a/recipes/core/base/drivers/input/usbhidd/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "usbhidd"
-description = "USB HID driver"
-version = "0.1.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-edition = "2018"
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow.workspace = true
-bitflags.workspace = true
-log.workspace = true
-orbclient.workspace = true
-redox_syscall.workspace = true
-rehid = { git = "https://gitlab.redox-os.org/redox-os/rehid.git" }
-xhcid = { path = "../../usb/xhcid" }
-
-common = { path = "../../common" }
-inputd = { path = "../../inputd" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/input/usbhidd/src/main.rs b/recipes/core/base/drivers/input/usbhidd/src/main.rs
deleted file mode 100644
index 15c5b77820..0000000000
--- a/recipes/core/base/drivers/input/usbhidd/src/main.rs
+++ /dev/null
@@ -1,457 +0,0 @@
-use anyhow::{Context, Result};
-use std::{env, thread, time};
-
-use inputd::ProducerHandle;
-use orbclient::KeyEvent as OrbKeyEvent;
-use rehid::{
-    report_desc::{ReportTy, REPORT_DESC_TY},
-    report_handler::ReportHandler,
-    usage_tables::{GenericDesktopUsage, UsagePage},
-};
-use xhcid_interface::{
-    ConfigureEndpointsReq, DevDesc, EndpDirection, EndpointTy, PortId, PortReqRecipient,
-    XhciClientHandle,
-};
-
-mod reqs;
-
-fn send_key_event(display: &mut ProducerHandle, usage_page: u16, usage: u16, pressed: bool) {
-    let scancode = match usage_page {
-        0x07 => match usage {
-            0x04 => orbclient::K_A,
-            0x05 => orbclient::K_B,
-            0x06 => orbclient::K_C,
-            0x07 => orbclient::K_D,
-            0x08 => orbclient::K_E,
-            0x09 => orbclient::K_F,
-            0x0A => orbclient::K_G,
-            0x0B => orbclient::K_H,
-            0x0C => orbclient::K_I,
-            0x0D => orbclient::K_J,
-            0x0E => orbclient::K_K,
-            0x0F => orbclient::K_L,
-            0x10 => orbclient::K_M,
-            0x11 => orbclient::K_N,
-            0x12 => orbclient::K_O,
-            0x13 => orbclient::K_P,
-            0x14 => orbclient::K_Q,
-            0x15 => orbclient::K_R,
-            0x16 => orbclient::K_S,
-            0x17 => orbclient::K_T,
-            0x18 => orbclient::K_U,
-            0x19 => orbclient::K_V,
-            0x1A => orbclient::K_W,
-            0x1B => orbclient::K_X,
-            0x1C => orbclient::K_Y,
-            0x1D => orbclient::K_Z,
-            0x1E => orbclient::K_1,
-            0x1F => orbclient::K_2,
-            0x20 => orbclient::K_3,
-            0x21 => orbclient::K_4,
-            0x22 => orbclient::K_5,
-            0x23 => orbclient::K_6,
-            0x24 => orbclient::K_7,
-            0x25 => orbclient::K_8,
-            0x26 => orbclient::K_9,
-            0x27 => orbclient::K_0,
-            0x28 => orbclient::K_ENTER,
-            0x29 => orbclient::K_ESC,
-            0x2A => orbclient::K_BKSP,
-            0x2B => orbclient::K_TAB,
-            0x2C => orbclient::K_SPACE,
-            0x2D => orbclient::K_MINUS,
-            0x2E => orbclient::K_EQUALS,
-            0x2F => orbclient::K_BRACE_OPEN,
-            0x30 => orbclient::K_BRACE_CLOSE,
-            0x31 => orbclient::K_BACKSLASH,
-            // 0x32 non-us # and ~
-            0x32 => 0x56,
-            0x33 => orbclient::K_SEMICOLON,
-            0x34 => orbclient::K_QUOTE,
-            0x35 => orbclient::K_TICK,
-            0x36 => orbclient::K_COMMA,
-            0x37 => orbclient::K_PERIOD,
-            0x38 => orbclient::K_SLASH,
-            0x39 => orbclient::K_CAPS,
-            0x3A => orbclient::K_F1,
-            0x3B => orbclient::K_F2,
-            0x3C => orbclient::K_F3,
-            0x3D => orbclient::K_F4,
-            0x3E => orbclient::K_F5,
-            0x3F => orbclient::K_F6,
-            0x40 => orbclient::K_F7,
-            0x41 => orbclient::K_F8,
-            0x42 => orbclient::K_F9,
-            0x43 => orbclient::K_F10,
-            0x44 => orbclient::K_F11,
-            0x45 => orbclient::K_F12,
-            0x46 => orbclient::K_PRTSC,
-            0x47 => orbclient::K_SCROLL,
-            // 0x48 pause
-            0x49 => orbclient::K_INS,
-            0x4A => orbclient::K_HOME,
-            0x4B => orbclient::K_PGUP,
-            0x4C => orbclient::K_DEL,
-            0x4D => orbclient::K_END,
-            0x4E => orbclient::K_PGDN,
-            0x4F => orbclient::K_RIGHT,
-            0x50 => orbclient::K_LEFT,
-            0x51 => orbclient::K_DOWN,
-            0x52 => orbclient::K_UP,
-            0x53 => orbclient::K_NUM,
-            0x54 => orbclient::K_NUM_SLASH,
-            0x55 => orbclient::K_NUM_ASTERISK,
-            0x56 => orbclient::K_NUM_MINUS,
-            0x57 => orbclient::K_NUM_PLUS,
-            0x58 => orbclient::K_NUM_ENTER,
-            0x59 => orbclient::K_NUM_1,
-            0x5A => orbclient::K_NUM_2,
-            0x5B => orbclient::K_NUM_3,
-            0x5C => orbclient::K_NUM_4,
-            0x5D => orbclient::K_NUM_5,
-            0x5E => orbclient::K_NUM_6,
-            0x5F => orbclient::K_NUM_7,
-            0x60 => orbclient::K_NUM_8,
-            0x61 => orbclient::K_NUM_9,
-            0x62 => orbclient::K_NUM_0,
-            // 0x62 num .
-            // 0x64 non-us \ and |
-            0x64 => orbclient::K_APP,
-            0x66 => orbclient::K_POWER,
-            // 0x67 num =
-            // unmapped values
-            0xE0 => orbclient::K_LEFT_CTRL,
-            0xE1 => orbclient::K_LEFT_SHIFT,
-            0xE2 => orbclient::K_ALT,
-            0xE3 => orbclient::K_LEFT_SUPER,
-            0xE4 => orbclient::K_RIGHT_CTRL,
-            0xE5 => orbclient::K_RIGHT_SHIFT,
-            0xE6 => orbclient::K_ALT_GR,
-            0xE7 => orbclient::K_RIGHT_SUPER,
-            // reserved values
-            _ => {
-                log::warn!("unknown usage_page {:#x} usage {:#x}", usage_page, usage);
-                return;
-            }
-        },
-        _ => {
-            log::warn!("unknown usage_page {:#x}", usage_page);
-            return;
-        }
-    };
-
-    let key_event = OrbKeyEvent {
-        character: '\0',
-        scancode,
-        pressed,
-    };
-
-    match display.write_event(key_event.to_event()) {
-        Ok(_) => (),
-        Err(err) => {
-            log::warn!("failed to send key event to orbital: {}", err);
-        }
-    }
-}
-
-fn main() -> Result<()> {
-    let mut args = env::args().skip(1);
-
-    const USAGE: &'static str = "usbhidd <scheme> <port> <interface>";
-
-    let scheme = args.next().expect(USAGE);
-    let port = args
-        .next()
-        .expect(USAGE)
-        .parse::<PortId>()
-        .expect("Expected port ID");
-    let interface_num = args
-        .next()
-        .expect(USAGE)
-        .parse::<u8>()
-        .expect("Expected integer as input of interface");
-
-    let name = format!("{}_{}_{}_hid", scheme, port, interface_num);
-    common::setup_logging(
-        "usb",
-        "usbhid",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    log::info!(
-        "USB HID driver spawned with scheme `{}`, port {}, interface {}",
-        scheme,
-        port,
-        interface_num
-    );
-
-    let handle = XhciClientHandle::new(scheme, port).context("Failed to open XhciClientHandle")?;
-    let desc: DevDesc = handle
-        .get_standard_descs()
-        .context("Failed to get standard descriptors")?;
-
-    log::info!(
-        "USB HID driver: {:?} serial {:?}",
-        desc.product_str.as_ref().map(|s| s.as_str()).unwrap_or(""),
-        desc.serial_str.as_ref().map(|s| s.as_str()).unwrap_or(""),
-    );
-
-    log::debug!("{:X?}", desc);
-
-    let mut endp_count = 0;
-    let (conf_desc, (if_desc, endp_desc_opt, hid_desc)) = desc
-        .config_descs
-        .iter()
-        .find_map(|conf_desc| {
-            let if_desc = conf_desc.interface_descs.iter().find_map(|if_desc| {
-                if if_desc.number == interface_num {
-                    let endp_desc_opt = if_desc.endpoints.iter().find_map(|endp_desc| {
-                        endp_count += 1;
-                        if endp_desc.ty() == EndpointTy::Interrupt
-                            && endp_desc.direction() == EndpDirection::In
-                        {
-                            Some((endp_count, endp_desc.clone()))
-                        } else {
-                            None
-                        }
-                    });
-                    let hid_desc = if_desc.hid_descs.iter().find_map(|hid_desc| {
-                        //TODO: should we do any filtering?
-                        Some(hid_desc)
-                    })?;
-                    Some((if_desc.clone(), endp_desc_opt, hid_desc))
-                } else {
-                    endp_count += if_desc.endpoints.len();
-                    None
-                }
-            })?;
-            Some((conf_desc.clone(), if_desc))
-        })
-        .context("Failed to find suitable configuration")?;
-
-    handle
-        .configure_endpoints(&ConfigureEndpointsReq {
-            config_desc: conf_desc.configuration_value,
-            interface_desc: Some(interface_num),
-            alternate_setting: Some(if_desc.alternate_setting),
-            hub_ports: None,
-        })
-        .context("Failed to configure endpoints")?;
-
-    //TODO: do we need to set protocol to report? It fails for mice.
-
-    //TODO: dynamically create good values, fix xhcid so it does not block on each request
-    // This sets all reports to a duration of 4ms
-    reqs::set_idle(&handle, 1, 0, interface_num as u16).context("Failed to set idle")?;
-
-    let report_desc_len = hid_desc.desc_len;
-    assert_eq!(hid_desc.desc_ty, REPORT_DESC_TY);
-
-    let mut report_desc_bytes = vec![0u8; report_desc_len as usize];
-    handle
-        .get_descriptor(
-            PortReqRecipient::Interface,
-            REPORT_DESC_TY,
-            0,
-            //TODO: should this be an index into interface_descs?
-            interface_num as u16,
-            &mut report_desc_bytes,
-        )
-        .context("Failed to retrieve report descriptor")?;
-
-    let mut handler =
-        ReportHandler::new(&report_desc_bytes).expect("failed to parse report descriptor");
-
-    let report_len = match endp_desc_opt {
-        Some((_endp_num, endp_desc)) => endp_desc.max_packet_size as usize,
-        None => handler.total_byte_length as usize,
-    };
-    let mut report_buffer = vec![0u8; report_len];
-    let report_ty = ReportTy::Input;
-    let report_id = 0;
-
-    let mut display = ProducerHandle::new().context("Failed to open input socket")?;
-    let mut endpoint_opt = match endp_desc_opt {
-        Some((endp_num, _endp_desc)) => match handle.open_endpoint(endp_num as u8) {
-            Ok(ok) => Some(ok),
-            Err(err) => {
-                log::warn!("failed to open endpoint {endp_num}: {err}");
-                None
-            }
-        },
-        None => None,
-    };
-    let mut left_shift = false;
-    let mut right_shift = false;
-    let mut last_mouse_pos = (0, 0);
-    let mut last_buttons = [false, false, false];
-    loop {
-        //TODO: get frequency from device
-        //TODO: use sleeps when accuracy is better: thread::sleep(time::Duration::from_millis(10));
-        let timer = time::Instant::now();
-        while timer.elapsed() < time::Duration::from_millis(1) {
-            thread::yield_now();
-        }
-
-        if let Some(endpoint) = &mut endpoint_opt {
-            // interrupt transfer
-            endpoint
-                .transfer_read(&mut report_buffer)
-                .context("failed to get report")?;
-        } else {
-            // control transfer
-            reqs::get_report(
-                &handle,
-                report_ty,
-                report_id,
-                //TODO: should this be an index into interface_descs?
-                interface_num as u16,
-                &mut report_buffer,
-            )
-            .context("failed to get report")?;
-        }
-
-        let mut mouse_pos = last_mouse_pos;
-        let mut mouse_dx = 0i32;
-        let mut mouse_dy = 0i32;
-        let mut scroll_y = 0i32;
-        let mut buttons = last_buttons;
-        for event in handler
-            .handle(&report_buffer)
-            .expect("failed to parse report")
-        {
-            log::debug!("{}", event);
-            if event.usage_page == UsagePage::GenericDesktop as u16 {
-                if event.usage == GenericDesktopUsage::X as u16 {
-                    if event.relative {
-                        mouse_dx += event.value as i32;
-                    } else {
-                        mouse_pos.0 = event.value as i32;
-                    }
-                } else if event.usage == GenericDesktopUsage::Y as u16 {
-                    if event.relative {
-                        mouse_dy += event.value as i32;
-                    } else {
-                        mouse_pos.1 = event.value as i32;
-                    }
-                } else if event.usage == GenericDesktopUsage::Wheel as u16 {
-                    //TODO: what is X scroll?
-                    if event.relative {
-                        scroll_y += event.value as i32;
-                    } else {
-                        log::warn!("absolute mouse wheel not supported");
-                    }
-                } else {
-                    log::info!(
-                        "unsupported generic desktop usage 0x{:X}:0x{:X} value {}",
-                        event.usage_page,
-                        event.usage,
-                        event.value
-                    );
-                }
-            } else if event.usage_page == UsagePage::KeyboardOrKeypad as u16 {
-                let (pressed, shift_opt) = if event.value != 0 {
-                    (true, Some(left_shift | right_shift))
-                } else {
-                    (false, None)
-                };
-                if event.usage == 0xE1 {
-                    left_shift = pressed;
-                } else if event.usage == 0xE5 {
-                    right_shift = pressed;
-                }
-                send_key_event(&mut display, event.usage_page, event.usage, pressed);
-            } else if event.usage_page == UsagePage::Button as u16 {
-                if event.usage > 0 && event.usage as usize <= buttons.len() {
-                    buttons[event.usage as usize - 1] = event.value != 0;
-                } else {
-                    log::info!(
-                        "unsupported buttons usage 0x{:X}:0x{:X} value {}",
-                        event.usage_page,
-                        event.usage,
-                        event.value
-                    );
-                }
-            } else if event.usage_page >= 0xFF00 {
-                // Ignore vendor defined event
-            } else {
-                log::info!(
-                    "unsupported usage 0x{:X}:0x{:X} value {}",
-                    event.usage_page,
-                    event.usage,
-                    event.value
-                );
-            }
-        }
-
-        if mouse_pos != last_mouse_pos {
-            last_mouse_pos = mouse_pos;
-
-            // TODO
-            // ps2d uses 0..=65535 as range, while usb uses 0..=32767. orbital
-            // expects the former range, so multiply by two here to temporarily
-            // align with orbital expectation. This workaround will make cursor
-            //  looks out of sync in QEMU using virtio-vga with usb-tablet.
-            let mouse_event = orbclient::event::MouseEvent {
-                x: mouse_pos.0 * 2,
-                y: mouse_pos.1 * 2,
-            };
-
-            match display.write_event(mouse_event.to_event()) {
-                Ok(_) => (),
-                Err(err) => {
-                    log::warn!("failed to send mouse event to orbital: {}", err);
-                }
-            }
-        }
-
-        if mouse_dx != 0 || mouse_dy != 0 {
-            // TODO: This is a filter to prevent random mouse jumps
-            if mouse_dx > -127 && mouse_dx < 127 {
-                let mouse_event = orbclient::event::MouseRelativeEvent {
-                    dx: mouse_dx,
-                    dy: mouse_dy,
-                };
-
-                match display.write_event(mouse_event.to_event()) {
-                    Ok(_) => (),
-                    Err(err) => {
-                        log::warn!("failed to send mouse event to orbital: {}", err);
-                    }
-                }
-            }
-        }
-
-        if scroll_y != 0 {
-            let scroll_event = orbclient::event::ScrollEvent { x: 0, y: scroll_y };
-
-            match display.write_event(scroll_event.to_event()) {
-                Ok(_) => (),
-                Err(err) => {
-                    log::warn!("failed to send scroll event to orbital: {}", err);
-                }
-            }
-        }
-
-        if buttons != last_buttons {
-            last_buttons = buttons;
-
-            let button_event = orbclient::event::ButtonEvent {
-                left: buttons[0],
-                right: buttons[1],
-                middle: buttons[2],
-            };
-
-            match display.write_event(button_event.to_event()) {
-                Ok(_) => (),
-                Err(err) => {
-                    log::warn!("failed to send button event to orbital: {}", err);
-                }
-            }
-        }
-
-        // log::trace!("took {}ms", timer.elapsed().as_millis())
-    }
-}
diff --git a/recipes/core/base/drivers/input/usbhidd/src/reqs.rs b/recipes/core/base/drivers/input/usbhidd/src/reqs.rs
deleted file mode 100644
index c74281dd3d..0000000000
--- a/recipes/core/base/drivers/input/usbhidd/src/reqs.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use std::slice;
-
-use rehid::report_desc::ReportTy;
-use xhcid_interface::{
-    DeviceReqData, PortReqRecipient, PortReqTy, XhciClientHandle, XhciClientHandleError,
-};
-
-const GET_REPORT_REQ: u8 = 0x1;
-const SET_REPORT_REQ: u8 = 0x9;
-const GET_IDLE_REQ: u8 = 0x2;
-const SET_IDLE_REQ: u8 = 0xA;
-const GET_PROTOCOL_REQ: u8 = 0x3;
-const SET_PROTOCOL_REQ: u8 = 0xB;
-
-fn concat(hi: u8, lo: u8) -> u16 {
-    (u16::from(hi) << 8) | u16::from(lo)
-}
-
-pub fn get_report(
-    handle: &XhciClientHandle,
-    report_ty: ReportTy,
-    report_id: u8,
-    if_num: u16,
-    buffer: &mut [u8],
-) -> Result<(), XhciClientHandleError> {
-    handle.device_request(
-        PortReqTy::Class,
-        PortReqRecipient::Interface,
-        GET_REPORT_REQ,
-        concat(report_ty as u8, report_id),
-        if_num,
-        DeviceReqData::In(buffer),
-    )
-}
-pub fn set_report(
-    handle: &XhciClientHandle,
-    report_ty: ReportTy,
-    report_id: u8,
-    if_num: u16,
-    buffer: &[u8],
-) -> Result<(), XhciClientHandleError> {
-    handle.device_request(
-        PortReqTy::Class,
-        PortReqRecipient::Interface,
-        SET_REPORT_REQ,
-        concat(report_id, report_ty as u8),
-        if_num,
-        DeviceReqData::Out(buffer),
-    )
-}
-pub fn get_idle(
-    handle: &XhciClientHandle,
-    report_id: u8,
-    if_num: u16,
-) -> Result<u8, XhciClientHandleError> {
-    let mut idle_rate = 0;
-    let buffer = slice::from_mut(&mut idle_rate);
-    handle.device_request(
-        PortReqTy::Class,
-        PortReqRecipient::Interface,
-        GET_IDLE_REQ,
-        u16::from(report_id),
-        if_num,
-        DeviceReqData::In(buffer),
-    )?;
-    Ok(idle_rate)
-}
-pub fn set_idle(
-    handle: &XhciClientHandle,
-    duration: u8,
-    report_id: u8,
-    if_num: u16,
-) -> Result<(), XhciClientHandleError> {
-    handle.device_request(
-        PortReqTy::Class,
-        PortReqRecipient::Interface,
-        SET_IDLE_REQ,
-        concat(duration, report_id),
-        if_num,
-        DeviceReqData::NoData,
-    )
-}
-pub fn get_protocol(handle: &XhciClientHandle, if_num: u16) -> Result<u8, XhciClientHandleError> {
-    let mut protocol = 0;
-    let buffer = slice::from_mut(&mut protocol);
-    handle.device_request(
-        PortReqTy::Class,
-        PortReqRecipient::Interface,
-        GET_PROTOCOL_REQ,
-        0,
-        if_num,
-        DeviceReqData::In(buffer),
-    )?;
-    Ok(protocol)
-}
-pub fn set_protocol(
-    handle: &XhciClientHandle,
-    protocol: u8,
-    if_num: u16,
-) -> Result<(), XhciClientHandleError> {
-    handle.device_request(
-        PortReqTy::Class,
-        PortReqRecipient::Interface,
-        SET_PROTOCOL_REQ,
-        u16::from(protocol),
-        if_num,
-        DeviceReqData::NoData,
-    )
-}
diff --git a/recipes/core/base/drivers/inputd/Cargo.toml b/recipes/core/base/drivers/inputd/Cargo.toml
deleted file mode 100644
index 8c1b999040..0000000000
--- a/recipes/core/base/drivers/inputd/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "inputd"
-description = "Input multiplexer daemon"
-version = "0.1.0"
-edition = "2021"
-authors = ["Anhad Singh <andypython@protonmail.com>"]
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-orbclient.workspace = true
-libredox.workspace = true
-
-common = { path = "../common" }
-daemon = { path = "../../daemon" }
-redox-scheme.workspace = true
-scheme-utils = { path = "../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/inputd/src/keymap.rs b/recipes/core/base/drivers/inputd/src/keymap.rs
deleted file mode 100644
index ca69e46e90..0000000000
--- a/recipes/core/base/drivers/inputd/src/keymap.rs
+++ /dev/null
@@ -1,438 +0,0 @@
-use std::collections::HashMap;
-use std::fmt::Display;
-use std::str::FromStr;
-
-mod keymaps {
-    pub static US: [(u8, [char; 2]); 53] = [
-        (orbclient::K_ESC, ['\x1B', '\x1B']),
-        (orbclient::K_1, ['1', '!']),
-        (orbclient::K_2, ['2', '@']),
-        (orbclient::K_3, ['3', '#']),
-        (orbclient::K_4, ['4', '$']),
-        (orbclient::K_5, ['5', '%']),
-        (orbclient::K_6, ['6', '^']),
-        (orbclient::K_7, ['7', '&']),
-        (orbclient::K_8, ['8', '*']),
-        (orbclient::K_9, ['9', '(']),
-        (orbclient::K_0, ['0', ')']),
-        (orbclient::K_MINUS, ['-', '_']),
-        (orbclient::K_EQUALS, ['=', '+']),
-        (orbclient::K_BKSP, ['\x7F', '\x7F']),
-        (orbclient::K_TAB, ['\t', '\t']),
-        (orbclient::K_Q, ['q', 'Q']),
-        (orbclient::K_W, ['w', 'W']),
-        (orbclient::K_E, ['e', 'E']),
-        (orbclient::K_R, ['r', 'R']),
-        (orbclient::K_T, ['t', 'T']),
-        (orbclient::K_Y, ['y', 'Y']),
-        (orbclient::K_U, ['u', 'U']),
-        (orbclient::K_I, ['i', 'I']),
-        (orbclient::K_O, ['o', 'O']),
-        (orbclient::K_P, ['p', 'P']),
-        (orbclient::K_BRACE_OPEN, ['[', '{']),
-        (orbclient::K_BRACE_CLOSE, [']', '}']),
-        (orbclient::K_ENTER, ['\n', '\n']),
-        (orbclient::K_CTRL, ['\0', '\0']),
-        (orbclient::K_A, ['a', 'A']),
-        (orbclient::K_S, ['s', 'S']),
-        (orbclient::K_D, ['d', 'D']),
-        (orbclient::K_F, ['f', 'F']),
-        (orbclient::K_G, ['g', 'G']),
-        (orbclient::K_H, ['h', 'H']),
-        (orbclient::K_J, ['j', 'J']),
-        (orbclient::K_K, ['k', 'K']),
-        (orbclient::K_L, ['l', 'L']),
-        (orbclient::K_SEMICOLON, [';', ':']),
-        (orbclient::K_QUOTE, ['\'', '"']),
-        (orbclient::K_TICK, ['`', '~']),
-        (orbclient::K_BACKSLASH, ['\\', '|']),
-        (orbclient::K_Z, ['z', 'Z']),
-        (orbclient::K_X, ['x', 'X']),
-        (orbclient::K_C, ['c', 'C']),
-        (orbclient::K_V, ['v', 'V']),
-        (orbclient::K_B, ['b', 'B']),
-        (orbclient::K_N, ['n', 'N']),
-        (orbclient::K_M, ['m', 'M']),
-        (orbclient::K_COMMA, [',', '<']),
-        (orbclient::K_PERIOD, ['.', '>']),
-        (orbclient::K_SLASH, ['/', '?']),
-        (orbclient::K_SPACE, [' ', ' ']),
-    ];
-
-    pub static GB: [(u8, [char; 2]); 54] = [
-        (orbclient::K_ESC, ['\x1B', '\x1B']),
-        (orbclient::K_1, ['1', '!']),
-        (orbclient::K_2, ['2', '"']),
-        (orbclient::K_3, ['3', '£']),
-        (orbclient::K_4, ['4', '$']),
-        (orbclient::K_5, ['5', '%']),
-        (orbclient::K_6, ['6', '^']),
-        (orbclient::K_7, ['7', '&']),
-        (orbclient::K_8, ['8', '*']),
-        (orbclient::K_9, ['9', '(']),
-        (orbclient::K_0, ['0', ')']),
-        (orbclient::K_MINUS, ['-', '_']),
-        (orbclient::K_EQUALS, ['=', '+']),
-        (orbclient::K_BKSP, ['\x7F', '\x7F']),
-        (orbclient::K_TAB, ['\t', '\t']),
-        (orbclient::K_Q, ['q', 'Q']),
-        (orbclient::K_W, ['w', 'W']),
-        (orbclient::K_E, ['e', 'E']),
-        (orbclient::K_R, ['r', 'R']),
-        (orbclient::K_T, ['t', 'T']),
-        (orbclient::K_Y, ['y', 'Y']),
-        (orbclient::K_U, ['u', 'U']),
-        (orbclient::K_I, ['i', 'I']),
-        (orbclient::K_O, ['o', 'O']),
-        (orbclient::K_P, ['p', 'P']),
-        (orbclient::K_BRACE_OPEN, ['[', '{']),
-        (orbclient::K_BRACE_CLOSE, [']', '}']),
-        (orbclient::K_ENTER, ['\n', '\n']),
-        (orbclient::K_CTRL, ['\0', '\0']),
-        (orbclient::K_A, ['a', 'A']),
-        (orbclient::K_S, ['s', 'S']),
-        (orbclient::K_D, ['d', 'D']),
-        (orbclient::K_F, ['f', 'F']),
-        (orbclient::K_G, ['g', 'G']),
-        (orbclient::K_H, ['h', 'H']),
-        (orbclient::K_J, ['j', 'J']),
-        (orbclient::K_K, ['k', 'K']),
-        (orbclient::K_L, ['l', 'L']),
-        (orbclient::K_SEMICOLON, [';', ':']),
-        (orbclient::K_QUOTE, ['\'', '@']),
-        (orbclient::K_TICK, ['`', '¬']),
-        (orbclient::K_BACKSLASH, ['#', '~']),
-        (orbclient::K_Z, ['z', 'Z']),
-        (orbclient::K_X, ['x', 'X']),
-        (orbclient::K_C, ['c', 'C']),
-        (orbclient::K_V, ['v', 'V']),
-        (orbclient::K_B, ['b', 'B']),
-        (orbclient::K_N, ['n', 'N']),
-        (orbclient::K_M, ['m', 'M']),
-        (orbclient::K_COMMA, [',', '<']),
-        (orbclient::K_PERIOD, ['.', '>']),
-        (orbclient::K_SLASH, ['/', '?']),
-        (orbclient::K_SPACE, [' ', ' ']),
-        // UK Backslash, doesn't exist on US keyboard
-        (0x56, ['\\', '|']),
-    ];
-
-    pub static DVORAK: [(u8, [char; 2]); 53] = [
-        (orbclient::K_ESC, ['\x1B', '\x1B']),
-        (orbclient::K_1, ['1', '!']),
-        (orbclient::K_2, ['2', '@']),
-        (orbclient::K_3, ['3', '#']),
-        (orbclient::K_4, ['4', '$']),
-        (orbclient::K_5, ['5', '%']),
-        (orbclient::K_6, ['6', '^']),
-        (orbclient::K_7, ['7', '&']),
-        (orbclient::K_8, ['8', '*']),
-        (orbclient::K_9, ['9', '(']),
-        (orbclient::K_0, ['0', ')']),
-        (orbclient::K_MINUS, ['[', '{']),
-        (orbclient::K_EQUALS, [']', '}']),
-        (orbclient::K_BKSP, ['\x7F', '\x7F']),
-        (orbclient::K_TAB, ['\t', '\t']),
-        (orbclient::K_Q, ['\'', '"']),
-        (orbclient::K_W, [',', '<']),
-        (orbclient::K_E, ['.', '>']),
-        (orbclient::K_R, ['p', 'P']),
-        (orbclient::K_T, ['y', 'Y']),
-        (orbclient::K_Y, ['f', 'F']),
-        (orbclient::K_U, ['g', 'G']),
-        (orbclient::K_I, ['c', 'C']),
-        (orbclient::K_O, ['r', 'R']),
-        (orbclient::K_P, ['l', 'L']),
-        (orbclient::K_BRACE_OPEN, ['/', '?']),
-        (orbclient::K_BRACE_CLOSE, ['=', '+']),
-        (orbclient::K_ENTER, ['\n', '\n']),
-        (orbclient::K_CTRL, ['\0', '\0']),
-        (orbclient::K_A, ['a', 'A']),
-        (orbclient::K_S, ['o', 'O']),
-        (orbclient::K_D, ['e', 'E']),
-        (orbclient::K_F, ['u', 'U']),
-        (orbclient::K_G, ['i', 'I']),
-        (orbclient::K_H, ['d', 'D']),
-        (orbclient::K_J, ['h', 'H']),
-        (orbclient::K_K, ['t', 'T']),
-        (orbclient::K_L, ['n', 'N']),
-        (orbclient::K_SEMICOLON, ['s', 'S']),
-        (orbclient::K_QUOTE, ['-', '_']),
-        (orbclient::K_TICK, ['`', '~']),
-        (orbclient::K_BACKSLASH, ['\\', '|']),
-        (orbclient::K_Z, [';', ':']),
-        (orbclient::K_X, ['q', 'Q']),
-        (orbclient::K_C, ['j', 'J']),
-        (orbclient::K_V, ['k', 'K']),
-        (orbclient::K_B, ['x', 'X']),
-        (orbclient::K_N, ['b', 'B']),
-        (orbclient::K_M, ['m', 'M']),
-        (orbclient::K_COMMA, ['w', 'W']),
-        (orbclient::K_PERIOD, ['v', 'V']),
-        (orbclient::K_SLASH, ['z', 'Z']),
-        (orbclient::K_SPACE, [' ', ' ']),
-    ];
-
-    pub static AZERTY: [(u8, [char; 2]); 53] = [
-        (orbclient::K_ESC, ['\x1B', '\x1B']),
-        (orbclient::K_1, ['&', '1']),
-        (orbclient::K_2, ['é', '2']),
-        (orbclient::K_3, ['"', '3']),
-        (orbclient::K_4, ['\'', '4']),
-        (orbclient::K_5, ['(', '5']),
-        (orbclient::K_6, ['|', '6']),
-        (orbclient::K_7, ['è', '7']),
-        (orbclient::K_8, ['_', '8']),
-        (orbclient::K_9, ['ç', '9']),
-        (orbclient::K_0, ['à', '0']),
-        (orbclient::K_MINUS, [')', '°']),
-        (orbclient::K_EQUALS, ['=', '+']),
-        (orbclient::K_BKSP, ['\x7F', '\x7F']),
-        (orbclient::K_TAB, ['\t', '\t']),
-        (orbclient::K_Q, ['a', 'A']),
-        (orbclient::K_W, ['z', 'Z']),
-        (orbclient::K_E, ['e', 'E']),
-        (orbclient::K_R, ['r', 'R']),
-        (orbclient::K_T, ['t', 'T']),
-        (orbclient::K_Y, ['y', 'Y']),
-        (orbclient::K_U, ['u', 'U']),
-        (orbclient::K_I, ['i', 'I']),
-        (orbclient::K_O, ['o', 'O']),
-        (orbclient::K_P, ['p', 'P']),
-        (orbclient::K_BRACE_OPEN, ['^', '¨']),
-        (orbclient::K_BRACE_CLOSE, ['$', '£']),
-        (orbclient::K_ENTER, ['\n', '\n']),
-        (orbclient::K_CTRL, ['\0', '\0']),
-        (orbclient::K_A, ['q', 'Q']),
-        (orbclient::K_S, ['s', 'S']),
-        (orbclient::K_D, ['d', 'D']),
-        (orbclient::K_F, ['f', 'F']),
-        (orbclient::K_G, ['g', 'G']),
-        (orbclient::K_H, ['h', 'H']),
-        (orbclient::K_J, ['j', 'J']),
-        (orbclient::K_K, ['k', 'K']),
-        (orbclient::K_L, ['l', 'L']),
-        (orbclient::K_SEMICOLON, ['m', 'M']),
-        (orbclient::K_QUOTE, ['ù', '%']),
-        (orbclient::K_TICK, ['*', 'µ']),
-        (orbclient::K_BACKSLASH, ['ê', 'Ê']),
-        (orbclient::K_Z, ['w', 'W']),
-        (orbclient::K_X, ['x', 'X']),
-        (orbclient::K_C, ['c', 'C']),
-        (orbclient::K_V, ['v', 'V']),
-        (orbclient::K_B, ['b', 'B']),
-        (orbclient::K_N, ['n', 'N']),
-        (orbclient::K_M, [',', '?']),
-        (orbclient::K_COMMA, [';', '.']),
-        (orbclient::K_PERIOD, [':', '/']),
-        (orbclient::K_SLASH, ['!', '§']),
-        (orbclient::K_SPACE, [' ', ' ']),
-    ];
-
-    pub static BEPO: [(u8, [char; 2]); 53] = [
-        (orbclient::K_ESC, ['\x1B', '\x1B']),
-        (orbclient::K_1, ['"', '1']),
-        (orbclient::K_2, ['«', '2']),
-        (orbclient::K_3, ['»', '3']),
-        (orbclient::K_4, ['(', '4']),
-        (orbclient::K_5, [')', '5']),
-        (orbclient::K_6, ['@', '6']),
-        (orbclient::K_7, ['+', '7']),
-        (orbclient::K_8, ['-', '8']),
-        (orbclient::K_9, ['/', '9']),
-        (orbclient::K_0, ['*', '0']),
-        (orbclient::K_MINUS, ['=', '°']),
-        (orbclient::K_EQUALS, ['%', '`']),
-        (orbclient::K_BKSP, ['\x7F', '\x7F']),
-        (orbclient::K_TAB, ['\t', '\t']),
-        (orbclient::K_Q, ['b', 'B']),
-        (orbclient::K_W, ['é', 'É']),
-        (orbclient::K_E, ['p', 'P']),
-        (orbclient::K_R, ['o', 'O']),
-        (orbclient::K_T, ['è', 'È']),
-        (orbclient::K_Y, ['^', '!']),
-        (orbclient::K_U, ['v', 'V']),
-        (orbclient::K_I, ['d', 'D']),
-        (orbclient::K_O, ['l', 'L']),
-        (orbclient::K_P, ['j', 'J']),
-        (orbclient::K_BRACE_OPEN, ['z', 'Z']),
-        (orbclient::K_BRACE_CLOSE, ['w', 'W']),
-        (orbclient::K_ENTER, ['\n', '\n']),
-        (orbclient::K_CTRL, ['\0', '\0']),
-        (orbclient::K_A, ['a', 'A']),
-        (orbclient::K_S, ['u', 'U']),
-        (orbclient::K_D, ['i', 'I']),
-        (orbclient::K_F, ['e', 'E']),
-        (orbclient::K_G, [',', ';']),
-        (orbclient::K_H, ['c', 'C']),
-        (orbclient::K_J, ['t', 'T']),
-        (orbclient::K_K, ['s', 'S']),
-        (orbclient::K_L, ['r', 'R']),
-        (orbclient::K_SEMICOLON, ['n', 'N']),
-        (orbclient::K_QUOTE, ['m', 'M']),
-        (orbclient::K_TICK, ['ç', 'Ç']),
-        (orbclient::K_BACKSLASH, ['ê', 'Ê']),
-        (orbclient::K_Z, ['à', 'À']),
-        (orbclient::K_X, ['y', 'Y']),
-        (orbclient::K_C, ['x', 'X']),
-        (orbclient::K_V, ['.', ':']),
-        (orbclient::K_B, ['k', 'K']),
-        (orbclient::K_N, ['\'', '?']),
-        (orbclient::K_M, ['q', 'Q']),
-        (orbclient::K_COMMA, ['g', 'G']),
-        (orbclient::K_PERIOD, ['h', 'H']),
-        (orbclient::K_SLASH, ['f', 'F']),
-        (orbclient::K_SPACE, [' ', ' ']),
-    ];
-
-    pub static IT: [(u8, [char; 2]); 53] = [
-        (orbclient::K_ESC, ['\x1B', '\x1B']),
-        (orbclient::K_1, ['1', '!']),
-        (orbclient::K_2, ['2', '"']),
-        (orbclient::K_3, ['3', '£']),
-        (orbclient::K_4, ['4', '$']),
-        (orbclient::K_5, ['5', '%']),
-        (orbclient::K_6, ['6', '&']),
-        (orbclient::K_7, ['7', '/']),
-        (orbclient::K_8, ['8', '(']),
-        (orbclient::K_9, ['9', ')']),
-        (orbclient::K_0, ['0', '=']),
-        (orbclient::K_MINUS, ['?', '\'']),
-        (orbclient::K_EQUALS, ['ì', '^']),
-        (orbclient::K_BKSP, ['\x7F', '\x7F']),
-        (orbclient::K_TAB, ['\t', '\t']),
-        (orbclient::K_Q, ['q', 'Q']),
-        (orbclient::K_W, ['w', 'W']),
-        (orbclient::K_E, ['e', 'E']),
-        (orbclient::K_R, ['r', 'R']),
-        (orbclient::K_T, ['t', 'T']),
-        (orbclient::K_Y, ['y', 'Y']),
-        (orbclient::K_U, ['u', 'U']),
-        (orbclient::K_I, ['i', 'I']),
-        (orbclient::K_O, ['o', 'O']),
-        (orbclient::K_P, ['p', 'P']),
-        (orbclient::K_BRACE_OPEN, ['è', 'é']),
-        (orbclient::K_BRACE_CLOSE, ['+', '*']),
-        (orbclient::K_ENTER, ['\n', '\n']),
-        (orbclient::K_CTRL, ['\x20', '\x20']),
-        (orbclient::K_A, ['a', 'A']),
-        (orbclient::K_S, ['s', 'S']),
-        (orbclient::K_D, ['d', 'D']),
-        (orbclient::K_F, ['f', 'F']),
-        (orbclient::K_G, ['g', 'G']),
-        (orbclient::K_H, ['h', 'H']),
-        (orbclient::K_J, ['j', 'J']),
-        (orbclient::K_K, ['k', 'K']),
-        (orbclient::K_L, ['l', 'L']),
-        (orbclient::K_SEMICOLON, ['ò', 'ç']),
-        (orbclient::K_QUOTE, ['à', '°']),
-        (orbclient::K_TICK, ['ù', '§']),
-        (orbclient::K_BACKSLASH, ['<', '>']),
-        (orbclient::K_Z, ['z', 'Z']),
-        (orbclient::K_X, ['x', 'X']),
-        (orbclient::K_C, ['c', 'C']),
-        (orbclient::K_V, ['v', 'V']),
-        (orbclient::K_B, ['b', 'B']),
-        (orbclient::K_N, ['n', 'N']),
-        (orbclient::K_M, ['m', 'M']),
-        (orbclient::K_COMMA, [',', ';']),
-        (orbclient::K_PERIOD, ['.', ':']),
-        (orbclient::K_SLASH, ['-', '_']),
-        (orbclient::K_SPACE, [' ', ' ']),
-    ];
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-#[repr(usize)]
-pub enum KeymapKind {
-    US = 0,
-    GB,
-    Dvorak,
-    Azerty,
-    Bepo,
-    IT,
-}
-
-impl From<usize> for KeymapKind {
-    fn from(value: usize) -> Self {
-        if value > (KeymapKind::IT as usize) {
-            KeymapKind::US
-        } else {
-            // SAFETY: Checked above
-            unsafe { std::mem::transmute(value) }
-        }
-    }
-}
-
-#[allow(missing_copy_implementations)]
-#[derive(Debug, PartialEq, Eq)]
-pub struct ParseKeymapError(());
-
-impl FromStr for KeymapKind {
-    type Err = ParseKeymapError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let keymap = match s {
-            "dvorak" => KeymapKind::Dvorak,
-            "us" => KeymapKind::US,
-            "gb" => KeymapKind::GB,
-            "azerty" => KeymapKind::Azerty,
-            "bepo" => KeymapKind::Bepo,
-            "it" => KeymapKind::IT,
-            &_ => return Err(ParseKeymapError(())),
-        };
-
-        Ok(keymap)
-    }
-}
-
-impl Display for KeymapKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let s = match *self {
-            KeymapKind::US => "us",
-            KeymapKind::GB => "gb",
-            KeymapKind::Dvorak => "dvorak",
-            KeymapKind::Azerty => "azerty",
-            KeymapKind::Bepo => "bepo",
-            KeymapKind::IT => "it",
-        };
-        f.write_str(s)
-    }
-}
-
-pub struct KeymapData {
-    pub keymap_hash: HashMap<u8, [char; 2]>,
-    pub kind: KeymapKind,
-}
-
-impl KeymapData {
-    pub fn new(kind: KeymapKind) -> Self {
-        let keymap_hash = match kind {
-            KeymapKind::US => HashMap::from(keymaps::US),
-            KeymapKind::GB => HashMap::from(keymaps::GB),
-            KeymapKind::Dvorak => HashMap::from(keymaps::DVORAK),
-            KeymapKind::Azerty => HashMap::from(keymaps::AZERTY),
-            KeymapKind::Bepo => HashMap::from(keymaps::BEPO),
-            KeymapKind::IT => HashMap::from(keymaps::IT),
-        };
-
-        Self { keymap_hash, kind }
-    }
-
-    pub fn get_kind(&self) -> KeymapKind {
-        self.kind
-    }
-
-    // TODO: AltGr, Numlock
-    pub fn get_char(&self, scancode: u8, shift: bool) -> char {
-        if let Some(c) = self.keymap_hash.get(&scancode) {
-            if shift {
-                c[1]
-            } else {
-                c[0]
-            }
-        } else {
-            '\0'
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/inputd/src/lib.rs b/recipes/core/base/drivers/inputd/src/lib.rs
deleted file mode 100644
index b68e8211f5..0000000000
--- a/recipes/core/base/drivers/inputd/src/lib.rs
+++ /dev/null
@@ -1,211 +0,0 @@
-use std::fs::{File, OpenOptions};
-use std::io::{self, Read, Write};
-use std::mem::size_of;
-use std::os::fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, RawFd};
-use std::os::unix::fs::OpenOptionsExt;
-use std::path::PathBuf;
-use std::slice;
-
-use libredox::flag::{O_CLOEXEC, O_NONBLOCK, O_RDWR};
-use orbclient::Event;
-use syscall::ESTALE;
-
-fn read_to_slice<T: Copy>(
-    file: BorrowedFd,
-    buf: &mut [T],
-) -> Result<usize, libredox::error::Error> {
-    unsafe {
-        libredox::call::read(
-            file.as_raw_fd() as usize,
-            slice::from_raw_parts_mut(buf.as_mut_ptr() as *mut u8, buf.len() * size_of::<T>()),
-        )
-        .map(|count| count / size_of::<T>())
-    }
-}
-
-pub unsafe fn any_as_u8_slice<T: Sized>(p: &T) -> &[u8] {
-    slice::from_raw_parts((p as *const T) as *const u8, size_of::<T>())
-}
-
-unsafe fn any_as_u8_slice_mut<T: Sized>(p: &mut T) -> &mut [u8] {
-    slice::from_raw_parts_mut((p as *mut T) as *mut u8, size_of::<T>())
-}
-
-pub struct ConsumerHandle(File);
-
-pub enum ConsumerHandleEvent<'a> {
-    Events(&'a [Event]),
-    Handoff,
-}
-
-impl ConsumerHandle {
-    pub fn new_vt() -> io::Result<Self> {
-        let file = OpenOptions::new()
-            .read(true)
-            .custom_flags(O_NONBLOCK as i32)
-            .open(format!("/scheme/input/consumer"))?;
-        Ok(Self(file))
-    }
-
-    pub fn bootlog_vt() -> io::Result<Self> {
-        let file = OpenOptions::new()
-            .read(true)
-            .custom_flags(O_NONBLOCK as i32)
-            .open(format!("/scheme/input/consumer_bootlog"))?;
-        Ok(Self(file))
-    }
-
-    pub fn event_handle(&self) -> BorrowedFd<'_> {
-        self.0.as_fd()
-    }
-
-    pub fn open_display_v2(&self) -> io::Result<File> {
-        let mut buffer = [0; 1024];
-        let fd = self.0.as_raw_fd();
-        let written = libredox::call::fpath(fd as usize, &mut buffer)?;
-
-        assert!(written <= buffer.len());
-
-        let mut display_path = PathBuf::from(
-            std::str::from_utf8(&buffer[..written])
-                .expect("init: display path UTF-8 check failed")
-                .to_owned(),
-        );
-        display_path.set_file_name(format!(
-            "v2/{}",
-            display_path.file_name().unwrap().to_str().unwrap()
-        ));
-        let display_path = display_path.to_str().unwrap();
-
-        let display_file =
-            libredox::call::open(display_path, (O_CLOEXEC | O_NONBLOCK | O_RDWR) as _, 0)
-                .map(|socket| unsafe { File::from_raw_fd(socket as RawFd) })
-                .unwrap_or_else(|err| {
-                    panic!("failed to open display {}: {}", display_path, err);
-                });
-
-        Ok(display_file)
-    }
-
-    pub fn read_events<'a>(&self, events: &'a mut [Event]) -> io::Result<ConsumerHandleEvent<'a>> {
-        match read_to_slice(self.0.as_fd(), events) {
-            Ok(count) => Ok(ConsumerHandleEvent::Events(&events[..count])),
-            Err(err) if err.errno() == ESTALE => Ok(ConsumerHandleEvent::Handoff),
-            Err(err) => Err(err.into()),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-#[repr(C)]
-pub struct ControlEvent {
-    pub kind: usize,
-    pub data: usize,
-}
-
-impl From<VtActivate> for ControlEvent {
-    fn from(value: VtActivate) -> Self {
-        ControlEvent {
-            kind: 1,
-            data: value.vt,
-        }
-    }
-}
-
-impl From<KeymapActivate> for ControlEvent {
-    fn from(value: KeymapActivate) -> Self {
-        ControlEvent {
-            kind: 2,
-            data: value.keymap,
-        }
-    }
-}
-
-pub struct VtActivate {
-    pub vt: usize,
-}
-
-pub struct KeymapActivate {
-    pub keymap: usize,
-}
-
-pub struct DisplayHandle(File);
-
-impl DisplayHandle {
-    pub fn new<S: Into<String>>(scheme_name: S) -> io::Result<Self> {
-        let path = format!("/scheme/input/handle/{}", scheme_name.into());
-        Ok(Self(File::open(path)?))
-    }
-
-    pub fn new_early<S: Into<String>>(scheme_name: S) -> io::Result<Self> {
-        let path = format!("/scheme/input/handle_early/{}", scheme_name.into());
-        Ok(Self(File::open(path)?))
-    }
-
-    pub fn read_vt_event(&mut self) -> io::Result<Option<VtEvent>> {
-        let mut event = VtEvent {
-            kind: VtEventKind::Activate,
-            vt: usize::MAX,
-        };
-
-        let nread = self.0.read(unsafe { any_as_u8_slice_mut(&mut event) })?;
-
-        if nread == 0 {
-            Ok(None)
-        } else {
-            assert_eq!(nread, size_of::<VtEvent>());
-            Ok(Some(event))
-        }
-    }
-
-    pub fn inner(&self) -> BorrowedFd<'_> {
-        self.0.as_fd()
-    }
-}
-
-pub struct ControlHandle(File);
-
-impl ControlHandle {
-    pub fn new() -> io::Result<Self> {
-        let path = format!("/scheme/input/control");
-        Ok(Self(File::open(path)?))
-    }
-
-    /// Sent to Handle::Display
-    pub fn activate_vt(&mut self, vt: usize) -> io::Result<usize> {
-        let cmd = ControlEvent::from(VtActivate { vt });
-        self.0.write(unsafe { any_as_u8_slice(&cmd) })
-    }
-
-    /// Sent to Handle::Producer
-    pub fn activate_keymap(&mut self, keymap: usize) -> io::Result<usize> {
-        let cmd = ControlEvent::from(KeymapActivate { keymap });
-        self.0.write(unsafe { any_as_u8_slice(&cmd) })
-    }
-}
-
-#[derive(Debug)]
-#[repr(usize)]
-pub enum VtEventKind {
-    Activate,
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct VtEvent {
-    pub kind: VtEventKind,
-    pub vt: usize,
-}
-
-pub struct ProducerHandle(File);
-
-impl ProducerHandle {
-    pub fn new() -> io::Result<Self> {
-        File::open("/scheme/input/producer").map(ProducerHandle)
-    }
-
-    pub fn write_event(&mut self, event: orbclient::Event) -> io::Result<()> {
-        self.0.write(&event)?;
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/inputd/src/main.rs b/recipes/core/base/drivers/inputd/src/main.rs
deleted file mode 100644
index 9f24080c28..0000000000
--- a/recipes/core/base/drivers/inputd/src/main.rs
+++ /dev/null
@@ -1,663 +0,0 @@
-//! `:input`
-//!
-//! A seperate scheme is required since all of the input from different input devices is required
-//! to be combined into a single stream which is later going to be processed by the "consumer"
-//! which usually is Orbital.
-//!
-//! ## Input Device ("producer")
-//! Write events to `input:producer`.
-//!
-//! ## Input Consumer ("consumer")
-//! Read events from `input:consumer`. Optionally, set the `EVENT_READ` flag to be notified when
-//! events are available.
-
-use core::mem::size_of;
-use std::borrow::Cow;
-use std::collections::BTreeSet;
-use std::mem::transmute;
-use std::ops::ControlFlow;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-use inputd::{ControlEvent, VtEvent, VtEventKind};
-
-use libredox::errno::ESTALE;
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult, Response, SignalBehavior, Socket};
-
-use orbclient::{Event, EventOption};
-use scheme_utils::{Blocking, FpathWriter, HandleMap};
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error as SysError, EventFlags, EACCES, EBADF, EEXIST, EINVAL};
-
-pub mod keymap;
-
-use keymap::KeymapKind;
-
-use crate::keymap::KeymapData;
-
-enum Handle {
-    Producer,
-    Consumer {
-        events: EventFlags,
-        pending: Vec<u8>,
-        /// We return an ESTALE error once to indicate that a handoff to a different graphics driver
-        /// is necessary.
-        needs_handoff: bool,
-        notified: bool,
-        vt: usize,
-    },
-    Display {
-        events: EventFlags,
-        pending: Vec<VtEvent>,
-        notified: bool,
-        device: String,
-        /// Control of all VT's gets handed over from earlyfb devices to the first non-earlyfb device.
-        is_earlyfb: bool,
-    },
-    Control,
-    SchemeRoot,
-}
-
-struct InputScheme {
-    handles: HandleMap<Handle>,
-
-    next_vt_id: AtomicUsize,
-
-    display: Option<String>,
-    vts: BTreeSet<usize>,
-    super_key: bool,
-    active_vt: Option<usize>,
-    active_keymap: KeymapData,
-    lshift: bool,
-    rshift: bool,
-
-    has_new_events: bool,
-}
-
-impl InputScheme {
-    fn new() -> Self {
-        Self {
-            handles: HandleMap::new(),
-
-            next_vt_id: AtomicUsize::new(2), // VT 1 is reserved for the bootlog
-
-            display: None,
-            vts: BTreeSet::new(),
-            super_key: false,
-            active_vt: None,
-            // TODO: configurable init?
-            active_keymap: KeymapData::new(KeymapKind::US),
-            lshift: false,
-            rshift: false,
-            has_new_events: false,
-        }
-    }
-
-    fn switch_vt(&mut self, new_active: usize) {
-        if let Some(active_vt) = self.active_vt {
-            if new_active == active_vt {
-                return;
-            }
-        }
-
-        if !self.vts.contains(&new_active) {
-            log::warn!("switch to non-existent VT #{new_active} was requested");
-            return;
-        }
-
-        log::debug!(
-            "switching from VT #{} to VT #{new_active}",
-            self.active_vt.unwrap_or(0)
-        );
-
-        for handle in self.handles.values_mut() {
-            match handle {
-                Handle::Display {
-                    pending,
-                    notified,
-                    device,
-                    ..
-                } => {
-                    if self.display.as_deref() == Some(&*device) {
-                        pending.push(VtEvent {
-                            kind: VtEventKind::Activate,
-                            vt: new_active,
-                        });
-                        *notified = false;
-                    }
-                }
-                _ => continue,
-            }
-        }
-
-        self.active_vt = Some(new_active);
-    }
-
-    fn switch_keymap(&mut self, new_active: usize) {
-        if new_active == self.active_keymap.get_kind() as usize {
-            return;
-        }
-
-        log::debug!(
-            "switching from keymap #{} to keymap #{}",
-            self.active_keymap.get_kind(),
-            KeymapKind::from(new_active),
-        );
-
-        self.active_keymap = KeymapData::new(new_active.into());
-    }
-}
-
-impl SchemeSync for InputScheme {
-    fn scheme_root(&mut self) -> syscall::Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<OpenResult> {
-        if !matches!(self.handles.get(dirfd)?, Handle::SchemeRoot) {
-            return Err(SysError::new(EACCES));
-        }
-
-        let mut path_parts = path.split('/');
-
-        let command = path_parts.next().ok_or(SysError::new(EINVAL))?;
-
-        let handle_ty = match command {
-            "producer" => Handle::Producer,
-            "consumer" => {
-                let vt = self.next_vt_id.fetch_add(1, Ordering::Relaxed);
-                self.vts.insert(vt);
-
-                if self.active_vt.is_none() {
-                    self.switch_vt(vt);
-                }
-                Handle::Consumer {
-                    events: EventFlags::empty(),
-                    pending: Vec::new(),
-                    needs_handoff: false,
-                    notified: false,
-                    vt,
-                }
-            }
-            "consumer_bootlog" => {
-                if !self.vts.insert(1) {
-                    return Err(SysError::new(EEXIST));
-                }
-
-                self.switch_vt(1);
-                Handle::Consumer {
-                    events: EventFlags::empty(),
-                    pending: Vec::new(),
-                    needs_handoff: false,
-                    notified: false,
-                    vt: 1,
-                }
-            }
-            "handle" | "handle_early" => {
-                let display = path_parts.next().ok_or(SysError::new(EINVAL))?;
-
-                let needs_handoff = match command {
-                    "handle_early" => self.display.is_none(),
-                    "handle" => self.handles.values().all(|handle| {
-                        !matches!(
-                            handle,
-                            Handle::Display {
-                                is_earlyfb: false,
-                                ..
-                            }
-                        )
-                    }),
-                    _ => unreachable!(),
-                };
-
-                if needs_handoff {
-                    self.has_new_events = true;
-                    self.display = Some(display.to_owned());
-
-                    for handle in self.handles.values_mut() {
-                        match handle {
-                            Handle::Consumer {
-                                needs_handoff,
-                                notified,
-                                ..
-                            } => {
-                                *needs_handoff = true;
-                                *notified = false;
-                            }
-                            _ => continue,
-                        }
-                    }
-                }
-
-                Handle::Display {
-                    events: EventFlags::empty(),
-                    pending: if let Some(active_vt) = self.active_vt {
-                        vec![VtEvent {
-                            kind: VtEventKind::Activate,
-                            vt: active_vt,
-                        }]
-                    } else {
-                        vec![]
-                    },
-                    notified: false,
-                    device: display.to_owned(),
-                    is_earlyfb: command == "handle_early",
-                }
-            }
-            "control" => Handle::Control,
-
-            _ => {
-                log::error!("invalid path '{path}'");
-                return Err(SysError::new(EINVAL));
-            }
-        };
-
-        log::debug!("{path} channel has been opened");
-
-        let fd = self.handles.insert(handle_ty);
-        Ok(OpenResult::ThisScheme {
-            number: fd,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> syscall::Result<usize> {
-        let display = self.display.as_ref().ok_or(SysError::new(EINVAL))?;
-        FpathWriter::with(buf, display, |w| {
-            let handle = self.handles.get(id)?;
-
-            if let Handle::Consumer { vt, .. } = handle {
-                write!(w, "{vt}").unwrap();
-                Ok(())
-            } else {
-                Err(SysError::new(EINVAL))
-            }
-        })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<usize> {
-        let handle = self.handles.get_mut(id)?;
-
-        match handle {
-            Handle::Consumer {
-                pending,
-                needs_handoff,
-                ..
-            } => {
-                if *needs_handoff {
-                    *needs_handoff = false;
-                    // Indicates that handoff to a new graphics driver is necessary.
-                    return Err(SysError::new(ESTALE));
-                }
-
-                let copy = core::cmp::min(pending.len(), buf.len());
-
-                for (i, byte) in pending.drain(..copy).enumerate() {
-                    buf[i] = byte;
-                }
-
-                Ok(copy)
-            }
-
-            Handle::Display { pending, .. } => {
-                if buf.len() % size_of::<VtEvent>() == 0 {
-                    let copy = core::cmp::min(pending.len(), buf.len() / size_of::<VtEvent>());
-
-                    for (i, event) in pending.drain(..copy).enumerate() {
-                        buf[i * size_of::<VtEvent>()..(i + 1) * size_of::<VtEvent>()]
-                            .copy_from_slice(&unsafe {
-                                transmute::<VtEvent, [u8; size_of::<VtEvent>()]>(event)
-                            });
-                    }
-                    Ok(copy * size_of::<VtEvent>())
-                } else {
-                    log::error!("display tried to read incorrectly sized event");
-                    return Err(SysError::new(EINVAL));
-                }
-            }
-
-            Handle::Producer => {
-                log::error!("producer tried to read");
-                return Err(SysError::new(EINVAL));
-            }
-            Handle::Control => {
-                log::error!("control tried to read");
-                return Err(SysError::new(EINVAL));
-            }
-            Handle::SchemeRoot => return Err(SysError::new(EBADF)),
-        }
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<usize> {
-        self.has_new_events = true;
-
-        let handle = self.handles.get_mut(id)?;
-
-        match handle {
-            Handle::Control => {
-                if buf.len() != size_of::<ControlEvent>() {
-                    log::error!("control tried to write incorrectly sized command");
-                    return Err(SysError::new(EINVAL));
-                }
-
-                // SAFETY: We have verified the size of the buffer above.
-                let cmd = unsafe { &*buf.as_ptr().cast::<ControlEvent>() };
-
-                match cmd.kind {
-                    1 => self.switch_vt(cmd.data),
-                    2 => self.switch_keymap(cmd.data),
-                    k => {
-                        log::warn!("unknown control {}", k);
-                    }
-                }
-
-                return Ok(buf.len());
-            }
-
-            Handle::Consumer { .. } => {
-                log::error!("consumer tried to write");
-                return Err(SysError::new(EINVAL));
-            }
-            Handle::Display { .. } => {
-                log::error!("display tried to write");
-                return Err(SysError::new(EINVAL));
-            }
-            Handle::Producer => {}
-            Handle::SchemeRoot => return Err(SysError::new(EBADF)),
-        }
-
-        if buf.len() == 1 && buf[0] > 0xf4 {
-            return Ok(1);
-        }
-
-        let mut events = Cow::from(unsafe {
-            core::slice::from_raw_parts(
-                buf.as_ptr() as *const Event,
-                buf.len() / size_of::<Event>(),
-            )
-        });
-
-        for i in 0..events.len() {
-            let mut new_active_opt = None;
-            match events[i].to_option() {
-                EventOption::Key(mut key_event) => match key_event.scancode {
-                    f @ orbclient::K_F1..=orbclient::K_F10 if self.super_key => {
-                        new_active_opt = Some((f - 0x3A) as usize);
-                    }
-                    orbclient::K_F11 if self.super_key => {
-                        new_active_opt = Some(11);
-                    }
-                    orbclient::K_F12 if self.super_key => {
-                        new_active_opt = Some(12);
-                    }
-                    orbclient::K_SUPER => {
-                        self.super_key = key_event.pressed;
-                    }
-                    orbclient::K_LEFT_SHIFT => {
-                        self.lshift = key_event.pressed;
-                    }
-                    orbclient::K_RIGHT_SHIFT => {
-                        self.rshift = key_event.pressed;
-                    }
-
-                    key => {
-                        let shift = self.lshift | self.rshift;
-                        let ev = self.active_keymap.get_char(key, shift);
-                        key_event.character = ev;
-                        events.to_mut()[i] = key_event.to_event();
-                    }
-                },
-
-                _ => continue,
-            }
-
-            if let Some(new_active) = new_active_opt {
-                self.switch_vt(new_active);
-            }
-        }
-
-        let handle = self.handles.get_mut(id)?;
-        assert!(matches!(handle, Handle::Producer));
-
-        let buf = unsafe {
-            core::slice::from_raw_parts(
-                (events.as_ptr()) as *const u8,
-                events.len() * size_of::<Event>(),
-            )
-        };
-
-        if let Some(active_vt) = self.active_vt {
-            for handle in self.handles.values_mut() {
-                match handle {
-                    Handle::Consumer {
-                        pending,
-                        notified,
-                        vt,
-                        ..
-                    } => {
-                        if *vt != active_vt {
-                            continue;
-                        }
-
-                        pending.extend_from_slice(buf);
-                        *notified = false;
-                    }
-                    _ => continue,
-                }
-            }
-        }
-
-        Ok(buf.len())
-    }
-
-    fn fevent(
-        &mut self,
-        id: usize,
-        flags: syscall::EventFlags,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<syscall::EventFlags> {
-        match self.handles.get_mut(id)? {
-            Handle::Consumer {
-                ref mut events,
-                ref mut notified,
-                ..
-            } => {
-                *events = flags;
-                *notified = false;
-                Ok(EventFlags::empty())
-            }
-            Handle::Display {
-                ref mut events,
-                ref mut notified,
-                ..
-            } => {
-                *events = flags;
-                *notified = false;
-                Ok(EventFlags::empty())
-            }
-            Handle::Producer | Handle::Control => {
-                log::error!("producer or control tried to use an event queue");
-                Err(SysError::new(EINVAL))
-            }
-            Handle::SchemeRoot => Err(SysError::new(EBADF)),
-        }
-    }
-
-    fn on_close(&mut self, id: usize) {
-        match self.handles.remove(id).unwrap() {
-            Handle::Consumer { vt, .. } => {
-                self.vts.remove(&vt);
-                if self.active_vt == Some(vt) {
-                    if let Some(&new_vt) = self.vts.last() {
-                        self.switch_vt(new_vt);
-                    } else {
-                        self.active_vt = None;
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-}
-
-fn daemon(daemon: daemon::SchemeDaemon) -> anyhow::Result<()> {
-    // Create the ":input" scheme.
-    let socket_file = Socket::create()?;
-    let mut scheme = InputScheme::new();
-    let mut handler = Blocking::new(&socket_file, 16);
-
-    let _ = daemon.ready_sync_scheme(&socket_file, &mut scheme);
-
-    loop {
-        scheme.has_new_events = false;
-        match handler.process_requests_nonblocking(&mut scheme)? {
-            ControlFlow::Continue(()) => {}
-            ControlFlow::Break(()) => unreachable!("scheme should be non-blocking"),
-        }
-
-        if !scheme.has_new_events {
-            continue;
-        }
-
-        for (id, handle) in scheme.handles.iter_mut() {
-            match handle {
-                Handle::Consumer {
-                    events,
-                    pending,
-                    needs_handoff,
-                    ref mut notified,
-                    ..
-                } => {
-                    if (!*needs_handoff && pending.is_empty())
-                        || *notified
-                        || !events.contains(EventFlags::EVENT_READ)
-                    {
-                        continue;
-                    }
-
-                    // Notify the consumer that we have some events to read. Yum yum.
-                    socket_file.write_response(
-                        Response::post_fevent(*id, EventFlags::EVENT_READ.bits()),
-                        SignalBehavior::Restart,
-                    )?;
-
-                    *notified = true;
-                }
-                Handle::Display {
-                    events,
-                    pending,
-                    ref mut notified,
-                    ..
-                } => {
-                    if pending.is_empty() || *notified || !events.contains(EventFlags::EVENT_READ) {
-                        continue;
-                    }
-
-                    // Notify the consumer that we have some events to read. Yum yum.
-                    socket_file.write_response(
-                        Response::post_fevent(*id, EventFlags::EVENT_READ.bits()),
-                        SignalBehavior::Restart,
-                    )?;
-
-                    *notified = true;
-                }
-                _ => {}
-            }
-        }
-    }
-}
-
-fn daemon_runner(redox_daemon: daemon::SchemeDaemon) -> ! {
-    daemon(redox_daemon).unwrap();
-    unreachable!();
-}
-
-const HELP: &str = r#"
-inputd [-K keymap|-A vt|--keymaps]
-   -A vt       : set current virtual display
-   -K keymap   : set keyboard mapping
-   --keymaps   : list available keyboard mappings
-"#;
-
-fn main() {
-    let mut args = std::env::args().skip(1);
-
-    if let Some(val) = args.next() {
-        // TODO: Get current VT or keymap
-        match val.as_ref() {
-            // Activates a VT.
-            "-A" => {
-                let vt = args.next().unwrap().parse::<usize>().unwrap();
-
-                let mut handle =
-                    inputd::ControlHandle::new().expect("inputd: failed to open control handle");
-                handle
-                    .activate_vt(vt)
-                    .expect("inputd: failed to activate VT");
-            }
-            // Activates a keymap.
-            "-K" => {
-                let arg = if let Some(a) = args.next() {
-                    a
-                } else {
-                    eprintln!("Error: Option -K requires a layout argument.");
-                    std::process::exit(1);
-                };
-
-                let vt: KeymapKind = arg.to_ascii_lowercase().parse().unwrap_or_else(|_| {
-                    eprintln!("inputd: unrecognized keymap code (see: inputd --keymaps)");
-                    std::process::exit(1);
-                });
-
-                let mut handle =
-                    inputd::ControlHandle::new().expect("inputd: failed to open control handle");
-                handle
-                    .activate_keymap(vt as usize)
-                    .expect("inputd: failed to activate keymap");
-            }
-            // List available keymaps
-            "--keymaps" => {
-                // TODO: configurable KeymapKind using files
-                for key in vec!["dvorak", "us", "gb", "azerty", "bepo", "it"] {
-                    println!("{}", key);
-                }
-            }
-            "--help" => {
-                println!("{}", HELP);
-            }
-
-            _ => panic!("inputd: invalid argument: {}", val),
-        }
-    } else {
-        common::setup_logging(
-            "input",
-            "inputd",
-            "inputd",
-            common::output_level(),
-            common::file_level(),
-        );
-
-        daemon::SchemeDaemon::new(daemon_runner);
-    }
-}
diff --git a/recipes/core/base/drivers/net/driver-network/Cargo.toml b/recipes/core/base/drivers/net/driver-network/Cargo.toml
deleted file mode 100644
index fc8179086f..0000000000
--- a/recipes/core/base/drivers/net/driver-network/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "driver-network"
-description = "Shared networking code library"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-libredox.workspace = true
-daemon = { path = "../../../daemon" }
-redox-scheme.workspace = true
-scheme-utils = { path = "../../../scheme-utils" }
-redox_syscall = { workspace = true, features = ["std"] }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/net/driver-network/src/lib.rs b/recipes/core/base/drivers/net/driver-network/src/lib.rs
deleted file mode 100644
index 39d26d851b..0000000000
--- a/recipes/core/base/drivers/net/driver-network/src/lib.rs
+++ /dev/null
@@ -1,354 +0,0 @@
-use std::{cmp, io};
-
-use libredox::flag::O_NONBLOCK;
-use libredox::Fd;
-use redox_scheme::{
-    scheme::{IntoTag, Op, SchemeResponse, SchemeState, SchemeSync},
-    CallerCtx, OpenResult, RequestKind, Response, SignalBehavior, Socket,
-};
-use scheme_utils::{FpathWriter, HandleMap};
-use syscall::schemev2::NewFdFlags;
-use syscall::{
-    Error, EventFlags, Result, Stat, EACCES, EAGAIN, EBADF, EINTR, EINVAL, EWOULDBLOCK, MODE_FILE,
-};
-
-pub trait NetworkAdapter {
-    /// The [MAC address](https://en.wikipedia.org/wiki/MAC_address) of this
-    /// network adapter.
-    fn mac_address(&mut self) -> [u8; 6];
-
-    /// The amount of network packets that can be read without blocking.
-    fn available_for_read(&mut self) -> usize;
-
-    /// Attempt to read a network packet without blocking.
-    ///
-    /// Returns `Ok(None)` when there is no pending network packet.
-    fn read_packet(&mut self, buf: &mut [u8]) -> Result<Option<usize>>;
-
-    /// Write a single network packet.
-    // FIXME support back pressure on writes by returning EWOULDBLOCK or not
-    // returning from the write syscall until there is room.
-    fn write_packet(&mut self, buf: &[u8]) -> Result<usize>;
-}
-
-pub struct NetworkScheme<T: NetworkAdapter> {
-    scheme: NetworkSchemeInner<T>,
-    state: SchemeState,
-    blocked: Vec<(Op, CallerCtx)>,
-    socket: Socket,
-}
-
-fn post_fevent(socket: &Socket, id: usize, flags: usize) -> Result<()> {
-    let fevent_response = Response::post_fevent(id, flags);
-    match socket.write_response(fevent_response, SignalBehavior::Restart) {
-        Ok(true) => Ok(()),                            // Write response success
-        Ok(false) => Err(Error::new(syscall::EAGAIN)), // Write response failed, retry.
-        Err(err) => Err(err),                          // Error writing response
-    }
-}
-
-impl<T: NetworkAdapter> NetworkScheme<T> {
-    pub fn new(
-        adapter_fn: impl FnOnce() -> T,
-        daemon: daemon::Daemon,
-        scheme_name: String,
-    ) -> Self {
-        assert!(scheme_name.starts_with("network"));
-        let socket = Socket::nonblock().expect("failed to create network scheme");
-        let adapter = adapter_fn();
-        let mut scheme = NetworkSchemeInner::new(adapter, scheme_name.clone());
-        redox_scheme::scheme::register_sync_scheme(&socket, &scheme_name, &mut scheme)
-            .expect("failed to regitster network scheme");
-        daemon.ready();
-        Self {
-            scheme,
-            state: SchemeState::new(),
-            blocked: Vec::new(),
-            socket,
-        }
-    }
-
-    pub fn event_handle(&self) -> &Fd {
-        self.socket.inner()
-    }
-
-    pub fn adapter(&self) -> &T {
-        &self.scheme.adapter
-    }
-
-    pub fn adapter_mut(&mut self) -> &mut T {
-        &mut self.scheme.adapter
-    }
-
-    /// Process pending and new requests.
-    ///
-    /// This needs to be called each time there is a new event on the scheme
-    /// file and each time a new network packet has been received by the
-    /// driver.
-    // FIXME maybe split into one method for events on the scheme fd and one
-    // to call when an irq is received to indicate that blocked requests can
-    // be processed.
-    pub fn tick(&mut self) -> io::Result<()> {
-        // Handle any blocked requests
-        let mut i = 0;
-        while i < self.blocked.len() {
-            let (op, caller) = &mut self.blocked[i];
-            let res = op.handle_sync_dont_consume(caller, &mut self.scheme, &mut self.state);
-            match res {
-                SchemeResponse::Opened(Err(Error {
-                    errno: syscall::EWOULDBLOCK,
-                }))
-                | SchemeResponse::Regular(Err(Error {
-                    errno: syscall::EWOULDBLOCK,
-                })) if !op.is_explicitly_nonblock() => {
-                    i += 1;
-                }
-                SchemeResponse::Regular(r) => {
-                    let (op, _) = self.blocked.remove(i);
-                    let _ = self
-                        .socket
-                        .write_response(Response::new(r, op), SignalBehavior::Restart)
-                        .expect("driver-network: failed to write scheme");
-                }
-                SchemeResponse::Opened(o) => {
-                    let (op, _) = self.blocked.remove(i);
-                    let _ = self
-                        .socket
-                        .write_response(Response::open_dup_like(o, op), SignalBehavior::Restart)
-                        .expect("driver-network: failed to write scheme");
-                }
-                SchemeResponse::RegularAndNotifyOnDetach(status) => {
-                    let (op, _) = self.blocked.remove(i);
-                    let _ = self
-                        .socket
-                        .write_response(
-                            Response::new_notify_on_detach(status, op),
-                            SignalBehavior::Restart,
-                        )
-                        .expect("driver-network: failed to write scheme");
-                }
-            }
-        }
-
-        // Handle new scheme requests
-        loop {
-            let request = match self.socket.next_request(SignalBehavior::Restart) {
-                Ok(Some(request)) => request,
-                Ok(None) => {
-                    // Scheme likely got unmounted
-                    std::process::exit(0);
-                }
-                Err(err) if err.errno == EAGAIN => break,
-                Err(err) => return Err(err.into()),
-            };
-
-            let req = match request.kind() {
-                RequestKind::Call(c) => c,
-                RequestKind::OnClose { id } => {
-                    self.scheme.on_close(id);
-                    continue;
-                }
-                RequestKind::Cancellation(req) => {
-                    if let Some(i) = self.blocked.iter().position(|q| q.0.req_id() == req.id) {
-                        let (blocked_req, _) = self.blocked.remove(i);
-                        let resp = Response::new(Err(Error::new(EINTR)), blocked_req);
-                        self.socket.write_response(resp, SignalBehavior::Restart)?;
-                    }
-                    continue;
-                }
-                _ => {
-                    continue;
-                }
-            };
-            let caller = req.caller();
-            let mut op = match req.op() {
-                Ok(op) => op,
-                Err(req) => {
-                    self.socket.write_response(
-                        Response::err(syscall::EOPNOTSUPP, req),
-                        SignalBehavior::Restart,
-                    )?;
-                    continue;
-                }
-            };
-
-            let resp = match op.handle_sync_dont_consume(&caller, &mut self.scheme, &mut self.state)
-            {
-                SchemeResponse::Opened(Err(Error {
-                    errno: syscall::EWOULDBLOCK,
-                }))
-                | SchemeResponse::Regular(Err(Error {
-                    errno: syscall::EWOULDBLOCK,
-                })) if !op.is_explicitly_nonblock() => {
-                    self.blocked.push((op, caller));
-                    continue;
-                }
-                SchemeResponse::Regular(r) => Response::new(r, op),
-                SchemeResponse::Opened(o) => Response::open_dup_like(o, op),
-                SchemeResponse::RegularAndNotifyOnDetach(status) => {
-                    Response::new_notify_on_detach(status, op)
-                }
-            };
-            let _ = self.socket.write_response(resp, SignalBehavior::Restart)?;
-        }
-
-        // Notify readers about incoming events
-        let available_for_read = self.scheme.adapter.available_for_read();
-        if available_for_read > 0 {
-            for &handle_id in self.scheme.handles.keys() {
-                post_fevent(&self.socket, handle_id, syscall::flag::EVENT_READ.bits())?;
-            }
-            return Ok(());
-        }
-
-        Ok(())
-    }
-}
-
-struct NetworkSchemeInner<T: NetworkAdapter> {
-    adapter: T,
-    scheme_name: String,
-    handles: HandleMap<Handle>,
-}
-
-enum Handle {
-    Data,
-    Mac,
-    SchemeRoot,
-}
-
-impl<T: NetworkAdapter> NetworkSchemeInner<T> {
-    pub fn new(adapter: T, scheme_name: String) -> Self {
-        Self {
-            adapter,
-            scheme_name,
-            handles: HandleMap::new(),
-        }
-    }
-}
-
-impl<T: NetworkAdapter> SchemeSync for NetworkSchemeInner<T> {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-
-    fn openat(
-        &mut self,
-        fd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(self.handles.get(fd)?, Handle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-        if ctx.uid != 0 {
-            return Err(Error::new(EACCES));
-        }
-
-        let (handle, flags) = match path {
-            "" => (Handle::Data, NewFdFlags::empty()),
-            "mac" => (Handle::Mac, NewFdFlags::POSITIONED),
-            _ => return Err(Error::new(EINVAL)),
-        };
-
-        let id = self.handles.insert(handle);
-        Ok(OpenResult::ThisScheme { number: id, flags })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        offset: u64,
-        fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.handles.get_mut(id)?;
-
-        match *handle {
-            Handle::Data => {}
-            Handle::Mac => {
-                let data = &self.adapter.mac_address()[offset as usize..];
-                let i = cmp::min(buf.len(), data.len());
-                buf[..i].copy_from_slice(&data[..i]);
-                return Ok(i);
-            }
-            _ => return Err(Error::new(EBADF)),
-        };
-
-        match self.adapter.read_packet(buf)? {
-            Some(count) => Ok(count),
-            None => {
-                if fcntl_flags & O_NONBLOCK as u32 != 0 {
-                    Err(Error::new(EAGAIN))
-                } else {
-                    Err(Error::new(EWOULDBLOCK))
-                }
-            }
-        }
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.handles.get(id)?;
-
-        match handle {
-            Handle::Data => {}
-            Handle::Mac { .. } => return Err(Error::new(EINVAL)),
-            _ => return Err(Error::new(EBADF)),
-        }
-
-        Ok(self.adapter.write_packet(buf)?)
-    }
-
-    fn fevent(&mut self, id: usize, _flags: EventFlags, _ctx: &CallerCtx) -> Result<EventFlags> {
-        let _handle = self.handles.get(id)?;
-        Ok(EventFlags::empty())
-    }
-
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, &self.scheme_name, |w| {
-            let path = match self.handles.get(id)? {
-                Handle::Data { .. } => "",
-                Handle::Mac { .. } => "mac",
-                _ => "",
-            };
-            write!(w, "{path}").unwrap();
-            Ok(())
-        })
-    }
-
-    fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        let handle = self.handles.get(id)?;
-
-        match handle {
-            Handle::Data { .. } => {
-                stat.st_mode = MODE_FILE | 0o700;
-            }
-            Handle::Mac { .. } => {
-                stat.st_mode = MODE_FILE | 0o400;
-                stat.st_size = 6;
-            }
-            _ => return Err(Error::new(EBADF)),
-        }
-
-        Ok(())
-    }
-
-    fn fsync(&mut self, id: usize, _ctx: &CallerCtx) -> Result<()> {
-        let _handle = self.handles.get(id)?;
-        Ok(())
-    }
-
-    fn on_close(&mut self, id: usize) {
-        self.handles.remove(id);
-    }
-}
diff --git a/recipes/core/base/drivers/net/e1000d/Cargo.toml b/recipes/core/base/drivers/net/e1000d/Cargo.toml
deleted file mode 100644
index 43ef78f4de..0000000000
--- a/recipes/core/base/drivers/net/e1000d/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "e1000d"
-description = "Intel Gigabit ethernet driver"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-bitflags.workspace = true
-log.workspace = true
-libredox.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-network = { path = "../driver-network" }
-pcid = { path = "../../pcid" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/net/e1000d/config.toml b/recipes/core/base/drivers/net/e1000d/config.toml
deleted file mode 100644
index 4862da27dc..0000000000
--- a/recipes/core/base/drivers/net/e1000d/config.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[[drivers]]
-name = "E1000 NIC"
-class = 0x02
-ids = { 0x8086 = [0x1004, 0x100e, 0x100f, 0x109a, 0x1503] }
-command = ["e1000d"]
diff --git a/recipes/core/base/drivers/net/e1000d/src/device.rs b/recipes/core/base/drivers/net/e1000d/src/device.rs
deleted file mode 100644
index 4c518f30fc..0000000000
--- a/recipes/core/base/drivers/net/e1000d/src/device.rs
+++ /dev/null
@@ -1,368 +0,0 @@
-use std::convert::TryInto;
-use std::{cmp, mem, ptr, slice, thread, time};
-
-use driver_network::NetworkAdapter;
-
-use syscall::error::Result;
-
-use common::dma::Dma;
-
-const CTRL: u32 = 0x00;
-const CTRL_LRST: u32 = 1 << 3;
-const CTRL_ASDE: u32 = 1 << 5;
-const CTRL_SLU: u32 = 1 << 6;
-const CTRL_ILOS: u32 = 1 << 7;
-const CTRL_RST: u32 = 1 << 26;
-const CTRL_VME: u32 = 1 << 30;
-const CTRL_PHY_RST: u32 = 1 << 31;
-
-const STATUS: u32 = 0x08;
-
-const FCAL: u32 = 0x28;
-const FCAH: u32 = 0x2C;
-const FCT: u32 = 0x30;
-const FCTTV: u32 = 0x170;
-
-const ICR: u32 = 0xC0;
-
-const IMS: u32 = 0xD0;
-const IMS_TXDW: u32 = 1;
-const IMS_TXQE: u32 = 1 << 1;
-const IMS_LSC: u32 = 1 << 2;
-const IMS_RXSEQ: u32 = 1 << 3;
-const IMS_RXDMT: u32 = 1 << 4;
-const IMS_RX: u32 = 1 << 6;
-const IMS_RXT: u32 = 1 << 7;
-
-const RCTL: u32 = 0x100;
-const RCTL_EN: u32 = 1 << 1;
-const RCTL_UPE: u32 = 1 << 3;
-const RCTL_MPE: u32 = 1 << 4;
-const RCTL_LPE: u32 = 1 << 5;
-const RCTL_LBM: u32 = 1 << 6 | 1 << 7;
-const RCTL_BAM: u32 = 1 << 15;
-const RCTL_BSIZE1: u32 = 1 << 16;
-const RCTL_BSIZE2: u32 = 1 << 17;
-const RCTL_BSEX: u32 = 1 << 25;
-const RCTL_SECRC: u32 = 1 << 26;
-
-const RDBAL: u32 = 0x2800;
-const RDBAH: u32 = 0x2804;
-const RDLEN: u32 = 0x2808;
-const RDH: u32 = 0x2810;
-const RDT: u32 = 0x2818;
-
-const RAL0: u32 = 0x5400;
-const RAH0: u32 = 0x5404;
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-struct Rd {
-    buffer: u64,
-    length: u16,
-    checksum: u16,
-    status: u8,
-    error: u8,
-    special: u16,
-}
-const RD_DD: u8 = 1;
-const RD_EOP: u8 = 1 << 1;
-
-const TCTL: u32 = 0x400;
-const TCTL_EN: u32 = 1 << 1;
-const TCTL_PSP: u32 = 1 << 3;
-
-const TDBAL: u32 = 0x3800;
-const TDBAH: u32 = 0x3804;
-const TDLEN: u32 = 0x3808;
-const TDH: u32 = 0x3810;
-const TDT: u32 = 0x3818;
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-struct Td {
-    buffer: u64,
-    length: u16,
-    cso: u8,
-    command: u8,
-    status: u8,
-    css: u8,
-    special: u16,
-}
-const TD_CMD_EOP: u8 = 1;
-const TD_CMD_IFCS: u8 = 1 << 1;
-const TD_CMD_RS: u8 = 1 << 3;
-const TD_DD: u8 = 1;
-
-pub struct Intel8254x {
-    base: usize,
-    mac_address: [u8; 6],
-    receive_buffer: [Dma<[u8; 16384]>; 16],
-    receive_ring: Dma<[Rd; 16]>,
-    receive_index: usize,
-    transmit_buffer: [Dma<[u8; 16384]>; 16],
-    transmit_ring: Dma<[Td; 16]>,
-    transmit_ring_free: usize,
-    transmit_index: usize,
-    transmit_clean_index: usize,
-}
-
-#[derive(Copy, Clone)]
-pub enum Handle {
-    Data { flags: usize },
-    Mac { offset: usize },
-}
-
-fn wrap_ring(index: usize, ring_size: usize) -> usize {
-    (index + 1) & (ring_size - 1)
-}
-
-impl NetworkAdapter for Intel8254x {
-    fn mac_address(&mut self) -> [u8; 6] {
-        self.mac_address
-    }
-
-    fn available_for_read(&mut self) -> usize {
-        let desc = unsafe { &*(self.receive_ring.as_ptr().add(self.receive_index) as *const Rd) };
-
-        if desc.status & RD_DD == RD_DD {
-            return desc.length as usize;
-        }
-
-        0
-    }
-
-    fn read_packet(&mut self, buf: &mut [u8]) -> Result<Option<usize>> {
-        let desc = unsafe { &mut *(self.receive_ring.as_ptr().add(self.receive_index) as *mut Rd) };
-
-        if desc.status & RD_DD == RD_DD {
-            desc.status = 0;
-
-            let data = &self.receive_buffer[self.receive_index][..desc.length as usize];
-
-            let i = cmp::min(buf.len(), data.len());
-            buf[..i].copy_from_slice(&data[..i]);
-
-            unsafe { self.write_reg(RDT, self.receive_index as u32) };
-            self.receive_index = wrap_ring(self.receive_index, self.receive_ring.len());
-
-            return Ok(Some(i));
-        }
-
-        Ok(None)
-    }
-
-    fn write_packet(&mut self, buf: &[u8]) -> Result<usize> {
-        if self.transmit_ring_free == 0 {
-            loop {
-                let desc = unsafe {
-                    &*(self.transmit_ring.as_ptr().add(self.transmit_clean_index) as *const Td)
-                };
-
-                if desc.status != 0 {
-                    self.transmit_clean_index =
-                        wrap_ring(self.transmit_clean_index, self.transmit_ring.len());
-                    self.transmit_ring_free += 1;
-                } else if self.transmit_ring_free > 0 {
-                    break;
-                }
-
-                if self.transmit_ring_free >= self.transmit_ring.len() {
-                    break;
-                }
-            }
-        }
-
-        let desc =
-            unsafe { &mut *(self.transmit_ring.as_ptr().add(self.transmit_index) as *mut Td) };
-
-        let data = unsafe {
-            slice::from_raw_parts_mut(
-                self.transmit_buffer[self.transmit_index].as_ptr() as *mut u8,
-                cmp::min(buf.len(), self.transmit_buffer[self.transmit_index].len()) as usize,
-            )
-        };
-
-        let i = cmp::min(buf.len(), data.len());
-        data[..i].copy_from_slice(&buf[..i]);
-
-        desc.cso = 0;
-        desc.command = TD_CMD_EOP | TD_CMD_IFCS | TD_CMD_RS;
-        desc.status = 0;
-        desc.css = 0;
-        desc.special = 0;
-
-        desc.length = (cmp::min(
-            buf.len(),
-            self.transmit_buffer[self.transmit_index].len() - 1,
-        )) as u16;
-
-        self.transmit_index = wrap_ring(self.transmit_index, self.transmit_ring.len());
-        self.transmit_ring_free -= 1;
-
-        unsafe { self.write_reg(TDT, self.transmit_index as u32) };
-
-        Ok(i)
-    }
-}
-
-fn dma_array<T, const N: usize>() -> Result<[Dma<T>; N]> {
-    Ok((0..N)
-        .map(|_| Ok(unsafe { Dma::zeroed()?.assume_init() }))
-        .collect::<Result<Vec<_>>>()?
-        .try_into()
-        .unwrap_or_else(|_| unreachable!()))
-}
-impl Intel8254x {
-    pub unsafe fn new(base: usize) -> Result<Self> {
-        #[rustfmt::skip]
-        let mut module = Intel8254x {
-            base,
-            mac_address: [0; 6],
-            receive_buffer: dma_array()?,
-            receive_ring: Dma::zeroed()?.assume_init(),
-            transmit_buffer: dma_array()?,
-            receive_index: 0,
-            transmit_ring: Dma::zeroed()?.assume_init(),
-            transmit_ring_free: 16,
-            transmit_index: 0,
-            transmit_clean_index: 0,
-        };
-
-        module.init();
-
-        Ok(module)
-    }
-
-    pub unsafe fn irq(&self) -> bool {
-        let icr = self.read_reg(ICR);
-        icr != 0
-    }
-
-    pub unsafe fn read_reg(&self, register: u32) -> u32 {
-        ptr::read_volatile((self.base + register as usize) as *mut u32)
-    }
-
-    pub unsafe fn write_reg(&self, register: u32, data: u32) -> u32 {
-        ptr::write_volatile((self.base + register as usize) as *mut u32, data);
-        ptr::read_volatile((self.base + register as usize) as *mut u32)
-    }
-
-    pub unsafe fn flag(&self, register: u32, flag: u32, value: bool) {
-        if value {
-            self.write_reg(register, self.read_reg(register) | flag);
-        } else {
-            self.write_reg(register, self.read_reg(register) & !flag);
-        }
-    }
-
-    pub unsafe fn init(&mut self) {
-        self.flag(CTRL, CTRL_RST, true);
-        while self.read_reg(CTRL) & CTRL_RST == CTRL_RST {
-            log::trace!("Waiting for reset: {:X}", self.read_reg(CTRL));
-        }
-
-        // Enable auto negotiate, link, clear reset, do not Invert Loss-Of Signal
-        self.flag(CTRL, CTRL_ASDE | CTRL_SLU, true);
-        self.flag(CTRL, CTRL_LRST | CTRL_PHY_RST | CTRL_ILOS, false);
-
-        // No flow control
-        self.write_reg(FCAH, 0);
-        self.write_reg(FCAL, 0);
-        self.write_reg(FCT, 0);
-        self.write_reg(FCTTV, 0);
-
-        // Do not use VLANs
-        self.flag(CTRL, CTRL_VME, false);
-
-        // TODO: Clear statistical counters
-
-        let mac_low = self.read_reg(RAL0);
-        let mac_high = self.read_reg(RAH0);
-        let mac = [
-            mac_low as u8,
-            (mac_low >> 8) as u8,
-            (mac_low >> 16) as u8,
-            (mac_low >> 24) as u8,
-            mac_high as u8,
-            (mac_high >> 8) as u8,
-        ];
-        log::debug!(
-            "MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}",
-            mac[0],
-            mac[1],
-            mac[2],
-            mac[3],
-            mac[4],
-            mac[5]
-        );
-        self.mac_address = mac;
-
-        //
-        // MTA => 0;
-        //
-
-        // Receive Buffer
-        for i in 0..self.receive_ring.len() {
-            self.receive_ring[i].buffer = self.receive_buffer[i].physical() as u64;
-        }
-
-        self.write_reg(RDBAH, ((self.receive_ring.physical() as u64) >> 32) as u32);
-        self.write_reg(RDBAL, self.receive_ring.physical() as u32);
-        self.write_reg(
-            RDLEN,
-            (self.receive_ring.len() * mem::size_of::<Rd>()) as u32,
-        );
-        self.write_reg(RDH, 0);
-        self.write_reg(RDT, self.receive_ring.len() as u32 - 1);
-
-        // Transmit Buffer
-        for i in 0..self.transmit_ring.len() {
-            self.transmit_ring[i].buffer = self.transmit_buffer[i].physical() as u64;
-        }
-
-        self.write_reg(TDBAH, ((self.transmit_ring.physical() as u64) >> 32) as u32);
-        self.write_reg(TDBAL, self.transmit_ring.physical() as u32);
-        self.write_reg(
-            TDLEN,
-            (self.transmit_ring.len() * mem::size_of::<Td>()) as u32,
-        );
-        self.write_reg(TDH, 0);
-        self.write_reg(TDT, 0);
-
-        self.write_reg(IMS, IMS_RXT | IMS_RX | IMS_RXDMT | IMS_RXSEQ); // | IMS_LSC | IMS_TXQE | IMS_TXDW
-
-        self.flag(RCTL, RCTL_EN, true);
-        self.flag(RCTL, RCTL_UPE, true);
-        // self.flag(RCTL, RCTL_MPE, true);
-        self.flag(RCTL, RCTL_LPE, true);
-        self.flag(RCTL, RCTL_LBM, false);
-        // RCTL.RDMTS = Minimum threshold size ???
-        // RCTL.MO = Multicast offset
-        self.flag(RCTL, RCTL_BAM, true);
-        self.flag(RCTL, RCTL_BSIZE1, true);
-        self.flag(RCTL, RCTL_BSIZE2, false);
-        self.flag(RCTL, RCTL_BSEX, true);
-        self.flag(RCTL, RCTL_SECRC, true);
-
-        self.flag(TCTL, TCTL_EN, true);
-        self.flag(TCTL, TCTL_PSP, true);
-        // TCTL.CT = Collision threshold
-        // TCTL.COLD = Collision distance
-        // TIPG Packet Gap
-        // TODO ...
-
-        log::debug!("Waiting for link up: {:X}", self.read_reg(STATUS));
-        while self.read_reg(STATUS) & 2 != 2 {
-            thread::sleep(time::Duration::from_millis(100));
-        }
-        log::debug!(
-            "Link is up with speed {}",
-            match (self.read_reg(STATUS) >> 6) & 0b11 {
-                0b00 => "10 Mb/s",
-                0b01 => "100 Mb/s",
-                _ => "1000 Mb/s",
-            }
-        );
-    }
-}
diff --git a/recipes/core/base/drivers/net/e1000d/src/main.rs b/recipes/core/base/drivers/net/e1000d/src/main.rs
deleted file mode 100644
index 373ea9b38b..0000000000
--- a/recipes/core/base/drivers/net/e1000d/src/main.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use std::io::{Read, Write};
-use std::os::unix::io::AsRawFd;
-
-use driver_network::NetworkScheme;
-use event::{user_data, EventQueue};
-use pcid_interface::PciFunctionHandle;
-
-pub mod device;
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_e1000");
-
-    common::setup_logging(
-        "net",
-        "pci",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    let irq = pci_config
-        .func
-        .legacy_interrupt_line
-        .expect("e1000d: no legacy interrupts supported");
-
-    log::info!("E1000 {}", pci_config.func.display());
-
-    let mut irq_file = irq.irq_handle("e1000d");
-
-    let address = unsafe { pcid_handle.map_bar(0) }.ptr.as_ptr() as usize;
-
-    let mut scheme = NetworkScheme::new(
-        move || unsafe {
-            device::Intel8254x::new(address).expect("e1000d: failed to allocate device")
-        },
-        daemon,
-        format!("network.{name}"),
-    );
-
-    user_data! {
-        enum Source {
-            Irq,
-            Scheme,
-        }
-    }
-
-    let event_queue = EventQueue::<Source>::new().expect("e1000d: failed to create event queue");
-
-    event_queue
-        .subscribe(
-            irq_file.as_raw_fd() as usize,
-            Source::Irq,
-            event::EventFlags::READ,
-        )
-        .expect("e1000d: failed to subscribe to IRQ fd");
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .expect("e1000d: failed to subscribe to scheme fd");
-
-    libredox::call::setrens(0, 0).expect("e1000d: failed to enter null namespace");
-
-    scheme.tick().unwrap();
-
-    for event in event_queue.map(|e| e.expect("e1000d: failed to get event")) {
-        match event.user_data {
-            Source::Irq => {
-                let mut irq = [0; 8];
-                irq_file.read(&mut irq).unwrap();
-                if unsafe { scheme.adapter().irq() } {
-                    irq_file.write(&mut irq).unwrap();
-
-                    scheme.tick().expect("e1000d: failed to handle IRQ")
-                }
-            }
-            Source::Scheme => scheme.tick().expect("e1000d: failed to handle scheme op"),
-        }
-    }
-    unreachable!()
-}
diff --git a/recipes/core/base/drivers/net/ixgbed/Cargo.toml b/recipes/core/base/drivers/net/ixgbed/Cargo.toml
deleted file mode 100644
index d97ff39874..0000000000
--- a/recipes/core/base/drivers/net/ixgbed/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "ixgbed"
-description = "Intel 10 Gigabit ethernet driver"
-version = "1.0.0"
-edition = "2021"
-
-[dependencies]
-bitflags.workspace = true
-libredox.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-network = { path = "../driver-network" }
-pcid = { path = "../../pcid" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/net/ixgbed/LICENSE b/recipes/core/base/drivers/net/ixgbed/LICENSE
deleted file mode 100644
index 0ad25db4bd..0000000000
--- a/recipes/core/base/drivers/net/ixgbed/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
diff --git a/recipes/core/base/drivers/net/ixgbed/README.md b/recipes/core/base/drivers/net/ixgbed/README.md
deleted file mode 100644
index abcd4a2f83..0000000000
--- a/recipes/core/base/drivers/net/ixgbed/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# ixgbed (a.k.a. ixy.rs on Redox)
-
-ixgbed is the Redox port of [ixy.rs](https://github.com/ixy-languages/ixy.rs), a Rust rewrite of the [ixy](https://github.com/emmericp/ixy) userspace network driver.
-It is designed to be readable, idiomatic Rust code.
-It supports Intel 82599 10GbE NICs (`ixgbe` family).
-
-## Features
-
-* first 10 Gbit/s network driver on Redox
-* transmitting 250 times faster than e1000 / rtl8168 driver
-* MSI-X interrupts (not supported by Redox yet)
-* less than 1000 lines of code for the driver
-* documented code
-
-## Build instructions
-
-See the [Redox README](https://gitlab.redox-os.org/redox-os/redox/blob/master/README.md) for build instructions.
-
-To run ixgbed on Redox (in case the driver is not shipped with Redox anymore)
-
-* clone this project into `cookbook/recipes/drivers/source/`
-* create an entry for ixgbed in `cookbook/recipes/drivers/source/Cargo.toml`
-* check if your ixgbe device is included in `config.toml`
-* touch `filesystem.toml` in Redox's root directory, build Redox and run it
-
-## Usage
-
-To test the driver's transmit and forwarding capabilities, have a look at [rheinfall](https://github.com/ackxolotl/rheinfall), a simple packet generator / forwarder application.
-
-## Docs
-
-ixgbed contains documentation that can be created and viewed by running
-
-```
-cargo doc --open
-```
-
diff --git a/recipes/core/base/drivers/net/ixgbed/config.toml b/recipes/core/base/drivers/net/ixgbed/config.toml
deleted file mode 100644
index a10fba5a8f..0000000000
--- a/recipes/core/base/drivers/net/ixgbed/config.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[[drivers]]
-name = "Intel 10G NIC"
-class = 0x02
-ids = { 0x8086 = [0x10F7, 0x1514, 0x1517, 0x151C, 0x10F9, 0x10FB, 0x152a, 0x1529, 0x1507, 0x154D, 0x1557, 0x10FC, 0x10F8, 0x154F, 0x1528, 0x154A, 0x1558, 0x1560, 0x1563, 0x15D1, 0x15AA, 0x15AB, 0x15AC, 0x15AD, 0x15AE, 0x15B0, 0x15C2, 0x15C3, 0x15C4, 0x15C6, 0x15C7, 0x15C8, 0x15CE, 0x15E4, 0x15E5, 0x10ED, 0x1515, 0x1565, 0x15A8, 0x15C5] }
-command = ["ixgbed"]
diff --git a/recipes/core/base/drivers/net/ixgbed/src/device.rs b/recipes/core/base/drivers/net/ixgbed/src/device.rs
deleted file mode 100644
index 0d59b46d34..0000000000
--- a/recipes/core/base/drivers/net/ixgbed/src/device.rs
+++ /dev/null
@@ -1,579 +0,0 @@
-use std::convert::TryInto;
-use std::time::{Duration, Instant};
-use std::{cmp, mem, ptr, slice, thread};
-
-use driver_network::NetworkAdapter;
-use syscall::error::Result;
-
-use common::dma::Dma;
-
-use crate::ixgbe::*;
-
-pub struct Intel8259x {
-    base: usize,
-    size: usize,
-    receive_buffer: [Dma<[u8; 16384]>; 32],
-    receive_ring: Dma<[ixgbe_adv_rx_desc; 32]>,
-    receive_index: usize,
-    transmit_buffer: [Dma<[u8; 16384]>; 32],
-    transmit_ring: Dma<[ixgbe_adv_tx_desc; 32]>,
-    transmit_ring_free: usize,
-    transmit_index: usize,
-    transmit_clean_index: usize,
-    mac_address: [u8; 6],
-}
-
-fn wrap_ring(index: usize, ring_size: usize) -> usize {
-    (index + 1) & (ring_size - 1)
-}
-
-impl NetworkAdapter for Intel8259x {
-    fn mac_address(&mut self) -> [u8; 6] {
-        self.mac_address
-    }
-
-    fn available_for_read(&mut self) -> usize {
-        self.next_read()
-    }
-
-    fn read_packet(&mut self, buf: &mut [u8]) -> Result<Option<usize>> {
-        let desc = unsafe {
-            &mut *(self.receive_ring.as_ptr().add(self.receive_index) as *mut ixgbe_adv_rx_desc)
-        };
-
-        let status = unsafe { desc.wb.upper.status_error };
-
-        if (status & IXGBE_RXDADV_STAT_DD) != 0 {
-            if (status & IXGBE_RXDADV_STAT_EOP) == 0 {
-                panic!("increase buffer size or decrease MTU")
-            }
-
-            let data = unsafe {
-                &self.receive_buffer[self.receive_index][..desc.wb.upper.length as usize]
-            };
-
-            let i = cmp::min(buf.len(), data.len());
-            buf[..i].copy_from_slice(&data[..i]);
-
-            desc.read.pkt_addr = self.receive_buffer[self.receive_index].physical() as u64;
-            desc.read.hdr_addr = 0;
-
-            self.write_reg(IXGBE_RDT(0), self.receive_index as u32);
-            self.receive_index = wrap_ring(self.receive_index, self.receive_ring.len());
-
-            return Ok(Some(i));
-        }
-
-        Ok(None)
-    }
-
-    fn write_packet(&mut self, buf: &[u8]) -> Result<usize> {
-        if self.transmit_ring_free == 0 {
-            loop {
-                let desc = unsafe {
-                    &*(self.transmit_ring.as_ptr().add(self.transmit_clean_index)
-                        as *const ixgbe_adv_tx_desc)
-                };
-
-                if (unsafe { desc.wb.status } & IXGBE_ADVTXD_STAT_DD) != 0 {
-                    self.transmit_clean_index =
-                        wrap_ring(self.transmit_clean_index, self.transmit_ring.len());
-                    self.transmit_ring_free += 1;
-                } else if self.transmit_ring_free > 0 {
-                    break;
-                }
-
-                if self.transmit_ring_free >= self.transmit_ring.len() {
-                    break;
-                }
-            }
-        }
-
-        let desc = unsafe {
-            &mut *(self.transmit_ring.as_ptr().add(self.transmit_index) as *mut ixgbe_adv_tx_desc)
-        };
-
-        let data = unsafe {
-            slice::from_raw_parts_mut(
-                self.transmit_buffer[self.transmit_index].as_ptr() as *mut u8,
-                cmp::min(buf.len(), self.transmit_buffer[self.transmit_index].len()) as usize,
-            )
-        };
-
-        let i = cmp::min(buf.len(), data.len());
-        data[..i].copy_from_slice(&buf[..i]);
-
-        desc.read.cmd_type_len = IXGBE_ADVTXD_DCMD_EOP
-            | IXGBE_ADVTXD_DCMD_RS
-            | IXGBE_ADVTXD_DCMD_IFCS
-            | IXGBE_ADVTXD_DCMD_DEXT
-            | IXGBE_ADVTXD_DTYP_DATA
-            | buf.len() as u32;
-
-        desc.read.olinfo_status = (buf.len() as u32) << IXGBE_ADVTXD_PAYLEN_SHIFT;
-
-        self.transmit_index = wrap_ring(self.transmit_index, self.transmit_ring.len());
-        self.transmit_ring_free -= 1;
-
-        self.write_reg(IXGBE_TDT(0), self.transmit_index as u32);
-
-        Ok(i)
-    }
-}
-
-impl Intel8259x {
-    /// Returns an initialized `Intel8259x` on success.
-    pub fn new(base: usize, size: usize) -> Result<Self> {
-        #[rustfmt::skip]
-        let mut module = Intel8259x {
-            base,
-            size,
-            receive_buffer: (0..32)
-                .map(|_| Ok(unsafe { Dma::zeroed()?.assume_init() }))
-                .collect::<Result<Vec<_>>>()?
-                .try_into()
-                .unwrap_or_else(|_| unreachable!()),
-            receive_ring: unsafe { Dma::zeroed()?.assume_init() },
-            transmit_buffer: (0..32)
-                .map(|_| Ok(unsafe { Dma::zeroed()?.assume_init() }))
-                .collect::<Result<Vec<_>>>()?
-                .try_into()
-                .unwrap_or_else(|_| unreachable!()),
-            receive_index: 0,
-            transmit_ring: unsafe { Dma::zeroed()?.assume_init() },
-            transmit_ring_free: 32,
-            transmit_index: 0,
-            transmit_clean_index: 0,
-            mac_address: [0; 6],
-        };
-
-        module.init();
-
-        Ok(module)
-    }
-
-    pub fn irq(&self) -> bool {
-        let icr = self.read_reg(IXGBE_EICR);
-        icr != 0
-    }
-
-    pub fn next_read(&self) -> usize {
-        let desc = unsafe {
-            &*(self.receive_ring.as_ptr().add(self.receive_index) as *const ixgbe_adv_rx_desc)
-        };
-
-        let status = unsafe { desc.wb.upper.status_error };
-
-        if (status & IXGBE_RXDADV_STAT_DD) != 0 {
-            if (status & IXGBE_RXDADV_STAT_EOP) == 0 {
-                panic!("increase buffer size or decrease MTU")
-            }
-
-            return unsafe { desc.wb.upper.length as usize };
-        }
-
-        0
-    }
-
-    /// Returns the mac address of this device.
-    pub fn get_mac_addr(&self) -> [u8; 6] {
-        let low = self.read_reg(IXGBE_RAL(0));
-        let high = self.read_reg(IXGBE_RAH(0));
-
-        [
-            (low & 0xff) as u8,
-            (low >> 8 & 0xff) as u8,
-            (low >> 16 & 0xff) as u8,
-            (low >> 24) as u8,
-            (high & 0xff) as u8,
-            (high >> 8 & 0xff) as u8,
-        ]
-    }
-
-    /// Sets the mac address of this device.
-    #[allow(dead_code)]
-    pub fn set_mac_addr(&mut self, mac: [u8; 6]) {
-        let low: u32 = u32::from(mac[0])
-            + (u32::from(mac[1]) << 8)
-            + (u32::from(mac[2]) << 16)
-            + (u32::from(mac[3]) << 24);
-        let high: u32 = u32::from(mac[4]) + (u32::from(mac[5]) << 8);
-
-        self.write_reg(IXGBE_RAL(0), low);
-        self.write_reg(IXGBE_RAH(0), high);
-
-        self.mac_address = mac;
-    }
-
-    /// Returns the register at `self.base` + `register`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `self.base` + `register` does not belong to the mapped memory of the PCIe device.
-    fn read_reg(&self, register: u32) -> u32 {
-        assert!(
-            register as usize <= self.size - 4 as usize,
-            "MMIO access out of bounds"
-        );
-
-        unsafe { ptr::read_volatile((self.base + register as usize) as *mut u32) }
-    }
-
-    /// Sets the register at `self.base` + `register`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `self.base` + `register` does not belong to the mapped memory of the PCIe device.
-    fn write_reg(&self, register: u32, data: u32) -> u32 {
-        assert!(
-            register as usize <= self.size - 4 as usize,
-            "MMIO access out of bounds"
-        );
-
-        unsafe {
-            ptr::write_volatile((self.base + register as usize) as *mut u32, data);
-            ptr::read_volatile((self.base + register as usize) as *mut u32)
-        }
-    }
-
-    fn write_flag(&self, register: u32, flags: u32) {
-        self.write_reg(register, self.read_reg(register) | flags);
-    }
-
-    fn clear_flag(&self, register: u32, flags: u32) {
-        self.write_reg(register, self.read_reg(register) & !flags);
-    }
-
-    fn wait_clear_reg(&self, register: u32, value: u32) {
-        loop {
-            let current = self.read_reg(register);
-            if (current & value) == 0 {
-                break;
-            }
-            thread::sleep(Duration::from_millis(100));
-        }
-    }
-
-    fn wait_write_reg(&self, register: u32, value: u32) {
-        loop {
-            let current = self.read_reg(register);
-            if (current & value) == value {
-                break;
-            }
-            thread::sleep(Duration::from_millis(100));
-        }
-    }
-
-    /// Resets and initializes an ixgbe device.
-    fn init(&mut self) {
-        // section 4.6.3.1 - disable all interrupts
-        self.write_reg(IXGBE_EIMC, 0x7fff_ffff);
-
-        // section 4.6.3.2
-        self.write_reg(IXGBE_CTRL, IXGBE_CTRL_RST_MASK);
-        self.wait_clear_reg(IXGBE_CTRL, IXGBE_CTRL_RST_MASK);
-        thread::sleep(Duration::from_millis(10));
-
-        // section 4.6.3.1 - disable interrupts again after reset
-        self.write_reg(IXGBE_EIMC, 0x7fff_ffff);
-
-        let mac = self.get_mac_addr();
-
-        println!(
-            "   - MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}",
-            mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]
-        );
-
-        self.mac_address = mac;
-
-        // section 4.6.3 - wait for EEPROM auto read completion
-        self.wait_write_reg(IXGBE_EEC, IXGBE_EEC_ARD);
-
-        // section 4.6.3 - wait for dma initialization done
-        self.wait_write_reg(
-            IXGBE_RDRXCTL,
-            IXGBE_RDRXCTL_DMAIDONE | IXGBE_RDRXCTL_RESERVED_BITS,
-        );
-
-        // section 4.6.4 - initialize link (auto negotiation)
-        self.init_link();
-
-        // section 4.6.5 - statistical counters
-        // reset-on-read registers, just read them once
-        self.reset_stats();
-
-        // section 4.6.7 - init rx
-        self.init_rx();
-
-        // section 4.6.8 - init tx
-        self.init_tx();
-
-        // start a single receive queue/ring
-        self.start_rx_queue(0);
-
-        // start a single transmit queue/ring
-        self.start_tx_queue(0);
-
-        // section 4.6.3.9 - enable interrupts
-        self.enable_msix_interrupt(0);
-
-        // wait some time for the link to come up
-        self.wait_for_link();
-    }
-
-    /// Resets the stats of this device.
-    fn reset_stats(&self) {
-        self.read_reg(IXGBE_GPRC);
-        self.read_reg(IXGBE_GPTC);
-        self.read_reg(IXGBE_GORCL);
-        self.read_reg(IXGBE_GORCH);
-        self.read_reg(IXGBE_GOTCL);
-        self.read_reg(IXGBE_GOTCH);
-    }
-
-    // sections 4.6.7
-    /// Initializes the rx queues of this device.
-    fn init_rx(&mut self) {
-        // disable rx while re-configuring it
-        self.clear_flag(IXGBE_RXCTRL, IXGBE_RXCTRL_RXEN);
-
-        // section 4.6.11.3.4 - allocate all queues and traffic to PB0
-        self.write_reg(IXGBE_RXPBSIZE(0), IXGBE_RXPBSIZE_128KB);
-        for i in 1..8 {
-            self.write_reg(IXGBE_RXPBSIZE(i), 0);
-        }
-
-        // enable CRC offloading
-        self.write_flag(IXGBE_HLREG0, IXGBE_HLREG0_RXCRCSTRP);
-        self.write_flag(IXGBE_RDRXCTL, IXGBE_RDRXCTL_CRCSTRIP);
-
-        // accept broadcast packets
-        self.write_flag(IXGBE_FCTRL, IXGBE_FCTRL_BAM);
-
-        // configure a single receive queue/ring
-        let i: u32 = 0;
-
-        // enable advanced rx descriptors
-        self.write_reg(
-            IXGBE_SRRCTL(i),
-            (self.read_reg(IXGBE_SRRCTL(i)) & !IXGBE_SRRCTL_DESCTYPE_MASK)
-                | IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF,
-        );
-        // let nic drop packets if no rx descriptor is available instead of buffering them
-        self.write_flag(IXGBE_SRRCTL(i), IXGBE_SRRCTL_DROP_EN);
-
-        self.write_reg(IXGBE_RDBAL(i), self.receive_ring.physical() as u32);
-
-        self.write_reg(
-            IXGBE_RDBAH(i),
-            ((self.receive_ring.physical() as u64) >> 32) as u32,
-        );
-        self.write_reg(
-            IXGBE_RDLEN(i),
-            (self.receive_ring.len() * mem::size_of::<ixgbe_adv_rx_desc>()) as u32,
-        );
-
-        // set ring to empty at start
-        self.write_reg(IXGBE_RDH(i), 0);
-        self.write_reg(IXGBE_RDT(i), 0);
-
-        // last sentence of section 4.6.7 - set some magic bits
-        self.write_flag(IXGBE_CTRL_EXT, IXGBE_CTRL_EXT_NS_DIS);
-
-        // probably a broken feature, this flag is initialized with 1 but has to be set to 0
-        self.clear_flag(IXGBE_DCA_RXCTRL(i), 1 << 12);
-
-        // enable promisc mode by default to make testing easier
-        // this has to be done when the rxctrl.rxen bit is not set
-        self.set_promisc(true);
-
-        // start rx
-        self.write_flag(IXGBE_RXCTRL, IXGBE_RXCTRL_RXEN);
-    }
-
-    // section 4.6.8
-    /// Initializes the tx queues of this device.
-    fn init_tx(&mut self) {
-        // crc offload and small packet padding
-        self.write_flag(IXGBE_HLREG0, IXGBE_HLREG0_TXCRCEN | IXGBE_HLREG0_TXPADEN);
-
-        // section 4.6.11.3.4 - set default buffer size allocations
-        self.write_reg(IXGBE_TXPBSIZE(0), IXGBE_TXPBSIZE_40KB);
-        for i in 1..8 {
-            self.write_reg(IXGBE_TXPBSIZE(i), 0);
-        }
-
-        // required when not using DCB/VTd
-        self.write_reg(IXGBE_DTXMXSZRQ, 0xfff);
-        self.clear_flag(IXGBE_RTTDCS, IXGBE_RTTDCS_ARBDIS);
-
-        // configure a single transmit queue/ring
-        let i: u32 = 0;
-
-        // section 7.1.9 - setup descriptor ring
-
-        self.write_reg(IXGBE_TDBAL(i), self.transmit_ring.physical() as u32);
-        self.write_reg(
-            IXGBE_TDBAH(i),
-            ((self.transmit_ring.physical() as u64) >> 32) as u32,
-        );
-        self.write_reg(
-            IXGBE_TDLEN(i),
-            (self.transmit_ring.len() * mem::size_of::<ixgbe_adv_tx_desc>()) as u32,
-        );
-
-        // descriptor writeback magic values, important to get good performance and low PCIe overhead
-        // see 7.2.3.4.1 and 7.2.3.5 for an explanation of these values and how to find good ones
-        // we just use the defaults from DPDK here, but this is a potentially interesting point for optimizations
-        let mut txdctl = self.read_reg(IXGBE_TXDCTL(i));
-        // there are no defines for this in ixgbe.rs for some reason
-        // pthresh: 6:0, hthresh: 14:8, wthresh: 22:16
-        txdctl &= !(0x3F | (0x3F << 8) | (0x3F << 16));
-        txdctl |= 36 | (8 << 8) | (4 << 16);
-
-        self.write_reg(IXGBE_TXDCTL(i), txdctl);
-
-        // final step: enable DMA
-        self.write_reg(IXGBE_DMATXCTL, IXGBE_DMATXCTL_TE);
-    }
-
-    /// Sets the rx queues` descriptors and enables the queues.
-    ///
-    /// # Panics
-    /// Panics if length of `self.receive_ring` is not a power of 2.
-    fn start_rx_queue(&mut self, queue_id: u16) {
-        if self.receive_ring.len() & (self.receive_ring.len() - 1) != 0 {
-            panic!("number of receive queue entries must be a power of 2");
-        }
-
-        for i in 0..self.receive_ring.len() {
-            self.receive_ring[i].read.pkt_addr = self.receive_buffer[i].physical() as u64;
-            self.receive_ring[i].read.hdr_addr = 0;
-        }
-
-        // enable queue and wait if necessary
-        self.write_flag(IXGBE_RXDCTL(u32::from(queue_id)), IXGBE_RXDCTL_ENABLE);
-        self.wait_write_reg(IXGBE_RXDCTL(u32::from(queue_id)), IXGBE_RXDCTL_ENABLE);
-
-        // rx queue starts out full
-        self.write_reg(IXGBE_RDH(u32::from(queue_id)), 0);
-
-        // was set to 0 before in the init function
-        self.write_reg(
-            IXGBE_RDT(u32::from(queue_id)),
-            (self.receive_ring.len() - 1) as u32,
-        );
-    }
-
-    /// Enables the tx queues.
-    ///
-    /// # Panics
-    /// Panics if length of `self.transmit_ring` is not a power of 2.
-    fn start_tx_queue(&mut self, queue_id: u16) {
-        if self.transmit_ring.len() & (self.transmit_ring.len() - 1) != 0 {
-            panic!("number of receive queue entries must be a power of 2");
-        }
-
-        for i in 0..self.transmit_ring.len() {
-            self.transmit_ring[i].read.buffer_addr = self.transmit_buffer[i].physical() as u64;
-        }
-
-        // tx queue starts out empty
-        self.write_reg(IXGBE_TDH(u32::from(queue_id)), 0);
-        self.write_reg(IXGBE_TDT(u32::from(queue_id)), 0);
-
-        // enable queue and wait if necessary
-        self.write_flag(IXGBE_TXDCTL(u32::from(queue_id)), IXGBE_TXDCTL_ENABLE);
-        self.wait_write_reg(IXGBE_TXDCTL(u32::from(queue_id)), IXGBE_TXDCTL_ENABLE);
-    }
-
-    // see section 4.6.4
-    /// Initializes the link of this device.
-    fn init_link(&self) {
-        // link auto-configuration register should already be set correctly, we're resetting it anyway
-        self.write_reg(
-            IXGBE_AUTOC,
-            (self.read_reg(IXGBE_AUTOC) & !IXGBE_AUTOC_LMS_MASK) | IXGBE_AUTOC_LMS_10G_SERIAL,
-        );
-        self.write_reg(
-            IXGBE_AUTOC,
-            (self.read_reg(IXGBE_AUTOC) & !IXGBE_AUTOC_10G_PMA_PMD_MASK) | IXGBE_AUTOC_10G_XAUI,
-        );
-        // negotiate link
-        self.write_flag(IXGBE_AUTOC, IXGBE_AUTOC_AN_RESTART);
-        // datasheet wants us to wait for the link here, but we can continue and wait afterwards
-    }
-
-    /// Waits for the link to come up.
-    fn wait_for_link(&self) {
-        println!("   - waiting for link");
-        let time = Instant::now();
-        let mut speed = self.get_link_speed();
-        while speed == 0 && time.elapsed().as_secs() < 10 {
-            thread::sleep(Duration::from_millis(100));
-            speed = self.get_link_speed();
-        }
-        println!("   - link speed is {} Mbit/s", self.get_link_speed());
-    }
-
-    /// Enables or disables promisc mode of this device.
-    fn set_promisc(&self, enabled: bool) {
-        if enabled {
-            self.write_flag(IXGBE_FCTRL, IXGBE_FCTRL_MPE | IXGBE_FCTRL_UPE);
-        } else {
-            self.clear_flag(IXGBE_FCTRL, IXGBE_FCTRL_MPE | IXGBE_FCTRL_UPE);
-        }
-    }
-
-    /// Set the IVAR registers, mapping interrupt causes to vectors.
-    fn set_ivar(&mut self, direction: i8, queue_id: u16, mut msix_vector: u8) {
-        let index = ((16 * (queue_id & 1)) as i16 + i16::from(8 * direction)) as u32;
-
-        msix_vector |= IXGBE_IVAR_ALLOC_VAL as u8;
-
-        let mut ivar = self.read_reg(IXGBE_IVAR(u32::from(queue_id >> 1)));
-        ivar &= !(0xFF << index);
-        ivar |= u32::from(msix_vector << index);
-
-        self.write_reg(IXGBE_IVAR(u32::from(queue_id >> 1)), ivar);
-    }
-
-    /// Enable MSI-X interrupt for a queue.
-    fn enable_msix_interrupt(&mut self, queue_id: u16) {
-        // Step 1: The software driver associates between interrupt causes and MSI-X vectors and the
-        //throttling timers EITR[n] by programming the IVAR[n] and IVAR_MISC registers.
-        self.set_ivar(0, queue_id, queue_id as u8);
-
-        // Step 2: Program SRRCTL[n].RDMTS (per receive queue) if software uses the receive
-        // descriptor minimum threshold interrupt
-
-        // Step 3: The EIAC[n] registers should be set to auto clear for transmit and receive interrupt
-        // causes (for best performance). The EIAC bits that control the other and TCP timer
-        // interrupt causes should be set to 0b (no auto clear).
-        self.write_reg(IXGBE_EIAC, IXGBE_EICR_RTX_QUEUE);
-
-        // Step 4: Set the auto mask in the EIAM register according to the preferred mode of operation.
-
-        // Step 5: Set the interrupt throttling in EITR[n] and GPIE according to the preferred mode of operation.
-
-        // Step 6: Software enables the required interrupt causes by setting the EIMS register
-        let mut mask: u32 = self.read_reg(IXGBE_EIMS);
-        mask |= 1 << queue_id;
-
-        self.write_reg(IXGBE_EIMS, mask);
-    }
-
-    /// Returns the link speed of this device.
-    fn get_link_speed(&self) -> u16 {
-        let speed = self.read_reg(IXGBE_LINKS);
-        if (speed & IXGBE_LINKS_UP) == 0 {
-            return 0;
-        }
-        match speed & IXGBE_LINKS_SPEED_82599 {
-            IXGBE_LINKS_SPEED_100_82599 => 100,
-            IXGBE_LINKS_SPEED_1G_82599 => 1000,
-            IXGBE_LINKS_SPEED_10G_82599 => 10000,
-            _ => 0,
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/net/ixgbed/src/ixgbe.rs b/recipes/core/base/drivers/net/ixgbed/src/ixgbe.rs
deleted file mode 100644
index 8d77959444..0000000000
--- a/recipes/core/base/drivers/net/ixgbed/src/ixgbe.rs
+++ /dev/null
@@ -1,315 +0,0 @@
-#![allow(non_snake_case)]
-#![allow(non_camel_case_types)]
-#![allow(non_upper_case_globals)]
-#![allow(clippy::unreadable_literal)]
-
-pub const IXGBE_EIMC: u32                       = 0x00888;
-
-pub const IXGBE_CTRL: u32                       = 0x00000;
-pub const IXGBE_CTRL_LNK_RST: u32               = 0x00000008; /* Link Reset. Resets everything. */
-pub const IXGBE_CTRL_RST: u32                   = 0x04000000; /* Reset (SW) */
-pub const IXGBE_CTRL_RST_MASK: u32              = IXGBE_CTRL_LNK_RST | IXGBE_CTRL_RST;
-
-pub const IXGBE_EEC: u32                        = 0x10010;
-pub const IXGBE_EEC_ARD: u32                    = 0x00000200; /* EEPROM Auto Read Done */
-
-pub const IXGBE_RDRXCTL: u32                    = 0x02F00;
-pub const IXGBE_RDRXCTL_RESERVED_BITS: u32      = 1 << 25 | 1 << 26;
-pub const IXGBE_RDRXCTL_DMAIDONE: u32           = 0x00000008; /* DMA init cycle done */
-
-pub const IXGBE_AUTOC: u32                      = 0x042A0;
-pub const IXGBE_AUTOC_LMS_SHIFT: u32            = 13;
-pub const IXGBE_AUTOC_LMS_MASK: u32             = 0x7 << IXGBE_AUTOC_LMS_SHIFT;
-pub const IXGBE_AUTOC_LMS_10G_SERIAL: u32       = 0x3 << IXGBE_AUTOC_LMS_SHIFT;
-pub const IXGBE_AUTOC_10G_PMA_PMD_MASK: u32     = 0x00000180;
-pub const IXGBE_AUTOC_10G_PMA_PMD_SHIFT: u32    = 7;
-pub const IXGBE_AUTOC_10G_XAUI: u32             = 0x0 << IXGBE_AUTOC_10G_PMA_PMD_SHIFT;
-pub const IXGBE_AUTOC_AN_RESTART: u32           = 0x00001000;
-
-pub const IXGBE_GPRC: u32                       = 0x04074;
-pub const IXGBE_GPTC: u32                       = 0x04080;
-pub const IXGBE_GORCL: u32                      = 0x04088;
-pub const IXGBE_GORCH: u32                      = 0x0408C;
-pub const IXGBE_GOTCL: u32                      = 0x04090;
-pub const IXGBE_GOTCH: u32                      = 0x04094;
-
-pub const IXGBE_RXCTRL: u32                     = 0x03000;
-pub const IXGBE_RXCTRL_RXEN: u32                = 0x00000001; /* Enable Receiver */
-
-pub fn IXGBE_RXPBSIZE(i: u32) -> u32 {
-    0x03C00 + (i * 4)
-}
-
-pub const IXGBE_RXPBSIZE_128KB: u32             = 0x00020000; /* 128KB Packet Buffer */
-pub const IXGBE_HLREG0: u32                     = 0x04240;
-pub const IXGBE_HLREG0_RXCRCSTRP: u32           = 0x00000002; /* bit  1 */
-pub const IXGBE_RDRXCTL_CRCSTRIP: u32           = 0x00000002; /* CRC Strip */
-
-pub const IXGBE_FCTRL: u32                      = 0x05080;
-pub const IXGBE_FCTRL_BAM: u32                  = 0x00000400; /* Broadcast Accept Mode */
-
-pub fn IXGBE_SRRCTL(i: u32) -> u32 {
-    if i <= 15 {
-        0x02100 + (i * 4)
-    } else if i < 64 {
-        0x01014 + (i * 0x40)
-    } else {
-        0x0D014 + ((i - 64) * 0x40)
-    }
-}
-
-pub const IXGBE_SRRCTL_DESCTYPE_MASK: u32       = 0x0E000000;
-pub const IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF: u32 = 0x02000000;
-pub const IXGBE_SRRCTL_DROP_EN: u32             = 0x10000000;
-
-pub fn IXGBE_RDBAL(i: u32) -> u32 {
-    if i < 64 {
-        0x01000 + (i * 0x40)
-    } else {
-        0x0D000 + ((i - 64) * 0x40)
-    }
-}
-pub fn IXGBE_RDBAH(i: u32) -> u32 {
-    if i < 64 {
-        0x01004 + (i * 0x40)
-    } else {
-        0x0D004 + ((i - 64) * 0x40)
-    }
-}
-pub fn IXGBE_RDLEN(i: u32) -> u32 {
-    if i < 64 {
-        0x01008 + (i * 0x40)
-    } else {
-        0x0D008 + ((i - 64) * 0x40)
-    }
-}
-pub fn IXGBE_RDH(i: u32) -> u32 {
-    if i < 64 {
-        0x01010 + (i * 0x40)
-    } else {
-        0x0D010 + ((i - 64) * 0x40)
-    }
-}
-pub fn IXGBE_RDT(i: u32) -> u32 {
-    if i < 64 {
-        0x01018 + (i * 0x40)
-    } else {
-        0x0D018 + ((i - 64) * 0x40)
-    }
-}
-
-pub const IXGBE_CTRL_EXT: u32                   = 0x00018;
-pub const IXGBE_CTRL_EXT_NS_DIS: u32            = 0x00010000; /* No Snoop disable */
-
-pub fn IXGBE_DCA_RXCTRL(i: u32) -> u32 {
-    if i <= 15 {
-        0x02200 + (i * 4)
-    } else if i < 64 {
-        0x0100C + (i * 0x40)
-    } else {
-        0x0D00C + ((i - 64) * 0x40)
-    }
-}
-
-pub const IXGBE_HLREG0_TXCRCEN: u32             = 0x00000001; /* bit  0 */
-pub const IXGBE_HLREG0_TXPADEN: u32             = 0x00000400; /* bit 10 */
-
-pub fn IXGBE_TXPBSIZE(i: u32) -> u32 {
-    0x0CC00 + (i * 4)
-} /* 8 of these */
-
-pub const IXGBE_TXPBSIZE_40KB: u32              = 0x0000A000; /* 40KB Packet Buffer */
-pub const IXGBE_DTXMXSZRQ: u32                  = 0x08100;
-pub const IXGBE_RTTDCS: u32                     = 0x04900;
-pub const IXGBE_RTTDCS_ARBDIS: u32              = 0x00000040; /* DCB arbiter disable */
-
-pub fn IXGBE_TDBAL(i: u32) -> u32 {
-    0x06000 + (i * 0x40)
-} /* 32 of them (0-31)*/
-pub fn IXGBE_TDBAH(i: u32) -> u32 {
-    0x06004 + (i * 0x40)
-}
-pub fn IXGBE_TDLEN(i: u32) -> u32 {
-    0x06008 + (i * 0x40)
-}
-pub fn IXGBE_TXDCTL(i: u32) -> u32 {
-    0x06028 + (i * 0x40)
-}
-
-pub const IXGBE_DMATXCTL: u32                   = 0x04A80;
-pub const IXGBE_DMATXCTL_TE: u32                = 0x1; /* Transmit Enable */
-
-pub fn IXGBE_RXDCTL(i: u32) -> u32 {
-    if i < 64 {
-        0x01028 + (i * 0x40)
-    } else {
-        0x0D028 + ((i - 64) * 0x40)
-    }
-}
-pub const IXGBE_RXDCTL_ENABLE: u32              = 0x02000000; /* Ena specific Rx Queue */
-pub const IXGBE_TXDCTL_ENABLE: u32              = 0x02000000; /* Ena specific Tx Queue */
-
-pub fn IXGBE_TDH(i: u32) -> u32 {
-    0x06010 + (i * 0x40)
-}
-pub fn IXGBE_TDT(i: u32) -> u32 {
-    0x06018 + (i * 0x40)
-}
-
-pub const IXGBE_FCTRL_MPE: u32                  = 0x00000100; /* Multicast Promiscuous Ena*/
-pub const IXGBE_FCTRL_UPE: u32                  = 0x00000200; /* Unicast Promiscuous Ena */
-
-pub const IXGBE_LINKS: u32                      = 0x042A4;
-pub const IXGBE_LINKS_UP: u32                   = 0x40000000;
-pub const IXGBE_LINKS_SPEED_82599: u32          = 0x30000000;
-pub const IXGBE_LINKS_SPEED_100_82599: u32      = 0x10000000;
-pub const IXGBE_LINKS_SPEED_1G_82599: u32       = 0x20000000;
-pub const IXGBE_LINKS_SPEED_10G_82599: u32      = 0x30000000;
-
-pub fn IXGBE_RAL(i: u32) -> u32 {
-    if i <= 15 {
-        0x05400 + (i * 8)
-    } else {
-        0x0A200 + (i * 8)
-    }
-}
-
-pub fn IXGBE_RAH(i: u32) -> u32 {
-    if i <= 15 {
-        0x05404 + (i * 8)
-    } else {
-        0x0A204 + (i * 8)
-    }
-}
-
-pub const IXGBE_RXD_STAT_DD: u32                = 0x01; /* Descriptor Done */
-pub const IXGBE_RXD_STAT_EOP: u32               = 0x02; /* End of Packet */
-pub const IXGBE_RXDADV_STAT_DD: u32             = IXGBE_RXD_STAT_DD; /* Done */
-pub const IXGBE_RXDADV_STAT_EOP: u32            = IXGBE_RXD_STAT_EOP; /* End of Packet */
-
-pub const IXGBE_ADVTXD_PAYLEN_SHIFT: u32        = 14; /* Adv desc PAYLEN shift */
-pub const IXGBE_TXD_CMD_EOP: u32                = 0x01000000; /* End of Packet */
-pub const IXGBE_ADVTXD_DCMD_EOP: u32            = IXGBE_TXD_CMD_EOP; /* End of Packet */
-pub const IXGBE_TXD_CMD_RS: u32                 = 0x08000000; /* Report Status */
-pub const IXGBE_ADVTXD_DCMD_RS: u32             = IXGBE_TXD_CMD_RS; /* Report Status */
-pub const IXGBE_TXD_CMD_IFCS: u32               = 0x02000000; /* Insert FCS (Ethernet CRC) */
-pub const IXGBE_ADVTXD_DCMD_IFCS: u32           = IXGBE_TXD_CMD_IFCS; /* Insert FCS */
-pub const IXGBE_TXD_CMD_DEXT: u32               = 0x20000000; /* Desc extension (0 = legacy) */
-pub const IXGBE_ADVTXD_DTYP_DATA: u32           = 0x00300000; /* Adv Data Descriptor */
-pub const IXGBE_ADVTXD_DCMD_DEXT: u32           = IXGBE_TXD_CMD_DEXT; /* Desc ext 1=Adv */
-pub const IXGBE_TXD_STAT_DD: u32                = 0x00000001; /* Descriptor Done */
-pub const IXGBE_ADVTXD_STAT_DD: u32             = IXGBE_TXD_STAT_DD; /* Descriptor Done */
-
-/* Interrupt Registers */
-pub const IXGBE_EICR: u32                       = 0x00800;
-pub const IXGBE_EIAC: u32                       = 0x00810;
-pub const IXGBE_EIMS: u32                       = 0x00880;
-pub const IXGBE_IVAR_ALLOC_VAL: u32             = 0x80; /* Interrupt Allocation valid */
-pub const IXGBE_EICR_RTX_QUEUE: u32             = 0x0000FFFF; /* RTx Queue Interrupt */
-
-pub fn IXGBE_IVAR(i: u32) -> u32 {
-    0x00900 + (i * 4)
-} /* 24 at 0x900-0x960 */
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct ixgbe_adv_rx_desc_read {
-    pub pkt_addr: u64,
-    /* Packet buffer address */
-    pub hdr_addr: u64,
-    /* Header buffer address */
-}
-
-/* Receive Descriptor - Advanced */
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct ixgbe_adv_rx_desc_wb_lower_lo_dword_hs_rss {
-    pub pkt_info: u16,
-    /* RSS, Pkt type */
-    pub hdr_info: u16,
-    /* Splithdr, hdrlen */
-}
-
-#[derive(Copy, Clone)]
-#[repr(C, packed)]
-pub union ixgbe_adv_rx_desc_wb_lower_lo_dword {
-    pub data: u32,
-    pub hs_rss: ixgbe_adv_rx_desc_wb_lower_lo_dword_hs_rss,
-}
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct ixgbe_adv_rx_desc_wb_lower_hi_dword_csum_ip {
-    pub ip_id: u16,
-    /* IP id */
-    pub csum: u16,
-    /* Packet Checksum */
-}
-
-#[derive(Copy, Clone)]
-#[repr(C, packed)]
-pub union ixgbe_adv_rx_desc_wb_lower_hi_dword {
-    pub rss: u32,
-    /* RSS Hash */
-    pub csum_ip: ixgbe_adv_rx_desc_wb_lower_hi_dword_csum_ip,
-}
-
-#[derive(Copy, Clone)]
-#[repr(C, packed)]
-pub struct ixgbe_adv_rx_desc_wb_lower {
-    pub lo_dword: ixgbe_adv_rx_desc_wb_lower_lo_dword,
-    pub hi_dword: ixgbe_adv_rx_desc_wb_lower_hi_dword,
-}
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct ixgbe_adv_rx_desc_wb_upper {
-    pub status_error: u32,
-    /* ext status/error */
-    pub length: u16,
-    /* Packet length */
-    pub vlan: u16,
-    /* VLAN tag */
-}
-
-#[derive(Copy, Clone)]
-#[repr(C, packed)]
-pub struct ixgbe_adv_rx_desc_wb {
-    pub lower: ixgbe_adv_rx_desc_wb_lower,
-    pub upper: ixgbe_adv_rx_desc_wb_upper,
-}
-
-#[derive(Copy, Clone)]
-#[repr(C, packed)]
-pub union ixgbe_adv_rx_desc {
-    pub read: ixgbe_adv_rx_desc_read,
-    pub wb: ixgbe_adv_rx_desc_wb, /* writeback */
-    _union_align: [u64; 2],
-}
-
-/* Transmit Descriptor - Advanced */
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct ixgbe_adv_tx_desc_read {
-    pub buffer_addr: u64,
-    /* Address of descriptor's data buf */
-    pub cmd_type_len: u32,
-    pub olinfo_status: u32,
-}
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct ixgbe_adv_tx_desc_wb {
-    pub rsvd: u64,
-    /* Reserved */
-    pub nxtseq_seed: u32,
-    pub status: u32,
-}
-
-#[derive(Copy, Clone)]
-#[repr(C, packed)]
-pub union ixgbe_adv_tx_desc {
-    pub read: ixgbe_adv_tx_desc_read,
-    pub wb: ixgbe_adv_tx_desc_wb,
-    _union_align: [u64; 2],
-}
diff --git a/recipes/core/base/drivers/net/ixgbed/src/main.rs b/recipes/core/base/drivers/net/ixgbed/src/main.rs
deleted file mode 100644
index 4a6ce74dcd..0000000000
--- a/recipes/core/base/drivers/net/ixgbed/src/main.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use std::io::{Read, Write};
-use std::os::unix::io::AsRawFd;
-
-use driver_network::NetworkScheme;
-use event::{user_data, EventQueue};
-use pcid_interface::PciFunctionHandle;
-
-pub mod device;
-#[rustfmt::skip]
-mod ixgbe;
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_ixgbe");
-
-    let irq = pci_config
-        .func
-        .legacy_interrupt_line
-        .expect("ixgbed: no legacy interrupts supported");
-
-    println!(" + IXGBE {}", pci_config.func.display());
-
-    let mut irq_file = irq.irq_handle("ixgbed");
-
-    let mapped_bar = unsafe { pcid_handle.map_bar(0) };
-    let address = mapped_bar.ptr.as_ptr();
-    let size = mapped_bar.bar_size;
-
-    let mut scheme = NetworkScheme::new(
-        move || {
-            device::Intel8259x::new(address as usize, size)
-                .expect("ixgbed: failed to allocate device")
-        },
-        daemon,
-        format!("network.{name}"),
-    );
-
-    user_data! {
-        enum Source {
-            Irq,
-            Scheme,
-        }
-    }
-
-    let event_queue = EventQueue::<Source>::new().expect("ixgbed: Could not create event queue.");
-    event_queue
-        .subscribe(
-            irq_file.as_raw_fd() as usize,
-            Source::Irq,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    libredox::call::setrens(0, 0).expect("ixgbed: failed to enter null namespace");
-
-    scheme.tick().unwrap();
-
-    for event in event_queue.map(|e| e.expect("ixgbed: failed to get next event")) {
-        match event.user_data {
-            Source::Irq => {
-                let mut irq = [0; 8];
-                irq_file.read(&mut irq).unwrap();
-                if scheme.adapter().irq() {
-                    irq_file.write(&mut irq).unwrap();
-
-                    scheme.tick().unwrap();
-                }
-            }
-            Source::Scheme => {
-                scheme.tick().unwrap();
-            }
-        }
-    }
-    unreachable!()
-}
diff --git a/recipes/core/base/drivers/net/rtl8139d/Cargo.toml b/recipes/core/base/drivers/net/rtl8139d/Cargo.toml
deleted file mode 100644
index 8686242a89..0000000000
--- a/recipes/core/base/drivers/net/rtl8139d/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "rtl8139d"
-description = "Realtek 8139 ethernet driver"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-bitflags.workspace = true
-libredox.workspace = true
-log.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-network = { path = "../driver-network" }
-pcid = { path = "../../pcid" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/net/rtl8139d/config.toml b/recipes/core/base/drivers/net/rtl8139d/config.toml
deleted file mode 100644
index 05c5322479..0000000000
--- a/recipes/core/base/drivers/net/rtl8139d/config.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[[drivers]]
-name = "RTL8139 NIC"
-class = 0x02
-ids = { 0x10ec = [0x8139] }
-command = ["rtl8139d"]
diff --git a/recipes/core/base/drivers/net/rtl8139d/src/device.rs b/recipes/core/base/drivers/net/rtl8139d/src/device.rs
deleted file mode 100644
index 37167ee2fb..0000000000
--- a/recipes/core/base/drivers/net/rtl8139d/src/device.rs
+++ /dev/null
@@ -1,309 +0,0 @@
-use std::convert::TryInto;
-use std::mem;
-
-use driver_network::NetworkAdapter;
-use syscall::error::{Error, Result, EIO, EMSGSIZE};
-
-use common::dma::Dma;
-use common::io::{Io, Mmio, ReadOnly};
-use common::timeout::Timeout;
-
-const RX_BUFFER_SIZE: usize = 64 * 1024;
-
-const RXSTS_ROK: u16 = 1 << 0;
-
-const TSD_TOK: u32 = 1 << 15;
-const TSD_OWN: u32 = 1 << 13;
-const TSD_SIZE_MASK: u32 = 0x1FFF;
-
-const CR_RST: u8 = 1 << 4;
-const CR_RE: u8 = 1 << 3;
-const CR_TE: u8 = 1 << 2;
-const CR_BUFE: u8 = 1 << 0;
-
-const IMR_TOK: u16 = 1 << 2;
-const IMR_ROK: u16 = 1 << 0;
-
-const RCR_RBLEN_8K: u32 = 0b00 << 11;
-const RCR_RBLEN_16K: u32 = 0b01 << 11;
-const RCR_RBLEN_32K: u32 = 0b10 << 11;
-const RCR_RBLEN_64K: u32 = 0b11 << 11;
-const RCR_RBLEN_MASK: u32 = 0b11 << 11;
-const RCR_AER: u32 = 1 << 5;
-const RCR_AR: u32 = 1 << 4;
-const RCR_AB: u32 = 1 << 3;
-const RCR_AM: u32 = 1 << 2;
-const RCR_APM: u32 = 1 << 1;
-const RCR_AAP: u32 = 1 << 0;
-
-#[repr(C, packed)]
-struct Regs {
-    mac: [Mmio<u32>; 2],
-    mar: [Mmio<u32>; 2],
-    tsd: [Mmio<u32>; 4],
-    tsad: [Mmio<u32>; 4],
-    rbstart: Mmio<u32>,
-    erbcr: ReadOnly<Mmio<u16>>,
-    ersr: ReadOnly<Mmio<u8>>,
-    cr: Mmio<u8>,
-    capr: Mmio<u16>,
-    cbr: ReadOnly<Mmio<u16>>,
-    imr: Mmio<u16>,
-    isr: Mmio<u16>,
-    tcr: Mmio<u32>,
-    rcr: Mmio<u32>,
-    tctr: Mmio<u32>,
-    mpc: Mmio<u32>,
-    cr_9346: Mmio<u8>,
-    config0: Mmio<u8>,
-    config1: Mmio<u8>,
-    rsvd_53: ReadOnly<Mmio<u8>>,
-    timer_int: Mmio<u32>,
-    msr: Mmio<u8>,
-    config2: Mmio<u8>,
-    config3: Mmio<u8>,
-    rsvd_5b: ReadOnly<Mmio<u8>>,
-    mulint: Mmio<u16>,
-    rerid: ReadOnly<Mmio<u8>>,
-    rsvd_5f: ReadOnly<Mmio<u8>>,
-    tsts: ReadOnly<Mmio<u16>>,
-    _todo: [ReadOnly<Mmio<u8>>; 158],
-}
-
-impl Regs {
-    unsafe fn from_base(base: usize) -> &'static mut Self {
-        assert_eq!(mem::size_of::<Regs>(), 256);
-
-        let regs = &mut *(base as *mut Regs);
-
-        assert_eq!(&regs.mac[0] as *const _ as usize - base, 0x00);
-        assert_eq!(&regs.mac[1] as *const _ as usize - base, 0x04);
-        assert_eq!(&regs.mar[0] as *const _ as usize - base, 0x08);
-        assert_eq!(&regs.mar[1] as *const _ as usize - base, 0x0C);
-        assert_eq!(&regs.tsd[0] as *const _ as usize - base, 0x10);
-        assert_eq!(&regs.tsd[1] as *const _ as usize - base, 0x14);
-        assert_eq!(&regs.tsd[2] as *const _ as usize - base, 0x18);
-        assert_eq!(&regs.tsd[3] as *const _ as usize - base, 0x1C);
-        assert_eq!(&regs.tsad[0] as *const _ as usize - base, 0x20);
-        assert_eq!(&regs.tsad[1] as *const _ as usize - base, 0x24);
-        assert_eq!(&regs.tsad[2] as *const _ as usize - base, 0x28);
-        assert_eq!(&regs.tsad[3] as *const _ as usize - base, 0x2C);
-        assert_eq!(&regs.rbstart as *const _ as usize - base, 0x30);
-        assert_eq!(&regs.erbcr as *const _ as usize - base, 0x34);
-        assert_eq!(&regs.ersr as *const _ as usize - base, 0x36);
-        assert_eq!(&regs.cr as *const _ as usize - base, 0x37);
-        assert_eq!(&regs.capr as *const _ as usize - base, 0x38);
-        assert_eq!(&regs.cbr as *const _ as usize - base, 0x3A);
-        assert_eq!(&regs.imr as *const _ as usize - base, 0x3C);
-        assert_eq!(&regs.isr as *const _ as usize - base, 0x3E);
-        assert_eq!(&regs.tcr as *const _ as usize - base, 0x40);
-        assert_eq!(&regs.rcr as *const _ as usize - base, 0x44);
-        assert_eq!(&regs.tctr as *const _ as usize - base, 0x48);
-        assert_eq!(&regs.mpc as *const _ as usize - base, 0x4C);
-        assert_eq!(&regs.cr_9346 as *const _ as usize - base, 0x50);
-        assert_eq!(&regs.config0 as *const _ as usize - base, 0x51);
-        assert_eq!(&regs.config1 as *const _ as usize - base, 0x52);
-        assert_eq!(&regs.rsvd_53 as *const _ as usize - base, 0x53);
-        assert_eq!(&regs.timer_int as *const _ as usize - base, 0x54);
-        assert_eq!(&regs.msr as *const _ as usize - base, 0x58);
-        assert_eq!(&regs.config2 as *const _ as usize - base, 0x59);
-        assert_eq!(&regs.config3 as *const _ as usize - base, 0x5A);
-        assert_eq!(&regs.rsvd_5b as *const _ as usize - base, 0x5B);
-        assert_eq!(&regs.mulint as *const _ as usize - base, 0x5C);
-        assert_eq!(&regs.rerid as *const _ as usize - base, 0x5E);
-        assert_eq!(&regs.rsvd_5f as *const _ as usize - base, 0x5F);
-        assert_eq!(&regs.tsts as *const _ as usize - base, 0x60);
-
-        regs
-    }
-}
-
-pub struct Rtl8139 {
-    regs: &'static mut Regs,
-    receive_buffer: Dma<[Mmio<u8>; RX_BUFFER_SIZE + 16]>,
-    receive_i: usize,
-    transmit_buffer: [Dma<[Mmio<u8>; 1792]>; 4],
-    transmit_i: usize,
-    mac_address: [u8; 6],
-}
-
-impl NetworkAdapter for Rtl8139 {
-    fn mac_address(&mut self) -> [u8; 6] {
-        self.mac_address
-    }
-
-    fn available_for_read(&mut self) -> usize {
-        self.next_read()
-    }
-
-    fn read_packet(&mut self, buf: &mut [u8]) -> Result<Option<usize>> {
-        if !self.regs.cr.readf(CR_BUFE) {
-            let rxsts = (self.rx(0) as u16) | (self.rx(1) as u16) << 8;
-
-            let size_with_crc = (self.rx(2) as usize) | (self.rx(3) as usize) << 8;
-
-            let res = if (rxsts & RXSTS_ROK) == RXSTS_ROK {
-                let mut i = 0;
-                while i < buf.len() && i < size_with_crc.saturating_sub(4) {
-                    buf[i] = self.rx(4 + i as u16);
-                    i += 1;
-                }
-                Ok(Some(i))
-            } else {
-                //TODO: better error types
-                log::error!("invalid receive status 0x{:X}", rxsts);
-                Err(Error::new(EIO))
-            };
-
-            self.receive_i =
-                (self.receive_i + 4 + size_with_crc).next_multiple_of(4) % RX_BUFFER_SIZE;
-            let capr = self.receive_i.wrapping_sub(16) as u16;
-            self.regs.capr.write(capr);
-
-            res
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn write_packet(&mut self, buf: &[u8]) -> Result<usize> {
-        loop {
-            if self.transmit_i >= 4 {
-                self.transmit_i = 0;
-            }
-
-            if self.regs.tsd[self.transmit_i].readf(TSD_OWN) {
-                let data = &mut self.transmit_buffer[self.transmit_i];
-
-                if buf.len() > data.len() {
-                    return Err(Error::new(EMSGSIZE));
-                }
-
-                let mut i = 0;
-                while i < buf.len() && i < data.len() {
-                    data[i].write(buf[i]);
-                    i += 1;
-                }
-
-                self.regs.tsad[self.transmit_i].write(data.physical() as u32);
-                assert_eq!(i as u32, i as u32 & TSD_SIZE_MASK);
-                self.regs.tsd[self.transmit_i].write(i as u32 & TSD_SIZE_MASK);
-
-                //TODO: wait for TSD_TOK or error
-
-                self.transmit_i += 1;
-
-                return Ok(i);
-            }
-
-            std::hint::spin_loop();
-        }
-    }
-}
-
-impl Rtl8139 {
-    pub unsafe fn new(base: usize) -> Result<Self> {
-        let regs = Regs::from_base(base);
-
-        let mut module = Rtl8139 {
-            regs,
-            //TODO: limit to 32-bit
-            receive_buffer: Dma::zeroed().map(|dma| dma.assume_init())?,
-            receive_i: 0,
-            //TODO: limit to 32-bit
-            transmit_buffer: (0..4)
-                .map(|_| Ok(Dma::zeroed()?.assume_init()))
-                .collect::<Result<Vec<_>>>()?
-                .try_into()
-                .unwrap_or_else(|_| unreachable!()),
-            transmit_i: 0,
-            mac_address: [0; 6],
-        };
-
-        module.init()?;
-
-        Ok(module)
-    }
-
-    pub unsafe fn irq(&mut self) -> bool {
-        // Read and then clear the ISR
-        let isr = self.regs.isr.read();
-        self.regs.isr.write(isr);
-        let imr = self.regs.imr.read();
-        (isr & imr) != 0
-    }
-
-    fn rx(&self, offset: u16) -> u8 {
-        let index = (self.receive_i + offset as usize) % RX_BUFFER_SIZE;
-        self.receive_buffer[index].read()
-    }
-
-    pub fn next_read(&self) -> usize {
-        if !self.regs.cr.readf(CR_BUFE) {
-            let rxsts = (self.rx(0) as u16) | (self.rx(1) as u16) << 8;
-
-            let size_with_crc = (self.rx(2) as usize) | (self.rx(3) as usize) << 8;
-
-            if (rxsts & RXSTS_ROK) == RXSTS_ROK {
-                size_with_crc.saturating_sub(4)
-            } else {
-                0
-            }
-        } else {
-            0
-        }
-    }
-
-    pub unsafe fn init(&mut self) -> Result<()> {
-        let mac_low = self.regs.mac[0].read();
-        let mac_high = self.regs.mac[1].read();
-        let mac = [
-            mac_low as u8,
-            (mac_low >> 8) as u8,
-            (mac_low >> 16) as u8,
-            (mac_low >> 24) as u8,
-            mac_high as u8,
-            (mac_high >> 8) as u8,
-        ];
-        log::debug!(
-            "MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}",
-            mac[0],
-            mac[1],
-            mac[2],
-            mac[3],
-            mac[4],
-            mac[5]
-        );
-        self.mac_address = mac;
-
-        // Reset - this will disable tx and rx, reinitialize FIFOs, and set the system buffer pointer to the initial value
-        {
-            log::debug!("Reset");
-            let timeout = Timeout::from_secs(1);
-            self.regs.cr.writef(CR_RST, true);
-            while self.regs.cr.readf(CR_RST) {
-                timeout.run().map_err(|()| Error::new(EIO))?;
-            }
-        }
-
-        // Set up rx buffer
-        log::debug!("Receive buffer");
-        self.regs
-            .rbstart
-            .write(self.receive_buffer.physical() as u32);
-
-        log::debug!("Interrupt mask");
-        self.regs.imr.write(IMR_TOK | IMR_ROK);
-
-        log::debug!("Receive configuration");
-        self.regs
-            .rcr
-            .write(RCR_RBLEN_64K | RCR_AB | RCR_AM | RCR_APM | RCR_AAP);
-
-        log::debug!("Enable RX and TX");
-        self.regs.cr.writef(CR_RE | CR_TE, true);
-
-        log::debug!("Complete!");
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/net/rtl8139d/src/main.rs b/recipes/core/base/drivers/net/rtl8139d/src/main.rs
deleted file mode 100644
index d470e814df..0000000000
--- a/recipes/core/base/drivers/net/rtl8139d/src/main.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use std::io::{Read, Write};
-use std::os::unix::io::AsRawFd;
-
-use driver_network::NetworkScheme;
-use event::{user_data, EventQueue};
-use pcid_interface::irq_helpers::pci_allocate_interrupt_vector;
-use pcid_interface::PciFunctionHandle;
-
-pub mod device;
-
-use std::ops::{Add, Div, Rem};
-pub fn div_round_up<T>(a: T, b: T) -> T
-where
-    T: Add<Output = T> + Div<Output = T> + Rem<Output = T> + PartialEq + From<u8> + Copy,
-{
-    if a % b != T::from(0u8) {
-        a / b + T::from(1u8)
-    } else {
-        a / b
-    }
-}
-
-fn map_bar(pcid_handle: &mut PciFunctionHandle) -> *mut u8 {
-    let config = pcid_handle.config();
-
-    // RTL8139 uses BAR2, RTL8169 uses BAR1, search in that order
-    for &barnum in &[2, 1] {
-        match config.func.bars[usize::from(barnum)] {
-            pcid_interface::PciBar::Memory32 { .. } | pcid_interface::PciBar::Memory64 { .. } => unsafe {
-                return pcid_handle.map_bar(barnum).ptr.as_ptr();
-            },
-            other => log::warn!("BAR {} is {:?} instead of memory BAR", barnum, other),
-        }
-    }
-    panic!("rtl8139d: failed to find BAR");
-}
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_rtl8139");
-
-    common::setup_logging(
-        "net",
-        "pci",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    log::info!(" + RTL8139 {}", pci_config.func.display());
-
-    let bar = map_bar(&mut pcid_handle);
-
-    let irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "rtl8139d");
-
-    let mut scheme = NetworkScheme::new(
-        move || unsafe {
-            device::Rtl8139::new(bar as usize).expect("rtl8139d: failed to allocate device")
-        },
-        daemon,
-        format!("network.{name}"),
-    );
-
-    user_data! {
-        enum Source {
-            Irq,
-            Scheme,
-        }
-    }
-
-    let event_queue = EventQueue::<Source>::new().expect("rtl8139d: Could not create event queue.");
-    event_queue
-        .subscribe(
-            irq_file.irq_handle().as_raw_fd() as usize,
-            Source::Irq,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    libredox::call::setrens(0, 0).expect("rtl8139d: failed to enter null namespace");
-
-    scheme.tick().unwrap();
-
-    for event in event_queue.map(|e| e.expect("rtl8139d: failed to get next event")) {
-        match event.user_data {
-            Source::Irq => {
-                let mut irq = [0; 8];
-                irq_file.irq_handle().read(&mut irq).unwrap();
-                //TODO: This may be causing spurious interrupts
-                if unsafe { scheme.adapter_mut().irq() } {
-                    irq_file.irq_handle().write(&mut irq).unwrap();
-
-                    scheme.tick().unwrap();
-                }
-            }
-            Source::Scheme => {
-                scheme.tick().unwrap();
-            }
-        }
-    }
-    unreachable!()
-}
diff --git a/recipes/core/base/drivers/net/rtl8168d/Cargo.toml b/recipes/core/base/drivers/net/rtl8168d/Cargo.toml
deleted file mode 100644
index 35975ed241..0000000000
--- a/recipes/core/base/drivers/net/rtl8168d/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "rtl8168d"
-description = "Realtek 8168 ethernet driver"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-bitflags.workspace = true
-libredox.workspace = true
-log.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-network = { path = "../driver-network" }
-pcid = { path = "../../pcid" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/net/rtl8168d/config.toml b/recipes/core/base/drivers/net/rtl8168d/config.toml
deleted file mode 100644
index ee98e345f3..0000000000
--- a/recipes/core/base/drivers/net/rtl8168d/config.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[[drivers]]
-name = "RTL8168 NIC"
-class = 0x02
-ids = { 0x10ec = [0x8168, 0x8169] }
-command = ["rtl8168d"]
diff --git a/recipes/core/base/drivers/net/rtl8168d/src/device.rs b/recipes/core/base/drivers/net/rtl8168d/src/device.rs
deleted file mode 100644
index ae545ec48c..0000000000
--- a/recipes/core/base/drivers/net/rtl8168d/src/device.rs
+++ /dev/null
@@ -1,345 +0,0 @@
-use std::convert::TryInto;
-use std::mem;
-
-use common::dma::Dma;
-use common::io::{Io, Mmio, ReadOnly};
-use common::timeout::Timeout;
-use driver_network::NetworkAdapter;
-use syscall::error::{Error, Result, EIO, EMSGSIZE};
-
-#[repr(C, packed)]
-struct Regs {
-    mac: [Mmio<u32>; 2],
-    _mar: [Mmio<u32>; 2],
-    _dtccr: [Mmio<u32>; 2],
-    _rsv0: [Mmio<u32>; 2],
-    tnpds: [Mmio<u32>; 2],
-    thpds: [Mmio<u32>; 2],
-    _rsv1: [Mmio<u8>; 7],
-    cmd: Mmio<u8>,
-    tppoll: Mmio<u8>,
-    _rsv2: [Mmio<u8>; 3],
-    imr: Mmio<u16>,
-    isr: Mmio<u16>,
-    tcr: Mmio<u32>,
-    rcr: Mmio<u32>,
-    _tctr: Mmio<u32>,
-    _rsv3: Mmio<u32>,
-    cmd_9346: Mmio<u8>,
-    _config: [Mmio<u8>; 6],
-    _rsv4: Mmio<u8>,
-    timer_int: Mmio<u32>,
-    _rsv5: Mmio<u32>,
-    _phys_ar: Mmio<u32>,
-    _rsv6: [Mmio<u32>; 2],
-    phys_sts: ReadOnly<Mmio<u8>>,
-    _rsv7: [Mmio<u8>; 23],
-    _wakeup: [Mmio<u32>; 16],
-    _crc: [Mmio<u16>; 5],
-    _rsv8: [Mmio<u8>; 12],
-    rms: Mmio<u16>,
-    _rsv9: Mmio<u32>,
-    _c_plus_cr: Mmio<u16>,
-    _rsv10: Mmio<u16>,
-    rdsar: [Mmio<u32>; 2],
-    mtps: Mmio<u8>,
-    _rsv11: [Mmio<u8>; 19],
-}
-
-const OWN: u32 = 1 << 31;
-const EOR: u32 = 1 << 30;
-const FS: u32 = 1 << 29;
-const LS: u32 = 1 << 28;
-
-#[repr(C, packed)]
-struct Rd {
-    ctrl: Mmio<u32>,
-    _vlan: Mmio<u32>,
-    buffer_low: Mmio<u32>,
-    buffer_high: Mmio<u32>,
-}
-
-#[repr(C, packed)]
-struct Td {
-    ctrl: Mmio<u32>,
-    _vlan: Mmio<u32>,
-    buffer_low: Mmio<u32>,
-    buffer_high: Mmio<u32>,
-}
-
-pub struct Rtl8168 {
-    regs: &'static mut Regs,
-    receive_buffer: [Dma<[Mmio<u8>; 0x1FF8]>; 64],
-    receive_ring: Dma<[Rd; 64]>,
-    receive_i: usize,
-    transmit_buffer: [Dma<[Mmio<u8>; 7552]>; 16],
-    transmit_ring: Dma<[Td; 16]>,
-    transmit_i: usize,
-    transmit_buffer_h: [Dma<[Mmio<u8>; 7552]>; 1],
-    transmit_ring_h: Dma<[Td; 1]>,
-    mac_address: [u8; 6],
-}
-
-impl NetworkAdapter for Rtl8168 {
-    fn mac_address(&mut self) -> [u8; 6] {
-        self.mac_address
-    }
-
-    fn available_for_read(&mut self) -> usize {
-        self.next_read()
-    }
-
-    fn read_packet(&mut self, buf: &mut [u8]) -> Result<Option<usize>> {
-        if self.receive_i >= self.receive_ring.len() {
-            self.receive_i = 0;
-        }
-
-        let rd = &mut self.receive_ring[self.receive_i];
-        if !rd.ctrl.readf(OWN) {
-            let rd_len = rd.ctrl.read() & 0x3FFF;
-
-            let data = &self.receive_buffer[self.receive_i];
-
-            let mut i = 0;
-            while i < buf.len() && i < rd_len as usize {
-                buf[i] = data[i].read();
-                i += 1;
-            }
-
-            let eor = rd.ctrl.read() & EOR;
-            rd.ctrl.write(OWN | eor | data.len() as u32);
-
-            self.receive_i += 1;
-
-            Ok(Some(i))
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn write_packet(&mut self, buf: &[u8]) -> Result<usize> {
-        loop {
-            if self.transmit_i >= self.transmit_ring.len() {
-                self.transmit_i = 0;
-            }
-
-            let td = &mut self.transmit_ring[self.transmit_i];
-            if !td.ctrl.readf(OWN) {
-                let data = &mut self.transmit_buffer[self.transmit_i];
-
-                if buf.len() > data.len() {
-                    return Err(Error::new(EMSGSIZE));
-                }
-
-                let mut i = 0;
-                while i < buf.len() && i < data.len() {
-                    data[i].write(buf[i]);
-                    i += 1;
-                }
-
-                let eor = td.ctrl.read() & EOR;
-                td.ctrl.write(OWN | eor | FS | LS | i as u32);
-
-                self.regs.tppoll.writef(1 << 6, true); //Notify of normal priority packet
-
-                while self.regs.tppoll.readf(1 << 6) {
-                    std::hint::spin_loop();
-                }
-
-                self.transmit_i += 1;
-
-                return Ok(i);
-            }
-
-            std::hint::spin_loop();
-        }
-    }
-}
-
-impl Rtl8168 {
-    pub unsafe fn new(base: usize) -> Result<Self> {
-        assert_eq!(mem::size_of::<Regs>(), 256);
-
-        let regs = &mut *(base as *mut Regs);
-        assert_eq!(&regs.tnpds as *const _ as usize - base, 0x20);
-        assert_eq!(&regs.cmd as *const _ as usize - base, 0x37);
-        assert_eq!(&regs.tcr as *const _ as usize - base, 0x40);
-        assert_eq!(&regs.rcr as *const _ as usize - base, 0x44);
-        assert_eq!(&regs.cmd_9346 as *const _ as usize - base, 0x50);
-        assert_eq!(&regs.phys_sts as *const _ as usize - base, 0x6C);
-        assert_eq!(&regs.rms as *const _ as usize - base, 0xDA);
-        assert_eq!(&regs.rdsar as *const _ as usize - base, 0xE4);
-        assert_eq!(&regs.mtps as *const _ as usize - base, 0xEC);
-
-        let mut module = Rtl8168 {
-            regs,
-            receive_buffer: (0..64)
-                .map(|_| Ok(Dma::zeroed()?.assume_init()))
-                .collect::<Result<Vec<_>>>()?
-                .try_into()
-                .unwrap_or_else(|_| unreachable!()),
-
-            receive_ring: Dma::zeroed()?.assume_init(),
-            receive_i: 0,
-            transmit_buffer: (0..16)
-                .map(|_| Ok(Dma::zeroed()?.assume_init()))
-                .collect::<Result<Vec<_>>>()?
-                .try_into()
-                .unwrap_or_else(|_| unreachable!()),
-            transmit_ring: Dma::zeroed()?.assume_init(),
-            transmit_i: 0,
-            transmit_buffer_h: [Dma::zeroed()?.assume_init()],
-            transmit_ring_h: Dma::zeroed()?.assume_init(),
-            mac_address: [0; 6],
-        };
-
-        module.init()?;
-
-        Ok(module)
-    }
-
-    pub unsafe fn irq(&mut self) -> bool {
-        // Read and then clear the ISR
-        let isr = self.regs.isr.read();
-        self.regs.isr.write(isr);
-        let imr = self.regs.imr.read();
-        (isr & imr) != 0
-    }
-
-    pub fn next_read(&self) -> usize {
-        let mut receive_i = self.receive_i;
-        if receive_i >= self.receive_ring.len() {
-            receive_i = 0;
-        }
-
-        let rd = &self.receive_ring[receive_i];
-        if !rd.ctrl.readf(OWN) {
-            (rd.ctrl.read() & 0x3FFF) as usize
-        } else {
-            0
-        }
-    }
-
-    pub unsafe fn init(&mut self) -> Result<()> {
-        let mac_low = self.regs.mac[0].read();
-        let mac_high = self.regs.mac[1].read();
-        let mac = [
-            mac_low as u8,
-            (mac_low >> 8) as u8,
-            (mac_low >> 16) as u8,
-            (mac_low >> 24) as u8,
-            mac_high as u8,
-            (mac_high >> 8) as u8,
-        ];
-        log::debug!(
-            "MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}",
-            mac[0],
-            mac[1],
-            mac[2],
-            mac[3],
-            mac[4],
-            mac[5]
-        );
-        self.mac_address = mac;
-
-        // Reset - this will disable tx and rx, reinitialize FIFOs, and set the system buffer pointer to the initial value
-        {
-            log::debug!("Reset");
-            let timeout = Timeout::from_secs(1);
-            self.regs.cmd.writef(1 << 4, true);
-            while self.regs.cmd.readf(1 << 4) {
-                timeout.run().map_err(|()| Error::new(EIO))?;
-            }
-        }
-
-        // Set up rx buffers
-        log::debug!("Receive buffers");
-        for i in 0..self.receive_ring.len() {
-            let rd = &mut self.receive_ring[i];
-            let data = &mut self.receive_buffer[i];
-            rd.buffer_low.write(data.physical() as u32);
-            rd.buffer_high.write((data.physical() as u64 >> 32) as u32);
-            rd.ctrl.write(OWN | data.len() as u32);
-        }
-        if let Some(rd) = self.receive_ring.last_mut() {
-            rd.ctrl.writef(EOR, true);
-        }
-
-        // Set up normal priority tx buffers
-        log::debug!("Transmit buffers (normal priority)");
-        for i in 0..self.transmit_ring.len() {
-            self.transmit_ring[i]
-                .buffer_low
-                .write(self.transmit_buffer[i].physical() as u32);
-            self.transmit_ring[i]
-                .buffer_high
-                .write((self.transmit_buffer[i].physical() as u64 >> 32) as u32);
-        }
-        if let Some(td) = self.transmit_ring.last_mut() {
-            td.ctrl.writef(EOR, true);
-        }
-
-        // Set up high priority tx buffers
-        log::debug!("Transmit buffers (high priority)");
-        for i in 0..self.transmit_ring_h.len() {
-            self.transmit_ring_h[i]
-                .buffer_low
-                .write(self.transmit_buffer_h[i].physical() as u32);
-            self.transmit_ring_h[i]
-                .buffer_high
-                .write((self.transmit_buffer_h[i].physical() as u64 >> 32) as u32);
-        }
-        if let Some(td) = self.transmit_ring_h.last_mut() {
-            td.ctrl.writef(EOR, true);
-        }
-
-        log::debug!("Set config");
-        // Unlock config
-        self.regs.cmd_9346.write(1 << 7 | 1 << 6);
-
-        // Enable rx (bit 3) and tx (bit 2)
-        self.regs.cmd.writef(1 << 3 | 1 << 2, true);
-
-        // Max RX packet size
-        self.regs.rms.write(0x1FF8);
-
-        // Max TX packet size
-        self.regs.mtps.write(0x3B);
-
-        // Set tx low priority buffer address
-        self.regs.tnpds[0].write(self.transmit_ring.physical() as u32);
-        self.regs.tnpds[1].write(((self.transmit_ring.physical() as u64) >> 32) as u32);
-
-        // Set tx high priority buffer address
-        self.regs.thpds[0].write(self.transmit_ring_h.physical() as u32);
-        self.regs.thpds[1].write(((self.transmit_ring_h.physical() as u64) >> 32) as u32);
-
-        // Set rx buffer address
-        self.regs.rdsar[0].write(self.receive_ring.physical() as u32);
-        self.regs.rdsar[1].write(((self.receive_ring.physical() as u64) >> 32) as u32);
-
-        // Disable timer interrupt
-        self.regs.timer_int.write(0);
-
-        //Clear ISR
-        let isr = self.regs.isr.read();
-        self.regs.isr.write(isr);
-
-        // Interrupt on tx error (bit 3), tx ok (bit 2), rx error(bit 1), and rx ok (bit 0)
-        self.regs.imr.write(
-            1 << 15 | 1 << 14 | 1 << 7 | 1 << 6 | 1 << 5 | 1 << 4 | 1 << 3 | 1 << 2 | 1 << 1 | 1,
-        );
-
-        // Set TX config
-        self.regs.tcr.write(0b11 << 24 | 0b111 << 8);
-
-        // Set RX config - Accept broadcast (bit 3), multicast (bit 2), and unicast (bit 1)
-        self.regs.rcr.write(0xE70E);
-
-        // Lock config
-        self.regs.cmd_9346.write(0);
-
-        log::debug!("Complete!");
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/net/rtl8168d/src/main.rs b/recipes/core/base/drivers/net/rtl8168d/src/main.rs
deleted file mode 100644
index 1d9963a3ad..0000000000
--- a/recipes/core/base/drivers/net/rtl8168d/src/main.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use std::io::{Read, Write};
-use std::os::unix::io::AsRawFd;
-
-use driver_network::NetworkScheme;
-use event::{user_data, EventQueue};
-use pcid_interface::irq_helpers::pci_allocate_interrupt_vector;
-use pcid_interface::PciFunctionHandle;
-
-pub mod device;
-
-use std::ops::{Add, Div, Rem};
-pub fn div_round_up<T>(a: T, b: T) -> T
-where
-    T: Add<Output = T> + Div<Output = T> + Rem<Output = T> + PartialEq + From<u8> + Copy,
-{
-    if a % b != T::from(0u8) {
-        a / b + T::from(1u8)
-    } else {
-        a / b
-    }
-}
-
-fn map_bar(pcid_handle: &mut PciFunctionHandle) -> *mut u8 {
-    let config = pcid_handle.config();
-
-    // RTL8168 uses BAR2, RTL8169 uses BAR1, search in that order
-    for &barnum in &[2, 1] {
-        match config.func.bars[usize::from(barnum)] {
-            pcid_interface::PciBar::Memory32 { .. } | pcid_interface::PciBar::Memory64 { .. } => unsafe {
-                return pcid_handle.map_bar(barnum).ptr.as_ptr();
-            },
-            other => log::warn!("BAR {} is {:?} instead of memory BAR", barnum, other),
-        }
-    }
-    panic!("rtl8168d: failed to find BAR");
-}
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_rtl8168");
-
-    common::setup_logging(
-        "net",
-        "pci",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    log::info!("RTL8168 {}", pci_config.func.display());
-
-    let bar = map_bar(&mut pcid_handle);
-
-    let irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "rtl8168d");
-
-    let mut scheme = NetworkScheme::new(
-        move || unsafe {
-            device::Rtl8168::new(bar as usize).expect("rtl8168d: failed to allocate device")
-        },
-        daemon,
-        format!("network.{name}"),
-    );
-
-    user_data! {
-        enum Source {
-            Irq,
-            Scheme,
-        }
-    }
-
-    let event_queue = EventQueue::<Source>::new().expect("rtl8168d: Could not create event queue.");
-    event_queue
-        .subscribe(
-            irq_file.irq_handle().as_raw_fd() as usize,
-            Source::Irq,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Source::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    libredox::call::setrens(0, 0).expect("rtl8168d: failed to enter null namespace");
-
-    scheme.tick().unwrap();
-
-    for event in event_queue.map(|e| e.expect("rtl8168d: failed to get next event")) {
-        match event.user_data {
-            Source::Irq => {
-                let mut irq = [0; 8];
-                irq_file.irq_handle().read(&mut irq).unwrap();
-                //TODO: This may be causing spurious interrupts
-                if unsafe { scheme.adapter_mut().irq() } {
-                    irq_file.irq_handle().write(&mut irq).unwrap();
-
-                    scheme.tick().unwrap();
-                }
-            }
-            Source::Scheme => {
-                scheme.tick().unwrap();
-            }
-        }
-    }
-    unreachable!()
-}
diff --git a/recipes/core/base/drivers/net/virtio-netd/Cargo.toml b/recipes/core/base/drivers/net/virtio-netd/Cargo.toml
deleted file mode 100644
index f8e943f3d8..0000000000
--- a/recipes/core/base/drivers/net/virtio-netd/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "virtio-netd"
-description = "VirtIO network driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-log.workspace = true
-static_assertions.workspace = true
-futures = { version = "0.3.28", features = ["executor"] }
-
-virtio-core = { path = "../../virtio-core" }
-pcid = { path = "../../pcid" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-network = { path = "../driver-network" }
-
-redox_syscall.workspace = true
-libredox.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/net/virtio-netd/config.toml b/recipes/core/base/drivers/net/virtio-netd/config.toml
deleted file mode 100644
index ebedb9e40c..0000000000
--- a/recipes/core/base/drivers/net/virtio-netd/config.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[[drivers]]
-name = "virtio-net"
-class = 0x02
-vendor = 0x1AF4
-device = 0x1000
-command = ["virtio-netd"]
diff --git a/recipes/core/base/drivers/net/virtio-netd/src/main.rs b/recipes/core/base/drivers/net/virtio-netd/src/main.rs
deleted file mode 100644
index 1200cec92f..0000000000
--- a/recipes/core/base/drivers/net/virtio-netd/src/main.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-mod scheme;
-
-use std::fs::File;
-use std::io::{Read, Write};
-use std::mem;
-
-use driver_network::NetworkScheme;
-use pcid_interface::PciFunctionHandle;
-
-use scheme::VirtioNet;
-
-pub const VIRTIO_NET_F_MAC: u32 = 5;
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct VirtHeader {
-    pub flags: u8,
-    pub gso_type: u8,
-    pub hdr_len: u16,
-    pub gso_size: u16,
-    pub csum_start: u16,
-    pub csum_offset: u16,
-    pub num_buffers: u16,
-}
-
-static_assertions::const_assert_eq!(core::mem::size_of::<VirtHeader>(), 12);
-
-const MAX_BUFFER_LEN: usize = 65535;
-fn main() {
-    pcid_interface::pci_daemon(daemon_runner);
-}
-
-fn daemon_runner(redox_daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
-    daemon(redox_daemon, pcid_handle).unwrap();
-    unreachable!();
-}
-
-fn daemon(
-    daemon: daemon::Daemon,
-    mut pcid_handle: PciFunctionHandle,
-) -> Result<(), Box<dyn std::error::Error>> {
-    common::setup_logging(
-        "net",
-        "pci",
-        "virtio-netd",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    // Double check that we have the right device.
-    //
-    // 0x1000 - virtio-net
-    let pci_config = pcid_handle.config();
-
-    assert_eq!(pci_config.func.full_device_id.device_id, 0x1000);
-    log::info!("virtio-net: initiating startup sequence :^)");
-
-    let device = virtio_core::probe_device(&mut pcid_handle)?;
-    let device_space = device.device_space;
-
-    // Negotiate device features:
-    let mac_address = if device.transport.check_device_feature(VIRTIO_NET_F_MAC) {
-        let mac = unsafe {
-            [
-                core::ptr::read_volatile(device_space.add(0)),
-                core::ptr::read_volatile(device_space.add(1)),
-                core::ptr::read_volatile(device_space.add(2)),
-                core::ptr::read_volatile(device_space.add(3)),
-                core::ptr::read_volatile(device_space.add(4)),
-                core::ptr::read_volatile(device_space.add(5)),
-            ]
-        };
-
-        log::info!(
-            "virtio-net: device MAC is {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}",
-            mac[0],
-            mac[1],
-            mac[2],
-            mac[3],
-            mac[4],
-            mac[5]
-        );
-
-        device.transport.ack_driver_feature(VIRTIO_NET_F_MAC);
-        mac
-    } else {
-        unimplemented!()
-    };
-
-    device.transport.finalize_features();
-
-    // Allocate the recieve and transmit queues:
-    //
-    // > Empty buffers are placed in one virtqueue for receiving
-    // > packets, and outgoing packets are enqueued into another
-    // > for transmission in that order.
-    //
-    // TODO(andypython): Should we use the same IRQ vector for both?
-    let rx_queue = device
-        .transport
-        .setup_queue(virtio_core::MSIX_PRIMARY_VECTOR, &device.irq_handle)?;
-
-    let tx_queue = device
-        .transport
-        .setup_queue(virtio_core::MSIX_PRIMARY_VECTOR, &device.irq_handle)?;
-
-    device.transport.run_device();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_virtio_net");
-
-    let device = VirtioNet::new(mac_address, rx_queue, tx_queue);
-    let mut scheme = NetworkScheme::new(
-        move || {
-            //TODO: do device init in this function to prevent hangs
-            device
-        },
-        daemon,
-        format!("network.{name}"),
-    );
-
-    let mut event_queue = File::open("/scheme/event")?;
-    event_queue.write(&syscall::Event {
-        id: scheme.event_handle().raw(),
-        flags: syscall::EVENT_READ,
-        data: 0,
-    })?;
-
-    libredox::call::setrens(0, 0).expect("virtio-netd: failed to enter null namespace");
-
-    scheme.tick()?;
-
-    loop {
-        event_queue.read(&mut [0; mem::size_of::<syscall::Event>()])?; // Wait for event
-        scheme.tick()?;
-    }
-}
diff --git a/recipes/core/base/drivers/net/virtio-netd/src/scheme.rs b/recipes/core/base/drivers/net/virtio-netd/src/scheme.rs
deleted file mode 100644
index 59b3b93e20..0000000000
--- a/recipes/core/base/drivers/net/virtio-netd/src/scheme.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use std::sync::Arc;
-
-use driver_network::NetworkAdapter;
-
-use common::dma::Dma;
-
-use virtio_core::spec::{Buffer, ChainBuilder, DescriptorFlags};
-use virtio_core::transport::Queue;
-
-use crate::{VirtHeader, MAX_BUFFER_LEN};
-
-pub struct VirtioNet<'a> {
-    mac_address: [u8; 6],
-
-    /// Reciever Queue.
-    rx: Arc<Queue<'a>>,
-    rx_buffers: Vec<Dma<[u8]>>,
-
-    /// Transmiter Queue.
-    tx: Arc<Queue<'a>>,
-
-    recv_head: u16,
-}
-
-impl<'a> VirtioNet<'a> {
-    pub fn new(mac_address: [u8; 6], rx: Arc<Queue<'a>>, tx: Arc<Queue<'a>>) -> Self {
-        // Populate all of the `rx_queue` with buffers to maximize performence.
-        let mut rx_buffers = vec![];
-        for i in 0..(rx.descriptor_len() as usize) {
-            rx_buffers.push(unsafe {
-                Dma::<[u8]>::zeroed_slice(MAX_BUFFER_LEN)
-                    .unwrap()
-                    .assume_init()
-            });
-
-            let chain = ChainBuilder::new()
-                .chain(Buffer::new_unsized(&rx_buffers[i]).flags(DescriptorFlags::WRITE_ONLY))
-                .build();
-
-            let _ = rx.send(chain);
-        }
-
-        Self {
-            mac_address,
-
-            rx,
-            rx_buffers,
-            tx,
-
-            recv_head: 0,
-        }
-    }
-
-    /// Returns the number of bytes read. Returns `0` if the operation would block.
-    fn try_recv(&mut self, target: &mut [u8]) -> usize {
-        let header_size = core::mem::size_of::<VirtHeader>();
-
-        if self.recv_head == self.rx.used.head_index() {
-            // The read would block.
-            return 0;
-        }
-
-        let idx = self.rx.used.head_index() as usize;
-        let element = self.rx.used.get_element_at(idx - 1);
-
-        let descriptor_idx = element.table_index.get();
-        let payload_size = element.written.get() as usize - header_size;
-
-        // XXX: The header and packet are added as one output descriptor to the transmit queue,
-        //      and the device is notified of the new entry (see 5.1.5 Device Initialization).
-        let buffer = &self.rx_buffers[descriptor_idx as usize];
-        // TODO: Check the header.
-        let _header = unsafe { &*(buffer.as_ptr() as *const VirtHeader) };
-        let packet = &buffer[header_size..(header_size + payload_size)];
-
-        // Copy the packet into the buffer.
-        target[..payload_size].copy_from_slice(&packet);
-
-        self.recv_head = self.rx.used.head_index();
-        payload_size
-    }
-}
-
-impl<'a> NetworkAdapter for VirtioNet<'a> {
-    fn mac_address(&mut self) -> [u8; 6] {
-        self.mac_address
-    }
-
-    fn available_for_read(&mut self) -> usize {
-        (self.rx.used.head_index() - self.recv_head).into()
-    }
-
-    fn read_packet(&mut self, buf: &mut [u8]) -> syscall::Result<Option<usize>> {
-        let bytes = self.try_recv(buf);
-
-        if bytes != 0 {
-            // We read some bytes.
-            Ok(Some(bytes))
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn write_packet(&mut self, buffer: &[u8]) -> syscall::Result<usize> {
-        let header = unsafe { Dma::<VirtHeader>::zeroed()?.assume_init() };
-
-        let mut payload = unsafe { Dma::<[u8]>::zeroed_slice(buffer.len())?.assume_init() };
-        payload.copy_from_slice(buffer);
-
-        let chain = ChainBuilder::new()
-            .chain(Buffer::new(&header))
-            .chain(Buffer::new_unsized(&payload))
-            .build();
-
-        futures::executor::block_on(self.tx.send(chain));
-        Ok(buffer.len())
-    }
-}
diff --git a/recipes/core/base/drivers/pcid-spawner/Cargo.toml b/recipes/core/base/drivers/pcid-spawner/Cargo.toml
deleted file mode 100644
index 8c03f8d33a..0000000000
--- a/recipes/core/base/drivers/pcid-spawner/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "pcid-spawner"
-description = "PCI-based device driver spawner daemon"
-version = "0.1.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-edition = "2021"
-license = "MIT"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-pico-args.workspace = true
-redox_syscall.workspace = true
-serde.workspace = true
-toml.workspace = true
-
-config = { path = "../../config" }
-common = { path = "../common" }
-daemon = { path = "../../daemon" }
-pcid = { path = "../pcid" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/pcid-spawner/recipe.toml b/recipes/core/base/drivers/pcid-spawner/recipe.toml
deleted file mode 100644
index 61e62e0894..0000000000
--- a/recipes/core/base/drivers/pcid-spawner/recipe.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[source]
-path = "../../source/drivers/pcid-spawner"
-
-[build]
-template = "cargo"
-
-[package]
-dependencies = ["base"]
diff --git a/recipes/core/base/drivers/pcid-spawner/src/main.rs b/recipes/core/base/drivers/pcid-spawner/src/main.rs
deleted file mode 100644
index a968f4d494..0000000000
--- a/recipes/core/base/drivers/pcid-spawner/src/main.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use std::fs;
-use std::process::Command;
-
-use anyhow::{anyhow, Context, Result};
-
-use pcid_interface::config::Config;
-use pcid_interface::PciFunctionHandle;
-
-fn main() -> Result<()> {
-    let mut args = pico_args::Arguments::from_env();
-    let initfs = args.contains("--initfs");
-
-    common::setup_logging(
-        "bus",
-        "pci",
-        "pci-spawner.log",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    let mut config_data = String::new();
-    for path in if initfs {
-        config::config_for_initfs("pcid")?
-    } else {
-        config::config("pcid")?
-    } {
-        if let Ok(tmp) = fs::read_to_string(path) {
-            config_data.push_str(&tmp);
-        }
-    }
-
-    let config: Config = toml::from_str(&config_data)?;
-
-    for entry in fs::read_dir("/scheme/pci")? {
-        let entry = entry.context("failed to get entry")?;
-        let device_path = entry.path();
-        log::trace!("ENTRY: {}", device_path.to_string_lossy());
-
-        let mut handle = match PciFunctionHandle::connect_by_path(&device_path) {
-            Ok(handle) => handle,
-            Err(err) if err.raw_os_error() == Some(syscall::ENOLCK) => {
-                log::debug!(
-                    "pcid-spawner: {} already in use: {err}",
-                    device_path.display(),
-                );
-                continue;
-            }
-            Err(err) => {
-                log::error!(
-                    "pcid-spawner: failed to open channel for {}: {err}",
-                    device_path.display(),
-                );
-                continue;
-            }
-        };
-
-        let full_device_id = handle.config().func.full_device_id;
-
-        log::debug!(
-            "pcid-spawner enumerated: PCI {} {}",
-            handle.config().func.addr,
-            full_device_id.display()
-        );
-
-        let Some(driver) = config
-            .drivers
-            .iter()
-            .find(|driver| driver.match_function(&full_device_id))
-        else {
-            log::debug!("no driver for {}, continuing", handle.config().func.addr);
-            continue;
-        };
-
-        let mut args = driver.command.iter();
-
-        let program = args
-            .next()
-            .ok_or_else(|| anyhow!("driver configuration entry did not have any command!"))?;
-        let program = if program.starts_with('/') {
-            program.to_owned()
-        } else {
-            "/usr/lib/drivers/".to_owned() + program
-        };
-
-        let mut command = Command::new(program);
-        command.args(args);
-
-        log::info!("pcid-spawner: spawn {:?}", command);
-
-        handle.enable_device();
-
-        let channel_fd = handle.into_inner_fd();
-        command.env("PCID_CLIENT_CHANNEL", channel_fd.to_string());
-
-        #[allow(deprecated, reason = "we can't yet move this to init")]
-        daemon::Daemon::spawn(command);
-        syscall::close(channel_fd as usize).unwrap();
-    }
-
-    Ok(())
-}
diff --git a/recipes/core/base/drivers/pcid/.gitignore b/recipes/core/base/drivers/pcid/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/pcid/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/pcid/Cargo.toml b/recipes/core/base/drivers/pcid/Cargo.toml
deleted file mode 100644
index 6969531136..0000000000
--- a/recipes/core/base/drivers/pcid/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[package]
-name = "pcid"
-description = "PCI and PCI Express driver"
-version = "0.1.0"
-edition = "2021"
-
-[[bin]]
-name = "pcid"
-path = "src/main.rs"
-
-[lib]
-name = "pcid_interface"
-path = "src/lib.rs"
-
-[dependencies]
-bincode = "1.2"
-fdt.workspace = true
-libc.workspace = true
-log.workspace = true
-pci_types = "0.10.1"
-pico-args = { workspace = true, features = ["combined-flags"] }
-plain.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../../scheme-utils" }
-redox_syscall.workspace = true
-serde.workspace = true
-
-common = { path = "../common" }
-daemon = { path = "../../daemon" }
-libredox.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/pcid/src/cfg_access/fallback.rs b/recipes/core/base/drivers/pcid/src/cfg_access/fallback.rs
deleted file mode 100644
index 671d17f735..0000000000
--- a/recipes/core/base/drivers/pcid/src/cfg_access/fallback.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use std::cell::Cell;
-use std::convert::TryFrom;
-use std::sync::Mutex;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-use common::io::{Io as _, Pio};
-
-use log::info;
-use pci_types::{ConfigRegionAccess, PciAddress};
-
-pub(crate) struct Pci {
-    lock: Mutex<()>,
-}
-
-impl Pci {
-    pub(crate) fn new() -> Self {
-        Self {
-            lock: Mutex::new(()),
-        }
-    }
-
-    fn set_iopl() {
-        // The IO privilege level is per-thread, so we need to do the initialization on every thread.
-        thread_local! {
-            static IOPL_ONCE: Cell<bool> = Cell::new(false);
-        }
-
-        IOPL_ONCE.with(|iopl_once| {
-            if !iopl_once.replace(true) {
-                // make sure that pcid is not granted io port permission unless pcie memory-mapped
-                // configuration space is not available.
-                info!(
-                    "PCI: couldn't find or access PCIe extended configuration, \
-                 and thus falling back to PCI 3.0 io ports"
-                );
-                common::acquire_port_io_rights().expect("pcid: failed to get IO port rights");
-            }
-        });
-    }
-
-    fn address(address: PciAddress, offset: u8) -> u32 {
-        assert_eq!(
-            address.segment(),
-            0,
-            "usage of multiple segments requires PCIe extended configuration"
-        );
-
-        assert_eq!(offset & 0xFC, offset, "pci offset is not aligned");
-
-        0x80000000
-            | (u32::from(address.bus()) << 16)
-            | (u32::from(address.device()) << 11)
-            | (u32::from(address.function()) << 8)
-            | u32::from(offset)
-    }
-}
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-impl ConfigRegionAccess for Pci {
-    unsafe fn read(&self, address: PciAddress, offset: u16) -> u32 {
-        let _guard = self.lock.lock().unwrap();
-
-        Self::set_iopl();
-
-        let offset =
-            u8::try_from(offset).expect("offset too large for PCI 3.0 configuration space");
-        let address = Self::address(address, offset);
-
-        Pio::<u32>::new(0xCF8).write(address);
-        Pio::<u32>::new(0xCFC).read()
-    }
-
-    unsafe fn write(&self, address: PciAddress, offset: u16, value: u32) {
-        let _guard = self.lock.lock().unwrap();
-
-        Self::set_iopl();
-
-        let offset =
-            u8::try_from(offset).expect("offset too large for PCI 3.0 configuration space");
-        let address = Self::address(address, offset);
-
-        Pio::<u32>::new(0xCF8).write(address);
-        Pio::<u32>::new(0xCFC).write(value);
-    }
-}
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-impl ConfigRegionAccess for Pci {
-    unsafe fn read(&self, addr: PciAddress, offset: u16) -> u32 {
-        let _guard = self.lock.lock().unwrap();
-        todo!("Pci::CfgAccess::read on this architecture")
-    }
-
-    unsafe fn write(&self, addr: PciAddress, offset: u16, value: u32) {
-        let _guard = self.lock.lock().unwrap();
-        todo!("Pci::CfgAccess::write on this architecture")
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/cfg_access/mod.rs b/recipes/core/base/drivers/pcid/src/cfg_access/mod.rs
deleted file mode 100644
index c25524485a..0000000000
--- a/recipes/core/base/drivers/pcid/src/cfg_access/mod.rs
+++ /dev/null
@@ -1,372 +0,0 @@
-use std::sync::Mutex;
-use std::{fs, io, mem};
-
-use common::{MemoryType, PhysBorrowed, Prot};
-use fdt::Fdt;
-use pci_types::{ConfigRegionAccess, PciAddress};
-
-use fallback::Pci;
-
-mod fallback;
-
-pub struct InterruptMap {
-    pub addr: [u32; 3],
-    pub interrupt: u32,
-    pub parent_phandle: u32,
-    pub parent_interrupt: [u32; 3],
-    pub parent_interrupt_cells: usize,
-}
-
-// https://elinux.org/Device_Tree_Usage has a lot of useful information
-fn locate_ecam_dtb<T>(
-    f: impl FnOnce(PcieAllocs<'_>, Vec<InterruptMap>, [u32; 4]) -> io::Result<T>,
-) -> io::Result<T> {
-    let dtb = fs::read("/scheme/kernel.dtb")?;
-    let dt = Fdt::new(&dtb).map_err(|err| {
-        io::Error::new(
-            io::ErrorKind::InvalidData,
-            format!("invalid device tree: {err:?}"),
-        )
-    })?;
-
-    let node = dt
-        .find_compatible(&["pci-host-ecam-generic"])
-        .ok_or_else(|| {
-            io::Error::new(
-                io::ErrorKind::NotFound,
-                "couldn't find pci-host-ecam-generic node in device tree",
-            )
-        })?;
-
-    let address = node.reg().unwrap().next().unwrap().starting_address as u64;
-
-    let bus_range = node.property("bus-range").unwrap();
-    assert_eq!(bus_range.value.len(), 8);
-    let start_bus = u32::from_be_bytes(<[u8; 4]>::try_from(&bus_range.value[0..4]).unwrap());
-    let end_bus = u32::from_be_bytes(<[u8; 4]>::try_from(&bus_range.value[4..8]).unwrap());
-
-    // address-cells == 3, size-cells == 2, interrupt-cells == 1
-    let mut interrupt_map_data = node
-        .property("interrupt-map")
-        .unwrap()
-        .value
-        .chunks_exact(4)
-        .map(|x| u32::from_be_bytes(<[u8; 4]>::try_from(x).unwrap()));
-    let mut interrupt_map = Vec::<InterruptMap>::new();
-    while let Ok([addr1, addr2, addr3, int1, phandle]) = interrupt_map_data.next_chunk::<5>() {
-        let parent = dt.find_phandle(phandle).unwrap();
-        let parent_address_cells = u32::from_be_bytes(
-            parent.property("#address-cells").unwrap().value[..4]
-                .try_into()
-                .unwrap(),
-        );
-        match parent_address_cells {
-            0 => {}
-            1 => {
-                assert_eq!(interrupt_map_data.next().unwrap(), 0);
-            }
-            2 => {
-                assert_eq!(interrupt_map_data.next_chunk::<2>().unwrap(), [0, 0]);
-            }
-            3 => {
-                assert_eq!(interrupt_map_data.next_chunk::<3>().unwrap(), [0, 0, 0]);
-            }
-            _ => break,
-        };
-        let parent_interrupt_cells = parent.interrupt_cells().unwrap();
-        let parent_interrupt = match parent_interrupt_cells {
-            1 if let Some(a) = interrupt_map_data.next() => [a, 0, 0],
-            2 if let Ok([a, b]) = interrupt_map_data.next_chunk::<2>() => [a, b, 0],
-            3 if let Ok([a, b, c]) = interrupt_map_data.next_chunk::<3>() => [a, b, c],
-            _ => break,
-        };
-        interrupt_map.push(InterruptMap {
-            addr: [addr1, addr2, addr3],
-            interrupt: int1,
-            parent_phandle: phandle,
-            parent_interrupt,
-            parent_interrupt_cells,
-        });
-    }
-
-    let interrupt_map_mask = if let Some(interrupt_mask_node) = node.property("interrupt-map-mask")
-    {
-        let mut cells = interrupt_mask_node
-            .value
-            .chunks_exact(4)
-            .map(|x| u32::from_be_bytes(<[u8; 4]>::try_from(x).unwrap()));
-        cells.next_chunk::<4>().unwrap().to_owned()
-    } else {
-        [u32::MAX, u32::MAX, u32::MAX, u32::MAX]
-    };
-
-    f(
-        PcieAllocs(&[PcieAlloc {
-            base_addr: address,
-            seg_group_num: 0,
-            start_bus: start_bus.try_into().unwrap(),
-            end_bus: end_bus.try_into().unwrap(),
-            _rsvd: [0; 4],
-        }]),
-        interrupt_map,
-        interrupt_map_mask,
-    )
-}
-
-pub const MCFG_NAME: [u8; 4] = *b"MCFG";
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct Mcfg {
-    // base sdt fields
-    name: [u8; 4],
-    length: u32,
-    revision: u8,
-    checksum: u8,
-    oem_id: [u8; 6],
-    oem_table_id: [u8; 8],
-    oem_revision: u32,
-    creator_id: [u8; 4],
-    creator_revision: u32,
-    _rsvd: [u8; 8],
-}
-unsafe impl plain::Plain for Mcfg {}
-
-/// The "Memory Mapped Enhanced Configuration Space Base Address Allocation Structure" (yes, it's
-/// called that).
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct PcieAlloc {
-    pub base_addr: u64,
-    pub seg_group_num: u16,
-    pub start_bus: u8,
-    pub end_bus: u8,
-    _rsvd: [u8; 4],
-}
-unsafe impl plain::Plain for PcieAlloc {}
-
-#[derive(Debug)]
-struct PcieAllocs<'a>(&'a [PcieAlloc]);
-
-impl Mcfg {
-    fn with<T>(
-        f: impl FnOnce(PcieAllocs<'_>, Vec<InterruptMap>, [u32; 4]) -> io::Result<T>,
-    ) -> io::Result<T> {
-        let table_dir = fs::read_dir("/scheme/acpi/tables")?;
-
-        // TODO: validate/print MCFG?
-
-        for table_direntry in table_dir {
-            let table_path = table_direntry?.path();
-
-            // Every directory entry has to have a filename unless
-            // the filesystem (or in this case acpid) misbehaves.
-            // If it misbehaves we have worse problems than pcid
-            // crashing. `as_encoded_bytes()` returns some superset
-            // of ASCII, so directly comparing it with an ASCII name
-            // is fine.
-            let table_filename = table_path.file_name().unwrap().as_encoded_bytes();
-            if table_filename.get(0..4) == Some(&MCFG_NAME) {
-                let bytes = fs::read(table_path)?.into_boxed_slice();
-                match Mcfg::parse(&*bytes) {
-                    Some((_mcfg, allocs)) => {
-                        log::debug!("MCFG ALLOCS {:?}", allocs.0);
-                        return f(allocs, Vec::new(), [u32::MAX, u32::MAX, u32::MAX, u32::MAX]);
-                    }
-                    None => {
-                        return Err(io::Error::new(
-                            io::ErrorKind::InvalidData,
-                            "couldn't find mcfg table",
-                        ));
-                    }
-                }
-            }
-        }
-
-        Err(io::Error::new(
-            io::ErrorKind::NotFound,
-            "couldn't find mcfg table",
-        ))
-    }
-
-    fn parse<'a>(bytes: &'a [u8]) -> Option<(&'a Mcfg, PcieAllocs<'a>)> {
-        if bytes.len() < mem::size_of::<Mcfg>() {
-            return None;
-        }
-        let (header_bytes, allocs_bytes) = bytes.split_at(mem::size_of::<Mcfg>());
-
-        let mcfg =
-            plain::from_bytes::<Mcfg>(header_bytes).expect("packed -> align 1, checked size");
-        if mcfg.length as usize != bytes.len() {
-            log::warn!("MCFG {mcfg:?} length mismatch, expected {}", bytes.len());
-            return None;
-        }
-        // TODO: Allow invalid bytes not divisible by PcieAlloc?
-
-        let allocs_len =
-            allocs_bytes.len() / mem::size_of::<PcieAlloc>() * mem::size_of::<PcieAlloc>();
-
-        let allocs = plain::slice_from_bytes::<PcieAlloc>(&allocs_bytes[..allocs_len])
-            .expect("packed -> align 1, checked size");
-        Some((mcfg, PcieAllocs(allocs)))
-    }
-}
-
-pub struct Pcie {
-    lock: Mutex<()>,
-    allocs: Vec<Alloc>,
-    pub interrupt_map: Vec<InterruptMap>,
-    pub interrupt_map_mask: [u32; 4],
-    fallback: Pci,
-}
-struct Alloc {
-    seg: u16,
-    start_bus: u8,
-    end_bus: u8,
-    mem: PhysBorrowed,
-}
-
-unsafe impl Send for Pcie {}
-unsafe impl Sync for Pcie {}
-
-const BYTES_PER_BUS: usize = 1 << 20;
-
-impl Pcie {
-    pub fn new() -> Self {
-        match Mcfg::with(Self::from_allocs) {
-            Ok(pcie) => pcie,
-            Err(acpi_error) => match locate_ecam_dtb(Self::from_allocs) {
-                Ok(pcie) => pcie,
-                Err(fdt_error) => {
-                    log::warn!(
-                        "Couldn't retrieve PCIe info, perhaps the kernel is not compiled with \
-                        acpi or device tree support? Using the PCI 3.0 configuration space \
-                        instead. ACPI error: {:?} FDT error: {:?}",
-                        acpi_error,
-                        fdt_error
-                    );
-                    Self {
-                        lock: Mutex::new(()),
-                        allocs: Vec::new(),
-                        fallback: Pci::new(),
-                        interrupt_map: Vec::new(),
-                        interrupt_map_mask: [u32::MAX, u32::MAX, u32::MAX, u32::MAX],
-                    }
-                }
-            },
-        }
-    }
-
-    fn from_allocs(
-        allocs: PcieAllocs<'_>,
-        interrupt_map: Vec<InterruptMap>,
-        interrupt_map_mask: [u32; 4],
-    ) -> Result<Pcie, io::Error> {
-        let mut allocs = allocs
-            .0
-            .iter()
-            .filter_map(|desc| {
-                Some(Alloc {
-                    seg: desc.seg_group_num,
-                    start_bus: desc.start_bus,
-                    end_bus: desc.end_bus,
-                    mem: PhysBorrowed::map(
-                        desc.base_addr.try_into().ok()?,
-                        BYTES_PER_BUS
-                            * (usize::from(desc.end_bus) - usize::from(desc.start_bus) + 1),
-                        Prot::RW,
-                        MemoryType::Uncacheable,
-                    )
-                    .inspect_err(|err| {
-                        log::error!(
-                            "failed to map seg {} bus {}..={}: {}",
-                            { desc.seg_group_num },
-                            { desc.start_bus },
-                            { desc.end_bus },
-                            err
-                        )
-                    })
-                    .ok()?,
-                })
-            })
-            .collect::<Vec<_>>();
-
-        allocs.sort_by_key(|alloc| (alloc.seg, alloc.start_bus));
-
-        Ok(Self {
-            lock: Mutex::new(()),
-            allocs,
-            interrupt_map,
-            interrupt_map_mask,
-            fallback: Pci::new(),
-        })
-    }
-
-    fn bus_addr(&self, seg: u16, bus: u8) -> Option<*mut u32> {
-        let alloc = match self
-            .allocs
-            .binary_search_by_key(&(seg, bus), |alloc| (alloc.seg, alloc.start_bus))
-        {
-            Ok(present_idx) => &self.allocs[present_idx],
-            Err(0) => return None,
-            Err(above_idx) => {
-                let below_alloc = &self.allocs[above_idx - 1];
-                if bus > below_alloc.end_bus {
-                    return None;
-                }
-                below_alloc
-            }
-        };
-        let bus_off = bus - alloc.start_bus;
-        Some(unsafe {
-            alloc
-                .mem
-                .as_ptr()
-                .cast::<u8>()
-                .add(usize::from(bus_off) * BYTES_PER_BUS)
-                .cast::<u32>()
-        })
-    }
-
-    fn bus_addr_offset_in_dwords(address: PciAddress, offset: u16) -> usize {
-        assert_eq!(offset & 0xFFFC, offset, "pcie offset not dword-aligned");
-        assert_eq!(offset & 0x0FFF, offset, "pcie offset larger than 4095");
-
-        (((address.device() as usize) << 15)
-            | ((address.function() as usize) << 12)
-            | (offset as usize))
-            >> 2
-    }
-    // TODO: A safer interface, using e.g. a VolatileCell or Volatile<'a>. The PhysBorrowed wrapper
-    // can possibly deref to or provide a Volatile<T>.
-    fn mmio_addr(&self, address: PciAddress, offset: u16) -> Option<*mut u32> {
-        assert_eq!(
-            address.segment(),
-            0,
-            "multiple segments not yet implemented"
-        );
-
-        let bus_addr = self.bus_addr(address.segment(), address.bus())?;
-        Some(unsafe { bus_addr.add(Self::bus_addr_offset_in_dwords(address, offset)) })
-    }
-}
-
-impl ConfigRegionAccess for Pcie {
-    unsafe fn read(&self, address: PciAddress, offset: u16) -> u32 {
-        let _guard = self.lock.lock().unwrap();
-
-        match self.mmio_addr(address, offset) {
-            Some(addr) => addr.read_volatile(),
-            None => self.fallback.read(address, offset),
-        }
-    }
-
-    unsafe fn write(&self, address: PciAddress, offset: u16, value: u32) {
-        let _guard = self.lock.lock().unwrap();
-
-        match self.mmio_addr(address, offset) {
-            Some(addr) => addr.write_volatile(value),
-            None => self.fallback.write(address, offset, value),
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/driver_handler.rs b/recipes/core/base/drivers/pcid/src/driver_handler.rs
deleted file mode 100644
index f70a7f6da3..0000000000
--- a/recipes/core/base/drivers/pcid/src/driver_handler.rs
+++ /dev/null
@@ -1,284 +0,0 @@
-use pci_types::capability::{MultipleMessageSupport, PciCapability};
-use pci_types::{ConfigRegionAccess, EndpointHeader};
-use pcid_interface::PciFunction;
-
-use crate::cfg_access::Pcie;
-
-pub struct DriverHandler<'a> {
-    func: PciFunction,
-    endpoint_header: &'a mut EndpointHeader,
-    capabilities: &'a mut [PciCapability],
-
-    pcie: &'a Pcie,
-}
-
-impl<'a> DriverHandler<'a> {
-    pub fn new(
-        func: PciFunction,
-        endpoint_header: &'a mut EndpointHeader,
-        capabilities: &'a mut [PciCapability],
-        pcie: &'a Pcie,
-    ) -> Self {
-        DriverHandler {
-            func,
-            endpoint_header,
-            capabilities,
-            pcie,
-        }
-    }
-
-    pub fn respond(
-        &mut self,
-        request: pcid_interface::PcidClientRequest,
-    ) -> pcid_interface::PcidClientResponse {
-        use pcid_interface::*;
-
-        #[forbid(non_exhaustive_omitted_patterns)]
-        match request {
-            PcidClientRequest::EnableDevice => {
-                self.func.legacy_interrupt_line = crate::enable_function(
-                    &self.pcie,
-                    &mut self.endpoint_header,
-                    &mut self.capabilities,
-                );
-
-                PcidClientResponse::EnabledDevice
-            }
-            PcidClientRequest::RequestVendorCapabilities => PcidClientResponse::VendorCapabilities(
-                self.capabilities
-                    .iter()
-                    .filter_map(|capability| match capability {
-                        PciCapability::Vendor(addr) => unsafe {
-                            Some(VendorSpecificCapability::parse(*addr, self.pcie))
-                        },
-                        _ => None,
-                    })
-                    .collect::<Vec<_>>(),
-            ),
-            PcidClientRequest::RequestConfig => {
-                PcidClientResponse::Config(SubdriverArguments { func: self.func })
-            }
-            PcidClientRequest::RequestFeatures => PcidClientResponse::AllFeatures(
-                self.capabilities
-                    .iter()
-                    .filter_map(|capability| match capability {
-                        PciCapability::Msi(_) => Some(PciFeature::Msi),
-                        PciCapability::MsiX(_) => Some(PciFeature::MsiX),
-                        _ => None,
-                    })
-                    .collect(),
-            ),
-            PcidClientRequest::EnableFeature(feature) => {
-                match feature {
-                    PciFeature::Msi => {
-                        if let Some(msix_capability) =
-                            self.capabilities
-                                .iter_mut()
-                                .find_map(|capability| match capability {
-                                    PciCapability::MsiX(cap) => Some(cap),
-                                    _ => None,
-                                })
-                        {
-                            // If MSI-X is supported disable it before enabling MSI as they can't be
-                            // active at the same time.
-                            msix_capability.set_enabled(false, self.pcie);
-                        }
-
-                        let capability = match self.capabilities.iter_mut().find_map(|capability| {
-                            match capability {
-                                PciCapability::Msi(cap) => Some(cap),
-                                _ => None,
-                            }
-                        }) {
-                            Some(capability) => capability,
-                            None => {
-                                return PcidClientResponse::Error(
-                                    PcidServerResponseError::NonexistentFeature(feature),
-                                )
-                            }
-                        };
-                        capability.set_enabled(true, self.pcie);
-                        PcidClientResponse::FeatureEnabled(feature)
-                    }
-                    PciFeature::MsiX => {
-                        if let Some(msi_capability) =
-                            self.capabilities
-                                .iter_mut()
-                                .find_map(|capability| match capability {
-                                    PciCapability::Msi(cap) => Some(cap),
-                                    _ => None,
-                                })
-                        {
-                            // If MSI is supported disable it before enabling MSI-X as they can't be
-                            // active at the same time.
-                            msi_capability.set_enabled(false, self.pcie);
-                        }
-
-                        let capability = match self.capabilities.iter_mut().find_map(|capability| {
-                            match capability {
-                                PciCapability::MsiX(cap) => Some(cap),
-                                _ => None,
-                            }
-                        }) {
-                            Some(capability) => capability,
-                            None => {
-                                return PcidClientResponse::Error(
-                                    PcidServerResponseError::NonexistentFeature(feature),
-                                )
-                            }
-                        };
-                        capability.set_enabled(true, self.pcie);
-                        PcidClientResponse::FeatureEnabled(feature)
-                    }
-                }
-            }
-            PcidClientRequest::FeatureInfo(feature) => PcidClientResponse::FeatureInfo(
-                feature,
-                match feature {
-                    PciFeature::Msi => {
-                        if let Some(info) =
-                            self.capabilities
-                                .iter()
-                                .find_map(|capability| match capability {
-                                    PciCapability::Msi(cap) => Some(cap),
-                                    _ => None,
-                                })
-                        {
-                            PciFeatureInfo::Msi(msi::MsiInfo {
-                                log2_multiple_message_capable: info.multiple_message_capable()
-                                    as u8,
-                                is_64bit: info.is_64bit(),
-                                has_per_vector_masking: info.has_per_vector_masking(),
-                            })
-                        } else {
-                            return PcidClientResponse::Error(
-                                PcidServerResponseError::NonexistentFeature(feature),
-                            );
-                        }
-                    }
-                    PciFeature::MsiX => {
-                        if let Some(info) =
-                            self.capabilities
-                                .iter()
-                                .find_map(|capability| match capability {
-                                    PciCapability::MsiX(cap) => Some(cap),
-                                    _ => None,
-                                })
-                        {
-                            PciFeatureInfo::MsiX(msi::MsixInfo {
-                                table_bar: info.table_bar(),
-                                table_offset: info.table_offset(),
-                                table_size: info.table_size(),
-                                pba_bar: info.pba_bar(),
-                                pba_offset: info.pba_offset(),
-                            })
-                        } else {
-                            return PcidClientResponse::Error(
-                                PcidServerResponseError::NonexistentFeature(feature),
-                            );
-                        }
-                    }
-                },
-            ),
-            PcidClientRequest::SetFeatureInfo(info_to_set) => match info_to_set {
-                SetFeatureInfo::Msi(info_to_set) => {
-                    if let Some(info) =
-                        self.capabilities
-                            .iter_mut()
-                            .find_map(|capability| match capability {
-                                PciCapability::Msi(cap) => Some(cap),
-                                _ => None,
-                            })
-                    {
-                        if let Some(mme) = info_to_set.multi_message_enable {
-                            if (info.multiple_message_capable() as u8) < mme {
-                                return PcidClientResponse::Error(
-                                    PcidServerResponseError::InvalidBitPattern,
-                                );
-                            }
-                            info.set_multiple_message_enable(
-                                match mme {
-                                    0 => MultipleMessageSupport::Int1,
-                                    1 => MultipleMessageSupport::Int2,
-                                    2 => MultipleMessageSupport::Int4,
-                                    3 => MultipleMessageSupport::Int8,
-                                    4 => MultipleMessageSupport::Int16,
-                                    5 => MultipleMessageSupport::Int32,
-                                    _ => {
-                                        return PcidClientResponse::Error(
-                                            PcidServerResponseError::InvalidBitPattern,
-                                        )
-                                    }
-                                },
-                                self.pcie,
-                            );
-                        }
-                        if let Some(message_addr_and_data) = info_to_set.message_address_and_data {
-                            let message_addr = message_addr_and_data.addr;
-                            if message_addr & 0b11 != 0 {
-                                return PcidClientResponse::Error(
-                                    PcidServerResponseError::InvalidBitPattern,
-                                );
-                            }
-                            if message_addr_and_data.data
-                                & ((1 << info.multiple_message_enable(self.pcie) as u8) - 1)
-                                != 0
-                            {
-                                return PcidClientResponse::Error(
-                                    PcidServerResponseError::InvalidBitPattern,
-                                );
-                            }
-                            info.set_message_info(
-                                message_addr,
-                                message_addr_and_data
-                                    .data
-                                    .try_into()
-                                    .expect("pcid: MSI message data too big"),
-                                self.pcie,
-                            );
-                        }
-                        if let Some(mask_bits) = info_to_set.mask_bits {
-                            info.set_message_mask(mask_bits, self.pcie);
-                        }
-                        PcidClientResponse::SetFeatureInfo(PciFeature::Msi)
-                    } else {
-                        return PcidClientResponse::Error(
-                            PcidServerResponseError::NonexistentFeature(PciFeature::Msi),
-                        );
-                    }
-                }
-                SetFeatureInfo::MsiX { function_mask } => {
-                    if let Some(info) =
-                        self.capabilities
-                            .iter_mut()
-                            .find_map(|capability| match capability {
-                                PciCapability::MsiX(cap) => Some(cap),
-                                _ => None,
-                            })
-                    {
-                        if let Some(mask) = function_mask {
-                            info.set_function_mask(mask, self.pcie);
-                        }
-                        PcidClientResponse::SetFeatureInfo(PciFeature::MsiX)
-                    } else {
-                        return PcidClientResponse::Error(
-                            PcidServerResponseError::NonexistentFeature(PciFeature::MsiX),
-                        );
-                    }
-                }
-                _ => unreachable!(),
-            },
-            PcidClientRequest::ReadConfig(offset) => {
-                let value = unsafe { self.pcie.read(self.func.addr, offset) };
-                return PcidClientResponse::ReadConfig(value);
-            }
-            PcidClientRequest::WriteConfig(offset, value) => {
-                unsafe {
-                    self.pcie.write(self.func.addr, offset, value);
-                }
-                return PcidClientResponse::WriteConfig;
-            }
-            _ => unreachable!(),
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/driver_interface/bar.rs b/recipes/core/base/drivers/pcid/src/driver_interface/bar.rs
deleted file mode 100644
index b2c1d35bbd..0000000000
--- a/recipes/core/base/drivers/pcid/src/driver_interface/bar.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use std::convert::TryInto;
-
-use serde::{Deserialize, Serialize};
-
-// This type is used instead of [pci_types::Bar] in the driver interface as the
-// latter can't be serialized and is missing the convenience functions of [PciBar].
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-pub enum PciBar {
-    None,
-    Memory32 { addr: u32, size: u32 },
-    Memory64 { addr: u64, size: u64 },
-    Port(u16),
-}
-
-impl PciBar {
-    pub fn display(&self) -> String {
-        match self {
-            PciBar::None => format!("<none>"),
-            PciBar::Memory32 { addr, .. } => format!("{addr:08X}"),
-            PciBar::Memory64 { addr, .. } => format!("{addr:016X}"),
-            PciBar::Port(port) => format!("P{port:04X}"),
-        }
-    }
-
-    pub fn is_none(&self) -> bool {
-        match self {
-            &PciBar::None => true,
-            _ => false,
-        }
-    }
-
-    pub fn expect_port(&self) -> u16 {
-        match *self {
-            PciBar::Port(port) => port,
-            PciBar::Memory32 { .. } | PciBar::Memory64 { .. } => {
-                panic!("expected port BAR, found memory BAR");
-            }
-            PciBar::None => panic!("expected BAR to exist"),
-        }
-    }
-
-    pub fn expect_mem(&self) -> (usize, usize) {
-        match *self {
-            PciBar::Memory32 { addr, size } => (addr as usize, size as usize),
-            PciBar::Memory64 { addr, size } => (
-                addr.try_into()
-                    .expect("conversion from 64bit BAR to usize failed"),
-                size.try_into()
-                    .expect("conversion from 64bit BAR size to usize failed"),
-            ),
-            PciBar::Port(_) => panic!("expected memory BAR, found port BAR"),
-            PciBar::None => panic!("expected BAR to exist"),
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/driver_interface/cap.rs b/recipes/core/base/drivers/pcid/src/driver_interface/cap.rs
deleted file mode 100644
index 19521608f8..0000000000
--- a/recipes/core/base/drivers/pcid/src/driver_interface/cap.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use pci_types::capability::PciCapabilityAddress;
-use pci_types::ConfigRegionAccess;
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct VendorSpecificCapability {
-    pub data: Vec<u8>,
-}
-
-impl VendorSpecificCapability {
-    pub unsafe fn parse(addr: PciCapabilityAddress, access: &dyn ConfigRegionAccess) -> Self {
-        let dword = access.read(addr.address, addr.offset);
-        let length = ((dword >> 16) & 0xFF) as u16;
-        // let next = (dword >> 8) & 0xFF;
-        // log::trace!(
-        //     "Vendor specific offset: {:#02x} next: {next:#02x} cap len: {length:#02x}",
-        //     addr.offset
-        // );
-        let data = if length > 0 {
-            assert!(
-                length > 3 && length % 4 == 0,
-                "invalid range length: {}",
-                length
-            );
-            let mut raw_data = {
-                (addr.offset..addr.offset + length)
-                    .step_by(4)
-                    .flat_map(|offset| access.read(addr.address, offset).to_le_bytes())
-                    .collect::<Vec<u8>>()
-            };
-            raw_data.drain(3..).collect()
-        } else {
-            log::warn!("Vendor specific capability is invalid");
-            Vec::new()
-        };
-        VendorSpecificCapability { data }
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/driver_interface/config.rs b/recipes/core/base/drivers/pcid/src/driver_interface/config.rs
deleted file mode 100644
index e148b26ce6..0000000000
--- a/recipes/core/base/drivers/pcid/src/driver_interface/config.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use std::collections::BTreeMap;
-use std::ops::Range;
-
-use serde::Deserialize;
-
-use crate::driver_interface::FullDeviceId;
-
-#[derive(Clone, Debug, Default, Deserialize)]
-pub struct Config {
-    pub drivers: Vec<DriverConfig>,
-}
-
-#[derive(Clone, Debug, Default, Deserialize)]
-pub struct DriverConfig {
-    pub name: Option<String>,
-    pub class: Option<u8>,
-    pub subclass: Option<u8>,
-    pub interface: Option<u8>,
-    pub ids: Option<BTreeMap<String, Vec<u16>>>,
-    pub vendor: Option<u16>,
-    pub device: Option<u16>,
-    pub device_id_range: Option<Range<u16>>,
-    pub command: Vec<String>,
-}
-
-impl DriverConfig {
-    pub fn match_function(&self, id: &FullDeviceId) -> bool {
-        if let Some(class) = self.class {
-            if class != id.class {
-                return false;
-            }
-        }
-
-        if let Some(subclass) = self.subclass {
-            if subclass != id.subclass {
-                return false;
-            }
-        }
-
-        if let Some(interface) = self.interface {
-            if interface != id.interface {
-                return false;
-            }
-        }
-
-        if let Some(ref ids) = self.ids {
-            let mut device_found = false;
-            for (vendor, devices) in ids {
-                let vendor_without_prefix = vendor.trim_start_matches("0x");
-                let vendor = i64::from_str_radix(vendor_without_prefix, 16).unwrap() as u16;
-
-                if vendor != id.vendor_id {
-                    continue;
-                }
-
-                for device in devices {
-                    if *device == id.device_id {
-                        device_found = true;
-                        break;
-                    }
-                }
-            }
-            if !device_found {
-                return false;
-            }
-        } else {
-            if let Some(vendor) = self.vendor {
-                if vendor != id.vendor_id {
-                    return false;
-                }
-            }
-
-            if let Some(device) = self.device {
-                if device != id.device_id {
-                    return false;
-                }
-            }
-        }
-
-        if let Some(ref device_id_range) = self.device_id_range {
-            if id.device_id < device_id_range.start || device_id_range.end <= id.device_id {
-                return false;
-            }
-        }
-
-        true
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/driver_interface/id.rs b/recipes/core/base/drivers/pcid/src/driver_interface/id.rs
deleted file mode 100644
index 7b4ec84444..0000000000
--- a/recipes/core/base/drivers/pcid/src/driver_interface/id.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use pci_types::device_type::DeviceType;
-use serde::{Deserialize, Serialize};
-
-/// All identifying information of a PCI function.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-pub struct FullDeviceId {
-    pub vendor_id: u16,
-    pub device_id: u16,
-    pub class: u8,
-    pub subclass: u8,
-    pub interface: u8,
-    pub revision: u8,
-}
-
-impl FullDeviceId {
-    pub fn display(&self) -> String {
-        let mut string = format!(
-            "{:>04X}:{:>04X} {:>02X}.{:>02X}.{:>02X}.{:>02X} {:?}",
-            self.vendor_id,
-            self.device_id,
-            self.class,
-            self.subclass,
-            self.interface,
-            self.revision,
-            self.class,
-        );
-        let device_type = DeviceType::from((self.class, self.subclass));
-        match device_type {
-            DeviceType::LegacyVgaCompatible => string.push_str("  VGA CTL"),
-            DeviceType::IdeController => string.push_str(" IDE"),
-            DeviceType::SataController => match self.interface {
-                0 => string.push_str(" SATA VND"),
-                1 => string.push_str(" SATA AHCI"),
-                _ => (),
-            },
-            DeviceType::UsbController => match self.interface {
-                0x00 => string.push_str(" UHCI"),
-                0x10 => string.push_str(" OHCI"),
-                0x20 => string.push_str(" EHCI"),
-                0x30 => string.push_str(" XHCI"),
-                _ => (),
-            },
-            DeviceType::NvmeController => string.push_str(" NVME"),
-            _ => (),
-        }
-        string
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/driver_interface/irq_helpers.rs b/recipes/core/base/drivers/pcid/src/driver_interface/irq_helpers.rs
deleted file mode 100644
index 28ca077a92..0000000000
--- a/recipes/core/base/drivers/pcid/src/driver_interface/irq_helpers.rs
+++ /dev/null
@@ -1,334 +0,0 @@
-//! IRQ helpers.
-//!
-//! This module allows easy handling of the `/scheme/irq` scheme, and allocating interrupt vectors
-//! for use by INTx#, MSI, or MSI-X.
-
-use std::convert::TryFrom;
-use std::fs::{self, File};
-use std::io::{self, prelude::*};
-use std::num::NonZeroU8;
-
-use crate::driver_interface::msi::{MsiAddrAndData, MsixTableEntry};
-
-/// Read the local APIC ID of the bootstrap processor.
-pub fn read_bsp_apic_id() -> io::Result<usize> {
-    let mut buffer = [0u8; 8];
-
-    let mut file = File::open("/scheme/irq/bsp")?;
-    let bytes_read = file.read(&mut buffer)?;
-
-    (if bytes_read == 8 {
-        usize::try_from(u64::from_le_bytes(buffer))
-    } else if bytes_read == 4 {
-        usize::try_from(u32::from_le_bytes([
-            buffer[0], buffer[1], buffer[2], buffer[3],
-        ]))
-    } else {
-        panic!(
-            "`/scheme/irq` scheme responded with {} bytes, expected {}",
-            bytes_read,
-            std::mem::size_of::<usize>()
-        );
-    })
-    .or(Err(io::Error::new(
-        io::ErrorKind::InvalidData,
-        "bad BSP int size",
-    )))
-}
-
-// TODO: Perhaps read the MADT instead?
-/// Obtains an interator over all of the visible CPU ids, for use in IRQ allocation and MSI
-/// capability structs or MSI-X tables.
-pub fn cpu_ids() -> io::Result<impl Iterator<Item = io::Result<usize>> + 'static> {
-    Ok(
-        fs::read_dir("/scheme/irq")?.filter_map(|entry| -> Option<io::Result<_>> {
-            match entry {
-                Ok(e) => {
-                    let path = e.path();
-                    let file_name = path.file_name()?.to_str()?;
-                    // the file name should be in the format `cpu-<CPU ID>`
-                    if !file_name.starts_with("cpu-") {
-                        return None;
-                    }
-                    u8::from_str_radix(&file_name[4..], 16)
-                        .map(usize::from)
-                        .map(Ok)
-                        .ok()
-                }
-                Err(e) => Some(Err(e)),
-            }
-        }),
-    )
-}
-
-/// Allocate multiple interrupt vectors, from the IDT of the specified processor, returning the
-/// start vector and the IRQ handles.
-///
-/// The alignment is a requirement for the allocation range. For example, with an alignment of 8,
-/// only ranges that begin with a multiple of eight are accepted. The IRQ handles returned will
-/// always correspond to the subsequent IRQ numbers beginning the first value in the return tuple.
-///
-/// This function is not actually guaranteed to allocate all of the IRQs specified in `count`,
-/// since another process might already have requested one vector in the range. The caller must
-/// check that the returned vector have the same length as `count`. In the future this function may
-/// perhaps lock the entire directory to prevent this from happening, or maybe find the smallest free
-/// range with the minimum alignment, to allow other drivers to obtain their necessary IRQs.
-///
-/// Note that this count/alignment restriction is only mandatory for MSI; MSI-X allows for
-/// individually allocated vectors that might be spread out, even on multiple CPUs. Thus, multiple
-/// invocations with alignment 1 and count 1 are totally acceptable, although allocating in bulk
-/// minimizes the initialization overhead.
-pub fn allocate_aligned_interrupt_vectors(
-    cpu_id: usize,
-    alignment: NonZeroU8,
-    count: u8,
-) -> io::Result<Option<(u8, Vec<File>)>> {
-    let cpu_id = u8::try_from(cpu_id).expect("usize cpu ids not implemented yet");
-    if count == 0 {
-        return Ok(None);
-    }
-
-    let available_irqs = fs::read_dir(format!("/scheme/irq/cpu-{:02x}", cpu_id))?;
-    let mut available_irq_numbers = available_irqs.filter_map(|entry| -> Option<io::Result<_>> {
-        let entry = match entry {
-            Ok(e) => e,
-            Err(err) => return Some(Err(err)),
-        };
-
-        let path = entry.path();
-
-        let file_name = match path.file_name() {
-            Some(f) => f,
-            None => return None,
-        };
-
-        let path_str = match file_name.to_str() {
-            Some(s) => s,
-            None => return None,
-        };
-
-        match path_str.parse::<u8>() {
-            Ok(p) => Some(Ok(p)),
-            Err(_) => None,
-        }
-    });
-
-    // TODO: fcntl F_SETLK on `/scheme/irq/`?
-
-    let mut handles = Vec::with_capacity(usize::from(count));
-
-    let mut index = 0;
-    let mut first = None;
-
-    while let Some(number) = available_irq_numbers.next() {
-        let number = number?;
-
-        // Skip until a suitable alignment is found.
-        if number % u8::from(alignment) != 0 {
-            continue;
-        }
-        let first = *first.get_or_insert(number);
-        let irq_number = first + index;
-
-        // From the point where the range is aligned, we can start to advance until `count` IRQs
-        // have been allocated.
-        if index >= count {
-            break;
-        }
-
-        // if found, reserve the irq
-        let irq_handle =
-            match File::create(format!("/scheme/irq/cpu-{:02x}/{}", cpu_id, irq_number)) {
-                Ok(handle) => handle,
-
-                // return early if the entire range couldn't be allocated
-                Err(err) if err.kind() == io::ErrorKind::NotFound => break,
-
-                Err(err) => return Err(err),
-            };
-        handles.push(irq_handle);
-        index += 1;
-    }
-    if handles.is_empty() {
-        return Ok(None);
-    }
-    let first = match first {
-        Some(f) => f,
-        None => return Ok(None),
-    };
-
-    Ok(Some((first + 32, handles)))
-}
-
-/// Allocate at most `count` interrupt vectors, which can start at any offset. Unless MSI is used
-/// and an entire aligned range of vectors is needed, this function should be used.
-pub fn allocate_interrupt_vectors(cpu_id: usize, count: u8) -> io::Result<Option<(u8, Vec<File>)>> {
-    allocate_aligned_interrupt_vectors(cpu_id, NonZeroU8::new(1).unwrap(), count)
-}
-
-/// Allocate a single interrupt vector, returning both the vector number (starting from 32 up to
-/// 254), and its IRQ handle which is then reserved. Returns Ok(None) if allocation fails due to
-/// no available IRQs.
-pub fn allocate_single_interrupt_vector(cpu_id: usize) -> io::Result<Option<(u8, File)>> {
-    let (base, mut files) = match allocate_interrupt_vectors(cpu_id, 1) {
-        Ok(Some((base, files))) => (base, files),
-        Ok(None) => return Ok(None),
-        Err(err) => return Err(err),
-    };
-    assert_eq!(files.len(), 1);
-    Ok(Some((base, files.pop().unwrap())))
-}
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub fn allocate_single_interrupt_vector_for_msi(cpu_id: usize) -> (MsiAddrAndData, File) {
-    use crate::driver_interface::msi::x86 as x86_msix;
-
-    // FIXME for cpu_id >255 we need to use the IOMMU to use IRQ remapping
-    let lapic_id = u8::try_from(cpu_id).expect("CPU id couldn't fit inside u8");
-    let rh = false;
-    let dm = false;
-    let addr = x86_msix::message_address(lapic_id, rh, dm);
-
-    let (vector, interrupt_handle) = allocate_single_interrupt_vector(cpu_id)
-        .expect("failed to allocate interrupt vector")
-        .expect("no interrupt vectors left");
-    let msg_data = x86_msix::message_data_edge_triggered(x86_msix::DeliveryMode::Fixed, vector);
-
-    (
-        MsiAddrAndData {
-            addr,
-            data: msg_data,
-        },
-        interrupt_handle,
-    )
-}
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub fn allocate_first_msi_interrupt_on_bsp(
-    pcid_handle: &mut crate::driver_interface::PciFunctionHandle,
-) -> File {
-    use crate::driver_interface::{MsiSetFeatureInfo, PciFeature, SetFeatureInfo};
-
-    // TODO: Allow allocation of up to 32 vectors.
-
-    let destination_id = read_bsp_apic_id().expect("failed to read BSP apic id");
-    let (msg_addr_and_data, interrupt_handle) =
-        allocate_single_interrupt_vector_for_msi(destination_id);
-
-    let set_feature_info = MsiSetFeatureInfo {
-        multi_message_enable: Some(0),
-        message_address_and_data: Some(msg_addr_and_data),
-        mask_bits: None,
-    };
-    pcid_handle.set_feature_info(SetFeatureInfo::Msi(set_feature_info));
-
-    pcid_handle.enable_feature(PciFeature::Msi);
-    log::debug!("Enabled MSI");
-
-    interrupt_handle
-}
-
-pub struct InterruptVector {
-    irq_handle: File,
-    vector: u16,
-    kind: InterruptVectorKind,
-}
-
-enum InterruptVectorKind {
-    Legacy,
-    Msi,
-    MsiX { table_entry: *mut MsixTableEntry },
-}
-
-impl InterruptVector {
-    pub fn irq_handle(&self) -> &File {
-        &self.irq_handle
-    }
-
-    pub fn vector(&self) -> u16 {
-        self.vector
-    }
-
-    pub fn set_masked_if_fast(&mut self, masked: bool) -> bool {
-        match self.kind {
-            InterruptVectorKind::Legacy | InterruptVectorKind::Msi => false,
-            InterruptVectorKind::MsiX { table_entry } => {
-                unsafe { (*table_entry).set_masked(masked) };
-                true
-            }
-        }
-    }
-}
-
-/// Get the most optimal supported interrupt mechanism: either (in the order of preference):
-/// MSI-X, MSI, and INTx# pin. Returns both runtime interrupt structures (MSI/MSI-X capability
-/// structures), and the handles to the interrupts.
-// FIXME allow allocating multiple interrupt vectors
-// FIXME move MSI-X IRQ allocation to pcid
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub fn pci_allocate_interrupt_vector(
-    pcid_handle: &mut crate::driver_interface::PciFunctionHandle,
-    driver: &str,
-) -> InterruptVector {
-    let features = pcid_handle.fetch_all_features();
-
-    let has_msi = features.iter().any(|feature| feature.is_msi());
-    let has_msix = features.iter().any(|feature| feature.is_msix());
-
-    if has_msix {
-        let msix_info = match pcid_handle.feature_info(super::PciFeature::MsiX) {
-            super::PciFeatureInfo::MsiX(msix) => msix,
-            _ => unreachable!(),
-        };
-        let mut info = unsafe { msix_info.map_and_mask_all(pcid_handle) };
-
-        pcid_handle.enable_feature(crate::driver_interface::PciFeature::MsiX);
-
-        let entry = info.table_entry_pointer(0);
-
-        let bsp_cpu_id = read_bsp_apic_id()
-            .unwrap_or_else(|err| panic!("{driver}: failed to read BSP APIC ID: {err}"));
-        let (msg_addr_and_data, irq_handle) = allocate_single_interrupt_vector_for_msi(bsp_cpu_id);
-        entry.write_addr_and_data(msg_addr_and_data);
-        entry.unmask();
-
-        InterruptVector {
-            irq_handle,
-            vector: 0,
-            kind: InterruptVectorKind::MsiX { table_entry: entry },
-        }
-    } else if has_msi {
-        InterruptVector {
-            irq_handle: allocate_first_msi_interrupt_on_bsp(pcid_handle),
-            vector: 0,
-            kind: InterruptVectorKind::Msi,
-        }
-    } else if let Some(irq) = pcid_handle.config().func.legacy_interrupt_line {
-        // INTx# pin based interrupts.
-        InterruptVector {
-            irq_handle: irq.irq_handle(driver),
-            vector: 0,
-            kind: InterruptVectorKind::Legacy,
-        }
-    } else {
-        panic!("{driver}: no interrupts supported at all")
-    }
-}
-
-// FIXME support MSI on non-x86 systems
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-pub fn pci_allocate_interrupt_vector(
-    pcid_handle: &mut crate::driver_interface::PciFunctionHandle,
-    driver: &str,
-) -> InterruptVector {
-    if let Some(irq) = pcid_handle.config().func.legacy_interrupt_line {
-        // INTx# pin based interrupts.
-        InterruptVector {
-            irq_handle: irq.irq_handle(driver),
-            vector: 0,
-            kind: InterruptVectorKind::Legacy,
-        }
-    } else {
-        panic!("{driver}: no interrupts supported at all")
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/driver_interface/mod.rs b/recipes/core/base/drivers/pcid/src/driver_interface/mod.rs
deleted file mode 100644
index bbc7304ee5..0000000000
--- a/recipes/core/base/drivers/pcid/src/driver_interface/mod.rs
+++ /dev/null
@@ -1,492 +0,0 @@
-use std::fs::File;
-use std::io::prelude::*;
-use std::os::fd::{FromRawFd, IntoRawFd, RawFd};
-use std::path::Path;
-use std::ptr::NonNull;
-use std::{env, io};
-use std::{fmt, process};
-
-use daemon::Daemon;
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-
-pub use bar::PciBar;
-pub use cap::VendorSpecificCapability;
-pub use id::FullDeviceId;
-pub use pci_types::PciAddress;
-
-mod bar;
-pub mod cap;
-pub mod config;
-mod id;
-pub mod irq_helpers;
-pub mod msi;
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub struct LegacyInterruptLine {
-    #[doc(hidden)]
-    pub irq: u8,
-    pub phandled: Option<(u32, [u32; 3], usize)>,
-}
-
-impl LegacyInterruptLine {
-    /// Get an IRQ handle for this interrupt line.
-    pub fn irq_handle(self, driver: &str) -> File {
-        if let Some((phandle, addr, cells)) = self.phandled {
-            let path = match cells {
-                1 => format!("/scheme/irq/phandle-{}/{}", phandle, addr[0]),
-                2 => format!("/scheme/irq/phandle-{}/{},{}", phandle, addr[0], addr[1]),
-                3 => format!(
-                    "/scheme/irq/phandle-{}/{},{},{}",
-                    phandle, addr[0], addr[1], addr[2]
-                ),
-                _ => panic!(
-                    "unexpected number of IRQ description cells for phandle {phandle}: {cells}"
-                ),
-            };
-            File::create(path)
-                .unwrap_or_else(|err| panic!("{driver}: failed to open IRQ file: {err}"))
-        } else {
-            File::open(format!("/scheme/irq/{}", self.irq))
-                .unwrap_or_else(|err| panic!("{driver}: failed to open IRQ file: {err}"))
-        }
-    }
-}
-
-impl fmt::Display for LegacyInterruptLine {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if let Some((phandle, addr, cells)) = self.phandled {
-            match cells {
-                1 => write!(f, "(phandle {}, {:?})", phandle, addr[0]),
-                2 => write!(f, "(phandle {}, {:?},{:?})", phandle, addr[0], addr[1]),
-                3 => write!(f, "(phandle {}, {:?})", phandle, addr),
-                _ => panic!(
-                    "unexpected number of IRQ description cells for phandle {phandle}: {cells}"
-                ),
-            }
-        } else {
-            write!(f, "{}", self.irq)
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(remote = "PciAddress")]
-struct PciAddressDef {
-    #[serde(getter = "PciAddress::segment")]
-    segment: u16,
-    #[serde(getter = "PciAddress::bus")]
-    bus: u8,
-    #[serde(getter = "PciAddress::device")]
-    device: u8,
-    #[serde(getter = "PciAddress::function")]
-    function: u8,
-}
-
-impl From<PciAddressDef> for PciAddress {
-    fn from(value: PciAddressDef) -> Self {
-        PciAddress::new(value.segment, value.bus, value.device, value.function)
-    }
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub struct PciRom {
-    pub addr: u32,
-    pub size: u32,
-    pub enabled: bool,
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub struct PciFunction {
-    /// Address of the PCI function.
-    #[serde(with = "PciAddressDef")]
-    pub addr: PciAddress,
-
-    /// PCI Base Address Registers
-    pub bars: [PciBar; 6],
-
-    /// PCI Option ROM
-    pub rom: Option<PciRom>,
-
-    /// Legacy IRQ line: It's the responsibility of pcid to make sure that it be mapped in either
-    /// the I/O APIC or the 8259 PIC, so that the subdriver can map the interrupt vector directly.
-    /// The vector to map is always this field, plus 32.
-    /// If INTx# interrupts aren't supported at all this is `None`.
-    pub legacy_interrupt_line: Option<LegacyInterruptLine>,
-
-    /// All identifying information of the PCI function.
-    pub full_device_id: FullDeviceId,
-}
-impl PciFunction {
-    pub fn name(&self) -> String {
-        // FIXME stop replacing : with - once it is a valid character in scheme names
-        format!("pci-{}", self.addr).replace(':', "-")
-    }
-
-    pub fn display(&self) -> String {
-        let mut string = self.name();
-        let mut first = true;
-        for (i, bar) in self.bars.iter().enumerate() {
-            if !bar.is_none() {
-                if first {
-                    first = false;
-                    string.push_str(" on:");
-                }
-                string.push_str(&format!(" {i}={}", bar.display()));
-            }
-        }
-        if let Some(irq) = self.legacy_interrupt_line {
-            string.push_str(&format!(" IRQ: {irq}"));
-        }
-        string
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct SubdriverArguments {
-    pub func: PciFunction,
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub enum FeatureStatus {
-    Enabled,
-    Disabled,
-}
-
-impl FeatureStatus {
-    pub fn enabled(enabled: bool) -> Self {
-        if enabled {
-            Self::Enabled
-        } else {
-            Self::Disabled
-        }
-    }
-    pub fn is_enabled(&self) -> bool {
-        if let &Self::Enabled = self {
-            true
-        } else {
-            false
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub enum PciFeature {
-    Msi,
-    MsiX,
-}
-impl PciFeature {
-    pub fn is_msi(self) -> bool {
-        if let Self::Msi = self {
-            true
-        } else {
-            false
-        }
-    }
-    pub fn is_msix(self) -> bool {
-        if let Self::MsiX = self {
-            true
-        } else {
-            false
-        }
-    }
-}
-#[derive(Debug, Serialize, Deserialize)]
-pub enum PciFeatureInfo {
-    Msi(msi::MsiInfo),
-    MsiX(msi::MsixInfo),
-}
-
-// TODO: Remove these "features" and just go strait to the actual thing.
-
-#[derive(Debug, Default, Serialize, Deserialize)]
-pub struct MsiSetFeatureInfo {
-    /// The Multi Message Enable field of the Message Control in the MSI Capability Structure,
-    /// is the log2 of the interrupt vectors, minus one. Can only be 0b000..=0b101.
-    pub multi_message_enable: Option<u8>,
-
-    /// The system-specific message address and data.
-    ///
-    /// The message address contains things like the CPU that will be targeted, at least on
-    /// x86_64. The message data contains the actual interrupt vector (lower 8 bits) and
-    /// the kind of interrupt, at least on x86_64.
-    pub message_address_and_data: Option<msi::MsiAddrAndData>,
-
-    /// A bitmap of the vectors that are masked. This field is not guaranteed (and not likely,
-    /// at least according to the feature flags I got from QEMU), to exist.
-    pub mask_bits: Option<u32>,
-}
-
-/// Some flags that might be set simultaneously, but separately.
-#[derive(Debug, Serialize, Deserialize)]
-#[non_exhaustive]
-pub enum SetFeatureInfo {
-    Msi(MsiSetFeatureInfo),
-
-    MsiX {
-        /// Masks the entire function, and all of its vectors.
-        function_mask: Option<bool>,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[non_exhaustive]
-pub enum PcidClientRequest {
-    EnableDevice,
-    RequestConfig,
-    RequestFeatures,
-    RequestVendorCapabilities,
-    EnableFeature(PciFeature),
-    FeatureInfo(PciFeature),
-    SetFeatureInfo(SetFeatureInfo),
-    ReadConfig(u16),
-    WriteConfig(u16, u32),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[non_exhaustive]
-pub enum PcidServerResponseError {
-    NonexistentFeature(PciFeature),
-    InvalidBitPattern,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[non_exhaustive]
-pub enum PcidClientResponse {
-    EnabledDevice,
-    Config(SubdriverArguments),
-    AllFeatures(Vec<PciFeature>),
-    VendorCapabilities(Vec<VendorSpecificCapability>),
-    FeatureEnabled(PciFeature),
-    FeatureStatus(PciFeature, FeatureStatus),
-    Error(PcidServerResponseError),
-    FeatureInfo(PciFeature, PciFeatureInfo),
-    SetFeatureInfo(PciFeature),
-    ReadConfig(u32),
-    WriteConfig,
-}
-
-pub struct MappedBar {
-    pub ptr: NonNull<u8>,
-    pub bar_size: usize,
-}
-
-/// A handle from a `pcid` client (e.g. `ahcid`) to `pcid`.
-pub struct PciFunctionHandle {
-    channel: File,
-    config: SubdriverArguments,
-    mapped_bars: [Option<MappedBar>; 6],
-}
-
-fn send<T: Serialize>(w: &mut File, message: &T) {
-    let mut data = Vec::new();
-    bincode::serialize_into(&mut data, message).expect("couldn't serialize pcid message");
-    match w.write(&data) {
-        Ok(len) => assert_eq!(len, data.len()),
-        Err(err) => {
-            log::error!("writing pcid request failed: {err}");
-            process::exit(1);
-        }
-    }
-}
-fn recv<T: DeserializeOwned>(r: &mut File) -> T {
-    let mut length_bytes = [0u8; 8];
-    if let Err(err) = r.read_exact(&mut length_bytes) {
-        log::error!("reading pcid response length failed: {err}");
-        process::exit(1);
-    }
-    let length = u64::from_le_bytes(length_bytes);
-    if length > 0x100_000 {
-        panic!("pcid_interface: buffer too large");
-    }
-    let mut data = vec![0u8; length as usize];
-    if let Err(err) = r.read_exact(&mut data) {
-        log::error!("reading pcid response failed: {err}");
-        process::exit(1);
-    }
-
-    bincode::deserialize_from(&data[..]).expect("couldn't deserialize pcid message")
-}
-
-impl PciFunctionHandle {
-    fn connect_default() -> Self {
-        let channel_fd = match env::var("PCID_CLIENT_CHANNEL") {
-            Ok(channel_fd) => channel_fd,
-            Err(err) => {
-                log::error!("PCID_CLIENT_CHANNEL invalid: {err}");
-                process::exit(1);
-            }
-        };
-        let channel_fd = match channel_fd.parse::<RawFd>() {
-            Ok(channel_fd) => channel_fd,
-            Err(err) => {
-                log::error!("PCID_CLIENT_CHANNEL invalid: {err}");
-                process::exit(1);
-            }
-        };
-        Self::connect_common(channel_fd)
-    }
-
-    pub fn connect_by_path(device_path: &Path) -> io::Result<Self> {
-        let channel_fd = libredox::call::open(
-            device_path.join("channel").to_str().unwrap(),
-            libredox::flag::O_RDWR,
-            0,
-        )?;
-        Ok(Self::connect_common(channel_fd as RawFd))
-    }
-
-    fn connect_common(channel_fd: i32) -> PciFunctionHandle {
-        let mut channel = unsafe { File::from_raw_fd(channel_fd) };
-
-        send(&mut channel, &PcidClientRequest::RequestConfig);
-        let config = match recv(&mut channel) {
-            PcidClientResponse::Config(a) => a,
-            other => {
-                log::error!("received wrong pcid response: {other:?}");
-                process::exit(1);
-            }
-        };
-
-        Self {
-            channel,
-            config,
-            mapped_bars: [const { None }; 6],
-        }
-    }
-
-    pub fn into_inner_fd(self) -> RawFd {
-        self.channel.into_raw_fd()
-    }
-
-    fn send(&mut self, req: &PcidClientRequest) {
-        send(&mut self.channel, req)
-    }
-    fn recv(&mut self) -> PcidClientResponse {
-        recv(&mut self.channel)
-    }
-
-    pub fn config(&self) -> SubdriverArguments {
-        self.config.clone()
-    }
-
-    pub fn enable_device(&mut self) {
-        self.send(&PcidClientRequest::EnableDevice);
-        match self.recv() {
-            PcidClientResponse::EnabledDevice => {}
-            other => {
-                log::error!("received wrong pcid response: {other:?}");
-                process::exit(1);
-            }
-        }
-    }
-
-    pub fn get_vendor_capabilities(&mut self) -> Vec<VendorSpecificCapability> {
-        self.send(&PcidClientRequest::RequestVendorCapabilities);
-        match self.recv() {
-            PcidClientResponse::VendorCapabilities(a) => a,
-            other => {
-                log::error!("received wrong pcid response: {other:?}");
-                process::exit(1);
-            }
-        }
-    }
-
-    // FIXME turn into struct with bool fields
-    pub fn fetch_all_features(&mut self) -> Vec<PciFeature> {
-        self.send(&PcidClientRequest::RequestFeatures);
-        match self.recv() {
-            PcidClientResponse::AllFeatures(a) => a,
-            other => {
-                log::error!("received wrong pcid response: {other:?}");
-                process::exit(1);
-            }
-        }
-    }
-    pub fn enable_feature(&mut self, feature: PciFeature) {
-        self.send(&PcidClientRequest::EnableFeature(feature));
-        match self.recv() {
-            PcidClientResponse::FeatureEnabled(feat) if feat == feature => {}
-            other => {
-                log::error!("received wrong pcid response: {other:?}");
-                process::exit(1);
-            }
-        }
-    }
-    pub fn feature_info(&mut self, feature: PciFeature) -> PciFeatureInfo {
-        self.send(&PcidClientRequest::FeatureInfo(feature));
-        match self.recv() {
-            PcidClientResponse::FeatureInfo(feat, info) if feat == feature => info,
-            other => {
-                log::error!("received wrong pcid response: {other:?}");
-                process::exit(1);
-            }
-        }
-    }
-    pub fn set_feature_info(&mut self, info: SetFeatureInfo) {
-        self.send(&PcidClientRequest::SetFeatureInfo(info));
-        match self.recv() {
-            PcidClientResponse::SetFeatureInfo(_) => {}
-            other => {
-                log::error!("received wrong pcid response: {other:?}");
-                process::exit(1);
-            }
-        }
-    }
-    pub unsafe fn read_config(&mut self, offset: u16) -> u32 {
-        self.send(&PcidClientRequest::ReadConfig(offset));
-        match self.recv() {
-            PcidClientResponse::ReadConfig(value) => value,
-            other => {
-                log::error!("received wrong pcid response: {other:?}");
-                process::exit(1);
-            }
-        }
-    }
-    pub unsafe fn write_config(&mut self, offset: u16, value: u32) {
-        self.send(&PcidClientRequest::WriteConfig(offset, value));
-        match self.recv() {
-            PcidClientResponse::WriteConfig => {}
-            other => {
-                log::error!("received wrong pcid response: {other:?}");
-                process::exit(1);
-            }
-        }
-    }
-    pub unsafe fn map_bar(&mut self, bir: u8) -> &MappedBar {
-        let mapped_bar = &mut self.mapped_bars[bir as usize];
-        if let Some(mapped_bar) = mapped_bar {
-            mapped_bar
-        } else {
-            let (bar, bar_size) = self.config.func.bars[bir as usize].expect_mem();
-
-            let ptr = match unsafe {
-                common::physmap(
-                    bar,
-                    bar_size,
-                    common::Prot::RW,
-                    // FIXME once the kernel supports this use write-through for prefetchable BAR
-                    common::MemoryType::Uncacheable,
-                )
-            } {
-                Ok(ptr) => ptr,
-                Err(err) => {
-                    log::error!("failed to map BAR at {bar:016X}: {err}");
-                    process::exit(1);
-                }
-            };
-
-            mapped_bar.insert(MappedBar {
-                ptr: NonNull::new(ptr.cast::<u8>()).expect("Mapping a BAR resulted in a nullptr"),
-                bar_size,
-            })
-        }
-    }
-}
-
-pub fn pci_daemon<F: FnOnce(Daemon, PciFunctionHandle) -> !>(f: F) -> ! {
-    Daemon::new(|daemon| {
-        common::init();
-        let pcid_handle = PciFunctionHandle::connect_default();
-        f(daemon, pcid_handle)
-    })
-}
diff --git a/recipes/core/base/drivers/pcid/src/driver_interface/msi.rs b/recipes/core/base/drivers/pcid/src/driver_interface/msi.rs
deleted file mode 100644
index 0ca68ec556..0000000000
--- a/recipes/core/base/drivers/pcid/src/driver_interface/msi.rs
+++ /dev/null
@@ -1,257 +0,0 @@
-use std::fmt;
-use std::ptr::NonNull;
-
-use crate::driver_interface::PciBar;
-use crate::PciFunctionHandle;
-
-use common::io::{Io, Mmio};
-use serde::{Deserialize, Serialize};
-
-/// The address and data to use for MSI and MSI-X.
-///
-/// For MSI using this only works when you need a single interrupt vector.
-/// For MSI-X you can have a single [MsiEntry] for each interrupt vector.
-#[derive(Debug, Default, Serialize, Deserialize)]
-pub struct MsiAddrAndData {
-    pub addr: u64,
-    pub data: u32,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct MsiInfo {
-    pub log2_multiple_message_capable: u8,
-    pub is_64bit: bool,
-    pub has_per_vector_masking: bool,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct MsixInfo {
-    pub table_bar: u8,
-    pub table_offset: u32,
-    pub table_size: u16,
-    pub pba_bar: u8,
-    pub pba_offset: u32,
-}
-
-impl MsixInfo {
-    pub unsafe fn map_and_mask_all(self, pcid_handle: &mut PciFunctionHandle) -> MappedMsixRegs {
-        self.validate(pcid_handle.config().func.bars);
-
-        let virt_table_base = unsafe {
-            pcid_handle
-                .map_bar(self.table_bar)
-                .ptr
-                .as_ptr()
-                .byte_add(self.table_offset as usize)
-        };
-
-        let mut info = MappedMsixRegs {
-            virt_table_base: NonNull::new(virt_table_base.cast::<MsixTableEntry>()).unwrap(),
-            info: self,
-        };
-
-        // Mask all interrupts in case some earlier driver/os already unmasked them (according to
-        // the PCI Local Bus spec 3.0, they are masked after system reset).
-        for i in 0..info.info.table_size {
-            info.table_entry_pointer(i.into()).mask();
-        }
-
-        info
-    }
-
-    fn validate(&self, bars: [PciBar; 6]) {
-        if self.table_bar > 5 {
-            panic!(
-                "MSI-X Table BIR contained a reserved enum value: {}",
-                self.table_bar
-            );
-        }
-        if self.pba_bar > 5 {
-            panic!(
-                "MSI-X PBA BIR contained a reserved enum value: {}",
-                self.pba_bar
-            );
-        }
-
-        let table_size = self.table_size;
-        let table_offset = self.table_offset as usize;
-        let table_min_length = table_size * 16;
-
-        let pba_offset = self.pba_offset as usize;
-        let pba_min_length = table_size.div_ceil(8);
-
-        let (_, table_bar_size) = bars[self.table_bar as usize].expect_mem();
-        let (_, pba_bar_size) = bars[self.pba_bar as usize].expect_mem();
-
-        // Ensure that the table and PBA are within the BAR.
-
-        if !(0..table_bar_size as u64).contains(&(table_offset as u64 + table_min_length as u64)) {
-            panic!(
-                "Table {:#x}:{:#x} outside of BAR with length {:#x}",
-                table_offset,
-                table_offset + table_min_length as usize,
-                table_bar_size
-            );
-        }
-
-        if !(0..pba_bar_size as u64).contains(&(pba_offset as u64 + pba_min_length as u64)) {
-            panic!(
-                "PBA {:#x}:{:#x} outside of BAR with length {:#x}",
-                pba_offset,
-                pba_offset + pba_min_length as usize,
-                pba_bar_size
-            );
-        }
-    }
-}
-
-pub struct MappedMsixRegs {
-    pub virt_table_base: NonNull<MsixTableEntry>,
-    pub info: MsixInfo,
-}
-impl MappedMsixRegs {
-    pub unsafe fn table_entry_pointer_unchecked(&mut self, k: usize) -> &mut MsixTableEntry {
-        &mut *self.virt_table_base.as_ptr().add(k)
-    }
-
-    pub fn table_entry_pointer(&mut self, k: usize) -> &mut MsixTableEntry {
-        assert!(k < self.info.table_size as usize);
-        unsafe { self.table_entry_pointer_unchecked(k) }
-    }
-}
-
-#[repr(C, packed)]
-pub struct MsixTableEntry {
-    pub addr_lo: Mmio<u32>,
-    pub addr_hi: Mmio<u32>,
-    pub msg_data: Mmio<u32>,
-    pub vec_ctl: Mmio<u32>,
-}
-
-const _: () = {
-    assert!(size_of::<MsixTableEntry>() == 16);
-};
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub mod x86 {
-    #[repr(u8)]
-    pub enum TriggerMode {
-        Edge = 0,
-        Level = 1,
-    }
-
-    #[repr(u8)]
-    pub enum LevelTriggerMode {
-        Deassert = 0,
-        Assert = 1,
-    }
-
-    #[repr(u8)]
-    pub enum DeliveryMode {
-        Fixed = 0b000,
-        LowestPriority = 0b001,
-        Smi = 0b010,
-        // 0b011 is reserved
-        Nmi = 0b100,
-        Init = 0b101,
-        // 0b110 is reserved
-        ExtInit = 0b111,
-    }
-
-    // TODO: should the reserved field be preserved?
-    pub const fn message_address(
-        destination_id: u8,
-        redirect_hint: bool,
-        dest_mode_logical: bool,
-    ) -> u64 {
-        0x0000_0000_FEE0_0000u64
-            | ((destination_id as u64) << 12)
-            | ((redirect_hint as u64) << 3)
-            | ((dest_mode_logical as u64) << 2)
-    }
-    pub const fn message_data(
-        trigger_mode: TriggerMode,
-        level_trigger_mode: LevelTriggerMode,
-        delivery_mode: DeliveryMode,
-        vector: u8,
-    ) -> u32 {
-        ((trigger_mode as u32) << 15)
-            | ((level_trigger_mode as u32) << 14)
-            | ((delivery_mode as u32) << 8)
-            | vector as u32
-    }
-    pub const fn message_data_level_triggered(
-        level_trigger_mode: LevelTriggerMode,
-        delivery_mode: DeliveryMode,
-        vector: u8,
-    ) -> u32 {
-        message_data(
-            TriggerMode::Level,
-            level_trigger_mode,
-            delivery_mode,
-            vector,
-        )
-    }
-    pub const fn message_data_edge_triggered(delivery_mode: DeliveryMode, vector: u8) -> u32 {
-        message_data(
-            TriggerMode::Edge,
-            LevelTriggerMode::Deassert,
-            delivery_mode,
-            vector,
-        )
-    }
-}
-
-impl MsixTableEntry {
-    pub fn addr_lo(&self) -> u32 {
-        self.addr_lo.read()
-    }
-    pub fn addr_hi(&self) -> u32 {
-        self.addr_hi.read()
-    }
-    pub fn set_addr_lo(&mut self, value: u32) {
-        self.addr_lo.write(value);
-    }
-    pub fn set_addr_hi(&mut self, value: u32) {
-        self.addr_hi.write(value);
-    }
-    pub fn msg_data(&self) -> u32 {
-        self.msg_data.read()
-    }
-    pub fn vec_ctl(&self) -> u32 {
-        self.vec_ctl.read()
-    }
-    pub fn set_msg_data(&mut self, value: u32) {
-        self.msg_data.write(value);
-    }
-    pub fn addr(&self) -> u64 {
-        u64::from(self.addr_lo()) | (u64::from(self.addr_hi()) << 32)
-    }
-    pub const VEC_CTL_MASK_BIT: u32 = 1;
-
-    pub fn set_masked(&mut self, masked: bool) {
-        self.vec_ctl.writef(Self::VEC_CTL_MASK_BIT, masked)
-    }
-    pub fn mask(&mut self) {
-        self.set_masked(true);
-    }
-    pub fn unmask(&mut self) {
-        self.set_masked(false);
-    }
-
-    pub fn write_addr_and_data(&mut self, entry: MsiAddrAndData) {
-        self.set_addr_lo(entry.addr as u32);
-        self.set_addr_hi((entry.addr >> 32) as u32);
-        self.set_msg_data(entry.data);
-    }
-}
-
-impl fmt::Debug for MsixTableEntry {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("MsixTableEntry")
-            .field("addr", &self.addr())
-            .field("msg_data", &self.msg_data())
-            .field("vec_ctl", &self.vec_ctl())
-            .finish()
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/lib.rs b/recipes/core/base/drivers/pcid/src/lib.rs
deleted file mode 100644
index e8098a1786..0000000000
--- a/recipes/core/base/drivers/pcid/src/lib.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//! Interface to `pcid`.
-
-#![feature(never_type)]
-
-mod driver_interface;
-pub use driver_interface::*;
diff --git a/recipes/core/base/drivers/pcid/src/main.rs b/recipes/core/base/drivers/pcid/src/main.rs
deleted file mode 100644
index cad33114bc..0000000000
--- a/recipes/core/base/drivers/pcid/src/main.rs
+++ /dev/null
@@ -1,384 +0,0 @@
-#![feature(iter_next_chunk)]
-#![feature(if_let_guard)]
-#![feature(non_exhaustive_omitted_patterns_lint)]
-
-use std::collections::BTreeMap;
-
-use log::{debug, error, info, trace, warn};
-use pci_types::capability::PciCapability;
-use pci_types::{
-    Bar as TyBar, CommandRegister, EndpointHeader, HeaderType, PciAddress,
-    PciHeader as TyPciHeader, PciPciBridgeHeader,
-};
-use redox_scheme::scheme::register_sync_scheme;
-use scheme_utils::Blocking;
-
-use crate::cfg_access::Pcie;
-use pcid_interface::{FullDeviceId, LegacyInterruptLine, PciBar, PciFunction, PciRom};
-
-mod cfg_access;
-mod driver_handler;
-mod scheme;
-
-pub struct Func {
-    inner: PciFunction,
-
-    capabilities: Vec<PciCapability>,
-    endpoint_header: EndpointHeader,
-    enabled: bool,
-}
-
-fn handle_parsed_header(
-    pcie: &Pcie,
-    tree: &mut BTreeMap<PciAddress, Func>,
-    endpoint_header: EndpointHeader,
-    full_device_id: FullDeviceId,
-) {
-    let mut bars = [PciBar::None; 6];
-    let mut skip = false;
-    for i in 0..6 {
-        if skip {
-            skip = false;
-            continue;
-        }
-        match endpoint_header.bar(i, pcie) {
-            Some(TyBar::Io { port }) => bars[i as usize] = PciBar::Port(port.try_into().unwrap()),
-            Some(TyBar::Memory32 {
-                address,
-                size,
-                prefetchable: _,
-            }) => {
-                bars[i as usize] = PciBar::Memory32 {
-                    addr: address,
-                    size,
-                }
-            }
-            Some(TyBar::Memory64 {
-                address,
-                size,
-                prefetchable: _,
-            }) => {
-                bars[i as usize] = PciBar::Memory64 {
-                    addr: address,
-                    size,
-                };
-                skip = true; // Each 64bit memory BAR occupies two slots
-            }
-            None => bars[i as usize] = PciBar::None,
-        }
-    }
-
-    let mut string = String::new();
-    for (i, bar) in bars.iter().enumerate() {
-        if !bar.is_none() {
-            string.push_str(&format!(" {i}={}", bar.display()));
-        }
-    }
-
-    if !string.is_empty() {
-        debug!("    BAR{}", string);
-    }
-
-    //TODO: submit to pci_types
-    let get_rom = |pci_address, offset| -> Option<PciRom> {
-        use pci_types::ConfigRegionAccess;
-
-        const ROM_ENABLED: u32 = 1;
-        const ROM_ADDRESS_MASK: u32 = 0xfffff800;
-
-        let data = unsafe { pcie.read(pci_address, offset) };
-        let enabled = (data & ROM_ENABLED) == ROM_ENABLED;
-        let addr = data & ROM_ADDRESS_MASK;
-
-        let size = unsafe {
-            pcie.write(
-                pci_address,
-                offset,
-                ROM_ADDRESS_MASK | if enabled { ROM_ENABLED } else { 0 },
-            );
-            let mut readback = pcie.read(pci_address, offset);
-            pcie.write(pci_address, offset, data);
-
-            /*
-             * If the entire readback value is zero, the BAR is not implemented, so we return `None`.
-             */
-            if readback == 0x0 {
-                return None;
-            }
-
-            readback &= ROM_ADDRESS_MASK;
-            1 << readback.trailing_zeros()
-        };
-
-        Some(PciRom {
-            addr,
-            size,
-            enabled,
-        })
-    };
-
-    let rom = get_rom(endpoint_header.header().address(), 0x30);
-    if let Some(rom) = rom {
-        debug!("    ROM={:08X}", rom.addr);
-    }
-
-    let capabilities = if endpoint_header.status(pcie).has_capability_list() {
-        endpoint_header.capabilities(pcie).collect::<Vec<_>>()
-    } else {
-        Vec::new()
-    };
-    debug!(
-        "PCI DEVICE CAPABILITIES for {}: {:?}",
-        endpoint_header.header().address(),
-        capabilities
-    );
-
-    let func = Func {
-        inner: pcid_interface::PciFunction {
-            addr: endpoint_header.header().address(),
-            bars,
-            rom,
-            legacy_interrupt_line: None, // Will be filled in when enabling the device
-            full_device_id: full_device_id.clone(),
-        },
-
-        capabilities,
-        endpoint_header,
-        enabled: false,
-    };
-
-    tree.insert(func.inner.addr, func);
-}
-
-fn enable_function(
-    pcie: &Pcie,
-    endpoint_header: &mut EndpointHeader,
-    capabilities: &mut [PciCapability],
-) -> Option<LegacyInterruptLine> {
-    // Enable bus mastering, memory space, and I/O space
-    endpoint_header.update_command(pcie, |cmd| {
-        cmd | CommandRegister::BUS_MASTER_ENABLE
-            | CommandRegister::MEMORY_ENABLE
-            | CommandRegister::IO_ENABLE
-    });
-
-    // Disable MSI and MSI-X in case a previous driver instance enabled them.
-    for capability in capabilities {
-        match capability {
-            PciCapability::Msi(capability) => {
-                capability.set_enabled(false, pcie);
-            }
-            PciCapability::MsiX(capability) => {
-                capability.set_enabled(false, pcie);
-            }
-            _ => {}
-        }
-    }
-
-    // Set IRQ line to 9 if not set
-    let mut irq = 0xFF;
-    let mut interrupt_pin = 0xFF;
-
-    endpoint_header.update_interrupt(pcie, |(pin, mut line)| {
-        if line == 0xFF {
-            line = 9;
-        }
-        irq = line;
-        interrupt_pin = pin;
-        (pin, line)
-    });
-
-    let legacy_interrupt_enabled = match interrupt_pin {
-        0 => false,
-        1 | 2 | 3 | 4 => true,
-
-        other => {
-            warn!("pcid: invalid interrupt pin: {}", other);
-            false
-        }
-    };
-
-    if legacy_interrupt_enabled {
-        let pci_address = endpoint_header.header().address();
-        let dt_address = ((pci_address.bus() as u32) << 16)
-            | ((pci_address.device() as u32) << 11)
-            | ((pci_address.function() as u32) << 8);
-        let addr = [
-            dt_address & pcie.interrupt_map_mask[0],
-            0u32,
-            0u32,
-            interrupt_pin as u32 & pcie.interrupt_map_mask[3],
-        ];
-        let mapping = pcie
-            .interrupt_map
-            .iter()
-            .find(|x| x.addr == addr[0..3] && x.interrupt == addr[3]);
-        let phandled = if let Some(mapping) = mapping {
-            Some((
-                mapping.parent_phandle,
-                mapping.parent_interrupt,
-                mapping.parent_interrupt_cells,
-            ))
-        } else {
-            None
-        };
-        if mapping.is_some() {
-            debug!("found mapping: addr={:?} => {:?}", addr, phandled);
-        }
-
-        Some(LegacyInterruptLine { irq, phandled })
-    } else {
-        None
-    }
-}
-
-fn main() {
-    common::init();
-    daemon::Daemon::new(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon) -> ! {
-    common::setup_logging(
-        "bus",
-        "pci",
-        "pcid",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    let pcie = Pcie::new();
-
-    info!("PCI SG-BS:DV.F VEND:DEVI CL.SC.IN.RV");
-
-    let mut scheme = scheme::PciScheme::new(pcie);
-    let socket = redox_scheme::Socket::create().expect("failed to open pci scheme socket");
-    let handler = Blocking::new(&socket, 16);
-
-    {
-        match libredox::Fd::open("/scheme/acpi/register_pci", libredox::flag::O_WRONLY, 0) {
-            Ok(register_pci) => {
-                let access_id = scheme.access();
-
-                let access_fd = match socket
-                    .create_this_scheme_fd(0, access_id, syscall::O_RDWR, 0)
-                {
-                    Ok(fd) => Some(fd),
-                    Err(err) => {
-                        warn!("pcid: failed to issue acpi resource fd: {:?}", err);
-                        None
-                    }
-                };
-                if let Some(access_fd) = access_fd {
-                    let access_bytes = access_fd.to_ne_bytes();
-                    if let Err(err) = register_pci.call_wo(
-                        &access_bytes,
-                        syscall::CallFlags::WRITE | syscall::CallFlags::FD,
-                        &[],
-                    ) {
-                        warn!("pcid: failed to send pci_fd to acpid: {:?}", err);
-                    }
-                }
-            }
-            Err(err) => {
-                if err.errno() == libredox::errno::ENODEV {
-                    debug!("pcid: acpid not found. Running without ACPI integration.");
-                } else {
-                    warn!("pcid: failed to open acpid register_pci (error: {}). Running without ACPI integration.", err);
-                }
-            }
-        }
-    }
-
-    // FIXME Use full ACPI for enumerating the host bridges. MCFG only describes the first
-    // host bridge, while multi-processor systems likely have a host bridge for each CPU.
-    // See also https://www.kernel.org/doc/html/latest/PCI/acpi-info.html
-    // Bus 0x80 is scanned for compatibility with newer (Arrow Lake) Intel CPUs where PCH devices
-    // are there. This workaround may not be required if we had ACPI bus enumeration.
-    let mut bus_nums = vec![0, 0x80];
-    let mut bus_i = 0;
-    while bus_i < bus_nums.len() {
-        let bus_num = bus_nums[bus_i];
-        bus_i += 1;
-
-        for dev_num in 0..32 {
-            scan_device(
-                &mut scheme.tree,
-                &scheme.pcie,
-                &mut bus_nums,
-                bus_num,
-                dev_num,
-            );
-        }
-    }
-    debug!("Enumeration complete, now starting pci scheme");
-
-    if let Err(err) = register_sync_scheme(&socket, "pci", &mut scheme) {
-        error!("pcid: failed to register pci scheme to namespace: {:?}", err);
-        std::process::exit(1);
-    }
-
-    let _ = daemon.ready();
-
-    handler.process_requests_blocking(scheme).unwrap_or_else(|err| {
-        error!("pcid: failed to process requests: {:?}", err);
-        std::process::exit(1);
-    });
-}
-
-fn scan_device(
-    tree: &mut BTreeMap<PciAddress, Func>,
-    pcie: &Pcie,
-    bus_nums: &mut Vec<u8>,
-    bus_num: u8,
-    dev_num: u8,
-) {
-    for func_num in 0..8 {
-        let header = TyPciHeader::new(PciAddress::new(0, bus_num, dev_num, func_num));
-
-        let (vendor_id, device_id) = header.id(pcie);
-        if vendor_id == 0xffff && device_id == 0xffff {
-            if func_num == 0 {
-                trace!("PCI {:>02X}:{:>02X}: no dev", bus_num, dev_num);
-                return;
-            }
-
-            continue;
-        }
-
-        let (revision, class, subclass, interface) = header.revision_and_class(pcie);
-        let full_device_id = FullDeviceId {
-            vendor_id,
-            device_id,
-            class,
-            subclass,
-            interface,
-            revision,
-        };
-
-        info!("PCI {} {}", header.address(), full_device_id.display());
-
-        let has_multiple_functions = header.has_multiple_functions(pcie);
-
-        match header.header_type(pcie) {
-            HeaderType::Endpoint => {
-                handle_parsed_header(
-                    pcie,
-                    tree,
-                    EndpointHeader::from_header(header, pcie).unwrap(),
-                    full_device_id,
-                );
-            }
-            HeaderType::PciPciBridge => {
-                let bridge_header = PciPciBridgeHeader::from_header(header, pcie).unwrap();
-                bus_nums.push(bridge_header.secondary_bus_number(pcie));
-            }
-            ty => {
-                warn!("pcid: unknown header type: {ty:?}");
-            }
-        }
-
-        if func_num == 0 && !has_multiple_functions {
-            return;
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/pcid/src/scheme.rs b/recipes/core/base/drivers/pcid/src/scheme.rs
deleted file mode 100644
index bb9f39a318..0000000000
--- a/recipes/core/base/drivers/pcid/src/scheme.rs
+++ /dev/null
@@ -1,428 +0,0 @@
-use std::collections::{BTreeMap, VecDeque};
-
-use pci_types::{ConfigRegionAccess, PciAddress};
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult};
-use scheme_utils::HandleMap;
-use syscall::dirent::{DirEntry, DirentBuf, DirentKind};
-use syscall::error::{Error, Result, EACCES, EBADF, EINVAL, EIO, EISDIR, ENOENT, ENOTDIR};
-use syscall::flag::{MODE_CHR, MODE_DIR, O_DIRECTORY, O_STAT};
-use syscall::schemev2::NewFdFlags;
-use syscall::ENOLCK;
-
-use crate::cfg_access::Pcie;
-
-pub struct PciScheme {
-    handles: HandleMap<HandleWrapper>,
-    pub pcie: Pcie,
-    pub tree: BTreeMap<PciAddress, crate::Func>,
-}
-enum Handle {
-    TopLevel { entries: Vec<String> },
-    Access,
-    Device,
-    Channel { addr: PciAddress, st: ChannelState },
-    SchemeRoot,
-}
-struct HandleWrapper {
-    inner: Handle,
-    stat: bool,
-}
-impl Handle {
-    fn is_file(&self) -> bool {
-        matches!(self, Self::Access | Self::Channel { .. })
-    }
-    fn is_dir(&self) -> bool {
-        !self.is_file()
-    }
-    // TODO: capability rather than root
-    fn requires_root(&self) -> bool {
-        matches!(self, Self::Access | Self::Channel { .. })
-    }
-    fn is_scheme_root(&self) -> bool {
-        matches!(self, Self::SchemeRoot)
-    }
-}
-
-enum ChannelState {
-    AwaitingData,
-    AwaitingResponseRead(VecDeque<u8>),
-}
-
-const DEVICE_CONTENTS: &[&str] = &["channel"];
-
-impl PciScheme {
-    pub fn access(&mut self) -> usize {
-        self.handles.insert(HandleWrapper {
-            inner: Handle::Access,
-            stat: false,
-        })
-    }
-}
-
-impl SchemeSync for PciScheme {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(HandleWrapper {
-            inner: Handle::SchemeRoot,
-            stat: false,
-        }))
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        let handle = self.handles.get(dirfd)?;
-        if !handle.inner.is_scheme_root() {
-            return Err(Error::new(EACCES));
-        }
-
-        log::trace!("OPEN `{}` flags {}", path, flags);
-
-        // TODO: Check flags are correct
-        let expects_dir = path.ends_with('/') || flags & O_DIRECTORY != 0;
-
-        let path = path.trim_matches('/');
-
-        let handle = if path.is_empty() {
-            Handle::TopLevel {
-                entries: self
-                    .tree
-                    .iter()
-                    // FIXME remove replacement of : once the old scheme format is no longer supported.
-                    .map(|(addr, _)| format!("{}", addr).replace(':', "--"))
-                    .collect::<Vec<_>>(),
-            }
-        } else if path == "access" {
-            Handle::Access
-        } else {
-            let idx = path.find('/').unwrap_or(path.len());
-            let (addr_str, after) = path.split_at(idx);
-            let addr = parse_pci_addr(addr_str).ok_or(Error::new(ENOENT))?;
-
-            self.parse_after_pci_addr(addr, after)?
-        };
-
-        let stat = flags & O_STAT != 0;
-        if expects_dir && handle.is_file() && !stat {
-            return Err(Error::new(ENOTDIR));
-        }
-        if !expects_dir && handle.is_dir() && !stat {
-            return Err(Error::new(EISDIR));
-        }
-        if ctx.uid != 0 && handle.requires_root() && !stat {
-            return Err(Error::new(EACCES));
-        }
-
-        let id = self.handles.insert(HandleWrapper {
-            inner: handle,
-            stat,
-        });
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::POSITIONED,
-        })
-    }
-    fn fstat(&mut self, id: usize, stat: &mut syscall::Stat, _ctx: &CallerCtx) -> Result<()> {
-        let handle = self.handles.get_mut(id)?;
-
-        let (len, mode) = match handle.inner {
-            Handle::TopLevel { ref entries } => (entries.len(), MODE_DIR | 0o755),
-            Handle::Device => (DEVICE_CONTENTS.len(), MODE_DIR | 0o755),
-            Handle::Access | Handle::Channel { .. } => (0, MODE_CHR | 0o600),
-            Handle::SchemeRoot => return Err(Error::new(EBADF)),
-        };
-        stat.st_size = len as u64;
-        stat.st_mode = mode;
-        Ok(())
-    }
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.handles.get_mut(id)?;
-
-        if handle.stat {
-            return Err(Error::new(EBADF));
-        }
-
-        match handle.inner {
-            Handle::TopLevel { .. } => Err(Error::new(EISDIR)),
-            Handle::Device => Err(Error::new(EISDIR)),
-            Handle::Channel {
-                addr: _,
-                ref mut st,
-            } => Self::read_channel(st, buf),
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-            _ => Err(Error::new(EBADF)),
-        }
-    }
-    fn getdents<'buf>(
-        &mut self,
-        id: usize,
-        mut buf: DirentBuf<&'buf mut [u8]>,
-        opaque_offset: u64,
-    ) -> Result<DirentBuf<&'buf mut [u8]>> {
-        let Ok(offset) = usize::try_from(opaque_offset) else {
-            return Ok(buf);
-        };
-
-        let handle = self.handles.get_mut(id)?;
-
-        if handle.stat {
-            return Err(Error::new(EBADF));
-        }
-
-        let entries = match handle.inner {
-            Handle::TopLevel { ref entries } => {
-                for (i, dent_name) in entries.iter().enumerate().skip(offset) {
-                    buf.entry(DirEntry {
-                        inode: 0,
-                        name: dent_name,
-                        kind: DirentKind::Unspecified,
-                        next_opaque_id: i as u64 + 1,
-                    })?;
-                }
-                return Ok(buf);
-            }
-            Handle::Device => DEVICE_CONTENTS,
-            Handle::Access | Handle::Channel { .. } => return Err(Error::new(ENOTDIR)),
-            Handle::SchemeRoot => return Err(Error::new(EBADF)),
-        };
-
-        for (i, dent_name) in entries.iter().enumerate().skip(offset) {
-            buf.entry(DirEntry {
-                inode: 0,
-                name: dent_name,
-                kind: DirentKind::Unspecified,
-                next_opaque_id: i as u64 + 1,
-            })?;
-        }
-        Ok(buf)
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.handles.get_mut(id)?;
-
-        if handle.stat {
-            return Err(Error::new(EBADF));
-        }
-
-        match handle.inner {
-            Handle::Channel { addr, ref mut st } => {
-                Self::write_channel(&self.pcie, &mut self.tree, addr, st, buf)
-            }
-
-            _ => Err(Error::new(EBADF)),
-        }
-    }
-
-    fn call(
-        &mut self,
-        id: usize,
-        payload: &mut [u8],
-        metadata: &[u64],
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.handles.get_mut(id)?;
-
-        if handle.stat {
-            return Err(Error::new(EBADF));
-        }
-
-        match handle.inner {
-            Handle::Access => {
-                let payload_len = u16::try_from(payload.len()).map_err(|_| Error::new(EINVAL))?;
-                let write = match metadata.get(0) {
-                    Some(1) => false,
-                    Some(2) => true,
-                    _ => return Err(Error::new(EINVAL)),
-                };
-                let (addr, offset) = match metadata.get(1) {
-                    Some(value) => {
-                        // Segment: u16, at 28 bits
-                        // Bus: u8, 8 bits, 256 total, at 20 bits
-                        // Device: u8, 5 bits, 32 total, at 15 bits
-                        // Function: u8, 3 bits, 8 total, at 12 bits
-                        // Offset: u16, 12 bits, 4096 total, at 0 bits
-                        (
-                            PciAddress::new(
-                                ((value >> 28) & 0xFFFF) as u16,
-                                ((value >> 20) & 0xFF) as u8,
-                                ((value >> 15) & 0x1F) as u8,
-                                ((value >> 12) & 0x7) as u8,
-                            ),
-                            (value & 0xFFF) as u16,
-                        )
-                    }
-                    None => return Err(Error::new(EINVAL)),
-                };
-                // This handle must allow less than 4 byte access, but the
-                // lower level only works with 4 byte reads and writes
-                let unaligned = offset % 4;
-                let start = offset - unaligned;
-                let end = offset + payload_len;
-                let mut i = 0;
-                while start + i < end {
-                    let mut bytes = unsafe { self.pcie.read(addr, start + i) }.to_le_bytes();
-                    for j in 0..bytes.len() {
-                        if let Some(payload_i) = i.checked_sub(unaligned) {
-                            if let Some(payload_b) = payload.get_mut(usize::from(payload_i)) {
-                                if write {
-                                    bytes[j] = *payload_b;
-                                } else {
-                                    *payload_b = bytes[j]
-                                }
-                            }
-                        }
-                        i += 1;
-                    }
-                    if write {
-                        let value = u32::from_le_bytes(bytes);
-                        unsafe {
-                            self.pcie.write(addr, start + i, value);
-                        }
-                    }
-                }
-                Ok(payload.len())
-            }
-
-            _ => Err(Error::new(EBADF)),
-        }
-    }
-
-    fn on_close(&mut self, id: usize) {
-        match self.handles.remove(id) {
-            Some(HandleWrapper {
-                inner: Handle::Channel { addr, .. },
-                ..
-            }) => {
-                log::trace!("TODO: Support disabling device (called on {})", addr);
-                if let Some(func) = self.tree.get_mut(&addr) {
-                    func.enabled = false;
-                }
-            }
-            _ => {}
-        }
-    }
-}
-
-impl PciScheme {
-    pub fn new(pcie: Pcie) -> Self {
-        Self {
-            handles: HandleMap::new(),
-            pcie,
-            tree: BTreeMap::new(),
-        }
-    }
-    fn parse_after_pci_addr(&mut self, addr: PciAddress, after: &str) -> Result<Handle> {
-        if after.chars().next().map_or(false, |c| c != '/') {
-            return Err(Error::new(ENOENT));
-        }
-        let func = self.tree.get_mut(&addr).ok_or(Error::new(ENOENT))?;
-
-        Ok(if after.is_empty() {
-            Handle::Device
-        } else {
-            let path = &after[1..];
-
-            match path {
-                "channel" => {
-                    if func.enabled {
-                        return Err(Error::new(ENOLCK));
-                    }
-                    func.inner.legacy_interrupt_line = crate::enable_function(
-                        &self.pcie,
-                        &mut func.endpoint_header,
-                        &mut func.capabilities,
-                    );
-                    func.enabled = true;
-                    Handle::Channel {
-                        addr,
-                        st: ChannelState::AwaitingData,
-                    }
-                }
-                _ => return Err(Error::new(ENOENT)),
-            }
-        })
-    }
-
-    fn read_channel(state: &mut ChannelState, buf: &mut [u8]) -> Result<usize> {
-        match *state {
-            ChannelState::AwaitingResponseRead(ref mut queue) => {
-                let byte_count = std::cmp::min(queue.len(), buf.len());
-                // XXX: Why can't VecDeque support dequeueing into slices?
-                for (idx, byte) in queue.drain(..byte_count).enumerate() {
-                    buf[idx] = byte;
-                }
-                if queue.is_empty() {
-                    *state = ChannelState::AwaitingData;
-                }
-                Ok(byte_count)
-            }
-            ChannelState::AwaitingData => Err(Error::new(EINVAL)),
-        }
-    }
-    fn write_channel(
-        pci_state: &Pcie,
-        tree: &mut BTreeMap<PciAddress, crate::Func>,
-        addr: PciAddress,
-        state: &mut ChannelState,
-        buf: &[u8],
-    ) -> Result<usize> {
-        match *state {
-            ChannelState::AwaitingResponseRead(_) => return Err(Error::new(EINVAL)),
-            ChannelState::AwaitingData => {
-                let func = tree.get_mut(&addr).unwrap();
-
-                let request = bincode::deserialize_from(buf).map_err(|_| Error::new(EINVAL))?;
-                let response = crate::driver_handler::DriverHandler::new(
-                    func.inner.clone(),
-                    &mut func.endpoint_header,
-                    &mut func.capabilities,
-                    &*pci_state,
-                )
-                .respond(request);
-
-                let mut output_bytes = vec![0_u8; 8];
-                bincode::serialize_into(&mut output_bytes, &response)
-                    .map_err(|_| Error::new(EIO))?;
-                let len = output_bytes.len() - 8;
-                output_bytes[..8].copy_from_slice(&u64::to_le_bytes(len as u64));
-                *state = ChannelState::AwaitingResponseRead(output_bytes.into());
-
-                Ok(buf.len())
-            }
-        }
-    }
-}
-
-fn parse_pci_addr(addr: &str) -> Option<PciAddress> {
-    // FIXME use : instead of -- as separator once the old scheme format is no longer supported.
-    let (segment, rest) = addr.split_once("--")?;
-    let segment = u16::from_str_radix(segment, 16).ok()?;
-
-    // FIXME use : instead of -- as separator once the old scheme format is no longer supported.
-    let (bus, rest) = rest.split_once("--")?;
-    let bus = u8::from_str_radix(bus, 16).ok()?;
-
-    let (device, function) = rest.split_once('.')?;
-    let device = u8::from_str_radix(device, 16).ok()?;
-    let function = u8::from_str_radix(function, 16).ok()?;
-
-    Some(PciAddress::new(segment, bus, device, function))
-}
diff --git a/recipes/core/base/drivers/redoxerd/Cargo.toml b/recipes/core/base/drivers/redoxerd/Cargo.toml
deleted file mode 100644
index 6214b45a6f..0000000000
--- a/recipes/core/base/drivers/redoxerd/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "redoxerd"
-description = "Redoxer QEMU daemon"
-version = "0.1.0"
-authors = ["Jeremy Soller <jackpot51@gmail.com>"]
-edition = "2018"
-
-[dependencies]
-anyhow.workspace = true
-libredox.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-redox_termios.workspace = true
-common = { path = "../common" }
-qemu-exit = "3.0.2"
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/redoxerd/src/main.rs b/recipes/core/base/drivers/redoxerd/src/main.rs
deleted file mode 100644
index 5ecd0b4672..0000000000
--- a/recipes/core/base/drivers/redoxerd/src/main.rs
+++ /dev/null
@@ -1,184 +0,0 @@
-use anyhow::Context;
-use std::fs::{self, OpenOptions};
-use std::io;
-use std::os::unix::io::{FromRawFd, IntoRawFd, RawFd};
-use std::process::{Child, Command, ExitStatus, Stdio};
-
-mod sys;
-
-const DEFAULT_COLS: u32 = 80;
-const DEFAULT_LINES: u32 = 30;
-
-event::user_data! {
-    enum EventData {
-        Pty,
-        Timer,
-    }
-}
-
-fn handle(
-    event_queue: event::EventQueue<EventData>,
-    master_fd: RawFd,
-    timeout_fd: RawFd,
-    process: &mut Child,
-) -> io::Result<ExitStatus> {
-    let handle_event = |event: EventData| -> io::Result<bool> {
-        match event {
-            EventData::Pty => {
-                let mut packet = [0; 4096];
-                loop {
-                    // Read data from PTY master
-                    let count = match libredox::call::read(master_fd as usize, &mut packet) {
-                        Ok(0) => return Ok(false),
-                        Ok(count) => count,
-                        Err(ref err) if err.errno() == libredox::errno::EAGAIN => return Ok(true),
-                        Err(err) => return Err(err.into()),
-                    };
-
-                    // Write data to stdout
-                    libredox::call::write(1, &packet[1..count])?;
-
-                    for i in 1..count {
-                        // Write byte to QEMU debugcon (Bochs compatible)
-                        sys::debug_char(packet[i]);
-                    }
-                }
-            }
-            EventData::Timer => {
-                let mut timespec = syscall::TimeSpec::default();
-                libredox::call::read(timeout_fd as usize, &mut timespec)?;
-
-                timespec.tv_sec += 1;
-                libredox::call::write(timeout_fd as usize, &mut timespec)?;
-
-                Ok(true)
-            }
-        }
-    };
-
-    if handle_event(EventData::Pty)? && handle_event(EventData::Timer)? {
-        'events: loop {
-            match process.try_wait() {
-                Ok(status_opt) => match status_opt {
-                    Some(status) => return Ok(status),
-                    None => (),
-                },
-                Err(err) => match err.kind() {
-                    io::ErrorKind::WouldBlock => (),
-                    _ => return Err(err),
-                },
-            }
-
-            let event = event_queue.next_event()?;
-            if !handle_event(event.user_data)? {
-                break 'events;
-            }
-        }
-    }
-
-    let _ = process.kill();
-    process.wait()
-}
-
-fn getpty(columns: u32, lines: u32) -> io::Result<(RawFd, String)> {
-    let master = libredox::call::open(
-        "/scheme/pty",
-        libredox::flag::O_CLOEXEC
-            | libredox::flag::O_RDWR
-            | libredox::flag::O_CREAT
-            | libredox::flag::O_NONBLOCK,
-        0,
-    )?;
-
-    if let Ok(winsize_fd) = libredox::call::dup(master, b"winsize") {
-        let _ = libredox::call::write(
-            winsize_fd,
-            &redox_termios::Winsize {
-                ws_row: lines as u16,
-                ws_col: columns as u16,
-            },
-        );
-        let _ = libredox::call::close(winsize_fd);
-    }
-
-    let mut buf: [u8; 4096] = [0; 4096];
-    let count = libredox::call::fpath(master, &mut buf)?;
-    Ok((master as RawFd, unsafe {
-        String::from_utf8_unchecked(Vec::from(&buf[..count]))
-    }))
-}
-
-fn inner() -> anyhow::Result<()> {
-    common::acquire_port_io_rights()?;
-
-    let config = fs::read_to_string("/etc/redoxerd").context("Failed to read /etc/redoxerd")?;
-    let mut config_lines = config.lines();
-
-    let (columns, lines) = (DEFAULT_COLS, DEFAULT_LINES);
-    let (master_fd, pty) = getpty(columns, lines)?;
-
-    let timeout_fd = libredox::call::open(
-        "/scheme/time/4",
-        libredox::flag::O_CLOEXEC | libredox::flag::O_RDWR | libredox::flag::O_NONBLOCK,
-        0,
-    )? as RawFd;
-
-    let event_queue = event::EventQueue::new()?;
-    event_queue.subscribe(master_fd as usize, EventData::Pty, event::EventFlags::READ)?;
-    event_queue.subscribe(
-        timeout_fd as usize,
-        EventData::Timer,
-        event::EventFlags::READ,
-    )?;
-
-    let slave_stdin = OpenOptions::new().read(true).open(&pty)?;
-    let slave_stdout = OpenOptions::new().write(true).open(&pty)?;
-    let slave_stderr = OpenOptions::new().write(true).open(&pty)?;
-
-    let Some(name) = config_lines.next() else {
-        anyhow::bail!("/etc/redoxerd does not specify command");
-    };
-    let mut command = Command::new(name);
-    for arg in config_lines {
-        command.arg(arg);
-    }
-    unsafe {
-        command
-            .stdin(Stdio::from_raw_fd(slave_stdin.into_raw_fd()))
-            .stdout(Stdio::from_raw_fd(slave_stdout.into_raw_fd()))
-            .stderr(Stdio::from_raw_fd(slave_stderr.into_raw_fd()))
-            .env("COLUMNS", format!("{}", columns))
-            .env("LINES", format!("{}", lines))
-            .env("TERM", "xterm-256color")
-            .env("TTY", &pty);
-    }
-
-    let mut process = command
-        .spawn()
-        .with_context(|| format!("Failed to spawn {command:?}"))?;
-    let status = handle(event_queue, master_fd, timeout_fd, &mut process)
-        .with_context(|| format!("Failed to run {name}"))?;
-    if status.success() {
-        Ok(())
-    } else {
-        anyhow::bail!("{name} failed with {}", status);
-    }
-}
-
-fn main() {
-    match inner() {
-        Ok(()) => {
-            // Exit with success using qemu device
-            sys::exit_success();
-        }
-        Err(err) => {
-            eprintln!("redoxerd: {:#}", err);
-
-            // Wait a bit for the error message to get flushed through the tty subsystem before exiting.
-            std::thread::sleep(std::time::Duration::from_millis(100));
-
-            // Exit with error using qemu device
-            sys::exit_failure();
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/redoxerd/src/sys.rs b/recipes/core/base/drivers/redoxerd/src/sys.rs
deleted file mode 100644
index 2731eacefb..0000000000
--- a/recipes/core/base/drivers/redoxerd/src/sys.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-pub fn exit_success() {
-    imp::exit(true);
-}
-
-pub fn exit_failure() {
-    imp::exit(false);
-}
-
-pub fn debug_char(b: u8) {
-    let _ = imp::write_debug(b);
-}
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-mod imp {
-    use syscall::Io;
-    use syscall::Pio;
-
-    pub fn exit(success: bool) {
-        if success {
-            Pio::<u16>::new(0x604).write(0x2000);
-            Pio::<u8>::new(0x501).write(51 / 2);
-        } else {
-            Pio::<u8>::new(0x501).write(53 / 2);
-        }
-    }
-
-    pub fn write_debug(b: u8) -> syscall::Result<()> {
-        Pio::<u8>::new(0xe9).write(b);
-        Ok(())
-    }
-}
-
-#[cfg(target_arch = "aarch64")]
-mod imp {
-    use qemu_exit::QEMUExit;
-
-    pub fn exit(success: bool) {
-        let q = qemu_exit::AArch64::new();
-        if success {
-            q.exit(51)
-        } else {
-            q.exit(53)
-        }
-    }
-
-    pub fn write_debug(b: u8) -> syscall::Result<()> {
-        // TODO
-        Ok(())
-    }
-}
-
-#[cfg(target_arch = "riscv64")]
-mod imp {
-
-    pub fn exit(success: bool) {
-        todo!()
-        // let q = qemu_exit::RISCV64::new(addr);
-        // if success {
-        //     q.exit(51)
-        // } else {
-        //     q.exit(53)
-        // }
-    }
-
-    pub fn write_debug(b: u8) -> syscall::Result<()> {
-        // TODO
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/drivers/rtcd/Cargo.toml b/recipes/core/base/drivers/rtcd/Cargo.toml
deleted file mode 100644
index 123b04f68c..0000000000
--- a/recipes/core/base/drivers/rtcd/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "rtcd"
-description = "x86 Real Time Clock daemon"
-version = "0.1.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-edition = "2018"
-license = "MIT"
-
-
-[dependencies]
-anyhow.workspace = true
-
-common = { path = "../common" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/rtcd/src/main.rs b/recipes/core/base/drivers/rtcd/src/main.rs
deleted file mode 100644
index 3e913780ab..0000000000
--- a/recipes/core/base/drivers/rtcd/src/main.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use anyhow::{Context, Result};
-
-// TODO: Do not use target architecture to distinguish these.
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-mod x86;
-
-/// The rtc driver runs only once, being perhaps the first of all processes that init starts (since
-/// early logging benefits from knowing the time, even though this can be adjusted later once the
-/// time is known). The sole job of `rtcd` is to read from the hardware real-time clock, and then
-/// write the offset to the kernel.
-
-fn main() -> Result<()> {
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    {
-        common::acquire_port_io_rights().context("failed to set iopl")?;
-
-        let time_s = self::x86::get_time();
-        let time_ns = u128::from(time_s) * 1_000_000_000;
-
-        std::fs::write("/scheme/sys/update_time_offset", &time_ns.to_ne_bytes())
-            .context("failed to write to time offset")?;
-    }
-    // TODO: aarch64 is currently handled in the kernel
-
-    Ok(())
-}
diff --git a/recipes/core/base/drivers/rtcd/src/x86.rs b/recipes/core/base/drivers/rtcd/src/x86.rs
deleted file mode 100644
index ea2aebcbbf..0000000000
--- a/recipes/core/base/drivers/rtcd/src/x86.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-// TODO: Get RTC information from acpid.
-use common::io::{Io, Pio};
-
-pub fn get_time() -> u64 {
-    Rtc::new().time()
-}
-
-fn cvt_bcd(value: usize) -> usize {
-    (value & 0xF) + ((value / 16) * 10)
-}
-
-/// RTC
-pub struct Rtc {
-    addr: Pio<u8>,
-    data: Pio<u8>,
-    nmi: bool,
-}
-
-impl Rtc {
-    /// Create new empty RTC
-    pub fn new() -> Self {
-        Rtc {
-            addr: Pio::<u8>::new(0x70),
-            data: Pio::<u8>::new(0x71),
-            nmi: false,
-        }
-    }
-
-    /// Read
-    unsafe fn read(&mut self, reg: u8) -> u8 {
-        if self.nmi {
-            self.addr.write(reg & 0x7F);
-        } else {
-            self.addr.write(reg | 0x80);
-        }
-        self.data.read()
-    }
-
-    /// Write
-    #[allow(dead_code)]
-    unsafe fn write(&mut self, reg: u8, value: u8) {
-        if self.nmi {
-            self.addr.write(reg & 0x7F);
-        } else {
-            self.addr.write(reg | 0x80);
-        }
-        self.data.write(value);
-    }
-
-    /// Wait for an update, can take one second if full is specified!
-    unsafe fn wait(&mut self, full: bool) {
-        if full {
-            while self.read(0xA) & 0x80 != 0x80 {}
-        }
-        while self.read(0xA) & 0x80 == 0x80 {}
-    }
-
-    /// Get time without waiting
-    pub unsafe fn time_no_wait(&mut self) -> u64 {
-        /*let century_register = if let Some(ref fadt) = acpi::ACPI_TABLE.lock().fadt {
-            Some(fadt.century)
-        } else {
-            None
-        };*/
-
-        let mut second = self.read(0) as usize;
-        let mut minute = self.read(2) as usize;
-        let mut hour = self.read(4) as usize;
-        let mut day = self.read(7) as usize;
-        let mut month = self.read(8) as usize;
-        let mut year = self.read(9) as usize;
-        let mut century = /* TODO: Fix invalid value from VirtualBox
-        if let Some(century_reg) = century_register {
-            self.read(century_reg) as usize
-        } else */ {
-            20
-        };
-        let register_b = self.read(0xB);
-
-        if register_b & 4 != 4 {
-            second = cvt_bcd(second);
-            minute = cvt_bcd(minute);
-            hour = cvt_bcd(hour & 0x7F) | (hour & 0x80);
-            day = cvt_bcd(day);
-            month = cvt_bcd(month);
-            year = cvt_bcd(year);
-            century = /* TODO: Fix invalid value from VirtualBox
-            if century_register.is_some() {
-                cvt_bcd(century)
-            } else */ {
-                century
-            };
-        }
-
-        if register_b & 2 != 2 || hour & 0x80 == 0x80 {
-            hour = ((hour & 0x7F) + 12) % 24;
-        }
-
-        year += century * 100;
-
-        // Unix time from clock
-        let mut secs: u64 = (year as u64 - 1970) * 31_536_000;
-
-        let mut leap_days = (year as u64 - 1972) / 4 + 1;
-        if year % 4 == 0 && month <= 2 {
-            leap_days -= 1;
-        }
-        secs += leap_days * 86_400;
-
-        match month {
-            2 => secs += 2_678_400,
-            3 => secs += 5_097_600,
-            4 => secs += 7_776_000,
-            5 => secs += 10_368_000,
-            6 => secs += 13_046_400,
-            7 => secs += 15_638_400,
-            8 => secs += 18_316_800,
-            9 => secs += 20_995_200,
-            10 => secs += 23_587_200,
-            11 => secs += 26_265_600,
-            12 => secs += 28_857_600,
-            _ => (),
-        }
-
-        secs += (day as u64 - 1) * 86_400;
-        secs += hour as u64 * 3600;
-        secs += minute as u64 * 60;
-        secs += second as u64;
-
-        secs
-    }
-
-    /// Get time
-    pub fn time(&mut self) -> u64 {
-        loop {
-            unsafe {
-                self.wait(false);
-                let time = self.time_no_wait();
-                self.wait(false);
-                let next_time = self.time_no_wait();
-                if time == next_time {
-                    return time;
-                }
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/storage/ahcid/.gitignore b/recipes/core/base/drivers/storage/ahcid/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/storage/ahcid/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/storage/ahcid/Cargo.toml b/recipes/core/base/drivers/storage/ahcid/Cargo.toml
deleted file mode 100644
index 91458cf1d1..0000000000
--- a/recipes/core/base/drivers/storage/ahcid/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "ahcid"
-description = "AHCI (SATA standard) driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-byteorder = "1.2"
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-block = { path = "../driver-block" }
-pcid = { path = "../../pcid" }
-libredox.workspace = true
-redox_event.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/storage/ahcid/src/ahci/disk_ata.rs b/recipes/core/base/drivers/storage/ahcid/src/ahci/disk_ata.rs
deleted file mode 100644
index 4f83c51dcf..0000000000
--- a/recipes/core/base/drivers/storage/ahcid/src/ahci/disk_ata.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-use std::convert::TryInto;
-use std::ptr;
-
-use syscall::error::Result;
-
-use common::dma::Dma;
-
-use super::hba::{HbaCmdHeader, HbaCmdTable, HbaPort};
-use super::Disk;
-
-enum BufferKind<'a> {
-    Read(&'a mut [u8]),
-    Write(&'a [u8]),
-}
-
-struct Request {
-    address: usize,
-    total_sectors: usize,
-    sector: usize,
-    running_opt: Option<(u32, usize)>,
-}
-
-pub struct DiskATA {
-    id: usize,
-    port: &'static mut HbaPort,
-    size: u64,
-    request_opt: Option<Request>,
-    clb: Dma<[HbaCmdHeader; 32]>,
-    ctbas: [Dma<HbaCmdTable>; 32],
-    _fb: Dma<[u8; 256]>,
-    buf: Dma<[u8; 256 * 512]>,
-}
-
-impl DiskATA {
-    pub fn new(id: usize, port: &'static mut HbaPort) -> Result<Self> {
-        let mut clb = unsafe { Dma::zeroed()?.assume_init() };
-
-        let mut ctbas: [_; 32] = (0..32)
-            .map(|_| Ok(unsafe { Dma::zeroed()?.assume_init() }))
-            .collect::<Result<Vec<_>>>()?
-            .try_into()
-            .unwrap_or_else(|_| unreachable!());
-
-        let mut fb = unsafe { Dma::zeroed()?.assume_init() };
-        let buf = unsafe { Dma::zeroed()?.assume_init() };
-
-        port.init(&mut clb, &mut ctbas, &mut fb)?;
-
-        let size = unsafe { port.identify(&mut clb, &mut ctbas).unwrap_or(0) };
-
-        Ok(DiskATA {
-            id: id,
-            port: port,
-            size: size,
-            request_opt: None,
-            clb: clb,
-            ctbas,
-            _fb: fb,
-            buf: buf,
-        })
-    }
-
-    fn request(&mut self, block: u64, mut buffer_kind: BufferKind) -> Result<Option<usize>> {
-        let (write, address, total_sectors) = match buffer_kind {
-            BufferKind::Read(ref buffer) => (false, buffer.as_ptr() as usize, buffer.len() / 512),
-            BufferKind::Write(ref buffer) => (true, buffer.as_ptr() as usize, buffer.len() / 512),
-        };
-
-        loop {
-            let mut request = match self.request_opt.take() {
-                Some(request) => {
-                    if address == request.address && total_sectors == request.total_sectors {
-                        // Keep servicing current request
-                        request
-                    } else {
-                        // Have to wait for another request to finish
-                        self.request_opt = Some(request);
-                        return Ok(None);
-                    }
-                }
-                None => {
-                    // Create new request
-                    Request {
-                        address,
-                        total_sectors,
-                        sector: 0,
-                        running_opt: None,
-                    }
-                }
-            };
-
-            // Finish a previously running request
-            if let Some(running) = request.running_opt.take() {
-                if self.port.ata_running(running.0) {
-                    // Continue waiting for request
-                    request.running_opt = Some(running);
-                    self.request_opt = Some(request);
-                    return Ok(None);
-                }
-
-                self.port.ata_stop(running.0)?;
-
-                if let BufferKind::Read(ref mut buffer) = buffer_kind {
-                    unsafe {
-                        ptr::copy(
-                            self.buf.as_ptr(),
-                            buffer.as_mut_ptr().add(request.sector * 512),
-                            running.1 * 512,
-                        );
-                    }
-                }
-
-                request.sector += running.1;
-            }
-
-            if request.sector < request.total_sectors {
-                // Start a new request
-                let sectors = if request.total_sectors - request.sector >= 255 {
-                    255
-                } else {
-                    request.total_sectors - request.sector
-                };
-
-                if let BufferKind::Write(ref buffer) = buffer_kind {
-                    unsafe {
-                        ptr::copy(
-                            buffer.as_ptr().add(request.sector * 512),
-                            self.buf.as_mut_ptr(),
-                            sectors * 512,
-                        );
-                    }
-                }
-
-                if let Some(slot) = self.port.ata_dma(
-                    block + request.sector as u64,
-                    sectors,
-                    write,
-                    &mut self.clb,
-                    &mut self.ctbas,
-                    &mut self.buf,
-                )? {
-                    request.running_opt = Some((slot, sectors));
-                }
-
-                self.request_opt = Some(request);
-
-                // TODO: support async internally
-                return Ok(None);
-            } else {
-                // Done
-                return Ok(Some(request.sector * 512));
-            }
-        }
-    }
-}
-
-impl Disk for DiskATA {
-    fn block_size(&self) -> u32 {
-        512
-    }
-
-    fn size(&self) -> u64 {
-        self.size
-    }
-
-    async fn read(&mut self, block: u64, buffer: &mut [u8]) -> Result<usize> {
-        //TODO: FIGURE OUT WHY INTERRUPTS CAUSE HANGS
-        loop {
-            match self.request(block, BufferKind::Read(buffer))? {
-                Some(count) => return Ok(count),
-                None => std::thread::yield_now(),
-            }
-        }
-    }
-
-    async fn write(&mut self, block: u64, buffer: &[u8]) -> Result<usize> {
-        //TODO: FIGURE OUT WHY INTERRUPTS CAUSE HANGS
-        loop {
-            match self.request(block, BufferKind::Write(buffer))? {
-                Some(count) => return Ok(count),
-                None => std::thread::yield_now(),
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/storage/ahcid/src/ahci/disk_atapi.rs b/recipes/core/base/drivers/storage/ahcid/src/ahci/disk_atapi.rs
deleted file mode 100644
index a0e75c0964..0000000000
--- a/recipes/core/base/drivers/storage/ahcid/src/ahci/disk_atapi.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-#![allow(dead_code)]
-
-use std::convert::TryInto;
-use std::ptr;
-
-use byteorder::{BigEndian, ByteOrder};
-
-use syscall::error::{Error, Result, EBADF};
-
-use common::dma::Dma;
-
-use super::hba::{HbaCmdHeader, HbaCmdTable, HbaPort};
-use super::Disk;
-
-const SCSI_READ_CAPACITY: u8 = 0x25;
-const SCSI_READ10: u8 = 0x28;
-
-pub struct DiskATAPI {
-    id: usize,
-    port: &'static mut HbaPort,
-    size: u64,
-    clb: Dma<[HbaCmdHeader; 32]>,
-    ctbas: [Dma<HbaCmdTable>; 32],
-    _fb: Dma<[u8; 256]>,
-    // Just using the same buffer size as DiskATA
-    // Although the sector size is different (and varies)
-    buf: Dma<[u8; 256 * 512]>,
-    blk_count: u32,
-    blk_size: u32,
-}
-
-impl DiskATAPI {
-    pub fn new(id: usize, port: &'static mut HbaPort) -> Result<Self> {
-        let mut clb = unsafe { Dma::zeroed()?.assume_init() };
-
-        let mut ctbas: [_; 32] = (0..32)
-            .map(|_| Ok(unsafe { Dma::zeroed()?.assume_init() }))
-            .collect::<Result<Vec<_>>>()?
-            .try_into()
-            .unwrap_or_else(|_| unreachable!());
-
-        let mut fb = unsafe { Dma::zeroed()?.assume_init() };
-        let mut buf = unsafe { Dma::zeroed()?.assume_init() };
-
-        port.init(&mut clb, &mut ctbas, &mut fb)?;
-
-        let size = unsafe { port.identify_packet(&mut clb, &mut ctbas).unwrap_or(0) };
-
-        let mut cmd = [0; 16];
-        cmd[0] = SCSI_READ_CAPACITY;
-        port.atapi_dma(&cmd, 8, &mut clb, &mut ctbas, &mut buf)?;
-
-        // Instead of a count, contains number of last LBA, so add 1
-        let blk_count = BigEndian::read_u32(&buf[0..4]) + 1;
-        let blk_size = BigEndian::read_u32(&buf[4..8]);
-
-        Ok(DiskATAPI {
-            id,
-            port,
-            size,
-            clb,
-            ctbas,
-            _fb: fb,
-            buf,
-            blk_count,
-            blk_size,
-        })
-    }
-}
-
-impl Disk for DiskATAPI {
-    fn block_size(&self) -> u32 {
-        self.blk_size
-    }
-
-    fn size(&self) -> u64 {
-        u64::from(self.blk_count) * u64::from(self.blk_size)
-    }
-
-    async fn read(&mut self, block: u64, buffer: &mut [u8]) -> Result<usize> {
-        // TODO: Handle audio CDs, which use special READ CD command
-
-        let blk_len = self.blk_size;
-        let sectors = buffer.len() as u32 / blk_len;
-
-        fn read10_cmd(block: u32, count: u16) -> [u8; 16] {
-            let mut cmd = [0; 16];
-            cmd[0] = SCSI_READ10;
-            BigEndian::write_u32(&mut cmd[2..6], block as u32);
-            BigEndian::write_u16(&mut cmd[7..9], count as u16);
-            cmd
-        }
-
-        let mut sector = 0;
-        let buf_len = (256 * 512) / blk_len;
-        let buf_size = buf_len * blk_len;
-        while sectors - sector >= buf_len {
-            let cmd = read10_cmd(block as u32 + sector, buf_len as u16);
-            self.port.atapi_dma(
-                &cmd,
-                buf_size,
-                &mut self.clb,
-                &mut self.ctbas,
-                &mut self.buf,
-            )?;
-
-            unsafe {
-                ptr::copy(
-                    self.buf.as_ptr(),
-                    buffer
-                        .as_mut_ptr()
-                        .offset(sector as isize * blk_len as isize),
-                    buf_size as usize,
-                );
-            }
-
-            sector += blk_len;
-        }
-        if sector < sectors {
-            let cmd = read10_cmd(block as u32 + sector, (sectors - sector) as u16);
-            self.port.atapi_dma(
-                &cmd,
-                buf_size,
-                &mut self.clb,
-                &mut self.ctbas,
-                &mut self.buf,
-            )?;
-
-            unsafe {
-                ptr::copy(
-                    self.buf.as_ptr(),
-                    buffer
-                        .as_mut_ptr()
-                        .offset(sector as isize * blk_len as isize),
-                    ((sectors - sector) * blk_len) as usize,
-                );
-            }
-
-            sector += sectors - sector;
-        }
-
-        Ok((sector * blk_len) as usize)
-    }
-
-    async fn write(&mut self, _block: u64, _buffer: &[u8]) -> Result<usize> {
-        Err(Error::new(EBADF)) // TODO: Implement writing
-    }
-}
diff --git a/recipes/core/base/drivers/storage/ahcid/src/ahci/fis.rs b/recipes/core/base/drivers/storage/ahcid/src/ahci/fis.rs
deleted file mode 100644
index 56dd45b814..0000000000
--- a/recipes/core/base/drivers/storage/ahcid/src/ahci/fis.rs
+++ /dev/null
@@ -1,157 +0,0 @@
-use common::io::Mmio;
-
-#[repr(u8)]
-pub enum FisType {
-    /// Register FIS - host to device
-    RegH2D = 0x27,
-    /// Register FIS - device to host
-    RegD2H = 0x34,
-    /// DMA activate FIS - device to host
-    DmaAct = 0x39,
-    /// DMA setup FIS - bidirectional
-    DmaSetup = 0x41,
-    /// Data FIS - bidirectional
-    Data = 0x46,
-    /// BIST activate FIS - bidirectional
-    Bist = 0x58,
-    /// PIO setup FIS - device to host
-    PioSetup = 0x5F,
-    /// Set device bits FIS - device to host
-    DevBits = 0xA1,
-}
-
-#[repr(C, packed)]
-pub struct FisRegH2D {
-    // DWORD 0
-    pub fis_type: Mmio<u8>, // FIS_TYPE_REG_H2D
-
-    pub pm: Mmio<u8>, // Port multiplier, 1: Command, 0: Control
-
-    pub command: Mmio<u8>,  // Command register
-    pub featurel: Mmio<u8>, // Feature register, 7:0
-
-    // DWORD 1
-    pub lba0: Mmio<u8>,   // LBA low register, 7:0
-    pub lba1: Mmio<u8>,   // LBA mid register, 15:8
-    pub lba2: Mmio<u8>,   // LBA high register, 23:16
-    pub device: Mmio<u8>, // Device register
-
-    // DWORD 2
-    pub lba3: Mmio<u8>,     // LBA register, 31:24
-    pub lba4: Mmio<u8>,     // LBA register, 39:32
-    pub lba5: Mmio<u8>,     // LBA register, 47:40
-    pub featureh: Mmio<u8>, // Feature register, 15:8
-
-    // DWORD 3
-    pub countl: Mmio<u8>,  // Count register, 7:0
-    pub counth: Mmio<u8>,  // Count register, 15:8
-    pub icc: Mmio<u8>,     // Isochronous command completion
-    pub control: Mmio<u8>, // Control register
-
-    // DWORD 4
-    pub rsv1: [Mmio<u8>; 4], // Reserved
-}
-
-#[repr(C, packed)]
-pub struct FisRegD2H {
-    // DWORD 0
-    pub fis_type: Mmio<u8>, // FIS_TYPE_REG_D2H
-
-    pub pm: Mmio<u8>, // Port multiplier, Interrupt bit: 2
-
-    pub status: Mmio<u8>, // Status register
-    pub error: Mmio<u8>,  // Error register
-
-    // DWORD 1
-    pub lba0: Mmio<u8>,   // LBA low register, 7:0
-    pub lba1: Mmio<u8>,   // LBA mid register, 15:8
-    pub lba2: Mmio<u8>,   // LBA high register, 23:16
-    pub device: Mmio<u8>, // Device register
-
-    // DWORD 2
-    pub lba3: Mmio<u8>, // LBA register, 31:24
-    pub lba4: Mmio<u8>, // LBA register, 39:32
-    pub lba5: Mmio<u8>, // LBA register, 47:40
-    pub rsv2: Mmio<u8>, // Reserved
-
-    // DWORD 3
-    pub countl: Mmio<u8>,    // Count register, 7:0
-    pub counth: Mmio<u8>,    // Count register, 15:8
-    pub rsv3: [Mmio<u8>; 2], // Reserved
-
-    // DWORD 4
-    pub rsv4: [Mmio<u8>; 4], // Reserved
-}
-
-#[repr(C, packed)]
-pub struct FisData {
-    // DWORD 0
-    pub fis_type: Mmio<u8>, // FIS_TYPE_DATA
-
-    pub pm: Mmio<u8>, // Port multiplier
-
-    pub rsv1: [Mmio<u8>; 2], // Reserved
-
-    // DWORD 1 ~ N
-    pub data: [Mmio<u8>; 252], // Payload
-}
-
-#[repr(C, packed)]
-pub struct FisPioSetup {
-    // DWORD 0
-    pub fis_type: Mmio<u8>, // FIS_TYPE_PIO_SETUP
-
-    pub pm: Mmio<u8>, // Port multiplier, direction: 4 - device to host, interrupt: 2
-
-    pub status: Mmio<u8>, // Status register
-    pub error: Mmio<u8>,  // Error register
-
-    // DWORD 1
-    pub lba0: Mmio<u8>,   // LBA low register, 7:0
-    pub lba1: Mmio<u8>,   // LBA mid register, 15:8
-    pub lba2: Mmio<u8>,   // LBA high register, 23:16
-    pub device: Mmio<u8>, // Device register
-
-    // DWORD 2
-    pub lba3: Mmio<u8>, // LBA register, 31:24
-    pub lba4: Mmio<u8>, // LBA register, 39:32
-    pub lba5: Mmio<u8>, // LBA register, 47:40
-    pub rsv2: Mmio<u8>, // Reserved
-
-    // DWORD 3
-    pub countl: Mmio<u8>,   // Count register, 7:0
-    pub counth: Mmio<u8>,   // Count register, 15:8
-    pub rsv3: Mmio<u8>,     // Reserved
-    pub e_status: Mmio<u8>, // New value of status register
-
-    // DWORD 4
-    pub tc: Mmio<u16>,       // Transfer count
-    pub rsv4: [Mmio<u8>; 2], // Reserved
-}
-
-#[repr(C, packed)]
-pub struct FisDmaSetup {
-    // DWORD 0
-    pub fis_type: Mmio<u8>, // FIS_TYPE_DMA_SETUP
-
-    pub pm: Mmio<u8>, // Port multiplier, direction: 4 - device to host, interrupt: 2, auto-activate: 1
-
-    pub rsv1: [Mmio<u8>; 2], // Reserved
-
-    // DWORD 1&2
-    /* DMA Buffer Identifier. Used to Identify DMA buffer in host memory. SATA Spec says host specific and not in Spec. Trying AHCI spec might work. */
-    pub dma_buffer_id_low: Mmio<u32>,
-    pub dma_buffer_id_high: Mmio<u32>,
-
-    // DWORD 3
-    pub rsv3: Mmio<u32>, // More reserved
-
-    // DWORD 4
-    pub dma_buffer_offset: Mmio<u32>, // Byte offset into buffer. First 2 bits must be 0
-
-    // DWORD 5
-    pub transfer_count: Mmio<u32>, // Number of bytes to transfer. Bit 0 must be 0
-
-    // DWORD 6
-    pub rsv6: Mmio<u32>, // Reserved
-}
diff --git a/recipes/core/base/drivers/storage/ahcid/src/ahci/hba.rs b/recipes/core/base/drivers/storage/ahcid/src/ahci/hba.rs
deleted file mode 100644
index bea8792c80..0000000000
--- a/recipes/core/base/drivers/storage/ahcid/src/ahci/hba.rs
+++ /dev/null
@@ -1,549 +0,0 @@
-use log::{debug, error, info, trace};
-use std::mem::size_of;
-use std::ops::DerefMut;
-use std::time::Duration;
-use std::{ptr, u32};
-
-use common::dma::Dma;
-use common::io::{Io, Mmio};
-use common::timeout::Timeout;
-use syscall::error::{Error, Result, EIO};
-
-use super::fis::{FisRegH2D, FisType};
-
-const ATA_CMD_READ_DMA_EXT: u8 = 0x25;
-const ATA_CMD_WRITE_DMA_EXT: u8 = 0x35;
-const ATA_CMD_IDENTIFY: u8 = 0xEC;
-const ATA_CMD_IDENTIFY_PACKET: u8 = 0xA1;
-const ATA_CMD_PACKET: u8 = 0xA0;
-const ATA_DEV_BUSY: u8 = 0x80;
-const ATA_DEV_DRQ: u8 = 0x08;
-
-const HBA_PORT_CMD_CR: u32 = 1 << 15;
-const HBA_PORT_CMD_FR: u32 = 1 << 14;
-const HBA_PORT_CMD_FRE: u32 = 1 << 4;
-const HBA_PORT_CMD_ST: u32 = 1;
-const HBA_PORT_IS_ERR: u32 = 1 << 30 | 1 << 29 | 1 << 28 | 1 << 27;
-const HBA_SSTS_PRESENT: u32 = 0x3;
-const HBA_SIG_ATA: u32 = 0x00000101;
-const HBA_SIG_ATAPI: u32 = 0xEB140101;
-const HBA_SIG_PM: u32 = 0x96690101;
-const HBA_SIG_SEMB: u32 = 0xC33C0101;
-
-const TIMEOUT: Duration = Duration::new(5, 0);
-
-#[derive(Debug)]
-pub enum HbaPortType {
-    None,
-    Unknown(u32),
-    SATA,
-    SATAPI,
-    PM,
-    SEMB,
-}
-
-#[repr(C, packed)]
-pub struct HbaPort {
-    pub clb: [Mmio<u32>; 2], // 0x00, command list base address, 1K-byte aligned
-    pub fb: [Mmio<u32>; 2],  // 0x08, FIS base address, 256-byte aligned
-    pub is: Mmio<u32>,       // 0x10, interrupt status
-    pub ie: Mmio<u32>,       // 0x14, interrupt enable
-    pub cmd: Mmio<u32>,      // 0x18, command and status
-    pub _rsv0: Mmio<u32>,    // 0x1C, Reserved
-    pub tfd: Mmio<u32>,      // 0x20, task file data
-    pub sig: Mmio<u32>,      // 0x24, signature
-    pub ssts: Mmio<u32>,     // 0x28, SATA status (SCR0:SStatus)
-    pub sctl: Mmio<u32>,     // 0x2C, SATA control (SCR2:SControl)
-    pub serr: Mmio<u32>,     // 0x30, SATA error (SCR1:SError)
-    pub sact: Mmio<u32>,     // 0x34, SATA active (SCR3:SActive)
-    pub ci: Mmio<u32>,       // 0x38, command issue
-    pub sntf: Mmio<u32>,     // 0x3C, SATA notification (SCR4:SNotification)
-    pub fbs: Mmio<u32>,      // 0x40, FIS-based switch control
-    pub _rsv1: [Mmio<u32>; 11], // 0x44 ~ 0x6F, Reserved
-    pub vendor: [Mmio<u32>; 4], // 0x70 ~ 0x7F, vendor specific
-}
-
-impl HbaPort {
-    pub fn probe(&self) -> HbaPortType {
-        if self.ssts.readf(HBA_SSTS_PRESENT) {
-            let sig = self.sig.read();
-            match sig {
-                HBA_SIG_ATA => HbaPortType::SATA,
-                HBA_SIG_ATAPI => HbaPortType::SATAPI,
-                HBA_SIG_PM => HbaPortType::PM,
-                HBA_SIG_SEMB => HbaPortType::SEMB,
-                _ => HbaPortType::Unknown(sig),
-            }
-        } else {
-            HbaPortType::None
-        }
-    }
-
-    pub fn start(&mut self) -> Result<()> {
-        let timeout = Timeout::new(TIMEOUT);
-        while self.cmd.readf(HBA_PORT_CMD_CR) {
-            timeout.run().map_err(|()| {
-                log::error!("HBA start timed out");
-                Error::new(EIO)
-            })?;
-        }
-
-        self.cmd.writef(HBA_PORT_CMD_FRE | HBA_PORT_CMD_ST, true);
-        Ok(())
-    }
-
-    pub fn stop(&mut self) -> Result<()> {
-        self.cmd.writef(HBA_PORT_CMD_ST, false);
-
-        let timeout = Timeout::new(TIMEOUT);
-        while self.cmd.readf(HBA_PORT_CMD_FR | HBA_PORT_CMD_CR) {
-            timeout.run().map_err(|()| {
-                log::error!("HBA stop timed out");
-                Error::new(EIO)
-            })?;
-        }
-
-        self.cmd.writef(HBA_PORT_CMD_FRE, false);
-        Ok(())
-    }
-
-    pub fn slot(&self) -> Option<u32> {
-        let slots = self.sact.read() | self.ci.read();
-        for i in 0..32 {
-            if slots & 1 << i == 0 {
-                return Some(i);
-            }
-        }
-        None
-    }
-
-    pub fn init(
-        &mut self,
-        clb: &mut Dma<[HbaCmdHeader; 32]>,
-        ctbas: &mut [Dma<HbaCmdTable>; 32],
-        fb: &mut Dma<[u8; 256]>,
-    ) -> Result<()> {
-        self.stop()?;
-
-        for i in 0..32 {
-            let cmdheader = &mut clb[i];
-            cmdheader.ctba_low.write(ctbas[i].physical() as u32);
-            cmdheader
-                .ctba_high
-                .write((ctbas[i].physical() as u64 >> 32) as u32);
-            cmdheader.prdtl.write(0);
-        }
-
-        self.clb[0].write(clb.physical() as u32);
-        self.clb[1].write(((clb.physical() as u64) >> 32) as u32);
-        self.fb[0].write(fb.physical() as u32);
-        self.fb[1].write(((fb.physical() as u64) >> 32) as u32);
-        let is = self.is.read();
-        self.is.write(is);
-        self.ie.write(0b10111);
-        let serr = self.serr.read();
-        self.serr.write(serr);
-
-        // Disable power management
-        let sctl = self.sctl.read();
-        self.sctl.write(sctl | 7 << 8);
-
-        // Power on and spin up device
-        self.cmd.writef(1 << 2 | 1 << 1, true);
-
-        debug!("AHCI init {:X}", self.cmd.read());
-        Ok(())
-    }
-
-    pub unsafe fn identify(
-        &mut self,
-        clb: &mut Dma<[HbaCmdHeader; 32]>,
-        ctbas: &mut [Dma<HbaCmdTable>; 32],
-    ) -> Result<u64> {
-        self.identify_inner(ATA_CMD_IDENTIFY, clb, ctbas)
-    }
-
-    pub unsafe fn identify_packet(
-        &mut self,
-        clb: &mut Dma<[HbaCmdHeader; 32]>,
-        ctbas: &mut [Dma<HbaCmdTable>; 32],
-    ) -> Result<u64> {
-        self.identify_inner(ATA_CMD_IDENTIFY_PACKET, clb, ctbas)
-    }
-
-    // Shared between identify() and identify_packet()
-    unsafe fn identify_inner(
-        &mut self,
-        cmd: u8,
-        clb: &mut Dma<[HbaCmdHeader; 32]>,
-        ctbas: &mut [Dma<HbaCmdTable>; 32],
-    ) -> Result<u64> {
-        let dest: Dma<[u16; 256]> = Dma::new([0; 256]).unwrap();
-
-        let slot = self
-            .ata_start(clb, ctbas, |cmdheader, cmdfis, prdt_entries, _acmd| {
-                cmdheader.prdtl.write(1);
-
-                let prdt_entry = &mut prdt_entries[0];
-                prdt_entry.dba_low.write(dest.physical() as u32);
-                prdt_entry
-                    .dba_high
-                    .write((dest.physical() as u64 >> 32) as u32);
-                prdt_entry.dbc.write(512 | 1);
-
-                cmdfis.pm.write(1 << 7);
-                cmdfis.command.write(cmd);
-                cmdfis.device.write(0);
-                cmdfis.countl.write(1);
-                cmdfis.counth.write(0);
-            })?
-            .ok_or(Error::new(EIO))?;
-
-        self.ata_stop(slot)?;
-
-        let mut serial = String::new();
-        for word in 10..20 {
-            let d = dest[word];
-            let a = ((d >> 8) as u8) as char;
-            if a != '\0' {
-                serial.push(a);
-            }
-            let b = (d as u8) as char;
-            if b != '\0' {
-                serial.push(b);
-            }
-        }
-
-        let mut firmware = String::new();
-        for word in 23..27 {
-            let d = dest[word];
-            let a = ((d >> 8) as u8) as char;
-            if a != '\0' {
-                firmware.push(a);
-            }
-            let b = (d as u8) as char;
-            if b != '\0' {
-                firmware.push(b);
-            }
-        }
-
-        let mut model = String::new();
-        for word in 27..47 {
-            let d = dest[word];
-            let a = ((d >> 8) as u8) as char;
-            if a != '\0' {
-                model.push(a);
-            }
-            let b = (d as u8) as char;
-            if b != '\0' {
-                model.push(b);
-            }
-        }
-
-        let mut sectors = (dest[100] as u64)
-            | ((dest[101] as u64) << 16)
-            | ((dest[102] as u64) << 32)
-            | ((dest[103] as u64) << 48);
-
-        let lba_bits = if sectors == 0 {
-            sectors = (dest[60] as u64) | ((dest[61] as u64) << 16);
-            28
-        } else {
-            48
-        };
-
-        info!(
-            "Serial: {} Firmware: {} Model: {} {}-bit LBA Size: {} MB",
-            serial.trim(),
-            firmware.trim(),
-            model.trim(),
-            lba_bits,
-            sectors / 2048
-        );
-
-        Ok(sectors * 512)
-    }
-
-    pub fn ata_dma(
-        &mut self,
-        block: u64,
-        sectors: usize,
-        write: bool,
-        clb: &mut Dma<[HbaCmdHeader; 32]>,
-        ctbas: &mut [Dma<HbaCmdTable>; 32],
-        buf: &mut Dma<[u8; 256 * 512]>,
-    ) -> Result<Option<u32>> {
-        trace!(
-            "AHCI {:X} DMA BLOCK: {:X} SECTORS: {} WRITE: {}",
-            (self as *mut HbaPort) as usize,
-            block,
-            sectors,
-            write
-        );
-
-        assert!(sectors > 0 && sectors < 256);
-
-        self.ata_start(clb, ctbas, |cmdheader, cmdfis, prdt_entries, _acmd| {
-            if write {
-                let cfl = cmdheader.cfl.read();
-                cmdheader.cfl.write(cfl | 1 << 7 | 1 << 6)
-            }
-
-            cmdheader.prdtl.write(1);
-
-            let prdt_entry = &mut prdt_entries[0];
-            prdt_entry.dba_low.write(buf.physical() as u32);
-            prdt_entry
-                .dba_high
-                .write((buf.physical() as u64 >> 32) as u32);
-            prdt_entry.dbc.write(((sectors * 512) as u32) | 1);
-
-            cmdfis.pm.write(1 << 7);
-            if write {
-                cmdfis.command.write(ATA_CMD_WRITE_DMA_EXT);
-            } else {
-                cmdfis.command.write(ATA_CMD_READ_DMA_EXT);
-            }
-
-            cmdfis.lba0.write(block as u8);
-            cmdfis.lba1.write((block >> 8) as u8);
-            cmdfis.lba2.write((block >> 16) as u8);
-
-            cmdfis.device.write(1 << 6);
-
-            cmdfis.lba3.write((block >> 24) as u8);
-            cmdfis.lba4.write((block >> 32) as u8);
-            cmdfis.lba5.write((block >> 40) as u8);
-
-            cmdfis.countl.write(sectors as u8);
-            cmdfis.counth.write((sectors >> 8) as u8);
-        })
-    }
-
-    /// Send ATAPI packet
-    pub fn atapi_dma(
-        &mut self,
-        cmd: &[u8; 16],
-        size: u32,
-        clb: &mut Dma<[HbaCmdHeader; 32]>,
-        ctbas: &mut [Dma<HbaCmdTable>; 32],
-        buf: &mut Dma<[u8; 256 * 512]>,
-    ) -> Result<()> {
-        let slot = self
-            .ata_start(clb, ctbas, |cmdheader, cmdfis, prdt_entries, acmd| {
-                let cfl = cmdheader.cfl.read();
-                cmdheader.cfl.write(cfl | 1 << 5);
-
-                cmdheader.prdtl.write(1);
-
-                let prdt_entry = &mut prdt_entries[0];
-                prdt_entry.dba_low.write(buf.physical() as u32);
-                prdt_entry
-                    .dba_high
-                    .write((buf.physical() as u64 >> 32) as u32);
-                prdt_entry.dbc.write(size - 1);
-
-                cmdfis.pm.write(1 << 7);
-                cmdfis.command.write(ATA_CMD_PACKET);
-                cmdfis.device.write(0);
-                cmdfis.lba1.write(0);
-                cmdfis.lba2.write(0);
-                cmdfis.featurel.write(1);
-                cmdfis.featureh.write(0);
-
-                unsafe { ptr::write_volatile(acmd.as_mut_ptr() as *mut [u8; 16], *cmd) };
-            })?
-            .ok_or(Error::new(EIO))?;
-        self.ata_stop(slot)
-    }
-
-    pub fn ata_start<F>(
-        &mut self,
-        clb: &mut Dma<[HbaCmdHeader; 32]>,
-        ctbas: &mut [Dma<HbaCmdTable>; 32],
-        callback: F,
-    ) -> Result<Option<u32>>
-    where
-        F: FnOnce(
-            &mut HbaCmdHeader,
-            &mut FisRegH2D,
-            &mut [HbaPrdtEntry; PRDT_ENTRIES],
-            &mut [Mmio<u8>; 16],
-        ),
-    {
-        //TODO: Should probably remove
-        self.is.write(u32::MAX);
-
-        let Some(slot) = self.slot() else {
-            return Ok(None);
-        };
-
-        {
-            let cmdheader = &mut clb[slot as usize];
-            cmdheader
-                .cfl
-                .write((size_of::<FisRegH2D>() / size_of::<u32>()) as u8);
-
-            let cmdtbl = &mut ctbas[slot as usize];
-            unsafe {
-                ptr::write_bytes(
-                    cmdtbl.deref_mut() as *mut HbaCmdTable as *mut u8,
-                    0,
-                    size_of::<HbaCmdTable>(),
-                );
-            }
-
-            let cmdfis = unsafe { &mut *(cmdtbl.cfis.as_mut_ptr() as *mut FisRegH2D) };
-            cmdfis.fis_type.write(FisType::RegH2D as u8);
-
-            let prdt_entry = unsafe { &mut *(&mut cmdtbl.prdt_entry as *mut _) };
-            let acmd = unsafe { &mut *(&mut cmdtbl.acmd as *mut _) };
-
-            callback(cmdheader, cmdfis, prdt_entry, acmd)
-        }
-
-        let timeout = Timeout::new(TIMEOUT);
-        while self.tfd.readf((ATA_DEV_BUSY | ATA_DEV_DRQ) as u32) {
-            timeout.run().map_err(|()| {
-                log::error!("HBA ata_start timeout");
-                Error::new(EIO)
-            })?;
-        }
-
-        self.ci.writef(1 << slot, true);
-
-        //TODO: Should probably remove
-        self.start()?;
-
-        Ok(Some(slot))
-    }
-
-    pub fn ata_running(&self, slot: u32) -> bool {
-        (self.ci.readf(1 << slot) || self.tfd.readf(0x80)) && self.is.read() & HBA_PORT_IS_ERR == 0
-    }
-
-    pub fn ata_stop(&mut self, slot: u32) -> Result<()> {
-        let timeout = Timeout::new(TIMEOUT);
-        while self.ata_running(slot) {
-            timeout.run().map_err(|()| {
-                log::error!("HBA ata_stop timeout");
-                Error::new(EIO)
-            })?;
-        }
-
-        self.stop()?;
-
-        if self.is.read() & HBA_PORT_IS_ERR != 0 {
-            let (is, ie, cmd, tfd, ssts, sctl, serr, sact, ci, sntf, fbs) = (
-                self.is.read(),
-                self.ie.read(),
-                self.cmd.read(),
-                self.tfd.read(),
-                self.ssts.read(),
-                self.sctl.read(),
-                self.serr.read(),
-                self.sact.read(),
-                self.ci.read(),
-                self.sntf.read(),
-                self.fbs.read(),
-            );
-
-            error!("IS {:X} IE {:X} CMD {:X} TFD {:X}", is, ie, cmd, tfd);
-            error!(
-                "SSTS {:X} SCTL {:X} SERR {:X} SACT {:X}",
-                ssts, sctl, serr, sact
-            );
-            error!("CI {:X} SNTF {:X} FBS {:X}", ci, sntf, fbs);
-
-            self.is.write(u32::MAX);
-            Err(Error::new(EIO))
-        } else {
-            Ok(())
-        }
-    }
-}
-
-#[repr(C, packed)]
-pub struct HbaMem {
-    pub cap: Mmio<u32>,         // 0x00, Host capability
-    pub ghc: Mmio<u32>,         // 0x04, Global host control
-    pub is: Mmio<u32>,          // 0x08, Interrupt status
-    pub pi: Mmio<u32>,          // 0x0C, Port implemented
-    pub vs: Mmio<u32>,          // 0x10, Version
-    pub ccc_ctl: Mmio<u32>,     // 0x14, Command completion coalescing control
-    pub ccc_pts: Mmio<u32>,     // 0x18, Command completion coalescing ports
-    pub em_loc: Mmio<u32>,      // 0x1C, Enclosure management location
-    pub em_ctl: Mmio<u32>,      // 0x20, Enclosure management control
-    pub cap2: Mmio<u32>,        // 0x24, Host capabilities extended
-    pub bohc: Mmio<u32>,        // 0x28, BIOS/OS handoff control and status
-    pub _rsv: [Mmio<u8>; 116],  // 0x2C - 0x9F, Reserved
-    pub vendor: [Mmio<u8>; 96], // 0xA0 - 0xFF, Vendor specific registers
-    pub ports: [HbaPort; 32],   // 0x100 - 0x10FF, Port control registers
-}
-
-impl HbaMem {
-    pub fn init(&mut self) {
-        /*
-        self.ghc.writef(1, true);
-        while self.ghc.readf(1) {
-            pause();
-        }
-        */
-        self.ghc.write(1 << 31 | 1 << 1);
-
-        debug!(
-            "AHCI CAP {:X} GHC {:X} IS {:X} PI {:X} VS {:X} CAP2 {:X} BOHC {:X}",
-            self.cap.read(),
-            self.ghc.read(),
-            self.is.read(),
-            self.pi.read(),
-            self.vs.read(),
-            self.cap2.read(),
-            self.bohc.read()
-        );
-    }
-}
-
-#[repr(C, packed)]
-pub struct HbaPrdtEntry {
-    dba_low: Mmio<u32>,  // Data base address (low
-    dba_high: Mmio<u32>, // Data base address (high)
-    _rsv0: Mmio<u32>,    // Reserved
-    dbc: Mmio<u32>,      // Byte count, 4M max, interrupt = 1
-}
-
-#[repr(C, packed)]
-pub struct HbaCmdTable {
-    // 0x00
-    cfis: [Mmio<u8>; 64], // Command FIS
-
-    // 0x40
-    acmd: [Mmio<u8>; 16], // ATAPI command, 12 or 16 bytes
-
-    // 0x50
-    _rsv: [Mmio<u8>; 48], // Reserved
-
-    // 0x80
-    prdt_entry: [HbaPrdtEntry; PRDT_ENTRIES], // Physical region descriptor table entries, 0 ~ 65535
-}
-const CMD_TBL_SIZE: usize = 256 * 4096;
-const PRDT_ENTRIES: usize = (CMD_TBL_SIZE - 128) / size_of::<HbaPrdtEntry>();
-
-#[repr(C, packed)]
-pub struct HbaCmdHeader {
-    // DW0
-    cfl: Mmio<u8>, /* Command FIS length in DWORDS, 2 ~ 16, atapi: 4, write - host to device: 2, prefetchable: 1 */
-    _pm: Mmio<u8>, // Reset - 0x80, bist: 0x40, clear busy on ok: 0x20, port multiplier
-
-    prdtl: Mmio<u16>, // Physical region descriptor table length in entries
-
-    // DW1
-    _prdbc: Mmio<u32>, // Physical region descriptor byte count transferred
-
-    // DW2, 3
-    ctba_low: Mmio<u32>,  // Command table descriptor base address (low)
-    ctba_high: Mmio<u32>, // Command table descriptor base address (high)
-
-    // DW4 - 7
-    _rsv1: [Mmio<u32>; 4], // Reserved
-}
diff --git a/recipes/core/base/drivers/storage/ahcid/src/ahci/mod.rs b/recipes/core/base/drivers/storage/ahcid/src/ahci/mod.rs
deleted file mode 100644
index 4d8cc8c040..0000000000
--- a/recipes/core/base/drivers/storage/ahcid/src/ahci/mod.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use common::io::Io;
-use driver_block::Disk;
-use log::{error, info};
-
-use self::disk_ata::DiskATA;
-use self::disk_atapi::DiskATAPI;
-use self::hba::{HbaMem, HbaPortType};
-
-pub mod disk_ata;
-pub mod disk_atapi;
-pub mod fis;
-pub mod hba;
-
-pub enum AnyDisk {
-    Ata(DiskATA),
-    Atapi(DiskATAPI),
-}
-impl Disk for AnyDisk {
-    fn block_size(&self) -> u32 {
-        match self {
-            Self::Ata(a) => a.block_size(),
-            Self::Atapi(a) => a.block_size(),
-        }
-    }
-    fn size(&self) -> u64 {
-        match self {
-            Self::Ata(a) => a.size(),
-            Self::Atapi(a) => a.size(),
-        }
-    }
-    async fn read(&mut self, base: u64, buffer: &mut [u8]) -> syscall::Result<usize> {
-        match self {
-            Self::Ata(a) => a.read(base, buffer).await,
-            Self::Atapi(a) => a.read(base, buffer).await,
-        }
-    }
-    async fn write(&mut self, base: u64, buffer: &[u8]) -> syscall::Result<usize> {
-        match self {
-            Self::Ata(a) => a.write(base, buffer).await,
-            Self::Atapi(a) => a.write(base, buffer).await,
-        }
-    }
-}
-
-pub fn disks(base: usize, name: &str) -> (&'static mut HbaMem, Vec<AnyDisk>) {
-    let hba_mem = unsafe { &mut *(base as *mut HbaMem) };
-    hba_mem.init();
-    let pi = hba_mem.pi.read();
-    let disks: Vec<AnyDisk> = (0..hba_mem.ports.len())
-        .filter(|&i| pi & 1 << i as i32 == 1 << i as i32)
-        .filter_map(|i| {
-            let port = unsafe { &mut *hba_mem.ports.as_mut_ptr().add(i) };
-            let port_type = port.probe();
-            info!("{}-{}: {:?}", name, i, port_type);
-
-            let disk: Option<AnyDisk> = match port_type {
-                HbaPortType::SATA => match DiskATA::new(i, port) {
-                    Ok(disk) => Some(AnyDisk::Ata(disk)),
-                    Err(err) => {
-                        error!("{}: {}", i, err);
-                        None
-                    }
-                },
-                HbaPortType::SATAPI => match DiskATAPI::new(i, port) {
-                    Ok(disk) => Some(AnyDisk::Atapi(disk)),
-                    Err(err) => {
-                        error!("{}: {}", i, err);
-                        None
-                    }
-                },
-                _ => None,
-            };
-
-            disk
-        })
-        .collect();
-
-    (hba_mem, disks)
-}
diff --git a/recipes/core/base/drivers/storage/ahcid/src/main.rs b/recipes/core/base/drivers/storage/ahcid/src/main.rs
deleted file mode 100644
index 1f130a2974..0000000000
--- a/recipes/core/base/drivers/storage/ahcid/src/main.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-// #![cfg_attr(target_arch = "aarch64", feature(stdsimd))] // Required for yield instruction
-
-use std::io::{Read, Write};
-use std::os::fd::AsRawFd;
-use std::usize;
-
-use common::io::Io;
-use driver_block::{DiskScheme, ExecutorTrait, FuturesExecutor};
-use event::{EventFlags, RawEventQueue};
-use pcid_interface::PciFunctionHandle;
-
-use log::{error, info};
-
-pub mod ahci;
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_ahci");
-
-    let irq = pci_config
-        .func
-        .legacy_interrupt_line
-        .expect("ahcid: no legacy interrupts supported");
-
-    common::setup_logging(
-        "disk",
-        "pci",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    info!("AHCI {}", pci_config.func.display());
-
-    let address = unsafe { pcid_handle.map_bar(5) }.ptr.as_ptr() as usize;
-    {
-        let (hba_mem, disks) = ahci::disks(address as usize, &name);
-
-        let scheme_name = format!("disk.{}", name);
-        let mut scheme = DiskScheme::new(
-            Some(daemon),
-            scheme_name,
-            disks
-                .into_iter()
-                .enumerate()
-                .map(|(i, disk)| (i as u32, disk))
-                .collect(),
-            &FuturesExecutor,
-        );
-
-        let mut irq_file = irq.irq_handle("ahcid");
-        let irq_fd = irq_file.as_raw_fd() as usize;
-
-        let event_queue = RawEventQueue::new().expect("ahcid: failed to create event queue");
-
-        libredox::call::setrens(0, 0).expect("ahcid: failed to enter null namespace");
-
-        event_queue
-            .subscribe(scheme.event_handle().raw(), 1, EventFlags::READ)
-            .expect("ahcid: failed to event scheme socket");
-        event_queue
-            .subscribe(irq_fd, 1, EventFlags::READ)
-            .expect("ahcid: failed to event irq scheme");
-
-        for event in event_queue {
-            let event = event.unwrap();
-            if event.fd == scheme.event_handle().raw() {
-                FuturesExecutor.block_on(scheme.tick()).unwrap();
-            } else if event.fd == irq_fd {
-                let mut irq = [0; 8];
-                if irq_file
-                    .read(&mut irq)
-                    .expect("ahcid: failed to read irq file")
-                    >= irq.len()
-                {
-                    let is = hba_mem.is.read();
-                    if is > 0 {
-                        let pi = hba_mem.pi.read();
-                        let pi_is = pi & is;
-                        for i in 0..hba_mem.ports.len() {
-                            if pi_is & 1 << i > 0 {
-                                let port = &mut hba_mem.ports[i];
-                                let is = port.is.read();
-                                port.is.write(is);
-                            }
-                        }
-                        hba_mem.is.write(is);
-
-                        irq_file
-                            .write(&irq)
-                            .expect("ahcid: failed to write irq file");
-
-                        FuturesExecutor.block_on(scheme.tick()).unwrap();
-                    }
-                }
-            } else {
-                error!("Unknown event {}", event.fd);
-            }
-        }
-    }
-
-    std::process::exit(0);
-}
diff --git a/recipes/core/base/drivers/storage/bcm2835-sdhcid/Cargo.toml b/recipes/core/base/drivers/storage/bcm2835-sdhcid/Cargo.toml
deleted file mode 100644
index fad2238b7b..0000000000
--- a/recipes/core/base/drivers/storage/bcm2835-sdhcid/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "bcm2835-sdhcid"
-description = "BCM2835 storage controller driver"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-fdt = { git = "https://github.com/repnop/fdt.git", rev = "059bb23" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-block = { path = "../driver-block" }
-
-libredox.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-redox_event.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/storage/bcm2835-sdhcid/src/main.rs b/recipes/core/base/drivers/storage/bcm2835-sdhcid/src/main.rs
deleted file mode 100644
index 2241d27c01..0000000000
--- a/recipes/core/base/drivers/storage/bcm2835-sdhcid/src/main.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use std::process;
-
-use driver_block::{DiskScheme, ExecutorTrait, TrivialExecutor};
-use event::{EventFlags, RawEventQueue};
-use fdt::Fdt;
-
-mod sd;
-
-#[cfg(target_os = "redox")]
-fn get_dtb() -> Vec<u8> {
-    std::fs::read("kernel.dtb:").unwrap()
-}
-
-#[cfg(target_os = "linux")]
-fn get_dtb() -> Vec<u8> {
-    use std::env;
-    if let Some(arg1) = env::args().nth(1) {
-        std::fs::read(arg1).unwrap()
-    } else {
-        Vec::new()
-    }
-}
-
-fn main() {
-    daemon::Daemon::new(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon) -> ! {
-    let dtb_data = get_dtb();
-    println!("read from OS, len = {}", dtb_data.len());
-    if dtb_data.len() == 0 {
-        process::exit(0);
-    }
-
-    let fdt = Fdt::new(&dtb_data).unwrap();
-    println!("DTB model = {}", fdt.root().model());
-    let with = ["brcm,bcm2835-sdhci"];
-    let compat_node = fdt.find_compatible(&with).unwrap();
-    let reg = compat_node.reg().unwrap().next().unwrap();
-    let reg_size = reg.size.unwrap();
-    let mut reg_addr = reg.starting_address as usize;
-    println!(
-        "DeviceMemory start = 0x{:08x}, size = 0x{:08x}",
-        reg_addr, reg_size
-    );
-    if let Some(mut ranges) = fdt.find_node("/soc").and_then(|f| f.ranges()) {
-        let range = ranges
-            .find(|f| f.child_bus_address <= reg_addr && reg_addr - f.child_bus_address < f.size)
-            .expect("Couldn't find device range in /soc/@ranges");
-        reg_addr = range.parent_bus_address + (reg_addr - range.child_bus_address);
-        println!(
-            "DeviceMemory remapped onto CPU address space: start = 0x{:08x}, size = 0x{:08x}",
-            reg_addr, reg_size
-        );
-    }
-
-    let addr = unsafe {
-        common::physmap(
-            reg_addr,
-            reg_size,
-            common::Prot::RW,
-            common::MemoryType::DeviceMemory,
-        )
-        .expect("bcm2835-sdhcid: failed to map address") as usize
-    };
-    println!(
-        "ioremap 0x{:08x} to 0x{:08x} 2222",
-        reg.starting_address as usize, addr
-    );
-    let mut sdhci = sd::SdHostCtrl::new(addr);
-    unsafe {
-        sdhci.init();
-        /*
-        let mut buf1 = [0u32; 512];
-        sdhci.sd_readblock(1, &mut buf1, 1);
-        println!("readblock {:?}", buf1);
-        buf1[0] = 0xdead_0000;
-        buf1[1] = 0xdead_0000;
-        buf1[2] = 0x0000_dead;
-        buf1[3] = 0x0000_dead;
-        sdhci.sd_writeblock(1, &buf1, 1);
-        sdhci.sd_readblock(1, &mut buf1, 1);
-        println!("readblock {:?}", buf1);
-        */
-        /*
-        let mut buf1 = [0u8; 512];
-        sdhci.read(1, &mut buf1);
-        println!("readblock {:?}", buf1);
-        buf1[0] = 0xde;
-        buf1[1] = 0xad;
-        buf1[2] = 0xde;
-        buf1[3] = 0xad;
-        sdhci.write(1, &buf1);
-        sdhci.read(1, &mut buf1);
-        println!("readblock {:?}", buf1);
-        */
-    }
-
-    let mut disks = Vec::new();
-    disks.push(sdhci);
-    let mut scheme = DiskScheme::new(
-        Some(daemon),
-        "disk.mmc".to_string(),
-        disks
-            .into_iter()
-            .enumerate()
-            .map(|(i, disk)| (i as u32, disk))
-            .collect(),
-        &TrivialExecutor, // TODO: real executor
-    );
-
-    let event_queue = RawEventQueue::new().expect("mmcd: failed to open event file");
-    event_queue
-        .subscribe(scheme.event_handle().raw(), 0, EventFlags::READ)
-        .expect("mmcd: failed to event disk scheme");
-
-    libredox::call::setrens(0, 0).expect("mmcd: failed to enter null namespace");
-
-    for event in event_queue {
-        let event = event.unwrap();
-        if event.fd == scheme.event_handle().raw() {
-            TrivialExecutor.block_on(scheme.tick()).unwrap();
-        } else {
-            println!("Unknown event {}", event.fd);
-        }
-    }
-    process::exit(0);
-}
diff --git a/recipes/core/base/drivers/storage/bcm2835-sdhcid/src/sd/mod.rs b/recipes/core/base/drivers/storage/bcm2835-sdhcid/src/sd/mod.rs
deleted file mode 100644
index afb568291a..0000000000
--- a/recipes/core/base/drivers/storage/bcm2835-sdhcid/src/sd/mod.rs
+++ /dev/null
@@ -1,785 +0,0 @@
-use common::io::{Io, Mmio};
-use driver_block::Disk;
-use std::{sync::RwLock, thread, time::Duration};
-use syscall::{Error, Result, EINVAL};
-
-#[cfg(target_arch = "aarch64")]
-#[inline(always)]
-pub(crate) unsafe fn wait_cycles(mut n: usize) {
-    use core::arch::asm;
-
-    while n > 0 {
-        asm!("nop");
-        n -= 1;
-    }
-}
-
-#[cfg(target_arch = "riscv64")]
-#[inline(always)]
-pub(crate) unsafe fn wait_msec(mut n: usize) {
-    todo!()
-}
-
-#[cfg(target_arch = "aarch64")]
-#[inline(always)]
-pub(crate) unsafe fn wait_msec(mut n: usize) {
-    use core::arch::asm;
-
-    let mut f: usize;
-    let mut t: usize;
-    let mut r: usize;
-
-    asm!("mrs {0}, cntfrq_el0", out(reg) f);
-    asm!("mrs {0}, cntpct_el0", out(reg) t);
-
-    t += ((f / 1000) * n) / 1000;
-
-    loop {
-        asm!("mrs {0}, cntpct_el0", out(reg) r);
-        if r >= t {
-            break;
-        }
-    }
-}
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-#[inline(always)]
-pub(crate) unsafe fn wait_msec(n: usize) {
-    thread::sleep(Duration::from_millis(n as u64));
-}
-
-//cmd Flags
-const CMD_NEED_APP: u32 = 0x8000_0000;
-const CMD_RSPNS_48: u32 = 0x0002_0000;
-const CMD_ERRORS_MASK: u32 = 0xfff9_c004;
-const CMD_RCA_MASK: u32 = 0xffff_0000;
-
-//CMD
-const CMD_GO_IDLE: u32 = 0x0000_0000;
-const CMD_ALL_SEND_CID: u32 = 0x0201_0000;
-const CMD_SEND_CSD: u32 = 0x0901_0000;
-const CMD_SEND_REL_ADDR: u32 = 0x0302_0000;
-const CMD_CARD_SELECT: u32 = 0x0703_0000;
-const CMD_SEND_IF_COND: u32 = 0x0802_0000;
-const CMD_STOP_TRANS: u32 = 0x0c03_0000;
-const CMD_READ_SINGLE: u32 = 0x1122_0010;
-const CMD_READ_MULTI: u32 = 0x1222_0032;
-const CMD_SET_BLOCKCNT: u32 = 0x1702_0000;
-const CMD_WRITE_SINGLE: u32 = 0x1822_0000;
-const CMD_WRITE_MULTI: u32 = 0x1922_0022;
-
-const CMD_APP_CMD: u32 = 0x3700_0000;
-const CMD_SET_BUS_WIDTH: u32 = 0x0602_0000 | CMD_NEED_APP;
-const CMD_SEND_OP_COND: u32 = 0x2902_0000 | CMD_NEED_APP;
-const CMD_SEND_SCR: u32 = 0x3322_0010 | CMD_NEED_APP;
-
-//STATUS register settings
-const SR_READ_AVAILABLE: u32 = 0x0000_0800;
-const SR_WRITE_AVAILABLE: u32 = 0x0000_0400;
-const SR_DAT_INHIBIT: u32 = 0x0000_0002;
-const SR_CMD_INHIBIT: u32 = 0x0000_0001;
-const SR_APP_CMD: u32 = 0x0000_0020;
-
-//CONTROL register settings
-
-const C0_SPI_MODE_EN: u32 = 0x0010_0000;
-const C0_HCTL_HS_EN: u32 = 0x0000_0004;
-const C0_HCTL_DWITDH: u32 = 0x0000_0002;
-
-const C1_SRST_DATA: u32 = 0x0400_0000;
-const C1_SRST_CMD: u32 = 0x0200_0000;
-const C1_SRST_HC: u32 = 0x0100_0000;
-const C1_TOUNIT_DIS: u32 = 0x000f_0000;
-const C1_TOUNIT_MAX: u32 = 0x000e_0000;
-const C1_CLK_GENSEL: u32 = 0x0000_0020;
-const C1_CLK_EN: u32 = 0x0000_0004;
-const C1_CLK_STABLE: u32 = 0x0000_0002;
-const C1_CLK_INTLEN: u32 = 0x0000_0001;
-
-//INTERRUPT register settings
-const INT_DATA_TIMEOUT: u32 = 0x0010_0000;
-const INT_CMD_TIMEOUT: u32 = 0x0001_0000;
-const INT_READ_RDY: u32 = 0x0000_0020;
-const INT_WRITE_RDY: u32 = 0x0000_0010;
-const INT_DATA_DONE: u32 = 0x0000_0002;
-const INT_CMD_DONE: u32 = 0x0000_0001;
-const INT_ERROR_MASK: u32 = 0x017e_8000;
-
-const HOST_SPEC_VERSION_OFFSET: u32 = 16;
-const HOST_SPEC_VERSION_MASK: u32 = 0x00ff_0000;
-const HOST_SPEC_V3: u32 = 2;
-const HOST_SPEC_V2: u32 = 1;
-const HOST_SPEC_V1: u32 = 0;
-
-const ACMD41_VOLTAGE: u32 = 0x00ff_8000;
-const ACMD41_CMD_COMPLETE: u32 = 0x8000_0000;
-const ACMD41_CMD_CCS: u32 = 0x4000_0000;
-const ACMD41_ARG_HC: u32 = 0x51ff_8000;
-
-const SCR_SD_BUS_WIDTH_4: u32 = 0x0000_0400;
-const SCR_SUPP_SET_BLKCNT: u32 = 0x0200_0000;
-//added by bztsrc driver
-const SCR_SUPP_CCS: u32 = 0x0000_0001;
-
-#[repr(C, packed)]
-pub struct SdHostCtrlRegs {
-    //LSB
-
-    //ACMD23 Argument
-    _arg2: Mmio<u32>,
-
-    //Block Size and Count
-    blksizecnt: Mmio<u32>,
-
-    //Argument
-    arg1: Mmio<u32>,
-
-    //Command and Transfer Mode
-    cmdtm: Mmio<u32>,
-
-    //Response bit 0-127
-    resp0: Mmio<u32>,
-    resp1: Mmio<u32>,
-    resp2: Mmio<u32>,
-    resp3: Mmio<u32>,
-
-    //Data
-    data: Mmio<u32>,
-
-    //Status
-    status: Mmio<u32>,
-
-    //Host Configuration bits
-    control0: Mmio<u32>,
-
-    //Host Configuration bits
-    control1: Mmio<u32>,
-
-    //Interrupt Flags
-    interrupt: Mmio<u32>,
-
-    //Interrupt Flag Enable
-    irpt_mask: Mmio<u32>,
-
-    //Interrupt Generation Enable
-    irpt_en: Mmio<u32>,
-
-    //Host Configuration bits
-    _control2: Mmio<u32>,
-
-    _rsvd: [Mmio<u32>; 47],
-
-    //Slot Interrupt Status and Version
-    slotisr_ver: Mmio<u32>,
-}
-
-//TODO: refactor, sd/sdhci/bcmh2835-sdhci three different modules.
-pub struct SdHostCtrl {
-    regs: RwLock<&'static mut SdHostCtrlRegs>,
-    host_spec_ver: u32,
-    cid: [u32; 4],
-    csd: [u32; 4],
-    rca: u32, //relative card address
-    scr: [u32; 2],
-    ocr: u32,
-    size: u64,
-}
-
-impl SdHostCtrl {
-    pub fn new(address: usize) -> Self {
-        SdHostCtrl {
-            regs: RwLock::new(unsafe { &mut *(address as *mut SdHostCtrlRegs) }),
-            host_spec_ver: 0,
-            cid: [0; 4],
-            csd: [0; 4],
-            rca: 0,
-            scr: [0; 2],
-            ocr: 0,
-            size: 0,
-        }
-    }
-
-    pub unsafe fn init(&mut self) {
-        let regs = self.regs.get_mut().unwrap();
-
-        let mut reg_val = regs.slotisr_ver.read();
-        self.host_spec_ver = (reg_val & HOST_SPEC_VERSION_MASK) >> HOST_SPEC_VERSION_OFFSET;
-
-        regs.control0.write(0x0);
-        reg_val = regs.control1.read();
-        regs.control1.write(reg_val | C1_SRST_HC);
-        let mut cnt = 1000;
-        while (cnt >= 0) && ((regs.control1.read() & C1_SRST_HC) == C1_SRST_HC) {
-            cnt -= 1;
-            wait_msec(10);
-        }
-
-        if cnt < 0 {
-            println!("ERROR: failed to reset EMMC");
-            return;
-        }
-        println!("EMMC: reset OK");
-        reg_val = regs.control1.read();
-        regs.control1.write(reg_val | C1_CLK_INTLEN | C1_TOUNIT_MAX);
-
-        wait_msec(10);
-
-        {
-            if let Err(_) = self.set_clock(40_0000) {
-                println!("ERROR: failed to set clock {}", 40_0000);
-                return;
-            }
-        }
-
-        let regs = self.regs.get_mut().unwrap();
-        regs.irpt_en.write(0xffff_ffff);
-        regs.irpt_mask.write(0xffff_ffff);
-
-        if let Err(_) = self.sd_cmd(CMD_GO_IDLE, 0) {
-            println!("failed to go idle");
-            return;
-        }
-
-        if let Err(_) = self.sd_cmd(CMD_SEND_IF_COND, 0x0000_01aa) {
-            println!("failed to send if cond");
-            return;
-        }
-
-        cnt = 6;
-        reg_val = 0;
-
-        while ((reg_val & ACMD41_CMD_COMPLETE) == 0) && cnt > 0 {
-            wait_msec(10);
-            cnt -= 1;
-
-            if let Ok(val) = self.sd_cmd(CMD_SEND_OP_COND, ACMD41_ARG_HC) {
-                reg_val = val;
-                self.ocr = reg_val;
-                print!("EMMC: CMD_SEND_OP_COND returned 0x{:08x} = ", reg_val);
-
-                if (reg_val & ACMD41_CMD_COMPLETE) != 0 {
-                    print!("COMPLETE ");
-                }
-                if (reg_val & ACMD41_VOLTAGE) != 0 {
-                    print!("VOLTAGE ");
-                }
-                if (reg_val & ACMD41_CMD_CCS) != 0 {
-                    print!("CCS ");
-                }
-                print!("\n");
-            } else {
-                println!("ERROR: EMMC ACMD41 returned error");
-                return;
-            }
-        }
-
-        if (reg_val & ACMD41_CMD_COMPLETE) == 0 || cnt <= 0 {
-            println!("ACMD41 TIMEOUT");
-            return;
-        }
-
-        if (reg_val & ACMD41_VOLTAGE) == 0 {
-            println!("ACMD41 VOLTAGE NOT FOUND!");
-            return;
-        }
-
-        let ccs = if (reg_val & ACMD41_CMD_CCS) != 0 {
-            SCR_SUPP_CCS
-        } else {
-            0
-        };
-
-        if let Err(_) = self.sd_cmd(CMD_ALL_SEND_CID, 0) {
-            println!("CMD_ALL_SEND_CID ERROR, IGNORE!");
-        }
-
-        let sd_rca = self.sd_cmd(CMD_SEND_REL_ADDR, 0x0).unwrap();
-        println!("CMD_SEND_REL_ADDR = 0x{:08x}", sd_rca);
-        self.rca = sd_rca;
-
-        if let Err(_) = self.sd_cmd(CMD_SEND_CSD, sd_rca) {
-            println!("failed to get csd");
-            return;
-        }
-
-        let (csize, cmult) = if (self.ocr & ACMD41_CMD_CCS) != 0 {
-            let csize = (self.csd[1] & 0x3f) << 16 | (self.csd[2] & 0xffff_0000) >> 16;
-            let cmult = 8;
-            (csize as u64, cmult as u64)
-        } else {
-            let csize = (self.csd[1] & 0x3ff) << 2 | (self.csd[2] & 0xc000_0000) >> 30;
-            let cmult = (self.csd[2] & 0x0003_8000) >> 15;
-            (csize as u64, cmult as u64)
-        };
-        self.size = ((csize + 1) << (cmult + 2)) * 512;
-        println!("mmc size = 0x{:08x}", self.size);
-
-        if let Err(_) = self.set_clock(2500_0000) {
-            println!("failed to set clock 2500_0000 Hz");
-            return;
-        }
-
-        if let Err(_) = self.sd_cmd(CMD_CARD_SELECT, sd_rca) {
-            println!("failed to CMD_CARD_SELECT 0x{:08x}", sd_rca);
-            return;
-        }
-
-        if let Err(_) = self.sd_status(SR_DAT_INHIBIT) {
-            println!("SR_DAT_INHIBIT return");
-            return;
-        }
-
-        let regs = self.regs.get_mut().unwrap();
-        regs.blksizecnt.write(1 << 16 | 8);
-
-        if let Err(_) = self.sd_cmd(CMD_SEND_SCR, 0) {
-            println!("failed to CMD_SEND_SCR");
-            return;
-        }
-
-        if let Err(_) = self.sd_int(INT_READ_RDY) {
-            println!("failed to INT_READ_RDY");
-            return;
-        }
-
-        cnt = 10000;
-        let mut i = 0;
-        let regs = self.regs.get_mut().unwrap();
-        while i < 2 && cnt > 0 {
-            reg_val = regs.status.read();
-            cnt -= 1;
-            if (reg_val & SR_READ_AVAILABLE) != 0 {
-                self.scr[i] = regs.data.read();
-                i += 1;
-            } else {
-                wait_msec(10);
-                cnt -= 1;
-            }
-        }
-        if i != 2 {
-            println!("SD TIMEOUT FOR SCR[; 2]");
-            return;
-        }
-
-        if (self.scr[0] & SCR_SD_BUS_WIDTH_4) != 0 {
-            if let Err(_) = self.sd_cmd(CMD_SET_BUS_WIDTH, sd_rca | 2) {
-                println!("failed to set bus width, {}", sd_rca | 2);
-                return;
-            }
-            let regs = self.regs.get_mut().unwrap();
-            regs.control0.write(C0_HCTL_DWITDH);
-        }
-
-        print!("EMMC: supports ");
-
-        if (self.scr[0] & SCR_SUPP_SET_BLKCNT) != 0 {
-            print!("SET_BLKCNT ");
-        }
-
-        if ccs != 0 {
-            print!("CCS ");
-        }
-
-        print!("\n");
-
-        self.scr[0] &= !SCR_SUPP_CCS;
-        self.scr[0] |= ccs;
-    }
-
-    pub unsafe fn set_clock(&mut self, freq: u32) -> Result<()> {
-        let regs = self.regs.get_mut().unwrap();
-
-        let mut reg_val = regs.status.read() & (SR_CMD_INHIBIT | SR_DAT_INHIBIT);
-        let mut cnt = 10_0000;
-        while (cnt > 0) && reg_val != 0 {
-            wait_msec(1);
-            cnt -= 1;
-            reg_val = regs.status.read() & (SR_CMD_INHIBIT | SR_DAT_INHIBIT);
-        }
-
-        if cnt <= 0 {
-            println!("ERROR: TIMEOUT WAITING FOR INHIBIT FLAG");
-            return Err(Error::new(EINVAL));
-        }
-
-        reg_val = regs.control1.read();
-        reg_val &= !C1_CLK_EN;
-        regs.control1.write(reg_val);
-        wait_msec(10);
-
-        let c = 4166_6666 / freq;
-        let mut x: u32 = c - 1;
-        let mut s: u32 = 32;
-
-        if x == 0 {
-            s = 0;
-        } else {
-            if (x & 0xffff_0000) == 0 {
-                x <<= 16;
-                s -= 16;
-            }
-            if (x & 0xff00_0000) == 0 {
-                x <<= 8;
-                s -= 8;
-            }
-            if (x & 0xf000_0000) == 0 {
-                x <<= 4;
-                s -= 4;
-            }
-            if (x & 0xc000_0000) == 0 {
-                x <<= 2;
-                s -= 2;
-            }
-            if (x & 0x8000_0000) == 0 {
-                x <<= 1;
-                s -= 1;
-            }
-            if s > 0 {
-                s -= 1;
-            }
-            if s > 7 {
-                s = 7;
-            }
-        }
-        let mut d;
-        if self.host_spec_ver > HOST_SPEC_V2 {
-            d = c;
-        } else {
-            d = 1 << s;
-        }
-
-        if d <= 2 {
-            d = 2;
-            s = 0;
-        }
-        println!("sd clk divisor: 0x{:08x}, shift: 0x{:08x}", d, s);
-
-        let mut h = 0;
-        if self.host_spec_ver > HOST_SPEC_V2 {
-            h = (d & 0x300) >> 2;
-        }
-
-        d = ((d & 0xff) << 8) | h;
-        reg_val = regs.control1.read() & 0xffff_003f;
-        regs.control1.write(reg_val | d);
-        wait_msec(10);
-        reg_val = regs.control1.read();
-        regs.control1.write(reg_val | C1_CLK_EN);
-        wait_msec(10);
-
-        reg_val = regs.control1.read() & C1_CLK_STABLE;
-        cnt = 10000;
-        while cnt > 0 && reg_val == 0 {
-            wait_msec(10);
-            cnt -= 1;
-            reg_val = regs.control1.read() & C1_CLK_STABLE;
-        }
-
-        if cnt <= 0 {
-            println!("ERROR: failed to get stable clock");
-            return Err(Error::new(EINVAL));
-        }
-
-        Ok(())
-    }
-
-    pub unsafe fn sd_cmd(&mut self, mut code: u32, arg: u32) -> Result<u32> {
-        if (code & CMD_NEED_APP) != 0 {
-            let pre_cmd = CMD_APP_CMD | if self.rca != 0 { CMD_RSPNS_48 } else { 0 };
-            match self.sd_cmd(pre_cmd, self.rca) {
-                Err(_) => {
-                    println!("ERROR: failed to send SD APP command");
-                    return Err(Error::new(EINVAL));
-                }
-                Ok(_) => {
-                    code &= !CMD_NEED_APP;
-                }
-            }
-        }
-
-        if let Err(_) = self.sd_status(SR_CMD_INHIBIT) {
-            println!("ERROR: Emmc busy");
-            return Err(Error::new(EINVAL));
-        }
-
-        //println!("EMMC: Sending command 0x{:08x}, arg 0x{:08x}", code, arg);
-
-        let regs = self.regs.get_mut().unwrap();
-        let mut reg_val = regs.interrupt.read();
-        regs.interrupt.write(reg_val);
-        regs.arg1.write(arg);
-        regs.cmdtm.write(code);
-
-        if code == CMD_SEND_OP_COND {
-            wait_msec(1000);
-        } else if code == CMD_SEND_IF_COND || code == CMD_APP_CMD {
-            wait_msec(200);
-        }
-
-        if let Err(_) = self.sd_int(INT_CMD_DONE) {
-            println!("ERROR: failed to send EMMC command");
-            return Err(Error::new(EINVAL));
-        }
-
-        let regs = self.regs.get_mut().unwrap();
-        reg_val = regs.resp0.read();
-
-        if code == CMD_GO_IDLE || code == CMD_APP_CMD {
-            return Ok(0);
-        } else if code == (CMD_APP_CMD | CMD_RSPNS_48) {
-            return Ok(reg_val & SR_APP_CMD);
-        } else if code == CMD_SEND_OP_COND {
-            return Ok(reg_val);
-        } else if code == CMD_SEND_IF_COND {
-            if reg_val == arg {
-                return Ok(0);
-            } else {
-                return Err(Error::new(EINVAL));
-            }
-        } else if code == CMD_ALL_SEND_CID {
-            self.cid[0] = reg_val;
-            self.cid[1] = regs.resp1.read();
-            self.cid[2] = regs.resp2.read();
-            self.cid[3] = regs.resp3.read();
-
-            //FIXME: wrong implement, see CMD_SEND_CSD for detail
-            return Ok(reg_val);
-        } else if code == CMD_SEND_CSD {
-            let tmp0 = reg_val;
-            let tmp1 = regs.resp1.read();
-            let tmp2 = regs.resp2.read();
-            let tmp3 = regs.resp3.read();
-
-            self.csd[0] = tmp3 << 8 | tmp2 >> 24;
-            self.csd[1] = tmp2 << 8 | tmp1 >> 24;
-            self.csd[2] = tmp1 << 8 | tmp0 >> 24;
-            self.csd[3] = tmp0 << 8;
-
-            //FIXME: support variable length of result.
-            return Ok(reg_val);
-        } else if code == CMD_SEND_REL_ADDR {
-            let mut err = reg_val & 0x1fff;
-            err |= (reg_val & 0x2000) << 6;
-            err |= (reg_val & 0x4000) << 8;
-            err |= (reg_val & 0x8000) << 8;
-            err &= CMD_ERRORS_MASK;
-
-            if err != 0 {
-                return Err(Error::new(EINVAL));
-            } else {
-                return Ok(reg_val & CMD_RCA_MASK);
-            }
-        } else {
-            return Ok(reg_val & CMD_ERRORS_MASK);
-        }
-    }
-
-    pub unsafe fn sd_status(&mut self, mask: u32) -> Result<()> {
-        let regs = self.regs.get_mut().unwrap();
-        let mut cnt = 500000;
-
-        let mut reg_val = regs.status.read() & mask;
-        let mut reg_val1 = regs.interrupt.read() & INT_ERROR_MASK;
-
-        while cnt > 0 && reg_val != 0 && reg_val1 == 0 {
-            wait_msec(1);
-            cnt -= 1;
-            reg_val = regs.status.read() & mask;
-            reg_val1 = regs.interrupt.read() & INT_ERROR_MASK;
-        }
-        reg_val1 = regs.interrupt.read() & INT_ERROR_MASK;
-
-        if cnt <= 0 || reg_val1 != 0 {
-            return Err(Error::new(EINVAL));
-        } else {
-            return Ok(());
-        }
-    }
-    pub unsafe fn sd_int(&mut self, mask: u32) -> Result<()> {
-        let regs = self.regs.get_mut().unwrap();
-        let mut cnt = 100_0000;
-        let m = mask | INT_ERROR_MASK;
-
-        let mut reg_val = regs.interrupt.read() & m;
-
-        while cnt > 0 && reg_val == 0 {
-            wait_msec(1);
-            cnt -= 1;
-            reg_val = regs.interrupt.read() & m;
-        }
-        reg_val = regs.interrupt.read();
-        let err = reg_val & (INT_CMD_TIMEOUT | INT_DATA_TIMEOUT | INT_ERROR_MASK);
-
-        if cnt <= 0 || err != 0 {
-            regs.interrupt.write(reg_val);
-            return Err(Error::new(EINVAL));
-        } else {
-            regs.interrupt.write(mask);
-            return Ok(());
-        }
-    }
-
-    pub unsafe fn sd_readblock(&mut self, lba: u32, buf: &mut [u32], num: u32) -> Result<usize> {
-        let num = if num < 1 { 1 } else { num };
-
-        //println!("sd_readblock lba 0x{:x}, num 0x{:x}", lba, num);
-
-        if let Err(_) = self.sd_status(SR_DAT_INHIBIT) {
-            println!("SR_DAT_INHIBIT TIMEOUT");
-            return Err(Error::new(EINVAL));
-        }
-
-        if (self.scr[0] & SCR_SUPP_CCS) != 0 {
-            if num > 1 && ((self.scr[0] & SCR_SUPP_SET_BLKCNT) != 0) {
-                if let Err(_) = self.sd_cmd(CMD_SET_BLOCKCNT, num) {
-                    println!("CMD_SET_BLOCKCNT ERROR");
-                    return Err(Error::new(EINVAL));
-                }
-            }
-            let regs = self.regs.get_mut().unwrap();
-            regs.blksizecnt.write((num) << 16 | 512);
-            if num == 1 {
-                self.sd_cmd(CMD_READ_SINGLE, lba).unwrap();
-            } else {
-                self.sd_cmd(CMD_READ_MULTI, lba).unwrap();
-            }
-        } else {
-            let regs = self.regs.get_mut().unwrap();
-            regs.blksizecnt.write(1 << 16 | 512);
-        }
-
-        let mut cnt = 0;
-        while cnt < num {
-            if (self.scr[0] & SCR_SUPP_CCS) == 0 {
-                self.sd_cmd(CMD_READ_SINGLE, (lba + cnt) * 512).unwrap();
-            }
-
-            if let Err(_) = self.sd_int(INT_READ_RDY) {
-                println!("ERROR: Timeout waiting for ready to read");
-                return Err(Error::new(EINVAL));
-            }
-
-            let regs = self.regs.get_mut().unwrap();
-            regs.blksizecnt.write(1 << 16 | 512);
-            for d in 0..128 {
-                buf[(128 * cnt + d) as usize] = regs.data.read();
-            }
-            cnt += 1;
-        }
-
-        if num > 1 && (self.scr[0] & SCR_SUPP_SET_BLKCNT) == 0 && (self.scr[0] & SCR_SUPP_CCS) != 0
-        {
-            self.sd_cmd(CMD_STOP_TRANS, 0).unwrap();
-        }
-        Ok((num * 512) as usize)
-    }
-
-    pub unsafe fn sd_writeblock(&mut self, lba: u32, buf: &[u32], num: u32) -> Result<usize> {
-        let num = if num < 1 { 1 } else { num };
-
-        //println!("sd_writelock lba 0x{:x}, num 0x{:x}", lba, num);
-
-        if let Err(_) = self.sd_status(SR_DAT_INHIBIT | SR_WRITE_AVAILABLE) {
-            println!("SR_DAT_INHIBIT TIMEOUT");
-            return Err(Error::new(EINVAL));
-        }
-
-        if (self.scr[0] & SCR_SUPP_CCS) != 0 {
-            if num > 1 && ((self.scr[0] & SCR_SUPP_SET_BLKCNT) != 0) {
-                if let Err(_) = self.sd_cmd(CMD_SET_BLOCKCNT, num) {
-                    println!("CMD_SET_BLOCKCNT ERROR");
-                    return Err(Error::new(EINVAL));
-                }
-            }
-            let regs = self.regs.get_mut().unwrap();
-            regs.blksizecnt.write((num) << 16 | 512);
-            if num == 1 {
-                self.sd_cmd(CMD_WRITE_SINGLE, lba).unwrap();
-            } else {
-                self.sd_cmd(CMD_WRITE_MULTI, lba).unwrap();
-            }
-        } else {
-            let regs = self.regs.get_mut().unwrap();
-            regs.blksizecnt.write(1 << 16 | 512);
-        }
-
-        let mut cnt = 0;
-        while cnt < num {
-            if (self.scr[0] & SCR_SUPP_CCS) == 0 {
-                self.sd_cmd(CMD_WRITE_SINGLE, (lba + cnt) * 512).unwrap();
-            }
-
-            if let Err(_) = self.sd_int(INT_WRITE_RDY) {
-                println!("ERROR: Timeout waiting for ready to write");
-                return Err(Error::new(EINVAL));
-            }
-
-            let regs = self.regs.get_mut().unwrap();
-            regs.blksizecnt.write(1 << 16 | 512);
-            for d in 0..128 {
-                regs.data.write(buf[(128 * cnt + d) as usize]);
-            }
-            cnt += 1;
-        }
-
-        if let Err(_) = self.sd_int(INT_DATA_DONE) {
-            println!("ERROR: Timeout waiting for data done");
-            return Err(Error::new(EINVAL));
-        }
-
-        if num > 1 && (self.scr[0] & SCR_SUPP_SET_BLKCNT) == 0 && (self.scr[0] & SCR_SUPP_CCS) != 0
-        {
-            self.sd_cmd(CMD_STOP_TRANS, 0).unwrap();
-        }
-        Ok((num * 512) as usize)
-    }
-}
-
-impl Disk for SdHostCtrl {
-    fn block_size(&self) -> u32 {
-        512
-    }
-
-    fn size(&self) -> u64 {
-        //assert 512MiB
-        self.size
-    }
-
-    // TODO: real async?
-    async fn read(&mut self, block: u64, buffer: &mut [u8]) -> Result<usize> {
-        if (buffer.len() % 512) != 0 {
-            println!("buffer.len {} should be aligned to {}", buffer.len(), 512);
-            return Err(Error::new(EINVAL));
-        }
-        let u32_len = buffer.len() / core::mem::size_of::<u32>();
-        let num = buffer.len() / 512;
-        let u8_ptr = buffer.as_mut_ptr();
-        let ret = unsafe {
-            let u32_buffer = core::slice::from_raw_parts_mut(u8_ptr as *mut u32, u32_len);
-            self.sd_readblock(block as u32, u32_buffer, num as u32)
-        };
-        match ret {
-            Ok(cnt) => Ok(cnt),
-            Err(err) => Err(err),
-        }
-    }
-
-    // TODO: real async?
-    async fn write(&mut self, block: u64, buffer: &[u8]) -> Result<usize> {
-        if (buffer.len() % 512) != 0 {
-            println!("buffer.len {} should be aligned to {}", buffer.len(), 512);
-            return Err(Error::new(EINVAL));
-        }
-        let u32_len = buffer.len() / core::mem::size_of::<u32>();
-        let num = buffer.len() / 512;
-        let u8_ptr = buffer.as_ptr();
-        let ret = unsafe {
-            let u32_buffer = core::slice::from_raw_parts(u8_ptr as *const u32, u32_len);
-            self.sd_writeblock(block as u32, u32_buffer, num as u32)
-        };
-        match ret {
-            Ok(cnt) => Ok(cnt),
-            Err(err) => Err(err),
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/storage/driver-block/Cargo.toml b/recipes/core/base/drivers/storage/driver-block/Cargo.toml
deleted file mode 100644
index ec34dd9cdc..0000000000
--- a/recipes/core/base/drivers/storage/driver-block/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "driver-block"
-description = "Shared storage driver code"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-daemon = { path = "../../../daemon" }
-executor = { path = "../../executor" }
-partitionlib = { path = "../partitionlib" }
-
-libredox.workspace = true
-log.workspace = true
-
-# TODO: migrate virtio to our executor
-futures = { version = "0.3.28", features = ["executor"] }
-
-redox_syscall = { workspace = true, features = ["std"] }
-redox-scheme.workspace = true
-scheme-utils = { path = "../../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/storage/driver-block/src/lib.rs b/recipes/core/base/drivers/storage/driver-block/src/lib.rs
deleted file mode 100644
index 315aa659d1..0000000000
--- a/recipes/core/base/drivers/storage/driver-block/src/lib.rs
+++ /dev/null
@@ -1,661 +0,0 @@
-use std::cmp;
-use std::future::{Future, IntoFuture};
-use std::io::{self, Read, Seek, SeekFrom};
-
-use std::collections::BTreeMap;
-use std::convert::TryFrom;
-use std::fmt::Write;
-use std::str;
-use std::task::Poll;
-
-use executor::LocalExecutor;
-use libredox::Fd;
-use partitionlib::{LogicalBlockSize, PartitionTable};
-use redox_scheme::scheme::{register_scheme_inner, SchemeAsync, SchemeState};
-use redox_scheme::{CallerCtx, OpenResult, RequestKind, Response, SignalBehavior, Socket};
-use scheme_utils::{FpathWriter, HandleMap};
-use syscall::dirent::DirentBuf;
-use syscall::schemev2::NewFdFlags;
-use syscall::{
-    Error, Result, Stat, EACCES, EAGAIN, EBADF, EINTR, EINVAL, EISDIR, ENOENT, ENOLCK, EOPNOTSUPP,
-    EOVERFLOW, EWOULDBLOCK, MODE_DIR, MODE_FILE, O_DIRECTORY, O_STAT,
-};
-
-/// Split the read operation into a series of block reads.
-/// `read_fn` will be called with a block number to be read, and a buffer to be filled.
-/// `read_fn` must return a full block of data.
-/// Result will be the number of bytes read.
-fn block_read(
-    offset: u64,
-    blksize: u32,
-    buf: &mut [u8],
-    mut read_fn: impl FnMut(u64, &mut [u8]) -> io::Result<()>,
-) -> io::Result<usize> {
-    // TODO: Yield sometimes, perhaps after a few blocks or something.
-
-    if buf.len() == 0 {
-        return Ok(0);
-    }
-    let to_copy = usize::try_from(
-        offset.saturating_add(u64::try_from(buf.len()).expect("buf.len() larger than u64"))
-            - offset,
-    )
-    .expect("bytes to copy larger than usize");
-    let mut curr_buf = &mut buf[..to_copy];
-    let mut curr_offset = offset;
-    let blk_size = usize::try_from(blksize).expect("blksize larger than usize");
-    let mut total_read = 0;
-
-    let mut block_bytes = [0u8; 4096];
-    let block_bytes = &mut block_bytes[..blk_size];
-
-    while curr_buf.len() > 0 {
-        // TODO: Async/await? I mean, shouldn't AHCI be async?
-
-        let blk_offset =
-            usize::try_from(curr_offset % u64::from(blksize)).expect("usize smaller than blksize");
-        let to_copy = cmp::min(curr_buf.len(), blk_size - blk_offset);
-        assert!(blk_offset + to_copy <= blk_size);
-
-        read_fn(curr_offset / u64::from(blksize), block_bytes)?;
-
-        let src_buf = &block_bytes[blk_offset..];
-
-        curr_buf[..to_copy].copy_from_slice(&src_buf[..to_copy]);
-        curr_buf = &mut curr_buf[to_copy..];
-        curr_offset += u64::try_from(to_copy).expect("bytes to copy larger than u64");
-        total_read += to_copy;
-    }
-    Ok(total_read)
-}
-
-pub trait Disk {
-    fn block_size(&self) -> u32;
-    fn size(&self) -> u64;
-
-    // These operate on a whole multiple of the block size
-    // FIXME maybe only operate on a single block worth of data?
-    async fn read(&mut self, block: u64, buffer: &mut [u8]) -> syscall::Result<usize>;
-    async fn write(&mut self, block: u64, buffer: &[u8]) -> syscall::Result<usize>;
-}
-
-impl<T: Disk + ?Sized> Disk for Box<T> {
-    fn block_size(&self) -> u32 {
-        (**self).block_size()
-    }
-
-    fn size(&self) -> u64 {
-        (**self).size()
-    }
-
-    async fn read(&mut self, block: u64, buffer: &mut [u8]) -> syscall::Result<usize> {
-        (**self).read(block, buffer).await
-    }
-
-    async fn write(&mut self, block: u64, buffer: &[u8]) -> syscall::Result<usize> {
-        (**self).write(block, buffer).await
-    }
-}
-
-pub struct DiskWrapper<T> {
-    pub disk: T,
-    pub pt: Option<PartitionTable>,
-}
-
-impl<T: Disk> DiskWrapper<T> {
-    pub fn pt(disk: &mut T, executor: &impl ExecutorTrait) -> Option<PartitionTable> {
-        let bs = match disk.block_size() {
-            512 => LogicalBlockSize::Lb512,
-            4096 => LogicalBlockSize::Lb4096,
-            _ => return None,
-        };
-        struct Device<'a, D: Disk, E: ExecutorTrait> {
-            disk: &'a mut D,
-            executor: &'a E,
-            offset: u64,
-        }
-
-        impl<'a, D: Disk, E: ExecutorTrait> Seek for Device<'a, D, E> {
-            fn seek(&mut self, from: SeekFrom) -> io::Result<u64> {
-                let size = i64::try_from(self.disk.size()).or(Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    "Disk larger than 2^63 - 1 bytes",
-                )))?;
-
-                self.offset = match from {
-                    SeekFrom::Start(new_pos) => cmp::min(self.disk.size(), new_pos),
-                    SeekFrom::Current(new_pos) => {
-                        cmp::max(0, cmp::min(size, self.offset as i64 + new_pos)) as u64
-                    }
-                    SeekFrom::End(new_pos) => cmp::max(0, cmp::min(size + new_pos, size)) as u64,
-                };
-
-                Ok(self.offset)
-            }
-        }
-        // TODO: Perhaps this impl should be used in the rest of the scheme.
-        impl<'a, D: Disk, E: ExecutorTrait> Read for Device<'a, D, E> {
-            fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-                let blksize = self.disk.block_size();
-                let size_in_blocks = self.disk.size() / u64::from(blksize);
-
-                let disk = &mut self.disk;
-
-                let read_block = |block: u64, block_bytes: &mut [u8]| {
-                    if block >= size_in_blocks {
-                        return Err(io::Error::from_raw_os_error(syscall::EOVERFLOW));
-                    }
-
-                    let bytes = self.executor.block_on(disk.read(block, block_bytes))?;
-                    assert_eq!(bytes, block_bytes.len());
-                    Ok(())
-                };
-                let bytes_read = block_read(self.offset, blksize, buf, read_block)?;
-
-                self.offset += bytes_read as u64;
-                Ok(bytes_read)
-            }
-        }
-
-        partitionlib::get_partitions(
-            &mut Device {
-                disk,
-                offset: 0,
-                executor,
-            },
-            bs,
-        )
-        .ok()
-        .flatten()
-    }
-
-    pub fn new(mut disk: T, executor: &impl ExecutorTrait) -> Self {
-        Self {
-            pt: Self::pt(&mut disk, executor),
-            disk,
-        }
-    }
-
-    pub fn disk(&self) -> &T {
-        &self.disk
-    }
-
-    pub fn disk_mut(&mut self) -> &mut T {
-        &mut self.disk
-    }
-
-    pub fn block_size(&self) -> u32 {
-        self.disk.block_size()
-    }
-
-    pub fn size(&self) -> u64 {
-        self.disk.size()
-    }
-
-    pub async fn read(
-        &mut self,
-        part_num: Option<usize>,
-        block: u64,
-        buf: &mut [u8],
-    ) -> syscall::Result<usize> {
-        if buf.len() as u64 % u64::from(self.disk.block_size()) != 0 {
-            return Err(Error::new(EINVAL));
-        }
-
-        if let Some(part_num) = part_num {
-            let part = self
-                .pt
-                .as_ref()
-                .ok_or(syscall::Error::new(EBADF))?
-                .partitions
-                .get(part_num)
-                .ok_or(syscall::Error::new(EBADF))?;
-
-            if block >= part.size {
-                return Err(syscall::Error::new(EOVERFLOW));
-            }
-
-            let abs_block = part.start_lba + block;
-
-            self.disk.read(abs_block, buf).await
-        } else {
-            self.disk.read(block, buf).await
-        }
-    }
-
-    pub async fn write(
-        &mut self,
-        part_num: Option<usize>,
-        block: u64,
-        buf: &[u8],
-    ) -> syscall::Result<usize> {
-        if buf.len() as u64 % u64::from(self.disk.block_size()) != 0 {
-            return Err(Error::new(EINVAL));
-        }
-
-        if let Some(part_num) = part_num {
-            let part = self
-                .pt
-                .as_ref()
-                .ok_or(syscall::Error::new(EBADF))?
-                .partitions
-                .get(part_num)
-                .ok_or(syscall::Error::new(EBADF))?;
-
-            if block >= part.size {
-                return Err(syscall::Error::new(EOVERFLOW));
-            }
-
-            let abs_block = part.start_lba + block;
-
-            self.disk.write(abs_block, buf).await
-        } else {
-            self.disk.write(block, buf).await
-        }
-    }
-}
-
-pub struct DiskScheme<T> {
-    inner: DiskSchemeInner<T>,
-    state: SchemeState,
-}
-
-impl<T: Disk> DiskScheme<T> {
-    pub fn new(
-        daemon: Option<daemon::Daemon>,
-        scheme_name: String,
-        disks: BTreeMap<u32, T>,
-        executor: &impl ExecutorTrait,
-    ) -> Self {
-        assert!(scheme_name.starts_with("disk"));
-        let socket = Socket::nonblock().expect("failed to create disk scheme");
-
-        let mut inner = DiskSchemeInner {
-            scheme_name: scheme_name,
-            socket,
-            disks: disks
-                .into_iter()
-                .map(|(k, disk)| (k, DiskWrapper::new(disk, executor)))
-                .collect(),
-            handles: HandleMap::new(),
-        };
-
-        let cap_id = inner.scheme_root().expect("failed to get this scheme root");
-        register_scheme_inner(&inner.socket, &inner.scheme_name, cap_id)
-            .expect("failed to register disk scheme root");
-
-        if let Some(daemon) = daemon {
-            daemon.ready();
-        }
-
-        Self {
-            inner,
-            state: SchemeState::new(),
-        }
-    }
-
-    pub fn event_handle(&self) -> &Fd {
-        self.inner.socket.inner()
-    }
-
-    /// Process pending and new requests.
-    ///
-    /// This needs to be called each time there is a new event on the scheme.
-    pub async fn tick(&mut self) -> io::Result<()> {
-        // Handle new scheme requests
-        loop {
-            let request = match self.inner.socket.next_request(SignalBehavior::Interrupt) {
-                Ok(Some(request)) => request,
-                Ok(None) => {
-                    // Scheme likely got unmounted
-                    // TODO: return this to caller instead
-                    std::process::exit(0);
-                }
-                Err(error) if error.errno == EWOULDBLOCK || error.errno == EAGAIN => break,
-                Err(err) if err.errno == EINTR => continue,
-                Err(err) => return Err(err.into()),
-            };
-
-            let response = match request.kind() {
-                RequestKind::Call(call_request) => {
-                    // TODO: Spawn a separate task for each scheme call. This would however require the
-                    // use of a smarter buffer pool (or direct IO, or a buffer per fd) in order to do
-                    // parallel IO. It might also require async-aware locks so that a close() is
-                    // correctly ordered wrt IO on the same fd.
-                    call_request
-                        .handle_async(&mut self.inner, &mut self.state)
-                        .await
-                }
-                RequestKind::SendFd(request) => Response::err(EOPNOTSUPP, request),
-                RequestKind::RecvFd(request) => Response::err(EOPNOTSUPP, request),
-                RequestKind::Cancellation(_cancellation_request) => {
-                    // FIXME implement cancellation
-                    continue;
-                }
-                RequestKind::MsyncMsg | RequestKind::MunmapMsg | RequestKind::MmapMsg => {
-                    unreachable!()
-                }
-                RequestKind::OnClose { id } => {
-                    self.inner.on_close(id);
-                    continue;
-                }
-                RequestKind::OnDetach { .. } => continue,
-            };
-            self.inner
-                .socket
-                .write_response(response, SignalBehavior::Restart)?;
-        }
-
-        Ok(())
-    }
-}
-
-enum Handle {
-    List(Vec<u8>),       // entries
-    Disk(u32),           // disk num
-    Partition(u32, u32), // disk num, part num
-    SchemeRoot,
-}
-
-struct DiskSchemeInner<T> {
-    scheme_name: String,
-    socket: Socket,
-    disks: BTreeMap<u32, DiskWrapper<T>>,
-    handles: HandleMap<Handle>,
-}
-
-pub trait ExecutorTrait {
-    fn block_on<'a, O: 'a>(&self, fut: impl IntoFuture<Output = O> + 'a) -> O;
-}
-impl<Hw: executor::Hardware> ExecutorTrait for LocalExecutor<Hw> {
-    fn block_on<'a, O: 'a>(&self, fut: impl IntoFuture<Output = O> + 'a) -> O {
-        LocalExecutor::block_on(self, fut)
-    }
-}
-#[deprecated = "use custom executor"]
-pub struct FuturesExecutor;
-
-#[allow(deprecated)]
-impl ExecutorTrait for FuturesExecutor {
-    fn block_on<'a, O: 'a>(&self, fut: impl IntoFuture<Output = O> + 'a) -> O {
-        futures::executor::block_on(fut.into_future())
-    }
-}
-pub struct TrivialExecutor;
-impl ExecutorTrait for TrivialExecutor {
-    fn block_on<'a, O: 'a>(&self, fut: impl IntoFuture<Output = O> + 'a) -> O {
-        let mut fut = std::pin::pin!(fut.into_future());
-        let mut cx = std::task::Context::from_waker(std::task::Waker::noop());
-        loop {
-            match fut.as_mut().poll(&mut cx) {
-                Poll::Ready(v) => return v,
-                Poll::Pending => {
-                    log::warn!("TrivialExecutor: future wasn't trivial");
-                    continue;
-                }
-            }
-        }
-    }
-}
-
-impl<T: Disk> DiskSchemeInner<T> {
-    // Checks if any conflicting handles already exist
-    fn check_locks(&self, disk_i: u32, part_i_opt: Option<u32>) -> Result<()> {
-        for (_, handle) in self.handles.iter() {
-            match handle {
-                Handle::Disk(i) => {
-                    if disk_i == *i {
-                        return Err(Error::new(ENOLCK));
-                    }
-                }
-                Handle::Partition(i, p) => {
-                    if disk_i == *i {
-                        match part_i_opt {
-                            Some(part_i) => {
-                                if part_i == *p {
-                                    return Err(Error::new(ENOLCK));
-                                }
-                            }
-                            None => {
-                                return Err(Error::new(ENOLCK));
-                            }
-                        }
-                    }
-                }
-                _ => (),
-            }
-        }
-        Ok(())
-    }
-}
-
-impl<T: Disk> SchemeAsync for DiskSchemeInner<T> {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-    async fn openat(
-        &mut self,
-        dirfd: usize,
-        path_str: &str,
-        flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(self.handles.get(dirfd)?, Handle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-
-        if ctx.uid != 0 {
-            return Err(Error::new(EACCES));
-        }
-        let path_str = path_str.trim_matches('/');
-
-        let handle = if path_str.is_empty() {
-            if flags & O_DIRECTORY == O_DIRECTORY || flags & O_STAT == O_STAT {
-                let mut list = String::new();
-
-                for (nsid, disk) in self.disks.iter() {
-                    write!(list, "{}\n", nsid).unwrap();
-
-                    if disk.pt.is_none() {
-                        continue;
-                    }
-                    for part_num in 0..disk.pt.as_ref().unwrap().partitions.len() {
-                        write!(list, "{}p{}\n", nsid, part_num).unwrap();
-                    }
-                }
-
-                Handle::List(list.into_bytes())
-            } else {
-                return Err(Error::new(EISDIR));
-            }
-        } else if let Some(p_pos) = path_str.chars().position(|c| c == 'p') {
-            let nsid_str = &path_str[..p_pos];
-
-            if p_pos + 1 >= path_str.len() {
-                return Err(Error::new(ENOENT));
-            }
-            let part_num_str = &path_str[p_pos + 1..];
-
-            let nsid = nsid_str.parse::<u32>().or(Err(Error::new(ENOENT)))?;
-            let part_num = part_num_str.parse::<u32>().or(Err(Error::new(ENOENT)))?;
-
-            if let Some(disk) = self.disks.get(&nsid) {
-                if disk
-                    .pt
-                    .as_ref()
-                    .ok_or(Error::new(ENOENT))?
-                    .partitions
-                    .get(part_num as usize)
-                    .is_some()
-                {
-                    self.check_locks(nsid, Some(part_num))?;
-
-                    Handle::Partition(nsid, part_num)
-                } else {
-                    return Err(Error::new(ENOENT));
-                }
-            } else {
-                return Err(Error::new(ENOENT));
-            }
-        } else {
-            let nsid = path_str.parse::<u32>().or(Err(Error::new(ENOENT)))?;
-
-            if self.disks.contains_key(&nsid) {
-                self.check_locks(nsid, None)?;
-                Handle::Disk(nsid)
-            } else {
-                return Err(Error::new(ENOENT));
-            }
-        };
-        let id = self.handles.insert(handle);
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::POSITIONED,
-        })
-    }
-    async fn getdents<'buf>(
-        &mut self,
-        _id: usize,
-        _buf: DirentBuf<&'buf mut [u8]>,
-        _opaque_offset: u64,
-    ) -> Result<DirentBuf<&'buf mut [u8]>> {
-        // TODO
-        Err(Error::new(EOPNOTSUPP))
-    }
-
-    async fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        match *self.handles.get(id)? {
-            Handle::List(ref data) => {
-                stat.st_mode = MODE_DIR;
-                stat.st_size = data.len() as u64;
-                Ok(())
-            }
-            Handle::Disk(number) => {
-                let disk = self.disks.get_mut(&number).ok_or(Error::new(EBADF))?;
-                stat.st_mode = MODE_FILE;
-                stat.st_blocks = disk.disk().size() / u64::from(disk.block_size());
-                stat.st_blksize = disk.block_size();
-                stat.st_size = disk.size();
-                Ok(())
-            }
-            Handle::Partition(disk_num, part_num) => {
-                let disk = self.disks.get_mut(&disk_num).ok_or(Error::new(EBADF))?;
-                let part = disk
-                    .pt
-                    .as_ref()
-                    .ok_or(Error::new(EBADF))?
-                    .partitions
-                    .get(part_num as usize)
-                    .ok_or(Error::new(EBADF))?;
-                stat.st_mode = MODE_FILE;
-                stat.st_size = part.size * u64::from(disk.block_size());
-                stat.st_blocks = part.size;
-                stat.st_blksize = disk.block_size();
-                Ok(())
-            }
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-        }
-    }
-
-    async fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with_legacy(buf, &self.scheme_name, |w| {
-            match *self.handles.get(id)? {
-                Handle::List(_) => (),
-                Handle::Disk(number) => {
-                    write!(w, "{number}").unwrap();
-                }
-                Handle::Partition(disk_num, part_num) => {
-                    write!(w, "{disk_num}p{part_num}").unwrap();
-                }
-                Handle::SchemeRoot => return Err(Error::new(EBADF)),
-            }
-            Ok(())
-        })
-    }
-
-    async fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        match *self.handles.get_mut(id)? {
-            Handle::List(ref handle) => {
-                let src = usize::try_from(offset)
-                    .ok()
-                    .and_then(|o| handle.get(o..))
-                    .unwrap_or(&[]);
-                let count = core::cmp::min(src.len(), buf.len());
-                buf[..count].copy_from_slice(&src[..count]);
-                Ok(count)
-            }
-            Handle::Disk(number) => {
-                let disk = self.disks.get_mut(&number).ok_or(Error::new(EBADF))?;
-                let block = offset / u64::from(disk.block_size());
-                disk.read(None, block, buf).await
-            }
-            Handle::Partition(disk_num, part_num) => {
-                let disk = self.disks.get_mut(&disk_num).ok_or(Error::new(EBADF))?;
-                let block = offset / u64::from(disk.block_size());
-                disk.read(Some(part_num as usize), block, buf).await
-            }
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-        }
-    }
-
-    async fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        match *self.handles.get_mut(id)? {
-            Handle::List(_) => Err(Error::new(EBADF)),
-            Handle::Disk(number) => {
-                let disk = self.disks.get_mut(&number).ok_or(Error::new(EBADF))?;
-                let block = offset / u64::from(disk.block_size());
-                disk.write(None, block, buf).await
-            }
-            Handle::Partition(disk_num, part_num) => {
-                let disk = self.disks.get_mut(&disk_num).ok_or(Error::new(EBADF))?;
-                let block = offset / u64::from(disk.block_size());
-                disk.write(Some(part_num as usize), block, buf).await
-            }
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-        }
-    }
-
-    async fn fsize(&mut self, id: usize, _ctx: &CallerCtx) -> Result<u64> {
-        Ok(match *self.handles.get_mut(id)? {
-            Handle::List(ref handle) => handle.len() as u64,
-            Handle::Disk(number) => {
-                let disk = self.disks.get_mut(&number).ok_or(Error::new(EBADF))?;
-                disk.size()
-            }
-            Handle::Partition(disk_num, part_num) => {
-                let disk = self.disks.get_mut(&disk_num).ok_or(Error::new(EBADF))?;
-                let part = disk
-                    .pt
-                    .as_ref()
-                    .ok_or(Error::new(EBADF))?
-                    .partitions
-                    .get(part_num as usize)
-                    .ok_or(Error::new(EBADF))?;
-
-                part.size * u64::from(disk.block_size())
-            }
-            Handle::SchemeRoot => return Err(Error::new(EBADF)),
-        })
-    }
-}
-
-impl<D: Disk> DiskSchemeInner<D> {
-    pub fn on_close(&mut self, id: usize) {
-        let _ = self.handles.remove(id);
-    }
-}
diff --git a/recipes/core/base/drivers/storage/ided/.gitignore b/recipes/core/base/drivers/storage/ided/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/storage/ided/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/storage/ided/Cargo.toml b/recipes/core/base/drivers/storage/ided/Cargo.toml
deleted file mode 100644
index addcfafd8f..0000000000
--- a/recipes/core/base/drivers/storage/ided/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "ided"
-description = "PATA (IDE) driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-common = { path = "../../common" }
-driver-block = { path = "../driver-block" }
-libredox.workspace = true
-log.workspace = true
-pcid = { path = "../../pcid" }
-daemon = { path = "../../../daemon" }
-redox_syscall = { workspace = true, features = ["std"] }
-redox_event.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/storage/ided/src/ide.rs b/recipes/core/base/drivers/storage/ided/src/ide.rs
deleted file mode 100644
index 5faf3250d4..0000000000
--- a/recipes/core/base/drivers/storage/ided/src/ide.rs
+++ /dev/null
@@ -1,469 +0,0 @@
-use std::{
-    convert::TryInto,
-    sync::{Arc, Mutex},
-    thread,
-    time::{Duration, Instant},
-};
-
-use driver_block::Disk;
-use syscall::error::{Error, Result, EIO};
-
-use common::dma::Dma;
-use common::io::{Io, Pio, ReadOnly, WriteOnly};
-
-const TIMEOUT: Duration = Duration::new(5, 0);
-
-#[repr(u8)]
-pub enum AtaCommand {
-    ReadPio = 0x20,
-    ReadPioExt = 0x24,
-    ReadDma = 0xC8,
-    ReadDmaExt = 0x25,
-    WritePio = 0x30,
-    WritePioExt = 0x34,
-    WriteDma = 0xCA,
-    WriteDmaExt = 0x35,
-    CacheFlush = 0xE7,
-    CacheFlushExt = 0xEA,
-    Packet = 0xA0,
-    IdentifyPacket = 0xA1,
-    Identify = 0xEC,
-}
-
-#[repr(C, packed)]
-struct PrdtEntry {
-    phys: u32,
-    size: u16,
-    flags: u16,
-}
-
-pub struct Channel {
-    pub data8: Pio<u8>,
-    pub data32: Pio<u32>,
-    pub error: ReadOnly<Pio<u8>>,
-    pub features: WriteOnly<Pio<u8>>,
-    pub sector_count: Pio<u8>,
-    pub lba_0: Pio<u8>,
-    pub lba_1: Pio<u8>,
-    pub lba_2: Pio<u8>,
-    pub device_select: Pio<u8>,
-    pub status: ReadOnly<Pio<u8>>,
-    pub command: WriteOnly<Pio<u8>>,
-    pub alt_status: ReadOnly<Pio<u8>>,
-    pub control: WriteOnly<Pio<u8>>,
-    pub busmaster_command: Pio<u8>,
-    pub busmaster_status: Pio<u8>,
-    pub busmaster_prdt: Pio<u32>,
-    prdt: Dma<[PrdtEntry; 128]>,
-    buf: Dma<[u8; 128 * 512]>,
-}
-
-impl Channel {
-    pub fn new(base: u16, control_base: u16, busmaster_base: u16) -> Result<Self> {
-        Ok(Self {
-            data8: Pio::new(base + 0),
-            data32: Pio::new(base + 0),
-            error: ReadOnly::new(Pio::new(base + 1)),
-            features: WriteOnly::new(Pio::new(base + 1)),
-            sector_count: Pio::new(base + 2),
-            lba_0: Pio::new(base + 3),
-            lba_1: Pio::new(base + 4),
-            lba_2: Pio::new(base + 5),
-            device_select: Pio::new(base + 6),
-            status: ReadOnly::new(Pio::new(base + 7)),
-            command: WriteOnly::new(Pio::new(base + 7)),
-            alt_status: ReadOnly::new(Pio::new(control_base)),
-            control: WriteOnly::new(Pio::new(control_base)),
-            busmaster_command: Pio::new(busmaster_base),
-            busmaster_status: Pio::new(busmaster_base + 2),
-            busmaster_prdt: Pio::new(busmaster_base + 4),
-            prdt: unsafe {
-                Dma::zeroed(
-                    //TODO: PhysBox::new_in_32bit_space(4096)?
-                )?
-                .assume_init()
-            },
-            buf: unsafe {
-                Dma::zeroed(
-                    //TODO: PhysBox::new_in_32bit_space(16 * 4096)?
-                )?
-                .assume_init()
-            },
-        })
-    }
-
-    pub fn primary_compat(busmaster_base: u16) -> Result<Self> {
-        Self::new(0x1F0, 0x3F6, busmaster_base)
-    }
-
-    pub fn secondary_compat(busmaster_base: u16) -> Result<Self> {
-        Self::new(0x170, 0x376, busmaster_base)
-    }
-
-    fn check_status(&mut self) -> Result<u8> {
-        let status = self.status.read();
-
-        if status & 0x01 != 0 {
-            log::error!("IDE error: {:#x}", self.error.read());
-            return Err(Error::new(EIO));
-        }
-
-        if status & 0x20 != 0 {
-            log::error!("IDE device write fault");
-            return Err(Error::new(EIO));
-        }
-
-        Ok(status)
-    }
-
-    fn polling(&mut self, read: bool, line: u32) -> Result<()> {
-        /*
-        #define ATA_SR_BSY     0x80    // Busy
-        #define ATA_SR_DRDY    0x40    // Drive ready
-        #define ATA_SR_DF      0x20    // Drive write fault
-        #define ATA_SR_DSC     0x10    // Drive seek complete
-        #define ATA_SR_DRQ     0x08    // Data request ready
-        #define ATA_SR_CORR    0x04    // Corrected data
-        #define ATA_SR_IDX     0x02    // Index
-        #define ATA_SR_ERR     0x01    // Error
-        */
-
-        for _ in 0..4 {
-            // Doing this 4 times creates a 400ns delay
-            self.alt_status.read();
-        }
-
-        let start = Instant::now();
-        loop {
-            let status = self.check_status()?;
-            if status & 0x80 == 0 {
-                if read && status & 0x08 == 0 {
-                    log::error!("IDE read data not ready");
-                    return Err(Error::new(EIO));
-                }
-                break;
-            }
-            if start.elapsed() >= TIMEOUT {
-                log::error!(
-                    "line {} polling {} timeout with status 0x{:02X}",
-                    line,
-                    if read { "read" } else { "write" },
-                    status
-                );
-                return Err(Error::new(EIO));
-            }
-            thread::yield_now();
-        }
-
-        Ok(())
-    }
-}
-
-pub struct AtaDisk {
-    pub chan: Arc<Mutex<Channel>>,
-    pub chan_i: usize,
-    pub dev: u8,
-    pub size: u64,
-    pub dma: bool,
-    pub lba_48: bool,
-}
-
-impl Disk for AtaDisk {
-    fn block_size(&self) -> u32 {
-        512
-    }
-
-    fn size(&self) -> u64 {
-        self.size
-    }
-
-    // NOTE: not async
-    async fn read(&mut self, start_block: u64, buffer: &mut [u8]) -> Result<usize> {
-        let mut count = 0;
-        for chunk in buffer.chunks_mut(65536) {
-            let block = start_block + (count as u64) / 512;
-
-            //TODO: support other LBA modes
-            assert!(block < 0x1_0000_0000_0000);
-
-            let sectors = (chunk.len() + 511) / 512;
-            assert!(sectors <= 128);
-
-            log::trace!(
-                "IDE read chan {} dev {} block {:#x} count {:#x}",
-                self.chan_i,
-                self.dev,
-                block,
-                sectors
-            );
-
-            let mut chan = self.chan.lock().unwrap();
-
-            if self.dma {
-                // Stop bus master
-                chan.busmaster_command.writef(1, false);
-                // Make PRDT EOT match chunk size
-                for i in 0..sectors {
-                    chan.prdt[i] = PrdtEntry {
-                        phys: (chan.buf.physical() + i * 512).try_into().unwrap(),
-                        size: 512,
-                        flags: if i + 1 == sectors {
-                            1 << 15 // End of table
-                        } else {
-                            0
-                        },
-                    };
-                }
-                // Set PRDT
-                let prdt = chan.prdt.physical();
-                chan.busmaster_prdt.write(prdt.try_into().unwrap());
-                // Set to read
-                chan.busmaster_command.writef(1 << 3, true);
-                // Clear interrupt and error bits
-                chan.busmaster_status.write(0b110);
-            }
-
-            // Select drive
-            //TODO: upper part of LBA 28
-            chan.device_select.write(0xE0 | (self.dev << 4));
-
-            if self.lba_48 {
-                // Set high sector count and LBA
-                chan.control.write(0x80);
-                chan.sector_count.write((sectors >> 8) as u8);
-                chan.lba_0.write((block >> 24) as u8);
-                chan.lba_1.write((block >> 32) as u8);
-                chan.lba_2.write((block >> 40) as u8);
-                chan.control.write(0x00);
-            }
-
-            // Set low sector count and LBA
-            chan.sector_count.write(sectors as u8);
-            chan.lba_0.write(block as u8);
-            chan.lba_1.write((block >> 8) as u8);
-            chan.lba_2.write((block >> 16) as u8);
-
-            // Send command
-            chan.command.write(if self.dma {
-                if self.lba_48 {
-                    AtaCommand::ReadDmaExt as u8
-                } else {
-                    AtaCommand::ReadDma as u8
-                }
-            } else {
-                if self.lba_48 {
-                    AtaCommand::ReadPioExt as u8
-                } else {
-                    AtaCommand::ReadPio as u8
-                }
-            });
-
-            // Read data
-            if self.dma {
-                // Start bus master
-                chan.busmaster_command.writef(1, true);
-
-                // Wait for transaction to finish
-                chan.polling(false, line!())?;
-
-                // Wait for bus master to finish
-                let start = Instant::now();
-                let error = loop {
-                    let status = chan.busmaster_status.read();
-                    if status & 1 << 1 != 0 {
-                        // Break with error status
-                        break true;
-                    }
-                    if status & 1 == 0 {
-                        // Break when not busy and no error
-                        break false;
-                    }
-                    if start.elapsed() >= TIMEOUT {
-                        log::error!("busmaster read timeout with status 0x{:02X}", status);
-                        return Err(Error::new(EIO));
-                    }
-                    thread::yield_now();
-                };
-
-                // Stop bus master
-                chan.busmaster_command.writef(1, false);
-
-                // Clear bus master error and interrupt
-                chan.busmaster_status.write(0b110);
-
-                if error {
-                    log::error!("IDE bus master error");
-                    return Err(Error::new(EIO));
-                }
-
-                // Read buffer
-                chunk.copy_from_slice(&chan.buf[..chunk.len()]);
-            } else {
-                for sector in 0..sectors {
-                    chan.polling(true, line!())?;
-
-                    for i in 0..128 {
-                        let data = chan.data32.read();
-                        chunk[sector * 512 + i * 4 + 0] = (data >> 0) as u8;
-                        chunk[sector * 512 + i * 4 + 1] = (data >> 8) as u8;
-                        chunk[sector * 512 + i * 4 + 2] = (data >> 16) as u8;
-                        chunk[sector * 512 + i * 4 + 3] = (data >> 24) as u8;
-                    }
-                }
-            }
-
-            count += chunk.len();
-        }
-
-        Ok(count)
-    }
-
-    // NOTE: not async
-    async fn write(&mut self, start_block: u64, buffer: &[u8]) -> Result<usize> {
-        let mut count = 0;
-        for chunk in buffer.chunks(65536) {
-            let block = start_block + (count as u64) / 512;
-
-            //TODO: support other LBA modes
-            assert!(block < 0x1_0000_0000_0000);
-
-            let sectors = (chunk.len() + 511) / 512;
-            assert!(sectors <= 128);
-
-            log::trace!(
-                "IDE write chan {} dev {} block {:#x} count {:#x}",
-                self.chan_i,
-                self.dev,
-                block,
-                sectors
-            );
-
-            let mut chan = self.chan.lock().unwrap();
-
-            if self.dma {
-                // Stop bus master
-                chan.busmaster_command.writef(1, false);
-                // Make PRDT EOT match chunk size
-                for i in 0..sectors {
-                    chan.prdt[i] = PrdtEntry {
-                        phys: (chan.buf.physical() + i * 512).try_into().unwrap(),
-                        size: 512,
-                        flags: if i + 1 == sectors {
-                            1 << 15 // End of table
-                        } else {
-                            0
-                        },
-                    };
-                }
-                // Set PRDT
-                let prdt = chan.prdt.physical();
-                chan.busmaster_prdt.write(prdt.try_into().unwrap());
-                // Set to write
-                chan.busmaster_command.writef(1 << 3, false);
-                // Clear interrupt and error bits
-                chan.busmaster_status.write(0b110);
-
-                // Write buffer
-                chan.buf[..chunk.len()].copy_from_slice(chunk);
-            }
-
-            // Select drive
-            //TODO: upper part of LBA 28
-            chan.device_select.write(0xE0 | (self.dev << 4));
-
-            if self.lba_48 {
-                // Set high sector count and LBA
-                chan.control.write(0x80);
-                chan.sector_count.write((sectors >> 8) as u8);
-                chan.lba_0.write((block >> 24) as u8);
-                chan.lba_1.write((block >> 32) as u8);
-                chan.lba_2.write((block >> 40) as u8);
-                chan.control.write(0x00);
-            }
-
-            // Set low sector count and LBA
-            chan.sector_count.write(sectors as u8);
-            chan.lba_0.write(block as u8);
-            chan.lba_1.write((block >> 8) as u8);
-            chan.lba_2.write((block >> 16) as u8);
-
-            // Send command
-            chan.command.write(if self.dma {
-                if self.lba_48 {
-                    AtaCommand::WriteDmaExt as u8
-                } else {
-                    AtaCommand::WriteDma as u8
-                }
-            } else {
-                if self.lba_48 {
-                    AtaCommand::WritePioExt as u8
-                } else {
-                    AtaCommand::WritePio as u8
-                }
-            });
-
-            // Write data
-            if self.dma {
-                // Start bus master
-                chan.busmaster_command.writef(1, true);
-
-                // Wait for transaction to finish
-                chan.polling(false, line!())?;
-
-                // Wait for bus master to finish
-                let start = Instant::now();
-                let error = loop {
-                    let status = chan.busmaster_status.read();
-                    if status & 1 << 1 != 0 {
-                        // Break with error status
-                        break true;
-                    }
-                    if status & 1 == 0 {
-                        // Break when not busy and no error
-                        break false;
-                    }
-                    if start.elapsed() >= TIMEOUT {
-                        log::error!("busmaster write timeout with status 0x{:02X}", status);
-                        return Err(Error::new(EIO));
-                    }
-                    thread::yield_now();
-                };
-
-                // Stop bus master
-                chan.busmaster_command.writef(1, false);
-
-                // Clear bus master error and interrupt
-                chan.busmaster_status.write(0b110);
-
-                if error {
-                    log::error!("IDE bus master error");
-                    return Err(Error::new(EIO));
-                }
-            } else {
-                for sector in 0..sectors {
-                    chan.polling(false, line!())?;
-
-                    for i in 0..128 {
-                        chan.data32.write(
-                            ((chunk[sector * 512 + i * 4 + 0] as u32) << 0)
-                                | ((chunk[sector * 512 + i * 4 + 1] as u32) << 8)
-                                | ((chunk[sector * 512 + i * 4 + 2] as u32) << 16)
-                                | ((chunk[sector * 512 + i * 4 + 3] as u32) << 24),
-                        );
-                    }
-                }
-            }
-
-            chan.command.write(if self.lba_48 {
-                AtaCommand::CacheFlushExt as u8
-            } else {
-                AtaCommand::CacheFlush as u8
-            });
-            chan.polling(false, line!())?;
-
-            count += chunk.len();
-        }
-
-        Ok(count)
-    }
-}
diff --git a/recipes/core/base/drivers/storage/ided/src/main.rs b/recipes/core/base/drivers/storage/ided/src/main.rs
deleted file mode 100644
index 4197217dcd..0000000000
--- a/recipes/core/base/drivers/storage/ided/src/main.rs
+++ /dev/null
@@ -1,304 +0,0 @@
-use common::io::Io as _;
-use driver_block::{Disk, DiskScheme, ExecutorTrait, FuturesExecutor};
-use event::{EventFlags, RawEventQueue};
-use libredox::flag;
-use log::{error, info};
-use pcid_interface::PciFunctionHandle;
-use std::{
-    fs::File,
-    io::{Read, Write},
-    os::unix::io::{FromRawFd, RawFd},
-    sync::{Arc, Mutex},
-    thread::{self, sleep},
-    time::Duration,
-};
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-use crate::ide::{AtaCommand, AtaDisk, Channel};
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub mod ide;
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-fn daemon(daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_ide");
-
-    common::setup_logging(
-        "disk",
-        "pci",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    info!("IDE PCI CONFIG: {:?}", pci_config);
-
-    // Get controller DMA capable
-    let dma = pci_config.func.full_device_id.interface & 0x80 != 0;
-
-    let busmaster_base = pci_config.func.bars[4].expect_port();
-    let (primary, primary_irq) = if pci_config.func.full_device_id.interface & 1 != 0 {
-        panic!("TODO: IDE primary channel is PCI native");
-    } else {
-        (Channel::primary_compat(busmaster_base).unwrap(), 14)
-    };
-    let (secondary, secondary_irq) = if pci_config.func.full_device_id.interface & 1 != 0 {
-        panic!("TODO: IDE secondary channel is PCI native");
-    } else {
-        (Channel::secondary_compat(busmaster_base + 8).unwrap(), 15)
-    };
-
-    common::acquire_port_io_rights().expect("ided: failed to get I/O privilege");
-
-    //TODO: move this to ide.rs?
-    let chans = vec![
-        Arc::new(Mutex::new(primary)),
-        Arc::new(Mutex::new(secondary)),
-    ];
-    enum AnyDisk {
-        Ata(AtaDisk),
-    }
-    impl Disk for AnyDisk {
-        fn block_size(&self) -> u32 {
-            let AnyDisk::Ata(a) = self;
-            a.block_size()
-        }
-        fn size(&self) -> u64 {
-            let AnyDisk::Ata(a) = self;
-            a.size()
-        }
-        async fn write(&mut self, block: u64, buffer: &[u8]) -> syscall::Result<usize> {
-            let AnyDisk::Ata(a) = self;
-            a.write(block, buffer).await
-        }
-        async fn read(&mut self, block: u64, buffer: &mut [u8]) -> syscall::Result<usize> {
-            let AnyDisk::Ata(a) = self;
-            a.read(block, buffer).await
-        }
-    }
-    let mut disks: Vec<AnyDisk> = Vec::new();
-    for (chan_i, chan_lock) in chans.iter().enumerate() {
-        let mut chan = chan_lock.lock().unwrap();
-
-        println!("  - channel {}", chan_i);
-
-        // Disable IRQs
-        chan.control.write(2);
-
-        for dev in 0..=1 {
-            println!("    - device {}", dev);
-
-            // Select device
-            chan.device_select.write(0xA0 | (dev << 4));
-            sleep(Duration::from_millis(1));
-
-            // ATA identify command
-            chan.command.write(AtaCommand::Identify as u8);
-            sleep(Duration::from_millis(1));
-
-            // Check if device exists
-            if chan.status.read() == 0 {
-                println!("      not found");
-                continue;
-            }
-
-            // Poll for status
-            let error = loop {
-                let status = chan.status.read();
-                if status & 1 != 0 {
-                    // Error
-                    break true;
-                }
-                if status & 0x80 == 0 && status & 0x08 != 0 {
-                    // Not busy and data ready
-                    break false;
-                }
-                thread::yield_now();
-            };
-
-            //TODO: probe ATAPI
-            if error {
-                println!("      error");
-                continue;
-            }
-
-            // Read and print identity
-            {
-                let mut dest = [0u16; 256];
-                for chunk in dest.chunks_mut(2) {
-                    let data = chan.data32.read();
-                    chunk[0] = data as u16;
-                    chunk[1] = (data >> 16) as u16;
-                }
-
-                let mut serial = String::new();
-                for word in 10..20 {
-                    let d = dest[word];
-                    let a = ((d >> 8) as u8) as char;
-                    if a != '\0' {
-                        serial.push(a);
-                    }
-                    let b = (d as u8) as char;
-                    if b != '\0' {
-                        serial.push(b);
-                    }
-                }
-
-                let mut firmware = String::new();
-                for word in 23..27 {
-                    let d = dest[word];
-                    let a = ((d >> 8) as u8) as char;
-                    if a != '\0' {
-                        firmware.push(a);
-                    }
-                    let b = (d as u8) as char;
-                    if b != '\0' {
-                        firmware.push(b);
-                    }
-                }
-
-                let mut model = String::new();
-                for word in 27..47 {
-                    let d = dest[word];
-                    let a = ((d >> 8) as u8) as char;
-                    if a != '\0' {
-                        model.push(a);
-                    }
-                    let b = (d as u8) as char;
-                    if b != '\0' {
-                        model.push(b);
-                    }
-                }
-
-                let mut sectors = (dest[100] as u64)
-                    | ((dest[101] as u64) << 16)
-                    | ((dest[102] as u64) << 32)
-                    | ((dest[103] as u64) << 48);
-
-                let lba_bits = if sectors == 0 {
-                    sectors = (dest[60] as u64) | ((dest[61] as u64) << 16);
-                    28
-                } else {
-                    48
-                };
-
-                println!("      Serial: {}", serial.trim());
-                println!("      Firmware: {}", firmware.trim());
-                println!("      Model: {}", model.trim());
-                println!("      Size: {} MB", sectors / 2048);
-                println!("      DMA: {}", dma);
-                println!("      {}-bit LBA", lba_bits);
-
-                disks.push(AnyDisk::Ata(AtaDisk {
-                    chan: chan_lock.clone(),
-                    chan_i,
-                    dev,
-                    size: sectors * 512,
-                    dma,
-                    lba_48: lba_bits == 48,
-                }));
-            }
-        }
-    }
-
-    let scheme_name = format!("disk.{}", name);
-    let mut scheme = DiskScheme::new(
-        Some(daemon),
-        scheme_name,
-        disks
-            .into_iter()
-            .enumerate()
-            .map(|(i, disk)| (i as u32, disk))
-            .collect(),
-        // TODO: Should ided just use TrivialExecutor or would it be valuable to actually use a
-        // real executor?
-        &FuturesExecutor,
-    );
-
-    let primary_irq_fd = libredox::call::open(
-        &format!("/scheme/irq/{}", primary_irq),
-        flag::O_RDWR | flag::O_NONBLOCK,
-        0,
-    )
-    .expect("ided: failed to open irq file");
-    let mut primary_irq_file = unsafe { File::from_raw_fd(primary_irq_fd as RawFd) };
-
-    let secondary_irq_fd = libredox::call::open(
-        &format!("/scheme/irq/{}", secondary_irq),
-        flag::O_RDWR | flag::O_NONBLOCK,
-        0,
-    )
-    .expect("ided: failed to open irq file");
-    let mut secondary_irq_file = unsafe { File::from_raw_fd(secondary_irq_fd as RawFd) };
-
-    let event_queue = RawEventQueue::new().expect("ided: failed to open event file");
-
-    libredox::call::setrens(0, 0).expect("ided: failed to enter null namespace");
-
-    event_queue
-        .subscribe(scheme.event_handle().raw(), 0, EventFlags::READ)
-        .expect("ided: failed to event disk scheme");
-
-    event_queue
-        .subscribe(primary_irq_fd, 0, EventFlags::READ)
-        .expect("ided: failed to event irq scheme");
-
-    event_queue
-        .subscribe(secondary_irq_fd, 0, EventFlags::READ)
-        .expect("ided: failed to event irq scheme");
-
-    for event in event_queue {
-        let event = event.unwrap();
-        if event.fd == scheme.event_handle().raw() {
-            FuturesExecutor.block_on(scheme.tick()).unwrap();
-        } else if event.fd == primary_irq_fd {
-            let mut irq = [0; 8];
-            if primary_irq_file
-                .read(&mut irq)
-                .expect("ided: failed to read irq file")
-                >= irq.len()
-            {
-                let _chan = chans[0].lock().unwrap();
-                //TODO: check chan for irq
-
-                primary_irq_file
-                    .write(&irq)
-                    .expect("ided: failed to write irq file");
-
-                FuturesExecutor.block_on(scheme.tick()).unwrap();
-            }
-        } else if event.fd == secondary_irq_fd {
-            let mut irq = [0; 8];
-            if secondary_irq_file
-                .read(&mut irq)
-                .expect("ided: failed to read irq file")
-                >= irq.len()
-            {
-                let _chan = chans[1].lock().unwrap();
-                //TODO: check chan for irq
-
-                secondary_irq_file
-                    .write(&irq)
-                    .expect("ided: failed to write irq file");
-
-                FuturesExecutor.block_on(scheme.tick()).unwrap();
-            }
-        } else {
-            error!("Unknown event {}", event.fd);
-        }
-    }
-
-    std::process::exit(0);
-}
-
-#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-fn daemon(daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
-    unimplemented!()
-}
diff --git a/recipes/core/base/drivers/storage/lived/Cargo.toml b/recipes/core/base/drivers/storage/lived/Cargo.toml
deleted file mode 100644
index 72ccae96c4..0000000000
--- a/recipes/core/base/drivers/storage/lived/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "lived"
-description = "Live disk daemon"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-version = "0.1.0"
-edition = "2021"
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow.workspace = true
-libredox.workspace = true
-daemon = { path = "../../../daemon" }
-redox_syscall = { workspace = true, features = ["std"] }
-redox_event.workspace = true
-driver-block = { path = "../driver-block" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/storage/lived/src/main.rs b/recipes/core/base/drivers/storage/lived/src/main.rs
deleted file mode 100644
index 2ca1ff27e5..0000000000
--- a/recipes/core/base/drivers/storage/lived/src/main.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-//! Disk scheme replacement when making live disk
-
-#![feature(int_roundings)]
-
-use std::collections::{BTreeMap, HashMap};
-use std::fs::File;
-
-use std::os::fd::AsRawFd;
-
-use driver_block::{Disk, DiskScheme};
-use driver_block::{ExecutorTrait, TrivialExecutor};
-use libredox::call::MmapArgs;
-use libredox::flag;
-
-use syscall::error::*;
-use syscall::PAGE_SIZE;
-
-use anyhow::{anyhow, Context};
-
-struct LiveDisk {
-    original: &'static [u8],
-    //TODO: drop overlay blocks if they match the original
-    overlay: HashMap<u64, Box<[u8]>>,
-}
-
-impl LiveDisk {
-    fn new(phys: usize, size: usize) -> anyhow::Result<LiveDisk> {
-        let start = phys.div_floor(PAGE_SIZE) * PAGE_SIZE;
-        let end = phys
-            .checked_add(size)
-            .context("phys + size overflow")?
-            .next_multiple_of(PAGE_SIZE);
-        let size = end - start;
-
-        let original = unsafe {
-            let file = File::open("/scheme/memory/physical")?;
-            let base = libredox::call::mmap(MmapArgs {
-                fd: file.as_raw_fd() as usize,
-                addr: core::ptr::null_mut(),
-                offset: start as u64,
-                length: size,
-                prot: flag::PROT_READ,
-                flags: flag::MAP_SHARED,
-            })
-            .map_err(|err| anyhow!("failed to mmap livedisk: {}", err))?;
-
-            std::slice::from_raw_parts_mut(base as *mut u8, size)
-        };
-
-        Ok(LiveDisk {
-            original,
-            overlay: HashMap::new(),
-        })
-    }
-}
-
-impl Disk for LiveDisk {
-    fn block_size(&self) -> u32 {
-        PAGE_SIZE as u32
-    }
-
-    fn size(&self) -> u64 {
-        self.original.len() as u64
-    }
-
-    async fn read(&mut self, mut block: u64, buffer: &mut [u8]) -> syscall::Result<usize> {
-        let mut offset = (block as usize) * PAGE_SIZE;
-        if offset + buffer.len() > self.original.len() {
-            return Err(syscall::Error::new(EINVAL));
-        }
-        for chunk in buffer.chunks_mut(PAGE_SIZE) {
-            match self.overlay.get(&block) {
-                Some(overlay) => {
-                    chunk.copy_from_slice(&overlay[..chunk.len()]);
-                }
-                None => {
-                    chunk.copy_from_slice(&self.original[offset..offset + chunk.len()]);
-                }
-            }
-            block += 1;
-            offset += PAGE_SIZE;
-        }
-        Ok(buffer.len())
-    }
-
-    async fn write(&mut self, mut block: u64, buffer: &[u8]) -> syscall::Result<usize> {
-        let mut offset = (block as usize) * PAGE_SIZE;
-        if offset + buffer.len() > self.original.len() {
-            return Err(syscall::Error::new(EINVAL));
-        }
-        for chunk in buffer.chunks(PAGE_SIZE) {
-            self.overlay.entry(block).or_insert_with(|| {
-                let offset = (block as usize) * PAGE_SIZE;
-                self.original[offset..offset + PAGE_SIZE]
-                    .to_vec()
-                    .into_boxed_slice()
-            })[..chunk.len()]
-                .copy_from_slice(chunk);
-            block += 1;
-            offset += PAGE_SIZE;
-        }
-        Ok(buffer.len())
-    }
-}
-
-fn main() {
-    daemon::Daemon::new(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon) -> ! {
-    let mut phys = 0;
-    let mut size = 0;
-
-    // TODO: handle error
-    for line in std::fs::read_to_string("/scheme/sys/env")
-        .context("failed to read env")
-        .unwrap()
-        .lines()
-    {
-        let mut parts = line.splitn(2, '=');
-        let name = parts.next().unwrap_or("");
-        let value = parts.next().unwrap_or("");
-
-        if name == "DISK_LIVE_ADDR" {
-            phys = usize::from_str_radix(value, 16).unwrap_or(0);
-        }
-
-        if name == "DISK_LIVE_SIZE" {
-            size = usize::from_str_radix(value, 16).unwrap_or(0);
-        }
-    }
-
-    if phys == 0 || size == 0 {
-        // No live disk data, no need to say anything or exit with
-        daemon.ready();
-        std::process::exit(0);
-    }
-
-    let event_queue = event::EventQueue::new().unwrap();
-
-    event::user_data! {
-        enum Event {
-            Scheme,
-        }
-    };
-
-    let mut scheme = DiskScheme::new(
-        Some(daemon),
-        "disk.live".to_owned(),
-        BTreeMap::from([(
-            0,
-            LiveDisk::new(phys, size).unwrap_or_else(|err| {
-                eprintln!("failed to initialize livedisk scheme: {}", err);
-                std::process::exit(1)
-            }),
-        )]),
-        &TrivialExecutor,
-    );
-
-    libredox::call::setrens(0, 0).expect("nvmed: failed to enter null namespace");
-
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Event::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    for event in event_queue {
-        match event.unwrap().user_data {
-            Event::Scheme => TrivialExecutor.block_on(scheme.tick()).unwrap(),
-        }
-    }
-
-    std::process::exit(0);
-}
diff --git a/recipes/core/base/drivers/storage/nvmed/.gitignore b/recipes/core/base/drivers/storage/nvmed/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/storage/nvmed/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/storage/nvmed/Cargo.toml b/recipes/core/base/drivers/storage/nvmed/Cargo.toml
deleted file mode 100644
index 69e8438133..0000000000
--- a/recipes/core/base/drivers/storage/nvmed/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "nvmed"
-description = "NVM Express (NVMe) driver"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-bitflags.workspace = true
-futures = "0.3"
-libredox.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-redox_event.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-smallvec.workspace = true
-
-executor = { path = "../../executor" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-block = { path = "../driver-block" }
-partitionlib = { path = "../partitionlib" }
-pcid = { path = "../../pcid" }
-
-[features]
-default = []
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/storage/nvmed/src/main.rs b/recipes/core/base/drivers/storage/nvmed/src/main.rs
deleted file mode 100644
index beb1b68940..0000000000
--- a/recipes/core/base/drivers/storage/nvmed/src/main.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-use std::cell::RefCell;
-use std::fs::File;
-use std::io::{self, Read, Write};
-use std::os::fd::AsRawFd;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::usize;
-
-use driver_block::{Disk, DiskScheme};
-use pcid_interface::{irq_helpers, PciFunctionHandle};
-
-use crate::nvme::NvmeNamespace;
-
-use self::nvme::Nvme;
-
-mod nvme;
-
-struct NvmeDisk {
-    nvme: Arc<Nvme>,
-    ns: NvmeNamespace,
-}
-
-impl Disk for NvmeDisk {
-    fn block_size(&self) -> u32 {
-        self.ns.block_size.try_into().unwrap()
-    }
-
-    fn size(&self) -> u64 {
-        self.ns.blocks * self.ns.block_size
-    }
-
-    async fn read(&mut self, block: u64, buffer: &mut [u8]) -> syscall::Result<usize> {
-        self.nvme.namespace_read(&self.ns, block, buffer).await
-    }
-
-    async fn write(&mut self, block: u64, buffer: &[u8]) -> syscall::Result<usize> {
-        self.nvme.namespace_write(&self.ns, block, buffer).await
-    }
-}
-
-fn time_arm(time_handle: &mut File, secs: i64) -> io::Result<()> {
-    let mut time_buf = [0_u8; core::mem::size_of::<libredox::data::TimeSpec>()];
-    if time_handle.read(&mut time_buf)? < time_buf.len() {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidData,
-            "time read too small",
-        ));
-    }
-
-    match libredox::data::timespec_from_mut_bytes(&mut time_buf) {
-        time => {
-            time.tv_sec += secs;
-        }
-    }
-    time_handle.write(&time_buf)?;
-    Ok(())
-}
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let scheme_name = format!("disk.{}-nvme", pci_config.func.name());
-
-    common::setup_logging(
-        "disk",
-        "pci",
-        &scheme_name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    log::debug!("NVME PCI CONFIG: {:?}", pci_config);
-
-    let address = unsafe { pcid_handle.map_bar(0).ptr };
-
-    let interrupt_vector = irq_helpers::pci_allocate_interrupt_vector(&mut pcid_handle, "nvmed");
-    let iv = interrupt_vector.vector();
-    let irq_handle = interrupt_vector.irq_handle().try_clone().unwrap();
-
-    let mut nvme = Nvme::new(address.as_ptr() as usize, interrupt_vector, pcid_handle)
-        .expect("nvmed: failed to allocate driver data");
-
-    unsafe { nvme.init().expect("nvmed: failed to init") }
-    log::debug!("Finished base initialization");
-    let nvme = Arc::new(nvme);
-
-    let executor = nvme::executor::init(Arc::clone(&nvme), iv, false /* FIXME */, irq_handle);
-
-    let mut time_handle = File::open(&format!("/scheme/time/{}", libredox::flag::CLOCK_MONOTONIC))
-        .expect("failed to open time handle");
-
-    let mut time_events = Box::pin(
-        executor.register_external_event(time_handle.as_raw_fd() as usize, event::EventFlags::READ),
-    );
-
-    // Try to init namespaces for 5 seconds
-    time_arm(&mut time_handle, 5).expect("failed to arm timer");
-    let namespaces = executor.block_on(async {
-        let namespaces_future = nvme.init_with_queues();
-        let time_future = time_events.as_mut().next();
-        futures::pin_mut!(namespaces_future);
-        futures::pin_mut!(time_future);
-        match futures::future::select(namespaces_future, time_future).await {
-            futures::future::Either::Left((namespaces, _)) => namespaces,
-            futures::future::Either::Right(_) => panic!("timeout on init"),
-        }
-    });
-    log::debug!("Initialized!");
-
-    let scheme = Rc::new(RefCell::new(DiskScheme::new(
-        Some(daemon),
-        scheme_name,
-        namespaces
-            .into_iter()
-            .map(|(k, ns)| {
-                (
-                    k,
-                    NvmeDisk {
-                        nvme: nvme.clone(),
-                        ns,
-                    },
-                )
-            })
-            .collect(),
-        &*executor,
-    )));
-
-    let mut scheme_events = Box::pin(executor.register_external_event(
-        scheme.borrow().event_handle().raw(),
-        event::EventFlags::READ,
-    ));
-
-    libredox::call::setrens(0, 0).expect("nvmed: failed to enter null namespace");
-
-    log::debug!("Starting to listen for scheme events");
-
-    executor.block_on(async {
-        loop {
-            log::trace!("new event iteration");
-            if let Err(err) = scheme.borrow_mut().tick().await {
-                log::error!("scheme error: {err}");
-            }
-            let _ = scheme_events.as_mut().next().await;
-        }
-    });
-
-    //TODO: destroy NVMe stuff
-
-    std::process::exit(0);
-}
diff --git a/recipes/core/base/drivers/storage/nvmed/src/nvme/cmd.rs b/recipes/core/base/drivers/storage/nvmed/src/nvme/cmd.rs
deleted file mode 100644
index b3567d9923..0000000000
--- a/recipes/core/base/drivers/storage/nvmed/src/nvme/cmd.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-use super::NvmeCmd;
-
-impl NvmeCmd {
-    pub fn create_io_completion_queue(
-        cid: u16,
-        qid: u16,
-        ptr: usize,
-        size: u16,
-        iv: Option<u16>,
-    ) -> Self {
-        const DW11_PHYSICALLY_CONTIGUOUS_BIT: u32 = 0x0000_0001;
-        const DW11_ENABLE_INTERRUPTS_BIT: u32 = 0x0000_0002;
-        const DW11_INTERRUPT_VECTOR_SHIFT: u8 = 16;
-
-        Self {
-            opcode: 5,
-            flags: 0,
-            cid,
-            nsid: 0,
-            _rsvd: 0,
-            mptr: 0,
-            dptr: [ptr as u64, 0],
-            cdw10: ((size as u32) << 16) | (qid as u32),
-
-            cdw11: DW11_PHYSICALLY_CONTIGUOUS_BIT
-                | if let Some(iv) = iv {
-                    // enable interrupts if a vector is present
-                    DW11_ENABLE_INTERRUPTS_BIT | (u32::from(iv) << DW11_INTERRUPT_VECTOR_SHIFT)
-                } else {
-                    0
-                },
-
-            cdw12: 0,
-            cdw13: 0,
-            cdw14: 0,
-            cdw15: 0,
-        }
-    }
-
-    pub fn create_io_submission_queue(
-        cid: u16,
-        qid: u16,
-        ptr: usize,
-        size: u16,
-        cqid: u16,
-    ) -> Self {
-        Self {
-            opcode: 1,
-            flags: 0,
-            cid,
-            nsid: 0,
-            _rsvd: 0,
-            mptr: 0,
-            dptr: [ptr as u64, 0],
-            cdw10: ((size as u32) << 16) | (qid as u32),
-            cdw11: ((cqid as u32) << 16) | 1, /* Physically Contiguous */
-            //TODO: QPRIO
-            cdw12: 0, //TODO: NVMSETID
-            cdw13: 0,
-            cdw14: 0,
-            cdw15: 0,
-        }
-    }
-
-    pub fn identify_namespace(cid: u16, ptr: usize, nsid: u32) -> Self {
-        Self {
-            opcode: 6,
-            flags: 0,
-            cid,
-            nsid,
-            _rsvd: 0,
-            mptr: 0,
-            dptr: [ptr as u64, 0],
-            cdw10: 0,
-            cdw11: 0,
-            cdw12: 0,
-            cdw13: 0,
-            cdw14: 0,
-            cdw15: 0,
-        }
-    }
-
-    pub fn identify_controller(cid: u16, ptr: usize) -> Self {
-        Self {
-            opcode: 6,
-            flags: 0,
-            cid,
-            nsid: 0,
-            _rsvd: 0,
-            mptr: 0,
-            dptr: [ptr as u64, 0],
-            cdw10: 1,
-            cdw11: 0,
-            cdw12: 0,
-            cdw13: 0,
-            cdw14: 0,
-            cdw15: 0,
-        }
-    }
-
-    pub fn identify_namespace_list(cid: u16, ptr: usize, base: u32) -> Self {
-        Self {
-            opcode: 6,
-            flags: 0,
-            cid,
-            nsid: base,
-            _rsvd: 0,
-            mptr: 0,
-            dptr: [ptr as u64, 0],
-            cdw10: 2,
-            cdw11: 0,
-            cdw12: 0,
-            cdw13: 0,
-            cdw14: 0,
-            cdw15: 0,
-        }
-    }
-    pub fn get_features(cid: u16, ptr: usize, fid: u8) -> Self {
-        Self {
-            opcode: 0xA,
-            dptr: [ptr as u64, 0],
-            cdw10: u32::from(fid), // TODO: SEL
-            ..Default::default()
-        }
-    }
-
-    pub fn io_read(cid: u16, nsid: u32, lba: u64, blocks_1: u16, ptr0: u64, ptr1: u64) -> Self {
-        Self {
-            opcode: 2,
-            flags: 0,
-            cid,
-            nsid,
-            _rsvd: 0,
-            mptr: 0,
-            dptr: [ptr0, ptr1],
-            cdw10: lba as u32,
-            cdw11: (lba >> 32) as u32,
-            cdw12: blocks_1 as u32,
-            cdw13: 0,
-            cdw14: 0,
-            cdw15: 0,
-        }
-    }
-
-    pub fn io_write(cid: u16, nsid: u32, lba: u64, blocks_1: u16, ptr0: u64, ptr1: u64) -> Self {
-        Self {
-            opcode: 1,
-            flags: 0,
-            cid,
-            nsid,
-            _rsvd: 0,
-            mptr: 0,
-            dptr: [ptr0, ptr1],
-            cdw10: lba as u32,
-            cdw11: (lba >> 32) as u32,
-            cdw12: blocks_1 as u32,
-            cdw13: 0,
-            cdw14: 0,
-            cdw15: 0,
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/storage/nvmed/src/nvme/executor.rs b/recipes/core/base/drivers/storage/nvmed/src/nvme/executor.rs
deleted file mode 100644
index 6242fa98cb..0000000000
--- a/recipes/core/base/drivers/storage/nvmed/src/nvme/executor.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use std::cell::RefCell;
-use std::fs::File;
-use std::rc::Rc;
-use std::sync::Arc;
-
-use executor::{Hardware, LocalExecutor};
-
-use super::{CmdId, CqId, Nvme, NvmeCmd, NvmeComp, SqId};
-
-pub struct NvmeHw;
-
-impl Hardware for NvmeHw {
-    type Iv = u16;
-    type Sqe = NvmeCmd;
-    type Cqe = NvmeComp;
-    type CmdId = CmdId;
-    type CqId = CqId;
-    type SqId = SqId;
-    type GlobalCtxt = Arc<Nvme>;
-
-    fn mask_vector(ctxt: &Arc<Nvme>, iv: Self::Iv) {
-        ctxt.set_vector_masked(iv, true)
-    }
-    fn unmask_vector(ctxt: &Arc<Nvme>, iv: Self::Iv) {
-        ctxt.set_vector_masked(iv, false)
-    }
-    fn set_sqe_cmdid(sqe: &mut NvmeCmd, id: CmdId) {
-        sqe.cid = id;
-    }
-    fn get_cqe_cmdid(cqe: &Self::Cqe) -> Self::CmdId {
-        cqe.cid
-    }
-    fn vtable() -> &'static std::task::RawWakerVTable {
-        &VTABLE
-    }
-    fn current() -> std::rc::Rc<executor::LocalExecutor<Self>> {
-        THE_EXECUTOR.with(|exec| Rc::clone(exec.borrow().as_ref().unwrap()))
-    }
-    fn try_submit(
-        nvme: &Arc<Nvme>,
-        sq_id: Self::SqId,
-        success: impl FnOnce(Self::CmdId) -> Self::Sqe,
-        fail: impl FnOnce(),
-    ) -> Option<(Self::CqId, Self::CmdId)> {
-        let ctxt = nvme.cur_thread_ctxt();
-        let ctxt = ctxt.lock();
-
-        nvme.try_submit_raw(&*ctxt, sq_id, success, fail)
-    }
-    fn poll_cqes(nvme: &Arc<Nvme>, mut handle: impl FnMut(Self::CqId, Self::Cqe)) {
-        let ctxt = nvme.cur_thread_ctxt();
-        let ctxt = ctxt.lock();
-
-        for (sq_cq_id, (sq, cq)) in ctxt.queues.borrow_mut().iter_mut() {
-            while let Some((new_head, cqe)) = cq.complete() {
-                unsafe {
-                    nvme.completion_queue_head(*sq_cq_id, new_head);
-                }
-                sq.head = cqe.sq_head;
-                log::trace!("new head {new_head} cqe {cqe:?}");
-                handle(*sq_cq_id, cqe);
-            }
-        }
-    }
-    fn sq_cq(_ctxt: &Arc<Nvme>, id: Self::CqId) -> Self::SqId {
-        id
-    }
-}
-
-static VTABLE: std::task::RawWakerVTable = executor::vtable::<NvmeHw>();
-
-thread_local! {
-    static THE_EXECUTOR: RefCell<Option<Rc<LocalExecutor<NvmeHw>>>> = RefCell::new(None);
-}
-
-pub type NvmeExecutor = LocalExecutor<NvmeHw>;
-
-pub fn init(nvme: Arc<Nvme>, iv: u16, intx: bool, irq_handle: File) -> Rc<LocalExecutor<NvmeHw>> {
-    let this = Rc::new(executor::init_raw(nvme, iv, intx, irq_handle));
-    THE_EXECUTOR.with(|exec| *exec.borrow_mut() = Some(Rc::clone(&this)));
-    this
-}
diff --git a/recipes/core/base/drivers/storage/nvmed/src/nvme/identify.rs b/recipes/core/base/drivers/storage/nvmed/src/nvme/identify.rs
deleted file mode 100644
index 05e5b9b2b6..0000000000
--- a/recipes/core/base/drivers/storage/nvmed/src/nvme/identify.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use super::{Nvme, NvmeCmd, NvmeNamespace};
-
-use common::dma::Dma;
-
-/// See NVME spec section 5.15.2.2.
-#[derive(Clone, Copy)]
-#[repr(C, packed)]
-pub struct IdentifyControllerData {
-    /// PCI vendor ID, always the same as in the PCI function header.
-    pub vid: u16,
-    /// PCI subsystem vendor ID.
-    pub ssvid: u16,
-    /// ASCII
-    pub serial_no: [u8; 20],
-    /// ASCII
-    pub model_no: [u8; 48],
-    /// ASCII
-    pub firmware_rev: [u8; 8],
-    // TODO: Lots of fields
-    pub _4k_pad: [u8; 4096 - 72],
-}
-
-/// See NVME spec section 5.15.2.1.
-#[derive(Clone, Copy)]
-#[repr(C, packed)]
-pub struct IdentifyNamespaceData {
-    pub nsze: u64,
-    pub ncap: u64,
-    pub nuse: u64,
-
-    pub nsfeat: u8,
-    pub nlbaf: u8,
-    pub flbas: u8,
-    pub mc: u8,
-
-    pub dpc: u8,
-    pub dps: u8,
-    pub nmic: u8,
-    pub rescap: u8,
-    // 32
-    pub fpi: u8,
-    pub dlfeat: u8,
-    pub nawun: u16,
-
-    pub nawupf: u16,
-    pub nacwu: u16,
-    // 40
-    pub nabsn: u16,
-    pub nabo: u16,
-
-    pub nabspf: u16,
-    pub noiob: u16,
-    // 48
-    pub nvmcap: u128,
-    // 64
-    pub npwg: u16,
-    pub npwa: u16,
-    pub npdg: u16,
-    pub npda: u16,
-    // 72
-    pub nows: u16,
-    pub _rsvd1: [u8; 18],
-    // 92
-    pub anagrpid: u32,
-    pub _rsvd2: [u8; 3],
-    pub nsattr: u8,
-
-    // 100
-    pub nvmsetid: u16,
-    pub endgid: u16,
-    pub nguid: [u8; 16],
-    pub eui64: u64,
-
-    pub lba_format_support: [LbaFormat; 16],
-    pub _rsvd3: [u8; 192],
-    pub vendor_specific: [u8; 3712],
-}
-
-impl IdentifyNamespaceData {
-    pub fn size_in_blocks(&self) -> u64 {
-        self.nsze
-    }
-    pub fn capacity_in_blocks(&self) -> u64 {
-        self.ncap
-    }
-    /// Guaranteed to be within 0..=15
-    pub fn formatted_lba_size_idx(&self) -> usize {
-        (self.flbas & 0xF) as usize
-    }
-    pub fn formatted_lba_size(&self) -> &LbaFormat {
-        &self.lba_format_support[self.formatted_lba_size_idx()]
-    }
-    pub fn has_metadata_after_data(&self) -> bool {
-        (self.flbas & (1 << 4)) != 0
-    }
-}
-
-#[derive(Clone, Copy)]
-#[repr(C, packed)]
-pub struct LbaFormat(pub u32);
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum RelativePerformance {
-    Best = 0b00,
-    Better,
-    Good,
-    Degraded,
-}
-impl Ord for RelativePerformance {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        // higher performance is better, hence reversed
-        Ord::cmp(&(*self as u8), &(*other as u8)).reverse()
-    }
-}
-impl PartialOrd for RelativePerformance {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(Ord::cmp(self, other))
-    }
-}
-
-impl LbaFormat {
-    pub fn relative_performance(&self) -> RelativePerformance {
-        match ((self.0 >> 24) & 0b11) {
-            0b00 => RelativePerformance::Best,
-            0b01 => RelativePerformance::Better,
-            0b10 => RelativePerformance::Good,
-            0b11 => RelativePerformance::Degraded,
-            _ => unreachable!(),
-        }
-    }
-    pub fn is_available(&self) -> bool {
-        self.log_lba_data_size() != 0
-    }
-    pub fn log_lba_data_size(&self) -> u8 {
-        ((self.0 >> 16) & 0xFF) as u8
-    }
-    pub fn lba_data_size(&self) -> Option<u64> {
-        if self.log_lba_data_size() < 9 {
-            return None;
-        }
-        if self.log_lba_data_size() >= 32 {
-            return None;
-        }
-        Some(1u64 << self.log_lba_data_size())
-    }
-    pub fn metadata_size(&self) -> u16 {
-        (self.0 & 0xFFFF) as u16
-    }
-}
-
-impl Nvme {
-    /// Returns the serial number, model, and firmware, in that order.
-    pub async fn identify_controller(&self) {
-        // TODO: Use same buffer
-        let data: Dma<IdentifyControllerData> = unsafe { Dma::zeroed().unwrap().assume_init() };
-
-        // println!("  - Attempting to identify controller");
-        let comp = self
-            .submit_and_complete_admin_command(|cid| {
-                NvmeCmd::identify_controller(cid, data.physical())
-            })
-            .await;
-        log::trace!("Completion: {:?}", comp);
-
-        // println!("  - Dumping identify controller");
-
-        let model_cow = String::from_utf8_lossy(&data.model_no);
-        let serial_cow = String::from_utf8_lossy(&data.serial_no);
-        let fw_cow = String::from_utf8_lossy(&data.firmware_rev);
-
-        let model = model_cow.trim();
-        let serial = serial_cow.trim();
-        let firmware = fw_cow.trim();
-
-        log::info!(
-            "  - Model: {} Serial: {} Firmware: {}",
-            model,
-            serial,
-            firmware,
-        );
-    }
-    pub async fn identify_namespace_list(&self, base: u32) -> Vec<u32> {
-        // TODO: Use buffer
-        let data: Dma<[u32; 1024]> = unsafe { Dma::zeroed().unwrap().assume_init() };
-
-        // println!("  - Attempting to retrieve namespace ID list");
-        let comp = self
-            .submit_and_complete_admin_command(|cid| {
-                NvmeCmd::identify_namespace_list(cid, data.physical(), base)
-            })
-            .await;
-
-        log::trace!("Completion2: {:?}", comp);
-
-        // println!("  - Dumping namespace ID list");
-        data.iter().copied().take_while(|&nsid| nsid != 0).collect()
-    }
-    pub async fn identify_namespace(&self, nsid: u32) -> NvmeNamespace {
-        //TODO: Use buffer
-        let data: Dma<IdentifyNamespaceData> = unsafe { Dma::zeroed().unwrap().assume_init() };
-
-        log::debug!("Attempting to identify namespace {nsid}");
-        let comp = self
-            .submit_and_complete_admin_command(|cid| {
-                NvmeCmd::identify_namespace(cid, data.physical(), nsid)
-            })
-            .await;
-
-        log::debug!("Dumping identify namespace");
-
-        let size = data.size_in_blocks();
-        let capacity = data.capacity_in_blocks();
-        log::info!("NSID: {} Size: {} Capacity: {}", nsid, size, capacity);
-
-        let block_size = data
-            .formatted_lba_size()
-            .lba_data_size()
-            .expect("nvmed: error: size outside 512-2^64 range");
-        log::debug!("NVME block size: {}", block_size);
-
-        NvmeNamespace {
-            id: nsid,
-            blocks: size,
-            block_size,
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/storage/nvmed/src/nvme/mod.rs b/recipes/core/base/drivers/storage/nvmed/src/nvme/mod.rs
deleted file mode 100644
index 682ee93329..0000000000
--- a/recipes/core/base/drivers/storage/nvmed/src/nvme/mod.rs
+++ /dev/null
@@ -1,541 +0,0 @@
-use std::cell::RefCell;
-use std::collections::{BTreeMap, HashMap};
-use std::convert::TryFrom;
-use std::iter;
-use std::sync::atomic::AtomicU16;
-use std::sync::Arc;
-
-use parking_lot::{Mutex, ReentrantMutex, RwLock};
-use pcid_interface::irq_helpers::InterruptVector;
-
-use common::io::{Io, Mmio};
-use common::timeout::Timeout;
-use syscall::error::{Error, Result, EIO};
-
-use common::dma::Dma;
-
-pub mod cmd;
-pub mod executor;
-pub mod identify;
-pub mod queues;
-
-use self::executor::NvmeExecutor;
-pub use self::queues::{NvmeCmd, NvmeCmdQueue, NvmeComp, NvmeCompQueue};
-
-use pcid_interface::PciFunctionHandle;
-
-#[repr(C, packed)]
-pub struct NvmeRegs {
-    /// Controller Capabilities
-    cap_low: Mmio<u32>,
-    cap_high: Mmio<u32>,
-    /// Version
-    vs: Mmio<u32>,
-    /// Interrupt mask set
-    intms: Mmio<u32>,
-    /// Interrupt mask clear
-    intmc: Mmio<u32>,
-    /// Controller configuration
-    cc: Mmio<u32>,
-    /// Reserved
-    _rsvd: Mmio<u32>,
-    /// Controller status
-    csts: Mmio<u32>,
-    /// NVM subsystem reset
-    nssr: Mmio<u32>,
-    /// Admin queue attributes
-    aqa: Mmio<u32>,
-    /// Admin submission queue base address
-    asq_low: Mmio<u32>,
-    asq_high: Mmio<u32>,
-    /// Admin completion queue base address
-    acq_low: Mmio<u32>,
-    acq_high: Mmio<u32>,
-    /// Controller memory buffer location
-    cmbloc: Mmio<u32>,
-    /// Controller memory buffer size
-    cmbsz: Mmio<u32>,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct NvmeNamespace {
-    pub id: u32,
-    pub blocks: u64,
-    pub block_size: u64,
-}
-
-pub type CqId = u16;
-pub type SqId = u16;
-pub type CmdId = u16;
-pub type AtomicCqId = AtomicU16;
-pub type AtomicSqId = AtomicU16;
-pub type AtomicCmdId = AtomicU16;
-pub type Iv = u16;
-
-pub struct Nvme {
-    interrupt_vector: Mutex<InterruptVector>,
-    pcid_interface: Mutex<PciFunctionHandle>,
-    regs: RwLock<&'static mut NvmeRegs>,
-
-    sq_ivs: RwLock<HashMap<SqId, Iv>>,
-    cq_ivs: RwLock<HashMap<CqId, Iv>>,
-
-    // maps interrupt vectors with the completion queues they have
-    thread_ctxts: RwLock<HashMap<Iv, Arc<ReentrantMutex<ThreadCtxt>>>>,
-
-    next_sqid: AtomicSqId,
-    next_cqid: AtomicCqId,
-}
-
-pub struct ThreadCtxt {
-    buffer: RefCell<Dma<[u8; 512 * 4096]>>, // 2MB of buffer
-    buffer_prp: RefCell<Dma<[u64; 512]>>,   // 4KB of PRP for the buffer
-
-    // Yes, technically NVME allows multiple submission queues to be mapped to the same completion
-    // queue, but we don't use that feature.
-    queues: RefCell<HashMap<u16, (NvmeCmdQueue, NvmeCompQueue)>>,
-}
-
-unsafe impl Send for Nvme {}
-unsafe impl Sync for Nvme {}
-
-/// How to handle full submission queues.
-pub enum FullSqHandling {
-    /// Return an error immediately prior to posting the command.
-    ErrorDirectly,
-
-    /// Tell the executor that we want to be notified when a command on the same submission queue
-    /// has been completed.
-    Wait,
-}
-
-impl Nvme {
-    pub fn new(
-        address: usize,
-        interrupt_vector: InterruptVector,
-        pcid_interface: PciFunctionHandle,
-    ) -> Result<Self> {
-        Ok(Nvme {
-            regs: RwLock::new(unsafe { &mut *(address as *mut NvmeRegs) }),
-            thread_ctxts: RwLock::new(
-                iter::once((
-                    0_u16,
-                    Arc::new(ReentrantMutex::new(ThreadCtxt {
-                        buffer: RefCell::new(unsafe { Dma::zeroed()?.assume_init() }),
-                        buffer_prp: RefCell::new(unsafe { Dma::zeroed()?.assume_init() }),
-
-                        queues: RefCell::new(
-                            iter::once((0, (NvmeCmdQueue::new()?, NvmeCompQueue::new()?)))
-                                .collect(),
-                        ),
-                    })),
-                ))
-                .collect(),
-            ),
-
-            cq_ivs: RwLock::new(iter::once((0, 0)).collect()),
-            sq_ivs: RwLock::new(iter::once((0, 0)).collect()),
-
-            interrupt_vector: Mutex::new(interrupt_vector),
-            pcid_interface: Mutex::new(pcid_interface),
-
-            // TODO
-            next_sqid: AtomicSqId::new(2),
-            next_cqid: AtomicCqId::new(2),
-        })
-    }
-    /// Write to a doorbell register.
-    ///
-    /// # Locking
-    /// Locks `regs`.
-    unsafe fn doorbell_write(&self, index: usize, value: u32) {
-        use std::ops::DerefMut;
-
-        let mut regs_guard = self.regs.write();
-        let regs: &mut NvmeRegs = regs_guard.deref_mut();
-
-        let dstrd = (regs.cap_high.read() & 0b1111) as usize;
-        let addr = (regs as *mut NvmeRegs as usize) + 0x1000 + index * (4 << dstrd);
-        (&mut *(addr as *mut Mmio<u32>)).write(value);
-    }
-    fn cur_thread_ctxt(&self) -> Arc<ReentrantMutex<ThreadCtxt>> {
-        // TODO: multi-threading
-        Arc::clone(self.thread_ctxts.read().get(&0).unwrap())
-    }
-
-    pub unsafe fn submission_queue_tail(&self, qid: u16, tail: u16) {
-        self.doorbell_write(2 * (qid as usize), u32::from(tail));
-    }
-
-    pub unsafe fn completion_queue_head(&self, qid: u16, head: u16) {
-        self.doorbell_write(2 * (qid as usize) + 1, u32::from(head));
-    }
-
-    pub unsafe fn init(&mut self) -> Result<()> {
-        let thread_ctxts = self.thread_ctxts.get_mut();
-        {
-            let regs = self.regs.read();
-            log::debug!("CAP_LOW: {:X}", regs.cap_low.read());
-            log::debug!("CAP_HIGH: {:X}", regs.cap_high.read());
-            log::debug!("VS: {:X}", regs.vs.read());
-            log::debug!("CC: {:X}", regs.cc.read());
-            log::debug!("CSTS: {:X}", regs.csts.read());
-        }
-
-        log::debug!("Disabling controller.");
-        self.regs.get_mut().cc.writef(1, false);
-
-        {
-            log::trace!("Waiting for not ready.");
-            let timeout = Timeout::from_secs(1);
-            loop {
-                let csts = self.regs.get_mut().csts.read();
-                log::trace!("CSTS: {:X}", csts);
-                if csts & 1 == 1 {
-                    timeout.run().map_err(|()| {
-                        log::error!("failed to wait for not ready");
-                        Error::new(EIO)
-                    })?;
-                } else {
-                    break;
-                }
-            }
-        }
-
-        if !self.interrupt_vector.get_mut().set_masked_if_fast(false) {
-            self.regs.get_mut().intms.write(0xFFFF_FFFF);
-            self.regs.get_mut().intmc.write(0x0000_0001);
-        }
-
-        for (qid, iv) in self.cq_ivs.get_mut().iter_mut() {
-            let ctxt = thread_ctxts.get(&0).unwrap().lock();
-            let queues = ctxt.queues.borrow();
-
-            let &(ref cq, ref sq) = queues.get(qid).unwrap();
-            log::debug!(
-                "iv {iv} [cq {qid}: {:X}, {}] [sq {qid}: {:X}, {}]",
-                cq.data.physical(),
-                cq.data.len(),
-                sq.data.physical(),
-                sq.data.len()
-            );
-        }
-
-        {
-            let main_ctxt = thread_ctxts.get(&0).unwrap().lock();
-
-            for (i, prp) in main_ctxt.buffer_prp.borrow_mut().iter_mut().enumerate() {
-                *prp = (main_ctxt.buffer.borrow_mut().physical() + i * 4096) as u64;
-            }
-
-            let regs = self.regs.get_mut();
-
-            let mut queues = main_ctxt.queues.borrow_mut();
-            let (asq, acq) = queues.get_mut(&0).unwrap();
-            regs.aqa
-                .write(((acq.data.len() as u32 - 1) << 16) | (asq.data.len() as u32 - 1));
-            regs.asq_low.write(asq.data.physical() as u32);
-            regs.asq_high
-                .write((asq.data.physical() as u64 >> 32) as u32);
-            regs.acq_low.write(acq.data.physical() as u32);
-            regs.acq_high
-                .write((acq.data.physical() as u64 >> 32) as u32);
-
-            // Set IOCQES, IOSQES, AMS, MPS, and CSS
-            let mut cc = regs.cc.read();
-            cc &= 0xFF00000F;
-            cc |= (4 << 20) | (6 << 16);
-            regs.cc.write(cc);
-        }
-
-        log::debug!("Enabling controller.");
-        self.regs.get_mut().cc.writef(1, true);
-
-        {
-            log::debug!("Waiting for ready");
-            let timeout = Timeout::from_secs(1);
-            loop {
-                let csts = self.regs.get_mut().csts.read();
-                log::debug!("CSTS: {:X}", csts);
-                if csts & 1 == 0 {
-                    timeout.run().map_err(|()| {
-                        log::error!("failed to wait for ready");
-                        Error::new(EIO)
-                    })?;
-                } else {
-                    break;
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn set_vector_masked(&self, vector: u16, masked: bool) {
-        let mut interrupt_vector_guard = (&self).interrupt_vector.lock();
-
-        if !interrupt_vector_guard.set_masked_if_fast(masked) {
-            let mut to_mask = 0x0000_0000;
-            let mut to_clear = 0x0000_0000;
-
-            let vector = vector as u8;
-
-            if masked {
-                assert_ne!(
-                    to_clear & (1 << vector),
-                    (1 << vector),
-                    "nvmed: internal error: cannot both mask and set"
-                );
-                to_mask |= 1 << vector;
-            } else {
-                assert_ne!(
-                    to_mask & (1 << vector),
-                    (1 << vector),
-                    "nvmed: internal error: cannot both mask and set"
-                );
-                to_clear |= 1 << vector;
-            }
-
-            if to_mask != 0 {
-                (&self).regs.write().intms.write(to_mask);
-            }
-            if to_clear != 0 {
-                (&self).regs.write().intmc.write(to_clear);
-            }
-        }
-    }
-
-    pub async fn submit_and_complete_command(
-        &self,
-        sq_id: SqId,
-        cmd_init: impl FnOnce(CmdId) -> NvmeCmd,
-    ) -> NvmeComp {
-        NvmeExecutor::current().submit(sq_id, cmd_init(0)).await
-    }
-
-    pub async fn submit_and_complete_admin_command(
-        &self,
-        cmd_init: impl FnOnce(CmdId) -> NvmeCmd,
-    ) -> NvmeComp {
-        self.submit_and_complete_command(0, cmd_init).await
-    }
-    pub fn try_submit_raw(
-        &self,
-        ctxt: &ThreadCtxt,
-        sq_id: SqId,
-        cmd_init: impl FnOnce(CmdId) -> NvmeCmd,
-        fail: impl FnOnce(),
-    ) -> Option<(CqId, CmdId)> {
-        match ctxt.queues.borrow_mut().get_mut(&sq_id).unwrap() {
-            (sq, _cq) => {
-                if sq.is_full() {
-                    fail();
-                    return None;
-                }
-                let cmd_id = sq.tail;
-                let tail = sq.submit_unchecked(cmd_init(cmd_id));
-
-                // TODO: Submit in bulk
-                unsafe {
-                    self.submission_queue_tail(sq_id, tail);
-                }
-                Some((sq_id, cmd_id))
-            }
-        }
-    }
-
-    pub async fn create_io_completion_queue(
-        &self,
-        io_cq_id: CqId,
-        vector: Option<Iv>,
-    ) -> NvmeCompQueue {
-        let queue = NvmeCompQueue::new().expect("nvmed: failed to allocate I/O completion queue");
-
-        let len = u16::try_from(queue.data.len())
-            .expect("nvmed: internal error: I/O CQ longer than 2^16 entries");
-        let raw_len = len
-            .checked_sub(1)
-            .expect("nvmed: internal error: CQID 0 for I/O CQ");
-
-        let comp = self
-            .submit_and_complete_admin_command(|cid| {
-                NvmeCmd::create_io_completion_queue(
-                    cid,
-                    io_cq_id,
-                    queue.data.physical(),
-                    raw_len,
-                    vector,
-                )
-            })
-            .await;
-
-        /*match comp.status.specific {
-            1 => panic!("invalid queue identifier"),
-            2 => panic!("invalid queue size"),
-            8 => panic!("invalid interrupt vector"),
-            _ => (),
-        }*/
-
-        queue
-    }
-    pub async fn create_io_submission_queue(&self, io_sq_id: SqId, io_cq_id: CqId) -> NvmeCmdQueue {
-        let q = NvmeCmdQueue::new().expect("failed to create submission queue");
-
-        let len = u16::try_from(q.data.len())
-            .expect("nvmed: internal error: I/O SQ longer than 2^16 entries");
-        let raw_len = len
-            .checked_sub(1)
-            .expect("nvmed: internal error: SQID 0 for I/O SQ");
-
-        let comp = self
-            .submit_and_complete_admin_command(|cid| {
-                NvmeCmd::create_io_submission_queue(
-                    cid,
-                    io_sq_id,
-                    q.data.physical(),
-                    raw_len,
-                    io_cq_id,
-                )
-            })
-            .await;
-        /*match comp.status.specific {
-            0 => panic!("completion queue invalid"),
-            1 => panic!("invalid queue identifier"),
-            2 => panic!("invalid queue size"),
-            _ => (),
-        }*/
-
-        q
-    }
-
-    pub async fn init_with_queues(&self) -> BTreeMap<u32, NvmeNamespace> {
-        log::trace!("preinit");
-
-        self.identify_controller().await;
-
-        let nsids = self.identify_namespace_list(0).await;
-
-        log::debug!("first commands");
-
-        let mut namespaces = BTreeMap::new();
-
-        for nsid in nsids.iter().copied() {
-            namespaces.insert(nsid, self.identify_namespace(nsid).await);
-        }
-
-        // TODO: Multiple queues
-        let cq = self.create_io_completion_queue(1, Some(0)).await;
-        log::trace!("created compq");
-        let sq = self.create_io_submission_queue(1, 1).await;
-        log::trace!("created subq");
-        self.thread_ctxts
-            .read()
-            .get(&0)
-            .unwrap()
-            .lock()
-            .queues
-            .borrow_mut()
-            .insert(1, (sq, cq));
-        self.sq_ivs.write().insert(1, 0);
-        self.cq_ivs.write().insert(1, 0);
-
-        namespaces
-    }
-
-    async fn namespace_rw(
-        &self,
-        ctxt: &ThreadCtxt,
-        namespace: &NvmeNamespace,
-        lba: u64,
-        blocks_1: u16,
-        write: bool,
-    ) -> Result<()> {
-        let block_size = namespace.block_size;
-
-        let prp = ctxt.buffer_prp.borrow_mut();
-        let bytes = ((blocks_1 as u64) + 1) * block_size;
-        let (ptr0, ptr1) = if bytes <= 4096 {
-            (prp[0], 0)
-        } else if bytes <= 8192 {
-            (prp[0], prp[1])
-        } else {
-            (prp[0], (prp.physical() + 8) as u64)
-        };
-
-        let mut cmd = NvmeCmd::default();
-        let comp = self
-            .submit_and_complete_command(1, |cid| {
-                cmd = if write {
-                    NvmeCmd::io_write(cid, namespace.id, lba, blocks_1, ptr0, ptr1)
-                } else {
-                    NvmeCmd::io_read(cid, namespace.id, lba, blocks_1, ptr0, ptr1)
-                };
-                cmd.clone()
-            })
-            .await;
-
-        let status = comp.status >> 1;
-        if status == 0 {
-            Ok(())
-        } else {
-            log::error!("command {:#x?} failed with status {:#x}", cmd, status);
-            Err(Error::new(EIO))
-        }
-    }
-
-    pub async fn namespace_read(
-        &self,
-        namespace: &NvmeNamespace,
-        mut lba: u64,
-        buf: &mut [u8],
-    ) -> Result<usize> {
-        let ctxt = self.cur_thread_ctxt();
-        let ctxt = ctxt.lock();
-
-        let block_size = namespace.block_size as usize;
-
-        for chunk in buf.chunks_mut(/* TODO: buf len */ 8192) {
-            let blocks = (chunk.len() + block_size - 1) / block_size;
-
-            assert!(blocks > 0);
-            assert!(blocks <= 0x1_0000);
-
-            self.namespace_rw(&*ctxt, namespace, lba, (blocks - 1) as u16, false)
-                .await?;
-
-            chunk.copy_from_slice(&ctxt.buffer.borrow()[..chunk.len()]);
-
-            lba += blocks as u64;
-        }
-
-        Ok(buf.len())
-    }
-
-    pub async fn namespace_write(
-        &self,
-        namespace: &NvmeNamespace,
-        mut lba: u64,
-        buf: &[u8],
-    ) -> Result<usize> {
-        let ctxt = self.cur_thread_ctxt();
-        let ctxt = ctxt.lock();
-
-        let block_size = namespace.block_size as usize;
-
-        for chunk in buf.chunks(/* TODO: buf len */ 8192) {
-            let blocks = (chunk.len() + block_size - 1) / block_size;
-
-            assert!(blocks > 0);
-            assert!(blocks <= 0x1_0000);
-
-            ctxt.buffer.borrow_mut()[..chunk.len()].copy_from_slice(chunk);
-
-            self.namespace_rw(&*ctxt, namespace, lba, (blocks - 1) as u16, true)
-                .await?;
-
-            lba += blocks as u64;
-        }
-
-        Ok(buf.len())
-    }
-}
diff --git a/recipes/core/base/drivers/storage/nvmed/src/nvme/queues.rs b/recipes/core/base/drivers/storage/nvmed/src/nvme/queues.rs
deleted file mode 100644
index a3712aeb74..0000000000
--- a/recipes/core/base/drivers/storage/nvmed/src/nvme/queues.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use std::cell::UnsafeCell;
-use std::ptr;
-use syscall::Result;
-
-use common::dma::Dma;
-
-/// A submission queue entry.
-#[derive(Clone, Copy, Debug, Default)]
-#[repr(C, packed)]
-pub struct NvmeCmd {
-    /// Opcode
-    pub opcode: u8,
-    /// Flags
-    pub flags: u8,
-    /// Command ID
-    pub cid: u16,
-    /// Namespace identifier
-    pub nsid: u32,
-    /// Reserved
-    pub _rsvd: u64,
-    /// Metadata pointer
-    pub mptr: u64,
-    /// Data pointer
-    pub dptr: [u64; 2],
-    /// Command dword 10
-    pub cdw10: u32,
-    /// Command dword 11
-    pub cdw11: u32,
-    /// Command dword 12
-    pub cdw12: u32,
-    /// Command dword 13
-    pub cdw13: u32,
-    /// Command dword 14
-    pub cdw14: u32,
-    /// Command dword 15
-    pub cdw15: u32,
-}
-
-/// A completion queue entry.
-#[derive(Clone, Copy, Debug)]
-#[repr(C, packed)]
-pub struct NvmeComp {
-    pub command_specific: u32,
-    pub _rsvd: u32,
-    pub sq_head: u16,
-    pub sq_id: u16,
-    pub cid: u16,
-    pub status: u16,
-}
-
-/// Completion queue
-pub struct NvmeCompQueue {
-    pub data: Dma<[UnsafeCell<NvmeComp>]>,
-    pub head: u16,
-    pub phase: bool,
-}
-
-impl NvmeCompQueue {
-    pub fn new() -> Result<Self> {
-        Ok(Self {
-            data: unsafe { Dma::zeroed_slice(256)?.assume_init() },
-            head: 0,
-            phase: true,
-        })
-    }
-
-    /// Get a new completion queue entry, or return None if no entry is available yet.
-    pub(crate) fn complete(&mut self) -> Option<(u16, NvmeComp)> {
-        let entry = unsafe { ptr::read_volatile(self.data[usize::from(self.head)].get()) };
-
-        if ((entry.status & 1) == 1) == self.phase {
-            self.head = (self.head + 1) % (self.data.len() as u16);
-            if self.head == 0 {
-                self.phase = !self.phase;
-            }
-            Some((self.head, entry))
-        } else {
-            None
-        }
-    }
-
-    /// Get a new CQ entry, busy waiting until an entry appears.
-    pub fn complete_spin(&mut self) -> (u16, NvmeComp) {
-        log::debug!("Waiting for new CQ entry");
-        loop {
-            if let Some(some) = self.complete() {
-                return some;
-            } else {
-                unsafe {
-                    std::hint::spin_loop();
-                }
-            }
-        }
-    }
-}
-
-/// Submission queue
-pub struct NvmeCmdQueue {
-    pub data: Dma<[UnsafeCell<NvmeCmd>]>,
-    pub tail: u16,
-    pub head: u16,
-}
-
-impl NvmeCmdQueue {
-    pub fn new() -> Result<Self> {
-        Ok(Self {
-            data: unsafe { Dma::zeroed_slice(64)?.assume_init() },
-            tail: 0,
-            head: 0,
-        })
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.head == self.tail
-    }
-    pub fn is_full(&self) -> bool {
-        self.head == self.tail + 1
-    }
-
-    /// Add a new submission command entry to the queue. The caller must ensure that the queue have free
-    /// entries; this can be checked using `is_full`.
-    pub fn submit_unchecked(&mut self, entry: NvmeCmd) -> u16 {
-        unsafe { ptr::write_volatile(self.data[usize::from(self.tail)].get(), entry) }
-        self.tail = (self.tail + 1) % (self.data.len() as u16);
-        self.tail
-    }
-}
-
-#[derive(Debug)]
-pub enum Status {
-    GenericCmdStatus(u8),
-    CommandSpecificStatus(u8),
-    IntegrityError(u8),
-    PathRelatedStatus(u8),
-    Rsvd(u8),
-    Vendor(u8),
-}
-impl Status {
-    pub fn parse(raw: u16) -> Self {
-        let code = (raw >> 1) as u8;
-        match (raw >> 9) & 0b111 {
-            0 => Self::GenericCmdStatus(code),
-            1 => Self::CommandSpecificStatus(code),
-            2 => Self::IntegrityError(code),
-            3 => Self::PathRelatedStatus(code),
-            4..=6 => Self::Rsvd(code),
-            7 => Self::Vendor(code),
-            _ => unreachable!(),
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/storage/partitionlib/Cargo.toml b/recipes/core/base/drivers/storage/partitionlib/Cargo.toml
deleted file mode 100644
index d9c95c985a..0000000000
--- a/recipes/core/base/drivers/storage/partitionlib/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "partitionlib"
-description = "GPT and MBR partition table library"
-version = "0.1.0"
-authors = ["Deepak Sirone <deepaksirone94@gmail.com>"]
-edition = "2021"
-license = "MIT"
-
-[dependencies]
-gpt = { version = "3.0.1" }
-scroll = { version = "0.10", features = ["derive"] }
-uuid = { version = "1.0", features = ["v4"] }
diff --git a/recipes/core/base/drivers/storage/partitionlib/resources/disk.img b/recipes/core/base/drivers/storage/partitionlib/resources/disk.img
deleted file mode 100644
index 76913628c2..0000000000
Binary files a/recipes/core/base/drivers/storage/partitionlib/resources/disk.img and /dev/null differ
diff --git a/recipes/core/base/drivers/storage/partitionlib/resources/disk_mbr.img b/recipes/core/base/drivers/storage/partitionlib/resources/disk_mbr.img
deleted file mode 100644
index 429d41ca6b..0000000000
Binary files a/recipes/core/base/drivers/storage/partitionlib/resources/disk_mbr.img and /dev/null differ
diff --git a/recipes/core/base/drivers/storage/partitionlib/src/lib.rs b/recipes/core/base/drivers/storage/partitionlib/src/lib.rs
deleted file mode 100644
index be369ce64e..0000000000
--- a/recipes/core/base/drivers/storage/partitionlib/src/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod mbr;
-mod partition;
-pub use self::partition::*;
diff --git a/recipes/core/base/drivers/storage/partitionlib/src/mbr.rs b/recipes/core/base/drivers/storage/partitionlib/src/mbr.rs
deleted file mode 100644
index 67ae5a6dad..0000000000
--- a/recipes/core/base/drivers/storage/partitionlib/src/mbr.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use scroll::{Pread, Pwrite};
-use std::io::{self, Read, Seek};
-
-#[derive(Clone, Copy, Debug, Pread, Pwrite)]
-pub(crate) struct Entry {
-    pub(crate) drive_attrs: u8,
-    pub(crate) start_head: u8,
-    pub(crate) start_cs: u16,
-    pub(crate) sys_id: u8,
-    pub(crate) end_head: u8,
-    pub(crate) end_cs: u16,
-    pub(crate) rel_sector: u32,
-    pub(crate) len: u32,
-}
-
-#[derive(Pread, Pwrite)]
-pub(crate) struct Header {
-    pub(crate) bootstrap: [u8; 446],
-    pub(crate) first_entry: Entry,
-    pub(crate) second_entry: Entry,
-    pub(crate) third_entry: Entry,
-    pub(crate) fourth_entry: Entry,
-    pub(crate) last_signature: u16, // 0xAA55
-}
-
-pub(crate) fn read_header<D: Read + Seek>(device: &mut D) -> io::Result<Option<Header>> {
-    device.seek(io::SeekFrom::Start(0))?;
-
-    let mut bytes = [0u8; 512];
-    device.read_exact(&mut bytes)?;
-
-    let header: Header = bytes.pread_with(0, scroll::LE).unwrap();
-
-    if header.last_signature != 0xAA55 {
-        return Ok(None);
-    }
-
-    Ok(Some(header))
-}
-
-impl Header {
-    pub(crate) fn partitions(&self) -> impl Iterator<Item = Entry> {
-        [
-            self.first_entry,
-            self.second_entry,
-            self.third_entry,
-            self.fourth_entry,
-        ]
-        .into_iter()
-        .filter(Entry::is_valid)
-    }
-}
-impl Entry {
-    fn is_valid(&self) -> bool {
-        (self.drive_attrs == 0 || self.drive_attrs == 0x80) && self.len != 0
-    }
-}
diff --git a/recipes/core/base/drivers/storage/partitionlib/src/partition.rs b/recipes/core/base/drivers/storage/partitionlib/src/partition.rs
deleted file mode 100644
index 949171511b..0000000000
--- a/recipes/core/base/drivers/storage/partitionlib/src/partition.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-pub use gpt::disk::LogicalBlockSize;
-use std::io::{self, Read, Seek};
-use uuid::Uuid;
-
-/// A union of the MBR and GPT partition entry
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub struct Partition {
-    /// The starting logical block number
-    pub start_lba: u64,
-    /// The size of the partition in sectors
-    pub size: u64,
-    pub flags: Option<u64>,
-    pub name: Option<String>,
-    pub uuid: Option<Uuid>,
-}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum PartitionTableKind {
-    Mbr,
-    Gpt,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct PartitionTable {
-    pub partitions: Vec<Partition>,
-    pub kind: PartitionTableKind,
-}
-
-fn get_gpt_partitions<D: Read + Seek>(
-    device: &mut D,
-    sector_size: LogicalBlockSize,
-) -> io::Result<PartitionTable> {
-    let header = gpt::header::read_header_from_arbitrary_device(device, sector_size)?;
-    Ok(PartitionTable {
-        partitions: gpt::partition::file_read_partitions(device, &header, sector_size).map(
-            |btree| {
-                btree
-                    .into_iter()
-                    .map(|(_, part)| Partition {
-                        flags: Some(part.flags),
-                        size: part.last_lba - part.first_lba + 1,
-                        name: Some(part.name.clone()),
-                        uuid: Some(part.part_guid),
-                        start_lba: part.first_lba,
-                    })
-                    .collect()
-            },
-        )?,
-        kind: PartitionTableKind::Gpt,
-    })
-}
-fn get_mbr_partitions<D: Read + Seek>(device: &mut D) -> io::Result<Option<PartitionTable>> {
-    let Some(header) = crate::mbr::read_header(device)? else {
-        return Ok(None);
-    };
-    Ok(Some(PartitionTable {
-        kind: PartitionTableKind::Mbr,
-        partitions: header
-            .partitions()
-            .map(|partition: crate::mbr::Entry| Partition {
-                name: None,
-                uuid: None,  // TODO: Some kind of one-way conversion should be possible
-                flags: None, // TODO
-                size: partition.len.into(),
-                start_lba: partition.rel_sector.into(),
-            })
-            .collect(),
-    }))
-}
-pub fn get_partitions<D: Read + Seek>(
-    device: &mut D,
-    sector_size: LogicalBlockSize,
-) -> io::Result<Option<PartitionTable>> {
-    get_gpt_partitions(device, sector_size)
-        .map(Some)
-        .or_else(|_| get_mbr_partitions(device))
-}
-
-impl Partition {
-    pub fn to_offset(&self, sector_size: LogicalBlockSize) -> u64 {
-        let blksize: u64 = sector_size.into();
-        self.start_lba * blksize
-    }
-}
diff --git a/recipes/core/base/drivers/storage/partitionlib/tests/test.rs b/recipes/core/base/drivers/storage/partitionlib/tests/test.rs
deleted file mode 100644
index c4ef93220e..0000000000
--- a/recipes/core/base/drivers/storage/partitionlib/tests/test.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::fs::File;
-
-use partitionlib::{
-    get_partitions, LogicalBlockSize, Partition, PartitionTable, PartitionTableKind,
-};
-
-fn get_partitions_from_file(path: &str) -> PartitionTable {
-    let mut file = File::open(path).unwrap();
-    get_partitions(&mut file, LogicalBlockSize::Lb512)
-        .unwrap()
-        .unwrap()
-}
-
-// NOTE: The following tests rely on outside resource files being correct.
-#[test]
-fn gpt() {
-    let table = get_partitions_from_file("./resources/disk.img");
-    assert_eq!(table.kind, PartitionTableKind::Gpt);
-    assert_eq!(
-        &table.partitions,
-        &[Partition {
-            flags: Some(0),
-            name: Some("bug".to_owned()),
-            uuid: Some(uuid::Uuid::parse_str("b665fba9-74d5-4069-a6b9-5ba3a164fdfe").unwrap()), // Microsoft basic data
-            size: 957,
-            start_lba: 34,
-        }]
-    );
-}
-
-#[test]
-fn mbr() {
-    let table = get_partitions_from_file("./resources/disk_mbr.img");
-    assert_eq!(table.kind, PartitionTableKind::Mbr);
-    assert_eq!(
-        &table.partitions,
-        &[Partition {
-            flags: None,
-            name: None,
-            uuid: None,
-            size: 3,
-            start_lba: 1,
-        }]
-    );
-}
diff --git a/recipes/core/base/drivers/storage/usbscsid/.gitignore b/recipes/core/base/drivers/storage/usbscsid/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/storage/usbscsid/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/storage/usbscsid/Cargo.toml b/recipes/core/base/drivers/storage/usbscsid/Cargo.toml
deleted file mode 100644
index 4a36934ebb..0000000000
--- a/recipes/core/base/drivers/storage/usbscsid/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "usbscsid"
-description = "USB SCSI driver"
-version = "0.1.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-edition = "2021"
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-base64 = "0.11" # Only for debugging
-libredox.workspace = true
-plain.workspace = true
-driver-block = { path = "../driver-block" }
-daemon = { path = "../../../daemon" }
-redox_event.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-thiserror.workspace = true
-xhcid = { path = "../../usb/xhcid" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/storage/usbscsid/src/main.rs b/recipes/core/base/drivers/storage/usbscsid/src/main.rs
deleted file mode 100644
index 5382d118e3..0000000000
--- a/recipes/core/base/drivers/storage/usbscsid/src/main.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use std::collections::BTreeMap;
-use std::env;
-
-use driver_block::{Disk, DiskScheme, ExecutorTrait};
-use syscall::{Error, EIO};
-use xhcid_interface::{ConfigureEndpointsReq, PortId, XhciClientHandle};
-
-pub mod protocol;
-pub mod scsi;
-
-use crate::protocol::Protocol;
-use crate::scsi::Scsi;
-
-fn main() {
-    daemon::Daemon::new(daemon);
-}
-fn daemon(daemon: daemon::Daemon) -> ! {
-    let mut args = env::args().skip(1);
-
-    const USAGE: &'static str = "usbscsid <scheme> <port> <protocol>";
-
-    let scheme = args.next().expect(USAGE);
-    let port = args
-        .next()
-        .expect(USAGE)
-        .parse::<PortId>()
-        .expect("Expected port ID");
-    let protocol = args
-        .next()
-        .expect(USAGE)
-        .parse::<u8>()
-        .expect("protocol has to be a number 0-255");
-
-    println!(
-        "USB SCSI driver spawned with scheme `{}`, port {}, protocol {}",
-        scheme, port, protocol
-    );
-
-    let disk_scheme_name = format!("disk.usb-{scheme}+{port}-scsi");
-
-    // TODO: Use eventfds.
-    let handle =
-        XhciClientHandle::new(scheme.to_owned(), port).expect("Failed to open XhciClientHandle");
-
-    let desc = handle
-        .get_standard_descs()
-        .expect("Failed to get standard descriptors");
-
-    // TODO: Perhaps the drivers should just be given the config, interface, and alternate setting
-    // from xhcid.
-    let (conf_desc, configuration_value, (if_desc, interface_num, alternate_setting)) = desc
-        .config_descs
-        .iter()
-        .find_map(|config_desc| {
-            let interface_desc = config_desc.interface_descs.iter().find_map(|if_desc| {
-                if if_desc.class == 8 && if_desc.sub_class == 6 && if_desc.protocol == 0x50 {
-                    Some((if_desc.clone(), if_desc.number, if_desc.alternate_setting))
-                } else {
-                    None
-                }
-            })?;
-            Some((
-                config_desc.clone(),
-                config_desc.configuration_value,
-                interface_desc,
-            ))
-        })
-        .expect("Failed to find suitable configuration");
-
-    handle
-        .configure_endpoints(&ConfigureEndpointsReq {
-            config_desc: configuration_value,
-            interface_desc: Some(interface_num),
-            alternate_setting: Some(alternate_setting),
-            hub_ports: None,
-        })
-        .expect("Failed to configure endpoints");
-
-    let mut protocol = protocol::setup(&handle, protocol, &desc, &conf_desc, &if_desc)
-        .expect("Failed to setup protocol");
-
-    // TODO: Let all of the USB drivers fork or be managed externally, and xhcid won't have to keep
-    // track of all the drivers.
-    let mut scsi = Scsi::new(&mut *protocol).expect("usbscsid: failed to setup SCSI");
-    println!("SCSI initialized");
-    let mut buffer = [0u8; 512];
-    scsi.read(&mut *protocol, 0, &mut buffer).unwrap();
-    println!("DISK CONTENT: {}", base64::encode(&buffer[..]));
-
-    let event_queue = event::EventQueue::new().unwrap();
-
-    event::user_data! {
-        enum Event {
-            Scheme,
-        }
-    };
-
-    let mut scheme = DiskScheme::new(
-        None,
-        disk_scheme_name,
-        BTreeMap::from([(
-            0,
-            UsbDisk {
-                scsi: &mut scsi,
-                protocol: &mut *protocol,
-            },
-        )]),
-        &driver_block::FuturesExecutor,
-    );
-
-    // FIXME should this wait notifying readiness until the disk scheme is created?
-    daemon.ready();
-
-    //libredox::call::setrens(0, 0).expect("nvmed: failed to enter null namespace");
-
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Event::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    for event in event_queue {
-        match event.unwrap().user_data {
-            Event::Scheme => driver_block::FuturesExecutor
-                .block_on(scheme.tick())
-                .unwrap(),
-        }
-    }
-
-    std::process::exit(0);
-}
-
-struct UsbDisk<'a> {
-    scsi: &'a mut Scsi,
-    protocol: &'a mut dyn Protocol,
-}
-
-impl Disk for UsbDisk<'_> {
-    fn block_size(&self) -> u32 {
-        self.scsi.block_size
-    }
-
-    fn size(&self) -> u64 {
-        self.scsi.get_disk_size()
-    }
-
-    async fn read(&mut self, block: u64, buffer: &mut [u8]) -> syscall::Result<usize> {
-        match self.scsi.read(self.protocol, block, buffer) {
-            Ok(bytes_read) => Ok(bytes_read as usize),
-            Err(err) => {
-                eprintln!("usbscsid: READ IO ERROR: {err}");
-                Err(Error::new(EIO))
-            }
-        }
-    }
-
-    async fn write(&mut self, block: u64, buffer: &[u8]) -> syscall::Result<usize> {
-        match self.scsi.write(self.protocol, block, buffer) {
-            Ok(bytes_written) => Ok(bytes_written as usize),
-            Err(err) => {
-                eprintln!("usbscsid: WRITE IO ERROR: {err}");
-                Err(Error::new(EIO))
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/storage/usbscsid/src/protocol/bot.rs b/recipes/core/base/drivers/storage/usbscsid/src/protocol/bot.rs
deleted file mode 100644
index b751d51ad6..0000000000
--- a/recipes/core/base/drivers/storage/usbscsid/src/protocol/bot.rs
+++ /dev/null
@@ -1,363 +0,0 @@
-use std::num::NonZeroU32;
-use std::slice;
-
-use xhcid_interface::{
-    ConfDesc, DeviceReqData, EndpBinaryDirection, EndpDirection, EndpointStatus, IfDesc, Invalid,
-    PortReqRecipient, PortReqTy, PortTransferStatus, PortTransferStatusKind, XhciClientHandle,
-    XhciClientHandleError, XhciEndpHandle,
-};
-
-use super::{Protocol, ProtocolError, SendCommandStatus, SendCommandStatusKind};
-
-pub const CBW_SIGNATURE: u32 = 0x43425355;
-
-/// 0 means host to dev, 1 means dev to host
-pub const CBW_FLAGS_DIRECTION_BIT: u8 = 1 << CBW_FLAGS_DIRECTION_SHIFT;
-pub const CBW_FLAGS_DIRECTION_SHIFT: u8 = 7;
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct CommandBlockWrapper {
-    pub signature: u32,
-    pub tag: u32,
-    pub data_transfer_len: u32,
-    pub flags: u8, // upper nibble reserved
-    pub lun: u8,   // bits 7:5 reserved
-    pub cb_len: u8,
-    pub command_block: [u8; 16],
-}
-impl CommandBlockWrapper {
-    pub fn new(
-        tag: u32,
-        data_transfer_len: u32,
-        direction: EndpBinaryDirection,
-        lun: u8,
-        cb: &[u8],
-    ) -> Result<Self, ProtocolError> {
-        let mut command_block = [0u8; 16];
-        if cb.len() > 16 {
-            return Err(ProtocolError::TooLargeCommandBlock(cb.len()));
-        }
-
-        command_block[..cb.len()].copy_from_slice(&cb);
-        Ok(Self {
-            signature: CBW_SIGNATURE,
-            tag,
-            data_transfer_len,
-            flags: match direction {
-                EndpBinaryDirection::Out => 0,
-                EndpBinaryDirection::In => 1,
-            } << CBW_FLAGS_DIRECTION_SHIFT,
-            lun,
-            cb_len: cb.len() as u8,
-            command_block,
-        })
-    }
-}
-unsafe impl plain::Plain for CommandBlockWrapper {}
-
-pub const CSW_SIGNATURE: u32 = 0x53425355;
-
-#[repr(u8)]
-pub enum CswStatus {
-    Passed = 0,
-    Failed = 1,
-    PhaseError = 2,
-    // the rest are reserved
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct CommandStatusWrapper {
-    pub signature: u32,
-    pub tag: u32,
-    pub data_residue: u32,
-    pub status: u8,
-}
-unsafe impl plain::Plain for CommandStatusWrapper {}
-
-impl CommandStatusWrapper {
-    pub fn is_valid(&self) -> bool {
-        self.signature == CSW_SIGNATURE
-    }
-}
-
-pub struct BulkOnlyTransport<'a> {
-    handle: &'a XhciClientHandle,
-    bulk_in: XhciEndpHandle,
-    bulk_out: XhciEndpHandle,
-    bulk_in_num: u8,
-    bulk_out_num: u8,
-    max_lun: u8,
-    current_tag: u32,
-    interface_num: u8,
-}
-
-pub const FEATURE_ENDPOINT_HALT: u16 = 0;
-
-impl<'a> BulkOnlyTransport<'a> {
-    pub fn init(
-        handle: &'a XhciClientHandle,
-        config_desc: &ConfDesc,
-        if_desc: &IfDesc,
-    ) -> Result<Self, ProtocolError> {
-        let endpoints = &if_desc.endpoints;
-
-        let bulk_in_num = (endpoints
-            .iter()
-            .position(|endpoint| endpoint.direction() == EndpDirection::In)
-            .unwrap()
-            + 1) as u8;
-        let bulk_out_num = (endpoints
-            .iter()
-            .position(|endpoint| endpoint.direction() == EndpDirection::Out)
-            .unwrap()
-            + 1) as u8;
-
-        let max_lun = get_max_lun(handle, 0)?;
-        println!("BOT_MAX_LUN {}", max_lun);
-
-        Ok(Self {
-            bulk_in: handle.open_endpoint(bulk_in_num)?,
-            bulk_out: handle.open_endpoint(bulk_out_num)?,
-            bulk_in_num,
-            bulk_out_num,
-            handle,
-            max_lun,
-            current_tag: 0,
-            interface_num: if_desc.number,
-        })
-    }
-    fn clear_stall_in(&mut self) -> Result<(), XhciClientHandleError> {
-        if self.bulk_in.status()? == EndpointStatus::Halted {
-            self.bulk_in.reset(false)?;
-            self.handle.clear_feature(
-                PortReqRecipient::Endpoint,
-                u16::from(self.bulk_in_num),
-                FEATURE_ENDPOINT_HALT,
-            )?;
-        }
-        Ok(())
-    }
-    fn clear_stall_out(&mut self) -> Result<(), XhciClientHandleError> {
-        if self.bulk_out.status()? == EndpointStatus::Halted {
-            self.bulk_out.reset(false)?;
-            self.handle.clear_feature(
-                PortReqRecipient::Endpoint,
-                u16::from(self.bulk_out_num),
-                FEATURE_ENDPOINT_HALT,
-            )?;
-        }
-        Ok(())
-    }
-    fn reset_recovery(&mut self) -> Result<(), ProtocolError> {
-        bulk_only_mass_storage_reset(self.handle, self.interface_num.into())?;
-        self.clear_stall_in()?;
-        self.clear_stall_out()?;
-
-        if self.bulk_in.status()? == EndpointStatus::Halted
-            || self.bulk_out.status()? == EndpointStatus::Halted
-        {
-            return Err(ProtocolError::RecoveryFailed);
-        }
-        Ok(())
-    }
-    fn read_csw_raw(
-        &mut self,
-        csw_buffer: &mut [u8; 13],
-        already: bool,
-    ) -> Result<(), ProtocolError> {
-        match self.bulk_in.transfer_read(&mut csw_buffer[..])? {
-            PortTransferStatus {
-                kind: PortTransferStatusKind::Stalled,
-                ..
-            } => {
-                if already {
-                    self.reset_recovery()?;
-                }
-                println!("bulk in endpoint stalled when reading CSW");
-                self.clear_stall_in()?;
-                self.read_csw_raw(csw_buffer, true)?;
-            }
-            PortTransferStatus {
-                kind: PortTransferStatusKind::ShortPacket,
-                bytes_transferred,
-            } if bytes_transferred != 13 => {
-                panic!(
-                    "received a short packet when reading CSW ({} != 13)",
-                    bytes_transferred
-                )
-            }
-            _ => (),
-        }
-        Ok(())
-    }
-    fn read_csw(&mut self, csw_buffer: &mut [u8; 13]) -> Result<(), ProtocolError> {
-        self.read_csw_raw(csw_buffer, false)
-    }
-}
-
-impl<'a> Protocol for BulkOnlyTransport<'a> {
-    fn send_command(
-        &mut self,
-        cb: &[u8],
-        data: DeviceReqData,
-    ) -> Result<SendCommandStatus, ProtocolError> {
-        self.current_tag += 1;
-        let tag = self.current_tag;
-
-        let mut cbw_bytes = [0u8; 31];
-        let cbw = plain::from_mut_bytes::<CommandBlockWrapper>(&mut cbw_bytes).unwrap();
-        *cbw = CommandBlockWrapper::new(tag, data.len() as u32, data.direction().into(), 0, cb)?;
-        let cbw = *cbw;
-
-        match self.bulk_out.transfer_write(&cbw_bytes)? {
-            PortTransferStatus {
-                kind: PortTransferStatusKind::Stalled,
-                ..
-            } => {
-                // TODO: Error handling
-                panic!("bulk out endpoint stalled when sending CBW {:?}", cbw);
-                //self.clear_stall_out()?;
-                //dbg!(self.bulk_in.status()?, self.bulk_out.status()?);
-            }
-            PortTransferStatus {
-                bytes_transferred, ..
-            } if bytes_transferred != 31 => {
-                panic!(
-                    "received short packet when sending CBW ({} != 31)",
-                    bytes_transferred
-                );
-            }
-            _ => (),
-        }
-
-        let early_residue: Option<NonZeroU32> = match data {
-            DeviceReqData::In(buffer) => match self.bulk_in.transfer_read(buffer)? {
-                PortTransferStatus {
-                    kind,
-                    bytes_transferred,
-                } => match kind {
-                    PortTransferStatusKind::Success => None,
-                    PortTransferStatusKind::ShortPacket => {
-                        println!(
-                            "received short packet (len {}) when transferring data",
-                            bytes_transferred
-                        );
-                        NonZeroU32::new(bytes_transferred)
-                    }
-                    PortTransferStatusKind::Stalled => {
-                        panic!("bulk in endpoint stalled when reading data");
-                        //self.clear_stall_in()?;
-                    }
-                    PortTransferStatusKind::Unknown => {
-                        return Err(ProtocolError::XhciError(
-                            XhciClientHandleError::InvalidResponse(Invalid(
-                                "unknown transfer status",
-                            )),
-                        ));
-                    }
-                },
-            },
-            DeviceReqData::Out(buffer) => match self.bulk_out.transfer_write(buffer)? {
-                PortTransferStatus {
-                    kind,
-                    bytes_transferred,
-                } => match kind {
-                    PortTransferStatusKind::Success => None,
-                    PortTransferStatusKind::ShortPacket => {
-                        println!(
-                            "received short packet (len {}) when transferring data",
-                            bytes_transferred
-                        );
-                        NonZeroU32::new(bytes_transferred)
-                    }
-                    PortTransferStatusKind::Stalled => {
-                        panic!("bulk out endpoint stalled when reading data");
-                        //self.clear_stall_out()?;
-                    }
-                    PortTransferStatusKind::Unknown => {
-                        return Err(ProtocolError::XhciError(
-                            XhciClientHandleError::InvalidResponse(Invalid(
-                                "unknown transfer status",
-                            )),
-                        ));
-                    }
-                },
-            },
-            DeviceReqData::NoData => None,
-        };
-
-        let mut csw_buffer = [0u8; 13];
-        self.read_csw(&mut csw_buffer)?;
-        let csw = plain::from_bytes::<CommandStatusWrapper>(&csw_buffer).unwrap();
-
-        let residue = early_residue.or(NonZeroU32::new(csw.data_residue));
-
-        if csw.status == CswStatus::Failed as u8 {
-            println!("CSW indicated failure (CSW {:?}, CBW {:?})", csw, cbw);
-        }
-
-        if !csw.is_valid() || csw.tag != cbw.tag {
-            println!("Invald CSW {:?} (for CBW {:?})", csw, cbw);
-            self.reset_recovery()?;
-            if self.bulk_in.status()? == EndpointStatus::Halted
-                || self.bulk_out.status()? == EndpointStatus::Halted
-            {
-                return Err(ProtocolError::ProtocolError(
-                    "Reset Recovery didn't reset endpoints",
-                ));
-            }
-            return Err(ProtocolError::ProtocolError(
-                "CSW invalid, but a recover was successful",
-            ));
-        }
-
-        /*if self.bulk_in.status()? == EndpointStatus::Halted
-            || self.bulk_out.status()? == EndpointStatus::Halted
-        {
-            println!("Trying to recover from stall");
-            dbg!(self.bulk_in.status()?, self.bulk_out.status()?);
-        }*/
-
-        Ok(SendCommandStatus {
-            kind: if csw.status == CswStatus::Passed as u8 {
-                SendCommandStatusKind::Success
-            } else if csw.status == CswStatus::Failed as u8 {
-                SendCommandStatusKind::Failed
-            } else {
-                return Err(ProtocolError::ProtocolError(
-                    "bulk-only transport phase error, or other",
-                ));
-            },
-            residue,
-        })
-    }
-}
-
-pub fn bulk_only_mass_storage_reset(
-    handle: &XhciClientHandle,
-    if_num: u16,
-) -> Result<(), XhciClientHandleError> {
-    handle.device_request(
-        PortReqTy::Class,
-        PortReqRecipient::Interface,
-        0xFF,
-        0,
-        if_num,
-        DeviceReqData::NoData,
-    )
-}
-pub fn get_max_lun(handle: &XhciClientHandle, if_num: u16) -> Result<u8, XhciClientHandleError> {
-    let mut lun = 0u8;
-    let buffer = slice::from_mut(&mut lun);
-    handle.device_request(
-        PortReqTy::Class,
-        PortReqRecipient::Interface,
-        0xFE,
-        0,
-        if_num,
-        DeviceReqData::In(buffer),
-    )?;
-    Ok(lun)
-}
diff --git a/recipes/core/base/drivers/storage/usbscsid/src/protocol/mod.rs b/recipes/core/base/drivers/storage/usbscsid/src/protocol/mod.rs
deleted file mode 100644
index a580765f1d..0000000000
--- a/recipes/core/base/drivers/storage/usbscsid/src/protocol/mod.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use std::io;
-use std::num::NonZeroU32;
-
-use thiserror::Error;
-use xhcid_interface::{
-    ConfDesc, DevDesc, DeviceReqData, IfDesc, XhciClientHandle, XhciClientHandleError,
-};
-
-#[derive(Debug, Error)]
-pub enum ProtocolError {
-    #[error("Too large command block ({0} > 16)")]
-    TooLargeCommandBlock(usize),
-
-    #[error("xhcid connection error: {0}")]
-    XhciError(#[from] XhciClientHandleError),
-
-    #[error("i/o error")]
-    IoError(#[from] io::Error),
-
-    #[error("attempted recovery failed")]
-    RecoveryFailed,
-
-    #[error("protocol error")]
-    ProtocolError(&'static str),
-}
-
-#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
-pub struct SendCommandStatus {
-    pub residue: Option<NonZeroU32>,
-    pub kind: SendCommandStatusKind,
-}
-
-impl SendCommandStatus {
-    pub fn bytes_transferred(&self, transfer_len: u32) -> u32 {
-        transfer_len - self.residue.map(u32::from).unwrap_or(0)
-    }
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum SendCommandStatusKind {
-    Success,
-    Failed,
-}
-
-impl Default for SendCommandStatusKind {
-    fn default() -> Self {
-        Self::Success
-    }
-}
-
-pub trait Protocol {
-    fn send_command(
-        &mut self,
-        command: &[u8],
-        data: DeviceReqData,
-    ) -> Result<SendCommandStatus, ProtocolError>;
-}
-
-/// Bulk-only transport
-pub mod bot;
-
-mod uas {
-    // TODO
-}
-
-use bot::BulkOnlyTransport;
-
-pub fn setup<'a>(
-    handle: &'a XhciClientHandle,
-    protocol: u8,
-    dev_desc: &DevDesc,
-    conf_desc: &ConfDesc,
-    if_desc: &IfDesc,
-) -> Option<Box<dyn Protocol + 'a>> {
-    match protocol {
-        0x50 => Some(Box::new(
-            BulkOnlyTransport::init(handle, conf_desc, if_desc).unwrap(),
-        )),
-        _ => None,
-    }
-}
diff --git a/recipes/core/base/drivers/storage/usbscsid/src/scsi/cmds.rs b/recipes/core/base/drivers/storage/usbscsid/src/scsi/cmds.rs
deleted file mode 100644
index ab02525e93..0000000000
--- a/recipes/core/base/drivers/storage/usbscsid/src/scsi/cmds.rs
+++ /dev/null
@@ -1,559 +0,0 @@
-use super::opcodes::Opcode;
-use std::convert::TryInto;
-use std::{fmt, mem, slice};
-
-#[repr(C, packed)]
-pub struct Inquiry {
-    pub opcode: u8,
-    /// bits 7:2 are reserved, bit 1 (CMDDT) is obsolete, bit 0 is EVPD
-    pub evpd: u8,
-    pub page_code: u8,
-    /// big endian
-    pub alloc_len: u16,
-    pub control: u8,
-}
-unsafe impl plain::Plain for Inquiry {}
-
-impl Inquiry {
-    pub const fn new(evpd: bool, page_code: u8, alloc_len: u16, control: u8) -> Self {
-        Self {
-            opcode: Opcode::Inquiry as u8,
-            evpd: evpd as u8,
-            page_code,
-            alloc_len: u16::to_be(alloc_len),
-            control,
-        }
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct StandardInquiryData {
-    /// Peripheral device type (bits 4:0), and peripheral device qualifier (bits 7:5).
-    pub a: u8,
-    /// Removable media bit (bit 7, bits 6:0 are reserved).
-    pub rmb: u8,
-    /// Version of the SCSI command set.
-    pub version: u8,
-    pub b: u8,
-    pub additional_len: u8,
-    pub c: u8,
-    pub d: u8,
-    pub e: u8,
-    pub t10_vendor_info: u64,
-    pub product_ident: [u8; 16],
-    pub product_rev_label: u32,
-    pub driver_serial_no: [u8; 8],
-    pub vendor_uniq: [u8; 12],
-    _rsvd1: [u8; 2],
-    pub version_descs: [u16; 8],
-    _rsvd2: [u8; 22],
-}
-unsafe impl plain::Plain for StandardInquiryData {}
-impl StandardInquiryData {
-    pub const fn periph_dev_ty(&self) -> u8 {
-        self.a & 0x1F
-    }
-    pub const fn periph_dev_qual(&self) -> u8 {
-        (self.a & 0xE0) >> 5
-    }
-    pub const fn version(&self) -> u8 {
-        self.version
-    }
-}
-
-#[repr(u8)]
-pub enum PeriphDeviceType {
-    DirectAccess,
-    SeqAccess,
-    // there are more
-}
-#[repr(u8)]
-pub enum InquiryVersion {
-    NoConformance,
-    Spc,
-    Spc2,
-    Spc3,
-    Spc4,
-    Spc5,
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct RequestSense {
-    pub opcode: u8,
-    pub desc: u8, // bits 7:1 reserved
-    _rsvd: u16,
-    pub alloc_len: u8,
-    pub control: u8,
-}
-unsafe impl plain::Plain for RequestSense {}
-
-impl RequestSense {
-    pub const MINIMAL_ALLOC_LEN: u8 = 252;
-
-    pub const fn new(desc: bool, alloc_len: u8, control: u8) -> Self {
-        Self {
-            opcode: Opcode::RequestSense as u8,
-            desc: desc as u8,
-            _rsvd: 0,
-            alloc_len,
-            control,
-        }
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct FixedFormatSenseData {
-    pub a: u8,
-    _obsolete: u8,
-    pub b: u8,
-    pub info: u32,
-    pub add_sense_len: u8,
-    pub command_specific_info: u32,
-    pub add_sense_code: u8,
-    pub add_sense_code_qual: u8,
-    pub field_replacable_unit_code: u8,
-    pub sense_key_specific: [u8; 3], // big endian
-    pub add_sense_bytes: [u8; 0],
-}
-unsafe impl plain::Plain for FixedFormatSenseData {}
-
-impl FixedFormatSenseData {
-    pub const fn additional_len(&self) -> u16 {
-        self.add_sense_len as u16 + 7
-    }
-    pub unsafe fn add_sense_bytes(&self) -> &[u8] {
-        slice::from_raw_parts(
-            &self.add_sense_len as *const u8,
-            self.add_sense_len as usize - 18,
-        )
-    }
-    pub fn sense_key(&self) -> SenseKey {
-        let sense_key_raw = self.b & 0b1111;
-        // Safe because all possible values (0-15) are used by the enum.
-        unsafe { mem::transmute(sense_key_raw) }
-    }
-}
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum SenseKey {
-    NoSense = 0x00,
-    RecoveredError = 0x01,
-    NotReady = 0x02,
-    MediumError = 0x03,
-    HardwareError = 0x04,
-    IllegalRequest = 0x05,
-    UnitAttention = 0x06,
-    DataProtect = 0x07,
-    BlankCheck = 0x08,
-    VendorSpecific = 0x09,
-    CopyAborted = 0x0A,
-    AbortedCommand = 0x0B,
-    Reserved = 0x0C,
-    VolumeOverflow = 0x0D,
-    Miscompare = 0x0E,
-    Completed = 0x0F,
-}
-impl Default for SenseKey {
-    fn default() -> Self {
-        Self::NoSense
-    }
-}
-
-pub const ADD_SENSE_CODE05_INVAL_CDB_FIELD: u8 = 0x24;
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct Read16 {
-    pub opcode: u8,
-    pub a: u8,
-    pub lba: u64,
-    pub transfer_len: u32,
-    pub b: u8,
-    pub control: u8,
-}
-unsafe impl plain::Plain for Read16 {}
-
-impl Read16 {
-    pub const fn new(lba: u64, transfer_len: u32, control: u8) -> Self {
-        // TODO: RDPROTECT, DPO, FUA, RARC
-        // TODO: DLD
-        // TODO: Group number
-        Self {
-            opcode: Opcode::Read16 as u8,
-            a: 0,
-            lba: u64::to_be(lba),
-            transfer_len: u32::to_be(transfer_len),
-            b: 0,
-            control,
-        }
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct Write16 {
-    pub opcode: u8,
-    pub a: u8,
-    pub lba: u64, // big endian
-    pub transfer_len: u32,
-    pub b: u8,
-    pub control: u8,
-}
-unsafe impl plain::Plain for Write16 {}
-
-impl Write16 {
-    pub const fn new(lba: u64, transfer_len: u32, control: u8) -> Self {
-        Self {
-            // TODO
-            opcode: Opcode::Write16 as u8,
-            a: 0,
-            lba,
-            transfer_len,
-            b: 0,
-            control,
-        }
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct ModeSense6 {
-    pub opcode: u8,
-    pub a: u8,
-    pub b: u8,
-    pub subpage_code: u8,
-    pub alloc_len: u8,
-    pub control: u8,
-}
-unsafe impl plain::Plain for ModeSense6 {}
-
-impl ModeSense6 {
-    pub const fn new(
-        dbd: bool,
-        page_code: u8,
-        pc: u8,
-        subpage_code: u8,
-        alloc_len: u8,
-        control: u8,
-    ) -> Self {
-        Self {
-            opcode: Opcode::ModeSense6 as u8,
-            a: (dbd as u8) << 3,
-            b: page_code | (pc << 6),
-            subpage_code,
-            alloc_len,
-            control,
-        }
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct ModeSense10 {
-    pub opcode: u8,
-    pub a: u8,
-    pub b: u8,
-    pub subpage_code: u8,
-    pub _rsvd: [u8; 3],
-    pub alloc_len: u16,
-    pub control: u8,
-}
-unsafe impl plain::Plain for ModeSense10 {}
-
-impl ModeSense10 {
-    pub const fn new(
-        dbd: bool,
-        llbaa: bool,
-        page_code: u8,
-        pc: ModePageControl,
-        subpage_code: u8,
-        alloc_len: u16,
-        control: u8,
-    ) -> Self {
-        Self {
-            opcode: Opcode::ModeSense10 as u8,
-            a: ((dbd as u8) << 3) | ((llbaa as u8) << 4),
-            b: page_code | ((pc as u8) << 6),
-            subpage_code,
-            _rsvd: [0u8; 3],
-            alloc_len: u16::from_be(alloc_len),
-            control,
-        }
-    }
-    pub const fn get_block_desc(alloc_len: u16, control: u8) -> Self {
-        Self::new(
-            false,
-            true,
-            0x3F,
-            ModePageControl::CurrentValues,
-            0x00,
-            alloc_len,
-            control,
-        )
-    }
-}
-
-#[repr(u8)]
-pub enum ModePageControl {
-    CurrentValues,
-    ChangeableChanges,
-    DefaultValues,
-    SavedValue,
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy)]
-pub struct ShortLbaModeParamBlkDesc {
-    pub block_count: u32,
-    _rsvd: u8,
-    pub logical_block_len: [u8; 3],
-}
-unsafe impl plain::Plain for ShortLbaModeParamBlkDesc {}
-
-impl ShortLbaModeParamBlkDesc {
-    pub const fn block_count(&self) -> u32 {
-        u32::from_be(self.block_count)
-    }
-    pub const fn logical_block_len(&self) -> u32 {
-        u24_be_to_u32(self.logical_block_len)
-    }
-}
-impl fmt::Debug for ShortLbaModeParamBlkDesc {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("ShortLbaModeParamBlkDesc")
-            .field("block_count", &self.block_count())
-            .field("logical_block_len", &self.logical_block_len())
-            .finish()
-    }
-}
-
-const fn u24_be_to_u32(u24: [u8; 3]) -> u32 {
-    ((u24[0] as u32) << 16) | ((u24[1] as u32) << 8) | (u24[2] as u32)
-}
-
-/// From SPC-3, when LONGLBA is not set, and the peripheral device type of the INQUIRY data indicates that the device is not a direct access device. Otherwise, `ShortLbaModeParamBlkDesc` is used instead.
-#[repr(C, packed)]
-#[derive(Clone, Copy)]
-pub struct GeneralModeParamBlkDesc {
-    pub density_code: u8,
-    pub block_count: [u8; 3],
-    _rsvd: u8,
-    pub block_length: [u8; 3],
-}
-unsafe impl plain::Plain for GeneralModeParamBlkDesc {}
-
-impl GeneralModeParamBlkDesc {
-    pub fn block_count(&self) -> u32 {
-        u24_be_to_u32(self.block_count)
-    }
-    pub fn logical_block_len(&self) -> u32 {
-        u24_be_to_u32(self.block_length)
-    }
-}
-
-impl fmt::Debug for GeneralModeParamBlkDesc {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("GeneralModeParamBlkDesc")
-            .field("density_code", &self.density_code)
-            .field("block_count", &u24_be_to_u32(self.block_count))
-            .field("block_length", &u24_be_to_u32(self.block_length))
-            .finish()
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct LongLbaModeParamBlkDesc {
-    pub block_count: u64,
-    _rsvd: u32,
-    pub logical_block_len: u32,
-}
-unsafe impl plain::Plain for LongLbaModeParamBlkDesc {}
-
-impl LongLbaModeParamBlkDesc {
-    pub const fn block_count(&self) -> u64 {
-        u64::from_be(self.block_count)
-    }
-    pub const fn logical_block_len(&self) -> u32 {
-        u32::from_be(self.logical_block_len)
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct ModeParamHeader6 {
-    pub mode_data_len: u8,
-    pub medium_ty: u8,
-    pub a: u8,
-    pub block_desc_len: u8,
-}
-unsafe impl plain::Plain for ModeParamHeader6 {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct ModeParamHeader10 {
-    pub mode_data_len: u16,
-    pub medium_ty: u8,
-    pub a: u8,
-    pub b: u8,
-    _rsvd: u8,
-    pub block_desc_len: u16,
-}
-unsafe impl plain::Plain for ModeParamHeader10 {}
-impl ModeParamHeader10 {
-    pub const fn mode_data_len(&self) -> u16 {
-        u16::from_be(self.mode_data_len)
-    }
-    pub const fn block_desc_len(&self) -> u16 {
-        u16::from_be(self.block_desc_len)
-    }
-    pub const fn longlba(&self) -> bool {
-        (self.b & 0x01) != 0
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct ReadCapacity10 {
-    pub opcode: u8,
-    _rsvd1: u8,
-    obsolete_lba: u32,
-    _rsvd2: [u8; 3],
-    pub control: u8,
-}
-unsafe impl plain::Plain for ReadCapacity10 {}
-
-impl ReadCapacity10 {
-    pub const fn new(control: u8) -> Self {
-        Self {
-            opcode: Opcode::ReadCapacity10 as u8,
-            _rsvd1: 0,
-            obsolete_lba: 0,
-            _rsvd2: [0; 3],
-            control,
-        }
-    }
-}
-// TODO: ReadCapacity16
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct ReadCapacity10ParamData {
-    pub max_lba: u32,
-    pub block_len: u32,
-}
-unsafe impl plain::Plain for ReadCapacity10ParamData {}
-
-impl ReadCapacity10ParamData {
-    pub const fn block_count(&self) -> u32 {
-        u32::from_be(self.max_lba)
-    }
-    pub const fn logical_block_len(&self) -> u32 {
-        u32::from_be(self.block_len)
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct RwErrorRecoveryPage {
-    pub a: u8,
-    pub page_length: u8,
-    pub b: u8,
-    pub read_retry_count: u8,
-    _obsolete: [u8; 3],
-    _rsvd: u8,
-    pub recovery_time_limit: u16,
-}
-unsafe impl plain::Plain for RwErrorRecoveryPage {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct CachingModePage {
-    pub a: u8,
-    pub page_length: u8,
-    // TODO: more
-}
-unsafe impl plain::Plain for CachingModePage {}
-
-pub(crate) struct ModePageIterRaw<'a> {
-    buffer: &'a [u8],
-}
-
-impl<'a> Iterator for ModePageIterRaw<'a> {
-    type Item = &'a [u8];
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.buffer.len() < 2 {
-            return None;
-        }
-
-        let a = self.buffer[0];
-        let page_len = if a & (1 << 6) == 0 {
-            // item is page_0 mode
-            self.buffer[1] as usize + 1
-        } else {
-            // item is sub_page mode
-            u16::from_be_bytes((&self.buffer[2..3]).try_into().ok()?) as usize + 3
-        };
-        if self.buffer.len() < page_len {
-            return None;
-        }
-        let buffer = &self.buffer[..page_len];
-
-        self.buffer = if page_len == self.buffer.len() {
-            &[]
-        } else {
-            &self.buffer[page_len..]
-        };
-
-        Some(buffer)
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum AnyModePage<'a> {
-    RwErrorRecovery(&'a RwErrorRecoveryPage),
-    Caching(&'a CachingModePage),
-}
-
-struct ModePageIter<'a> {
-    raw: ModePageIterRaw<'a>,
-}
-
-impl<'a> Iterator for ModePageIter<'a> {
-    type Item = AnyModePage<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let next_buf = self.raw.next()?;
-        let a = next_buf[0];
-
-        let page_code = a & 0x1F;
-        let spf = a & (1 << 6) != 0;
-
-        if !spf {
-            if page_code == 0x01 {
-                Some(AnyModePage::RwErrorRecovery(
-                    plain::from_bytes(next_buf).ok()?,
-                ))
-            } else if page_code == 0x08 {
-                Some(AnyModePage::Caching(plain::from_bytes(next_buf).ok()?))
-            } else {
-                println!("Unimplemented sub_page {}", base64::encode(next_buf));
-                None
-            }
-        } else {
-            println!("Unimplemented page_0 {}", base64::encode(next_buf));
-            None
-        }
-    }
-}
-
-pub fn mode_page_iter(buffer: &[u8]) -> impl Iterator<Item = AnyModePage<'_>> {
-    ModePageIter {
-        raw: ModePageIterRaw { buffer },
-    }
-}
diff --git a/recipes/core/base/drivers/storage/usbscsid/src/scsi/mod.rs b/recipes/core/base/drivers/storage/usbscsid/src/scsi/mod.rs
deleted file mode 100644
index 790abea68c..0000000000
--- a/recipes/core/base/drivers/storage/usbscsid/src/scsi/mod.rs
+++ /dev/null
@@ -1,339 +0,0 @@
-use std::convert::TryFrom;
-use std::mem;
-
-pub mod cmds;
-pub mod opcodes;
-
-use thiserror::Error;
-use xhcid_interface::DeviceReqData;
-
-use crate::protocol::{Protocol, ProtocolError, SendCommandStatus, SendCommandStatusKind};
-use cmds::StandardInquiryData;
-
-pub struct Scsi {
-    command_buffer: [u8; 16],
-    inquiry_buffer: [u8; 259],
-    data_buffer: Vec<u8>,
-    pub block_size: u32,
-    pub block_count: u64,
-}
-
-const INQUIRY_CMD_LEN: u8 = 6;
-const REPORT_SUPP_OPCODES_CMD_LEN: u8 = 12;
-const REQUEST_SENSE_CMD_LEN: u8 = 6;
-const MIN_INQUIRY_ALLOC_LEN: u16 = 5;
-const MIN_REPORT_SUPP_OPCODES_ALLOC_LEN: u32 = 4;
-
-type Result<T, E = ScsiError> = std::result::Result<T, E>;
-
-#[derive(Debug, Error)]
-pub enum ScsiError {
-    // TODO: Add some kind of context here, since it's very useful indeed to be able to see which
-    // command returned the protocol error.
-    #[error("protocol error when sending command: {0}")]
-    ProtocolError(#[from] ProtocolError),
-
-    #[error("overflow")]
-    Overflow(&'static str),
-}
-
-impl Scsi {
-    pub fn new(protocol: &mut dyn Protocol) -> Result<Self> {
-        assert_eq!(std::mem::size_of::<StandardInquiryData>(), 96);
-
-        let mut this = Self {
-            command_buffer: [0u8; 16],
-            // separate buffer since the inquiry data is most likely going to be used in the
-            // future.
-            inquiry_buffer: [0u8; 259], // additional_len = 255 max
-            data_buffer: Vec::new(),
-            block_size: 0,
-            block_count: 0,
-        };
-
-        // Get the max length that the device supports, of the Standard Inquiry Data.
-        let max_inquiry_len = this.get_inquiry_alloc_len(protocol)?;
-        // Get the Standard Inquiry Data.
-        this.get_standard_inquiry_data(protocol, max_inquiry_len)?;
-
-        let version = this.res_standard_inquiry_data().version();
-        println!("Inquiry version: {}", version);
-
-        let (block_size, block_count) = {
-            let (_, blkdescs, mode_page_iter) = this.get_mode_sense10(protocol)?;
-
-            for page in mode_page_iter {
-                println!("PAGE: {:?}", page);
-            }
-
-            // TODO: Can there be multiple disks at all?
-            if let Some(only_blkdesc) = blkdescs.get(0) {
-                println!("Found block desc: {:?}", only_blkdesc);
-                (only_blkdesc.block_size(), only_blkdesc.block_count())
-            } else {
-                println!("read_capacity10");
-                let r = this.read_capacity(protocol)?;
-                println!("read_capacity10 result: {:?}", r);
-                (r.logical_block_len(), r.block_count().into())
-            }
-        };
-
-        this.block_size = block_size;
-        this.block_count = block_count;
-
-        Ok(this)
-    }
-    pub fn get_inquiry_alloc_len(&mut self, protocol: &mut dyn Protocol) -> Result<u16> {
-        self.get_standard_inquiry_data(protocol, MIN_INQUIRY_ALLOC_LEN)?;
-        let standard_inquiry_data = self.res_standard_inquiry_data();
-        Ok(4 + u16::from(standard_inquiry_data.additional_len))
-    }
-    pub fn get_standard_inquiry_data(
-        &mut self,
-        protocol: &mut dyn Protocol,
-        max_inquiry_len: u16,
-    ) -> Result<()> {
-        let inquiry = self.cmd_inquiry();
-        *inquiry = cmds::Inquiry::new(false, 0, max_inquiry_len, 0);
-
-        protocol.send_command(
-            &self.command_buffer[..INQUIRY_CMD_LEN as usize],
-            DeviceReqData::In(&mut self.inquiry_buffer[..max_inquiry_len as usize]),
-        )?;
-        Ok(())
-    }
-    pub fn get_ff_sense(&mut self, protocol: &mut dyn Protocol, alloc_len: u8) -> Result<()> {
-        let request_sense = self.cmd_request_sense();
-        *request_sense = cmds::RequestSense::new(false, alloc_len, 0);
-        self.data_buffer.resize(alloc_len.into(), 0);
-        protocol.send_command(
-            &self.command_buffer[..REQUEST_SENSE_CMD_LEN as usize],
-            DeviceReqData::In(&mut self.data_buffer[..alloc_len as usize]),
-        )?;
-        Ok(())
-    }
-    pub fn read_capacity(
-        &mut self,
-        protocol: &mut dyn Protocol,
-    ) -> Result<&cmds::ReadCapacity10ParamData> {
-        // The spec explicitly states that the allocation length is 8 bytes.
-        let read_capacity10 = self.cmd_read_capacity10();
-        *read_capacity10 = cmds::ReadCapacity10::new(0);
-        self.data_buffer.resize(10usize, 0u8);
-        protocol.send_command(
-            &self.command_buffer[..10],
-            DeviceReqData::In(&mut self.data_buffer[..8]),
-        )?;
-        Ok(self.res_read_capacity10())
-    }
-    pub fn get_mode_sense10(
-        &mut self,
-        protocol: &mut dyn Protocol,
-    ) -> Result<(
-        &cmds::ModeParamHeader10,
-        BlkDescSlice<'_>,
-        impl Iterator<Item = cmds::AnyModePage<'_>>,
-    )> {
-        let initial_alloc_len = mem::size_of::<cmds::ModeParamHeader10>() as u16; // covers both mode_data_len and blk_desc_len.
-        let mode_sense10 = self.cmd_mode_sense10();
-        *mode_sense10 = cmds::ModeSense10::get_block_desc(initial_alloc_len, 0);
-        self.data_buffer
-            .resize(mem::size_of::<cmds::ModeParamHeader10>(), 0);
-        if let SendCommandStatus {
-            kind: SendCommandStatusKind::Failed,
-            ..
-        } = protocol.send_command(
-            &self.command_buffer[..10],
-            DeviceReqData::In(&mut self.data_buffer[..initial_alloc_len as usize]),
-        )? {
-            self.get_ff_sense(protocol, 252)?;
-            panic!("{:?}", self.res_ff_sense_data());
-        }
-
-        let optimal_alloc_len = self.res_mode_param_header10().mode_data_len() + 2; // the length of the mode data field itself
-
-        let mode_sense10 = self.cmd_mode_sense10();
-        *mode_sense10 = cmds::ModeSense10::get_block_desc(optimal_alloc_len, 0);
-        self.data_buffer.resize(optimal_alloc_len as usize, 0);
-        protocol.send_command(
-            &self.command_buffer[..10],
-            DeviceReqData::In(&mut self.data_buffer[..optimal_alloc_len as usize]),
-        )?;
-        Ok((
-            self.res_mode_param_header10(),
-            self.res_blkdesc_mode10(),
-            self.res_mode_pages10(),
-        ))
-    }
-
-    pub fn cmd_inquiry(&mut self) -> &mut cmds::Inquiry {
-        plain::from_mut_bytes(&mut self.command_buffer).unwrap()
-    }
-    pub fn cmd_mode_sense6(&mut self) -> &mut cmds::ModeSense6 {
-        plain::from_mut_bytes(&mut self.command_buffer).unwrap()
-    }
-    pub fn cmd_mode_sense10(&mut self) -> &mut cmds::ModeSense10 {
-        plain::from_mut_bytes(&mut self.command_buffer).unwrap()
-    }
-    pub fn cmd_request_sense(&mut self) -> &mut cmds::RequestSense {
-        plain::from_mut_bytes(&mut self.command_buffer).unwrap()
-    }
-    pub fn cmd_read_capacity10(&mut self) -> &mut cmds::ReadCapacity10 {
-        plain::from_mut_bytes(&mut self.command_buffer).unwrap()
-    }
-    pub fn cmd_read16(&mut self) -> &mut cmds::Read16 {
-        plain::from_mut_bytes(&mut self.command_buffer).unwrap()
-    }
-    pub fn cmd_write16(&mut self) -> &mut cmds::Write16 {
-        plain::from_mut_bytes(&mut self.command_buffer).unwrap()
-    }
-    pub fn res_standard_inquiry_data(&self) -> &StandardInquiryData {
-        plain::from_bytes(&self.inquiry_buffer).unwrap()
-    }
-    pub fn res_ff_sense_data(&self) -> &cmds::FixedFormatSenseData {
-        plain::from_bytes(&self.data_buffer).unwrap()
-    }
-    pub fn res_mode_param_header6(&self) -> &cmds::ModeParamHeader6 {
-        plain::from_bytes(&self.data_buffer).unwrap()
-    }
-    pub fn res_mode_param_header10(&self) -> &cmds::ModeParamHeader10 {
-        plain::from_bytes(&self.data_buffer).unwrap()
-    }
-    pub fn res_blkdesc_mode6(&self) -> &[cmds::ShortLbaModeParamBlkDesc] {
-        let header = self.res_mode_param_header6();
-        let descs_start = mem::size_of::<cmds::ModeParamHeader6>();
-        plain::slice_from_bytes(
-            &self.data_buffer[descs_start..descs_start + usize::from(header.block_desc_len)],
-        )
-        .unwrap()
-    }
-    pub fn res_blkdesc_mode10(&self) -> BlkDescSlice<'_> {
-        let header = self.res_mode_param_header10();
-        let descs_start = mem::size_of::<cmds::ModeParamHeader10>();
-        if header.longlba() {
-            BlkDescSlice::Long(
-                plain::slice_from_bytes(
-                    &self.data_buffer
-                        [descs_start..descs_start + usize::from(header.block_desc_len())],
-                )
-                .unwrap(),
-            )
-        } else if self.res_standard_inquiry_data().periph_dev_ty()
-            != cmds::PeriphDeviceType::DirectAccess as u8
-            && self.res_standard_inquiry_data().version() == cmds::InquiryVersion::Spc3 as u8
-        {
-            BlkDescSlice::General(
-                plain::slice_from_bytes(
-                    &self.data_buffer
-                        [descs_start..descs_start + usize::from(header.block_desc_len())],
-                )
-                .unwrap(),
-            )
-        } else {
-            BlkDescSlice::Short(
-                plain::slice_from_bytes(
-                    &self.data_buffer
-                        [descs_start..descs_start + usize::from(header.block_desc_len())],
-                )
-                .unwrap(),
-            )
-        }
-    }
-
-    pub fn res_mode_pages10(&self) -> impl Iterator<Item = cmds::AnyModePage<'_>> {
-        let header = self.res_mode_param_header10();
-        let descs_start = mem::size_of::<cmds::ModeParamHeader10>();
-        let buffer = &self.data_buffer[descs_start + header.block_desc_len() as usize..];
-        cmds::mode_page_iter(buffer)
-    }
-    pub fn res_read_capacity10(&self) -> &cmds::ReadCapacity10ParamData {
-        plain::from_bytes(&self.data_buffer).unwrap()
-    }
-    pub fn get_disk_size(&self) -> u64 {
-        self.block_count * u64::from(self.block_size)
-    }
-    pub fn read(
-        &mut self,
-        protocol: &mut dyn Protocol,
-        lba: u64,
-        buffer: &mut [u8],
-    ) -> Result<u32> {
-        let blocks_to_read = buffer.len() as u64 / u64::from(self.block_size);
-        let bytes_to_read = blocks_to_read as usize * self.block_size as usize;
-        let transfer_len = u32::try_from(blocks_to_read).or(Err(ScsiError::Overflow(
-            "number of blocks to read couldn't fit inside a u32",
-        )))?;
-        {
-            let read = self.cmd_read16();
-            *read = cmds::Read16::new(lba, transfer_len, 0);
-        }
-        // TODO: Use the to-be-written TransferReadStream instead of relying on everything being
-        // able to fit within a single buffer.
-        self.data_buffer.resize(bytes_to_read, 0u8);
-        let status = protocol.send_command(
-            &self.command_buffer[..16],
-            DeviceReqData::In(&mut self.data_buffer[..bytes_to_read]),
-        )?;
-        buffer[..bytes_to_read].copy_from_slice(&self.data_buffer[..bytes_to_read]);
-        Ok(status.bytes_transferred(bytes_to_read as u32))
-    }
-    pub fn write(&mut self, protocol: &mut dyn Protocol, lba: u64, buffer: &[u8]) -> Result<u32> {
-        let blocks_to_write = buffer.len() as u64 / u64::from(self.block_size);
-        let bytes_to_write = blocks_to_write as usize * self.block_size as usize;
-        let transfer_len = u32::try_from(blocks_to_write).or(Err(ScsiError::Overflow(
-            "number of blocks to write couldn't fit inside a u32",
-        )))?;
-        {
-            let read = self.cmd_write16();
-            *read = cmds::Write16::new(lba, transfer_len, 0);
-        }
-        // TODO: Use the to-be-written TransferReadStream instead of relying on everything being
-        // able to fit within a single buffer.
-        self.data_buffer.resize(bytes_to_write, 0u8);
-        self.data_buffer[..bytes_to_write].copy_from_slice(&buffer[..bytes_to_write]);
-        let status = protocol.send_command(
-            &self.command_buffer[..16],
-            DeviceReqData::Out(&buffer[..bytes_to_write]),
-        )?;
-        Ok(status.bytes_transferred(bytes_to_write as u32))
-    }
-}
-#[derive(Debug)]
-pub enum BlkDescSlice<'a> {
-    Short(&'a [cmds::ShortLbaModeParamBlkDesc]),
-    General(&'a [cmds::GeneralModeParamBlkDesc]),
-    Long(&'a [cmds::LongLbaModeParamBlkDesc]),
-}
-
-#[derive(Debug)]
-pub enum BlkDesc<'a> {
-    Short(&'a cmds::ShortLbaModeParamBlkDesc),
-    General(&'a cmds::GeneralModeParamBlkDesc),
-    Long(&'a cmds::LongLbaModeParamBlkDesc),
-}
-impl<'a> BlkDesc<'a> {
-    fn block_size(&self) -> u32 {
-        match self {
-            Self::Short(s) => s.logical_block_len(),
-            Self::General(g) => g.logical_block_len(),
-            Self::Long(l) => l.logical_block_len(),
-        }
-    }
-    fn block_count(&self) -> u64 {
-        match self {
-            Self::Short(s) => s.block_count().into(),
-            Self::General(g) => g.block_count().into(),
-            Self::Long(l) => l.block_count(),
-        }
-    }
-}
-
-impl<'a> BlkDescSlice<'a> {
-    fn get(&self, idx: usize) -> Option<BlkDesc<'a>> {
-        match self {
-            Self::Short(s) => s.get(idx).map(BlkDesc::Short),
-            Self::Long(l) => l.get(idx).map(BlkDesc::Long),
-            Self::General(g) => g.get(idx).map(BlkDesc::General),
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/storage/usbscsid/src/scsi/opcodes.rs b/recipes/core/base/drivers/storage/usbscsid/src/scsi/opcodes.rs
deleted file mode 100644
index d146238297..0000000000
--- a/recipes/core/base/drivers/storage/usbscsid/src/scsi/opcodes.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-#[repr(u8)]
-pub enum Opcode {
-    TestUnitReady = 0x00,
-    /// obsolete
-    RezeroUnit = 0x01,
-    RequestSense = 0x03,
-    FormatUnit = 0x04,
-    ReassignBlocks = 0x07,
-    /// obsolete
-    Read6 = 0x08,
-    /// obsolete
-    Write6 = 0x0A,
-    /// obsolete
-    Seek = 0x0B,
-    Inquiry = 0x12,
-    ModeSelect6 = 0x15,
-    /// obsolete
-    Reserve6 = 0x16,
-    /// obsolete
-    Release6 = 0x17,
-    ModeSense6 = 0x1A,
-    StartStopUnit = 0x1B,
-    RecvDiagnosticRes = 0x1C,
-    SendDiagnostic = 0x1D,
-    ReadCapacity10 = 0x25,
-    Read10 = 0x28,
-    Write10 = 0x2A,
-    /// obsolete
-    SeekExt = 0x2B,
-    WriteAndVerify10 = 0x2E,
-    Verify10 = 0x2F,
-    SyncCache10 = 0x35,
-    ReadDefectData10 = 0x37,
-    WriteBuf10 = 0x3B,
-    ReadBuf10 = 0x3C,
-    /// obsolete
-    ReadLong10 = 0x3E,
-    WriteLong10 = 0x3F,
-    /// obsolete
-    ChangeDef = 0x40,
-    WriteSame10 = 0x41,
-    Unmap = 0x42,
-    Sanitize = 0x48,
-    LogSelect = 0x4C,
-    LogSense = 0x4D,
-    ModeSelect10 = 0x55,
-    /// obsolete
-    Reserve10 = 0x56,
-    /// obsolete
-    Release10 = 0x57,
-    ModeSense10 = 0x5A,
-    PersistentResvIn = 0x5E,
-    PersistentResvOut = 0x5F,
-    ServiceAction7F = 0x7F,
-    Read16 = 0x88,
-    Write16 = 0x8A,
-    WriteAndVerify16 = 0x8E,
-    Verify16 = 0x8F,
-    SyncCache16 = 0x91,
-    WriteSame16 = 0x93,
-    WriteStream16 = 0x9A,
-    ReadBuf16 = 0x9B,
-    WriteAtomic16 = 0x9C,
-    ServiceAction9E = 0x9E,
-    ServiceAction9F,
-    ReportLuns = 0xA0,
-    SecurityProtoIn = 0xA2,
-    ServiceActionA3 = 0xA3,
-    ServiceActionA4 = 0xA4,
-    Read12 = 0xA8,
-    Write12 = 0xAA,
-    WriteAndVerify12 = 0xAE,
-    Verify12 = 0xAF,
-    SecurityProtoOut = 0xB5,
-    ReadDefectData12 = 0xB7,
-}
-
-#[repr(u8)]
-pub enum ServiceAction7F {
-    Read32 = 0x09,
-    Verify32 = 0x0A,
-    Write32 = 0x0B,
-    WriteAndVerify32 = 0x0C,
-    WriteSame32 = 0x0D,
-    WriteAtomic32 = 0x18,
-}
-
-#[repr(u8)]
-pub enum ServiceAction9E {
-    ReadCapacity16 = 0x10,
-    ReadLong16 = 0x11,
-    GetLbaStatus = 0x12,
-    StreamControl = 0x14,
-    BackgroundControl = 0x15,
-    GetStreamStatus = 0x16,
-}
-#[repr(u8)]
-pub enum ServiceAction9F {
-    WriteLong16 = 0x11,
-}
-#[repr(u8)]
-pub enum ServiceActionA3 {
-    ReportIdentInfo = 0x05,
-    ReportSuppOpcodes = 0x0C,
-    ReportSuppTaskManFuncs = 0x0D,
-    ReportTimestamp = 0x0F,
-}
-#[repr(u8)]
-pub enum ServiceActionA4 {
-    SetIdentInfo = 0x06,
-    SetTimestamp = 0x0F,
-}
diff --git a/recipes/core/base/drivers/storage/virtio-blkd/Cargo.toml b/recipes/core/base/drivers/storage/virtio-blkd/Cargo.toml
deleted file mode 100644
index cd8fc6d2de..0000000000
--- a/recipes/core/base/drivers/storage/virtio-blkd/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "virtio-blkd"
-description = "VirtIO block (storage) driver"
-version = "0.1.0"
-edition = "2021"
-authors = ["Anhad Singh <andypython@protonmail.com>"]
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-thiserror.workspace = true
-static_assertions.workspace = true
-futures = { version = "0.3.28", features = ["executor"] }
-spin.workspace = true
-
-redox_event.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-driver-block = { path = "../driver-block" }
-pcid = { path = "../../pcid" }
-virtio-core = { path = "../../virtio-core" }
-libredox.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/storage/virtio-blkd/src/main.rs b/recipes/core/base/drivers/storage/virtio-blkd/src/main.rs
deleted file mode 100644
index d21236b377..0000000000
--- a/recipes/core/base/drivers/storage/virtio-blkd/src/main.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-#![deny(trivial_numeric_casts, unused_allocation)]
-
-use std::collections::BTreeMap;
-use std::sync::{Arc, Weak};
-
-use driver_block::DiskScheme;
-use static_assertions::const_assert_eq;
-
-use pcid_interface::*;
-use virtio_core::spec::*;
-
-use virtio_core::transport::Transport;
-use virtio_core::utils::VolatileCell;
-
-mod scheme;
-
-use thiserror::Error;
-
-use crate::scheme::VirtioDisk;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("capability {0:?} not found")]
-    InCapable(CfgType),
-    #[error("failed to map memory")]
-    Physmap,
-    #[error("failed to allocate an interrupt vector")]
-    ExhaustedInt,
-    #[error("syscall error")]
-    SyscallError(syscall::Error),
-}
-
-#[repr(C)]
-pub struct BlockGeometry {
-    pub cylinders: VolatileCell<u16>,
-    pub heads: VolatileCell<u8>,
-    pub sectors: VolatileCell<u8>,
-}
-
-#[repr(u8)]
-pub enum DeviceConfigTy {
-    Capacity = 0,
-    SizeMax = 0x8,
-    SeqMax = 0xc,
-    Geometry = 0x10,
-    BlkSize = 0x14,
-}
-
-pub struct BlockDeviceConfig(Weak<dyn Transport>);
-
-impl BlockDeviceConfig {
-    #[inline]
-    fn new(tranport: &Arc<dyn Transport>) -> Self {
-        Self(Arc::downgrade(&tranport))
-    }
-
-    pub fn load_config<T>(&self, ty: DeviceConfigTy) -> T
-    where
-        T: Sized + TryFrom<u64>,
-        <T as TryFrom<u64>>::Error: std::fmt::Debug,
-    {
-        let transport = self.0.upgrade().unwrap();
-
-        let size = core::mem::size_of::<T>()
-            .try_into()
-            .expect("load_config: invalid size");
-
-        let value = transport.load_config(ty as u8, size);
-        T::try_from(value).unwrap()
-    }
-
-    /// Returns the capacity of the block device in bytes.
-    #[inline]
-    pub fn capacity(&self) -> u64 {
-        self.load_config(DeviceConfigTy::Capacity)
-    }
-
-    #[inline]
-    pub fn block_size(&self) -> u32 {
-        self.load_config(DeviceConfigTy::BlkSize)
-    }
-}
-
-#[repr(u32)]
-pub enum BlockRequestTy {
-    In = 0,
-    Out = 1,
-}
-
-const_assert_eq!(core::mem::size_of::<BlockRequestTy>(), 4);
-
-#[repr(C)]
-pub struct BlockVirtRequest {
-    pub ty: BlockRequestTy,
-    pub reserved: u32,
-    pub sector: u64,
-}
-
-const_assert_eq!(core::mem::size_of::<BlockVirtRequest>(), 16);
-
-fn main() {
-    pcid_interface::pci_daemon(daemon_runner);
-}
-
-fn daemon_runner(redox_daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
-    daemon(redox_daemon, pcid_handle).unwrap();
-    unreachable!();
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> anyhow::Result<()> {
-    common::setup_logging(
-        "disk",
-        "pci",
-        "virtio-blkd",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    // Double check that we have the right device.
-    //
-    // 0x1001 - virtio-blk
-    let pci_config = pcid_handle.config();
-
-    assert_eq!(pci_config.func.full_device_id.device_id, 0x1001);
-    log::info!("virtio-blk: initiating startup sequence :^)");
-
-    let device = virtio_core::probe_device(&mut pcid_handle)?;
-    device.transport.finalize_features();
-
-    let queue = device
-        .transport
-        .setup_queue(virtio_core::MSIX_PRIMARY_VECTOR, &device.irq_handle)?;
-
-    let device_space = BlockDeviceConfig::new(&device.transport);
-
-    // At this point the device is alive!
-    device.transport.run_device();
-
-    log::info!(
-        "virtio-blk: disk size: {} sectors and block size of {} bytes",
-        device_space.capacity(),
-        device_space.block_size()
-    );
-
-    let mut name = pci_config.func.name();
-    name.push_str("_virtio_blk");
-
-    let scheme_name = format!("disk.{}", name);
-
-    let event_queue = event::EventQueue::new().unwrap();
-
-    event::user_data! {
-        enum Event {
-            Scheme,
-        }
-    };
-
-    let mut scheme = DiskScheme::new(
-        Some(daemon),
-        scheme_name,
-        BTreeMap::from([(0, VirtioDisk::new(queue, device_space))]),
-        &driver_block::FuturesExecutor,
-    );
-
-    libredox::call::setrens(0, 0).expect("nvmed: failed to enter null namespace");
-
-    event_queue
-        .subscribe(
-            scheme.event_handle().raw(),
-            Event::Scheme,
-            event::EventFlags::READ,
-        )
-        .unwrap();
-
-    for event in event_queue {
-        match event.unwrap().user_data {
-            Event::Scheme => futures::executor::block_on(scheme.tick()).unwrap(),
-        }
-    }
-
-    Ok(())
-}
diff --git a/recipes/core/base/drivers/storage/virtio-blkd/src/scheme.rs b/recipes/core/base/drivers/storage/virtio-blkd/src/scheme.rs
deleted file mode 100644
index ec4ecf732d..0000000000
--- a/recipes/core/base/drivers/storage/virtio-blkd/src/scheme.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use std::sync::Arc;
-
-use common::dma::Dma;
-use virtio_core::spec::{Buffer, ChainBuilder, DescriptorFlags};
-use virtio_core::transport::Queue;
-
-use crate::BlockDeviceConfig;
-use crate::BlockRequestTy;
-use crate::BlockVirtRequest;
-
-trait BlkExtension {
-    async fn read(&self, block: u64, target: &mut [u8]) -> usize;
-    async fn write(&self, block: u64, target: &[u8]) -> usize;
-}
-
-impl BlkExtension for Queue<'_> {
-    async fn read(&self, block: u64, target: &mut [u8]) -> usize {
-        let req = Dma::new(BlockVirtRequest {
-            ty: BlockRequestTy::In,
-            reserved: 0,
-            sector: block,
-        })
-        .unwrap();
-
-        let result = unsafe {
-            Dma::<[u8]>::zeroed_slice(target.len())
-                .unwrap()
-                .assume_init()
-        };
-        let status = Dma::new(u8::MAX).unwrap();
-
-        let chain = ChainBuilder::new()
-            .chain(Buffer::new(&req))
-            .chain(Buffer::new_unsized(&result).flags(DescriptorFlags::WRITE_ONLY))
-            .chain(Buffer::new(&status).flags(DescriptorFlags::WRITE_ONLY))
-            .build();
-
-        // XXX: Subtract 1 because the of status byte.
-        let written = self.send(chain).await as usize - 1;
-        assert_eq!(*status, 0);
-
-        target[..written].copy_from_slice(&result);
-        written
-    }
-
-    async fn write(&self, block: u64, target: &[u8]) -> usize {
-        let req = Dma::new(BlockVirtRequest {
-            ty: BlockRequestTy::Out,
-            reserved: 0,
-            sector: block,
-        })
-        .unwrap();
-
-        let mut result = unsafe {
-            Dma::<[u8]>::zeroed_slice(target.len())
-                .unwrap()
-                .assume_init()
-        };
-        result.copy_from_slice(target.as_ref());
-
-        let status = Dma::new(u8::MAX).unwrap();
-
-        let chain = ChainBuilder::new()
-            .chain(Buffer::new(&req))
-            .chain(Buffer::new_sized(&result, target.len()))
-            .chain(Buffer::new(&status).flags(DescriptorFlags::WRITE_ONLY))
-            .build();
-
-        self.send(chain).await as usize;
-        assert_eq!(*status, 0);
-
-        target.len()
-    }
-}
-
-pub(crate) struct VirtioDisk<'a> {
-    queue: Arc<Queue<'a>>,
-    cfg: BlockDeviceConfig,
-}
-
-impl<'a> VirtioDisk<'a> {
-    pub(crate) fn new(queue: Arc<Queue<'a>>, cfg: BlockDeviceConfig) -> Self {
-        Self { queue, cfg }
-    }
-}
-
-impl driver_block::Disk for VirtioDisk<'_> {
-    fn block_size(&self) -> u32 {
-        self.cfg.block_size()
-    }
-
-    fn size(&self) -> u64 {
-        self.cfg.capacity() * u64::from(self.cfg.block_size())
-    }
-
-    async fn read(&mut self, block: u64, buffer: &mut [u8]) -> syscall::Result<usize> {
-        Ok(self.queue.read(block, buffer).await)
-    }
-
-    async fn write(&mut self, block: u64, buffer: &[u8]) -> syscall::Result<usize> {
-        Ok(self.queue.write(block, buffer).await)
-    }
-}
diff --git a/recipes/core/base/drivers/thermald/Cargo.toml b/recipes/core/base/drivers/thermald/Cargo.toml
deleted file mode 100644
index 65255ebaa0..0000000000
--- a/recipes/core/base/drivers/thermald/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "thermald"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-log.workspace = true
-anyhow.workspace = true
-common = { path = "../common" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/thermald/src/main.rs b/recipes/core/base/drivers/thermald/src/main.rs
deleted file mode 100644
index 3db4dd55ba..0000000000
--- a/recipes/core/base/drivers/thermald/src/main.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use anyhow::{Context, Result};
-use std::{thread, time};
-
-fn read_temp() -> Option<f32> {
-    for zone in 0..4 {
-        let path = format!("/scheme/acpi/thermal_zone/{}/temperature", zone);
-        if let Ok(data) = std::fs::read_to_string(&path) {
-            if let Ok(mv) = data.trim().parse::<u32>() {
-                return Some(mv as f32 / 1000.0);
-            }
-        }
-    }
-    None
-}
-
-fn main() -> Result<()> {
-    common::setup_logging("system", "thermald", "thermald",
-        common::output_level(), common::file_level());
-    log::info!("thermald: started");
-    loop {
-        if let Some(temp) = read_temp() {
-            if temp > 85.0 {
-                log::error!("thermald: CRITICAL {:.1}C", temp);
-            } else if temp > 70.0 {
-                log::warn!("thermald: WARNING {:.1}C", temp);
-            }
-        }
-        thread::sleep(time::Duration::from_secs(5));
-    }
-}
diff --git a/recipes/core/base/drivers/usb/ucsid/Cargo.toml b/recipes/core/base/drivers/usb/ucsid/Cargo.toml
deleted file mode 100644
index 1a6833e500..0000000000
--- a/recipes/core/base/drivers/usb/ucsid/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "ucsid"
-description = "USB-C UCSI topology daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-redox_syscall = { workspace = true, features = ["std"] }
-libredox.workspace = true
-redox-scheme.workspace = true
-serde.workspace = true
-ron.workspace = true
-
-acpi-resource = { path = "../../acpi-resource" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-i2c-interface = { path = "../../i2c/i2c-interface" }
-scheme-utils = { path = "../../../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/usb/ucsid/src/main.rs b/recipes/core/base/drivers/usb/ucsid/src/main.rs
deleted file mode 100644
index d00cfbcfe1..0000000000
--- a/recipes/core/base/drivers/usb/ucsid/src/main.rs
+++ /dev/null
@@ -1,839 +0,0 @@
-use std::collections::BTreeMap;
-use std::fs::{self, File, OpenOptions};
-use std::io::{Read, Write};
-use std::path::Path;
-use std::process;
-
-use acpi_resource::{
-    AddressResourceType, FixedMemory32Descriptor, I2cSerialBusDescriptor, Memory32RangeDescriptor,
-    ResourceDescriptor,
-};
-use anyhow::{bail, Context, Result};
-use i2c_interface::{
-    I2cAdapterInfo, I2cControlRequest, I2cControlResponse, I2cTransferRequest,
-    I2cTransferSegment,
-};
-use libredox::flag::{O_CLOEXEC, O_RDWR};
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult, Socket};
-use scheme_utils::{Blocking, HandleMap};
-use serde::{Deserialize, Serialize};
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error as SysError, EACCES, EBADF, EINVAL, ENOENT};
-
-const SUPPORTED_IDS: &[&str] = &["PNP0CA0", "AMDI0042"];
-const GET_CAPABILITY: u8 = 0x01;
-const GET_CONNECTOR_STATUS: u8 = 0x10;
-const UCSI_RESPONSE_HEADER_LEN: usize = 4;
-const UCSI_CAPABILITY_READ_LEN: usize = 20;
-const UCSI_CONNECTOR_STATUS_READ_LEN: usize = 20;
-const MAX_CONNECTOR_PROBE: u8 = 8;
-
-#[derive(Debug, Deserialize)]
-struct AmlSymbol {
-    name: String,
-    value: AmlValue,
-}
-
-#[derive(Debug, Deserialize)]
-enum AmlValue {
-    Integer(u64),
-    String(String),
-}
-
-#[derive(Clone, Copy, Debug)]
-struct UcsiCommand {
-    command: u8,
-    data_length: u8,
-    specific_data: [u8; 6],
-}
-
-impl UcsiCommand {
-    fn new(command: u8, data_length: u8, specific_data: [u8; 6]) -> Self {
-        Self {
-            command,
-            data_length,
-            specific_data,
-        }
-    }
-
-    fn as_bytes(self) -> [u8; 8] {
-        let mut bytes = [0_u8; 8];
-        bytes[0] = self.command;
-        bytes[1] = self.data_length;
-        bytes[2..].copy_from_slice(&self.specific_data);
-        bytes
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-struct UcsiResponseHeader {
-    _status: u16,
-    data_length: u16,
-}
-
-impl UcsiResponseHeader {
-    fn parse(bytes: &[u8]) -> Option<Self> {
-        let header = bytes.get(..UCSI_RESPONSE_HEADER_LEN)?;
-        Some(Self {
-            _status: u16::from_le_bytes([header[0], header[1]]),
-            data_length: u16::from_le_bytes([header[2], header[3]]),
-        })
-    }
-}
-
-#[derive(Clone, Debug)]
-struct DiscoveredUcsiDevice {
-    name: String,
-    hid: String,
-    transport: UcsiTransport,
-    dsm_probe: bool,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-enum UcsiTransport {
-    I2c {
-        adapter: String,
-        address: u16,
-        ten_bit_address: bool,
-    },
-    Mmio {
-        base: usize,
-        len: usize,
-    },
-    Unknown,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-struct UcsiCapability {
-    connector_count: u8,
-    supports_usb_pd: bool,
-    supports_alt_modes: bool,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-struct UcsiConnectorSummary {
-    device: String,
-    connector_number: u8,
-    connected: bool,
-    data_role: String,
-    power_direction: String,
-    input_critical: bool,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-struct UcsiDeviceSummary {
-    name: String,
-    hid: String,
-    transport: UcsiTransport,
-    capability: Option<UcsiCapability>,
-    connectors: Vec<UcsiConnectorSummary>,
-    dsm_probe: bool,
-    issues: Vec<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-struct UcsiSummary {
-    schema_version: u32,
-    device_count: usize,
-    connector_count: usize,
-    input_critical_ports: usize,
-    devices: Vec<UcsiDeviceSummary>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-struct UcsiHealth {
-    healthy: bool,
-    scanned_devices: usize,
-    responsive_devices: usize,
-    issues: Vec<String>,
-}
-
-struct UcsiState {
-    summary: UcsiSummary,
-    connectors: Vec<UcsiConnectorSummary>,
-    health: UcsiHealth,
-}
-
-enum Handle {
-    SchemeRoot,
-    Summary { pending: Vec<u8> },
-    Connectors { pending: Vec<u8> },
-    Health { pending: Vec<u8> },
-}
-
-struct UcsiScheme {
-    handles: HandleMap<Handle>,
-    state: UcsiState,
-}
-
-impl UcsiScheme {
-    fn new(state: UcsiState) -> Self {
-        Self {
-            handles: HandleMap::new(),
-            state,
-        }
-    }
-
-    fn serialize_payload<T: Serialize>(value: &T) -> syscall::Result<Vec<u8>> {
-        ron::ser::to_string(value)
-            .map(|text| text.into_bytes())
-            .map_err(|err| {
-                log::error!("ucsid: failed to serialize scheme payload: {err}");
-                SysError::new(EINVAL)
-            })
-    }
-
-    fn set_pending(handle: &mut Handle, pending: Vec<u8>) -> syscall::Result<()> {
-        match handle {
-            Handle::Summary { pending: slot }
-            | Handle::Connectors { pending: slot }
-            | Handle::Health { pending: slot } => {
-                *slot = pending;
-                Ok(())
-            }
-            Handle::SchemeRoot => Err(SysError::new(EBADF)),
-        }
-    }
-
-    fn copy_pending(handle: &mut Handle, buf: &mut [u8], offset: u64) -> syscall::Result<usize> {
-        let pending = match handle {
-            Handle::Summary { pending }
-            | Handle::Connectors { pending }
-            | Handle::Health { pending } => pending,
-            Handle::SchemeRoot => return Err(SysError::new(EBADF)),
-        };
-
-        let offset = usize::try_from(offset).map_err(|_| SysError::new(EINVAL))?;
-        if offset >= pending.len() {
-            return Ok(0);
-        }
-
-        let copy_len = buf.len().min(pending.len() - offset);
-        buf[..copy_len].copy_from_slice(&pending[offset..offset + copy_len]);
-        Ok(copy_len)
-    }
-}
-
-impl SchemeSync for UcsiScheme {
-    fn scheme_root(&mut self) -> syscall::Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<OpenResult> {
-        if !matches!(self.handles.get(dirfd)?, Handle::SchemeRoot) {
-            return Err(SysError::new(EACCES));
-        }
-
-        let handle = match path.trim_matches('/') {
-            "summary" => Handle::Summary {
-                pending: Vec::new(),
-            },
-            "connectors" => Handle::Connectors {
-                pending: Vec::new(),
-            },
-            "health" => Handle::Health {
-                pending: Vec::new(),
-            },
-            "" => return Err(SysError::new(EINVAL)),
-            _ => return Err(SysError::new(ENOENT)),
-        };
-
-        let fd = self.handles.insert(handle);
-        Ok(OpenResult::ThisScheme {
-            number: fd,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> syscall::Result<usize> {
-        let payload = match self.handles.get(id)? {
-            Handle::Summary { pending } if pending.is_empty() => {
-                Some(Self::serialize_payload(&self.state.summary)?)
-            }
-            Handle::Connectors { pending } if pending.is_empty() => {
-                Some(Self::serialize_payload(&self.state.connectors)?)
-            }
-            Handle::Health { pending } if pending.is_empty() => {
-                log::info!(
-                    "RB_UCSID_HEALTH healthy={} scanned_devices={} responsive_devices={} issues={}",
-                    self.state.health.healthy,
-                    self.state.health.scanned_devices,
-                    self.state.health.responsive_devices,
-                    self.state.health.issues.len(),
-                );
-                Some(Self::serialize_payload(&self.state.health)?)
-            }
-            _ => None,
-        };
-
-        let handle = self.handles.get_mut(id)?;
-        if let Some(payload) = payload {
-            Self::set_pending(handle, payload)?;
-        }
-        Self::copy_pending(handle, buf, offset)
-    }
-}
-
-fn main() {
-    common::setup_logging(
-        "usb",
-        "ucsi",
-        "ucsid",
-        common::output_level(),
-        common::file_level(),
-    );
-
-    daemon::SchemeDaemon::new(daemon_runner);
-}
-
-fn daemon_runner(daemon: daemon::SchemeDaemon) -> ! {
-    if let Err(err) = run_daemon(daemon) {
-        log::error!("ucsid: {err:#}");
-        process::exit(1);
-    }
-
-    process::exit(0);
-}
-
-fn run_daemon(daemon: daemon::SchemeDaemon) -> Result<()> {
-    log::info!("RB_UCSID_SCHEMA version=1");
-
-    let state = build_state().context("failed to build UCSI device snapshot")?;
-    let socket = Socket::create().context("failed to create ucsi scheme socket")?;
-    let mut scheme = UcsiScheme::new(state);
-    let handler = Blocking::new(&socket, 16);
-
-    daemon
-        .ready_sync_scheme(&socket, &mut scheme)
-        .context("failed to publish ucsi scheme root")?;
-
-    libredox::call::setrens(0, 0).context("failed to enter null namespace")?;
-
-    handler
-        .process_requests_blocking(scheme)
-        .context("failed to process ucsid requests")?;
-}
-
-fn build_state() -> Result<UcsiState> {
-    let adapters = list_i2c_adapters().unwrap_or_else(|err| {
-        log::warn!("ucsid: failed to query i2cd adapters: {err:#}");
-        Vec::new()
-    });
-    let devices = discover_ucsi_devices().context("failed to discover ACPI UCSI devices")?;
-
-    let mut summaries = Vec::new();
-    let mut connectors = Vec::new();
-    let mut issues = Vec::new();
-    let mut responsive_devices = 0usize;
-
-    for device in devices {
-        log::info!(
-            "RB_UCSID_DEVICE name={} hid={} transport={:?} dsm_probe={}",
-            device.name,
-            device.hid,
-            device.transport,
-            device.dsm_probe,
-        );
-        let summary = summarize_device(device, &adapters)
-            .context("failed to summarize discovered UCSI device")?;
-        if summary.capability.is_some() {
-            responsive_devices += 1;
-        }
-        issues.extend(summary.issues.iter().cloned());
-        connectors.extend(summary.connectors.iter().cloned());
-        summaries.push(summary);
-    }
-
-    let summary = UcsiSummary {
-        schema_version: 1,
-        device_count: summaries.len(),
-        connector_count: connectors.len(),
-        input_critical_ports: connectors.iter().filter(|connector| connector.input_critical).count(),
-        devices: summaries,
-    };
-    let health = UcsiHealth {
-        healthy: issues.is_empty(),
-        scanned_devices: summary.device_count,
-        responsive_devices,
-        issues,
-    };
-
-    log::info!(
-        "RB_UCSID_SUMMARY devices={} connectors={} input_critical_ports={} healthy={}",
-        summary.device_count,
-        summary.connector_count,
-        summary.input_critical_ports,
-        health.healthy,
-    );
-
-    Ok(UcsiState {
-        summary,
-        connectors,
-        health,
-    })
-}
-
-fn discover_ucsi_devices() -> Result<Vec<DiscoveredUcsiDevice>> {
-    let mut matched = BTreeMap::new();
-
-    let entries = match fs::read_dir("/scheme/acpi/symbols") {
-        Ok(entries) => entries,
-        Err(err) if err.kind() == std::io::ErrorKind::WouldBlock || err.raw_os_error() == Some(11) => {
-            log::debug!("ucsid: ACPI symbols are not ready yet");
-            return Ok(Vec::new());
-        }
-        Err(err) => return Err(err).context("failed to read /scheme/acpi/symbols"),
-    };
-
-    for entry in entries {
-        let entry = entry.context("failed to read ACPI symbol directory entry")?;
-        let Some(file_name) = entry.file_name().to_str().map(str::to_owned) else {
-            continue;
-        };
-        if !file_name.ends_with("_HID") && !file_name.ends_with("_CID") {
-            continue;
-        }
-
-        let Some(id) = read_symbol_id(&entry.path())? else {
-            continue;
-        };
-        if !SUPPORTED_IDS.iter().any(|candidate| *candidate == id) {
-            continue;
-        }
-
-        let Some(device) = file_name
-            .strip_suffix("_HID")
-            .or_else(|| file_name.strip_suffix("_CID"))
-            .map(str::to_owned)
-        else {
-            continue;
-        };
-        matched.entry(device).or_insert(id);
-    }
-
-    let mut devices = Vec::new();
-    for (device, hid) in matched {
-        let transport = read_ucsi_transport(&device)
-            .with_context(|| format!("failed to decode transport resources for {device}"))?;
-        let dsm_probe = bounded_dsm_probe(&device).unwrap_or_else(|err| {
-            log::debug!("ucsid: bounded _DSM probe failed for {device}: {err:#}");
-            false
-        });
-        devices.push(DiscoveredUcsiDevice {
-            name: device,
-            hid,
-            transport,
-            dsm_probe,
-        });
-    }
-
-    Ok(devices)
-}
-
-fn summarize_device(device: DiscoveredUcsiDevice, adapters: &[I2cAdapterInfo]) -> Result<UcsiDeviceSummary> {
-    let mut issues = Vec::new();
-    let capability = match &device.transport {
-        UcsiTransport::I2c {
-            adapter,
-            address,
-            ten_bit_address,
-        } => match match_i2c_adapter(adapters, adapter) {
-            Some(adapter_info) => match execute_ucsi_i2c_command(
-                adapter_info,
-                adapter,
-                *address,
-                *ten_bit_address,
-                UcsiCommand::new(GET_CAPABILITY, 0, [0; 6]),
-                UCSI_CAPABILITY_READ_LEN,
-            ) {
-                Ok(bytes) => parse_ucsi_payload(&bytes)
-                    .and_then(|(_header, payload)| parse_capability(payload))
-                    .or_else(|| {
-                        issues.push(format!(
-                            "{}: GET_CAPABILITY returned an unexpected payload",
-                            device.name
-                        ));
-                        None
-                    }),
-                Err(err) => {
-                    issues.push(format!("{}: GET_CAPABILITY failed: {err:#}", device.name));
-                    None
-                }
-            },
-            None => {
-                issues.push(format!(
-                    "{}: no i2cd adapter matched ACPI source {}",
-                    device.name, adapter
-                ));
-                None
-            }
-        },
-        UcsiTransport::Mmio { base, len } => {
-            issues.push(format!(
-                "{}: MMIO UCSI transport discovered at {base:#x}+{len:#x} but command execution is not implemented yet",
-                device.name,
-            ));
-            None
-        }
-        UcsiTransport::Unknown => {
-            issues.push(format!(
-                "{}: no supported UCSI transport was decoded from ACPI resources",
-                device.name,
-            ));
-            None
-        }
-    };
-
-    let connector_count = capability
-        .as_ref()
-        .map(|capability| capability.connector_count.min(MAX_CONNECTOR_PROBE))
-        .unwrap_or(0);
-    let mut connectors = Vec::new();
-    for connector in 1..=connector_count {
-        match query_connector_status(&device, adapters, connector) {
-            Ok(connector_summary) => connectors.push(connector_summary),
-            Err(err) => issues.push(format!(
-                "{}: GET_CONNECTOR_STATUS({connector}) failed: {err:#}",
-                device.name,
-            )),
-        }
-    }
-
-    Ok(UcsiDeviceSummary {
-        name: device.name,
-        hid: device.hid,
-        transport: device.transport,
-        capability,
-        connectors,
-        dsm_probe: device.dsm_probe,
-        issues,
-    })
-}
-
-fn read_ucsi_transport(device: &str) -> Result<UcsiTransport> {
-    let contents = fs::read_to_string(format!("/scheme/acpi/resources/{device}"))
-        .with_context(|| format!("failed to read /scheme/acpi/resources/{device}"))?;
-    let resources = ron::from_str::<Vec<ResourceDescriptor>>(&contents)
-        .with_context(|| format!("failed to decode RON resources for {device}"))?;
-
-    let mut i2c = None::<I2cSerialBusDescriptor>;
-    let mut mmio = None::<(usize, usize)>;
-
-    for resource in resources {
-        match resource {
-            ResourceDescriptor::I2cSerialBus(bus) if i2c.is_none() => i2c = Some(bus),
-            ResourceDescriptor::FixedMemory32(FixedMemory32Descriptor {
-                address,
-                address_length,
-                ..
-            }) if mmio.is_none() => {
-                mmio = Some((address as usize, address_length as usize));
-            }
-            ResourceDescriptor::Memory32Range(Memory32RangeDescriptor {
-                minimum,
-                maximum,
-                address_length,
-                ..
-            }) if mmio.is_none() && maximum >= minimum => {
-                let span = maximum.saturating_sub(minimum).saturating_add(1) as usize;
-                mmio = Some((minimum as usize, span.max(address_length as usize)));
-            }
-            ResourceDescriptor::Address32(descriptor)
-                if mmio.is_none()
-                    && matches!(descriptor.resource_type, AddressResourceType::MemoryRange) =>
-            {
-                mmio = Some((descriptor.minimum as usize, descriptor.address_length as usize));
-            }
-            ResourceDescriptor::Address64(descriptor)
-                if mmio.is_none()
-                    && matches!(descriptor.resource_type, AddressResourceType::MemoryRange) =>
-            {
-                let base = usize::try_from(descriptor.minimum)
-                    .context("64-bit MMIO base does not fit in usize")?;
-                let len = usize::try_from(descriptor.address_length)
-                    .context("64-bit MMIO length does not fit in usize")?;
-                mmio = Some((base, len));
-            }
-            _ => {}
-        }
-    }
-
-    if let Some(bus) = i2c {
-        let adapter = bus
-            .resource_source
-            .as_ref()
-            .map(|source| source.source.clone())
-            .filter(|source| !source.is_empty())
-            .unwrap_or_else(|| String::from("ACPI-I2C"));
-        return Ok(UcsiTransport::I2c {
-            adapter,
-            address: bus.slave_address,
-            ten_bit_address: bus.access_mode_10bit,
-        });
-    }
-    if let Some((base, len)) = mmio {
-        return Ok(UcsiTransport::Mmio { base, len });
-    }
-    Ok(UcsiTransport::Unknown)
-}
-
-fn bounded_dsm_probe(device: &str) -> Result<bool> {
-    let symbol_name = format!("{}.{}", normalize_device_path(device), "_DSM");
-    let symbol_path = format!("/scheme/acpi/symbols/{symbol_name}");
-    let fd = match libredox::Fd::open(&symbol_path, O_RDWR | O_CLOEXEC, 0) {
-        Ok(fd) => fd,
-        Err(err) => {
-            log::debug!("ucsid: {} has no callable _DSM: {err}", device);
-            return Ok(false);
-        }
-    };
-
-    let mut payload = ron::to_string(&Vec::<u8>::new())
-        .context("failed to serialize bounded _DSM probe arguments")?
-        .into_bytes();
-    payload.resize(payload.len() + 1024, 0);
-    match libredox::call::call_ro(fd.raw(), &mut payload, syscall::CallFlags::empty(), &[]) {
-        Ok(_) => Ok(true),
-        Err(err) => {
-            log::debug!("ucsid: bounded _DSM probe for {} failed: {err}", device);
-            Ok(false)
-        }
-    }
-}
-
-fn parse_capability(payload: &[u8]) -> Option<UcsiCapability> {
-    let connector_count = *payload.first()?;
-    let flags = payload.get(1).copied().unwrap_or(0);
-    Some(UcsiCapability {
-        connector_count,
-        supports_usb_pd: flags & 0x01 != 0,
-        supports_alt_modes: flags & 0x02 != 0,
-    })
-}
-
-fn query_connector_status(
-    device: &DiscoveredUcsiDevice,
-    adapters: &[I2cAdapterInfo],
-    connector: u8,
-) -> Result<UcsiConnectorSummary> {
-    match &device.transport {
-        UcsiTransport::I2c {
-            adapter,
-            address,
-            ten_bit_address,
-        } => {
-            let adapter_info = match_i2c_adapter(adapters, adapter).with_context(|| {
-                format!("no i2cd adapter matched ACPI source {} for {}", adapter, device.name)
-            })?;
-            let bytes = execute_ucsi_i2c_command(
-                adapter_info,
-                adapter,
-                *address,
-                *ten_bit_address,
-                UcsiCommand::new(GET_CONNECTOR_STATUS, 1, [connector, 0, 0, 0, 0, 0]),
-                UCSI_CONNECTOR_STATUS_READ_LEN,
-            )?;
-            let (_header, payload) = parse_ucsi_payload(&bytes)
-                .with_context(|| format!("{}: malformed connector-status response", device.name))?;
-            Ok(parse_connector_summary(&device.name, connector, payload))
-        }
-        UcsiTransport::Mmio { base, len } => bail!(
-            "MMIO connector-status transport is not implemented yet for {:#x}+{:#x}",
-            base,
-            len,
-        ),
-        UcsiTransport::Unknown => bail!("unknown UCSI transport"),
-    }
-}
-
-fn parse_connector_summary(device_name: &str, connector: u8, payload: &[u8]) -> UcsiConnectorSummary {
-    let state = payload.first().copied().unwrap_or(0);
-    let connected = state & 0x01 != 0;
-    let power_direction = if state & 0x02 != 0 { "source" } else { "sink" };
-    let data_role = if state & 0x04 != 0 { "dfp" } else { "ufp" };
-    UcsiConnectorSummary {
-        device: device_name.to_string(),
-        connector_number: connector,
-        connected,
-        data_role: data_role.to_string(),
-        power_direction: power_direction.to_string(),
-        input_critical: classify_input_critical(device_name),
-    }
-}
-
-fn classify_input_critical(device_name: &str) -> bool {
-    let normalized = device_name.to_ascii_lowercase();
-    normalized.contains("kbd")
-        || normalized.contains("key")
-        || normalized.contains("touch")
-        || normalized.contains("thc")
-}
-
-fn parse_ucsi_payload(bytes: &[u8]) -> Option<(UcsiResponseHeader, &[u8])> {
-    let header = UcsiResponseHeader::parse(bytes)?;
-    let body = bytes.get(UCSI_RESPONSE_HEADER_LEN..)?;
-    let body_len = usize::from(header.data_length).min(body.len());
-    Some((header, &body[..body_len]))
-}
-
-fn execute_ucsi_i2c_command(
-    adapter: &I2cAdapterInfo,
-    adapter_name: &str,
-    address: u16,
-    ten_bit_address: bool,
-    command: UcsiCommand,
-    read_len: usize,
-) -> Result<Vec<u8>> {
-    let request = I2cTransferRequest {
-        adapter: adapter_name.to_string(),
-        segments: vec![
-            I2cTransferSegment {
-                address,
-                ten_bit_address,
-                op: i2c_interface::I2cTransferOp::Write(command.as_bytes().to_vec()),
-            },
-            I2cTransferSegment {
-                address,
-                ten_bit_address,
-                op: i2c_interface::I2cTransferOp::Read(read_len),
-            },
-        ],
-        stop: true,
-    };
-
-    let mut file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .open("/scheme/i2c/transfer")
-        .context("failed to open /scheme/i2c/transfer")?;
-    let payload = ron::ser::to_string(&I2cControlRequest::Transfer {
-        adapter_id: adapter.id,
-        request,
-    })
-    .context("failed to encode UCSI I2C transfer request")?;
-    file.write_all(payload.as_bytes())
-        .context("failed to send UCSI I2C transfer request")?;
-
-    let response = read_i2c_control_response(&mut file)?;
-    match response {
-        I2cControlResponse::TransferResult(result) => {
-            if !result.ok {
-                let detail = result
-                    .error
-                    .clone()
-                    .unwrap_or_else(|| String::from("unknown I2C transfer failure"));
-                bail!("UCSI I2C transfer failed: {detail}");
-            }
-            result
-                .read_data
-                .into_iter()
-                .next()
-                .context("UCSI I2C transfer returned no response payload")
-        }
-        I2cControlResponse::Error(message) => bail!("i2cd returned an error: {message}"),
-        other => bail!("unexpected i2cd transfer response: {other:?}"),
-    }
-}
-
-fn list_i2c_adapters() -> Result<Vec<I2cAdapterInfo>> {
-    let mut file = OpenOptions::new()
-        .read(true)
-        .write(true)
-        .open("/scheme/i2c/adapters")
-        .context("failed to open /scheme/i2c/adapters")?;
-
-    let payload = ron::ser::to_string(&I2cControlRequest::ListAdapters)
-        .context("failed to encode I2C list-adapters request")?;
-    file.write_all(payload.as_bytes())
-        .context("failed to request I2C adapter list")?;
-
-    let response = read_i2c_control_response(&mut file)?;
-    match response {
-        I2cControlResponse::AdapterList(adapters) => Ok(adapters),
-        I2cControlResponse::Error(message) => bail!("i2cd returned an error: {message}"),
-        other => bail!("unexpected i2cd list-adapters response: {other:?}"),
-    }
-}
-
-fn match_i2c_adapter<'a>(adapters: &'a [I2cAdapterInfo], wanted: &str) -> Option<&'a I2cAdapterInfo> {
-    adapters
-        .iter()
-        .find(|adapter| adapter.name == wanted)
-        .or_else(|| adapters.iter().find(|adapter| adapter.name.ends_with(wanted)))
-        .or_else(|| adapters.iter().find(|adapter| wanted.ends_with(&adapter.name)))
-}
-
-fn read_i2c_control_response(file: &mut File) -> Result<I2cControlResponse> {
-    let mut buffer = vec![0_u8; 4096];
-    let count = file
-        .read(&mut buffer)
-        .context("failed to read I2C control response")?;
-    buffer.truncate(count);
-    let text = std::str::from_utf8(&buffer).context("I2C control response was not UTF-8")?;
-    let trimmed = text.trim();
-    if trimmed.is_empty() {
-        return Ok(I2cControlResponse::AdapterList(Vec::new()));
-    }
-    ron::from_str(trimmed).context("failed to decode I2C control response")
-}
-
-fn read_symbol_id(path: &Path) -> Result<Option<String>> {
-    let contents = fs::read_to_string(path)
-        .with_context(|| format!("failed to read ACPI symbol {}", path.display()))?;
-    let symbol = match ron::from_str::<AmlSymbol>(&contents) {
-        Ok(symbol) => symbol,
-        Err(err) => {
-            log::debug!(
-                "ucsid: skipping {} because the symbol payload was not a scalar ID: {err}",
-                path.display(),
-            );
-            return Ok(None);
-        }
-    };
-
-    let id = match symbol.value {
-        AmlValue::Integer(integer) => eisa_id_from_integer(integer),
-        AmlValue::String(string) => string,
-    };
-
-    log::debug!("ucsid: {} -> {id}", symbol.name);
-    Ok(Some(id))
-}
-
-fn normalize_device_path(path: &str) -> String {
-    path.trim_start_matches('\\')
-        .trim_matches('/')
-        .replace('/', ".")
-}
-
-fn eisa_id_from_integer(integer: u64) -> String {
-    let vendor = integer & 0xFFFF;
-    let device = (integer >> 16) & 0xFFFF;
-    let vendor_rev = ((vendor & 0xFF) << 8) | (vendor >> 8);
-    let vendor_1 = (((vendor_rev >> 10) & 0x1F) as u8 + 64) as char;
-    let vendor_2 = (((vendor_rev >> 5) & 0x1F) as u8 + 64) as char;
-    let vendor_3 = (((vendor_rev >> 0) & 0x1F) as u8 + 64) as char;
-    let device_1 = (device >> 4) & 0xF;
-    let device_2 = (device >> 0) & 0xF;
-    let device_3 = (device >> 12) & 0xF;
-    let device_4 = (device >> 8) & 0xF;
-
-    format!(
-        "{vendor_1}{vendor_2}{vendor_3}{device_1:01X}{device_2:01X}{device_3:01X}{device_4:01X}"
-    )
-}
diff --git a/recipes/core/base/drivers/usb/usbctl/.gitignore b/recipes/core/base/drivers/usb/usbctl/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/usb/usbctl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/usb/usbctl/Cargo.toml b/recipes/core/base/drivers/usb/usbctl/Cargo.toml
deleted file mode 100644
index 5cc99f43e4..0000000000
--- a/recipes/core/base/drivers/usb/usbctl/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "usbctl"
-version = "0.1.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-clap.workspace = true
-xhcid = { path = "../xhcid" }
-common = { path = "../../common" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/usb/usbctl/src/main.rs b/recipes/core/base/drivers/usb/usbctl/src/main.rs
deleted file mode 100644
index 9b5773d901..0000000000
--- a/recipes/core/base/drivers/usb/usbctl/src/main.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use clap::{Arg, Command};
-use xhcid_interface::{PortId, XhciClientHandle};
-
-fn main() {
-    common::init();
-    let matches = Command::new("usbctl")
-        .arg(
-            Arg::new("SCHEME")
-                .num_args(1)
-                .required(true)
-                .long("scheme")
-                .short('s'),
-        )
-        .subcommand(
-            Command::new("port")
-                .arg(Arg::new("PORT").num_args(1).required(true))
-                .subcommand(Command::new("status"))
-                .subcommand(
-                    Command::new("endpoint")
-                        .arg(Arg::new("ENDPOINT_NUM").num_args(1).required(true))
-                        .subcommand(Command::new("status")),
-                ),
-        )
-        .get_matches();
-
-    let scheme = matches.get_one::<String>("SCHEME").expect("no scheme");
-
-    if let Some(port_scmd_matches) = matches.subcommand_matches("port") {
-        let port = port_scmd_matches
-            .get_one::<String>("PORT")
-            .expect("invalid utf-8 for PORT argument")
-            .parse::<PortId>()
-            .expect("expected PORT ID");
-
-        let handle = XhciClientHandle::new(scheme.to_owned(), port)
-            .expect("Failed to open XhciClientHandle");
-
-        if let Some(_status_scmd_matches) = port_scmd_matches.subcommand_matches("status") {
-            let state = handle.port_state().expect("Failed to get port state");
-            println!("{}", state.as_str());
-        } else if let Some(endp_scmd_matches) = port_scmd_matches.subcommand_matches("endpoint") {
-            let endp_num = endp_scmd_matches
-                .get_one::<String>("ENDPOINT_NUM")
-                .expect("no valid ENDPOINT_NUM")
-                .parse::<u8>()
-                .expect("expected ENDPOINT_NUM to be an 8-bit integer");
-            let mut endp_handle = handle
-                .open_endpoint(endp_num)
-                .expect("Failed to open endpoint");
-            let state = endp_handle.status().expect("Failed to get endpoint state");
-            println!("{}", state.as_str());
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/usb/usbhubd/.gitignore b/recipes/core/base/drivers/usb/usbhubd/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/usb/usbhubd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/usb/usbhubd/Cargo.toml b/recipes/core/base/drivers/usb/usbhubd/Cargo.toml
deleted file mode 100644
index e64355c56a..0000000000
--- a/recipes/core/base/drivers/usb/usbhubd/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "usbhubd"
-description = "USB Hub driver"
-version = "0.1.0"
-edition = "2018"
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-log.workspace = true
-redox_syscall.workspace = true
-xhcid = { path = "../xhcid" }
-
-common = { path = "../../common" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/usb/usbhubd/src/main.rs b/recipes/core/base/drivers/usb/usbhubd/src/main.rs
deleted file mode 100644
index 2c8b9876a6..0000000000
--- a/recipes/core/base/drivers/usb/usbhubd/src/main.rs
+++ /dev/null
@@ -1,249 +0,0 @@
-use std::{env, thread, time};
-
-use xhcid_interface::{
-    plain, usb, ConfigureEndpointsReq, DevDesc, DeviceReqData, PortId, PortReqRecipient, PortReqTy,
-    XhciClientHandle,
-};
-
-fn main() {
-    common::init();
-    let mut args = env::args().skip(1);
-
-    const USAGE: &'static str = "usbhubd <scheme> <port> <interface>";
-
-    let scheme = args.next().expect(USAGE);
-    let port_id = args
-        .next()
-        .expect(USAGE)
-        .parse::<PortId>()
-        .expect("Expected port ID");
-    let interface_num = args
-        .next()
-        .expect(USAGE)
-        .parse::<u8>()
-        .expect("Expected integer as input of interface");
-
-    log::info!(
-        "USB HUB driver spawned with scheme `{}`, port {}, interface {}",
-        scheme,
-        port_id,
-        interface_num
-    );
-
-    let name = format!("{}_{}_{}_hub", scheme, port_id, interface_num);
-    common::setup_logging(
-        "usb",
-        "device",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    let handle =
-        XhciClientHandle::new(scheme.clone(), port_id).expect("Failed to open XhciClientHandle");
-    let desc: DevDesc = handle
-        .get_standard_descs()
-        .expect("Failed to get standard descriptors");
-
-    let (conf_desc, if_desc) = desc
-        .config_descs
-        .iter()
-        .find_map(|conf_desc| {
-            let if_desc = conf_desc.interface_descs.iter().find_map(|if_desc| {
-                if if_desc.number == interface_num {
-                    Some(if_desc.clone())
-                } else {
-                    None
-                }
-            })?;
-            Some((conf_desc.clone(), if_desc))
-        })
-        .expect("Failed to find suitable configuration");
-
-    // Read hub descriptor
-    let (ports, usb_3) = if desc.major_version() >= 3 {
-        // USB 3.0 hubs
-        let mut hub_desc = usb::HubDescriptorV3::default();
-        handle
-            .device_request(
-                PortReqTy::Class,
-                PortReqRecipient::Device,
-                usb::SetupReq::GetDescriptor as u8,
-                u16::from(usb::HubDescriptorV3::DESCRIPTOR_KIND) << 8,
-                0,
-                DeviceReqData::In(unsafe { plain::as_mut_bytes(&mut hub_desc) }),
-            )
-            .expect("Failed to read hub descriptor");
-        (hub_desc.ports, true)
-    } else {
-        // USB 2.0 and earlier hubs
-        let mut hub_desc = usb::HubDescriptorV2::default();
-        handle
-            .device_request(
-                PortReqTy::Class,
-                PortReqRecipient::Device,
-                usb::SetupReq::GetDescriptor as u8,
-                u16::from(usb::HubDescriptorV2::DESCRIPTOR_KIND) << 8,
-                0,
-                DeviceReqData::In(unsafe { plain::as_mut_bytes(&mut hub_desc) }),
-            )
-            .expect("Failed to read hub descriptor");
-        (hub_desc.ports, false)
-    };
-
-    // Configure as hub device
-    handle
-        .configure_endpoints(&ConfigureEndpointsReq {
-            config_desc: conf_desc.configuration_value,
-            interface_desc: None, //TODO: stalls on USB 3 hub: Some(interface_num),
-            alternate_setting: None, //TODO: stalls on USB 3 hub: Some(if_desc.alternate_setting),
-            hub_ports: Some(ports),
-        })
-        .expect("Failed to configure endpoints after reading hub descriptor");
-
-    if usb_3 {
-        handle
-            .device_request(
-                PortReqTy::Class,
-                PortReqRecipient::Device,
-                0x0c, // SET_HUB_DEPTH
-                port_id.hub_depth().into(),
-                0,
-                DeviceReqData::NoData,
-            )
-            .expect("Failed to set hub depth");
-    }
-
-    // Initialize states
-    struct PortState {
-        port_id: PortId,
-        port_sts: usb::HubPortStatus,
-        handle: XhciClientHandle,
-        attached: bool,
-    }
-
-    impl PortState {
-        pub fn ensure_attached(&mut self, attached: bool) {
-            if attached == self.attached {
-                return;
-            }
-
-            if attached {
-                self.handle.attach().expect("Failed to attach");
-            } else {
-                self.handle.detach().expect("Failed to detach");
-            }
-
-            self.attached = attached;
-        }
-    }
-
-    let mut states = Vec::new();
-    for port in 1..=ports {
-        let child_port_id = port_id.child(port).expect("Cannot get child port ID");
-        states.push(PortState {
-            port_id: child_port_id,
-            port_sts: if usb_3 {
-                usb::HubPortStatus::V3(usb::HubPortStatusV3::default())
-            } else {
-                usb::HubPortStatus::V2(usb::HubPortStatusV2::default())
-            },
-            handle: XhciClientHandle::new(scheme.clone(), child_port_id)
-                .expect("Failed to open XhciClientHandle"),
-            attached: false,
-        });
-    }
-
-    //TODO: use change flags?
-    loop {
-        for port in 1..=ports {
-            let port_idx: usize = port.checked_sub(1).unwrap().into();
-            let state = states.get_mut(port_idx).unwrap();
-
-            let port_sts = if usb_3 {
-                let mut port_sts = usb::HubPortStatusV3::default();
-                handle
-                    .device_request(
-                        PortReqTy::Class,
-                        PortReqRecipient::Other,
-                        usb::SetupReq::GetStatus as u8,
-                        0,
-                        port as u16,
-                        DeviceReqData::In(unsafe { plain::as_mut_bytes(&mut port_sts) }),
-                    )
-                    .expect("Failed to retrieve port status");
-                usb::HubPortStatus::V3(port_sts)
-            } else {
-                let mut port_sts = usb::HubPortStatusV2::default();
-                handle
-                    .device_request(
-                        PortReqTy::Class,
-                        PortReqRecipient::Other,
-                        usb::SetupReq::GetStatus as u8,
-                        0,
-                        port as u16,
-                        DeviceReqData::In(unsafe { plain::as_mut_bytes(&mut port_sts) }),
-                    )
-                    .expect("Failed to retrieve port status");
-                usb::HubPortStatus::V2(port_sts)
-            };
-            if state.port_sts != port_sts {
-                state.port_sts = port_sts;
-                log::info!("port {} status {:X?}", port, port_sts);
-            }
-
-            // Ensure port is powered on
-            if !port_sts.is_powered() {
-                log::info!("power on port {port}");
-                handle
-                    .device_request(
-                        PortReqTy::Class,
-                        PortReqRecipient::Other,
-                        usb::SetupReq::SetFeature as u8,
-                        usb::HubPortFeature::PortPower as u16,
-                        port as u16,
-                        DeviceReqData::NoData,
-                    )
-                    .expect("Failed to set port power");
-                state.ensure_attached(false);
-                continue;
-            }
-
-            // Ignore disconnected port
-            if !port_sts.is_connected() {
-                state.ensure_attached(false);
-                continue;
-            }
-
-            // Ignore port in reset
-            if port_sts.is_resetting() {
-                state.ensure_attached(false);
-                continue;
-            }
-
-            // Ensure port is enabled
-            if !port_sts.is_enabled() {
-                log::info!("reset port {port}");
-                handle
-                    .device_request(
-                        PortReqTy::Class,
-                        PortReqRecipient::Other,
-                        usb::SetupReq::SetFeature as u8,
-                        usb::HubPortFeature::PortReset as u16,
-                        port as u16,
-                        DeviceReqData::NoData,
-                    )
-                    .expect("Failed to set port enable");
-                state.ensure_attached(false);
-                continue;
-            }
-
-            state.ensure_attached(true);
-        }
-
-        //TODO: use interrupts or poll faster?
-        thread::sleep(time::Duration::new(1, 0));
-    }
-
-    //TODO: read interrupt port for changes
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/.gitignore b/recipes/core/base/drivers/usb/xhcid/.gitignore
deleted file mode 100644
index ea8c4bf7f3..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/recipes/core/base/drivers/usb/xhcid/Cargo.toml b/recipes/core/base/drivers/usb/xhcid/Cargo.toml
deleted file mode 100644
index 6353ea5d69..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/Cargo.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[package]
-name = "xhcid"
-description = "xHCI controller driver"
-version = "0.1.0"
-edition = "2018"
-
-[[bin]]
-name = "xhcid"
-path = "src/main.rs"
-
-[lib]
-name = "xhcid_interface"
-path = "src/lib.rs"
-
-[dependencies]
-bitflags.workspace = true
-chashmap = "2.2.2"
-crossbeam-channel = "0.4"
-futures = "0.3"
-plain.workspace = true
-lazy_static = "1.4"
-log.workspace = true
-redox_event.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../../../scheme-utils" }
-redox_syscall.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-smallvec = { workspace = true, features = ["serde"] }
-thiserror.workspace = true
-toml.workspace = true
-
-config = { path = "../../../config" }
-common = { path = "../../common" }
-daemon = { path = "../../../daemon" }
-pcid = { path = "../../pcid" }
-libredox.workspace = true
-regex = "1.10.6"
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/usb/xhcid/config.toml b/recipes/core/base/drivers/usb/xhcid/config.toml
deleted file mode 100644
index 80e781c52a..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/config.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[[drivers]]
-name = "XHCI"
-class = 0x0C
-subclass = 0x03
-interface = 0x30
-command = ["xhcid"]
-use_channel = true
diff --git a/recipes/core/base/drivers/usb/xhcid/drivers.toml b/recipes/core/base/drivers/usb/xhcid/drivers.toml
deleted file mode 100644
index 83c90e2385..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/drivers.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-#TODO: causes XHCI errors
-#[[drivers]]
-#name = "SCSI over USB"
-#class = 8 # Mass Storage class
-#subclass = 6 # SCSI transparent command set
-#command = ["usbscsid", "$SCHEME", "$PORT", "$IF_PROTO"]
-
-[[drivers]]
-name = "USB HUB"
-class = 9 # HUB class
-subclass = -1
-command = ["usbhubd", "$SCHEME", "$PORT", "$IF_NUM"]
-
-[[drivers]]
-name = "USB HID"
-class = 3 # HID class
-subclass = -1
-command = ["usbhidd", "$SCHEME", "$PORT", "$IF_NUM"]
diff --git a/recipes/core/base/drivers/usb/xhcid/src/driver_interface.rs b/recipes/core/base/drivers/usb/xhcid/src/driver_interface.rs
deleted file mode 100644
index 727f8d7e99..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/driver_interface.rs
+++ /dev/null
@@ -1,889 +0,0 @@
-pub extern crate serde;
-pub extern crate smallvec;
-
-use std::convert::TryFrom;
-use std::fs::File;
-use std::io::prelude::*;
-use std::num::NonZeroU8;
-use std::os::fd::{FromRawFd, RawFd};
-use std::string::FromUtf8Error;
-use std::{fmt, io, result, str};
-
-use serde::{Deserialize, Serialize};
-use smallvec::SmallVec;
-use syscall::{Error, Result, EINVAL};
-use thiserror::Error;
-
-pub use crate::usb::{EndpointTy, ENDP_ATTR_TY_MASK};
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-pub struct ConfigureEndpointsReq {
-    /// Index into the configuration descriptors of the device descriptor.
-    pub config_desc: u8,
-    pub interface_desc: Option<u8>,
-    pub alternate_setting: Option<u8>,
-    pub hub_ports: Option<u8>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct DevDesc {
-    pub kind: u8,
-    pub usb: u16,
-    pub class: u8,
-    pub sub_class: u8,
-    pub protocol: u8,
-    pub packet_size: u8,
-    pub vendor: u16,
-    pub product: u16,
-    pub release: u16,
-    pub manufacturer_str: Option<String>,
-    pub product_str: Option<String>,
-    pub serial_str: Option<String>,
-    pub config_descs: SmallVec<[ConfDesc; 1]>,
-}
-
-impl DevDesc {
-    pub fn major_version(&self) -> u8 {
-        ((self.usb & 0xFF00) >> 8) as u8
-    }
-    pub fn minor_version(&self) -> u8 {
-        self.usb as u8
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ConfDesc {
-    pub kind: u8,
-    pub configuration_value: u8,
-    pub configuration: Option<String>,
-    pub attributes: u8,
-    pub max_power: u8,
-    pub interface_descs: SmallVec<[IfDesc; 1]>,
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub struct EndpDesc {
-    pub kind: u8,
-    pub address: u8,
-    pub attributes: u8,
-    pub max_packet_size: u16,
-    pub interval: u8,
-    pub ssc: Option<SuperSpeedCmp>,
-    pub sspc: Option<SuperSpeedPlusIsochCmp>,
-}
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum EndpDirection {
-    Out,
-    In,
-    Bidirectional,
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum EndpBinaryDirection {
-    Out,
-    In,
-}
-
-impl From<PortReqDirection> for EndpBinaryDirection {
-    fn from(d: PortReqDirection) -> Self {
-        match d {
-            PortReqDirection::DeviceToHost => Self::In,
-            PortReqDirection::HostToDevice => Self::Out,
-        }
-    }
-}
-
-impl From<EndpBinaryDirection> for EndpDirection {
-    fn from(b: EndpBinaryDirection) -> Self {
-        match b {
-            EndpBinaryDirection::In => Self::In,
-            EndpBinaryDirection::Out => Self::Out,
-        }
-    }
-}
-
-impl From<PortReqDirection> for EndpDirection {
-    fn from(d: PortReqDirection) -> Self {
-        match d {
-            PortReqDirection::HostToDevice => Self::Out,
-            PortReqDirection::DeviceToHost => Self::In,
-        }
-    }
-}
-
-impl EndpDesc {
-    pub fn ty(self) -> EndpointTy {
-        match self.attributes & ENDP_ATTR_TY_MASK {
-            0 => EndpointTy::Ctrl,
-            1 => EndpointTy::Isoch,
-            2 => EndpointTy::Bulk,
-            3 => EndpointTy::Interrupt,
-            _ => unreachable!(),
-        }
-    }
-    pub fn is_control(&self) -> bool {
-        self.ty() == EndpointTy::Ctrl
-    }
-    pub fn is_interrupt(&self) -> bool {
-        self.ty() == EndpointTy::Interrupt
-    }
-    pub fn is_bulk(&self) -> bool {
-        self.ty() == EndpointTy::Bulk
-    }
-    pub fn is_isoch(&self) -> bool {
-        self.ty() == EndpointTy::Isoch
-    }
-    pub fn direction(&self) -> EndpDirection {
-        if self.is_control() {
-            return EndpDirection::Bidirectional;
-        }
-        if self.address & 0x80 != 0 {
-            EndpDirection::In
-        } else {
-            EndpDirection::Out
-        }
-    }
-    pub fn xhci_ep_type(&self) -> Result<u8> {
-        Ok(match self.direction() {
-            EndpDirection::Out if self.is_isoch() => 1,
-            EndpDirection::Out if self.is_bulk() => 2,
-            EndpDirection::Out if self.is_interrupt() => 3,
-            EndpDirection::Bidirectional if self.is_control() => 4,
-            EndpDirection::In if self.is_isoch() => 5,
-            EndpDirection::In if self.is_bulk() => 6,
-            EndpDirection::In if self.is_interrupt() => 7,
-            _ => return Err(Error::new(EINVAL)),
-        })
-    }
-    pub fn is_superspeed(&self) -> bool {
-        self.ssc.is_some()
-    }
-    pub fn is_superspeedplus(&self) -> bool {
-        self.sspc.is_some()
-    }
-    fn interrupt_usage_bits(&self) -> u8 {
-        assert!(self.is_interrupt());
-        (self.attributes & 0x20) >> 4
-    }
-    pub fn is_periodic(&self) -> bool {
-        #[repr(u8)]
-        enum InterruptUsageBits {
-            Periodic,
-            Notification,
-            Rsvd2,
-            Rsvd3,
-        }
-
-        if self.is_interrupt() {
-            self.interrupt_usage_bits() == InterruptUsageBits::Periodic as u8
-        } else {
-            self.is_isoch()
-        }
-    }
-    pub fn log_max_streams(&self) -> Option<NonZeroU8> {
-        self.ssc
-            .as_ref()
-            .map(|ssc| {
-                if self.is_bulk() {
-                    let raw = ssc.attributes & 0x1F;
-                    NonZeroU8::new(raw)
-                } else {
-                    None
-                }
-            })
-            .flatten()
-    }
-    pub fn isoch_mult(&self, lec: bool) -> u8 {
-        if !lec && self.is_isoch() {
-            if self.is_superspeedplus() {
-                return 0;
-            }
-            self.ssc
-                .as_ref()
-                .map(|ssc| ssc.attributes & 0x3)
-                .unwrap_or(0)
-        } else {
-            0
-        }
-    }
-    pub fn max_burst(&self) -> u8 {
-        self.ssc.map(|ssc| ssc.max_burst).unwrap_or(0)
-    }
-    pub fn has_ssp_companion(&self) -> bool {
-        self.ssc
-            .map(|ssc| ssc.attributes & (1 << 7) != 0)
-            .unwrap_or(false)
-    }
-}
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct IfDesc {
-    pub kind: u8,
-    pub number: u8,
-    pub alternate_setting: u8,
-    pub class: u8,
-    pub sub_class: u8,
-    pub protocol: u8,
-    pub interface_str: Option<String>,
-    pub endpoints: SmallVec<[EndpDesc; 4]>,
-    pub hid_descs: SmallVec<[HidDesc; 1]>,
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub struct SuperSpeedCmp {
-    pub kind: u8,
-    pub max_burst: u8,
-    pub attributes: u8,
-    pub bytes_per_interval: u16,
-}
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub struct SuperSpeedPlusIsochCmp {
-    pub kind: u8,
-    pub bytes_per_interval: u32,
-}
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub struct HidDesc {
-    pub kind: u8,
-    pub hid_spec_release: u16,
-    pub country: u8,
-    pub desc_count: u8,
-    pub desc_ty: u8,
-    pub desc_len: u16,
-    pub optional_desc_ty: u8,
-    pub optional_desc_len: u16,
-}
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub struct PortReq {
-    pub direction: PortReqDirection,
-    pub req_type: PortReqTy,
-    pub req_recipient: PortReqRecipient,
-    pub request: u8,
-    pub value: u16,
-    pub index: u16,
-    pub length: u16,
-    pub transfers_data: bool,
-}
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub enum PortReqDirection {
-    HostToDevice,
-    DeviceToHost,
-}
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub enum PortReqTy {
-    Class,
-    Vendor,
-    Standard,
-}
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-pub enum PortReqRecipient {
-    Device,
-    Interface,
-    Endpoint,
-    Other,
-    VendorSpecific,
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct PortId {
-    pub root_hub_port_num: u8,
-    pub route_string: u32,
-}
-
-impl PortId {
-    pub fn root_hub_port_index(&self) -> usize {
-        self.root_hub_port_num.checked_sub(1).unwrap().into()
-    }
-
-    pub fn hub_depth(&self) -> u8 {
-        let mut hub_depth = 0;
-        let mut route_string = self.route_string;
-        while route_string != 0 {
-            route_string >>= 4;
-            hub_depth += 1;
-        }
-        hub_depth
-    }
-
-    pub fn child(&self, value: u8) -> Result<Self, String> {
-        let depth = self.hub_depth();
-        if depth >= 5 {
-            return Err(format!("too many route string components"));
-        }
-        if value & 0xF0 != 0 {
-            return Err(format!(
-                "value {:?} is too large for route string component",
-                value
-            ));
-        }
-        Ok(Self {
-            root_hub_port_num: self.root_hub_port_num,
-            route_string: self.route_string | u32::from(value) << (depth * 4),
-        })
-    }
-
-    pub fn parent(&self) -> Option<(Self, u8)> {
-        let depth = self.hub_depth();
-        let parent_depth = depth.checked_sub(1)?;
-        let parent_shift = parent_depth * 4;
-        let parent_mask = 0xF << parent_shift;
-        Some((
-            Self {
-                root_hub_port_num: self.root_hub_port_num,
-                route_string: self.route_string & !parent_mask,
-            },
-            u8::try_from((self.route_string & parent_mask) >> parent_shift).unwrap(),
-        ))
-    }
-}
-
-impl fmt::Display for PortId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.root_hub_port_num)?;
-        // USB 3.1 Revision 1.1 Specification Section 8.9 Route String Field
-        // The Route String is a 20-bit field in downstream directed packets that the hub uses to route
-        // each packet to the designated downstream port. It is composed of a concatenation of the
-        // downstream port numbers (4 bits per hub) for each hub traversed to reach a device.
-        let mut route_string = self.route_string;
-        while route_string != 0 {
-            write!(f, ".{}", route_string & 0xF)?;
-            route_string >>= 4;
-        }
-        Ok(())
-    }
-}
-
-impl str::FromStr for PortId {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut root_hub_port_num = 0;
-        let mut route_string = 0;
-        for (i, part) in s.split('.').enumerate() {
-            let value: u8 = part
-                .parse()
-                .map_err(|e| format!("failed to parse {:?}: {}", part, e))?;
-
-            // Neither root hub port number nor route string support 0 components
-            // to identify downstream ports
-            if value == 0 {
-                return Err(format!("zero is not a valid port ID component"));
-            }
-
-            // Parse root hub port number
-            if i == 0 {
-                root_hub_port_num = value;
-                continue;
-            }
-
-            // Parse route string component
-            let depth = i - 1;
-            if depth >= 5 {
-                return Err(format!("too many route string components"));
-            }
-            if value & 0xF0 != 0 {
-                return Err(format!(
-                    "value {:?} is too large for route string component",
-                    value
-                ));
-            }
-            route_string |= u32::from(value) << (depth * 4);
-        }
-        Ok(Self {
-            root_hub_port_num,
-            route_string,
-        })
-    }
-}
-
-pub struct XhciClientHandle {
-    fd: libredox::Fd,
-    scheme: String,
-    port: PortId,
-}
-impl fmt::Debug for XhciClientHandle {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("XhciClientHandle")
-            .field("scheme", &self.scheme)
-            .field("port", &self.port)
-            .field("fd", &"libredox::Fd")
-            .finish()
-    }
-}
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum PortState {
-    EnabledOrDisabled,
-    Default,
-    Addressed,
-    Configured,
-}
-impl PortState {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            Self::EnabledOrDisabled => "enabled_or_disabled",
-            Self::Default => "default",
-            Self::Addressed => "addressed",
-            Self::Configured => "configured",
-        }
-    }
-}
-#[derive(Debug, Error)]
-#[error("invalid input")]
-pub struct Invalid(pub &'static str);
-
-impl str::FromStr for PortState {
-    type Err = Invalid;
-
-    fn from_str(s: &str) -> result::Result<Self, Self::Err> {
-        Ok(match s {
-            "enabled_or_disabled" | "enabled/disabled" => Self::EnabledOrDisabled,
-            "default" => Self::Default,
-            "addressed" => Self::Addressed,
-            "configured" => Self::Configured,
-            _ => return Err(Invalid("read reserved port state")),
-        })
-    }
-}
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub enum EndpointStatus {
-    Disabled,
-    Enabled,
-    Halted,
-    Stopped,
-    Error,
-}
-
-#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct PortTransferStatus {
-    pub kind: PortTransferStatusKind,
-    pub bytes_transferred: u32,
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub enum PortTransferStatusKind {
-    Success,
-    ShortPacket,
-    Stalled,
-    Unknown,
-}
-impl Default for PortTransferStatusKind {
-    fn default() -> Self {
-        Self::Success
-    }
-}
-
-impl EndpointStatus {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            Self::Disabled => "disabled",
-            Self::Enabled => "enabled",
-            Self::Halted => "halted",
-            Self::Stopped => "stopped",
-            Self::Error => "error",
-        }
-    }
-}
-
-impl str::FromStr for EndpointStatus {
-    type Err = Invalid;
-
-    fn from_str(s: &str) -> result::Result<Self, Self::Err> {
-        Ok(match s {
-            "disabled" => Self::Disabled,
-            "enabled" => Self::Enabled,
-            "halted" => Self::Halted,
-            "stopped" => Self::Stopped,
-            "error" => Self::Error,
-            _ => return Err(Invalid("read reserved endpoint state")),
-        })
-    }
-}
-
-pub enum DeviceReqData<'a> {
-    In(&'a mut [u8]),
-    Out(&'a [u8]),
-    NoData,
-}
-impl DeviceReqData<'_> {
-    pub fn len(&self) -> usize {
-        match self {
-            Self::In(buf) => buf.len(),
-            Self::Out(buf) => buf.len(),
-            Self::NoData => 0,
-        }
-    }
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-    pub fn map_buf<T, F: Fn(&[u8]) -> T>(&self, f: F) -> Option<T> {
-        match self {
-            Self::In(sbuf) => Some(f(sbuf)),
-            Self::Out(dbuf) => Some(f(dbuf)),
-            _ => None,
-        }
-    }
-    pub fn direction(&self) -> PortReqDirection {
-        match self {
-            DeviceReqData::Out(_) => PortReqDirection::HostToDevice,
-            DeviceReqData::NoData => PortReqDirection::HostToDevice,
-            DeviceReqData::In(_) => PortReqDirection::DeviceToHost,
-        }
-    }
-}
-
-impl XhciClientHandle {
-    pub fn new(scheme: String, port: PortId) -> result::Result<Self, XhciClientHandleError> {
-        let path = format!("/scheme/{}/port{}", scheme, port);
-        let fd = libredox::Fd::open(&path, libredox::flag::O_DIRECTORY, 0)?;
-        Ok(Self { fd, scheme, port })
-    }
-    fn read(&self, path: &str) -> result::Result<Vec<u8>, XhciClientHandleError> {
-        let target_fd = self.fd.openat(path, libredox::flag::O_RDONLY, 0)?;
-        let stat = target_fd.stat()?;
-        let mut buf: Vec<u8> = vec![0u8; stat.st_size as usize];
-        let count = target_fd.read(&mut buf)?;
-        buf.truncate(count);
-        Ok(buf)
-    }
-    fn read_to_string(&self, path: &str) -> result::Result<String, XhciClientHandleError> {
-        let buf = self.read(path)?;
-        Ok(String::from_utf8(buf)?)
-    }
-    pub fn attach(&self) -> result::Result<(), XhciClientHandleError> {
-        let file = self.fd.openat("attach", libredox::flag::O_WRONLY, 0)?;
-        let _bytes_written = file.write(&[])?;
-        Ok(())
-    }
-    pub fn detach(&self) -> result::Result<(), XhciClientHandleError> {
-        let file = self.fd.openat("detach", libredox::flag::O_WRONLY, 0)?;
-        let _bytes_written = file.write(&[])?;
-        Ok(())
-    }
-    pub fn get_standard_descs(&self) -> result::Result<DevDesc, XhciClientHandleError> {
-        let json = self.read("descriptors")?;
-        Ok(serde_json::from_slice(&json)?)
-    }
-    pub fn configure_endpoints(
-        &self,
-        req: &ConfigureEndpointsReq,
-    ) -> result::Result<(), XhciClientHandleError> {
-        let json = serde_json::to_vec(req)?;
-        let file = self.fd.openat("configure", libredox::flag::O_WRONLY, 0)?;
-        let json_bytes_written = file.write(&json)?;
-        if json_bytes_written != json.len() {
-            return Err(XhciClientHandleError::InvalidResponse(Invalid(
-                "configure_endpoints didn't read as many bytes as were requested",
-            )));
-        }
-        Ok(())
-    }
-    pub fn port_state(&self) -> result::Result<PortState, XhciClientHandleError> {
-        let string = self.read_to_string("state")?;
-        Ok(string.parse()?)
-    }
-    pub fn open_endpoint_ctl(&self, num: u8) -> result::Result<File, XhciClientHandleError> {
-        let path = format!("endpoints/{}/ctl", num);
-        let fd = self.fd.openat(&path, libredox::flag::O_RDWR, 0)?;
-        Ok(unsafe { File::from_raw_fd(fd.into_raw() as RawFd) })
-    }
-    pub fn open_endpoint_data(&self, num: u8) -> result::Result<File, XhciClientHandleError> {
-        let path = format!("endpoints/{}/data", num);
-        let fd = self.fd.openat(&path, libredox::flag::O_RDWR, 0)?;
-        Ok(unsafe { File::from_raw_fd(fd.into_raw() as RawFd) })
-    }
-    pub fn open_endpoint(&self, num: u8) -> result::Result<XhciEndpHandle, XhciClientHandleError> {
-        Ok(XhciEndpHandle {
-            ctl: self.open_endpoint_ctl(num)?,
-            data: self.open_endpoint_data(num)?,
-        })
-    }
-    pub fn device_request<'a>(
-        &self,
-        req_type: PortReqTy,
-        req_recipient: PortReqRecipient,
-        request: u8,
-        value: u16,
-        index: u16,
-        data: DeviceReqData<'a>,
-    ) -> result::Result<(), XhciClientHandleError> {
-        let length = u16::try_from(data.len())
-            .or(Err(XhciClientHandleError::TransferBufTooLarge(data.len())))?;
-
-        let req = PortReq {
-            direction: data.direction(),
-            req_type,
-            req_recipient,
-            request,
-            value,
-            index,
-            length,
-            transfers_data: !matches!(data, DeviceReqData::NoData),
-        };
-        let json = serde_json::to_vec(&req)?;
-
-        let file = self.fd.openat("request", libredox::flag::O_RDWR, 0)?;
-
-        let json_bytes_written = file.write(&json)?;
-        if json_bytes_written != json.len() {
-            return Err(XhciClientHandleError::InvalidResponse(Invalid(
-                "device_request didn't return the same number of bytes as were written",
-            )));
-        }
-
-        match data {
-            DeviceReqData::In(buf) => {
-                let bytes_read = file.read(buf)?;
-
-                if bytes_read != buf.len() {
-                    return Err(XhciClientHandleError::InvalidResponse(Invalid(
-                        "device_request didn't transfer (host2dev) all bytes",
-                    )));
-                }
-            }
-            DeviceReqData::Out(buf) => {
-                let bytes_read = file.write(&buf)?;
-
-                if bytes_read != buf.len() {
-                    return Err(XhciClientHandleError::InvalidResponse(Invalid(
-                        "device_request didn't transfer (dev2host) all bytes",
-                    )));
-                }
-            }
-            DeviceReqData::NoData => (),
-        }
-        Ok(())
-    }
-    pub fn get_descriptor(
-        &self,
-        recipient: PortReqRecipient,
-        ty: u8,
-        idx: u8,
-        windex: u16,
-        buffer: &mut [u8],
-    ) -> result::Result<(), XhciClientHandleError> {
-        self.device_request(
-            PortReqTy::Standard,
-            recipient,
-            0x06,
-            (u16::from(ty) << 8) | u16::from(idx),
-            windex,
-            DeviceReqData::In(buffer),
-        )
-    }
-    pub fn clear_feature(
-        &self,
-        recipient: PortReqRecipient,
-        index: u16,
-        feature_sel: u16,
-    ) -> result::Result<(), XhciClientHandleError> {
-        self.device_request(
-            PortReqTy::Standard,
-            recipient,
-            0x01,
-            feature_sel,
-            index,
-            DeviceReqData::NoData,
-        )
-    }
-}
-
-#[derive(Debug)]
-pub struct XhciEndpHandle {
-    data: File,
-    ctl: File,
-}
-
-/// The direction of a transfer.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub enum XhciEndpCtlDirection {
-    /// Host to device
-    Out,
-    /// Device to host
-    In,
-    /// No data, and hence no I/O on the Data interface file at all.
-    NoData,
-}
-
-/// A request to an endpoint Ctl interface file. Currently serialized with JSON.
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-#[non_exhaustive]
-pub enum XhciEndpCtlReq {
-    // TODO: Reduce the number of direction enums from 5 to perhaps 2.
-    // TODO: Allow to send multiple buffers in one transfer.
-    /// Tells xhcid that a buffer is about to be sent from the Data interface file, to the
-    /// endpoint.
-    Transfer {
-        /// The direction of the transfer. If the direction is `XhciEndpCtlDirection::NoData`, no
-        /// bytes will be transferred, and therefore no reads or writes shall be done to the Data
-        /// driver interface file.
-        direction: XhciEndpCtlDirection,
-
-        /// The number of bytes to be read or written. This field must be set to zero if the
-        /// direction is `XhciEndpCtlDirection::NoData`. When all bytes have been read or written,
-        /// the transfer will be considered complete by xhcid, and a non-pending status will be
-        /// returned.
-        count: u32,
-    },
-    // TODO: Allow clients to specify what to reset.
-    /// Tells xhcid that the endpoint is going to be reset.
-    Reset {
-        /// Only issue the Reset Endpoint and Set TR Dequeue Pointer commands, and let the client
-        /// itself send a potential ClearFeature(ENDPOINT_HALT).
-        no_clear_feature: bool,
-    },
-
-    /// Tells xhcid that the endpoint status is going to be retrieved from the Ctl interface file.
-    Status,
-}
-/// A response from an endpoint Ctl interface file. Currently serialized with JSON.
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
-#[non_exhaustive]
-pub enum XhciEndpCtlRes {
-    /// Xhcid responded with the current state of an endpoint.
-    Status(EndpointStatus),
-
-    /// Xhci sent the result of a transfer.
-    TransferResult(PortTransferStatus),
-
-    /// Xhcid is waiting for data to be sent or received on the Data interface file.
-    Pending,
-
-    /// No Ctl request is currently being processed by xhcid.
-    Idle,
-}
-
-impl XhciEndpHandle {
-    fn ctl_req(&mut self, ctl_req: &XhciEndpCtlReq) -> result::Result<(), XhciClientHandleError> {
-        let ctl_buffer = serde_json::to_vec(ctl_req)?;
-
-        let ctl_bytes_written = self.ctl.write(&ctl_buffer)?;
-        if ctl_bytes_written != ctl_buffer.len() {
-            return Err(Invalid("xhcid didn't process all of the ctl bytes").into());
-        }
-
-        Ok(())
-    }
-    fn ctl_res(&mut self) -> result::Result<XhciEndpCtlRes, XhciClientHandleError> {
-        // a response must never exceed 256 bytes
-        let mut ctl_buffer = [0u8; 256];
-        let ctl_bytes_read = self.ctl.read(&mut ctl_buffer)?;
-
-        let ctl_res = serde_json::from_slice(&ctl_buffer[..ctl_bytes_read as usize])?;
-        Ok(ctl_res)
-    }
-    pub fn reset(&mut self, no_clear_feature: bool) -> result::Result<(), XhciClientHandleError> {
-        self.ctl_req(&XhciEndpCtlReq::Reset { no_clear_feature })
-    }
-    pub fn status(&mut self) -> result::Result<EndpointStatus, XhciClientHandleError> {
-        self.ctl_req(&XhciEndpCtlReq::Status)?;
-        match self.ctl_res()? {
-            XhciEndpCtlRes::Status(s) => Ok(s),
-            _ => Err(Invalid("expected status response").into()),
-        }
-    }
-    fn generic_transfer<F: FnOnce(&mut File) -> io::Result<usize>>(
-        &mut self,
-        direction: XhciEndpCtlDirection,
-        f: F,
-        expected_len: u32,
-    ) -> result::Result<PortTransferStatus, XhciClientHandleError> {
-        let req = XhciEndpCtlReq::Transfer {
-            direction,
-            count: expected_len,
-        };
-        self.ctl_req(&req)?;
-
-        let bytes_read = f(&mut self.data)?;
-        let res = self.ctl_res()?;
-
-        match res {
-            XhciEndpCtlRes::TransferResult(PortTransferStatus {
-                kind: PortTransferStatusKind::Success,
-                ..
-            }) if bytes_read != expected_len as usize => {
-                Err(Invalid("no short packet, but fewer bytes were read/written").into())
-            }
-            XhciEndpCtlRes::TransferResult(r) => Ok(r),
-            _ => Err(Invalid("expected transfer result").into()),
-        }
-    }
-    pub fn transfer_write(
-        &mut self,
-        buf: &[u8],
-    ) -> result::Result<PortTransferStatus, XhciClientHandleError> {
-        self.generic_transfer(
-            XhciEndpCtlDirection::Out,
-            |data| data.write(buf),
-            buf.len() as u32,
-        )
-    }
-    pub fn transfer_read(
-        &mut self,
-        buf: &mut [u8],
-    ) -> result::Result<PortTransferStatus, XhciClientHandleError> {
-        let len = buf.len() as u32;
-        self.generic_transfer(XhciEndpCtlDirection::In, |data| data.read(buf), len)
-    }
-    pub fn transfer_nodata(&mut self) -> result::Result<PortTransferStatus, XhciClientHandleError> {
-        self.generic_transfer(XhciEndpCtlDirection::NoData, |_| Ok(0), 0)
-    }
-    fn transfer_stream(&mut self, total_len: u32) -> TransferStream<'_> {
-        TransferStream {
-            bytes_to_transfer: total_len,
-            bytes_transferred: 0,
-            bytes_per_transfer: 32768, // TODO
-            endp_handle: self,
-        }
-    }
-    pub fn transfer_write_stream(&mut self, total_len: u32) -> TransferWriteStream<'_> {
-        TransferWriteStream {
-            inner: self.transfer_stream(total_len),
-        }
-    }
-    pub fn transfer_read_stream(&mut self, total_len: u32) -> TransferReadStream<'_> {
-        TransferReadStream {
-            inner: self.transfer_stream(total_len),
-        }
-    }
-}
-
-pub struct TransferWriteStream<'a> {
-    inner: TransferStream<'a>,
-}
-pub struct TransferReadStream<'a> {
-    inner: TransferStream<'a>,
-}
-struct TransferStream<'a> {
-    bytes_to_transfer: u32,
-    bytes_transferred: u32,
-    bytes_per_transfer: u32,
-    endp_handle: &'a mut XhciEndpHandle,
-}
-
-#[derive(Debug, Error)]
-pub enum XhciClientHandleError {
-    #[error("i/o error: {0}")]
-    IoError(#[from] io::Error),
-
-    #[error("serialization error: {0}")]
-    SerializationError(#[from] serde_json::Error),
-
-    #[error("invalid response")]
-    InvalidResponse(#[from] Invalid),
-
-    #[error("transfer buffer too large ({0} > 65536)")]
-    TransferBufTooLarge(usize),
-
-    #[error("unexpected short packet of size {0}")]
-    UnexpectedShortPacket(usize),
-
-    #[error("utf8 error: {0}")]
-    Utf8Error(#[from] FromUtf8Error),
-}
-
-impl From<libredox::error::Error> for XhciClientHandleError {
-    fn from(error: libredox::error::Error) -> Self {
-        Self::IoError(error.into())
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/lib.rs b/recipes/core/base/drivers/usb/xhcid/src/lib.rs
deleted file mode 100644
index 771958a18d..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/lib.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-//! The eXtensible Host Controller Interface (XHCI) Daemon Interface
-//!
-//! This crate implements the driver interface for interacting with the Redox xhcid daemon from
-//! another userspace process.
-//!
-//! XHCI is a standard for the USB Host Controller interface specified by Intel that provides a
-//! common register interface for systems to use to interact with the Universal Serial Bus (USB)
-//! subsystem.
-//!
-//! USB consists of three types of devices: The Host Controller/Root Hub, USB Hubs, and Endpoints.
-//! Endpoints represent actual devices connected to the USB fabric. USB Hubs are intermediaries
-//! between the Host Controller and the endpoints that report when devices have been connected/disconnected.
-//! The Host Controller provides the interface to the USB subsystem that software running on the
-//! system's CPU can interact with. It's a tree-like structure, which the Host Controller enumerating
-//! and addressing all the hubs and endpoints in the tree. Data then flows through the fabric
-//! using the USB protocol (2.0 or 3.2) as packets. Hubs have multiple ports that endpoints can
-//! connect to, and they notify the Host Controller/Root Hub when devices are hot plugged or removed.
-//!
-//! This documentation will refer directly to the relevant standards, which are as follows:
-//!
-//! - XHCI  - [eXtensible Host Controller Interface for Universal Serial Bus (xHCI) Requirements Specification](https://www.intel.com/content/dam/www/public/us/en/documents/technical-specifications/extensible-host-controler-interface-usb-xhci.pdf)
-//! - USB2  - [Universal Serial Bus Specification](https://www.usb.org/document-library/usb-20-specification)
-//! - USB32 - [Universal Serial Bus 3.2 Specification Revision 1.1](https://usb.org/document-library/usb-32-revision-11-june-2022)
-//!
-pub extern crate plain;
-
-mod driver_interface;
-pub mod usb;
-
-pub use driver_interface::*;
diff --git a/recipes/core/base/drivers/usb/xhcid/src/main.rs b/recipes/core/base/drivers/usb/xhcid/src/main.rs
deleted file mode 100644
index d345a52fc4..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/main.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-//! The eXtensible Host Controller Interface (XHCI) Daemon
-//!
-//! This crate provides the executable xhcid daemon that implements the driver for interacting with
-//! a PCIe XHCI device
-//!
-//! XHCI is a standard for the USB Host Controller interface specified by Intel that provides a
-//! common register interface for systems to use to interact with the Universal Serial Bus (USB)
-//! subsystem.
-//!
-//! USB consists of three types of devices: The Host Controller/Root Hub, USB Hubs, and Endpoints.
-//! Endpoints represent actual devices connected to the USB fabric. USB Hubs are intermediaries
-//! between the Host Controller and the endpoints that report when devices have been connected/disconnected.
-//! The Host Controller provides the interface to the USB subsystem that software running on the
-//! system's CPU can interact with. It's a tree-like structure, which the Host Controller enumerating
-//! and addressing all the hubs and endpoints in the tree. Data then flows through the fabric
-//! using the USB protocol (2.0 or 3.2) as packets. Hubs have multiple ports that endpoints can
-//! connect to, and they notify the Host Controller/Root Hub when devices are hot plugged or removed.
-//!
-//! This documentation will refer directly to the relevant standards, which are as follows:
-//!
-//! - XHCI  - [eXtensible Host Controller Interface for Universal Serial Bus (xHCI) Requirements Specification](https://www.intel.com/content/dam/www/public/us/en/documents/technical-specifications/extensible-host-controler-interface-usb-xhci.pdf)
-//! - USB2  - [Universal Serial Bus Specification](https://www.usb.org/document-library/usb-20-specification)
-//! - USB32 - [Universal Serial Bus 3.2 Specification Revision 1.1](https://usb.org/document-library/usb-32-revision-11-june-2022)
-//!
-#![allow(warnings)]
-
-#[macro_use]
-extern crate bitflags;
-
-use std::fs::File;
-use std::sync::Arc;
-
-use pcid_interface::irq_helpers::read_bsp_apic_id;
-#[cfg(target_arch = "x86_64")]
-use pcid_interface::irq_helpers::{
-    allocate_first_msi_interrupt_on_bsp, allocate_single_interrupt_vector_for_msi,
-};
-use pcid_interface::{PciFeature, PciFeatureInfo, PciFunctionHandle};
-
-use redox_scheme::{scheme::register_sync_scheme, Socket};
-use scheme_utils::Blocking;
-
-use crate::xhci::{InterruptMethod, Xhci};
-
-// Declare as pub so that no warnings appear due to parts of the interface code not being used by
-// the driver. Since there's also a dedicated crate for the driver interface, those warnings don't
-// mean anything.
-pub mod driver_interface;
-
-mod usb;
-mod xhci;
-
-#[cfg(target_arch = "x86_64")]
-fn get_int_method(pcid_handle: &mut PciFunctionHandle) -> (Option<File>, InterruptMethod) {
-    let pci_config = pcid_handle.config();
-
-    let all_pci_features = pcid_handle.fetch_all_features();
-    log::debug!("XHCI PCI FEATURES: {:?}", all_pci_features);
-
-    let has_msi = all_pci_features.iter().any(|feature| feature.is_msi());
-    let has_msix = all_pci_features.iter().any(|feature| feature.is_msix());
-
-    if has_msix {
-        let msix_info = match pcid_handle.feature_info(PciFeature::MsiX) {
-            PciFeatureInfo::Msi(_) => panic!(),
-            PciFeatureInfo::MsiX(s) => s,
-        };
-        let mut info = unsafe { msix_info.map_and_mask_all(pcid_handle) };
-
-        // Allocate one msi vector.
-
-        let method = {
-            // primary interrupter
-            let k = 0;
-
-            let table_entry_pointer = info.table_entry_pointer(k);
-
-            let destination_id = read_bsp_apic_id().expect("xhcid: failed to read BSP apic id");
-            let (msg_addr_and_data, interrupt_handle) =
-                allocate_single_interrupt_vector_for_msi(destination_id);
-            table_entry_pointer.write_addr_and_data(msg_addr_and_data);
-            table_entry_pointer.unmask();
-
-            (Some(interrupt_handle), InterruptMethod::Msi)
-        };
-
-        pcid_handle.enable_feature(PciFeature::MsiX);
-        log::debug!("Enabled MSI-X");
-
-        method
-    } else if has_msi {
-        let interrupt_handle = allocate_first_msi_interrupt_on_bsp(pcid_handle);
-        (Some(interrupt_handle), InterruptMethod::Msi)
-    } else if let Some(irq) = pci_config.func.legacy_interrupt_line {
-        log::debug!("Legacy IRQ {}", irq);
-
-        // legacy INTx# interrupt pins.
-        (Some(irq.irq_handle("xhcid")), InterruptMethod::Intx)
-    } else {
-        // no interrupts at all
-        (None, InterruptMethod::Polling)
-    }
-}
-
-//TODO: MSI on non-x86_64?
-#[cfg(not(target_arch = "x86_64"))]
-fn get_int_method(pcid_handle: &mut PciFunctionHandle) -> (Option<File>, InterruptMethod) {
-    let pci_config = pcid_handle.config();
-
-    if let Some(irq) = pci_config.func.legacy_interrupt_line {
-        // legacy INTx# interrupt pins.
-        (Some(irq.irq_handle("xhcid")), InterruptMethod::Intx)
-    } else {
-        // no interrupts at all
-        (None, InterruptMethod::Polling)
-    }
-}
-
-//TODO: cleanup CSZ support
-fn daemon_with_context_size<const N: usize>(
-    daemon: daemon::Daemon,
-    mut pcid_handle: PciFunctionHandle,
-) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_xhci");
-
-    common::setup_logging(
-        "usb",
-        "host",
-        &name,
-        common::output_level(),
-        common::file_level(),
-    );
-
-    log::debug!("XHCI PCI CONFIG: {:?}", pci_config);
-
-    let address = unsafe { pcid_handle.map_bar(0) }.ptr.as_ptr() as usize;
-
-    let (irq_file, interrupt_method) = (None, InterruptMethod::Polling); //get_int_method(&mut pcid_handle);
-                                                                         //TODO: Fix interrupts.
-
-    log::info!("XHCI {}", pci_config.func.display());
-
-    let scheme_name = format!("usb.{}", name);
-    let socket = Socket::create().expect("xhcid: failed to create usb scheme");
-    let handler = Blocking::new(&socket, 16);
-
-    let hci = Arc::new(
-        Xhci::<N>::new(scheme_name.clone(), address, interrupt_method, pcid_handle)
-            .expect("xhcid: failed to allocate device"),
-    );
-    register_sync_scheme(&socket, &scheme_name, &mut &*hci)
-        .expect("xhcid: failed to regsiter scheme to namespace");
-
-    daemon.ready();
-
-    xhci::start_irq_reactor(&hci, irq_file);
-    xhci::start_device_enumerator(&hci);
-
-    hci.poll();
-
-    handler
-        .process_requests_blocking(&*hci)
-        .expect("xhcid: failed to process requests");
-}
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let address = unsafe { pcid_handle.map_bar(0) }.ptr.as_ptr() as usize;
-    let cap = unsafe { &mut *(address as *mut xhci::CapabilityRegs) };
-    if cap.csz() {
-        daemon_with_context_size::<{ xhci::CONTEXT_64 }>(daemon, pcid_handle)
-    } else {
-        daemon_with_context_size::<{ xhci::CONTEXT_32 }>(daemon, pcid_handle)
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/usb/bos.rs b/recipes/core/base/drivers/usb/xhcid/src/usb/bos.rs
deleted file mode 100644
index f6a095712d..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/usb/bos.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use std::slice;
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct BosDescriptor {
-    pub len: u8,
-    pub kind: u8,
-    pub total_len: u16,
-    pub cap_count: u8,
-}
-
-unsafe impl plain::Plain for BosDescriptor {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct BosDevDescriptorBase {
-    pub len: u8,
-    pub kind: u8,
-    pub cap_ty: u8,
-}
-
-unsafe impl plain::Plain for BosDevDescriptorBase {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct BosSuperSpeedDesc {
-    pub len: u8,
-    pub kind: u8,
-    pub cap_ty: u8,
-
-    pub attrs: u8,
-    pub speed_supp: u16,
-    pub func_supp: u8,
-    pub u1_dev_exit_lat: u8,
-    pub u2_dev_exit_lat: u16,
-}
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct BosSuperSpeedPlusDesc {
-    pub len: u8,
-    pub kind: u8,
-    pub cap_ty: u8,
-    pub _rsvd0: u8,
-    pub attrs: u32,
-    pub func_supp: u32,
-    pub _rsvd1: u16,
-}
-
-unsafe impl plain::Plain for BosSuperSpeedPlusDesc {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct BosUsb2ExtDesc {
-    pub len: u8,
-    pub kind: u8,
-    pub cap_ty: u8,
-
-    pub attrs: u32,
-}
-
-unsafe impl plain::Plain for BosUsb2ExtDesc {}
-
-#[repr(u8)]
-pub enum DeviceCapability {
-    Usb2Ext = 0x02,
-    SuperSpeed,
-    SuperSpeedPlus = 0x0A,
-}
-
-unsafe impl plain::Plain for BosSuperSpeedDesc {}
-
-impl BosSuperSpeedPlusDesc {
-    pub fn ssac(&self) -> u8 {
-        (self.attrs & 0x0000_000F) as u8
-    }
-    pub fn sublink_speed_attr(&self) -> &[u32] {
-        unsafe {
-            slice::from_raw_parts(
-                (self as *const Self).add(1) as *const u32,
-                self.ssac() as usize + 1,
-            )
-        }
-    }
-}
-
-pub struct BosDevDescIter<'a> {
-    bytes: &'a [u8],
-}
-impl<'a> BosDevDescIter<'a> {
-    pub fn new(bytes: &'a [u8]) -> Self {
-        Self { bytes }
-    }
-}
-impl<'a> From<&'a [u8]> for BosDevDescIter<'a> {
-    fn from(slice: &'a [u8]) -> Self {
-        Self::new(slice)
-    }
-}
-impl<'a> Iterator for BosDevDescIter<'a> {
-    type Item = (BosDevDescriptorBase, &'a [u8]);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(desc) = plain::from_bytes::<BosDevDescriptorBase>(self.bytes).ok() {
-            if desc.len as usize > self.bytes.len() {
-                return None;
-            };
-            let bytes_ret = &self.bytes[..desc.len as usize];
-            self.bytes = &self.bytes[desc.len as usize..];
-            Some((*desc, bytes_ret))
-        } else {
-            return None;
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum BosAnyDevDesc {
-    Usb2Ext(BosUsb2ExtDesc),
-    SuperSpeed(BosSuperSpeedDesc),
-    SuperSpeedPlus(BosSuperSpeedPlusDesc),
-    Unknown,
-}
-
-impl BosAnyDevDesc {
-    pub fn is_superspeed(&self) -> bool {
-        match self {
-            Self::SuperSpeed(_) => true,
-            _ => false,
-        }
-    }
-    pub fn is_superspeedplus(&self) -> bool {
-        match self {
-            Self::SuperSpeedPlus(_) => true,
-            _ => false,
-        }
-    }
-}
-
-pub struct BosAnyDevDescIter<'a> {
-    inner: BosDevDescIter<'a>,
-}
-impl<'a> From<BosDevDescIter<'a>> for BosAnyDevDescIter<'a> {
-    fn from(ll: BosDevDescIter<'a>) -> Self {
-        Self { inner: ll }
-    }
-}
-impl<'a> From<&'a [u8]> for BosAnyDevDescIter<'a> {
-    fn from(slice: &'a [u8]) -> Self {
-        Self::from(BosDevDescIter::from(slice))
-    }
-}
-impl<'a> Iterator for BosAnyDevDescIter<'a> {
-    type Item = BosAnyDevDesc;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let (base, slice) = self.inner.next()?;
-
-        if base.cap_ty == DeviceCapability::Usb2Ext as u8 {
-            Some(BosAnyDevDesc::Usb2Ext(*plain::from_bytes(slice).ok()?))
-        } else if base.cap_ty == DeviceCapability::SuperSpeed as u8 {
-            Some(BosAnyDevDesc::SuperSpeed(*plain::from_bytes(slice).ok()?))
-        } else if base.cap_ty == DeviceCapability::SuperSpeedPlus as u8 {
-            Some(BosAnyDevDesc::SuperSpeedPlus(
-                *plain::from_bytes(slice).ok()?,
-            ))
-        } else if base.cap_ty == 0 {
-            // TODO
-            return None;
-        } else {
-            log::warn!("unknown USB device capability of type: {:#x}", base.cap_ty);
-            Some(BosAnyDevDesc::Unknown)
-        }
-    }
-}
-
-pub fn bos_capability_descs<'a>(
-    desc: BosDescriptor,
-    data: &'a [u8],
-) -> impl Iterator<Item = BosAnyDevDesc> + 'a {
-    BosAnyDevDescIter::from(&data[..desc.total_len as usize - std::mem::size_of_val(&desc)])
-        .take(desc.cap_count as usize)
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/usb/config.rs b/recipes/core/base/drivers/usb/xhcid/src/usb/config.rs
deleted file mode 100644
index 5d4a23bca7..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/usb/config.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct ConfigDescriptor {
-    pub length: u8,
-    pub kind: u8,
-    pub total_length: u16,
-    pub interfaces: u8,
-    pub configuration_value: u8,
-    pub configuration_str: u8,
-    pub attributes: u8,
-    pub max_power: u8,
-}
-
-unsafe impl plain::Plain for ConfigDescriptor {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct OtherSpeedConfig {
-    pub length: u8,
-    pub kind: u8,
-    pub total_length: u16,
-    pub interfaces: u8,
-    pub configuration_value: u8,
-    pub configuration_str: u8,
-    pub attributes: u8,
-    pub max_power: u8,
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/usb/device.rs b/recipes/core/base/drivers/usb/xhcid/src/usb/device.rs
deleted file mode 100644
index accac1c316..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/usb/device.rs
+++ /dev/null
@@ -1,191 +0,0 @@
-//! Implements the "Device" USB Descriptor.
-//!
-//! This descriptor is described in USB32 section 9.6.1
-
-/// A USB Device Descriptor.
-///
-/// This is common to all USB standards, and "provides information that applies globally to the
-/// device and all the device's configurations" (USB32 9.6.1)
-///
-/// A given device will only have one device descriptor.
-///
-/// USB32 Table 9-11 describes the USB packet offsets of the fields described by this structure.
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct DeviceDescriptor {
-    /// The length of this descriptor in bytes.
-    /// The bLength field in USB32 Table 9-11
-    pub length: u8,
-    /// The descriptor type. See [DescriptorKind]
-    /// The bDescriptorType field in USB32 Table 9-11.
-    pub kind: u8,
-    /// The USB standard version in binary-coded decimal.
-    ///
-    /// USB 2.1 would be encoded as 210H, 3.2 would be 320H.
-    /// The bcdUSB field in USB32 Table 9-11
-    pub usb: u16,
-    /// The USB Class Code.
-    ///
-    /// bDeviceClass in USB32 Table 9-11.
-    ///
-    /// These are values assigned by USB-IF that describes the type of device connected via USB.
-    ///
-    /// A value of FF indicates a vendor-specific class. A value of 0 indicates that all the
-    /// interfaces in a configuration will provide their own class information.
-    pub class: u8,
-    /// The USB Sub Device Class Code.
-    ///
-    /// bDeviceSubClass in USB32 Table 9-11
-    ///
-    /// These specify subclasses of a device class specified by the 'class' field.
-    pub sub_class: u8,
-    /// The USB Protocol code.
-    ///
-    /// bDeviceProtocol in USB32 Table 9-11
-    ///
-    /// This qualified by the class and sub_class fields, and specifies the application-layer protocol
-    /// (the protocol encapsulated by USB) of this device.
-    pub protocol: u8,
-    /// The maximum packet size for endpoint 0.
-    ///
-    /// bMaxPacketSize0 in USB32 Table 9-11
-    pub packet_size: u8,
-    /// The USB Vendor ID
-    ///
-    /// idVendor in USB32 Table 9-11
-    pub vendor: u16,
-    /// The USB Product ID
-    ///
-    /// idProduct in USB32 Table 9-11
-    pub product: u16,
-    /// The device release number in binary-coded decimal.
-    ///
-    /// bcdDevice in USB32 Table 9-11
-    pub release: u16,
-    /// Index of the String Descriptor describing the device manufacturer
-    ///
-    /// iManufacturer in USB32 Table 9-11
-    pub manufacturer_str: u8,
-    /// Index of the String Descriptor describing the product
-    ///
-    /// iProduct in Table 9-11
-    pub product_str: u8,
-    /// Index of the string descriptor describing the device's serial number
-    ///
-    /// iSerialNumber in USB32 Table 9-11
-    pub serial_str: u8,
-    /// The number of possible configurations (Configuration Descriptors) for this device.
-    ///
-    /// bNumConfigurations in USB32 Table 9-11
-    pub configurations: u8,
-}
-
-unsafe impl plain::Plain for DeviceDescriptor {}
-
-impl DeviceDescriptor {
-    /// Gets the USB Minor Version
-    pub fn minor_usb_vers(&self) -> u8 {
-        (self.usb & 0xFF) as u8
-    }
-    /// Gets the USB Major Version
-    pub fn major_usb_vers(&self) -> u8 {
-        ((self.usb >> 8) & 0xFF) as u8
-    }
-}
-
-/// The 8-byte version of the Device Descriptor
-///
-/// This is a subset of the full Device Descriptor. When the system is first performing device
-/// enumeration, it will request only the first eight bytes of the DeviceDescriptor from each
-/// device as this contains the crucial information, and then it will request the full descriptor
-/// at a later point.
-///
-/// See [DeviceDescriptor]
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct DeviceDescriptor8Byte {
-    /// See [DeviceDescriptor]
-    pub length: u8,
-    /// See [DeviceDescriptor]
-    pub kind: u8,
-    /// See [DeviceDescriptor]
-    pub usb: u16,
-    /// See [DeviceDescriptor]
-    pub class: u8,
-    /// See [DeviceDescriptor]
-    pub sub_class: u8,
-    /// See [DeviceDescriptor]
-    pub protocol: u8,
-    /// See [DeviceDescriptor]
-    pub packet_size: u8,
-}
-
-unsafe impl plain::Plain for DeviceDescriptor8Byte {}
-
-impl DeviceDescriptor8Byte {
-    /// Gets the USB Minor Version
-    pub fn minor_usb_vers(&self) -> u8 {
-        (self.usb & 0xFF) as u8
-    }
-
-    /// Gets the USB Major Version
-    pub fn major_usb_vers(&self) -> u8 {
-        ((self.usb >> 8) & 0xFF) as u8
-    }
-}
-
-/// A Device Qualifier Descriptor
-///
-/// This is a descriptor specific to the USB2 standard, and was deprecated in USB3. USB2 devices
-/// will still provide this value.
-///
-/// A Device Qualifier is sent by a high-speed capable USB2 device to describe information in its
-/// descriptor that would change if it was operating at the other speed. If it was at low speed,
-/// the qualifier would describe the device at high speed. If it was at high speed, the qualifier
-/// would describe the device at low speed.
-///
-/// See USB2 section 9.6.2
-///
-/// The packet offsets are described in USB2 Table 9-9
-#[repr(C, packed)]
-pub struct DeviceQualifier {
-    /// The size of the descriptor.
-    ///
-    /// bLength in USB2 Table 9-9
-    pub length: u8,
-    /// The Device Descriptor Type (see [xhci_interface::usb::DescriptorKind])
-    ///
-    /// bDescriptorType in USB2 Table 9-9
-    pub kind: u8,
-    /// The USB specification version number in binary-coded decimal
-    ///
-    /// bDeviceClass in USB2 Table 9-9
-    pub usb: u16,
-    /// The USB Device Class Code
-    ///
-    /// bDeviceClass in USB2 Table 9-9
-    pub class: u8,
-    /// The USB Device Sub Class Code
-    ///
-    /// bDeviceSubClass in USB2 Table 9-9
-    pub sub_class: u8,
-    /// The USB Device Protocol Code
-    ///
-    /// bDeviceProtocol in USB2 Table 9-9
-    pub protocol: u8,
-    /// The maximum packet size for the other speed\
-    ///
-    /// bMaxPacketSize0 in USB2 Table9-9
-    pub pkgsz_other_speed: u8,
-    /// The number of device configurations for the other speed
-    ///
-    /// bNumConfiguration in USB2 Table 9-9
-    pub num_other_speed_cfgs: u8,
-    /// Reserved for future use by the USB2 standard
-    ///
-    /// (DeviceQualifier was dropped in USB3, so it was never used!)
-    /// bReserved in USB2 Table 9-9
-    pub _rsvd: u8,
-}
-
-unsafe impl plain::Plain for DeviceQualifier {}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/usb/endpoint.rs b/recipes/core/base/drivers/usb/xhcid/src/usb/endpoint.rs
deleted file mode 100644
index e0f3510a7d..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/usb/endpoint.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use plain::Plain;
-
-/// The descriptor for a USB Endpoint.
-///
-/// Each endpoint for a particular interface has its own descriptor. The information in this
-/// structure is used by the host to determine the bandwidth requirements of the endpoint.
-///
-/// This is returned automatically when you send a request for a ConfigurationDescriptor,
-/// and cannot be requested individually.
-///
-/// See USB32 9.6.6
-///
-/// The offsets for the fields in the packet are described in USB32 Table 9-26
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct EndpointDescriptor {
-    pub length: u8,
-    pub kind: u8,
-    pub address: u8,
-    pub attributes: u8,
-    pub max_packet_size: u16,
-    pub interval: u8,
-}
-
-/// Mask that is ANDed to the [EndpointDescriptor].attributes buffer to get the endpoint type.
-pub const ENDP_ATTR_TY_MASK: u8 = 0x3;
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum EndpointTy {
-    Ctrl = 0,
-    Isoch = 1,
-    Bulk = 2,
-    Interrupt = 3,
-}
-
-impl EndpointDescriptor {
-    fn ty(self) -> EndpointTy {
-        match self.attributes & ENDP_ATTR_TY_MASK {
-            0 => EndpointTy::Ctrl,
-            1 => EndpointTy::Isoch,
-            2 => EndpointTy::Bulk,
-            3 => EndpointTy::Interrupt,
-            _ => unreachable!(),
-        }
-    }
-}
-
-unsafe impl Plain for EndpointDescriptor {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct SuperSpeedCompanionDescriptor {
-    pub length: u8,
-    pub kind: u8,
-    pub max_burst: u8,
-    pub attributes: u8,
-    pub bytes_per_interval: u16,
-}
-unsafe impl Plain for SuperSpeedCompanionDescriptor {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct SuperSpeedPlusIsochCmpDescriptor {
-    pub length: u8,
-    pub kind: u8,
-    pub reserved: u16,
-    pub bytes_per_interval: u32,
-}
-unsafe impl Plain for SuperSpeedPlusIsochCmpDescriptor {}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct HidDescriptor {
-    pub length: u8,
-    pub kind: u8,
-    pub hid_spec_release: u16,
-    pub country_code: u8,
-    pub num_descriptors: u8,
-    pub report_desc_ty: u8,
-    pub report_desc_len: u16,
-    pub optional_desc_ty: u8,
-    pub optional_desc_len: u16,
-}
-
-unsafe impl Plain for HidDescriptor {}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/usb/hub.rs b/recipes/core/base/drivers/usb/xhcid/src/usb/hub.rs
deleted file mode 100644
index 9dab55e85a..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/usb/hub.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct HubDescriptorV2 {
-    pub length: u8,
-    pub kind: u8,
-    pub ports: u8,
-    pub characteristics: u16,
-    pub power_on_good: u8,
-    pub current: u8,
-    /*TODO: USB 2 and 3 disagree on the descriptor, so some fields are disabled
-    // device_removable: bitmap of ports, maximum of 256 bits (32 bytes)
-    // power_control_mask: bitmap of ports, maximum of 256 bits (32 bytes)
-    bitmaps: [u8; 64],
-    */
-}
-
-unsafe impl plain::Plain for HubDescriptorV2 {}
-
-impl HubDescriptorV2 {
-    pub const DESCRIPTOR_KIND: u8 = 0x29;
-}
-
-impl Default for HubDescriptorV2 {
-    fn default() -> Self {
-        Self {
-            length: 0,
-            kind: 0,
-            ports: 0,
-            characteristics: 0,
-            power_on_good: 0,
-            current: 0,
-            /*
-            bitmaps: [0; 64],
-            */
-        }
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct HubDescriptorV3 {
-    pub length: u8,
-    pub kind: u8,
-    pub ports: u8,
-    pub characteristics: u16,
-    pub power_on_good: u8,
-    pub current: u8,
-    pub decode_latency: u8,
-    pub delay: u16,
-    /*TODO: USB 2 and 3 disagree on the descriptor, so some fields are disabled
-    // device_removable: bitmap of ports, maximum of 256 bits (32 bytes)
-    // power_control_mask: bitmap of ports, maximum of 256 bits (32 bytes)
-    bitmaps: [u8; 64],
-    */
-}
-
-unsafe impl plain::Plain for HubDescriptorV3 {}
-
-impl HubDescriptorV3 {
-    pub const DESCRIPTOR_KIND: u8 = 0x2A;
-}
-
-impl Default for HubDescriptorV3 {
-    fn default() -> Self {
-        Self {
-            length: 0,
-            kind: 0,
-            ports: 0,
-            characteristics: 0,
-            power_on_good: 0,
-            current: 0,
-            decode_latency: 0,
-            delay: 0,
-            /*
-            bitmaps: [0; 64],
-            */
-        }
-    }
-}
-
-// This only includes matching features from both USB 2.0 and 3.0 specs
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-pub enum HubPortFeature {
-    PortConnection = 0,
-    PortOverCurrent = 3,
-    PortReset = 4,
-    PortLinkState = 5,
-    PortPower = 8,
-    CPortConnection = 16,
-    CPortOverCurrent = 19,
-    CPortReset = 20,
-}
-
-bitflags::bitflags! {
-    #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
-    #[repr(transparent)]
-    pub struct HubPortStatusV2: u32 {
-        const CONNECTION = 1 << 0;
-        const ENABLE = 1 << 1;
-        const SUSPEND = 1 << 2;
-        const OVER_CURRENT = 1 << 3;
-        const RESET = 1 << 4;
-        // bits 5-7 reserved
-        const POWER = 1 << 8;
-        const LOW_SPEED = 1 << 9;
-        const HIGH_SPEED = 1 << 10;
-        const TEST = 1 << 11;
-        const INDICATOR = 1 << 12;
-        // bits 13-15 reserved
-        const CONNECTION_CHANGED = 1 << 16;
-        const ENABLE_CHANGED = 1 << 17;
-        const SUSPEND_CHANGED = 1 << 18;
-        const OVER_CURRENT_CHANGED = 1 << 19;
-        const RESET_CHANGED = 1 << 20;
-        // bits 21 - 31 reserved
-    }
-}
-
-unsafe impl plain::Plain for HubPortStatusV2 {}
-
-bitflags::bitflags! {
-    #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
-    #[repr(transparent)]
-    pub struct HubPortStatusV3: u32 {
-        const CONNECTION = 1 << 0;
-        const ENABLE = 1 << 1;
-        // bit 2 reserved
-        const OVER_CURRENT = 1 << 3;
-        const RESET = 1 << 4;
-        const LINK_STATE_0 = 1 << 5;
-        const LINK_STATE_1 = 1 << 6;
-        const LINK_STATE_2 = 1 << 7;
-        const LINK_STATE_3 = 1 << 8;
-        const POWER = 1 << 9;
-        const SPEED_0 = 1 << 10;
-        const SPEED_1 = 1 << 11;
-        const SPEED_2 = 1 << 12;
-        // bits 13 - 15 reserved
-        const CONNECTION_CHANGED = 1 << 16;
-        // bits 17-18
-        const OVER_CURRENT_CHANGED = 1 << 19;
-        const RESET_CHANGED = 1 << 20;
-        const BH_RESET_CHANGED = 1 << 21;
-        const LINK_STATE_CHANGED = 1 << 22;
-        const CONFIG_ERROR = 1 << 23;
-        // bits 24 - 31 reserved
-    }
-}
-
-unsafe impl plain::Plain for HubPortStatusV3 {}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum HubPortStatus {
-    V2(HubPortStatusV2),
-    V3(HubPortStatusV3),
-}
-
-impl HubPortStatus {
-    pub fn is_powered(&self) -> bool {
-        match self {
-            Self::V2(x) => x.contains(HubPortStatusV2::POWER),
-            Self::V3(x) => x.contains(HubPortStatusV3::POWER),
-        }
-    }
-
-    pub fn is_connected(&self) -> bool {
-        match self {
-            Self::V2(x) => x.contains(HubPortStatusV2::CONNECTION),
-            Self::V3(x) => x.contains(HubPortStatusV3::CONNECTION),
-        }
-    }
-
-    pub fn is_resetting(&self) -> bool {
-        match self {
-            Self::V2(x) => x.contains(HubPortStatusV2::RESET),
-            Self::V3(x) => x.contains(HubPortStatusV3::RESET),
-        }
-    }
-
-    pub fn is_enabled(&self) -> bool {
-        match self {
-            Self::V2(x) => x.contains(HubPortStatusV2::ENABLE),
-            Self::V3(x) => x.contains(HubPortStatusV3::ENABLE),
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/usb/interface.rs b/recipes/core/base/drivers/usb/xhcid/src/usb/interface.rs
deleted file mode 100644
index 4b60e06cf0..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/usb/interface.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use plain::Plain;
-
-///
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct InterfaceDescriptor {
-    pub length: u8,
-    pub kind: u8,
-    pub number: u8,
-    pub alternate_setting: u8,
-    pub endpoints: u8,
-    pub class: u8,
-    pub sub_class: u8,
-    pub protocol: u8,
-    pub interface_str: u8,
-}
-
-unsafe impl Plain for InterfaceDescriptor {}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/usb/mod.rs b/recipes/core/base/drivers/usb/xhcid/src/usb/mod.rs
deleted file mode 100644
index d0d659882a..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/usb/mod.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-//! The Universal Serial Bus (USB) Module
-//!
-//! The implementations in this module are common to all USB interfaces (though individual elements
-//! may be specific to only 2.0 or 3.2), and are used by specialized driver components like [xhci]
-//! to implement the driver interface.
-//!
-//! The [Universal Serial Bus Specification](https://www.usb.org/document-library/usb-20-specification) and the [Universal Serial Bus 3.2 Specification](https://usb.org/document-library/usb-32-revision-11-june-2022) are
-//! the documents that inform this implementation.
-//!
-//! See the crate-level documentation for the acronyms used to refer to specific documents.
-pub use self::bos::{bos_capability_descs, BosAnyDevDesc, BosDescriptor, BosSuperSpeedDesc};
-pub use self::config::ConfigDescriptor;
-pub use self::device::{DeviceDescriptor, DeviceDescriptor8Byte};
-pub use self::endpoint::{
-    EndpointDescriptor, EndpointTy, HidDescriptor, SuperSpeedCompanionDescriptor,
-    SuperSpeedPlusIsochCmpDescriptor, ENDP_ATTR_TY_MASK,
-};
-pub use self::hub::*;
-pub use self::interface::InterfaceDescriptor;
-pub use self::setup::{Setup, SetupReq};
-
-/// Enumerates the list of descriptor kinds that can be reported by a USB device to report its
-/// attributes to the system. (See USB32 Sections 9.5 and 9.6)
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-pub enum DescriptorKind {
-    /// No Descriptor TODO: Determine why this state exists, and what it does in the code.
-    None = 0,
-    /// A Device Descriptor. See [DeviceDescriptor]
-    Device = 1,
-    /// A Configuration Descriptor. See [ConfigDescriptor]
-    Configuration = 2,
-    /// A String Descriptor. See (USB32 Section 9.6.9).
-    String = 3,
-    /// An Interface Descriptor. See [InterfaceDescriptor]
-    Interface = 4,
-    /// An Endpoint Descriptor. See [EndpointDescriptor]
-    Endpoint = 5,
-    /// A Device Qualifier. USB2-specific. See [DeviceQualifier]
-    DeviceQualifier = 6,
-    /// The "Other Speed Configuration" descriptor. USB2-specific. See (USB2 9.6.4]
-    OtherSpeedConfiguration = 7,
-    /// TODO: Determine the standard that specifies this
-    InterfacePower = 8,
-    /// TODO: Determine the standard that specifies this (Possibly USB-C?)
-    OnTheGo = 9,
-    /// A Binary Device Object Store Descriptor. See [BosDescriptor]
-    BinaryObjectStorage = 15,
-    /// TODO: Track down the HID standard for references
-    Hid = 33,
-    /// A USB Hub Device Descriptor. See [HubDescriptor]
-    Hub = 41,
-    /// A Super Speed Endpoint Companion Descriptor. See [SuperSpeedCompanionDescriptor]
-    SuperSpeedCompanion = 48,
-}
-
-pub(crate) mod bos;
-pub(crate) mod config;
-pub(crate) mod device;
-pub(crate) mod endpoint;
-pub(crate) mod hub;
-pub(crate) mod interface;
-pub(crate) mod setup;
diff --git a/recipes/core/base/drivers/usb/xhcid/src/usb/setup.rs b/recipes/core/base/drivers/usb/xhcid/src/usb/setup.rs
deleted file mode 100644
index dc315ac502..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/usb/setup.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use super::DescriptorKind;
-use crate::driver_interface::*;
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Default)]
-pub struct Setup {
-    pub kind: u8,
-    pub request: u8,
-    pub value: u16,
-    pub index: u16,
-    pub length: u16,
-}
-
-#[repr(u8)]
-pub enum ReqDirection {
-    HostToDevice = 0,
-    DeviceToHost = 1,
-}
-impl From<PortReqDirection> for ReqDirection {
-    fn from(d: PortReqDirection) -> Self {
-        match d {
-            PortReqDirection::DeviceToHost => Self::DeviceToHost,
-            PortReqDirection::HostToDevice => Self::HostToDevice,
-        }
-    }
-}
-
-#[repr(u8)]
-pub enum ReqType {
-    /// Standard device requests, such as SET_ADDRESS and SET_CONFIGURATION. These aren't directly
-    /// accessible using the API, but are sent from xhcid when required.
-    Standard = 0,
-
-    /// Class specific requests that are directly accessible from the API.
-    Class = 1,
-
-    /// Vendor specific requests that are accessible using the API.
-    Vendor = 2,
-
-    /// Reserved
-    Reserved = 3,
-}
-impl From<PortReqTy> for ReqType {
-    fn from(d: PortReqTy) -> Self {
-        match d {
-            PortReqTy::Standard => Self::Standard,
-            PortReqTy::Class => Self::Class,
-            PortReqTy::Vendor => Self::Vendor,
-        }
-    }
-}
-
-#[repr(u8)]
-pub enum ReqRecipient {
-    Device = 0,
-    Interface = 1,
-    Endpoint = 2,
-    Other = 3,
-    // 4..=30 are reserved
-    VendorSpecific = 31,
-}
-impl From<PortReqRecipient> for ReqRecipient {
-    fn from(d: PortReqRecipient) -> Self {
-        match d {
-            PortReqRecipient::Device => Self::Device,
-            PortReqRecipient::Interface => Self::Interface,
-            PortReqRecipient::Endpoint => Self::Endpoint,
-            PortReqRecipient::Other => Self::Other,
-            PortReqRecipient::VendorSpecific => Self::VendorSpecific,
-        }
-    }
-}
-
-#[repr(u8)]
-pub enum SetupReq {
-    GetStatus = 0x00,
-    ClearFeature = 0x01,
-    SetFeature = 0x03,
-    SetAddress = 0x05,
-    GetDescriptor = 0x06,
-    SetDescriptor = 0x07,
-    GetConfiguration = 0x08,
-    SetConfiguration = 0x09,
-    GetInterface = 0x0A,
-    SetInterface = 0x0B,
-    SynchFrame = 0x0C,
-}
-
-pub const USB_SETUP_DIR_BIT: u8 = 1 << 7;
-pub const USB_SETUP_DIR_SHIFT: u8 = 7;
-pub const USB_SETUP_REQ_TY_MASK: u8 = 0x60;
-pub const USB_SETUP_REQ_TY_SHIFT: u8 = 5;
-pub const USB_SETUP_RECIPIENT_MASK: u8 = 0x1F;
-pub const USB_SETUP_RECIPIENT_SHIFT: u8 = 0;
-
-impl Setup {
-    pub fn direction(&self) -> ReqDirection {
-        if self.kind & USB_SETUP_DIR_BIT == 0 {
-            ReqDirection::HostToDevice
-        } else {
-            ReqDirection::DeviceToHost
-        }
-    }
-    pub const fn req_ty(&self) -> u8 {
-        (self.kind & USB_SETUP_REQ_TY_MASK) >> USB_SETUP_REQ_TY_SHIFT
-    }
-
-    pub const fn req_recipient(&self) -> u8 {
-        (self.kind & USB_SETUP_RECIPIENT_MASK) >> USB_SETUP_RECIPIENT_SHIFT
-    }
-    pub fn is_allowed_from_api(&self) -> bool {
-        self.req_ty() == ReqType::Class as u8 || self.req_ty() == ReqType::Vendor as u8
-    }
-
-    pub const fn get_status() -> Self {
-        Self {
-            kind: 0b1000_0000,
-            request: 0x00,
-            value: 0,
-            index: 0,
-            length: 2,
-        }
-    }
-
-    pub const fn clear_feature(feature: u16) -> Self {
-        Self {
-            kind: 0b0000_0000,
-            request: 0x01,
-            value: feature,
-            index: 0,
-            length: 0,
-        }
-    }
-
-    pub const fn set_feature(feature: u16) -> Self {
-        Self {
-            kind: 0b0000_0000,
-            request: 0x03,
-            value: feature,
-            index: 0,
-            length: 0,
-        }
-    }
-
-    pub const fn set_address(address: u16) -> Self {
-        Self {
-            kind: 0b0000_0000,
-            request: 0x05,
-            value: address,
-            index: 0,
-            length: 0,
-        }
-    }
-
-    pub const fn get_descriptor(
-        kind: DescriptorKind,
-        index: u8,
-        language: u16,
-        length: u16,
-    ) -> Self {
-        Self {
-            kind: 0b1000_0000,
-            request: 0x06,
-            value: ((kind as u16) << 8) | (index as u16),
-            index: language,
-            length: length,
-        }
-    }
-
-    pub const fn set_descriptor(kind: u8, index: u8, language: u16, length: u16) -> Self {
-        Self {
-            kind: 0b0000_0000,
-            request: 0x07,
-            value: ((kind as u16) << 8) | (index as u16),
-            index: language,
-            length: length,
-        }
-    }
-
-    pub const fn get_configuration() -> Self {
-        Self {
-            kind: 0b1000_0000,
-            request: 0x08,
-            value: 0,
-            index: 0,
-            length: 1,
-        }
-    }
-
-    pub const fn set_configuration(value: u8) -> Self {
-        Self {
-            kind: 0b0000_0000,
-            request: 0x09,
-            value: value as u16,
-            index: 0,
-            length: 0,
-        }
-    }
-
-    pub const fn set_interface(interface: u8, alternate_setting: u8) -> Self {
-        Self {
-            kind: 0b0000_0001,
-            request: 0x0B,
-            value: alternate_setting as u16,
-            index: interface as u16,
-            length: 0,
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/capability.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/capability.rs
deleted file mode 100644
index 2ad4ad1aa0..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/capability.rs
+++ /dev/null
@@ -1,225 +0,0 @@
-use common::io::{Io, Mmio};
-
-/// Represents the memory-mapped Capability Registers of the XHCI
-///
-/// These are read-only registers that specify the capabilities
-/// of the host controller implementation.
-///
-/// They are used by the driver to determine what subsystems to
-/// configure during initialization.
-///
-/// See XHCI Section 5.3. Table 5-9 describes the offsets of the registers
-/// in memory.
-#[repr(C, packed)]
-pub struct CapabilityRegs {
-    /// The length of the Capability Registers data structure in XHCI memory.
-    ///
-    /// While only the registers in this structure are defined by the XHCI standard,
-    /// the standard defines an arbitrary amount of space following those registers that
-    /// are reserved for the standard. As such, you need to know the offset to the operational
-    /// registers, which immediately follow.
-    ///
-    /// CAPLENGTH in XHC Table 5-9. See XHC 5.3.1
-    pub len: Mmio<u8>,
-    /// Reserved byte
-    ///
-    /// Rsvd in XHC Table 5-9
-    _rsvd: Mmio<u8>,
-    /// The XHCI interface version number in Binary-Encoded Decimal.
-    ///
-    /// This specifies the version of the XHCI specification that is supported by this controller.
-    /// HCIVERSION in XHC Table 5-9
-    pub hci_ver: Mmio<u16>,
-    /// The HCI Structural Parameters 1 Register.
-    ///
-    /// -Bits 0 - 7 describe the number of device slots supported by this controller
-    /// -Bits 8 - 18 describe the number of interrupters supported by this controller
-    /// -Bits 19-23 are reserved
-    /// -Bits 24-31 specify the maximum number of ports supported by this controller.
-    ///
-    /// HCPARAMS1 in XHC Table 5-9. See 5.3.3
-    pub hcs_params1: Mmio<u32>,
-    /// The HCI Structural Parameters 2 Register.
-    ///
-    /// - Bits 0-3 describe the Isochronus Scheduling Threshold (IST)
-    /// - Bits 4-7 describe the Event Ring Segment Table Max (ERST Max). The maximum number of event
-    /// ring segment table entries is 2^(ERST Max)
-    /// - Bits 8-20 are reserved
-    /// - Bits 25-21 describe the high order five bits of the maximum number of scratchpad buffers
-    /// - Bit  26 is the Scratchpad Restore Buffer (SPR). (See XHC 4.23.2)
-    /// - Bits 26-31 describe the low order five bits of the maximum number of scratchpad buffers
-    ///
-    /// HCPARAMS2 in XHC Table 5-9. See 5.3.4
-    pub hcs_params2: Mmio<u32>,
-    /// The HCI Structural Parameters 3 Register.
-    ///
-    /// - Bits 0-7 describes the worst-case U1 Device Exit Latency. Values are in microseconds, from 00h to 0Ah. 0B-FFh are reserved
-    /// - Bits 8-15 are reserved
-    /// - Bits 16-31 describe the worst-case U2 Device Exit Latency. Values are in microseconds, from 0000h to 07FFh. 0800-FFFFh are reserved
-    ///
-    /// HCPARAMS3 in XHC Table 5-9. See XHC 5.3.5
-    pub hcs_params3: Mmio<u32>,
-    /// The HCI Capability Parameters 1 Register.
-    ///
-    /// This register defines optional capabilities supported by the xHCI
-    ///
-    /// - Bit 0 is the 64-bit Address Capability Flag (AC64). 0 = 32-bit pointers, 1 = 64-bit pointers.
-    /// - Bit 1 is the Bandwidth Negotation Capability Flag (BNC)
-    /// - Bit 2 is the Context Size Flag (CSZ). 0 = 32-byte, 1 = 64-byte Context Data Structures
-    /// - Bit 3 is the Port Power Control Flag (PPC). Indicates whether the implementation supports port power control.
-    /// - Bit 4 is the Port Indicators Flag (PIND). Indicates whether the XHC root hub supports port indicator control
-    /// - Bit 5 is the Light Host Controller Reset Capability Flag (LHRC). Indicates whether the implementation supports a light reset
-    /// - Bit 6 is the Latency Tolerance Messaging Capability Flag (LTC). Indicates whether the implementation supports Latency Tolerance Messaging
-    /// - Bit 7 is the no Secondary SID Support Flag (NSS). Indicates whether secondary stream ids is supported. 1 = NO, 0 = YES
-    /// - Bit 8 is the Parse All Event Data Flag (PAE). (See XHC Table 5-13)
-    /// - Bit 9 is the Stopped - Short Packet Capability Flag (SPC). (See XHC 4.6.9)
-    /// - Bit 10 is the Stopped EDTLA Capability Flag (SEC). (See XHC 4.6.9, 4.12, and 6.4.4.1)
-    /// - Bit 11 is the Contiguous Frame ID Capability Flag (CFC). (See XHC 4.11.2.5)
-    /// - Bits 12-15 are the Maximum Primary Stream Array Size (MaxPSASize). Identifies the maximum size of PSA that the implementation supports.
-    /// - Bits 16-31 The xHCI Extended Capabilities Pointer (xECP). Points to an extended capabilities list. (See XHC Table 5-13 to see how to process this value)
-    ///
-    /// HCCPARAMS1 in XHC Table 5-9. See XHC 5.3.6
-    pub hcc_params1: Mmio<u32>,
-    /// The Doorbell Offset Register
-    ///
-    /// This register defines the offset of the Doorbell Array base address from the Base.
-    ///
-    /// Bits 0-1 are reserved.
-    /// Bits 2-31 contain the offset.
-    ///
-    /// DBOFF in XHC Table 5-9. See XHC 5.3.7
-    pub db_offset: Mmio<u32>,
-    /// The Runtime Register Space Offset
-    ///
-    /// The offset of the xHCI Runtime Registers from the Base.
-    ///
-    /// - Bits 0-4 are reserved.
-    /// - Bits 5-31 contain the offset.
-    ///
-    /// RTSOFF in XHC Table 5-9. See XHC 5.3.8
-    pub rts_offset: Mmio<u32>,
-    /// The HC Capability Parameters 2 Register
-    ///
-    /// This register defines optional capabilities supported by the xHCI
-    ///
-    /// - Bit 0 is the UC3 Entry Capability Flag (U3C). See XHC 4.15.1
-    /// - Bit 1 is the Configure Endpoint Command Max Latency Too Large Capability Flag (CMC). See XHC 4.23.5.2 and 5.4.1
-    /// - Bit 2 is the Force Save Context Capability (FCS). See XHC 4.23.2 and 5.4.1
-    /// - Bit 3 is the Compliance Transition Capability (CTC). See XHC 4.19.2.4.1
-    /// - Bit 4 is the Large ESIT Payload Capability (LEC). See XHC 6.2.3.8
-    /// - Bit 5 is the Configuration Information Capability (CIC). See XHC 6.2.5.1
-    /// - Bit 6 is the Extended TBC Capability (ETC). See XHC 4.11.2.3
-    /// - Bit 7 is the Extended TBC TRB Status Capability (ETC_TSC). See XHC 4.11.2.3
-    /// - Bit 8 is the Get/Set Extended Property Capability (GSC). See Sections XHC 4.6.17 and 4.6.18
-    /// - Bits 10-31 are reserved.
-    pub hcc_params2: Mmio<u32>,
-    //TODO: VTIOSOFF register for I/O virtualization
-}
-
-/// The mask to use to get the AC64 bit from HCCPARAMS1. See [CapabilityRegs]
-pub const HCC_PARAMS1_AC64_BIT: u32 = 1 << HCC_PARAMS1_AC64_SHIFT;
-/// The shift to use to get the AC64 bit from HCCParams1. See [CapabilityRegs]
-pub const HCC_PARAMS1_AC64_SHIFT: u8 = 0;
-/// The mask to use to get the CSZ bit from HCCPARAMS1. See [CapabilityRegs]
-pub const HCC_PARAMS1_CSZ_BIT: u32 = 1 << HCC_PARAMS1_CSZ_SHIFT;
-/// The shift to use to get the CSZ bit from HCCParams1. See [CapabilityRegs]
-pub const HCC_PARAMS1_CSZ_SHIFT: u8 = 2;
-/// The Mask to use to get the MAXPSASIZE value from HCCParams1. See [CapabilityRegs]
-pub const HCC_PARAMS1_MAXPSASIZE_MASK: u32 = 0xF000; // 15:12
-/// The shift to use to get the MAXPSASIZE value from HCCParams1. See [CapabilityRegs]
-pub const HCC_PARAMS1_MAXPSASIZE_SHIFT: u8 = 12;
-/// The mask to use to get the XECP value from HCCParams1. See [CapabilityRegs]
-pub const HCC_PARAMS1_XECP_MASK: u32 = 0xFFFF_0000;
-/// The shift to use to get the XECP value from HCCParams1. See [CapabilityRegs]
-pub const HCC_PARAMS1_XECP_SHIFT: u8 = 16;
-
-/// The mask to use to get the LEC bit from HCCParams2. See [CapabilityRegs]
-pub const HCC_PARAMS2_LEC_BIT: u32 = 1 << 4;
-/// The mask to use to get the CIC bit from HCCParams2. See [CapabilityRegs]
-pub const HCC_PARAMS2_CIC_BIT: u32 = 1 << 5;
-/// The mask to use to get MAXPORTS from HCSParams1. See [CapabilityRegs]
-pub const HCS_PARAMS1_MAX_PORTS_MASK: u32 = 0xFF00_0000;
-/// The shift to use to get MAXPORTS from HCSParams1. See [CapabilityRegs]
-pub const HCS_PARAMS1_MAX_PORTS_SHIFT: u8 = 24;
-/// The shift to use to get MAXSLOTS from HCSParams1. See [CapabilityRegs]
-pub const HCS_PARAMS1_MAX_SLOTS_MASK: u32 = 0x0000_00FF;
-/// The shift to use to get MAXSLOTS from HCSParams1. See [CapabilityRegs]
-pub const HCS_PARAMS1_MAX_SLOTS_SHIFT: u8 = 0;
-/// The mask to use to get MAXSCRATPADBUFS_LO from HCSParams2. See [CapabilityRegs]
-pub const HCS_PARAMS2_MAX_SCRATCHPAD_BUFS_LO_MASK: u32 = 0xF800_0000;
-/// The shift to use to get MAXSCRATCHPADBUFS_LO from HCSParams2. See [CapabilityRegs]
-pub const HCS_PARAMS2_MAX_SCRATCHPAD_BUFS_LO_SHIFT: u8 = 27;
-/// The mask to use to get the SPR bit from HCSParams2. See [CapabilityRegs]
-pub const HCS_PARAMS2_SPR_BIT: u32 = 1 << HCS_PARAMS2_SPR_SHIFT;
-/// The shift to use to get the SPR bit from HCSParams2. See [CapabilityRegs]
-pub const HCS_PARAMS2_SPR_SHIFT: u8 = 26;
-/// The mask to use to get MAXSCRATCHPADBUFS_HI from HCSParams2. See [CapabilityRegs]
-pub const HCS_PARAMS2_MAX_SCRATCHPAD_BUFS_HI_MASK: u32 = 0x03E0_0000;
-/// The shift to use to get MAXSCRATCHPADBUFS_HI from HCSParams2. See [CapabilityRegs]
-
-pub const HCS_PARAMS2_MAX_SCRATCHPAD_BUFS_HI_SHIFT: u8 = 21;
-
-impl CapabilityRegs {
-    /// Gets the ACS64 bit from HCCParams1.
-    pub fn ac64(&self) -> bool {
-        self.hcc_params1.readf(HCC_PARAMS1_AC64_BIT)
-    }
-
-    /// Gets the context size (CSZ) bit from HCCParams1.
-    pub fn csz(&self) -> bool {
-        self.hcc_params1.readf(HCC_PARAMS1_CSZ_BIT)
-    }
-
-    /// Gets the LEC bit from HCCParams2.
-    pub fn lec(&self) -> bool {
-        self.hcc_params2.readf(HCC_PARAMS2_LEC_BIT)
-    }
-    /// Gets the CIC bit from HCCParams2.
-    pub fn cic(&self) -> bool {
-        self.hcc_params2.readf(HCC_PARAMS2_CIC_BIT)
-    }
-
-    /// Gets the Max PSA Size from HCCParams1
-    pub fn max_psa_size(&self) -> u8 {
-        ((self.hcc_params1.read() & HCC_PARAMS1_MAXPSASIZE_MASK) >> HCC_PARAMS1_MAXPSASIZE_SHIFT)
-            as u8
-    }
-
-    /// Gets the maximum number of ports from HCCParams1
-    pub fn max_ports(&self) -> u8 {
-        ((self.hcs_params1.read() & HCS_PARAMS1_MAX_PORTS_MASK) >> HCS_PARAMS1_MAX_PORTS_SHIFT)
-            as u8
-    }
-
-    /// Gets the maximum number of ports from HCCParams 2
-    pub fn max_slots(&self) -> u8 {
-        (self.hcs_params1.read() & HCS_PARAMS1_MAX_SLOTS_MASK) as u8
-    }
-
-    /// Gets the extended capability pointer from HCCParams1 in DWORDs.
-    pub fn ext_caps_ptr_in_dwords(&self) -> u16 {
-        ((self.hcc_params1.read() & HCC_PARAMS1_XECP_MASK) >> HCC_PARAMS1_XECP_SHIFT) as u16
-    }
-
-    /// Gets the lower five bits from the Max Scratchpad Buffer Lo Register in HCSParams2
-    pub fn max_scratchpad_bufs_lo(&self) -> u8 {
-        ((self.hcs_params2.read() & HCS_PARAMS2_MAX_SCRATCHPAD_BUFS_LO_MASK)
-            >> HCS_PARAMS2_MAX_SCRATCHPAD_BUFS_LO_SHIFT) as u8
-    }
-
-    /// Gets the SPR register from HCSParams2
-    pub fn spr(&self) -> bool {
-        self.hcs_params2.readf(HCS_PARAMS2_SPR_BIT)
-    }
-
-    /// Gets the higher five bits from the Max Scratchpad Buffer Hi Register in HCSParams2
-    pub fn max_scratchpad_bufs_hi(&self) -> u8 {
-        ((self.hcs_params2.read() & HCS_PARAMS2_MAX_SCRATCHPAD_BUFS_HI_MASK)
-            >> HCS_PARAMS2_MAX_SCRATCHPAD_BUFS_HI_SHIFT) as u8
-    }
-
-    /// Gets the maximum number of scratchpad buffers supported by this implementation.
-    pub fn max_scratchpad_bufs(&self) -> u16 {
-        u16::from(self.max_scratchpad_bufs_lo()) | (u16::from(self.max_scratchpad_bufs_hi()) << 5)
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/context.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/context.rs
deleted file mode 100644
index b8f2f45a95..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/context.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use std::collections::BTreeMap;
-
-use common::io::{Io, Mmio};
-use log::debug;
-use syscall::error::Result;
-use syscall::PAGE_SIZE;
-
-use common::dma::Dma;
-
-use super::ring::Ring;
-use super::Xhci;
-
-pub const CONTEXT_32: usize = 0;
-pub const CONTEXT_64: usize = 1;
-
-#[repr(C, packed)]
-struct Rsvd64<const N: usize>([[Mmio<u32>; 8]; N]);
-
-#[repr(C, packed)]
-pub struct SlotContext<const N: usize> {
-    pub a: Mmio<u32>,
-    pub b: Mmio<u32>,
-    pub c: Mmio<u32>,
-    pub d: Mmio<u32>,
-    _rsvd: [Mmio<u32>; 4],
-    _rsvd64: Rsvd64<N>,
-}
-
-pub const SLOT_CONTEXT_STATE_MASK: u32 = 0xF800_0000;
-pub const SLOT_CONTEXT_STATE_SHIFT: u8 = 27;
-
-#[repr(u8)]
-pub enum SlotState {
-    EnabledOrDisabled = 0,
-    Default = 1,
-    Addressed = 2,
-    Configured = 3,
-}
-
-#[repr(C, packed)]
-pub struct EndpointContext<const N: usize> {
-    pub a: Mmio<u32>,
-    pub b: Mmio<u32>,
-    pub trl: Mmio<u32>,
-    pub trh: Mmio<u32>,
-    pub c: Mmio<u32>,
-    _rsvd: [Mmio<u32>; 3],
-    _rsvd64: Rsvd64<N>,
-}
-
-pub const ENDPOINT_CONTEXT_STATUS_MASK: u32 = 0x7;
-
-#[repr(C, packed)]
-pub struct DeviceContext<const N: usize> {
-    pub slot: SlotContext<N>,
-    pub endpoints: [EndpointContext<N>; 31],
-}
-
-#[repr(C, packed)]
-pub struct InputContext<const N: usize> {
-    pub drop_context: Mmio<u32>,
-    pub add_context: Mmio<u32>,
-    _rsvd: [Mmio<u32>; 5],
-    pub control: Mmio<u32>,
-    _rsvd64: Rsvd64<N>,
-    pub device: DeviceContext<N>,
-}
-impl<const N: usize> InputContext<N> {
-    pub fn dump_control(&self) {
-        debug!(
-            "INPUT CONTEXT: {} {} [{} {} {} {} {}] {}",
-            self.drop_context.read(),
-            self.add_context.read(),
-            self._rsvd[0].read(),
-            self._rsvd[1].read(),
-            self._rsvd[2].read(),
-            self._rsvd[3].read(),
-            self._rsvd[4].read(),
-            self.control.read()
-        );
-    }
-}
-
-pub struct DeviceContextList<const N: usize> {
-    pub dcbaa: Dma<[u64; 256]>,
-    pub contexts: Box<[Dma<DeviceContext<N>>]>,
-}
-
-impl<const N: usize> DeviceContextList<N> {
-    pub fn new(ac64: bool, max_slots: u8) -> Result<Self> {
-        let mut dcbaa = unsafe { Xhci::<N>::alloc_dma_zeroed_raw::<[u64; 256]>(ac64)? };
-        let mut contexts = vec![];
-
-        // Create device context buffers for each slot
-        for i in 0..max_slots as usize {
-            let context: Dma<DeviceContext<N>> = unsafe { Xhci::<N>::alloc_dma_zeroed_raw(ac64) }?;
-            dcbaa[i] = context.physical() as u64;
-            contexts.push(context);
-        }
-
-        Ok(DeviceContextList {
-            dcbaa,
-            contexts: contexts.into_boxed_slice(),
-        })
-    }
-
-    pub fn dcbaap(&self) -> u64 {
-        self.dcbaa.physical() as u64
-    }
-}
-
-#[repr(C, packed)]
-pub struct StreamContext {
-    trl: Mmio<u32>,
-    trh: Mmio<u32>,
-    edtla: Mmio<u32>,
-    rsvd: Mmio<u32>,
-}
-
-unsafe impl plain::Plain for StreamContext {}
-
-#[repr(u8)]
-pub enum StreamContextType {
-    SecondaryRing,
-    PrimaryRing,
-    PrimarySsa8,
-    PrimarySsa16,
-    PrimarySsa32,
-    PrimarySsa64,
-    PrimarySsa128,
-    PrimarySsa256,
-}
-
-pub struct StreamContextArray {
-    pub contexts: Dma<[StreamContext]>,
-    pub rings: BTreeMap<u16, Ring>,
-}
-
-impl StreamContextArray {
-    pub fn new<const N: usize>(ac64: bool, count: usize) -> Result<Self> {
-        unsafe {
-            Ok(Self {
-                contexts: Xhci::<N>::alloc_dma_zeroed_unsized_raw(ac64, count)?,
-                rings: BTreeMap::new(),
-            })
-        }
-    }
-    pub fn add_ring<const N: usize>(
-        &mut self,
-        ac64: bool,
-        stream_id: u16,
-        link: bool,
-    ) -> Result<()> {
-        // NOTE: stream_id 0 is reserved
-        assert_ne!(stream_id, 0);
-
-        let ring = Ring::new::<N>(ac64, 16, link)?;
-        let pointer = ring.register();
-        let sct = StreamContextType::PrimaryRing;
-
-        assert_eq!(pointer & (!0xE), pointer);
-        {
-            let context = &mut self.contexts[stream_id as usize];
-            context.trl.write((pointer as u32) | ((sct as u32) << 1));
-            context.trh.write((pointer >> 32) as u32);
-            // TODO: stopped edtla
-        }
-        self.rings.insert(stream_id, ring);
-        Ok(())
-    }
-    pub fn register(&self) -> u64 {
-        self.contexts.physical() as u64
-    }
-}
-
-#[repr(C, packed)]
-pub struct ScratchpadBufferEntry {
-    pub value_low: Mmio<u32>,
-    pub value_high: Mmio<u32>,
-}
-impl ScratchpadBufferEntry {
-    pub fn set_addr(&mut self, addr: u64) {
-        self.value_low.write(addr as u32);
-        self.value_high.write((addr >> 32) as u32);
-    }
-}
-
-pub struct ScratchpadBufferArray {
-    pub entries: Dma<[ScratchpadBufferEntry]>,
-    pub pages: Vec<Dma<[u8; PAGE_SIZE]>>,
-}
-impl ScratchpadBufferArray {
-    pub fn new<const N: usize>(ac64: bool, entries: u16) -> Result<Self> {
-        let mut entries =
-            unsafe { Xhci::<N>::alloc_dma_zeroed_unsized_raw(ac64, entries as usize)? };
-
-        let pages = entries
-            .iter_mut()
-            .map(
-                |entry: &mut ScratchpadBufferEntry| -> Result<_, syscall::Error> {
-                    let dma = unsafe { Dma::<[u8; PAGE_SIZE]>::zeroed()?.assume_init() };
-                    assert_eq!(dma.physical() % PAGE_SIZE, 0);
-                    entry.set_addr(dma.physical() as u64);
-                    Ok(dma)
-                },
-            )
-            .collect::<Result<Vec<_>, _>>()?;
-
-        Ok(Self { entries, pages })
-    }
-    pub fn register(&self) -> usize {
-        self.entries.physical()
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use core::mem;
-
-    #[test]
-    fn context_size() {
-        assert_eq!(mem::size_of::<SlotContext<CONTEXT_32>>(), 32);
-        assert_eq!(mem::size_of::<SlotContext<CONTEXT_64>>(), 64);
-        assert_eq!(mem::size_of::<EndpointContext<CONTEXT_32>>(), 32);
-        assert_eq!(mem::size_of::<EndpointContext<CONTEXT_64>>(), 64);
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/device_enumerator.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/device_enumerator.rs
deleted file mode 100644
index 74b9f73251..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/device_enumerator.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-use crate::xhci::port::PortFlags;
-use crate::xhci::{PortId, Xhci};
-use common::io::Io;
-use crossbeam_channel;
-use log::{debug, info, warn};
-use std::sync::Arc;
-use std::time::Duration;
-use syscall::EAGAIN;
-
-pub struct DeviceEnumerationRequest {
-    pub port_id: PortId,
-}
-
-pub struct DeviceEnumerator<const N: usize> {
-    hci: Arc<Xhci<N>>,
-    request_queue: crossbeam_channel::Receiver<DeviceEnumerationRequest>,
-}
-
-impl<const N: usize> DeviceEnumerator<N> {
-    pub fn new(hci: Arc<Xhci<N>>) -> Self {
-        let request_queue = hci.device_enumerator_receiver.clone();
-        DeviceEnumerator { hci, request_queue }
-    }
-
-    pub fn run(&mut self) {
-        loop {
-            debug!("Start Device Enumerator Loop");
-            let request = match self.request_queue.recv() {
-                Ok(req) => req,
-                Err(err) => {
-                    panic!("Failed to received an enumeration request! error: {}", err)
-                }
-            };
-
-            let port_id = request.port_id;
-            let port_array_index = port_id.root_hub_port_index();
-
-            debug!("Device Enumerator request for port {}", port_id);
-
-            let (len, flags) = {
-                let ports = self.hci.ports.lock().unwrap();
-
-                let len = ports.len();
-
-                if port_array_index >= len {
-                    warn!(
-                        "Received out of bounds Device Enumeration request for port {}",
-                        port_id
-                    );
-                    continue;
-                }
-
-                (len, ports[port_array_index].flags())
-            };
-
-            if flags.contains(PortFlags::CCS) {
-                debug!(
-                    "Received Device Connect Port Status Change Event with port flags {:?}",
-                    flags
-                );
-                //If the port isn't enabled (i.e. it's a USB2 port), we need to reset it if it isn't resetting already
-                //A USB3 port won't generate a Connect Status Change until it's already enabled, so this check
-                //will always be skipped for USB3 ports
-                if !flags.contains(PortFlags::PED) {
-                    let disabled_state = flags.contains(PortFlags::PP)
-                        && flags.contains(PortFlags::CCS)
-                        && !flags.contains(PortFlags::PED)
-                        && !flags.contains(PortFlags::PR);
-
-                    if !disabled_state {
-                        panic!(
-                            "Port {} isn't in the disabled state! Current flags: {:?}",
-                            port_id, flags
-                        );
-                    } else {
-                        debug!("Port {} has entered the disabled state.", port_id);
-                    }
-
-                    //THIS LOCKS THE PORTS. DO NOT LOCK PORTS BEFORE THIS POINT
-                    debug!("Received a device connect on port {}, but it's not enabled. Resetting the port.", port_id);
-                    let _ = self.hci.reset_port(port_id);
-
-                    let mut ports = self.hci.ports.lock().unwrap();
-                    let port = &mut ports[port_array_index];
-
-                    port.clear_prc();
-
-                    std::thread::sleep(Duration::from_millis(16)); //Some controllers need some extra time to make the transition.
-
-                    let flags = port.flags();
-
-                    let enabled_state = flags.contains(PortFlags::PP)
-                        && flags.contains(PortFlags::CCS)
-                        && flags.contains(PortFlags::PED)
-                        && !flags.contains(PortFlags::PR);
-
-                    if !enabled_state {
-                        warn!(
-                            "Port {} isn't in the enabled state! Current flags: {:?}",
-                            port_id, flags
-                        );
-                    } else {
-                        debug!(
-                            "Port {} is in the enabled state. Proceeding with enumeration",
-                            port_id
-                        );
-                    }
-                }
-
-                let result = futures::executor::block_on(self.hci.attach_device(port_id));
-                match result {
-                    Ok(_) => {
-                        info!("Device on port {} was attached", port_id);
-                    }
-                    Err(err) => {
-                        if err.errno == EAGAIN {
-                            debug!("Received a device connect notification for an already connected device. Ignoring...")
-                        } else {
-                            warn!("processing of device attach request failed! Error: {}", err);
-                        }
-                    }
-                }
-            } else {
-                debug!(
-                    "Device Enumerator received Detach request on port {} which is in state {}",
-                    port_id,
-                    self.hci.get_pls(port_id)
-                );
-                let result = futures::executor::block_on(self.hci.detach_device(port_id));
-                match result {
-                    Ok(was_connected) => {
-                        if was_connected {
-                            info!("Device on port {} was detached", port_id);
-                        }
-                    }
-                    Err(err) => {
-                        warn!("processing of device attach request failed! Error: {}", err);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/doorbell.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/doorbell.rs
deleted file mode 100644
index f65db206aa..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/doorbell.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use common::io::{Io, Mmio};
-
-#[repr(C, packed)]
-pub struct Doorbell(Mmio<u32>);
-
-impl Doorbell {
-    pub fn read(&self) -> u32 {
-        self.0.read()
-    }
-
-    pub fn write(&mut self, data: u32) {
-        self.0.write(data);
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/event.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/event.rs
deleted file mode 100644
index 83af1209af..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/event.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use common::io::{Io, Mmio};
-use syscall::error::Result;
-
-use common::dma::Dma;
-
-use super::ring::Ring;
-use super::trb::Trb;
-use super::Xhci;
-
-#[repr(C, packed)]
-pub struct EventRingSte {
-    pub address_low: Mmio<u32>,
-    pub address_high: Mmio<u32>,
-    pub size: Mmio<u16>,
-    _rsvd: Mmio<u16>,
-    _rsvd2: Mmio<u32>,
-}
-
-// TODO: Use atomic operations, and perhaps an occasional lock for reallocating.
-pub struct EventRing {
-    pub ste: Dma<[EventRingSte]>,
-    pub ring: Ring,
-}
-
-impl EventRing {
-    pub fn new<const N: usize>(ac64: bool) -> Result<EventRing> {
-        let mut ring = EventRing {
-            ste: unsafe { Xhci::<N>::alloc_dma_zeroed_unsized_raw(ac64, 1)? },
-            ring: Ring::new::<N>(ac64, 256, false)?,
-        };
-
-        ring.ste[0]
-            .address_low
-            .write(ring.ring.trbs.physical() as u32);
-        ring.ste[0]
-            .address_high
-            .write((ring.ring.trbs.physical() as u64 >> 32) as u32);
-        ring.ste[0].size.write(ring.ring.trbs.len() as u16);
-
-        Ok(ring)
-    }
-
-    pub fn next(&mut self) -> &mut Trb {
-        self.ring.next().0
-    }
-    pub fn erdp(&self) -> u64 {
-        self.ring.register() & 0xFFFF_FFFF_FFFF_FFF0
-    }
-    pub fn erstba(&self) -> u64 {
-        self.ste.physical() as u64
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/extended.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/extended.rs
deleted file mode 100644
index 00ab6f2f1b..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/extended.rs
+++ /dev/null
@@ -1,287 +0,0 @@
-use common::io::{Io, Mmio};
-use std::ops::Range;
-use std::ptr::NonNull;
-use std::{fmt, mem, ptr, slice};
-
-pub struct ExtendedCapabilitiesIter {
-    base: *const u8,
-}
-impl ExtendedCapabilitiesIter {
-    pub unsafe fn new(base: *const u8) -> Self {
-        Self { base }
-    }
-}
-impl Iterator for ExtendedCapabilitiesIter {
-    type Item = (NonNull<u8>, u8); // pointer, capability id
-
-    fn next(&mut self) -> Option<Self::Item> {
-        unsafe {
-            let current = NonNull::new(self.base as *mut _)?;
-
-            let reg = current.cast::<Mmio<u32>>().as_ref().read();
-            let capability_id = (reg & 0xFF) as u8;
-            let next_rel_in_dwords = ((reg & 0xFF00) >> 8) as u8;
-
-            let next_rel = u16::from(next_rel_in_dwords) << 2;
-
-            self.base = if next_rel != 0 {
-                self.base.offset(next_rel as isize)
-            } else {
-                ptr::null()
-            };
-
-            Some((current, capability_id))
-        }
-    }
-}
-
-#[repr(u8)]
-pub enum CapabilityId {
-    // bit 0 is reserved
-    UsbLegacySupport = 1,
-    SupportedProtocol,
-    ExtendedPowerManagement,
-    IoVirtualization,
-    MessageInterrupt,
-    LocalMem,
-    // bits 7-9 are reserved
-    UsbDebugCapability = 10,
-    // bits 11-16 are reserved
-    ExtendedMessageInterrupt = 17,
-    // bits 18-191 are reserved
-    // bits 192-255 are vendor-defined
-}
-
-#[repr(C, packed)]
-pub struct SupportedProtoCap {
-    a: Mmio<u32>,
-    b: Mmio<u32>,
-    c: Mmio<u32>,
-    d: Mmio<u32>,
-    protocol_speeds: [u8; 0],
-}
-
-#[repr(C, packed)]
-pub struct ProtocolSpeed {
-    a: Mmio<u32>,
-}
-
-pub const PROTO_SPEED_PSIV_MASK: u32 = 0x0000_000F;
-pub const PROTO_SPEED_PSIV_SHIFT: u8 = 0;
-
-pub const PROTO_SPEED_PSIE_MASK: u32 = 0x0000_0030;
-pub const PROTO_SPEED_PSIE_SHIFT: u8 = 4;
-
-pub const PROTO_SPEED_PLT_MASK: u32 = 0x0000_00C0;
-pub const PROTO_SPEED_PLT_SHIFT: u8 = 6;
-
-pub const PROTO_SPEED_PFD_BIT: u32 = 1 << PROTO_SPEED_PFD_SHIFT;
-pub const PROTO_SPEED_PFD_SHIFT: u8 = 8;
-
-pub const PROTO_SPEED_LP_MASK: u32 = 0x0000_C000;
-pub const PROTO_SPEED_LP_SHIFT: u8 = 14;
-
-pub const PROTO_SPEED_PSIM_MASK: u32 = 0xFFFF_0000;
-pub const PROTO_SPEED_PSIM_SHIFT: u8 = 16;
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub enum Psie {
-    Bps,
-    Kbps,
-    Mbps,
-    Gbps,
-}
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum Plt {
-    Symmetric,
-    Reserved,
-    AsymmetricRx,
-    AsymmetricTx,
-}
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum Lp {
-    SuperSpeed,
-    SuperSpeedPlus,
-    Rsvd2,
-    Rsvd3,
-}
-
-impl ProtocolSpeed {
-    pub const fn from_raw(raw: u32) -> Self {
-        Self { a: Mmio::new(raw) }
-    }
-    pub fn is_lowspeed(&self) -> bool {
-        self.psim() == 1500 && self.psie() == Psie::Kbps && !self.pfd()
-    }
-    pub fn is_fullspeed(&self) -> bool {
-        self.psim() == 12 && self.psie() == Psie::Mbps && !self.pfd()
-    }
-    pub fn is_highspeed(&self) -> bool {
-        self.psim() == 480 && self.psie() == Psie::Mbps && !self.pfd()
-    }
-    pub fn is_superspeed_gen1x1(&self) -> bool {
-        self.psim() == 5 && self.psie() == Psie::Gbps && self.pfd() && self.lp() == Lp::SuperSpeed
-    }
-    pub fn is_superspeedplus_gen2x1(&self) -> bool {
-        self.psim() == 10
-            && self.psie() == Psie::Gbps
-            && self.pfd()
-            && self.lp() == Lp::SuperSpeedPlus
-    }
-    pub fn is_superspeedplus_gen1x2(&self) -> bool {
-        self.psim() == 10
-            && self.psie() == Psie::Gbps
-            && self.pfd()
-            && self.lp() == Lp::SuperSpeedPlus
-    }
-    pub fn is_superspeedplus_gen2x2(&self) -> bool {
-        self.psim() == 20
-            && self.psie() == Psie::Gbps
-            && self.pfd()
-            && self.lp() == Lp::SuperSpeedPlus
-    }
-    pub fn is_superspeed_gen_x(&self) -> bool {
-        self.is_superspeed_gen1x1()
-            || self.is_superspeedplus_gen2x1()
-            || self.is_superspeedplus_gen1x2()
-            || self.is_superspeedplus_gen2x2()
-    }
-    /// Protocol speed ID value
-    pub fn psiv(&self) -> u8 {
-        ((self.a.read() & PROTO_SPEED_PSIV_MASK) >> PROTO_SPEED_PSIV_SHIFT) as u8
-    }
-    pub fn psie_raw(&self) -> u8 {
-        ((self.a.read() & PROTO_SPEED_PSIE_MASK) >> PROTO_SPEED_PSIE_SHIFT) as u8
-    }
-    /// Protocol speed ID exponent
-    pub fn psie(&self) -> Psie {
-        // safe because psie_raw can only return values in 0..=3
-        unsafe { mem::transmute(self.psie_raw()) }
-    }
-    pub fn plt_raw(&self) -> u8 {
-        ((self.a.read() & PROTO_SPEED_PLT_MASK) >> PROTO_SPEED_PLT_SHIFT) as u8
-    }
-    /// PSI type
-    pub fn plt(&self) -> Plt {
-        // safe because plt_raw can only return values in 0..=3
-        unsafe { mem::transmute(self.plt_raw()) }
-    }
-    /// PSI Full-duplex
-    pub fn pfd(&self) -> bool {
-        self.a.readf(PROTO_SPEED_PFD_BIT)
-    }
-    pub fn lp_raw(&self) -> u8 {
-        ((self.a.read() & PROTO_SPEED_LP_MASK) >> PROTO_SPEED_LP_SHIFT) as u8
-    }
-    /// Link protocol
-    pub fn lp(&self) -> Lp {
-        // safe because lp_raw can only return values in 0..=3
-        unsafe { mem::transmute(self.lp_raw()) }
-    }
-    /// Protocol speed ID mantissa
-    pub fn psim(&self) -> u16 {
-        ((self.a.read() & PROTO_SPEED_PSIM_MASK) >> PROTO_SPEED_PSIM_SHIFT) as u16
-    }
-}
-
-impl fmt::Debug for ProtocolSpeed {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("ProtocolSpeed")
-            .field("psiv", &self.psiv())
-            .field("psie", &self.psie())
-            .field("plt", &self.plt())
-            .field("pfd", &self.pfd())
-            .field("lp", &self.lp())
-            .field("psim", &self.psim())
-            .finish()
-    }
-}
-
-pub const SUPP_PROTO_CAP_REV_MIN_MASK: u32 = 0x00FF_0000;
-pub const SUPP_PROTO_CAP_REV_MIN_SHIFT: u8 = 16;
-
-pub const SUPP_PROTO_CAP_REV_MAJ_MASK: u32 = 0xFF00_0000;
-pub const SUPP_PROTO_CAP_REV_MAJ_SHIFT: u8 = 24;
-
-pub const SUPP_PROTO_CAP_COMPAT_PORT_OFF_MASK: u32 = 0x0000_00FF;
-pub const SUPP_PROTO_CAP_COMPAT_PORT_OFF_SHIFT: u8 = 0;
-
-pub const SUPP_PROTO_CAP_COMPAT_PORT_CNT_MASK: u32 = 0x0000_FF00;
-pub const SUPP_PROTO_CAP_COMPAT_PORT_CNT_SHIFT: u8 = 8;
-
-pub const SUPP_PROTO_CAP_PROTO_DEF_MASK: u32 = 0x0FFF_0000;
-pub const SUPP_PROTO_CAP_PROTO_DEF_SHIFT: u8 = 16;
-
-pub const SUPP_PROTO_CAP_PSIC_MASK: u32 = 0xF000_0000;
-pub const SUPP_PROTO_CAP_PSIC_SHIFT: u8 = 28;
-
-pub const SUPP_PROTO_CAP_PORT_SLOT_TYPE_MASK: u32 = 0x0000_001F;
-pub const SUPP_PROTO_CAP_PORT_SLOT_TYPE_SHIFT: u8 = 0;
-
-impl SupportedProtoCap {
-    pub unsafe fn protocol_speeds(&self) -> &[ProtocolSpeed] {
-        slice::from_raw_parts(
-            &self.protocol_speeds as *const u8 as *const _,
-            self.psic() as usize,
-        )
-    }
-    pub unsafe fn protocol_speeds_mut(&mut self) -> &mut [ProtocolSpeed] {
-        // XXX: Variance really is annoying sometimes.
-        slice::from_raw_parts_mut(
-            &self.protocol_speeds as *const u8 as *mut u8 as *mut _,
-            self.psic() as usize,
-        )
-    }
-    pub fn rev_minor(&self) -> u8 {
-        ((self.a.read() & SUPP_PROTO_CAP_REV_MIN_MASK) >> SUPP_PROTO_CAP_REV_MIN_SHIFT) as u8
-    }
-    pub fn rev_major(&self) -> u8 {
-        ((self.a.read() & SUPP_PROTO_CAP_REV_MAJ_MASK) >> SUPP_PROTO_CAP_REV_MAJ_SHIFT) as u8
-    }
-    pub fn name_string(&self) -> [u8; 4] {
-        // TODO: Little endian, right?
-        u32::to_le_bytes(self.b.read())
-    }
-    pub fn compat_port_offset(&self) -> u8 {
-        ((self.c.read() & SUPP_PROTO_CAP_COMPAT_PORT_OFF_MASK)
-            >> SUPP_PROTO_CAP_COMPAT_PORT_OFF_SHIFT) as u8
-    }
-    pub fn compat_port_count(&self) -> u8 {
-        ((self.c.read() & SUPP_PROTO_CAP_COMPAT_PORT_CNT_MASK)
-            >> SUPP_PROTO_CAP_COMPAT_PORT_CNT_SHIFT) as u8
-    }
-    pub fn compat_port_range(&self) -> Range<u8> {
-        self.compat_port_offset()..self.compat_port_offset() + self.compat_port_count()
-    }
-
-    pub fn proto_defined(&self) -> u16 {
-        ((self.c.read() & SUPP_PROTO_CAP_PROTO_DEF_MASK) >> SUPP_PROTO_CAP_PROTO_DEF_SHIFT) as u16
-    }
-    pub fn psic(&self) -> u8 {
-        ((self.c.read() & SUPP_PROTO_CAP_PSIC_MASK) >> SUPP_PROTO_CAP_PSIC_SHIFT) as u8
-    }
-    pub fn proto_slot_ty(&self) -> u8 {
-        ((self.d.read() & SUPP_PROTO_CAP_PORT_SLOT_TYPE_MASK)
-            >> SUPP_PROTO_CAP_PORT_SLOT_TYPE_SHIFT) as u8
-    }
-}
-impl fmt::Debug for SupportedProtoCap {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("SupportedProtoCap")
-            .field("rev_minor", &self.rev_minor())
-            .field("rev_major", &self.rev_major())
-            .field("name_string", &String::from_utf8_lossy(&self.name_string()))
-            .field("compat_port_offset", &self.compat_port_count())
-            .field("compat_port_count", &self.compat_port_offset())
-            .field("proto_defined", &self.proto_defined())
-            .field("psic", &self.psic())
-            .field("proto_slot_ty", &self.proto_slot_ty())
-            .field("proto_speeds", unsafe {
-                &self.protocol_speeds().to_owned()
-            })
-            .finish()
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/irq_reactor.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/irq_reactor.rs
deleted file mode 100644
index ac492d5bc1..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/irq_reactor.rs
+++ /dev/null
@@ -1,743 +0,0 @@
-use std::fs::File;
-use std::future::Future;
-use std::io::prelude::*;
-use std::pin::Pin;
-use std::sync::{Arc, Mutex};
-use std::task;
-
-use std::os::unix::io::AsRawFd;
-
-use crossbeam_channel::{Receiver, Sender};
-use log::{debug, error, info, trace, warn};
-
-use super::doorbell::Doorbell;
-use super::event::EventRing;
-use super::ring::Ring;
-use super::trb::{Trb, TrbCompletionCode, TrbType};
-use super::{PortId, Xhci};
-use crate::xhci::device_enumerator::DeviceEnumerationRequest;
-use crate::xhci::port::PortFlags;
-use common::io::Io as _;
-use event::RawEventQueue;
-
-/// Short-term states (as in, they are removed when the waker is consumed, but probably pushed back
-/// by the future unless it completed).
-#[derive(Debug)]
-pub struct State {
-    waker: task::Waker,
-    kind: StateKind,
-    message: Arc<Mutex<Option<NextEventTrb>>>,
-    is_isoch_or_vf: bool,
-}
-
-impl State {
-    fn finish(self, message: Option<NextEventTrb>) {
-        *self.message.lock().unwrap() = message;
-        trace!("Waking up future with waker: {:?}", self.waker);
-        self.waker.wake();
-    }
-}
-
-#[derive(Debug)]
-pub struct NextEventTrb {
-    pub event_trb: Trb,
-    pub src_trb: Option<Trb>,
-}
-
-// TODO: Perhaps all of the transfer rings used by the xHC should be stored linearly, and then
-// indexed using this struct instead.
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct RingId {
-    pub port: PortId,
-    pub endpoint_num: u8,
-    pub stream_id: u16,
-}
-impl RingId {
-    pub const fn default_control_pipe(port: PortId) -> Self {
-        Self {
-            port,
-            endpoint_num: 0,
-            stream_id: 0,
-        }
-    }
-}
-
-/// The state specific to a TRB-type. Since some of the event TDs may asynchronously appear, for
-/// example the Command Completion Event and the Transfer Event TDs, they have to be
-/// distinguishable. Luckily, the xHC also gives us the actual (physical) pointer to the source
-/// TRB, from the command ring, unless the event TD has one the completion codes Ring Underrun,
-/// Ring Overrun, or VF Event Ring Full Error. When these errors are encountered, it simply
-/// indicates that the commands causing the errors continue to be pending, and thus no information
-/// is lost.
-#[derive(Clone, Copy, Debug)]
-pub enum StateKind {
-    CommandCompletion {
-        phys_ptr: u64,
-    },
-    Transfer {
-        first_phys_ptr: u64,
-        last_phys_ptr: u64,
-        ring_id: RingId,
-    },
-    Other(TrbType),
-}
-
-impl StateKind {
-    pub fn trb_type(&self) -> TrbType {
-        match self {
-            &Self::CommandCompletion { .. } => TrbType::CommandCompletion,
-            &Self::Transfer { .. } => TrbType::Transfer,
-            &Self::Other(ty) => ty,
-        }
-    }
-}
-
-pub struct IrqReactor<const N: usize> {
-    hci: Arc<Xhci<N>>,
-    irq_file: Option<File>,
-    irq_receiver: Receiver<NewPendingTrb>,
-    device_enumerator_sender: Sender<DeviceEnumerationRequest>,
-    states: Vec<State>,
-    // TODO: Since the IRQ reactor is the only part of this driver that gets event TRBs, perhaps
-    // the event ring should be owned here?
-}
-
-pub type NewPendingTrb = State;
-
-impl<const N: usize> IrqReactor<N> {
-    pub fn new(hci: Arc<Xhci<N>>, irq_file: Option<File>) -> Self {
-        let device_enumerator_sender = hci.device_enumerator_sender.clone();
-        let irq_receiver = hci.irq_reactor_receiver.clone();
-
-        Self {
-            hci,
-            irq_file,
-            irq_receiver,
-            device_enumerator_sender,
-            states: Vec::new(),
-        }
-    }
-    // TODO: Configure the amount of time wait when no more work can be done (for IRQ-less polling).
-    fn pause(&self) {
-        std::thread::sleep(std::time::Duration::from_millis(2));
-    }
-    fn run_polling(mut self) -> ! {
-        debug!("Running IRQ reactor in polling mode.");
-        let hci_clone = Arc::clone(&self.hci);
-
-        let mut event_trb_index = {
-            hci_clone
-                .primary_event_ring
-                .lock()
-                .unwrap()
-                .ring
-                .next_index()
-        };
-
-        'trb_loop: loop {
-            self.pause();
-
-            let mut event_ring = hci_clone.primary_event_ring.lock().unwrap();
-
-            let event_trb = &mut event_ring.ring.trbs[event_trb_index];
-
-            if event_trb.completion_code() == TrbCompletionCode::Invalid as u8 {
-                continue 'trb_loop;
-            }
-
-            trace!(
-                "Found event TRB at index {} with type {} and cycle bit {}: {:?}",
-                event_trb_index,
-                event_trb.trb_type(),
-                event_trb.cycle() as u8,
-                event_trb
-            );
-
-            if self.check_event_ring_full(event_trb.clone()) {
-                info!("Had to resize event TRB, retrying...");
-                continue 'trb_loop;
-            }
-
-            trace!("Handling requests");
-            self.handle_requests();
-            trace!("Requests handled");
-
-            match event_trb.trb_type() {
-                _ if event_trb.trb_type() == TrbType::PortStatusChange as u8 => {
-                    trace!("Received a port status change!");
-                    self.handle_port_status_change(event_trb.clone())
-                } //TODO Handle the other unprompted events
-                _ => {
-                    self.acknowledge(event_trb.clone());
-                }
-            }
-
-            event_trb.reserved(false);
-
-            self.update_erdp(&*event_ring);
-            hci_clone.event_handler_finished();
-
-            event_trb_index = event_ring.ring.next_index();
-        }
-    }
-
-    fn mask_interrupts(&mut self) {
-        let mut run = self.hci.run.lock().unwrap();
-
-        debug!("Masking interrupts!");
-
-        if !run.ints[0].iman.readf(1 << 1) {
-            warn!("Attempted to mask interrupts when they were already disabled!")
-        }
-
-        run.ints[0].iman.writef(1 << 1, false);
-    }
-
-    fn unmask_interrupts(&mut self) {
-        let mut run = self.hci.run.lock().unwrap();
-
-        debug!("unmasking interrupts!");
-        if run.ints[0].iman.readf(1 << 1) {
-            warn!("Attempted to unmask interrupts when they were already enabled!")
-        }
-
-        run.ints[0].iman.writef(1 << 1, true);
-    }
-
-    fn run_with_irq_file(mut self) -> ! {
-        debug!("Running IRQ reactor with IRQ file and event queue");
-
-        let hci_clone = Arc::clone(&self.hci);
-        let event_queue =
-            RawEventQueue::new().expect("xhcid irq_reactor: failed to create IRQ event queue");
-        let irq_fd = self.irq_file.as_ref().unwrap().as_raw_fd();
-        event_queue
-            .subscribe(irq_fd as usize, 0, event::EventFlags::READ)
-            .unwrap();
-
-        trace!("IRQ Reactor has created its event queue.");
-        let mut event_trb_index = {
-            hci_clone
-                .primary_event_ring
-                .lock()
-                .unwrap()
-                .ring
-                .next_index()
-        };
-
-        trace!("IRQ reactor has grabbed the next index in the event ring.");
-        'trb_loop: loop {
-            let _event = event_queue.next_event().unwrap();
-            trace!("IRQ event queue notified");
-            let mut buffer = [0u8; 8];
-
-            let _ = self
-                .irq_file
-                .as_mut()
-                .unwrap()
-                .read(&mut buffer)
-                .expect("Failed to read from irq scheme");
-
-            if !self.hci.received_irq() {
-                // continue only when an IRQ to this device was received
-                trace!("no interrupt pending");
-                continue 'trb_loop;
-            }
-
-            self.mask_interrupts();
-
-            trace!("IRQ reactor received an IRQ");
-
-            let _ = self.irq_file.as_mut().unwrap().write(&buffer);
-
-            // TODO: More event rings, probably even with different IRQs.
-
-            let mut event_ring = hci_clone.primary_event_ring.lock().unwrap();
-
-            let mut count = 0;
-
-            loop {
-                trace!("count: {}", count);
-                let event_trb = &mut event_ring.ring.trbs[event_trb_index];
-
-                if event_trb.completion_code() == TrbCompletionCode::Invalid as u8 {
-                    if count == 0 {
-                        warn!("xhci: Received interrupt, but no event was found in the event ring. Ignoring interrupt.")
-                    }
-                    //hci_clone.event_handler_finished();
-                    self.unmask_interrupts();
-                    continue 'trb_loop;
-                } else {
-                    count += 1
-                }
-
-                info!(
-                    "Found event TRB at index {} with type {} and cycle bit {}: {:?}",
-                    event_trb_index,
-                    event_trb.trb_type(),
-                    event_trb.cycle() as u8,
-                    event_trb
-                );
-
-                if self.check_event_ring_full(event_trb.clone()) {
-                    info!("Had to resize event TRB, retrying...");
-                    //hci_clone.event_handler_finished();
-                    if self.hci.interrupt_is_pending(0) {
-                        warn!("After incrementing the dequeue pointer, the interrupt bit is still pending.")
-                    } else {
-                        debug!("The interrupt bit is no longer pending.");
-                    }
-                    self.unmask_interrupts();
-                    continue 'trb_loop;
-                }
-                self.handle_requests();
-
-                match event_trb.trb_type() {
-                    _ if event_trb.trb_type() == TrbType::PortStatusChange as u8 => {
-                        trace!("Received a port status change!");
-                        self.handle_port_status_change(event_trb.clone())
-                    } //TODO Handle the other unprompted events
-                    _ => {
-                        trace!("Received a non-status trb");
-                        self.acknowledge(event_trb.clone());
-                    }
-                }
-
-                event_trb.reserved(false);
-
-                self.update_erdp(&*event_ring);
-                self.hci.event_handler_finished();
-
-                event_trb_index = event_ring.ring.next_index();
-            }
-        }
-    }
-
-    /// Handles device attach/detach events as indicated by a PortStatusChange
-    fn handle_port_status_change(&mut self, trb: Trb) {
-        if let Some(root_hub_port_num) = trb.port_status_change_port_id() {
-            let port_id = PortId {
-                root_hub_port_num,
-                route_string: 0,
-            };
-            trace!("Received Port Status Change Request on port {}", port_id);
-            self.device_enumerator_sender
-                .send(DeviceEnumerationRequest { port_id })
-                .expect(
-                    format!(
-                        "Failed to transmit device numeration request on port {}",
-                        port_id
-                    )
-                    .as_str(),
-                );
-            {
-                let mut ports = self.hci.ports.lock().unwrap();
-                let root_port_index = port_id.root_hub_port_index();
-                if root_port_index >= ports.len() {
-                    warn!(
-                        "Received out of bounds transmit device numeration request on root index {} at port {} [port len was: {}]",
-                        root_port_index, port_id, ports.len()
-                    );
-                    return;
-                }
-
-                let port = &mut ports[root_port_index];
-                port.clear_csc();
-            }
-        } else {
-            warn!(
-                "Received a TRB of type {}, which was unexpected",
-                trb.trb_type()
-            )
-        }
-    }
-
-    fn update_erdp(&self, event_ring: &EventRing) {
-        let dequeue_pointer_and_dcs = event_ring.erdp();
-        let dequeue_pointer = dequeue_pointer_and_dcs & 0xFFFF_FFFF_FFFF_FFFE;
-        assert_eq!(
-            dequeue_pointer & 0xFFFF_FFFF_FFFF_FFF0,
-            dequeue_pointer,
-            "unaligned ERDP received from primary event ring"
-        );
-
-        trace!("Updated ERDP to {:#0x}", dequeue_pointer);
-
-        self.hci.run.lock().unwrap().ints[0]
-            .erdp_low
-            .write(dequeue_pointer as u32);
-        self.hci.run.lock().unwrap().ints[0]
-            .erdp_high
-            .write((dequeue_pointer >> 32) as u32);
-    }
-    fn handle_requests(&mut self) {
-        self.states.extend(
-            self.irq_receiver
-                .try_iter()
-                .inspect(|req| trace!("Received request: {:X?}", req)),
-        );
-    }
-    fn acknowledge(&mut self, trb: Trb) {
-        //TODO: handle TRBs without an attached state
-
-        trace!("ACK TRB {:X?}", trb);
-
-        let mut index = 0;
-        while index < self.states.len() {
-            trace!("ACK STATE {}: {:X?}", index, self.states[index].kind);
-
-            match self.states[index].kind {
-                StateKind::CommandCompletion { phys_ptr }
-                    if trb.trb_type() == TrbType::CommandCompletion as u8 =>
-                {
-                    if trb.completion_trb_pointer() == Some(phys_ptr) {
-                        trace!("Found matching command completion future");
-                        let state = self.states.remove(index);
-
-                        // Before waking, it's crucial that the command TRB that generated this event
-                        // is fetched before removing this event TRB from the queue.
-                        let command_trb = match self
-                            .hci
-                            .cmd
-                            .lock()
-                            .unwrap()
-                            .phys_addr_to_entry_mut(self.hci.cap.ac64(), phys_ptr)
-                        {
-                            Some(command_trb) => {
-                                let t = command_trb.clone();
-                                command_trb.reserved(false);
-                                t
-                            }
-                            None => {
-                                warn!("The xHC supplied a pointer to a command TRB that was outside the known command ring bounds. Ignoring event TRB {:?}.", trb);
-                                continue;
-                            }
-                        };
-
-                        // TODO: Validate the command TRB.
-                        state.finish(Some(NextEventTrb {
-                            src_trb: Some(command_trb.clone()),
-                            event_trb: trb.clone(),
-                        }));
-
-                        return;
-                    } else if trb.completion_trb_pointer().is_none() {
-                        warn!("Command TRB somehow resulted in an error that only can be caused by transfer TRBs. Ignoring event TRB: {:?}.", trb);
-                    }
-                }
-
-                StateKind::Transfer {
-                    first_phys_ptr,
-                    last_phys_ptr,
-                    ring_id,
-                } => {
-                    // Check if the TRB matches the transfer
-                    if trb.trb_type() == TrbType::Transfer as u8 {
-                        match trb.transfer_event_trb_pointer() {
-                            Some(phys_ptr) => {
-                                let matches = if first_phys_ptr <= last_phys_ptr {
-                                    phys_ptr >= first_phys_ptr && phys_ptr <= last_phys_ptr
-                                } else {
-                                    // Handle ring buffer wrap
-                                    phys_ptr >= first_phys_ptr || phys_ptr <= last_phys_ptr
-                                };
-                                if matches {
-                                    let src_trb = self.hci.get_transfer_trb(phys_ptr, ring_id);
-                                    // Give the source transfer TRB together with the event TRB, to the future.
-                                    let state = self.states.remove(index);
-                                    state.finish(Some(NextEventTrb {
-                                        src_trb: src_trb,
-                                        event_trb: trb.clone(),
-                                    }));
-                                    return;
-                                }
-                            }
-                            None => {
-                                // Ring Overrun, Ring Underrun, or Virtual Function Event Ring Full.
-                                //
-                                // These errors are caused when either an isoch transfer that shall write data, doesn't
-                                // have any data since the ring is empty, or if an isoch receive is impossible due to a
-                                // full ring. The Virtual Function Event Ring Full is only for Virtual Machine
-                                // Managers, and since this isn't implemented yet, they are irrelevant.
-                                //
-                                // The best solution here is to differentiate between isoch transfers (and
-                                // virtual function event rings when virtualization gets implemented), with
-                                // regular commands and transfers, and send the error TRB to all of them, or
-                                // possibly an error code wrapped in a Result.
-                                self.acknowledge_failed_transfer_trbs(trb);
-                                return;
-                            }
-                        }
-                    }
-
-                    // Also check if the transfer is on a dead ring
-                    if self.hci.with_ring(ring_id, |_ring| ()).is_none() {
-                        log::debug!("State {} is a dead transfer", index);
-                        let state = self.states.remove(index);
-                        state.finish(Some(NextEventTrb {
-                            src_trb: None,
-                            //TODO: don't send this TRB as it may not be related
-                            event_trb: trb.clone(),
-                        }));
-                        continue;
-                    }
-                }
-
-                StateKind::Other(trb_type) if trb_type as u8 == trb.trb_type() => {
-                    let state = self.states.remove(index);
-                    state.finish(None);
-                    return;
-                }
-
-                _ => (),
-            }
-
-            index += 1;
-        }
-        warn!(
-            "Lost event TRB type {}, completion code: {}: {:X?}",
-            trb.trb_type(),
-            trb.completion_code(),
-            trb
-        );
-    }
-    fn acknowledge_failed_transfer_trbs(&mut self, trb: Trb) {
-        let mut index = 0;
-
-        loop {
-            if !self.states[index].is_isoch_or_vf {
-                index += 1;
-                if index >= self.states.len() {
-                    break;
-                }
-                continue;
-            }
-            let state = self.states.remove(index);
-            state.finish(Some(NextEventTrb {
-                event_trb: trb.clone(),
-                src_trb: None,
-            }));
-        }
-    }
-    /// Checks if an event TRB is a Host Controller Event, with the completion code Event Ring
-    /// Full. If so, it grows the event ring. The return value is whether the event ring was full,
-    /// and then grown.
-    fn check_event_ring_full(&mut self, event_trb: Trb) -> bool {
-        let had_event_ring_full_error = event_trb.trb_type() == TrbType::HostController as u8
-            && event_trb.completion_code() == TrbCompletionCode::EventRingFull as u8;
-
-        if had_event_ring_full_error {
-            self.grow_event_ring();
-        }
-        had_event_ring_full_error
-    }
-    /// Grows the event ring
-    fn grow_event_ring(&mut self) {
-        // TODO
-        error!("TODO: grow event ring");
-    }
-
-    pub fn run(self) -> ! {
-        if self.irq_file.is_some() {
-            self.run_with_irq_file();
-        } else {
-            self.run_polling();
-        }
-    }
-}
-
-struct FutureState {
-    message: Arc<Mutex<Option<NextEventTrb>>>,
-    is_isoch_or_vf: bool,
-    state_kind: StateKind,
-}
-
-pub struct EventDoorbell {
-    dbs: Arc<Mutex<&'static mut [Doorbell]>>,
-    index: usize,
-    data: u32,
-}
-
-impl EventDoorbell {
-    pub fn new<const N: usize>(hci: &Xhci<N>, index: usize, data: u32) -> Self {
-        Self {
-            //TODO: simplify this logic, maybe just use a raw pointer?
-            dbs: hci.dbs.clone(),
-            index,
-            data,
-        }
-    }
-
-    pub fn ring(self) {
-        trace!("Ring doorbell {} with data {}", self.index, self.data);
-        self.dbs.lock().unwrap()[self.index].write(self.data);
-        trace!("Doorbell was rung.");
-    }
-}
-
-enum EventTrbFuture {
-    Pending {
-        state: FutureState,
-        sender: Sender<State>,
-        doorbell_opt: Option<EventDoorbell>,
-    },
-    Finished,
-}
-
-impl Future for EventTrbFuture {
-    type Output = NextEventTrb;
-
-    fn poll(self: Pin<&mut Self>, context: &mut task::Context) -> task::Poll<Self::Output> {
-        let this = self.get_mut();
-        trace!("Start poll!");
-        let message = match this {
-            &mut Self::Pending {
-                ref state,
-                ref sender,
-                ref mut doorbell_opt,
-            } => match state.message.lock().unwrap().take() {
-                Some(message) => message,
-
-                None => {
-                    // Register state with IRQ reactor
-                    trace!("Send state {:X?}", state.state_kind);
-                    sender
-                        .send(State {
-                            message: Arc::clone(&state.message),
-                            is_isoch_or_vf: state.is_isoch_or_vf,
-                            kind: state.state_kind,
-                            waker: context.waker().clone(),
-                        })
-                        .expect("IRQ reactor thread unexpectedly stopped");
-
-                    // Doorbell must be rung after sending state
-                    if let Some(doorbell) = doorbell_opt.take() {
-                        doorbell.ring();
-                    }
-                    return task::Poll::Pending;
-                }
-            },
-            &mut Self::Finished => panic!("Polling finished EventTrbFuture again."),
-        };
-        trace!("finished!");
-        *this = Self::Finished;
-        task::Poll::Ready(message)
-    }
-}
-
-impl<const N: usize> Xhci<N> {
-    pub fn get_transfer_trb(&self, paddr: u64, id: RingId) -> Option<Trb> {
-        self.with_ring(id, |ring| ring.phys_addr_to_entry(self.cap.ac64(), paddr))
-            .flatten()
-    }
-    pub fn with_ring<T, F: FnOnce(&Ring) -> T>(&self, id: RingId, function: F) -> Option<T> {
-        use super::RingOrStreams;
-
-        let slot_state = self.port_states.get(&id.port)?;
-        let endpoint_state = slot_state.endpoint_states.get(&id.endpoint_num)?;
-
-        let ring_ref = match endpoint_state.transfer {
-            RingOrStreams::Ring(ref ring) => ring,
-            RingOrStreams::Streams(ref ctx_arr) => ctx_arr.rings.get(&id.stream_id)?,
-        };
-
-        Some(function(ring_ref))
-    }
-    pub fn with_ring_mut<T, F: FnOnce(&mut Ring) -> T>(
-        &self,
-        id: RingId,
-        function: F,
-    ) -> Option<T> {
-        use super::RingOrStreams;
-
-        let mut slot_state = self.port_states.get_mut(&id.port)?;
-        let mut endpoint_state = slot_state.endpoint_states.get_mut(&id.endpoint_num)?;
-
-        let ring_ref = match endpoint_state.transfer {
-            RingOrStreams::Ring(ref mut ring) => ring,
-            RingOrStreams::Streams(ref mut ctx_arr) => ctx_arr.rings.get_mut(&id.stream_id)?,
-        };
-
-        Some(function(ring_ref))
-    }
-    pub fn next_transfer_event_trb(
-        &self,
-        ring_id: RingId,
-        ring: &Ring,
-        first_trb: &Trb,
-        last_trb: &Trb,
-        doorbell: EventDoorbell,
-    ) -> impl Future<Output = NextEventTrb> + Send + Sync + 'static {
-        if !last_trb.is_transfer_trb() {
-            panic!("Invalid TRB type given to next_transfer_event_trb(): {} (TRB {:?}. Expected transfer TRB.", last_trb.trb_type(), last_trb)
-        }
-
-        let is_isoch_or_vf = last_trb.trb_type() == TrbType::Isoch as u8;
-        let first_phys_ptr = ring.trb_phys_ptr(self.cap.ac64(), first_trb);
-        let last_phys_ptr = ring.trb_phys_ptr(self.cap.ac64(), last_trb);
-        EventTrbFuture::Pending {
-            state: FutureState {
-                is_isoch_or_vf,
-                state_kind: StateKind::Transfer {
-                    ring_id,
-                    first_phys_ptr,
-                    last_phys_ptr,
-                },
-                message: Arc::new(Mutex::new(None)),
-            },
-            sender: self.irq_reactor_sender.clone(),
-            doorbell_opt: Some(doorbell),
-        }
-    }
-    pub fn next_command_completion_event_trb(
-        &self,
-        command_ring: &Ring,
-        trb: &Trb,
-        doorbell: EventDoorbell,
-    ) -> impl Future<Output = NextEventTrb> + Send + Sync + 'static {
-        trace!(
-            "Sending command at phys_ptr {:X}",
-            command_ring.trb_phys_ptr(self.cap.ac64(), trb)
-        );
-        if !trb.is_command_trb() {
-            panic!("Invalid TRB type given to next_command_completion_event_trb(): {} (TRB {:?}. Expected command TRB.", trb.trb_type(), trb)
-        }
-        EventTrbFuture::Pending {
-            state: FutureState {
-                // This is only possible for transfers if they are isochronous, or for Force Event TRBs (virtualization).
-                is_isoch_or_vf: false,
-                state_kind: StateKind::CommandCompletion {
-                    phys_ptr: command_ring.trb_phys_ptr(self.cap.ac64(), trb),
-                },
-                message: Arc::new(Mutex::new(None)),
-            },
-            sender: self.irq_reactor_sender.clone(),
-            doorbell_opt: Some(doorbell),
-        }
-    }
-    pub fn next_misc_event_trb(
-        &self,
-        trb_type: TrbType,
-    ) -> impl Future<Output = NextEventTrb> + Send + Sync + 'static {
-        let valid_trb_types = [
-            TrbType::PortStatusChange as u8,
-            TrbType::BandwidthRequest as u8,
-            TrbType::Doorbell as u8,
-            TrbType::HostController as u8,
-            TrbType::DeviceNotification as u8,
-            TrbType::MfindexWrap as u8,
-        ];
-        if !valid_trb_types.contains(&(trb_type as u8)) {
-            panic!("Invalid TRB type given to next_misc_event_trb(): {:?}. Only event TRB types that are neither transfer events or command completion events can be used.", trb_type)
-        }
-        EventTrbFuture::Pending {
-            state: FutureState {
-                is_isoch_or_vf: false,
-                state_kind: StateKind::Other(trb_type),
-                message: Arc::new(Mutex::new(None)),
-            },
-            sender: self.irq_reactor_sender.clone(),
-            doorbell_opt: None,
-        }
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/mod.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/mod.rs
deleted file mode 100644
index 73d9d90b2a..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/mod.rs
+++ /dev/null
@@ -1,1498 +0,0 @@
-//! The eXtensible Host Controller Interface (XHCI) Module
-//!
-//! This module implements the XHCI functionality of Redox's USB driver daemon.
-//!
-//! XHCI is a standard for the USB Host Controller interface specified by Intel that provides a
-//! common register interface for systems to use to interact with the Universal Serial Bus (USB)
-//! subsystem.
-//!
-//! The standard can be found [here](https://www.intel.com/content/dam/www/public/us/en/documents/technical-specifications/extensible-host-controler-interface-usb-xhci.pdf).
-//! The standard is referenced frequently throughout this documentation. The acronyms used for specific
-//! documents are specified in the crate-level documentation.
-use std::collections::BTreeMap;
-use std::convert::TryFrom;
-use std::fs::{self, File};
-use std::sync::atomic::AtomicUsize;
-use std::sync::{Arc, Mutex};
-
-use std::{mem, process, slice, thread};
-use syscall::error::{Error, Result, EBADF, EBADMSG, EIO, ENOENT};
-use syscall::{EAGAIN, PAGE_SIZE};
-
-use chashmap::CHashMap;
-use common::{dma::Dma, io::Io, timeout::Timeout};
-use crossbeam_channel::{Receiver, Sender};
-use log::{debug, error, info, trace, warn};
-use serde::Deserialize;
-
-use crate::usb;
-
-use pcid_interface::PciFunctionHandle;
-
-mod capability;
-mod context;
-mod device_enumerator;
-mod doorbell;
-mod event;
-mod extended;
-pub mod irq_reactor;
-mod operational;
-mod port;
-mod ring;
-mod runtime;
-pub mod scheme;
-mod trb;
-
-pub use self::capability::CapabilityRegs;
-use self::context::{
-    DeviceContextList, InputContext, ScratchpadBufferArray, StreamContextArray,
-    SLOT_CONTEXT_STATE_MASK, SLOT_CONTEXT_STATE_SHIFT,
-};
-pub use self::context::{CONTEXT_32, CONTEXT_64};
-use self::doorbell::Doorbell;
-use self::event::EventRing;
-use self::extended::{CapabilityId, ExtendedCapabilitiesIter, ProtocolSpeed, SupportedProtoCap};
-use self::irq_reactor::{EventDoorbell, IrqReactor, NewPendingTrb, RingId};
-use self::operational::*;
-use self::port::Port;
-use self::ring::Ring;
-use self::runtime::RuntimeRegs;
-use self::trb::{TransferKind, Trb, TrbCompletionCode};
-
-use self::scheme::EndpIfState;
-
-pub use crate::driver_interface::PortId;
-use crate::driver_interface::*;
-use crate::xhci::device_enumerator::{DeviceEnumerationRequest, DeviceEnumerator};
-use crate::xhci::port::PortFlags;
-
-/// Specifies the configurable interrupt mechanism used by the xhci subsystem for registering
-/// device state change notifications.
-pub enum InterruptMethod {
-    /// No interrupts whatsoever; the driver will instead rely on polling event rings.
-    Polling,
-
-    /// Legacy PCI INTx# interrupt pin.
-    Intx,
-
-    /// (Extended) Message signaled interrupts.
-    Msi,
-}
-
-impl<const N: usize> Xhci<N> {
-    /// Gets descriptors, before the port state is initiated.
-    async fn get_desc_raw<T>(
-        &self,
-        port: PortId,
-        slot: u8,
-        kind: usb::DescriptorKind,
-        value: u8,
-        index: u16,
-        desc: &mut Dma<T>,
-    ) -> Result<()> {
-        if self.interrupt_is_pending(0) {
-            debug!("EHB is already set!");
-            self.force_clear_interrupt(0);
-        }
-        let len = mem::size_of::<T>();
-        log::debug!(
-            "get_desc_raw port {} slot {} kind {:?} value {} index {} len {}",
-            port,
-            slot,
-            kind,
-            value,
-            index,
-            len
-        );
-
-        let future = {
-            let mut port_state = self.port_states.get_mut(&port).ok_or(Error::new(ENOENT))?;
-            let ring = port_state
-                .endpoint_states
-                .get_mut(&0)
-                .ok_or(Error::new(EIO))?
-                .ring()
-                .expect("no ring for the default control pipe");
-
-            let first_index = ring.next_index();
-            let (cmd, cycle) = (&mut ring.trbs[first_index], ring.cycle);
-            cmd.setup(
-                usb::Setup::get_descriptor(kind, value, index, len as u16),
-                TransferKind::In,
-                cycle,
-            );
-
-            let (cmd, cycle) = ring.next();
-            cmd.data(desc.physical(), len as u16, true, cycle);
-
-            let last_index = ring.next_index();
-            let (cmd, cycle) = (&mut ring.trbs[last_index], ring.cycle);
-
-            let interrupter = 0;
-            // When the data stage is in, the status stage must be out
-            let input = false;
-            let ioc = true;
-            let ch = false;
-            let ent = false;
-            cmd.status(interrupter, input, ioc, ch, ent, cycle);
-
-            self.next_transfer_event_trb(
-                RingId::default_control_pipe(port),
-                &ring,
-                &ring.trbs[first_index],
-                &ring.trbs[last_index],
-                EventDoorbell::new(self, usize::from(slot), Self::def_control_endp_doorbell()),
-            )
-        };
-
-        debug!("Waiting for the next transfer event TRB...");
-        let trbs = future.await;
-        let event_trb = trbs.event_trb;
-        let status_trb = trbs.src_trb.ok_or(Error::new(EIO))?;
-        trace!("Handling the transfer event TRB!");
-        self::scheme::handle_transfer_event_trb("GET_DESC", &event_trb, &status_trb)?;
-
-        //self.event_handler_finished();
-        Ok(())
-    }
-
-    async fn fetch_dev_desc_8_byte(
-        &self,
-        port: PortId,
-        slot: u8,
-    ) -> Result<usb::DeviceDescriptor8Byte> {
-        let mut desc = unsafe { self.alloc_dma_zeroed::<usb::DeviceDescriptor8Byte>()? };
-        self.get_desc_raw(port, slot, usb::DescriptorKind::Device, 0, 0, &mut desc)
-            .await?;
-        Ok(*desc)
-    }
-
-    async fn fetch_dev_desc(&self, port: PortId, slot: u8) -> Result<usb::DeviceDescriptor> {
-        let mut desc = unsafe { self.alloc_dma_zeroed::<usb::DeviceDescriptor>()? };
-        self.get_desc_raw(port, slot, usb::DescriptorKind::Device, 0, 0, &mut desc)
-            .await?;
-        Ok(*desc)
-    }
-
-    async fn fetch_config_desc(
-        &self,
-        port: PortId,
-        slot: u8,
-        config: u8,
-    ) -> Result<(usb::ConfigDescriptor, [u8; 4087])> {
-        let mut desc = unsafe { self.alloc_dma_zeroed::<(usb::ConfigDescriptor, [u8; 4087])>()? };
-        self.get_desc_raw(
-            port,
-            slot,
-            usb::DescriptorKind::Configuration,
-            config,
-            0,
-            &mut desc,
-        )
-        .await?;
-        Ok(*desc)
-    }
-
-    async fn fetch_bos_desc(
-        &self,
-        port: PortId,
-        slot: u8,
-    ) -> Result<(usb::BosDescriptor, [u8; 4087])> {
-        let mut desc = unsafe { self.alloc_dma_zeroed::<(usb::BosDescriptor, [u8; 4087])>()? };
-        self.get_desc_raw(
-            port,
-            slot,
-            usb::DescriptorKind::BinaryObjectStorage,
-            0,
-            0,
-            &mut desc,
-        )
-        .await?;
-        Ok(*desc)
-    }
-
-    async fn fetch_lang_ids_desc(&self, port: PortId, slot: u8) -> Result<Vec<u16>> {
-        let mut sdesc = unsafe { self.alloc_dma_zeroed::<(u8, u8, [u16; 127])>()? };
-        self.get_desc_raw(port, slot, usb::DescriptorKind::String, 0, 0, &mut sdesc)
-            .await?;
-
-        let len = sdesc.0 as usize;
-        if len > 2 {
-            Ok(sdesc.2[..(len - 2) / 2].to_vec())
-        } else {
-            Ok(Vec::new())
-        }
-    }
-
-    async fn fetch_string_desc(
-        &self,
-        port: PortId,
-        slot: u8,
-        value: u8,
-        lang_id: u16,
-    ) -> Result<String> {
-        let mut sdesc = unsafe { self.alloc_dma_zeroed::<(u8, u8, [u16; 127])>()? };
-        self.get_desc_raw(
-            port,
-            slot,
-            usb::DescriptorKind::String,
-            value,
-            lang_id,
-            &mut sdesc,
-        )
-        .await?;
-
-        let len = sdesc.0 as usize;
-        if len > 2 {
-            Ok(String::from_utf16(&sdesc.2[..(len - 2) / 2]).unwrap_or(String::new()))
-        } else {
-            Ok(String::new())
-        }
-    }
-}
-
-/// The eXtensible Host Controller Interface (XHCI) data structure
-pub struct Xhci<const N: usize> {
-    // immutable
-    /// The Host Controller Interface Capability Registers. These read-only registers specify the
-    /// limits and capabilities of the host controller implementation (See XHCI section 5.3)
-    cap: &'static CapabilityRegs,
-    //page_size: usize,
-
-    // XXX: It would be really useful to be able to mutably access individual elements of a slice,
-    // without having to wrap every element in a lock (which wouldn't work since they're packed).
-    /// The Host Controller Interface Operational Registers. These registers provide the software
-    /// interface to configure and monitor the state of the XHCI (See XHCI section 5.4)
-    op: Mutex<&'static mut OperationalRegs>,
-    ports: Mutex<&'static mut [Port]>,
-    /// The Host Controller Interface Doorbell Registers. There is one register per device slot,
-    /// and these registers are used by system software to notify the XHC that it has work to perform
-    /// for a specific device slot. (See XHCI sections 4.7 and 5.6)
-    dbs: Arc<Mutex<&'static mut [Doorbell]>>,
-    /// The Host Controller Interface Runtime Registers. These handle interrupt and event processing,
-    /// and provide time-sensitive information such as the current microframe. (See XHCI section 5.5)
-    run: Mutex<&'static mut RuntimeRegs>,
-    cmd: Mutex<Ring>,
-    primary_event_ring: Mutex<EventRing>,
-
-    // immutable
-    dev_ctx: DeviceContextList<N>,
-    scratchpad_buf_arr: Option<ScratchpadBufferArray>,
-
-    // used for the extended capabilities, and so far none of them are mutated, and thus no lock.
-    base: *const u8,
-
-    drivers_config: DriversConfig,
-    handles: CHashMap<usize, scheme::Handle>,
-    next_handle: AtomicUsize,
-    port_states: CHashMap<PortId, PortState<N>>,
-    drivers: CHashMap<PortId, Vec<process::Child>>,
-    scheme_name: String,
-
-    interrupt_method: InterruptMethod,
-    pcid_handle: Mutex<PciFunctionHandle>,
-
-    irq_reactor: Mutex<Option<thread::JoinHandle<()>>>,
-
-    irq_reactor_sender: Sender<NewPendingTrb>,
-
-    // not used, but still stored so that the thread, when created, can get the channel without the
-    // channel being in a mutex.
-    irq_reactor_receiver: Receiver<NewPendingTrb>,
-    device_enumerator: Mutex<Option<thread::JoinHandle<()>>>,
-    device_enumerator_sender: Sender<DeviceEnumerationRequest>,
-    device_enumerator_receiver: Receiver<DeviceEnumerationRequest>,
-}
-
-unsafe impl<const N: usize> Send for Xhci<N> {}
-unsafe impl<const N: usize> Sync for Xhci<N> {}
-
-struct PortState<const N: usize> {
-    slot: u8,
-    protocol_speed: &'static ProtocolSpeed,
-    cfg_idx: Option<u8>,
-    input_context: Mutex<Dma<InputContext<N>>>,
-    dev_desc: Option<DevDesc>,
-    endpoint_states: BTreeMap<u8, EndpointState>,
-}
-
-impl<const N: usize> PortState<N> {
-    //TODO: fetch using endpoint number instead
-    fn get_endp_desc(&self, endp_idx: u8) -> Option<&EndpDesc> {
-        let cfg_idx = self.cfg_idx?;
-        let config_desc = self
-            .dev_desc
-            .as_ref()?
-            .config_descs
-            .iter()
-            .find(|desc| desc.configuration_value == cfg_idx)?;
-        let mut endp_count = 0;
-        for if_desc in config_desc.interface_descs.iter() {
-            for endp_desc in if_desc.endpoints.iter() {
-                if endp_idx == endp_count {
-                    return Some(endp_desc);
-                }
-                endp_count += 1;
-            }
-        }
-        None
-    }
-}
-
-pub(crate) enum RingOrStreams {
-    Ring(Ring),
-    Streams(StreamContextArray),
-}
-
-pub(crate) struct EndpointState {
-    pub transfer: RingOrStreams,
-    pub driver_if_state: EndpIfState,
-}
-impl EndpointState {
-    fn ring(&mut self) -> Option<&mut Ring> {
-        match self.transfer {
-            RingOrStreams::Ring(ref mut ring) => Some(ring),
-            _ => None,
-        }
-    }
-}
-
-impl<const N: usize> Xhci<N> {
-    pub fn new(
-        scheme_name: String,
-        address: usize,
-        interrupt_method: InterruptMethod,
-        pcid_handle: PciFunctionHandle,
-    ) -> Result<Self> {
-        //Locate the capability registers from the mapped PCI Bar
-        let cap = unsafe { &mut *(address as *mut CapabilityRegs) };
-        debug!("CAP REGS BASE {:X}", address);
-
-        //let page_size = ...
-
-        //The operational registers appear immediately after the capability registers.
-        let op_base = address + cap.len.read() as usize;
-        let op = unsafe { &mut *(op_base as *mut OperationalRegs) };
-        debug!("OP REGS BASE {:X}", op_base);
-
-        //Reset the XHCI device
-        let (max_slots, max_ports) = {
-            {
-                debug!("Waiting for xHC becoming ready.");
-                let timeout = Timeout::from_secs(1);
-                while op.usb_sts.readf(USB_STS_CNR) {
-                    timeout.run().map_err(|()| {
-                        log::error!("timeout on USB_STS_CNR");
-                        Error::new(EIO)
-                    })?;
-                }
-            }
-
-            debug!("Stopping the xHC");
-            // Set run/stop to 0
-            op.usb_cmd.writef(USB_CMD_RS, false);
-
-            {
-                debug!("Waiting for the xHC to stop.");
-                let timeout = Timeout::from_secs(1);
-                while !op.usb_sts.readf(USB_STS_HCH) {
-                    timeout.run().map_err(|()| {
-                        log::error!("timeout on USB_STS_HCH");
-                        Error::new(EIO)
-                    })?;
-                }
-            }
-
-            {
-                debug!("Resetting the xHC.");
-                op.usb_cmd.writef(USB_CMD_HCRST, true);
-                let timeout = Timeout::from_secs(1);
-                while op.usb_cmd.readf(USB_CMD_HCRST) {
-                    timeout.run().map_err(|()| {
-                        log::error!("timeout on USB_CMD_HCRST");
-                        Error::new(EIO)
-                    })?;
-                }
-            }
-
-            debug!("Reading max slots.");
-
-            let max_slots = cap.max_slots();
-            let max_ports = cap.max_ports();
-
-            debug!("xHC max slots: {}, max ports: {}", max_slots, max_ports);
-            (max_slots, max_ports)
-        };
-
-        //Get the address of the port register table
-        let port_base = op_base + 0x400;
-        let ports =
-            unsafe { slice::from_raw_parts_mut(port_base as *mut Port, max_ports as usize) };
-        debug!("PORT BASE {:X}", port_base);
-
-        //Get the address of the dorbell register table
-        let db_base = address + cap.db_offset.read() as usize;
-        let dbs = unsafe { slice::from_raw_parts_mut(db_base as *mut Doorbell, 256) };
-        debug!("DOORBELL REGS BASE {:X}", db_base);
-
-        let run_base = address + cap.rts_offset.read() as usize;
-        let run = unsafe { &mut *(run_base as *mut RuntimeRegs) };
-        debug!("RUNTIME REGS BASE {:X}", run_base);
-
-        // Create the command ring with 4096 / 16 (TRB size) entries, so that it uses all of the
-        // DMA allocation (which is at least a 4k page).
-        let entries_per_page = PAGE_SIZE / mem::size_of::<Trb>();
-        let cmd = Ring::new::<N>(cap.ac64(), entries_per_page, true)?;
-
-        let (irq_reactor_sender, irq_reactor_receiver) = crossbeam_channel::unbounded();
-
-        let (device_enumerator_sender, device_enumerator_receiver) = crossbeam_channel::unbounded();
-
-        let mut drivers_config = DriversConfig { drivers: vec![] };
-        for file in config::config("xhcid").expect("xhcid: Failed to read driver configs") {
-            let config = match fs::read(&file) {
-                Ok(config) => config,
-                Err(err) => {
-                    println!("xhcid: Failed to read config {}: {err}", file.display());
-                    continue;
-                }
-            };
-            let config = match toml::from_slice::<DriversConfig>(&config) {
-                Ok(config) => config,
-                Err(err) => {
-                    println!("xhcid: Failed to parse config {}: {err}", file.display());
-                    continue;
-                }
-            };
-            drivers_config.drivers.extend(config.drivers);
-        }
-
-        let mut xhci = Self {
-            base: address as *const u8,
-
-            cap,
-            //page_size,
-            op: Mutex::new(op),
-            ports: Mutex::new(ports),
-            dbs: Arc::new(Mutex::new(dbs)),
-            run: Mutex::new(run),
-
-            dev_ctx: DeviceContextList::new(cap.ac64(), max_slots)?,
-            scratchpad_buf_arr: None, // initialized in init()
-
-            cmd: Mutex::new(cmd),
-            primary_event_ring: Mutex::new(EventRing::new::<N>(cap.ac64())?),
-            drivers_config,
-            handles: CHashMap::new(),
-            next_handle: AtomicUsize::new(0),
-            port_states: CHashMap::new(),
-            drivers: CHashMap::new(),
-            scheme_name,
-
-            interrupt_method,
-            pcid_handle: Mutex::new(pcid_handle),
-
-            irq_reactor: Mutex::new(None),
-            irq_reactor_sender,
-            irq_reactor_receiver,
-            device_enumerator: Mutex::new(None),
-            device_enumerator_sender,
-            device_enumerator_receiver,
-        };
-
-        xhci.init(max_slots)?;
-
-        Ok(xhci)
-    }
-
-    pub fn init(&mut self, max_slots: u8) -> Result<()> {
-        // Set run/stop to 0
-        debug!("Stopping xHC.");
-        self.op.get_mut().unwrap().usb_cmd.writef(USB_CMD_RS, false);
-
-        // Warm reset
-        {
-            debug!("Reset xHC");
-            let timeout = Timeout::from_secs(1);
-            self.op
-                .get_mut()
-                .unwrap()
-                .usb_cmd
-                .writef(USB_CMD_HCRST, true);
-            while self.op.get_mut().unwrap().usb_cmd.readf(USB_CMD_HCRST) {
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on USB_CMD_HCRST");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        // Set enabled slots
-        debug!("Setting enabled slots to {}.", max_slots);
-        self.op.get_mut().unwrap().config.write(max_slots as u32);
-        debug!(
-            "Enabled Slots: {}",
-            self.op.get_mut().unwrap().config.read() & 0xFF
-        );
-
-        // Set device context address array pointer
-        let dcbaap = self.dev_ctx.dcbaap();
-        debug!("Writing DCBAAP: {:X}", dcbaap);
-        self.op.get_mut().unwrap().dcbaap_low.write(dcbaap as u32);
-        self.op
-            .get_mut()
-            .unwrap()
-            .dcbaap_high
-            .write((dcbaap as u64 >> 32) as u32);
-
-        // Set command ring control register
-        let crcr = self.cmd.get_mut().unwrap().register();
-        assert_eq!(crcr & 0xFFFF_FFFF_FFFF_FFC1, crcr, "unaligned CRCR");
-        debug!("Writing CRCR: {:X}", crcr);
-        self.op.get_mut().unwrap().crcr_low.write(crcr as u32);
-        self.op
-            .get_mut()
-            .unwrap()
-            .crcr_high
-            .write((crcr as u64 >> 32) as u32);
-
-        // Set event ring segment table registers
-        debug!(
-            "Interrupter 0: {:p}",
-            self.run.get_mut().unwrap().ints.as_ptr()
-        );
-        {
-            let int = &mut self.run.get_mut().unwrap().ints[0];
-
-            let erstz = 1;
-            debug!("Writing ERSTZ: {}", erstz);
-            int.erstsz.write(erstz);
-
-            let erdp = self.primary_event_ring.get_mut().unwrap().erdp();
-            debug!("Writing ERDP: {:X}", erdp);
-            int.erdp_low.write(erdp as u32 | (1 << 3));
-            int.erdp_high.write((erdp as u64 >> 32) as u32);
-
-            let erstba = self.primary_event_ring.get_mut().unwrap().erstba();
-            debug!("Writing ERSTBA: {:X}", erstba);
-            int.erstba_low.write(erstba as u32);
-            int.erstba_high.write((erstba as u64 >> 32) as u32);
-
-            debug!("Writing IMODC and IMODI: {} and {}", 0, 0);
-            int.imod.write(0);
-
-            debug!("Enabling Primary Interrupter.");
-            int.iman.writef(1 << 1 | 1, true);
-        }
-        self.op
-            .get_mut()
-            .unwrap()
-            .usb_cmd
-            .writef(USB_CMD_INTE, true);
-
-        // Setup the scratchpad buffers that are required for the xHC to function.
-        self.setup_scratchpads()?;
-
-        // Set run/stop to 1
-        debug!("Starting xHC.");
-        self.op.get_mut().unwrap().usb_cmd.writef(USB_CMD_RS, true);
-
-        {
-            debug!("Waiting for start request to complete.");
-            let timeout = Timeout::from_secs(1);
-            while self.op.get_mut().unwrap().usb_sts.readf(USB_STS_HCH) {
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on USB_STS_HCH");
-                    Error::new(EIO)
-                })?;
-            }
-        }
-
-        // Ring command doorbell
-        debug!("Ringing command doorbell.");
-        self.dbs.lock().unwrap()[0].write(0);
-
-        debug!("XHCI initialized.");
-
-        self.op.get_mut().unwrap().set_cie(self.cap.cic());
-
-        self.print_port_capabilities();
-
-        Ok(())
-    }
-
-    pub fn get_pls(&self, port_id: PortId) -> u8 {
-        let mut ports = self.ports.lock().unwrap();
-        let port = ports.get_mut(port_id.root_hub_port_index()).unwrap();
-        port.state()
-    }
-
-    pub fn poll(&self) {
-        debug!("Polling Initial Devices!");
-
-        let len = self.ports.lock().unwrap().len();
-
-        for root_hub_port_num in 1..=(len as u8) {
-            let port_id = PortId {
-                root_hub_port_num,
-                route_string: 0,
-            };
-
-            //Get the CCS and CSC flags
-            let (ccs, csc, flags) = {
-                let mut ports = self.ports.lock().unwrap();
-                let port = &mut ports[port_id.root_hub_port_index()];
-                let flags = port.flags();
-                let ccs = flags.contains(PortFlags::CCS);
-                let csc = flags.contains(PortFlags::CSC);
-
-                (ccs, csc, flags)
-            };
-
-            debug!("Port {} has flags {:?}", port_id, flags);
-
-            match (ccs, csc) {
-                (false, false) => { // Nothing is connected, and there was no port status change
-                     //Do nothing
-                }
-                _ => {
-                    //Either something is connected, or nothing is connected and a port status change was asserted.
-                    self.device_enumerator_sender
-                        .send(DeviceEnumerationRequest { port_id })
-                        .expect("Failed to generate the port enumeration request!");
-                }
-            }
-        }
-    }
-
-    pub fn print_port_capabilities(&self) {
-        let len;
-        {
-            let mut ports = self.ports.lock().unwrap();
-            len = ports.len();
-        }
-
-        for root_hub_port_num in 1..=(len as u8) {
-            let port_id = PortId {
-                root_hub_port_num,
-                route_string: 0,
-            };
-
-            let state = self.get_pls(port_id);
-            let mut flags;
-            {
-                let mut ports = self.ports.lock().unwrap();
-
-                flags = ports[port_id.root_hub_port_index()].flags();
-            }
-
-            match self.supported_protocol(port_id) {
-                None => {
-                    warn!("No detected supported protocol for port {}", port_id);
-                }
-                Some(protocol) => {
-                    debug!(
-                        "Port {} is a USB {}.{} port with slot type {} and in current state {}: {:?}",
-                        port_id,
-                        protocol.rev_major(),
-                        protocol.rev_minor(),
-                        protocol.proto_slot_ty(),
-                        state,
-                        flags
-                    );
-                }
-            };
-        }
-    }
-    pub fn reset_port(&self, port_id: PortId) -> Result<()> {
-        debug!("XHCI Port {} reset", port_id);
-
-        //TODO handle the second unwrap
-        let mut ports = self.ports.lock().unwrap();
-        let port = ports.get_mut(port_id.root_hub_port_index()).unwrap();
-        let instant = std::time::Instant::now();
-
-        debug!("Port {} Link State: {}", port_id, port.state());
-
-        {
-            port.set_pr();
-            debug!(
-                "Flags after setting port {} reset: {:?}",
-                port_id,
-                port.flags()
-            );
-            let timeout = Timeout::from_secs(1);
-            while !port.flags().contains(port::PortFlags::PRC) {
-                timeout.run().map_err(|()| {
-                    log::error!("timeout on port {} PRC", port_id);
-                    Error::new(EIO)
-                })?;
-            }
-        }
-        Ok(())
-    }
-
-    pub fn setup_scratchpads(&mut self) -> Result<()> {
-        let buf_count = self.cap.max_scratchpad_bufs();
-
-        if buf_count == 0 {
-            return Ok(());
-        }
-        let scratchpad_buf_arr = ScratchpadBufferArray::new::<N>(self.cap.ac64(), buf_count)?;
-        self.dev_ctx.dcbaa[0] = scratchpad_buf_arr.register() as u64;
-        debug!(
-            "Setting up {} scratchpads, at {:#0x}",
-            buf_count,
-            scratchpad_buf_arr.register()
-        );
-        self.scratchpad_buf_arr = Some(scratchpad_buf_arr);
-
-        Ok(())
-    }
-
-    pub fn force_clear_interrupt(&self, index: usize) {
-        {
-            // If ERDP EHB bit is set, clear it before sending command
-            //TODO: find out why this bit is set earlier!
-            let mut run = self.run.lock().unwrap();
-            let mut int = &mut run.ints[index];
-
-            if int.erdp_low.readf(1 << 3) {
-                int.erdp_low.writef(1 << 3, true);
-            } else {
-                warn!("Attempted to clear the interrupt bit when no interrupt was pending");
-            }
-        }
-    }
-
-    pub fn interrupt_is_pending(&self, index: usize) -> bool {
-        let mut run = self.run.lock().unwrap();
-        let mut int = &mut run.ints[index];
-        int.erdp_low.readf(1 << 3)
-    }
-
-    pub async fn enable_port_slot(&self, slot_ty: u8) -> Result<u8> {
-        assert_eq!(slot_ty & 0x1F, slot_ty);
-
-        let (event_trb, command_trb) = self
-            .execute_command(|cmd, cycle| cmd.enable_slot(slot_ty, cycle))
-            .await;
-
-        trace!("Slot is enabled!");
-        self::scheme::handle_event_trb("ENABLE_SLOT", &event_trb, &command_trb)?;
-        //self.event_handler_finished();
-
-        Ok(event_trb.event_slot())
-    }
-    pub async fn disable_port_slot(&self, slot: u8) -> Result<()> {
-        trace!("Disable slot {}", slot);
-        let (event_trb, command_trb) = self
-            .execute_command(|cmd, cycle| cmd.disable_slot(slot, cycle))
-            .await;
-
-        self::scheme::handle_event_trb("DISABLE_SLOT", &event_trb, &command_trb)?;
-        //self.event_handler_finished();
-
-        Ok(())
-    }
-
-    pub fn slot_state(&self, slot: usize) -> u8 {
-        ((self.dev_ctx.contexts[slot].slot.d.read() & SLOT_CONTEXT_STATE_MASK)
-            >> SLOT_CONTEXT_STATE_SHIFT) as u8
-    }
-    pub unsafe fn alloc_dma_zeroed_raw<T>(_ac64: bool) -> Result<Dma<T>> {
-        // TODO: ac64
-        Ok(Dma::zeroed()?.assume_init())
-    }
-    pub unsafe fn alloc_dma_zeroed<T>(&self) -> Result<Dma<T>> {
-        Self::alloc_dma_zeroed_raw(self.cap.ac64())
-    }
-    pub unsafe fn alloc_dma_zeroed_unsized_raw<T>(_ac64: bool, count: usize) -> Result<Dma<[T]>> {
-        // TODO: ac64
-        Ok(Dma::zeroed_slice(count)?.assume_init())
-    }
-    pub unsafe fn alloc_dma_zeroed_unsized<T>(&self, count: usize) -> Result<Dma<[T]>> {
-        Self::alloc_dma_zeroed_unsized_raw(self.cap.ac64(), count)
-    }
-
-    pub async fn attach_device(&self, port_id: PortId) -> syscall::Result<()> {
-        if self.port_states.contains_key(&port_id) {
-            debug!("Already contains port {}", port_id);
-            return Err(syscall::Error::new(EAGAIN));
-        }
-
-        let (data, state, speed, flags) = {
-            let port = &self.ports.lock().unwrap()[port_id.root_hub_port_index()];
-            (port.read(), port.state(), port.speed(), port.flags())
-        };
-
-        debug!(
-            "XHCI Port {}: {:X}, State {}, Speed {}, Flags {:?}",
-            port_id, data, state, speed, flags
-        );
-
-        if flags.contains(port::PortFlags::CCS) {
-            let slot_ty = match self.supported_protocol(port_id) {
-                Some(protocol) => protocol.proto_slot_ty(),
-                None => {
-                    warn!("Failed to find supported protocol information for port");
-                    0
-                }
-            };
-
-            debug!("Slot type: {}", slot_ty);
-            debug!("Enabling slot.");
-            let slot = match self.enable_port_slot(slot_ty).await {
-                Ok(ok) => ok,
-                Err(err) => {
-                    error!("Failed to enable slot for port {}: {}", port_id, err);
-                    return Err(err);
-                }
-            };
-
-            debug!("Enabled port {}, which the xHC mapped to {}", port_id, slot);
-
-            //TODO: get correct speed for child devices
-            let protocol_speed = self
-                .lookup_psiv(port_id, speed)
-                .expect("Failed to retrieve speed ID");
-
-            let mut input = unsafe { self.alloc_dma_zeroed::<InputContext<N>>()? };
-
-            debug!("Attempting to address the device");
-            let mut ring = match self
-                .address_device(&mut input, port_id, slot_ty, slot, protocol_speed, speed)
-                .await
-            {
-                Ok(device_ring) => device_ring,
-                Err(err) => {
-                    error!("Failed to address device for port {}: `{}`", port_id, err);
-                    return Err(err);
-                }
-            };
-
-            debug!("Addressed device");
-
-            // TODO: Should the descriptors be cached in PortState, or refetched?
-
-            let mut port_state = PortState {
-                slot,
-                protocol_speed,
-                input_context: Mutex::new(input),
-                dev_desc: None,
-                cfg_idx: None,
-                endpoint_states: std::iter::once((
-                    0,
-                    EndpointState {
-                        transfer: RingOrStreams::Ring(ring),
-                        driver_if_state: EndpIfState::Init,
-                    },
-                ))
-                .collect::<BTreeMap<_, _>>(),
-            };
-            self.port_states.insert(port_id, port_state);
-            debug!("Got port states!");
-
-            // Ensure correct packet size is used
-            let dev_desc_8_byte = self.fetch_dev_desc_8_byte(port_id, slot).await?;
-            {
-                let mut port_state = self.port_states.get_mut(&port_id).unwrap();
-
-                let mut input = port_state.input_context.lock().unwrap();
-
-                self.update_max_packet_size(&mut *input, slot, dev_desc_8_byte)
-                    .await?;
-            }
-
-            debug!("Got the 8 byte dev descriptor: {:X?}", dev_desc_8_byte);
-
-            let dev_desc = self.get_desc(port_id, slot).await?;
-            debug!("Got the full device descriptor!");
-            self.port_states.get_mut(&port_id).unwrap().dev_desc = Some(dev_desc);
-
-            debug!("Got the port states again!");
-            {
-                let mut port_state = self.port_states.get_mut(&port_id).unwrap();
-
-                let mut input = port_state.input_context.lock().unwrap();
-                debug!("Got the input context!");
-                let dev_desc = port_state.dev_desc.as_ref().unwrap();
-
-                self.update_default_control_pipe(&mut *input, slot, dev_desc)
-                    .await?;
-            }
-
-            debug!("Updated the default control pipe");
-
-            match self.spawn_drivers(port_id) {
-                Ok(()) => (),
-                Err(err) => {
-                    error!("Failed to spawn driver for port {}: `{}`", port_id, err)
-                }
-            }
-        } else {
-            warn!("Attempted to attach a device that didnt have CCS=1");
-        }
-
-        Ok(())
-    }
-
-    pub async fn detach_device(&self, port_id: PortId) -> Result<bool> {
-        if let Some(children) = self.drivers.remove(&port_id) {
-            for mut child in children {
-                info!("killing driver process {} for port {}", child.id(), port_id);
-                match child.kill() {
-                    Ok(()) => {
-                        info!("killed driver process {} for port {}", child.id(), port_id);
-                        match child.try_wait() {
-                            Ok(status_opt) => match status_opt {
-                                Some(status) => {
-                                    debug!(
-                                        "driver process {} for port {} exited with status {}",
-                                        child.id(),
-                                        port_id,
-                                        status
-                                    );
-                                }
-                                None => {
-                                    //TODO: kill harder
-                                    warn!(
-                                        "driver process {} for port {} still running",
-                                        child.id(),
-                                        port_id
-                                    );
-                                }
-                            },
-                            Err(err) => {
-                                warn!(
-                                    "failed to wait for the driver process {} for port {}: {}",
-                                    child.id(),
-                                    port_id,
-                                    err
-                                );
-                            }
-                        }
-                    }
-                    Err(err) => {
-                        warn!(
-                            "failed to kill the driver process {} for port {}: {}",
-                            child.id(),
-                            port_id,
-                            err
-                        );
-                    }
-                }
-            }
-        }
-
-        if let Some(state) = self.port_states.remove(&port_id) {
-            debug!("disabling port slot {} for port {}", state.slot, port_id);
-            let result = self.disable_port_slot(state.slot).await.and(Ok(true));
-            debug!(
-                "disabled port slot {} for port {} with result: {:?}",
-                state.slot, port_id, result
-            );
-            result
-        } else {
-            debug!(
-                "Attempted to detach from port {}, which wasn't previously attached.",
-                port_id
-            );
-            Ok(false)
-        }
-    }
-
-    pub async fn update_max_packet_size(
-        &self,
-        input_context: &mut Dma<InputContext<N>>,
-        slot_id: u8,
-        dev_desc: usb::DeviceDescriptor8Byte,
-    ) -> Result<()> {
-        let new_max_packet_size = if dev_desc.major_usb_vers() <= 2 {
-            // For USB 2.0 and below, packet_size is in bytes
-            u32::from(dev_desc.packet_size)
-        } else {
-            // For later USB versions, packet_size is the shift
-            1u32 << dev_desc.packet_size
-        };
-        let mut b = input_context.device.endpoints[0].b.read();
-        b &= 0x0000_FFFF;
-        b |= (new_max_packet_size) << 16;
-        input_context.device.endpoints[0].b.write(b);
-
-        let (event_trb, command_trb) = self
-            .execute_command(|trb, cycle| {
-                trb.evaluate_context(slot_id, input_context.physical(), false, cycle)
-            })
-            .await;
-
-        self::scheme::handle_event_trb("EVALUATE_CONTEXT", &event_trb, &command_trb)?;
-        //self.event_handler_finished();
-
-        Ok(())
-    }
-
-    pub async fn update_default_control_pipe(
-        &self,
-        input_context: &mut Dma<InputContext<N>>,
-        slot_id: u8,
-        dev_desc: &DevDesc,
-    ) -> Result<()> {
-        debug!("Updating default control pipe!");
-        input_context.add_context.write(1 << 1);
-        input_context.drop_context.write(0);
-
-        let new_max_packet_size = if dev_desc.major_version() <= 2 {
-            // For USB 2.0 and below, packet_size is in bytes
-            u32::from(dev_desc.packet_size)
-        } else {
-            // For later USB versions, packet_size is the shift
-            1u32 << dev_desc.packet_size
-        };
-        let mut b = input_context.device.endpoints[0].b.read();
-        b &= 0x0000_FFFF;
-        b |= (new_max_packet_size) << 16;
-        input_context.device.endpoints[0].b.write(b);
-
-        let (event_trb, command_trb) = self
-            .execute_command(|trb, cycle| {
-                trb.evaluate_context(slot_id, input_context.physical(), false, cycle)
-            })
-            .await;
-        debug!("Completed the command to update the default control pipe");
-
-        self::scheme::handle_event_trb("EVALUATE_CONTEXT", &event_trb, &command_trb)?;
-        //self.event_handler_finished();
-
-        Ok(())
-    }
-
-    pub async fn address_device(
-        &self,
-        input_context: &mut Dma<InputContext<N>>,
-        port: PortId,
-        slot_ty: u8,
-        slot: u8,
-        protocol_speed: &ProtocolSpeed,
-        speed: u8,
-    ) -> Result<Ring> {
-        // Collect MTT, parent port number, parent slot ID
-        let mut mtt = false;
-        let mut parent_hub_slot_id = 0u8;
-        let mut parent_port_num = 0u8;
-        if let Some((parent_port, port_num)) = port.parent() {
-            match self.port_states.get(&parent_port) {
-                Some(parent_state) => {
-                    // parent info must be supplied if:
-                    let mut needs_parent_info = false;
-                    // 1. the device is low or full speed and connected through a high speed hub
-                    //TODO: determine device speed (speed is not accurate as it comes from the port)
-                    // 2. the device is superspeed and connected through a higher rank hub
-                    //TODO: determine device speed (speed is not accurate as it comes from the port)
-                    // For now, this is just set to true to force things to work
-                    needs_parent_info = true;
-                    if needs_parent_info {
-                        parent_hub_slot_id = parent_state.slot;
-                        parent_port_num = port_num;
-                    }
-                    info!(
-                        "port {} parent_hub_slot_id {} parent_port_num {}",
-                        port, parent_hub_slot_id, parent_port_num
-                    );
-                }
-                None => {
-                    warn!("port {} missing parent port {} state", port, parent_port);
-                }
-            }
-        }
-
-        let mut ring = Ring::new::<N>(self.cap.ac64(), 16, true)?;
-
-        {
-            input_context.add_context.write(1 << 1 | 1); // Enable the slot (zeroth bit) and the control endpoint (first bit).
-
-            let route_string = port.route_string;
-            let context_entries = 1u8;
-            let hub = false;
-
-            assert_eq!(route_string & 0x000F_FFFF, route_string);
-            input_context.device.slot.a.write(
-                route_string
-                    | (u32::from(speed) << 20)
-                    | (u32::from(mtt) << 25)
-                    | (u32::from(hub) << 26)
-                    | (u32::from(context_entries) << 27),
-            );
-
-            let max_exit_latency = 0u16;
-            let root_hub_port_num = port.root_hub_port_num;
-            let number_of_ports = 0u8;
-            input_context.device.slot.b.write(
-                u32::from(max_exit_latency)
-                    | (u32::from(root_hub_port_num) << 16)
-                    | (u32::from(number_of_ports) << 24),
-            );
-
-            // TODO
-            let ttt = 0u8;
-            let interrupter = 0u8;
-
-            assert_eq!(ttt & 0b11, ttt);
-            input_context.device.slot.c.write(
-                u32::from(parent_hub_slot_id)
-                    | (u32::from(parent_port_num) << 8)
-                    | (u32::from(ttt) << 16)
-                    | (u32::from(interrupter) << 22),
-            );
-
-            let max_error_count = 3u8; // recommended value according to the XHCI spec
-            let ep_ty = 4u8; // control endpoint, bidirectional
-            let max_packet_size: u32 =
-                if protocol_speed.is_lowspeed() || protocol_speed.is_fullspeed() {
-                    8
-                } else if protocol_speed.is_highspeed() {
-                    64
-                } else {
-                    512
-                };
-            let host_initiate_disable = false; // only applies to streams
-            let max_burst_size = 0u8; // TODO
-
-            assert_eq!(max_error_count & 0b11, max_error_count);
-            input_context.device.endpoints[0].b.write(
-                (u32::from(max_error_count) << 1)
-                    | (u32::from(ep_ty) << 3)
-                    | (u32::from(host_initiate_disable) << 7)
-                    | (u32::from(max_burst_size) << 8)
-                    | (u32::from(max_packet_size) << 16),
-            );
-
-            let dequeue_cycle_state = true;
-            let tr = ring.register();
-            input_context.device.endpoints[0]
-                .trh
-                .write((tr >> 32) as u32);
-            input_context.device.endpoints[0]
-                .trl
-                .write((tr as u32) | u32::from(dequeue_cycle_state));
-
-            // The default control pipe can always use 8 bytes
-            let avg_trb_len = 8u8;
-            input_context.device.endpoints[0]
-                .c
-                .write(u32::from(avg_trb_len));
-        }
-
-        let input_context_physical = input_context.physical();
-
-        let (event_trb, _) = self
-            .execute_command(|trb, cycle| {
-                trb.address_device(slot, input_context_physical, false, cycle)
-            })
-            .await;
-
-        if event_trb.completion_code() != TrbCompletionCode::Success as u8 {
-            error!(
-                "Failed to address device at slot {} (port {}), completion code 0x{:X}",
-                slot,
-                port,
-                event_trb.completion_code()
-            );
-            //self.event_handler_finished();
-            return Err(Error::new(EIO));
-        }
-        //self.event_handler_finished();
-
-        Ok(ring)
-    }
-
-    fn uses_msi_interrupts(&self) -> bool {
-        matches!(self.interrupt_method, InterruptMethod::Msi)
-    }
-
-    /// Checks whether an IRQ has been received from *this* device, in case of an interrupt. Always
-    /// true when using MSI/MSI-X.
-    pub fn received_irq(&self) -> bool {
-        let mut runtime_regs = self.run.lock().unwrap();
-
-        if self.uses_msi_interrupts() {
-            // Since using MSI and MSI-X implies having no IRQ sharing whatsoever, the IP bit
-            // doesn't have to be touched.
-            trace!(
-                "Successfully received MSI/MSI-X interrupt, IP={}, EHB={}",
-                runtime_regs.ints[0].iman.readf(1),
-                runtime_regs.ints[0].erdp_low.readf(1 << 3)
-            );
-            true
-        } else if runtime_regs.ints[0].iman.readf(1) {
-            trace!(
-                "Successfully received INTx# interrupt, IP={}, EHB={}",
-                runtime_regs.ints[0].iman.readf(1),
-                runtime_regs.ints[0].erdp_low.readf(1 << 3)
-            );
-            // If MSI and/or MSI-X are not used, the interrupt might have to be shared, and thus there is
-            // a special register to specify whether the IRQ actually came from the xHC.
-            runtime_regs.ints[0].iman.writef(1, true);
-
-            // The interrupt came from the xHC.
-            true
-        } else {
-            // The interrupt came from a different device.
-            false
-        }
-    }
-    fn spawn_drivers(&self, port: PortId) -> Result<()> {
-        // TODO: There should probably be a way to select alternate interfaces, and not just the
-        // first one.
-        // TODO: Now that there are some good error crates, I don't think errno.h error codes are
-        // suitable here.
-
-        let ps = self.port_states.get(&port).unwrap();
-        trace!("Spawning driver on port: {}", port);
-
-        //TODO: support choosing config?
-        let config_desc = &ps
-            .dev_desc
-            .as_ref()
-            .ok_or_else(|| {
-                log::warn!("Missing device descriptor");
-                Error::new(EBADF)
-            })?
-            .config_descs
-            .first()
-            .ok_or_else(|| {
-                log::warn!("Missing config descriptor");
-                Error::new(EBADF)
-            })?;
-
-        trace!("Got config and device descriptors on port {}", port);
-
-        for ifdesc in config_desc.interface_descs.iter() {
-            //TODO: support alternate settings
-            // This is difficult because the device driver must know which alternate
-            // to use, but if alternates can have different classes, then a different
-            // device driver may be required for each alternate. For now, we will use
-            // only the default alternate setting (0)
-            if ifdesc.alternate_setting != 0 {
-                warn!(
-                    "ignoring port {} iface {} alternate {} class {}.{} proto {}",
-                    port,
-                    ifdesc.number,
-                    ifdesc.alternate_setting,
-                    ifdesc.class,
-                    ifdesc.sub_class,
-                    ifdesc.protocol
-                );
-                continue;
-            }
-
-            if let Some(driver) = self.drivers_config.drivers.iter().find(|driver| {
-                driver.class == ifdesc.class
-                    && driver
-                        .subclass()
-                        .map(|subclass| subclass == ifdesc.sub_class)
-                        .unwrap_or(true)
-            }) {
-                info!(
-                    "Loading subdriver \"{}\" for port {} iface {} alternate {} class {}.{} proto {}",
-                    driver.name,
-                    port,
-                    ifdesc.number,
-                    ifdesc.alternate_setting,
-                    ifdesc.class,
-                    ifdesc.sub_class,
-                    ifdesc.protocol,
-                );
-                let (command, args) = driver.command.split_first().ok_or(Error::new(EBADMSG))?;
-
-                let command = if command.starts_with('/') {
-                    command.to_owned()
-                } else {
-                    "/usr/lib/drivers/".to_owned() + command
-                };
-                let process = process::Command::new(command)
-                    .args(
-                        args.into_iter()
-                            .map(|arg| {
-                                arg.replace("$SCHEME", &self.scheme_name)
-                                    .replace("$PORT", &format!("{}", port))
-                                    .replace("$IF_NUM", &format!("{}", ifdesc.number))
-                                    .replace("$IF_PROTO", &format!("{}", ifdesc.protocol))
-                            })
-                            .collect::<Vec<_>>(),
-                    )
-                    .stdin(process::Stdio::null())
-                    .spawn()
-                    .or(Err(Error::new(ENOENT)))?;
-                self.drivers.alter(port, |children_opt| {
-                    let mut children = children_opt.unwrap_or_else(|| Vec::new());
-                    children.push(process);
-                    Some(children)
-                });
-            } else {
-                warn!(
-                    "No driver for port {} iface {} alternate {} class {}.{} proto {}",
-                    port,
-                    ifdesc.number,
-                    ifdesc.alternate_setting,
-                    ifdesc.class,
-                    ifdesc.sub_class,
-                    ifdesc.protocol
-                );
-            }
-        }
-
-        Ok(())
-    }
-    pub fn capabilities_iter(&self) -> ExtendedCapabilitiesIter {
-        unsafe {
-            ExtendedCapabilitiesIter::new(
-                (self.base as *mut u8).offset((self.cap.ext_caps_ptr_in_dwords() << 2) as isize),
-            )
-        }
-    }
-    pub fn supported_protocols_iter(&self) -> impl Iterator<Item = &'static SupportedProtoCap> {
-        self.capabilities_iter()
-            .filter_map(|(pointer, cap_num)| unsafe {
-                if cap_num == CapabilityId::SupportedProtocol as u8 {
-                    Some(&*pointer.cast::<SupportedProtoCap>().as_ptr())
-                } else {
-                    None
-                }
-            })
-    }
-    pub fn supported_protocol(&self, port: PortId) -> Option<&'static SupportedProtoCap> {
-        self.supported_protocols_iter().find(|supp_proto| {
-            supp_proto
-                .compat_port_range()
-                .contains(&port.root_hub_port_num)
-        })
-    }
-    pub fn supported_protocol_speeds(
-        &self,
-        port: PortId,
-    ) -> impl Iterator<Item = &'static ProtocolSpeed> {
-        use extended::*;
-        const DEFAULT_SUPP_PROTO_SPEEDS: [ProtocolSpeed; 7] = [
-            // Full-speed
-            ProtocolSpeed::from_raw(
-                (Plt::Symmetric as u32) << PROTO_SPEED_PLT_SHIFT
-                    | (false as u32) << PROTO_SPEED_PFD_SHIFT
-                    | (Psie::Mbps as u32) << PROTO_SPEED_PSIE_SHIFT
-                    | 12 << PROTO_SPEED_PSIM_SHIFT
-                    | 1 << PROTO_SPEED_PSIV_SHIFT,
-            ),
-            // Low-speed
-            ProtocolSpeed::from_raw(
-                (Plt::Symmetric as u32) << PROTO_SPEED_PLT_SHIFT
-                    | (false as u32) << PROTO_SPEED_PFD_SHIFT
-                    | (Psie::Kbps as u32) << PROTO_SPEED_PSIE_SHIFT
-                    | 1500 << PROTO_SPEED_PSIM_SHIFT
-                    | 2 << PROTO_SPEED_PSIV_SHIFT,
-            ),
-            // High-speed
-            ProtocolSpeed::from_raw(
-                (Plt::Symmetric as u32) << PROTO_SPEED_PLT_SHIFT
-                    | (false as u32) << PROTO_SPEED_PFD_SHIFT
-                    | (Psie::Mbps as u32) << PROTO_SPEED_PSIE_SHIFT
-                    | 480 << PROTO_SPEED_PSIM_SHIFT
-                    | 3 << PROTO_SPEED_PSIV_SHIFT,
-            ),
-            // SuperSpeed Gen1 x1
-            ProtocolSpeed::from_raw(
-                (Plt::Symmetric as u32) << PROTO_SPEED_PLT_SHIFT
-                    | (true as u32) << PROTO_SPEED_PFD_SHIFT
-                    | (Psie::Gbps as u32) << PROTO_SPEED_PSIE_SHIFT
-                    | 5 << PROTO_SPEED_PSIM_SHIFT
-                    | (Lp::SuperSpeed as u32) << PROTO_SPEED_LP_SHIFT
-                    | 4 << PROTO_SPEED_PSIV_SHIFT,
-            ),
-            // SuperSpeedPlus Gen2 x1
-            ProtocolSpeed::from_raw(
-                (Plt::Symmetric as u32) << PROTO_SPEED_PLT_SHIFT
-                    | (true as u32) << PROTO_SPEED_PFD_SHIFT
-                    | (Psie::Gbps as u32) << PROTO_SPEED_PSIE_SHIFT
-                    | 10 << PROTO_SPEED_PSIM_SHIFT
-                    | (Lp::SuperSpeedPlus as u32) << PROTO_SPEED_LP_SHIFT
-                    | 5 << PROTO_SPEED_PSIV_SHIFT,
-            ),
-            // SuperSpeedPlus Gen1 x2
-            ProtocolSpeed::from_raw(
-                (Plt::Symmetric as u32) << PROTO_SPEED_PLT_SHIFT
-                    | (true as u32) << PROTO_SPEED_PFD_SHIFT
-                    | (Psie::Gbps as u32) << PROTO_SPEED_PSIE_SHIFT
-                    | 10 << PROTO_SPEED_PSIM_SHIFT
-                    | (Lp::SuperSpeedPlus as u32) << PROTO_SPEED_LP_SHIFT
-                    | 6 << PROTO_SPEED_PSIV_SHIFT,
-            ),
-            // SuperSpeedPlus Gen2 x2
-            ProtocolSpeed::from_raw(
-                (Plt::Symmetric as u32) << PROTO_SPEED_PLT_SHIFT
-                    | (true as u32) << PROTO_SPEED_PFD_SHIFT
-                    | (Psie::Gbps as u32) << PROTO_SPEED_PSIE_SHIFT
-                    | 20 << PROTO_SPEED_PSIM_SHIFT
-                    | (Lp::SuperSpeedPlus as u32) << PROTO_SPEED_LP_SHIFT
-                    | 7 << PROTO_SPEED_PSIV_SHIFT,
-            ),
-        ];
-
-        match self.supported_protocol(port) {
-            Some(supp_proto) => {
-                if supp_proto.psic() != 0 {
-                    unsafe { supp_proto.protocol_speeds().iter() }
-                } else {
-                    DEFAULT_SUPP_PROTO_SPEEDS.iter()
-                }
-            }
-            None => {
-                log::warn!(
-                    "falling back to default supported protocol speeds for port {}",
-                    port
-                );
-                DEFAULT_SUPP_PROTO_SPEEDS.iter()
-            }
-        }
-    }
-    pub fn lookup_psiv(&self, port: PortId, psiv: u8) -> Option<&'static ProtocolSpeed> {
-        self.supported_protocol_speeds(port)
-            .find(|speed| speed.psiv() == psiv)
-    }
-}
-pub fn start_irq_reactor<const N: usize>(hci: &Arc<Xhci<N>>, irq_file: Option<File>) {
-    let hci_clone = Arc::clone(&hci);
-
-    debug!("About to start IRQ reactor");
-
-    *hci.irq_reactor.lock().unwrap() = Some(thread::spawn(move || {
-        debug!("Started IRQ reactor thread");
-        IrqReactor::new(hci_clone, irq_file).run()
-    }));
-}
-
-pub fn start_device_enumerator<const N: usize>(hci: &Arc<Xhci<N>>) {
-    let hci_clone = Arc::clone(&hci);
-
-    debug!("About to start Device Enumerator");
-
-    *hci.device_enumerator.lock().unwrap() = Some(thread::spawn(move || {
-        debug!("Started Device Enumerator");
-        DeviceEnumerator::new(hci_clone).run();
-    }));
-}
-
-#[derive(Deserialize)]
-struct DriverConfig {
-    name: String,
-    class: u8,
-    subclass: i16, // The subclass may be meaningless for some drivers, hence negative values (and values above 255) mean "undefined".
-    command: Vec<String>,
-}
-impl DriverConfig {
-    fn subclass(&self) -> Option<u8> {
-        u8::try_from(self.subclass).ok()
-    }
-}
-#[derive(Deserialize)]
-struct DriversConfig {
-    drivers: Vec<DriverConfig>,
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/operational.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/operational.rs
deleted file mode 100644
index 12be477296..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/operational.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use common::io::{Io, Mmio};
-
-/// The XHCI Operational Registers
-///
-/// These registers specify the operational state of the XHCI device, and are used to receive status
-/// messages and transmit commands. These registers are offset from the XHCI base address by the
-/// "length" field of the [CapabilityRegs]
-///
-/// See XHCI section 5.4. Table 5-18 describes the offset of these registers in memory.
-#[repr(C, packed)]
-pub struct OperationalRegs {
-    /// The USB Command Register (USBCMD)
-    ///
-    /// Describes the command to be executed by the XHCI. Writes to this register case a command
-    /// to be executed.
-    ///
-    /// - Bit  0 is the Run/Stop bit (R/S). Writing a value of 1 stops the xHC from executing the schedule, 1 resumes. Latency is ~16ms at worst. (See XHCI Table 5-20)
-    /// - Bit  1 is the Host Controller Reset Bit (HCRST). Used by software to reset the host controller (See XHCI Table 5-20)
-    /// - Bit  2 is the Interrupter Enable Bit (INTE). Enables interrupting the host system.
-    /// - Bit  3 is the Host System Error Enable Bit (HSEE). Enables out-of-band error signalling to the host.
-    /// - Bits 4-6 are reserved.
-    /// - Bit  7 is the Light Host Controller Reset Bit (LHCRST). Resets the driver without affecting the state of the ports. Affected by [CapabilityRegs]
-    /// - Bit  8 is the Controller Save State Bit (CSS). See XHCI Table 5-20
-    /// - Bit  9 is the Controller Restore State Bit (CRS). See XHCI Table 5-20
-    /// - Bit 10 is the Enable Wrap Event Bit (EWE). See XHCI Table 5-20
-    /// - Bit 11 is the Enable U3 MFINDEX Stop Bit (EU3S). See XHCI Table 5-20
-    /// - Bit 12 is reserved.
-    /// - Bit 13 is the CEM Enable Bit (CME). See XHCI Table 5-20
-    /// - Bit 14 is the Extended TBC Enable Bit (ETE). See XHCI Table 5-20
-    /// - Bit 15 is the Extended TBC TRB Status Enable Bit (TSC_En). See XHCI Table 5-20
-    /// - Bit 16 is the VTIO Enable Bit (VTIOE). Controls the enable state of the VTIO capability.
-    /// - Bits 17-31 are reserved.
-    ///
-    pub usb_cmd: Mmio<u32>,
-    /// The USB Status Register (USBSTS)
-    ///
-    /// This register indicates pending interrupts and various states of the host controller.
-    ///
-    /// Software sets a bit to '0' in this register by writing a 1 to it.
-    ///
-    ///
-    pub usb_sts: Mmio<u32>,
-    /// The PAGESIZE Register (PAGESIZE)
-    ///
-    ///
-    pub page_size: Mmio<u32>,
-    /// Reserved bits (RsvdZ)
-    _rsvd: [Mmio<u32>; 2],
-    /// The Device Notification Control Register (DNCTRL)
-    ///
-    ///
-    pub dn_ctrl: Mmio<u32>,
-    /// The Command Ring Control Register Lower 32 bits (CRCR)
-    ///
-    ///
-    pub crcr_low: Mmio<u32>,
-    /// The Command Ring Control Register Upper 32 bits (CRCR)
-    ///
-    ///
-    pub crcr_high: Mmio<u32>,
-    /// Reserved bits (RsvdZ)
-    _rsvd2: [Mmio<u32>; 4],
-    /// Device Context Base Address Array Pointer Lower 32 bits (DCBAAP)
-    ///
-    ///
-    pub dcbaap_low: Mmio<u32>,
-    /// Device Context Base Address Array Pointer Upper 32 bits (DCBAAP)
-    ///
-    ///
-    pub dcbaap_high: Mmio<u32>,
-    /// The Configure Register (CONFIG)
-    ///
-    ///
-    pub config: Mmio<u32>,
-    // The standard has another set of reserved bits from 3C-3FFh here
-    // The standard has 400-13FFh has a Port Register Set here (likely defined in port.rs).
-}
-
-// Run/stop
-pub const USB_CMD_RS: u32 = 1 << 0;
-/// Host controller reset
-pub const USB_CMD_HCRST: u32 = 1 << 1;
-// Interrupter enable
-pub const USB_CMD_INTE: u32 = 1 << 2;
-
-/// Host controller halted
-pub const USB_STS_HCH: u32 = 1 << 0;
-/// Host controller not ready
-pub const USB_STS_CNR: u32 = 1 << 11;
-
-/// The mask to get the CIE bit from the Config register. See [OperationalRegs]
-pub const OP_CONFIG_CIE_BIT: u32 = 1 << 9;
-
-impl OperationalRegs {
-    pub fn cie(&self) -> bool {
-        self.config.readf(OP_CONFIG_CIE_BIT)
-    }
-    pub fn set_cie(&mut self, value: bool) {
-        self.config.writef(OP_CONFIG_CIE_BIT, value)
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/port.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/port.rs
deleted file mode 100644
index 0654ccc3a7..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/port.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use common::io::{Io, Mmio};
-
-// RO - read-only
-// ROS - read-only sticky
-// RW - read/write
-// RWS - read/write sticky
-// RW1CS - read/write-1-to-clear sticky
-// RW1S - read/write-1-to-set
-// Sticky register values may preserve values through chip hardware reset
-
-bitflags! {
-    #[derive(Debug)]
-    pub struct PortFlags: u32 {
-        const CCS = 1 << 0; // ROS
-        const PED = 1 << 1; // RW1CS
-        const RSVD_2 = 1 << 2; // RsvdZ
-        const OCA = 1 << 3; // RO
-        const PR =  1 << 4; // RW1S
-        const PLS_0 = 1 << 5; // RWS
-        const PLS_1 = 1 << 6; // RWS
-        const PLS_2 = 1 << 7; // RWS
-        const PLS_3 = 1 << 8; // RWS
-        const PP =  1 << 9; // RWS
-        const SPEED_0 =  1 << 10; // ROS
-        const SPEED_1 =  1 << 11; // ROS
-        const SPEED_2 =  1 << 12; // ROS
-        const SPEED_3 =  1 << 13; // ROS
-        const PIC_AMB = 1 << 14; // RWS
-        const PIC_GRN = 1 << 15; // RWS
-        const LWS = 1 << 16; // RW
-        const CSC = 1 << 17; // RW1CS
-        const PEC = 1 << 18; // RW1CS
-        const WRC = 1 << 19; // RW1CS
-        const OCC = 1 << 20; // RW1CS
-        const PRC = 1 << 21; // RW1CS
-        const PLC = 1 << 22; // RW1CS
-        const CEC = 1 << 23; // RW1CS
-        const CAS = 1 << 24; // RO
-        const WCE = 1 << 25; // RWS
-        const WDE = 1 << 26; // RWS
-        const WOE = 1 << 27; // RWS
-        const RSVD_28 = 1 << 28; // RsvdZ
-        const RSVD_29 = 1 << 29; // RsvdZ
-        const DR =  1 << 30; // RO
-        const WPR = 1 << 31; // RW1S
-    }
-}
-
-#[repr(C, packed)]
-pub struct Port {
-    // This has write one to clear fields, do not expose it, handle writes carefully!
-    portsc: Mmio<u32>,
-    pub portpmsc: Mmio<u32>,
-    pub portli: Mmio<u32>,
-    pub porthlpmc: Mmio<u32>,
-}
-
-impl Port {
-    pub fn read(&self) -> u32 {
-        self.portsc.read()
-    }
-
-    pub fn clear_csc(&mut self) {
-        self.portsc
-            .write((self.flags_preserved() | PortFlags::CSC).bits());
-    }
-
-    pub fn clear_prc(&mut self) {
-        self.portsc
-            .write((self.flags_preserved() | PortFlags::PRC).bits());
-    }
-
-    pub fn set_pr(&mut self) {
-        self.portsc
-            .write((self.flags_preserved() | PortFlags::PR).bits());
-    }
-
-    pub fn state(&self) -> u8 {
-        ((self.read() & (0b1111 << 5)) >> 5) as u8
-    }
-
-    pub fn speed(&self) -> u8 {
-        ((self.read() & (0b1111 << 10)) >> 10) as u8
-    }
-
-    pub fn flags(&self) -> PortFlags {
-        PortFlags::from_bits_truncate(self.read())
-    }
-
-    // Read only preserved flags
-    pub fn flags_preserved(&self) -> PortFlags {
-        // RO(S) and RW(S) bits should be preserved
-        // RW1S and RW1CS bits should not
-        let preserved = PortFlags::CCS
-            | PortFlags::OCA
-            | PortFlags::PLS_0
-            | PortFlags::PLS_1
-            | PortFlags::PLS_2
-            | PortFlags::PLS_3
-            | PortFlags::PP
-            | PortFlags::SPEED_0
-            | PortFlags::SPEED_1
-            | PortFlags::SPEED_2
-            | PortFlags::SPEED_3
-            | PortFlags::PIC_AMB
-            | PortFlags::PIC_GRN
-            | PortFlags::WCE
-            | PortFlags::WDE
-            | PortFlags::WOE
-            | PortFlags::DR;
-
-        self.flags() & preserved
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/ring.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/ring.rs
deleted file mode 100644
index 8e187ebea4..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/ring.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use std::mem;
-
-use syscall::error::Result;
-
-use common::dma::Dma;
-
-use super::trb::Trb;
-use super::Xhci;
-
-pub struct Ring {
-    pub link: bool,
-    pub trbs: Dma<[Trb]>,
-    pub i: usize,
-    pub cycle: bool,
-}
-
-impl Ring {
-    pub fn new<const N: usize>(ac64: bool, length: usize, link: bool) -> Result<Ring> {
-        Ok(Ring {
-            link,
-            trbs: unsafe { Xhci::<N>::alloc_dma_zeroed_unsized_raw(ac64, length)? },
-            i: 0,
-            cycle: link,
-        })
-    }
-
-    pub fn register(&self) -> u64 {
-        let base = self.trbs.physical() as *const Trb;
-        let addr = unsafe { base.offset(self.i as isize) };
-        addr as u64 | self.cycle as u64
-    }
-
-    pub fn next_index(&mut self) -> usize {
-        let mut i;
-        loop {
-            i = self.i;
-            self.i += 1;
-            if self.i >= self.trbs.len() {
-                self.i = 0;
-
-                if self.link {
-                    let address = self.trbs.physical();
-                    self.trbs[i].link(address, true, self.cycle);
-                    self.cycle = !self.cycle;
-                } else {
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-        i
-    }
-
-    pub fn next(&mut self) -> (&mut Trb, bool) {
-        let i = self.next_index();
-        (&mut self.trbs[i], self.cycle)
-    }
-    /// Endless iterator that iterates through the ring items, over and over again. The iterator
-    /// doesn't enqueue or dequeue anything.
-    pub fn iter(&self) -> impl Iterator<Item = &Trb> + '_ {
-        Iter {
-            ring: self,
-            i: self.i,
-        }
-    }
-    /// Takes a physical address and returns the index into this ring, that the index represents.
-    /// Returns `None` if the address is outside the bounds of this ring.
-    ///
-    /// # Panics
-    /// Panics if paddr is not a multiple of 16 bytes, i.e. the size of a TRB.
-    pub fn phys_addr_to_index(&self, ac64: bool, paddr: u64) -> Option<usize> {
-        let base = (self.trbs.physical() as u64)
-            & if ac64 {
-                0xFFFF_FFFF_FFFF_FFFF
-            } else {
-                0xFFFF_FFFF
-            };
-        let offset = paddr.checked_sub(base)? as usize;
-
-        assert_eq!(
-            offset % mem::size_of::<Trb>(),
-            0,
-            "unaligned TRB physical address"
-        );
-
-        let index = offset / mem::size_of::<Trb>();
-
-        if index > self.trbs.len() {
-            return None;
-        }
-
-        Some(index)
-    }
-    pub fn phys_addr_to_entry_ref(&self, ac64: bool, paddr: u64) -> Option<&Trb> {
-        Some(&self.trbs[self.phys_addr_to_index(ac64, paddr)?])
-    }
-    pub fn phys_addr_to_entry_mut(&mut self, ac64: bool, paddr: u64) -> Option<&mut Trb> {
-        let index = self.phys_addr_to_index(ac64, paddr)?;
-        Some(&mut self.trbs[index])
-    }
-    pub fn phys_addr_to_entry(&self, ac64: bool, paddr: u64) -> Option<Trb> {
-        Some(self.trbs[self.phys_addr_to_index(ac64, paddr)?].clone())
-    }
-    pub(crate) fn start_virt_addr(&self) -> *const Trb {
-        self.trbs.as_ptr()
-    }
-    pub(crate) fn end_virt_addr(&self) -> *const Trb {
-        unsafe { self.start_virt_addr().offset(self.trbs.len() as isize) }
-    }
-    pub fn trb_phys_ptr(&self, ac64: bool, trb: &Trb) -> u64 {
-        let trb_virt_pointer = trb as *const Trb;
-        let trbs_base_virt_pointer = self.trbs.as_ptr();
-
-        if (trb_virt_pointer as usize) < (trbs_base_virt_pointer as usize)
-            || (trb_virt_pointer as usize)
-                > (trbs_base_virt_pointer as usize) + self.trbs.len() * mem::size_of::<Trb>()
-        {
-            panic!("Gave a TRB outside of the ring, when retrieving its physical address in that ring. TRB: {:?} (at address {:p})", trb, trb);
-        }
-        let trb_offset_from_base = trb_virt_pointer as u64 - trbs_base_virt_pointer as u64;
-
-        let trbs_base_phys_ptr = (self.trbs.physical() as u64)
-            & if ac64 {
-                0xFFFF_FFFF_FFFF_FFFF
-            } else {
-                0xFFFF_FFFF
-            };
-        let trb_phys_ptr = trbs_base_phys_ptr + trb_offset_from_base;
-        trb_phys_ptr
-    }
-    /*
-    /// Endless mutable iterator that iterates through the ring items, over and over again. The
-    /// iterator doesn't enqueue or dequeue anything, but the trbs are mutably borrowed.
-    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut Trb> + '_ {
-        IterMut { ring: self, i: self.i }
-    }*/
-}
-struct Iter<'ring> {
-    ring: &'ring Ring,
-    i: usize,
-}
-impl<'ring> Iterator for Iter<'ring> {
-    type Item = &'ring Trb;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let i = self.i;
-        self.i = (self.i + 1) % self.ring.trbs.len();
-        Some(&self.ring.trbs[i])
-    }
-}
-/*struct IterMut<'ring> {
-    ring: &'ring mut Ring,
-    i: usize,
-}
-impl<'ring> Iterator for IterMut<'ring> {
-    type Item = &'ring mut Trb;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let i = self.i;
-        self.i = (self.i + 1) % self.ring.trbs.len();
-        Some(&mut self.ring.trbs[i])
-    }
-}*/
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/runtime.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/runtime.rs
deleted file mode 100644
index 55d54d4472..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/runtime.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use common::io::Mmio;
-
-#[repr(C, packed)]
-pub struct Interrupter {
-    pub iman: Mmio<u32>,
-    pub imod: Mmio<u32>,
-    pub erstsz: Mmio<u32>,
-    _rsvd: Mmio<u32>,
-    pub erstba_low: Mmio<u32>,
-    pub erstba_high: Mmio<u32>,
-    pub erdp_low: Mmio<u32>,
-    pub erdp_high: Mmio<u32>,
-}
-
-#[repr(C, packed)]
-pub struct RuntimeRegs {
-    pub mfindex: Mmio<u32>,
-    _rsvd: [Mmio<u32>; 7],
-    pub ints: [Interrupter; 1024],
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/scheme.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/scheme.rs
deleted file mode 100644
index ca27b3fec7..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/scheme.rs
+++ /dev/null
@@ -1,2839 +0,0 @@
-//! Provides the File Descriptor Scheme Interface to the XHCI.
-//!
-//! This file implements the basic unix file operations that are used to interface with the XHCI
-//! driver. While an external program could interact with the driver using this interface, a
-//! higher-level abstraction can be found in driver_interface.rs. It is recommended that you use
-//! the functions in that module to interact with the driver.
-//!
-//! The XHCI driver has the following set of schemes:
-//!
-//! port<n>
-//! port<n>/configure
-//! port<n>/request
-//! port<n>/endpoints
-//! port<n>/descriptors
-//! port<n>/state
-//! port<n>/endpoints/<n>
-//! port<n>/endpoints/<n>/ctl
-//! port<n>/endpoints/<n>/data
-use std::convert::TryFrom;
-use std::io::prelude::*;
-use std::ops::Deref;
-use std::sync::atomic;
-use std::{cmp, fmt, io, mem, str};
-
-use common::dma::Dma;
-use futures::executor::block_on;
-use log::{debug, error, info, trace, warn};
-use redox_scheme::scheme::SchemeSync;
-use scheme_utils::FpathWriter;
-use smallvec::SmallVec;
-
-use common::io::Io;
-use redox_scheme::{CallerCtx, OpenResult};
-use syscall::schemev2::NewFdFlags;
-use syscall::{
-    Error, Result, Stat, EACCES, EBADF, EBADFD, EBADMSG, EINVAL, EIO, EISDIR, ENOENT, ENOSYS,
-    ENOTDIR, EOPNOTSUPP, EPROTO, ESPIPE, MODE_CHR, MODE_DIR, MODE_FILE, O_DIRECTORY, O_RDWR,
-    O_STAT, O_WRONLY, SEEK_CUR, SEEK_END, SEEK_SET,
-};
-
-use super::{port, usb};
-use super::{EndpointState, PortId, Xhci};
-
-use super::context::{
-    SlotState, StreamContextArray, StreamContextType, CONTEXT_32, CONTEXT_64,
-    SLOT_CONTEXT_STATE_MASK, SLOT_CONTEXT_STATE_SHIFT,
-};
-use super::extended::ProtocolSpeed;
-use super::irq_reactor::{EventDoorbell, RingId};
-use super::ring::Ring;
-use super::trb::{TransferKind, Trb, TrbCompletionCode, TrbType};
-use super::usb::endpoint::EndpointTy;
-
-use crate::driver_interface::*;
-use regex::Regex;
-
-lazy_static! {
-    static ref REGEX_PORT_CONFIGURE: Regex = Regex::new(r"^port([\d\.]+)/configure$")
-        .expect("Failed to create the regex for the port<n>/configure scheme.");
-    static ref REGEX_PORT_ATTACH: Regex = Regex::new(r"^port([\d\.]+)/attach$")
-        .expect("Failed to create the regex for the port<n>/attach scheme.");
-    static ref REGEX_PORT_DETACH: Regex = Regex::new(r"^port([\d\.]+)/detach$")
-        .expect("Failed to create the regex for the port<n>/detach scheme.");
-    static ref REGEX_PORT_DESCRIPTORS: Regex = Regex::new(r"^port([\d\.]+)/descriptors$")
-        .expect("Failed to create the regex for the port<n>/descriptors");
-    static ref REGEX_PORT_STATE: Regex = Regex::new(r"^port([\d\.]+)/state$")
-        .expect("Failed to create the regex for the port<n>/state scheme");
-    static ref REGEX_PORT_REQUEST: Regex = Regex::new(r"^port([\d\.]+)/request$")
-        .expect("Failed to create the regex for the port<n>/request scheme");
-    static ref REGEX_PORT_ENDPOINTS: Regex = Regex::new(r"^port([\d\.]+)/endpoints$")
-        .expect("Failed to create the regex for the port<n>/endpoints scheme");
-    static ref REGEX_PORT_SPECIFIC_ENDPOINT: Regex =
-        Regex::new(r"^port([\d\.]+)/endpoints/(\d{1,3})$")
-            .expect("Failed to create the regex for the port<n>/endpoints/<n> scheme");
-    static ref REGEX_PORT_SUB_ENDPOINT: Regex = Regex::new(
-        r"port([\d\.]+)/endpoints/(\d{1,3})/(ctl|data)$"
-    )
-    .expect("Failed to create the regex for the port<n>/endpoints/<n>/<sub_endpoint> scheme");
-    static ref REGEX_PORT_ROOT: Regex =
-        Regex::new(r"^port([\d\.]+)$").expect("Failed to create the regex for the port<n> scheme.");
-    static ref REGEX_TOP_LEVEL: Regex =
-        Regex::new(r"^$").expect("Failed to create the regex for the top-level scheme");
-}
-
-pub enum ControlFlow {
-    Continue,
-    Break,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum EndpIfState {
-    Init,
-    WaitingForDataPipe {
-        direction: XhciEndpCtlDirection,
-        bytes_transferred: u32,
-        bytes_to_transfer: u32,
-    },
-    WaitingForStatus,
-    WaitingForTransferResult(PortTransferStatus),
-}
-
-/// Subdirs of an endpoint
-#[derive(Debug)]
-pub enum EndpointHandleTy {
-    /// portX/endpoints/Y/data. Allows clients to read and write data associated with ctl requests.
-    Data,
-
-    /// portX/endpoints/Y/status
-    Ctl,
-
-    /// portX/endpoints/Y/
-    Root(Vec<u8>), // content
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum PortTransferState {
-    /// Ready to read or write to do another transfer
-    Ready,
-
-    /// Transfer has completed, and the status has to be read.
-    WaitingForStatusReq(PortTransferStatus),
-}
-
-pub enum PortReqState {
-    Init,
-    WaitingForDeviceBytes(Dma<[u8]>, usb::Setup), // buffer, setup params
-    WaitingForHostBytes(Dma<[u8]>, usb::Setup),   // buffer, setup params
-    TmpSetup(usb::Setup),
-    Tmp,
-}
-
-/// The Handle to a specific scheme that is returned by an open() operation.
-///
-/// Contains some information about the data requested via the handle.
-#[derive(Debug)]
-pub enum Handle {
-    TopLevel(Vec<u8>),                      // contents (ports)
-    Port(PortId, Vec<u8>),                  // port, contents
-    PortDesc(PortId, Vec<u8>),              // port, contents
-    PortState(PortId),                      // port
-    PortReq(PortId, PortReqState),          // port, state
-    Endpoints(PortId, Vec<u8>),             // port, contents
-    Endpoint(PortId, u8, EndpointHandleTy), // port, endpoint, state
-    ConfigureEndpoints(PortId),             // port
-    AttachDevice(PortId),                   // port
-    DetachDevice(PortId),                   // port
-    SchemeRoot,
-}
-
-/// The type of handle.
-///
-/// This is used by fstat() to determine whether to return a:
-///     - MODE_DIR
-///     - MODE_FILE
-///     - MODE_CHR
-pub(crate) enum HandleType {
-    Directory,
-    File,
-    Character,
-}
-
-/// Parameters to a handle that were extracted from a scheme.
-///
-/// This structure is used to easily convert a scheme filesystem path to
-/// the parameters that we care about when constructing a handle.
-#[derive(Debug)]
-enum SchemeParameters {
-    /// The scheme references the top-level XHCI driver endpoint
-    TopLevel,
-    /// /port<n>
-    Port(PortId), // port number
-    /// /port<n>/descriptors
-    PortDesc(PortId), // port number
-    /// /port<n>/state
-    PortState(PortId), // port number
-    /// /port<n>/request
-    PortReq(PortId), // port number
-    /// /port<n>/endpoints
-    Endpoints(PortId), // port number
-    /// /port<n>/endpoints/<n>/(data|ctl)
-    ///
-    /// This can also represent
-    /// /port<n>/endpoints/<n>
-    Endpoint(PortId, u8, String), // port number, endpoint number, handle type
-    /// /port<n>/configure
-    ConfigureEndpoints(PortId), // port number
-    /// /port<n>/attach
-    AttachDevice(PortId), // port number
-    /// /port<n>/detach
-    DetachDevice(PortId), // port number
-}
-
-impl Handle {
-    /// Converts a handle back into the scheme that generated it.
-    ///
-    /// This is useful for implementing fpath, as the input parameters for our existing schemes
-    /// are generally static for the lifetime of the driver and can easily be retrieved.
-    ///
-    /// # Returns
-    /// - A [String] containing the scheme path that the handle is associated with.
-    pub(crate) fn to_path(&self) -> String {
-        match self {
-            Handle::TopLevel(_) => String::from(""),
-            Handle::Port(port_num, _) => {
-                format!("port{}", port_num)
-            }
-            Handle::PortDesc(port_num, _) => {
-                format!("port{}/descriptors", port_num)
-            }
-            Handle::PortState(port_num) => {
-                format!("port{}/state", port_num)
-            }
-            Handle::PortReq(port_num, _) => {
-                format!("port{}/request", port_num)
-            }
-            Handle::Endpoints(port_num, _) => {
-                format!("port{}/endpoints", port_num)
-            }
-            Handle::Endpoint(port_num, endpoint_num, handle_type) => match handle_type {
-                EndpointHandleTy::Data => {
-                    format!("port{}/endpoints/{}/data", port_num, endpoint_num)
-                }
-                EndpointHandleTy::Ctl => {
-                    format!("port{}/endpoints/{}/ctl", port_num, endpoint_num)
-                }
-                EndpointHandleTy::Root(_) => {
-                    format!("port{}/endpoints/{}", port_num, endpoint_num)
-                }
-            },
-            Handle::ConfigureEndpoints(port_num) => {
-                format!("port{}/configure", port_num)
-            }
-            Handle::AttachDevice(port_num) => {
-                format!("port{}/attach", port_num)
-            }
-            Handle::DetachDevice(port_num) => {
-                format!("port{}/detach", port_num)
-            }
-            Handle::SchemeRoot => String::from(""),
-        }
-    }
-
-    /// Gets the access mode for this handle
-    ///
-    /// Handles can be a file, a directory, or a character interface. The mode that we use is
-    /// entirely dependent upon the functionality of the scheme endpoint, so this returns the value
-    /// that should be associated with that endpoint.
-    ///
-    /// # Returns
-    /// - [HandleType] - The access mode associated with the handle.
-    pub(crate) fn get_handle_type(&self) -> HandleType {
-        match self {
-            &Handle::TopLevel(_) => HandleType::Directory,
-            &Handle::Port(_, _) => HandleType::Directory,
-            &Handle::Endpoints(_, _) => HandleType::Directory,
-            &Handle::PortDesc(_, _) => HandleType::File,
-            &Handle::PortReq(_, PortReqState::WaitingForDeviceBytes(_, _)) => HandleType::Character,
-            &Handle::PortReq(_, PortReqState::WaitingForHostBytes(_, _)) => HandleType::Character,
-            &Handle::PortReq(_, PortReqState::Tmp) => unreachable!(),
-            &Handle::PortReq(_, PortReqState::TmpSetup(_)) => unreachable!(),
-            &Handle::PortState(_) => HandleType::Character,
-            &Handle::PortReq(_, _) => HandleType::Character,
-            &Handle::ConfigureEndpoints(_) => HandleType::Character,
-            &Handle::AttachDevice(_) => HandleType::Character,
-            &Handle::DetachDevice(_) => HandleType::Character,
-            &Handle::Endpoint(_, _, ref st) => match st {
-                EndpointHandleTy::Data => HandleType::Character,
-                EndpointHandleTy::Ctl => HandleType::Character,
-                EndpointHandleTy::Root(_) => HandleType::Directory,
-            },
-            &Handle::SchemeRoot => HandleType::Directory,
-        }
-    }
-
-    /// Gets the length of the file buffer as returned by fstat in Stat.st_size
-    ///
-    /// As some of these endpoints did not return a length in the origin code, this
-    /// provides an Option<usize>
-    ///
-    /// # Returns
-    /// Either the size of the buffer, or [Option::None] if the buffer does not exist.
-    pub(crate) fn get_buf_len(&self) -> Option<usize> {
-        match self {
-            &Handle::TopLevel(ref buf) => Some(buf.len()),
-            &Handle::Port(_, ref buf) => Some(buf.len()),
-            &Handle::Endpoints(_, ref buf) => Some(buf.len()),
-            &Handle::PortDesc(_, ref buf) => Some(buf.len()),
-            &Handle::PortReq(_, PortReqState::WaitingForDeviceBytes(ref buf, _)) => Some(buf.len()),
-            &Handle::PortReq(_, PortReqState::WaitingForHostBytes(ref buf, _)) => Some(buf.len()),
-            &Handle::PortReq(_, PortReqState::Tmp) => None,
-            &Handle::PortReq(_, PortReqState::TmpSetup(_)) => None,
-            &Handle::PortState(_) => None,
-            &Handle::PortReq(_, _) => None,
-            &Handle::ConfigureEndpoints(_) => None,
-            &Handle::AttachDevice(_) => None,
-            &Handle::DetachDevice(_) => None,
-            &Handle::Endpoint(_, _, ref st) => match st {
-                EndpointHandleTy::Data => None,
-                EndpointHandleTy::Ctl => None,
-                EndpointHandleTy::Root(ref buf) => Some(buf.len()),
-            },
-            &Handle::SchemeRoot => None,
-        }
-    }
-}
-
-impl SchemeParameters {
-    /// This function gets a partially populated handle from a scheme string.
-    ///
-    /// This function is intended to be used by the driver's 'open' filesystem
-    /// hook to determine if the given string value represents a valid scheme
-    ///
-    /// # Arguments
-    /// 'scheme: &[str]' - A scheme in string format.
-    ///
-    /// # Returns
-    /// A [Result] containing:
-    /// - A [SchemeParameters] object representing the scheme that was passed, populated with the input parameters
-    /// - [ENOENT] if the passed scheme path is not valid for this driver.
-    ///
-    /// # Notes
-    /// ENOENT is returned so that it can easily be forwarded to the caller of open(). It cleans
-    /// up the function considerably to be able to use the ? syntax.
-    pub fn from_scheme(scheme: &str) -> Result<Self> {
-        fn get_string_from_regex(
-            rgx: &Regex,
-            scheme: &str,
-            capture_idx: usize,
-        ) -> syscall::Result<String> {
-            if let Some(capture_list) = rgx.captures(scheme) {
-                if let Some(value) = capture_list.get(capture_idx + 1) {
-                    return Ok(value.as_str().to_string());
-                }
-            }
-
-            Err(Error::new(ENOENT))
-        };
-
-        fn get_port_id_from_regex(
-            rgx: &Regex,
-            scheme: &str,
-            capture_idx: usize,
-        ) -> syscall::Result<PortId> {
-            if let Some(capture_list) = rgx.captures(scheme) {
-                if let Some(value) = capture_list.get(capture_idx + 1) {
-                    if let Ok(port_id) = value.as_str().parse::<PortId>() {
-                        return Ok(port_id);
-                    }
-                }
-            }
-
-            Err(Error::new(ENOENT))
-        };
-
-        fn get_u8_from_regex(rgx: &Regex, scheme: &str, capture_idx: usize) -> syscall::Result<u8> {
-            if let Some(capture_list) = rgx.captures(scheme) {
-                if let Some(value) = capture_list.get(capture_idx + 1) {
-                    if let Ok(integer) = value.as_str().parse::<u8>() {
-                        return Ok(integer);
-                    }
-                }
-            }
-
-            Err(Error::new(ENOENT))
-        };
-
-        //We don't implement From::<&path::Path> because we don't want to make this a part of
-        //the public interface. This function does not guarantee that the handle is VALID, only
-        //that the scheme is valid. open() will validate the contents of the enumeration instance,
-        //and store it if it's valid.
-
-        //Generate the regular expressions for all of our valid schemes.
-
-        //Check if we have a match and either return a partially initialized scheme, OR ENOENT
-        if REGEX_PORT_CONFIGURE.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_CONFIGURE, scheme, 0)?;
-
-            Ok(Self::ConfigureEndpoints(port_num))
-        } else if REGEX_PORT_ATTACH.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_ATTACH, scheme, 0)?;
-
-            Ok(Self::AttachDevice(port_num))
-        } else if REGEX_PORT_DETACH.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_DETACH, scheme, 0)?;
-
-            Ok(Self::DetachDevice(port_num))
-        } else if REGEX_PORT_DESCRIPTORS.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_DESCRIPTORS, scheme, 0)?;
-
-            Ok(Self::PortDesc(port_num))
-        } else if REGEX_PORT_STATE.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_STATE, scheme, 0)?;
-
-            Ok(Self::PortState(port_num))
-        } else if REGEX_PORT_REQUEST.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_REQUEST, scheme, 0)?;
-
-            Ok(Self::PortReq(port_num))
-        } else if REGEX_PORT_ENDPOINTS.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_ENDPOINTS, scheme, 0)?;
-
-            Ok(Self::Endpoints(port_num))
-        } else if REGEX_PORT_SPECIFIC_ENDPOINT.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_SPECIFIC_ENDPOINT, scheme, 0)?;
-            let endpoint_num = get_u8_from_regex(&REGEX_PORT_SPECIFIC_ENDPOINT, scheme, 1)?;
-
-            Ok(Self::Endpoint(port_num, endpoint_num, String::from("root")))
-        } else if REGEX_PORT_SUB_ENDPOINT.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_SUB_ENDPOINT, scheme, 0)?;
-            let endpoint_num = get_u8_from_regex(&REGEX_PORT_SUB_ENDPOINT, scheme, 1)?;
-            let handle_type = get_string_from_regex(&REGEX_PORT_SUB_ENDPOINT, scheme, 2)?;
-
-            Ok(Self::Endpoint(port_num, endpoint_num, handle_type))
-        } else if REGEX_PORT_ROOT.is_match(scheme) {
-            let port_num = get_port_id_from_regex(&REGEX_PORT_ROOT, scheme, 0)?;
-            Ok(Self::Port(port_num))
-        } else if REGEX_TOP_LEVEL.is_match(scheme) {
-            Ok(Self::TopLevel)
-        } else {
-            Err(Error::new(ENOENT))
-        }
-    }
-}
-
-#[derive(Clone, Copy)]
-struct DmaSliceDbg<'a, T>(&'a Dma<[T]>);
-
-impl<'a, T> fmt::Debug for DmaSliceDbg<'a, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let DmaSliceDbg(dma) = self;
-
-        f.debug_struct("Dma")
-            .field("phys_ptr", &(dma.physical() as *const u8))
-            .field("virt_ptr", &(dma.deref().as_ptr() as *const u8))
-            .field("length", &(dma.len() * mem::size_of::<T>()))
-            .finish()
-    }
-}
-
-impl fmt::Debug for PortReqState {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Self::Init => f.debug_struct("PortReqState::Init").finish(),
-            Self::WaitingForDeviceBytes(ref dma, setup) => f
-                .debug_tuple("PortReqState::WaitingForDeviceBytes")
-                .field(&DmaSliceDbg(dma))
-                .field(&setup)
-                .finish(),
-            Self::WaitingForHostBytes(ref dma, setup) => f
-                .debug_tuple("PortReqState::WaitingForHostBytes")
-                .field(&DmaSliceDbg(dma))
-                .field(&setup)
-                .finish(),
-            Self::TmpSetup(setup) => f
-                .debug_tuple("PortReqState::TmpSetup")
-                .field(&setup)
-                .finish(),
-            Self::Tmp => f.debug_struct("PortReqState::Init").finish(),
-        }
-    }
-}
-
-// TODO: Even though the driver interface descriptors are originally intended for JSON, they should suffice... for
-// now.
-
-impl From<usb::EndpointDescriptor> for EndpDesc {
-    fn from(d: usb::EndpointDescriptor) -> Self {
-        Self {
-            kind: d.kind,
-            address: d.address,
-            attributes: d.attributes,
-            interval: d.interval,
-            max_packet_size: d.max_packet_size,
-            ssc: None,
-            sspc: None,
-        }
-    }
-}
-
-impl From<usb::HidDescriptor> for HidDesc {
-    fn from(d: usb::HidDescriptor) -> Self {
-        Self {
-            kind: d.kind,
-            hid_spec_release: d.hid_spec_release,
-            country: d.country_code,
-            desc_count: d.num_descriptors,
-            desc_ty: d.report_desc_ty,
-            desc_len: d.report_desc_len,
-            optional_desc_ty: d.optional_desc_ty,
-            optional_desc_len: d.optional_desc_len,
-        }
-    }
-}
-
-impl From<usb::SuperSpeedCompanionDescriptor> for SuperSpeedCmp {
-    fn from(d: usb::SuperSpeedCompanionDescriptor) -> Self {
-        Self {
-            kind: d.kind,
-            attributes: d.attributes,
-            bytes_per_interval: d.bytes_per_interval,
-            max_burst: d.max_burst,
-        }
-    }
-}
-impl From<usb::SuperSpeedPlusIsochCmpDescriptor> for SuperSpeedPlusIsochCmp {
-    fn from(r: usb::SuperSpeedPlusIsochCmpDescriptor) -> Self {
-        Self {
-            kind: r.kind,
-            bytes_per_interval: r.bytes_per_interval,
-        }
-    }
-}
-
-/// Any descriptor that can be stored in the config desc "data" area.
-#[derive(Debug)]
-pub enum AnyDescriptor {
-    // These are the ones that I have found, but there are more.
-    Device(usb::DeviceDescriptor),
-    Config(usb::ConfigDescriptor),
-    Interface(usb::InterfaceDescriptor),
-    Endpoint(usb::EndpointDescriptor),
-    Hid(usb::HidDescriptor),
-    SuperSpeedCompanion(usb::SuperSpeedCompanionDescriptor),
-    SuperSpeedPlusCompanion(usb::SuperSpeedPlusIsochCmpDescriptor),
-}
-
-impl AnyDescriptor {
-    fn parse(bytes: &[u8]) -> Option<(Self, usize)> {
-        if bytes.len() < 2 {
-            return None;
-        }
-
-        let len = bytes[0];
-        let kind = bytes[1];
-
-        if bytes.len() < len.into() {
-            return None;
-        }
-
-        Some((
-            match kind {
-                1 => Self::Device(*plain::from_bytes(bytes).ok()?),
-                2 => Self::Config(*plain::from_bytes(bytes).ok()?),
-                4 => Self::Interface(*plain::from_bytes(bytes).ok()?),
-                5 => Self::Endpoint(*plain::from_bytes(bytes).ok()?),
-                33 => Self::Hid(*plain::from_bytes(bytes).ok()?),
-                48 => Self::SuperSpeedCompanion(*plain::from_bytes(bytes).ok()?),
-                49 => Self::SuperSpeedPlusCompanion(*plain::from_bytes(bytes).ok()?),
-                _ => {
-                    //panic!("Descriptor unknown {}: bytes {:#0x?}", kind, bytes);
-                    return None;
-                }
-            },
-            len.into(),
-        ))
-    }
-}
-
-impl<const N: usize> Xhci<N> {
-    async fn new_if_desc(
-        &self,
-        port_id: PortId,
-        slot: u8,
-        desc: usb::InterfaceDescriptor,
-        endps: impl IntoIterator<Item = EndpDesc>,
-        hid_descs: impl IntoIterator<Item = HidDesc>,
-        lang_id: u16,
-    ) -> Result<IfDesc> {
-        Ok(IfDesc {
-            alternate_setting: desc.alternate_setting,
-            class: desc.class,
-            interface_str: if desc.interface_str > 0 {
-                Some(
-                    self.fetch_string_desc(port_id, slot, desc.interface_str, lang_id)
-                        .await?,
-                )
-            } else {
-                None
-            },
-            kind: desc.kind,
-            number: desc.number,
-            protocol: desc.protocol,
-            sub_class: desc.sub_class,
-            endpoints: endps.into_iter().collect(),
-            hid_descs: hid_descs.into_iter().collect(),
-        })
-    }
-    /// Pushes a command TRB to the command ring, rings the doorbell, and then awaits its Command
-    /// Completion Event.
-    ///
-    /// # Locking
-    /// This function will lock `Xhci::cmd` and `Xhci::dbs`.
-    pub async fn execute_command<F: FnOnce(&mut Trb, bool)>(&self, f: F) -> (Trb, Trb) {
-        //TODO: find out why this bit is set earlier!
-        if self.interrupt_is_pending(0) {
-            debug!("The EHB bit is already set!");
-            //self.force_clear_interrupt(0);
-        }
-
-        let next_event = {
-            let mut command_ring = self.cmd.lock().unwrap();
-            let (cmd_index, cycle) = (command_ring.next_index(), command_ring.cycle);
-
-            debug!("Sending command with cycle bit {}", cycle as u8);
-
-            {
-                let command_trb = &mut command_ring.trbs[cmd_index];
-                f(command_trb, cycle);
-            }
-
-            // get the future here before awaiting, to destroy the lock before deadlock
-            let command_trb = &command_ring.trbs[cmd_index];
-            self.next_command_completion_event_trb(
-                &*command_ring,
-                command_trb,
-                EventDoorbell::new(self, 0, 0),
-            )
-        };
-
-        let trbs = next_event.await;
-        let event_trb = trbs.event_trb;
-        let command_trb = trbs.src_trb.expect("Command completion event TRBs shall always have a valid pointer to a valid source command TRB");
-
-        assert_eq!(
-            event_trb.trb_type(),
-            TrbType::CommandCompletion as u8,
-            "The IRQ reactor (or the xHC) gave an invalid event TRB"
-        );
-
-        (event_trb, command_trb)
-    }
-    pub async fn execute_control_transfer<D>(
-        &self,
-        port_num: PortId,
-        setup: usb::Setup,
-        tk: TransferKind,
-        name: &str,
-        mut d: D,
-    ) -> Result<Trb>
-    where
-        D: FnMut(&mut Trb, bool) -> ControlFlow,
-    {
-        let future = {
-            let mut port_state = self.port_state_mut(port_num)?;
-            let slot = port_state.slot;
-
-            let mut endpoint_state = port_state
-                .endpoint_states
-                .get_mut(&0)
-                .ok_or(Error::new(EIO))?;
-
-            let ring = endpoint_state.ring().ok_or(Error::new(EIO))?;
-
-            let first_index = ring.next_index();
-            let (cmd, cycle) = (&mut ring.trbs[first_index], ring.cycle);
-            cmd.setup(setup, tk, cycle);
-
-            if tk != TransferKind::NoData {
-                loop {
-                    let (trb, cycle) = ring.next();
-                    match d(trb, cycle) {
-                        ControlFlow::Break => break,
-                        ControlFlow::Continue => continue,
-                    }
-                }
-            }
-
-            let last_index = ring.next_index();
-            let (cmd, cycle) = (&mut ring.trbs[last_index], ring.cycle);
-
-            let interrupter = 0;
-            // When the data stage is in, the status stage must be out
-            let input = tk != TransferKind::In;
-            let ioc = true;
-            let ch = false;
-            let ent = false;
-            cmd.status(interrupter, input, ioc, ch, ent, cycle);
-
-            self.next_transfer_event_trb(
-                RingId::default_control_pipe(port_num),
-                ring,
-                &ring.trbs[first_index],
-                &ring.trbs[last_index],
-                EventDoorbell::new(self, usize::from(slot), Self::def_control_endp_doorbell()),
-            )
-        };
-
-        let trbs = future.await;
-        let event_trb = trbs.event_trb;
-        let status_trb = trbs.src_trb.ok_or(Error::new(EIO))?;
-
-        handle_transfer_event_trb("CONTROL_TRANSFER", &event_trb, &status_trb)?;
-
-        //self.event_handler_finished();
-
-        Ok(event_trb)
-    }
-    /// NOTE: There has to be AT LEAST one successful invocation of `d`, that actually updates the
-    /// TRB (it could be a NO-OP in the worst case).
-    /// The function is also required to set the Interrupt on Completion flag, or this function
-    /// will never complete.
-    pub async fn execute_transfer<D>(
-        &self,
-        port_num: PortId,
-        endp_num: u8,
-        stream_id: u16,
-        name: &str,
-        mut d: D,
-    ) -> Result<Trb>
-    where
-        D: FnMut(&mut Trb, bool) -> ControlFlow,
-    {
-        let endp_idx = endp_num.checked_sub(1).ok_or(Error::new(EIO))?;
-        let mut port_state = self.port_state_mut(port_num)?;
-
-        let slot = port_state.slot;
-
-        let (doorbell_data_stream, doorbell_data_no_stream) = {
-            let endp_desc = port_state
-                .get_endp_desc(endp_idx)
-                .ok_or(Error::new(EBADFD))?;
-
-            //TODO: clean this up
-            (
-                Self::endp_doorbell(endp_num, endp_desc, stream_id),
-                Self::endp_doorbell(endp_num, endp_desc, 0),
-            )
-        };
-
-        let endp_state = port_state
-            .endpoint_states
-            .get_mut(&endp_num)
-            .ok_or(Error::new(EBADF))?;
-
-        let (has_streams, ring) = match endp_state {
-            EndpointState {
-                transfer: super::RingOrStreams::Ring(ref mut ring),
-                ..
-            } => (false, ring),
-            EndpointState {
-                transfer: super::RingOrStreams::Streams(stream_ctx_array),
-                ..
-            } => (
-                true,
-                stream_ctx_array
-                    .rings
-                    .get_mut(&1)
-                    .ok_or(Error::new(EBADF))?,
-            ),
-        };
-
-        let future = loop {
-            let last_index = ring.next_index();
-            let (trb, cycle) = (&mut ring.trbs[last_index], ring.cycle);
-
-            match d(trb, cycle) {
-                ControlFlow::Break => {
-                    break self.next_transfer_event_trb(
-                        super::irq_reactor::RingId {
-                            port: port_num,
-                            endpoint_num: endp_num,
-                            stream_id,
-                        },
-                        ring,
-                        //TODO: find first TRB
-                        &ring.trbs[last_index],
-                        &ring.trbs[last_index],
-                        EventDoorbell::new(
-                            self,
-                            usize::from(slot),
-                            if has_streams {
-                                doorbell_data_stream
-                            } else {
-                                doorbell_data_no_stream
-                            },
-                        ),
-                    );
-                }
-                ControlFlow::Continue => continue,
-            }
-        };
-
-        drop(port_state);
-
-        let trbs = future.await;
-        let event_trb = trbs.event_trb;
-        let transfer_trb = trbs.src_trb.ok_or(Error::new(EIO))?;
-
-        handle_transfer_event_trb("EXECUTE_TRANSFER", &event_trb, &transfer_trb)?;
-
-        // FIXME: EDTLA if event data was set
-        if event_trb.completion_code() != TrbCompletionCode::ShortPacket as u8
-            && event_trb.transfer_length() != 0
-        {
-            error!("Event trb didn't yield a short packet, but some bytes were not transferred");
-            return Err(Error::new(EIO));
-        }
-
-        // TODO: Handle event data
-        trace!("EVENT DATA: {:?}", event_trb.event_data());
-
-        Ok(event_trb)
-    }
-    async fn device_req_no_data(&self, port: PortId, req: usb::Setup) -> Result<()> {
-        trace!("DEVICE_REQ_NO_DATA port {}, req: {:?}", port, req);
-
-        self.execute_control_transfer(
-            port,
-            req,
-            TransferKind::NoData,
-            "DEVICE_REQ_NO_DATA",
-            |_, _| ControlFlow::Break,
-        )
-        .await?;
-        Ok(())
-    }
-
-    async fn set_configuration(&self, port: PortId, config: u8) -> Result<()> {
-        debug!("Setting configuration value {} to port {}", config, port);
-        self.device_req_no_data(port, usb::Setup::set_configuration(config))
-            .await
-    }
-
-    async fn set_interface(
-        &self,
-        port: PortId,
-        interface_num: u8,
-        alternate_setting: u8,
-    ) -> Result<()> {
-        debug!(
-            "Setting interface value {} (alternate setting {}) to port {}",
-            interface_num, alternate_setting, port
-        );
-        self.device_req_no_data(
-            port,
-            usb::Setup::set_interface(interface_num, alternate_setting),
-        )
-        .await
-    }
-
-    async fn reset_endpoint(&self, port_num: PortId, endp_num: u8, tsp: bool) -> Result<()> {
-        let endp_idx = endp_num.checked_sub(1).ok_or(Error::new(EIO))?;
-        let port_state = self.port_states.get(&port_num).ok_or(Error::new(EBADFD))?;
-
-        let endp_desc = port_state
-            .get_endp_desc(endp_idx)
-            .ok_or(Error::new(EBADFD))?;
-        let endp_num_xhc = Self::endp_num_to_dci(endp_num, endp_desc);
-
-        let slot = self
-            .port_states
-            .get(&port_num)
-            .ok_or(Error::new(EBADF))?
-            .slot;
-
-        let (event_trb, command_trb) = self
-            .execute_command(|trb, cycle| {
-                trb.reset_endpoint(slot, endp_num_xhc, tsp, cycle);
-            })
-            .await;
-        //self.event_handler_finished();
-
-        handle_event_trb("RESET_ENDPOINT", &event_trb, &command_trb)
-    }
-
-    fn endp_ctx_interval(speed_id: &ProtocolSpeed, endp_desc: &EndpDesc) -> u8 {
-        /// Logarithmic (base 2) 125 µs periods per millisecond.
-        const MILLISEC_PERIODS: u8 = 3;
-
-        // TODO: Also check the Speed ID for superspeed(plus).
-        if (speed_id.is_lowspeed() || speed_id.is_fullspeed()) && endp_desc.is_interrupt() {
-            // The interval field has values 1-255, ranging from 1 ms to 255 ms.
-            // TODO: This is correct, right?
-            let last_power_of_two = 8 - endp_desc.interval.leading_zeros() as u8;
-            last_power_of_two - 1 + MILLISEC_PERIODS
-        } else if speed_id.is_fullspeed() && endp_desc.is_isoch() {
-            // bInterval has values 1-16, ranging from 1 ms to 32,768 ms.
-            endp_desc.interval - 1 + MILLISEC_PERIODS
-        } else if (speed_id.is_fullspeed()
-            || endp_desc.is_superspeed()
-            || endp_desc.is_superspeedplus())
-            && (endp_desc.is_interrupt() || endp_desc.is_isoch())
-        {
-            // bInterval has values 1-16, but ranging from 125 µs to 4096 ms.
-            endp_desc.interval - 1
-        } else {
-            // This includes superspeed(plus) control and bulk endpoints in particular.
-            0
-        }
-    }
-    fn endp_ctx_max_burst(
-        speed_id: &ProtocolSpeed,
-        dev_desc: &DevDesc,
-        endp_desc: &EndpDesc,
-    ) -> u8 {
-        if speed_id.is_highspeed() && (endp_desc.is_interrupt() || endp_desc.is_isoch()) {
-            assert_eq!(dev_desc.major_version(), 2);
-            ((endp_desc.max_packet_size & 0x0C00) >> 11) as u8
-        } else if endp_desc.is_superspeed() {
-            endp_desc.max_burst()
-        } else {
-            0
-        }
-    }
-    fn endp_ctx_max_packet_size(endp_desc: &EndpDesc) -> u16 {
-        // TODO: Control endpoint? Encoding?
-        endp_desc.max_packet_size & 0x07FF
-    }
-    fn endp_ctx_max_esit_payload(
-        speed_id: &ProtocolSpeed,
-        dev_desc: &DevDesc,
-        endp_desc: &EndpDesc,
-        max_packet_size: u16,
-        max_burst_size: u8,
-    ) -> u32 {
-        const KIB: u32 = 1024;
-
-        if dev_desc.major_version() == 2 && endp_desc.is_periodic() {
-            u32::from(max_packet_size) * (u32::from(max_burst_size) + 1)
-        } else if endp_desc.has_ssp_companion() {
-            endp_desc.sspc.as_ref().unwrap().bytes_per_interval
-        } else if endp_desc.ssc.is_some() {
-            u32::from(endp_desc.ssc.as_ref().unwrap().bytes_per_interval)
-        } else if speed_id.is_fullspeed() && endp_desc.is_interrupt() {
-            64
-        } else if speed_id.is_fullspeed() && endp_desc.is_isoch() {
-            1 * KIB
-        } else if (speed_id.is_highspeed() && (endp_desc.is_interrupt() || endp_desc.is_isoch()))
-            || endp_desc.is_superspeed() && endp_desc.is_interrupt()
-        {
-            3 * KIB
-        } else if endp_desc.is_superspeed() && endp_desc.is_isoch() {
-            48 * KIB
-        } else {
-            // TODO: Is "maximum allowed" ESIT payload, the same as "maximum" ESIT payload.
-            0
-        }
-    }
-
-    fn port_state(
-        &self,
-        port: PortId,
-    ) -> Result<chashmap::ReadGuard<'_, PortId, super::PortState<N>>> {
-        self.port_states.get(&port).ok_or(Error::new(EBADF))
-    }
-    fn port_state_mut(
-        &self,
-        port: PortId,
-    ) -> Result<chashmap::WriteGuard<'_, PortId, super::PortState<N>>> {
-        self.port_states.get_mut(&port).ok_or(Error::new(EBADF))
-    }
-
-    async fn configure_endpoints_once(
-        &self,
-        port: PortId,
-        req: &ConfigureEndpointsReq,
-    ) -> Result<()> {
-        let (endp_desc_count, new_context_entries, configuration_value) = {
-            let mut port_state = self.port_states.get_mut(&port).ok_or(Error::new(EBADFD))?;
-
-            port_state.cfg_idx = Some(req.config_desc);
-
-            let config_desc = port_state
-                .dev_desc
-                .as_ref()
-                .unwrap()
-                .config_descs
-                .iter()
-                .find(|desc| desc.configuration_value == req.config_desc)
-                .ok_or(Error::new(EBADFD))?;
-
-            //TODO: USE ENDPOINTS FROM ALL INTERFACES
-            let mut endp_desc_count = 0;
-            let mut new_context_entries = 1;
-            for if_desc in config_desc.interface_descs.iter() {
-                for endpoint in if_desc.endpoints.iter() {
-                    endp_desc_count += 1;
-                    let entry = Self::endp_num_to_dci(endp_desc_count, endpoint);
-                    if entry > new_context_entries {
-                        new_context_entries = entry;
-                    }
-                }
-            }
-            new_context_entries += 1;
-
-            if endp_desc_count >= 31 {
-                warn!("endpoints length {} >= 31", endp_desc_count);
-                return Err(Error::new(EIO));
-            }
-
-            (
-                endp_desc_count,
-                new_context_entries,
-                config_desc.configuration_value,
-            )
-        };
-        let lec = self.cap.lec();
-        let log_max_psa_size = self.cap.max_psa_size();
-
-        let port_speed_id = self.ports.lock().unwrap()[port.root_hub_port_index()].speed();
-        let speed_id: &ProtocolSpeed = self.lookup_psiv(port, port_speed_id).ok_or_else(|| {
-            warn!("no speed_id");
-            Error::new(EIO)
-        })?;
-
-        {
-            let port_state = self.port_states.get(&port).ok_or(Error::new(EBADFD))?;
-            let mut input_context = port_state.input_context.lock().unwrap();
-
-            // Configure the slot context as well, which holds the last index of the endp descs.
-            input_context.add_context.write(1);
-            input_context.drop_context.write(0);
-
-            const CONTEXT_ENTRIES_MASK: u32 = 0xF800_0000;
-            const CONTEXT_ENTRIES_SHIFT: u8 = 27;
-
-            const HUB_PORTS_MASK: u32 = 0xFF00_0000;
-            const HUB_PORTS_SHIFT: u8 = 24;
-
-            let mut current_slot_a = input_context.device.slot.a.read();
-            let mut current_slot_b = input_context.device.slot.b.read();
-
-            // Set context entries
-            current_slot_a &= !CONTEXT_ENTRIES_MASK;
-            current_slot_a |=
-                (u32::from(new_context_entries) << CONTEXT_ENTRIES_SHIFT) & CONTEXT_ENTRIES_MASK;
-
-            // Set hub data
-            current_slot_a &= !(1 << 26);
-            current_slot_b &= !HUB_PORTS_MASK;
-            if let Some(hub_ports) = req.hub_ports {
-                current_slot_a |= 1 << 26;
-                current_slot_b |= (u32::from(hub_ports) << HUB_PORTS_SHIFT) & HUB_PORTS_MASK;
-            }
-
-            input_context.device.slot.a.write(current_slot_a);
-            input_context.device.slot.b.write(current_slot_b);
-
-            let control = if self.op.lock().unwrap().cie() {
-                (u32::from(req.alternate_setting.unwrap_or(0)) << 16)
-                    | (u32::from(req.interface_desc.unwrap_or(0)) << 8)
-                    | u32::from(configuration_value)
-            } else {
-                0
-            };
-            input_context.control.write(control);
-        }
-
-        for endp_idx in 0..endp_desc_count as u8 {
-            let endp_num = endp_idx + 1;
-
-            let mut port_state = self.port_states.get_mut(&port).ok_or(Error::new(EBADFD))?;
-            let dev_desc = port_state.dev_desc.as_ref().unwrap();
-            let endp_desc = port_state.get_endp_desc(endp_idx).ok_or_else(|| {
-                warn!("failed to find endpoint {}", endp_idx);
-                Error::new(EIO)
-            })?;
-
-            let endp_num_xhc = Self::endp_num_to_dci(endp_num, endp_desc);
-
-            let usb_log_max_streams = endp_desc.log_max_streams();
-
-            // TODO: Secondary streams.
-            let primary_streams = if let Some(log_max_streams) = usb_log_max_streams {
-                // TODO: Can streams-capable be configured to not use streams?
-                if log_max_psa_size != 0 {
-                    cmp::min(u8::from(log_max_streams), log_max_psa_size + 1) - 1
-                } else {
-                    0
-                }
-            } else {
-                0
-            };
-            let linear_stream_array = if primary_streams != 0 { true } else { false };
-
-            // TODO: Interval related fields
-            // TODO: Max ESIT payload size.
-
-            let mult = endp_desc.isoch_mult(lec);
-
-            let max_packet_size = Self::endp_ctx_max_packet_size(endp_desc);
-            let max_burst_size = Self::endp_ctx_max_burst(speed_id, dev_desc, endp_desc);
-
-            let max_esit_payload = Self::endp_ctx_max_esit_payload(
-                speed_id,
-                dev_desc,
-                endp_desc,
-                max_packet_size,
-                max_burst_size,
-            );
-            let max_esit_payload_lo = max_esit_payload as u16;
-            let max_esit_payload_hi = ((max_esit_payload & 0x00FF_0000) >> 16) as u8;
-
-            let interval = Self::endp_ctx_interval(speed_id, endp_desc);
-
-            let max_error_count = 3;
-            let ep_ty = endp_desc.xhci_ep_type()?;
-            let host_initiate_disable = false;
-
-            // TODO: Maybe this value is out of scope for xhcid, because the actual usb device
-            // driver probably knows better. The spec says that the initial value should be 8 bytes
-            // for control, 1KiB for interrupt and 3KiB for bulk and isoch.
-            let avg_trb_len: u16 = match endp_desc.ty() {
-                EndpointTy::Ctrl => {
-                    warn!("trying to use control endpoint");
-                    return Err(Error::new(EIO)); // only endpoint zero is of type control, and is configured separately with the address device command.
-                }
-                EndpointTy::Bulk | EndpointTy::Isoch => 3072, // 3 KiB
-                EndpointTy::Interrupt => 1024,                // 1 KiB
-            };
-
-            assert_eq!(ep_ty & 0x7, ep_ty);
-            assert_eq!(mult & 0x3, mult);
-            assert_eq!(max_error_count & 0x3, max_error_count);
-            assert_ne!(ep_ty, 0); // 0 means invalid.
-
-            let ring_ptr = if usb_log_max_streams.is_some() {
-                let mut array =
-                    StreamContextArray::new::<N>(self.cap.ac64(), 1 << (primary_streams + 1))?;
-
-                // TODO: Use as many stream rings as needed.
-                array.add_ring::<N>(self.cap.ac64(), 1, true)?;
-                let array_ptr = array.register();
-
-                assert_eq!(
-                    array_ptr & 0xFFFF_FFFF_FFFF_FF81,
-                    array_ptr,
-                    "stream ctx ptr not aligned to 16 bytes"
-                );
-                port_state.endpoint_states.insert(
-                    endp_num,
-                    EndpointState {
-                        transfer: super::RingOrStreams::Streams(array),
-                        driver_if_state: EndpIfState::Init,
-                    },
-                );
-
-                array_ptr
-            } else {
-                let ring = Ring::new::<N>(self.cap.ac64(), 16, true)?;
-                let ring_ptr = ring.register();
-
-                assert_eq!(
-                    ring_ptr & 0xFFFF_FFFF_FFFF_FF81,
-                    ring_ptr,
-                    "ring pointer not aligned to 16 bytes"
-                );
-                port_state.endpoint_states.insert(
-                    endp_num,
-                    EndpointState {
-                        transfer: super::RingOrStreams::Ring(ring),
-                        driver_if_state: EndpIfState::Init,
-                    },
-                );
-                ring_ptr
-            };
-            assert_eq!(primary_streams & 0x1F, primary_streams);
-
-            let mut input_context = port_state.input_context.lock().unwrap();
-            input_context.add_context.writef(1 << endp_num_xhc, true);
-
-            let endp_i = endp_num_xhc as usize - 1;
-            input_context.device.endpoints[endp_i].a.write(
-                u32::from(mult) << 8
-                    | u32::from(primary_streams) << 10
-                    | u32::from(linear_stream_array) << 15
-                    | u32::from(interval) << 16
-                    | u32::from(max_esit_payload_hi) << 24,
-            );
-            input_context.device.endpoints[endp_i].b.write(
-                max_error_count << 1
-                    | u32::from(ep_ty) << 3
-                    | u32::from(host_initiate_disable) << 7
-                    | u32::from(max_burst_size) << 8
-                    | u32::from(max_packet_size) << 16,
-            );
-
-            input_context.device.endpoints[endp_i]
-                .trl
-                .write(ring_ptr as u32);
-            input_context.device.endpoints[endp_i]
-                .trh
-                .write((ring_ptr >> 32) as u32);
-
-            input_context.device.endpoints[endp_i]
-                .c
-                .write(u32::from(avg_trb_len) | (u32::from(max_esit_payload_lo) << 16));
-
-            log::debug!("initialized endpoint {}", endp_num);
-        }
-
-        {
-            let port_state = self.port_states.get(&port).ok_or(Error::new(EBADFD))?;
-            let slot = port_state.slot;
-            let input_context_physical = port_state.input_context.lock().unwrap().physical();
-
-            let (event_trb, command_trb) = self
-                .execute_command(|trb, cycle| {
-                    trb.configure_endpoint(slot, input_context_physical, cycle)
-                })
-                .await;
-
-            //self.event_handler_finished();
-
-            handle_event_trb("CONFIGURE_ENDPOINT", &event_trb, &command_trb)?;
-        }
-
-        // Tell the device about this configuration.
-        self.set_configuration(port, configuration_value).await?;
-
-        Ok(())
-    }
-
-    async fn configure_endpoints(&self, port: PortId, json_buf: &[u8]) -> Result<()> {
-        let mut req: ConfigureEndpointsReq =
-            serde_json::from_slice(json_buf).or(Err(Error::new(EBADMSG)))?;
-
-        debug!(
-            "Running configure endpoints command, at port {}, request: {:?}",
-            port, req
-        );
-
-        if req.interface_desc.is_some() != req.alternate_setting.is_some() {
-            return Err(Error::new(EBADMSG));
-        }
-
-        let already_configured = {
-            let port_state = self.port_states.get(&port).ok_or(Error::new(EBADFD))?;
-            port_state.cfg_idx == Some(req.config_desc)
-        };
-
-        if !already_configured {
-            self.configure_endpoints_once(port, &req).await?;
-        }
-
-        if let Some(interface_num) = req.interface_desc {
-            if let Some(alternate_setting) = req.alternate_setting {
-                self.set_interface(port, interface_num, alternate_setting)
-                    .await?;
-            }
-        }
-
-        Ok(())
-    }
-    async fn transfer_read(
-        &self,
-        port_num: PortId,
-        endp_idx: u8,
-        buf: &mut [u8],
-    ) -> Result<(u8, u32)> {
-        if buf.is_empty() {
-            return Err(Error::new(EINVAL));
-        }
-        let dma_buffer = unsafe { self.alloc_dma_zeroed_unsized(buf.len())? };
-
-        let (completion_code, bytes_transferred, dma_buffer) = self
-            .transfer(
-                port_num,
-                endp_idx,
-                Some(dma_buffer),
-                PortReqDirection::DeviceToHost,
-            )
-            .await?;
-
-        buf.copy_from_slice(&*dma_buffer.as_ref().unwrap());
-        Ok((completion_code, bytes_transferred))
-    }
-    async fn transfer_write(
-        &self,
-        port_num: PortId,
-        endp_idx: u8,
-        sbuf: &[u8],
-    ) -> Result<(u8, u32)> {
-        if sbuf.is_empty() {
-            return Err(Error::new(EINVAL));
-        }
-        let mut dma_buffer = unsafe { self.alloc_dma_zeroed_unsized(sbuf.len()) }?;
-        dma_buffer.copy_from_slice(sbuf);
-
-        trace!(
-            "TRANSFER_WRITE port {} ep {}, buffer at {:p}, size {}, dma buffer {:?}",
-            port_num,
-            endp_idx + 1,
-            sbuf.as_ptr(),
-            sbuf.len(),
-            DmaSliceDbg(&dma_buffer)
-        );
-
-        let (completion_code, bytes_transferred, _) = self
-            .transfer(
-                port_num,
-                endp_idx,
-                Some(dma_buffer),
-                PortReqDirection::HostToDevice,
-            )
-            .await?;
-        Ok((completion_code, bytes_transferred))
-    }
-    pub const fn def_control_endp_doorbell() -> u32 {
-        1
-    }
-    // TODO: Wrap DCIs and driver-level endp_num into distinct types, due to the high chance of
-    // mixing the two up.
-    fn endp_num_to_dci(endp_num: u8, desc: &EndpDesc) -> u8 {
-        if endp_num == 0 {
-            unreachable!("EndpDesc cannot be obtained from the default control endpoint")
-        }
-
-        if desc.is_control() || desc.direction() == EndpDirection::In {
-            endp_num * 2 + 1
-        } else if desc.direction() == EndpDirection::Out {
-            endp_num * 2
-        } else {
-            unreachable!()
-        }
-    }
-    fn endp_doorbell(endp_num: u8, desc: &EndpDesc, stream_id: u16) -> u32 {
-        let db_target = Self::endp_num_to_dci(endp_num, desc);
-        let db_task_id: u16 = stream_id;
-
-        (u32::from(db_task_id) << 16) | u32::from(db_target)
-    }
-    // TODO: Rename DeviceReqData to something more general.
-    async fn transfer(
-        &self,
-        port_num: PortId,
-        endp_idx: u8,
-        dma_buf: Option<Dma<[u8]>>,
-        direction: PortReqDirection,
-    ) -> Result<(u8, u32, Option<Dma<[u8]>>)> {
-        // TODO: Check that only readable enpoints are read, etc.
-        let endp_num = endp_idx + 1;
-
-        let mut port_state = self
-            .port_states
-            .get_mut(&port_num)
-            .ok_or(Error::new(EBADFD))?;
-
-        let endp_desc: &EndpDesc = port_state
-            .get_endp_desc(endp_idx)
-            .ok_or(Error::new(EBADFD))?;
-
-        let direction = endp_desc.direction();
-
-        if endp_desc.is_isoch() {
-            return Err(Error::new(ENOSYS));
-        }
-
-        if EndpDirection::from(direction) != endp_desc.direction() {
-            return Err(Error::new(EBADF));
-        }
-
-        let max_packet_size = endp_desc.max_packet_size;
-        let max_transfer_size = 65536u32;
-
-        let (buffer, idt, estimated_td_size) = {
-            let (buffer, idt) = if dma_buf.as_ref().map(|buf| buf.len()).unwrap_or(0) <= 8
-                && max_packet_size >= 8
-                && direction != EndpDirection::In
-            {
-                dma_buf
-                    .as_ref()
-                    .map(|sbuf| {
-                        let mut bytes = [0u8; 8];
-                        bytes[..sbuf.len()].copy_from_slice(&sbuf);
-                        (u64::from_le_bytes(bytes), true)
-                    })
-                    .unwrap_or((0, false))
-            } else {
-                (
-                    dma_buf.as_ref().map(|dma| dma.physical()).unwrap_or(0) as u64,
-                    false,
-                )
-            };
-            let estimated_td_size = cmp::min(
-                u8::try_from(
-                    div_round_up(
-                        dma_buf.as_ref().map(|buf| buf.len()).unwrap_or(0),
-                        max_transfer_size as usize,
-                    ) * mem::size_of::<Trb>(),
-                )
-                .ok()
-                .unwrap_or(0x1F),
-                0x1F,
-            ); // one trb per td
-            (buffer, idt, estimated_td_size)
-        };
-
-        let stream_id = 1u16;
-
-        let mut bytes_left = dma_buf.as_ref().map(|buf| buf.len()).unwrap_or(0);
-
-        drop(port_state);
-
-        let event = self
-            .execute_transfer(
-                port_num,
-                endp_num,
-                stream_id,
-                "CUSTOM_TRANSFER",
-                |trb, cycle| {
-                    let len = cmp::min(bytes_left, max_transfer_size as usize) as u32;
-
-                    // set the interrupt on completion (IOC) flag for the last trb.
-                    let ioc = bytes_left <= max_transfer_size as usize;
-                    let chain = !ioc;
-
-                    let interrupter = 0;
-                    let ent = false;
-                    let isp = true;
-                    let bei = false;
-                    trb.normal(
-                        buffer,
-                        len,
-                        cycle,
-                        estimated_td_size,
-                        interrupter,
-                        ent,
-                        isp,
-                        chain,
-                        ioc,
-                        idt,
-                        bei,
-                    );
-
-                    bytes_left -= len as usize;
-
-                    if bytes_left != 0 {
-                        ControlFlow::Continue
-                    } else {
-                        ControlFlow::Break
-                    }
-                },
-            )
-            .await?;
-        //self.event_handler_finished();
-
-        let bytes_transferred = dma_buf
-            .as_ref()
-            .map(|buf| buf.len() as u32 - event.transfer_length())
-            .unwrap_or(0);
-
-        Ok((event.completion_code(), bytes_transferred, dma_buf))
-    }
-    pub async fn get_desc(&self, port_id: PortId, slot: u8) -> Result<DevDesc> {
-        let ports = self.ports.lock().unwrap();
-        let port = ports
-            .get(port_id.root_hub_port_index())
-            .ok_or(Error::new(ENOENT))?;
-        if !port.flags().contains(port::PortFlags::CCS) {
-            return Err(Error::new(ENOENT));
-        }
-
-        let raw_dd = self.fetch_dev_desc(port_id, slot).await?;
-        log::debug!("port {} slot {} desc {:X?}", port_id, slot, raw_dd);
-
-        // Only fetch language IDs if we need to. Some devices will fail to return this descriptor
-        //TODO: also check configurations and interfaces for defined strings?
-        let lang_id =
-            if raw_dd.manufacturer_str > 0 || raw_dd.product_str > 0 || raw_dd.serial_str > 0 {
-                let lang_ids = self.fetch_lang_ids_desc(port_id, slot).await?;
-                // Prefer US English, but fall back to first language ID, or zero
-                let en_us_id = 0x409;
-                if lang_ids.contains(&en_us_id) {
-                    en_us_id
-                } else {
-                    match lang_ids.first() {
-                        Some(some) => *some,
-                        None => 0,
-                    }
-                }
-            } else {
-                0
-            };
-        log::debug!("port {} using language ID 0x{:04x}", port_id, lang_id);
-
-        let (manufacturer_str, product_str, serial_str) = (
-            if raw_dd.manufacturer_str > 0 {
-                Some(
-                    self.fetch_string_desc(port_id, slot, raw_dd.manufacturer_str, lang_id)
-                        .await?,
-                )
-            } else {
-                None
-            },
-            if raw_dd.product_str > 0 {
-                Some(
-                    self.fetch_string_desc(port_id, slot, raw_dd.product_str, lang_id)
-                        .await?,
-                )
-            } else {
-                None
-            },
-            if raw_dd.serial_str > 0 {
-                Some(
-                    self.fetch_string_desc(port_id, slot, raw_dd.serial_str, lang_id)
-                        .await?,
-                )
-            } else {
-                None
-            },
-        );
-        log::debug!(
-            "manufacturer {:?} product {:?} serial {:?}",
-            manufacturer_str,
-            product_str,
-            serial_str
-        );
-
-        //TODO let (bos_desc, bos_data) = self.fetch_bos_desc(port_id, slot).await?;
-
-        let supports_superspeed = false;
-        //TODO usb::bos_capability_descs(bos_desc, &bos_data).any(|desc| desc.is_superspeed());
-        let supports_superspeedplus = false;
-        //TODO usb::bos_capability_descs(bos_desc, &bos_data).any(|desc| desc.is_superspeedplus());
-
-        let mut config_descs = SmallVec::new();
-
-        for index in 0..raw_dd.configurations {
-            debug!("Fetching the config descriptor at index {}", index);
-            let (desc, data) = self.fetch_config_desc(port_id, slot, index).await?;
-            log::debug!(
-                "port {} slot {} config {} desc {:X?}",
-                port_id,
-                slot,
-                index,
-                desc
-            );
-
-            let extra_length = desc.total_length as usize - mem::size_of_val(&desc);
-            let data = &data[..extra_length];
-
-            let mut i = 0;
-            let mut descriptors = Vec::new();
-
-            while let Some((descriptor, len)) = AnyDescriptor::parse(&data[i..]) {
-                descriptors.push(descriptor);
-                i += len;
-            }
-
-            let mut interface_descs = SmallVec::new();
-            let mut iter = descriptors.into_iter().peekable();
-
-            while let Some(item) = iter.next() {
-                if let AnyDescriptor::Interface(idesc) = item {
-                    let mut endpoints = SmallVec::<[EndpDesc; 4]>::new();
-                    let mut hid_descs = SmallVec::<[HidDesc; 1]>::new();
-
-                    while endpoints.len() < idesc.endpoints as usize {
-                        let next = match iter.next() {
-                            Some(AnyDescriptor::Endpoint(n)) => n,
-                            Some(AnyDescriptor::Hid(h)) if idesc.class == 3 => {
-                                hid_descs.push(h.into());
-                                continue;
-                            }
-                            Some(unexpected) => {
-                                log::warn!("expected endpoint, got {:X?}", unexpected);
-                                break;
-                            }
-                            None => break,
-                        };
-                        let mut endp = EndpDesc::from(next);
-
-                        loop {
-                            match iter.peek() {
-                                Some(AnyDescriptor::SuperSpeedCompanion(n)) => {
-                                    endp.ssc = Some(SuperSpeedCmp::from(n.clone()));
-                                    iter.next().unwrap();
-                                }
-                                Some(AnyDescriptor::SuperSpeedPlusCompanion(n)) => {
-                                    endp.sspc = Some(SuperSpeedPlusIsochCmp::from(n.clone()));
-                                    iter.next().unwrap();
-                                }
-                                _ => break,
-                            }
-                        }
-
-                        endpoints.push(endp);
-                    }
-
-                    interface_descs.push(
-                        self.new_if_desc(port_id, slot, idesc, endpoints, hid_descs, lang_id)
-                            .await?,
-                    );
-                } else {
-                    log::warn!("expected interface, got {:?}", item);
-                    // TODO
-                    //break;
-                }
-            }
-
-            config_descs.push(ConfDesc {
-                kind: desc.kind,
-                configuration: if desc.configuration_str > 0 {
-                    Some(
-                        self.fetch_string_desc(port_id, slot, desc.configuration_str, lang_id)
-                            .await?,
-                    )
-                } else {
-                    None
-                },
-                configuration_value: desc.configuration_value,
-                attributes: desc.attributes,
-                max_power: desc.max_power,
-                interface_descs,
-            });
-        }
-
-        Ok(DevDesc {
-            kind: raw_dd.kind,
-            usb: raw_dd.usb,
-            class: raw_dd.class,
-            sub_class: raw_dd.sub_class,
-            protocol: raw_dd.protocol,
-            packet_size: raw_dd.packet_size,
-            vendor: raw_dd.vendor,
-            product: raw_dd.product,
-            release: raw_dd.release,
-            manufacturer_str,
-            product_str,
-            serial_str,
-            config_descs,
-        })
-    }
-    fn port_desc_json(&self, port_id: PortId) -> Result<Vec<u8>> {
-        let dev_desc = &self
-            .port_states
-            .get(&port_id)
-            .ok_or(Error::new(ENOENT))?
-            .dev_desc;
-        serde_json::to_vec(dev_desc).or(Err(Error::new(EIO)))
-    }
-    fn write_dyn_string(string: &[u8], buf: &mut [u8], offset: usize) -> usize {
-        let max_bytes_to_read = cmp::min(string.len(), buf.len());
-        let bytes_to_read = cmp::max(offset, max_bytes_to_read) - offset;
-        buf[..bytes_to_read].copy_from_slice(&string[..bytes_to_read]);
-
-        bytes_to_read
-    }
-    async fn port_req_transfer(
-        &self,
-        port_num: PortId,
-        data_buffer: Option<&mut Dma<[u8]>>,
-        setup: usb::Setup,
-        transfer_kind: TransferKind,
-    ) -> Result<()> {
-        self.execute_control_transfer(
-            port_num,
-            setup,
-            transfer_kind,
-            "CUSTOM_DEVICE_REQ",
-            |trb, cycle| {
-                trb.data(
-                    data_buffer.as_ref().map(|dma| dma.physical()).unwrap_or(0),
-                    setup.length,
-                    transfer_kind == TransferKind::In,
-                    cycle,
-                );
-                ControlFlow::Break
-            },
-        )
-        .await?;
-        Ok(())
-    }
-    fn port_req_init_st(&self, port_num: PortId, req: &PortReq) -> Result<PortReqState> {
-        use usb::setup::*;
-
-        let direction = ReqDirection::from(req.direction);
-        let ty = ReqType::from(req.req_type) as u8;
-        let recipient = ReqRecipient::from(req.req_recipient) as u8;
-
-        let transfer_kind = match direction {
-            _ if !req.transfers_data => TransferKind::NoData,
-            ReqDirection::DeviceToHost => TransferKind::In,
-            ReqDirection::HostToDevice => TransferKind::Out,
-        };
-
-        let setup = Setup {
-            kind: ((direction as u8) << USB_SETUP_DIR_SHIFT)
-                | (ty << USB_SETUP_REQ_TY_SHIFT)
-                | (recipient << USB_SETUP_RECIPIENT_SHIFT),
-            request: req.request,
-            value: req.value,
-            index: req.index,
-            length: req.length,
-        };
-        // TODO: Reuse buffers, or something.
-        // TODO: Validate the size.
-        // TODO: Sizes above 65536, *perhaps*.
-        let data_buffer_opt = if req.transfers_data {
-            let data_buffer = unsafe { self.alloc_dma_zeroed_unsized(req.length as usize)? };
-            assert_eq!(data_buffer.len(), req.length as usize);
-            Some(data_buffer)
-        } else {
-            None
-        };
-
-        Ok(match transfer_kind {
-            TransferKind::In => PortReqState::WaitingForDeviceBytes(
-                data_buffer_opt.ok_or(Error::new(EINVAL))?,
-                setup,
-            ),
-            TransferKind::Out => {
-                PortReqState::WaitingForHostBytes(data_buffer_opt.ok_or(Error::new(EINVAL))?, setup)
-            }
-            TransferKind::NoData => PortReqState::TmpSetup(setup),
-            _ => unreachable!(),
-        })
-        // FIXME: Make sure there aren't any other PortReq handles, perhaps by storing the state in
-        // PortState?
-    }
-    async fn handle_port_req_write(
-        &self,
-        fd: usize,
-        port_num: PortId,
-        mut st: PortReqState,
-        buf: &[u8],
-    ) -> Result<usize> {
-        let bytes_written = match st {
-            PortReqState::Init => {
-                let req = serde_json::from_slice::<PortReq>(buf).or(Err(Error::new(EBADMSG)))?;
-
-                st = self.port_req_init_st(port_num, &req)?;
-
-                if let PortReqState::TmpSetup(setup) = st {
-                    // No need for any additional reads or writes, before completing.
-                    self.port_req_transfer(port_num, None, setup, TransferKind::NoData)
-                        .await?;
-                    st = PortReqState::Init;
-                }
-
-                buf.len()
-            }
-            PortReqState::WaitingForHostBytes(mut dma_buffer, setup) => {
-                if buf.len() != dma_buffer.len() {
-                    return Err(Error::new(EINVAL));
-                }
-                dma_buffer.copy_from_slice(buf);
-
-                self.port_req_transfer(port_num, Some(&mut dma_buffer), setup, TransferKind::Out)
-                    .await?;
-                st = PortReqState::Init;
-
-                buf.len()
-            }
-            PortReqState::WaitingForDeviceBytes(_, _) => return Err(Error::new(EBADF)),
-            PortReqState::Tmp | PortReqState::TmpSetup(_) => unreachable!(),
-        };
-        let mut guard = self.handles.get_mut(&fd).ok_or(Error::new(EBADF))?;
-        match &mut *guard {
-            Handle::PortReq(_, ref mut state) => *state = st,
-            _ => unreachable!(),
-        }
-        Ok(bytes_written)
-    }
-    async fn handle_port_req_read(
-        &self,
-        fd: usize,
-        port_num: PortId,
-        mut st: PortReqState,
-        buf: &mut [u8],
-    ) -> Result<usize> {
-        let bytes_read = match st {
-            PortReqState::WaitingForDeviceBytes(mut dma_buffer, setup) => {
-                if buf.len() != dma_buffer.len() {
-                    return Err(Error::new(EINVAL));
-                }
-                self.port_req_transfer(port_num, Some(&mut dma_buffer), setup, TransferKind::In)
-                    .await?;
-                buf.copy_from_slice(&dma_buffer);
-
-                st = PortReqState::Init;
-
-                buf.len()
-            }
-            PortReqState::Init | PortReqState::WaitingForHostBytes(_, _) => {
-                return Err(Error::new(EBADF))
-            }
-            PortReqState::Tmp | PortReqState::TmpSetup(_) => unreachable!(),
-        };
-
-        let mut guard = self.handles.get_mut(&fd).ok_or(Error::new(EBADF))?;
-        match &mut *guard {
-            Handle::PortReq(_, ref mut state) => *state = st,
-            _ => unreachable!(),
-        }
-        Ok(bytes_read)
-    }
-
-    /// Implements open() for the root level scheme
-    ///
-    /// # Arguments
-    /// - 'flags: [usize]' - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either
-    ///
-    /// - Handle::TopLevel - The file was opened.
-    /// - EISDIR           - This is a directory endpoint, but neither O_DIRECTORY nor O_STAT were passed.
-    ///
-    fn open_handle_top_level(&self, flags: usize) -> Result<Handle> {
-        if flags & O_DIRECTORY != 0 || flags & O_STAT != 0 {
-            let mut contents = Vec::new();
-
-            let ports_guard = self.ports.lock().unwrap();
-
-            for (index, _) in ports_guard
-                .iter()
-                .enumerate()
-                .filter(|(_, port)| port.flags().contains(port::PortFlags::CCS))
-            {
-                write!(contents, "port{}\n", index).unwrap();
-            }
-
-            Ok(Handle::TopLevel(contents))
-        } else {
-            Err(Error::new(EISDIR))
-        }
-    }
-
-    /// implements open() for /port<n>/descriptors
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::PortDesc] - The handle was opened successfully
-    /// - [ENOTDIR]          - Directory-specific flags were passed to open(), but this endpoint is not a directory.
-    fn open_handle_port_descriptors(&self, port_num: PortId, flags: usize) -> Result<Handle> {
-        if flags & O_DIRECTORY != 0 && flags & O_STAT == 0 {
-            return Err(Error::new(ENOTDIR));
-        }
-
-        let contents = self.port_desc_json(port_num)?;
-        Ok(Handle::PortDesc(port_num, contents))
-    }
-
-    /// implements open() for /port<n>
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::Port]     - The handle was opened successfully
-    /// - [ENOENT]           - The scheme is valid, but there is no port associated with the given port_num
-    /// - [EISDIR]           - open() was called on this scheme endpoint, but no directory-specific flags were passed to open
-    fn open_handle_port(&self, port_num: PortId, flags: usize) -> Result<Handle> {
-        // The != here is unintuitive. You would assume that you could do
-        // flags & O_DIRECTORY || flags & O_STAT, but rust doesn't allow
-        // you to cast integers to booleans.
-        if (flags & O_DIRECTORY != 0) || (flags & O_STAT != 0) {
-            let mut contents = Vec::new();
-
-            write!(contents, "descriptors\nendpoints\n").unwrap();
-
-            if self.slot_state(
-                self.port_states
-                    .get(&port_num)
-                    .ok_or(Error::new(ENOENT))?
-                    .slot as usize,
-            ) != SlotState::Configured as u8
-            {
-                write!(contents, "configure\n").unwrap();
-            }
-
-            Ok(Handle::Port(port_num, contents))
-        } else {
-            Err(Error::new(EISDIR))
-        }
-    }
-
-    /// implements open() for /port<n>/state
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::Port]     - The handle was opened successfully
-    /// - [ENOTDIR]          - open() was called on this scheme endpoint, but directory-specific flags were passed to open
-    fn open_handle_port_state(&self, port_num: PortId, flags: usize) -> Result<Handle> {
-        if flags & O_DIRECTORY != 0 && flags & O_STAT == 0 {
-            return Err(Error::new(ENOTDIR));
-        }
-
-        Ok(Handle::PortState(port_num))
-    }
-
-    /// implements open() for /port<n>/endpoints
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::Port]     - The handle was opened successfully
-    /// - [EISDIR]          - open() was called on this scheme endpoint, but no directory-specific flags were passed to open
-    fn open_handle_port_endpoints(&self, port_num: PortId, flags: usize) -> Result<Handle> {
-        if flags & O_DIRECTORY == 0 && flags & O_STAT == 0 {
-            return Err(Error::new(EISDIR));
-        };
-        let mut contents = Vec::new();
-        let ps = self.port_states.get(&port_num).ok_or(Error::new(ENOENT))?;
-
-        /*for (ep_num, _) in self.dev_ctx.contexts[ps.slot as usize].endpoints.iter().enumerate().filter(|(_, ep)| ep.a.read() & 0b111 == 1) {
-            write!(contents, "{}\n", ep_num).unwrap();
-        }*/
-
-        for ep_num in ps.endpoint_states.keys() {
-            write!(contents, "{}\n", ep_num).unwrap();
-        }
-
-        Ok(Handle::Endpoints(port_num, contents))
-    }
-
-    /// implements open() for /port<n>/endpoints/<n>
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'endpoint_num: [u8]' - The endpoint number to access
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::Port]     - The handle was opened successfully
-    /// - [EISDIR]          - open() was called on this scheme endpoint, but no directory-specific flags were passed to open
-    /// - [ENOENT]           - The scheme is valid, but there is no port associated with the given port_num
-    fn open_handle_endpoint_root(
-        &self,
-        port_num: PortId,
-        endpoint_num: u8,
-        flags: usize,
-    ) -> Result<Handle> {
-        if flags & O_DIRECTORY == 0 && flags & O_STAT == 0 {
-            return Err(Error::new(EISDIR));
-        }
-
-        let port_state = self
-            .port_states
-            .get_mut(&port_num)
-            .ok_or(Error::new(ENOENT))?;
-
-        /*if self.dev_ctx.contexts[port_state.slot as usize].endpoints.get(endpoint_num as usize).ok_or(Error::new(ENOENT))?.a.read() & 0b111 != 1 {
-            return Err(Error::new(ENXIO)); // TODO: Find a proper error code for "endpoint not initialized".
-        }*/
-
-        if !port_state.endpoint_states.contains_key(&endpoint_num) {
-            return Err(Error::new(ENOENT));
-        }
-        let contents = "ctl\ndata\n".as_bytes().to_owned();
-
-        Ok(Handle::Endpoint(
-            port_num,
-            endpoint_num,
-            EndpointHandleTy::Root(contents),
-        ))
-    }
-
-    /// implements open() for /port<n>/endpoints/<n>/data and /port<n>/endpoints/<n>/ctl
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'endpoint_num: [u8]' - The endpoint number to access
-    /// - 'handle_type: [String]' - The type of the handle
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::Port]     - The handle was opened successfully
-    /// - [EISDIR]          - open() was called on this scheme endpoint, but no directory-specific flags were passed to open
-    /// - [ENOENT]           - The scheme is valid, but there is no port associated with the given port_num, or no endpoint with the given endpoint_num
-    fn open_handle_single_endpoint(
-        &self,
-        port_num: PortId,
-        endpoint_num: u8,
-        handle_type: String,
-        flags: usize,
-    ) -> Result<Handle> {
-        match handle_type.as_str() {
-            "root" => self.open_handle_endpoint_root(port_num, endpoint_num, flags),
-            "ctl" | "data" => {
-                if flags & O_DIRECTORY != 0 && flags & O_STAT == 0 {
-                    return Err(Error::new(EISDIR));
-                }
-
-                let port_state = self.port_states.get(&port_num).ok_or(Error::new(ENOENT))?;
-
-                if port_state.endpoint_states.get(&endpoint_num).is_none() {
-                    return Err(Error::new(ENOENT));
-                }
-
-                let st = match handle_type.as_str() {
-                    "ctl" => EndpointHandleTy::Ctl,
-                    "data" => EndpointHandleTy::Data,
-                    _ => return Err(Error::new(ENOENT)),
-                };
-                Ok(Handle::Endpoint(port_num, endpoint_num, st))
-            }
-            _ => panic!(
-                "Scheme parser returned an invalid string '{}' for the endpoint handle type",
-                handle_type
-            ),
-        }
-    }
-
-    /// implements open() for /port<n>/configure
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'endpoint_num: [u8]' - The endpoint number to access
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::Port]     - The handle was opened successfully
-    /// - [EISDIR]          - open() was called on this scheme endpoint, but no directory-specific flags were passed to open
-    /// - [ENOENT]           - The scheme is valid, but there is no port associated with the given port_num, or no endpoint with the given endpoint_num
-    fn open_handle_configure_endpoints(&self, port_num: PortId, flags: usize) -> Result<Handle> {
-        if flags & O_DIRECTORY != 0 && flags & O_STAT == 0 {
-            return Err(Error::new(ENOTDIR));
-        }
-
-        if flags & O_RDWR != O_WRONLY && flags & O_STAT == 0 {
-            return Err(Error::new(EACCES));
-        }
-
-        Ok(Handle::ConfigureEndpoints(port_num))
-    }
-
-    /// implements open() for /port<n>/attach
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::Port]     - The handle was opened successfully
-    /// - [EISDIR]          - open() was called on this scheme endpoint, but no directory-specific flags were passed to open
-    /// - [ENOENT]           - The scheme is valid, but there is no port associated with the given port_num, or no endpoint with the given endpoint_num
-    fn open_handle_attach_device(&self, port_num: PortId, flags: usize) -> Result<Handle> {
-        if flags & O_DIRECTORY != 0 && flags & O_STAT == 0 {
-            return Err(Error::new(ENOTDIR));
-        }
-
-        if flags & O_RDWR != O_WRONLY && flags & O_STAT == 0 {
-            return Err(Error::new(EACCES));
-        }
-
-        Ok(Handle::AttachDevice(port_num))
-    }
-
-    /// implements open() for /port<n>/detach
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::Port]     - The handle was opened successfully
-    /// - [EISDIR]          - open() was called on this scheme endpoint, but no directory-specific flags were passed to open
-    /// - [ENOENT]           - The scheme is valid, but there is no port associated with the given port_num, or no endpoint with the given endpoint_num
-    fn open_handle_detach_device(&self, port_num: PortId, flags: usize) -> Result<Handle> {
-        if flags & O_DIRECTORY != 0 && flags & O_STAT == 0 {
-            return Err(Error::new(ENOTDIR));
-        }
-
-        if flags & O_RDWR != O_WRONLY && flags & O_STAT == 0 {
-            return Err(Error::new(EACCES));
-        }
-
-        Ok(Handle::DetachDevice(port_num))
-    }
-
-    /// implements open() for /port<n>/request
-    ///
-    /// # Arguments
-    /// - 'port_num: [PortId]' - The port number specified in the scheme path
-    /// - 'flags: [usize]'    - The flags parameter passed to open()
-    ///
-    /// # Returns
-    /// This function returns a [Result] containing either:
-    ///
-    /// - [Handle::Port]     - The handle was opened successfully
-    /// - [ENOTDIR]          - open() was called on this scheme endpoint, but directory-specific flags were passed to open
-    fn open_handle_port_request(&self, port_num: PortId, flags: usize) -> Result<Handle> {
-        if flags & O_DIRECTORY != 0 && flags & O_STAT == 0 {
-            return Err(Error::new(ENOTDIR));
-        }
-
-        Ok(Handle::PortReq(port_num, PortReqState::Init))
-    }
-}
-
-impl<const N: usize> SchemeSync for &Xhci<N> {
-    fn scheme_root(&mut self) -> Result<usize> {
-        let fd = self.next_handle.fetch_add(1, atomic::Ordering::Relaxed);
-        self.handles.insert(fd, Handle::SchemeRoot);
-        Ok(fd)
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path_str: &str,
-        mut flags: usize,
-        fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        let full_path = match *self.handles.get(&dirfd).ok_or(Error::new(EBADF))? {
-            Handle::SchemeRoot => path_str.trim_start_matches('/').to_string(),
-            Handle::Port(port_num, _) => {
-                let clean_path = path_str.trim_start_matches('/');
-                if clean_path.is_empty() {
-                    format!("port{}", port_num)
-                } else {
-                    format!("port{}/{}", port_num, clean_path)
-                }
-            }
-            _ => return Err(Error::new(EACCES)),
-        };
-        if ctx.uid != 0 {
-            return Err(Error::new(EACCES));
-        }
-
-        //Parse the scheme, determine if it's in the valid format, return an error if not.
-        //This doesn't guarantee that the parameters themselves are valid (i.e. bounded correctly)
-        //only that the scheme itself was parseable.
-        let scheme_parameters = SchemeParameters::from_scheme(&full_path)?;
-
-        flags |= fcntl_flags as usize;
-
-        //Once we have our scheme parsed into parameters, we can match on those parameters to
-        //find the correct routine to open a handle
-        let handle = match scheme_parameters {
-            SchemeParameters::TopLevel => self.open_handle_top_level(flags)?,
-            SchemeParameters::Port(port_number) => self.open_handle_port(port_number, flags)?,
-            SchemeParameters::PortDesc(port_number) => {
-                self.open_handle_port_descriptors(port_number, flags)?
-            }
-            SchemeParameters::PortState(port_number) => {
-                self.open_handle_port_state(port_number, flags)?
-            }
-            SchemeParameters::PortReq(port_number) => {
-                self.open_handle_port_request(port_number, flags)?
-            }
-            SchemeParameters::Endpoints(port_number) => {
-                self.open_handle_port_endpoints(port_number, flags)?
-            }
-            SchemeParameters::Endpoint(port_number, endpoint_number, handle_type) => {
-                self.open_handle_single_endpoint(port_number, endpoint_number, handle_type, flags)?
-            }
-            SchemeParameters::ConfigureEndpoints(port_number) => {
-                self.open_handle_configure_endpoints(port_number, flags)?
-            }
-            SchemeParameters::AttachDevice(port_number) => {
-                self.open_handle_attach_device(port_number, flags)?
-            }
-            SchemeParameters::DetachDevice(port_number) => {
-                self.open_handle_detach_device(port_number, flags)?
-            }
-        };
-
-        let fd = self.next_handle.fetch_add(1, atomic::Ordering::Relaxed);
-
-        trace!("OPENED {} to FD={}, handle: {:?}", full_path, fd, handle);
-
-        self.handles.insert(fd, handle);
-
-        Ok(OpenResult::ThisScheme {
-            number: fd,
-            flags: NewFdFlags::POSITIONED,
-        })
-    }
-
-    fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        let guard = self.handles.get(&id).ok_or(Error::new(EBADF))?;
-
-        stat.st_mode = match (&*guard).get_handle_type() {
-            HandleType::Directory => MODE_DIR,
-            HandleType::File => MODE_FILE,
-            HandleType::Character => MODE_CHR,
-        };
-
-        stat.st_size = match (&*guard).get_buf_len() {
-            None => stat.st_size,
-            Some(size) => size as u64,
-        };
-
-        //If we have a handle to the configure scheme, we need to mark it as write only.
-        match &*guard {
-            Handle::ConfigureEndpoints(_) | Handle::AttachDevice(_) | Handle::DetachDevice(_) => {
-                stat.st_mode = stat.st_mode | 0o200;
-            }
-            _ => {}
-        }
-
-        Ok(())
-    }
-
-    fn fpath(&mut self, fd: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, "xhci", |w| {
-            let handle = self.handles.get(&fd).ok_or(Error::new(EBADF))?;
-            write!(w, "{}", handle.to_path()).unwrap();
-            Ok(())
-        })
-    }
-
-    fn read(
-        &mut self,
-        fd: usize,
-        buf: &mut [u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let offset = offset as usize;
-        let mut guard = self.handles.get_mut(&fd).ok_or(Error::new(EBADF))?;
-        trace!(
-            "READ fd={}, handle={:?}, buf=(addr {:p}, length {})",
-            fd,
-            guard,
-            buf.as_ptr(),
-            buf.len()
-        );
-        match &mut *guard {
-            Handle::TopLevel(ref src_buf)
-            | Handle::Port(_, ref src_buf)
-            | Handle::PortDesc(_, ref src_buf)
-            | Handle::Endpoints(_, ref src_buf)
-            | Handle::Endpoint(_, _, EndpointHandleTy::Root(ref src_buf)) => {
-                let max_bytes_to_read = cmp::min(src_buf.len(), buf.len());
-                let bytes_to_read = cmp::max(max_bytes_to_read, offset) - offset;
-
-                buf[..bytes_to_read].copy_from_slice(&src_buf[..bytes_to_read]);
-
-                Ok(bytes_to_read)
-            }
-            Handle::ConfigureEndpoints(_) => Err(Error::new(EBADF)),
-            Handle::AttachDevice(_) => Err(Error::new(EBADF)),
-            Handle::DetachDevice(_) => Err(Error::new(EBADF)),
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-
-            &mut Handle::Endpoint(port_num, endp_num, ref mut st) => match st {
-                EndpointHandleTy::Ctl => self.on_read_endp_ctl(port_num, endp_num, buf),
-                EndpointHandleTy::Data => block_on(self.on_read_endp_data(port_num, endp_num, buf)),
-                EndpointHandleTy::Root(_) => Err(Error::new(EBADF)),
-            },
-            &mut Handle::PortState(port_num) => {
-                let ps = self.port_states.get(&port_num).ok_or(Error::new(EBADF))?;
-                let ctx = self
-                    .dev_ctx
-                    .contexts
-                    .get(ps.slot as usize)
-                    .ok_or(Error::new(EBADF))?;
-                let state = ((ctx.slot.d.read() & SLOT_CONTEXT_STATE_MASK)
-                    >> SLOT_CONTEXT_STATE_SHIFT) as u8;
-
-                let string = match state {
-                    0 => Some(PortState::EnabledOrDisabled),
-                    1 => Some(PortState::Default),
-                    2 => Some(PortState::Addressed),
-                    3 => Some(PortState::Configured),
-                    _ => None,
-                }
-                .as_ref()
-                .map(PortState::as_str)
-                .unwrap_or("unknown")
-                .as_bytes();
-
-                Ok(Xhci::<N>::write_dyn_string(string, buf, offset))
-            }
-            &mut Handle::PortReq(port_num, ref mut st) => {
-                let state = std::mem::replace(st, PortReqState::Tmp);
-                drop(guard); // release the lock
-                block_on(self.handle_port_req_read(fd, port_num, state, buf))
-            }
-        }
-    }
-    fn write(
-        &mut self,
-        fd: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let mut guard = self.handles.get_mut(&fd).ok_or(Error::new(EBADF))?;
-        trace!(
-            "WRITE fd={}, handle={:?}, buf=(addr {:p}, length {})",
-            fd,
-            guard,
-            buf.as_ptr(),
-            buf.len()
-        );
-
-        match &mut *guard {
-            &mut Handle::ConfigureEndpoints(port_num) => {
-                block_on(self.configure_endpoints(port_num, buf))?;
-                Ok(buf.len())
-            }
-            &mut Handle::AttachDevice(port_num) => {
-                //TODO: accept some arguments in buffer?
-                block_on(self.attach_device(port_num))?;
-                Ok(buf.len())
-            }
-            &mut Handle::DetachDevice(port_num) => {
-                //TODO: accept some arguments in buffer?
-                block_on(self.detach_device(port_num))?;
-                Ok(buf.len())
-            }
-            &mut Handle::Endpoint(port_num, endp_num, ref ep_file_ty) => match ep_file_ty {
-                EndpointHandleTy::Ctl => block_on(self.on_write_endp_ctl(port_num, endp_num, buf)),
-                EndpointHandleTy::Data => {
-                    block_on(self.on_write_endp_data(port_num, endp_num, buf))
-                }
-                EndpointHandleTy::Root(_) => return Err(Error::new(EBADF)),
-            },
-            &mut Handle::PortReq(port_num, ref mut st) => {
-                let state = std::mem::replace(st, PortReqState::Tmp);
-                drop(guard); // release the lock
-                block_on(self.handle_port_req_write(fd, port_num, state, buf))
-            }
-            // TODO: Introduce PortReqState::Waiting, which this write call changes to
-            // PortReqState::ReadyToWrite when all bytes are written.
-            _ => Err(Error::new(EBADF)),
-        }
-    }
-
-    fn on_close(&mut self, fd: usize) {
-        self.handles.remove(&fd);
-    }
-}
-
-impl<const N: usize> Xhci<N> {
-    pub fn get_endp_status(&self, port_num: PortId, endp_num: u8) -> Result<EndpointStatus> {
-        let port_state = self.port_states.get(&port_num).ok_or(Error::new(EBADFD))?;
-
-        let slot = port_state.slot;
-
-        let endp_desc = port_state
-            .dev_desc
-            .as_ref()
-            .unwrap()
-            .config_descs
-            .get(0)
-            .ok_or(Error::new(EIO))?
-            .interface_descs
-            .get(0)
-            .ok_or(Error::new(EIO))?
-            .endpoints
-            .get(endp_num as usize - 1)
-            .ok_or(Error::new(EBADFD))?;
-
-        let endp_num_xhc = if endp_num != 0 {
-            Self::endp_num_to_dci(endp_num, endp_desc)
-        } else {
-            1
-        };
-
-        let raw = self
-            .dev_ctx
-            .contexts
-            .get(slot as usize)
-            .ok_or(Error::new(EBADFD))?
-            .endpoints[endp_num_xhc as usize - 1]
-            .a
-            .read()
-            & super::context::ENDPOINT_CONTEXT_STATUS_MASK;
-
-        Ok(match raw {
-            0 => EndpointStatus::Disabled,
-            1 => EndpointStatus::Enabled,
-            2 => EndpointStatus::Halted,
-            3 => EndpointStatus::Stopped,
-            4 => EndpointStatus::Error,
-            _ => return Err(Error::new(EIO)),
-        })
-    }
-    pub async fn on_req_reset_device(
-        &self,
-        port_num: PortId,
-        endp_num: u8,
-        clear_feature: bool,
-    ) -> Result<()> {
-        if self.get_endp_status(port_num, endp_num)? != EndpointStatus::Halted {
-            return Err(Error::new(EPROTO));
-        }
-        // Change the endpoint state from anything, but most likely HALTED (otherwise resetting
-        // would be quite meaningless), to stopped.
-        self.reset_endpoint(port_num, endp_num, false).await?;
-        self.restart_endpoint(port_num, endp_num).await?;
-
-        if clear_feature {
-            self.device_req_no_data(
-                port_num,
-                usb::Setup {
-                    kind: 0b0000_0010, // endpoint recipient
-                    request: 0x01,     // CLEAR_FEATURE
-                    value: 0x00,       // ENDPOINT_HALT
-                    index: 0,          // TODO: interface num
-                    length: 0,
-                },
-            )
-            .await?;
-        }
-        Ok(())
-    }
-    pub async fn restart_endpoint(&self, port_num: PortId, endp_num: u8) -> Result<()> {
-        let mut port_state = self
-            .port_states
-            .get_mut(&port_num)
-            .ok_or(Error::new(EBADFD))?;
-        let slot = port_state.slot;
-
-        let mut endpoint_state = port_state
-            .endpoint_states
-            .get_mut(&endp_num)
-            .ok_or(Error::new(EBADFD))?;
-
-        let (has_streams, ring) = match &mut endpoint_state.transfer {
-            &mut super::RingOrStreams::Ring(ref mut ring) => (false, ring),
-            &mut super::RingOrStreams::Streams(ref mut arr) => {
-                (true, arr.rings.get_mut(&1).ok_or(Error::new(EBADFD))?)
-            }
-        };
-
-        let (cmd, cycle) = ring.next();
-        cmd.transfer_no_op(0, false, false, false, cycle);
-
-        let deque_ptr_and_cycle = ring.register();
-
-        let endp_desc = port_state
-            .dev_desc
-            .as_ref()
-            .unwrap()
-            .config_descs
-            .get(0)
-            .ok_or(Error::new(EIO))?
-            .interface_descs
-            .get(0)
-            .ok_or(Error::new(EIO))?
-            .endpoints
-            .get(endp_num as usize - 1)
-            .ok_or(Error::new(EBADFD))?;
-
-        let doorbell = if endp_num != 0 {
-            let stream_id = 1u16;
-
-            Self::endp_doorbell(endp_num, endp_desc, if has_streams { stream_id } else { 0 })
-        } else {
-            Self::def_control_endp_doorbell()
-        };
-
-        self.dbs.lock().unwrap()[slot as usize].write(doorbell);
-
-        self.set_tr_deque_ptr(port_num, endp_num, deque_ptr_and_cycle)
-            .await?;
-
-        Ok(())
-    }
-    pub fn endp_direction(&self, port_num: PortId, endp_num: u8) -> Result<EndpDirection> {
-        Ok(self
-            .port_states
-            .get(&port_num)
-            .ok_or(Error::new(EIO))?
-            .dev_desc
-            .as_ref()
-            .unwrap()
-            .config_descs
-            .first()
-            .ok_or(Error::new(EIO))?
-            .interface_descs
-            .first()
-            .ok_or(Error::new(EIO))?
-            .endpoints
-            .get(endp_num as usize)
-            .ok_or(Error::new(EIO))?
-            .direction())
-    }
-    pub fn slot(&self, port_num: PortId) -> Result<u8> {
-        Ok(self.port_states.get(&port_num).ok_or(Error::new(EIO))?.slot)
-    }
-    pub async fn set_tr_deque_ptr(
-        &self,
-        port_num: PortId,
-        endp_num: u8,
-        deque_ptr_and_cycle: u64,
-    ) -> Result<()> {
-        let endp_idx = endp_num.checked_sub(1).ok_or(Error::new(EIO))?;
-        let port_state = self.port_states.get(&port_num).ok_or(Error::new(EBADFD))?;
-        let slot = port_state.slot;
-
-        let endp_desc = port_state
-            .get_endp_desc(endp_idx)
-            .ok_or(Error::new(EBADFD))?;
-        let endp_num_xhc = Self::endp_num_to_dci(endp_num, endp_desc);
-
-        let (event_trb, command_trb) = self
-            .execute_command(|trb, cycle| {
-                trb.set_tr_deque_ptr(
-                    deque_ptr_and_cycle,
-                    cycle,
-                    StreamContextType::PrimaryRing,
-                    1,
-                    endp_num_xhc,
-                    slot,
-                )
-            })
-            .await;
-        //self.event_handler_finished();
-
-        handle_event_trb("SET_TR_DEQUEUE_PTR", &event_trb, &command_trb)
-    }
-    pub async fn on_write_endp_ctl(
-        &self,
-        port_num: PortId,
-        endp_num: u8,
-        buf: &[u8],
-    ) -> Result<usize> {
-        let mut port_state = self
-            .port_states
-            .get_mut(&port_num)
-            .ok_or(Error::new(EBADF))?;
-
-        let ep_if_state = &mut port_state
-            .endpoint_states
-            .get_mut(&endp_num)
-            .ok_or(Error::new(EBADF))?
-            .driver_if_state;
-
-        let req = serde_json::from_slice::<XhciEndpCtlReq>(buf).or(Err(Error::new(EBADMSG)))?;
-        match req {
-            XhciEndpCtlReq::Status => match ep_if_state {
-                state @ EndpIfState::Init => *state = EndpIfState::WaitingForStatus,
-                other => {
-                    return Err(Error::new(EBADF));
-                }
-            },
-            XhciEndpCtlReq::Reset { no_clear_feature } => match ep_if_state {
-                EndpIfState::Init => {
-                    self.on_req_reset_device(port_num, endp_num, !no_clear_feature)
-                        .await?
-                }
-                other => {
-                    return Err(Error::new(EBADF));
-                }
-            },
-            XhciEndpCtlReq::Transfer { direction, count } => match ep_if_state {
-                state @ EndpIfState::Init => {
-                    if direction == XhciEndpCtlDirection::NoData {
-                        // Yield the result directly because no bytes have to be sent or received
-                        // beforehand.
-                        let (completion_code, bytes_transferred, _) = self
-                            .transfer(port_num, endp_num - 1, None, PortReqDirection::DeviceToHost)
-                            .await?;
-                        if bytes_transferred > 0 {
-                            return Err(Error::new(EIO));
-                        }
-                        let result = Self::transfer_result(completion_code, 0);
-
-                        let mut port_state = self
-                            .port_states
-                            .get_mut(&port_num)
-                            .ok_or(Error::new(EBADF))?;
-                        let new_state = &mut port_state
-                            .endpoint_states
-                            .get_mut(&endp_num)
-                            .ok_or(Error::new(EBADF))?
-                            .driver_if_state;
-                        *new_state = EndpIfState::WaitingForTransferResult(result)
-                    } else {
-                        *state = EndpIfState::WaitingForDataPipe {
-                            direction,
-                            bytes_to_transfer: count,
-                            bytes_transferred: 0,
-                        };
-                    }
-                }
-                other => {
-                    return Err(Error::new(EBADF));
-                }
-            },
-            other => {
-                return Err(Error::new(EBADF));
-            }
-        }
-        Ok(buf.len())
-    }
-    fn transfer_result(completion_code: u8, bytes_transferred: u32) -> PortTransferStatus {
-        let kind = if completion_code == TrbCompletionCode::Success as u8 {
-            PortTransferStatusKind::Success
-        } else if completion_code == TrbCompletionCode::ShortPacket as u8 {
-            PortTransferStatusKind::ShortPacket
-        } else if completion_code == TrbCompletionCode::Stall as u8 {
-            PortTransferStatusKind::Stalled
-        } else {
-            PortTransferStatusKind::Unknown
-        };
-        PortTransferStatus {
-            kind,
-            bytes_transferred,
-        }
-    }
-    pub async fn on_write_endp_data(
-        &self,
-        port_num: PortId,
-        endp_num: u8,
-        buf: &[u8],
-    ) -> Result<usize> {
-        let mut port_state = self
-            .port_states
-            .get_mut(&port_num)
-            .ok_or(Error::new(EBADFD))?;
-        let mut endpoint_state = port_state
-            .endpoint_states
-            .get_mut(&endp_num)
-            .ok_or(Error::new(EBADFD))?;
-
-        let ep_if_state = &mut endpoint_state.driver_if_state;
-
-        match ep_if_state {
-            &mut EndpIfState::WaitingForDataPipe {
-                direction: XhciEndpCtlDirection::Out,
-                bytes_to_transfer: total_bytes_to_transfer,
-                bytes_transferred,
-            } => {
-                if buf.len() > total_bytes_to_transfer as usize - bytes_transferred as usize {
-                    return Err(Error::new(EINVAL));
-                }
-                drop(port_state);
-                let (completion_code, some_bytes_transferred) =
-                    self.transfer_write(port_num, endp_num - 1, buf).await?;
-                let result = Self::transfer_result(completion_code, some_bytes_transferred);
-
-                // To avoid having to read from the Ctl interface file, the client should stop
-                // invoking further data transfer calls if any single transfer returns fewer bytes
-                // than requested.
-
-                let mut port_state = self
-                    .port_states
-                    .get_mut(&port_num)
-                    .ok_or(Error::new(EBADFD))?;
-                let mut endpoint_state = port_state
-                    .endpoint_states
-                    .get_mut(&endp_num)
-                    .ok_or(Error::new(EBADFD))?;
-                let ep_if_state = &mut endpoint_state.driver_if_state;
-
-                if let &mut EndpIfState::WaitingForDataPipe {
-                    direction: XhciEndpCtlDirection::Out,
-                    bytes_to_transfer,
-                    ref mut bytes_transferred,
-                } = ep_if_state
-                {
-                    if *bytes_transferred + some_bytes_transferred == bytes_to_transfer
-                        || completion_code != TrbCompletionCode::Success as u8
-                    {
-                        *ep_if_state = EndpIfState::WaitingForTransferResult(result);
-                    } else {
-                        *bytes_transferred += some_bytes_transferred;
-                    }
-                } else {
-                    unreachable!()
-                }
-                Ok(some_bytes_transferred as usize)
-            }
-            _ => return Err(Error::new(EBADF)),
-        }
-    }
-    pub fn on_read_endp_ctl(
-        &self,
-        port_num: PortId,
-        endp_num: u8,
-        buf: &mut [u8],
-    ) -> Result<usize> {
-        let port_state = &mut self
-            .port_states
-            .get_mut(&port_num)
-            .ok_or(Error::new(EBADF))?;
-
-        let ep_if_state = &mut port_state
-            .endpoint_states
-            .get_mut(&endp_num)
-            .ok_or(Error::new(EBADF))?
-            .driver_if_state;
-
-        let res: XhciEndpCtlRes = match ep_if_state {
-            &mut EndpIfState::Init => XhciEndpCtlRes::Idle,
-
-            state @ &mut EndpIfState::WaitingForStatus => {
-                *state = EndpIfState::Init;
-                XhciEndpCtlRes::Status(self.get_endp_status(port_num, endp_num)?)
-            }
-            &mut EndpIfState::WaitingForDataPipe { .. } => XhciEndpCtlRes::Pending,
-            &mut EndpIfState::WaitingForTransferResult(status) => {
-                *ep_if_state = EndpIfState::Init;
-                XhciEndpCtlRes::TransferResult(status)
-            }
-        };
-
-        let mut cursor = io::Cursor::new(buf);
-        serde_json::to_writer(&mut cursor, &res).or(Err(Error::new(EIO)))?;
-        Ok(cursor.seek(io::SeekFrom::Current(0)).unwrap() as usize)
-    }
-    pub async fn on_read_endp_data(
-        &self,
-        port_num: PortId,
-        endp_num: u8,
-        buf: &mut [u8],
-    ) -> Result<usize> {
-        let mut port_state = self
-            .port_states
-            .get_mut(&port_num)
-            .ok_or(Error::new(EBADF))?;
-
-        let mut ep_if_state = &mut port_state
-            .endpoint_states
-            .get_mut(&endp_num)
-            .ok_or(Error::new(EBADF))?
-            .driver_if_state;
-
-        match ep_if_state {
-            &mut EndpIfState::WaitingForDataPipe {
-                direction: XhciEndpCtlDirection::In,
-                bytes_transferred,
-                bytes_to_transfer: total_bytes_to_transfer,
-            } => {
-                if buf.len() > total_bytes_to_transfer as usize - bytes_transferred as usize {
-                    return Err(Error::new(EINVAL));
-                }
-
-                drop(port_state);
-                let (completion_code, some_bytes_transferred) =
-                    self.transfer_read(port_num, endp_num - 1, buf).await?;
-
-                // Just as with on_write_endp_data, a client issuing multiple reads must always
-                // stop reading if one read returns fewer bytes than expected.
-
-                let result = Self::transfer_result(completion_code, some_bytes_transferred);
-
-                let mut port_state = self
-                    .port_states
-                    .get_mut(&port_num)
-                    .ok_or(Error::new(EBADF))?;
-
-                let mut ep_state = port_state
-                    .endpoint_states
-                    .get_mut(&endp_num)
-                    .ok_or(Error::new(EBADF))?;
-
-                let ep_if_state = &mut ep_state.driver_if_state;
-
-                if let &mut EndpIfState::WaitingForDataPipe {
-                    direction: XhciEndpCtlDirection::In,
-                    bytes_to_transfer,
-                    ref mut bytes_transferred,
-                } = ep_if_state
-                {
-                    if *bytes_transferred + some_bytes_transferred == bytes_to_transfer
-                        || completion_code != TrbCompletionCode::Success as u8
-                    {
-                        *ep_if_state = EndpIfState::WaitingForTransferResult(result);
-                    } else {
-                        *bytes_transferred += some_bytes_transferred;
-                    }
-                } else {
-                    unreachable!()
-                }
-                Ok(some_bytes_transferred as usize)
-            }
-            _ => return Err(Error::new(EBADF)),
-        }
-    }
-    /// Notifies the xHC that the current event handler has finished, so that new interrupts can be
-    /// sent. This is required after each invocation of `Self::execute_command`.
-    ///
-    /// # Locking
-    /// This function locks `Xhci::run`.
-    pub fn event_handler_finished(&self) {
-        trace!("Event handler finished");
-        // write 1 to EHB to clear it
-        self.run.lock().unwrap().ints[0]
-            .erdp_low
-            .writef(1 << 3, true);
-    }
-}
-pub fn handle_event_trb(name: &str, event_trb: &Trb, command_trb: &Trb) -> Result<()> {
-    if event_trb.completion_code() == TrbCompletionCode::Success as u8 {
-        Ok(())
-    } else {
-        error!(
-            "{} command (TRB {:?}) failed with event trb {:?}",
-            name, command_trb, event_trb
-        );
-        Err(Error::new(EIO))
-    }
-}
-pub fn handle_transfer_event_trb(name: &str, event_trb: &Trb, transfer_trb: &Trb) -> Result<()> {
-    if event_trb.completion_code() == TrbCompletionCode::Success as u8
-        || event_trb.completion_code() == TrbCompletionCode::ShortPacket as u8
-    {
-        Ok(())
-    } else {
-        error!(
-            "{} transfer {:?} failed with event {:?}",
-            name, transfer_trb, event_trb
-        );
-        Err(Error::new(EIO))
-    }
-}
-use lazy_static::lazy_static;
-use std::ops::{Add, Div, Rem};
-
-pub fn div_round_up<T>(a: T, b: T) -> T
-where
-    T: Add<Output = T> + Div<Output = T> + Rem<Output = T> + PartialEq + From<u8> + Copy,
-{
-    if a % b != T::from(0u8) {
-        a / b + T::from(1u8)
-    } else {
-        a / b
-    }
-}
diff --git a/recipes/core/base/drivers/usb/xhcid/src/xhci/trb.rs b/recipes/core/base/drivers/usb/xhcid/src/xhci/trb.rs
deleted file mode 100644
index e0e5dc79fe..0000000000
--- a/recipes/core/base/drivers/usb/xhcid/src/xhci/trb.rs
+++ /dev/null
@@ -1,510 +0,0 @@
-use super::context::StreamContextType;
-use crate::usb;
-use common::io::{Io, Mmio};
-use log::trace;
-use std::{fmt, mem};
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum TrbType {
-    Reserved,
-    /* Transfer */
-    Normal,
-    SetupStage,
-    DataStage,
-    StatusStage,
-    Isoch,
-    Link,
-    EventData,
-    NoOp,
-    /* Command */
-    EnableSlot,
-    DisableSlot,
-    AddressDevice,
-    ConfigureEndpoint,
-    EvaluateContext,
-    ResetEndpoint,
-    StopEndpoint,
-    SetTrDequeuePointer,
-    ResetDevice,
-    ForceEvent,
-    NegotiateBandwidth,
-    SetLatencyToleranceValue,
-    GetPortBandwidth,
-    ForceHeader,
-    NoOpCmd,
-    /* Reserved */
-    GetExtendedProperty,
-    SetExtendedProperty,
-    Rsv26,
-    Rsv27,
-    Rsv28,
-    Rsv29,
-    Rsv30,
-    Rsv31,
-    /* Events */
-    Transfer,
-    CommandCompletion,
-    PortStatusChange,
-    BandwidthRequest,
-    Doorbell,
-    HostController,
-    DeviceNotification,
-    MfindexWrap,
-    /* Reserved from 40 to 47, vendor devined from 48 to 63 */
-}
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum TrbCompletionCode {
-    Invalid = 0x00,
-    Success = 0x01,
-    DataBuffer = 0x02,
-    BabbleDetected = 0x03,
-    UsbTransaction = 0x04,
-    Trb = 0x05,
-    Stall = 0x06,
-    Resource = 0x07,
-    Bandwidth = 0x08,
-    NoSlotsAvailable = 0x09,
-    InvalidStreamType = 0x0A,
-    SlotNotEnabled = 0x0B,
-    EndpointNotEnabled = 0x0C,
-    ShortPacket = 0x0D,
-    RingUnderrun = 0x0E,
-    RingOverrun = 0x0F,
-    VfEventRingFull = 0x10,
-    Parameter = 0x11,
-    BandwidthOverrun = 0x12,
-    ContextState = 0x13,
-    NoPingResponse = 0x14,
-    EventRingFull = 0x15,
-    IncompatibleDevice = 0x16,
-    MissedService = 0x17,
-    CommandRingStopped = 0x18,
-    CommandAborted = 0x19,
-    Stopped = 0x1A,
-    StoppedLengthInvalid = 0x1B,
-    StoppedShortPacket = 0x1C,
-    MaxExitLatencyTooLarge = 0x1D,
-    Rsv30 = 0x1E,
-    IsochBuffer = 0x1F,
-    EventLost = 0x20,
-    Undefined = 0x21,
-    InvalidStreamId = 0x22,
-    SecondaryBandwidth = 0x23,
-    SplitTransaction = 0x24,
-    /* Values from 37 to 191 are reserved */
-    /* 192 to 223 are vendor defined errors */
-    /* 224 to 255 are vendor defined information */
-}
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum TransferKind {
-    NoData,
-    Reserved,
-    Out,
-    In,
-}
-
-#[repr(C, packed)]
-pub struct Trb {
-    pub data_low: Mmio<u32>,
-    pub data_high: Mmio<u32>,
-    pub status: Mmio<u32>,
-    pub control: Mmio<u32>,
-}
-impl Clone for Trb {
-    fn clone(&self) -> Self {
-        Self {
-            data_low: Mmio::new(self.data_low.read()),
-            data_high: Mmio::new(self.data_high.read()),
-            status: Mmio::new(self.status.read()),
-            control: Mmio::new(self.control.read()),
-        }
-    }
-}
-
-pub const TRB_STATUS_COMPLETION_CODE_SHIFT: u8 = 24;
-pub const TRB_STATUS_COMPLETION_CODE_MASK: u32 = 0xFF00_0000;
-
-pub const TRB_STATUS_COMPLETION_PARAM_SHIFT: u8 = 0;
-pub const TRB_STATUS_COMPLETION_PARAM_MASK: u32 = 0x00FF_FFFF;
-
-pub const TRB_STATUS_TRANSFER_LENGTH_SHIFT: u8 = 0;
-pub const TRB_STATUS_TRANSFER_LENGTH_MASK: u32 = 0x00FF_FFFF;
-
-pub const TRB_CONTROL_TRB_TYPE_SHIFT: u8 = 10;
-pub const TRB_CONTROL_TRB_TYPE_MASK: u32 = 0x0000_FC00;
-
-pub const TRB_CONTROL_EVENT_DATA_SHIFT: u8 = 2;
-pub const TRB_CONTROL_EVENT_DATA_BIT: u32 = 1 << TRB_CONTROL_EVENT_DATA_SHIFT;
-
-pub const TRB_CONTROL_ENDPOINT_ID_MASK: u32 = 0x001F_0000;
-pub const TRB_CONTROL_ENDPOINT_ID_SHIFT: u8 = 16;
-
-impl Trb {
-    pub fn set(&mut self, data: u64, status: u32, control: u32) {
-        self.data_low.write(data as u32);
-        self.data_high.write((data >> 32) as u32);
-        self.status.write(status);
-        self.control.write(control);
-    }
-
-    pub fn reserved(&mut self, cycle: bool) {
-        self.set(0, 0, ((TrbType::Reserved as u32) << 10) | (cycle as u32));
-    }
-
-    pub fn read_data(&self) -> u64 {
-        (self.data_low.read() as u64) | ((self.data_high.read() as u64) << 32)
-    }
-
-    pub fn completion_code(&self) -> u8 {
-        (self.status.read() >> TRB_STATUS_COMPLETION_CODE_SHIFT) as u8
-    }
-    pub fn completion_param(&self) -> u32 {
-        self.status.read() & TRB_STATUS_COMPLETION_PARAM_MASK
-    }
-    fn has_completion_trb_pointer(&self) -> bool {
-        if self.completion_code() == TrbCompletionCode::RingUnderrun as u8
-            || self.completion_code() == TrbCompletionCode::RingOverrun as u8
-        {
-            false
-        } else if self.completion_code() == TrbCompletionCode::VfEventRingFull as u8 {
-            false
-        } else {
-            true
-        }
-    }
-    pub fn completion_trb_pointer(&self) -> Option<u64> {
-        debug_assert_eq!(self.trb_type(), TrbType::CommandCompletion as u8);
-
-        if self.has_completion_trb_pointer() {
-            Some(self.read_data())
-        } else {
-            None
-        }
-    }
-    pub fn transfer_event_trb_pointer(&self) -> Option<u64> {
-        debug_assert_eq!(self.trb_type(), TrbType::Transfer as u8);
-
-        if self.has_completion_trb_pointer() {
-            Some(self.read_data())
-        } else {
-            None
-        }
-    }
-
-    pub fn port_status_change_port_id(&self) -> Option<u8> {
-        debug_assert_eq!(self.trb_type(), TrbType::PortStatusChange as u8);
-
-        if self.has_completion_trb_pointer() {
-            let data = self.read_data();
-            Some(((data >> 24) & 0xFF) as u8)
-        } else {
-            None
-        }
-    }
-
-    pub fn event_slot(&self) -> u8 {
-        (self.control.read() >> 24) as u8
-    }
-    /// Returns the number of bytes that should have been transmitten, but weren't.
-    pub fn transfer_length(&self) -> u32 {
-        self.status.read() & TRB_STATUS_TRANSFER_LENGTH_MASK
-    }
-    pub fn event_data_bit(&self) -> bool {
-        self.control.readf(TRB_CONTROL_EVENT_DATA_BIT)
-    }
-    pub fn event_data(&self) -> Option<u64> {
-        if self.event_data_bit() {
-            Some(self.read_data())
-        } else {
-            None
-        }
-    }
-    pub fn endpoint_id(&self) -> u8 {
-        ((self.control.read() & TRB_CONTROL_ENDPOINT_ID_MASK) >> TRB_CONTROL_ENDPOINT_ID_SHIFT)
-            as u8
-    }
-    pub fn trb_type(&self) -> u8 {
-        ((self.control.read() & TRB_CONTROL_TRB_TYPE_MASK) >> TRB_CONTROL_TRB_TYPE_SHIFT) as u8
-    }
-
-    pub fn link(&mut self, address: usize, toggle: bool, cycle: bool) {
-        self.set(
-            address as u64,
-            0,
-            ((TrbType::Link as u32) << 10) | ((toggle as u32) << 1) | (cycle as u32),
-        );
-    }
-
-    pub fn no_op_cmd(&mut self, cycle: bool) {
-        self.set(0, 0, ((TrbType::NoOpCmd as u32) << 10) | (cycle as u32));
-    }
-
-    pub fn enable_slot(&mut self, slot_type: u8, cycle: bool) {
-        trace!("Enabling slot with type {}", slot_type);
-        self.set(
-            0,
-            0,
-            (((slot_type as u32) & 0x1F) << 16)
-                | ((TrbType::EnableSlot as u32) << 10)
-                | (cycle as u32),
-        );
-    }
-    pub fn disable_slot(&mut self, slot: u8, cycle: bool) {
-        self.set(
-            0,
-            0,
-            (u32::from(slot) << 24) | ((TrbType::DisableSlot as u32) << 10) | u32::from(cycle),
-        );
-    }
-
-    pub fn address_device(&mut self, slot_id: u8, input_ctx_ptr: usize, bsr: bool, cycle: bool) {
-        assert_eq!(
-            (input_ctx_ptr as u64) & 0xFFFF_FFFF_FFFF_FFF0,
-            input_ctx_ptr as u64,
-            "unaligned input context ptr"
-        );
-        self.set(
-            input_ctx_ptr as u64,
-            0,
-            (u32::from(slot_id) << 24)
-                | ((TrbType::AddressDevice as u32) << 10)
-                | (u32::from(bsr) << 9)
-                | u32::from(cycle),
-        );
-    }
-    // Synchronizes the input context endpoints with the device context endpoints, I think.
-    pub fn configure_endpoint(&mut self, slot_id: u8, input_ctx_ptr: usize, cycle: bool) {
-        assert_eq!(
-            (input_ctx_ptr as u64) & 0xFFFF_FFFF_FFFF_FFF0,
-            input_ctx_ptr as u64,
-            "unaligned input context ptr"
-        );
-
-        self.set(
-            input_ctx_ptr as u64,
-            0,
-            (u32::from(slot_id) << 24)
-                | ((TrbType::ConfigureEndpoint as u32) << 10)
-                | u32::from(cycle),
-        );
-    }
-    pub fn evaluate_context(&mut self, slot_id: u8, input_ctx_ptr: usize, bsr: bool, cycle: bool) {
-        assert_eq!(
-            (input_ctx_ptr as u64) & 0xFFFF_FFFF_FFFF_FFF0,
-            input_ctx_ptr as u64,
-            "unaligned input context ptr"
-        );
-        self.set(
-            input_ctx_ptr as u64,
-            0,
-            (u32::from(slot_id) << 24)
-                | ((TrbType::EvaluateContext as u32) << 10)
-                | (u32::from(bsr) << 9)
-                | u32::from(cycle),
-        );
-    }
-    pub fn reset_endpoint(&mut self, slot_id: u8, endp_num_xhc: u8, tsp: bool, cycle: bool) {
-        assert_eq!(endp_num_xhc & 0x1F, endp_num_xhc);
-        self.set(
-            0,
-            0,
-            (u32::from(slot_id) << 24)
-                | (u32::from(endp_num_xhc) << 16)
-                | ((TrbType::ResetEndpoint as u32) << 10)
-                | (u32::from(tsp) << 9)
-                | u32::from(cycle),
-        );
-    }
-    /// The deque_ptr has to contain the DCS bit (bit 0).
-    pub fn set_tr_deque_ptr(
-        &mut self,
-        deque_ptr: u64,
-        cycle: bool,
-        sct: StreamContextType,
-        stream_id: u16,
-        endp_num_xhc: u8,
-        slot: u8,
-    ) {
-        assert_eq!(deque_ptr & 0xFFFF_FFFF_FFFF_FFF1, deque_ptr);
-        assert_eq!(endp_num_xhc & 0x1F, endp_num_xhc);
-
-        self.set(
-            deque_ptr | ((sct as u64) << 1),
-            u32::from(stream_id) << 16,
-            (u32::from(slot) << 24)
-                | (u32::from(endp_num_xhc) << 16)
-                | ((TrbType::SetTrDequeuePointer as u32) << 10)
-                | u32::from(cycle),
-        )
-    }
-    pub fn stop_endpoint(&mut self, slot_id: u8, endp_num_xhc: u8, suspend: bool, cycle: bool) {
-        assert_eq!(endp_num_xhc & 0x1F, endp_num_xhc);
-        self.set(
-            0,
-            0,
-            (u32::from(slot_id) << 24)
-                | (u32::from(suspend) << 23)
-                | (u32::from(endp_num_xhc) << 16)
-                | ((TrbType::StopEndpoint as u32) << 10)
-                | u32::from(cycle),
-        );
-    }
-    pub fn reset_device(&mut self, slot_id: u8, cycle: bool) {
-        self.set(
-            0,
-            0,
-            (u32::from(slot_id) << 24) | ((TrbType::ResetDevice as u32) << 10) | u32::from(cycle),
-        );
-    }
-
-    pub fn transfer_no_op(&mut self, interrupter: u8, ent: bool, ch: bool, ioc: bool, cycle: bool) {
-        self.set(
-            0,
-            u32::from(interrupter) << 22,
-            ((TrbType::NoOp as u32) << 10)
-                | (u32::from(ioc) << 5)
-                | (u32::from(ch) << 4)
-                | (u32::from(ent) << 1)
-                | u32::from(cycle),
-        );
-    }
-
-    pub fn setup(&mut self, setup: usb::Setup, transfer: TransferKind, cycle: bool) {
-        self.set(
-            unsafe { mem::transmute(setup) },
-            8,
-            ((transfer as u32) << 16)
-                | ((TrbType::SetupStage as u32) << 10)
-                | (1 << 6)
-                | (cycle as u32),
-        );
-    }
-
-    pub fn data(&mut self, buffer: usize, length: u16, input: bool, cycle: bool) {
-        self.set(
-            buffer as u64,
-            length as u32,
-            ((input as u32) << 16) | ((TrbType::DataStage as u32) << 10) | (cycle as u32),
-        );
-    }
-
-    pub fn cycle(&self) -> bool {
-        self.control.readf(0x01)
-    }
-
-    pub fn status(
-        &mut self,
-        interrupter: u16,
-        input: bool,
-        ioc: bool,
-        ch: bool,
-        ent: bool,
-        cycle: bool,
-    ) {
-        self.set(
-            0,
-            u32::from(interrupter) << 22,
-            (u32::from(input) << 16)
-                | ((TrbType::StatusStage as u32) << 10)
-                | (u32::from(ioc) << 5)
-                | (u32::from(ch) << 4)
-                | (u32::from(ent) << 1)
-                | (cycle as u32),
-        );
-    }
-    pub fn normal(
-        &mut self,
-        buffer: u64,
-        len: u32,
-        cycle: bool,
-        estimated_td_size: u8,
-        interrupter: u8,
-        ent: bool,
-        isp: bool,
-        chain: bool,
-        ioc: bool,
-        idt: bool,
-        bei: bool,
-    ) {
-        assert_eq!(estimated_td_size & 0x1F, estimated_td_size);
-        // NOTE: The interrupter target and no snoop flags have been omitted.
-        self.set(
-            buffer,
-            len | (u32::from(estimated_td_size) << 17) | (u32::from(interrupter) << 22),
-            u32::from(cycle)
-                | (u32::from(ent) << 1)
-                | (u32::from(isp) << 2)
-                | (u32::from(chain) << 4)
-                | (u32::from(ioc) << 5)
-                | (u32::from(idt) << 6)
-                | (u32::from(bei) << 9)
-                | ((TrbType::Normal as u32) << 10),
-        )
-    }
-    pub fn is_command_trb(&self) -> bool {
-        let valid_trb_types = [
-            TrbType::NoOpCmd as u8,
-            TrbType::EnableSlot as u8,
-            TrbType::DisableSlot as u8,
-            TrbType::AddressDevice as u8,
-            TrbType::ConfigureEndpoint as u8,
-            TrbType::EvaluateContext as u8,
-            TrbType::ResetEndpoint as u8,
-            TrbType::StopEndpoint as u8,
-            TrbType::SetTrDequeuePointer as u8,
-            TrbType::ResetDevice as u8,
-            TrbType::ForceEvent as u8,
-            TrbType::NegotiateBandwidth as u8,
-            TrbType::SetLatencyToleranceValue as u8,
-            TrbType::GetPortBandwidth as u8,
-            TrbType::ForceHeader as u8,
-            TrbType::GetExtendedProperty as u8,
-            TrbType::SetExtendedProperty as u8,
-        ];
-        valid_trb_types.contains(&self.trb_type())
-    }
-    pub fn is_transfer_trb(&self) -> bool {
-        // XXX: Unfortunately, the only way to use match statements with integer constants, is to
-        // precast them into valid enum values, which either requires a derive macro such as
-        // num_traits's #[derive(FromPrimitive)], or manually writing the reverse match statement
-        // first.
-        let valid_trb_types = [
-            TrbType::Normal as u8,
-            TrbType::SetupStage as u8,
-            TrbType::DataStage as u8,
-            TrbType::StatusStage as u8,
-            TrbType::Isoch as u8,
-            TrbType::NoOp as u8,
-        ];
-        valid_trb_types.contains(&self.trb_type())
-    }
-}
-
-impl fmt::Debug for Trb {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "Trb {{ data: {:>016X}, status: {:>08X}, control: {:>08X} }}",
-            self.read_data(),
-            self.status.read(),
-            self.control.read()
-        )
-    }
-}
-
-impl fmt::Display for Trb {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "({:>016X}, {:>08X}, {:>08X})",
-            self.read_data(),
-            self.status.read(),
-            self.control.read()
-        )
-    }
-}
diff --git a/recipes/core/base/drivers/vboxd/Cargo.toml b/recipes/core/base/drivers/vboxd/Cargo.toml
deleted file mode 100644
index 814eeeab11..0000000000
--- a/recipes/core/base/drivers/vboxd/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "vboxd"
-description = "VirtualBox driver"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-libredox.workspace = true
-orbclient.workspace = true
-redox_event.workspace = true
-redox_syscall.workspace = true
-
-common = { path = "../common" }
-daemon = { path = "../../daemon" }
-pcid = { path = "../pcid" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/vboxd/config.toml b/recipes/core/base/drivers/vboxd/config.toml
deleted file mode 100644
index 1216625579..0000000000
--- a/recipes/core/base/drivers/vboxd/config.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[[drivers]]
-name = "VirtualBox Guest Device"
-class = 0x08
-vendor = 0x80EE
-device = 0xCAFE
-command = ["vboxd"]
diff --git a/recipes/core/base/drivers/vboxd/src/bga.rs b/recipes/core/base/drivers/vboxd/src/bga.rs
deleted file mode 100644
index 264c9c568c..0000000000
--- a/recipes/core/base/drivers/vboxd/src/bga.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use common::io::{Io, Pio};
-
-const BGA_INDEX_XRES: u16 = 1;
-const BGA_INDEX_YRES: u16 = 2;
-const BGA_INDEX_BPP: u16 = 3;
-const BGA_INDEX_ENABLE: u16 = 4;
-
-pub struct Bga {
-    index: Pio<u16>,
-    data: Pio<u16>,
-}
-
-impl Bga {
-    pub fn new() -> Bga {
-        Bga {
-            index: Pio::new(0x1CE),
-            data: Pio::new(0x1CF),
-        }
-    }
-
-    fn read(&mut self, index: u16) -> u16 {
-        self.index.write(index);
-        self.data.read()
-    }
-
-    fn write(&mut self, index: u16, data: u16) {
-        self.index.write(index);
-        self.data.write(data);
-    }
-
-    pub fn width(&mut self) -> u16 {
-        self.read(BGA_INDEX_XRES)
-    }
-
-    pub fn height(&mut self) -> u16 {
-        self.read(BGA_INDEX_YRES)
-    }
-
-    pub fn set_size(&mut self, width: u16, height: u16) {
-        self.write(BGA_INDEX_ENABLE, 0);
-        self.write(BGA_INDEX_XRES, width);
-        self.write(BGA_INDEX_YRES, height);
-        self.write(BGA_INDEX_BPP, 32);
-        self.write(BGA_INDEX_ENABLE, 0x41);
-    }
-}
diff --git a/recipes/core/base/drivers/vboxd/src/main.rs b/recipes/core/base/drivers/vboxd/src/main.rs
deleted file mode 100644
index bcb9bb157d..0000000000
--- a/recipes/core/base/drivers/vboxd/src/main.rs
+++ /dev/null
@@ -1,333 +0,0 @@
-//#![deny(warnings)]
-
-use event::{user_data, EventQueue};
-use std::fs::File;
-use std::io::{Read, Write};
-use std::os::unix::io::AsRawFd;
-use std::{iter, mem};
-
-use common::io::{Io, Mmio};
-use pcid_interface::PciFunctionHandle;
-
-use common::dma::Dma;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-mod bga;
-
-const VBOX_REQUEST_HEADER_VERSION: u32 = 0x10001;
-const VBOX_VMMDEV_VERSION: u32 = 0x00010003;
-
-const VBOX_EVENT_DISPLAY: u32 = 1 << 2;
-const VBOX_EVENT_MOUSE: u32 = 1 << 9;
-
-/// VBox VMMDevMemory
-#[repr(C, packed)]
-struct VboxVmmDev {
-    size: Mmio<u32>,
-    version: Mmio<u32>,
-    host_events: Mmio<u32>,
-    guest_events: Mmio<u32>,
-}
-
-/// VBox Guest packet header
-#[repr(C, packed)]
-struct VboxHeader {
-    /// Size of the entire packet (including this header)
-    size: Mmio<u32>,
-    /// Version; always VBOX_REQUEST_HEADER_VERSION
-    version: Mmio<u32>,
-    /// Request type
-    request: Mmio<u32>,
-    /// Return code
-    result: Mmio<u32>,
-    _reserved1: Mmio<u32>,
-    _reserved2: Mmio<u32>,
-}
-
-/// VBox Get Mouse
-#[repr(C, packed)]
-struct VboxGetMouse {
-    header: VboxHeader,
-    features: Mmio<u32>,
-    x: Mmio<u32>,
-    y: Mmio<u32>,
-}
-
-impl VboxGetMouse {
-    fn request() -> u32 {
-        1
-    }
-
-    fn new() -> syscall::Result<Dma<Self>> {
-        let mut packet = unsafe { Dma::<Self>::zeroed()?.assume_init() };
-
-        packet.header.size.write(mem::size_of::<Self>() as u32);
-        packet.header.version.write(VBOX_REQUEST_HEADER_VERSION);
-        packet.header.request.write(Self::request());
-
-        Ok(packet)
-    }
-}
-
-/// VBox Set Mouse
-#[repr(C, packed)]
-struct VboxSetMouse {
-    header: VboxHeader,
-    features: Mmio<u32>,
-    x: Mmio<u32>,
-    y: Mmio<u32>,
-}
-
-impl VboxSetMouse {
-    fn request() -> u32 {
-        2
-    }
-
-    fn new() -> syscall::Result<Dma<Self>> {
-        let mut packet = unsafe { Dma::<Self>::zeroed()?.assume_init() };
-
-        packet.header.size.write(mem::size_of::<Self>() as u32);
-        packet.header.version.write(VBOX_REQUEST_HEADER_VERSION);
-        packet.header.request.write(Self::request());
-
-        Ok(packet)
-    }
-}
-
-/// VBox Acknowledge Events packet
-#[repr(C, packed)]
-struct VboxAckEvents {
-    header: VboxHeader,
-    events: Mmio<u32>,
-}
-
-impl VboxAckEvents {
-    fn request() -> u32 {
-        41
-    }
-
-    fn new() -> syscall::Result<Dma<Self>> {
-        let mut packet = unsafe { Dma::<Self>::zeroed()?.assume_init() };
-
-        packet.header.size.write(mem::size_of::<Self>() as u32);
-        packet.header.version.write(VBOX_REQUEST_HEADER_VERSION);
-        packet.header.request.write(Self::request());
-
-        Ok(packet)
-    }
-}
-
-/// VBox Guest Capabilities packet
-#[repr(C, packed)]
-struct VboxGuestCaps {
-    header: VboxHeader,
-    caps: Mmio<u32>,
-}
-
-impl VboxGuestCaps {
-    fn request() -> u32 {
-        55
-    }
-
-    fn new() -> syscall::Result<Dma<Self>> {
-        let mut packet = unsafe { Dma::<Self>::zeroed()?.assume_init() };
-
-        packet.header.size.write(mem::size_of::<Self>() as u32);
-        packet.header.version.write(VBOX_REQUEST_HEADER_VERSION);
-        packet.header.request.write(Self::request());
-
-        Ok(packet)
-    }
-}
-
-/* VBox GetDisplayChange packet */
-struct VboxDisplayChange {
-    header: VboxHeader,
-    xres: Mmio<u32>,
-    yres: Mmio<u32>,
-    bpp: Mmio<u32>,
-    eventack: Mmio<u32>,
-}
-
-impl VboxDisplayChange {
-    fn request() -> u32 {
-        51
-    }
-
-    fn new() -> syscall::Result<Dma<Self>> {
-        let mut packet = unsafe { Dma::<Self>::zeroed()?.assume_init() };
-
-        packet.header.size.write(mem::size_of::<Self>() as u32);
-        packet.header.version.write(VBOX_REQUEST_HEADER_VERSION);
-        packet.header.request.write(Self::request());
-
-        Ok(packet)
-    }
-}
-
-/// VBox Guest Info packet (legacy)
-#[repr(C, packed)]
-struct VboxGuestInfo {
-    header: VboxHeader,
-    version: Mmio<u32>,
-    ostype: Mmio<u32>,
-}
-
-impl VboxGuestInfo {
-    fn request() -> u32 {
-        50
-    }
-
-    fn new() -> syscall::Result<Dma<Self>> {
-        let mut packet = unsafe { Dma::<Self>::zeroed()?.assume_init() };
-
-        packet.header.size.write(mem::size_of::<Self>() as u32);
-        packet.header.version.write(VBOX_REQUEST_HEADER_VERSION);
-        packet.header.request.write(Self::request());
-
-        Ok(packet)
-    }
-}
-
-fn main() {
-    pcid_interface::pci_daemon(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
-    let pci_config = pcid_handle.config();
-
-    let mut name = pci_config.func.name();
-    name.push_str("_vbox");
-
-    let bar0 = pci_config.func.bars[0].expect_port();
-
-    let irq = pci_config
-        .func
-        .legacy_interrupt_line
-        .expect("vboxd: no legacy interrupts supported");
-
-    println!(" + VirtualBox {}", pci_config.func.display());
-
-    common::acquire_port_io_rights().expect("vboxd: failed to get I/O permission");
-
-    let mut width = 0;
-    let mut height = 0;
-    let mut display_opt = File::open("inputd:producer").ok();
-    if let Some(ref display) = display_opt {
-        let mut buf: [u8; 4096] = [0; 4096];
-        if let Ok(count) = libredox::call::fpath(display.as_raw_fd() as usize, &mut buf) {
-            let path = unsafe { String::from_utf8_unchecked(Vec::from(&buf[..count])) };
-            let res = path.split(":").nth(1).unwrap_or("");
-            width = res
-                .split("/")
-                .nth(1)
-                .unwrap_or("")
-                .parse::<u32>()
-                .unwrap_or(0);
-            height = res
-                .split("/")
-                .nth(2)
-                .unwrap_or("")
-                .parse::<u32>()
-                .unwrap_or(0);
-        }
-    }
-
-    let mut irq_file = irq.irq_handle("vboxd");
-
-    let address = unsafe { pcid_handle.map_bar(1) }.ptr.as_ptr();
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    {
-        let mut port = common::io::Pio::<u32>::new(bar0 as u16);
-
-        let vmmdev = unsafe { &mut *(address as *mut VboxVmmDev) };
-
-        let mut guest_info = VboxGuestInfo::new().expect("vboxd: failed to map GuestInfo");
-        guest_info.version.write(VBOX_VMMDEV_VERSION);
-        guest_info.ostype.write(0x100);
-        port.write(guest_info.physical() as u32);
-
-        let mut guest_caps = VboxGuestCaps::new().expect("vboxd: failed to map GuestCaps");
-        guest_caps.caps.write(1 << 2);
-        port.write(guest_caps.physical() as u32);
-
-        let mut set_mouse = VboxSetMouse::new().expect("vboxd: failed to map SetMouse");
-        set_mouse.features.write(1 << 4 | 1);
-        port.write(set_mouse.physical() as u32);
-
-        vmmdev
-            .guest_events
-            .write(VBOX_EVENT_DISPLAY | VBOX_EVENT_MOUSE);
-
-        user_data! {
-            enum Source {
-                Irq,
-            }
-        }
-
-        let event_queue =
-            EventQueue::<Source>::new().expect("vboxd: Could not create event queue.");
-        event_queue
-            .subscribe(
-                irq_file.as_raw_fd() as usize,
-                Source::Irq,
-                event::EventFlags::READ,
-            )
-            .unwrap();
-
-        daemon.ready();
-
-        libredox::call::setrens(0, 0).expect("vboxd: failed to enter null namespace");
-
-        let mut bga = crate::bga::Bga::new();
-        let get_mouse = VboxGetMouse::new().expect("vboxd: failed to map GetMouse");
-        let display_change = VboxDisplayChange::new().expect("vboxd: failed to map DisplayChange");
-        let ack_events = VboxAckEvents::new().expect("vboxd: failed to map AckEvents");
-
-        for Source::Irq in iter::once(Source::Irq)
-            .chain(event_queue.map(|e| e.expect("vboxd: failed to get next event").user_data))
-        {
-            let mut irq = [0; 8];
-            if irq_file.read(&mut irq).unwrap() >= irq.len() {
-                let host_events = vmmdev.host_events.read();
-                if host_events != 0 {
-                    port.write(ack_events.physical() as u32);
-                    irq_file.write(&irq).unwrap();
-
-                    if host_events & VBOX_EVENT_DISPLAY == VBOX_EVENT_DISPLAY {
-                        port.write(display_change.physical() as u32);
-                        if let Some(ref mut display) = display_opt {
-                            let new_width = display_change.xres.read();
-                            let new_height = display_change.yres.read();
-                            if width != new_width || height != new_height {
-                                width = new_width;
-                                height = new_height;
-                                println!("Display {}, {}", width, height);
-                                bga.set_size(width as u16, height as u16);
-                                let _ = display
-                                    .write(&orbclient::ResizeEvent { width, height }.to_event());
-                            }
-                        }
-                    }
-
-                    if host_events & VBOX_EVENT_MOUSE == VBOX_EVENT_MOUSE {
-                        port.write(get_mouse.physical() as u32);
-                        if let Some(ref mut display) = display_opt {
-                            let x = get_mouse.x.read() * width / 0x10000;
-                            let y = get_mouse.y.read() * height / 0x10000;
-                            let _ = display.write(
-                                &orbclient::MouseEvent {
-                                    x: x as i32,
-                                    y: y as i32,
-                                }
-                                .to_event(),
-                            );
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    std::process::exit(0);
-}
diff --git a/recipes/core/base/drivers/virtio-core/Cargo.toml b/recipes/core/base/drivers/virtio-core/Cargo.toml
deleted file mode 100644
index 0f37be583f..0000000000
--- a/recipes/core/base/drivers/virtio-core/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "virtio-core"
-description = "VirtIO driver library"
-version = "0.1.0"
-edition = "2021"
-authors = ["Anhad Singh <andypython@protonmail.com>"]
-
-[dependencies]
-static_assertions.workspace = true
-bitflags.workspace = true
-redox_syscall.workspace = true
-libredox.workspace = true
-log.workspace = true
-thiserror.workspace = true
-futures = { version = "0.3.28", features = ["executor"] }
-crossbeam-queue = "0.3.8"
-
-redox_event.workspace = true
-
-common = { path = "../common" }
-pcid = { path = "../pcid" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/drivers/virtio-core/src/arch/aarch64.rs b/recipes/core/base/drivers/virtio-core/src/arch/aarch64.rs
deleted file mode 100644
index 4801a1f25d..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/arch/aarch64.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use std::fs::File;
-
-use pcid_interface::*;
-
-use crate::{transport::Error, Device};
-
-pub fn enable_msix(pcid_handle: &mut PciFunctionHandle) -> Result<File, Error> {
-    unimplemented!("virtio_core: aarch64 enable_msix")
-}
diff --git a/recipes/core/base/drivers/virtio-core/src/arch/riscv64.rs b/recipes/core/base/drivers/virtio-core/src/arch/riscv64.rs
deleted file mode 100644
index 2551479f52..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/arch/riscv64.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use std::fs::File;
-
-use pcid_interface::*;
-
-use crate::{transport::Error, Device};
-
-pub fn enable_msix(pcid_handle: &mut PciFunctionHandle) -> Result<File, Error> {
-    unimplemented!("virtio_core: enable_msix")
-}
diff --git a/recipes/core/base/drivers/virtio-core/src/arch/x86.rs b/recipes/core/base/drivers/virtio-core/src/arch/x86.rs
deleted file mode 100644
index aea86c4ad5..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/arch/x86.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use crate::transport::Error;
-
-use pcid_interface::irq_helpers::{allocate_single_interrupt_vector_for_msi, read_bsp_apic_id};
-use std::fs::File;
-
-use crate::MSIX_PRIMARY_VECTOR;
-
-use pcid_interface::*;
-
-pub fn enable_msix(pcid_handle: &mut PciFunctionHandle) -> Result<File, Error> {
-    // Extended message signaled interrupts.
-    let msix_info = match pcid_handle.feature_info(PciFeature::MsiX) {
-        PciFeatureInfo::MsiX(capability) => capability,
-        _ => unreachable!(),
-    };
-    let mut info = unsafe { msix_info.map_and_mask_all(pcid_handle) };
-
-    // Allocate the primary MSI vector.
-    // FIXME allow the driver to register multiple MSI-X vectors
-    // FIXME move this MSI-X registering code into pcid_interface or pcid itself
-    let interrupt_handle = {
-        let table_entry_pointer = info.table_entry_pointer(MSIX_PRIMARY_VECTOR as usize);
-
-        let destination_id = read_bsp_apic_id().expect("virtio_core: `read_bsp_apic_id()` failed");
-        let (msg_addr_and_data, interrupt_handle) =
-            allocate_single_interrupt_vector_for_msi(destination_id);
-        table_entry_pointer.write_addr_and_data(msg_addr_and_data);
-        table_entry_pointer.unmask();
-
-        interrupt_handle
-    };
-
-    pcid_handle.enable_feature(PciFeature::MsiX);
-
-    log::debug!("virtio: using MSI-X (interrupt_handle={interrupt_handle:?})");
-    Ok(interrupt_handle)
-}
diff --git a/recipes/core/base/drivers/virtio-core/src/lib.rs b/recipes/core/base/drivers/virtio-core/src/lib.rs
deleted file mode 100644
index 2557d0b78e..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/lib.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-pub mod spec;
-pub mod transport;
-pub mod utils;
-
-mod probe;
-
-#[cfg(target_arch = "aarch64")]
-#[path = "arch/aarch64.rs"]
-mod arch;
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-#[path = "arch/x86.rs"]
-mod arch;
-
-#[cfg(target_arch = "riscv64")]
-#[path = "arch/riscv64.rs"]
-mod arch;
-
-pub use probe::{probe_device, reinit, Device, MSIX_PRIMARY_VECTOR};
diff --git a/recipes/core/base/drivers/virtio-core/src/probe.rs b/recipes/core/base/drivers/virtio-core/src/probe.rs
deleted file mode 100644
index 5631ef676c..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/probe.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-use std::fs::File;
-use std::sync::Arc;
-
-use pcid_interface::*;
-
-use crate::spec::*;
-use crate::transport::{Error, StandardTransport, Transport};
-use crate::utils::align_down;
-
-pub struct Device {
-    pub transport: Arc<dyn Transport>,
-    pub device_space: *const u8,
-    pub irq_handle: File,
-}
-
-// FIXME(andypython): `device_space` should not be `Send` nor `Sync`. Take
-// it out of `Device`.
-unsafe impl Send for Device {}
-unsafe impl Sync for Device {}
-
-pub const MSIX_PRIMARY_VECTOR: u16 = 0;
-
-/// VirtIO Device Probe
-///
-/// ## Device State
-/// After this function, the device will have been successfully reseted and is ready for use.
-///
-/// The caller is required to do the following:
-/// * Negotiate the device and driver supported features (finialize via [`StandardTransport::finalize_features`])
-/// * Create the device specific virtio queues (via [`StandardTransport::setup_queue`]). This is *required* to be done
-///   before starting the device.
-/// * Finally start the device (via [`StandardTransport::run_device`]). At this point, the device
-///   is alive.
-///
-/// ## Panics
-/// This function panics if the device is not a virtio device.
-pub fn probe_device(pcid_handle: &mut PciFunctionHandle) -> Result<Device, Error> {
-    let pci_config = pcid_handle.config();
-
-    assert_eq!(
-        pci_config.func.full_device_id.vendor_id, 6900,
-        "virtio_core::probe_device: not a virtio device"
-    );
-
-    let mut common_addr = None;
-    let mut notify_addr = None;
-    let mut device_addr = None;
-
-    for raw_capability in pcid_handle.get_vendor_capabilities() {
-        // SAFETY: We have verified that the length of the data is correct.
-        let capability = unsafe { &*(raw_capability.data.as_ptr() as *const PciCapability) };
-
-        match capability.cfg_type {
-            CfgType::Common | CfgType::Notify | CfgType::Device => {}
-            _ => continue,
-        }
-
-        let (addr, _) = pci_config.func.bars[capability.bar as usize].expect_mem();
-
-        let address = unsafe {
-            let addr = addr + capability.offset as usize;
-
-            // XXX: physmap() requires the address to be page aligned.
-            let aligned_addr = align_down(addr);
-            let offset = addr - aligned_addr;
-
-            let size = offset + capability.length as usize;
-
-            let addr = common::physmap(
-                aligned_addr,
-                size,
-                common::Prot::RW,
-                common::MemoryType::Uncacheable,
-            )? as usize;
-
-            addr + offset
-        };
-
-        match capability.cfg_type {
-            CfgType::Common => {
-                debug_assert!(common_addr.is_none());
-                common_addr = Some(address);
-            }
-
-            CfgType::Notify => {
-                debug_assert!(notify_addr.is_none());
-
-                // SAFETY: The capability type is `Notify`, so its safe to access
-                //         the `notify_multiplier` field.
-                let multiplier = unsafe {
-                    (&*(raw_capability.data.as_ptr() as *const PciCapability
-                        as *const PciCapabilityNotify))
-                        .notify_off_multiplier()
-                };
-                notify_addr = Some((address, multiplier));
-            }
-
-            CfgType::Device => {
-                debug_assert!(device_addr.is_none());
-                device_addr = Some(address);
-            }
-
-            _ => unreachable!(),
-        }
-    }
-
-    let common_addr = common_addr.expect("virtio common capability missing");
-    let device_addr = device_addr.expect("virtio device capability missing");
-    let (notify_addr, notify_multiplier) = notify_addr.expect("virtio notify capability missing");
-
-    // FIXME this is explicitly allowed by the virtio specification to happen
-    assert!(
-        notify_multiplier != 0,
-        "virtio-core::device_probe: device uses the same Queue Notify addresses for all queues"
-    );
-
-    let common = unsafe { &mut *(common_addr as *mut CommonCfg) };
-    let device_space = unsafe { &mut *(device_addr as *mut u8) };
-
-    let transport = StandardTransport::new(
-        common,
-        notify_addr as *const u8,
-        notify_multiplier,
-        device_space,
-    );
-
-    // Setup interrupts.
-    let all_pci_features = pcid_handle.fetch_all_features();
-    let has_msix = all_pci_features.iter().any(|feature| feature.is_msix());
-
-    // According to the virtio specification, the device REQUIRED to support MSI-X.
-    assert!(has_msix, "virtio: device does not support MSI-X");
-    let irq_handle = crate::arch::enable_msix(pcid_handle)?;
-
-    log::debug!("virtio: using standard PCI transport");
-
-    let device = Device {
-        transport,
-        device_space,
-        irq_handle,
-    };
-
-    device.transport.reset();
-    reinit(&device)?;
-
-    Ok(device)
-}
-
-pub fn reinit(device: &Device) -> Result<(), Error> {
-    // XXX: According to the virtio specification v1.2, setting the ACKNOWLEDGE and DRIVER bits
-    //      in `device_status` is required to be done in two steps.
-    device
-        .transport
-        .insert_status(DeviceStatusFlags::ACKNOWLEDGE);
-
-    device.transport.insert_status(DeviceStatusFlags::DRIVER);
-    Ok(())
-}
diff --git a/recipes/core/base/drivers/virtio-core/src/spec/mod.rs b/recipes/core/base/drivers/virtio-core/src/spec/mod.rs
deleted file mode 100644
index b78931d2cb..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/spec/mod.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-//! https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html
-//!
-//! This file contains comments copied from the VirtIO specification which are
-//! licensed under the following conditions:
-//!
-//! Copyright © OASIS Open 2022. All Rights Reserved.
-//!
-//! All capitalized terms in the following text have the meanings assigned to them
-//! in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-//! full Policy may be found at the OASIS website.
-//!
-//! This document and translations of it may be copied and furnished to others,
-//! and derivative works that comment on or otherwise explain it or assist in its
-//! implementation may be prepared, copied, published, and distributed, in whole
-//! or in part, without restriction of any kind, provided that the above copyright
-//! notice and this section are included on all such copies and derivative works.
-//! However, this document itself may not be modified in any way, including by
-//! removing the copyright notice or references to OASIS, except as needed for the
-//! purpose of developing any document or deliverable produced by an OASIS Technical
-//! Committee (in which case the rules applicable to copyrights, as set forth in the
-//! OASIS IPR Policy, must be followed) or as required to translate it into languages
-//! other than English.
-
-bitflags::bitflags! {
-    /// [2.1 Device Status Field](https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-110001)
-    #[derive(Debug, Copy, Clone, PartialEq)]
-    #[repr(transparent)]
-    pub struct DeviceStatusFlags: u8 {
-        /// Indicates that the guest OS has found the device and recognized it as a
-        /// valid device.
-        const ACKNOWLEDGE = 1;
-        /// Indicates that the guest OS knows how to drive the device.
-        const DRIVER = 2;
-        /// Indicates that something went wrong in the guest and it has given up on
-        /// the device.
-        const FAILED = 128;
-        /// Indicates that the driver has acknowledged all the features it understands
-        /// and feature negotiation is complete.
-        const FEATURES_OK = 8;
-        /// Indicates that the driver is set up and ready to drive the device.
-        const DRIVER_OK = 4;
-        /// Indicates that the device has experienced an error from which it can’t recover.
-        const DEVICE_NEEDS_RESET = 64;
-    }
-}
-
-mod split_virtqueue;
-pub use split_virtqueue::*;
-
-// FIXME add [2.8 Packed Virtqueues](https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-720008)
-
-mod transport_pci;
-pub use transport_pci::*;
-
-mod reserved_features;
-pub use reserved_features::*;
diff --git a/recipes/core/base/drivers/virtio-core/src/spec/reserved_features.rs b/recipes/core/base/drivers/virtio-core/src/spec/reserved_features.rs
deleted file mode 100644
index 9f88676767..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/spec/reserved_features.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-//! [6 Reserved Feature Bits](https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-6600006)
-//!
-//! This file contains comments copied from the VirtIO specification which are
-//! licensed under the following conditions:
-//!
-//! Copyright © OASIS Open 2022. All Rights Reserved.
-//!
-//! All capitalized terms in the following text have the meanings assigned to them
-//! in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-//! full Policy may be found at the OASIS website.
-//!
-//! This document and translations of it may be copied and furnished to others,
-//! and derivative works that comment on or otherwise explain it or assist in its
-//! implementation may be prepared, copied, published, and distributed, in whole
-//! or in part, without restriction of any kind, provided that the above copyright
-//! notice and this section are included on all such copies and derivative works.
-//! However, this document itself may not be modified in any way, including by
-//! removing the copyright notice or references to OASIS, except as needed for the
-//! purpose of developing any document or deliverable produced by an OASIS Technical
-//! Committee (in which case the rules applicable to copyrights, as set forth in the
-//! OASIS IPR Policy, must be followed) or as required to translate it into languages
-//! other than English.
-
-/// Negotiating this feature indicates that the driver can use descriptors
-/// with the VIRTQ_DESC_F_INDIRECT flag set as described in 2.7.5.3 Indirect
-/// Descriptors and 2.8.7 Indirect Flag: Scatter-Gather Support.
-pub const VIRTIO_F_INDIRECT_DESC: u32 = 28;
-
-/// This feature enables the used_event and the avail_event fields as
-/// described in 2.7.7, 2.7.8 and 2.8.10.
-pub const VIRTIO_F_EVENT_IDX: u32 = 29;
-
-/// This indicates compliance with this specification, giving a simple way
-/// to detect legacy devices or drivers.
-pub const VIRTIO_F_VERSION_1: u32 = 32;
-
-/// This feature indicates that the device can be used on a platform where device
-/// access to data in memory is limited and/or translated. E.g. this is the case
-/// if the device can be located behind an IOMMU that translates bus addresses
-/// from the device into physical addresses in memory, if the device can be limited
-/// to only access certain memory addresses or if special commands such as a cache
-/// flush can be needed to synchronise data in memory with the device. Whether
-/// accesses are actually limited or translated is described by platform-specific
-/// means. If this feature bit is set to 0, then the device has same access to
-/// memory addresses supplied to it as the driver has. In particular, the device
-/// will always use physical addresses matching addresses used by the driver
-/// (typically meaning physical addresses used by the CPU) and not translated
-/// further, and can access any address supplied to it by the driver. When clear,
-/// this overrides any platform-specific description of whether device access is
-/// limited or translated in any way, e.g. whether an IOMMU may be present.
-pub const VIRTIO_F_ACCESS_PLATFORM: u32 = 33;
-
-/// This feature indicates support for the packed virtqueue layout as described
-/// in 2.8 Packed Virtqueues.
-pub const VIRTIO_F_RING_PACKED: u32 = 34;
-
-/// This feature indicates that all buffers are used by the device in the same order
-/// in which they have been made available.
-pub const VIRTIO_F_IN_ORDER: u32 = 35;
-
-/// This feature indicates that memory accesses by the driver and the device are
-/// ordered in a way described by the platform.
-/// If this feature bit is negotiated, the ordering in effect for any memory
-/// accesses by the driver that need to be ordered in a specific way with respect
-/// to accesses by the device is the one suitable for devices described by the
-/// platform. This implies that the driver needs to use memory barriers suitable
-/// for devices described by the platform; e.g. for the PCI transport in the case
-/// of hardware PCI devices.
-///
-/// If this feature bit is not negotiated, then the device and driver are assumed
-/// to be implemented in software, that is they can be assumed to run on identical
-/// CPUs in an SMP configuration. Thus a weaker form of memory barriers is sufficient
-/// to yield better performance.
-pub const VIRTIO_F_ORDER_PLATFORM: u32 = 36;
-
-/// This feature indicates that the device supports Single Root I/O Virtualization.
-/// Currently only PCI devices support this feature.
-pub const VIRTIO_F_SR_IOV: u32 = 37;
-
-/// This feature indicates that the driver passes extra data (besides identifying
-/// the virtqueue) in its device notifications. See 2.9 Driver Notifications.
-pub const VIRTIO_F_NOTIFICATION_DATA: u32 = 38;
-
-/// This feature indicates that the driver uses the data provided by the device as
-/// a virtqueue identifier in available buffer notifications. As mentioned in section
-/// 2.9, when the driver is required to send an available buffer notification to the
-/// device, it sends the virtqueue number to be notified. The method of delivering
-/// notifications is transport specific. With the PCI transport, the device can
-/// optionally provide a per-virtqueue value for the driver to use in driver
-/// notifications, instead of the virtqueue number. Some devices may benefit from this
-/// flexibility by providing, for example, an internal virtqueue identifier, or an
-/// internal offset related to the virtqueue number.
-///
-/// This feature indicates the availability of such value. The definition of the data
-/// to be provided in driver notification and the delivery method is transport
-/// specific. For more details about driver notifications over PCI see 4.1.5.2.
-pub const VIRTIO_F_NOTIF_CONFIG_DATA: u32 = 39;
-
-/// This feature indicates that the driver can reset a queue individually. See 2.6.1.
-pub const VIRTIO_F_RING_RESET: u32 = 40;
diff --git a/recipes/core/base/drivers/virtio-core/src/spec/split_virtqueue.rs b/recipes/core/base/drivers/virtio-core/src/spec/split_virtqueue.rs
deleted file mode 100644
index b96367111f..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/spec/split_virtqueue.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-//! [2.7 Split Virtqueues](https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-350007)
-//!
-//! This file contains comments copied from the VirtIO specification which are
-//! licensed under the following conditions:
-//!
-//! Copyright © OASIS Open 2022. All Rights Reserved.
-//!
-//! All capitalized terms in the following text have the meanings assigned to them
-//! in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-//! full Policy may be found at the OASIS website.
-//!
-//! This document and translations of it may be copied and furnished to others,
-//! and derivative works that comment on or otherwise explain it or assist in its
-//! implementation may be prepared, copied, published, and distributed, in whole
-//! or in part, without restriction of any kind, provided that the above copyright
-//! notice and this section are included on all such copies and derivative works.
-//! However, this document itself may not be modified in any way, including by
-//! removing the copyright notice or references to OASIS, except as needed for the
-//! purpose of developing any document or deliverable produced by an OASIS Technical
-//! Committee (in which case the rules applicable to copyrights, as set forth in the
-//! OASIS IPR Policy, must be followed) or as required to translate it into languages
-//! other than English.
-
-use std::sync::atomic::{AtomicU16, AtomicU32, AtomicU64, Ordering};
-
-use crate::utils::{IncompleteArrayField, VolatileCell};
-use static_assertions::const_assert_eq;
-
-/// [2.7.5 The Virtqueue Descriptor table](https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-430005)
-#[repr(C, align(16))]
-pub struct Descriptor {
-    /// Address (guest-physical).
-    address: AtomicU64,
-    /// Size of the descriptor.
-    size: AtomicU32,
-    flags: AtomicU16,
-    /// Next field if flags & NEXT
-    next: AtomicU16,
-}
-
-const_assert_eq!(core::mem::size_of::<Descriptor>(), 16);
-
-bitflags::bitflags! {
-    #[derive(Debug, Copy, Clone)]
-    #[repr(transparent)]
-    pub struct DescriptorFlags: u16 {
-        /// This marks a buffer as continuing via the next field.
-        const NEXT = 1 << 0;
-        /// This marks a buffer as device write-only (otherwise device read-only).
-        const WRITE_ONLY = 1 << 1;
-        /// This means the buffer contains a list of buffer descriptors.
-        const INDIRECT = 1 << 2;
-    }
-}
-
-impl Descriptor {
-    pub fn set_addr(&self, addr: u64) {
-        self.address.store(addr, Ordering::SeqCst)
-    }
-
-    pub fn set_size(&self, size: u32) {
-        self.size.store(size, Ordering::SeqCst)
-    }
-
-    pub fn set_next(&self, next: Option<u16>) {
-        self.next.store(next.unwrap_or_default(), Ordering::SeqCst)
-    }
-
-    pub fn set_flags(&self, flags: DescriptorFlags) {
-        self.flags.store(flags.bits(), Ordering::SeqCst)
-    }
-
-    pub fn next(&self) -> u16 {
-        self.next.load(Ordering::SeqCst)
-    }
-
-    pub fn flags(&self) -> DescriptorFlags {
-        DescriptorFlags::from_bits_truncate(self.flags.load(Ordering::SeqCst))
-    }
-}
-
-// ======== Available Ring ========
-//
-// XXX: The driver uses the available ring to offer buffers to the
-//      device. Each ring entry refers to the head of a descriptor
-//      chain.
-
-/// [2.7.6 The Virtqueue Available Ring](https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-490006)
-#[repr(C, align(2))]
-pub struct AvailableRing {
-    pub flags: VolatileCell<u16>,
-    pub head_index: AtomicU16,
-    pub elements: IncompleteArrayField<AvailableRingElement>,
-}
-
-const_assert_eq!(core::mem::size_of::<AvailableRing>(), 4);
-
-#[repr(C)]
-pub struct AvailableRingElement {
-    pub table_index: AtomicU16,
-}
-
-impl AvailableRingElement {
-    pub fn set_table_index(&self, index: u16) {
-        self.table_index.store(index, Ordering::SeqCst)
-    }
-}
-
-const_assert_eq!(core::mem::size_of::<AvailableRingElement>(), 2);
-
-#[repr(C)]
-pub struct AvailableRingExtra {
-    pub avail_event: VolatileCell<u16>, // Only if `VIRTIO_F_EVENT_IDX`
-}
-
-const_assert_eq!(core::mem::size_of::<AvailableRingExtra>(), 2);
-
-// ======== Used Ring ========
-
-/// [2.7.8 The Virtqueue Used Ring](https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-540008)
-#[repr(C, align(4))]
-pub struct UsedRing {
-    pub flags: VolatileCell<u16>,
-    pub head_index: VolatileCell<u16>,
-    pub elements: IncompleteArrayField<UsedRingElement>,
-}
-
-const_assert_eq!(core::mem::size_of::<UsedRing>(), 4);
-
-#[repr(C)]
-pub struct UsedRingElement {
-    pub table_index: VolatileCell<u32>,
-    pub written: VolatileCell<u32>,
-}
-
-const_assert_eq!(core::mem::size_of::<UsedRingElement>(), 8);
-
-#[repr(C)]
-pub struct UsedRingExtra {
-    pub event_index: VolatileCell<u16>,
-}
-
-// ======== Utils ========
-pub struct Buffer {
-    pub(crate) buffer: usize,
-    pub(crate) size: usize,
-    pub(crate) flags: DescriptorFlags,
-}
-
-impl Buffer {
-    pub fn new<T>(val: &common::dma::Dma<T>) -> Self {
-        Self {
-            buffer: val.physical(),
-            size: core::mem::size_of::<T>(),
-            flags: DescriptorFlags::empty(),
-        }
-    }
-
-    pub fn new_unsized<T>(val: &common::dma::Dma<[T]>) -> Self {
-        Self {
-            buffer: val.physical(),
-            size: core::mem::size_of::<T>() * val.len(),
-            flags: DescriptorFlags::empty(),
-        }
-    }
-
-    pub fn new_sized<T>(val: &common::dma::Dma<[T]>, size: usize) -> Self {
-        Self {
-            buffer: val.physical(),
-            size,
-            flags: DescriptorFlags::empty(),
-        }
-    }
-
-    pub fn flags(mut self, flags: DescriptorFlags) -> Self {
-        self.flags = flags;
-        self
-    }
-}
-
-/// XXX: The [`DescriptorFlags::NEXT`] flag is set automatically.
-pub struct ChainBuilder {
-    buffers: Vec<Buffer>,
-}
-
-impl ChainBuilder {
-    pub fn new() -> Self {
-        Self {
-            buffers: Vec::new(),
-        }
-    }
-
-    pub fn chain(mut self, mut buffer: Buffer) -> Self {
-        buffer.flags |= DescriptorFlags::NEXT;
-        self.buffers.push(buffer);
-        self
-    }
-
-    pub fn build(mut self) -> Vec<Buffer> {
-        let last_buffer = self.buffers.last_mut().expect("virtio-core: empty chain");
-        last_buffer.flags.remove(DescriptorFlags::NEXT);
-
-        self.buffers
-    }
-}
diff --git a/recipes/core/base/drivers/virtio-core/src/spec/transport_pci.rs b/recipes/core/base/drivers/virtio-core/src/spec/transport_pci.rs
deleted file mode 100644
index c6cb4a8af4..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/spec/transport_pci.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-//! [4.1 Virtio Over PCI Bus](https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-1150001)
-//!
-//! This file contains comments copied from the VirtIO specification which are
-//! licensed under the following conditions:
-//!
-//! Copyright © OASIS Open 2022. All Rights Reserved.
-//!
-//! All capitalized terms in the following text have the meanings assigned to them
-//! in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-//! full Policy may be found at the OASIS website.
-//!
-//! This document and translations of it may be copied and furnished to others,
-//! and derivative works that comment on or otherwise explain it or assist in its
-//! implementation may be prepared, copied, published, and distributed, in whole
-//! or in part, without restriction of any kind, provided that the above copyright
-//! notice and this section are included on all such copies and derivative works.
-//! However, this document itself may not be modified in any way, including by
-//! removing the copyright notice or references to OASIS, except as needed for the
-//! purpose of developing any document or deliverable produced by an OASIS Technical
-//! Committee (in which case the rules applicable to copyrights, as set forth in the
-//! OASIS IPR Policy, must be followed) or as required to translate it into languages
-//! other than English.
-
-use super::DeviceStatusFlags;
-use crate::utils::VolatileCell;
-use static_assertions::const_assert_eq;
-
-/// [4.1.4 Virtio Structure PCI Capabilities](https://docs.oasis-open.org/virtio/virtio/v1.2/cs01/virtio-v1.2-cs01.html#x1-1240004)
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct PciCapability {
-    /// Identifies the structure.
-    pub cfg_type: CfgType,
-    /// Where to find it.
-    pub bar: u8,
-    /// Multiple capabilities of the same type.
-    pub id: u8,
-    /// Pad to a full dword.
-    pub padding: [u8; 2],
-    /// Offset within the bar.
-    pub offset: u32,
-    /// Length of the structure, in bytes.
-    pub length: u32,
-}
-
-// The size of `PciCapability` is 13 bytes since the generic
-// PCI fields are *not* included.
-const_assert_eq!(core::mem::size_of::<PciCapability>(), 13);
-
-#[derive(Debug, Copy, Clone)]
-#[repr(u8)]
-pub enum CfgType {
-    /// Common Configuration.
-    Common = 1,
-    /// Notifications.
-    Notify = 2,
-    /// ISR Status.
-    Isr = 3,
-    /// Device specific configuration.
-    Device = 4,
-    /// PCI configuration access.
-    PciConfig = 5,
-    /// Shared memory region.
-    SharedMemory = 8,
-    /// Vendor-specific data.
-    Vendor = 9,
-}
-
-const_assert_eq!(core::mem::size_of::<CfgType>(), 1);
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct CommonCfg {
-    // About the whole device.
-    /// The driver uses this to select which feature bits device_feature shows.
-    /// Value 0x0 selects Feature Bits 0 to 31, 0x1 selects Feature Bits 32 to 63, etc.
-    /// read-write
-    pub device_feature_select: VolatileCell<u32>,
-    /// The device uses this to report which feature bits it is offering to the driver:
-    /// the driver writes to device_feature_select to select which feature bits are presented.
-    /// read-only for driver
-    pub device_feature: VolatileCell<u32>,
-    /// The driver uses this to select which feature bits driver_feature shows.
-    /// Value 0x0 selects Feature Bits 0 to 31, 0x1 selects Feature Bits 32 to 63, etc.
-    /// read-write
-    pub driver_feature_select: VolatileCell<u32>,
-    /// The driver writes this to accept feature bits offered by the device.
-    /// Driver Feature Bits selected by driver_feature_select.
-    /// read-write
-    pub driver_feature: VolatileCell<u32>,
-    /// The driver sets the Configuration Vector for MSI-X.
-    /// read-write
-    pub config_msix_vector: VolatileCell<u16>,
-    /// The device specifies the maximum number of virtqueues supported here.
-    /// read-only for driver
-    pub num_queues: VolatileCell<u16>,
-    /// The driver writes the device status here (see 2.1).
-    /// Writing 0 into this field resets the device.
-    /// read-write
-    pub device_status: VolatileCell<DeviceStatusFlags>,
-    /// Configuration atomicity value. The device changes this every time the
-    /// configuration noticeably changes.
-    /// read-only for driver
-    pub config_generation: VolatileCell<u8>,
-
-    // About a specific virtqueue.
-    /// Queue Select. The driver selects which virtqueue the following fields refer to.
-    /// read-write
-    pub queue_select: VolatileCell<u16>,
-    /// Queue Size. On reset, specifies the maximum queue size supported by the device.
-    /// This can be modified by the driver to reduce memory requirements.
-    /// A 0 means the queue is unavailable.
-    /// read-write
-    pub queue_size: VolatileCell<u16>,
-    /// The driver uses this to specify the queue vector for MSI-X.
-    /// read-write
-    pub queue_msix_vector: VolatileCell<u16>,
-    /// The driver uses this to selectively prevent the device from executing
-    /// requests from this virtqueue. 1 - enabled; 0 - disabled.
-    /// read-write
-    pub queue_enable: VolatileCell<u16>,
-    /// The driver reads this to calculate the offset from start of Notification
-    /// structure at which this virtqueue is located. Note: this is not an offset
-    /// in bytes. See 4.1.4.4 below.
-    /// read-only for driver
-    pub queue_notify_off: VolatileCell<u16>,
-    /// The driver writes the physical address of Descriptor Area here.
-    /// See section 2.6.
-    /// read-write
-    pub queue_desc: VolatileCell<u64>,
-    /// The driver writes the physical address of Driver Area here.
-    /// See section 2.6.
-    /// read-write
-    pub queue_driver: VolatileCell<u64>,
-    /// The driver writes the physical address of Device Area here.
-    /// See section 2.6.
-    /// read-write
-    pub queue_device: VolatileCell<u64>,
-    /// This field exists only if VIRTIO_F_NOTIF_CONFIG_DATA has been negotiated.
-    /// The driver will use this value to put it in the ’virtqueue number’ field
-    /// in the available buffer notification structure. See section 4.1.5.2. Note:
-    /// This field provides the device with flexibility to determine how virtqueues
-    /// will be referred to in available buffer notifications. In a trivial case the
-    /// device can set queue_notify_data=vqn. Some devices may benefit from providing
-    /// another value, for example an internal virtqueue identifier, or an internal
-    /// offset related to the virtqueue number.
-    /// read-only for driver
-    pub queue_notify_data: VolatileCell<u16>,
-    /// The driver uses this to selectively reset the queue. This field exists
-    /// only if VIRTIO_F_RING_RESET has been negotiated. (see 2.6.1).
-    /// read-write
-    pub queue_reset: VolatileCell<u16>,
-}
-
-//TODO: why does this fail on x86?
-#[cfg(not(target_arch = "x86"))]
-const_assert_eq!(core::mem::size_of::<CommonCfg>(), 64);
-
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
-pub struct PciCapabilityNotify {
-    pub cap: PciCapability,
-    /// Multiplier for queue_notify_off.
-    notify_off_multiplier: u32,
-}
-
-impl PciCapabilityNotify {
-    pub fn notify_off_multiplier(&self) -> u32 {
-        self.notify_off_multiplier
-    }
-}
-
-const_assert_eq!(core::mem::size_of::<PciCapabilityNotify>(), 17);
-
-/// Vector value used to disable MSI for queue
-pub const VIRTIO_MSI_NO_VECTOR: u16 = 0xffff;
diff --git a/recipes/core/base/drivers/virtio-core/src/transport.rs b/recipes/core/base/drivers/virtio-core/src/transport.rs
deleted file mode 100644
index d3445d2d81..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/transport.rs
+++ /dev/null
@@ -1,696 +0,0 @@
-use crate::spec::*;
-use crate::utils::align;
-
-use common::dma::Dma;
-use event::RawEventQueue;
-
-use core::mem::size_of;
-use core::sync::atomic::{AtomicU16, Ordering};
-
-use std::fs::File;
-use std::future::Future;
-use std::os::fd::AsRawFd;
-use std::sync::{Arc, Mutex, Weak};
-use std::task::{Poll, Waker};
-
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("syscall failed")]
-    SyscallError(#[from] libredox::error::Error),
-    #[error("the device is incapable of {0:?}")]
-    InCapable(CfgType),
-}
-
-/// Returns the queue part sizes in bytes.
-///
-/// ## Reference
-/// Section 2.7 Split Virtqueues of the specfication v1.2 describes the alignment
-/// and size of the queue parts.
-///
-/// ## Panics
-/// If `queue_size` is not a power of two or is zero.
-pub const fn queue_part_sizes(queue_size: usize) -> (usize, usize, usize) {
-    assert!(queue_size.is_power_of_two() && queue_size != 0);
-
-    const DESCRIPTOR_ALIGN: usize = 16;
-    const AVAILABLE_ALIGN: usize = 2;
-    const USED_ALIGN: usize = 4;
-
-    let queue_size = queue_size as usize;
-    let desc = size_of::<Descriptor>() * queue_size;
-
-    // `avail_header`: Size of the available ring header and the footer.
-    let avail_header = size_of::<AvailableRing>() + size_of::<AvailableRingExtra>();
-    let avail = avail_header + size_of::<AvailableRingElement>() * queue_size;
-
-    // `used_header`: Size of the used ring header and the footer.
-    let used_header = size_of::<UsedRing>() + size_of::<UsedRingExtra>();
-    let used = used_header + size_of::<UsedRingElement>() * queue_size;
-
-    (
-        align(desc, DESCRIPTOR_ALIGN).next_multiple_of(syscall::PAGE_SIZE),
-        align(avail, AVAILABLE_ALIGN).next_multiple_of(syscall::PAGE_SIZE),
-        align(used, USED_ALIGN).next_multiple_of(syscall::PAGE_SIZE),
-    )
-}
-
-pub fn spawn_irq_thread(irq_handle: &File, queue: &Arc<Queue<'static>>) {
-    let irq_fd = irq_handle.as_raw_fd();
-    let queue_copy = queue.clone();
-
-    std::thread::spawn(move || {
-        let event_queue = RawEventQueue::new().unwrap();
-
-        event_queue
-            .subscribe(irq_fd as usize, 0, event::EventFlags::READ)
-            .unwrap();
-
-        for _ in event_queue.map(Result::unwrap) {
-            // Wake up the tasks waiting on the queue.
-            for (_, task) in queue_copy.waker.lock().unwrap().iter() {
-                task.wake_by_ref();
-            }
-        }
-    });
-}
-
-pub trait NotifyBell {
-    fn ring(&self, queue_index: u16);
-}
-
-pub struct PendingRequest<'a> {
-    queue: Arc<Queue<'a>>,
-    first_descriptor: u32,
-}
-
-impl<'a> Future for PendingRequest<'a> {
-    type Output = u32;
-
-    fn poll(self: std::pin::Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {
-        // XXX: Register the waker before checking the queue to avoid the race condition
-        //      where you lose a notification.
-        self.queue
-            .waker
-            .lock()
-            .unwrap()
-            .insert(self.first_descriptor, cx.waker().clone());
-
-        let used_head = self.queue.used.head_index();
-
-        if used_head == self.queue.used_head.load(Ordering::SeqCst) {
-            // No new requests have been completed.
-            return Poll::Pending;
-        }
-
-        let used_element = self.queue.used.get_element_at((used_head - 1) as usize);
-        let written = used_element.written.get();
-
-        let mut table_index = used_element.table_index.get();
-
-        if table_index == self.first_descriptor {
-            // The request has been completed; recycle the descriptors used.
-            while self.queue.descriptor[table_index as usize]
-                .flags()
-                .contains(DescriptorFlags::NEXT)
-            {
-                let next_index = self.queue.descriptor[table_index as usize].next();
-                self.queue.descriptor_stack.push(table_index as u16);
-                table_index = next_index.into();
-            }
-
-            // Push the last descriptor.
-            self.queue.descriptor_stack.push(table_index as u16);
-            self.queue
-                .waker
-                .lock()
-                .unwrap()
-                .remove(&self.first_descriptor);
-
-            self.queue.used_head.store(used_head, Ordering::SeqCst);
-            return Poll::Ready(written);
-        } else {
-            return Poll::Pending;
-        }
-    }
-}
-
-pub struct Queue<'a> {
-    pub queue_index: u16,
-    pub waker: Mutex<std::collections::HashMap<u32, Waker>>,
-    pub used: Used<'a>,
-    pub descriptor: Dma<[Descriptor]>,
-    pub available: Available<'a>,
-    pub used_head: AtomicU16,
-    vector: u16,
-
-    notification_bell: Box<dyn NotifyBell>,
-    descriptor_stack: crossbeam_queue::SegQueue<u16>,
-    sref: Weak<Self>,
-}
-
-impl<'a> Queue<'a> {
-    pub fn new<N>(
-        descriptor: Dma<[Descriptor]>,
-        available: Available<'a>,
-        used: Used<'a>,
-
-        notification_bell: N,
-        queue_index: u16,
-        vector: u16,
-    ) -> Arc<Self>
-    where
-        N: NotifyBell + 'static,
-    {
-        let descriptor_stack = crossbeam_queue::SegQueue::new();
-        (0..descriptor.len() as u16).for_each(|i| descriptor_stack.push(i));
-
-        Arc::new_cyclic(|sref| Self {
-            notification_bell: Box::new(notification_bell),
-            available,
-            descriptor,
-            used,
-            waker: Mutex::new(std::collections::HashMap::new()),
-            queue_index,
-            descriptor_stack,
-            used_head: AtomicU16::new(0),
-            sref: sref.clone(),
-            vector,
-        })
-    }
-
-    fn reinit(&self) {
-        self.used_head.store(0, Ordering::SeqCst);
-        self.available.set_head_idx(0);
-
-        // Drain all of the available descriptors.
-        while let Some(_) = self.descriptor_stack.pop() {}
-
-        // Refill the descriptor stack.
-        (0..self.descriptor.len() as u16).for_each(|i| self.descriptor_stack.push(i));
-    }
-
-    #[must_use = "The function returns a future that must be awaited to ensure the sent request is completed."]
-    pub fn send(&self, chain: Vec<Buffer>) -> PendingRequest<'a> {
-        let mut first_descriptor: Option<usize> = None;
-        let mut last_descriptor: Option<usize> = None;
-
-        for buffer in chain.iter() {
-            let descriptor = self.descriptor_stack.pop().unwrap() as usize;
-
-            if first_descriptor.is_none() {
-                first_descriptor = Some(descriptor);
-            }
-
-            self.descriptor[descriptor].set_addr(buffer.buffer as u64);
-            self.descriptor[descriptor].set_flags(buffer.flags);
-            self.descriptor[descriptor].set_size(buffer.size as u32);
-
-            if let Some(index) = last_descriptor {
-                self.descriptor[index].set_next(Some(descriptor as u16));
-            }
-
-            last_descriptor = Some(descriptor);
-        }
-
-        let last_descriptor = last_descriptor.unwrap();
-        let first_descriptor = first_descriptor.unwrap();
-
-        self.descriptor[last_descriptor].set_next(None);
-
-        let index = self.available.head_index() as usize;
-
-        self.available
-            .get_element_at(index)
-            .set_table_index(first_descriptor as u16);
-
-        self.available.set_head_idx(index as u16 + 1);
-        self.notification_bell.ring(self.queue_index);
-
-        PendingRequest {
-            queue: self.sref.upgrade().unwrap(),
-            first_descriptor: first_descriptor as u32,
-        }
-    }
-
-    /// Returns the number of descriptors in the descriptor table of this queue.
-    pub fn descriptor_len(&self) -> usize {
-        self.descriptor.len()
-    }
-}
-
-unsafe impl Sync for Queue<'_> {}
-unsafe impl Send for Queue<'_> {}
-
-pub struct Available<'a> {
-    mem: Mem<'a>,
-    queue_size: usize,
-}
-pub struct Borrowed<'a> {
-    phys: usize,
-    virt: usize,
-    size: usize,
-    _unused: &'a (),
-}
-pub enum Mem<'a> {
-    Owned(Dma<[u8]>),
-    Borrowed(Borrowed<'a>),
-}
-impl Borrowed<'_> {
-    pub unsafe fn new(phys: usize, virt: usize, size: usize) -> Self {
-        Self {
-            phys,
-            virt,
-            size,
-            _unused: &(),
-        }
-    }
-}
-impl<'a> Mem<'a> {
-    pub fn as_ptr<T>(&self) -> *const T {
-        match *self {
-            Self::Owned(ref dma) => dma.as_ptr().cast(),
-            Self::Borrowed(Borrowed {
-                phys: _,
-                virt,
-                size: _,
-                _unused,
-            }) => virt as *const T,
-        }
-    }
-    pub fn as_mut_ptr<T>(&mut self) -> *mut T {
-        match *self {
-            Self::Owned(ref mut dma) => dma.as_mut_ptr().cast(),
-            Self::Borrowed(Borrowed {
-                phys: _,
-                virt,
-                size: _,
-                _unused,
-            }) => virt as *mut T,
-        }
-    }
-    pub fn physical(&self) -> usize {
-        match self {
-            Self::Owned(dma) => dma.physical(),
-            Self::Borrowed(borrowed) => borrowed.phys,
-        }
-    }
-}
-
-impl<'a> Available<'a> {
-    pub fn ring(&self) -> &AvailableRing {
-        unsafe { &*self.mem.as_ptr() }
-    }
-    pub fn ring_mut(&mut self) -> &mut AvailableRing {
-        unsafe { &mut *self.mem.as_mut_ptr() }
-    }
-    pub fn new(queue_size: usize) -> Result<Self, Error> {
-        let (_, _, size) = queue_part_sizes(queue_size);
-        let mem = unsafe {
-            Dma::zeroed_slice(size)
-                .map_err(Error::SyscallError)?
-                .assume_init()
-        };
-
-        unsafe { Self::from_raw(Mem::Owned(mem), queue_size) }
-    }
-
-    /// `addr` is the physical address of the ring.
-    pub unsafe fn from_raw(mem: Mem<'a>, queue_size: usize) -> Result<Self, Error> {
-        let ring = Self { mem, queue_size };
-
-        for i in 0..queue_size {
-            // Setting them to `u16::MAX` helps with debugging since qemu reports them
-            // as illegal values.
-            ring.get_element_at(i)
-                .table_index
-                .store(u16::MAX, Ordering::SeqCst);
-        }
-
-        Ok(ring)
-    }
-
-    /// ## Panics
-    /// This function panics if the index is out of bounds.
-    pub fn get_element_at(&self, index: usize) -> &AvailableRingElement {
-        // SAFETY: We have exclusive access to the elements and the number of elements
-        //         is correct; same as the queue size.
-        unsafe {
-            self.ring()
-                .elements
-                .as_slice(self.queue_size)
-                .get(index % self.queue_size)
-                .expect("virtio-core::available: index out of bounds")
-        }
-    }
-
-    pub fn head_index(&self) -> u16 {
-        self.ring().head_index.load(Ordering::SeqCst)
-    }
-
-    pub fn set_head_idx(&self, index: u16) {
-        self.ring().head_index.store(index, Ordering::SeqCst);
-    }
-
-    pub fn phys_addr(&self) -> usize {
-        self.mem.physical()
-    }
-}
-
-impl<'a> Drop for Available<'a> {
-    fn drop(&mut self) {
-        log::warn!(
-            "virtio-core: dropping 'available' ring at {:#x}",
-            self.phys_addr()
-        );
-    }
-}
-
-pub struct Used<'a> {
-    mem: Mem<'a>,
-    queue_size: usize,
-    _unused: &'a (),
-}
-
-impl<'a> Used<'a> {
-    fn ring(&self) -> &UsedRing {
-        unsafe { &*self.mem.as_ptr() }
-    }
-    fn ring_mut(&mut self) -> &mut UsedRing {
-        unsafe { &mut *self.mem.as_mut_ptr() }
-    }
-
-    pub fn new(queue_size: usize) -> Result<Self, Error> {
-        let (_, _, size) = queue_part_sizes(queue_size);
-        let mem = unsafe {
-            Dma::zeroed_slice(size)
-                .map_err(Error::SyscallError)?
-                .assume_init()
-        };
-
-        unsafe { Self::from_raw(Mem::Owned(mem), queue_size) }
-    }
-
-    /// `addr` is the physical address of the ring.
-    pub unsafe fn from_raw(mem: Mem<'a>, queue_size: usize) -> Result<Self, Error> {
-        let mut ring = Self {
-            mem,
-            queue_size,
-            _unused: &(),
-        };
-
-        for i in 0..queue_size {
-            // Setting them to `u32::MAX` helps with debugging since qemu reports them
-            // as illegal values.
-            ring.get_mut_element_at(i).table_index.set(u32::MAX);
-        }
-
-        Ok(ring)
-    }
-
-    /// ## Panics
-    /// This function panics if the index is out of bounds.
-    pub fn get_element_at(&self, index: usize) -> &UsedRingElement {
-        // SAFETY: We have exclusive access to the elements and the number of elements
-        //         is correct; same as the queue size.
-        unsafe {
-            self.ring()
-                .elements
-                .as_slice(self.queue_size)
-                .get(index % self.queue_size)
-                .expect("virtio-core::used: index out of bounds")
-        }
-    }
-
-    /// ## Panics
-    /// This function panics if the index is out of bounds.
-    pub fn get_mut_element_at(&mut self, index: usize) -> &mut UsedRingElement {
-        // SAFETY: We have exclusive access to the elements and the number of elements
-        //         is correct; same as the queue size.
-        let queue_size = self.queue_size;
-        unsafe {
-            self.ring_mut()
-                .elements
-                .as_mut_slice(queue_size)
-                .get_mut(index % 256)
-                .expect("virtio-core::used: index out of bounds")
-        }
-    }
-
-    pub fn flags(&self) -> u16 {
-        self.ring().flags.get()
-    }
-
-    pub fn head_index(&self) -> u16 {
-        self.ring().head_index.get()
-    }
-
-    pub fn phys_addr(&self) -> usize {
-        self.mem.physical()
-    }
-}
-
-impl Drop for Used<'_> {
-    fn drop(&mut self) {
-        log::warn!(
-            "virtio-core: dropping 'used' ring at {:#x}",
-            self.phys_addr()
-        );
-    }
-}
-
-pub trait Transport: Sync + Send {
-    /// `size` specifies the size of the read in bytes.
-    ///
-    /// ## Panics
-    /// This function panics if the provided `size` is more then `size_of::<u64>()`.
-    fn load_config(&self, offset: u8, size: u8) -> u64;
-
-    /// Resets the device.
-    fn reset(&self);
-
-    /// Returns whether the device supports the specified feature.
-    fn check_device_feature(&self, feature: u32) -> bool;
-
-    /// Acknowledges the specified feature.
-    ///
-    /// **Note**: [`Transport::check_device_feature`] must be used to check whether
-    /// the device supports the feature before acknowledging it.
-    fn ack_driver_feature(&self, feature: u32);
-
-    /// Finalizes the acknowledged features by setting the `FEATURES_OK` bit in the
-    /// device status flags.
-    fn finalize_features(&self);
-
-    /// Runs the device.
-    ///
-    /// At this point, all of the queues must be created and the features must be
-    /// finalized.
-    ///
-    /// ## Panics
-    /// This function panics if the device is already running.
-    fn run_device(&self) {
-        self.insert_status(DeviceStatusFlags::DRIVER_OK);
-    }
-
-    /// Request to be notified on configuration changes on the given MSI-X vector.
-    fn setup_config_notify(&self, vector: u16);
-
-    /// Each time the device configuration changes this number will be updated.
-    fn config_generation(&self) -> u32;
-
-    /// Creates a new queue.
-    ///
-    /// ## Panics
-    /// This function panics if the device is running.
-    fn setup_queue(&self, vector: u16, irq_handle: &File) -> Result<Arc<Queue<'_>>, Error>;
-
-    // TODO(andypython): Should this function be unsafe?
-    fn reinit_queue(&self, queue: Arc<Queue>);
-    fn insert_status(&self, status: DeviceStatusFlags);
-}
-
-struct StandardBell<'a>(&'a mut AtomicU16);
-
-impl NotifyBell for StandardBell<'_> {
-    #[inline]
-    fn ring(&self, queue_index: u16) {
-        self.0.store(queue_index, Ordering::SeqCst);
-    }
-}
-
-pub struct StandardTransport<'a> {
-    pub(crate) common: Mutex<&'a mut CommonCfg>,
-    notify: *const u8,
-    notify_mul: u32,
-    device_space: *const u8,
-
-    queue_index: AtomicU16,
-}
-
-impl<'a> StandardTransport<'a> {
-    pub fn new(
-        common: &'a mut CommonCfg,
-        notify: *const u8,
-        notify_mul: u32,
-        device_space: *const u8,
-    ) -> Arc<Self> {
-        Arc::new(Self {
-            common: Mutex::new(common),
-            notify,
-            notify_mul,
-
-            queue_index: AtomicU16::new(0),
-            device_space,
-        })
-    }
-}
-
-impl Transport for StandardTransport<'_> {
-    fn load_config(&self, offset: u8, size: u8) -> u64 {
-        unsafe {
-            let ptr = self.device_space.add(offset as usize);
-            let size = size as usize;
-
-            if size == size_of::<u8>() {
-                ptr.cast::<u8>().read() as u64
-            } else if size == size_of::<u16>() {
-                ptr.cast::<u16>().read() as u64
-            } else if size == size_of::<u32>() {
-                ptr.cast::<u32>().read() as u64
-            } else if size == size_of::<u64>() {
-                ptr.cast::<u64>().read() as u64
-            } else {
-                unreachable!()
-            }
-        }
-    }
-
-    fn reset(&self) {
-        let mut common = self.common.lock().unwrap();
-
-        common.device_status.set(DeviceStatusFlags::empty());
-        // Upon reset, the device must initialize device status to 0.
-        assert_eq!(common.device_status.get(), DeviceStatusFlags::empty());
-    }
-
-    fn check_device_feature(&self, feature: u32) -> bool {
-        let mut common = self.common.lock().unwrap();
-
-        common.device_feature_select.set(feature >> 5);
-        (common.device_feature.get() & (1 << (feature & 31))) != 0
-    }
-
-    fn ack_driver_feature(&self, feature: u32) {
-        let mut common = self.common.lock().unwrap();
-
-        common.driver_feature_select.set(feature >> 5);
-
-        let current = common.driver_feature.get();
-        common.driver_feature.set(current | (1 << (feature & 31)));
-    }
-
-    fn finalize_features(&self) {
-        // Check VirtIO version 1 compliance.
-        assert!(self.check_device_feature(VIRTIO_F_VERSION_1));
-        self.ack_driver_feature(VIRTIO_F_VERSION_1);
-
-        let mut common = self.common.lock().unwrap();
-
-        let status = common.device_status.get();
-        common
-            .device_status
-            .set(status | DeviceStatusFlags::FEATURES_OK);
-
-        // Re-read device status to ensure the `FEATURES_OK` bit is still set: otherwise,
-        // the device does not support our subset of features and the device is unusable.
-        let confirm = common.device_status.get();
-        assert!((confirm & DeviceStatusFlags::FEATURES_OK) == DeviceStatusFlags::FEATURES_OK);
-    }
-
-    fn setup_config_notify(&self, vector: u16) {
-        self.common.lock().unwrap().config_msix_vector.set(vector);
-    }
-
-    fn config_generation(&self) -> u32 {
-        u32::from(self.common.lock().unwrap().config_generation.get())
-    }
-
-    fn setup_queue(&self, vector: u16, irq_handle: &File) -> Result<Arc<Queue<'_>>, Error> {
-        let mut common = self.common.lock().unwrap();
-
-        let queue_index = self.queue_index.fetch_add(1, Ordering::SeqCst);
-        common.queue_select.set(queue_index);
-
-        let queue_size = common.queue_size.get() as usize;
-        let queue_notify_idx = common.queue_notify_off.get();
-
-        // Allocate memory for the queue structues.
-        let descriptor = unsafe {
-            Dma::<[Descriptor]>::zeroed_slice(queue_size)
-                .map_err(Error::SyscallError)?
-                .assume_init()
-        };
-
-        let avail = Available::new(queue_size)?;
-        let used = Used::new(queue_size)?;
-
-        common.queue_desc.set(descriptor.physical() as u64);
-        common.queue_driver.set(avail.phys_addr() as u64);
-        common.queue_device.set(used.phys_addr() as u64);
-
-        // Set the MSI-X vector.
-        common.queue_msix_vector.set(vector);
-        assert!(common.queue_msix_vector.get() == vector);
-
-        // Enable the queue.
-        common.queue_enable.set(1);
-
-        let notification_bell = unsafe {
-            let offset = self.notify_mul * queue_notify_idx as u32;
-            &mut *(self.notify.add(offset as usize) as *mut AtomicU16)
-        };
-
-        log::debug!("virtio-core: enabled queue #{queue_index} (size={queue_size})");
-
-        let queue = Queue::new(
-            descriptor,
-            avail,
-            used,
-            StandardBell(notification_bell),
-            queue_index,
-            vector,
-        );
-
-        spawn_irq_thread(irq_handle, &queue);
-        Ok(queue)
-    }
-
-    fn insert_status(&self, status: DeviceStatusFlags) {
-        let mut common = self.common.lock().unwrap();
-        let old = common.device_status.get();
-
-        common.device_status.set(old | status);
-    }
-
-    /// Re-initializes a queue; usually done after a device reset.
-    fn reinit_queue(&self, queue: Arc<Queue>) {
-        let mut common = self.common.lock().unwrap();
-        queue.reinit();
-
-        common.queue_select.set(queue.queue_index);
-
-        common.queue_desc.set(queue.descriptor.physical() as u64);
-        common.queue_driver.set(queue.available.phys_addr() as u64);
-        common.queue_device.set(queue.used.phys_addr() as u64);
-
-        // Set the MSI-X vector.
-        common.queue_msix_vector.set(queue.vector);
-        assert!(common.queue_msix_vector.get() == queue.vector);
-
-        // Enable the queue.
-        common.queue_enable.set(1);
-    }
-}
-
-unsafe impl Send for StandardTransport<'_> {}
-unsafe impl Sync for StandardTransport<'_> {}
diff --git a/recipes/core/base/drivers/virtio-core/src/utils.rs b/recipes/core/base/drivers/virtio-core/src/utils.rs
deleted file mode 100644
index 76d8ff7eb7..0000000000
--- a/recipes/core/base/drivers/virtio-core/src/utils.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use core::cell::UnsafeCell;
-use core::fmt::Debug;
-use core::marker::PhantomData;
-
-#[repr(C)]
-pub struct VolatileCell<T> {
-    value: UnsafeCell<T>,
-}
-
-impl<T: Copy> VolatileCell<T> {
-    #[inline]
-    pub const fn new(value: T) -> Self {
-        Self {
-            value: UnsafeCell::new(value),
-        }
-    }
-
-    /// Returns a copy of the contained value.
-    #[inline]
-    pub fn get(&self) -> T {
-        unsafe { core::ptr::read_volatile(self.value.get()) }
-    }
-
-    /// Sets the contained value.
-    #[inline]
-    pub fn set(&mut self, value: T) {
-        unsafe { core::ptr::write_volatile(self.value.get(), value) }
-    }
-}
-
-impl<T> Debug for VolatileCell<T>
-where
-    T: Debug + Copy,
-{
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("VolatileCell")
-            .field("value", &self.get())
-            .finish()
-    }
-}
-
-unsafe impl<T> Sync for VolatileCell<T> {}
-
-#[repr(C)]
-pub struct IncompleteArrayField<T>(PhantomData<T>, [T; 0]);
-
-impl<T> IncompleteArrayField<T> {
-    #[inline]
-    pub const fn new() -> Self {
-        IncompleteArrayField(PhantomData, [])
-    }
-
-    #[inline]
-    pub unsafe fn as_slice(&self, len: usize) -> &[T] {
-        core::slice::from_raw_parts(self.as_ptr(), len)
-    }
-
-    #[inline]
-    pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] {
-        core::slice::from_raw_parts_mut(self.as_mut_ptr(), len)
-    }
-
-    #[inline]
-    pub unsafe fn as_ptr(&self) -> *const T {
-        self as *const _ as *const T
-    }
-
-    #[inline]
-    pub unsafe fn as_mut_ptr(&mut self) -> *mut T {
-        self as *mut _ as *mut T
-    }
-}
-
-pub const fn align(val: usize, align: usize) -> usize {
-    (val + align) & !align
-}
-
-pub const fn align_down(addr: usize) -> usize {
-    addr & !(syscall::PAGE_SIZE - 1)
-}
diff --git a/recipes/core/base/fmt.sh b/recipes/core/base/fmt.sh
deleted file mode 100755
index 007766e270..0000000000
--- a/recipes/core/base/fmt.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/bash
-
-set -eo pipefail
-
-printf "\e[1;32mFormatting\e[0m $dir\n"
-if [[ "$CHECK_ONLY" -eq "1" ]]; then
-    cargo fmt --all --check
-else
-    cargo fmt --all
-fi
diff --git a/recipes/core/base/init/Cargo.toml b/recipes/core/base/init/Cargo.toml
deleted file mode 100644
index b0ae14a873..0000000000
--- a/recipes/core/base/init/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "init"
-description = "Userspace process launcher"
-version = "0.1.0"
-edition = "2024"
-license = "MIT"
-
-[dependencies]
-libc.workspace = true
-libredox.workspace = true
-plain.workspace = true
-redox_syscall.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-toml.workspace = true
-
-config = { path = "../config" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/init/src/color.rs b/recipes/core/base/init/src/color.rs
deleted file mode 100644
index db792c441f..0000000000
--- a/recipes/core/base/init/src/color.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-pub fn status_ok(msg: &str) {
-    eprintln!("[  OK   ] {msg}");
-}
-
-pub fn status_fail(msg: &str) {
-    eprintln!("[ FAILED ] {msg}");
-}
-
-pub fn status_skip(msg: &str) {
-    eprintln!("[  SKIP ] {msg}");
-}
-
-pub fn init_error(msg: &str) {
-    eprintln!("init: {msg}");
-}
-
-pub fn init_warn(msg: &str) {
-    eprintln!("init: {msg}");
-}
-
-pub fn init_info(msg: &str) {
-    eprintln!("init: {msg}");
-}
-
-pub fn init_debug(msg: &str) {
-    eprintln!("init: {msg}");
-}
diff --git a/recipes/core/base/init/src/main.rs b/recipes/core/base/init/src/main.rs
deleted file mode 100644
index e78a669990..0000000000
--- a/recipes/core/base/init/src/main.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-use std::collections::BTreeMap;
-use std::ffi::OsString;
-use std::path::Path;
-use std::{env, fs, io};
-
-use libredox::flag::{O_RDONLY, O_WRONLY};
-
-use crate::scheduler::Scheduler;
-use crate::unit::{UnitId, UnitStore};
-
-mod scheduler;
-mod script;
-mod service;
-mod unit;
-
-fn switch_stdio(stdio: &str) -> io::Result<()> {
-    let stdin = libredox::Fd::open(stdio, O_RDONLY, 0)?;
-    let stdout = libredox::Fd::open(stdio, O_WRONLY, 0)?;
-    let stderr = libredox::Fd::open(stdio, O_WRONLY, 0)?;
-
-    stdin.dup2(0, &[])?;
-    stdout.dup2(1, &[])?;
-    stderr.dup2(2, &[])?;
-
-    Ok(())
-}
-
-struct InitConfig {
-    log_debug: bool,
-    skip_cmd: Vec<String>,
-    envs: BTreeMap<String, OsString>,
-}
-
-impl InitConfig {
-    fn new() -> Self {
-        let log_level = env::var("INIT_LOG_LEVEL").unwrap_or("INFO".into());
-        let log_debug = matches!(log_level.as_str(), "DEBUG" | "TRACE");
-        let skip_cmd: Vec<String> = match env::var("INIT_SKIP") {
-            Ok(v) if v.len() > 0 => v.split(',').map(|s| s.to_string()).collect(),
-            _ => Vec::new(),
-        };
-
-        Self {
-            log_debug,
-            skip_cmd,
-            envs: BTreeMap::from([("RUST_BACKTRACE".to_owned(), "1".into())]),
-        }
-    }
-}
-
-fn switch_root(unit_store: &mut UnitStore, config: &mut InitConfig, prefix: &Path, etcdir: &Path) {
-    eprintln!(
-        "init: switchroot to {} {}",
-        prefix.display(),
-        etcdir.display()
-    );
-
-    config
-        .envs
-        .insert("PATH".to_owned(), prefix.join("bin").into_os_string());
-    config.envs.insert(
-        "LD_LIBRARY_PATH".to_owned(),
-        prefix.join("lib").into_os_string(),
-    );
-
-    unit_store.config_dirs = vec![prefix.join("lib").join("init.d"), etcdir.join("init.d")];
-
-    let env_dirs = &[
-        prefix.join("lib").join("environment.d"),
-        etcdir.join("environment.d"),
-    ];
-    match config::config_for_dirs(env_dirs) {
-        Ok(files) => {
-            for file in files {
-                match fs::read_to_string(&file) {
-                    Ok(envs) => {
-                        for env in envs.lines() {
-                            if env.is_empty() || env.starts_with("#") {
-                                continue;
-                            }
-                            let Some((key, value)) = env.split_once('=') else {
-                                eprintln!(
-                                    "init: failed to parse env line from {}: {env:?}",
-                                    file.display(),
-                                );
-                                continue;
-                            };
-                            config
-                                .envs
-                                .insert(key.to_owned().into(), value.to_owned().into());
-                        }
-                    }
-                    Err(err) => {
-                        eprintln!(
-                            "init: failed to read environment from {}: {err}",
-                            file.display(),
-                        );
-                    }
-                }
-            }
-        }
-        Err(err) => {
-            eprintln!(
-                "init: failed to read environments from {}: {err}",
-                env_dirs
-                    .iter()
-                    .map(|dir| dir.display().to_string())
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            );
-        }
-    }
-}
-
-fn main() {
-    let mut init_config = InitConfig::new();
-    let mut unit_store = UnitStore::new();
-    let mut scheduler = Scheduler::new();
-
-    switch_root(
-        &mut unit_store,
-        &mut init_config,
-        Path::new("/scheme/initfs"),
-        Path::new("/scheme/initfs/etc"),
-    );
-
-    // Start logd first such that we can pass /scheme/log as stdio to all other services
-    scheduler
-        .schedule_start_and_report_errors(&mut unit_store, UnitId("00_logd.service".to_owned()));
-    scheduler.step(&mut unit_store, &mut init_config);
-    if let Err(err) = switch_stdio("/scheme/log") {
-        eprintln!("init: failed to switch stdio to '/scheme/log': {err}");
-    }
-
-    let runtime_target = UnitId("00_runtime.target".to_owned());
-    scheduler.schedule_start_and_report_errors(&mut unit_store, runtime_target.clone());
-    unit_store.set_runtime_target(runtime_target);
-
-    scheduler
-        .schedule_start_and_report_errors(&mut unit_store, UnitId("90_initfs.target".to_owned()));
-    scheduler.step(&mut unit_store, &mut init_config);
-
-    switch_root(
-        &mut unit_store,
-        &mut init_config,
-        Path::new("/usr"),
-        Path::new("/etc"),
-    );
-    {
-        // FIXME introduce multi-user.target unit and replace the config dir iteration
-        // scheduler.schedule_start_and_report_errors(&mut unit_store, UnitId("multi-user.target".to_owned()));
-
-        let entries = match config::config_for_dirs(&unit_store.config_dirs) {
-            Ok(entries) => entries,
-            Err(err) => {
-                eprintln!(
-                    "init: failed to read configs from {}: {err}",
-                    unit_store
-                        .config_dirs
-                        .iter()
-                        .map(|dir| dir.display().to_string())
-                        .collect::<Vec<_>>()
-                        .join(", ")
-                );
-                return;
-            }
-        };
-        for entry in entries {
-            let Some(file_name) = entry.file_name().and_then(|n| n.to_str()) else {
-                eprintln!("init: skipping entry with invalid filename: {}", entry.display());
-                continue;
-            };
-            scheduler.schedule_start_and_report_errors(
-                &mut unit_store,
-                UnitId(file_name.to_owned()),
-            );
-        }
-    };
-
-    eprintln!("init: DEBUG step start — {} jobs pending", scheduler.pending_len());
-    scheduler.step(&mut unit_store, &mut init_config);
-    eprintln!("init: DEBUG step done — entering waitpid loop");
-
-    if let Err(err) = libredox::call::setrens(0, 0) {
-        eprintln!("init: failed to enter null namespace: {}", err);
-        return;
-    }
-
-    loop {
-        let mut status = 0;
-        match libredox::call::waitpid(0, &mut status, 0) {
-            Ok(()) => {}
-            Err(err) => eprintln!("init: waitpid error: {}", err),
-        }
-    }
-}
diff --git a/recipes/core/base/init/src/scheduler.rs b/recipes/core/base/init/src/scheduler.rs
deleted file mode 100644
index 44215bbba5..0000000000
--- a/recipes/core/base/init/src/scheduler.rs
+++ /dev/null
@@ -1,350 +0,0 @@
-use std::collections::VecDeque;
-use std::io::Read;
-use std::os::fd::AsRawFd;
-use std::os::unix::process::CommandExt;
-use std::process::Command;
-use std::time::Duration;
-use std::{env, io};
-
-use crate::InitConfig;
-use crate::service::ServiceType;
-use crate::unit::{RestartPolicy, UnitId, UnitKind, UnitStore};
-
-const MAX_DEPENDENCY_WAIT_RETRIES: u32 = 1000;
-
-pub struct Scheduler {
-    pending: VecDeque<Job>,
-}
-
-struct Job {
-    unit: UnitId,
-    kind: JobKind,
-    dep_retries: u32,
-}
-
-enum JobKind {
-    Start,
-    Restart { backoff: Duration },
-}
-
-impl Scheduler {
-    pub fn new() -> Scheduler {
-        Scheduler {
-            pending: VecDeque::new(),
-        }
-    }
-
-    pub fn schedule_start_and_report_errors(
-        &mut self,
-        unit_store: &mut UnitStore,
-        unit_id: UnitId,
-    ) {
-        let mut errors = vec![];
-        self.schedule_start(unit_store, unit_id, &mut errors);
-        for error in errors {
-            eprintln!("init: {error}");
-        }
-    }
-
-    pub fn schedule_start(
-        &mut self,
-        unit_store: &mut UnitStore,
-        unit_id: UnitId,
-        errors: &mut Vec<String>,
-    ) {
-        let loaded_units = unit_store.load_units(unit_id.clone(), errors);
-        for unit_id in loaded_units {
-            if !unit_store.unit(&unit_id).conditions_met() {
-                continue;
-            }
-
-            self.pending.push_back(Job {
-                unit: unit_id,
-                kind: JobKind::Start,
-                dep_retries: 0,
-            });
-        }
-    }
-
-    pub fn pending_len(&self) -> usize {
-        self.pending.len()
-    }
-
-    pub fn step(&mut self, unit_store: &mut UnitStore, init_config: &mut InitConfig) {
-        'a: loop {
-            let Some(mut job) = self.pending.pop_front() else {
-                return;
-            };
-
-            match job.kind {
-                JobKind::Start => {
-                    let unit = unit_store.unit(&job.unit);
-                    eprintln!(
-                        "init: DEBUG processing {} ({}) — deps: {:?}",
-                        job.unit.0,
-                        match &unit.kind {
-                            crate::unit::UnitKind::LegacyScript { .. } => "script",
-                            crate::unit::UnitKind::Service { service } => &service.cmd,
-                            crate::unit::UnitKind::Target { .. } => "target",
-                        },
-                        unit.info.requires_weak.iter().map(|u| &u.0).collect::<Vec<_>>()
-                    );
-
-                    let timeout_secs = unit.info.dependency_timeout_secs;
-                    let mut deps_pending = false;
-                    for dep in &unit.info.requires_weak {
-                        for pending_job in &self.pending {
-                            if &pending_job.unit == dep {
-                                deps_pending = true;
-                                break;
-                            }
-                        }
-                        if deps_pending {
-                            break;
-                        }
-                    }
-
-                    if deps_pending {
-                        eprintln!(
-                            "init: DEBUG {} waiting for deps (retry {})",
-                            job.unit.0, job.dep_retries
-                        );
-                        if timeout_secs > 0 {
-                            job.dep_retries += 1;
-                            let max_retries = timeout_secs * 100; // ~10ms per retry
-                            if job.dep_retries > max_retries as u32 {
-                                eprintln!(
-                                    "init: {}: dependency timeout after {}s, failing",
-                                    job.unit.0, timeout_secs
-                                );
-                                continue;
-                            }
-                        } else if job.dep_retries >= MAX_DEPENDENCY_WAIT_RETRIES {
-                            eprintln!(
-                                "init: {}: dependency wait exceeded {} retries, failing",
-                                job.unit.0, MAX_DEPENDENCY_WAIT_RETRIES
-                            );
-                            continue;
-                        }
-                        job.dep_retries += 1;
-                        self.pending.push_back(job);
-                        continue 'a;
-                    }
-
-                    if let Err(restart) = run(unit_store, &job.unit, init_config) {
-                        if let Some(backoff) = restart {
-                            self.pending.push_back(Job {
-                                unit: job.unit.clone(),
-                                kind: JobKind::Restart { backoff },
-                                dep_retries: 0,
-                            });
-                        }
-                    }
-                }
-                JobKind::Restart { backoff } => {
-                    std::thread::sleep(backoff);
-                    let next_backoff = (backoff * 2).min(Duration::from_secs(60));
-                    if let Err(restart) = run(unit_store, &job.unit, init_config) {
-                        if let Some(_next) = restart {
-                            self.pending.push_back(Job {
-                                unit: job.unit,
-                                kind: JobKind::Restart {
-                                    backoff: next_backoff,
-                                },
-                                dep_retries: 0,
-                            });
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-fn run(
-    unit_store: &UnitStore,
-    unit_id: &UnitId,
-    config: &mut InitConfig,
-) -> Result<(), Option<Duration>> {
-    let unit = unit_store.unit(unit_id);
-
-    let restart_policy = unit.info.restart;
-
-    match &unit.kind {
-        UnitKind::LegacyScript { script } => {
-            for cmd in script.clone() {
-                if config.log_debug {
-                    eprintln!("init: running: {cmd:?}");
-                }
-                cmd.run(config);
-            }
-            Ok(())
-        }
-        UnitKind::Service { service } => {
-            if config.skip_cmd.contains(&service.cmd) {
-                eprintln!("Skipping '{} {}'", service.cmd, service.args.join(" "));
-                return Ok(());
-            }
-            if config.log_debug {
-                eprintln!(
-                    "Starting {} ({})",
-                    unit.info.description.as_ref().unwrap_or(&unit.id.0),
-                    service.cmd,
-                );
-            }
-
-            let mut command = Command::new(&service.cmd);
-            command.args(&service.args);
-            command.env_clear();
-            for env in &service.inherit_envs {
-                if let Some(value) = env::var_os(env) {
-                    command.env(env, value);
-                }
-            }
-            command.envs(config.envs.iter().map(|(k, v)| (k.as_str(), v.as_os_str())));
-
-            let (read_pipe, write_pipe) = match io::pipe() {
-                Ok(p) => p,
-                Err(err) => {
-                    eprintln!("init: pipe failed for {}: {}", service.cmd, err);
-                    return Err(restart_signal(restart_policy));
-                }
-            };
-
-            let write_fd: std::os::fd::OwnedFd = write_pipe.into();
-            unsafe {
-                command.env("INIT_NOTIFY", format!("{}", write_fd.as_raw_fd()));
-                command.pre_exec(move || {
-                    if unsafe { libc::fcntl(write_fd.as_raw_fd(), libc::F_SETFD, 0) } == -1 {
-                        Err(io::Error::last_os_error())
-                    } else {
-                        Ok(())
-                    }
-                });
-            }
-
-            let status = service_spawn_status(read_pipe, command, &service.type_, &service.cmd);
-
-            match status {
-                SpawnStatus::Success => Ok(()),
-                SpawnStatus::Failed => Err(restart_signal(restart_policy)),
-                SpawnStatus::Async => Ok(()),
-            }
-        }
-        UnitKind::Target {} => {
-            if config.log_debug {
-                eprintln!(
-                    "Reached target {}",
-                    unit.info.description.as_ref().unwrap_or(&unit.id.0),
-                );
-            }
-            Ok(())
-        }
-    }
-}
-
-enum SpawnStatus {
-    Success,
-    Failed,
-    Async,
-}
-
-fn restart_signal(policy: RestartPolicy) -> Option<Duration> {
-    match policy {
-        RestartPolicy::No => None,
-        RestartPolicy::OnFailure | RestartPolicy::Always => Some(Duration::from_secs(1)),
-    }
-}
-
-fn service_spawn_status(
-    mut read_pipe: impl Read + AsRawFd,
-    mut command: Command,
-    service_type: &ServiceType,
-    cmd: &str,
-) -> SpawnStatus {
-    let mut child = match command.spawn() {
-        Ok(child) => child,
-        Err(err) => {
-            eprintln!("init: failed to execute {}: {}", cmd, err);
-            return SpawnStatus::Failed;
-        }
-    };
-
-    match service_type {
-        ServiceType::Notify => match read_pipe.read_exact(&mut [0]) {
-            Ok(()) => SpawnStatus::Success,
-            Err(err) if err.kind() == io::ErrorKind::UnexpectedEof => {
-                eprintln!("init: {cmd} exited without notifying readiness");
-                SpawnStatus::Failed
-            }
-            Err(err) => {
-                eprintln!("init: failed to wait for {cmd}: {err}");
-                SpawnStatus::Failed
-            }
-        },
-        ServiceType::Scheme(scheme) => {
-            let scheme = scheme.clone();
-            let mut new_fd = usize::MAX;
-            let res = loop {
-                match syscall::call_ro(
-                    read_pipe.as_raw_fd() as usize,
-                    unsafe { plain::as_mut_bytes(&mut new_fd) },
-                    syscall::CallFlags::FD | syscall::CallFlags::FD_UPPER,
-                    &[],
-                ) {
-                    Err(syscall::Error {
-                        errno: syscall::EINTR,
-                    }) => continue,
-                    Ok(0) => break SpawnStatus::Failed,
-                    Ok(1) => break SpawnStatus::Success,
-                    Ok(n) => {
-                        eprintln!("init: incorrect amount of fds {n} returned from {cmd}");
-                        break SpawnStatus::Failed;
-                    }
-                    Err(err) => {
-                        eprintln!("init: failed to wait for {cmd}: {err}");
-                        break SpawnStatus::Failed;
-                    }
-                }
-            };
-
-            if matches!(res, SpawnStatus::Success) {
-                match libredox::call::getns() {
-                    Ok(current_namespace_fd) => {
-                        if let Err(err) = libredox::call::register_scheme_to_ns(
-                            current_namespace_fd,
-                            &scheme,
-                            new_fd,
-                        ) {
-                            eprintln!("init: scheme registration failed for {cmd}: {err}");
-                            return SpawnStatus::Failed;
-                        }
-                    }
-                    Err(err) => {
-                        eprintln!("init: getns failed for {cmd}: {err}");
-                        return SpawnStatus::Failed;
-                    }
-                }
-            }
-            res
-        }
-        ServiceType::Oneshot => {
-            drop(read_pipe);
-            match child.wait() {
-                Ok(exit_status) => {
-                    if !exit_status.success() {
-                        eprintln!("init: {cmd} failed with {exit_status}");
-                        SpawnStatus::Failed
-                    } else {
-                        SpawnStatus::Success
-                    }
-                }
-                Err(err) => {
-                    eprintln!("init: failed to wait for {cmd}: {err}");
-                    SpawnStatus::Failed
-                }
-            }
-        }
-        ServiceType::OneshotAsync => SpawnStatus::Async,
-    }
-}
diff --git a/recipes/core/base/init/src/script.rs b/recipes/core/base/init/src/script.rs
deleted file mode 100644
index d18e3a045b..0000000000
--- a/recipes/core/base/init/src/script.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use std::collections::BTreeMap;
-use std::{env, io, iter};
-
-use crate::InitConfig;
-use crate::unit::UnitId;
-
-pub fn subst_env<'a>(arg: &str) -> String {
-    if arg.starts_with('$') {
-        env::var(&arg[1..]).unwrap_or(String::new())
-    } else {
-        arg.to_owned()
-    }
-}
-
-pub struct Script(pub Vec<Command>, pub Vec<UnitId>);
-
-impl Script {
-    pub fn from_str(config: &str, errors: &mut Vec<String>) -> io::Result<Script> {
-        let mut cmds = vec![];
-        let mut requires_weak = vec![];
-
-        for line_raw in config.lines() {
-            let line = line_raw.trim();
-            if line.is_empty() || line.starts_with('#') {
-                continue;
-            }
-
-            let args = line.split(' ').map(subst_env);
-
-            match Command::parse(args, &mut requires_weak) {
-                Ok(None) => {}
-                Ok(Some(cmd)) => cmds.push(cmd),
-                Err(err) => errors.push(err),
-            }
-        }
-
-        Ok(Script(cmds, requires_weak))
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct Command {
-    process: Process,
-    kind: CommandKind,
-}
-
-#[derive(Clone, Debug)]
-enum CommandKind {
-    Oneshot,
-    OneshotAsync,
-}
-
-impl Command {
-    fn parse(
-        mut args: impl Iterator<Item = String>,
-        requires_weak: &mut Vec<UnitId>,
-    ) -> Result<Option<Command>, String> {
-        let Some(cmd) = args.next() else {
-            return Ok(None);
-        };
-
-        match cmd.as_str() {
-            "requires_weak" => {
-                requires_weak.extend(args.map(UnitId));
-                Ok(None)
-            }
-            "nowait" => {
-                let process = Process::parse(args)?;
-                Ok(Some(Command {
-                    process,
-                    kind: CommandKind::OneshotAsync,
-                }))
-            }
-            _ => {
-                let process = Process::parse(iter::once(cmd).chain(args))?;
-                Ok(Some(Command {
-                    process,
-                    kind: CommandKind::Oneshot,
-                }))
-            }
-        }
-    }
-
-    pub fn run(&self, config: &mut InitConfig) {
-        let Command { process, kind } = self;
-
-        if config.skip_cmd.contains(&process.cmd) {
-            eprintln!(
-                "init: skipping '{} {}'",
-                process.cmd,
-                process.args.join(" ")
-            );
-            return;
-        }
-
-        let mut command = std::process::Command::new(&process.cmd);
-        command.args(process.args.iter().map(|arg| subst_env(arg)));
-        command.env_clear();
-        command.envs(&config.envs).envs(&process.envs);
-
-        let mut child = match command.spawn() {
-            Ok(child) => child,
-            Err(err) => {
-                eprintln!("init: failed to execute {:?}: {}", command, err);
-                return;
-            }
-        };
-
-        match kind {
-            CommandKind::Oneshot => match child.wait() {
-                Ok(exit_status) => {
-                    if !exit_status.success() {
-                        eprintln!("init: {command:?} failed with {exit_status}");
-                    }
-                }
-                Err(err) => {
-                    eprintln!("init: failed to wait for {:?}: {}", command, err)
-                }
-            },
-            CommandKind::OneshotAsync => {}
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-struct Process {
-    cmd: String,
-    args: Vec<String>,
-    envs: BTreeMap<String, String>,
-}
-
-impl Process {
-    fn parse(parts: impl Iterator<Item = String>) -> Result<Process, String> {
-        let mut cmd = None;
-        let mut args = vec![];
-        let mut envs = BTreeMap::new();
-
-        for arg in parts {
-            if cmd.is_none() {
-                if let Some((env, value)) = arg.split_once('=') {
-                    let value = if value == "$" {
-                        env::var(env).unwrap_or_default()
-                    } else {
-                        subst_env(value)
-                    };
-                    if !value.is_empty() {
-                        envs.insert(env.to_owned(), value);
-                    }
-                } else {
-                    cmd = Some(arg);
-                }
-            } else {
-                args.push(arg);
-            }
-        }
-
-        if let Some(cmd) = cmd {
-            Ok(Process { cmd, args, envs })
-        } else {
-            Err("no command given".to_owned())
-        }
-    }
-}
diff --git a/recipes/core/base/init/src/service.rs b/recipes/core/base/init/src/service.rs
deleted file mode 100644
index ed0023e921..0000000000
--- a/recipes/core/base/init/src/service.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::ffi::OsString;
-use std::io::Read;
-use std::os::fd::{AsRawFd, OwnedFd};
-use std::os::unix::process::CommandExt;
-use std::process::Command;
-use std::{env, io};
-
-use serde::Deserialize;
-
-use crate::script::subst_env;
-
-#[derive(Clone, Debug, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct Service {
-    pub cmd: String,
-    #[serde(default)]
-    pub args: Vec<String>,
-    #[serde(default)]
-    pub envs: BTreeMap<String, String>,
-    #[serde(default)]
-    pub inherit_envs: BTreeSet<String>,
-    #[serde(rename = "type")]
-    pub type_: ServiceType,
-}
-
-#[derive(Clone, Debug, Default, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ServiceType {
-    #[default]
-    Notify,
-    Scheme(String),
-    Oneshot,
-    OneshotAsync,
-}
-
-impl Service {
-    pub fn spawn(&self, base_envs: &BTreeMap<String, OsString>) {
-        let mut command = Command::new(&self.cmd);
-        command.args(self.args.iter().map(|arg| subst_env(arg)));
-        command.env_clear();
-        for env in &self.inherit_envs {
-            if let Some(value) = env::var_os(env) {
-                command.env(env, value);
-            }
-        }
-        command.envs(base_envs).envs(&self.envs);
-
-        let (mut read_pipe, write_pipe) = io::pipe().unwrap();
-        unsafe { pass_fd(&mut command, "INIT_NOTIFY", write_pipe.into()) };
-
-        let mut child = match command.spawn() {
-            Ok(child) => child,
-            Err(err) => {
-                eprintln!("init: failed to execute {:?}: {}", command, err);
-                return;
-            }
-        };
-
-        match &self.type_ {
-            ServiceType::Notify => match read_pipe.read_exact(&mut [0]) {
-                Ok(()) => {}
-                Err(err) if err.kind() == io::ErrorKind::UnexpectedEof => {
-                    eprintln!("init: {command:?} exited without notifying readiness");
-                }
-                Err(err) => {
-                    eprintln!("init: failed to wait for {command:?}: {err}");
-                }
-            },
-            ServiceType::Scheme(scheme) => {
-                let mut new_fd = usize::MAX;
-                loop {
-                    match syscall::call_ro(
-                        read_pipe.as_raw_fd() as usize,
-                        unsafe { plain::as_mut_bytes(&mut new_fd) },
-                        syscall::CallFlags::FD | syscall::CallFlags::FD_UPPER,
-                        &[],
-                    ) {
-                        Err(syscall::Error {
-                            errno: syscall::EINTR,
-                        }) => continue,
-                        Ok(0) => {
-                            eprintln!("init: {command:?} exited without notifying readiness");
-                            return;
-                        }
-                        Ok(1) => break,
-                        Ok(n) => {
-                            eprintln!("init: incorrect amount of fds {n} returned");
-                            return;
-                        }
-                        Err(err) => {
-                            eprintln!("init: failed to wait for {command:?}: {err}");
-                            return;
-                        }
-                    }
-                }
-
-                let current_namespace_fd = libredox::call::getns().expect("TODO");
-                libredox::call::register_scheme_to_ns(current_namespace_fd, scheme, new_fd)
-                    .expect("TODO");
-            }
-            ServiceType::Oneshot => {
-                drop(read_pipe);
-                match child.wait() {
-                    Ok(exit_status) => {
-                        if !exit_status.success() {
-                            eprintln!("init: {command:?} failed with {exit_status}");
-                        }
-                    }
-                    Err(err) => {
-                        eprintln!("init: failed to wait for {:?}: {}", command, err)
-                    }
-                }
-            }
-            ServiceType::OneshotAsync => {}
-        }
-    }
-}
-
-unsafe fn pass_fd(cmd: &mut Command, env: &str, fd: OwnedFd) {
-    cmd.env(env, format!("{}", fd.as_raw_fd()));
-    unsafe {
-        cmd.pre_exec(move || {
-            // Pass notify pipe to child
-            if libc::fcntl(fd.as_raw_fd(), libc::F_SETFD, 0) == -1 {
-                Err(io::Error::last_os_error())
-            } else {
-                Ok(())
-            }
-        });
-    }
-}
diff --git a/recipes/core/base/init/src/unit.rs b/recipes/core/base/init/src/unit.rs
deleted file mode 100644
index 414b92d17f..0000000000
--- a/recipes/core/base/init/src/unit.rs
+++ /dev/null
@@ -1,272 +0,0 @@
-use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
-use std::{fs, io};
-
-use serde::Deserialize;
-
-use crate::script::{Command, Script};
-use crate::service::Service;
-
-pub struct UnitStore {
-    pub config_dirs: Vec<PathBuf>,
-    units: BTreeMap<UnitId, Unit>,
-    runtime_target: Option<UnitId>,
-}
-
-impl UnitStore {
-    pub fn new() -> Self {
-        UnitStore {
-            config_dirs: vec![],
-            units: BTreeMap::new(),
-            runtime_target: None,
-        }
-    }
-
-    pub fn set_runtime_target(&mut self, unit_id: UnitId) {
-        assert!(self.runtime_target.is_none());
-        assert!(self.units.contains_key(&unit_id));
-        self.runtime_target = Some(unit_id);
-    }
-
-    fn load_single_unit(&mut self, unit_id: UnitId, errors: &mut Vec<String>) -> Option<UnitId> {
-        let (filename, instance) = if let Some((base_service, rest)) = unit_id.0.split_once('@') {
-            let Some((instance, ext)) = rest.rsplit_once('.') else {
-                errors.push(format!("script {} can't be instanced", unit_id.0));
-                return None;
-            };
-            (format!("{base_service}@.{ext}"), Some(instance))
-        } else {
-            (unit_id.0.clone(), None)
-        };
-
-        let Some(path) = self
-            .config_dirs
-            .iter()
-            .rev()
-            .map(|dir| dir.join(&filename))
-            .find(|path| path.exists())
-        else {
-            errors.push(format!("unit {} not found", unit_id.0));
-            return None;
-        };
-
-        let mut unit = match Unit::from_file(unit_id.clone(), &path, instance, errors) {
-            Ok(unit) => unit,
-            Err(err) => {
-                errors.push(format!("{}: {err}", path.display()));
-                return None;
-            }
-        };
-
-        if unit.info.default_dependencies {
-            if let Some(runtime_target) = self.runtime_target.clone() {
-                unit.info.requires_weak.push(runtime_target);
-            } else {
-                errors.push(format!(
-                    "{}: dependency of the runtime target must have default dependencies disabled",
-                    path.display(),
-                ));
-            }
-        }
-
-        self.units.insert(unit_id.clone(), unit);
-
-        Some(unit_id)
-    }
-
-    pub fn load_units(&mut self, root_unit: UnitId, errors: &mut Vec<String>) -> Vec<UnitId> {
-        let mut loaded_units = vec![];
-        let mut pending_units = vec![root_unit];
-
-        while let Some(unit_id) = pending_units.pop() {
-            if self.units.contains_key(&unit_id) {
-                continue;
-            }
-            let unit = self.load_single_unit(unit_id, errors);
-            if let Some(unit) = unit {
-                loaded_units.push(unit.clone());
-                for dep in &self.unit(&unit).info.requires_weak {
-                    pending_units.push(dep.clone());
-                }
-            }
-        }
-
-        loaded_units
-    }
-
-    pub fn unit(&self, unit: &UnitId) -> &Unit {
-        self.units.get(unit).unwrap()
-    }
-
-    pub fn unit_mut(&mut self, unit: &UnitId) -> &mut Unit {
-        self.units.get_mut(unit).unwrap()
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deserialize)]
-#[serde(transparent)]
-pub struct UnitId(pub String);
-
-pub struct Unit {
-    pub id: UnitId,
-
-    pub info: UnitInfo,
-    pub kind: UnitKind,
-}
-
-#[derive(Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct UnitInfo {
-    pub description: Option<String>,
-    #[serde(default = "true_bool")]
-    pub default_dependencies: bool,
-    #[serde(default)]
-    pub requires_weak: Vec<UnitId>,
-    pub condition_architecture: Option<Vec<String>>,
-    // FIXME replace this with hwd reading from the devicetree
-    pub condition_board: Option<Vec<String>>,
-    /// Restart policy for the service (only applies to Service units)
-    #[serde(default)]
-    pub restart: RestartPolicy,
-    /// Maximum time in seconds to wait for dependencies before failing (0 = no timeout)
-    #[serde(default)]
-    pub dependency_timeout_secs: u64,
-}
-
-/// Restart policy for managed services
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Default)]
-#[serde(rename_all = "kebab-case")]
-pub enum RestartPolicy {
-    /// Never restart the service (default)
-    #[default]
-    No,
-    /// Restart on failure (non-zero exit or crash)
-    OnFailure,
-    /// Always restart (on any exit)
-    Always,
-}
-
-fn true_bool() -> bool {
-    true
-}
-
-pub enum UnitKind {
-    LegacyScript { script: Vec<Command> },
-    Service { service: Service },
-    Target {},
-}
-
-#[derive(Deserialize)]
-#[serde(deny_unknown_fields)]
-struct SerializedService {
-    unit: UnitInfo,
-    service: Service,
-}
-
-#[derive(Deserialize)]
-#[serde(deny_unknown_fields)]
-struct SerializedTarget {
-    unit: UnitInfo,
-}
-
-fn instance_toml(value: toml::Value, instance: &str) -> toml::Value {
-    match value {
-        toml::Value::Integer(_)
-        | toml::Value::Float(_)
-        | toml::Value::Boolean(_)
-        | toml::Value::Datetime(_) => value,
-        toml::Value::String(s) => toml::Value::String(s.replace("$INSTANCE", instance)),
-        toml::Value::Array(values) => toml::Value::Array(
-            values
-                .into_iter()
-                .map(|value| instance_toml(value, instance))
-                .collect(),
-        ),
-        toml::Value::Table(map) => toml::Value::Table(
-            map.into_iter()
-                .map(|(key, value)| (key, instance_toml(value, instance)))
-                .collect(),
-        ),
-    }
-}
-
-impl Unit {
-    pub fn from_file(
-        id: UnitId,
-        config_path: &Path,
-        instance: Option<&str>,
-        errors: &mut Vec<String>,
-    ) -> io::Result<Self> {
-        let config = fs::read_to_string(config_path)?;
-
-        let Some(ext) = config_path.extension().map(|ext| ext.to_str().unwrap()) else {
-            let script = Script::from_str(&config, errors)?;
-            return Ok(Unit {
-                id,
-                info: UnitInfo {
-                    description: None,
-                    default_dependencies: true,
-                    requires_weak: script.1,
-                    condition_architecture: None,
-                    condition_board: None,
-                    restart: RestartPolicy::No,
-                    dependency_timeout_secs: 0,
-                },
-                kind: UnitKind::LegacyScript { script: script.0 },
-            });
-        };
-
-        let toml_value: toml::Value = toml::from_str(&config)
-            .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
-        let toml_value = if let Some(instance) = instance {
-            instance_toml(toml_value, instance)
-        } else {
-            toml_value
-        };
-
-        let (info, kind) = match ext {
-            "service" => {
-                let service: SerializedService = toml_value
-                    .try_into()
-                    .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
-                (
-                    service.unit,
-                    UnitKind::Service {
-                        service: service.service,
-                    },
-                )
-            }
-            "target" => {
-                let target: SerializedTarget = toml_value
-                    .try_into()
-                    .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
-                (target.unit, UnitKind::Target {})
-            }
-            _ => return Err(io::Error::other("invalid file extension")),
-        };
-
-        Ok(Unit { id, info, kind })
-    }
-
-    pub fn conditions_met(&self) -> bool {
-        if let Some(condition_architecture) = &self.info.condition_architecture {
-            if !condition_architecture
-                .iter()
-                .any(|arch| arch == std::env::consts::ARCH)
-            {
-                return false;
-            }
-        }
-
-        if let Some(condition_board) = &self.info.condition_board {
-            if !condition_board
-                .iter()
-                .any(|board| Some(&**board) == option_env!("BOARD"))
-            {
-                return false;
-            }
-        }
-
-        true
-    }
-}
diff --git a/recipes/core/base/initfs/Cargo.toml b/recipes/core/base/initfs/Cargo.toml
deleted file mode 100644
index 8b2da874ea..0000000000
--- a/recipes/core/base/initfs/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "redox-initfs"
-description = "Userspace bootstrap image library"
-version = "0.2.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>", "Kamil Koczurek <koczurekk@gmail.com>"]
-edition = "2024"
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-plain.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/initfs/src/lib.rs b/recipes/core/base/initfs/src/lib.rs
deleted file mode 100644
index 1f42024a17..0000000000
--- a/recipes/core/base/initfs/src/lib.rs
+++ /dev/null
@@ -1,285 +0,0 @@
-#![no_std]
-//! A super simple initfs, only meant to be loaded into RAM by the bootloader, and then directly be
-//! read.
-
-use core::convert::{TryFrom, TryInto};
-
-pub mod types;
-
-use self::types::*;
-
-#[derive(Clone, Copy)]
-pub struct InitFs<'initfs> {
-    base: &'initfs [u8],
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct Inode(u16);
-
-#[derive(Clone, Copy, Debug)]
-pub struct Error;
-
-impl core::fmt::Display for Error {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        write!(f, "invalid or corrupt initfs")
-    }
-}
-
-impl core::error::Error for Error {}
-
-type Result<T> = core::result::Result<T, Error>;
-
-#[derive(Clone, Copy)]
-pub struct InodeStruct<'initfs> {
-    initfs: InitFs<'initfs>,
-    inode_id: Inode,
-    inode: &'initfs InodeHeader,
-}
-
-#[derive(Clone, Copy)]
-pub struct InodeFile<'initfs> {
-    inner: InodeStruct<'initfs>,
-}
-impl<'initfs> InodeFile<'initfs> {
-    pub fn inode(self) -> InodeStruct<'initfs> {
-        self.inner
-    }
-    pub fn data(&self) -> Result<&'initfs [u8]> {
-        self.inner.data()
-    }
-}
-
-#[derive(Clone, Copy)]
-pub struct InodeDir<'initfs> {
-    inner: InodeStruct<'initfs>,
-}
-impl<'initfs> InodeDir<'initfs> {
-    pub fn inode(self) -> InodeStruct<'initfs> {
-        self.inner
-    }
-    pub fn entry_count(&self) -> Result<u32> {
-        let len = self.entries()?.len();
-
-        // NOTE: Len is originally stored as a u32 in the struct, so it can never exceed u32
-        // despite first being converted to usize.
-        let len = len as u32;
-
-        Ok(len)
-    }
-    pub fn get_entry(&self, idx: u32) -> Result<Option<Entry<'initfs>>> {
-        let idx = usize::try_from(idx).map_err(|_| Error)?;
-
-        self.entries().map(|entries| {
-            let entry = entries.get(idx)?;
-
-            Some(Entry {
-                entry,
-                initfs: self.inner.initfs,
-            })
-        })
-    }
-    fn entries(&self) -> Result<&'initfs [DirEntry]> {
-        let bytes = self.inner.data()?;
-        let entries = plain::slice_from_bytes::<DirEntry>(bytes)
-            .expect("expected dir entry to have alignment 1");
-
-        Ok(entries)
-    }
-}
-
-#[derive(Clone, Copy)]
-pub struct InodeLink<'initfs> {
-    inner: InodeStruct<'initfs>,
-}
-
-impl<'initfs> InodeLink<'initfs> {
-    pub fn inode(self) -> InodeStruct<'initfs> {
-        self.inner
-    }
-    pub fn data(&self) -> Result<&'initfs [u8]> {
-        self.inner.data()
-    }
-}
-
-#[derive(Clone, Copy)]
-pub struct Entry<'initfs> {
-    initfs: InitFs<'initfs>,
-    entry: &'initfs DirEntry,
-}
-
-impl<'initfs> Entry<'initfs> {
-    pub fn inode(&self) -> Inode {
-        Inode(self.entry.inode.get())
-    }
-    pub fn name(&self) -> Result<&'initfs [u8]> {
-        let name_offset: usize = self
-            .entry
-            .name_offset
-            .0
-            .get()
-            .try_into()
-            .map_err(|_| Error)?;
-        let name_length: usize = self.entry.name_len.get().into();
-
-        let name_end = name_offset.checked_add(name_length).ok_or(Error)?;
-
-        self.initfs.base.get(name_offset..name_end).ok_or(Error)
-    }
-}
-
-#[derive(Clone, Copy)]
-pub enum InodeKind<'initfs> {
-    File(InodeFile<'initfs>),
-    Dir(InodeDir<'initfs>),
-    Link(InodeLink<'initfs>),
-    Unknown,
-}
-
-impl<'initfs> InodeStruct<'initfs> {
-    pub fn id(&self) -> u64 {
-        self.inode_id.0.into()
-    }
-    fn data(&self) -> Result<&'initfs [u8]> {
-        let start: usize = self.inode.offset.0.get().try_into().map_err(|_| Error)?;
-        let length: usize = self.inode.length.0.get().try_into().map_err(|_| Error)?;
-
-        let end = start.checked_add(length).ok_or(Error)?;
-
-        self.initfs.base.get(start..end).ok_or(Error)
-    }
-    pub fn mode(&self) -> u16 {
-        match self.ty() {
-            Some(InodeType::RegularFile) => 0o444,
-            Some(InodeType::ExecutableFile) => 0o555,
-            Some(InodeType::Dir) => 0o555,
-            Some(InodeType::Link) => 0o777,
-            None => 0o000,
-        }
-    }
-    fn ty(&self) -> Option<InodeType> {
-        InodeType::try_from(self.inode.type_.get()).ok()
-    }
-    pub fn kind(&self) -> InodeKind<'initfs> {
-        let inner = *self;
-        match self.ty() {
-            Some(InodeType::Dir) => InodeKind::Dir(InodeDir { inner }),
-            Some(InodeType::RegularFile | InodeType::ExecutableFile) => {
-                InodeKind::File(InodeFile { inner })
-            }
-            Some(InodeType::Link) => InodeKind::Link(InodeLink { inner }),
-            None => InodeKind::Unknown,
-        }
-    }
-}
-
-impl<'initfs> InitFs<'initfs> {
-    pub fn new(base: &'initfs [u8], required_page_size: Option<u16>) -> Result<Self> {
-        let this = Self { base };
-
-        if base.len() < core::mem::size_of::<Header>() {
-            return Err(Error);
-        }
-        if u32::try_from(base.len()).is_err() {
-            return Err(Error);
-        }
-
-        let header = this.get_header_assume_valid();
-
-        if header.magic != Magic(MAGIC) {
-            return Err(Error);
-        }
-
-        let inode_table_offset = header.inode_table_offset.0.get();
-
-        if inode_table_offset < u32::from(Self::header_len_8()) {
-            return Err(Error);
-        }
-
-        let inode_table_size = this.inode_table_size();
-
-        let inode_table_end = inode_table_offset
-            .checked_add(inode_table_size)
-            .ok_or(Error)?;
-
-        if inode_table_end > this.base_len_32() {
-            return Err(Error);
-        }
-
-        if let Some(required_page_size) = required_page_size
-            && header.page_size.get() != required_page_size
-        {
-            return Err(Error);
-        }
-
-        // From now on, we can be completely sure that the header and inode tables offsets are
-        // valid, and thus continue based on that assumption.
-
-        Ok(this)
-    }
-    fn get_header_assume_valid(&self) -> &Header {
-        plain::from_bytes::<Header>(&self.base[..core::mem::size_of::<Header>()])
-            .expect("expected header type to require no alignment, and size to be sufficient")
-    }
-    pub fn header(&self) -> &Header {
-        self.get_header_assume_valid()
-    }
-    fn header_len_8() -> u8 {
-        core::mem::size_of::<Header>()
-            .try_into()
-            .expect("expected header size to fit within u8")
-    }
-    fn inode_struct_len_8() -> u8 {
-        core::mem::size_of::<InodeHeader>()
-            .try_into()
-            .expect("expected inode struct size to fit within u8")
-    }
-    fn inode_table_offset_usize(&self) -> usize {
-        // NOTE: We have already validated that the inode table fits within the initfs slice, and
-        // that this length, which must fit within usize, also fits within u32.
-        self.get_header_assume_valid().inode_table_offset.0.get() as usize
-    }
-    fn inode_table_end_usize(&self) -> usize {
-        // NOTE: This follows the same reasoning as in inode_table_offset_usize(). The end offset
-        // has been checked against u32 and the initfs slice length.
-        self.inode_table_offset_usize()
-            .wrapping_add(self.inode_table_size() as usize)
-    }
-    fn inode_table_range(&self) -> core::ops::Range<usize> {
-        self.inode_table_offset_usize()..self.inode_table_end_usize()
-    }
-    fn base_len_32(&self) -> u32 {
-        // NOTE: We have already validated that the length is sufficient.
-        self.base.len() as u32
-    }
-    fn inode_table_size(&self) -> u32 {
-        let count = self.get_header_assume_valid().inode_count.get();
-        let struct_size = Self::inode_struct_len_8();
-
-        // NOTE: We know for a fact, that even the largest u8 (255) and the largest u16 (65536),
-        // can only be approximately 2^24 at max.
-        u32::wrapping_mul(u32::from(count), u32::from(struct_size))
-    }
-    fn inode_table(&self) -> &'initfs [InodeHeader] {
-        let inode_table_bytes = &self.base[self.inode_table_range()];
-
-        plain::slice_from_bytes::<InodeHeader>(inode_table_bytes)
-            .expect("expected inode struct alignment to be 1")
-    }
-    pub fn root_inode(&self) -> Inode {
-        Inode(self.get_header_assume_valid().root_inode.get())
-    }
-    pub fn all_inodes(&self) -> impl Iterator<Item = Inode> {
-        (0..self.inode_count()).map(Inode)
-    }
-
-    pub fn inode_count(&self) -> u16 {
-        self.get_header_assume_valid().inode_count.get()
-    }
-    pub fn get_inode(&self, inode_id: Inode) -> Option<InodeStruct<'initfs>> {
-        Some(InodeStruct {
-            initfs: *self,
-            inode_id,
-            inode: self.inode_table().get(usize::from(inode_id.0))?,
-        })
-    }
-}
diff --git a/recipes/core/base/initfs/src/types.rs b/recipes/core/base/initfs/src/types.rs
deleted file mode 100644
index aea108466a..0000000000
--- a/recipes/core/base/initfs/src/types.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use core::mem::offset_of;
-
-pub const MAGIC_LEN: usize = 8;
-pub const MAGIC: [u8; 8] = *b"RedoxFtw";
-
-macro_rules! primitive(
-    ($wrapper:ident, $bits:expr, $primitive:ident) => {
-        #[repr(transparent)]
-        #[derive(Clone, Copy, Default)]
-        pub struct $wrapper([u8; $bits / 8]);
-
-        impl $wrapper {
-            #[inline]
-            pub const fn get(self) -> $primitive {
-                <$primitive>::from_le_bytes(self.0)
-            }
-            #[inline]
-            pub const fn new(primitive: $primitive) -> Self {
-                Self(<$primitive>::to_le_bytes(primitive))
-            }
-        }
-        impl From<$primitive> for $wrapper {
-            fn from(primitive: $primitive) -> Self {
-                Self::new(primitive)
-            }
-        }
-        impl From<$wrapper> for $primitive {
-            fn from(wrapper: $wrapper) -> Self {
-                wrapper.get()
-            }
-        }
-        impl core::fmt::Debug for $wrapper {
-            fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-                write!(f, "{:#0width$x}", self.get(), width = 2 * core::mem::size_of::<$primitive>())
-            }
-        }
-    }
-);
-
-primitive!(U16, 16, u16);
-primitive!(U32, 32, u32);
-primitive!(U64, 64, u64);
-
-#[repr(transparent)]
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub struct Magic(pub [u8; MAGIC_LEN]);
-
-#[repr(transparent)]
-#[derive(Clone, Copy, Debug)]
-pub struct Offset(pub U32);
-
-#[repr(transparent)]
-#[derive(Clone, Copy, Debug)]
-pub struct Length(pub U32);
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct Header {
-    pub magic: Magic,
-    pub inode_table_offset: Offset,
-    pub initfs_size: U64,
-    pub page_size: U16,
-    pub root_inode: U16,
-    pub inode_count: U16,
-    pub bootstrap_entry: U64,
-}
-
-const _: () = {
-    // Ensure the offsets of field used by the bootloader stay stable.
-    assert!(offset_of!(Header, bootstrap_entry) == 0x1a);
-};
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct InodeHeader {
-    pub type_: U32,
-    pub length: Length,
-    pub offset: Offset,
-}
-
-#[derive(Clone, Copy, Debug)]
-#[repr(u8)]
-pub enum InodeType {
-    RegularFile = 0x0,
-    ExecutableFile = 0x1,
-    Dir = 0x2,
-    Link = 0x3,
-    // All other bit patterns are reserved... for now.
-}
-
-impl TryFrom<u32> for InodeType {
-    type Error = ();
-
-    fn try_from(value: u32) -> Result<Self, ()> {
-        Ok(if value == InodeType::RegularFile as u32 {
-            InodeType::RegularFile
-        } else if value == InodeType::ExecutableFile as u32 {
-            InodeType::ExecutableFile
-        } else if value == InodeType::Dir as u32 {
-            InodeType::Dir
-        } else if value == InodeType::Link as u32 {
-            InodeType::Link
-        } else {
-            return Err(());
-        })
-    }
-}
-
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug)]
-pub struct DirEntry {
-    pub inode: U16,
-    pub name_len: U16,
-    pub name_offset: Offset,
-}
-
-unsafe impl plain::Plain for Header {}
-unsafe impl plain::Plain for InodeHeader {}
-unsafe impl plain::Plain for DirEntry {}
diff --git a/recipes/core/base/initfs/tools/Cargo.toml b/recipes/core/base/initfs/tools/Cargo.toml
deleted file mode 100644
index 6c79d8300e..0000000000
--- a/recipes/core/base/initfs/tools/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-[package]
-name = "redox-initfs-tools"
-version = "0.2.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>", "Kamil Koczurek <koczurekk@gmail.com>"]
-edition = "2021"
-description = "Tooling to archive a directory into an userspace bootstrap image (initfs)"
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[[bin]]
-name = "redox-initfs-ar"
-path = "src/bin/archive.rs"
-
-[[bin]]
-name = "redox-initfs-dump"
-path = "src/bin/dump.rs"
-
-[dependencies]
-anyhow.workspace = true
-clap = {workspace = true, features = ["cargo"]}
-env_logger = "0.8"
-log.workspace = true
-pathdiff = "0.2.1"
-plain.workspace = true
-twox-hash = "1.6"
-
-redox-initfs = {path = ".."}
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/initfs/tools/data/foo/bootstrap.elf b/recipes/core/base/initfs/tools/data/foo/bootstrap.elf
deleted file mode 100644
index 0d77a7513a..0000000000
Binary files a/recipes/core/base/initfs/tools/data/foo/bootstrap.elf and /dev/null differ
diff --git a/recipes/core/base/initfs/tools/data/foo/file-link.txt b/recipes/core/base/initfs/tools/data/foo/file-link.txt
deleted file mode 120000
index 4c330738cc..0000000000
--- a/recipes/core/base/initfs/tools/data/foo/file-link.txt
+++ /dev/null
@@ -1 +0,0 @@
-file.txt
\ No newline at end of file
diff --git a/recipes/core/base/initfs/tools/data/foo/file.txt b/recipes/core/base/initfs/tools/data/foo/file.txt
deleted file mode 100644
index 98eb3df43f..0000000000
--- a/recipes/core/base/initfs/tools/data/foo/file.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a file meant to be used in a redox-initfs test.
diff --git a/recipes/core/base/initfs/tools/src/bin/archive.rs b/recipes/core/base/initfs/tools/src/bin/archive.rs
deleted file mode 100644
index 11b54313b5..0000000000
--- a/recipes/core/base/initfs/tools/src/bin/archive.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use std::path::Path;
-
-use anyhow::Result;
-use clap::{Arg, Command};
-
-use redox_initfs_tools::{self as archive, Args, DEFAULT_MAX_SIZE};
-
-fn main() -> Result<()> {
-    let matches = Command::new("redox-initfs-ar")
-        .about("create an initfs image from a directory")
-        .version(clap::crate_version!())
-        .author(clap::crate_authors!())
-        // TODO: support non-utf8 paths (applies to other paths as well)
-        .arg(
-            Arg::new("SOURCE")
-                .required(true)
-                .help("Specify the source directory to build the image from."),
-        )
-        .arg(
-            Arg::new("BOOTSTRAP_CODE")
-                .required(true)
-                .help("Specify the bootstrap ELF file to include in the image."),
-        )
-        .arg(
-            Arg::new("OUTPUT")
-                .required(true)
-                .long("output")
-                .short('o')
-                .help("Specify the path of the new image file."),
-        )
-        .get_matches();
-
-    env_logger::init();
-
-    let source = matches
-        .get_one::<String>("SOURCE")
-        .expect("expected the required arg SOURCE to exist");
-
-    let bootstrap_code = matches
-        .get_one::<String>("BOOTSTRAP_CODE")
-        .expect("expected the required arg BOOTSTRAP_CODE to exist");
-
-    let destination = matches
-        .get_one::<String>("OUTPUT")
-        .expect("expected the required arg OUTPUT to exist");
-
-    let args = Args {
-        source: Path::new(source),
-        bootstrap_code: Path::new(bootstrap_code),
-        destination_path: Path::new(destination),
-        max_size: DEFAULT_MAX_SIZE,
-    };
-    archive::archive(&args)
-}
diff --git a/recipes/core/base/initfs/tools/src/bin/dump.rs b/recipes/core/base/initfs/tools/src/bin/dump.rs
deleted file mode 100644
index 2a211f8d1f..0000000000
--- a/recipes/core/base/initfs/tools/src/bin/dump.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use std::{ffi::OsStr, path::Path};
-
-use anyhow::{Context, Result};
-use clap::{Arg, Command};
-
-use redox_initfs::{InitFs, InodeKind};
-
-fn main() -> Result<()> {
-    let matches = Command::new("redox-initfs-dump")
-        .about("dump initfs metadata")
-        .version(clap::crate_version!())
-        .author(clap::crate_authors!())
-        .arg(
-            Arg::new("IMAGE")
-                .required(true)
-                .help("specify the image to dump"),
-        )
-        .get_matches();
-
-    // TODO: support non-utf8 paths
-    let source = matches
-        .get_one::<String>("IMAGE")
-        .expect("expected the required arg IMAGE to exist");
-
-    let bytes = std::fs::read(source).context("failed to read image into memory")?;
-    let initfs = InitFs::new(&bytes, None).context("failed to parse initfs header")?;
-
-    println!("{:#?}", initfs.header());
-
-    for inode in initfs.all_inodes() {
-        print!("{:?}: ", inode);
-
-        let inode_struct = match initfs.get_inode(inode) {
-            Some(s) => s,
-            None => {
-                println!("failed to obtain.");
-                continue;
-            }
-        };
-
-        match inode_struct.kind() {
-            InodeKind::Unknown => println!("(unknown)"),
-            InodeKind::Dir(dir) => {
-                print!("dir{{");
-                let ec = match dir.entry_count().ok() {
-                    Some(c) => c,
-                    None => {
-                        println!("(failed to get entry count)}}");
-                        continue;
-                    }
-                };
-                println!("entries=[");
-
-                for entry in 0..ec {
-                    let entry = match dir.get_entry(entry).ok().flatten() {
-                        Some(e) => e,
-                        None => {
-                            println!("\t(unknown),");
-                            continue;
-                        }
-                    };
-                    let name = match entry.name().ok() {
-                        Some(name) => name,
-                        None => {
-                            println!("\t(unknown name),");
-                            continue;
-                        }
-                    };
-                    println!(
-                        "\t`{}` => {:?},",
-                        String::from_utf8_lossy(name),
-                        entry.inode()
-                    );
-                }
-
-                println!("]}}");
-            }
-            InodeKind::File(file) => {
-                print!("file{{");
-
-                match file.data().ok() {
-                    Some(d) => {
-                        use std::hash::Hasher;
-                        let mut hasher = twox_hash::XxHash64::with_seed(0);
-                        hasher.write(d);
-                        print!("len={}, hash={:#0x}", d.len(), hasher.finish());
-                    }
-                    None => {
-                        print!("(failed to get data)");
-                    }
-                }
-
-                println!("}}");
-            }
-            InodeKind::Link(link) => {
-                print!("link{{");
-                match link.data().ok() {
-                    Some(d) => {
-                        use std::os::unix::ffi::OsStrExt;
-                        print!("dst={}", Path::new(OsStr::from_bytes(d)).display());
-                    }
-                    None => {
-                        print!("(failed to get data)");
-                    }
-                }
-                println!("}}");
-            }
-        }
-    }
-
-    Ok(())
-}
diff --git a/recipes/core/base/initfs/tools/src/lib.rs b/recipes/core/base/initfs/tools/src/lib.rs
deleted file mode 100644
index 64d64e39de..0000000000
--- a/recipes/core/base/initfs/tools/src/lib.rs
+++ /dev/null
@@ -1,589 +0,0 @@
-use std::convert::{TryFrom, TryInto};
-use std::fs::{DirEntry, File, OpenOptions};
-use std::io::{prelude::*, SeekFrom};
-use std::path::{Path, PathBuf};
-
-use std::os::unix::ffi::OsStrExt;
-use std::os::unix::fs::{FileExt, FileTypeExt, PermissionsExt};
-
-use anyhow::{anyhow, bail, Context, Result};
-
-use redox_initfs::types as initfs;
-
-const KIBIBYTE: u64 = 1024;
-const MEBIBYTE: u64 = KIBIBYTE * 1024;
-
-#[cfg(debug_assertions)]
-pub const DEFAULT_MAX_SIZE: u64 = 256 * MEBIBYTE;
-
-#[cfg(not(debug_assertions))]
-pub const DEFAULT_MAX_SIZE: u64 = 64 * MEBIBYTE;
-
-// FIXME make this configurable to handle systems with 16k and 64k pages.
-const PAGE_SIZE: u16 = 4096;
-
-pub enum EntryKind {
-    File { file: File, executable: bool },
-    Dir(Vec<Entry>),
-    Link(PathBuf),
-}
-
-pub struct Entry {
-    pub name: Vec<u8>,
-    pub kind: EntryKind,
-}
-
-struct State<'path> {
-    file: OutputImageGuard<'path>,
-    offset: u64,
-    max_size: u64,
-    buffer: Box<[u8]>,
-    inode_table: InodeTable,
-}
-
-fn write_all_at(file: &File, buf: &[u8], offset: u64, r#where: &str) -> Result<()> {
-    file.write_all_at(buf, offset)?;
-    log::trace!(
-        "Wrote {}..{} within {}",
-        offset,
-        offset + buf.len() as u64,
-        r#where
-    );
-    Ok(())
-}
-
-fn read_directory(path: &Path, root_path: &Path) -> Result<Vec<Entry>> {
-    let read_dir = path
-        .read_dir()
-        .with_context(|| anyhow!("failed to read directory `{}`", path.to_string_lossy(),))?;
-
-    let entries = read_dir
-        .map(|result| {
-            let entry = result.with_context(|| {
-                anyhow!(
-                    "failed to get a directory entry from `{}`",
-                    path.to_string_lossy(),
-                )
-            })?;
-
-            let metadata = entry.metadata().with_context(|| {
-                anyhow!(
-                    "failed to get metadata for `{}`",
-                    entry.path().to_string_lossy(),
-                )
-            })?;
-            let file_type = metadata.file_type();
-
-            let unsupported_type = |ty: &str, entry: &DirEntry| {
-                Err(anyhow!(
-                    "failed to include {} at `{}`: not supported by redox-initfs",
-                    ty,
-                    entry.path().to_string_lossy()
-                ))
-            };
-            let name = entry
-                .path()
-                .file_name()
-                .context("expected path to have a valid filename")?
-                .as_bytes()
-                .to_owned();
-
-            let entry_kind = if file_type.is_socket() {
-                return unsupported_type("socket", &entry);
-            } else if file_type.is_fifo() {
-                return unsupported_type("FIFO", &entry);
-            } else if file_type.is_block_device() {
-                return unsupported_type("block device", &entry);
-            } else if file_type.is_char_device() {
-                return unsupported_type("character device", &entry);
-            } else if file_type.is_file() {
-                let executable = metadata.permissions().mode() & 0o100 != 0;
-                EntryKind::File {
-                    file: File::open(entry.path()).with_context(|| {
-                        anyhow!("failed to open file `{}`", entry.path().to_string_lossy(),)
-                    })?,
-                    executable,
-                }
-            } else if file_type.is_dir() {
-                EntryKind::Dir(read_directory(&entry.path(), root_path)?)
-            } else if file_type.is_symlink() {
-                let link_file_path = entry.path();
-
-                let link_path = std::fs::read_link(&link_file_path)?;
-                let cannonical = if link_path.is_absolute() {
-                    link_path.clone()
-                } else {
-                    let Some(link_parent) = link_file_path.parent() else {
-                        bail!("Link at `{}` has no parent", link_file_path.display())
-                    };
-                    link_parent.canonicalize()?.join(link_path.clone())
-                };
-
-                let dir_path = path
-                    .canonicalize()
-                    .context("Failed to cannonicalize path")?;
-                let path = pathdiff::diff_paths(cannonical, &dir_path).ok_or_else(|| {
-                    anyhow!(
-                        "Failed to diff symlink path [{}] to path [{}]",
-                        link_path.display(),
-                        dir_path.display()
-                    )
-                })?;
-                EntryKind::Link(path)
-            } else {
-                return Err(anyhow!(
-                    "unknown file type at `{}`",
-                    entry.path().to_string_lossy()
-                ));
-            };
-
-            Ok(Entry {
-                kind: entry_kind,
-                name,
-            })
-        })
-        .collect::<Result<Vec<_>>>()?;
-
-    Ok(entries)
-}
-
-fn bump_alloc(state: &mut State, size: u64, why: &str) -> Result<u64> {
-    let end = (state.offset + size).next_multiple_of(PAGE_SIZE.into());
-    if end <= state.max_size {
-        let offset = state.offset;
-        state.offset = end;
-        log::debug!("Allocating range {}..{} in {}", offset, state.offset, why);
-        Ok(offset)
-    } else {
-        Err(anyhow!("bump allocation failed: max limit reached"))
-    }
-}
-struct WriteResult {
-    size: u32,
-    offset: u32,
-}
-
-fn allocate_and_write_file(state: &mut State, mut file: &File) -> Result<WriteResult> {
-    let size = file
-        .seek(SeekFrom::End(0))
-        .context("failed to seek to end")?;
-
-    let size: u32 = size.try_into().context("file too large")?;
-
-    let offset: u32 = bump_alloc(state, size.into(), "allocate space for file")
-        .context("failed to allocate space for file")?
-        .try_into()
-        .context("file offset too high")?;
-
-    let buffer_size: u32 = state.buffer.len().try_into().context("buffer too large")?;
-
-    file.seek(SeekFrom::Start(0))
-        .context("failed to seek to start")?;
-
-    let mut relative_offset = 0;
-
-    // TODO: If this would ever turn out to be a bottleneck, then perhaps we could use
-    // copy_file_range in `nix`.
-
-    while relative_offset < size {
-        let allowed_length = std::cmp::min(buffer_size, size - relative_offset);
-        let allowed_length =
-            usize::try_from(allowed_length).expect("expected buffer size not to be outside usize");
-
-        file.read(&mut state.buffer[..allowed_length])
-            .context("failed to read from source file")?;
-
-        write_all_at(
-            &state.file,
-            &state.buffer[..allowed_length],
-            u64::from(offset + relative_offset),
-            "allocate_and_write_file buffer chunk",
-        )
-        .context("failed to write source file into destination image")?;
-
-        relative_offset += buffer_size;
-    }
-
-    Ok(WriteResult { size, offset })
-}
-
-fn allocate_and_write_link(state: &mut State, link: &Path) -> Result<WriteResult> {
-    let data = link.as_os_str().as_bytes();
-    let size: u32 = data.len().try_into().unwrap();
-
-    let offset: u32 = bump_alloc(state, size.into(), "allocate space for file")
-        .context("failed to allocate space for file")?
-        .try_into()
-        .context("file offset too high")?;
-
-    write_all_at(
-        &state.file,
-        data,
-        u64::from(offset),
-        "allocate_and_write_link target path",
-    )
-    .context("failed to write source file into destination image")?;
-
-    Ok(WriteResult { size, offset })
-}
-
-fn allocate_and_write_dir(state: &mut State, dir: &[Entry]) -> Result<WriteResult> {
-    let entry_size =
-        u16::try_from(std::mem::size_of::<initfs::DirEntry>()).context("entry size too large")?;
-    let entry_count = u16::try_from(dir.len()).context("too many subdirectories")?;
-
-    let entry_table_length = u32::from(entry_count)
-        .checked_mul(u32::from(entry_size))
-        .ok_or_else(|| anyhow!("entry table length too large when multiplying by size"))?;
-
-    let entry_table_offset: u32 =
-        bump_alloc(state, entry_table_length.into(), "allocate entry table")
-            .context("failed to allocate entry table")?
-            .try_into()
-            .context("directory entries offset too high")?;
-
-    for (index, entry) in dir.iter().enumerate() {
-        let (write_result, ty) = match entry.kind {
-            EntryKind::Dir(ref subdir) => {
-                let write_result = allocate_and_write_dir(state, subdir).with_context(|| {
-                    anyhow!(
-                        "failed to copy directory entries from `{}` into image",
-                        String::from_utf8_lossy(&entry.name)
-                    )
-                })?;
-
-                (write_result, initfs::InodeType::Dir)
-            }
-
-            EntryKind::File {
-                ref file,
-                executable,
-            } => {
-                let write_result = allocate_and_write_file(state, file)
-                    .context("failed to copy file into image")?;
-
-                let type_ = if executable {
-                    initfs::InodeType::ExecutableFile
-                } else {
-                    initfs::InodeType::RegularFile
-                };
-
-                (write_result, type_)
-            }
-
-            EntryKind::Link(ref path) => {
-                let write_result = allocate_and_write_link(state, path)
-                    .context("failed to copy symbolic link into image")?;
-                (write_result, initfs::InodeType::Link)
-            }
-        };
-
-        let index: u16 = index
-            .try_into()
-            .expect("expected dir entry count not to exceed u32");
-
-        let inode = state.inode_table.allocate(ty, write_result);
-
-        let (name_offset, name_len) = {
-            let name_len: u16 = entry.name.len().try_into().context("file name too long")?;
-
-            let offset: u32 = bump_alloc(state, u64::from(name_len), "allocate file name")
-                .context("failed to allocate space for file name")?
-                .try_into()
-                .context("file name offset too high up")?;
-
-            write_all_at(&state.file, &entry.name, offset.into(), "writing file name")
-                .context("failed to write file name")?;
-
-            (offset, name_len)
-        };
-        {
-            let mut direntry_buf = [0_u8; std::mem::size_of::<initfs::DirEntry>()];
-
-            let direntry = plain::from_mut_bytes::<initfs::DirEntry>(&mut direntry_buf)
-                .expect("expected dir entry struct to have alignment 1, and buffer size to match");
-
-            log::debug!(
-                "Linking inode {} into dir entry index {}, file name `{}`",
-                inode,
-                index,
-                String::from_utf8_lossy(&entry.name)
-            );
-
-            *direntry = initfs::DirEntry {
-                inode: inode.into(),
-                name_len: name_len.into(),
-                name_offset: initfs::Offset(name_offset.into()),
-            };
-
-            write_all_at(
-                &state.file,
-                &direntry_buf,
-                u64::from(entry_table_offset + u32::from(index) * u32::from(entry_size)),
-                "allocate_and_write_dir entry",
-            )
-            .context("failed to write dir entry struct to image")?;
-        }
-    }
-
-    Ok(WriteResult {
-        size: entry_table_length,
-        offset: entry_table_offset,
-    })
-}
-fn allocate_contents(state: &mut State, dir: &[Entry]) -> Result<initfs::U16> {
-    let write_result = allocate_and_write_dir(state, dir)
-        .context("failed to allocate and write all directories and files")?;
-
-    let root_inode = state
-        .inode_table
-        .allocate(initfs::InodeType::Dir, write_result);
-
-    Ok(root_inode.into())
-}
-
-struct InodeTable {
-    entries: Vec<initfs::InodeHeader>,
-}
-
-impl InodeTable {
-    fn new() -> Self {
-        Self { entries: vec![] }
-    }
-
-    fn count(&self) -> u16 {
-        self.entries
-            .len()
-            .try_into()
-            .expect("inode count too large")
-    }
-
-    fn allocate(&mut self, ty: initfs::InodeType, write_result: WriteResult) -> u16 {
-        let inode = self.entries.len();
-        self.entries.push(initfs::InodeHeader {
-            type_: (ty as u32).into(),
-            length: initfs::Length(write_result.size.into()),
-            offset: initfs::Offset(write_result.offset.into()),
-        });
-        inode.try_into().expect("inode count too large")
-    }
-}
-
-fn write_inode_table(state: &mut State) -> Result<initfs::Offset> {
-    log::debug!("there are {} inodes", state.inode_table.count());
-
-    let inode_size: u32 = std::mem::size_of::<initfs::InodeHeader>()
-        .try_into()
-        .expect("inode header length cannot fit within u32");
-
-    let inode_table_length = {
-        u64::from(inode_size)
-            .checked_mul(u64::from(state.inode_table.count()))
-            .ok_or_else(|| anyhow!("inode table too large"))?
-    };
-
-    let inode_table_offset = bump_alloc(state, inode_table_length, "allocate inode table")?;
-    let inode_table_offset =
-        u32::try_from(inode_table_offset).with_context(|| "inode table located too far away")?;
-
-    for (i, inode) in state.inode_table.entries.iter().enumerate() {
-        // TODO: Use main buffer and write in bulk.
-        let mut inode_buf = [0_u8; std::mem::size_of::<initfs::InodeHeader>()];
-
-        let inode_hdr = plain::from_mut_bytes::<initfs::InodeHeader>(&mut inode_buf)
-            .expect("expected inode struct to have alignment 1, and buffer size to match");
-
-        *inode_hdr = *inode;
-
-        log::debug!(
-            "Writing inode index {} from offset {}",
-            i,
-            inode_table_offset
-        );
-        write_all_at(
-            &state.file,
-            &inode_buf,
-            u64::from(inode_table_offset + u32::try_from(i).unwrap() * inode_size),
-            "write_inode",
-        )
-        .context("failed to write inode struct to disk image")?;
-    }
-
-    let inode_table_offset = initfs::Offset(inode_table_offset.into());
-
-    Ok(inode_table_offset)
-}
-
-struct OutputImageGuard<'a> {
-    file: File,
-    path: &'a Path,
-    ok: bool,
-}
-
-impl std::ops::Deref for OutputImageGuard<'_> {
-    type Target = File;
-
-    fn deref(&self) -> &Self::Target {
-        &self.file
-    }
-}
-impl std::ops::DerefMut for OutputImageGuard<'_> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.file
-    }
-}
-
-impl Drop for OutputImageGuard<'_> {
-    fn drop(&mut self) {
-        if !self.ok {
-            let _ = std::fs::remove_file(self.path);
-        }
-    }
-}
-
-pub struct Args<'a> {
-    pub destination_path: &'a Path,
-    pub max_size: u64,
-    pub source: &'a Path,
-    pub bootstrap_code: &'a Path,
-}
-pub fn archive(
-    &Args {
-        destination_path,
-        max_size,
-        source,
-        bootstrap_code,
-    }: &Args,
-) -> Result<()> {
-    let root_path = source;
-    let root = read_directory(root_path, root_path).context("failed to read root")?;
-
-    build_initfs(destination_path, max_size, bootstrap_code, root)
-}
-
-pub fn build_initfs(
-    destination_path: &Path,
-    max_size: u64,
-    bootstrap_code: &Path,
-    root: Vec<Entry>,
-) -> std::result::Result<(), anyhow::Error> {
-    let previous_extension = destination_path.extension().map_or("", |ext| {
-        ext.to_str()
-            .expect("expected destination path to be valid UTF-8")
-    });
-
-    if !destination_path
-        .metadata()
-        .map_or(true, |metadata| metadata.is_file())
-    {
-        return Err(anyhow!("Destination file must be a file"));
-    }
-
-    let destination_temp_path =
-        destination_path.with_extension(format!("{}.partial", previous_extension));
-
-    let destination_temp_file = OpenOptions::new()
-        .read(false)
-        .write(true)
-        .create(true)
-        .truncate(true)
-        .create_new(false)
-        .open(&destination_temp_path)
-        .context("failed to open destination file")?;
-
-    let guard = OutputImageGuard {
-        file: destination_temp_file,
-        path: &destination_temp_path,
-        ok: false,
-    };
-
-    const BUFFER_SIZE: usize = 8192;
-
-    let mut state = State {
-        file: guard,
-        offset: 0,
-        max_size,
-        buffer: vec![0_u8; BUFFER_SIZE].into_boxed_slice(),
-        inode_table: InodeTable::new(),
-    };
-
-    // NOTE: The header is always stored at offset zero.
-    let header_offset = bump_alloc(&mut state, 4096, "allocate header")?;
-    assert_eq!(header_offset, 0);
-
-    allocate_and_write_file(
-        &mut state,
-        &File::open(bootstrap_code).with_context(|| {
-            anyhow!(
-                "failed to open bootstrap code file `{}`",
-                bootstrap_code.to_string_lossy(),
-            )
-        })?,
-    )?;
-    let bootstrap_data = std::fs::read(bootstrap_code).with_context(|| {
-        anyhow!(
-            "failed to read bootstrap code file `{}`",
-            bootstrap_code.to_string_lossy(),
-        )
-    })?;
-    let bootstrap_entry = elf_entry(&bootstrap_data);
-
-    let root_inode = allocate_contents(&mut state, &root)?;
-
-    let inode_table_offset = write_inode_table(&mut state)?;
-
-    {
-        let mut header_bytes = [0_u8; std::mem::size_of::<initfs::Header>()];
-        let header = plain::from_mut_bytes(&mut header_bytes)
-            .expect("expected header size to be sufficient and alignment to be 1");
-
-        *header = initfs::Header {
-            magic: initfs::Magic(initfs::MAGIC),
-            inode_count: state.inode_table.count().into(),
-            inode_table_offset,
-            bootstrap_entry: bootstrap_entry.into(),
-            initfs_size: state
-                .file
-                .metadata()
-                .context("failed to get initfs size")?
-                .len()
-                .into(),
-            page_size: PAGE_SIZE.into(),
-            root_inode,
-        };
-        write_all_at(&state.file, &header_bytes, header_offset, "writing header")
-            .context("failed to write header")?;
-    }
-
-    std::fs::rename(&destination_temp_path, destination_path)
-        .context("failed to rename output image")?;
-
-    state.file.ok = true;
-
-    Ok(())
-}
-
-fn elf_entry(data: &[u8]) -> u64 {
-    assert!(&data[..4] == b"\x7FELF");
-    match (data[4], data[5]) {
-        // 32-bit, little endian
-        (1, 1) => u32::from_le_bytes(
-            <[u8; 4]>::try_from(&data[0x18..0x18 + 4]).expect("conversion cannot fail"),
-        ) as u64,
-        // 32-bit, big endian
-        (1, 2) => u32::from_be_bytes(
-            <[u8; 4]>::try_from(&data[0x18..0x18 + 4]).expect("conversion cannot fail"),
-        ) as u64,
-        // 64-bit, little endian
-        (2, 1) => u64::from_le_bytes(
-            <[u8; 8]>::try_from(&data[0x18..0x18 + 8]).expect("conversion cannot fail"),
-        ),
-        // 64-bit, big endian
-        (2, 2) => u64::from_be_bytes(
-            <[u8; 8]>::try_from(&data[0x18..0x18 + 8]).expect("conversion cannot fail"),
-        ),
-        (ei_class, ei_data) => {
-            panic!("Unsupported ELF EI_CLASS {} EI_DATA {}", ei_class, ei_data);
-        }
-    }
-}
diff --git a/recipes/core/base/initfs/tools/tests/archive_and_read.rs b/recipes/core/base/initfs/tools/tests/archive_and_read.rs
deleted file mode 100644
index f32ea0ad3d..0000000000
--- a/recipes/core/base/initfs/tools/tests/archive_and_read.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use std::{collections::HashMap, path::Path};
-
-use anyhow::{anyhow, Context, Result};
-use redox_initfs::{InitFs, InodeKind, InodeStruct};
-
-#[derive(Debug, Clone, PartialEq)]
-enum Node {
-    Link { to: Vec<u8> },
-    File { data: Vec<u8> },
-    Dir(HashMap<Vec<u8>, Node>),
-    Unknown,
-}
-
-impl Node {
-    fn link(to: impl Into<Vec<u8>>) -> Self {
-        Node::Link { to: to.into() }
-    }
-
-    fn file(data: impl Into<Vec<u8>>) -> Self {
-        Node::File { data: data.into() }
-    }
-
-    fn dir(entries: impl IntoIterator<Item = (impl Into<Vec<u8>>, Node)>) -> Self {
-        Self::Dir(
-            entries
-                .into_iter()
-                .map(|(name, node)| (name.into(), node))
-                .collect(),
-        )
-    }
-}
-
-fn build_tree<'a>(fs: InitFs<'a>, inode: InodeStruct<'a>) -> anyhow::Result<Node> {
-    use InodeKind::*;
-    let node = match inode.kind() {
-        File(file) => {
-            let data = file.data().context("failed to get file data")?.to_owned();
-            Node::File { data }
-        }
-        Link(link) => {
-            let data = link.data().context("failed to get link data")?.to_owned();
-            Node::Link { to: data }
-        }
-        Dir(dir) => {
-            let mut entries = HashMap::new();
-            for idx in 0..dir
-                .entry_count()
-                .context("failed to get inode entry count")?
-            {
-                let entry = dir
-                    .get_entry(idx)
-                    .context("failed to get entry for index")?
-                    .ok_or_else(|| anyhow!("no entry found"))?;
-
-                let entry_name = entry.name().context("failed to get entry name")?;
-                let inode = fs
-                    .get_inode(entry.inode())
-                    .context("failed to load file inode")?;
-
-                let entry_node = build_tree(fs, inode)?;
-
-                entries.insert(entry_name.to_owned(), entry_node);
-            }
-
-            Node::Dir(entries)
-        }
-        Unknown => Node::Unknown,
-    };
-
-    Ok(node)
-}
-
-#[test]
-fn archive_and_read() -> Result<()> {
-    env_logger::init();
-
-    let args = redox_initfs_tools::Args {
-        destination_path: &Path::new(env!("CARGO_TARGET_TMPDIR")).join("out.img"),
-        source: Path::new("data"),
-        bootstrap_code: Path::new("data/foo/bootstrap.elf"),
-        max_size: redox_initfs_tools::DEFAULT_MAX_SIZE,
-    };
-    redox_initfs_tools::archive(&args).context("failed to archive")?;
-
-    let data = std::fs::read(args.destination_path).context("failed to read new archive")?;
-    let filesystem =
-        redox_initfs::InitFs::new(&data, None).context("failed to parse archive header")?;
-    let inode = filesystem
-        .get_inode(filesystem.root_inode())
-        .ok_or_else(|| anyhow!("Failed to get root inode"))?;
-
-    let tree = build_tree(filesystem, inode)?;
-
-    let reference_tree = Node::dir([(
-        b"foo",
-        Node::dir([
-            (
-                b"bootstrap.elf".as_slice(),
-                Node::file("\x7FELF\x01\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"),
-            ),
-            (b"file-link.txt".as_slice(), Node::link(b"file.txt")),
-            (
-                b"file.txt".as_slice(),
-                Node::file(b"This is a file meant to be used in a redox-initfs test.\n"),
-            ),
-        ]),
-    )]);
-
-    assert_eq!(tree, reference_tree);
-
-    Ok(())
-}
diff --git a/recipes/core/base/ipcd/.gitignore b/recipes/core/base/ipcd/.gitignore
deleted file mode 100644
index 899ce2fc38..0000000000
--- a/recipes/core/base/ipcd/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-**/*.rs.bk
-/Xargo.toml
diff --git a/recipes/core/base/ipcd/.gitlab-ci.yml b/recipes/core/base/ipcd/.gitlab-ci.yml
deleted file mode 100644
index d019614988..0000000000
--- a/recipes/core/base/ipcd/.gitlab-ci.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-image: "redoxos/redoxer"
-
-stages:
-    - build
-    - test
-
-cache:
-    paths:
-        - target/
-
-build:redox:
-    stage: build
-    script: redoxer build --verbose
-
-test:redox:
-    stage: test
-    dependencies:
-        - build:redox
-    script:
-        - redoxer build --verbose --examples
-        - redoxer exec --folder . -- sh -- ./redoxer.sh
-          event
-          main
-          unnamed
-          shm_demo
-        # FIXME: shm is currently broken
diff --git a/recipes/core/base/ipcd/Cargo.toml b/recipes/core/base/ipcd/Cargo.toml
deleted file mode 100644
index e157df579f..0000000000
--- a/recipes/core/base/ipcd/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "ipcd"
-description = "Inter-process communication daemon"
-edition = "2018"
-version = "0.1.0"
-
-[dependencies]
-libredox = { workspace = true, features = ["call"]}
-daemon = { path = "../daemon" }
-redox_syscall.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../scheme-utils" }
-redox_event.workspace = true
-anyhow.workspace = true
-libc.workspace = true
-rand = "0.10"
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/ipcd/README.md b/recipes/core/base/ipcd/README.md
deleted file mode 100644
index 553034bdf4..0000000000
--- a/recipes/core/base/ipcd/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# ipcd
-
-A userspace daemon for interprocess communication.
-
-## Usage
-
-See the `examples` folder.
-
-Simply open `chan:<name>` with O_CREAT where `<name>` is any name you'd like to create a listener.  
-This listener can accept clients by calling `dup("listen")`.
-
-Open `chan:<name>` without O_CREAT to connect. Now you can read and write between both streams.
diff --git a/recipes/core/base/ipcd/examples/event.rs b/recipes/core/base/ipcd/examples/event.rs
deleted file mode 100644
index 81abeac4f8..0000000000
--- a/recipes/core/base/ipcd/examples/event.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use std::{
-    fs::File,
-    io::{self, prelude::*},
-    os::unix::io::{AsRawFd, FromRawFd, RawFd},
-};
-
-fn from_syscall_error(error: syscall::Error) -> io::Error {
-    io::Error::from_raw_os_error(error.errno as i32)
-}
-fn nonblock(file: &File) -> io::Result<()> {
-    syscall::fcntl(
-        file.as_raw_fd() as usize,
-        syscall::F_SETFL,
-        syscall::O_NONBLOCK,
-    )
-    .map(|_| ())
-    .map_err(from_syscall_error)
-}
-fn dup(file: &File, buf: &str) -> io::Result<File> {
-    let stream =
-        syscall::dup(file.as_raw_fd() as usize, buf.as_bytes()).map_err(from_syscall_error)?;
-    Ok(unsafe { File::from_raw_fd(stream as RawFd) })
-}
-
-fn main() -> io::Result<()> {
-    let server = File::create("chan:hello_world")?;
-
-    nonblock(&server)?;
-
-    let mut event_file = File::open("event:")?;
-    let mut time_file = File::open(format!("time:{}", syscall::CLOCK_MONOTONIC))?;
-
-    let mut time = syscall::TimeSpec::default();
-    time_file.read(&mut time)?;
-    time.tv_sec += 1;
-    time_file.write(&time)?;
-    time.tv_sec += 2;
-    time_file.write(&time)?;
-    time.tv_sec += 2;
-    time_file.write(&time)?;
-
-    const TOKEN_TIMER: usize = 0;
-    const TOKEN_STREAM: usize = 1;
-    const TOKEN_SERVER: usize = 2;
-    const TOKEN_CLIENT: usize = 3;
-
-    event_file.write(&syscall::Event {
-        id: time_file.as_raw_fd() as usize,
-        flags: syscall::EVENT_READ,
-        data: TOKEN_TIMER,
-    })?;
-    event_file.write(&syscall::Event {
-        id: server.as_raw_fd() as usize,
-        flags: syscall::EVENT_WRITE | syscall::EVENT_READ,
-        data: TOKEN_SERVER,
-    })?;
-
-    let mut event = syscall::Event::default();
-
-    println!("Testing accept events...");
-
-    event_file.read(&mut event)?;
-    assert_eq!(event.data, TOKEN_TIMER);
-    assert_eq!(event.flags, syscall::EVENT_READ);
-    println!("-> Timed out");
-
-    let mut client = File::open("chan:hello_world")?;
-    event_file.write(&syscall::Event {
-        id: client.as_raw_fd() as usize,
-        flags: syscall::EVENT_WRITE | syscall::EVENT_READ,
-        data: TOKEN_CLIENT,
-    })?;
-
-    event_file.read(&mut event)?;
-    assert_eq!(event.data, TOKEN_SERVER);
-    assert_eq!(event.flags, syscall::EVENT_WRITE | syscall::EVENT_READ);
-    println!("-> Accept event");
-
-    println!("Testing write events...");
-
-    let mut stream = dup(&server, "listen")?;
-
-    event_file.read(&mut event)?;
-    assert_eq!(event.data, TOKEN_CLIENT);
-    assert_eq!(event.flags, syscall::EVENT_WRITE);
-    println!("-> Writable event");
-
-    event_file.write(&syscall::Event {
-        id: stream.as_raw_fd() as usize,
-        flags: syscall::EVENT_READ | syscall::EVENT_WRITE,
-        data: TOKEN_STREAM,
-    })?;
-
-    event_file.read(&mut event)?;
-    assert_eq!(event.data, TOKEN_STREAM);
-    assert_eq!(event.flags, syscall::EVENT_WRITE);
-    println!("-> Writable event");
-
-    event_file.read(&mut event)?;
-    assert_eq!(event.data, TOKEN_TIMER);
-    assert_eq!(event.flags, syscall::EVENT_READ);
-    println!("-> Timed out");
-
-    println!("Testing read events...");
-
-    client.write(b"a")?;
-
-    let mut buf = [0; 5];
-
-    event_file.read(&mut event)?;
-    assert_eq!(event.data, TOKEN_STREAM);
-    assert_eq!(event.flags, syscall::EVENT_READ);
-    println!("-> Readable event");
-
-    assert_eq!(stream.read(&mut buf)?, 1);
-    assert_eq!(buf[0], b'a');
-
-    stream.write(b"b")?;
-
-    event_file.read(&mut event)?;
-    assert_eq!(event.data, TOKEN_CLIENT);
-    assert_eq!(event.flags, syscall::EVENT_READ);
-    println!("-> Readable event");
-
-    assert_eq!(client.read(&mut buf)?, 1);
-    assert_eq!(buf[0], b'b');
-
-    drop(client);
-
-    event_file.read(&mut event)?;
-    assert_eq!(event.data, TOKEN_STREAM);
-    println!("-> Readable event (EOF)");
-
-    assert_eq!(stream.read(&mut buf)?, 0);
-
-    event_file.read(&mut event)?;
-    assert_eq!(event.data, TOKEN_TIMER);
-    println!("-> Timed out");
-
-    println!("Everything tested!");
-    Ok(())
-}
diff --git a/recipes/core/base/ipcd/examples/helloclient.rs b/recipes/core/base/ipcd/examples/helloclient.rs
deleted file mode 100644
index 5c73c24b7a..0000000000
--- a/recipes/core/base/ipcd/examples/helloclient.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use std::{fs::File, io};
-
-fn main() -> io::Result<()> {
-    let mut client = File::open("chan:hello")?;
-    io::copy(&mut client, &mut io::stdout())?;
-
-    Ok(())
-}
diff --git a/recipes/core/base/ipcd/examples/helloserver.rs b/recipes/core/base/ipcd/examples/helloserver.rs
deleted file mode 100644
index d2d3927602..0000000000
--- a/recipes/core/base/ipcd/examples/helloserver.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use std::{
-    fs::File,
-    io::{self, prelude::*},
-    os::unix::io::{AsRawFd, FromRawFd, RawFd},
-};
-
-fn from_syscall_error(error: syscall::Error) -> io::Error {
-    io::Error::from_raw_os_error(error.errno as i32)
-}
-
-fn main() -> io::Result<()> {
-    let server = File::create("chan:hello")?;
-
-    loop {
-        let stream =
-            syscall::dup(server.as_raw_fd() as usize, b"listen").map_err(from_syscall_error)?;
-        let mut stream = unsafe { File::from_raw_fd(stream as RawFd) };
-
-        stream.write(b"Hello World!\n")?;
-    }
-}
diff --git a/recipes/core/base/ipcd/examples/logserver.rs b/recipes/core/base/ipcd/examples/logserver.rs
deleted file mode 100644
index 82d3132547..0000000000
--- a/recipes/core/base/ipcd/examples/logserver.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use std::{
-    collections::HashMap,
-    fs::File,
-    io::{self, prelude::*},
-    os::unix::io::{AsRawFd, FromRawFd, RawFd},
-    str,
-};
-
-fn from_syscall_error(error: syscall::Error) -> io::Error {
-    io::Error::from_raw_os_error(error.errno as i32)
-}
-
-fn main() -> io::Result<()> {
-    let server = File::create("chan:log")?;
-    let mut event_file = File::open("event:")?;
-
-    syscall::fcntl(
-        server.as_raw_fd() as usize,
-        syscall::F_SETFL,
-        syscall::O_NONBLOCK,
-    )
-    .map(|_| ())
-    .map_err(from_syscall_error)?;
-    event_file.write(&syscall::Event {
-        id: server.as_raw_fd() as usize,
-        data: 0,
-        flags: syscall::EVENT_READ | syscall::EVENT_WRITE,
-    })?;
-
-    let mut clients = HashMap::new();
-    let mut next_id = 1;
-
-    'outer: loop {
-        let mut event = syscall::Event::default();
-        event_file.read(&mut event)?;
-
-        if event.data == 0 {
-            println!("Listener recevied flags: {:?}", event.flags);
-            if event.flags & syscall::EVENT_WRITE == syscall::EVENT_WRITE {
-                loop {
-                    let stream = match syscall::dup(server.as_raw_fd() as usize, b"listen")
-                        .map_err(from_syscall_error)
-                    {
-                        Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => break,
-                        stream => stream?,
-                    };
-                    let stream = unsafe { File::from_raw_fd(stream as RawFd) };
-
-                    event_file.write(&syscall::Event {
-                        id: stream.as_raw_fd() as usize,
-                        data: next_id,
-                        flags: syscall::EVENT_READ | syscall::EVENT_WRITE,
-                    })?;
-
-                    clients.insert(next_id, stream);
-                    println!("-> Spawned client #{}", next_id);
-                    next_id += 1;
-                }
-            }
-        } else {
-            println!("Client #{} received flags: {:?}", event.data, event.flags);
-            let client = clients.get_mut(&event.data).unwrap();
-
-            if event.flags & syscall::EVENT_READ == syscall::EVENT_READ {
-                println!("-> Reading");
-                let mut buf = [0; 128];
-                loop {
-                    let len = match client.read(&mut buf) {
-                        Ok(0) => {
-                            println!("--> EOF");
-                            clients.remove(&event.data);
-                            continue 'outer;
-                        }
-                        Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => break,
-                        len => len?,
-                    };
-                    println!(
-                        "--> Read {}/128 bytes: {:?}",
-                        len,
-                        str::from_utf8(&buf[..len])
-                    );
-                }
-            }
-            if event.flags & syscall::EVENT_WRITE == syscall::EVENT_WRITE {
-                println!("-> Writing");
-                const BUF: &str = "Hello from the log server\n";
-                let mut written = 0;
-                while written < BUF.len() {
-                    let len = match client.write(BUF[written..].as_bytes()) {
-                        Ok(0) => panic!("EOF should never happen here"),
-                        Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => break,
-                        len => len?,
-                    };
-                    println!(
-                        "--> Wrote {}/{} bytes: {:?}",
-                        len,
-                        BUF.len(),
-                        &BUF[written..]
-                    );
-                    written += len;
-                }
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/ipcd/examples/main.rs b/recipes/core/base/ipcd/examples/main.rs
deleted file mode 100644
index 1f9553588d..0000000000
--- a/recipes/core/base/ipcd/examples/main.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use std::{
-    fs::{File, OpenOptions},
-    io::{self, prelude::*},
-    os::unix::io::{AsRawFd, FromRawFd, RawFd},
-    thread,
-    time::Duration,
-};
-
-fn from_syscall_error(error: syscall::Error) -> io::Error {
-    io::Error::from_raw_os_error(error.errno as i32)
-}
-fn nonblock(file: &File) -> io::Result<()> {
-    syscall::fcntl(
-        file.as_raw_fd() as usize,
-        syscall::F_SETFL,
-        syscall::O_NONBLOCK,
-    )
-    .map(|_| ())
-    .map_err(from_syscall_error)
-}
-fn dup(file: &File, buf: &str) -> io::Result<File> {
-    let stream =
-        syscall::dup(file.as_raw_fd() as usize, buf.as_bytes()).map_err(from_syscall_error)?;
-    Ok(unsafe { File::from_raw_fd(stream as RawFd) })
-}
-
-fn main() -> io::Result<()> {
-    let mut buf = [0; 5];
-    let server = File::create("chan:hello_world")?;
-    {
-        println!("Testing O_EXCL...");
-        assert_eq!(
-            OpenOptions::new()
-                .write(true)
-                .create_new(true)
-                .open("chan:hello_world")
-                .unwrap_err()
-                .kind(),
-            io::ErrorKind::AlreadyExists
-        );
-
-        println!("Testing connecting...");
-
-        File::open("chan:hello_world")?; // closed connection will silently be skipped
-        let mut client = File::create("chan:hello_world")?; // O_CREAT without O_EXCL does nothing
-        let tmp = File::open("chan:hello_world")?; // multiple connections are handled
-
-        let mut stream = dup(&server, "listen")?;
-        assert!(dup(&server, "listen").is_ok());
-        drop(tmp);
-
-        println!("Testing basic I/O...");
-
-        stream.write(b"abc")?;
-        stream.flush()?;
-        println!("-> Wrote message");
-
-        assert_eq!(client.read(&mut buf)?, 3);
-        assert_eq!(&buf[..3], b"abc");
-        println!("-> Read message");
-
-        println!("Testing close...");
-
-        drop(client);
-        assert_eq!(
-            stream.write(b"a").unwrap_err().kind(),
-            io::ErrorKind::BrokenPipe
-        );
-        assert_eq!(stream.read(&mut buf)?, 0);
-    }
-    println!("Testing alternative connect method...");
-
-    let mut client = dup(&server, "connect")?;
-    let mut stream = dup(&server, "listen")?;
-
-    println!("Testing blocking I/O...");
-
-    let mut client_clone = client.try_clone()?;
-
-    let thread = thread::spawn(move || -> io::Result<()> {
-        println!("--> Thread: Sleeping for 1 second...");
-        thread::sleep(Duration::from_secs(1));
-        println!("--> Thread: Writing...");
-        client_clone.write(b"def")?;
-        client_clone.flush()?;
-        Ok(())
-    });
-
-    assert_eq!(stream.read(&mut buf)?, 3);
-    assert_eq!(&buf[..3], b"def");
-    println!("-> Read message");
-
-    thread.join().unwrap().unwrap();
-
-    println!("Testing non-blocking I/O...");
-
-    nonblock(&client)?;
-    nonblock(&server)?;
-
-    assert_eq!(
-        client.read(&mut buf).unwrap_err().kind(),
-        io::ErrorKind::WouldBlock
-    );
-    println!("-> Read would block");
-
-    assert_eq!(
-        dup(&server, "listen").unwrap_err().kind(),
-        io::ErrorKind::WouldBlock
-    );
-    println!("-> Accept would block");
-
-    drop(client);
-    {
-        let mut client = File::open("chan:hello_world")?;
-        nonblock(&client)?;
-
-        assert_eq!(
-            client.write(b"a").unwrap_err().kind(),
-            io::ErrorKind::WouldBlock
-        );
-        println!("-> Write before accept would block");
-    }
-
-    let mut client = dup(&server, "connect")?;
-    nonblock(&client)?;
-
-    assert_eq!(
-        client.write(b"a").unwrap_err().kind(),
-        io::ErrorKind::WouldBlock
-    );
-    println!("-> Write before accept would block (alternative connection method)");
-
-    println!("Everything tested!");
-    Ok(())
-}
diff --git a/recipes/core/base/ipcd/examples/shm.rs b/recipes/core/base/ipcd/examples/shm.rs
deleted file mode 100644
index d44a4b6465..0000000000
--- a/recipes/core/base/ipcd/examples/shm.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::{fs::File, io, os::unix::io::AsRawFd, slice};
-
-fn from_syscall_error(error: syscall::Error) -> io::Error {
-    io::Error::from_raw_os_error(error.errno as i32)
-}
-fn main() -> Result<(), io::Error> {
-    let file1 = File::open("shm:example")?;
-    let file2 = File::open("shm:example")?;
-
-    let one = unsafe {
-        slice::from_raw_parts_mut(
-            syscall::fmap(
-                file1.as_raw_fd() as usize,
-                &syscall::Map {
-                    offset: 0,
-                    size: 128,
-                    flags: syscall::PROT_READ | syscall::PROT_WRITE | syscall::MAP_SHARED,
-                    address: 0,
-                },
-            )
-            .map_err(from_syscall_error)? as *mut u8,
-            128,
-        )
-    };
-    // FIXME: While the length can be unaligned, the offset cannot. This test is incorrectly
-    // written.
-    let two = unsafe {
-        slice::from_raw_parts_mut(
-            syscall::fmap(
-                file2.as_raw_fd() as usize,
-                &syscall::Map {
-                    offset: 64,
-                    size: 64,
-                    flags: syscall::PROT_READ | syscall::PROT_WRITE | syscall::MAP_SHARED,
-                    address: 0,
-                },
-            )
-            .map_err(from_syscall_error)? as *mut u8,
-            64,
-        )
-    };
-
-    println!("Testing writing between");
-    for i in 0..128 {
-        one[i as usize] = i;
-    }
-    for i in 0..64 {
-        assert_eq!(two[i as usize], 64 + i);
-    }
-
-    println!("Testing fpath");
-    let mut buf = [0; 128];
-    let len = syscall::fpath(file1.as_raw_fd() as usize, &mut buf).map_err(from_syscall_error)?;
-    assert_eq!(&buf[..len], b"shm:example");
-    Ok(())
-}
diff --git a/recipes/core/base/ipcd/examples/shm_demo.rs b/recipes/core/base/ipcd/examples/shm_demo.rs
deleted file mode 100644
index 2bc719ba86..0000000000
--- a/recipes/core/base/ipcd/examples/shm_demo.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::{fs::File, io, mem, os::unix::io::AsRawFd, thread, time::Duration};
-
-fn from_syscall_error(error: syscall::Error) -> io::Error {
-    io::Error::from_raw_os_error(error.errno as i32)
-}
-fn main() -> Result<(), io::Error> {
-    let file = File::open("shm:counter")?;
-    println!("Reading from map... ");
-    let counter = unsafe {
-        &mut *(syscall::fmap(
-            file.as_raw_fd() as usize,
-            &syscall::Map {
-                offset: 0,
-                address: 0,
-                size: mem::size_of::<usize>(),
-                flags: syscall::PROT_READ | syscall::PROT_WRITE | syscall::MAP_SHARED,
-            },
-        )
-        .map_err(from_syscall_error)? as *mut usize)
-    };
-    println!("Read value {}", counter);
-    *counter += 1;
-    println!("Increased value to {}", counter);
-
-    thread::sleep(Duration::from_secs(1));
-    Ok(())
-}
diff --git a/recipes/core/base/ipcd/examples/unnamed.rs b/recipes/core/base/ipcd/examples/unnamed.rs
deleted file mode 100644
index e519ed5fbf..0000000000
--- a/recipes/core/base/ipcd/examples/unnamed.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use std::{
-    fs::File,
-    io::{self, prelude::*},
-    os::unix::io::{AsRawFd, FromRawFd, RawFd},
-};
-
-fn from_syscall_error(error: syscall::Error) -> io::Error {
-    io::Error::from_raw_os_error(error.errno as i32)
-}
-fn dup(file: &File, buf: &str) -> io::Result<File> {
-    let stream =
-        syscall::dup(file.as_raw_fd() as usize, buf.as_bytes()).map_err(from_syscall_error)?;
-    Ok(unsafe { File::from_raw_fd(stream as RawFd) })
-}
-
-fn main() -> io::Result<()> {
-    let mut buf = [0; 5];
-    let server = File::create("chan:")?;
-
-    let mut client = dup(&server, "connect")?;
-    let mut stream = dup(&server, "listen")?;
-
-    println!("Testing basic I/O...");
-
-    stream.write(b"abc")?;
-    stream.flush()?;
-    println!("-> Wrote message");
-
-    assert_eq!(client.read(&mut buf)?, 3);
-    assert_eq!(&buf[..3], b"abc");
-    println!("-> Read message");
-
-    println!("Testing connecting to unnamed socket by name (makes no sense)...");
-    assert_eq!(
-        File::open("chan:").unwrap_err().kind(),
-        io::ErrorKind::NotFound
-    );
-
-    println!("Everything tested!");
-    Ok(())
-}
diff --git a/recipes/core/base/ipcd/redoxer.sh b/recipes/core/base/ipcd/redoxer.sh
deleted file mode 100755
index 2bcdc680bd..0000000000
--- a/recipes/core/base/ipcd/redoxer.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-old_path="file:/bin/ipcd"
-new_path="target/x86_64-unknown-redox/debug/ipcd"
-if [ -e "${new_path}" ]
-then
-    mv -v "${new_path}" "${old_path}"
-    shutdown --reboot
-fi
-
-while [ "$#" != "0" ]
-do
-    example="$1"
-    shift
-
-    echo "# ${example} #"
-    "target/x86_64-unknown-redox/debug/examples/${example}"
-done
diff --git a/recipes/core/base/ipcd/src/chan.rs b/recipes/core/base/ipcd/src/chan.rs
deleted file mode 100644
index ec19751283..0000000000
--- a/recipes/core/base/ipcd/src/chan.rs
+++ /dev/null
@@ -1,446 +0,0 @@
-use redox_scheme::{scheme::SchemeSync, CallerCtx, OpenResult, Response, SignalBehavior, Socket};
-use scheme_utils::FpathWriter;
-use std::{
-    cmp,
-    collections::{HashMap, VecDeque},
-};
-use syscall::{error::*, flag::*, schemev2::NewFdFlags, Error};
-
-#[derive(Debug, Default)]
-pub struct Client {
-    buffer: Vec<u8>,
-    remote: Connection,
-}
-#[derive(Debug, Default)]
-pub struct Listener {
-    path: Option<String>,
-    awaiting: VecDeque<usize>,
-}
-#[derive(Debug)]
-pub enum Extra {
-    Client(Client),
-    Listener(Listener),
-    SchemeRoot,
-}
-impl Default for Extra {
-    fn default() -> Self {
-        Extra::Client(Client::default())
-    }
-}
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Connection {
-    Waiting,
-    Open(usize),
-    Closed,
-}
-impl Default for Connection {
-    fn default() -> Self {
-        Connection::Waiting
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct Handle {
-    flags: usize,
-    extra: Extra,
-    path: Option<String>,
-}
-impl Handle {
-    /// Duplicate this listener handle into one that is linked to the
-    /// specified remote.
-    /// Does NOT error if this is not a listener
-    pub fn accept(&self, remote: usize) -> Self {
-        Self {
-            flags: self.flags,
-            extra: Extra::Client(Client {
-                remote: Connection::Open(remote),
-                ..Client::default()
-            }),
-            ..Default::default()
-        }
-    }
-
-    /// Mark this listener handle as having a connection which can be
-    /// accepted, but only if it is ready to accept.
-    /// Errors if this is not a listener
-    pub fn connect(&mut self, other: usize) -> Result<()> {
-        match self.extra {
-            Extra::Listener(ref mut listener) => {
-                listener.awaiting.push_back(other);
-                Ok(())
-            }
-            _ => Err(Error::new(EBADF)),
-        }
-    }
-
-    /// Error if this is not a listener
-    pub fn require_listener(&mut self) -> Result<&mut Listener> {
-        match self.extra {
-            Extra::Listener(ref mut listener) => Ok(listener),
-            _ => Err(Error::new(EBADF)),
-        }
-    }
-
-    /// Error if this is not a client
-    pub fn require_client(&mut self) -> Result<&mut Client> {
-        match self.extra {
-            Extra::Client(ref mut client) => Ok(client),
-            _ => Err(Error::new(EBADF)),
-        }
-    }
-}
-
-pub struct ChanScheme<'sock> {
-    handles: HashMap<usize, Handle>,
-    listeners: HashMap<String, usize>,
-    next_id: usize,
-    socket: &'sock Socket,
-}
-impl<'sock> ChanScheme<'sock> {
-    pub fn new(socket: &'sock Socket) -> Self {
-        Self {
-            handles: HashMap::new(),
-            listeners: HashMap::new(),
-            next_id: 0,
-            socket,
-        }
-    }
-
-    fn post_fevent(&self, id: usize, flags: usize) -> Result<()> {
-        let fevent_response = Response::post_fevent(id, flags);
-        match self
-            .socket
-            .write_response(fevent_response, SignalBehavior::Restart)
-        {
-            Ok(true) => Ok(()),                   // Write response success
-            Ok(false) => Err(Error::new(EAGAIN)), // Write response failed, retry.
-            Err(err) => Err(err),                 // Error writing response
-        }
-    }
-
-    fn open(&mut self, path: &str, flags: usize) -> Result<OpenResult> {
-        let new_id = self.next_id;
-        let mut new = Handle::default();
-        new.flags = flags;
-
-        let create = flags & O_CREAT == O_CREAT;
-
-        if create && !self.listeners.contains_key(path) {
-            let mut listener = Listener::default();
-            if !path.is_empty() {
-                self.listeners.insert(String::from(path), new_id);
-                listener.path = Some(String::from(path));
-            }
-            new.extra = Extra::Listener(listener);
-        } else if create && flags & O_EXCL == O_EXCL {
-            return Err(Error::new(EEXIST));
-        } else {
-            // Connect to existing if: O_CREAT isn't set or it already exists
-            // and O_EXCL isn't set
-            let listener_id = *self.listeners.get(path).ok_or(Error::new(ENOENT))?;
-            let listener = self
-                .handles
-                .get_mut(&listener_id)
-                .expect("orphan listener left over");
-            listener.connect(new_id)?;
-
-            // smoltcp sends writeable whenever a listener gets a
-            // client, we'll do the same too (but also readable, why
-            // not)
-            self.post_fevent(listener_id, (EVENT_READ | EVENT_WRITE).bits())?;
-        }
-
-        self.handles.insert(new_id, new);
-        self.next_id += 1;
-
-        Ok(OpenResult::ThisScheme {
-            number: new_id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-}
-
-impl<'sock> SchemeSync for ChanScheme<'sock> {
-    fn scheme_root(&mut self) -> Result<usize> {
-        let id = self.next_id;
-        self.next_id += 1;
-
-        self.handles.insert(
-            id,
-            Handle {
-                flags: 0,
-                extra: Extra::SchemeRoot,
-                path: None,
-            },
-        );
-        Ok(id)
-    }
-    //   ___  ____  _____ _   _
-    //  / _ \|  _ \| ____| \ | |
-    // | | | | |_) |  _| |  \| |
-    // | |_| |  __/| |___| |\  |
-    //  \___/|_|   |_____|_| \_|
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        let handle = self.handles.get(&dirfd).ok_or(Error::new(EBADF))?;
-
-        if !matches!(handle.extra, Extra::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-
-        self.open(path, flags)
-    }
-    fn dup(&mut self, id: usize, buf: &[u8], _ctx: &CallerCtx) -> Result<OpenResult> {
-        match buf {
-            b"listen" => {
-                loop {
-                    let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
-                    let listener = handle.require_listener()?;
-                    let listener_path = listener.path.clone();
-
-                    break if let Some(remote_id) = listener.awaiting.pop_front() {
-                        let new_id = self.next_id;
-                        let mut new = handle.accept(remote_id);
-
-                        // Hook the remote side, assuming it's still
-                        // connected, up to this one so the connection is
-                        // mutal.
-                        let remote = match self.handles.get_mut(&remote_id) {
-                            Some(client) => client,
-                            None => continue, // Check next client
-                        };
-                        match remote.extra {
-                            Extra::Client(ref mut client) => {
-                                client.remote = Connection::Open(new_id);
-                            }
-                            Extra::Listener(_) => {
-                                panic!("newly created handle can't possibly be a listener")
-                            }
-                            Extra::SchemeRoot => return Err(Error::new(EBADF)),
-                        }
-                        self.post_fevent(remote_id, EVENT_WRITE.bits())?;
-
-                        new.path = listener_path;
-
-                        self.handles.insert(new_id, new);
-                        self.next_id += 1;
-
-                        Ok(OpenResult::ThisScheme {
-                            number: new_id,
-                            flags: NewFdFlags::empty(),
-                        })
-                    } else if handle.flags & O_NONBLOCK == O_NONBLOCK {
-                        Ok(OpenResult::WouldBlock)
-                    } else {
-                        Err(Error::new(EWOULDBLOCK))
-                    };
-                }
-            }
-            b"connect" => {
-                let new_id = self.next_id;
-                let new = Handle::default();
-
-                let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
-                handle.require_listener()?;
-                handle.connect(new_id)?;
-
-                // smoltcp sends writeable whenever a listener gets a
-                // client, we'll do the same too (but also readable,
-                // why not)
-                self.post_fevent(id, (EVENT_READ | EVENT_WRITE).bits())?;
-
-                self.handles.insert(new_id, new);
-                self.next_id += 1;
-
-                Ok(OpenResult::ThisScheme {
-                    number: new_id,
-                    flags: NewFdFlags::empty(),
-                })
-            }
-            _ => {
-                // If a buf is provided, different than "connect" / "listen",
-                // turn the socket into a named socket.
-
-                if buf.is_empty() {
-                    return Err(Error::new(EBADF));
-                }
-
-                let path = core::str::from_utf8(buf).map_err(|_| Error::new(EBADF))?;
-
-                let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
-                if handle.path.is_some() {
-                    return Err(Error::new(EBADF));
-                }
-
-                if matches!(handle.extra, Extra::SchemeRoot) {
-                    return Err(Error::new(EBADF));
-                }
-
-                let flags = handle.flags;
-                return self.open(path, flags);
-            }
-        }
-    }
-
-    //  ___ ___     ___      ____ _     ___  ____  _____
-    // |_ _/ _ \   ( _ )    / ___| |   / _ \/ ___|| ____|
-    //  | | | | |  / _ \/\ | |   | |  | | | \___ \|  _|
-    //  | | |_| | | (_>  < | |___| |__| |_| |___) | |___
-    // |___\___/   \___/\/  \____|_____\___/|____/|_____|
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
-        let client = handle.require_client()?;
-
-        if let Connection::Open(remote_id) = client.remote {
-            let remote = self.handles.get_mut(&remote_id).unwrap();
-            match remote.extra {
-                Extra::Client(ref mut client) => {
-                    client.buffer.extend(buf);
-                    if client.buffer.len() == buf.len() {
-                        // Send readable only if it wasn't readable
-                        // before
-                        self.post_fevent(remote_id, EVENT_READ.bits())?;
-                    }
-                    Ok(buf.len())
-                }
-                Extra::Listener(_) => {
-                    panic!("somehow, a client was connected to a listener directly")
-                }
-                Extra::SchemeRoot => panic!("somehow, a client was connected to a SchemeRoot"),
-            }
-        } else if client.remote == Connection::Closed {
-            Err(Error::new(EPIPE))
-        } else if (flags as usize) & O_NONBLOCK == O_NONBLOCK {
-            Err(Error::new(EAGAIN))
-        } else {
-            Err(Error::new(EWOULDBLOCK))
-        }
-    }
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with_legacy(buf, "chan", |w| {
-            let handle = self.handles.get(&id).ok_or(Error::new(EBADF))?;
-            if let Extra::SchemeRoot = handle.extra {
-                return Ok(());
-            }
-            w.push_str(handle.path.as_ref().ok_or(Error::new(EBADF))?);
-
-            Ok(())
-        })
-    }
-    fn fsync(&mut self, id: usize, _ctx: &CallerCtx) -> Result<()> {
-        self.handles.get(&id).ok_or(Error::new(EBADF)).and(Ok(()))
-    }
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
-        let client = handle.require_client()?;
-
-        if !client.buffer.is_empty() {
-            let len = cmp::min(buf.len(), client.buffer.len());
-            buf[..len].copy_from_slice(&client.buffer[..len]);
-            client.buffer.drain(..len);
-            Ok(len)
-        } else if client.remote == Connection::Closed {
-            // Remote dropped, send EOF
-            Ok(0)
-        } else if (flags as usize) & O_NONBLOCK == O_NONBLOCK {
-            Err(Error::new(EAGAIN))
-        } else {
-            Err(Error::new(EWOULDBLOCK))
-        }
-    }
-    fn on_close(&mut self, id: usize) {
-        let handle = self
-            .handles
-            .remove(&id)
-            .expect("handle pointing to nothing");
-
-        match handle.extra {
-            Extra::Client(client) => {
-                if let Connection::Open(remote_id) = client.remote {
-                    let remote = self.handles.get_mut(&remote_id).unwrap();
-
-                    match remote.extra {
-                        Extra::Client(ref mut client) => {
-                            client.remote = Connection::Closed;
-                            if client.buffer.is_empty() {
-                                // Post readable on EOF only if it wasn't
-                                // readable before
-                                self.post_fevent(remote_id, EVENT_READ.bits()).unwrap();
-                            }
-                        }
-                        Extra::Listener(_) => panic!("a client can't be connected to a listener!"),
-                        Extra::SchemeRoot => {
-                            panic!("a client can't be connected to a scheme root!")
-                        }
-                    }
-                }
-            }
-            Extra::Listener(listener) => {
-                if let Some(path) = listener.path {
-                    self.listeners.remove(&path);
-                }
-            }
-            Extra::SchemeRoot => {}
-        }
-    }
-
-    //  ____   _    ____      _    __  __ _____ _____ _____ ____  ____
-    // |  _ \ / \  |  _ \    / \  |  \/  | ____|_   _| ____|  _ \/ ___|
-    // | |_) / _ \ | |_) |  / _ \ | |\/| |  _|   | | |  _| | |_) \___ \
-    // |  __/ ___ \|  _ <  / ___ \| |  | | |___  | | | |___|  _ < ___) |
-    // |_| /_/   \_\_| \_\/_/   \_\_|  |_|_____| |_| |_____|_| \_\____/
-
-    fn fcntl(&mut self, id: usize, cmd: usize, arg: usize, _ctx: &CallerCtx) -> Result<usize> {
-        let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
-        match cmd {
-            F_GETFL => Ok(handle.flags),
-            F_SETFL => {
-                handle.flags = arg;
-                Ok(0)
-            }
-            _ => Err(Error::new(EINVAL)),
-        }
-    }
-    fn fevent(&mut self, id: usize, _flags: EventFlags, _ctx: &CallerCtx) -> Result<EventFlags> {
-        let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
-        let mut events = EventFlags::empty();
-        match handle.extra {
-            Extra::Client(ref client) => {
-                if let Connection::Open(_) = client.remote {
-                    events |= EVENT_WRITE;
-                }
-                if !client.buffer.is_empty() || client.remote == Connection::Closed {
-                    events |= EVENT_READ;
-                }
-            }
-            Extra::Listener(ref listener) => {
-                if !listener.awaiting.is_empty() {
-                    events |= EVENT_READ | EVENT_WRITE;
-                }
-            }
-            Extra::SchemeRoot => {}
-        }
-        Ok(events)
-    }
-}
diff --git a/recipes/core/base/ipcd/src/main.rs b/recipes/core/base/ipcd/src/main.rs
deleted file mode 100644
index a365ae028c..0000000000
--- a/recipes/core/base/ipcd/src/main.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-use event::{EventFlags, EventQueue};
-use redox_scheme::scheme::register_sync_scheme;
-use redox_scheme::Socket;
-use scheme_utils::ReadinessBased;
-
-mod chan;
-mod shm;
-mod uds;
-
-use self::chan::ChanScheme;
-use self::shm::ShmScheme;
-use self::uds::dgram::UdsDgramScheme;
-use self::uds::stream::UdsStreamScheme;
-
-fn main() {
-    daemon::Daemon::new(daemon_runner);
-}
-
-fn daemon_runner(daemon: daemon::Daemon) -> ! {
-    // TODO: Better error handling
-    match inner(daemon) {
-        Ok(()) => std::process::exit(0),
-        Err(error) => {
-            println!("ipcd failed: {error}");
-            std::process::exit(1);
-        }
-    }
-}
-
-fn inner(daemon: daemon::Daemon) -> anyhow::Result<()> {
-    event::user_data! {
-        enum EventSource {
-            ChanSocket,
-            ShmSocket,
-            UdsStreamSocket,
-            UdsDgramSocket,
-        }
-    }
-
-    // Prepare chan scheme
-    let chan_socket =
-        Socket::nonblock().map_err(|e| anyhow::anyhow!("failed to create chan scheme: {e}"))?;
-    let mut chan = ChanScheme::new(&chan_socket);
-    let mut chan_handler = ReadinessBased::new(&chan_socket, 16);
-
-    // Prepare shm scheme
-    let shm_socket =
-        Socket::nonblock().map_err(|e| anyhow::anyhow!("failed to create shm socket: {e}"))?;
-    let mut shm = ShmScheme::new();
-    let mut shm_handler = ReadinessBased::new(&shm_socket, 16);
-
-    // Prepare uds stream scheme
-    let uds_stream_socket = Socket::nonblock()
-        .map_err(|e| anyhow::anyhow!("failed to create uds stream scheme: {e}"))?;
-    let mut uds_stream = UdsStreamScheme::new(&uds_stream_socket)
-        .map_err(|e| anyhow::anyhow!("failed to create uds stream scheme: {e}"))?;
-    let mut uds_stream_handler = ReadinessBased::new(&uds_stream_socket, 16);
-
-    // Prepare uds dgram scheme
-    let uds_dgram_socket = Socket::nonblock()
-        .map_err(|e| anyhow::anyhow!("failed to create uds dgram scheme: {e}"))?;
-    let mut uds_dgram = UdsDgramScheme::new(&uds_dgram_socket)
-        .map_err(|e| anyhow::anyhow!("failed to create uds dgram scheme: {e}"))?;
-    let mut uds_dgram_handler = ReadinessBased::new(&uds_dgram_socket, 16);
-
-    register_sync_scheme(&chan_socket, "chan", &mut chan)
-        .map_err(|e| anyhow::anyhow!("failed to register chan scheme: {e}"))?;
-    register_sync_scheme(&shm_socket, "shm", &mut shm)
-        .map_err(|e| anyhow::anyhow!("failed to register shm scheme: {e}"))?;
-    register_sync_scheme(&uds_stream_socket, "uds_stream", &mut uds_stream)
-        .map_err(|e| anyhow::anyhow!("failed to register uds stream scheme: {e}"))?;
-    register_sync_scheme(&uds_dgram_socket, "uds_dgram", &mut uds_dgram)
-        .map_err(|e| anyhow::anyhow!("failed to register uds dgram scheme: {e}"))?;
-
-    daemon.ready();
-
-    // Create event listener for both files
-    let event_queue = EventQueue::<EventSource>::new()
-        .map_err(|e| anyhow::anyhow!("failed to create event queue: {e}"))?;
-    event_queue
-        .subscribe(
-            chan_socket.inner().raw(),
-            EventSource::ChanSocket,
-            EventFlags::READ,
-        )
-        .map_err(|e| anyhow::anyhow!("failed to subscribe chan socket: {e}"))?;
-    event_queue
-        .subscribe(
-            shm_socket.inner().raw(),
-            EventSource::ShmSocket,
-            EventFlags::READ,
-        )
-        .map_err(|e| anyhow::anyhow!("failed to subscribe shm socket: {e}"))?;
-    event_queue
-        .subscribe(
-            uds_stream_socket.inner().raw(),
-            EventSource::UdsStreamSocket,
-            EventFlags::READ,
-        )
-        .map_err(|e| anyhow::anyhow!("failed to subscribe uds stream socket: {e}"))?;
-    event_queue
-        .subscribe(
-            uds_dgram_socket.inner().raw(),
-            EventSource::UdsDgramSocket,
-            EventFlags::READ,
-        )
-        .map_err(|e| anyhow::anyhow!("failed to subscribe uds dgram socket: {e}"))?;
-
-    libredox::call::setrens(0, 0)?;
-
-    loop {
-        let event = event_queue
-            .next_event()
-            .map_err(|e| anyhow::anyhow!("error occured in event queue: {e}"))?;
-
-        match event.user_data {
-            EventSource::ChanSocket => {
-                // Channel scheme
-                chan_handler.read_and_process_requests(&mut chan)?;
-                chan_handler
-                    .poll_all_requests(&mut chan)
-                    .map_err(|e| anyhow::anyhow!("error occured in poll_all_requests: {e}"))?;
-                chan_handler.write_responses()?;
-            }
-            EventSource::ShmSocket => {
-                // Shared memory scheme
-                shm_handler.read_and_process_requests(&mut shm)?;
-                // shm is not a blocking scheme
-                shm_handler.write_responses()?;
-            }
-            EventSource::UdsStreamSocket => {
-                // Unix Domain Socket Stream scheme
-                uds_stream_handler.read_and_process_requests(&mut uds_stream)?;
-                uds_stream_handler
-                    .poll_all_requests(&mut uds_stream)
-                    .map_err(|e| anyhow::anyhow!("error occured in poll_all_requests: {e}"))?;
-                uds_stream_handler.write_responses()?;
-            }
-            EventSource::UdsDgramSocket => {
-                // Unix Domain Socket Dgram scheme
-                uds_dgram_handler.read_and_process_requests(&mut uds_dgram)?;
-                uds_dgram_handler
-                    .poll_all_requests(&mut uds_dgram)
-                    .map_err(|e| anyhow::anyhow!("error occured in poll_all_requests: {e}"))?;
-                uds_dgram_handler.write_responses()?;
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/ipcd/src/shm.rs b/recipes/core/base/ipcd/src/shm.rs
deleted file mode 100644
index 2ea6964e05..0000000000
--- a/recipes/core/base/ipcd/src/shm.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-use redox_scheme::{scheme::SchemeSync, CallerCtx, OpenResult};
-use scheme_utils::{FpathWriter, HandleMap};
-use std::{
-    cmp,
-    collections::{hash_map::Entry, HashMap},
-    rc::Rc,
-};
-use syscall::{
-    data::Stat, error::*, schemev2::NewFdFlags, Error, Map, MapFlags, MremapFlags, Result,
-    MAP_PRIVATE, PAGE_SIZE, PROT_READ, PROT_WRITE,
-};
-
-enum Handle {
-    Shm(Rc<str>),
-    SchemeRoot,
-}
-impl Handle {
-    fn as_shm(&self) -> Result<&Rc<str>, Error> {
-        match self {
-            Self::Shm(path) => Ok(path),
-            Self::SchemeRoot => Err(Error::new(EBADF)),
-        }
-    }
-}
-
-// TODO: Move to relibc
-const AT_REMOVEDIR: usize = 0x200;
-
-pub struct ShmHandle {
-    buffer: MmapGuard,
-    refs: usize,
-    unlinked: bool,
-}
-pub struct ShmScheme {
-    maps: HashMap<Rc<str>, ShmHandle>,
-    handles: HandleMap<Handle>,
-}
-impl ShmScheme {
-    pub fn new() -> Self {
-        Self {
-            maps: HashMap::new(),
-            handles: HandleMap::new(),
-        }
-    }
-}
-
-impl SchemeSync for ShmScheme {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-    //FIXME: Handle O_RDONLY/O_WRONLY/O_RDWR
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        let handle = self.handles.get(dirfd)?;
-        if !matches!(handle, Handle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-
-        let path = Rc::from(path);
-        let entry = match self.maps.entry(Rc::clone(&path)) {
-            Entry::Occupied(e) => {
-                if flags & syscall::O_EXCL != 0 && flags & syscall::O_CREAT != 0 {
-                    return Err(Error::new(EEXIST));
-                }
-                e.into_mut()
-            }
-            Entry::Vacant(e) => {
-                if flags & syscall::O_CREAT == 0 {
-                    return Err(Error::new(ENOENT));
-                }
-                e.insert(ShmHandle {
-                    buffer: MmapGuard::new(),
-                    refs: 0,
-                    unlinked: false,
-                })
-            }
-        };
-        entry.refs += 1;
-        let id = self.handles.insert(Handle::Shm(path));
-
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::POSITIONED,
-        })
-    }
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, "shm", |w| {
-            w.push_str(self.handles.get(id).and_then(Handle::as_shm)?);
-            Ok(())
-        })
-    }
-    fn on_close(&mut self, id: usize) {
-        let Handle::Shm(path) = self.handles.remove(id).unwrap() else {
-            return;
-        };
-        let mut entry = match self.maps.entry(path) {
-            Entry::Occupied(entry) => entry,
-            Entry::Vacant(_) => panic!("handle pointing to nothing"),
-        };
-        entry.get_mut().refs -= 1;
-        if entry.get().refs == 0 && entry.get().unlinked {
-            // There is no other reference to this entry, drop
-            entry.remove_entry();
-        }
-    }
-    fn unlinkat(&mut self, dirfd: usize, path: &str, flags: usize, _ctx: &CallerCtx) -> Result<()> {
-        let handle = self.handles.get(dirfd)?;
-        if !matches!(handle, Handle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-        if flags & AT_REMOVEDIR == AT_REMOVEDIR {
-            return Err(Error::new(ENOTDIR));
-        }
-        let path = Rc::from(path);
-        let mut entry = match self.maps.entry(Rc::clone(&path)) {
-            Entry::Occupied(e) => e,
-            Entry::Vacant(_) => return Err(Error::new(ENOENT)),
-        };
-
-        entry.get_mut().unlinked = true;
-        if entry.get().refs == 0 {
-            // There is no other reference to this entry, drop
-            entry.remove_entry();
-        }
-        Ok(())
-    }
-    fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        let path = self.handles.get(id).and_then(Handle::as_shm)?;
-        let size = self
-            .maps
-            .get(path)
-            .expect("handle pointing to nothing")
-            .buffer
-            .len();
-
-        //TODO: fill in more items?
-        *stat = Stat {
-            st_mode: syscall::MODE_FILE,
-            st_size: size as _,
-            ..Default::default()
-        };
-
-        Ok(())
-    }
-    fn fsize(&mut self, id: usize, _ctx: &CallerCtx) -> Result<u64> {
-        let path = self.handles.get(id).and_then(Handle::as_shm)?;
-        let size = self
-            .maps
-            .get(path)
-            .expect("handle pointing to nothing")
-            .buffer
-            .len();
-
-        Ok(size as u64)
-    }
-    fn ftruncate(&mut self, id: usize, len: u64, _ctx: &CallerCtx) -> Result<()> {
-        let path = self.handles.get(id).and_then(Handle::as_shm)?;
-        self.maps
-            .get_mut(path)
-            .expect("handle pointing to nothing")
-            .buffer
-            .grow_to(len as usize)
-    }
-    fn mmap_prep(
-        &mut self,
-        id: usize,
-        offset: u64,
-        size: usize,
-        _flags: MapFlags,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let path = self.handles.get(id).and_then(Handle::as_shm)?;
-        self.maps
-            .get_mut(path)
-            .expect("handle pointing to nothing")
-            .buffer
-            .mmap(offset as usize, size)
-    }
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let path = self.handles.get(id).and_then(Handle::as_shm)?;
-        self.maps
-            .get_mut(path)
-            .expect("handle pointing to nothing")
-            .buffer
-            .read(offset as usize, buf)
-    }
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let path = self.handles.get(id).and_then(Handle::as_shm)?;
-        self.maps
-            .get_mut(path)
-            .expect("handle pointing to nothing")
-            .buffer
-            .write(offset as usize, buf)
-    }
-}
-
-pub struct MmapGuard {
-    base: *mut (),
-    len: usize,
-}
-
-impl MmapGuard {
-    pub fn new() -> Self {
-        Self {
-            base: core::ptr::null_mut(),
-            len: 0,
-        }
-    }
-
-    fn grow_to(&mut self, new_len: usize) -> Result<()> {
-        if new_len <= self.total_capacity() {
-            // FIXME clear bytes after new_len
-            self.len = new_len;
-            return Ok(());
-        }
-
-        let needed = new_len - self.total_capacity();
-        let page_count = needed.div_ceil(PAGE_SIZE);
-        let alloc_size = page_count * PAGE_SIZE;
-
-        let new_base = unsafe {
-            if self.base.is_null() {
-                syscall::fmap(
-                    !0,
-                    &Map {
-                        offset: 0,
-                        size: alloc_size,
-                        flags: MAP_PRIVATE | PROT_READ | PROT_WRITE,
-                        address: 0,
-                    },
-                )
-            } else {
-                syscall::syscall5(
-                    syscall::SYS_MREMAP,
-                    self.base as usize,
-                    self.len.next_multiple_of(PAGE_SIZE),
-                    0,
-                    new_len.next_multiple_of(PAGE_SIZE),
-                    MremapFlags::empty().bits() | (PROT_READ | PROT_WRITE).bits(),
-                )
-            }
-        }?;
-
-        self.base = new_base as *mut ();
-        self.len = new_len;
-        Ok(())
-    }
-
-    fn total_capacity(&self) -> usize {
-        self.len.next_multiple_of(PAGE_SIZE)
-    }
-
-    pub fn len(&self) -> usize {
-        self.len
-    }
-
-    pub fn mmap(&mut self, offset: usize, size: usize) -> Result<usize> {
-        let total_size = offset + size;
-
-        if total_size > self.len.next_multiple_of(PAGE_SIZE) {
-            return Err(Error::new(ERANGE));
-        }
-
-        if size == 0 {
-            return Ok(0);
-        }
-
-        Ok(self.base.addr() + offset)
-    }
-
-    pub fn read(&self, offset: usize, buf: &mut [u8]) -> Result<usize> {
-        if offset >= self.len {
-            // FIXME read as zeros
-            return Ok(0);
-        }
-
-        let to_read = cmp::min(self.len - offset, buf.len());
-        unsafe {
-            let src = (self.base as *const u8).add(offset);
-            let dst = buf.as_mut_ptr();
-            core::ptr::copy_nonoverlapping(src, dst, to_read);
-        }
-
-        Ok(to_read)
-    }
-
-    pub fn write(&mut self, offset: usize, buf: &[u8]) -> Result<usize> {
-        let end = offset.checked_add(buf.len()).ok_or(Error::new(ERANGE))?;
-        self.grow_to(end)?;
-
-        let to_write = cmp::min(self.len - offset, buf.len());
-        unsafe {
-            let src = buf.as_ptr();
-            let dst = (self.base as *mut u8).add(offset);
-            core::ptr::copy_nonoverlapping(src, dst, to_write);
-        }
-
-        Ok(to_write)
-    }
-}
-
-impl Drop for MmapGuard {
-    fn drop(&mut self) {
-        if !self.base.is_null() {
-            let _ =
-                unsafe { syscall::funmap(self.base.addr(), self.len.next_multiple_of(PAGE_SIZE)) };
-        }
-    }
-}
diff --git a/recipes/core/base/ipcd/src/uds/dgram.rs b/recipes/core/base/ipcd/src/uds/dgram.rs
deleted file mode 100644
index 85c8d53b61..0000000000
--- a/recipes/core/base/ipcd/src/uds/dgram.rs
+++ /dev/null
@@ -1,827 +0,0 @@
-//! uds scheme for handling Unix Domain Socket datagram communication
-
-use super::{
-    get_uid_gid_from_pid, path_buf_to_str, read_msghdr_info, read_num, AncillaryData, Credential,
-    DataPacket, MsgWriter, MAX_DGRAM_MSG_LEN,
-};
-
-use libc::{AF_UNIX, SO_DOMAIN, SO_PASSCRED};
-use libredox::protocol::SocketCall;
-use rand::rngs::SmallRng;
-use rand::Rng;
-use redox_scheme::{
-    scheme::SchemeSync, CallerCtx, OpenResult, RecvFdRequest, Response, SendFdRequest,
-    SignalBehavior, Socket as SchemeSocket,
-};
-use scheme_utils::FpathWriter;
-use std::{
-    cell::RefCell,
-    cmp,
-    collections::{HashMap, HashSet, VecDeque},
-    mem,
-    rc::Rc,
-};
-use syscall::{error::*, flag::*, schemev2::NewFdFlags, Error, FobtainFdFlags, Stat};
-
-#[derive(Debug, Default)]
-pub struct Socket {
-    primary_id: usize,
-    path: Option<String>,
-    state: State,
-    peer: Option<usize>,
-    messages: VecDeque<DataPacket>,
-    options: HashSet<i32>,
-    fds: VecDeque<usize>,
-    flags: usize,
-    issued_token: Option<u64>,
-}
-
-impl Socket {
-    fn drop_fds(&mut self, num_fd: usize) -> Result<()> {
-        for i in 0..num_fd {
-            if self.fds.pop_front().is_none() {
-                eprintln!("Socket::drop_fds: Attempted to drop FD #{} of {}, but fd queue is empty. State inconsistency.", i + 1, num_fd);
-                return Err(Error::new(EINVAL));
-            }
-        }
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum State {
-    Unbound,
-    Bound,
-    Closed,
-}
-
-impl Default for State {
-    fn default() -> Self {
-        Self::Unbound
-    }
-}
-
-impl DataPacket {
-    pub fn serialize_to_stream(
-        self,
-        stream: &mut [u8],
-        socket: &mut Socket,
-        name_buf_size: usize,
-        iov_size: usize,
-    ) -> Result<usize> {
-        let mut msg_writer = MsgWriter::new(stream);
-        msg_writer.write_name(
-            self.ancillary_data.name,
-            name_buf_size,
-            UdsDgramScheme::fpath_inner,
-        )?;
-
-        msg_writer.write_payload(&self.payload, self.payload.len(), iov_size)?;
-
-        // Write the ancillary data
-        if !msg_writer.write_rights(self.ancillary_data.num_fds) {
-            // Buffer was too small, FDs could not be described. Drop the actual FDs.
-            eprintln!(
-                "serialize_to_stream: Buffer too small for SCM_RIGHTS, dropping {} FDs.",
-                self.ancillary_data.num_fds
-            );
-            socket.drop_fds(self.ancillary_data.num_fds)?;
-        }
-        // Write other ancillary datas
-        for option in &socket.options {
-            let result = match *option {
-                SO_PASSCRED => msg_writer.write_credentials(&self.ancillary_data.cred),
-                _ => {
-                    eprintln!(
-                        "serialize_to_stream: Unsupported socket option for serialization: {}",
-                        option
-                    );
-                    return Err(Error::new(EOPNOTSUPP));
-                }
-            };
-            if !result {
-                eprintln!("serialize_to_stream: Buffer too small for ancillary data, stopping further serialization.");
-                break;
-            }
-        }
-
-        Ok(msg_writer.len())
-    }
-}
-
-enum Handle {
-    Socket(Rc<RefCell<Socket>>),
-    SchemeRoot,
-}
-
-impl Handle {
-    fn as_socket(&self) -> Option<&Rc<RefCell<Socket>>> {
-        if let Self::Socket(socket) = self {
-            Some(socket)
-        } else {
-            None
-        }
-    }
-    fn is_scheme_root(&self) -> bool {
-        matches!(self, Self::SchemeRoot)
-    }
-}
-
-pub struct UdsDgramScheme<'sock> {
-    handles: HashMap<usize, Handle>,
-    next_id: usize,
-    socket_paths: HashMap<String, Rc<RefCell<Socket>>>,
-    socket_tokens: HashMap<u64, Rc<RefCell<Socket>>>,
-    socket: &'sock SchemeSocket,
-    proc_creds_capability: usize,
-    rng: SmallRng,
-}
-
-impl<'sock> UdsDgramScheme<'sock> {
-    pub fn new(socket: &'sock SchemeSocket) -> Result<Self> {
-        Ok(Self {
-            handles: HashMap::new(),
-            next_id: 0,
-            socket_paths: HashMap::new(),
-            socket_tokens: HashMap::new(),
-            socket,
-            proc_creds_capability: {
-                libredox::call::open(
-                    "/scheme/proc/proc-creds-capability",
-                    libredox::flag::O_RDONLY,
-                    0,
-                )?
-            },
-            rng: rand::make_rng(),
-        })
-    }
-
-    fn post_fevent(&self, id: usize, flags: usize) -> Result<()> {
-        let fevent_response = Response::post_fevent(id, flags);
-        match self
-            .socket
-            .write_response(fevent_response, SignalBehavior::Restart)
-        {
-            Ok(true) => Ok(()),
-            Ok(false) => Err(Error::new(EAGAIN)),
-            Err(err) => Err(err),
-        }
-    }
-
-    fn get_socket(&self, id: usize) -> Result<&Rc<RefCell<Socket>>, Error> {
-        self.handles
-            .get(&id)
-            .and_then(Handle::as_socket)
-            .ok_or(Error::new(EBADF))
-    }
-
-    fn insert_socket(&mut self, id: usize, socket: Rc<RefCell<Socket>>) {
-        self.handles.insert(id, Handle::Socket(socket));
-    }
-
-    fn get_connected_peer(&self, id: usize) -> Result<(usize, Rc<RefCell<Socket>>), Error> {
-        let socket = self.get_socket(id)?.borrow();
-
-        let remote_id = socket.peer.ok_or(Error::new(ENOTCONN))?;
-
-        let remote_rc = self.get_socket(remote_id).map_err(|e| {
-            eprintln!("get_connected_peer(id: {}): Peer socket (id: {}) has vanished. Original error: {:?}", id, remote_id, e);
-            Error::new(EPIPE)
-        })?;
-
-        if remote_rc.borrow().state == State::Closed {
-            eprintln!(
-                "get_connected_peer(id: {}): Attempted to interact with a closed peer (id: {}).",
-                id, remote_id
-            );
-            return Err(Error::new(ECONNREFUSED));
-        }
-
-        Ok((remote_id, remote_rc.clone()))
-    }
-
-    fn handle_unnamed_socket(&mut self, flags: usize) -> usize {
-        let new_id = self.next_id;
-        let mut new = Socket::default();
-        new.flags = flags;
-        new.primary_id = new_id;
-
-        self.insert_socket(new_id, Rc::new(RefCell::new(new)));
-        self.next_id += 1;
-        new_id
-    }
-
-    fn call_inner(
-        &mut self,
-        id: usize,
-        payload: &mut [u8],
-        metadata: &[u64],
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        // metadata to Vec<u8>
-        let Some(verb) = SocketCall::try_from_raw(metadata[0] as usize) else {
-            eprintln!("call_inner: Invalid verb in metadata: {:?}", metadata);
-            return Err(Error::new(EINVAL));
-        };
-        match verb {
-            SocketCall::Bind => self.handle_bind(id, &payload),
-            SocketCall::Connect => self.handle_connect(id, &payload),
-            SocketCall::SetSockOpt => self.handle_setsockopt(id, metadata[1] as i32, &payload),
-            SocketCall::GetSockOpt => self.handle_getsockopt(id, metadata[1] as i32, payload),
-            SocketCall::SendMsg => self.handle_sendmsg(id, payload, ctx),
-            SocketCall::RecvMsg => self.handle_recvmsg(id, payload),
-            SocketCall::Unbind => self.handle_unbind(id),
-            SocketCall::GetToken => self.handle_get_token(id, payload),
-            SocketCall::GetPeerName => self.handle_get_peer_name(id, payload),
-            _ => Err(Error::new(EOPNOTSUPP)),
-        }
-    }
-
-    fn handle_bind(&mut self, id: usize, path_buf: &[u8]) -> Result<usize> {
-        let path = path_buf_to_str(path_buf)?;
-
-        // Check if path is already bound to a server
-        if self.socket_paths.contains_key(path) {
-            eprintln!(
-                "handle_bind(id: {}): Address '{}' already in use.",
-                id, path
-            );
-            return Err(Error::new(EADDRINUSE));
-        }
-
-        let socket_rc = self.get_socket(id)?.clone();
-        let path_owned: String;
-        let token: u64;
-        {
-            let mut socket = socket_rc.borrow_mut();
-
-            if socket.state != State::Unbound {
-                eprintln!(
-                    "handle_bind(id: {}): Socket is already bound or connected (state: {:?})",
-                    id, socket.state
-                );
-                return Err(Error::new(EINVAL));
-            }
-
-            path_owned = path.to_string();
-            socket.path = Some(path_owned.clone());
-            socket.state = State::Bound;
-            token = self.rng.next_u64();
-            socket.issued_token = Some(token);
-        }
-
-        self.socket_paths.insert(path_owned, socket_rc.clone());
-        self.socket_tokens.insert(token, socket_rc);
-
-        Ok(0)
-    }
-
-    fn handle_connect(&mut self, id: usize, token_buf: &[u8]) -> Result<usize> {
-        let token = read_num::<u64>(token_buf)?;
-        {
-            let target_rc = self
-                .socket_tokens
-                .get(&token)
-                .ok_or(Error::new(ECONNREFUSED))?;
-            let target_socket_token = target_rc
-                .borrow()
-                .issued_token
-                .ok_or(Error::new(ECONNREFUSED))?;
-            if target_socket_token != token {
-                return Err(Error::new(EACCES));
-            }
-
-            let target_id = target_rc.borrow().primary_id;
-
-            let socket_rc = self.get_socket(id)?;
-            socket_rc.borrow_mut().peer = Some(target_id);
-        }
-
-        Ok(0)
-    }
-
-    fn handle_setsockopt(&mut self, id: usize, option: i32, value_slice: &[u8]) -> Result<usize> {
-        let socket_rc = self.get_socket(id)?;
-        let mut socket = socket_rc.borrow_mut();
-
-        match option {
-            SO_PASSCRED => {
-                let value = read_num::<i32>(value_slice)?;
-                if value != 0 {
-                    socket.options.insert(SO_PASSCRED);
-                } else {
-                    socket.options.remove(&SO_PASSCRED);
-                }
-                Ok(value_slice.len())
-            }
-            _ => {
-                eprintln!(
-                    "handle_setsockopt(id: {}): Unsupported option: {}",
-                    id, option
-                );
-                Err(Error::new(ENOPROTOOPT))
-            }
-        }
-    }
-
-    fn handle_getsockopt(&mut self, id: usize, option: i32, payload: &mut [u8]) -> Result<usize> {
-        match option {
-            SO_DOMAIN => {
-                payload.fill(0);
-                if payload.len() < mem::size_of::<i32>() {
-                    eprintln!(
-                        "handle_getsockopt(id: {}): SO_DOMAIN payload buffer is too small. len: {}",
-                        id,
-                        payload.len()
-                    );
-                    return Err(Error::new(ENOBUFS));
-                }
-                let domain = AF_UNIX.to_le_bytes();
-                payload[..domain.len()].copy_from_slice(&domain);
-                Ok(domain.len())
-            }
-            _ => {
-                eprintln!(
-                    "handle_getsockopt(id: {}): Unsupported option: {}",
-                    id, option
-                );
-                Err(Error::new(ENOPROTOOPT))
-            }
-        }
-    }
-
-    fn handle_sendmsg(&mut self, id: usize, msg_stream: &[u8], ctx: &CallerCtx) -> Result<usize> {
-        if msg_stream.is_empty() {
-            eprintln!("handle_sendmsg(id: {}): msg_stream is empty.", id);
-            return Err(Error::new(EINVAL));
-        }
-
-        let name = {
-            let socket_rc = self.get_socket(id)?;
-            let socket = socket_rc.borrow();
-            socket.path.clone()
-        };
-        let (remote_id, remote_rc) = self.get_connected_peer(id)?;
-
-        let bytes_written = Self::sendmsg_inner(
-            self.proc_creds_capability,
-            &mut remote_rc.borrow_mut(),
-            name,
-            msg_stream,
-            ctx,
-        )?;
-        self.post_fevent(remote_id, EVENT_READ.bits())?;
-        Ok(bytes_written)
-    }
-
-    fn sendmsg_inner(
-        cap_fd: usize,
-        socket: &mut Socket,
-        name: Option<String>,
-        msg_stream: &[u8],
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        if msg_stream.is_empty() {
-            eprintln!("sendmsg_inner: msg_stream is empty.");
-            return Err(Error::new(EINVAL));
-        }
-
-        let (pid, uid, gid) = get_uid_gid_from_pid(cap_fd, ctx.pid)?;
-        let message = DataPacket::from_stream(
-            msg_stream,
-            name,
-            Credential::new(pid as i32, uid as i32, gid as i32),
-        )?;
-        let payload_len = message.len();
-        socket.messages.push_back(message);
-
-        Ok(payload_len)
-    }
-
-    fn handle_recvmsg(&mut self, id: usize, msg_stream: &mut [u8]) -> Result<usize> {
-        let socket_rc = self.get_socket(id)?;
-        let mut socket = socket_rc.borrow_mut();
-
-        if let Some(message) = socket.messages.pop_front() {
-            Ok(Self::recvmsg_inner(&mut socket, message, msg_stream)?)
-        } else if (socket.flags as usize) & O_NONBLOCK == O_NONBLOCK {
-            Err(Error::new(EAGAIN))
-        } else {
-            Err(Error::new(EWOULDBLOCK))
-        }
-    }
-
-    fn recvmsg_inner(
-        socket: &mut Socket,
-        message: DataPacket,
-        msg_stream: &mut [u8],
-    ) -> Result<usize> {
-        // Read the name length, whole iov size, and msg controllen from the stream
-        let (prepared_name_len, prepared_whole_iov_size, _) = read_msghdr_info(msg_stream)?;
-
-        message.serialize_to_stream(
-            msg_stream,
-            socket,
-            prepared_name_len,
-            prepared_whole_iov_size,
-        )
-    }
-
-    fn handle_unbind(&mut self, id: usize) -> Result<usize> {
-        let path_opt = {
-            let socket_rc = self.get_socket(id)?;
-            let mut socket = socket_rc.borrow_mut();
-
-            if socket.state != State::Bound {
-                return Err(Error::new(EINVAL));
-            }
-
-            socket.state = State::Unbound;
-            socket.path.take()
-        };
-        if let Some(path) = path_opt {
-            self.socket_paths.remove(&path);
-        }
-
-        Ok(0)
-    }
-
-    fn handle_get_token(&self, id: usize, payload: &mut [u8]) -> Result<usize> {
-        let socket_rc = self.get_socket(id)?;
-        let Some(token) = socket_rc.borrow().issued_token else {
-            return Err(Error::new(EINVAL));
-        };
-        let token_bytes = token.to_le_bytes();
-        let token_bytes_len = token_bytes.len();
-        if payload.len() < token_bytes_len {
-            eprintln!(
-                "handle_get_token(id: {}): Payload buffer is too small for token.",
-                id
-            );
-            return Err(Error::new(ENOBUFS));
-        }
-        payload[..token_bytes_len].copy_from_slice(&token_bytes);
-        return Ok(token_bytes_len);
-    }
-
-    fn handle_get_peer_name(&self, id: usize, payload: &mut [u8]) -> Result<usize> {
-        let (_, socket_rc) = self.get_connected_peer(id)?;
-        let socket_borrow = socket_rc.borrow();
-        match socket_borrow.path.as_ref() {
-            Some(path_string) => Self::fpath_inner(path_string, payload),
-            None => {
-                let empty_path = "".to_string();
-                Self::fpath_inner(&empty_path, payload)
-            }
-        }
-    }
-
-    fn handle_connect_socketpair(&mut self, id: usize) -> Result<OpenResult> {
-        let new_id = self.next_id;
-        let mut new = Socket::default();
-        new.primary_id = new_id;
-
-        let socket_rc = self.get_socket(id)?;
-        if socket_rc.borrow().state == State::Closed {
-            eprintln!(
-                "handle_connect_socketpair(id: {}): Attempting to connect from a closed socket.",
-                id
-            );
-            return Err(Error::new(ECONNREFUSED));
-        }
-
-        {
-            let mut socket = socket_rc.borrow_mut();
-            socket.peer = Some(new_id);
-        }
-
-        new.peer = Some(id);
-
-        // smoltcp sends writeable whenever a listener gets a
-        // client, we'll do the same too (but also readable,
-        // why not)
-        self.post_fevent(id, (EVENT_READ | EVENT_WRITE).bits())?;
-
-        self.insert_socket(new_id, Rc::new(RefCell::new(new)));
-
-        self.next_id += 1;
-
-        Ok(OpenResult::ThisScheme {
-            number: new_id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn handle_recvfd(&mut self, id: usize) -> Result<OpenResult> {
-        let socket_rc = self.get_socket(id)?;
-        let mut socket = socket_rc.borrow_mut();
-        let fd = socket.fds.pop_front().ok_or(Error::new(EWOULDBLOCK))?;
-
-        Ok(OpenResult::OtherScheme { fd })
-    }
-
-    fn handle_listen(&mut self, id: usize) -> Result<OpenResult> {
-        let socket_rc = self.get_socket(id)?;
-
-        let new_id = self.next_id;
-
-        self.insert_socket(new_id, socket_rc.clone());
-        self.next_id += 1;
-
-        Ok(OpenResult::ThisScheme {
-            number: new_id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn write_inner(&mut self, id: usize, buf: &[u8], ctx: &CallerCtx) -> Result<usize> {
-        if buf.len() > MAX_DGRAM_MSG_LEN {
-            return Err(Error::new(EMSGSIZE));
-        }
-
-        let name = {
-            let socket_rc = self.get_socket(id)?;
-            let socket = socket_rc.borrow();
-            if matches!(socket.state, State::Closed) {
-                return Err(Error::new(EPIPE));
-            }
-
-            socket.path.clone()
-        };
-
-        // Assume writing to the connected socket if the given id is the primary id
-        let (remote_id, remote_rc) = self.get_connected_peer(id)?;
-        let mut remote = remote_rc.borrow_mut();
-        let message = DataPacket::new(
-            buf.to_vec(),
-            AncillaryData::new(
-                Credential::new(ctx.pid as i32, ctx.uid as i32, ctx.gid as i32),
-                name,
-            ),
-        );
-        remote.messages.push_back(message);
-
-        self.post_fevent(remote_id, EVENT_READ.bits())?;
-
-        Ok(buf.len())
-    }
-
-    fn fpath_inner(path: &String, buf: &mut [u8]) -> Result<usize> {
-        FpathWriter::with(buf, "uds_dgram", |w| {
-            w.push_str(path);
-            Ok(())
-        })
-    }
-
-    fn read_inner(&mut self, id: usize, buf: &mut [u8], flags: u32) -> Result<usize> {
-        let socket_rc = self.get_socket(id)?;
-        let mut socket = socket_rc.borrow_mut();
-
-        if let Some(message) = socket.messages.pop_front() {
-            let full_len = message.len();
-            let copy_len = cmp::min(buf.len(), full_len);
-            buf[..copy_len].copy_from_slice(&message.payload[..copy_len]);
-
-            Ok(copy_len)
-        } else if (flags as usize) & O_NONBLOCK == O_NONBLOCK {
-            Err(Error::new(EAGAIN))
-        } else {
-            Err(Error::new(EWOULDBLOCK))
-        }
-    }
-
-    fn sendfd_inner(&mut self, sendfd_request: &SendFdRequest) -> Result<usize> {
-        if sendfd_request.num_fds() == 0 {
-            return Ok(0);
-        }
-        let mut new_fds = Vec::new();
-        new_fds.resize(sendfd_request.num_fds(), usize::MAX);
-        if let Err(e) =
-            sendfd_request.obtain_fd(&self.socket, FobtainFdFlags::UPPER_TBL, &mut new_fds)
-        {
-            eprintln!("sendfd_inner: obtain_fd failed with error: {:?}", e);
-            return Err(e);
-        }
-        let socket_id = sendfd_request.id();
-        let (remote_id, remote_rc) = self.get_connected_peer(socket_id)?;
-        {
-            let mut remote = remote_rc.borrow_mut();
-            for new_fd in &new_fds {
-                remote.fds.push_back(*new_fd);
-            }
-        }
-
-        self.post_fevent(remote_id, EVENT_READ.bits())?;
-        Ok(new_fds.len())
-    }
-
-    fn recvfd_inner(&mut self, recvfd_request: &RecvFdRequest) -> Result<OpenResult> {
-        if recvfd_request.num_fds() == 0 {
-            return Ok(OpenResult::OtherSchemeMultiple { num_fds: 0 });
-        }
-
-        let socket_id = recvfd_request.id();
-        let socket_rc = self.get_socket(socket_id)?;
-        let mut socket = socket_rc.borrow_mut();
-
-        if socket.fds.len() < recvfd_request.num_fds() {
-            return if (socket.flags as usize) & O_NONBLOCK == O_NONBLOCK {
-                Ok(OpenResult::WouldBlock)
-            } else {
-                Err(Error::new(EWOULDBLOCK))
-            };
-        }
-
-        let fds: Vec<usize> = socket.fds.drain(..recvfd_request.num_fds()).collect();
-        if let Err(e) = recvfd_request.move_fd(&self.socket, FmoveFdFlags::empty(), &fds) {
-            eprintln!("recvfd_inner: move_fd failed with error: {:?}", e);
-            return Err(Error::new(EPROTO));
-        }
-
-        Ok(OpenResult::OtherSchemeMultiple {
-            num_fds: recvfd_request.num_fds(),
-        })
-    }
-}
-
-impl<'sock> SchemeSync for UdsDgramScheme<'sock> {
-    fn scheme_root(&mut self) -> Result<usize> {
-        let new_id = self.next_id;
-        self.handles.insert(new_id, Handle::SchemeRoot);
-        self.next_id += 1;
-        Ok(new_id)
-    }
-
-    fn openat(
-        &mut self,
-        fd: usize,
-        path: &str,
-        mut flags: usize,
-        fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        {
-            let Some(handle) = self.handles.get(&fd) else {
-                return Err(Error::new(EBADF));
-            };
-            if !handle.is_scheme_root() {
-                eprintln!(
-                    "openat(fd: {}, path: '{}'): fd is not an open capability.",
-                    fd, path
-                );
-                return Err(Error::new(EACCES));
-            }
-        }
-        flags |= fcntl_flags as usize;
-
-        let new_id = if path.is_empty() {
-            if flags & O_CREAT == O_CREAT {
-                self.handle_unnamed_socket(flags)
-            } else {
-                eprintln!(
-                    "open(path: '{}'): Attempting to open an unnamed socket without O_CREAT.",
-                    path
-                );
-                return Err(Error::new(EINVAL));
-            }
-        } else {
-            eprintln!(
-                "open(path: '{}'): Attempting to open a named socket, which is not supported.",
-                path
-            );
-            return Err(Error::new(EINVAL));
-        };
-        Ok(OpenResult::ThisScheme {
-            number: new_id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn call(
-        &mut self,
-        id: usize,
-        payload: &mut [u8],
-        metadata: &[u64],
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        self.call_inner(id, payload, metadata, ctx)
-    }
-
-    fn dup(&mut self, id: usize, buf: &[u8], _ctx: &CallerCtx) -> Result<OpenResult> {
-        match buf {
-            // Connect for socket pair
-            b"connect" => self.handle_connect_socketpair(id),
-            b"recvfd" => self.handle_recvfd(id),
-            // listen will generate a id for same socket
-            b"listen" => self.handle_listen(id),
-            _ => Err(Error::new(EINVAL)),
-        }
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        self.write_inner(id, buf, ctx)
-    }
-
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        match self.handles.get(&id).ok_or(Error::new(EBADF))? {
-            Handle::SchemeRoot => Ok(Self::fpath_inner(&String::new(), buf)?),
-            Handle::Socket(socket_rc) => {
-                let socket = socket_rc.borrow();
-                let empty = String::new();
-                let path = socket.path.as_ref().unwrap_or(&empty);
-                Ok(Self::fpath_inner(path, buf)?)
-            }
-        }
-    }
-
-    fn fsync(&mut self, id: usize, _ctx: &CallerCtx) -> Result<()> {
-        self.get_socket(id).and(Ok(()))
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        self.read_inner(id, buf, flags)
-    }
-
-    fn on_close(&mut self, id: usize) {
-        let Some(Handle::Socket(socket_rc)) = self.handles.remove(&id) else {
-            return;
-        };
-        let mut socket = socket_rc.borrow_mut();
-        if socket.primary_id == id {
-            socket.state = State::Closed;
-            socket.peer = None;
-            let path = socket.path.clone();
-            socket.path = None;
-
-            if let Some(path) = path {
-                self.socket_paths.remove(&path);
-            }
-            if let Some(token) = socket.issued_token {
-                self.socket_tokens.remove(&token);
-            }
-        }
-    }
-
-    fn on_sendfd(&mut self, sendfd_request: &SendFdRequest) -> Result<usize> {
-        self.sendfd_inner(sendfd_request)
-    }
-
-    fn on_recvfd(&mut self, recvfd_request: &RecvFdRequest) -> Result<OpenResult> {
-        self.recvfd_inner(recvfd_request)
-    }
-
-    fn fcntl(&mut self, id: usize, cmd: usize, arg: usize, _ctx: &CallerCtx) -> Result<usize> {
-        let socket = self.get_socket(id)?;
-        match cmd {
-            F_GETFL => Ok(socket.borrow().flags),
-            F_SETFL => {
-                socket.borrow_mut().flags = arg;
-                Ok(0)
-            }
-            _ => {
-                eprintln!("fcntl(id: {}): Unsupported cmd: {}", id, cmd);
-                Err(Error::new(EINVAL))
-            }
-        }
-    }
-
-    fn fevent(&mut self, id: usize, flags: EventFlags, _ctx: &CallerCtx) -> Result<EventFlags> {
-        let socket_rc = self.get_socket(id)?;
-        let socket = socket_rc.borrow_mut();
-
-        let mut ready = EventFlags::empty();
-        if flags.contains(EVENT_READ) && !socket.messages.is_empty() {
-            ready |= EVENT_READ;
-        }
-        if flags.contains(EVENT_WRITE) && socket.peer.is_some() {
-            ready |= EVENT_WRITE;
-        }
-
-        Ok(ready)
-    }
-
-    fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        self.get_socket(id)?;
-
-        *stat = Stat {
-            st_mode: MODE_SOCK,
-            ..Default::default()
-        };
-
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/ipcd/src/uds/mod.rs b/recipes/core/base/ipcd/src/uds/mod.rs
deleted file mode 100644
index d17dba5bbc..0000000000
--- a/recipes/core/base/ipcd/src/uds/mod.rs
+++ /dev/null
@@ -1,367 +0,0 @@
-use libredox::protocol::ProcMeta;
-use std::fmt::Debug;
-use std::{cmp, convert::TryInto, mem};
-use syscall::{error::*, Error};
-
-pub mod dgram;
-pub mod stream;
-
-// TODO: Remove this when Rust libc crate is updated to include SCM_CREDENTIALS
-const SCM_CREDENTIALS: i32 = 2;
-
-const MAX_DGRAM_MSG_LEN: usize = 65536;
-const MIN_RECV_MSG_LEN: usize = mem::size_of::<usize>() * 2; // name_len, payload_len,
-const CMSG_HEADER_LEN_IN_STREAM: usize = CMSG_LEVEL_SIZE + CMSG_TYPE_SIZE + CMSG_DATA_LEN_SIZE;
-const CMSG_LEVEL_SIZE: usize = mem::size_of::<i32>();
-const CMSG_TYPE_SIZE: usize = mem::size_of::<i32>();
-const CMSG_DATA_LEN_SIZE: usize = mem::size_of::<usize>();
-const PID_SIZE: usize = mem::size_of::<i32>();
-const UID_SIZE: usize = mem::size_of::<i32>();
-const GID_SIZE: usize = mem::size_of::<i32>();
-
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
-struct Credential {
-    pid: i32,
-    uid: i32,
-    gid: i32,
-}
-impl Credential {
-    fn new(pid: i32, uid: i32, gid: i32) -> Self {
-        Self { pid, uid, gid }
-    }
-}
-
-#[derive(Debug, Default, Clone, PartialEq, Eq)]
-struct AncillaryData {
-    cred: Credential,
-    num_fds: usize,
-    name: Option<String>,
-}
-impl AncillaryData {
-    fn new(cred: Credential, name: Option<String>) -> Self {
-        Self {
-            cred,
-            name,
-            ..Default::default()
-        }
-    }
-}
-
-struct AncillaryDataHeader {
-    level: i32,
-    c_type: i32,
-    data_len: usize,
-}
-impl AncillaryDataHeader {
-    fn from_stream(stream: &[u8]) -> Result<Option<Self>> {
-        let mut cursor = 0;
-        if cursor + CMSG_HEADER_LEN_IN_STREAM > stream.len() {
-            return Ok(None);
-        }
-
-        // cmsg entry format: [level(i32)][type(i32)][data_len(usize)][data]
-        let cmsg_level = read_num::<i32>(&stream[cursor..])?;
-        cursor += mem::size_of::<i32>();
-
-        let cmsg_type = read_num::<i32>(&stream[cursor..])?;
-        cursor += mem::size_of::<i32>();
-
-        let cmsg_data_len = read_num::<usize>(&stream[cursor..])?;
-
-        Ok(Some(Self {
-            level: cmsg_level,
-            c_type: cmsg_type,
-            data_len: cmsg_data_len,
-        }))
-    }
-}
-
-#[derive(Debug, Default, Clone, PartialEq, Eq)]
-struct DataPacket {
-    payload: Vec<u8>,
-    ancillary_data: AncillaryData,
-    // Only for stream packets
-    read_offset: usize,
-    ancillary_taken: bool,
-}
-
-impl DataPacket {
-    fn new(payload: Vec<u8>, ancillary_data: AncillaryData) -> Self {
-        Self {
-            payload,
-            ancillary_data,
-            read_offset: 0,
-            ancillary_taken: false,
-        }
-    }
-
-    fn len(&self) -> usize {
-        self.payload.len()
-    }
-
-    fn from_stream(stream: &[u8], name: Option<String>, cred: Credential) -> Result<Self> {
-        let mut cursor: usize = 0;
-        let payload_len = read_num::<usize>(&stream[cursor..])?;
-        cursor += mem::size_of::<usize>();
-        let payload = stream
-            .get(cursor..cursor + payload_len)
-            .ok_or_else(|| {
-                eprintln!("Message::from_stream: Stream too short for payload. Expected len {}, actual remaining len {}", payload_len, stream.len() - cursor);
-                Error::new(EINVAL)
-            })?;
-        cursor += payload_len;
-
-        // Create a new message with the payload and credentials
-        let mut message = Self::new(payload.to_vec(), AncillaryData::new(cred, name));
-
-        while let Some(cmsg_header) = AncillaryDataHeader::from_stream(&stream[cursor..])? {
-            cursor += CMSG_HEADER_LEN_IN_STREAM;
-            let data_stream = stream
-                .get(cursor..cursor + cmsg_header.data_len)
-                .ok_or_else(|| {
-                    eprintln!("Message::from_stream: Stream too short for ancillary data. Expected len {}, actual remaining len {}", cmsg_header.data_len, stream.len() - cursor);
-                    Error::new(EINVAL)
-                })?;
-
-            match (cmsg_header.level, cmsg_header.c_type) {
-                (libc::SOL_SOCKET, libc::SCM_RIGHTS) => {
-                    // Handle file descriptor passing
-                    let num_fds = read_num::<usize>(data_stream)?;
-                    message.ancillary_data.num_fds += num_fds;
-                }
-                (libc::SOL_SOCKET, SCM_CREDENTIALS) => {}
-                _ => {
-                    eprintln!(
-                        "Message::from_stream: Unsupported cmsg type received. level: {}, type: {}",
-                        cmsg_header.level, cmsg_header.c_type
-                    );
-                    return Err(Error::new(EOPNOTSUPP));
-                }
-            }
-            cursor += cmsg_header.data_len;
-        }
-        Ok(message)
-    }
-}
-
-trait NumFromBytes: Sized + Debug {
-    fn from_le_bytes_slice(buffer: &[u8]) -> Result<Self, Error>;
-}
-
-macro_rules! num_from_bytes_impl {
-    ($($t:ty),*) => {
-        $(
-            impl NumFromBytes for $t {
-                fn from_le_bytes_slice(buffer: &[u8]) -> Result<Self, Error> {
-                    let size = mem::size_of::<Self>();
-                    let buffer_slice = buffer.get(..size).and_then(|s| s.try_into().ok());
-
-                    if let Some(slice) = buffer_slice {
-                        Ok(Self::from_le_bytes(slice))
-                    } else {
-                        eprintln!(
-                            "read_num: buffer is too short to read num of size {} (buffer len: {})",
-                            size, buffer.len()
-                        );
-                        Err(Error::new(EINVAL))
-                    }
-                }
-            }
-        )*
-    };
-}
-
-num_from_bytes_impl!(i32, u32, u64, usize);
-
-fn read_num<T>(buffer: &[u8]) -> Result<T, Error>
-where
-    T: NumFromBytes,
-{
-    T::from_le_bytes_slice(buffer)
-}
-
-fn get_uid_gid_from_pid(cap_fd: usize, target_pid: usize) -> Result<(u32, u32, u32)> {
-    let mut buffer = [0u8; mem::size_of::<ProcMeta>()];
-    let _ = libredox::call::get_proc_credentials(cap_fd, target_pid, &mut buffer).map_err(|e| {
-        eprintln!(
-            "Failed to get process credentials for pid {}: {:?}",
-            target_pid, e
-        );
-        Error::new(EINVAL)
-    })?;
-    let mut cursor = 0;
-    let pid = read_num::<u32>(&buffer[cursor..])?;
-    cursor += mem::size_of::<u32>() * 3;
-    let uid = read_num::<u32>(&buffer[cursor..])?;
-    cursor += mem::size_of::<u32>() * 3;
-    let gid = read_num::<u32>(&buffer[cursor..])?;
-    Ok((pid, uid, gid))
-}
-
-fn read_msghdr_info(stream: &mut [u8]) -> Result<(usize, usize, usize)> {
-    if stream.len() < mem::size_of::<usize>() * 3 {
-        eprintln!(
-            "get_msghdr_info: stream buffer is too small to read headers. len: {}",
-            stream.len()
-        );
-        return Err(Error::new(EINVAL));
-    }
-    let mut cursor: usize = 0;
-    let prepared_name_len = read_num::<usize>(&stream[cursor..])?;
-    cursor += mem::size_of::<usize>();
-    let prepared_whole_iov_size = read_num::<usize>(&stream[cursor..])?;
-    cursor += mem::size_of::<usize>();
-    let prepared_msg_controllen = read_num::<usize>(&stream[cursor..])?;
-    cursor += mem::size_of::<usize>();
-    // Clear the stream buffer
-    stream[..cursor].copy_from_slice(&[0u8; mem::size_of::<usize>() * 3]);
-    Ok((
-        prepared_name_len,
-        prepared_whole_iov_size,
-        prepared_msg_controllen,
-    ))
-}
-
-struct MsgWriter<'a> {
-    buffer: &'a mut [u8],
-    written_len: usize,
-}
-impl<'a> MsgWriter<'a> {
-    fn new(buffer: &'a mut [u8]) -> Self {
-        Self {
-            buffer,
-            written_len: 0,
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        self.written_len
-    }
-
-    fn write_name(
-        &mut self,
-        name: Option<String>,
-        name_buf_size: usize,
-        name_write_fn: fn(&String, &mut [u8]) -> Result<usize>,
-    ) -> Result<()> {
-        if self.buffer.len() < self.written_len + mem::size_of::<usize>() {
-            eprintln!("MsgWriter::write_name: Buffer too small to write name length. written_len: {}, buffer_len: {}", self.written_len, self.buffer.len());
-            self.written_len = self.buffer.len();
-            return Ok(());
-        }
-        if let Some(name) = name {
-            let copy_len = cmp::min(
-                name_buf_size,
-                self.buffer.len() - self.written_len - mem::size_of::<usize>(),
-            );
-            if name_buf_size > 0 && copy_len < name.len() {
-                eprintln!("MsgWriter::write_name: Name will be truncated. Full length: {}, buffer available: {}", name.len(), copy_len);
-            }
-            let name_len = name_write_fn(
-                &name,
-                &mut self.buffer[self.written_len + mem::size_of::<usize>()
-                    ..self.written_len + mem::size_of::<usize>() + copy_len],
-            )?;
-            self.buffer[self.written_len..self.written_len + mem::size_of::<usize>()]
-                .copy_from_slice(&name_len.to_le_bytes());
-            self.written_len += mem::size_of::<usize>() + name_len;
-            Ok(())
-        } else {
-            self.written_len += mem::size_of::<usize>();
-            Ok(())
-        }
-    }
-
-    fn write_payload(&mut self, payload: &[u8], full_len: usize, iov_size: usize) -> Result<usize> {
-        let Some(payload_len_buffer) = self
-            .buffer
-            .get_mut(self.written_len..self.written_len + mem::size_of::<usize>())
-        else {
-            eprintln!("MsgWriter::write_payload: Buffer too small to write payload length. written_len: {}, buffer_len: {}", self.written_len, self.buffer.len());
-            self.written_len = self.buffer.len();
-            return Ok(0);
-        };
-        payload_len_buffer.copy_from_slice(&full_len.to_le_bytes());
-        self.written_len += mem::size_of::<usize>();
-
-        let copy_len = cmp::min(iov_size, full_len);
-        if copy_len < full_len {
-            eprintln!("MsgWriter::write_payload: Payload will be truncated. Full length: {}, buffer available: {}", full_len, copy_len);
-        }
-        let Some(payload_buffer) = self
-            .buffer
-            .get_mut(self.written_len..self.written_len + copy_len)
-        else {
-            eprintln!("MsgWriter::write_payload: Buffer too small to write payload data. written_len: {}, buffer_len: {}", self.written_len, self.buffer.len());
-            self.written_len = self.buffer.len();
-            return Ok(0);
-        };
-        payload_buffer.copy_from_slice(&payload[..copy_len]);
-        self.written_len += copy_len;
-        Ok(copy_len)
-    }
-
-    fn write_cmsg(&mut self, level: i32, c_type: i32, data: &[u8]) -> bool {
-        let data_len = data.len();
-
-        let Some(remaining_buf) = self.buffer.get_mut(self.written_len..) else {
-            eprintln!("CmsgWriter::write_cmsg: No remaining buffer space at all.");
-            return false;
-        };
-        if remaining_buf.len() < CMSG_HEADER_LEN_IN_STREAM {
-            eprintln!("CmsgWriter::write_cmsg: Not enough space for cmsg header. remaining: {}, needed: {}", remaining_buf.len(), CMSG_HEADER_LEN_IN_STREAM);
-            // Fill the remaining buffer with 1s to indicate Imcomplete CMSG header
-            remaining_buf.fill(1);
-            self.written_len += remaining_buf.len();
-            return false;
-        }
-        let mut cursor = 0;
-        remaining_buf[cursor..cursor + CMSG_LEVEL_SIZE].copy_from_slice(&level.to_le_bytes());
-        cursor += CMSG_LEVEL_SIZE;
-        remaining_buf[cursor..cursor + CMSG_TYPE_SIZE].copy_from_slice(&c_type.to_le_bytes());
-        cursor += CMSG_TYPE_SIZE;
-        remaining_buf[cursor..cursor + CMSG_DATA_LEN_SIZE].copy_from_slice(&data_len.to_le_bytes());
-        cursor += CMSG_DATA_LEN_SIZE;
-
-        if remaining_buf.len() < cursor + data_len {
-            eprintln!(
-                "CmsgWriter::write_cmsg: Not enough space for cmsg data. remaining: {}, needed: {}",
-                remaining_buf.len(),
-                cursor + data_len
-            );
-            // Fill the remaining buffer with 1s to indicate Imcomplete CMSG data
-            remaining_buf.fill(1);
-            self.written_len += remaining_buf.len();
-            return false;
-        }
-        remaining_buf[cursor..cursor + data_len].copy_from_slice(data);
-        self.written_len += cursor + data_len;
-
-        true
-    }
-
-    fn write_rights(&mut self, num_fds: usize) -> bool {
-        let data = num_fds.to_le_bytes();
-        if num_fds == 0 {
-            return true;
-        }
-        self.write_cmsg(libc::SOL_SOCKET, libc::SCM_RIGHTS, &data)
-    }
-
-    fn write_credentials(&mut self, credential: &Credential) -> bool {
-        let mut data = [0u8; PID_SIZE + UID_SIZE + GID_SIZE];
-        data[..PID_SIZE].copy_from_slice(&credential.pid.to_le_bytes());
-        data[PID_SIZE..PID_SIZE + UID_SIZE].copy_from_slice(&credential.uid.to_le_bytes());
-        data[PID_SIZE + UID_SIZE..PID_SIZE + UID_SIZE + GID_SIZE]
-            .copy_from_slice(&credential.gid.to_le_bytes());
-        self.write_cmsg(libc::SOL_SOCKET, SCM_CREDENTIALS, &data)
-    }
-}
-
-fn path_buf_to_str(path_buf: &[u8]) -> Result<&str> {
-    match std::str::from_utf8(path_buf) {
-        Ok("") => Err(Error::new(EINVAL)),
-        Ok(s) => Ok(s),
-        Err(_) => Err(Error::new(EINVAL)),
-    }
-}
diff --git a/recipes/core/base/ipcd/src/uds/stream.rs b/recipes/core/base/ipcd/src/uds/stream.rs
deleted file mode 100644
index 46de854ee8..0000000000
--- a/recipes/core/base/ipcd/src/uds/stream.rs
+++ /dev/null
@@ -1,1431 +0,0 @@
-//! uds scheme for handling Unix Domain Socket stream communication
-
-use super::{
-    get_uid_gid_from_pid, path_buf_to_str, read_msghdr_info, read_num, AncillaryData, Credential,
-    DataPacket, MsgWriter, MIN_RECV_MSG_LEN,
-};
-
-use libc::{ucred, AF_UNIX};
-use libredox::protocol::SocketCall;
-use rand::prelude::*;
-use redox_scheme::{
-    scheme::SchemeSync, CallerCtx, OpenResult, RecvFdRequest, Response, SendFdRequest,
-    SignalBehavior, Socket as SchemeSocket,
-};
-use scheme_utils::FpathWriter;
-use std::{
-    cell::RefCell,
-    cmp,
-    collections::{HashMap, HashSet, VecDeque},
-    mem,
-    rc::Rc,
-    slice,
-};
-use syscall::{error::*, flag::*, schemev2::NewFdFlags, Error, Stat};
-
-#[derive(Clone, Copy, Default)]
-struct MsgFlags(libc::c_int);
-
-impl MsgFlags {
-    fn nonblock(&self) -> bool {
-        self.0 & libc::MSG_DONTWAIT == libc::MSG_DONTWAIT
-    }
-}
-
-#[derive(Debug, Default, Clone, PartialEq, Eq)]
-struct Connection {
-    peer: usize,
-    packets: VecDeque<DataPacket>,
-    fds: VecDeque<usize>,
-
-    is_peer_shutdown: bool,
-}
-impl Connection {
-    fn new(peer: usize) -> Self {
-        Self {
-            peer,
-            ..Default::default()
-        }
-    }
-
-    fn drop_fds(&mut self, num_fd: usize) -> Result<()> {
-        for i in 0..num_fd {
-            if self.fds.pop_front().is_none() {
-                eprintln!("Connection::drop_fds: Attempted to drop FD #{} of {}, but fd queue is empty. State inconsistency.", i + 1, num_fd);
-                return Err(Error::new(EPROTO));
-            }
-        }
-        Ok(())
-    }
-
-    fn can_read(&self) -> bool {
-        !self.packets.is_empty() || !self.fds.is_empty() || self.is_peer_shutdown
-    }
-
-    fn serialize_to_msgstream(
-        &mut self,
-        stream: &mut [u8],
-        name_buf_size: usize,
-        iov_size: usize,
-        options: HashSet<i32>,
-    ) -> Result<usize> {
-        let mut name: Option<String> = None;
-        let mut payload_buffer: Vec<u8> = Vec::with_capacity(iov_size);
-        let mut ancillary_data_buffer: VecDeque<AncillaryData> = VecDeque::new();
-        let mut total_copied_len = 0;
-        let mut user_buf_offset = 0;
-
-        while user_buf_offset < iov_size {
-            let Some(packet) = self.packets.front_mut() else {
-                // No more packets to read
-                break;
-            };
-
-            let packet_rem_payload = &packet.payload[packet.read_offset..];
-
-            let user_buf_rem_len = iov_size - user_buf_offset;
-
-            let copied_len = cmp::min(packet_rem_payload.len(), user_buf_rem_len);
-            if copied_len == 0 {
-                // No more data to read from this packet
-                break;
-            }
-            payload_buffer.extend_from_slice(&packet_rem_payload[..copied_len]);
-
-            if !packet.ancillary_taken {
-                name = name.or_else(|| packet.ancillary_data.name.take());
-                ancillary_data_buffer.push_back(packet.ancillary_data.clone());
-                packet.ancillary_taken = true; // Mark ancillary data as taken
-            }
-
-            packet.read_offset += copied_len;
-            user_buf_offset += copied_len;
-            total_copied_len += copied_len;
-            if packet.read_offset >= packet.payload.len() {
-                // If the packet is fully read, remove it from the queue
-                self.packets.pop_front();
-            }
-        }
-
-        let mut msg_writer = MsgWriter::new(stream);
-
-        msg_writer.write_name(name, name_buf_size, UdsStreamScheme::fpath_inner)?;
-
-        let full_len = cmp::min(total_copied_len, iov_size);
-        msg_writer.write_payload(&payload_buffer, full_len, iov_size)?;
-
-        let mut num_fds = 0;
-        for ancillary_data in ancillary_data_buffer.iter() {
-            num_fds += ancillary_data.num_fds;
-        }
-        if !msg_writer.write_rights(num_fds) {
-            eprintln!(
-                "serialize_to_msgstream: Buffer too small for SCM_RIGHTS, dropping {} FDs.",
-                num_fds
-            );
-            self.drop_fds(num_fds)?;
-        }
-
-        for option in options {
-            let result = match option {
-                libc::SO_PASSCRED => {
-                    let mut success = true;
-                    for data in &ancillary_data_buffer {
-                        if !msg_writer.write_credentials(&data.cred) {
-                            success = false;
-                            break;
-                        }
-                    }
-                    success
-                }
-                _ => {
-                    eprintln!(
-                        "serialize_to_msgstream: Unsupported socket option for serialization: {}",
-                        option
-                    );
-                    return Err(Error::new(EOPNOTSUPP));
-                }
-            };
-            if !result {
-                eprintln!("serialize_to_msgstream: Buffer too small for ancillary data, stopping further serialization.");
-                break;
-            }
-        }
-
-        Ok(msg_writer.len())
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Copy)]
-pub enum State {
-    Unbound,
-    Bound,
-    Listening,
-    Connecting,
-    Accepted,
-    Established,
-    Closed,
-}
-
-impl Default for State {
-    fn default() -> Self {
-        Self::Unbound
-    }
-}
-
-#[derive(Debug)]
-pub struct Socket {
-    primary_id: usize,
-    path: Option<String>,
-    options: HashSet<i32>,
-    flags: usize,
-    state: State,
-    awaiting: VecDeque<(usize, ucred)>,
-    connection: Option<Connection>,
-    issued_token: Option<u64>,
-    ucred: ucred,
-}
-
-impl Socket {
-    fn new(
-        id: usize,
-        path: Option<String>,
-        state: State,
-        options: HashSet<i32>,
-        flags: usize,
-        connection: Option<Connection>,
-        ctx: &CallerCtx,
-    ) -> Self {
-        Self {
-            primary_id: id,
-            path,
-            state,
-            options,
-            flags,
-            awaiting: VecDeque::new(),
-            connection,
-            issued_token: None,
-            //TODO: when should ucred be updated? man 7 unix for SO_PEERCRED says on connect, listen, or socketpair
-            ucred: ucred {
-                pid: ctx.pid as _,
-                uid: ctx.uid as _,
-                gid: ctx.gid as _,
-            },
-        }
-    }
-
-    fn events(&self) -> EventFlags {
-        let mut ready = EventFlags::empty();
-        if let Some(connection) = &self.connection {
-            if connection.can_read() {
-                ready |= EVENT_READ;
-            }
-            //TODO: block on write buffer
-            ready |= EVENT_WRITE;
-        }
-        match self.state {
-            State::Listening => {
-                if !self.awaiting.is_empty() {
-                    ready |= EVENT_READ;
-                }
-            }
-            State::Closed => {
-                ready |= EVENT_READ;
-            }
-            _ => {}
-        }
-        ready
-    }
-
-    fn accept(
-        &mut self,
-        primary_id: usize,
-        awaiting_client_id: usize,
-        client_ucred: ucred,
-        ctx: &CallerCtx,
-    ) -> Result<Self> {
-        if !self.is_listening() {
-            eprintln!(
-                "accept(id: {}): Accept called on a non-listening socket.",
-                self.primary_id
-            );
-            return Err(Error::new(EINVAL));
-        }
-        Ok(Self {
-            primary_id,
-            path: self.path.clone(),
-            state: State::Established,
-            options: self.options.clone(),
-            flags: self.flags,
-            awaiting: VecDeque::new(),
-            connection: Some(Connection::new(awaiting_client_id)),
-            issued_token: None,
-            ucred: client_ucred,
-        })
-    }
-
-    fn establish(&mut self, new_socket: &mut Self, peer: usize) -> Result<()> {
-        if self.state != State::Connecting {
-            eprintln!(
-                "establish(id: {}): Cannot establish connection in state: {:?}",
-                self.primary_id, self.state
-            );
-            return Err(Error::new(EINVAL));
-        }
-        self.state = State::Accepted;
-        if let Some(conn) = &mut self.connection {
-            if conn.peer != peer {
-                // client is expecting other connection
-                return Err(Error::new(EAGAIN));
-            }
-            conn.peer = new_socket.primary_id;
-            if let Some(ref mut new_conn) = &mut new_socket.connection {
-                new_conn.packets.append(&mut conn.packets);
-            }
-        } else {
-            // client is dead
-            return Err(Error::new(EAGAIN));
-        }
-        Ok(())
-    }
-
-    fn connect(&mut self, other: &mut Socket, client_ucred: ucred) -> Result<()> {
-        match self.state {
-            State::Unbound | State::Bound => {
-                // If the socket is unbound or bound, wait for the listener to start listening.
-                if other.flags & O_NONBLOCK != O_NONBLOCK {
-                    // If the connecting target is not a listening,
-                    // the connecting socket will block until the socket
-                    // is ready to accept.
-                    return Err(Error::new(EWOULDBLOCK));
-                }
-            }
-            State::Listening => {
-                // If the socket is already listening, it can accept connections.
-            }
-            _ => return Err(Error::new(ECONNREFUSED)),
-        }
-        self.connect_unchecked(other, client_ucred);
-        Ok(())
-    }
-
-    fn connect_unchecked(&mut self, other: &mut Socket, client_ucred: ucred) {
-        self.awaiting.push_back((other.primary_id, client_ucred));
-        other.state = State::Connecting;
-        other.connection = Some(Connection::new(self.primary_id));
-    }
-
-    fn is_listening(&self) -> bool {
-        self.state == State::Listening
-    }
-
-    fn require_connection(&mut self) -> Result<&mut Connection> {
-        if let Some(connection) = &mut self.connection {
-            Ok(connection)
-        } else {
-            eprintln!(
-                "Socket (id: {}): connection is None in require_connection",
-                self.primary_id
-            );
-            Err(Error::new(EPROTO))
-        }
-    }
-
-    fn require_connected_connection(&mut self, msg_flags: MsgFlags) -> Result<&mut Connection> {
-        match self.state {
-            State::Established | State::Accepted => self.require_connection(),
-            State::Connecting => {
-                if self.flags & O_NONBLOCK == O_NONBLOCK || msg_flags.nonblock() {
-                    Err(Error::new(EAGAIN))
-                } else {
-                    Err(Error::new(EWOULDBLOCK))
-                }
-            }
-            State::Closed => Err(Error::new(EPIPE)),
-            _ => Err(Error::new(ENOTCONN)),
-        }
-    }
-
-    fn start_listening(&mut self) -> Result<()> {
-        if !matches!(self.state, State::Unbound | State::Bound) {
-            eprintln!(
-                "start_listening(id: {}): Socket cannot listen in state {:?}.",
-                self.primary_id, self.state
-            );
-            return Err(Error::new(EINVAL));
-        }
-        self.state = State::Listening;
-        Ok(())
-    }
-
-    fn serialize_to_msgstream(
-        &mut self,
-        msg_flags: MsgFlags,
-        stream: &mut [u8],
-        name_buf_size: usize,
-        iov_size: usize,
-    ) -> Result<usize> {
-        let options = self.options.clone();
-        let connection = self.require_connected_connection(msg_flags)?;
-        connection.serialize_to_msgstream(stream, name_buf_size, iov_size, options)
-    }
-}
-
-enum Handle {
-    Socket(Rc<RefCell<Socket>>),
-    SchemeRoot,
-}
-
-impl Handle {
-    fn as_socket(&self) -> Option<&Rc<RefCell<Socket>>> {
-        if let Self::Socket(socket) = self {
-            Some(socket)
-        } else {
-            None
-        }
-    }
-    fn is_scheme_root(&self) -> bool {
-        matches!(self, Self::SchemeRoot)
-    }
-}
-
-pub struct UdsStreamScheme<'sock> {
-    handles: HashMap<usize, Handle>,
-    next_id: usize,
-    socket_paths: HashMap<String, Rc<RefCell<Socket>>>,
-    socket_tokens: HashMap<u64, Rc<RefCell<Socket>>>,
-    socket: &'sock SchemeSocket,
-    proc_creds_capability: usize,
-    rng: SmallRng,
-}
-
-impl<'sock> UdsStreamScheme<'sock> {
-    pub fn new(socket: &'sock SchemeSocket) -> Result<Self> {
-        Ok(Self {
-            handles: HashMap::new(),
-            next_id: 0,
-            socket_paths: HashMap::new(),
-            socket_tokens: HashMap::new(),
-            socket,
-            proc_creds_capability: {
-                libredox::call::open(
-                    "/scheme/proc/proc-creds-capability",
-                    libredox::flag::O_RDONLY,
-                    0,
-                )?
-            },
-            rng: rand::make_rng(),
-        })
-    }
-
-    fn post_fevent(&self, id: usize, flags: EventFlags) -> Result<()> {
-        /*TODO: filter out unnecessary flags?
-        if let Ok(socket_rc) = self.get_socket(id) {
-            let socket = socket_rc.borrow();
-            let socket_flags = socket.events();
-        }
-        */
-        let fevent_response = Response::post_fevent(id, flags.bits());
-        match self
-            .socket
-            .write_response(fevent_response, SignalBehavior::Restart)
-        {
-            Ok(true) => Ok(()),                   // Write response success
-            Ok(false) => Err(Error::new(EAGAIN)), // Write response failed, retry.
-            Err(err) => Err(err),                 // Error writing response
-        }
-    }
-
-    fn get_socket(&self, id: usize) -> Result<&Rc<RefCell<Socket>>, Error> {
-        self.handles
-            .get(&id)
-            .and_then(Handle::as_socket)
-            .ok_or(Error::new(EBADF))
-    }
-
-    fn insert_socket(&mut self, id: usize, socket: Rc<RefCell<Socket>>) {
-        self.handles.insert(id, Handle::Socket(socket));
-    }
-
-    fn get_connected_peer(&self, id: usize) -> Result<(usize, Rc<RefCell<Socket>>), Error> {
-        let mut socket = self.get_socket(id)?.borrow_mut();
-
-        let remote_id = socket.require_connection()?.peer;
-        let remote_rc = self.get_socket(remote_id).map_err(|e| {
-            eprintln!("get_connected_peer(id: {}): Peer socket (id: {}) has vanished. Original error: {:?}", id, remote_id, e);
-            Error::new(EPIPE)
-        })?;
-
-        if remote_rc.borrow().state == State::Closed {
-            eprintln!(
-                "get_connected_peer(id: {}): Attempted to interact with a closed peer (id: {}).",
-                id, remote_id
-            );
-            return Err(Error::new(ECONNREFUSED));
-        }
-
-        Ok((remote_id, remote_rc.clone()))
-    }
-
-    fn handle_unnamed_socket(&mut self, flags: usize, ctx: &CallerCtx) -> usize {
-        let new_id = self.next_id;
-        let new = Socket::new(
-            new_id,
-            None,
-            State::Unbound,
-            HashSet::new(),
-            flags,
-            None,
-            ctx,
-        );
-        self.insert_socket(new_id, Rc::new(RefCell::new(new)));
-        self.next_id += 1;
-        new_id
-    }
-
-    fn call_inner(
-        &mut self,
-        id: usize,
-        payload: &mut [u8],
-        metadata: &[u64],
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let Some(verb) =
-            SocketCall::try_from_raw(*metadata.get(0).ok_or(Error::new(EINVAL))? as usize)
-        else {
-            eprintln!("call_inner: Invalid verb in metadata: {:?}", metadata);
-            return Err(Error::new(EINVAL));
-        };
-        match verb {
-            SocketCall::Bind => self.handle_bind(id, &payload),
-            SocketCall::Connect => self.handle_connect(id, &payload, ctx),
-            SocketCall::SetSockOpt => self.handle_setsockopt(
-                id,
-                *metadata.get(1).ok_or(Error::new(EINVAL))? as i32,
-                &payload,
-            ),
-            SocketCall::GetSockOpt => self.handle_getsockopt(
-                id,
-                *metadata.get(1).ok_or(Error::new(EINVAL))? as i32,
-                payload,
-            ),
-            SocketCall::SendMsg => self.handle_sendmsg(
-                id,
-                metadata
-                    .get(1)
-                    .map(|x| MsgFlags(*x as _))
-                    .unwrap_or_default(),
-                payload,
-                ctx,
-            ),
-            SocketCall::RecvMsg => self.handle_recvmsg(
-                id,
-                metadata
-                    .get(1)
-                    .map(|x| MsgFlags(*x as _))
-                    .unwrap_or_default(),
-                payload,
-            ),
-            SocketCall::Unbind => self.handle_unbind(id),
-            SocketCall::GetToken => self.handle_get_token(id, payload),
-            SocketCall::GetPeerName => self.handle_get_peer_name(id, payload),
-            _ => Err(Error::new(EOPNOTSUPP)),
-        }
-    }
-
-    fn handle_bind(&mut self, id: usize, path_buf: &[u8]) -> Result<usize> {
-        let path = path_buf_to_str(path_buf)?;
-
-        if self.socket_paths.contains_key(path) {
-            eprintln!("handle_bind: Path '{}' is already in use.", path);
-            return Err(Error::new(EADDRINUSE));
-        }
-
-        let socket_rc = self.get_socket(id)?.clone();
-        let path_owned: String;
-        let token: u64;
-        {
-            let mut socket = socket_rc.borrow_mut();
-
-            if socket.state != State::Unbound {
-                eprintln!(
-                    "handle_bind(id: {}): Socket is already bound or connected (state: {:?})",
-                    id, socket.state
-                );
-                return Err(Error::new(EINVAL));
-            }
-
-            path_owned = path.to_string();
-            socket.path = Some(path_owned.clone());
-            socket.state = State::Bound;
-            token = self.rng.next_u64();
-            socket.issued_token = Some(token);
-
-            //TODO: Hack since relibc does not listen()
-            socket.start_listening()?;
-        }
-
-        self.socket_paths.insert(path_owned, socket_rc.clone());
-        self.socket_tokens.insert(token, socket_rc);
-
-        Ok(0)
-    }
-
-    // There are three phases of connecting a socket:
-    //
-    // Phase 1: The listener is bound but not yet listening.
-    //          The client is trying to connect.
-    //          If the listener is not listening, the listener will
-    //          refuse to connect until the listener starts listening.
-    //
-    // Phase 2: The listener is now listening.
-    //          The client is still trying to connect.
-    //          The client pushes its ID to the listener's awaiting queue
-    //          and sets its state to `Connecting`.
-    //          The client will be blocked from receiving messages,
-    //          but now allowed to send messages.
-    //
-    // Phase 3: The listener accepts the client, changes its state to `Established`,
-    //          and then changes the client's state to `Accepted`.
-    //          The client detects that its state has changed to `Accepted`
-    //          and changes its own state to `Established`.
-    //
-    // After these three phases, the socket connection is considered established.
-    fn handle_connect(&mut self, id: usize, token_buf: &[u8], ctx: &CallerCtx) -> Result<usize> {
-        let token = read_num::<u64>(token_buf)?;
-        let (listener_id, connecting_res) = {
-            let listener_rc = self
-                .socket_tokens
-                .get(&token)
-                .ok_or_else(|| Error::new(ECONNREFUSED))?
-                .clone();
-
-            let client_rc = self.get_socket(id)?.clone();
-            let mut client = client_rc.borrow_mut();
-
-            // Phase 1: listener is bound but not yet listening
-            let mut listener = listener_rc.borrow_mut();
-            let listener_id = listener.primary_id;
-
-            let connecting_res = if client.flags & O_NONBLOCK == O_NONBLOCK {
-                Err(Error::new(EAGAIN))
-            } else {
-                Err(Error::new(EWOULDBLOCK))
-            };
-
-            match client.state {
-                State::Connecting => {
-                    if client
-                        .connection
-                        .as_ref()
-                        .is_some_and(|c| c.peer == listener_id)
-                    {
-                        // No op
-                        return connecting_res;
-                    }
-                }
-                State::Established => {
-                    return Err(Error::new(EISCONN));
-                }
-                State::Accepted => {
-                    // Phase 3: Socket is already connected
-                    client.state = State::Established;
-                    return Ok(0);
-                }
-                _ => {}
-            }
-
-            let client_ucred = ucred {
-                pid: ctx.pid as _,
-                uid: ctx.uid as _,
-                gid: ctx.gid as _,
-            };
-
-            // Phase 2: listener is now listening
-            listener.connect(&mut client, client_ucred)?;
-
-            (listener_id, connecting_res)
-        };
-        // smoltcp sends writeable whenever a listener gets a
-        // client, we'll do the same too (but also readable, why
-        // not)
-        self.post_fevent(listener_id, EVENT_READ | EVENT_WRITE)?;
-        connecting_res
-    }
-
-    fn handle_setsockopt(&mut self, id: usize, option: i32, value_slice: &[u8]) -> Result<usize> {
-        let socket_rc = self.get_socket(id)?;
-        let mut socket = socket_rc.borrow_mut();
-
-        match option {
-            libc::SO_PASSCRED => {
-                let value = read_num::<i32>(value_slice)?;
-                if value != 0 {
-                    socket.options.insert(libc::SO_PASSCRED);
-                } else {
-                    socket.options.remove(&libc::SO_PASSCRED);
-                }
-                Ok(value_slice.len())
-            }
-            libc::SO_SNDBUF => {
-                // FIXME: implement
-                Ok(0)
-            }
-            _ => {
-                eprintln!(
-                    "socket_setsockopt(id: {}): Unsupported option: {}",
-                    id, option
-                );
-                Err(Error::new(ENOPROTOOPT))
-            }
-        }
-    }
-
-    fn handle_getsockopt(&mut self, id: usize, option: i32, payload: &mut [u8]) -> Result<usize> {
-        let mut write_value = |value: &[u8]| -> Result<usize> {
-            if payload.len() < value.len() {
-                eprintln!(
-                    "socket_getsockopt(id: {}, option: {}): payload buffer is too small. len: {} < {}",
-                    id,
-                    option,
-                    payload.len(),
-                    value.len()
-                );
-                return Err(Error::new(ENOBUFS));
-            }
-            payload.fill(0);
-            payload[..value.len()].copy_from_slice(&value);
-            Ok(value.len())
-        };
-        match option {
-            libc::SO_DOMAIN => write_value(&AF_UNIX.to_le_bytes()),
-            libc::SO_PEERCRED => {
-                let (_, remote_rc) = self.get_connected_peer(id)?;
-                let remote = remote_rc.borrow();
-                write_value(unsafe {
-                    slice::from_raw_parts(
-                        &remote.ucred as *const ucred as *const u8,
-                        mem::size_of::<ucred>(),
-                    )
-                })
-            }
-            libc::SO_SNDBUF => {
-                //TODO: default value on Linux, should we use something else?
-                let value: libc::c_int = 212992;
-                write_value(&value.to_le_bytes())
-            }
-            _ => {
-                eprintln!(
-                    "socket_getsockopt(id: {}): Unsupported option: {}",
-                    id, option
-                );
-                Err(Error::new(ENOPROTOOPT))
-            }
-        }
-    }
-
-    fn handle_sendmsg(
-        &mut self,
-        id: usize,
-        msg_flags: MsgFlags,
-        msg_stream: &[u8],
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        if msg_stream.is_empty() {
-            eprintln!("msg_stream is empty, returning EINVAL.");
-            return Err(Error::new(EINVAL));
-        }
-
-        let (bytes_written, remote_id) = {
-            let name = self.get_socket(id)?.borrow().path.clone();
-            let (remote_id, remote_rc) = self.get_connected_peer(id)?;
-            let mut socket = remote_rc.borrow_mut();
-            let connection = socket.require_connected_connection(msg_flags)?;
-            let (pid, uid, gid) = get_uid_gid_from_pid(self.proc_creds_capability, ctx.pid)?;
-
-            let packet = DataPacket::from_stream(
-                msg_stream,
-                name,
-                Credential::new(pid as i32, uid as i32, gid as i32),
-            )?;
-
-            let payload_len = packet.len();
-
-            // sendmsg(2) on `SOCK_STREAM` with zero-byte payload is a no-op
-            // even if ancillary data is present. Note that this does not apply
-            // to `SOCK_DGRAM`.
-            if payload_len == 0 {
-                return Ok(0);
-            }
-
-            connection.packets.push_back(packet);
-            (payload_len, remote_id)
-        };
-
-        self.post_fevent(remote_id, EVENT_READ)?;
-        Ok(bytes_written)
-    }
-
-    fn handle_recvmsg(
-        &mut self,
-        id: usize,
-        msg_flags: MsgFlags,
-        msg_stream: &mut [u8],
-    ) -> Result<usize> {
-        let socket_rc = self.get_socket(id)?;
-        let mut socket = socket_rc.borrow_mut();
-        let flags = socket.flags;
-        let connection = match &mut socket.state {
-            State::Established | State::Accepted => socket.require_connection()?,
-            State::Closed => {
-                // Remote dropped, send EOF
-                return Self::write_eof(msg_stream);
-            }
-            State::Listening => {
-                eprintln!("socket_recvmsg: Called on a listening socket, returning EOPNOTSUPP.");
-                return Err(Error::new(EOPNOTSUPP));
-            }
-            _ => return Err(Error::new(ENOTCONN)),
-        };
-
-        if connection.packets.is_empty() {
-            return if connection.is_peer_shutdown {
-                // EOF, no data to read
-                return Self::write_eof(msg_stream);
-            } else if (flags as usize) & O_NONBLOCK == O_NONBLOCK || msg_flags.nonblock() {
-                Err(Error::new(EAGAIN))
-            } else {
-                Err(Error::new(EWOULDBLOCK))
-            };
-        }
-        Self::recvmsg_inner(&mut socket, msg_flags, msg_stream)
-    }
-
-    fn write_eof(buffer: &mut [u8]) -> Result<usize> {
-        // Write EOF to the buffer
-        let target = buffer.get_mut(..MIN_RECV_MSG_LEN).ok_or_else(|| {
-            eprintln!("write_eof: Buffer is too small to write EOF, returning EINVAL.");
-            Error::new(EINVAL)
-        })?;
-        target.fill(0); // Fill the buffer with zeros to indicate EOF
-        Ok(MIN_RECV_MSG_LEN)
-    }
-
-    fn recvmsg_inner(
-        socket: &mut Socket,
-        msg_flags: MsgFlags,
-        msg_stream: &mut [u8],
-    ) -> Result<usize> {
-        let (prepared_name_len, prepared_whole_iov_size, _) = read_msghdr_info(msg_stream)?;
-
-        let written_len = socket.serialize_to_msgstream(
-            msg_flags,
-            msg_stream,
-            prepared_name_len,
-            prepared_whole_iov_size,
-        )?;
-
-        Ok(written_len)
-    }
-
-    fn handle_unbind(&mut self, id: usize) -> Result<usize> {
-        let path_opt = {
-            let socket_rc = self.get_socket(id)?;
-            let mut socket = socket_rc.borrow_mut();
-
-            if socket.state != State::Bound {
-                return Err(Error::new(EINVAL));
-            }
-
-            socket.state = State::Unbound;
-            socket.path.take()
-        };
-
-        if let Some(path) = path_opt {
-            self.socket_paths.remove(&path);
-        }
-
-        Ok(0)
-    }
-
-    fn handle_get_token(&self, id: usize, payload: &mut [u8]) -> Result<usize> {
-        let socket_rc = self.get_socket(id)?;
-        let Some(token) = socket_rc.borrow().issued_token else {
-            return Err(Error::new(EINVAL));
-        };
-        let token_bytes = token.to_le_bytes();
-        let token_bytes_len = token_bytes.len();
-        if payload.len() < token_bytes_len {
-            eprintln!(
-                "handle_get_token(id: {}): Payload buffer is too small for token.",
-                id
-            );
-            return Err(Error::new(ENOBUFS));
-        }
-        payload[..token_bytes_len].copy_from_slice(&token_bytes);
-        return Ok(token_bytes_len);
-    }
-
-    fn handle_get_peer_name(&self, id: usize, payload: &mut [u8]) -> Result<usize> {
-        let (_, socket_rc) = self.get_connected_peer(id)?;
-        let socket_borrow = socket_rc.borrow();
-        match socket_borrow.path.as_ref() {
-            Some(path_string) => Self::fpath_inner(path_string, payload),
-            None => {
-                let empty_path = "".to_string();
-                Self::fpath_inner(&empty_path, payload)
-            }
-        }
-    }
-
-    fn accept_connection(
-        &mut self,
-        listener_socket: &mut Socket,
-        client_id: usize,
-        client_ucred: ucred,
-        ctx: &CallerCtx,
-    ) -> Result<Option<OpenResult>> {
-        let (new_id, new) = {
-            let Ok(client_rc) = self.get_socket(client_id) else {
-                return Ok(None); // Client socket has been closed, nothing to accept
-            };
-            let new_id = self.next_id;
-            let mut new = listener_socket.accept(new_id, client_id, client_ucred, ctx)?;
-
-            let mut client_socket = client_rc.borrow_mut();
-            client_socket.establish(&mut new, listener_socket.primary_id)?;
-            (new_id, new)
-        };
-
-        self.next_id += 1;
-        self.insert_socket(new_id, Rc::new(RefCell::new(new)));
-        self.post_fevent(client_id, EVENT_READ | EVENT_WRITE)?;
-        Ok(Some(OpenResult::ThisScheme {
-            number: new_id,
-            flags: NewFdFlags::empty(),
-        }))
-    }
-
-    fn handle_accept(
-        &mut self,
-        id: usize,
-        socket: &mut Socket,
-        ctx: &CallerCtx,
-    ) -> Result<Option<OpenResult>> {
-        let flags = socket.flags;
-        if !socket.is_listening() {
-            eprintln!(
-                "socket_accept: Socket state is not Listening for id: {}",
-                id
-            );
-            return Err(Error::new(EINVAL));
-        }
-        loop {
-            // Try to accept a waiting connection
-            let Some((client_id, client_ucred)) = socket.awaiting.pop_front() else {
-                if flags & O_NONBLOCK == O_NONBLOCK {
-                    return Err(Error::new(EAGAIN));
-                } else {
-                    return Err(Error::new(EWOULDBLOCK));
-                }
-            };
-            return match self.accept_connection(socket, client_id, client_ucred, ctx) {
-                Ok(conn) => Ok(conn),
-                Err(Error { errno: EAGAIN }) => continue,
-                Err(e) => Err(e),
-            };
-        }
-    }
-
-    // Transition a Bound or Unbound socket to the Listening state.
-    fn handle_start_listening(&mut self, socket_rc: &Rc<RefCell<Socket>>) -> Result<()> {
-        let path = {
-            let mut socket = socket_rc.borrow_mut();
-            socket.start_listening()?;
-            socket.path.clone()
-        };
-
-        if let Some(path) = path {
-            if let Some(existing_socket_rc) = self.socket_paths.get(&path) {
-                if !Rc::ptr_eq(socket_rc, existing_socket_rc) {
-                    eprintln!("handle_start_listening: Path '{}' is already in use.", path);
-                    return Err(Error::new(EADDRINUSE));
-                }
-            }
-            self.socket_paths.insert(path, socket_rc.clone());
-        }
-        Ok(())
-    }
-
-    // Handle a `dup` call for `b"listen"`.
-    // If the socket is not yet listening, it transitions it to the Listening state.
-    // If it is already listening, it tries to accept a pending connection.
-    fn handle_listen(&mut self, id: usize, ctx: &CallerCtx) -> Result<OpenResult> {
-        loop {
-            let socket_rc = self.get_socket(id)?.clone();
-            let is_listening = socket_rc.borrow().is_listening();
-
-            if is_listening {
-                let mut socket = socket_rc.borrow_mut();
-                match self.handle_accept(id, &mut socket, ctx)? {
-                    Some(result) => return Ok(result),
-                    None => continue,
-                }
-            } else {
-                self.handle_start_listening(&socket_rc)?;
-                continue;
-            }
-        }
-    }
-
-    fn handle_connect_socketpair(&mut self, id: usize, ctx: &CallerCtx) -> Result<OpenResult> {
-        let new_id = self.next_id;
-        let flags = self.get_socket(id)?.borrow().flags;
-        let mut new = Socket::new(
-            new_id,
-            None,
-            State::Unbound,
-            HashSet::new(),
-            flags,
-            None,
-            ctx,
-        );
-        {
-            let socket_rc = self.get_socket(id)?;
-            let mut socket = socket_rc.borrow_mut();
-
-            if socket.state == State::Closed {
-                eprintln!(
-                    "socket_connect_socketpair: Base socket {} is already closed.",
-                    id
-                );
-                return Err(Error::new(EPIPE));
-            }
-            let pair_ucred = ucred {
-                pid: ctx.pid as _,
-                uid: ctx.uid as _,
-                gid: ctx.gid as _,
-            };
-            socket.connect_unchecked(&mut new, pair_ucred);
-        }
-
-        // smoltcp sends writeable whenever a listener gets a
-        // client, we'll do the same too (but also readable,
-        // why not)
-        self.post_fevent(id, EVENT_READ | EVENT_WRITE)?;
-
-        self.insert_socket(new_id, Rc::new(RefCell::new(new)));
-
-        self.next_id += 1;
-
-        Ok(OpenResult::ThisScheme {
-            number: new_id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn handle_recvfd(&mut self, id: usize) -> Result<OpenResult> {
-        let socket_rc = self.get_socket(id)?;
-        let mut socket = socket_rc.borrow_mut();
-
-        match socket.state {
-            State::Established | State::Accepted => {
-                let connection = socket.require_connected_connection(MsgFlags::default())?;
-                let fd = connection.fds.pop_front().ok_or(Error::new(EWOULDBLOCK))?;
-                Ok(OpenResult::OtherScheme { fd })
-            }
-            State::Closed => Err(Error::new(EPIPE)),
-            State::Listening => Err(Error::new(EOPNOTSUPP)),
-            _ => Err(Error::new(ENOTCONN)),
-        }
-    }
-
-    fn write_inner(
-        &mut self,
-        sender_id: usize,
-        receiver_id: usize,
-        buf: &[u8],
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        {
-            let receiver_rc = self.get_socket(receiver_id)?;
-            let mut receiver = receiver_rc.borrow_mut();
-            let name = receiver.path.clone();
-
-            let connection = if receiver.is_listening() {
-                // not accepted yet, park the data to client until accept() handle it
-                let receiver_rc = self.get_socket(sender_id)?;
-                receiver = receiver_rc.borrow_mut();
-                receiver.require_connection()?
-            } else {
-                receiver.require_connected_connection(MsgFlags::default())?
-            };
-
-            if !buf.is_empty() {
-                // Send readable only if it wasn't readable before
-                let ancillary_data = AncillaryData::new(
-                    Credential::new(ctx.pid as i32, ctx.uid as i32, ctx.gid as i32),
-                    name,
-                );
-                let packet = DataPacket::new(buf.to_vec(), ancillary_data);
-                connection.packets.push_back(packet);
-            }
-        }
-
-        self.post_fevent(receiver_id, EVENT_READ)?;
-
-        Ok(buf.len())
-    }
-
-    fn sendfd_inner(
-        &mut self,
-        receiver_id: usize,
-        sendfd_request: &SendFdRequest,
-    ) -> Result<usize> {
-        let mut new_fds = Vec::new();
-        new_fds.resize(sendfd_request.num_fds(), usize::MAX);
-        if let Err(e) =
-            sendfd_request.obtain_fd(&self.socket, FobtainFdFlags::UPPER_TBL, &mut new_fds)
-        {
-            eprintln!("sendfd_inner: obtain_fd failed with error: {:?}", e);
-            return Err(e);
-        }
-        {
-            let receiver_rc = self.get_socket(receiver_id)?;
-            let mut receiver = receiver_rc.borrow_mut();
-
-            let connection = receiver.require_connected_connection(MsgFlags::default())?;
-            for new_fd in &new_fds {
-                connection.fds.push_back(*new_fd);
-            }
-        }
-
-        self.post_fevent(receiver_id, EVENT_READ)?;
-
-        Ok(new_fds.len())
-    }
-
-    fn recvfd_inner(&mut self, recvfd_request: &RecvFdRequest) -> Result<OpenResult> {
-        let socket_id = recvfd_request.id();
-        let socket_rc = self.get_socket(socket_id)?;
-        let mut socket = socket_rc.borrow_mut();
-
-        if recvfd_request.num_fds() == 0 {
-            return Ok(OpenResult::OtherSchemeMultiple { num_fds: 0 });
-        }
-
-        match socket.state {
-            State::Established | State::Accepted => {
-                let connection = socket.require_connected_connection(MsgFlags::default())?;
-
-                if connection.fds.len() < recvfd_request.num_fds() {
-                    return if connection.is_peer_shutdown {
-                        Ok(OpenResult::OtherSchemeMultiple { num_fds: 0 }) // EOF, no data to read
-                    } else if (socket.flags as usize) & O_NONBLOCK == O_NONBLOCK {
-                        Err(Error::new(EAGAIN))
-                    } else {
-                        Ok(OpenResult::WouldBlock)
-                    };
-                }
-
-                let fds: Vec<usize> = connection.fds.drain(..recvfd_request.num_fds()).collect();
-                if let Err(e) = recvfd_request.move_fd(&self.socket, FmoveFdFlags::empty(), &fds) {
-                    eprintln!("recvfd_inner: move_fd failed with error: {:?}", e);
-                    return Err(Error::new(EPROTO));
-                }
-
-                Ok(OpenResult::OtherSchemeMultiple {
-                    num_fds: recvfd_request.num_fds(),
-                })
-            }
-            State::Closed => Err(Error::new(EPIPE)),
-            State::Listening => Err(Error::new(EOPNOTSUPP)),
-            _ => Err(Error::new(ENOTCONN)),
-        }
-    }
-
-    fn read_inner(connection: &mut Connection, buf: &mut [u8], flags: u32) -> Result<usize> {
-        let mut total_copied_len = 0;
-        let mut user_buf_offset = 0;
-
-        while user_buf_offset < buf.len() {
-            let Some(packet) = connection.packets.front_mut() else {
-                // No more packets to read
-                break;
-            };
-
-            let packet_rem_payload = &packet.payload[packet.read_offset..];
-
-            let user_buf_rem_len = buf.len() - user_buf_offset;
-
-            let copied_len = cmp::min(packet_rem_payload.len(), user_buf_rem_len);
-            if copied_len == 0 {
-                // No more data to read from this packet
-                break;
-            }
-            buf[user_buf_offset..user_buf_offset + copied_len]
-                .copy_from_slice(&packet_rem_payload[..copied_len]);
-
-            if packet.read_offset == 0 {
-                packet.ancillary_taken = true; // Mark ancillary data as taken
-            }
-
-            packet.read_offset += copied_len;
-            user_buf_offset += copied_len;
-            total_copied_len += copied_len;
-            if packet.read_offset >= packet.payload.len() {
-                // If the packet is fully read, remove it from the queue
-                connection.packets.pop_front();
-            }
-        }
-
-        if total_copied_len > 0 {
-            Ok(total_copied_len)
-        } else if connection.is_peer_shutdown {
-            Ok(0) // EOF, no data to read
-        } else if (flags as usize) & O_NONBLOCK == O_NONBLOCK {
-            Err(Error::new(EAGAIN))
-        } else {
-            Err(Error::new(EWOULDBLOCK))
-        }
-    }
-
-    fn handle_listening_closure(&mut self, socket_rc: Rc<RefCell<Socket>>) {
-        let socket = socket_rc.borrow();
-        if let Some(path) = &socket.path {
-            self.socket_paths.remove(path);
-        }
-
-        if let Some(token) = &socket.issued_token {
-            self.socket_tokens.remove(&token);
-        }
-
-        // Notify all waiting clients about listener closure
-        for (client_id, _) in &socket.awaiting {
-            if let Ok(client_rc) = self.get_socket(*client_id) {
-                {
-                    let mut client = client_rc.borrow_mut();
-                    client.state = State::Closed;
-                }
-                let _ = self.post_fevent(*client_id, EVENT_READ);
-            }
-        }
-    }
-
-    fn handle_other_closure(&mut self, socket_rc: Rc<RefCell<Socket>>) {
-        // If this is the last reference to the socket, it's safe to remove the socket path.
-        let mut socket = socket_rc.borrow_mut();
-        if matches!(socket.state, State::Established | State::Accepted) {
-            let Ok(connection) = socket.require_connection() else {
-                return;
-            };
-            let Ok(remote_rc) = self.get_socket(connection.peer) else {
-                return;
-            };
-            let remote_id = {
-                let mut remote = remote_rc.borrow_mut();
-                let Ok(connection) = remote.require_connection() else {
-                    return;
-                };
-                connection.is_peer_shutdown = true;
-                remote.primary_id
-            };
-            let _ = self.post_fevent(remote_id, EVENT_READ);
-        }
-
-        if let Some(path) = socket.path.take() {
-            // If this is the last reference to the socket, remove the path from the registry
-            self.socket_paths.remove(&path);
-        }
-        if let Some(token) = socket.issued_token {
-            self.socket_tokens.remove(&token);
-        }
-        socket.state = State::Closed;
-    }
-
-    fn fpath_inner(path: &String, buf: &mut [u8]) -> Result<usize> {
-        FpathWriter::with(buf, "uds_stream", |w| {
-            w.push_str(path);
-            Ok(())
-        })
-    }
-}
-
-impl<'sock> SchemeSync for UdsStreamScheme<'sock> {
-    fn scheme_root(&mut self) -> Result<usize> {
-        let new_id = self.next_id;
-        self.handles.insert(new_id, Handle::SchemeRoot);
-        self.next_id += 1;
-        Ok(new_id)
-    }
-    fn openat(
-        &mut self,
-        fd: usize,
-        path: &str,
-        mut flags: usize,
-        fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        {
-            let Some(handle) = self.handles.get(&fd) else {
-                return Err(Error::new(EBADF));
-            };
-            if !handle.is_scheme_root() {
-                eprintln!(
-                    "openat(fd: {}, path: '{}'): fd is not an open capability.",
-                    fd, path
-                );
-                return Err(Error::new(EACCES));
-            }
-        }
-
-        flags |= fcntl_flags as usize;
-
-        let new_id = if path.is_empty() {
-            if flags & O_CREAT == O_CREAT {
-                self.handle_unnamed_socket(flags, ctx)
-            } else {
-                eprintln!(
-                    "open(path: '{}'): Attempting to open an unnamed socket without O_CREAT.",
-                    path
-                );
-                return Err(Error::new(EINVAL));
-            }
-        } else {
-            eprintln!(
-                "open(path: '{}'): Attempting to open a named socket, which is not supported.",
-                path
-            );
-            return Err(Error::new(EINVAL));
-        };
-        Ok(OpenResult::ThisScheme {
-            number: new_id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn call(
-        &mut self,
-        id: usize,
-        payload: &mut [u8],
-        metadata: &[u64],
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        self.call_inner(id, payload, metadata, ctx)
-    }
-
-    fn dup(&mut self, id: usize, buf: &[u8], ctx: &CallerCtx) -> Result<OpenResult> {
-        match buf {
-            b"listen" => self.handle_listen(id, ctx),
-            b"connect" => self.handle_connect_socketpair(id, ctx),
-            b"recvfd" => self.handle_recvfd(id),
-            _ => Err(Error::new(EINVAL)),
-        }
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let (receiver_id, _) = self.get_connected_peer(id)?;
-        self.write_inner(id, receiver_id, buf, ctx)
-    }
-
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        match self.handles.get(&id).ok_or(Error::new(EBADF))? {
-            Handle::SchemeRoot => Ok(Self::fpath_inner(&String::new(), buf)?),
-            Handle::Socket(socket_rc) => {
-                let socket = socket_rc.borrow();
-                let empty = String::new();
-                let path = socket.path.as_ref().unwrap_or(&empty);
-                Ok(Self::fpath_inner(path, buf)?)
-            }
-        }
-    }
-
-    fn fsync(&mut self, id: usize, _ctx: &CallerCtx) -> Result<()> {
-        self.get_socket(id).and(Ok(()))
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let socket_rc = self.get_socket(id)?;
-        let mut socket = socket_rc.borrow_mut();
-        match socket.state {
-            State::Established | State::Accepted | State::Connecting => {
-                let connection = socket.require_connected_connection(MsgFlags::default())?;
-                Self::read_inner(connection, buf, flags)
-            }
-            State::Closed => Ok(0),
-            State::Listening => Err(Error::new(EOPNOTSUPP)),
-            _ => Err(Error::new(ENOTCONN)),
-        }
-    }
-
-    fn on_sendfd(&mut self, sendfd_request: &SendFdRequest) -> Result<usize> {
-        let id = sendfd_request.id();
-        let (receiver_id, _) = self.get_connected_peer(id)?;
-
-        self.sendfd_inner(receiver_id, sendfd_request)
-    }
-
-    fn on_recvfd(&mut self, recvfd_request: &RecvFdRequest) -> Result<OpenResult> {
-        self.recvfd_inner(recvfd_request)
-    }
-
-    fn on_close(&mut self, id: usize) {
-        let Some(Handle::Socket(socket_rc)) = self.handles.remove(&id) else {
-            return;
-        };
-
-        let state = socket_rc.borrow().state;
-        match state {
-            State::Listening => {
-                self.handle_listening_closure(socket_rc);
-            }
-            _ => {
-                self.handle_other_closure(socket_rc);
-            }
-        }
-    }
-
-    fn fcntl(&mut self, id: usize, cmd: usize, arg: usize, _ctx: &CallerCtx) -> Result<usize> {
-        let socket_rc = self.get_socket(id)?;
-        let mut socket = socket_rc.borrow_mut();
-        match cmd {
-            F_GETFL => Ok(socket.flags),
-            F_SETFL => {
-                socket.flags = arg;
-                Ok(0)
-            }
-            _ => Err(Error::new(EINVAL)),
-        }
-    }
-
-    fn fevent(&mut self, id: usize, flags: EventFlags, _ctx: &CallerCtx) -> Result<EventFlags> {
-        let socket_rc = self.get_socket(id)?;
-        let socket = socket_rc.borrow();
-        Ok(socket.events() & flags)
-    }
-
-    fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        self.get_socket(id)?;
-
-        *stat = Stat {
-            st_mode: MODE_SOCK,
-            ..Default::default()
-        };
-
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/logd/Cargo.toml b/recipes/core/base/logd/Cargo.toml
deleted file mode 100644
index 85e617e6ff..0000000000
--- a/recipes/core/base/logd/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "logd"
-description = "Logging daemon"
-version = "0.1.0"
-authors = ["Jeremy Soller <jackpot51@gmail.com>"]
-edition = "2021"
-
-[dependencies]
-redox_syscall.workspace = true
-daemon = { path = "../daemon" }
-libredox.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../scheme-utils" }
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/logd/src/main.rs b/recipes/core/base/logd/src/main.rs
deleted file mode 100644
index 3636f1fa28..0000000000
--- a/recipes/core/base/logd/src/main.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use redox_scheme::Socket;
-use scheme_utils::Blocking;
-
-use crate::scheme::LogScheme;
-
-mod scheme;
-
-fn daemon(daemon: daemon::SchemeDaemon) -> ! {
-    let socket = Socket::create().expect("logd: failed to create log scheme");
-
-    let mut scheme = LogScheme::new(&socket);
-    let handler = Blocking::new(&socket, 16);
-
-    let _ = daemon.ready_sync_scheme(&socket, &mut scheme);
-
-    libredox::call::setrens(0, 0).expect("logd: failed to enter null namespace");
-
-    handler
-        .process_requests_blocking(scheme)
-        .expect("logd: failed to process requests");
-}
-
-fn main() {
-    daemon::SchemeDaemon::new(daemon);
-}
diff --git a/recipes/core/base/logd/src/scheme.rs b/recipes/core/base/logd/src/scheme.rs
deleted file mode 100644
index 070de3d678..0000000000
--- a/recipes/core/base/logd/src/scheme.rs
+++ /dev/null
@@ -1,253 +0,0 @@
-use std::collections::{BTreeMap, VecDeque};
-use std::fs::{File, OpenOptions};
-use std::io::{Read, Write};
-use std::mem;
-use std::os::fd::{FromRawFd, RawFd};
-use std::sync::mpsc::{self, Sender};
-
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult, SendFdRequest, Socket};
-use scheme_utils::{FpathWriter, HandleMap};
-use syscall::error::*;
-use syscall::schemev2::NewFdFlags;
-
-pub enum LogHandle {
-    Log {
-        context: Box<str>,
-        bufs: BTreeMap<usize, Vec<u8>>,
-    },
-    AddSink,
-    SchemeRoot,
-}
-
-pub struct LogScheme<'sock> {
-    socket: &'sock Socket,
-    kernel_debug: File,
-    output_tx: Sender<OutputCmd>,
-    handles: HandleMap<LogHandle>,
-}
-
-enum OutputCmd {
-    Log(Vec<u8>),
-    AddSink(usize),
-}
-
-impl<'sock> LogScheme<'sock> {
-    pub fn new(socket: &'sock Socket) -> Self {
-        let kernel_debug = OpenOptions::new()
-            .write(true)
-            .open("/scheme/debug")
-            .unwrap();
-
-        let mut kernel_sys_log = std::fs::File::open("/scheme/sys/log").unwrap();
-
-        let (output_tx, output_rx) = mpsc::channel::<OutputCmd>();
-
-        std::thread::spawn(move || {
-            let mut files: Vec<File> = vec![];
-            let mut logs = VecDeque::new();
-            for cmd in output_rx {
-                match cmd {
-                    OutputCmd::Log(line) => {
-                        for file in &mut files {
-                            let _ = file.write(&line);
-                            let _ = file.flush();
-                        }
-                        logs.push_back(line);
-                        // Keep a limited amount of logs for backfilling to bound memory usage
-                        while logs.len() > 1000 {
-                            logs.pop_front();
-                        }
-                    }
-                    OutputCmd::AddSink(log_fd) => {
-                        let mut file = unsafe { File::from_raw_fd(log_fd as RawFd) };
-                        for line in &logs {
-                            let _ = file.write(line);
-                            let _ = file.flush();
-                        }
-
-                        files.push(file)
-                    }
-                }
-            }
-        });
-
-        let output_tx2 = output_tx.clone();
-        std::thread::spawn(move || {
-            let mut handle_buf = vec![];
-            let mut buf = [0; 4096];
-            buf[.."kernel: ".len()].copy_from_slice(b"kernel: ");
-            loop {
-                let n = kernel_sys_log.read(&mut buf["kernel: ".len()..]).unwrap();
-                if n == 0 {
-                    // FIXME currently possible as /scheme/log/kernel presents a snapshot of the log queue
-                    break;
-                }
-                Self::write_logs(&output_tx2, &mut handle_buf, "kernel", &buf, None);
-            }
-        });
-
-        LogScheme {
-            socket,
-            kernel_debug,
-            output_tx,
-            handles: HandleMap::new(),
-        }
-    }
-
-    fn write_logs(
-        output_tx: &Sender<OutputCmd>,
-        handle_buf: &mut Vec<u8>,
-        context: &str,
-        buf: &[u8],
-        mut kernel_debug: Option<&mut File>,
-    ) {
-        let mut i = 0;
-        while i < buf.len() {
-            let b = buf[i];
-
-            if handle_buf.is_empty() && !context.is_empty() {
-                handle_buf.extend_from_slice(context.as_bytes());
-                handle_buf.extend_from_slice(b": ");
-            }
-
-            handle_buf.push(b);
-
-            if b == b'\n' {
-                if let Some(kernel_debug) = kernel_debug.as_mut() {
-                    // Writing to the kernel debug log never blocks
-                    let _ = kernel_debug.write(handle_buf);
-                    let _ = kernel_debug.flush();
-                }
-
-                output_tx
-                    .send(OutputCmd::Log(mem::take(handle_buf)))
-                    .unwrap();
-            }
-
-            i += 1;
-        }
-    }
-}
-
-impl<'sock> SchemeSync for LogScheme<'sock> {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(LogHandle::SchemeRoot))
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(self.handles.get(dirfd)?, LogHandle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-
-        let id = if path == "add_sink" {
-            self.handles.insert(LogHandle::AddSink)
-        } else {
-            self.handles.insert(LogHandle::Log {
-                context: path.to_string().into_boxed_str(),
-                bufs: BTreeMap::new(),
-            })
-        };
-
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        _buf: &mut [u8],
-        _offset: u64,
-        _flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let _handle = self.handles.get(id)?;
-
-        // TODO
-
-        Ok(0)
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let (context, bufs) = match self.handles.get_mut(id)? {
-            LogHandle::Log { context, bufs } => (context, bufs),
-            LogHandle::SchemeRoot | LogHandle::AddSink => return Err(Error::new(EBADF)),
-        };
-
-        let handle_buf = bufs.entry(ctx.pid).or_insert_with(|| Vec::new());
-
-        Self::write_logs(
-            &self.output_tx,
-            handle_buf,
-            context,
-            buf,
-            Some(&mut self.kernel_debug),
-        );
-
-        Ok(buf.len())
-    }
-
-    fn on_sendfd(&mut self, sendfd_request: &SendFdRequest) -> Result<usize> {
-        let id = sendfd_request.id();
-
-        if !matches!(self.handles.get(id)?, LogHandle::AddSink) {
-            return Err(Error::new(EBADF));
-        }
-
-        let mut new_fd = usize::MAX;
-        if let Err(e) = sendfd_request.obtain_fd(
-            &self.socket,
-            syscall::FobtainFdFlags::CLOEXEC,
-            std::slice::from_mut(&mut new_fd),
-        ) {
-            return Err(e);
-        }
-        self.output_tx.send(OutputCmd::AddSink(new_fd)).unwrap();
-
-        Ok(1)
-    }
-
-    fn fcntl(&mut self, id: usize, _cmd: usize, _arg: usize, _ctx: &CallerCtx) -> Result<usize> {
-        let _handle = self.handles.get(id)?;
-
-        Ok(0)
-    }
-
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, "log", |w| {
-            w.push_str(match self.handles.get(id)? {
-                LogHandle::Log { context, .. } => context,
-                LogHandle::AddSink => "add_sink",
-                LogHandle::SchemeRoot => return Err(Error::new(EBADF)),
-            });
-            Ok(())
-        })
-    }
-
-    fn fsync(&mut self, id: usize, _ctx: &CallerCtx) -> Result<()> {
-        let _handle = self.handles.get(id)?;
-
-        //TODO: flush remaining data?
-
-        Ok(())
-    }
-
-    fn on_close(&mut self, id: usize) {
-        self.handles.remove(id);
-    }
-}
diff --git a/recipes/core/base/netstack/Cargo.toml b/recipes/core/base/netstack/Cargo.toml
deleted file mode 100644
index df6d9d82ba..0000000000
--- a/recipes/core/base/netstack/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "netstack"
-description = "Network stack daemons"
-version = "0.1.0"
-edition = "2021"
-
-[[bin]]
-name = "netstack"
-path = "src/main.rs"
-
-[dependencies]
-redox_event.workspace = true
-daemon = { path = "../daemon" }
-redox_syscall = { workspace = true, features = ["std"] }
-redox-log.workspace = true
-libredox = { workspace = true, features = ["mkns"] }
-anyhow.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../scheme-utils" }
-
-[dependencies.log]
-workspace = true
-default-features = false
-features = ["release_max_level_warn"]
-
-[dependencies.smoltcp]
-version = "0.12.0"
-default-features = false
-features = [
-    "std",
-    "medium-ethernet", "medium-ip",
-    "proto-ipv4",
-    "socket-raw", "socket-icmp", "socket-udp", "socket-tcp", "socket-tcp-cubic",
-    "iface-max-addr-count-8",
-    "log"
-]
-#For debugging: "log", "verbose"
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/netstack/src/buffer_pool.rs b/recipes/core/base/netstack/src/buffer_pool.rs
deleted file mode 100644
index 5991f9ece3..0000000000
--- a/recipes/core/base/netstack/src/buffer_pool.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use std::cell::RefCell;
-use std::mem::{replace, swap};
-use std::ops::{Deref, DerefMut, Drop};
-use std::rc::Rc;
-
-type BufferStack = Rc<RefCell<Vec<Vec<u8>>>>;
-
-pub struct Buffer {
-    buffer: Vec<u8>,
-    stack: BufferStack,
-}
-
-impl Buffer {
-    pub fn resize(&mut self, new_len: usize) {
-        self.buffer.resize(new_len, 0u8);
-    }
-
-    pub fn move_out(&mut self) -> Buffer {
-        Buffer {
-            buffer: replace(&mut self.buffer, vec![]),
-            stack: Rc::clone(&self.stack),
-        }
-    }
-}
-
-impl AsRef<[u8]> for Buffer {
-    fn as_ref(&self) -> &[u8] {
-        &self.buffer
-    }
-}
-
-impl AsMut<[u8]> for Buffer {
-    fn as_mut(&mut self) -> &mut [u8] {
-        &mut self.buffer
-    }
-}
-
-impl Deref for Buffer {
-    type Target = [u8];
-
-    fn deref(&self) -> &Self::Target {
-        &self.buffer
-    }
-}
-
-impl DerefMut for Buffer {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.buffer
-    }
-}
-
-impl Drop for Buffer {
-    fn drop(&mut self) {
-        if self.buffer.capacity() > 0 {
-            let mut tmp = vec![];
-            swap(&mut tmp, &mut self.buffer);
-            {
-                let mut stack = self.stack.borrow_mut();
-                stack.push(tmp);
-            }
-        }
-    }
-}
-
-pub struct BufferPool {
-    buffers_size: usize,
-    stack: BufferStack,
-}
-
-impl BufferPool {
-    pub fn new(buffers_size: usize) -> BufferPool {
-        BufferPool {
-            buffers_size,
-            stack: Rc::new(RefCell::new(vec![])),
-        }
-    }
-
-    pub fn get_buffer(&mut self) -> Buffer {
-        let buffer = match self.stack.borrow_mut().pop() {
-            None => vec![0u8; self.buffers_size],
-            Some(mut v) => {
-                // memsetting the buffer with `resize` would be a waste of time
-                let capacity = v.capacity();
-                unsafe {
-                    v.set_len(capacity);
-                }
-                v
-            }
-        };
-
-        Buffer {
-            buffer,
-            stack: Rc::clone(&self.stack),
-        }
-    }
-}
diff --git a/recipes/core/base/netstack/src/error.rs b/recipes/core/base/netstack/src/error.rs
deleted file mode 100644
index c35051606a..0000000000
--- a/recipes/core/base/netstack/src/error.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use std::convert;
-use std::fmt;
-use std::io::Error as IOError;
-use std::result;
-use syscall::error::Error as SyscallError;
-
-#[derive(Debug)]
-enum ErrorType {
-    Syscall(SyscallError),
-    IOError(IOError),
-}
-
-#[derive(Debug)]
-pub struct Error {
-    error_type: ErrorType,
-    descr: String,
-}
-
-impl Error {
-    pub fn from_syscall_error<S: Into<String>>(syscall_error: SyscallError, descr: S) -> Error {
-        Error {
-            error_type: ErrorType::Syscall(syscall_error),
-            descr: descr.into(),
-        }
-    }
-
-    pub fn from_io_error<S: Into<String>>(io_error: IOError, descr: S) -> Error {
-        Error {
-            error_type: ErrorType::IOError(io_error),
-            descr: descr.into(),
-        }
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> result::Result<(), fmt::Error> {
-        match self.error_type {
-            ErrorType::Syscall(ref syscall_error) => {
-                write!(f, "{}: syscall error: {}", self.descr, syscall_error)
-            }
-            ErrorType::IOError(ref io_error) => {
-                write!(f, "{} : io error : {}", self.descr, io_error)
-            }
-        }
-    }
-}
-impl std::error::Error for Error {}
-
-impl convert::From<IOError> for Error {
-    fn from(e: IOError) -> Self {
-        Error::from_io_error(e, "generic error")
-    }
-}
-
-pub type Result<T> = result::Result<T, Error>;
diff --git a/recipes/core/base/netstack/src/link/ethernet.rs b/recipes/core/base/netstack/src/link/ethernet.rs
deleted file mode 100644
index 5f32a479dd..0000000000
--- a/recipes/core/base/netstack/src/link/ethernet.rs
+++ /dev/null
@@ -1,412 +0,0 @@
-use std::collections::btree_map::Entry;
-use std::collections::BTreeMap;
-use std::fs::File;
-use std::io::{ErrorKind, Read, Write};
-use std::rc::Rc;
-
-use smoltcp::storage::PacketMetadata;
-use smoltcp::time::{Duration, Instant};
-use smoltcp::wire::{
-    ArpOperation, ArpPacket, ArpRepr, EthernetAddress, EthernetFrame, EthernetProtocol,
-    EthernetRepr, IpAddress, IpCidr, Ipv4Address, Ipv4Cidr,
-};
-
-use super::LinkDevice;
-
-struct Neighbor {
-    hardware_address: EthernetAddress,
-    expires_at: Instant,
-}
-
-#[derive(Debug, Default)]
-enum ArpState {
-    #[default]
-    Discovered,
-    Discovering {
-        target: Ipv4Address,
-        tries: u32,
-        silent_until: Instant,
-    },
-}
-
-type PacketBuffer = smoltcp::storage::PacketBuffer<'static, IpAddress>;
-
-const EMPTY_MAC: EthernetAddress = EthernetAddress([0; 6]);
-
-pub struct EthernetLink {
-    name: Rc<str>,
-    neighbor_cache: BTreeMap<IpAddress, Neighbor>,
-    arp_state: ArpState,
-    waiting_packets: PacketBuffer,
-    input_buffer: Vec<u8>,
-    output_buffer: Vec<u8>,
-    network_file: File,
-    hardware_address: Option<EthernetAddress>,
-    ip_address: Option<Ipv4Cidr>,
-}
-
-impl EthernetLink {
-    // TODO: Review these constants
-    const MAX_WAITING_PACKET_COUNT: usize = 10;
-    const MTU: usize = 1500;
-    const WAITING_PACKET_BUFFER_SIZE: usize = Self::MTU * Self::MAX_WAITING_PACKET_COUNT;
-
-    const NEIGHBOR_LIVE_TIME: Duration = Duration::from_secs(60);
-    const ARP_SILENCE_TIME: Duration = Duration::from_secs(1);
-
-    pub fn new(name: &str, network_file: File) -> Self {
-        let waiting_packets = PacketBuffer::new(
-            vec![PacketMetadata::EMPTY; Self::MAX_WAITING_PACKET_COUNT],
-            vec![0u8; Self::WAITING_PACKET_BUFFER_SIZE],
-        );
-
-        Self {
-            name: name.into(),
-            network_file,
-            waiting_packets,
-            hardware_address: None,
-            ip_address: None,
-            input_buffer: vec![0u8; Self::MTU],
-            output_buffer: Vec::with_capacity(Self::MTU),
-            arp_state: Default::default(),
-            neighbor_cache: Default::default(),
-        }
-    }
-
-    fn send_to<F>(&mut self, dst: EthernetAddress, size: usize, f: F, proto: EthernetProtocol)
-    where
-        F: FnOnce(&mut [u8]),
-    {
-        let Some(hardware_address) = self.hardware_address else {
-            return;
-        };
-
-        let repr = EthernetRepr {
-            src_addr: hardware_address,
-            dst_addr: dst,
-            ethertype: proto,
-        };
-
-        self.output_buffer.clear();
-        self.output_buffer.resize(repr.buffer_len() + size, 0);
-        let mut frame = EthernetFrame::new_unchecked(&mut self.output_buffer);
-        repr.emit(&mut frame);
-
-        f(frame.payload_mut());
-
-        if let Err(_) = self.network_file.write_all(&self.output_buffer) {
-            error!(
-                "Dropped outboud packet on {} (failed to write to network file)",
-                self.name
-            )
-        }
-    }
-
-    fn process_arp(&mut self, packet: &[u8], now: Instant) {
-        let Some(hardware_address) = self.hardware_address else {
-            return;
-        };
-
-        let Some(ip_addr) = self.ip_address else {
-            return;
-        };
-
-        let Ok(repr) = ArpPacket::new_checked(packet).and_then(|packet| ArpRepr::parse(&packet))
-        else {
-            debug!("Dropped incomming arp packet on {} (Malformed)", self.name);
-            return;
-        };
-
-        match repr {
-            ArpRepr::EthernetIpv4 {
-                operation,
-                source_hardware_addr,
-                source_protocol_addr,
-                target_hardware_addr,
-                target_protocol_addr,
-            } => {
-                let is_unicast_mac =
-                    target_hardware_addr != EMPTY_MAC && !target_hardware_addr.is_broadcast();
-
-                if is_unicast_mac && hardware_address != target_hardware_addr {
-                    // Only process packet that are for us
-                    return;
-                }
-
-                if let ArpOperation::Unknown(_) = operation {
-                    return;
-                }
-
-                if !source_hardware_addr.is_unicast()
-                    || source_protocol_addr.is_broadcast()
-                    || source_protocol_addr.is_multicast()
-                    || source_protocol_addr.is_unspecified()
-                {
-                    return;
-                }
-
-                if ip_addr.address() != target_protocol_addr {
-                    return;
-                }
-
-                self.neighbor_cache.insert(
-                    IpAddress::Ipv4(source_protocol_addr),
-                    Neighbor {
-                        hardware_address: source_hardware_addr,
-                        expires_at: now + Self::NEIGHBOR_LIVE_TIME,
-                    },
-                );
-
-                if let ArpOperation::Request = operation {
-                    let response = ArpRepr::EthernetIpv4 {
-                        operation: ArpOperation::Reply,
-                        source_hardware_addr: hardware_address,
-                        source_protocol_addr: ip_addr.address(),
-                        target_hardware_addr: source_hardware_addr,
-                        target_protocol_addr: source_protocol_addr,
-                    };
-
-                    self.send_to(
-                        source_hardware_addr,
-                        response.buffer_len(),
-                        |buf| response.emit(&mut ArpPacket::new_unchecked(buf)),
-                        EthernetProtocol::Arp,
-                    );
-                }
-                self.check_waiting_packets(source_protocol_addr, source_hardware_addr, now);
-            }
-            _ => {}
-        }
-    }
-
-    fn check_waiting_packets(&mut self, ip: Ipv4Address, mac: EthernetAddress, now: Instant) {
-        let mut waiting_packets =
-            std::mem::replace(&mut self.waiting_packets, PacketBuffer::new(vec![], vec![]));
-        loop {
-            match waiting_packets.peek() {
-                Ok((IpAddress::Ipv4(dst), _)) if dst == &ip => {}
-                Ok((IpAddress::Ipv4(dst), _)) => {
-                    self.arp_state = ArpState::Discovering {
-                        target: *dst,
-                        tries: 0,
-                        silent_until: Instant::ZERO,
-                    };
-                    self.send_arp(now);
-                    break;
-                }
-                Err(_) => {
-                    self.arp_state = ArpState::Discovered;
-                    break;
-                }
-            }
-
-            let (_, packet) = waiting_packets.dequeue().unwrap();
-            self.send_to(
-                mac,
-                packet.len(),
-                |buf| buf.copy_from_slice(packet),
-                EthernetProtocol::Ipv4,
-            );
-        }
-
-        self.waiting_packets = waiting_packets;
-    }
-
-    fn drop_waiting_packets(&mut self, ip: Ipv4Address, now: Instant) {
-        loop {
-            match self.waiting_packets.peek() {
-                Ok((IpAddress::Ipv4(dst), _)) if dst == &ip => {}
-                Ok((IpAddress::Ipv4(dst), _)) => {
-                    self.arp_state = ArpState::Discovering {
-                        target: *dst,
-                        tries: 0,
-                        silent_until: Instant::ZERO,
-                    };
-
-                    self.send_arp(now);
-
-                    return;
-                }
-                Err(_) => {
-                    self.arp_state = ArpState::Discovered;
-                    return;
-                }
-            }
-
-            let _ = self.waiting_packets.dequeue();
-            debug!(
-                "Dropped packet on {} because neighbor was not found",
-                self.name
-            )
-        }
-    }
-
-    fn handle_missing_neighbor(&mut self, next_hop: IpAddress, packet: &[u8], now: Instant) {
-        let Ok(buf) = self.waiting_packets.enqueue(packet.len(), next_hop) else {
-            warn!(
-                "Dropped packet on {} because waiting queue was full",
-                self.name
-            );
-            return;
-        };
-        buf.copy_from_slice(packet);
-
-        let IpAddress::Ipv4(next_hop) = next_hop;
-        if let ArpState::Discovered = self.arp_state {
-            self.arp_state = ArpState::Discovering {
-                target: next_hop,
-                tries: 0,
-                silent_until: Instant::ZERO,
-            };
-
-            self.send_arp(now)
-        }
-    }
-
-    fn send_arp(&mut self, now: Instant) {
-        let Some(hardware_address) = self.hardware_address else {
-            return;
-        };
-
-        let Some(ip_address) = self.ip_address else {
-            return;
-        };
-
-        match self.arp_state {
-            ArpState::Discovered => {}
-            ArpState::Discovering { silent_until, .. } if silent_until > now => {}
-            ArpState::Discovering { target, tries, .. } if tries >= 3 => {
-                self.drop_waiting_packets(target, now)
-            }
-            ArpState::Discovering {
-                target,
-                ref mut tries,
-                ref mut silent_until,
-            } => {
-                let arp_repr = ArpRepr::EthernetIpv4 {
-                    operation: ArpOperation::Request,
-                    source_hardware_addr: hardware_address,
-                    source_protocol_addr: ip_address.address(),
-                    target_hardware_addr: EthernetAddress::BROADCAST,
-                    target_protocol_addr: target,
-                };
-
-                *tries += 1;
-                *silent_until = now + Self::ARP_SILENCE_TIME;
-
-                self.send_to(
-                    EthernetAddress::BROADCAST,
-                    arp_repr.buffer_len(),
-                    |buf| arp_repr.emit(&mut ArpPacket::new_unchecked(buf)),
-                    EthernetProtocol::Arp,
-                );
-            }
-        }
-    }
-}
-
-impl LinkDevice for EthernetLink {
-    fn send(&mut self, next_hop: IpAddress, packet: &[u8], now: Instant) {
-        let local_broadcast = match self.ip_address.and_then(|cidr| cidr.broadcast()) {
-            Some(addr) => IpAddress::Ipv4(addr) == next_hop,
-            None => false,
-        };
-
-        if local_broadcast || next_hop.is_broadcast() {
-            self.send_to(
-                EthernetAddress::BROADCAST,
-                packet.len(),
-                |buf| buf.copy_from_slice(packet),
-                EthernetProtocol::Ipv4,
-            );
-            return;
-        }
-
-        match self.neighbor_cache.entry(next_hop) {
-            Entry::Vacant(_) => self.handle_missing_neighbor(next_hop, packet, now),
-            Entry::Occupied(e) => {
-                if e.get().expires_at < now {
-                    e.remove();
-                    self.handle_missing_neighbor(next_hop, packet, now)
-                } else {
-                    let mac = e.get().hardware_address;
-                    self.send_to(
-                        mac,
-                        packet.len(),
-                        |buf| buf.copy_from_slice(packet),
-                        EthernetProtocol::Ipv4,
-                    )
-                }
-            }
-        }
-    }
-
-    fn recv(&mut self, now: Instant) -> Option<&[u8]> {
-        let Some(hardware_address) = self.hardware_address else {
-            return None;
-        };
-
-        let mut input_buffer = std::mem::replace(&mut self.input_buffer, Vec::new());
-        loop {
-            if let Err(e) = self.network_file.read(&mut input_buffer) {
-                if e.kind() != ErrorKind::WouldBlock {
-                    error!("Failed to read ethernet device on link {}", self.name);
-                } else {
-                    // No packet to read but we check if we have arp to send
-                    self.send_arp(now);
-                }
-                self.input_buffer = input_buffer;
-                return None;
-            }
-            let packet = EthernetFrame::new_unchecked(&input_buffer[..]);
-            let Ok(repr) = EthernetRepr::parse(&packet) else {
-                debug!("Dropped incomming frame on {} (Malformed)", self.name);
-                continue;
-            };
-
-            // We let EMPTY_MAC pass because somehow this is the mac used when net=redir is used
-            if !repr.dst_addr.is_broadcast()
-                && repr.dst_addr != EMPTY_MAC
-                && repr.dst_addr != hardware_address
-            {
-                // Drop packets which are not for us
-                continue;
-            }
-
-            match repr.ethertype {
-                EthernetProtocol::Ipv4 => {
-                    self.input_buffer = input_buffer;
-                    return Some(EthernetFrame::new_unchecked(&self.input_buffer[..]).payload());
-                }
-                EthernetProtocol::Arp => self.process_arp(packet.payload(), now),
-                _ => continue,
-            }
-        }
-    }
-
-    fn name(&self) -> &Rc<str> {
-        &self.name
-    }
-
-    fn can_recv(&self) -> bool {
-        // We don't buffer any packets so we can't receive immediatly
-        false
-    }
-
-    fn mac_address(&self) -> Option<EthernetAddress> {
-        self.hardware_address
-    }
-
-    fn set_mac_address(&mut self, addr: EthernetAddress) {
-        self.hardware_address = Some(addr)
-    }
-
-    fn ip_address(&self) -> Option<IpCidr> {
-        Some(IpCidr::Ipv4(self.ip_address?))
-    }
-
-    fn set_ip_address(&mut self, addr: IpCidr) {
-        let IpCidr::Ipv4(addr) = addr;
-        self.ip_address = Some(addr);
-    }
-}
diff --git a/recipes/core/base/netstack/src/link/loopback.rs b/recipes/core/base/netstack/src/link/loopback.rs
deleted file mode 100644
index 24bdb74eba..0000000000
--- a/recipes/core/base/netstack/src/link/loopback.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use std::rc::Rc;
-
-use smoltcp::storage::PacketMetadata;
-use smoltcp::time::Instant;
-
-use crate::scheme::Smolnetd;
-
-use super::LinkDevice;
-
-pub type PacketBuffer = smoltcp::storage::PacketBuffer<'static, ()>;
-
-pub struct LoopbackDevice {
-    name: Rc<str>,
-    buffer: PacketBuffer,
-}
-
-impl Default for LoopbackDevice {
-    fn default() -> Self {
-        let buffer = PacketBuffer::new(
-            vec![PacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-            vec![0u8; 1500 * Smolnetd::SOCKET_BUFFER_SIZE],
-        );
-        LoopbackDevice {
-            name: "loopback".into(),
-            buffer,
-        }
-    }
-}
-
-impl LinkDevice for LoopbackDevice {
-    fn send(&mut self, _next_hop: smoltcp::wire::IpAddress, packet: &[u8], _now: Instant) {
-        match self.buffer.enqueue(packet.len(), ()) {
-            Err(_) => warn!("loopback dropped packet because buffer was full"),
-            Ok(buf) => buf.copy_from_slice(packet),
-        }
-    }
-
-    fn recv(&mut self, _now: Instant) -> Option<&[u8]> {
-        self.buffer.dequeue().ok().map(|((), buf)| &*buf)
-    }
-
-    fn name(&self) -> &std::rc::Rc<str> {
-        &self.name
-    }
-
-    fn can_recv(&self) -> bool {
-        !self.buffer.is_empty()
-    }
-
-    fn mac_address(&self) -> Option<smoltcp::wire::EthernetAddress> {
-        None
-    }
-
-    fn set_mac_address(&mut self, _addr: smoltcp::wire::EthernetAddress) {}
-
-    fn ip_address(&self) -> Option<smoltcp::wire::IpCidr> {
-        Some("127.0.0.1/8".parse().unwrap())
-    }
-
-    fn set_ip_address(&mut self, _addr: smoltcp::wire::IpCidr) {
-        todo!()
-    }
-}
diff --git a/recipes/core/base/netstack/src/link/mod.rs b/recipes/core/base/netstack/src/link/mod.rs
deleted file mode 100644
index e36e331ffd..0000000000
--- a/recipes/core/base/netstack/src/link/mod.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-pub mod ethernet;
-pub mod loopback;
-
-use std::rc::Rc;
-
-use smoltcp::time::Instant;
-use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr};
-
-/// Represent a link layer device (eth0, loopback...)
-pub trait LinkDevice {
-    /// Send the given packet to the machine with the `next_hop` ip address
-    /// This method cannot fail so it's the implementor responsability
-    /// to buffer packets which can't be sent immediatly or decide to
-    /// drop them if necessary
-    fn send(&mut self, next_hop: IpAddress, packet: &[u8], now: Instant);
-
-    /// Returns None if nothing is received.
-    /// Returns an Ip packet otherwise
-    fn recv(&mut self, now: Instant) -> Option<&[u8]>;
-
-    /// Returns the LinkDevice display name used to refer to it and for lookups
-    fn name(&self) -> &Rc<str>;
-
-    /// Returns wether this device have packets pending
-    fn can_recv(&self) -> bool;
-
-    fn mac_address(&self) -> Option<EthernetAddress>;
-    fn set_mac_address(&mut self, addr: EthernetAddress);
-
-    fn ip_address(&self) -> Option<IpCidr>;
-    fn set_ip_address(&mut self, addr: IpCidr);
-}
-
-#[derive(Default)]
-pub struct DeviceList {
-    inner: Vec<Box<dyn LinkDevice>>,
-}
-
-impl DeviceList {
-    pub fn push<T: LinkDevice + 'static>(&mut self, dev: T) {
-        self.inner.push(Box::new(dev))
-    }
-
-    pub fn get(&self, device_name: &str) -> Option<&dyn LinkDevice> {
-        self.inner
-            .iter()
-            .find(|dev| dev.name().as_ref() == device_name)
-            .map(|device| device.as_ref())
-    }
-
-    pub fn get_mut(&mut self, device_name: &str) -> Option<&mut (dyn LinkDevice + 'static)> {
-        self.inner
-            .iter_mut()
-            .find(|dev| dev.name().as_ref() == device_name)
-            .map(|device| device.as_mut())
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &(dyn LinkDevice + 'static)> {
-        self.inner.iter().map(|b| b.as_ref())
-    }
-
-    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut (dyn LinkDevice + 'static)> {
-        self.inner.iter_mut().map(|b| b.as_mut())
-    }
-}
diff --git a/recipes/core/base/netstack/src/logger.rs b/recipes/core/base/netstack/src/logger.rs
deleted file mode 100644
index d854b4c773..0000000000
--- a/recipes/core/base/netstack/src/logger.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use redox_log::{OutputBuilder, RedoxLogger};
-
-pub fn init_logger(process_name: &str) {
-    if let Err(_) = RedoxLogger::new()
-        .with_output(
-            OutputBuilder::stdout()
-                .with_ansi_escape_codes()
-                .flush_on_newline(true)
-                .with_filter(log::LevelFilter::Trace)
-                .build(),
-        )
-        .with_process_name(process_name.into())
-        .enable()
-    {
-        eprintln!("{process_name}: Failed to init logger")
-    }
-}
diff --git a/recipes/core/base/netstack/src/main.rs b/recipes/core/base/netstack/src/main.rs
deleted file mode 100644
index b18f32266c..0000000000
--- a/recipes/core/base/netstack/src/main.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-#[macro_use]
-extern crate log;
-use std::process;
-
-use anyhow::{anyhow, bail, Context, Result};
-use event::{EventFlags, EventQueue};
-use libredox::flag::{O_NONBLOCK, O_RDWR};
-use libredox::Fd;
-
-use redox_scheme::Socket;
-use scheme::Smolnetd;
-use smoltcp::wire::EthernetAddress;
-
-mod buffer_pool;
-mod error;
-mod link;
-mod logger;
-mod port_set;
-mod router;
-mod scheme;
-
-fn get_network_adapter() -> Result<String> {
-    use std::fs;
-
-    let mut adapters = vec![];
-
-    for entry_res in fs::read_dir("/scheme")? {
-        let Ok(entry) = entry_res else {
-            continue;
-        };
-
-        let Ok(scheme) = entry.file_name().into_string() else {
-            continue;
-        };
-
-        if !scheme.starts_with("network") {
-            continue;
-        }
-
-        adapters.push(scheme);
-    }
-
-    if adapters.is_empty() {
-        bail!("no network adapter found");
-    } else {
-        let adapter = adapters.remove(0);
-        if !adapters.is_empty() {
-            // FIXME allow using multiple network adapters at the same time
-            warn!("Multiple network adapters found. Only {adapter} will be used");
-        }
-        Ok(adapter)
-    }
-}
-
-fn run(daemon: daemon::Daemon) -> Result<()> {
-    let adapter = get_network_adapter()?;
-    trace!("opening {adapter}:");
-    let network_fd = Fd::open(&format!("/scheme/{adapter}"), O_RDWR | O_NONBLOCK, 0)
-        .map_err(|e| anyhow!("failed to open {adapter}: {e}"))?;
-
-    let hardware_addr = std::fs::read(format!("/scheme/{adapter}/mac"))
-        .map(|mac_address| EthernetAddress::from_bytes(&mac_address))
-        .context("failed to get mac address from network adapter")?;
-
-    trace!("opening ip scheme socket");
-    let ip_fd = Socket::nonblock()
-        .map_err(|e| anyhow!("failed to open create ip scheme socket: {:?}", e))?;
-
-    trace!("opening udp scheme socket");
-    let udp_fd =
-        Socket::nonblock().map_err(|e| anyhow!("failed to open udp scheme socket: {:?}", e))?;
-
-    trace!("opening tcp scheme socket");
-    let tcp_fd =
-        Socket::nonblock().map_err(|e| anyhow!("failed to open tcp scheme socket: {:?}", e))?;
-
-    trace!("opening icmp scheme socket");
-    let icmp_fd =
-        Socket::nonblock().map_err(|e| anyhow!("failed to open icmp scheme socket: {:?}", e))?;
-
-    trace!("opening netcfg scheme socket");
-    let netcfg_fd =
-        Socket::nonblock().map_err(|e| anyhow!("failed to open netcfg scheme socket {:?}", e))?;
-
-    let time_path = format!("/scheme/time/{}", syscall::CLOCK_MONOTONIC);
-    let time_fd = Fd::open(&time_path, O_RDWR, 0).context("failed to open /scheme/time")?;
-
-    event::user_data! {
-        enum EventSource {
-            Network,
-            Time,
-            IpScheme,
-            UdpScheme,
-            TcpScheme,
-            IcmpScheme,
-            NetcfgScheme,
-        }
-    }
-
-    let event_queue = EventQueue::<EventSource>::new()
-        .map_err(|e| anyhow!("failed to create event queue: {:?}", e))?;
-
-    daemon.ready();
-
-    event_queue
-        .subscribe(network_fd.raw(), EventSource::Network, EventFlags::READ)
-        .map_err(|e| anyhow!("failed to listen to network events: {:?}", e))?;
-
-    event_queue
-        .subscribe(time_fd.raw(), EventSource::Time, EventFlags::READ)
-        .map_err(|e| anyhow!("failed to listen to timer events: {:?}", e))?;
-
-    event_queue
-        .subscribe(ip_fd.inner().raw(), EventSource::IpScheme, EventFlags::READ)
-        .context("failed to listen to ip scheme events")?;
-
-    event_queue
-        .subscribe(
-            udp_fd.inner().raw(),
-            EventSource::UdpScheme,
-            EventFlags::READ,
-        )
-        .context("failed to listen to udp scheme events")?;
-
-    event_queue
-        .subscribe(
-            tcp_fd.inner().raw(),
-            EventSource::TcpScheme,
-            EventFlags::READ,
-        )
-        .context("failed to listen to tcp scheme events")?;
-
-    event_queue
-        .subscribe(
-            icmp_fd.inner().raw(),
-            EventSource::IcmpScheme,
-            EventFlags::READ,
-        )
-        .context("failed to listen to icmp scheme events")?;
-
-    event_queue
-        .subscribe(
-            netcfg_fd.inner().raw(),
-            EventSource::NetcfgScheme,
-            EventFlags::READ,
-        )
-        .context("failed to listen to netcfg scheme events")?;
-
-    let mut smolnetd = Smolnetd::new(
-        network_fd,
-        hardware_addr,
-        ip_fd,
-        udp_fd,
-        tcp_fd,
-        icmp_fd,
-        time_fd,
-        netcfg_fd,
-    )
-    .context("smolnetd: failed to initialize smolnetd")?;
-
-    libredox::call::setrens(0, 0).context("smolnetd: failed to enter null namespace")?;
-
-    let all = {
-        use EventSource::*;
-        [Network, Time, IpScheme, UdpScheme, IcmpScheme, NetcfgScheme].map(Ok)
-    };
-
-    for event_res in all
-        .into_iter()
-        .chain(event_queue.map(|r| r.map(|e| e.user_data)))
-    {
-        match event_res.map_err(|e| anyhow!("event result is error: {:?}", e))? {
-            EventSource::Network => smolnetd.on_network_scheme_event(),
-            EventSource::Time => smolnetd.on_time_event(),
-            EventSource::IpScheme => smolnetd.on_ip_scheme_event(),
-            EventSource::UdpScheme => smolnetd.on_udp_scheme_event(),
-            EventSource::TcpScheme => smolnetd.on_tcp_scheme_event(),
-            EventSource::IcmpScheme => smolnetd.on_icmp_scheme_event(),
-            EventSource::NetcfgScheme => smolnetd.on_netcfg_scheme_event(),
-        }
-        .map_err(|e| error!("Received packet error: {:?}", e));
-    }
-    Ok(())
-}
-
-fn main() {
-    daemon::Daemon::new(daemon_runner);
-}
-
-fn daemon_runner(daemon: daemon::Daemon) -> ! {
-    logger::init_logger("smolnetd");
-
-    if let Err(err) = run(daemon) {
-        error!("smoltcpd: {}", err);
-        process::exit(1);
-    }
-    process::exit(0);
-}
diff --git a/recipes/core/base/netstack/src/port_set.rs b/recipes/core/base/netstack/src/port_set.rs
deleted file mode 100644
index 88011ec337..0000000000
--- a/recipes/core/base/netstack/src/port_set.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::collections::btree_map::{BTreeMap, Entry};
-
-pub struct PortSet {
-    from: u16,
-    range: u16,
-    next: u16,
-    ports: BTreeMap<u16, usize>,
-}
-
-impl PortSet {
-    pub fn new(from: u16, to: u16) -> Option<PortSet> {
-        if from > to {
-            return None;
-        }
-        Some(PortSet {
-            from,
-            range: to - from + 1,
-            next: 0,
-            ports: BTreeMap::new(),
-        })
-    }
-
-    pub fn get_port(&mut self) -> Option<u16> {
-        if self.ports.len() >= self.range as usize {
-            return None;
-        }
-
-        let port = loop {
-            if let Entry::Vacant(entry) = self.ports.entry(self.next) {
-                entry.insert(1);
-                let port = self.from + self.next;
-                self.next = self.next.wrapping_add(1);
-                break port;
-            }
-            self.next = self.next.wrapping_add(1);
-        };
-
-        Some(port)
-    }
-
-    pub fn claim_port(&mut self, port: u16) -> bool {
-        if let Entry::Vacant(entry) = self.ports.entry(port) {
-            entry.insert(1);
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn acquire_port(&mut self, port: u16) {
-        *self.ports.entry(port).or_insert(0) += 1;
-    }
-
-    pub fn release_port(&mut self, port: u16) {
-        if let Entry::Occupied(mut entry) = self.ports.entry(port) {
-            *entry.get_mut() -= 1;
-            if *entry.get() == 0 {
-                entry.remove();
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/netstack/src/router/mod.rs b/recipes/core/base/netstack/src/router/mod.rs
deleted file mode 100644
index 3cfd0a2fea..0000000000
--- a/recipes/core/base/netstack/src/router/mod.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use smoltcp::phy::{Device, DeviceCapabilities, Medium};
-use smoltcp::storage::PacketMetadata;
-use smoltcp::time::Instant;
-use smoltcp::wire::IpAddress;
-
-use self::route_table::RouteTable;
-use crate::link::DeviceList;
-use crate::scheme::Smolnetd;
-
-pub mod route_table;
-
-pub type PacketBuffer = smoltcp::storage::PacketBuffer<'static, ()>;
-
-pub struct Router {
-    rx_buffer: PacketBuffer,
-    tx_buffer: PacketBuffer,
-    devices: Rc<RefCell<DeviceList>>,
-    route_table: Rc<RefCell<RouteTable>>,
-}
-
-impl Router {
-    pub fn new(devices: Rc<RefCell<DeviceList>>, route_table: Rc<RefCell<RouteTable>>) -> Self {
-        let rx_buffer = PacketBuffer::new(
-            vec![PacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-            vec![0u8; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-        );
-        let tx_buffer = PacketBuffer::new(
-            vec![PacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-            vec![0u8; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-        );
-        Self {
-            rx_buffer,
-            tx_buffer,
-            devices,
-            route_table,
-        }
-    }
-
-    pub const MTU: usize = 1486;
-
-    pub fn can_recv(&self) -> bool {
-        let mut can_recv = false;
-        for dev in self.devices.borrow().iter() {
-            can_recv |= dev.can_recv();
-        }
-        can_recv
-    }
-
-    pub fn poll(&mut self, now: Instant) {
-        for dev in self.devices.borrow_mut().iter_mut() {
-            if self.rx_buffer.is_full() {
-                break;
-            }
-
-            loop {
-                if self.rx_buffer.is_full() {
-                    break;
-                }
-
-                let Some(buf) = dev.recv(now) else {
-                    break;
-                };
-
-                self.rx_buffer
-                    .enqueue(buf.len(), ())
-                    .expect("We checked if it was full")
-                    .copy_from_slice(buf);
-            }
-        }
-    }
-
-    pub fn dispatch(&mut self, now: Instant) {
-        while let Ok(((), packet)) = self.tx_buffer.dequeue() {
-            if let Ok(mut packet) = smoltcp::wire::Ipv4Packet::new_checked(packet) {
-                let dst_addr = IpAddress::Ipv4(packet.dst_addr());
-                if packet.dst_addr().is_broadcast() {
-                    let buf = packet.into_inner();
-                    for dev in self.devices.borrow_mut().iter_mut() {
-                        dev.send(dst_addr, buf, now)
-                    }
-                } else {
-                    let route_table = self.route_table.borrow();
-                    let Some(rule) = route_table.lookup_rule(&dst_addr) else {
-                        warn!("No route found for destination: {}", dst_addr);
-                        continue;
-                    };
-
-                    let next_hop = match rule.via {
-                        Some(via) => via,
-                        None => dst_addr,
-                    };
-
-                    let mut devices = self.devices.borrow_mut();
-                    let Some(dev) = devices.get_mut(&rule.dev) else {
-                        warn!("Device {} not found", rule.dev);
-                        // TODO: Remove route if device doesn't exist anymore ?
-                        continue;
-                    };
-
-                    let IpAddress::Ipv4(src) = rule.src;
-                    if src != packet.src_addr() {
-                        packet.set_src_addr(src);
-                        packet.fill_checksum()
-                    }
-
-                    dev.send(next_hop, packet.into_inner(), now);
-                }
-            }
-        }
-    }
-}
-
-impl Device for Router {
-    type RxToken<'a> = RxToken<'a>;
-
-    type TxToken<'a> = TxToken<'a>;
-
-    fn receive(
-        &mut self,
-        _timestamp: smoltcp::time::Instant,
-    ) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> {
-        if self.rx_buffer.is_empty() || self.tx_buffer.is_full() {
-            None
-        } else {
-            Some((
-                RxToken {
-                    rx_buffer: &mut self.rx_buffer,
-                },
-                TxToken {
-                    tx_buffer: &mut self.tx_buffer,
-                },
-            ))
-        }
-    }
-
-    fn transmit(&mut self, _timestamp: smoltcp::time::Instant) -> Option<Self::TxToken<'_>> {
-        if self.tx_buffer.is_full() {
-            None
-        } else {
-            Some(TxToken {
-                tx_buffer: &mut self.tx_buffer,
-            })
-        }
-    }
-
-    fn capabilities(&self) -> smoltcp::phy::DeviceCapabilities {
-        let mut caps = DeviceCapabilities::default();
-        caps.medium = Medium::Ip;
-        caps.max_transmission_unit = Router::MTU;
-        caps.max_burst_size = Some(Smolnetd::SOCKET_BUFFER_SIZE);
-        caps
-    }
-}
-
-pub struct TxToken<'a> {
-    tx_buffer: &'a mut PacketBuffer,
-}
-
-impl smoltcp::phy::TxToken for TxToken<'_> {
-    fn consume<R, F>(self, len: usize, f: F) -> R
-    where
-        F: FnOnce(&mut [u8]) -> R,
-    {
-        f(self
-            .tx_buffer
-            .enqueue(len, ())
-            .expect("This was checked before creating the TxToken"))
-    }
-}
-
-pub struct RxToken<'a> {
-    rx_buffer: &'a mut PacketBuffer,
-}
-
-impl<'a> smoltcp::phy::RxToken for RxToken<'a> {
-    fn consume<R, F>(self, f: F) -> R
-    where
-        F: FnOnce(&[u8]) -> R,
-    {
-        let ((), buf) = self
-            .rx_buffer
-            .dequeue()
-            .expect("This was checked before creating the RxToken");
-
-        f(buf)
-    }
-}
diff --git a/recipes/core/base/netstack/src/router/route_table.rs b/recipes/core/base/netstack/src/router/route_table.rs
deleted file mode 100644
index 51943c932f..0000000000
--- a/recipes/core/base/netstack/src/router/route_table.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use std::fmt::Display;
-use std::rc::Rc;
-
-use smoltcp::wire::{IpAddress, IpCidr};
-
-#[derive(Debug)]
-pub struct Rule {
-    pub filter: IpCidr,
-    pub via: Option<IpAddress>,
-    pub dev: Rc<str>,
-    pub src: IpAddress,
-}
-
-impl Rule {
-    pub fn new(filter: IpCidr, via: Option<IpAddress>, dev: Rc<str>, src: IpAddress) -> Self {
-        Self {
-            filter,
-            via,
-            dev,
-            src,
-        }
-    }
-}
-
-impl Display for Rule {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.filter.prefix_len() == 0 {
-            write!(f, "default")?;
-        } else {
-            write!(f, "{} ", self.filter)?;
-        }
-
-        if let Some(via) = self.via {
-            write!(f, " via {}", via)?;
-        }
-
-        write!(f, " dev {}", self.dev)?;
-        write!(f, " src {}", self.src)?;
-
-        Ok(())
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct RouteTable {
-    rules: Vec<Rule>,
-}
-
-impl RouteTable {
-    pub fn lookup_rule(&self, dst: &IpAddress) -> Option<&Rule> {
-        self.rules
-            .iter()
-            .rev()
-            .find(|rule| rule.filter.contains_addr(dst))
-    }
-
-    pub fn lookup_src_addr(&self, dst: &IpAddress) -> Option<IpAddress> {
-        Some(self.lookup_rule(dst)?.src)
-    }
-
-    pub fn lookup_gateway(&self, dst: &IpAddress) -> Option<IpAddress> {
-        self.lookup_rule(dst)?.via
-    }
-
-    pub fn lookup_device(&self, dst: &IpAddress) -> Option<Rc<str>> {
-        Some(self.lookup_rule(dst)?.dev.clone())
-    }
-
-    pub fn insert_rule(&mut self, new_rule: Rule) {
-        let i = match self
-            .rules
-            .binary_search_by_key(&new_rule.filter.prefix_len(), |rule| {
-                rule.filter.prefix_len()
-            }) {
-            Ok(i) | Err(i) => i,
-        };
-        self.rules.insert(i, new_rule);
-    }
-
-    pub fn remove_rule(&mut self, filter: IpCidr) {
-        self.rules.retain(|rule| rule.filter != filter);
-    }
-
-    pub fn change_src(&mut self, old_src: IpAddress, new_src: IpAddress) {
-        for rule in self.rules.iter_mut().filter(|rule| rule.src == old_src) {
-            rule.src = new_src;
-        }
-    }
-}
-
-impl Display for RouteTable {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        for rule in self.rules.iter() {
-            writeln!(f, "{}", rule)?;
-        }
-
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/netstack/src/scheme/icmp.rs b/recipes/core/base/netstack/src/scheme/icmp.rs
deleted file mode 100644
index e326c67eb5..0000000000
--- a/recipes/core/base/netstack/src/scheme/icmp.rs
+++ /dev/null
@@ -1,304 +0,0 @@
-use scheme_utils::FpathWriter;
-use smoltcp::iface::SocketHandle;
-use smoltcp::socket::icmp::{
-    Endpoint as IcmpEndpoint, PacketBuffer as IcmpSocketBuffer,
-    PacketMetadata as IcmpPacketMetadata, Socket as IcmpSocket,
-};
-use smoltcp::wire::{Icmpv4Packet, Icmpv4Repr, IpAddress, IpListenEndpoint};
-use std::mem;
-use std::str;
-use syscall;
-use syscall::{Error as SyscallError, Result as SyscallResult};
-
-use super::socket::{Context, DupResult, SchemeFile, SchemeSocket, SocketFile};
-use super::{SchemeWrapper, Smolnetd, SocketSet};
-use crate::port_set::PortSet;
-use crate::router::Router;
-
-pub type IcmpScheme = SchemeWrapper<IcmpSocket<'static>>;
-
-enum IcmpSocketType {
-    Echo,
-    Udp,
-}
-
-pub struct IcmpData {
-    socket_type: IcmpSocketType,
-    ip: IpAddress,
-    ident: u16,
-}
-
-impl<'a> SchemeSocket for IcmpSocket<'a> {
-    type SchemeDataT = PortSet;
-    type DataT = IcmpData;
-    type SettingT = ();
-
-    fn new_scheme_data() -> Self::SchemeDataT {
-        PortSet::new(1u16, 0xffffu16).expect("Wrong ICMP ident values")
-    }
-
-    fn can_send(&self) -> bool {
-        self.can_send()
-    }
-
-    fn can_recv(&mut self, _data: &Self::DataT) -> bool {
-        smoltcp::socket::icmp::Socket::can_recv(self)
-    }
-
-    fn may_recv(&self) -> bool {
-        true
-    }
-
-    fn get_setting(
-        _file: &SocketFile<Self::DataT>,
-        _setting: Self::SettingT,
-        _buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        Ok(0)
-    }
-
-    fn set_setting(
-        _file: &mut SocketFile<Self::DataT>,
-        _setting: Self::SettingT,
-        _buf: &[u8],
-    ) -> SyscallResult<usize> {
-        Ok(0)
-    }
-
-    fn hop_limit(&self) -> u8 {
-        self.hop_limit().unwrap_or(64)
-    }
-
-    fn set_hop_limit(&mut self, hop_limit: u8) {
-        self.set_hop_limit(Some(hop_limit));
-    }
-
-    fn new_socket(
-        socket_set: &mut SocketSet,
-        path: &str,
-        _uid: u32,
-        ident_set: &mut Self::SchemeDataT,
-        _context: &Context,
-    ) -> SyscallResult<(SocketHandle, Self::DataT)> {
-        use std::str::FromStr;
-
-        let mut parts = path.split('/');
-        let method = parts
-            .next()
-            .ok_or_else(|| syscall::Error::new(syscall::EINVAL))?;
-
-        match method {
-            "echo" => {
-                let addr = parts
-                    .next()
-                    .ok_or_else(|| syscall::Error::new(syscall::EINVAL))?;
-                let ip =
-                    IpAddress::from_str(addr).map_err(|_| syscall::Error::new(syscall::EINVAL))?;
-
-                let socket = IcmpSocket::new(
-                    IcmpSocketBuffer::new(
-                        vec![IcmpPacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-                        vec![0; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-                    ),
-                    IcmpSocketBuffer::new(
-                        vec![IcmpPacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-                        vec![0; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-                    ),
-                );
-                let handle = socket_set.add(socket);
-                let icmp_socket = socket_set.get_mut::<IcmpSocket>(handle);
-                let ident = ident_set
-                    .get_port()
-                    .ok_or_else(|| SyscallError::new(syscall::EINVAL))?;
-                icmp_socket
-                    .bind(IcmpEndpoint::Ident(ident))
-                    .map_err(|_| syscall::Error::new(syscall::EINVAL))?;
-                let socket_data = IcmpData {
-                    socket_type: IcmpSocketType::Echo,
-                    ident,
-                    ip,
-                };
-                Ok((handle, socket_data))
-            }
-            "udp" => {
-                let addr = parts
-                    .next()
-                    .ok_or_else(|| syscall::Error::new(syscall::EINVAL))?;
-                let ip =
-                    IpAddress::from_str(addr).map_err(|_| syscall::Error::new(syscall::EINVAL))?;
-
-                let socket = IcmpSocket::new(
-                    IcmpSocketBuffer::new(
-                        vec![IcmpPacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-                        vec![0; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-                    ),
-                    IcmpSocketBuffer::new(
-                        vec![IcmpPacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-                        vec![0; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-                    ),
-                );
-                let handle = socket_set.add(socket);
-                let icmp_socket = socket_set.get_mut::<IcmpSocket>(handle);
-                let ident = ident_set
-                    .get_port()
-                    .ok_or_else(|| SyscallError::new(syscall::EINVAL))?;
-                icmp_socket
-                    .bind(IcmpEndpoint::Udp(IpListenEndpoint::from(ident)))
-                    .map_err(|_| syscall::Error::new(syscall::EINVAL))?;
-                let socket_data = IcmpData {
-                    socket_type: IcmpSocketType::Udp,
-                    ident,
-                    ip,
-                };
-                Ok((handle, socket_data))
-            }
-            _ => Err(syscall::Error::new(syscall::EINVAL)),
-        }
-    }
-
-    fn close_file(
-        &self,
-        file: &SchemeFile<Self>,
-        ident_set: &mut Self::SchemeDataT,
-    ) -> SyscallResult<()> {
-        if let SchemeFile::Socket(ref file) = *file {
-            ident_set.release_port(file.data.ident);
-        }
-        Ok(())
-    }
-
-    fn write_buf(
-        &mut self,
-        file: &mut SocketFile<Self::DataT>,
-        buf: &[u8],
-    ) -> SyscallResult<usize> {
-        if !file.write_enabled {
-            return Err(SyscallError::new(syscall::EPIPE));
-        } else if self.can_send() {
-            match file.data.socket_type {
-                IcmpSocketType::Echo => {
-                    if buf.len() < mem::size_of::<u16>() {
-                        return Err(SyscallError::new(syscall::EINVAL));
-                    }
-                    let (&seq_buf, payload) = buf.split_first_chunk::<2>().unwrap();
-                    let seq_no = u16::from_be_bytes(seq_buf);
-                    let icmp_repr = Icmpv4Repr::EchoRequest {
-                        ident: file.data.ident,
-                        seq_no,
-                        data: payload,
-                    };
-
-                    let icmp_payload = self
-                        .send(icmp_repr.buffer_len(), file.data.ip)
-                        .map_err(|_| syscall::Error::new(syscall::EINVAL))?;
-                    let mut icmp_packet = Icmpv4Packet::new_unchecked(icmp_payload);
-                    //TODO: replace Default with actual caps
-                    icmp_repr.emit(&mut icmp_packet, &Default::default());
-                    Ok(buf.len())
-                }
-                IcmpSocketType::Udp => Err(SyscallError::new(syscall::EINVAL)),
-            }
-        } else if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-read
-        }
-    }
-
-    fn read_buf(
-        &mut self,
-        file: &mut SocketFile<Self::DataT>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        if !file.read_enabled {
-            return Ok(0);
-        }
-        while self.can_recv(&file.data) {
-            let (payload, _) = self.recv().expect("Can't recv icmp packet");
-            let icmp_packet = Icmpv4Packet::new_unchecked(&payload);
-            //TODO: replace default with actual caps
-            let icmp_repr = Icmpv4Repr::parse(&icmp_packet, &Default::default()).unwrap();
-
-            if let Icmpv4Repr::EchoReply { seq_no, data, .. } = icmp_repr {
-                if buf.len() < mem::size_of::<u16>() + data.len() {
-                    return Err(SyscallError::new(syscall::EINVAL));
-                }
-                buf[0..2].copy_from_slice(&seq_no.to_be_bytes());
-
-                for i in 0..data.len() {
-                    buf[mem::size_of::<u16>() + i] = data[i];
-                }
-
-                return Ok(mem::size_of::<u16>() + data.len());
-            }
-        }
-
-        if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-read
-        }
-    }
-
-    fn dup(
-        _socket_set: &mut SocketSet,
-        _file: &mut SchemeFile<Self>,
-        _path: &str,
-        _: &mut Self::SchemeDataT,
-    ) -> SyscallResult<DupResult<Self>> {
-        Err(SyscallError::new(syscall::EBADF))
-    }
-
-    fn fpath(&self, file: &SchemeFile<Self>, buf: &mut [u8]) -> SyscallResult<usize> {
-        FpathWriter::with(buf, "icmp", |w| {
-            if let SchemeFile::Socket(ref socket_file) = *file {
-                match socket_file.data.socket_type {
-                    IcmpSocketType::Echo => {
-                        write!(w, "echo/{}", socket_file.data.ip).unwrap();
-                    }
-                    IcmpSocketType::Udp => {
-                        write!(w, "udp/{}", socket_file.data.ip).unwrap();
-                    }
-                }
-                Ok(())
-            } else {
-                Err(SyscallError::new(syscall::EBADF))
-            }
-        })
-    }
-
-    fn handle_recvmsg(
-        &mut self,
-        file: &mut SchemeFile<Self>,
-        how: &mut [u8],
-        flags: usize,
-    ) -> SyscallResult<usize> {
-        return Err(SyscallError::new(syscall::EOPNOTSUPP));
-    }
-
-    fn handle_get_peer_name(
-        &self,
-        file: &SchemeFile<Self>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        self.fpath(file, buf)
-    }
-
-    fn handle_shutdown(&mut self, file: &mut SchemeFile<Self>, how: usize) -> SyscallResult<usize> {
-        let socket_file = match file {
-            SchemeFile::Socket(ref mut file) => file,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        match how {
-            0 => socket_file.read_enabled = false,  // SHUT_RD
-            1 => socket_file.write_enabled = false, // SHUT_WR
-            2 => {
-                socket_file.read_enabled = false;
-                socket_file.write_enabled = false;
-            } // SHUT_RDWR
-            _ => return Err(SyscallError::new(syscall::EINVAL)),
-        }
-        Ok(0)
-    }
-}
diff --git a/recipes/core/base/netstack/src/scheme/ip.rs b/recipes/core/base/netstack/src/scheme/ip.rs
deleted file mode 100644
index 18d0dc6d9a..0000000000
--- a/recipes/core/base/netstack/src/scheme/ip.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use scheme_utils::FpathWriter;
-use smoltcp::iface::SocketHandle;
-use smoltcp::socket::raw::{
-    PacketBuffer as RawSocketBuffer, PacketMetadata as RawPacketMetadata, Socket as RawSocket,
-};
-use smoltcp::wire::{IpProtocol, IpVersion};
-use std::str;
-use syscall;
-use syscall::{Error as SyscallError, Result as SyscallResult};
-
-use crate::router::Router;
-
-use super::socket::{Context, DupResult, SchemeFile, SchemeSocket, SocketFile};
-use super::{SchemeWrapper, Smolnetd, SocketSet};
-
-pub type IpScheme = SchemeWrapper<RawSocket<'static>>;
-
-impl<'a> SchemeSocket for RawSocket<'a> {
-    type SchemeDataT = ();
-    type DataT = ();
-    type SettingT = ();
-
-    fn new_scheme_data() -> Self::SchemeDataT {
-        ()
-    }
-
-    fn can_send(&self) -> bool {
-        self.can_send()
-    }
-
-    fn can_recv(&mut self, _data: &Self::DataT) -> bool {
-        smoltcp::socket::raw::Socket::can_recv(self)
-    }
-
-    fn may_recv(&self) -> bool {
-        true
-    }
-
-    fn get_setting(
-        _file: &SocketFile<Self::DataT>,
-        _setting: Self::SettingT,
-        _buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        Ok(0)
-    }
-
-    fn set_setting(
-        _file: &mut SocketFile<Self::DataT>,
-        _setting: Self::SettingT,
-        _buf: &[u8],
-    ) -> SyscallResult<usize> {
-        Ok(0)
-    }
-
-    fn hop_limit(&self) -> u8 {
-        0
-    }
-
-    fn set_hop_limit(&mut self, _hop_limit: u8) {}
-
-    fn new_socket(
-        socket_set: &mut SocketSet,
-        path: &str,
-        uid: u32,
-        _: &mut Self::SchemeDataT,
-        _context: &Context,
-    ) -> SyscallResult<(SocketHandle, Self::DataT)> {
-        if uid != 0 {
-            return Err(SyscallError::new(syscall::EACCES));
-        }
-        let proto =
-            u8::from_str_radix(path, 16).or_else(|_| Err(SyscallError::new(syscall::ENOENT)))?;
-
-        let rx_buffer = RawSocketBuffer::new(
-            vec![RawPacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-            vec![0; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-        );
-        let tx_buffer = RawSocketBuffer::new(
-            vec![RawPacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-            vec![0; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-        );
-        let ip_socket = RawSocket::new(
-            IpVersion::Ipv4,
-            IpProtocol::from(proto),
-            rx_buffer,
-            tx_buffer,
-        );
-
-        let socket_handle = socket_set.add(ip_socket);
-        Ok((socket_handle, ()))
-    }
-
-    fn close_file(&self, _: &SchemeFile<Self>, _: &mut Self::SchemeDataT) -> SyscallResult<()> {
-        Ok(())
-    }
-
-    fn write_buf(
-        &mut self,
-        file: &mut SocketFile<Self::DataT>,
-        buf: &[u8],
-    ) -> SyscallResult<usize> {
-        if !file.write_enabled {
-            return Err(SyscallError::new(syscall::EPIPE));
-        } else if self.can_send() {
-            self.send_slice(buf).expect("Can't send slice");
-            Ok(buf.len())
-        } else if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-read
-        }
-    }
-
-    fn read_buf(
-        &mut self,
-        file: &mut SocketFile<Self::DataT>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        if !file.read_enabled {
-            Ok(0)
-        } else if self.can_recv(&file.data) {
-            let length = self.recv_slice(buf).expect("Can't receive slice");
-            Ok(length)
-        } else if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-read
-        }
-    }
-
-    fn dup(
-        _socket_set: &mut SocketSet,
-        _file: &mut SchemeFile<Self>,
-        _path: &str,
-        _: &mut Self::SchemeDataT,
-    ) -> SyscallResult<DupResult<Self>> {
-        Err(SyscallError::new(syscall::EBADF))
-    }
-
-    fn fpath(&self, _file: &SchemeFile<Self>, buf: &mut [u8]) -> SyscallResult<usize> {
-        FpathWriter::with(buf, "ip", |w| {
-            write!(w, "{}", self.ip_protocol()).unwrap();
-            Ok(())
-        })
-    }
-
-    fn handle_recvmsg(
-        &mut self,
-        file: &mut SchemeFile<Self>,
-        how: &mut [u8],
-        flags: usize,
-    ) -> SyscallResult<usize> {
-        return Err(SyscallError::new(syscall::EOPNOTSUPP));
-    }
-
-    fn handle_get_peer_name(
-        &self,
-        file: &SchemeFile<Self>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        self.fpath(file, buf)
-    }
-
-    fn handle_shutdown(&mut self, file: &mut SchemeFile<Self>, how: usize) -> SyscallResult<usize> {
-        let socket_file = match file {
-            SchemeFile::Socket(ref mut file) => file,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        match how {
-            0 => socket_file.read_enabled = false,  // SHUT_RD
-            1 => socket_file.write_enabled = false, // SHUT_WR
-            2 => {
-                socket_file.read_enabled = false;
-                socket_file.write_enabled = false;
-            } // SHUT_RDWR
-            _ => return Err(SyscallError::new(syscall::EINVAL)),
-        }
-        Ok(0)
-    }
-}
diff --git a/recipes/core/base/netstack/src/scheme/mod.rs b/recipes/core/base/netstack/src/scheme/mod.rs
deleted file mode 100644
index baaf360ee5..0000000000
--- a/recipes/core/base/netstack/src/scheme/mod.rs
+++ /dev/null
@@ -1,558 +0,0 @@
-use crate::link::ethernet::EthernetLink;
-use crate::link::LinkDevice;
-use crate::link::{loopback::LoopbackDevice, DeviceList};
-use crate::router::route_table::{RouteTable, Rule};
-use crate::router::Router;
-use crate::scheme::smoltcp::iface::SocketSet as SmoltcpSocketSet;
-use crate::scheme::socket::{Handle, SchemeSocket, SocketScheme};
-use libredox::flag;
-use libredox::Fd;
-use redox_scheme::{
-    scheme::{IntoTag, Op, SchemeResponse, SchemeState, SchemeSync},
-    CallerCtx, RequestKind, Response, SignalBehavior, Socket,
-};
-use smoltcp;
-use smoltcp::iface::{Config, Interface as SmoltcpInterface};
-use smoltcp::phy::Tracer;
-use smoltcp::socket::AnySocket;
-use smoltcp::time::{Duration, Instant};
-use smoltcp::wire::{
-    EthernetAddress, HardwareAddress, IpAddress, IpCidr, IpListenEndpoint, Ipv4Address,
-};
-use std::cell::RefCell;
-use std::fs::File;
-use std::io::{Read, Write};
-use std::mem::size_of;
-use std::os::fd::{FromRawFd, RawFd};
-use std::rc::Rc;
-use std::str::FromStr;
-use syscall;
-use syscall::data::TimeSpec;
-use syscall::Error as SyscallError;
-
-use self::icmp::IcmpScheme;
-use self::ip::IpScheme;
-use self::netcfg::NetCfgScheme;
-use self::tcp::TcpScheme;
-use self::udp::UdpScheme;
-use crate::error::{Error, Result};
-
-mod icmp;
-mod ip;
-mod netcfg;
-mod socket;
-mod tcp;
-mod udp;
-
-type SocketSet = SmoltcpSocketSet<'static>;
-type Interface = Rc<RefCell<SmoltcpInterface>>;
-
-const MAX_DURATION: Duration = Duration::from_micros(u64::MAX);
-const MIN_DURATION: Duration = Duration::from_micros(0);
-
-fn getcfg(key: &str) -> Result<String> {
-    let mut value = String::new();
-    let mut file = File::open(format!("/etc/net/{key}"))?;
-    file.read_to_string(&mut value)?;
-    Ok(value.trim().to_string())
-}
-
-pub struct Smolnetd {
-    router_device: Tracer<Router>,
-    iface: Interface,
-    time_file: File,
-
-    socket_set: Rc<RefCell<SocketSet>>,
-    timer: ::std::time::Instant,
-
-    ip_scheme: IpScheme,
-    udp_scheme: UdpScheme,
-    tcp_scheme: TcpScheme,
-    icmp_scheme: IcmpScheme,
-    netcfg_scheme: NetCfgScheme,
-}
-
-impl Smolnetd {
-    pub const MAX_PACKET_SIZE: usize = 2048;
-    pub const SOCKET_BUFFER_SIZE: usize = 128; //packets
-    pub const MIN_CHECK_TIMEOUT: Duration = Duration::from_millis(10);
-    pub const MAX_CHECK_TIMEOUT: Duration = Duration::from_millis(500);
-
-    pub fn new(
-        network_file: Fd,
-        hardware_addr: EthernetAddress,
-        ip_file: Socket,
-        udp_file: Socket,
-        tcp_file: Socket,
-        icmp_file: Socket,
-        time_file: Fd,
-        netcfg_file: Socket,
-    ) -> Result<Smolnetd> {
-        let protocol_addrs = vec![
-            //This is a placeholder IP for DHCP
-            IpCidr::new(IpAddress::v4(0, 0, 0, 0), 8),
-            IpCidr::new(IpAddress::v4(127, 0, 0, 1), 8),
-        ];
-
-        let default_gw = Ipv4Address::from_str(getcfg("ip_router").unwrap().trim())
-            .expect("Can't parse the 'ip_router' cfg.");
-
-        let devices = Rc::new(RefCell::new(DeviceList::default()));
-        let route_table = Rc::new(RefCell::new(RouteTable::default()));
-        let mut network_device = Tracer::new(
-            Router::new(Rc::clone(&devices), Rc::clone(&route_table)),
-            |_timestamp, printer| trace!("{}", printer),
-        );
-
-        let config = Config::new(HardwareAddress::Ip);
-        let mut iface = SmoltcpInterface::new(config, &mut network_device, Instant::now());
-        iface.update_ip_addrs(|ip_addrs| ip_addrs.extend(protocol_addrs));
-        iface
-            .routes_mut()
-            .add_default_ipv4_route(default_gw)
-            .expect("Failed to add default gateway");
-
-        let iface = Rc::new(RefCell::new(iface));
-        let socket_set = Rc::new(RefCell::new(SocketSet::new(vec![])));
-
-        let loopback = LoopbackDevice::default();
-        route_table.borrow_mut().insert_rule(Rule::new(
-            "127.0.0.0/8".parse().unwrap(),
-            None,
-            Rc::clone(loopback.name()),
-            "127.0.0.1".parse().unwrap(),
-        ));
-
-        let mut eth0 = EthernetLink::new("eth0", unsafe {
-            File::from_raw_fd(network_file.into_raw() as RawFd)
-        });
-        eth0.set_mac_address(hardware_addr);
-
-        devices.borrow_mut().push(loopback);
-        devices.borrow_mut().push(eth0);
-
-        Ok(Smolnetd {
-            iface: Rc::clone(&iface),
-            router_device: network_device,
-            socket_set: Rc::clone(&socket_set),
-            timer: ::std::time::Instant::now(),
-            time_file: unsafe { File::from_raw_fd(time_file.into_raw() as RawFd) },
-            ip_scheme: IpScheme::new(
-                "ip",
-                Rc::clone(&iface),
-                Rc::clone(&route_table),
-                Rc::clone(&socket_set),
-                ip_file,
-            )?,
-            udp_scheme: UdpScheme::new(
-                "udp",
-                Rc::clone(&iface),
-                Rc::clone(&route_table),
-                Rc::clone(&socket_set),
-                udp_file,
-            )?,
-            tcp_scheme: TcpScheme::new(
-                "tcp",
-                Rc::clone(&iface),
-                Rc::clone(&route_table),
-                Rc::clone(&socket_set),
-                tcp_file,
-            )?,
-            icmp_scheme: IcmpScheme::new(
-                "icmp",
-                Rc::clone(&iface),
-                Rc::clone(&route_table),
-                Rc::clone(&socket_set),
-                icmp_file,
-            )?,
-            netcfg_scheme: NetCfgScheme::new(
-                Rc::clone(&iface),
-                netcfg_file,
-                Rc::clone(&route_table),
-                Rc::clone(&devices),
-            )?,
-        })
-    }
-
-    pub fn on_network_scheme_event(&mut self) -> Result<()> {
-        self.poll()?;
-        Ok(())
-    }
-
-    pub fn on_ip_scheme_event(&mut self) -> Result<()> {
-        self.ip_scheme.on_scheme_event()?;
-        let _ = self.poll()?;
-        Ok(())
-    }
-
-    pub fn on_udp_scheme_event(&mut self) -> Result<()> {
-        self.udp_scheme.on_scheme_event()?;
-        let _ = self.poll()?;
-        Ok(())
-    }
-
-    pub fn on_tcp_scheme_event(&mut self) -> Result<()> {
-        self.tcp_scheme.on_scheme_event()?;
-        let _ = self.poll()?;
-        Ok(())
-    }
-
-    pub fn on_icmp_scheme_event(&mut self) -> Result<()> {
-        self.icmp_scheme.on_scheme_event()?;
-        let _ = self.poll()?;
-        Ok(())
-    }
-
-    pub fn on_time_event(&mut self) -> Result<()> {
-        let timeout = self.poll()?;
-        self.schedule_time_event(timeout)?;
-        //TODO: Fix network scheme to ensure events are not missed
-        self.on_network_scheme_event()
-    }
-
-    pub fn on_netcfg_scheme_event(&mut self) -> Result<()> {
-        self.netcfg_scheme.on_scheme_event()?;
-        Ok(())
-    }
-
-    fn schedule_time_event(&mut self, timeout: Duration) -> Result<()> {
-        let mut time = TimeSpec::default();
-        if self.time_file.read(&mut time)? < size_of::<TimeSpec>() {
-            return Err(Error::from_syscall_error(
-                syscall::Error::new(syscall::EBADF),
-                "Can't read current time",
-            ));
-        }
-        let mut time_ms = time.tv_sec * 1000i64 + i64::from(time.tv_nsec) / 1_000_000i64;
-        time_ms += timeout.total_millis() as i64;
-        time.tv_sec = time_ms / 1000;
-        time.tv_nsec = ((time_ms % 1000) * 1_000_000) as i32;
-        self.time_file
-            .write_all(&time)
-            .map_err(|e| Error::from_io_error(e, "Failed to write to time file"))?;
-        Ok(())
-    }
-
-    fn poll(&mut self) -> Result<Duration> {
-        let timeout = {
-            let mut iter_limit = 10usize;
-            let mut iface = self.iface.borrow_mut();
-            let mut socket_set = self.socket_set.borrow_mut();
-
-            loop {
-                let timestamp = Instant::from(self.timer);
-                if iter_limit == 0 {
-                    break MIN_DURATION;
-                }
-                iter_limit -= 1;
-
-                self.router_device.get_mut().poll(timestamp);
-
-                // TODO: Check what if the bool returned by poll can be useful
-                iface.poll(timestamp, &mut self.router_device, &mut socket_set);
-
-                self.router_device.get_mut().dispatch(timestamp);
-
-                if !self.router_device.get_ref().can_recv() {
-                    match iface.poll_delay(timestamp, &socket_set) {
-                        Some(delay) if delay == Duration::ZERO => {}
-                        Some(delay) => break ::std::cmp::min(MAX_DURATION, delay),
-                        None => break MAX_DURATION,
-                    };
-                }
-            }
-        };
-
-        self.notify_sockets()?;
-
-        Ok(::std::cmp::min(
-            ::std::cmp::max(Smolnetd::MIN_CHECK_TIMEOUT, timeout),
-            Smolnetd::MAX_CHECK_TIMEOUT,
-        ))
-    }
-
-    fn notify_sockets(&mut self) -> Result<()> {
-        self.ip_scheme.notify_sockets()?;
-        self.udp_scheme.notify_sockets()?;
-        self.tcp_scheme.notify_sockets()?;
-        self.icmp_scheme.notify_sockets()
-    }
-}
-
-fn post_fevent(socket: &Socket, id: usize, flags: usize) -> syscall::error::Result<()> {
-    let fevent_response = Response::post_fevent(id, flags);
-    match socket.write_response(fevent_response, SignalBehavior::Restart) {
-        Ok(true) => Ok(()), // Write response success
-        Ok(false) => Err(syscall::error::Error::new(syscall::EAGAIN)), // Write response failed, retry.
-        Err(err) => Err(err),                                          // Error writing response
-    }
-}
-
-fn parse_endpoint(socket: &str) -> IpListenEndpoint {
-    let mut socket_parts = socket.split(':');
-    let host = Ipv4Address::from_str(socket_parts.next().unwrap_or(""))
-        .ok()
-        .filter(|addr| !addr.is_unspecified())
-        .map(IpAddress::Ipv4);
-
-    let port = socket_parts
-        .next()
-        .unwrap_or("")
-        .parse::<u16>()
-        .unwrap_or(0);
-    IpListenEndpoint { addr: host, port }
-}
-
-struct WaitHandle {
-    until: Option<TimeSpec>,
-    cancelling: bool,
-    packet: (Op, CallerCtx),
-}
-
-type WaitQueue = Vec<WaitHandle>;
-
-pub struct SchemeWrapper<SocketT>
-where
-    SocketT: SchemeSocket + AnySocket<'static>,
-{
-    scheme: socket::SocketScheme<SocketT>,
-    state: SchemeState,
-    wait_queue: WaitQueue,
-}
-impl<SocketT> SchemeWrapper<SocketT>
-where
-    SocketT: SchemeSocket + AnySocket<'static>,
-{
-    pub fn new(
-        name: &str,
-        iface: Interface,
-        route_table: Rc<RefCell<RouteTable>>,
-        socket_set: Rc<RefCell<SocketSet>>,
-        scheme_file: Socket,
-    ) -> Result<Self> {
-        Ok(Self {
-            scheme: SocketScheme::<SocketT>::new(name, iface, route_table, socket_set, scheme_file)
-                .map_err(|e| {
-                    Error::from_syscall_error(e, &format!("failed to initialize {} scheme", name))
-                })?,
-            state: SchemeState::new(),
-            wait_queue: Vec::new(),
-        })
-    }
-    pub fn on_scheme_event(&mut self) -> Result<Option<()>> {
-        let result = loop {
-            let request = match self
-                .scheme
-                .scheme_file
-                .next_request(SignalBehavior::Restart)
-            {
-                Ok(Some(req)) => req,
-                Ok(None) => {
-                    break Some(());
-                }
-                Err(error)
-                    if error.errno == syscall::EWOULDBLOCK || error.errno == syscall::EAGAIN =>
-                {
-                    break None;
-                }
-                Err(other) => {
-                    return Err(Error::from_syscall_error(
-                        other,
-                        "failed to receive new request",
-                    ))
-                }
-            };
-
-            let req = match request.kind() {
-                RequestKind::Call(c) => c,
-                RequestKind::OnClose { id } => {
-                    self.scheme.on_close(id);
-                    continue;
-                }
-                RequestKind::Cancellation(req) => {
-                    if let Some(idx) = self
-                        .wait_queue
-                        .iter()
-                        .position(|q| q.packet.0.req_id() == req.id)
-                    {
-                        self.wait_queue[idx].cancelling = true;
-                    }
-                    continue;
-                }
-                _ => {
-                    continue;
-                }
-            };
-            let caller = req.caller();
-            let mut op = match req.op() {
-                Ok(op) => op,
-                Err(req) => {
-                    self.scheme
-                        .scheme_file
-                        .write_response(
-                            Response::err(syscall::EOPNOTSUPP, req),
-                            SignalBehavior::Restart,
-                        )
-                        .map_err(|e| {
-                            Error::from_syscall_error(e.into(), "failed to write response")
-                        })?;
-                    continue;
-                }
-            };
-            let resp = match op.handle_sync_dont_consume(&caller, &mut self.scheme, &mut self.state)
-            {
-                SchemeResponse::Opened(Err(SyscallError {
-                    errno: syscall::EWOULDBLOCK,
-                }))
-                | SchemeResponse::Regular(Err(SyscallError {
-                    errno: syscall::EWOULDBLOCK,
-                })) if !op.is_explicitly_nonblock() => {
-                    match self.scheme.handle_block(&op) {
-                        Ok(timeout) => {
-                            self.wait_queue.push(WaitHandle {
-                                until: timeout,
-                                cancelling: false,
-                                packet: (op, caller),
-                            });
-                        }
-                        Err(err) => {
-                            let _ = self
-                                .scheme
-                                .scheme_file
-                                .write_response(
-                                    Response::err(err.errno, op),
-                                    SignalBehavior::Restart,
-                                )
-                                .map_err(|e| {
-                                    Error::from_syscall_error(e.into(), "failed to write response")
-                                })?;
-                            return Err(Error::from_syscall_error(
-                                err,
-                                "Can't handle blocked socket",
-                            ));
-                        }
-                    }
-                    continue;
-                }
-                SchemeResponse::Regular(r) => Response::new(r, op),
-                SchemeResponse::Opened(o) => Response::open_dup_like(o, op),
-                SchemeResponse::RegularAndNotifyOnDetach(status) => {
-                    Response::new_notify_on_detach(status, op)
-                }
-            };
-            let _ = self
-                .scheme
-                .scheme_file
-                .write_response(resp, SignalBehavior::Restart)
-                .map_err(|e| Error::from_syscall_error(e.into(), "failed to write response"))?;
-        };
-        Ok(result)
-    }
-
-    pub fn notify_sockets(&mut self) -> Result<()> {
-        let cur_time = libredox::call::clock_gettime(flag::CLOCK_MONOTONIC)
-            .map_err(|e| Error::from_syscall_error(e.into(), "Can't get time"))?;
-
-        // Notify non-blocking sockets
-        let scheme = &mut self.scheme;
-        let state = &mut self.state;
-
-        for (&fd, handle) in scheme.handles.iter_mut() {
-            let Handle::File(file) = handle else {
-                continue;
-            };
-            let events = {
-                let mut socket_set = scheme.socket_set.borrow_mut();
-                file.events(&mut socket_set)
-            };
-            if events > 0 {
-                post_fevent(&scheme.scheme_file, fd, events)
-                    .map_err(|e| Error::from_syscall_error(e.into(), "failed to post fevent"))?;
-            }
-        }
-        // Wake up blocking queue
-        let queue = &mut self.wait_queue;
-        let mut i = 0;
-        while i < queue.len() {
-            let handle = &mut queue[i];
-            let (op, caller) = &mut handle.packet;
-            let res = op.handle_sync_dont_consume(caller, scheme, state);
-
-            match res {
-                SchemeResponse::Opened(Err(SyscallError {
-                    errno: syscall::EWOULDBLOCK,
-                }))
-                | SchemeResponse::Regular(Err(SyscallError {
-                    errno: syscall::EWOULDBLOCK,
-                })) if !op.is_explicitly_nonblock() => {
-                    if handle.cancelling {
-                        let (op, _) = queue.swap_remove(i).packet;
-                        scheme
-                            .scheme_file
-                            .write_response(
-                                Response::err(syscall::ECANCELED, op),
-                                SignalBehavior::Restart,
-                            )
-                            .map_err(|e| {
-                                Error::from_syscall_error(e.into(), "failed to write response")
-                            })?;
-                        continue;
-                    }
-                    match handle.until {
-                        Some(until)
-                            if (until.tv_sec < cur_time.tv_sec
-                                || (until.tv_sec == cur_time.tv_sec
-                                    && i64::from(until.tv_nsec) < i64::from(cur_time.tv_nsec))) =>
-                        {
-                            let (op, _) = queue.swap_remove(i).packet;
-                            let _ = scheme
-                                .scheme_file
-                                .write_response(
-                                    Response::err(syscall::ETIMEDOUT, op),
-                                    SignalBehavior::Restart,
-                                )
-                                .map_err(|e| {
-                                    Error::from_syscall_error(e.into(), "failed to write response")
-                                })?;
-                        }
-                        _ => {
-                            i += 1;
-                        }
-                    }
-                }
-                SchemeResponse::Regular(r) => {
-                    let (op, _) = queue.swap_remove(i).packet;
-                    let _ = scheme
-                        .scheme_file
-                        .write_response(Response::new(r, op), SignalBehavior::Restart)
-                        .map_err(|e| {
-                            Error::from_syscall_error(e.into(), "failed to write response")
-                        })?;
-                }
-                SchemeResponse::Opened(o) => {
-                    let (op, _) = queue.swap_remove(i).packet;
-                    let _ = scheme
-                        .scheme_file
-                        .write_response(Response::open_dup_like(o, op), SignalBehavior::Restart)
-                        .map_err(|e| {
-                            Error::from_syscall_error(e.into(), "failed to write response")
-                        })?;
-                }
-                SchemeResponse::RegularAndNotifyOnDetach(status) => {
-                    let (op, _) = queue.swap_remove(i).packet;
-                    let _ = scheme
-                        .scheme_file
-                        .write_response(
-                            Response::new_notify_on_detach(status, op),
-                            SignalBehavior::Restart,
-                        )
-                        .map_err(|e| {
-                            Error::from_syscall_error(e.into(), "failed to write response")
-                        })?;
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/netstack/src/scheme/netcfg/mod.rs b/recipes/core/base/netstack/src/scheme/netcfg/mod.rs
deleted file mode 100644
index 269c28c81f..0000000000
--- a/recipes/core/base/netstack/src/scheme/netcfg/mod.rs
+++ /dev/null
@@ -1,627 +0,0 @@
-#[macro_use]
-mod nodes;
-mod notifier;
-
-use redox_scheme::{
-    scheme::{register_scheme_inner, SchemeState, SchemeSync},
-    CallerCtx, OpenResult, RequestKind, SignalBehavior, Socket,
-};
-use scheme_utils::HandleMap;
-use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr, Ipv4Address};
-use std::cell::RefCell;
-use std::collections::BTreeMap;
-use std::mem;
-use std::rc::Rc;
-use std::str;
-use std::str::FromStr;
-use syscall;
-use syscall::data::Stat;
-use syscall::flag::{MODE_DIR, MODE_FILE};
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error as SyscallError, EventFlags as SyscallEventFlags, Result as SyscallResult};
-
-use crate::error::{Error, Result};
-use crate::link::DeviceList;
-use crate::router::route_table::{RouteTable, Rule};
-
-use self::nodes::*;
-use self::notifier::*;
-use super::{post_fevent, Interface};
-
-const WRITE_BUFFER_MAX_SIZE: usize = 0xffff;
-
-fn gateway_cidr() -> IpCidr {
-    // TODO: const fn
-    IpCidr::new(IpAddress::v4(0, 0, 0, 0), 0)
-}
-
-fn parse_route(value: &str, route_table: &RouteTable) -> SyscallResult<Rule> {
-    let mut parts = value.split_whitespace();
-    let cidr_str = parts.next().ok_or(SyscallError::new(syscall::EINVAL))?;
-    let cidr = match cidr_str {
-        "default" => gateway_cidr(),
-        cidr_str => cidr_str
-            .parse()
-            .map_err(|_| SyscallError::new(syscall::EINVAL))?,
-    };
-
-    let via: IpAddress = match parts.next().ok_or(SyscallError::new(syscall::EINVAL))? {
-        "via" => parts
-            .next()
-            .ok_or(SyscallError::new(syscall::EINVAL))?
-            .parse()
-            .map_err(|_| SyscallError::new(syscall::EINVAL))?,
-        _ => return Err(SyscallError::new(syscall::EINVAL)),
-    };
-
-    if !via.is_unicast() {
-        return Err(SyscallError::new(syscall::EINVAL));
-    }
-
-    let rule = route_table
-        .lookup_rule(&via)
-        .ok_or(SyscallError::new(syscall::EINVAL))?;
-
-    Ok(Rule::new(cidr, Some(via), rule.dev.clone(), rule.src))
-}
-
-fn mk_root_node(
-    iface: Interface,
-    notifier: NotifierRef,
-    dns_config: DNSConfigRef,
-    route_table: Rc<RefCell<RouteTable>>,
-    devices: Rc<RefCell<DeviceList>>,
-) -> CfgNodeRef {
-    cfg_node! {
-        "resolv" => {
-            "nameserver" => {
-                rw [dns_config, notifier] (Option<Ipv4Address>, None)
-                || {
-                    format!("{}\n", dns_config.borrow().name_server)
-                }
-                |cur_value, line| {
-                    if cur_value.is_none() {
-                        let ip = Ipv4Address::from_str(line.trim())
-                            .map_err(|_| SyscallError::new(syscall::EINVAL))?;
-                        if ip.is_broadcast() || ip.is_multicast() || ip.is_unspecified() {
-                            return Err(SyscallError::new(syscall::EINVAL));
-                        }
-                        *cur_value = Some(ip);
-                        Ok(())
-                    } else {
-                        Err(SyscallError::new(syscall::EINVAL))
-                    }
-                }
-                |cur_value| {
-                    if let Some(ip) = *cur_value {
-                        dns_config.borrow_mut().name_server = ip;
-                        notifier.borrow_mut().schedule_notify("resolv/nameserver");
-                    }
-                    Ok(())
-                }
-            }
-        },
-        "route" => {
-            "list" => {
-                ro [route_table] || {
-                    format!("{}", route_table.borrow())
-                }
-            },
-            "add" => {
-                wo [iface, notifier, route_table] (Option<Rule>, None)
-                |cur_value, line| {
-                    if cur_value.is_none() {
-                        let route = parse_route(line, &route_table.borrow())?;
-                        *cur_value = Some(route);
-                        Ok(())
-                    } else {
-                        Err(SyscallError::new(syscall::EINVAL))
-                    }
-                }
-                |cur_value| {
-                    if let Some(route) = cur_value.take() {
-                        route_table.borrow_mut().insert_rule(route);
-                        notifier.borrow_mut().schedule_notify("route/list");
-                        Ok(())
-                    } else {
-                        Err(SyscallError::new(syscall::EINVAL))
-                    }
-                }
-            },
-            "rm" => {
-                wo [iface, notifier, route_table] (Option<IpCidr>, None)
-                |cur_value, line| {
-                    if cur_value.is_none() {
-                        match line.parse() {
-                            Ok(cidr) => {
-                                *cur_value = Some(cidr);
-                                Ok(())
-                            }
-                            Err(_) => Err(SyscallError::new(syscall::EINVAL))
-                        }
-                    } else {
-                        Err(SyscallError::new(syscall::EINVAL))
-                    }
-                }
-                |cur_value| {
-                    if let Some(cidr) = *cur_value {
-                        route_table.borrow_mut().remove_rule(cidr);
-                        notifier.borrow_mut().schedule_notify("route/list");
-                        Ok(())
-                    } else {
-                        Err(SyscallError::new(syscall::EINVAL))
-                    }
-                }
-            },
-        },
-        "ifaces" => {
-            "eth0" => {
-                "mac" => {
-                    rw [iface, notifier, devices] (Option<EthernetAddress>, None)
-                    || {
-                        match devices.borrow().get("eth0") {
-                            Some(dev) => {
-                                match dev.mac_address() {
-                                    Some(addr) => format!("{addr}\n"),
-                                    None => "Not configured\n".into(),
-                                }
-                            }
-                            None => "Device not found\n".into(),
-                        }
-                    }
-                    |cur_value, line| {
-                        if cur_value.is_none() {
-                            let mac = EthernetAddress::from_str(line).
-                                map_err(|_| SyscallError::new(syscall::EINVAL))?;
-                            if !mac.is_unicast() {
-                                return Err(SyscallError::new(syscall::EINVAL));
-                            }
-                            *cur_value = Some(mac);
-                            Ok(())
-                        } else {
-                            Err(SyscallError::new(syscall::EINVAL))
-                        }
-                    }
-                    |cur_value| {
-                        if let Some(mac) = *cur_value {
-                            if let Some(dev) = devices.borrow_mut().get_mut("eth0") {
-                                dev.set_mac_address(mac);
-                                notifier.borrow_mut().schedule_notify("ifaces/eth0/mac");
-                            }
-                        }
-                        Ok(())
-                    }
-                },
-                "addr" => {
-                    "list" => {
-                        ro [devices]
-                        || {
-                            let res = match devices.borrow().get("eth0") {
-                                Some(dev) => {
-                                    match dev.ip_address() {
-                                        Some(addr) => format!("{addr}\n"),
-                                        None => "Not configured\n".into(),
-                                    }
-                                }
-                                None => "Device not found\n".into(),
-                            };
-                            res
-                        }
-                    },
-                    "set" => {
-                        wo [iface, notifier, devices, route_table] (Option<IpCidr>, None)
-                        |cur_value, line| {
-                            if cur_value.is_none() {
-                                let cidr = IpCidr::from_str(line)
-                                    .map_err(|_| SyscallError::new(syscall::EINVAL))?;
-                                if !cidr.address().is_unicast() {
-                                    return Err(SyscallError::new(syscall::EINVAL));
-                                }
-                                *cur_value = Some(cidr);
-                                Ok(())
-                            } else {
-                                Err(SyscallError::new(syscall::EINVAL))
-                            }
-                        }
-                        |cur_value| {
-                            // TODO: Multiple IPs
-                            if let Some(cidr) = cur_value.take() {
-                                if let Some(dev) = devices.borrow_mut().get_mut("eth0") {
-
-                                    let mut route_table = route_table.borrow_mut();
-                                    if let Some(old_addr) = dev.ip_address() {
-                                        let IpCidr::Ipv4(old_v4_cidr) = old_addr;
-                                        let old_network = IpCidr::Ipv4(old_v4_cidr.network());
-
-                                        route_table.remove_rule(old_network);
-                                        route_table.change_src(old_addr.address(), cidr.address());
-                                        iface.borrow_mut().update_ip_addrs(|addrs| addrs.retain(|addr| *addr != old_addr))
-                                    }
-
-                                    dev.set_ip_address(cidr);
-                                    // FIXME: Here, the insert 0 is a workaround to let UDP sockets
-                                    // work with this interface only.
-                                    // Smoltcp takes the first ip address when looking for a source
-                                    // ip address when sending UDP packets.
-                                    // This behavior will have to be fixed as it's our route table
-                                    // job to find give this source.
-                                    iface.borrow_mut().update_ip_addrs(|addrs| addrs.insert(0, cidr).unwrap());
-
-                                    let IpCidr::Ipv4(v4_cidr) = cidr;
-                                    let network_cidr = IpCidr::Ipv4(v4_cidr.network());
-                                    route_table.insert_rule(Rule::new(network_cidr, None, dev.name().clone(), cidr.address()))
-                                }
-                                notifier.borrow_mut().schedule_notify("ifaces/eth0/addr/list");
-                                notifier.borrow_mut().schedule_notify("route/list");
-                            }
-                            Ok(())
-                        }
-                    },
-                }
-            }
-        }
-    }
-}
-
-struct DNSConfig {
-    name_server: Ipv4Address,
-}
-
-type DNSConfigRef = Rc<RefCell<DNSConfig>>;
-
-struct NetCfgFile {
-    path: String,
-    is_dir: bool,
-    is_writable: bool,
-    is_readable: bool,
-    node_writer: Option<Box<dyn NodeWriter>>,
-    read_buf: Vec<u8>,
-    write_buf: Vec<u8>,
-    pos: usize,
-    uid: u32,
-    done: bool,
-}
-
-impl NetCfgFile {
-    fn commit(&mut self) -> SyscallResult<()> {
-        if let Some(ref mut node_writer) = self.node_writer {
-            if !self.write_buf.is_empty() {
-                let line = str::from_utf8(&self.write_buf)
-                    .or_else(|_| Err(SyscallError::new(syscall::EINVAL)))?;
-                node_writer.write_line(line)?;
-            }
-            node_writer.commit()?;
-            self.write_buf.clear();
-        }
-        Ok(())
-    }
-
-    fn consume_lines(&mut self) -> SyscallResult<()> {
-        if let Some(ref mut node_writer) = self.node_writer {
-            let mut swap_with = None;
-            {
-                let mut lines = self.write_buf.split(|&c| c == b'\n');
-                if let Some(mut cur_line) = lines.next() {
-                    let mut consumed = false;
-                    for next_line in lines {
-                        let line = str::from_utf8(cur_line)
-                            .or_else(|_| Err(SyscallError::new(syscall::EINVAL)))?;
-                        trace!("writing line {}", line);
-                        node_writer.write_line(line)?;
-                        cur_line = next_line;
-                        consumed = true;
-                    }
-                    if consumed {
-                        swap_with = Some(From::from(cur_line))
-                    }
-                }
-            }
-            if let Some(ref mut new_vec) = swap_with {
-                mem::swap(&mut self.write_buf, new_vec);
-            }
-            Ok(())
-        } else {
-            Err(SyscallError::new(syscall::EBADF))
-        }
-    }
-}
-
-pub struct NetCfgScheme {
-    inner: NetCfgSchemeInner,
-    state: SchemeState,
-}
-
-impl NetCfgScheme {
-    pub fn new(
-        iface: Interface,
-        scheme_file: Socket,
-        route_table: Rc<RefCell<RouteTable>>,
-        devices: Rc<RefCell<DeviceList>>,
-    ) -> Result<NetCfgScheme> {
-        let notifier = Notifier::new_ref();
-        let dns_config = Rc::new(RefCell::new(DNSConfig {
-            name_server: Ipv4Address::new(8, 8, 8, 8),
-        }));
-        let mut inner = NetCfgSchemeInner {
-            scheme_file,
-            handles: HandleMap::new(),
-            root_node: mk_root_node(
-                iface,
-                Rc::clone(&notifier),
-                dns_config,
-                route_table,
-                devices,
-            ),
-            notifier,
-        };
-        let cap_id = inner
-            .scheme_root()
-            .map_err(|e| Error::from_syscall_error(e, "failed to get scheme root id"))?;
-        register_scheme_inner(&inner.scheme_file, "netcfg", cap_id).map_err(|e| {
-            Error::from_syscall_error(e, "failed to register netcfg scheme to namespace")
-        })?;
-        Ok(Self {
-            inner,
-            state: SchemeState::new(),
-        })
-    }
-
-    pub fn on_scheme_event(&mut self) -> Result<Option<()>> {
-        let result = loop {
-            let request = match self.inner.scheme_file.next_request(SignalBehavior::Restart) {
-                Ok(Some(req)) => req,
-                Ok(None) => {
-                    break Some(());
-                }
-                Err(error)
-                    if error.errno == syscall::EWOULDBLOCK || error.errno == syscall::EAGAIN =>
-                {
-                    break None;
-                }
-                Err(other) => {
-                    return Err(Error::from_syscall_error(
-                        other,
-                        "failed to receive new request",
-                    ))
-                }
-            };
-
-            match request.kind() {
-                RequestKind::Call(c) => {
-                    let resp = c.handle_sync(&mut self.inner, &mut self.state);
-                    let _ = self
-                        .inner
-                        .scheme_file
-                        .write_response(resp, SignalBehavior::Restart)
-                        .map_err(|e| {
-                            Error::from_syscall_error(e.into(), "failed to write response")
-                        })?;
-                }
-                RequestKind::OnClose { id } => {
-                    self.inner.on_close(id);
-                }
-                _ => {}
-            }
-        };
-        self.inner.notify_scheduled_fds();
-        Ok(result)
-    }
-}
-
-enum Handle {
-    SchemeRoot,
-    File(NetCfgFile),
-}
-
-struct NetCfgSchemeInner {
-    scheme_file: Socket,
-    handles: HandleMap<Handle>,
-    root_node: CfgNodeRef,
-    notifier: NotifierRef,
-}
-
-impl NetCfgSchemeInner {
-    fn notify_scheduled_fds(&mut self) {
-        let fds_to_notify = self.notifier.borrow_mut().get_notified_fds();
-        for fd in fds_to_notify {
-            let _ = post_fevent(&self.scheme_file, fd, syscall::EVENT_READ.bits());
-        }
-    }
-}
-
-impl SchemeSync for NetCfgSchemeInner {
-    fn scheme_root(&mut self) -> SyscallResult<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> SyscallResult<OpenResult> {
-        {
-            let handle = self.handles.get(dirfd)?;
-
-            if !matches!(handle, Handle::SchemeRoot) {
-                return Err(SyscallError::new(syscall::EACCES));
-            }
-        }
-
-        let mut current_node = Rc::clone(&self.root_node);
-        for part in path.split('/') {
-            if part.is_empty() {
-                continue;
-            }
-            let next_node = current_node
-                .borrow_mut()
-                .open(part)
-                .ok_or_else(|| SyscallError::new(syscall::EINVAL))?;
-            current_node = next_node;
-        }
-        let current_node = current_node.borrow();
-        let read_buf = Vec::from(current_node.read());
-        let fd = self.handles.insert(Handle::File(NetCfgFile {
-            path: path.to_owned(),
-            is_dir: current_node.is_dir(),
-            is_writable: current_node.is_writable(),
-            is_readable: current_node.is_readable(),
-            node_writer: if current_node.is_writable() {
-                current_node.new_writer()
-            } else {
-                None
-            },
-            uid: ctx.uid,
-            pos: 0,
-            read_buf,
-            write_buf: vec![],
-            done: false,
-        }));
-        trace!("open {} {}", fd, path);
-        Ok(OpenResult::ThisScheme {
-            number: fd,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn on_close(&mut self, fd: usize) {
-        trace!("close {}", fd);
-        if let Some(handle) = self.handles.remove(fd) {
-            match handle {
-                Handle::SchemeRoot => {
-                    // SchemeRoot closed, nothing specific to clean up
-                }
-                Handle::File(mut file) => {
-                    self.notifier.borrow_mut().unsubscribe(&file.path, fd);
-                    if !file.done {
-                        let _ = file.commit().map(|_| 0);
-                    }
-                }
-            }
-        }
-    }
-
-    fn write(
-        &mut self,
-        fd: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> SyscallResult<usize> {
-        let handle = self.handles.get_mut(fd)?;
-
-        let file = match handle {
-            Handle::File(file) => file,
-            Handle::SchemeRoot => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        if file.done {
-            return Err(SyscallError::new(syscall::EBADF));
-        }
-
-        if file.uid != 0 {
-            return Err(SyscallError::new(syscall::EACCES));
-        }
-
-        if (WRITE_BUFFER_MAX_SIZE - file.write_buf.len()) < buf.len() {
-            return Err(SyscallError::new(syscall::EMSGSIZE));
-        }
-
-        file.write_buf.extend_from_slice(buf);
-
-        if let Err(e) = file.consume_lines() {
-            trace!("Failed write {} {}", fd, e);
-            file.done = true;
-            return Err(e);
-        }
-
-        Ok(buf.len())
-    }
-
-    fn read(
-        &mut self,
-        fd: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> SyscallResult<usize> {
-        let handle = self.handles.get_mut(fd)?;
-
-        let file = match handle {
-            Handle::File(file) => file,
-            Handle::SchemeRoot => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        let mut i = 0;
-        while i < buf.len() && file.pos < file.read_buf.len() {
-            buf[i] = file.read_buf[file.pos];
-            i += 1;
-            file.pos += 1;
-        }
-        Ok(i)
-    }
-
-    fn fstat(&mut self, fd: usize, stat: &mut Stat, _ctx: &CallerCtx) -> SyscallResult<()> {
-        let handle = self.handles.get_mut(fd)?;
-
-        match handle {
-            Handle::SchemeRoot => return Err(SyscallError::new(syscall::EBADF)),
-            Handle::File(file) => {
-                stat.st_mode = if file.is_dir { MODE_DIR } else { MODE_FILE };
-                if file.is_writable {
-                    stat.st_mode |= 0o222;
-                }
-                if file.is_readable {
-                    stat.st_mode |= 0o444;
-                }
-                stat.st_uid = 0;
-                stat.st_gid = 0;
-                stat.st_size = file.read_buf.len() as u64;
-            }
-        }
-
-        Ok(())
-    }
-
-    fn fevent(
-        &mut self,
-        fd: usize,
-        events: SyscallEventFlags,
-        _ctx: &CallerCtx,
-    ) -> SyscallResult<SyscallEventFlags> {
-        let handle = self.handles.get_mut(fd)?;
-
-        match handle {
-            Handle::SchemeRoot => return Err(SyscallError::new(syscall::EBADF)),
-            Handle::File(file) => {
-                if events.contains(syscall::EVENT_READ) {
-                    self.notifier.borrow_mut().subscribe(&file.path, fd);
-                } else {
-                    self.notifier.borrow_mut().unsubscribe(&file.path, fd);
-                }
-            }
-        }
-        Ok(SyscallEventFlags::empty())
-    }
-
-    fn fsync(&mut self, fd: usize, _ctx: &CallerCtx) -> SyscallResult<()> {
-        let handle = self.handles.get_mut(fd)?;
-
-        let file = match handle {
-            Handle::File(file) => file,
-            Handle::SchemeRoot => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        if !file.done {
-            let res = file.commit();
-            file.done = true;
-            res
-        } else {
-            Err(SyscallError::new(syscall::EBADF))
-        }
-    }
-}
diff --git a/recipes/core/base/netstack/src/scheme/netcfg/nodes.rs b/recipes/core/base/netstack/src/scheme/netcfg/nodes.rs
deleted file mode 100644
index 4183da73cd..0000000000
--- a/recipes/core/base/netstack/src/scheme/netcfg/nodes.rs
+++ /dev/null
@@ -1,270 +0,0 @@
-use std::cell::RefCell;
-use std::collections::BTreeMap;
-use std::rc::Rc;
-use syscall::Result as SyscallResult;
-
-pub type CfgNodeRef = Rc<RefCell<dyn CfgNode>>;
-
-pub trait NodeWriter {
-    fn write_line(&mut self, _: &str) -> SyscallResult<()> {
-        Ok(())
-    }
-
-    fn commit(&mut self) -> SyscallResult<()> {
-        Ok(())
-    }
-}
-
-pub struct SimpleWriter<T, WL, C>
-where
-    WL: 'static + Fn(&mut T, &str) -> SyscallResult<()>,
-    C: 'static + Fn(&mut T) -> SyscallResult<()>,
-{
-    data: T,
-    write_line: WL,
-    commit: C,
-}
-
-impl<T, WL, C> NodeWriter for SimpleWriter<T, WL, C>
-where
-    WL: 'static + Fn(&mut T, &str) -> SyscallResult<()>,
-    C: 'static + Fn(&mut T) -> SyscallResult<()>,
-{
-    fn write_line(&mut self, line: &str) -> SyscallResult<()> {
-        (self.write_line)(&mut self.data, line)
-    }
-
-    fn commit(&mut self) -> SyscallResult<()> {
-        (self.commit)(&mut self.data)
-    }
-}
-
-impl<T, WL, C> SimpleWriter<T, WL, C>
-where
-    WL: 'static + Fn(&mut T, &str) -> SyscallResult<()>,
-    C: 'static + Fn(&mut T) -> SyscallResult<()>,
-{
-    pub fn new_boxed(data: T, write_line: WL, commit: C) -> Box<Self> {
-        Box::new(SimpleWriter {
-            data,
-            write_line,
-            commit,
-        })
-    }
-}
-
-pub trait CfgNode {
-    fn is_dir(&self) -> bool {
-        false
-    }
-
-    fn is_writable(&self) -> bool {
-        false
-    }
-
-    fn is_readable(&self) -> bool {
-        true
-    }
-
-    fn read(&self) -> String {
-        String::new()
-    }
-
-    fn open(&self, _file: &str) -> Option<CfgNodeRef> {
-        None
-    }
-
-    fn new_writer(&self) -> Option<Box<dyn NodeWriter>> {
-        None
-    }
-}
-
-pub struct RONode<F>
-where
-    F: Fn() -> String,
-{
-    read_fun: F,
-}
-
-impl<F> CfgNode for RONode<F>
-where
-    F: Fn() -> String,
-{
-    fn read(&self) -> String {
-        (self.read_fun)()
-    }
-}
-
-impl<F> RONode<F>
-where
-    F: 'static + Fn() -> String,
-{
-    pub fn new_ref(read_fun: F) -> CfgNodeRef {
-        Rc::new(RefCell::new(RONode { read_fun }))
-    }
-}
-
-pub struct WONode<W>
-where
-    W: 'static + Fn() -> Box<dyn NodeWriter>,
-{
-    new_writer: W,
-}
-
-impl<W> CfgNode for WONode<W>
-where
-    W: 'static + Fn() -> Box<dyn NodeWriter>,
-{
-    fn is_readable(&self) -> bool {
-        false
-    }
-
-    fn is_writable(&self) -> bool {
-        true
-    }
-
-    fn new_writer(&self) -> Option<Box<dyn NodeWriter>> {
-        Some((self.new_writer)())
-    }
-}
-
-impl<W> WONode<W>
-where
-    W: 'static + Fn() -> Box<dyn NodeWriter>,
-{
-    pub fn new_ref(new_writer: W) -> CfgNodeRef {
-        Rc::new(RefCell::new(WONode { new_writer }))
-    }
-}
-
-pub struct RWNode<F, W>
-where
-    F: Fn() -> String,
-    W: 'static + Fn() -> Box<dyn NodeWriter>,
-{
-    read_fun: F,
-    new_writer: W,
-}
-
-impl<F, W> CfgNode for RWNode<F, W>
-where
-    F: Fn() -> String,
-    W: 'static + Fn() -> Box<dyn NodeWriter>,
-{
-    fn read(&self) -> String {
-        (self.read_fun)()
-    }
-
-    fn is_writable(&self) -> bool {
-        true
-    }
-
-    fn new_writer(&self) -> Option<Box<dyn NodeWriter>> {
-        Some((self.new_writer)())
-    }
-}
-
-impl<F, W> RWNode<F, W>
-where
-    F: 'static + Fn() -> String,
-    W: 'static + Fn() -> Box<dyn NodeWriter>,
-{
-    pub fn new_ref(read_fun: F, new_writer: W) -> CfgNodeRef {
-        Rc::new(RefCell::new(RWNode {
-            read_fun,
-            new_writer,
-        }))
-    }
-}
-
-pub struct StaticDirNode {
-    child_nodes: BTreeMap<String, CfgNodeRef>,
-}
-
-impl CfgNode for StaticDirNode {
-    fn is_dir(&self) -> bool {
-        true
-    }
-
-    fn read(&self) -> String {
-        let mut files = String::new();
-        for child in self.child_nodes.keys() {
-            if !files.is_empty() {
-                files.push('\n');
-            }
-            files += child;
-        }
-        files
-    }
-
-    fn open(&self, file: &str) -> Option<CfgNodeRef> {
-        self.child_nodes.get(file).map(|node| Rc::clone(node))
-    }
-}
-
-impl StaticDirNode {
-    pub fn new_ref(child_nodes: BTreeMap<String, CfgNodeRef>) -> CfgNodeRef {
-        Rc::new(RefCell::new(StaticDirNode { child_nodes }))
-    }
-}
-
-macro_rules! cfg_node {
-    (val $e:expr) => {
-        $e
-    };
-    (ro [ $($c:ident),* ] || $b:block ) => {
-        {
-            $(let $c = $c.clone();)*
-            RONode::new_ref(move|| $b)
-        }
-    };
-    (wo [ $($c:ident),* ] ( $et:ty , $e:expr ) |$data_i:ident, $line_i:ident|
-     $write_line:block |$data_i2:ident| $commit:block) => {
-        {
-            $(#[allow(unused_variables)] let $c = $c.clone();)*
-            let new_writer = move || -> Box<dyn NodeWriter> {
-                let write_line = {
-                    $(#[allow(unused_variables)] let $c = $c.clone();)*
-                    move |$data_i: &mut $et, $line_i: &str| $write_line
-                };
-                let commit = {
-                    $(#[allow(unused_variables)] let $c = $c.clone();)*
-                    move |$data_i2: &mut $et| $commit
-                };
-                let data: $et = $e;
-                SimpleWriter::new_boxed(data, write_line, commit)
-            };
-            WONode::new_ref(new_writer)
-        }
-    };
-    (rw [ $($c:ident),* ] ( $et:ty , $e:expr ) || $read_fun:block |$data_i:ident, $line_i:ident|
-     $write_line:block |$data_i2:ident| $commit:block) => {
-        {
-            let read_fun = {
-                $(#[allow(unused_variables)] let $c = $c.clone();)*
-                move || $read_fun
-            };
-            $(#[allow(unused_variables)] let $c = $c.clone();)*
-            let new_writer = move || -> Box<dyn NodeWriter> {
-                let write_line = {
-                    $(#[allow(unused_variables)] let $c = $c.clone();)*
-                    move |$data_i: &mut $et, $line_i: &str| $write_line
-                };
-                let commit = {
-                    $(#[allow(unused_variables)] let $c = $c.clone();)*
-                    move |$data_i2: &mut $et| $commit
-                };
-                let data: $et = $e;
-                SimpleWriter::new_boxed(data, write_line, commit)
-            };
-            RWNode::new_ref(read_fun, new_writer)
-        }
-    };
-    ($($e:expr => { $($t:tt)* }),* $(,)*) => {
-        {
-            let mut children = BTreeMap::new();
-            $(children.insert($e.into(), cfg_node!($($t)*));)*
-            StaticDirNode::new_ref(children)
-        }
-    };
-}
diff --git a/recipes/core/base/netstack/src/scheme/netcfg/notifier.rs b/recipes/core/base/netstack/src/scheme/netcfg/notifier.rs
deleted file mode 100644
index 8f05a92d1f..0000000000
--- a/recipes/core/base/netstack/src/scheme/netcfg/notifier.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::cell::RefCell;
-use std::collections::btree_map::Entry;
-use std::collections::{BTreeMap, BTreeSet};
-use std::rc::Rc;
-
-pub struct Notifier {
-    listeners: BTreeMap<String, BTreeSet<usize>>,
-    notified: BTreeSet<usize>,
-}
-
-pub type NotifierRef = Rc<RefCell<Notifier>>;
-
-impl Notifier {
-    pub fn new_ref() -> NotifierRef {
-        Rc::new(RefCell::new(Notifier {
-            listeners: BTreeMap::new(),
-            notified: BTreeSet::new(),
-        }))
-    }
-
-    pub fn subscribe(&mut self, path: &str, fd: usize) {
-        trace!("Sub fd {} to {}", fd, path);
-        match self.listeners.entry(path.to_owned()) {
-            Entry::Occupied(mut e) => {
-                e.get_mut().insert(fd);
-            }
-            Entry::Vacant(e) => {
-                let mut fds = BTreeSet::new();
-                fds.insert(fd);
-                e.insert(fds);
-            }
-        }
-    }
-
-    pub fn unsubscribe(&mut self, path: &str, fd: usize) {
-        let empty = if let Some(fds) = self.listeners.get_mut(path) {
-            if fds.remove(&fd) {
-                trace!("Unsub fd {} from {}", fd, path);
-            }
-            fds.is_empty()
-        } else {
-            false
-        };
-        if empty {
-            self.listeners.remove(path);
-        }
-    }
-
-    pub fn schedule_notify(&mut self, path: &str) {
-        trace!("Notifying {}", path);
-        if let Some(fds) = self.listeners.get(path) {
-            self.notified.extend(fds);
-        }
-    }
-
-    pub fn get_notified_fds(&mut self) -> BTreeSet<usize> {
-        use std::mem::swap;
-        let mut notified = BTreeSet::new();
-        swap(&mut self.notified, &mut notified);
-        notified
-    }
-}
diff --git a/recipes/core/base/netstack/src/scheme/socket.rs b/recipes/core/base/netstack/src/scheme/socket.rs
deleted file mode 100644
index fc8e558b51..0000000000
--- a/recipes/core/base/netstack/src/scheme/socket.rs
+++ /dev/null
@@ -1,942 +0,0 @@
-use std::cell::RefCell;
-use std::collections::btree_map::Entry;
-use std::collections::BTreeMap;
-use std::io::{Read, Write};
-use std::marker::PhantomData;
-use std::mem;
-use std::ops::Deref;
-use std::ops::DerefMut;
-use std::rc::Rc;
-use std::str;
-
-use libredox::flag::CLOCK_MONOTONIC;
-use libredox::protocol::SocketCall;
-use redox_scheme::{
-    scheme::{register_scheme_inner, Op, SchemeSync},
-    CallerCtx, OpenResult, Socket,
-};
-use scheme_utils::HandleMap;
-use syscall::data::TimeSpec;
-use syscall::flag::{EVENT_READ, EVENT_WRITE};
-use syscall::schemev2::NewFdFlags;
-use syscall::{
-    Error as SyscallError, EventFlags as SyscallEventFlags, Result as SyscallResult, EINVAL,
-    EOPNOTSUPP,
-};
-
-use super::Interface;
-use crate::router::route_table::RouteTable;
-use crate::scheme::smoltcp::iface::SocketHandle;
-use crate::scheme::Router;
-use crate::Smolnetd;
-use smoltcp::socket::AnySocket;
-
-use super::SocketSet;
-
-const SO_RCVBUF: usize = 8;
-const SO_SNDBUF: usize = 7;
-
-pub struct Context {
-    pub iface: Interface,
-    pub route_table: Rc<RefCell<RouteTable>>,
-}
-
-pub struct NullFile {
-    pub flags: usize,
-    pub uid: u32,
-    pub gid: u32,
-    pub read_enabled: bool,
-    pub write_enabled: bool,
-}
-
-pub struct SocketFile<DataT> {
-    pub flags: usize,
-    pub data: DataT,
-
-    events: usize,
-    socket_handle: SocketHandle,
-    read_notified: bool,
-    write_notified: bool,
-    read_timeout: Option<TimeSpec>,
-    write_timeout: Option<TimeSpec>,
-    pub read_enabled: bool,
-    pub write_enabled: bool,
-}
-
-impl<DataT> SocketFile<DataT> {
-    pub fn clone_with_data(&self, data: DataT) -> SocketFile<DataT> {
-        SocketFile {
-            flags: self.flags,
-            events: self.events,
-            read_notified: false, // we still want to notify about this new socket
-            write_notified: false,
-            read_timeout: self.read_timeout,
-            write_timeout: self.write_timeout,
-            socket_handle: self.socket_handle,
-            read_enabled: self.read_enabled,
-            write_enabled: self.write_enabled,
-            data,
-        }
-    }
-
-    pub fn new_with_data(socket_handle: SocketHandle, data: DataT) -> SocketFile<DataT> {
-        SocketFile {
-            flags: 0,
-            events: 0,
-            read_notified: false,
-            write_notified: false,
-            read_timeout: None,
-            write_timeout: None,
-            read_enabled: true,
-            write_enabled: true,
-            socket_handle,
-            data,
-        }
-    }
-}
-
-#[derive(Copy, Clone)]
-enum Setting<SettingT: Copy> {
-    HopLimit,
-    ReadTimeout,
-    WriteTimeout,
-    #[allow(dead_code)]
-    Other(SettingT),
-}
-
-pub struct SettingFile<SettingT: Copy> {
-    fd: usize,
-    socket_handle: SocketHandle,
-    setting: Setting<SettingT>,
-}
-
-pub enum SchemeFile<SocketT>
-where
-    SocketT: SchemeSocket,
-{
-    Setting(SettingFile<SocketT::SettingT>),
-    Socket(SocketFile<SocketT::DataT>),
-}
-
-impl<SocketT> SchemeFile<SocketT>
-where
-    SocketT: SchemeSocket,
-{
-    pub fn socket_handle(&self) -> SocketHandle {
-        match *self {
-            SchemeFile::Socket(SocketFile { socket_handle, .. })
-            | SchemeFile::Setting(SettingFile { socket_handle, .. }) => socket_handle,
-        }
-    }
-
-    pub fn events(&mut self, socket_set: &mut SocketSet) -> usize
-    where
-        SocketT: AnySocket<'static>,
-    {
-        let mut revents = 0;
-        if let &mut SchemeFile::Socket(SocketFile {
-            socket_handle,
-            events,
-            ref mut read_notified,
-            ref mut write_notified,
-            ref data,
-            ..
-        }) = self
-        {
-            let socket = socket_set.get_mut::<SocketT>(socket_handle);
-
-            if events & syscall::EVENT_READ.bits() == syscall::EVENT_READ.bits()
-                && (socket.can_recv(data) || !socket.may_recv())
-            {
-                if !*read_notified {
-                    *read_notified = true;
-                    revents |= EVENT_READ.bits();
-                }
-            } else {
-                *read_notified = false;
-            }
-
-            if events & syscall::EVENT_WRITE.bits() == syscall::EVENT_WRITE.bits()
-                && socket.can_send()
-            {
-                if !*write_notified {
-                    *write_notified = true;
-                    revents |= EVENT_WRITE.bits();
-                }
-            } else {
-                *write_notified = false;
-            }
-        }
-        revents
-    }
-}
-
-pub type DupResult<T> = Option<(
-    SchemeFile<T>,
-    Option<(SocketHandle, <T as SchemeSocket>::DataT)>,
-)>;
-
-pub trait SchemeSocket
-where
-    Self: ::std::marker::Sized,
-{
-    type SchemeDataT;
-    type DataT;
-    type SettingT: Copy;
-
-    fn new_scheme_data() -> Self::SchemeDataT;
-
-    fn can_send(&self) -> bool;
-    fn can_recv(&mut self, data: &Self::DataT) -> bool;
-    fn may_recv(&self) -> bool;
-
-    fn hop_limit(&self) -> u8;
-    fn set_hop_limit(&mut self, hop_limit: u8);
-
-    fn get_setting(
-        file: &SocketFile<Self::DataT>,
-        setting: Self::SettingT,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize>;
-    fn set_setting(
-        file: &mut SocketFile<Self::DataT>,
-        setting: Self::SettingT,
-        buf: &[u8],
-    ) -> SyscallResult<usize>;
-
-    fn new_socket(
-        sockets: &mut SocketSet,
-        path: &str,
-        uid: u32,
-        data: &mut Self::SchemeDataT,
-        context: &Context,
-    ) -> SyscallResult<(SocketHandle, Self::DataT)>;
-
-    fn close_file(
-        &self,
-        file: &SchemeFile<Self>,
-        data: &mut Self::SchemeDataT,
-    ) -> SyscallResult<()>;
-
-    fn write_buf(&mut self, file: &mut SocketFile<Self::DataT>, buf: &[u8])
-        -> SyscallResult<usize>;
-
-    fn read_buf(
-        &mut self,
-        file: &mut SocketFile<Self::DataT>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize>;
-
-    fn fpath(&self, file: &SchemeFile<Self>, buf: &mut [u8]) -> SyscallResult<usize>;
-
-    fn dup(
-        sockets: &mut SocketSet,
-        file: &mut SchemeFile<Self>,
-        path: &str,
-        data: &mut Self::SchemeDataT,
-    ) -> SyscallResult<DupResult<Self>>;
-
-    fn handle_get_peer_name(
-        &self,
-        file: &SchemeFile<Self>,
-        payload: &mut [u8],
-    ) -> SyscallResult<usize>;
-
-    fn handle_shutdown(&mut self, file: &mut SchemeFile<Self>, how: usize) -> SyscallResult<usize>;
-
-    fn handle_recvmsg(
-        &mut self,
-        file: &mut SchemeFile<Self>,
-        payload: &mut [u8],
-        flags: usize,
-    ) -> SyscallResult<usize>;
-
-    fn get_sock_opt(
-        &self,
-        file: &SchemeFile<Self>,
-        name: usize,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        // Return Err for default implementation
-        Err(SyscallError::new(syscall::ENOPROTOOPT))
-    }
-}
-
-pub enum Handle<SocketT>
-where
-    SocketT: SchemeSocket,
-{
-    SchemeRoot,
-    Null(NullFile),
-    File(SchemeFile<SocketT>),
-}
-
-pub struct SocketScheme<SocketT>
-where
-    SocketT: SchemeSocket + AnySocket<'static>,
-{
-    pub handles: HandleMap<Handle<SocketT>>,
-    ref_counts: BTreeMap<SocketHandle, usize>,
-    context: Context,
-    pub socket_set: Rc<RefCell<SocketSet>>,
-    pub scheme_file: Socket,
-    scheme_data: SocketT::SchemeDataT,
-    _phantom_socket: PhantomData<SocketT>,
-}
-
-impl<SocketT> SocketScheme<SocketT>
-where
-    SocketT: SchemeSocket + AnySocket<'static>,
-{
-    pub fn new(
-        name: &str,
-        iface: Interface,
-        route_table: Rc<RefCell<RouteTable>>,
-        socket_set: Rc<RefCell<SocketSet>>,
-        scheme_file: Socket,
-    ) -> SyscallResult<SocketScheme<SocketT>> {
-        let mut scheme = SocketScheme {
-            handles: HandleMap::new(),
-            ref_counts: BTreeMap::new(),
-            socket_set,
-            scheme_data: SocketT::new_scheme_data(),
-            scheme_file,
-            _phantom_socket: PhantomData,
-            context: Context { iface, route_table },
-        };
-        let cap_id = scheme.scheme_root()?;
-        register_scheme_inner(&scheme.scheme_file, name, cap_id)?;
-        Ok(scheme)
-    }
-
-    pub fn handle_block(&mut self, op: &Op) -> SyscallResult<Option<TimeSpec>> {
-        let fd = op.file_id().expect("op is not fd based request");
-        let (read_timeout, write_timeout) = {
-            let handle = self.handles.get(fd)?;
-
-            if let Handle::File(SchemeFile::Socket(ref scheme_file)) = *handle {
-                Ok((scheme_file.read_timeout, scheme_file.write_timeout))
-            } else {
-                Err(SyscallError::new(syscall::EBADF))
-            }
-        }?;
-
-        let mut timeout = match op {
-            Op::Read(_) => write_timeout,
-            Op::Write(_) => read_timeout,
-            _ => None,
-        };
-
-        if let Some(ref mut timeout) = timeout {
-            let cur_time = libredox::call::clock_gettime(CLOCK_MONOTONIC)?;
-            *timeout = add_time(
-                timeout,
-                &TimeSpec {
-                    tv_sec: cur_time.tv_sec,
-                    tv_nsec: cur_time.tv_nsec as i32,
-                },
-            )
-        }
-
-        Ok(timeout)
-    }
-
-    fn get_setting(
-        &mut self,
-        fd: usize,
-        setting: Setting<SocketT::SettingT>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        let file = self.handles.get_mut(fd)?;
-
-        let file = match *file {
-            Handle::File(SchemeFile::Socket(ref mut file)) => file,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        match setting {
-            Setting::Other(setting) => SocketT::get_setting(file, setting, buf),
-            Setting::HopLimit => {
-                if let Some(hop_limit) = buf.get_mut(0) {
-                    let socket_set = self.socket_set.borrow();
-                    let socket = socket_set.get::<SocketT>(file.socket_handle);
-                    *hop_limit = socket.hop_limit();
-                    Ok(1)
-                } else {
-                    Err(SyscallError::new(syscall::EIO))
-                }
-            }
-            Setting::ReadTimeout | Setting::WriteTimeout => {
-                let timespec = match (setting, file.read_timeout, file.write_timeout) {
-                    (Setting::ReadTimeout, Some(read_timeout), _) => read_timeout,
-                    (Setting::WriteTimeout, _, Some(write_timeout)) => write_timeout,
-                    _ => {
-                        return Ok(0);
-                    }
-                };
-
-                if buf.len() < mem::size_of::<TimeSpec>() {
-                    Ok(0)
-                } else {
-                    let count = timespec.deref().read(buf).map_err(|err| {
-                        SyscallError::new(err.raw_os_error().unwrap_or(syscall::EIO))
-                    })?;
-                    Ok(count)
-                }
-            }
-        }
-    }
-
-    fn update_setting(
-        &mut self,
-        fd: usize,
-        setting: Setting<SocketT::SettingT>,
-        buf: &[u8],
-    ) -> SyscallResult<usize> {
-        let file = self.handles.get_mut(fd)?;
-        let file = match *file {
-            Handle::File(SchemeFile::Socket(ref mut file)) => file,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-        match setting {
-            Setting::ReadTimeout | Setting::WriteTimeout => {
-                let (timeout, count) = {
-                    if buf.len() < mem::size_of::<TimeSpec>() {
-                        (None, 0)
-                    } else {
-                        let mut timespec = TimeSpec::default();
-                        let count = timespec.deref_mut().write(buf).map_err(|err| {
-                            SyscallError::new(err.raw_os_error().unwrap_or(syscall::EIO))
-                        })?;
-                        (Some(timespec), count)
-                    }
-                };
-                match setting {
-                    Setting::ReadTimeout => {
-                        file.read_timeout = timeout;
-                    }
-                    Setting::WriteTimeout => {
-                        file.write_timeout = timeout;
-                    }
-                    _ => {}
-                };
-                Ok(count)
-            }
-            Setting::HopLimit => {
-                if let Some(hop_limit) = buf.get(0) {
-                    let mut socket_set = self.socket_set.borrow_mut();
-                    let socket = socket_set.get_mut::<SocketT>(file.socket_handle);
-                    socket.set_hop_limit(*hop_limit);
-                    Ok(1)
-                } else {
-                    Err(SyscallError::new(syscall::EIO))
-                }
-            }
-            Setting::Other(setting) => SocketT::set_setting(file, setting, buf),
-        }
-    }
-
-    fn call_inner(
-        &mut self,
-        fd: usize,
-        payload: &mut [u8],
-        metadata: &[u64],
-        ctx: &CallerCtx,
-    ) -> SyscallResult<usize> {
-        // metadata to Vec<u8>
-        let Some(verb) = SocketCall::try_from_raw(metadata[0] as usize) else {
-            warn!("Invalid verb in metadata: {:?}", metadata);
-            return Err(SyscallError::new(EINVAL));
-        };
-        match verb {
-            // TODO
-            // SocketCall::Bind => self.handle_bind(id, &payload),
-            // SocketCall::Connect => self.handle_connect(id, &payload),
-            SocketCall::SetSockOpt => {
-                // currently not used
-                // self.handle_setsockopt(id, metadata[1] as i32, &payload)
-                // TODO: SO_REUSEADDR from null socket
-                Ok(0)
-            }
-            SocketCall::GetSockOpt => {
-                let handle = self.handles.get_mut(fd)?;
-
-                match *handle {
-                    Handle::File(ref mut file) => {
-                        let mut socket_set = self.socket_set.borrow_mut();
-                        let socket = socket_set.get_mut::<SocketT>(file.socket_handle());
-                        SocketT::get_sock_opt(socket, file, metadata[1] as usize, payload)
-                    }
-                    Handle::Null(_) => {
-                        // TODO
-                        // The socket exists but hasn't been bound/connected yet.
-                        // We return default values for buffer sizes to satisfy apps like iperf3.
-                        // Figure out maybe a better way?
-                        let name = metadata[1] as usize;
-                        if name == SO_RCVBUF || name == SO_SNDBUF {
-                            let val: i32 = (Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE) as i32;
-                            let bytes = val.to_ne_bytes();
-
-                            if payload.len() < bytes.len() {
-                                return Err(SyscallError::new(syscall::EINVAL));
-                            }
-                            payload[..bytes.len()].copy_from_slice(&bytes);
-                            Ok(bytes.len())
-                        } else {
-                            Err(SyscallError::new(syscall::EINVAL))
-                        }
-                    }
-                    Handle::SchemeRoot => Err(SyscallError::new(syscall::EBADF)),
-                }
-            }
-            // SocketCall::SendMsg => self.handle_sendmsg(id, payload, ctx),
-            // SocketCall::Unbind => self.handle_unbind(id),
-            // SocketCall::GetToken => self.handle_get_token(id, payload),
-            SocketCall::GetPeerName => {
-                let file = self.handles.get_mut(fd)?;
-
-                let file = match *file {
-                    Handle::File(ref mut f) => f,
-                    _ => return Err(SyscallError::new(syscall::EBADF)),
-                };
-                let mut socket_set = self.socket_set.borrow_mut();
-                let socket = socket_set.get_mut::<SocketT>(file.socket_handle());
-
-                SocketT::handle_get_peer_name(socket, file, payload)
-            }
-            SocketCall::RecvMsg => {
-                let flags = metadata[1] as usize;
-                let handle = self.handles.get_mut(fd)?;
-
-                match *handle {
-                    Handle::File(ref mut file) => {
-                        let mut socket_set = self.socket_set.borrow_mut();
-                        let socket = socket_set.get_mut::<SocketT>(file.socket_handle());
-
-                        SocketT::handle_recvmsg(socket, file, payload, flags)
-                    }
-                    Handle::Null(_) => Err(SyscallError::new(syscall::EINVAL)),
-                    Handle::SchemeRoot => Err(SyscallError::new(syscall::EBADF)),
-                }
-            }
-
-            SocketCall::Shutdown => {
-                let how = metadata[1] as usize;
-
-                match self.handles.get_mut(fd)? {
-                    Handle::File(file) => {
-                        let mut socket_set = self.socket_set.borrow_mut();
-                        let socket = socket_set.get_mut::<SocketT>(file.socket_handle());
-
-                        SocketT::handle_shutdown(socket, file, how)
-                    }
-                    Handle::Null(null_file) => {
-                        match how {
-                            0 => null_file.read_enabled = false,
-                            1 => null_file.write_enabled = false,
-                            2 => {
-                                null_file.read_enabled = false;
-                                null_file.write_enabled = false;
-                            }
-                            _ => return Err(SyscallError::new(EINVAL)),
-                        }
-                        Ok(0)
-                    }
-                    Handle::SchemeRoot => Err(SyscallError::new(syscall::EBADF)),
-                }
-            }
-            _ => Err(SyscallError::new(EOPNOTSUPP)),
-        }
-    }
-
-    fn open_inner(
-        &mut self,
-        path: &str,
-        flags: usize,
-        uid: u32,
-        gid: u32,
-        read_enabled: bool,
-        write_enabled: bool,
-    ) -> SyscallResult<OpenResult> {
-        if path.is_empty() {
-            let null = NullFile {
-                flags,
-                uid,
-                gid,
-                read_enabled,
-                write_enabled,
-            };
-
-            let id = self.handles.insert(Handle::Null(null));
-
-            Ok(OpenResult::ThisScheme {
-                number: id,
-                flags: NewFdFlags::empty(),
-            })
-        } else {
-            let (socket_handle, data) = SocketT::new_socket(
-                &mut self.socket_set.borrow_mut(),
-                path,
-                uid,
-                &mut self.scheme_data,
-                &self.context,
-            )?;
-
-            let file = SchemeFile::Socket(SocketFile {
-                flags,
-                events: 0,
-                socket_handle,
-                read_notified: false,
-                write_notified: false,
-                write_timeout: None,
-                read_timeout: None,
-                read_enabled: read_enabled,
-                write_enabled: write_enabled,
-                data,
-            });
-
-            self.ref_counts.insert(socket_handle, 1);
-            let id = self.handles.insert(Handle::File(file));
-
-            Ok(OpenResult::ThisScheme {
-                number: id,
-                flags: NewFdFlags::empty(),
-            })
-        }
-    }
-}
-
-impl<SocketT> SchemeSync for SocketScheme<SocketT>
-where
-    SocketT: SchemeSocket + AnySocket<'static>,
-{
-    fn scheme_root(&mut self) -> SyscallResult<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-
-    fn openat(
-        &mut self,
-        fd: usize,
-        path: &str,
-        flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> SyscallResult<OpenResult> {
-        match self.handles.get(fd)? {
-            Handle::SchemeRoot => self.open_inner(path, flags, ctx.uid, ctx.gid, true, true),
-            _ => Err(SyscallError::new(syscall::EACCES)),
-        }
-    }
-
-    fn call(
-        &mut self,
-        id: usize,
-        payload: &mut [u8],
-        metadata: &[u64],
-        ctx: &CallerCtx,
-    ) -> SyscallResult<usize> {
-        self.call_inner(id, payload, metadata, ctx)
-    }
-
-    fn on_close(&mut self, fd: usize) {
-        let Some(handle) = self.handles.remove(fd) else {
-            return;
-        };
-
-        // incorrect, and kernel can't send close until all references are gone
-        /*self.wait_queue.retain(
-            |&WaitHandle {
-                 packet: SyscallPacket { a, .. },
-                 ..
-             }| a != fd,
-        );*/
-
-        match handle {
-            Handle::SchemeRoot => return,
-            Handle::Null(_) => return,
-            Handle::File(scheme_file) => {
-                let socket_handle = scheme_file.socket_handle();
-                let mut socket_set = self.socket_set.borrow_mut();
-
-                let socket = socket_set.get::<SocketT>(socket_handle);
-                let _ = socket.close_file(&scheme_file, &mut self.scheme_data);
-
-                let remove = match self.ref_counts.entry(socket_handle) {
-                    Entry::Vacant(_) => {
-                        warn!("Closing a socket_handle with no ref");
-                        true
-                    }
-                    Entry::Occupied(mut e) => {
-                        if *e.get() == 0 {
-                            warn!("Closing a socket_handle with no ref");
-                            e.remove();
-                            true
-                        } else {
-                            *e.get_mut() -= 1;
-                            if *e.get() == 0 {
-                                e.remove();
-                                true
-                            } else {
-                                false
-                            }
-                        }
-                    }
-                };
-
-                if remove {
-                    socket_set.remove(socket_handle);
-                }
-            }
-        }
-    }
-
-    fn write(
-        &mut self,
-        fd: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> SyscallResult<usize> {
-        let (fd, setting) = {
-            let file = self.handles.get_mut(fd)?;
-
-            match *file {
-                Handle::File(SchemeFile::Setting(ref setting_handle)) => {
-                    (setting_handle.fd, setting_handle.setting)
-                }
-                Handle::File(SchemeFile::Socket(ref mut file)) => {
-                    let mut socket_set = self.socket_set.borrow_mut();
-                    let socket = socket_set.get_mut::<SocketT>(file.socket_handle);
-                    let ret = SocketT::write_buf(socket, file, buf);
-                    match ret {
-                        Err(e) if e.errno == syscall::EWOULDBLOCK || e.errno == syscall::EAGAIN => {
-                        }
-                        _ => file.write_notified = false,
-                    }
-                    return ret;
-                }
-                _ => return Err(SyscallError::new(syscall::EBADF)),
-            }
-        };
-        self.update_setting(fd, setting, buf)
-    }
-
-    fn read(
-        &mut self,
-        fd: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> SyscallResult<usize> {
-        let (fd, setting) = {
-            let file = self.handles.get_mut(fd)?;
-            match *file {
-                Handle::File(SchemeFile::Setting(ref setting_handle)) => {
-                    (setting_handle.fd, setting_handle.setting)
-                }
-                Handle::File(SchemeFile::Socket(ref mut file)) => {
-                    let mut socket_set = self.socket_set.borrow_mut();
-                    let socket = socket_set.get_mut::<SocketT>(file.socket_handle);
-
-                    let ret = SocketT::read_buf(socket, file, buf);
-                    match ret {
-                        Err(e) if e.errno == syscall::EWOULDBLOCK || e.errno == syscall::EAGAIN => {
-                        }
-                        _ => file.read_notified = false,
-                    }
-
-                    return ret;
-                }
-                _ => return Err(SyscallError::new(syscall::EBADF)),
-            }
-        };
-        self.get_setting(fd, setting, buf)
-    }
-
-    fn dup(&mut self, fd: usize, buf: &[u8], _ctx: &CallerCtx) -> SyscallResult<OpenResult> {
-        let path = str::from_utf8(buf).or_else(|_| Err(SyscallError::new(syscall::EINVAL)))?;
-
-        let new_file = {
-            let handle = self.handles.get_mut(fd)?;
-
-            let file = match *handle {
-                Handle::SchemeRoot => return Err(SyscallError::new(syscall::EBADF)),
-                Handle::Null(ref null) => {
-                    let (flags, uid, gid, read_enabled, write_enabled) = (
-                        null.flags,
-                        null.uid,
-                        null.gid,
-                        null.read_enabled,
-                        null.write_enabled,
-                    );
-                    // dup from empty path to a new path
-                    return self.open_inner(path, flags, uid, gid, read_enabled, write_enabled);
-                }
-                Handle::File(ref mut file) => file,
-            };
-
-            let socket_handle = file.socket_handle();
-
-            let (new_handle, update_with) = match path {
-                "hop_limit" => (
-                    SchemeFile::Setting(SettingFile {
-                        socket_handle,
-                        fd,
-                        setting: Setting::HopLimit,
-                    }),
-                    None,
-                ),
-                "read_timeout" => (
-                    SchemeFile::Setting(SettingFile {
-                        socket_handle,
-                        fd,
-                        setting: Setting::ReadTimeout,
-                    }),
-                    None,
-                ),
-                "write_timeout" => (
-                    SchemeFile::Setting(SettingFile {
-                        socket_handle,
-                        fd,
-                        setting: Setting::WriteTimeout,
-                    }),
-                    None,
-                ),
-                _ => match SocketT::dup(
-                    &mut self.socket_set.borrow_mut(),
-                    file,
-                    path,
-                    &mut self.scheme_data,
-                )? {
-                    Some(some) => some,
-                    None => return Err(SyscallError::new(syscall::EWOULDBLOCK)),
-                },
-            };
-
-            if let Some((socket_handle, data)) = update_with {
-                if let SchemeFile::Socket(ref mut file) = *file {
-                    // We replace the socket_handle pointed by file so update the ref_counts
-                    // accordingly
-                    self.ref_counts
-                        .entry(file.socket_handle)
-                        .and_modify(|e| *e = e.saturating_sub(1))
-                        .or_insert(0);
-
-                    *self
-                        .ref_counts
-                        .entry(new_handle.socket_handle())
-                        .or_insert(0) += 1;
-
-                    file.socket_handle = socket_handle;
-                    file.data = data;
-                }
-            }
-            *self
-                .ref_counts
-                .entry(new_handle.socket_handle())
-                .or_insert(0) += 1;
-            new_handle
-        };
-
-        let id = self.handles.insert(Handle::File(new_file));
-
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn fevent(
-        &mut self,
-        fd: usize,
-        events: SyscallEventFlags,
-        _ctx: &CallerCtx,
-    ) -> SyscallResult<SyscallEventFlags> {
-        let file = self.handles.get_mut(fd)?;
-
-        let file = match *file {
-            Handle::File(ref mut f) => f,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        match *file {
-            SchemeFile::Setting(_) => return Err(SyscallError::new(syscall::EBADF)),
-            SchemeFile::Socket(ref mut file) => {
-                file.events = events.bits();
-                file.read_notified = false; // resend missed events
-                file.write_notified = false;
-            }
-        }
-        let mut socket_set = self.socket_set.borrow_mut();
-        let revents = SyscallEventFlags::from_bits_truncate(file.events(&mut socket_set));
-        Ok(revents)
-    }
-
-    fn fsync(&mut self, fd: usize, _ctx: &CallerCtx) -> SyscallResult<()> {
-        {
-            let _file = self.handles.get_mut(fd)?;
-        }
-        Ok(())
-        // TODO Implement fsyncing
-        // self.0.network_fsync()
-    }
-
-    fn fpath(&mut self, fd: usize, buf: &mut [u8], _ctx: &CallerCtx) -> SyscallResult<usize> {
-        let file = self.handles.get_mut(fd)?;
-
-        let file = match *file {
-            Handle::File(ref mut f) => f,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        let socket_set = self.socket_set.borrow();
-        let socket = socket_set.get::<SocketT>(file.socket_handle());
-
-        socket.fpath(file, buf)
-    }
-
-    fn fcntl(
-        &mut self,
-        fd: usize,
-        cmd: usize,
-        arg: usize,
-        _ctx: &CallerCtx,
-    ) -> SyscallResult<usize> {
-        let handle = self.handles.get_mut(fd)?;
-
-        match *handle {
-            Handle::File(SchemeFile::Socket(ref mut socket_file)) => match cmd {
-                syscall::F_GETFL => Ok(socket_file.flags),
-                syscall::F_SETFL => {
-                    socket_file.flags = arg & !syscall::O_ACCMODE;
-                    Ok(0)
-                }
-                _ => Err(SyscallError::new(syscall::EINVAL)),
-            },
-            Handle::Null(ref mut null) => match cmd {
-                syscall::F_GETFL => Ok(null.flags),
-                syscall::F_SETFL => {
-                    null.flags = arg & !syscall::O_ACCMODE;
-                    Ok(0)
-                }
-                _ => Err(SyscallError::new(syscall::EINVAL)),
-            },
-            _ => Err(SyscallError::new(syscall::EBADF)),
-        }
-    }
-}
-
-fn add_time(a: &TimeSpec, b: &TimeSpec) -> TimeSpec {
-    let mut secs = a.tv_sec + b.tv_sec;
-    let mut nsecs = a.tv_nsec + b.tv_nsec;
-
-    secs += i64::from(nsecs) / 1_000_000_000;
-    nsecs %= 1_000_000_000;
-
-    TimeSpec {
-        tv_sec: secs,
-        tv_nsec: nsecs,
-    }
-}
diff --git a/recipes/core/base/netstack/src/scheme/tcp.rs b/recipes/core/base/netstack/src/scheme/tcp.rs
deleted file mode 100644
index 435553829d..0000000000
--- a/recipes/core/base/netstack/src/scheme/tcp.rs
+++ /dev/null
@@ -1,431 +0,0 @@
-use scheme_utils::FpathWriter;
-use smoltcp::iface::SocketHandle;
-use smoltcp::socket::tcp::{Socket as TcpSocket, SocketBuffer as TcpSocketBuffer};
-use smoltcp::wire::{IpEndpoint, IpListenEndpoint};
-use std::str;
-use syscall;
-use syscall::{Error as SyscallError, Result as SyscallResult};
-
-use super::socket::{Context, DupResult, SchemeFile, SchemeSocket, SocketFile};
-use super::{parse_endpoint, SchemeWrapper, SocketSet};
-use crate::port_set::PortSet;
-use libredox::flag;
-
-const SO_SNDBUF: usize = 7;
-const SO_RCVBUF: usize = 8;
-
-pub type TcpScheme = SchemeWrapper<TcpSocket<'static>>;
-
-impl<'a> SchemeSocket for TcpSocket<'a> {
-    type SchemeDataT = PortSet;
-    type DataT = Option<IpListenEndpoint>;
-    type SettingT = ();
-
-    fn new_scheme_data() -> Self::SchemeDataT {
-        PortSet::new(49_152u16, 65_535u16).expect("Wrong TCP port numbers")
-    }
-
-    fn can_send(&self) -> bool {
-        self.can_send()
-    }
-
-    fn can_recv(&mut self, _data: &Self::DataT) -> bool {
-        smoltcp::socket::tcp::Socket::can_recv(self)
-    }
-
-    fn may_recv(&self) -> bool {
-        self.may_recv()
-    }
-
-    fn hop_limit(&self) -> u8 {
-        self.hop_limit().unwrap_or(64)
-    }
-
-    fn set_hop_limit(&mut self, hop_limit: u8) {
-        self.set_hop_limit(Some(hop_limit));
-    }
-
-    fn get_setting(
-        _file: &SocketFile<Self::DataT>,
-        _setting: Self::SettingT,
-        _buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        Ok(0)
-    }
-
-    fn set_setting(
-        _file: &mut SocketFile<Self::DataT>,
-        _setting: Self::SettingT,
-        _buf: &[u8],
-    ) -> SyscallResult<usize> {
-        Ok(0)
-    }
-
-    fn new_socket(
-        socket_set: &mut SocketSet,
-        path: &str,
-        uid: u32,
-        port_set: &mut Self::SchemeDataT,
-        context: &Context,
-    ) -> SyscallResult<(SocketHandle, Self::DataT)> {
-        trace!("TCP open {}", path);
-        let mut parts = path.split('/');
-        let remote_endpoint = parse_endpoint(parts.next().unwrap_or(""));
-        let mut local_endpoint = parse_endpoint(parts.next().unwrap_or(""));
-
-        if local_endpoint.port > 0 && local_endpoint.port <= 1024 && uid != 0 {
-            return Err(SyscallError::new(syscall::EACCES));
-        }
-
-        let rx_packets = vec![0; 0xffff];
-        let tx_packets = vec![0; 0xffff];
-        let rx_buffer = TcpSocketBuffer::new(rx_packets);
-        let tx_buffer = TcpSocketBuffer::new(tx_packets);
-        let socket = TcpSocket::new(rx_buffer, tx_buffer);
-
-        // TODO: claim port with ethernet ip address
-        if local_endpoint.port == 0 {
-            local_endpoint.port = port_set
-                .get_port()
-                .ok_or_else(|| SyscallError::new(syscall::EINVAL))?;
-        } else if !port_set.claim_port(local_endpoint.port) {
-            return Err(SyscallError::new(syscall::EADDRINUSE));
-        }
-
-        let socket_handle = socket_set.add(socket);
-
-        let tcp_socket = socket_set.get_mut::<TcpSocket>(socket_handle);
-
-        let listen_enpoint = if remote_endpoint.is_specified() {
-            let local_endpoint_addr = match local_endpoint.addr {
-                Some(addr) if !addr.is_unspecified() => Some(addr),
-                _ => {
-                    // local ip is 0.0.0.0, resolve it
-                    let route_table = context.route_table.borrow();
-                    let addr = route_table
-                        .lookup_src_addr(&remote_endpoint.addr.expect("Checked in is_specified"));
-                    if matches!(addr, None) {
-                        error!("Opening a TCP connection with a probably invalid source IP as no route have been found for destination: {}", remote_endpoint);
-                    }
-                    addr
-                }
-            };
-            let local_endpoint = IpListenEndpoint {
-                addr: local_endpoint_addr,
-                port: local_endpoint.port,
-            };
-
-            trace!("Connecting tcp {} {}", local_endpoint, remote_endpoint);
-            tcp_socket
-                .connect(
-                    context.iface.borrow_mut().context(),
-                    IpEndpoint::new(remote_endpoint.addr.unwrap(), remote_endpoint.port),
-                    local_endpoint,
-                )
-                .expect("Can't connect tcp socket ");
-            None
-        } else {
-            trace!("Listening tcp {}", local_endpoint);
-            tcp_socket
-                .listen(local_endpoint)
-                .expect("Can't listen on local endpoint");
-            Some(local_endpoint)
-        };
-
-        Ok((socket_handle, listen_enpoint))
-    }
-
-    fn close_file(
-        &self,
-        file: &SchemeFile<Self>,
-        port_set: &mut Self::SchemeDataT,
-    ) -> SyscallResult<()> {
-        if let SchemeFile::Socket(SocketFile { data, .. }) = *file {
-            if let Some(endpoint) = self.local_endpoint() {
-                // Socket was connected on some port
-                port_set.release_port(endpoint.port);
-            } else if let Some(endpoint) = data {
-                // Socket was listening on some port
-                port_set.release_port(endpoint.port);
-            }
-        }
-        Ok(())
-    }
-
-    fn write_buf(
-        &mut self,
-        file: &mut SocketFile<Self::DataT>,
-        buf: &[u8],
-    ) -> SyscallResult<usize> {
-        if !file.write_enabled {
-            return Err(SyscallError::new(syscall::EPIPE));
-        } else if !self.is_active() {
-            Err(SyscallError::new(syscall::ENOTCONN))
-        } else if self.can_send() {
-            self.send_slice(buf).expect("Can't send slice");
-            Ok(buf.len())
-        } else if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-write
-        }
-    }
-
-    fn read_buf(
-        &mut self,
-        file: &mut SocketFile<Self::DataT>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        if !file.read_enabled {
-            Ok(0)
-        } else if !self.is_active() {
-            Err(SyscallError::new(syscall::ENOTCONN))
-        } else if self.can_recv(&file.data) {
-            let length = self.recv_slice(buf).expect("Can't receive slice");
-            Ok(length)
-        } else if !self.may_recv() {
-            Ok(0)
-        } else if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-read
-        }
-    }
-
-    fn dup(
-        socket_set: &mut SocketSet,
-        file: &mut SchemeFile<Self>,
-        path: &str,
-        port_set: &mut Self::SchemeDataT,
-    ) -> SyscallResult<DupResult<Self>> {
-        let socket_handle = file.socket_handle();
-
-        let (is_active, local_endpoint) = {
-            let socket = socket_set.get::<TcpSocket>(socket_handle);
-            (socket.is_active(), socket.local_endpoint())
-        };
-
-        let file = match path {
-            "listen" => {
-                if let SchemeFile::Socket(ref tcp_handle) = *file {
-                    let Some(listen_enpoint) = tcp_handle.data else {
-                        // This socket is not listening so we can't accept a connection
-                        return Err(SyscallError::new(syscall::EINVAL));
-                    };
-
-                    if !is_active {
-                        // Socket listening but no connection received
-                        if tcp_handle.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
-                            return Err(SyscallError::new(syscall::EAGAIN));
-                        } else {
-                            return Ok(None);
-                        }
-                    }
-                    trace!("TCP creating new listening socket");
-                    // We pass None as data because this new handle is to the active connection so
-                    // not a listening socket
-                    let new_handle = SchemeFile::Socket(tcp_handle.clone_with_data(None));
-
-                    // Creating a socket to continue listening
-                    let rx_packets = vec![0; 0xffff];
-                    let tx_packets = vec![0; 0xffff];
-                    let rx_buffer = TcpSocketBuffer::new(rx_packets);
-                    let tx_buffer = TcpSocketBuffer::new(tx_packets);
-                    let socket = TcpSocket::new(rx_buffer, tx_buffer);
-                    let new_socket_handle = socket_set.add(socket);
-                    {
-                        let tcp_socket = socket_set.get_mut::<TcpSocket>(new_socket_handle);
-                        tcp_socket
-                            .listen(listen_enpoint)
-                            .expect("Can't listen on local endpoint");
-                    }
-                    // We got a new connection to the socket so acquire the port
-                    port_set.acquire_port(
-                        local_endpoint
-                            .expect("Socket was active so local endpoint must be set")
-                            .port,
-                    );
-                    return Ok(Some((
-                        new_handle,
-                        Some((new_socket_handle, Some(listen_enpoint))),
-                    )));
-                } else {
-                    return Err(SyscallError::new(syscall::EBADF));
-                }
-            }
-            _ => {
-                trace!("TCP dup unknown {}", path);
-                if let SchemeFile::Socket(ref tcp_handle) = *file {
-                    SchemeFile::Socket(tcp_handle.clone_with_data(tcp_handle.data))
-                } else {
-                    SchemeFile::Socket(SocketFile::new_with_data(socket_handle, None))
-                }
-            }
-        };
-
-        if let SchemeFile::Socket(_) = file {
-            if let Some(local_endpoint) = local_endpoint {
-                port_set.acquire_port(local_endpoint.port);
-            }
-        }
-
-        Ok(Some((file, None)))
-    }
-
-    fn fpath(&self, file: &SchemeFile<Self>, buf: &mut [u8]) -> SyscallResult<usize> {
-        FpathWriter::with(buf, "tcp", |w| {
-            let unspecified = "0.0.0.0:0";
-            match self.remote_endpoint() {
-                Some(endpoint) => write!(w, "{}", endpoint).unwrap(),
-                None => w.push_str(unspecified),
-            }
-            w.push_str("/");
-            match (self.local_endpoint(), file) {
-                (Some(endpoint), _) => write!(w, "{}", endpoint).unwrap(),
-                (
-                    None,
-                    SchemeFile::Socket(SocketFile {
-                        data: Some(endpoint),
-                        ..
-                    }),
-                ) => {
-                    if endpoint.is_specified() {
-                        write!(w, "{}", endpoint).unwrap()
-                    } else {
-                        write!(w, "0.0.0.0:{}", endpoint.port).unwrap()
-                    }
-                }
-                _ => w.push_str(unspecified),
-            }
-
-            Ok(())
-        })
-    }
-
-    fn handle_recvmsg(
-        &mut self,
-        file: &mut SchemeFile<Self>,
-        how: &mut [u8],
-        flags: usize,
-    ) -> SyscallResult<usize> {
-        let socket_file = match file {
-            SchemeFile::Socket(ref mut sock_f) => sock_f,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-        if !socket_file.read_enabled {
-            Ok(0)
-        } else if self.can_recv(&socket_file.data) {
-            let usize_length = core::mem::size_of::<usize>();
-            let prepared_name_len = usize::from_le_bytes(
-                how[0..usize_length]
-                    .try_into()
-                    .map_err(|_| SyscallError::new(syscall::EINVAL))?,
-            );
-            let prepared_whole_iov_size = usize::from_le_bytes(
-                how[usize_length..2 * usize_length]
-                    .try_into()
-                    .map_err(|_| SyscallError::new(syscall::EINVAL))?,
-            );
-            let prepared_msg_controllen = usize::from_le_bytes(
-                how[2 * usize_length..3 * usize_length]
-                    .try_into()
-                    .map_err(|_| SyscallError::new(syscall::EINVAL))?,
-            );
-            if 3 * usize_length
-                + prepared_name_len
-                + prepared_msg_controllen
-                + prepared_whole_iov_size
-                > how.len()
-            {
-                //expected returned buffer size is larger than provided -> return invalid
-                return Err(SyscallError::new(syscall::EINVAL));
-            }
-            let address = match self.remote_endpoint() {
-                Some(endpoint) => format!("/scheme/tcp/{}:{}", endpoint.addr, endpoint.port),
-                None => String::from("/scheme/tcp/0.0.0.0:0"),
-            };
-
-            how[..usize_length].copy_from_slice(&address.len().to_le_bytes());
-            how[usize_length..address.len() + usize_length].copy_from_slice(&address.as_bytes());
-            let payload_length = self
-                .recv_slice(
-                    &mut how[address.len() + 2 * usize_length
-                        ..address.len() + 2 * usize_length + prepared_whole_iov_size],
-                )
-                .unwrap();
-            how[address.len() + usize_length..address.len() + 2 * usize_length]
-                .copy_from_slice(&payload_length.to_le_bytes());
-
-            Ok(address.len() + 2 * usize_length + prepared_whole_iov_size)
-        } else if socket_file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK
-            || flags & flag::MSG_DONTWAIT as usize != 0
-        {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-read
-        }
-    }
-
-    fn handle_get_peer_name(
-        &self,
-        file: &SchemeFile<Self>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        self.fpath(file, buf)
-    }
-
-    fn handle_shutdown(&mut self, file: &mut SchemeFile<Self>, how: usize) -> SyscallResult<usize> {
-        let socket_file = match file {
-            SchemeFile::Socket(ref mut file) => file,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        match how {
-            0 => socket_file.read_enabled = false, // SHUT_RD
-            1 => {
-                socket_file.write_enabled = false;
-                self.close();
-            } // SHUT_WR
-            2 => {
-                socket_file.read_enabled = false;
-                socket_file.write_enabled = false;
-                self.close();
-            } // SHUT_RDWR
-            _ => return Err(SyscallError::new(syscall::EINVAL)),
-        }
-        Ok(0)
-    }
-
-    fn get_sock_opt(
-        &self,
-        _file: &SchemeFile<Self>,
-        name: usize,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        match name {
-            SO_RCVBUF => {
-                let val = self.recv_capacity() as i32;
-                let bytes = val.to_ne_bytes();
-
-                if buf.len() < bytes.len() {
-                    return Err(SyscallError::new(syscall::EINVAL));
-                }
-
-                buf[0..bytes.len()].copy_from_slice(&bytes);
-                Ok(bytes.len())
-            }
-            SO_SNDBUF => {
-                let val = self.send_capacity() as i32;
-                let bytes = val.to_ne_bytes();
-
-                if buf.len() < bytes.len() {
-                    return Err(SyscallError::new(syscall::EINVAL));
-                }
-
-                buf[0..bytes.len()].copy_from_slice(&bytes);
-                Ok(bytes.len())
-            }
-            _ => Err(SyscallError::new(syscall::ENOPROTOOPT)),
-        }
-    }
-}
diff --git a/recipes/core/base/netstack/src/scheme/udp.rs b/recipes/core/base/netstack/src/scheme/udp.rs
deleted file mode 100644
index f336d2544a..0000000000
--- a/recipes/core/base/netstack/src/scheme/udp.rs
+++ /dev/null
@@ -1,437 +0,0 @@
-use scheme_utils::FpathWriter;
-use smoltcp::iface::SocketHandle;
-use smoltcp::socket::udp::{
-    PacketBuffer as UdpSocketBuffer, PacketMetadata as UdpPacketMetadata, Socket as UdpSocket,
-};
-use smoltcp::wire::{IpEndpoint, IpListenEndpoint};
-use std::str;
-use syscall;
-use syscall::{Error as SyscallError, Result as SyscallResult};
-
-use super::socket::{Context, DupResult, SchemeFile, SchemeSocket, SocketFile};
-use super::{parse_endpoint, SchemeWrapper, Smolnetd, SocketSet};
-use crate::port_set::PortSet;
-use crate::router::Router;
-use libredox::flag;
-
-const SO_SNDBUF: usize = 7;
-const SO_RCVBUF: usize = 8;
-
-pub type UdpScheme = SchemeWrapper<UdpSocket<'static>>;
-
-impl<'a> SchemeSocket for UdpSocket<'a> {
-    type SchemeDataT = PortSet;
-    type DataT = IpListenEndpoint;
-    type SettingT = ();
-
-    fn new_scheme_data() -> Self::SchemeDataT {
-        PortSet::new(49_152u16, 65_535u16).expect("Wrong UDP port numbers")
-    }
-
-    fn can_send(&self) -> bool {
-        self.can_send()
-    }
-
-    fn can_recv(&mut self, data: &IpListenEndpoint) -> bool {
-        loop {
-            // If buffer is empty, we definitely can't recv
-            if !UdpSocket::can_recv(self) {
-                return false;
-            }
-
-            // If we are not connected to a specific remote, any packet is valid
-            if !data.is_specified() {
-                return true;
-            }
-
-            // If we are connected, peek at the packet.
-            match self.peek() {
-                Ok((_, meta)) => {
-                    let source = meta.endpoint;
-                    let connected_addr = data.addr.unwrap(); // Safe because is_specified() checked it
-
-                    // Allow Broadcast special case (DHCP)
-                    let is_broadcast = match connected_addr {
-                        smoltcp::wire::IpAddress::Ipv4(ip) => {
-                            ip == smoltcp::wire::Ipv4Address::BROADCAST
-                        }
-                        _ => false,
-                    };
-
-                    if !is_broadcast && !connected_addr.is_unspecified() {
-                        if source.addr != connected_addr || source.port != data.port {
-                            // Bad packet detected
-                            // Remove it from the buffer immediately so poll() doesn't trigger
-                            let _ = self.recv();
-                            continue; // Loop again to check the next packet
-                        }
-                    }
-                    // Packet is valid
-                    return true;
-                }
-                Err(_) => return false,
-            }
-        }
-    }
-
-    fn may_recv(&self) -> bool {
-        true
-    }
-
-    fn hop_limit(&self) -> u8 {
-        self.hop_limit().unwrap_or(64)
-    }
-
-    fn set_hop_limit(&mut self, hop_limit: u8) {
-        self.set_hop_limit(Some(hop_limit));
-    }
-
-    fn get_setting(
-        _file: &SocketFile<Self::DataT>,
-        _setting: Self::SettingT,
-        _buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        Ok(0)
-    }
-
-    fn set_setting(
-        _file: &mut SocketFile<Self::DataT>,
-        _setting: Self::SettingT,
-        _buf: &[u8],
-    ) -> SyscallResult<usize> {
-        Ok(0)
-    }
-
-    fn new_socket(
-        socket_set: &mut SocketSet,
-        path: &str,
-        uid: u32,
-        port_set: &mut Self::SchemeDataT,
-        context: &Context,
-    ) -> SyscallResult<(SocketHandle, Self::DataT)> {
-        let mut parts = path.split('/');
-        let remote_endpoint = parse_endpoint(parts.next().unwrap_or(""));
-        let mut local_endpoint = parse_endpoint(parts.next().unwrap_or(""));
-
-        if local_endpoint.port > 0 && local_endpoint.port <= 1024 && uid != 0 {
-            return Err(SyscallError::new(syscall::EACCES));
-        }
-
-        let rx_buffer = UdpSocketBuffer::new(
-            vec![UdpPacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-            vec![0; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-        );
-        let tx_buffer = UdpSocketBuffer::new(
-            vec![UdpPacketMetadata::EMPTY; Smolnetd::SOCKET_BUFFER_SIZE],
-            vec![0; Router::MTU * Smolnetd::SOCKET_BUFFER_SIZE],
-        );
-        let udp_socket = UdpSocket::new(rx_buffer, tx_buffer);
-
-        // TODO: claim port with ethernet ip address
-        if local_endpoint.port == 0 {
-            local_endpoint.port = port_set
-                .get_port()
-                .ok_or_else(|| SyscallError::new(syscall::EINVAL))?;
-        } else if !port_set.claim_port(local_endpoint.port) {
-            return Err(SyscallError::new(syscall::EADDRINUSE));
-        }
-
-        let socket_handle = socket_set.add(udp_socket);
-
-        let udp_socket = socket_set.get_mut::<UdpSocket>(socket_handle);
-
-        if remote_endpoint.is_specified() {
-            let local_endpoint_addr = match local_endpoint.addr {
-                Some(addr) if addr.is_unspecified() => Some(addr),
-                _ => {
-                    // local ip is 0.0.0.0, resolve it
-                    let route_table = context.route_table.borrow();
-                    let addr = route_table
-                        .lookup_src_addr(&remote_endpoint.addr.expect("Checked in is_specified"));
-                    if matches!(addr, None) {
-                        error!("Opening a TCP connection with a probably invalid source IP as no route have been found for destination: {}", remote_endpoint);
-                    }
-                    addr
-                }
-            };
-            local_endpoint = IpListenEndpoint {
-                addr: local_endpoint_addr,
-                port: local_endpoint.port,
-            };
-        }
-
-        udp_socket
-            .bind(local_endpoint)
-            .expect("Can't bind udp socket to local endpoint");
-
-        Ok((socket_handle, remote_endpoint))
-    }
-
-    fn close_file(
-        &self,
-        file: &SchemeFile<Self>,
-        port_set: &mut Self::SchemeDataT,
-    ) -> SyscallResult<()> {
-        if let SchemeFile::Socket(_) = *file {
-            port_set.release_port(self.endpoint().port);
-        }
-        Ok(())
-    }
-
-    fn write_buf(
-        &mut self,
-        file: &mut SocketFile<Self::DataT>,
-        buf: &[u8],
-    ) -> SyscallResult<usize> {
-        if !file.data.is_specified() {
-            return Err(SyscallError::new(syscall::EADDRNOTAVAIL));
-        }
-        if !file.write_enabled {
-            return Err(SyscallError::new(syscall::EPIPE));
-        }
-        if self.can_send() {
-            let endpoint = file.data;
-            let endpoint = IpEndpoint::new(
-                endpoint
-                    .addr
-                    .expect("If we can send, this should be specified"),
-                endpoint.port,
-            );
-            self.send_slice(buf, endpoint).expect("Can't send slice");
-            Ok(buf.len())
-        } else if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-read
-        }
-    }
-
-    fn read_buf(
-        &mut self,
-        file: &mut SocketFile<Self::DataT>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        if !file.read_enabled {
-            Ok(0)
-        } else if self.can_recv(&file.data) {
-            let (length, _) = self.recv_slice(buf).expect("Can't receive slice");
-            Ok(length)
-        } else if file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-read
-        }
-    }
-
-    fn dup(
-        socket_set: &mut SocketSet,
-        file: &mut SchemeFile<Self>,
-        path: &str,
-        port_set: &mut Self::SchemeDataT,
-    ) -> SyscallResult<DupResult<Self>> {
-        let socket_handle = file.socket_handle();
-        let file = match path {
-            "listen" => {
-                // there's no accept() for UDP
-                return Err(SyscallError::new(syscall::EAFNOSUPPORT));
-            }
-            "disconnect" => {
-                let remote_endpoint = IpListenEndpoint {
-                    addr: None,
-                    port: 0,
-                };
-                if let SchemeFile::Socket(ref udp_handle) = *file {
-                    SchemeFile::Socket(udp_handle.clone_with_data(remote_endpoint))
-                } else {
-                    SchemeFile::Socket(SocketFile::new_with_data(socket_handle, remote_endpoint))
-                }
-            }
-            _ => {
-                let remote_endpoint = parse_endpoint(path);
-                if let SchemeFile::Socket(ref udp_handle) = *file {
-                    SchemeFile::Socket(udp_handle.clone_with_data(remote_endpoint))
-                } else {
-                    SchemeFile::Socket(SocketFile::new_with_data(socket_handle, remote_endpoint))
-                }
-            }
-        };
-
-        let endpoint = {
-            let socket = socket_set.get::<UdpSocket>(socket_handle);
-            socket.endpoint()
-        };
-
-        if let SchemeFile::Socket(_) = file {
-            port_set.acquire_port(endpoint.port);
-        }
-
-        Ok(Some((file, None)))
-    }
-
-    fn fpath(&self, file: &SchemeFile<Self>, buf: &mut [u8]) -> SyscallResult<usize> {
-        FpathWriter::with(buf, "udp", |w| {
-            let unspecified = "0.0.0.0:0";
-
-            // remote
-            match file {
-                SchemeFile::Socket(SocketFile { data: endpoint, .. }) => {
-                    if endpoint.is_specified() {
-                        write!(w, "{}", endpoint).unwrap()
-                    } else {
-                        write!(w, "0.0.0.0:{}", endpoint.port).unwrap()
-                    }
-                }
-                _ => w.push_str(unspecified),
-            }
-            w.push_str("/");
-            // local
-            let endpoint = self.endpoint();
-            if endpoint.is_specified() {
-                write!(w, "{}", endpoint).unwrap()
-            } else {
-                write!(w, "0.0.0.0:{}", endpoint.port).unwrap()
-            }
-
-            Ok(())
-        })
-    }
-
-    fn handle_recvmsg(
-        &mut self,
-        file: &mut SchemeFile<Self>,
-        how: &mut [u8],
-        flags: usize,
-    ) -> SyscallResult<usize> {
-        //there is a separate flags argument for MSG_DONTWAIT which is call specific not socket-wide like socket_file.flags
-        let socket_file = match file {
-            SchemeFile::Socket(ref mut sock_f) => sock_f,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        if !socket_file.read_enabled {
-            Ok(0)
-        } else if self.can_recv(&socket_file.data) {
-            let usize_length = core::mem::size_of::<usize>();
-            let prepared_name_len = usize::from_le_bytes(
-                how[0..usize_length]
-                    .try_into()
-                    .map_err(|_| SyscallError::new(syscall::EINVAL))?,
-            );
-            let prepared_whole_iov_size = usize::from_le_bytes(
-                how[usize_length..2 * usize_length]
-                    .try_into()
-                    .map_err(|_| SyscallError::new(syscall::EINVAL))?,
-            );
-            let prepared_msg_controllen = usize::from_le_bytes(
-                how[2 * usize_length..3 * usize_length]
-                    .try_into()
-                    .map_err(|_| SyscallError::new(syscall::EINVAL))?,
-            );
-            if 3 * usize_length
-                + prepared_name_len
-                + prepared_msg_controllen
-                + prepared_whole_iov_size
-                > how.len()
-            {
-                //expected returned buffer size is larger than provided -> return invalid
-                return Err(SyscallError::new(syscall::EINVAL));
-            }
-
-            //the relibc deserialization functions expect NO GAPS between the name and payload slices
-            //so the payload must be temporarily stored during recv_slice
-            let mut payload_tmp = vec![0u8; prepared_whole_iov_size];
-            let (length, address) = self
-                .recv_slice(&mut payload_tmp)
-                .expect("Can't recieve slice");
-
-            //Address Handling
-            let address_formatted = if prepared_name_len > 0 {
-                format!(
-                    "/scheme/udp/{}:{}",
-                    address.endpoint.addr, address.endpoint.port
-                )
-            } else {
-                String::from("")
-            };
-            how[..usize_length].copy_from_slice(&address_formatted.len().to_le_bytes());
-            let payload_len_index = address_formatted.len() + usize_length;
-            how[usize_length..payload_len_index].copy_from_slice(&address_formatted.as_bytes());
-
-            //Payload Handling
-            how[payload_len_index..payload_len_index + usize_length]
-                .copy_from_slice(&(length as usize).to_le_bytes());
-            how[payload_len_index + usize_length..payload_len_index + usize_length + length]
-                .copy_from_slice(&payload_tmp[..length]);
-            Ok(payload_len_index + usize_length + length)
-        } else if socket_file.flags & syscall::O_NONBLOCK == syscall::O_NONBLOCK
-            || flags & flag::MSG_DONTWAIT as usize != 0
-        {
-            Err(SyscallError::new(syscall::EAGAIN))
-        } else {
-            Err(SyscallError::new(syscall::EWOULDBLOCK)) // internally scheduled to re-read
-        }
-    }
-
-    fn handle_get_peer_name(
-        &self,
-        file: &SchemeFile<Self>,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        let peer = match file {
-            SchemeFile::Socket(SocketFile { data, .. }) => data,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-        if peer.addr.is_some() || peer.port != 0 {
-            self.fpath(file, buf)
-        } else {
-            Err(SyscallError::new(syscall::ENOTCONN))
-        }
-    }
-
-    fn handle_shutdown(&mut self, file: &mut SchemeFile<Self>, how: usize) -> SyscallResult<usize> {
-        let socket_file = match file {
-            SchemeFile::Socket(ref mut file) => file,
-            _ => return Err(SyscallError::new(syscall::EBADF)),
-        };
-
-        match how {
-            0 => socket_file.read_enabled = false,  // SHUT_RD
-            1 => socket_file.write_enabled = false, // SHUT_WR
-            2 => {
-                socket_file.read_enabled = false;
-                socket_file.write_enabled = false;
-            } // SHUT_RDWR
-            _ => return Err(SyscallError::new(syscall::EINVAL)),
-        }
-        Ok(0)
-    }
-
-    fn get_sock_opt(
-        &self,
-        _file: &SchemeFile<Self>,
-        name: usize,
-        buf: &mut [u8],
-    ) -> SyscallResult<usize> {
-        match name {
-            SO_RCVBUF => {
-                let val = self.payload_recv_capacity() as i32;
-                let bytes = val.to_ne_bytes();
-                if buf.len() < bytes.len() {
-                    return Err(SyscallError::new(syscall::EINVAL));
-                }
-                buf[..bytes.len()].copy_from_slice(&bytes);
-                Ok(bytes.len())
-            }
-            SO_SNDBUF => {
-                let val = self.payload_send_capacity() as i32;
-                let bytes = val.to_ne_bytes();
-                if buf.len() < bytes.len() {
-                    return Err(SyscallError::new(syscall::EINVAL));
-                }
-                buf[..bytes.len()].copy_from_slice(&bytes);
-                Ok(bytes.len())
-            }
-            _ => Err(SyscallError::new(syscall::ENOPROTOOPT)),
-        }
-    }
-}
diff --git a/recipes/core/base/ptyd/.gitignore b/recipes/core/base/ptyd/.gitignore
deleted file mode 100644
index b83d22266a..0000000000
--- a/recipes/core/base/ptyd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/recipes/core/base/ptyd/.gitlab-ci.yml b/recipes/core/base/ptyd/.gitlab-ci.yml
deleted file mode 100644
index a812edea17..0000000000
--- a/recipes/core/base/ptyd/.gitlab-ci.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is a template, and might need editing before it works on your project.
-# Official language image. Look for the different tagged releases at:
-# https://hub.docker.com/r/library/rust/tags/
-image: "rust:latest"
-
-# Optional: Pick zero or more services to be used on all builds.
-# Only needed when using a docker container to run your tests in.
-# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-a-service
-#services:
-#  - mysql:latest
-#  - redis:latest
-#  - postgres:latest
-
-# Optional: Install a C compiler, cmake and git into the container.
-# You will often need this when you (or any of your dependencies) depends on C code.
-#before_script:
-#- apt-get update -yqq
-#- apt-get install -yqq --no-install-recommends build-essential
-
-# Use cargo to test the project
-test:cargo:
-  script:
-  - rustup toolchain add nightly
-  - rustup target add x86_64-unknown-redox --toolchain nightly
-  - rustup show      # Print version info for debugging
-  - cargo +nightly check --verbose --target x86_64-unknown-redox
diff --git a/recipes/core/base/ptyd/Cargo.toml b/recipes/core/base/ptyd/Cargo.toml
deleted file mode 100644
index 0edb56a730..0000000000
--- a/recipes/core/base/ptyd/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "ptyd"
-description = "Pseudo-terminal daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-libredox.workspace = true
-daemon = { path = "../daemon" }
-redox-scheme.workspace = true
-scheme-utils = { path = "../scheme-utils" }
-redox_event.workspace = true
-redox_syscall.workspace = true
-redox_termios.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/ptyd/src/controlterm.rs b/recipes/core/base/ptyd/src/controlterm.rs
deleted file mode 100644
index f1f6fc42f8..0000000000
--- a/recipes/core/base/ptyd/src/controlterm.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use std::cell::RefCell;
-use std::rc::{Rc, Weak};
-
-use syscall::error::{Error, Result, EAGAIN, EINVAL, EWOULDBLOCK};
-use syscall::flag::{EventFlags, F_GETFL, F_SETFL, O_ACCMODE, O_NONBLOCK};
-
-use crate::pty::Pty;
-use crate::resource::Resource;
-
-/// Read side of a pipe
-pub struct PtyControlTerm {
-    pty: Rc<RefCell<Pty>>,
-    flags: usize,
-    notified_read: bool,
-    notified_write: bool,
-}
-
-impl PtyControlTerm {
-    pub fn new(pty: Rc<RefCell<Pty>>, flags: usize) -> Self {
-        PtyControlTerm {
-            pty,
-            flags,
-            notified_read: false,
-            notified_write: false,
-        }
-    }
-}
-
-impl Resource for PtyControlTerm {
-    fn pty(&self) -> Weak<RefCell<Pty>> {
-        Rc::downgrade(&self.pty)
-    }
-
-    fn flags(&self) -> usize {
-        self.flags
-    }
-
-    fn path(&mut self, buf: &mut [u8]) -> Result<usize> {
-        self.pty.borrow_mut().path(buf)
-    }
-
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-        self.notified_read = false;
-
-        let mut pty = self.pty.borrow_mut();
-
-        if let Some(packet) = pty.miso.pop_front() {
-            let mut i = 0;
-
-            while i < buf.len() && i < packet.len() {
-                buf[i] = packet[i];
-                i += 1;
-            }
-
-            if i < packet.len() {
-                let packet_remaining = &packet[i..];
-                let mut new_packet = Vec::with_capacity(packet_remaining.len() + 1);
-                new_packet.push(packet[0]);
-                new_packet.extend(packet_remaining);
-                pty.miso.push_front(new_packet);
-            }
-
-            Ok(i)
-        } else if self.flags & O_NONBLOCK == O_NONBLOCK || Rc::weak_count(&self.pty) == 0 {
-            Err(Error::new(EAGAIN))
-        } else {
-            Err(Error::new(EWOULDBLOCK))
-        }
-    }
-
-    fn write(&mut self, buf: &[u8]) -> Result<usize> {
-        let mut pty = self.pty.borrow_mut();
-
-        if pty.mosi.len() >= 64 {
-            return Err(Error::new(EWOULDBLOCK));
-        }
-
-        pty.input(buf);
-
-        Ok(buf.len())
-    }
-
-    fn sync(&mut self) -> Result<()> {
-        Ok(())
-    }
-
-    fn fcntl(&mut self, cmd: usize, arg: usize) -> Result<usize> {
-        match cmd {
-            F_GETFL => Ok(self.flags),
-            F_SETFL => {
-                self.flags = (self.flags & O_ACCMODE) | (arg & !O_ACCMODE);
-                Ok(0)
-            }
-            _ => Err(Error::new(EINVAL)),
-        }
-    }
-
-    fn fevent(&mut self) -> Result<EventFlags> {
-        self.notified_read = false; // resend
-        self.notified_write = false;
-        Ok(self.events())
-    }
-
-    fn events(&mut self) -> EventFlags {
-        let mut events = EventFlags::empty();
-
-        let pty = self.pty.borrow();
-        if pty.miso.front().is_some() {
-            if !self.notified_read {
-                self.notified_read = true;
-                events |= syscall::EVENT_READ;
-            }
-        } else {
-            self.notified_read = false;
-        }
-
-        if !self.notified_write {
-            self.notified_write = true;
-            events |= syscall::EVENT_WRITE;
-        }
-
-        events
-    }
-
-    fn timeout(&self, count: u64) {
-        let mut pty = self.pty.borrow_mut();
-        pty.timeout(count);
-    }
-}
diff --git a/recipes/core/base/ptyd/src/main.rs b/recipes/core/base/ptyd/src/main.rs
deleted file mode 100644
index e6bf429eb8..0000000000
--- a/recipes/core/base/ptyd/src/main.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use event::{user_data, EventFlags, EventQueue};
-use libredox::{flag, Fd};
-
-use redox_scheme::{scheme::register_sync_scheme, Response, SignalBehavior, Socket};
-use scheme_utils::ReadinessBased;
-use syscall::data::TimeSpec;
-
-mod controlterm;
-mod pgrp;
-mod pty;
-mod resource;
-mod scheme;
-mod subterm;
-mod termios;
-mod winsize;
-
-use scheme::{Handle, PtyScheme};
-
-fn main() {
-    daemon::Daemon::new(daemon);
-}
-
-fn daemon(daemon: daemon::Daemon) -> ! {
-    user_data! {
-        enum EventSource {
-            Socket,
-            Time,
-        }
-    }
-
-    let event_queue = EventQueue::<EventSource>::new().expect("pty: failed to open event:");
-
-    let time_path = format!("/scheme/time/{}", flag::CLOCK_MONOTONIC);
-    let mut time_file =
-        Fd::open(&time_path, flag::O_NONBLOCK, 0).expect("pty: failed to open time:");
-
-    let socket = redox_scheme::Socket::nonblock().expect("pty: failed to create pty scheme");
-    let mut handler = ReadinessBased::new(&socket, 16);
-
-    let mut scheme = PtyScheme::new();
-    register_sync_scheme(&socket, "pty", &mut scheme)
-        .expect("ptyd: failed to register scheme to namespace");
-    daemon.ready();
-
-    libredox::call::setrens(0, 0).expect("ptyd: failed to enter null namespace");
-
-    event_queue
-        .subscribe(socket.inner().raw(), EventSource::Socket, EventFlags::READ)
-        .expect("pty: failed to watch events on pty:");
-    event_queue
-        .subscribe(time_file.raw(), EventSource::Time, EventFlags::READ)
-        .expect("pty: failed to watch events on time:");
-
-    //TODO: do not set timeout if not necessary
-    timeout(&mut time_file).expect("pty: failed to set timeout");
-
-    let mut timeout_count = 0u64;
-
-    scan_requests(&mut handler, &mut scheme).expect("pty: could not scan requests");
-    issue_events(&socket, &mut scheme);
-
-    for event_res in event_queue {
-        let event = event_res.expect("pty: failed to read from event queue");
-
-        match event.user_data {
-            EventSource::Socket => {
-                if scan_requests(&mut handler, &mut scheme).is_err() {
-                    break;
-                }
-            }
-            EventSource::Time => {
-                timeout(&mut time_file).expect("pty: failed to set timeout");
-
-                timeout_count = timeout_count.wrapping_add(1);
-
-                for (_id, handle) in scheme.handles.iter_mut() {
-                    if let Handle::Resource(res) = handle {
-                        res.timeout(timeout_count);
-                    }
-                }
-
-                handler
-                    .poll_all_requests(&mut scheme)
-                    .expect("ihdad: failed to poll requests");
-            }
-        }
-
-        issue_events(&socket, &mut scheme);
-    }
-
-    std::process::exit(0);
-}
-
-fn scan_requests(
-    handler: &mut ReadinessBased<'_>,
-    scheme: &mut PtyScheme,
-) -> libredox::error::Result<()> {
-    handler
-        .read_and_process_requests(scheme)
-        .expect("pty: failed to read from socket");
-    handler
-        .poll_all_requests(scheme)
-        .expect("pty: error occured in poll_all_requests");
-    handler
-        .write_responses()
-        .expect("pty: failed to write to socket");
-    Ok(())
-}
-
-fn issue_events(socket: &Socket, scheme: &mut PtyScheme) {
-    for (id, handle) in scheme.handles.iter_mut() {
-        if let Handle::Resource(ref mut res) = handle {
-            let events = res.events();
-            if events != syscall::EventFlags::empty() {
-                socket
-                    .write_response(
-                        Response::post_fevent(*id, events.bits()),
-                        SignalBehavior::Restart,
-                    )
-                    .expect("pty: failed to send scheme event");
-            }
-        }
-    }
-}
-
-fn timeout(time_file: &mut Fd) -> libredox::error::Result<()> {
-    let mut time = TimeSpec::default();
-    time_file.read(&mut time)?;
-
-    // Set timeout for 100ms
-    time.tv_nsec += 100_000_000;
-    while time.tv_nsec >= 1_000_000_000 {
-        time.tv_sec += 1;
-        time.tv_nsec -= 1_000_000_000;
-    }
-
-    time_file.write(&time)?;
-    Ok(())
-}
diff --git a/recipes/core/base/ptyd/src/pgrp.rs b/recipes/core/base/ptyd/src/pgrp.rs
deleted file mode 100644
index 68a9be5abd..0000000000
--- a/recipes/core/base/ptyd/src/pgrp.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Weak;
-
-use syscall::error::{Error, Result, EBADF, EINVAL, EPIPE};
-use syscall::flag::{EventFlags, F_GETFL, F_SETFL, O_ACCMODE};
-
-use crate::pty::Pty;
-use crate::resource::Resource;
-
-/// Read side of a pipe
-pub struct PtyPgrp {
-    pty: Weak<RefCell<Pty>>,
-    flags: usize,
-}
-
-impl PtyPgrp {
-    pub fn new(pty: Weak<RefCell<Pty>>, flags: usize) -> Self {
-        PtyPgrp { pty, flags }
-    }
-}
-
-impl Resource for PtyPgrp {
-    fn pty(&self) -> Weak<RefCell<Pty>> {
-        self.pty.clone()
-    }
-
-    fn flags(&self) -> usize {
-        self.flags
-    }
-
-    fn path(&mut self, buf: &mut [u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            pty_lock.borrow_mut().path(buf)
-        } else {
-            Err(Error::new(EPIPE))
-        }
-    }
-
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let pty = pty_lock.borrow();
-
-            //println!("READ PGRP {}: {}", pty.id, pty.pgrp);
-            let dst_buf = buf
-                .get_mut(..4)
-                .and_then(|b| <&mut [u8; 4]>::try_from(b).ok())
-                .ok_or(Error::new(EBADF))?;
-            *dst_buf = (pty.pgrp as u32).to_ne_bytes();
-
-            Ok(4)
-        } else {
-            Ok(0)
-        }
-    }
-
-    fn write(&mut self, buf: &[u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let mut pty = pty_lock.borrow_mut();
-
-            let new_pgrp = u32::from_ne_bytes(
-                buf.get(..4)
-                    .and_then(|b| <[u8; 4]>::try_from(b).ok())
-                    .ok_or(Error::new(EBADF))?,
-            );
-            pty.pgrp = new_pgrp as usize;
-            //println!("WRITE PGRP {}: {} => {}", pty.id, pty.pgrp, new_pgrp);
-
-            Ok(4)
-        } else {
-            Err(Error::new(EPIPE))
-        }
-    }
-
-    fn sync(&mut self) -> Result<()> {
-        Ok(())
-    }
-
-    fn fcntl(&mut self, cmd: usize, arg: usize) -> Result<usize> {
-        match cmd {
-            F_GETFL => Ok(self.flags),
-            F_SETFL => {
-                self.flags = (self.flags & O_ACCMODE) | (arg & !O_ACCMODE);
-                Ok(0)
-            }
-            _ => Err(Error::new(EINVAL)),
-        }
-    }
-
-    fn fevent(&mut self) -> Result<EventFlags> {
-        Err(Error::new(EBADF))
-    }
-
-    fn events(&mut self) -> EventFlags {
-        EventFlags::empty()
-    }
-}
diff --git a/recipes/core/base/ptyd/src/pty.rs b/recipes/core/base/ptyd/src/pty.rs
deleted file mode 100644
index bcc46ac35a..0000000000
--- a/recipes/core/base/ptyd/src/pty.rs
+++ /dev/null
@@ -1,317 +0,0 @@
-use std::collections::VecDeque;
-
-use redox_termios::*;
-use scheme_utils::FpathWriter;
-use syscall::error::Result;
-
-pub struct Pty {
-    pub id: usize,
-    pub pgrp: usize,
-    pub termios: Termios,
-    pub winsize: Winsize,
-    pub cooked: Vec<u8>,
-    pub miso: VecDeque<Vec<u8>>,
-    pub mosi: VecDeque<Vec<u8>>,
-    pub timeout_count: u64,
-    pub timeout_character: Option<u64>,
-}
-
-impl Pty {
-    pub fn new(id: usize) -> Self {
-        Pty {
-            id,
-            pgrp: 0,
-            termios: Termios::default(),
-            winsize: Winsize::default(),
-            cooked: Vec::new(),
-            miso: VecDeque::new(),
-            mosi: VecDeque::new(),
-            timeout_count: 0,
-            timeout_character: None,
-        }
-    }
-
-    pub fn path(&self, buf: &mut [u8]) -> Result<usize> {
-        FpathWriter::with(buf, "pty", |w| {
-            write!(w, "{}", self.id).unwrap();
-            Ok(())
-        })
-    }
-
-    pub fn input(&mut self, buf: &[u8]) {
-        let ifl = self.termios.c_iflag;
-        //let ofl = &self.termios.c_oflag;
-        //let cfl = &self.termios.c_cflag;
-        let lfl = self.termios.c_lflag;
-        let cc = self.termios.c_cc;
-
-        let is_cc = |b: u8, i: usize| -> bool { b != 0 && b == cc[i] };
-        // TODO: Delete this constant once termios is bumped (it's in termios).
-        const _POSIX_VDISABLE: u8 = 0;
-        let is_vdisable = |i: usize| -> bool { cc[i] == _POSIX_VDISABLE };
-
-        let inlcr = ifl & INLCR == INLCR;
-        let igncr = ifl & IGNCR == IGNCR;
-        let icrnl = ifl & ICRNL == ICRNL;
-
-        let echo = lfl & ECHO == ECHO;
-        let echoe = lfl & ECHOE == ECHOE;
-        let echonl = lfl & ECHONL == ECHONL;
-        let icanon = lfl & ICANON == ICANON;
-        let isig = lfl & ISIG == ISIG;
-        let iexten = lfl & IEXTEN == IEXTEN;
-        let ixon = lfl & IXON == IXON;
-
-        for &byte in buf.iter() {
-            let mut b = byte;
-
-            // Input translation
-            if b == b'\n' {
-                if inlcr {
-                    b = b'\r';
-                }
-            } else if b == b'\r' {
-                if igncr {
-                    b = 0;
-                } else if icrnl {
-                    b = b'\n';
-                }
-            }
-
-            // Link settings
-            if icanon {
-                if b == b'\n' {
-                    if echo || echonl {
-                        self.output(&[b]);
-                    }
-
-                    self.cooked.push(b);
-                    self.mosi.push_back(self.cooked.clone());
-                    self.cooked.clear();
-
-                    b = 0;
-                }
-
-                if is_cc(b, VEOF) {
-                    self.mosi.push_back(self.cooked.clone());
-                    self.cooked.clear();
-
-                    b = 0;
-                }
-
-                if is_cc(b, VEOL) {
-                    if echo {
-                        self.output(&[b]);
-                    }
-
-                    self.cooked.push(b);
-                    self.mosi.push_back(self.cooked.clone());
-                    self.cooked.clear();
-
-                    b = 0;
-                }
-
-                if is_cc(b, VEOL2) {
-                    if echo {
-                        self.output(&[b]);
-                    }
-
-                    self.cooked.push(b);
-                    self.mosi.push_back(self.cooked.clone());
-                    self.cooked.clear();
-
-                    b = 0;
-                }
-
-                if is_cc(b, VERASE) && !is_vdisable(VERASE) {
-                    if let Some(_c) = self.cooked.pop() {
-                        if echoe {
-                            self.output(&[8, b' ', 8]);
-                        }
-                    }
-
-                    b = 0;
-                }
-
-                if is_cc(b, VWERASE) && iexten {
-                    println!("VWERASE");
-                    b = 0;
-                }
-
-                if is_cc(b, VKILL) {
-                    println!("VKILL");
-                    b = 0;
-                }
-
-                if is_cc(b, VREPRINT) && iexten {
-                    println!("VREPRINT");
-                    b = 0;
-                }
-            }
-
-            if isig {
-                if is_cc(b, VINTR) && !is_vdisable(VINTR) {
-                    if self.pgrp != 0 {
-                        let _ = libredox::call::kill(
-                            -(self.pgrp as isize) as usize,
-                            libredox::flag::SIGINT as _,
-                        );
-                    }
-
-                    b = 0;
-                }
-
-                if is_cc(b, VQUIT) && !is_vdisable(VQUIT) {
-                    if self.pgrp != 0 {
-                        let _ = libredox::call::kill(
-                            -(self.pgrp as isize) as usize,
-                            libredox::flag::SIGQUIT as _,
-                        );
-                    }
-
-                    b = 0;
-                }
-
-                if is_cc(b, VSUSP) && !is_vdisable(VSUSP) {
-                    if self.pgrp != 0 {
-                        let _ = libredox::call::kill(
-                            -(self.pgrp as isize) as usize,
-                            libredox::flag::SIGTSTP as _,
-                        );
-                    }
-
-                    b = 0;
-                }
-            }
-
-            if ixon {
-                if is_cc(b, VSTART) {
-                    println!("VSTART");
-                    b = 0;
-                }
-
-                if is_cc(b, VSTOP) {
-                    println!("VSTOP");
-                    b = 0;
-                }
-            }
-
-            if is_cc(b, VLNEXT) && iexten {
-                println!("VLNEXT");
-                b = 0;
-            }
-
-            if is_cc(b, VDISCARD) && iexten {
-                println!("VDISCARD");
-                b = 0;
-            }
-
-            if b != 0 {
-                if echo {
-                    self.output(&[b]);
-                }
-
-                // Restart timer after every byte
-                self.timeout_character = Some(self.timeout_count);
-
-                self.cooked.push(b);
-            }
-        }
-
-        self.update();
-    }
-
-    pub fn output(&mut self, buf: &[u8]) {
-        //TODO: more output flags
-
-        let ofl = &self.termios.c_oflag;
-
-        let opost = ofl & OPOST == OPOST;
-        let onlcr = ofl & ONLCR == ONLCR;
-
-        let mut vec = Vec::with_capacity(buf.len() + 1);
-        vec.push(0);
-
-        for &b in buf.iter() {
-            if opost && onlcr && b == b'\n' {
-                vec.push(b'\r');
-            }
-            vec.push(b);
-        }
-
-        self.miso.push_back(vec);
-    }
-
-    pub fn update(&mut self) {
-        let lfl = self.termios.c_lflag;
-        let cc = self.termios.c_cc;
-        let icanon = lfl & ICANON == ICANON;
-        let vmin = usize::from(cc[VMIN]);
-        let vtime = u64::from(cc[VTIME]);
-
-        // http://unixwiz.net/techtips/termios-vmin-vtime.html
-        if !icanon {
-            if vtime == 0 {
-                // No timeout specified
-                if vmin == 0 {
-                    // Polling read, return immediately with data
-                    if self.mosi.is_empty() {
-                        self.mosi.push_back(self.cooked.clone());
-                        self.cooked.clear();
-                    }
-                } else {
-                    // Blocking read, wait until vmin bytes are available
-                    if self.cooked.len() >= vmin {
-                        self.mosi.push_back(self.cooked.clone());
-                        self.cooked.clear();
-                    }
-                }
-            } else {
-                // Timeout specified using vtime
-                if vmin == 0 {
-                    // Return when any data is available or the timer expires
-                    if !self.cooked.is_empty() {
-                        self.mosi.push_back(self.cooked.clone());
-                        self.cooked.clear();
-                    } else if let Some(timeout_character) = self.timeout_character {
-                        if self.timeout_count >= timeout_character.wrapping_add(vtime) {
-                            self.timeout_character = None;
-
-                            if self.mosi.is_empty() {
-                                self.mosi.push_back(self.cooked.clone());
-                                self.cooked.clear();
-                            }
-                        }
-                    } else {
-                        // Start timer if not already started
-                        self.timeout_character = Some(self.timeout_count);
-                    }
-                } else {
-                    // Return when min bytes are received or the timer expires
-                    // when any data is available
-                    if self.cooked.len() >= vmin {
-                        self.mosi.push_back(self.cooked.clone());
-                        self.cooked.clear();
-                    } else if !self.cooked.is_empty() {
-                        if let Some(timeout_character) = self.timeout_character {
-                            if self.timeout_count >= timeout_character.wrapping_add(vtime) {
-                                self.timeout_character = None;
-
-                                self.mosi.push_back(self.cooked.clone());
-                                self.cooked.clear();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn timeout(&mut self, count: u64) {
-        if self.timeout_count != count {
-            self.timeout_count = count;
-
-            self.update();
-        }
-    }
-}
diff --git a/recipes/core/base/ptyd/src/resource.rs b/recipes/core/base/ptyd/src/resource.rs
deleted file mode 100644
index ac300b54ef..0000000000
--- a/recipes/core/base/ptyd/src/resource.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Weak;
-
-use syscall::error::Result;
-use syscall::flag::EventFlags;
-
-use crate::pty::Pty;
-
-pub trait Resource {
-    fn pty(&self) -> Weak<RefCell<Pty>>;
-    fn flags(&self) -> usize;
-
-    fn path(&mut self, buf: &mut [u8]) -> Result<usize>;
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize>;
-    fn write(&mut self, buf: &[u8]) -> Result<usize>;
-    fn sync(&mut self) -> Result<()>;
-    fn fcntl(&mut self, cmd: usize, arg: usize) -> Result<usize>;
-    fn fevent(&mut self) -> Result<EventFlags>;
-    fn events(&mut self) -> EventFlags;
-    fn timeout(&self, _count: u64) {
-        // Handled only by PTY control term
-    }
-}
diff --git a/recipes/core/base/ptyd/src/scheme.rs b/recipes/core/base/ptyd/src/scheme.rs
deleted file mode 100644
index c7136a4e81..0000000000
--- a/recipes/core/base/ptyd/src/scheme.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-use std::cell::RefCell;
-use std::collections::BTreeMap;
-use std::rc::Rc;
-use std::str;
-
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult};
-use syscall::data::Stat;
-use syscall::error::{Error, Result, EACCES, EBADF, EINVAL, ENOENT};
-use syscall::flag::{EventFlags, MODE_CHR};
-use syscall::schemev2::NewFdFlags;
-
-use crate::controlterm::PtyControlTerm;
-use crate::pgrp::PtyPgrp;
-use crate::pty::Pty;
-use crate::resource::Resource;
-use crate::subterm::PtySubTerm;
-use crate::termios::PtyTermios;
-use crate::winsize::PtyWinsize;
-
-pub enum Handle {
-    Resource(Box<dyn Resource>),
-    SchemeRoot,
-}
-
-pub struct PtyScheme {
-    next_id: usize,
-    pub handles: BTreeMap<usize, Handle>,
-}
-
-impl PtyScheme {
-    pub fn new() -> Self {
-        PtyScheme {
-            next_id: 0,
-            handles: BTreeMap::new(),
-        }
-    }
-
-    fn get_resource_mut(&mut self, id: usize) -> Result<&mut Box<dyn Resource>> {
-        match self.handles.get_mut(&id).ok_or(Error::new(EBADF))? {
-            Handle::Resource(res) => Ok(res),
-            Handle::SchemeRoot => Err(Error::new(EBADF)),
-        }
-    }
-}
-
-impl SchemeSync for PtyScheme {
-    fn scheme_root(&mut self) -> Result<usize> {
-        let id = self.next_id;
-        self.next_id += 1;
-        self.handles.insert(id, Handle::SchemeRoot);
-        Ok(id)
-    }
-
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        flags: usize,
-        fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(
-            self.handles.get(&dirfd).ok_or(Error::new(EBADF))?,
-            Handle::SchemeRoot
-        ) {
-            return Err(Error::new(EACCES));
-        }
-
-        let path = path.trim_matches('/');
-
-        let id = self.next_id;
-        self.next_id += 1;
-
-        if path.is_empty() {
-            let pty = Rc::new(RefCell::new(Pty::new(id)));
-            self.handles.insert(
-                id,
-                Handle::Resource(Box::new(PtyControlTerm::new(pty, flags))),
-            );
-        } else {
-            let control_term_id = path.parse::<usize>().or(Err(Error::new(EINVAL)))?;
-            let pty = {
-                let handle = self
-                    .handles
-                    .get(&control_term_id)
-                    .ok_or(Error::new(ENOENT))?;
-
-                match handle {
-                    Handle::Resource(res) => res.pty(),
-                    Handle::SchemeRoot => return Err(Error::new(ENOENT)),
-                }
-            };
-
-            self.handles.insert(
-                id,
-                Handle::Resource(Box::new(PtySubTerm::new(pty, flags | fcntl_flags as usize))),
-            );
-        }
-
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn dup(&mut self, old_id: usize, buf: &[u8], _ctx: &CallerCtx) -> Result<OpenResult> {
-        let handle: Box<dyn Resource> = {
-            let old_handle = self.handles.get(&old_id).ok_or(Error::new(EBADF))?;
-
-            let old_resource = match old_handle {
-                Handle::Resource(res) => res,
-                Handle::SchemeRoot => return Err(Error::new(EBADF)),
-            };
-
-            if buf == b"pgrp" {
-                Box::new(PtyPgrp::new(old_resource.pty(), old_resource.flags()))
-            } else if buf == b"termios" {
-                Box::new(PtyTermios::new(old_resource.pty(), old_resource.flags()))
-            } else if buf == b"winsize" {
-                Box::new(PtyWinsize::new(old_resource.pty(), old_resource.flags()))
-            } else {
-                return Err(Error::new(EINVAL));
-            }
-        };
-
-        let id = self.next_id;
-        self.next_id += 1;
-        self.handles.insert(id, Handle::Resource(handle));
-
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.get_resource_mut(id)?;
-        handle.read(buf)
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let handle = self.get_resource_mut(id)?;
-        handle.write(buf)
-    }
-
-    fn fcntl(&mut self, id: usize, cmd: usize, arg: usize, _ctx: &CallerCtx) -> Result<usize> {
-        let handle = self.get_resource_mut(id)?;
-        handle.fcntl(cmd, arg)
-    }
-
-    fn fevent(&mut self, id: usize, _flags: EventFlags, _ctx: &CallerCtx) -> Result<EventFlags> {
-        let handle = self.get_resource_mut(id)?;
-        handle.fevent()
-    }
-
-    fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        let handle = self.get_resource_mut(id)?;
-        handle.path(buf)
-    }
-
-    fn fstat(&mut self, id: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        let handle = self.handles.get(&id).ok_or(Error::new(EBADF))?;
-
-        match handle {
-            Handle::SchemeRoot => return Err(Error::new(EBADF)),
-            Handle::Resource(_res) => {
-                *stat = Stat {
-                    st_mode: MODE_CHR | 0o666,
-                    ..Default::default()
-                };
-            }
-        }
-
-        Ok(())
-    }
-
-    fn fsync(&mut self, id: usize, _ctx: &CallerCtx) -> Result<()> {
-        let handle = self.get_resource_mut(id)?;
-        handle.sync()
-    }
-
-    fn on_close(&mut self, id: usize) {
-        let _ = self.handles.remove(&id);
-    }
-}
diff --git a/recipes/core/base/ptyd/src/subterm.rs b/recipes/core/base/ptyd/src/subterm.rs
deleted file mode 100644
index beda848fa3..0000000000
--- a/recipes/core/base/ptyd/src/subterm.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Weak;
-
-use syscall::error::{Error, Result, EAGAIN, EINVAL, EPIPE, EWOULDBLOCK};
-use syscall::flag::{EventFlags, F_GETFL, F_SETFL, O_ACCMODE, O_NONBLOCK};
-
-use crate::pty::Pty;
-use crate::resource::Resource;
-
-/// Read side of a pipe
-pub struct PtySubTerm {
-    pty: Weak<RefCell<Pty>>,
-    flags: usize,
-    notified_read: bool,
-    notified_write: bool,
-}
-
-impl PtySubTerm {
-    pub fn new(pty: Weak<RefCell<Pty>>, flags: usize) -> Self {
-        PtySubTerm {
-            pty,
-            flags,
-            notified_read: false,
-            notified_write: false,
-        }
-    }
-}
-
-impl Resource for PtySubTerm {
-    fn pty(&self) -> Weak<RefCell<Pty>> {
-        self.pty.clone()
-    }
-
-    fn flags(&self) -> usize {
-        self.flags
-    }
-
-    fn path(&mut self, buf: &mut [u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            pty_lock.borrow_mut().path(buf)
-        } else {
-            Err(Error::new(EPIPE))
-        }
-    }
-
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-        self.notified_read = false;
-
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let mut pty = pty_lock.borrow_mut();
-
-            pty.update();
-
-            if let Some(packet) = pty.mosi.pop_front() {
-                let mut i = 0;
-
-                while i < buf.len() && i < packet.len() {
-                    buf[i] = packet[i];
-                    i += 1;
-                }
-
-                if i < packet.len() {
-                    pty.mosi.push_front(packet[i..].to_vec());
-                }
-
-                Ok(i)
-            } else if self.flags & O_NONBLOCK == O_NONBLOCK {
-                Err(Error::new(EAGAIN))
-            } else {
-                Err(Error::new(EWOULDBLOCK))
-            }
-        } else {
-            Ok(0)
-        }
-    }
-
-    fn write(&mut self, buf: &[u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let mut pty = pty_lock.borrow_mut();
-
-            if pty.miso.len() >= 64 {
-                return Err(Error::new(EWOULDBLOCK));
-            }
-
-            pty.output(buf);
-
-            Ok(buf.len())
-        } else {
-            Err(Error::new(EPIPE))
-        }
-    }
-
-    fn sync(&mut self) -> Result<()> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let mut pty = pty_lock.borrow_mut();
-
-            pty.miso.push_back(vec![1]);
-
-            Ok(())
-        } else {
-            Err(Error::new(EPIPE))
-        }
-    }
-
-    fn fcntl(&mut self, cmd: usize, arg: usize) -> Result<usize> {
-        match cmd {
-            F_GETFL => Ok(self.flags),
-            F_SETFL => {
-                self.flags = (self.flags & O_ACCMODE) | (arg & !O_ACCMODE);
-                Ok(0)
-            }
-            _ => Err(Error::new(EINVAL)),
-        }
-    }
-
-    fn fevent(&mut self) -> Result<EventFlags> {
-        self.notified_read = false; // resend
-        self.notified_write = false;
-        Ok(self.events())
-    }
-
-    fn events(&mut self) -> EventFlags {
-        let mut events = EventFlags::empty();
-
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let pty = pty_lock.borrow();
-            if pty.mosi.front().is_some() {
-                if !self.notified_read {
-                    self.notified_read = true;
-                    events |= syscall::EVENT_READ;
-                }
-            } else {
-                self.notified_read = false;
-            }
-        }
-
-        if !self.notified_write {
-            self.notified_write = true;
-            events |= syscall::EVENT_WRITE;
-        }
-
-        events
-    }
-}
diff --git a/recipes/core/base/ptyd/src/termios.rs b/recipes/core/base/ptyd/src/termios.rs
deleted file mode 100644
index 2d8a682e2e..0000000000
--- a/recipes/core/base/ptyd/src/termios.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use std::cell::RefCell;
-use std::ops::{Deref, DerefMut};
-use std::rc::Weak;
-
-use syscall::error::{Error, Result, EBADF, EINVAL, EPIPE};
-use syscall::flag::{EventFlags, F_GETFL, F_SETFL, O_ACCMODE};
-
-use crate::pty::Pty;
-use crate::resource::Resource;
-
-/// Read side of a pipe
-pub struct PtyTermios {
-    pty: Weak<RefCell<Pty>>,
-    flags: usize,
-}
-
-impl PtyTermios {
-    pub fn new(pty: Weak<RefCell<Pty>>, flags: usize) -> Self {
-        PtyTermios { pty, flags }
-    }
-}
-
-impl Resource for PtyTermios {
-    fn pty(&self) -> Weak<RefCell<Pty>> {
-        self.pty.clone()
-    }
-
-    fn flags(&self) -> usize {
-        self.flags
-    }
-
-    fn path(&mut self, buf: &mut [u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            pty_lock.borrow_mut().path(buf)
-        } else {
-            Err(Error::new(EPIPE))
-        }
-    }
-
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let pty = pty_lock.borrow();
-            let termios: &[u8] = pty.termios.deref();
-
-            let mut i = 0;
-            while i < buf.len() && i < termios.len() {
-                buf[i] = termios[i];
-                i += 1;
-            }
-            Ok(i)
-        } else {
-            Ok(0)
-        }
-    }
-
-    fn write(&mut self, buf: &[u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let mut pty = pty_lock.borrow_mut();
-            let termios: &mut [u8] = pty.termios.deref_mut();
-
-            let mut i = 0;
-            while i < buf.len() && i < termios.len() {
-                termios[i] = buf[i];
-                i += 1;
-            }
-            Ok(i)
-        } else {
-            Err(Error::new(EPIPE))
-        }
-    }
-
-    fn sync(&mut self) -> Result<()> {
-        Ok(())
-    }
-
-    fn fcntl(&mut self, cmd: usize, arg: usize) -> Result<usize> {
-        match cmd {
-            F_GETFL => Ok(self.flags),
-            F_SETFL => {
-                self.flags = (self.flags & O_ACCMODE) | (arg & !O_ACCMODE);
-                Ok(0)
-            }
-            _ => Err(Error::new(EINVAL)),
-        }
-    }
-
-    fn fevent(&mut self) -> Result<EventFlags> {
-        Err(Error::new(EBADF))
-    }
-
-    fn events(&mut self) -> EventFlags {
-        EventFlags::empty()
-    }
-}
diff --git a/recipes/core/base/ptyd/src/winsize.rs b/recipes/core/base/ptyd/src/winsize.rs
deleted file mode 100644
index a7e247731a..0000000000
--- a/recipes/core/base/ptyd/src/winsize.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use std::cell::RefCell;
-use std::ops::{Deref, DerefMut};
-use std::rc::Weak;
-
-use syscall::error::{Error, Result, EBADF, EINVAL, EPIPE};
-use syscall::flag::{EventFlags, F_GETFL, F_SETFL, O_ACCMODE};
-
-use crate::pty::Pty;
-use crate::resource::Resource;
-
-/// Read side of a pipe
-pub struct PtyWinsize {
-    pty: Weak<RefCell<Pty>>,
-    flags: usize,
-}
-
-impl PtyWinsize {
-    pub fn new(pty: Weak<RefCell<Pty>>, flags: usize) -> Self {
-        PtyWinsize { pty, flags }
-    }
-}
-
-impl Resource for PtyWinsize {
-    fn pty(&self) -> Weak<RefCell<Pty>> {
-        self.pty.clone()
-    }
-
-    fn flags(&self) -> usize {
-        self.flags
-    }
-
-    fn path(&mut self, buf: &mut [u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            pty_lock.borrow_mut().path(buf)
-        } else {
-            Err(Error::new(EPIPE))
-        }
-    }
-
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let pty = pty_lock.borrow();
-            let winsize: &[u8] = pty.winsize.deref();
-
-            let mut i = 0;
-            while i < buf.len() && i < winsize.len() {
-                buf[i] = winsize[i];
-                i += 1;
-            }
-            Ok(i)
-        } else {
-            Ok(0)
-        }
-    }
-
-    fn write(&mut self, buf: &[u8]) -> Result<usize> {
-        if let Some(pty_lock) = self.pty.upgrade() {
-            let mut pty = pty_lock.borrow_mut();
-            let winsize: &mut [u8] = pty.winsize.deref_mut();
-
-            let mut i = 0;
-            while i < buf.len() && i < winsize.len() {
-                winsize[i] = buf[i];
-                i += 1;
-            }
-            Ok(i)
-        } else {
-            Err(Error::new(EPIPE))
-        }
-    }
-
-    fn sync(&mut self) -> Result<()> {
-        Ok(())
-    }
-
-    fn fcntl(&mut self, cmd: usize, arg: usize) -> Result<usize> {
-        match cmd {
-            F_GETFL => Ok(self.flags),
-            F_SETFL => {
-                self.flags = (self.flags & O_ACCMODE) | (arg & !O_ACCMODE);
-                Ok(0)
-            }
-            _ => Err(Error::new(EINVAL)),
-        }
-    }
-
-    fn fevent(&mut self) -> Result<EventFlags> {
-        Err(Error::new(EBADF))
-    }
-
-    fn events(&mut self) -> EventFlags {
-        EventFlags::empty()
-    }
-}
diff --git a/recipes/core/base/ramfs/Cargo.toml b/recipes/core/base/ramfs/Cargo.toml
deleted file mode 100644
index 85a3ff9000..0000000000
--- a/recipes/core/base/ramfs/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "ramfs"
-version = "0.1.0"
-authors = ["4lDO2 <4lDO2@protonmail.com>"]
-edition = "2018"
-license = "MIT"
-description = "RAM filesystem, which is useful for early logging"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-daemon = { path = "../daemon" }
-redox_syscall.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../scheme-utils" }
-libredox = { workspace = true, features = ["call"] }
-indexmap = "2.5.0"
-slab.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/ramfs/src/filesystem.rs b/recipes/core/base/ramfs/src/filesystem.rs
deleted file mode 100644
index bec19453cf..0000000000
--- a/recipes/core/base/ramfs/src/filesystem.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-use std::collections::BTreeMap;
-use std::convert::TryInto;
-use std::{fs, iter, time};
-
-use std::os::unix::io::AsRawFd;
-
-use indexmap::IndexMap;
-use syscall::error::{EACCES, EIO, ENFILE, ENOENT};
-use syscall::{Error, Result, TimeSpec, MODE_DIR};
-
-use super::scheme::current_perm;
-
-#[derive(Debug)]
-pub struct File {
-    pub mode: u16,
-    pub uid: u32,
-    pub gid: u32,
-    pub nlink: usize,
-    pub parent: Inode,
-
-    pub open_handles: usize,
-
-    pub atime: TimeSpec,
-    pub ctime: TimeSpec,
-    pub mtime: TimeSpec,
-
-    pub data: FileData,
-}
-
-#[derive(Clone, Debug)]
-pub struct Inode(pub usize);
-
-#[derive(Debug)]
-pub enum FileData {
-    File(Vec<u8>),
-    Directory(IndexMap<String, Inode>),
-}
-impl FileData {
-    pub fn size(&self) -> usize {
-        match self {
-            &Self::File(ref data) => data.len(),
-            &Self::Directory(_) => 0,
-        }
-    }
-}
-
-pub struct Filesystem {
-    pub files: BTreeMap<usize, File>,
-    pub memory_file: fs::File,
-    pub last_inode_number: usize,
-}
-impl Filesystem {
-    pub const DEFAULT_BLOCK_SIZE: u32 = 4096;
-    pub const ROOT_INODE: usize = 1;
-
-    pub fn new() -> Result<Self> {
-        Ok(Self {
-            files: iter::once((Self::ROOT_INODE, Self::create_root_inode())).collect(),
-            memory_file: fs::File::open("/scheme/memory").or(Err(Error::new(EIO)))?,
-            last_inode_number: Self::ROOT_INODE,
-        })
-    }
-    fn create_root_inode() -> File {
-        let cur_time = current_time();
-        File {
-            atime: cur_time,
-            ctime: cur_time,
-            mtime: cur_time,
-
-            mode: MODE_DIR | 0o755,
-            nlink: 1,
-            open_handles: 0,
-
-            uid: 0,
-            gid: 0,
-
-            data: FileData::Directory(IndexMap::new()),
-            parent: Inode(Self::ROOT_INODE),
-        }
-    }
-    pub fn get_block_size(&self) -> Result<u32> {
-        Ok(libredox::call::fstatvfs(self.memory_file.as_raw_fd() as usize)?.f_bsize as u32)
-    }
-    pub fn block_size(&self) -> u32 {
-        self.get_block_size().unwrap_or(Self::DEFAULT_BLOCK_SIZE)
-    }
-    pub fn next_inode_number(&mut self) -> Result<usize> {
-        let next = self
-            .last_inode_number
-            .checked_add(1)
-            .ok_or(Error::new(ENFILE))?;
-        self.last_inode_number = next;
-        Ok(next)
-    }
-    fn resolve_generic(&self, mut parts: Vec<&str>, uid: u32, gid: u32) -> Result<usize> {
-        let mut current_file = self
-            .files
-            .get(&Self::ROOT_INODE)
-            .ok_or(Error::new(ENOENT))?;
-        let mut current_inode = Self::ROOT_INODE;
-
-        let mut i = 0;
-
-        loop {
-            let Some(&part) = parts.get(i) else {
-                break;
-            };
-            let dentries = match current_file.data {
-                FileData::Directory(ref dentries) => dentries,
-                FileData::File(_) => return Err(Error::new(ENOENT)),
-            };
-            let perm = current_perm(&current_file, uid, gid);
-            if perm & 0o1 == 0 {
-                return Err(Error::new(EACCES));
-            }
-
-            if part == "." || part == ".." {
-                parts.remove(i);
-            }
-
-            let part = *parts.get(i).unwrap();
-            if part == ".." && i > 0 {
-                i -= 1;
-                parts.remove(i);
-            }
-            let part = *parts.get(i).unwrap();
-
-            current_inode = dentries.get(part).ok_or(Error::new(ENOENT))?.0;
-            current_file = self.files.get(&current_inode).ok_or(Error::new(EIO))?;
-
-            i += 1;
-        }
-        Ok(current_inode)
-    }
-    pub fn resolve_except_last<'a>(
-        &self,
-        path_bytes: &'a str,
-        uid: u32,
-        gid: u32,
-    ) -> Result<(usize, Option<&'a str>)> {
-        let mut parts =
-            path_components_iter(path_bytes.trim_start_matches('/')).collect::<Vec<_>>();
-
-        let last = if parts.len() >= 1 {
-            Some(parts.pop().unwrap())
-        } else {
-            None
-        };
-
-        Ok((self.resolve_generic(parts, uid, gid)?, last))
-    }
-    pub fn resolve(&self, path: &str, uid: u32, gid: u32) -> Result<usize> {
-        let parts = path_components_iter(path.trim_start_matches('/')).collect::<Vec<_>>();
-
-        self.resolve_generic(parts, uid, gid)
-    }
-}
-pub fn path_components_iter(bytes: &str) -> impl Iterator<Item = &str> + '_ {
-    let components_iter = bytes.split(|c| c == '/');
-    components_iter.filter(|item| !item.is_empty())
-}
-pub fn current_time() -> TimeSpec {
-    let sys_time = time::SystemTime::now();
-
-    let duration = match sys_time.duration_since(time::SystemTime::UNIX_EPOCH) {
-        Ok(d) => d,
-        Err(e) => {
-            eprintln!("The time is apparently now before the Unix epoch...");
-
-            let negative_duration = e.duration();
-
-            return TimeSpec {
-                tv_sec: negative_duration
-                    .as_secs()
-                    .try_into()
-                    .unwrap_or(i64::min_value()),
-                tv_nsec: negative_duration
-                    .subsec_nanos()
-                    .try_into()
-                    .unwrap_or(i32::min_value()),
-            };
-        }
-    };
-
-    TimeSpec {
-        tv_sec: duration.as_secs().try_into().unwrap_or(i64::max_value()),
-        tv_nsec: duration
-            .subsec_nanos()
-            .try_into()
-            .unwrap_or(i32::max_value()),
-    }
-}
diff --git a/recipes/core/base/ramfs/src/main.rs b/recipes/core/base/ramfs/src/main.rs
deleted file mode 100644
index e7c9d19f46..0000000000
--- a/recipes/core/base/ramfs/src/main.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use std::env;
-
-mod filesystem;
-mod scheme;
-
-use scheme_utils::Blocking;
-
-use self::scheme::Scheme;
-
-fn main() {
-    daemon::SchemeDaemon::new(daemon);
-}
-
-fn daemon(daemon: daemon::SchemeDaemon) -> ! {
-    let scheme_name = env::args().nth(1).expect("Usage:\n\tramfs SCHEME_NAME");
-
-    let socket = redox_scheme::Socket::create().expect("ramfs: failed to create socket");
-
-    let mut scheme = Scheme::new(scheme_name.clone()).expect("ramfs: failed to initialize scheme");
-    let handler = Blocking::new(&socket, 16);
-
-    let _ = daemon.ready_sync_scheme(&socket, &mut scheme);
-
-    libredox::call::setrens(0, 0).expect("ramfs: failed to enter null namespace");
-
-    handler
-        .process_requests_blocking(scheme)
-        .expect("ramfs: failed to process events from zero scheme");
-}
diff --git a/recipes/core/base/ramfs/src/scheme.rs b/recipes/core/base/ramfs/src/scheme.rs
deleted file mode 100644
index 421d814126..0000000000
--- a/recipes/core/base/ramfs/src/scheme.rs
+++ /dev/null
@@ -1,746 +0,0 @@
-use std::convert::{TryFrom, TryInto};
-use std::os::unix::io::AsRawFd;
-use std::{mem, str};
-
-use scheme_utils::{FpathWriter, HandleMap};
-use syscall::dirent::{DirEntry, DirentBuf, DirentKind};
-use syscall::error::{
-    EACCES, EBADF, EBADFD, EEXIST, EINVAL, EIO, EISDIR, ENOMEM, ENOSYS, ENOTDIR, ENOTEMPTY,
-    EOPNOTSUPP, EOVERFLOW, EPERM,
-};
-use syscall::flag::{
-    StdFsCallKind, O_ACCMODE, O_CREAT, O_DIRECTORY, O_EXCL, O_RDONLY, O_RDWR, O_STAT, O_TRUNC,
-    O_WRONLY,
-};
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error, EventFlags, Result, Stat, StatVfs, StdFsCallMeta, TimeSpec, ENOENT};
-use syscall::{MODE_DIR, MODE_FILE, MODE_PERM, MODE_TYPE};
-
-use indexmap::IndexMap;
-
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult};
-
-use crate::filesystem::{self, File, FileData, Filesystem, Inode};
-
-enum Handle {
-    Inode(usize),
-    SchemeRoot,
-}
-
-pub struct Scheme {
-    scheme_name: String,
-    filesystem: Filesystem,
-    handles: HandleMap<Handle>,
-    proc_creds_capability: libredox::Fd,
-}
-impl Scheme {
-    /// Create the scheme, with the name being used for `fpath`.
-    pub fn new(scheme_name: String) -> Result<Self> {
-        Ok(Self {
-            scheme_name,
-            filesystem: Filesystem::new()?,
-            handles: HandleMap::new(),
-            proc_creds_capability: {
-                libredox::Fd::open(
-                    "/scheme/proc/proc-creds-capability",
-                    libredox::flag::O_RDONLY,
-                    0,
-                )?
-            },
-        })
-    }
-    /// Remove a directory entry, where the entry can be both a file or a directory. Used by `unlinkat`.
-    pub fn remove_dentry(&mut self, path: &str, uid: u32, gid: u32, directory: bool) -> Result<()> {
-        let removed_inode = {
-            let (parent_dir_inode, name_to_delete) =
-                self.filesystem.resolve_except_last(path, uid, gid)?;
-            let name_to_delete = name_to_delete.ok_or(Error::new(EINVAL))?; // can't remove root
-            let parent = self
-                .filesystem
-                .files
-                .get_mut(&parent_dir_inode)
-                .ok_or(Error::new(EIO))?;
-
-            let mode = current_perm(parent, uid, gid);
-            if mode & 0o2 == 0 {
-                return Err(Error::new(EACCES));
-            }
-
-            let FileData::Directory(ref mut dentries) = parent.data else {
-                return Err(Error::new(ENOTDIR));
-            };
-
-            let Inode(entry_inode) = dentries
-                .shift_remove(name_to_delete)
-                .ok_or(Error::new(ENOENT))?;
-
-            if let Some(File {
-                data: FileData::Directory(ref data),
-                ..
-            }) = self.filesystem.files.get(&entry_inode)
-            {
-                if !directory {
-                    return Err(Error::new(EISDIR));
-                } else if !data.is_empty() {
-                    return Err(Error::new(ENOTEMPTY));
-                }
-                let parent = self
-                    .filesystem
-                    .files
-                    .get_mut(&parent_dir_inode)
-                    .ok_or(Error::new(EIO))?;
-                parent.nlink -= 1; // '..' of subdirectory
-            }
-
-            entry_inode
-        };
-
-        let removed_inode_info = self
-            .filesystem
-            .files
-            .get_mut(&removed_inode)
-            .ok_or(Error::new(EIO))?;
-
-        if let FileData::File(_) = removed_inode_info.data {
-            if directory {
-                return Err(Error::new(EISDIR));
-            }
-            removed_inode_info.nlink -= 1; // only the parent entry
-        } else {
-            if !directory {
-                return Err(Error::new(ENOTDIR));
-            }
-            removed_inode_info.nlink -= 2; // both the parent entry and '.'
-        }
-
-        if removed_inode_info.nlink == 0 && removed_inode_info.open_handles == 0 {
-            self.filesystem.files.remove(&removed_inode);
-        }
-
-        Ok(())
-    }
-
-    fn open_existing(&mut self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<Inode> {
-        let inode = self.filesystem.resolve(path, uid, gid)?;
-        let file = self
-            .filesystem
-            .files
-            .get_mut(&inode)
-            .ok_or(Error::new(EIO))?;
-
-        if flags & O_STAT == 0 && flags & O_DIRECTORY != 0 && file.mode & MODE_TYPE != MODE_DIR {
-            return Err(Error::new(ENOTDIR));
-        }
-
-        // Unlike on Linux, which allows directories to be opened without O_DIRECTORY, Redox has no
-        // getdents(2) syscall, and thus it adds the additional restriction that directories have
-        // to be opened with O_DIRECTORY, if they aren't opened with O_STAT to check whether it's a
-        // directory.
-        if flags & O_STAT == 0 && flags & O_DIRECTORY == 0 && file.mode & MODE_TYPE == MODE_DIR {
-            return Err(Error::new(EISDIR));
-        }
-
-        let current_perm = current_perm(file, uid, gid);
-        check_permissions(flags, current_perm)?;
-
-        let opened_as_write = flags & O_ACCMODE == O_WRONLY || flags & O_ACCMODE == O_RDWR;
-
-        if flags & O_TRUNC == O_TRUNC && opened_as_write {
-            match file.data {
-                // file.data and file.mode should match
-                FileData::Directory(_) => return Err(Error::new(EBADFD)),
-
-                // If we opened an existing file with O_CREAT and O_TRUNC
-                FileData::File(ref mut data) => data.clear(),
-            }
-        }
-
-        file.open_handles += 1;
-
-        Ok(Inode(inode))
-    }
-}
-
-impl SchemeSync for Scheme {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        flags: usize,
-        fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(self.handles.get(dirfd)?, Handle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-
-        let exists = self.filesystem.resolve(path, 0, 0).is_ok();
-        if flags & O_CREAT != 0 && flags & O_EXCL != 0 && exists {
-            return Err(Error::new(EEXIST));
-        }
-
-        let inode = if flags & O_CREAT != 0 && exists {
-            self.open_existing(path, flags, ctx.uid, ctx.gid)?.0
-        } else if flags & O_CREAT != 0 {
-            if flags & O_STAT != 0 {
-                return Err(Error::new(EINVAL));
-            }
-
-            let (parent_dir_inode, new_name) = self
-                .filesystem
-                .resolve_except_last(path, ctx.uid, ctx.gid)?;
-            let new_name = new_name.ok_or(Error::new(EINVAL))?; // cannot mkdir /
-
-            let current_time = filesystem::current_time();
-
-            let new_inode_number = self.filesystem.next_inode_number()?;
-
-            let mut mode = (flags & 0xFFFF) as u16;
-
-            let new_inode = if flags & O_DIRECTORY != 0 {
-                if mode & MODE_TYPE == 0 {
-                    mode |= MODE_DIR
-                }
-                if mode & MODE_TYPE != MODE_DIR {
-                    return Err(Error::new(EINVAL));
-                }
-
-                File {
-                    atime: current_time,
-                    ctime: current_time,
-                    mtime: current_time,
-                    gid: ctx.gid,
-                    uid: ctx.uid,
-                    mode,
-                    nlink: 2, // parent entry, "."
-                    data: FileData::Directory(IndexMap::new()),
-                    open_handles: 1,
-                    parent: Inode(parent_dir_inode),
-                }
-            } else {
-                if mode & MODE_TYPE == 0 {
-                    mode |= MODE_FILE
-                }
-                if mode & MODE_TYPE == MODE_DIR {
-                    return Err(Error::new(EINVAL));
-                }
-
-                File {
-                    atime: current_time,
-                    ctime: current_time,
-                    mtime: current_time,
-                    gid: ctx.gid,
-                    uid: ctx.uid,
-                    mode,
-                    nlink: 1,
-                    data: FileData::File(Vec::new()),
-                    open_handles: 1,
-                    parent: Inode(parent_dir_inode),
-                }
-            };
-            let current_perm = current_perm(&new_inode, ctx.uid, ctx.gid);
-            check_permissions(flags, current_perm)?;
-
-            self.filesystem.files.insert(new_inode_number, new_inode);
-
-            let parent_file = self
-                .filesystem
-                .files
-                .get_mut(&parent_dir_inode)
-                .ok_or(Error::new(EIO))?;
-            match parent_file.data {
-                FileData::File(_) => return Err(Error::new(EIO)),
-                FileData::Directory(ref mut entries) => {
-                    entries.insert(new_name.to_owned(), Inode(new_inode_number));
-                }
-            }
-
-            new_inode_number
-        } else {
-            self.open_existing(path, flags | fcntl_flags as usize, ctx.uid, ctx.gid)?
-                .0
-        };
-        let new_id = self.handles.insert(Handle::Inode(inode));
-        Ok(OpenResult::ThisScheme {
-            number: new_id,
-            flags: NewFdFlags::POSITIONED,
-        })
-    }
-    fn unlinkat(&mut self, dirfd: usize, path: &str, flags: usize, ctx: &CallerCtx) -> Result<()> {
-        {
-            if !matches!(self.handles.get(dirfd)?, Handle::SchemeRoot) {
-                return Err(Error::new(EACCES));
-            }
-        }
-        self.remove_dentry(
-            path,
-            ctx.uid,
-            ctx.gid,
-            flags & syscall::AT_REMOVEDIR == syscall::AT_REMOVEDIR,
-        )
-    }
-    fn read(
-        &mut self,
-        fd: usize,
-        buf: &mut [u8],
-        offset: u64,
-        fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let Ok(offset) = usize::try_from(offset) else {
-            return Ok(0);
-        };
-        let inode = match self.handles.get(fd)? {
-            Handle::Inode(inode) => inode,
-            Handle::SchemeRoot => return Err(Error::new(EISDIR)),
-        };
-        let file = self
-            .filesystem
-            .files
-            .get_mut(&inode)
-            .ok_or(Error::new(EBADFD))?;
-
-        if !matches!((fcntl_flags as usize) & O_ACCMODE, O_RDONLY | O_RDWR) {
-            return Err(Error::new(EBADF));
-        }
-
-        match file.data {
-            FileData::File(ref bytes) => {
-                if file.mode & MODE_TYPE == MODE_DIR {
-                    return Err(Error::new(EBADFD));
-                }
-                let src_bytes = bytes.get(offset..).unwrap_or(&[]);
-                let bytes_to_read = src_bytes.len().min(buf.len());
-                buf[..bytes_to_read].copy_from_slice(&src_bytes[..bytes_to_read]);
-                Ok(bytes_to_read)
-            }
-            FileData::Directory(_) => return Err(Error::new(EISDIR)),
-        }
-    }
-    fn getdents<'buf>(
-        &mut self,
-        fd: usize,
-        mut buf: DirentBuf<&'buf mut [u8]>,
-        opaque_offset: u64,
-    ) -> Result<DirentBuf<&'buf mut [u8]>> {
-        let Ok(offset) = usize::try_from(opaque_offset) else {
-            return Ok(buf);
-        };
-        let inode = match self.handles.get(fd)? {
-            Handle::Inode(inode) => inode,
-            Handle::SchemeRoot => return Err(Error::new(EISDIR)),
-        };
-        let file = self
-            .filesystem
-            .files
-            .get_mut(&inode)
-            .ok_or(Error::new(EBADFD))?;
-
-        let FileData::Directory(ref dir) = file.data else {
-            return Err(Error::new(ENOTDIR));
-        };
-
-        for (i, (dent_name, Inode(dent_inode))) in dir.iter().enumerate().skip(offset) {
-            buf.entry(DirEntry {
-                inode: *dent_inode as u64,
-                name: dent_name,
-                kind: DirentKind::Unspecified,
-                next_opaque_id: i as u64 + 1,
-            })?;
-        }
-        Ok(buf)
-    }
-    fn write(
-        &mut self,
-        fd: usize,
-        buf: &[u8],
-        offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        let Ok(offset) = usize::try_from(offset) else {
-            return Ok(0);
-        };
-        let inode = match self.handles.get(fd)? {
-            Handle::Inode(inode) => inode,
-            Handle::SchemeRoot => return Err(Error::new(EISDIR)),
-        };
-        let file = self
-            .filesystem
-            .files
-            .get_mut(&inode)
-            .ok_or(Error::new(EBADFD))?;
-
-        if let &mut FileData::File(ref mut bytes) = &mut file.data {
-            if file.mode & MODE_TYPE == MODE_DIR {
-                return Err(Error::new(EBADFD));
-            }
-
-            // if there's a seek hole, fill it with 0 and continue writing.
-            let end_off = offset.checked_add(buf.len()).ok_or(Error::new(EOVERFLOW))?;
-            if end_off > bytes.len() {
-                let additional = end_off - bytes.len();
-                bytes.try_reserve(additional).or(Err(Error::new(ENOMEM)))?;
-                bytes.resize(end_off, 0u8);
-            }
-            bytes[offset..][..buf.len()].copy_from_slice(buf);
-
-            Ok(buf.len())
-        } else {
-            Err(Error::new(EISDIR))
-        }
-    }
-    fn fchmod(&mut self, fd: usize, mode: u16, _ctx: &CallerCtx) -> Result<()> {
-        let inode = match self.handles.get(fd)? {
-            Handle::Inode(inode) => inode,
-            Handle::SchemeRoot => return Err(Error::new(EISDIR)),
-        };
-        let file = self
-            .filesystem
-            .files
-            .get_mut(&inode)
-            .ok_or(Error::new(EBADFD))?;
-
-        let cur_type = file.mode & MODE_TYPE;
-
-        /*
-        if mode & MODE_TYPE != 0 {
-            return Err(Error::new(EINVAL));
-        }
-        */
-
-        file.mode = mode | cur_type;
-
-        Ok(())
-    }
-    fn fchown(&mut self, inode: usize, uid: u32, gid: u32, _ctx: &CallerCtx) -> Result<()> {
-        let file = self
-            .filesystem
-            .files
-            .get_mut(&inode)
-            .ok_or(Error::new(EBADFD))?;
-
-        file.uid = uid;
-        file.gid = gid;
-
-        Ok(())
-    }
-    fn fcntl(
-        &mut self,
-        _inode: usize,
-        _cmd: usize,
-        _arg: usize,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        Ok(0)
-    }
-    fn fevent(
-        &mut self,
-        _inode: usize,
-        _flags: EventFlags,
-        _ctx: &CallerCtx,
-    ) -> Result<EventFlags> {
-        // TODO?
-        Err(Error::new(ENOSYS))
-    }
-    fn mmap_prep(
-        &mut self,
-        _inode: usize,
-        _offset: u64,
-        _size: usize,
-        _flags: syscall::MapFlags,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        // TODO
-        Err(Error::new(ENOSYS))
-    }
-    fn fpath(&mut self, fd: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, &self.scheme_name, |w| {
-            let mut current_inode = match *self.handles.get(fd)? {
-                Handle::Inode(inode) => inode,
-                Handle::SchemeRoot => return Err(Error::new(EISDIR)),
-            };
-
-            let mut chain = Vec::new();
-
-            let mut current_info = self
-                .filesystem
-                .files
-                .get(&current_inode)
-                .ok_or(Error::new(EBADFD))?;
-
-            while current_inode != Filesystem::ROOT_INODE {
-                let parent_info = self
-                    .filesystem
-                    .files
-                    .get(&current_info.parent.0)
-                    .ok_or(Error::new(EBADFD))?;
-
-                let FileData::Directory(ref dir) = parent_info.data else {
-                    return Err(Error::new(EBADFD));
-                };
-                // TODO: error handling?
-                let (name, _) = dir
-                    .iter()
-                    .find(|(_name, inode)| inode.0 == current_inode)
-                    .ok_or(Error::new(ENOENT))?;
-                chain.push(&**name);
-
-                current_inode = current_info.parent.0;
-                current_info = parent_info;
-            }
-
-            for (i, component) in chain.iter().copied().rev().enumerate() {
-                if i != 0 {
-                    w.push_str("/");
-                }
-                w.push_str(component);
-            }
-            Ok(())
-        })
-    }
-    fn frename(&mut self, _inode: usize, _path: &str, _ctx: &CallerCtx) -> Result<usize> {
-        // TODO
-        Err(Error::new(ENOSYS))
-    }
-    fn fstat(&mut self, fd: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        let inode = match *self.handles.get(fd)? {
-            Handle::Inode(inode) => inode,
-            Handle::SchemeRoot => return Err(Error::new(EISDIR)),
-        };
-
-        let block_size = self.filesystem.block_size();
-        let file = self
-            .filesystem
-            .files
-            .get_mut(&inode)
-            .ok_or(Error::new(EBADFD))?;
-
-        let size = file.data.size().try_into().or(Err(Error::new(EOVERFLOW)))?;
-
-        *stat = Stat {
-            st_mode: file.mode,
-            st_uid: file.uid,
-            st_gid: file.gid,
-            st_ino: inode.try_into().map_err(|_| Error::new(EOVERFLOW))?,
-            st_nlink: file.nlink.try_into().or(Err(Error::new(EOVERFLOW)))?,
-            st_dev: 0,
-
-            st_size: size,
-            st_blksize: block_size,
-            st_blocks: size.next_multiple_of(u64::from(block_size)),
-
-            st_atime: file
-                .atime
-                .tv_sec
-                .try_into()
-                .or(Err(Error::new(EOVERFLOW)))?,
-            st_atime_nsec: file
-                .atime
-                .tv_nsec
-                .try_into()
-                .or(Err(Error::new(EOVERFLOW)))?,
-
-            st_ctime: file
-                .ctime
-                .tv_sec
-                .try_into()
-                .or(Err(Error::new(EOVERFLOW)))?,
-            st_ctime_nsec: file
-                .ctime
-                .tv_nsec
-                .try_into()
-                .or(Err(Error::new(EOVERFLOW)))?,
-
-            st_mtime: file
-                .mtime
-                .tv_sec
-                .try_into()
-                .or(Err(Error::new(EOVERFLOW)))?,
-            st_mtime_nsec: file
-                .mtime
-                .tv_nsec
-                .try_into()
-                .or(Err(Error::new(EOVERFLOW)))?,
-        };
-
-        Ok(())
-    }
-    fn fstatvfs(&mut self, _inode: usize, stat: &mut StatVfs, _ctx: &CallerCtx) -> Result<()> {
-        let abi_stat = libredox::call::fstatvfs(self.filesystem.memory_file.as_raw_fd() as usize)?;
-        // TODO: From impl
-        *stat = StatVfs {
-            f_bavail: abi_stat.f_bavail as u64,
-            f_bfree: abi_stat.f_bfree as u64,
-            f_blocks: abi_stat.f_blocks as u64,
-            f_bsize: abi_stat.f_bsize as u32,
-        };
-
-        Ok(())
-    }
-    fn fsync(&mut self, _inode: usize, _ctx: &CallerCtx) -> Result<()> {
-        Ok(())
-    }
-    fn ftruncate(&mut self, fd: usize, size: u64, _ctx: &CallerCtx) -> Result<()> {
-        let inode = match self.handles.get(fd)? {
-            Handle::Inode(inode) => inode,
-            Handle::SchemeRoot => return Err(Error::new(EISDIR)),
-        };
-        let file = self
-            .filesystem
-            .files
-            .get_mut(&inode)
-            .ok_or(Error::new(EBADFD))?;
-
-        if file.mode & MODE_TYPE == MODE_DIR {
-            return Err(Error::new(EISDIR));
-        }
-        let size = usize::try_from(size).map_err(|_| Error::new(EOVERFLOW))?;
-        match &mut file.data {
-            &mut FileData::File(ref mut bytes) => {
-                if size > bytes.len() {
-                    let additional = size - bytes.len();
-                    bytes.try_reserve(additional).or(Err(Error::new(ENOMEM)))?;
-                    bytes.resize(size, 0u8)
-                } else {
-                    bytes.resize(size, 0u8)
-                }
-            }
-            &mut FileData::Directory(_) => return Err(Error::new(EBADFD)),
-        }
-        Ok(())
-    }
-    fn futimens(&mut self, fd: usize, times: &[TimeSpec], _ctx: &CallerCtx) -> Result<()> {
-        let inode = match self.handles.get(fd)? {
-            Handle::Inode(inode) => inode,
-            Handle::SchemeRoot => return Err(Error::new(EISDIR)),
-        };
-        let file = self
-            .filesystem
-            .files
-            .get_mut(&inode)
-            .ok_or(Error::new(EBADFD))?;
-
-        let new_atime = *times.get(0).ok_or(Error::new(EINVAL))?;
-        let new_mtime = *times.get(1).ok_or(Error::new(EINVAL))?;
-
-        file.atime = new_atime;
-        file.mtime = new_mtime;
-
-        Ok(())
-    }
-
-    fn std_fs_call(
-        &mut self,
-        id: usize,
-        kind: StdFsCallKind,
-        payload: &mut [u8],
-        metadata: StdFsCallMeta,
-        ctx: &CallerCtx,
-    ) -> Result<usize> {
-        match kind {
-            StdFsCallKind::Fchown => {
-                let (new_uid, new_gid) = (metadata.arg1 as u32, metadata.arg1 >> 32 as u32);
-                let (_pid, uid, gid) = get_uid_gid_from_pid(&self.proc_creds_capability, ctx.pid)?;
-                if uid != 0 && (uid != ctx.uid || gid != ctx.gid) {
-                    return Err(Error::new(EPERM));
-                }
-                self.fchown(id, new_uid, new_gid as u32, ctx).map(|_| 0)
-            }
-            /* TODO: Support Unlinkat using std_fs_call
-            Unlinkat => {
-                let path = unsafe { str::from_utf8_unchecked(payload) };
-                let flags = metadata.arg1;                {
-                    if !matches!(
-                        self.handles.get(&id).ok_or(Error::new(EBADF))?,
-                        Handle::SchemeRoot
-                    ) {
-                        return Err(Error::new(EACCES));
-                    }
-                }
-                let (_pid, uid, gid) = get_uid_gid_from_pid(&self.proc_creds_capability, ctx.pid)?;
-                self.remove_dentry(
-                    path,
-                    uid,
-                    gid,
-                    *flags as usize & syscall::AT_REMOVEDIR == syscall::AT_REMOVEDIR,
-                )
-                .map(|_| 0)
-            }
-            */
-            _ => Err(Error::new(EOPNOTSUPP)),
-        }
-    }
-
-    fn on_close(&mut self, fd: usize) {
-        let Some(Handle::Inode(inode)) = self.handles.remove(fd) else {
-            return;
-        };
-        let Some(inode_info) = self.filesystem.files.get_mut(&inode) else {
-            return;
-        };
-
-        inode_info.open_handles -= 1;
-
-        if inode_info.nlink == 0 && inode_info.open_handles == 0 {
-            self.filesystem.files.remove(&inode);
-        }
-    }
-}
-pub fn current_perm(file: &crate::filesystem::File, uid: u32, gid: u32) -> u8 {
-    let perm = file.mode & MODE_PERM;
-
-    if uid == 0 {
-        // root doesn't have to be checked
-        0o7
-    } else if uid == file.uid {
-        ((perm & 0o700) >> 6) as u8
-    } else if gid == file.gid {
-        ((perm & 0o70) >> 3) as u8
-    } else {
-        (perm & 0o7) as u8
-    }
-}
-fn check_permissions(flags: usize, single_mode: u8) -> Result<()> {
-    if flags & O_ACCMODE == O_RDONLY && single_mode & 0o4 == 0 {
-        return Err(Error::new(EACCES));
-    } else if flags & O_ACCMODE == O_WRONLY && single_mode & 0o2 == 0 {
-        return Err(Error::new(EACCES));
-    } else if flags & O_ACCMODE == O_RDWR && single_mode & 0o6 != 0o6 {
-        return Err(Error::new(EACCES));
-    }
-    Ok(())
-}
-
-fn get_uid_gid_from_pid(cap_fd: &libredox::Fd, target_pid: usize) -> Result<(u32, u32, u32)> {
-    let mut buffer = [0u8; mem::size_of::<libredox::protocol::ProcMeta>()];
-    let _ = libredox::call::get_proc_credentials(cap_fd.raw(), target_pid, &mut buffer).map_err(
-        |e| {
-            eprintln!(
-                "Failed to get process credentials for pid {}: {:?}",
-                target_pid, e
-            );
-            Error::new(EINVAL)
-        },
-    )?;
-    let mut cursor = 0;
-    let pid = read_u32(&buffer, cursor)?;
-    cursor += mem::size_of::<u32>() * 3;
-    let uid = read_u32(&buffer, cursor)?;
-    cursor += mem::size_of::<u32>() * 3;
-    let gid = read_u32(&buffer, cursor)?;
-    Ok((pid, uid, gid))
-}
-
-fn read_u32(buffer: &[u8], offset: usize) -> Result<u32> {
-    let bytes = buffer
-        .get(offset..offset + 4)
-        .and_then(|slice| slice.try_into().ok())
-        .ok_or_else(|| Error::new(EINVAL))?;
-
-    Ok(u32::from_le_bytes(bytes))
-}
diff --git a/recipes/core/base/randd/Cargo.toml b/recipes/core/base/randd/Cargo.toml
deleted file mode 100644
index 6ff2d7e6e1..0000000000
--- a/recipes/core/base/randd/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "randd"
-description = "Random number generation daemon"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-rand_chacha = "0.2"
-rand_core = "0.5"
-daemon = { path = "../daemon" }
-redox_syscall.workspace = true
-libredox.workspace = true
-sha2 = "0.8"
-redox-scheme.workspace = true
-scheme-utils = { path = "../scheme-utils" }
-
-[target.'cfg(target_arch = "x86_64")'.dependencies]
-raw-cpuid = "11.0.1"
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/randd/src/main.rs b/recipes/core/base/randd/src/main.rs
deleted file mode 100644
index d68dd732d1..0000000000
--- a/recipes/core/base/randd/src/main.rs
+++ /dev/null
@@ -1,469 +0,0 @@
-use std::arch::asm;
-
-use rand_chacha::ChaCha20Rng;
-use rand_core::RngCore;
-
-pub const MODE_PERM: u16 = 0x0FFF;
-pub const MODE_EXEC: u16 = 0o1;
-pub const MODE_WRITE: u16 = 0o2;
-pub const MODE_READ: u16 = 0o4;
-
-#[cfg(target_arch = "x86_64")]
-use raw_cpuid::CpuId;
-
-use redox_scheme::{scheme::SchemeSync, CallerCtx, OpenResult, Socket};
-use scheme_utils::{Blocking, FpathWriter, HandleMap};
-use syscall::data::Stat;
-use syscall::flag::{EventFlags, O_CREAT, O_EXCL, O_RDONLY, O_RDWR, O_WRONLY};
-use syscall::schemev2::NewFdFlags;
-use syscall::{Error, Result, EACCES, EBADF, EEXIST, ENOENT, EPERM, MODE_CHR};
-
-// Create an RNG Seed to create initial seed from the rdrand intel instruction
-use rand_core::SeedableRng;
-use sha2::{Digest, Sha256};
-
-// This Daemon implements a Cryptographically Secure Random Number Generator
-// that does not block on read - i.e. it is equivalent to linux /dev/urandom
-// We do not implement blocking reads as per linux /dev/random for the reasons outlined
-// here: https://www.2uo.de/myths-about-urandom/
-
-// Default file access mode for PRNG
-const DEFAULT_PRNG_MODE: u16 = 0o644;
-// Rand crate recommends at least 256 bits of entropy to seed the RNG
-const SEED_BYTES: usize = 32;
-
-/// Create a true random seed for the RNG if hardware support is present.
-/// On Intel x64 from rdrand instruction.
-/// On AArch64 from RNDRRS system register.
-/// Will seed with a zero (insecure) if getting support is not present.
-fn create_rdrand_seed() -> [u8; SEED_BYTES] {
-    let mut rng = [0; SEED_BYTES];
-    let mut have_seeded = false;
-    #[cfg(target_arch = "x86_64")]
-    {
-        if CpuId::new().get_feature_info().unwrap().has_rdrand() {
-            for i in 0..SEED_BYTES / 8 {
-                // We get 8 bytes at a time from rdrand instruction
-                let rand: u64;
-                unsafe {
-                    asm!("rdrand rax", out("rax") rand);
-                }
-
-                rng[i * 8..(i * 8 + 8)].copy_from_slice(&rand.to_le_bytes());
-            }
-            have_seeded = true;
-        }
-    }
-    #[cfg(target_arch = "aarch64")]
-    {
-        fn is_cpu_feature_detected(feature: &str) -> bool {
-            if let Ok(cpu) = std::fs::read_to_string("/scheme/sys/cpu") {
-                return cpu
-                    .lines()
-                    .find_map(|s| s.strip_prefix("Features:"))
-                    .map(|s| s.split(" ").find(|s| s == &feature))
-                    .is_some();
-            }
-            false
-        }
-        if is_cpu_feature_detected("rand") {
-            let mut failure = false;
-            for i in 0..SEED_BYTES / 8 {
-                // We get 8 bytes at a time from RNDRRS register
-                let rand: u64;
-                unsafe {
-                    asm!("mrs {}, s3_3_c2_c4_1", out(reg) rand); // rndrrs
-                }
-                failure |= rand == 0;
-                rng[i * 8..(i * 8 + 8)].copy_from_slice(&rand.to_le_bytes());
-            }
-            have_seeded = !failure;
-        }
-    } // TODO integrate alternative entropy sources
-    if !have_seeded {
-        println!("randd: Seeding failed, no entropy source.  Random numbers on this platform are NOT SECURE");
-    }
-    rng
-}
-
-/// Contains information about an open file
-struct OpenFileInfo {
-    o_flags: usize,
-    /// Flags used when opening file.
-    uid: u32,
-    gid: u32,
-    file_stat: Stat,
-}
-
-impl OpenFileInfo {
-    /// Tests if the current user has enough permissions to view the file, op is the operation,
-    /// like read and write, these modes are MODE_EXEC, MODE_READ, and MODE_WRITE
-    /// Copied from redoxfs
-    fn permission(&self, op: u16) -> bool {
-        let mut perm = self.file_stat.st_mode & 0o7;
-        if self.uid == self.file_stat.st_uid {
-            // If self.mode is 101100110, >> 6 would be 000000101
-            // 0o7 is octal for 111, or, when expanded to 9 digits is 000000111
-            perm |= (self.file_stat.st_mode >> 6) & 0o7;
-            // Since we erased the GID and OTHER bits when >>6'ing, |= will keep those bits in place.
-        }
-        if self.gid == self.file_stat.st_gid || self.file_stat.st_gid == 0 {
-            perm |= (self.file_stat.st_mode >> 3) & 0o7;
-        }
-        if self.uid == 0 {
-            //set the `other` bits to 111
-            perm |= 0o7;
-        }
-        perm & op == op
-    }
-    fn o_flag_set(&self, f: usize) -> bool {
-        return (f & self.o_flags) == f;
-    }
-}
-
-enum Handle {
-    File(OpenFileInfo),
-    SchemeRoot,
-}
-
-impl Handle {
-    fn as_file(&self) -> Option<&OpenFileInfo> {
-        match self {
-            Self::File(info) => Some(info),
-            _ => None,
-        }
-    }
-}
-
-/// Struct to represent the rand scheme.
-struct RandScheme {
-    prng: ChaCha20Rng,
-    // ChaCha20 is a Cryptographically Secure PRNG
-    // https://docs.rs/rand/0.5.0/rand/prng/chacha/struct.ChaChaRng.html
-    // Allows 2^64 streams of random numbers, which we will equate with file numbers
-    prng_stat: Stat,
-    handles: HandleMap<Handle>,
-}
-
-impl RandScheme {
-    /// Create new rand scheme from a message socket
-    fn new() -> RandScheme {
-        RandScheme {
-            prng: ChaCha20Rng::from_seed(create_rdrand_seed()),
-            prng_stat: Stat {
-                st_mode: MODE_CHR | DEFAULT_PRNG_MODE,
-                st_gid: 0,
-                st_uid: 0,
-                ..Default::default()
-            },
-            handles: HandleMap::new(),
-        }
-    }
-
-    /// Gets the open file info for a file descriptor if it is open - error otherwise.
-    fn get_fd(&self, fd: usize) -> Result<&OpenFileInfo> {
-        // Check we've got a valid file descriptor
-        let handle = self.handles.get(fd)?;
-        handle.as_file().ok_or(Error::new(EBADF))
-    }
-    /// Checks to see if the op (MODE_READ, MODE_WRITE) can be performed on the open file
-    /// descriptor - Will return the open file info if successful, and error if the file
-    /// descriptor is invalid, or the permission is denied.
-    fn can_perform_op_on_fd(&self, fd: usize, op: u16) -> Result<&OpenFileInfo> {
-        let file_info = self.get_fd(fd)?;
-        if !file_info.permission(op) {
-            return Err(Error::new(EPERM));
-        }
-        Ok(file_info)
-    }
-    /// Reseed the CSPRNG with the supplied entropy.
-    /// TODO add this to an entropy pool and give a limited estimate to the amount of entropy
-    /// TODO consider having trusted and untrusted entropy URIs, with different permissions.
-    fn reseed_prng(&mut self, entropy: &[u8]) {
-        // Need to fill a fixed size array for the from_seed, so we'll do 256 bit
-        // array and has the entropy into it.
-        let mut digest = Sha256::new();
-        digest.input(entropy);
-        let hash = digest.result();
-        let mut entropy_array: [u8; SEED_BYTES] = [0; SEED_BYTES];
-        entropy_array.copy_from_slice(hash.as_slice());
-        self.prng = ChaCha20Rng::from_seed(entropy_array);
-    }
-
-    fn open_inner(&mut self, path: &str, flags: usize, ctx: &CallerCtx) -> Result<OpenResult> {
-        // We are only allowing
-        // reads/writes from /scheme/rand/ and /scheme/rand/urandom - the root directory on its own is passed as an empty slice
-        if path != "" && path != "/urandom" {
-            return Err(Error::new(ENOENT));
-        }
-
-        if flags & (O_CREAT | O_EXCL) == O_CREAT | O_EXCL {
-            return Err(Error::new(EEXIST));
-        }
-
-        let open_file_info = OpenFileInfo {
-            o_flags: flags,
-            file_stat: self.prng_stat,
-            uid: ctx.uid,
-            gid: ctx.gid,
-        };
-
-        if (open_file_info.o_flag_set(O_RDONLY) || open_file_info.o_flag_set(O_RDWR))
-            && !open_file_info.permission(MODE_READ)
-        {
-            return Err(Error::new(EPERM));
-        }
-        if (open_file_info.o_flag_set(O_WRONLY) || open_file_info.o_flag_set(O_RDWR))
-            && !open_file_info.permission(MODE_WRITE)
-        {
-            return Err(Error::new(EPERM));
-        }
-
-        let id = self.handles.insert(Handle::File(open_file_info));
-
-        Ok(OpenResult::ThisScheme {
-            number: id,
-            flags: NewFdFlags::empty(),
-        })
-    }
-}
-#[test]
-fn test_scheme_perms() {
-    use syscall::{O_CLOEXEC, O_STAT};
-
-    let mut ctx = CallerCtx {
-        pid: 0,
-        uid: 1,
-        gid: 1,
-        id: unsafe { std::mem::zeroed() }, // Id doesn't have a public constructor
-    };
-
-    let mut scheme = RandScheme::new();
-    scheme.prng_stat.st_mode = MODE_CHR | 0o200;
-    scheme.prng_stat.st_uid = 1;
-    scheme.prng_stat.st_gid = 1;
-    assert!(scheme.open_inner("/", O_RDWR, &ctx).is_err());
-    assert!(scheme.open_inner("/", O_RDONLY, &ctx).is_err());
-
-    scheme.prng_stat.st_mode = MODE_CHR | 0o400;
-    let mut fd = match scheme.open("", O_RDONLY, &ctx).unwrap() {
-        OpenResult::ThisScheme { number, .. } => number,
-        _ => panic!(),
-    };
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_READ).is_ok());
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_WRITE).is_err());
-    scheme.on_close(fd);
-
-    assert!(scheme.open_inner("", O_WRONLY, &ctx).is_err());
-    assert!(scheme.open_inner("", O_RDWR, &ctx).is_err());
-
-    scheme.prng_stat.st_mode = MODE_CHR | 0o600;
-    fd = match scheme.open_inner("", O_RDWR, &ctx).unwrap() {
-        OpenResult::ThisScheme { number, .. } => number,
-        _ => panic!(),
-    };
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_READ).is_ok());
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_WRITE).is_ok());
-    scheme.on_close(fd);
-
-    ctx.uid = 2;
-    ctx.gid = 2;
-    fd = match scheme.open_inner("", O_STAT, &ctx).unwrap() {
-        OpenResult::ThisScheme { number, .. } => number,
-        _ => panic!(),
-    };
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_READ).is_err());
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_WRITE).is_err());
-    scheme.on_close(fd);
-    fd = match scheme.open_inner("", O_STAT | O_CLOEXEC, &ctx).unwrap() {
-        OpenResult::ThisScheme { number, .. } => number,
-        _ => panic!(),
-    };
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_READ).is_err());
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_WRITE).is_err());
-    scheme.on_close(fd);
-
-    // Try another user in group (no group perms)
-    ctx.uid = 2;
-    ctx.gid = 1;
-    fd = match scheme.open_inner("", O_STAT | O_CLOEXEC, &ctx).unwrap() {
-        OpenResult::ThisScheme { number, .. } => number,
-        _ => panic!(),
-    };
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_READ).is_err());
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_WRITE).is_err());
-    scheme.on_close(fd);
-    scheme.prng_stat.st_mode = MODE_CHR | 0o660;
-    fd = match scheme.open_inner("", O_STAT | O_CLOEXEC, &ctx).unwrap() {
-        OpenResult::ThisScheme { number, .. } => number,
-        _ => panic!(),
-    };
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_READ).is_ok());
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_WRITE).is_ok());
-    scheme.on_close(fd);
-
-    // Check root can do anything
-    scheme.prng_stat.st_mode = MODE_CHR | 0o000;
-    ctx.uid = 0;
-    ctx.gid = 0;
-    fd = match scheme.open_inner("", O_STAT | O_CLOEXEC, &ctx).unwrap() {
-        OpenResult::ThisScheme { number, .. } => number,
-        _ => panic!(),
-    };
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_READ).is_ok());
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_WRITE).is_ok());
-    scheme.on_close(fd);
-
-    // Check the rand:/urandom URL (Equivalent to rand:/)
-    scheme.prng_stat.st_mode = MODE_CHR | 0o660;
-    ctx.uid = 2;
-    ctx.gid = 1;
-    fd = match scheme
-        .open_inner("/urandom", O_STAT | O_CLOEXEC, &ctx)
-        .unwrap()
-    {
-        OpenResult::ThisScheme { number, .. } => number,
-        _ => panic!(),
-    };
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_READ).is_ok());
-    assert!(scheme.can_perform_op_on_fd(fd, MODE_WRITE).is_ok());
-    scheme.on_close(fd);
-}
-
-impl SchemeSync for RandScheme {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(self.handles.insert(Handle::SchemeRoot))
-    }
-
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        path: &str,
-        flags: usize,
-        _fcntl_flags: u32,
-        ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if !matches!(self.handles.get(dirfd)?, Handle::SchemeRoot) {
-            return Err(Error::new(EACCES));
-        }
-
-        self.open_inner(path, flags, ctx)
-    }
-
-    /* Resource operations */
-    fn read(
-        &mut self,
-        id: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        // Check fd and permissions
-        self.can_perform_op_on_fd(id, MODE_READ)?;
-
-        // Setting the stream will ensure that if two clients are reading concurrently, they won't get the same numbers
-        self.prng.set_stream(id as u64); // Should probably find a way to re-instate the counter for this stream, but
-                                         // not doing so won't make the output any less 'random'
-        self.prng.fill_bytes(buf);
-
-        Ok(buf.len())
-    }
-
-    fn write(
-        &mut self,
-        id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        // Check fd and permissions
-        self.can_perform_op_on_fd(id, MODE_WRITE)?;
-
-        // TODO - when we support other entropy sources, just add this to an entropy pool
-        // TODO - consider having trusted and untrusted entropy writing paths
-        // We have a healthy mistrust of the entropy we're being given, so we won't seed just with
-        // that as the resulting numbers would be predictable based on this input
-        // we'll take 512 bits (arbitrary) from the current PRNG, and seed with that
-        // and the supplied data.
-
-        let mut rng_buf: [u8; SEED_BYTES] = [0; SEED_BYTES];
-        self.prng.fill_bytes(&mut rng_buf);
-        let mut rng_vec = Vec::new();
-        rng_vec.extend(&rng_buf);
-        rng_vec.extend(buf);
-        self.reseed_prng(&rng_vec);
-        Ok(buf.len())
-    }
-
-    fn fchmod(&mut self, id: usize, mode: u16, ctx: &CallerCtx) -> Result<()> {
-        // Check fd and permissions
-        let file_info = self.get_fd(id)?;
-        // only root and owner can chmod
-        if ctx.uid != file_info.file_stat.st_uid && ctx.uid != 0 {
-            return Err(Error::new(EPERM));
-        }
-
-        self.prng_stat.st_mode = MODE_CHR | (mode & MODE_PERM); // Apply mask
-        Ok(())
-    }
-
-    fn fchown(&mut self, id: usize, uid: u32, gid: u32, ctx: &CallerCtx) -> Result<()> {
-        // Check fd and permissions
-        let file_info = self.get_fd(id)?;
-        // only root and owner can fchown
-        if ctx.uid != file_info.file_stat.st_uid && ctx.uid != 0 {
-            return Err(Error::new(EPERM));
-        }
-
-        self.prng_stat.st_uid = uid;
-        self.prng_stat.st_gid = gid;
-        Ok(())
-    }
-
-    fn fcntl(&mut self, _id: usize, _cmd: usize, _arg: usize, _ctx: &CallerCtx) -> Result<usize> {
-        // Just ignore this.
-        Ok(0)
-    }
-
-    fn fevent(&mut self, _id: usize, _flags: EventFlags, _ctx: &CallerCtx) -> Result<EventFlags> {
-        Ok(EventFlags::EVENT_READ)
-    }
-    fn fpath(&mut self, _file: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, "rand", |_| Ok(()))
-    }
-
-    fn fstat(&mut self, file: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
-        // Check fd and permissions
-        self.can_perform_op_on_fd(file, MODE_READ)?;
-
-        *stat = self.prng_stat.clone();
-
-        Ok(())
-    }
-
-    fn on_close(&mut self, file: usize) {
-        // just remove the file descriptor from the open descriptors
-        self.handles.remove(file);
-    }
-}
-
-fn daemon(daemon: daemon::SchemeDaemon) -> ! {
-    let socket = Socket::create().expect("randd: failed to create rand scheme");
-
-    let mut scheme = RandScheme::new();
-    let handler = Blocking::new(&socket, 16);
-
-    let _ = daemon.ready_sync_scheme(&socket, &mut scheme);
-
-    libredox::call::setrens(0, 0).expect("randd: failed to enter null namespace");
-
-    handler
-        .process_requests_blocking(scheme)
-        .expect("randd: failed to process events from zero scheme");
-}
-
-fn main() {
-    daemon::SchemeDaemon::new(daemon);
-}
diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml
index baf8d1065b..f0c1bda7a2 100644
--- a/recipes/core/base/recipe.toml
+++ b/recipes/core/base/recipe.toml
@@ -1,122 +1,11 @@
 [source]
 git = "https://gitlab.redox-os.org/redox-os/base.git"
-rev = "463f76b9608a896e6f6c9f63457f57f6409873c7"
+rev = "6dfade6602320b0620677d2b0b378588983d9ec6"
 patches = [
     "P0-daemon-fix-init-notify-unwrap.patch",
     "P0-workspace-add-bootstrap.patch",
-    "P0-init-continuous-scheduling.patch",
-    "P0-dhcpd-auto-iface.patch",
-    "P0-procmgr-sigchld-debug.patch",
-    "P0-pcid-mcfg-diagnostics.patch",
-    "P0-ihdgd-intel-gpu-ids.patch",
-    # P1: acpid EC runtime and AML physmem hardening (narrow ACPI runtime patches)
-    "P1-acpid-ec-runtime.patch",
-    "P1-acpid-runtime-hardening.patch",
-    # Stale patches needing recreation: P1-pcid-uevent-surface, P2-boot-runtime-fixes,
-    # P2-hwd-misc, P2-pcid-cfg-access, P3-xhci-device-hardening, P6-cpufreqd-real-impl
+    "P0-bootstrap-workspace-fix.patch",
     "P2-i2c-gpio-ucsi-drivers.patch",
-    "P0-i2c-control-response-empty.patch",
-    "P2-ihdad-graceful-init.patch",
-    "P2-boot-logging.patch",
-    "P2-init-acpid-wiring.patch",
-    "P2-hwd-remove-acpid-spawn.patch",
-    "P2-initfs-pcid-service.patch",
-    "P2-misc-daemon-fixes.patch",
-    "P9-fix-so-pecred.patch",
-    "P3-inputd-keymap-bridge.patch",
-    "P3-ps2d-led-feedback.patch",
-    "P3-ps2d-mouse-resend.patch",
-    "P0-ps2d-mouse-fastfail.patch",
-    "P3-usbhidd-hardening.patch",
-    "P3-init-colored-output.patch",
-    "P4-logd-persistent-logging.patch",
-    "P4-acpi-shutdown-hardening.patch",
-    "P4-acpi-s3-sleep.patch",
-    "P4-pcid-public-client-channel.patch",
-    "P4-pcid-config-scheme.patch",
-    "P4-pcid-spawner-pci-coordinate-env.patch",
-    "P4-initfs-usb-drm-services.patch",
-    "P4-initfs-release-virtio-gpu.patch",
-    "P4-initfs-network-services.patch",
-    "P4-initfs-getty-services.patch",
-    "P4-initfs-dbus-services.patch",
-    "P4-fbcond-scrollback.patch",
-    "P4-thermal-daemon.patch",
-    "P4-thermald-workspace.patch",
-    "P6-driver-main-fixes.patch",
-    "P6-driver-new-modules.patch",
-    "P9-init-scheduler-completed.patch",
-    "P2-pcid-acpid-graceful-fd.patch",
-]
-
-[package]
-installs = [
-    "/lib/pcid.d/ac97d.toml",
-    "/lib/pcid.d/e1000d.toml",
-    "/lib/pcid.d/ihdad.toml",
-    "/lib/pcid.d/ihdgd.toml",
-    "/lib/pcid.d/ixgbed.toml",
-    "/lib/pcid.d/rtl8139d.toml",
-    "/lib/pcid.d/rtl8168d.toml",
-    "/lib/pcid.d/vboxd.toml",
-    "/lib/pcid.d/virtio-netd.toml",
-    "/lib/pcid.d/xhcid.toml",
-    "/usr/bin/audiod",
-    "/usr/bin/dhcpd",
-    "/usr/bin/dw-acpi-i2cd",
-    "/usr/bin/gpiod",
-    "/usr/bin/i2cd",
-    "/usr/bin/i2c-gpio-expanderd",
-    "/usr/bin/i2c-hidd",
-    "/usr/bin/inputd",
-    "/usr/bin/intel-gpiod",
-    "/usr/bin/ipcd",
-    "/usr/bin/netstack",
-    "/usr/bin/pcid",
-    "/usr/bin/pcid-spawner",
-    "/usr/bin/ptyd",
-    "/usr/bin/redoxerd",
-    "/usr/bin/smolnetd",
-    "/usr/bin/ucsid",
-    "/usr/lib/drivers/ac97d",
-    "/usr/lib/drivers/amd-mp2-i2cd",
-    "/usr/lib/drivers/e1000d",
-    "/usr/lib/drivers/ihdad",
-    "/usr/lib/drivers/ihdgd",
-    "/usr/lib/drivers/intel-lpss-i2cd",
-    "/usr/lib/drivers/intel-thc-hidd",
-    "/usr/lib/drivers/ixgbed",
-    "/usr/lib/drivers/rtl8139d",
-    "/usr/lib/drivers/rtl8168d",
-    "/usr/lib/drivers/sb16d",
-    "/usr/lib/drivers/thermald",
-    "/usr/lib/drivers/usbctl",
-    "/usr/lib/drivers/usbhidd",
-    "/usr/lib/drivers/usbhubd",
-    "/usr/lib/drivers/usbscsid",
-    "/usr/lib/drivers/vboxd",
-    "/usr/lib/drivers/virtio-gpud",
-    "/usr/lib/drivers/virtio-netd",
-    "/usr/lib/drivers/xhcid",
-    "/usr/lib/init.d/00_base.target",
-    "/usr/lib/init.d/00_ipcd.service",
-    "/usr/lib/init.d/00_pcid-spawner.service",
-    "/usr/lib/init.d/00_ptyd.service",
-    "/usr/lib/init.d/00_sudo.service",
-    "/usr/lib/init.d/00_tmp",
-    "/usr/lib/init.d/05_boot_essential.target",
-    "/usr/lib/init.d/10_dhcpd.service",
-    "/usr/lib/init.d/10_net.target",
-    "/usr/lib/init.d/10_smolnetd.service",
-    "/usr/lib/init.d/12_boot_late.target",
-    "/usr/lib/init.d/12_dbus.service",
-    "/usr/lib/init.d/13_seatd.service",
-    "/usr/lib/init.d/13_sessiond.service",
-    "/usr/lib/init.d/20_audiod.service",
-    "/usr/lib/init.d/29_activate_console.service",
-    "/usr/lib/init.d/30_console.service",
-    "/usr/lib/init.d/30_thermald.service",
-    "/usr/lib/init.d/31_debug_console.service",
 ]
 
 [build]
@@ -124,7 +13,7 @@ template = "custom"
 script = """
 mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
 for package in audiod ipcd ptyd dhcpd; do
-    "${COOKBOOK_CARGO}" build \
+    "${COOKBOOK_CARGO}" build --offline \
         --manifest-path "${COOKBOOK_SOURCE}/${package}/Cargo.toml" \
         --target "${TARGET}" \
         ${build_flags}
@@ -133,7 +22,7 @@ for package in audiod ipcd ptyd dhcpd; do
         "${COOKBOOK_STAGE}/usr/bin/${package}"
 done
 
-"${COOKBOOK_CARGO}" build \
+"${COOKBOOK_CARGO}" build --offline \
     --manifest-path "${COOKBOOK_SOURCE}/netstack/Cargo.toml" \
     --target "${TARGET}" \
     ${build_flags}
@@ -164,7 +53,6 @@ BINS=(
     rtl8168d
     usbctl
     usbhidd
-    thermald
     usbhubd
     ucsid
     usbscsid
@@ -198,7 +86,7 @@ do
         EXISTING_BINS+=("${bin}")
     fi
 done
-"${COOKBOOK_CARGO}" build ${build_flags} \
+"${COOKBOOK_CARGO}" build --offline ${build_flags} \
     --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
     --target "${TARGET}" \
     $(for bin in "${EXISTING_BINS[@]}"; do echo "-p" "${bin}"; done)
diff --git a/recipes/core/base/scheme-utils/Cargo.toml b/recipes/core/base/scheme-utils/Cargo.toml
deleted file mode 100644
index 00561c9332..0000000000
--- a/recipes/core/base/scheme-utils/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "scheme-utils"
-version = "0.0.0"
-edition = "2024"
-
-[dependencies]
-libredox.workspace = true
-redox-scheme.workspace = true
-redox_syscall.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/scheme-utils/src/blocking.rs b/recipes/core/base/scheme-utils/src/blocking.rs
deleted file mode 100644
index 6c5c3dc833..0000000000
--- a/recipes/core/base/scheme-utils/src/blocking.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use std::collections::VecDeque;
-use std::ops::ControlFlow;
-
-use libredox::error::Error as LError;
-
-use syscall::Result;
-use syscall::error::{self as errno, Error};
-
-use redox_scheme::scheme::{SchemeState, SchemeSync};
-use redox_scheme::{Request, RequestKind, Response, SignalBehavior, Socket};
-
-pub struct Blocking<'sock> {
-    // TODO: VecDeque for both when it implements spare_capacity
-    requests_read: Vec<Request>,
-    responses_to_write: VecDeque<Response>,
-
-    socket: &'sock Socket,
-    state: SchemeState,
-}
-
-impl<'sock> Blocking<'sock> {
-    pub fn new(socket: &'sock Socket, queue_size: usize) -> Self {
-        Self {
-            requests_read: Vec::with_capacity(queue_size),
-            responses_to_write: VecDeque::with_capacity(queue_size),
-            socket,
-            state: SchemeState::new(),
-        }
-    }
-
-    pub fn process_requests_nonblocking(
-        &mut self,
-        scheme: &mut impl SchemeSync,
-    ) -> Result<ControlFlow<()>> {
-        assert!(self.requests_read.is_empty());
-        assert!(self.responses_to_write.is_empty());
-
-        match self
-            .socket
-            .read_requests(&mut self.requests_read, SignalBehavior::Interrupt)
-        {
-            Ok(()) if self.requests_read.is_empty() => {
-                unreachable!("blocking scheme read failed to read anything");
-            }
-            Ok(()) => {}
-            Err(Error {
-                errno: errno::EINTR | errno::EWOULDBLOCK | errno::EAGAIN,
-            }) => return Ok(ControlFlow::Break(())),
-            Err(err) => return Err(err),
-        }
-
-        for request in self.requests_read.drain(..) {
-            match request.kind() {
-                RequestKind::Call(req) => {
-                    let response = req.handle_sync(scheme, &mut self.state);
-                    self.responses_to_write.push_back(response);
-                }
-                RequestKind::Cancellation(_req) => {}
-                RequestKind::OnClose { id } => {
-                    // TODO: state.on_close()
-                    scheme.on_close(id);
-                }
-                RequestKind::SendFd(sendfd_request) => {
-                    let result = scheme.on_sendfd(&sendfd_request);
-                    let response = Response::new(result, sendfd_request);
-                    self.responses_to_write.push_back(response);
-                }
-                RequestKind::RecvFd(recvfd_request) => {
-                    let result = scheme.on_recvfd(&recvfd_request);
-                    let response = Response::open_dup_like(result, recvfd_request);
-                    self.responses_to_write.push_back(response);
-                }
-                _ => {}
-            }
-        }
-
-        match self
-            .socket
-            .write_responses(&mut self.responses_to_write, SignalBehavior::Restart)
-        {
-            Ok(()) if !self.responses_to_write.is_empty() => {
-                panic!("failed to write all scheme responses");
-            }
-            Ok(()) => Ok(ControlFlow::Continue(())),
-            Err(Error {
-                errno: errno::EINTR | errno::EWOULDBLOCK | errno::EAGAIN,
-            }) => {
-                panic!("scheme response writing should always block");
-            }
-            Err(err) => return Err(LError::from(err).into()),
-        }
-    }
-
-    pub fn process_requests_blocking(mut self, mut scheme: impl SchemeSync) -> Result<!> {
-        loop {
-            match self.process_requests_nonblocking(&mut scheme)? {
-                ControlFlow::Continue(()) => {}
-                ControlFlow::Break(()) => {
-                    panic!("process_requests_blocking should not be used on non-blocking schemes");
-                }
-            }
-        }
-    }
-}
diff --git a/recipes/core/base/scheme-utils/src/lib.rs b/recipes/core/base/scheme-utils/src/lib.rs
deleted file mode 100644
index b262939c6b..0000000000
--- a/recipes/core/base/scheme-utils/src/lib.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-#![feature(never_type)]
-
-use std::collections::{BTreeMap, btree_map};
-use std::fmt;
-use std::num::Wrapping;
-
-use syscall::{EBADF, Error, Result};
-
-mod blocking;
-mod readiness_based;
-
-pub use blocking::Blocking;
-pub use readiness_based::ReadinessBased;
-
-pub struct HandleMap<T> {
-    handles: BTreeMap<usize, T>,
-    next_id: Wrapping<usize>,
-}
-
-impl<T> HandleMap<T> {
-    pub const fn new() -> Self {
-        HandleMap {
-            handles: BTreeMap::new(),
-            next_id: Wrapping(1),
-        }
-    }
-
-    pub fn insert(&mut self, handle: T) -> usize {
-        let id = self.next_id;
-
-        // If we've looped round there's a small chance that the file descriptor still exists, so loop till we get one that doesn't
-        self.next_id += Wrapping(1);
-        loop {
-            if !self.handles.contains_key(&self.next_id.0) {
-                break;
-            } else {
-                self.next_id += Wrapping(1);
-            }
-        }
-
-        self.handles.insert(id.0, handle);
-        id.0
-    }
-
-    pub fn remove(&mut self, id: usize) -> Option<T> {
-        self.handles.remove(&id)
-    }
-
-    pub fn get(&self, id: usize) -> Result<&T> {
-        self.handles.get(&id).ok_or(Error::new(EBADF))
-    }
-
-    pub fn get_mut(&mut self, id: usize) -> Result<&mut T> {
-        self.handles.get_mut(&id).ok_or(Error::new(EBADF))
-    }
-
-    pub fn iter(&self) -> btree_map::Iter<'_, usize, T> {
-        self.handles.iter()
-    }
-
-    pub fn iter_mut(&mut self) -> btree_map::IterMut<'_, usize, T> {
-        self.handles.iter_mut()
-    }
-
-    pub fn keys(&self) -> btree_map::Keys<'_, usize, T> {
-        self.handles.keys()
-    }
-
-    pub fn values(&self) -> btree_map::Values<'_, usize, T> {
-        self.handles.values()
-    }
-
-    pub fn values_mut(&mut self) -> btree_map::ValuesMut<'_, usize, T> {
-        self.handles.values_mut()
-    }
-}
-
-pub struct FpathWriter<'a> {
-    buf: &'a mut [u8],
-    written: usize,
-}
-
-impl<'a> FpathWriter<'a> {
-    pub fn with(
-        buf: &'a mut [u8],
-        scheme_name: &str,
-        f: impl FnOnce(&mut Self) -> Result<()>,
-    ) -> Result<usize> {
-        let mut w = FpathWriter { buf, written: 0 };
-        write!(w, "/scheme/{scheme_name}/").unwrap();
-        f(&mut w)?;
-        Ok(w.written)
-    }
-
-    pub fn with_legacy(
-        buf: &'a mut [u8],
-        scheme_name: &str,
-        f: impl FnOnce(&mut Self) -> Result<()>,
-    ) -> Result<usize> {
-        let mut w = FpathWriter { buf, written: 0 };
-        write!(w, "{scheme_name}:").unwrap();
-        f(&mut w)?;
-        Ok(w.written)
-    }
-
-    pub fn push_str(&mut self, s: &str) {
-        let count = core::cmp::min(s.len(), self.buf.len() - self.written);
-        self.buf[self.written..self.written + count].copy_from_slice(&s.as_bytes()[..count]);
-        self.written += count;
-    }
-
-    pub fn write_fmt(&mut self, args: fmt::Arguments<'_>) -> fmt::Result {
-        std::fmt::write(self, args)
-    }
-}
-
-impl fmt::Write for FpathWriter<'_> {
-    fn write_str(&mut self, s: &str) -> fmt::Result {
-        self.push_str(s);
-        Ok(())
-    }
-}
diff --git a/recipes/core/base/scheme-utils/src/readiness_based.rs b/recipes/core/base/scheme-utils/src/readiness_based.rs
deleted file mode 100644
index 0eb929d333..0000000000
--- a/recipes/core/base/scheme-utils/src/readiness_based.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-use std::collections::{HashMap, VecDeque};
-use std::ops::ControlFlow;
-
-use libredox::error::Error as LError;
-
-use syscall::Result;
-use syscall::error::{self as errno, ECANCELED, EIO, EOPNOTSUPP, Error};
-
-use redox_scheme::scheme::{Op, SchemeResponse, SchemeState, SchemeSync};
-use redox_scheme::{CallerCtx, Id, Request, RequestKind, Response, SignalBehavior, Socket};
-
-pub struct ReadinessBased<'sock> {
-    // TODO: VecDeque for both when it implements spare_capacity
-    requests_read: Vec<Request>,
-    responses_to_write: VecDeque<Response>,
-
-    states: HashMap<Id, (CallerCtx, Op)>,
-    ready_queue: VecDeque<Id>,
-
-    socket: &'sock Socket,
-    state: SchemeState,
-}
-impl<'sock> ReadinessBased<'sock> {
-    pub fn new(socket: &'sock Socket, queue_size: usize) -> Self {
-        Self {
-            requests_read: Vec::with_capacity(queue_size),
-            responses_to_write: VecDeque::with_capacity(queue_size),
-            states: HashMap::new(),
-            socket,
-            ready_queue: VecDeque::new(),
-            state: SchemeState::new(),
-        }
-    }
-    pub fn read_and_process_requests(&mut self, scheme: &mut impl SchemeSync) -> Result<()> {
-        assert!(self.requests_read.is_empty());
-
-        match self
-            .socket
-            .read_requests(&mut self.requests_read, SignalBehavior::Interrupt)
-        {
-            Ok(()) if self.requests_read.is_empty() => {
-                unreachable!("blocking scheme read failed to read anything");
-            }
-            Ok(())
-            | Err(Error {
-                errno: errno::EINTR | errno::EWOULDBLOCK | errno::EAGAIN,
-            }) => {}
-            Err(err) => return Err(err),
-        }
-
-        for request in self.requests_read.drain(..) {
-            let req = match request.kind() {
-                RequestKind::Call(c) => c,
-                RequestKind::Cancellation(req) => {
-                    if let Some((_caller, op)) = self.states.remove(&req.id) {
-                        self.responses_to_write
-                            .push_back(Response::err(ECANCELED, op));
-                    }
-                    continue;
-                }
-                RequestKind::OnClose { id } => {
-                    // TODO: state.on_close()
-                    scheme.on_close(id);
-                    continue;
-                }
-                RequestKind::SendFd(sendfd_request) => {
-                    let result = scheme.on_sendfd(&sendfd_request);
-                    let response = Response::new(result, sendfd_request);
-                    self.responses_to_write.push_back(response);
-                    continue;
-                }
-                RequestKind::RecvFd(recvfd_request) => {
-                    let result = scheme.on_recvfd(&recvfd_request);
-                    let caller = recvfd_request.caller();
-
-                    if let Err(Error {
-                        errno: errno::EWOULDBLOCK,
-                    }) = result
-                    {
-                        self.states.insert(caller.id, (caller, recvfd_request.op()));
-                        continue;
-                    }
-                    let response = Response::open_dup_like(result, recvfd_request);
-                    self.responses_to_write.push_back(response);
-                    continue;
-                }
-                _ => continue,
-            };
-            let caller = req.caller();
-            let mut op = match req.op() {
-                Ok(op) => op,
-                Err(req) => {
-                    self.responses_to_write
-                        .push_back(Response::err(EOPNOTSUPP, req));
-                    continue;
-                }
-            };
-            let resp = match op.handle_sync_dont_consume(&caller, scheme, &mut self.state) {
-                SchemeResponse::Opened(Err(Error {
-                    errno: errno::EWOULDBLOCK,
-                }))
-                | SchemeResponse::Regular(Err(Error {
-                    errno: errno::EWOULDBLOCK,
-                })) if !op.is_explicitly_nonblock() => {
-                    self.states.insert(caller.id, (caller, op));
-                    continue;
-                }
-                SchemeResponse::Regular(r) => Response::new(r, op),
-                SchemeResponse::RegularAndNotifyOnDetach(status) => {
-                    Response::new_notify_on_detach(status, op)
-                }
-                SchemeResponse::Opened(o) => Response::open_dup_like(o, op),
-            };
-            self.responses_to_write.push_back(resp);
-        }
-
-        Ok(())
-    }
-    // TODO: Doesn't scale. Instead, provide an API for some form of queue.
-    // TODO: panic if id isn't present?
-    pub fn poll_request(&mut self, id: Id, scheme: &mut impl SchemeSync) -> Result<bool> {
-        Ok(
-            match Self::poll_request_inner(id, scheme, &mut self.state, &mut self.states)? {
-                ControlFlow::Continue((caller, op)) => {
-                    self.states.insert(id, (caller, op));
-                    false
-                }
-                ControlFlow::Break(resp) => {
-                    self.responses_to_write.push_back(resp);
-                    true
-                }
-            },
-        )
-    }
-
-    fn poll_request_inner(
-        id: Id,
-        scheme: &mut impl SchemeSync,
-        state: &mut SchemeState,
-        states: &mut HashMap<Id, (CallerCtx, Op)>,
-    ) -> Result<ControlFlow<Response, (CallerCtx, Op)>> {
-        let (caller, mut op) = states.remove(&id).ok_or(Error::new(EIO))?;
-        let resp = match op.handle_sync_dont_consume(&caller, scheme, state) {
-            SchemeResponse::Opened(Err(Error {
-                errno: errno::EWOULDBLOCK,
-            }))
-            | SchemeResponse::Regular(Err(Error {
-                errno: errno::EWOULDBLOCK,
-            })) if !op.is_explicitly_nonblock() => {
-                return Ok(ControlFlow::Continue((caller, op)));
-            }
-            SchemeResponse::Regular(r) => Response::new(r, op),
-            SchemeResponse::Opened(o) => Response::open_dup_like(o, op),
-            SchemeResponse::RegularAndNotifyOnDetach(status) => {
-                Response::new_notify_on_detach(status, op)
-            }
-        };
-        Ok(ControlFlow::Break(resp))
-    }
-    pub fn poll_ready_requests(&mut self, scheme: &mut impl SchemeSync) -> Result<()> {
-        for id in self.ready_queue.drain(..) {
-            match Self::poll_request_inner(id, scheme, &mut self.state, &mut self.states)? {
-                ControlFlow::Break(resp) => {
-                    self.responses_to_write.push_back(resp);
-                }
-                ControlFlow::Continue((caller, op)) => {
-                    self.states.insert(id, (caller, op));
-                }
-            }
-        }
-        Ok(())
-    }
-    pub fn poll_all_requests(&mut self, scheme: &mut impl SchemeSync) -> Result<()> {
-        // TODO: implement waker-like API
-        self.ready_queue.clear();
-        self.ready_queue.extend(self.states.keys().copied());
-        self.poll_ready_requests(scheme)
-    }
-    pub fn write_responses(&mut self) -> Result<()> {
-        match self
-            .socket
-            .write_responses(&mut self.responses_to_write, SignalBehavior::Restart)
-        {
-            Ok(()) if !self.responses_to_write.is_empty() => {
-                panic!("failed to write all scheme responses");
-            }
-            Ok(()) => Ok(()),
-            Err(Error {
-                errno: errno::EINTR | errno::EWOULDBLOCK | errno::EAGAIN,
-            }) => {
-                panic!("scheme response writing should always block");
-            }
-            Err(err) => return Err(LError::from(err).into()),
-        }
-    }
-}
diff --git a/recipes/core/base/source b/recipes/core/base/source
index 463f76b960..6dfade6602 160000
--- a/recipes/core/base/source
+++ b/recipes/core/base/source
@@ -1 +1 @@
-Subproject commit 463f76b9608a896e6f6c9f63457f57f6409873c7
+Subproject commit 6dfade6602320b0620677d2b0b378588983d9ec6
diff --git a/recipes/core/base/zerod/Cargo.toml b/recipes/core/base/zerod/Cargo.toml
deleted file mode 100644
index 7a5a321151..0000000000
--- a/recipes/core/base/zerod/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "zerod"
-description = "Zeroing buffers daemon"
-version = "0.1.0"
-authors = ["Alex Lyon <arcterus@mail.com>"]
-edition = "2021"
-
-[dependencies]
-redox_syscall.workspace = true
-redox-scheme.workspace = true
-scheme-utils = { path = "../scheme-utils" }
-daemon = { path = "../daemon" }
-libredox.workspace = true
-
-[lints]
-workspace = true
diff --git a/recipes/core/base/zerod/src/main.rs b/recipes/core/base/zerod/src/main.rs
deleted file mode 100644
index c9bd146556..0000000000
--- a/recipes/core/base/zerod/src/main.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use redox_scheme::Socket;
-
-use scheme::ZeroScheme;
-use scheme_utils::Blocking;
-
-mod scheme;
-
-enum Ty {
-    Null,
-    Zero,
-}
-
-fn main() {
-    daemon::SchemeDaemon::new(daemon);
-}
-
-fn daemon(daemon: daemon::SchemeDaemon) -> ! {
-    let ty = match &*std::env::args().nth(1).unwrap() {
-        "null" => Ty::Null,
-        "zero" => Ty::Zero,
-        _ => panic!("needs to be called with either null or zero as argument"),
-    };
-
-    let socket = Socket::create().expect("zerod: failed to create zero scheme");
-    let mut zero_scheme = ZeroScheme(ty);
-    let zero_handler = Blocking::new(&socket, 16);
-
-    let _ = daemon.ready_sync_scheme(&socket, &mut zero_scheme);
-
-    libredox::call::setrens(0, 0).expect("zerod: failed to enter null namespace");
-
-    zero_handler
-        .process_requests_blocking(zero_scheme)
-        .expect("zerod: failed to process events from zero scheme");
-}
diff --git a/recipes/core/base/zerod/src/scheme.rs b/recipes/core/base/zerod/src/scheme.rs
deleted file mode 100644
index 3e988461e1..0000000000
--- a/recipes/core/base/zerod/src/scheme.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use redox_scheme::scheme::SchemeSync;
-use redox_scheme::{CallerCtx, OpenResult};
-use scheme_utils::FpathWriter;
-use syscall::{error::*, schemev2::NewFdFlags, MODE_CHR};
-
-use crate::Ty;
-
-pub struct ZeroScheme(pub Ty);
-
-const SCHEME_ROOT_ID: usize = 1;
-
-impl SchemeSync for ZeroScheme {
-    fn scheme_root(&mut self) -> Result<usize> {
-        Ok(SCHEME_ROOT_ID)
-    }
-    fn openat(
-        &mut self,
-        dirfd: usize,
-        _path: &str,
-        _flags: usize,
-        _fcntl_flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<OpenResult> {
-        if dirfd != SCHEME_ROOT_ID {
-            return Err(Error::new(EACCES));
-        }
-        Ok(OpenResult::ThisScheme {
-            number: 0,
-            flags: NewFdFlags::empty(),
-        })
-    }
-    fn read(
-        &mut self,
-        _id: usize,
-        buf: &mut [u8],
-        _offset: u64,
-        _flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        match self.0 {
-            Ty::Null => Ok(0),
-            Ty::Zero => {
-                buf.fill(0);
-                Ok(buf.len())
-            }
-        }
-    }
-
-    fn write(
-        &mut self,
-        _id: usize,
-        buf: &[u8],
-        _offset: u64,
-        _flags: u32,
-        _ctx: &CallerCtx,
-    ) -> Result<usize> {
-        Ok(buf.len())
-    }
-
-    fn fcntl(&mut self, _id: usize, _cmd: usize, _arg: usize, _ctx: &CallerCtx) -> Result<usize> {
-        Ok(0)
-    }
-    fn fsize(&mut self, _id: usize, _ctx: &CallerCtx) -> Result<u64> {
-        Ok(0)
-    }
-    fn ftruncate(&mut self, _id: usize, _len: u64, _ctx: &CallerCtx) -> Result<()> {
-        Ok(())
-    }
-
-    fn fpath(&mut self, _id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> Result<usize> {
-        FpathWriter::with(buf, "zero", |_| Ok(()))
-    }
-
-    fn fsync(&mut self, _id: usize, _ctx: &CallerCtx) -> Result<()> {
-        Ok(())
-    }
-
-    fn fstat(&mut self, _id: usize, stat: &mut syscall::Stat, _ctx: &CallerCtx) -> Result<()> {
-        stat.st_mode = 0o666 | MODE_CHR;
-        stat.st_size = 0;
-        stat.st_blocks = 0;
-        stat.st_blksize = 4096;
-        stat.st_nlink = 1;
-
-        Ok(())
-    }
-}
diff --git a/recipes/core/kernel/source/Cargo.toml b/recipes/core/kernel/source/Cargo.toml
index 734afd92fd..e05f723c88 100644
--- a/recipes/core/kernel/source/Cargo.toml
+++ b/recipes/core/kernel/source/Cargo.toml
@@ -12,10 +12,7 @@ cc = "1.0"
 toml = "0.8"
 
 [dependencies]
-<<<<<<< HEAD
 acpi_ext = { package = "acpi", git = "https://gitlab.redox-os.org/redox-os/acpi.git", branch = "redox-6.x" }
-=======
->>>>>>> master
 arrayvec = { version = "0.7.4", default-features = false }
 bitfield = "0.13.2"
 bitflags = "2"
diff --git a/recipes/core/kernel/source/Makefile b/recipes/core/kernel/source/Makefile
index a18063a025..ce59b910b5 100644
--- a/recipes/core/kernel/source/Makefile
+++ b/recipes/core/kernel/source/Makefile
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 # Red Bear OS kernel patches applied via individual patch files
-=======
->>>>>>> master
 .PHONY: all check
 
 SOURCE:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
diff --git a/recipes/core/kernel/source/build.rs b/recipes/core/kernel/source/build.rs
index 95df9cadf4..751746ccdd 100644
--- a/recipes/core/kernel/source/build.rs
+++ b/recipes/core/kernel/source/build.rs
@@ -77,10 +77,7 @@ fn main() {
         }
         "x86_64" => {
             println!("cargo::rerun-if-changed=src/asm/x86_64/trampoline.asm");
-<<<<<<< HEAD
             println!("cargo::rerun-if-changed=src/asm/x86_64/s3_wakeup.asm");
-=======
->>>>>>> master
 
             let status = Command::new("nasm")
                 .arg("-f")
@@ -93,7 +90,6 @@ fn main() {
             if !status.success() {
                 panic!("nasm failed with exit status {}", status);
             }
-<<<<<<< HEAD
 
             let status = Command::new("nasm")
                 .arg("-f")
@@ -106,8 +102,6 @@ fn main() {
             if !status.success() {
                 panic!("nasm failed with exit status {}", status);
             }
-=======
->>>>>>> master
         }
         "riscv64" => {
             println!("cargo::rustc-cfg=dtb");
diff --git a/recipes/core/kernel/source/src/acpi/madt/arch/x86.rs b/recipes/core/kernel/source/src/acpi/madt/arch/x86.rs
index 408c0f9131..e8625a205a 100644
--- a/recipes/core/kernel/source/src/acpi/madt/arch/x86.rs
+++ b/recipes/core/kernel/source/src/acpi/madt/arch/x86.rs
@@ -3,11 +3,6 @@ use core::{
     sync::atomic::{AtomicU8, Ordering},
 };
 
-<<<<<<< HEAD
-use x86::time::rdtsc;
-
-=======
->>>>>>> master
 use crate::{
     arch::{
         device::local_apic::the_local_apic,
@@ -15,109 +10,18 @@ use crate::{
     },
     cpu_set::LogicalCpuId,
     memory::{
-<<<<<<< HEAD
         allocate_p2frame, map_device_memory, Frame, KernelMapper, Page, PageFlags,
         PhysicalAddress, RmmA, RmmArch, VirtualAddress, PAGE_SIZE,
-=======
-        allocate_p2frame, Frame, KernelMapper, Page, PageFlags, PhysicalAddress, RmmA, RmmArch,
-        VirtualAddress, PAGE_SIZE,
->>>>>>> master
     },
     startup::AP_READY,
 };
 
 use super::{Madt, MadtEntry};
 
-<<<<<<< HEAD
-use alloc::collections::BTreeSet;
-use alloc::vec::Vec;
-
-/// Maximum number of APIC→CPU mappings we track for NUMA topology.
-const MAX_APIC_MAPPINGS: usize = 256;
-
-struct ApicMapping {
-    apic_id: u32,
-    cpu_id: LogicalCpuId,
-}
-
-const UNINIT_MAPPING: ApicMapping = ApicMapping { apic_id: u32::MAX, cpu_id: LogicalCpuId::new(0) };
-
-static mut APIC_MAPPINGS: [ApicMapping; MAX_APIC_MAPPINGS] = [UNINIT_MAPPING; MAX_APIC_MAPPINGS];
-static mut APIC_MAPPING_COUNT: usize = 0;
-
-unsafe fn record_apic_mapping(apic_id: u32, cpu_id: LogicalCpuId) {
-    let count = APIC_MAPPING_COUNT;
-    if count < MAX_APIC_MAPPINGS {
-        APIC_MAPPINGS[count] = ApicMapping { apic_id, cpu_id };
-        APIC_MAPPING_COUNT = count + 1;
-    }
-}
-
 const AP_SPIN_LIMIT: u32 = 1_000_000;
 const TRAMPOLINE: usize = 0x8000;
 static TRAMPOLINE_DATA: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/trampoline"));
 
-/// Estimate TSC frequency in MHz from CPUID.
-///
-/// Tries CPUID leaf 0x16 (Processor Frequency Information) first,
-/// then CPUID leaf 0x15 (TSC/Core Crystal Clock Ratio).
-/// Returns None if frequency cannot be determined.
-fn tsc_freq_mhz_cpuid() -> Option<u64> {
-    let max_leaf = unsafe { core::arch::x86_64::__cpuid(0).eax as u32 };
-
-    // CPUID leaf 0x16: EAX = Core Base Frequency in MHz (Intel)
-    if max_leaf >= 0x16 {
-        let mhz = unsafe { core::arch::x86_64::__cpuid(0x16) }.eax as u64;
-        if mhz > 0 {
-            return Some(mhz);
-        }
-    }
-
-    // CPUID leaf 0x15: EAX = denominator, EBX = numerator, ECX = crystal Hz
-    if max_leaf >= 0x15 {
-        let res = unsafe { core::arch::x86_64::__cpuid(0x15) };
-        let denom = res.eax as u64;
-        let numer = res.ebx as u64;
-        let crystal_hz = res.ecx as u64;
-        if denom > 0 && numer > 0 && crystal_hz > 0 {
-            // TSC freq = crystal_hz * numer / denom
-            let tsc_hz = crystal_hz * numer / denom;
-            return Some(tsc_hz / 1_000_000); // Hz → MHz
-        }
-    }
-
-    None
-}
-
-/// Early-boot microsecond delay using the Time Stamp Counter.
-///
-/// Uses CPUID-based TSC frequency estimation when available.
-/// Falls back to a conservative spin loop calibrated for the
-/// minimum expected CPU speed (1 GHz).
-///
-/// # Safety
-/// Must only be called after the BSP TSC is running (always true
-/// after CPU reset on x86).
-fn early_udelay(us: u64) {
-    if let Some(mhz) = tsc_freq_mhz_cpuid() {
-        // TSC-based delay: precise on invariant TSC (all modern x86).
-        // MHz = cycles per µs.
-        let target = unsafe { rdtsc() } + us * mhz;
-        while unsafe { rdtsc() } < target {
-            hint::spin_loop();
-        }
-    } else {
-        // Fallback: conservative spin loop.
-        // spin_loop() (PAUSE) is ~40 cycles on modern Intel, ~1 on AMD.
-        // At 1 GHz minimum: 1000 cycles/µs ÷ 40 cycles/iter = 25 iters/µs.
-        // Use 50 iters/µs for safety margin on slower/variable CPUs.
-        let iters = us.saturating_mul(50);
-        for _ in 0..iters {
-            hint::spin_loop();
-        }
-    }
-}
-
 fn current_x2apic_processor_uid(madt: &Madt, apic_id: u32) -> Option<u32> {
     madt.iter().find_map(|entry| match entry {
         MadtEntry::LocalX2Apic(x2apic) if x2apic.x2apic_id == apic_id => Some(x2apic.processor_uid),
@@ -146,11 +50,6 @@ fn apply_lapic_address_override(
     debug!("Applied LAPIC address override: {:#x}", address);
 }
 
-=======
-const TRAMPOLINE: usize = 0x8000;
-static TRAMPOLINE_DATA: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/trampoline"));
-
->>>>>>> master
 pub(super) fn init(madt: Madt) {
     let local_apic = unsafe { the_local_apic() };
     let me = local_apic.id();
@@ -162,13 +61,6 @@ pub(super) fn init(madt: Madt) {
     }
 
     if cfg!(not(feature = "multi_core")) {
-<<<<<<< HEAD
-        unsafe {
-            record_apic_mapping(me.get(), LogicalCpuId::new(0));
-        }
-        crate::numa::init_default();
-=======
->>>>>>> master
         return;
     }
 
@@ -179,7 +71,6 @@ pub(super) fn init(madt: Madt) {
         //TODO: do not have writable and executable!
         let mut mapper = KernelMapper::lock_rw();
 
-<<<<<<< HEAD
         let result = match mapper.map_phys(
             trampoline_page.start_address(),
             trampoline_frame.base(),
@@ -191,15 +82,6 @@ pub(super) fn init(madt: Madt) {
                 return;
             }
         };
-=======
-        let result = mapper
-            .map_phys(
-                trampoline_page.start_address(),
-                trampoline_frame.base(),
-                PageFlags::new().execute(true).write(true),
-            )
-            .expect("failed to map trampoline");
->>>>>>> master
 
         (result, mapper.table().phys().data())
     };
@@ -212,226 +94,22 @@ pub(super) fn init(madt: Madt) {
         }
     }
 
-<<<<<<< HEAD
-    // Detect whether MADT contains any LocalX2Apic entries.
-    // Some firmware (notably QEMU and some older BIOS) provides only 8-bit
-    // LocalApic entries even when the CPU supports x2APIC. In that case we must
-    // fall back to processing LocalApic entries with zero-extended IDs.
-    let has_x2apic_entries = madt.iter().any(|e| matches!(e, MadtEntry::LocalX2Apic(_)));
-    let x2apic_fallback = local_apic.x2 && !has_x2apic_entries;
-    if x2apic_fallback {
-        warn!("MADT: x2APIC mode active but no LocalX2Apic entries found; falling back to LocalApic entries with zero-extended IDs");
-    }
-
     unsafe {
         let preliminary_cpu_count = madt
             .iter()
             .filter(|entry| match entry {
-                // When x2APIC is active, LocalApic entries use 8-bit IDs that don't
-                // match the BSP's 32-bit x2APIC ID. Use LocalX2Apic entries instead.
-                MadtEntry::LocalApic(local) if !local_apic.x2 => {
-                    u32::from(local.id) == me.get() || local.flags & 1 == 1
-                }
-                MadtEntry::LocalApic(local) if local_apic.x2 && x2apic_fallback => {
-                    u32::from(local.id) == me.get() || local.flags & 1 == 1
-                }
-                MadtEntry::LocalApic(_) => false,
-                // xAPIC mode: cannot use 32-bit x2APIC IDs via 8-bit ICR.
-                // Skip LocalX2Apic entries and use LocalApic exclusively.
-                MadtEntry::LocalX2Apic(local) if local_apic.x2 => {
-                    local.x2apic_id == me.get() || local.flags & 1 == 1
-                }
-                MadtEntry::LocalX2Apic(_) => false,
+                MadtEntry::LocalApic(local) => u32::from(local.id) == me.get() || local.flags & 1 == 1,
+                MadtEntry::LocalX2Apic(local) => local.x2apic_id == me.get() || local.flags & 1 == 1,
                 _ => false,
             })
             .count();
         crate::profiling::allocate(preliminary_cpu_count as u32);
     }
 
-    // Firmware bug detection: check for duplicate APIC IDs in MADT.
-    // Some firmware (especially on early BIOS/UEFI) may list the same
-    // processor multiple times. Keep first occurrence, warn on duplicates.
-    let mut seen_apic_ids: BTreeSet<u32> = BTreeSet::new();
-    {
-        let _ = seen_apic_ids.insert(me.get()); // BSP
-        for entry in madt.iter() {
-            match entry {
-                MadtEntry::LocalApic(local) if local.flags & 1 == 1 && !local_apic.x2 => {
-                    let id = u32::from(local.id);
-                    if !seen_apic_ids.insert(id) {
-                        warn!("MADT: duplicate APIC ID {} in LocalApic entry, firmware bug", id);
-                    }
-                }
-                MadtEntry::LocalApic(local) if local.flags & 1 == 1 && local_apic.x2 => {
-                    if x2apic_fallback {
-                        let id = u32::from(local.id);
-                        if !seen_apic_ids.insert(id) {
-                            warn!("MADT: duplicate APIC ID {} in LocalApic entry (x2APIC fallback), firmware bug", id);
-                        }
-                    } else {
-                    debug!("MADT: ignoring 8-bit LocalApic ID {} in x2APIC mode", local.id);
-                }
-                }
-                MadtEntry::LocalX2Apic(local) if local.flags & 1 == 1 && local_apic.x2 => {
-                    let id = local.x2apic_id;
-                    if !seen_apic_ids.insert(id) {
-                        warn!("MADT: duplicate x2APIC ID {} in LocalX2Apic entry, firmware bug", id);
-                    }
-                }
-                MadtEntry::LocalX2Apic(local) if local.flags & 1 == 1 && !local_apic.x2 => {
-                    // xAPIC mode: skip 32-bit x2APIC IDs; dedup only among LocalApic entries.
-                    let id = local.x2apic_id; // Copy from packed struct
-                    debug!("MADT: ignoring 32-bit x2APIC ID {} in xAPIC mode", id);
-                }
-                _ => {}
-            }
-        }
-    }
-
     for madt_entry in madt.iter() {
         debug!("      {:x?}", madt_entry);
         if let MadtEntry::LocalApic(ap_local_apic) = madt_entry {
-            // x2APIC mode: LocalApic entries have 8-bit IDs that don't match
-            // the BSP's 32-bit x2APIC ID. All entries would be treated as APs,
-            // and SIPI would target the wrong processors. Skip them and rely
-            // on LocalX2Apic entries exclusively.
-            if local_apic.x2 && !x2apic_fallback {
-                debug!(
-                    "        Skipping 8-bit LocalApic id={} (x2APIC active, using LocalX2Apic entries)",
-                    ap_local_apic.id
-                );
-            } else if local_apic.x2 && x2apic_fallback {
-                let apic_id = u32::from(ap_local_apic.id);
-                if apic_id == me.get() {
-                    debug!("        This is my local APIC (x2APIC fallback, id={})", apic_id);
-                } else if ap_local_apic.flags & 1 == 1 {
-                    let alloc = match allocate_p2frame(4) {
-                        Some(frame) => frame,
-                        None => {
-                            println!("KERNEL AP: CPU {} no memory for stack, skipping", apic_id);
-                            continue;
-                        }
-                    };
-                    let stack_start = RmmA::phys_to_virt(alloc.base()).data();
-                    let stack_end = stack_start + (PAGE_SIZE << 4);
-
-                    let cpu_id = LogicalCpuId::new(crate::CPU_COUNT.fetch_add(1, Ordering::SeqCst));
-                    if cpu_id.get() >= crate::cpu_set::MAX_CPU_COUNT {
-                        println!(
-                            "KERNEL AP: CPU {} exceeds logical CPU limit, skipping",
-                            apic_id
-                        );
-                        continue;
-                    }
-
-                    let pcr_ptr = crate::arch::gdt::allocate_and_init_pcr(cpu_id, stack_end);
-                    let idt_ptr = crate::arch::idt::allocate_and_init_idt(cpu_id);
-
-                    let args = KernelArgsAp {
-                        stack_end: stack_end as *mut u8,
-                        cpu_id,
-                        pcr_ptr,
-                        idt_ptr,
-                    };
-
-                    let ap_ready = (TRAMPOLINE + 8) as *mut u64;
-                    let ap_args_ptr = unsafe { ap_ready.add(1) };
-                    let ap_page_table = unsafe { ap_ready.add(2) };
-                    let ap_code = unsafe { ap_ready.add(3) };
-
-                    unsafe {
-                        ap_ready.write(0);
-                        ap_args_ptr.write(&args as *const _ as u64);
-                        ap_page_table.write(page_table_physaddr as u64);
-                        #[expect(clippy::fn_to_numeric_cast)]
-                        ap_code.write(kstart_ap as u64);
-
-                        core::sync::atomic::fence(Ordering::SeqCst);
-                    };
-                    AP_READY.store(false, Ordering::SeqCst);
-
-                    // Clear APIC Error Status Register before starting AP.
-                    unsafe { local_apic.esr(); }
-
-                    // Send INIT IPI (Assert) — x2APIC uses 64-bit ICR format.
-                    {
-                        let mut icr = 0x4500u64;
-                        icr |= u64::from(apic_id) << 32;
-                        local_apic.set_icr(icr);
-                    }
-
-                    // Intel SDM Vol 3A §8.4.4: wait 10ms after INIT deassert
-                    early_udelay(10_000);
-
-                    // Send START IPI #1
-                    {
-                        let ap_segment = (TRAMPOLINE >> 12) & 0xFF;
-                        let mut icr = 0x0600 | ap_segment as u64;
-                        icr |= u64::from(apic_id) << 32;
-                        local_apic.set_icr(icr);
-                    }
-
-                    early_udelay(200);
-
-                    // Send START IPI #2 (recommended for compatibility)
-                    {
-                        let ap_segment = (TRAMPOLINE >> 12) & 0xFF;
-                        let mut icr = 0x0600 | ap_segment as u64;
-                        icr |= u64::from(apic_id) << 32;
-                        local_apic.set_icr(icr);
-                    }
-
-                    early_udelay(200);
-
-                    // Check ESR for delivery errors after SIPI sequence.
-                    let esr_val = unsafe { local_apic.esr() };
-                    if esr_val != 0 {
-                        println!(
-                            "KERNEL AP: CPU {} SIPI delivery error (ESR={:#x}), continuing",
-                            apic_id, esr_val
-                        );
-                    }
-
-                    let mut trampoline_ready = false;
-                    for _ in 0..AP_SPIN_LIMIT {
-                        if unsafe { (*ap_ready.cast::<AtomicU8>()).load(Ordering::SeqCst) } != 0 {
-                            trampoline_ready = true;
-                            break;
-                        }
-                        hint::spin_loop();
-                    }
-                    if !trampoline_ready {
-                        println!("KERNEL AP: CPU {} trampoline timeout, skipping", apic_id);
-                        continue;
-                    }
-
-                    let mut kernel_ready = false;
-                    for _ in 0..AP_SPIN_LIMIT {
-                        if AP_READY.load(Ordering::SeqCst) {
-                            kernel_ready = true;
-                            break;
-                        }
-                        hint::spin_loop();
-                    }
-                    if !kernel_ready {
-                        println!("KERNEL AP: CPU {} AP_READY timeout, skipping", apic_id);
-                        continue;
-                    }
-
-                    // Record APIC→CPU mapping for NUMA topology.
-                    unsafe {
-                        record_apic_mapping(apic_id, cpu_id);
-                    }
-                    // Set NUMA node from SRAT data.
-                    if let Some(percpu) = crate::percpu::get_for_cpu(cpu_id) {
-                        if let Some(node) = crate::acpi::srat::numa_node_for_apic(apic_id) {
-                            percpu.numa_node.set(node);
-                        }
-                    }
-
-                    RmmA::invalidate_all();
-                }
-            } else if u32::from(ap_local_apic.id) == me.get() {
+            if u32::from(ap_local_apic.id) == me.get() {
                 debug!("        This is my local APIC");
             } else if ap_local_apic.flags & 1 == 1 {
                 // Allocate a stack
@@ -445,39 +123,15 @@ pub(super) fn init(madt: Madt) {
                 let stack_start = RmmA::phys_to_virt(alloc.base()).data();
                 let stack_end = stack_start + (PAGE_SIZE << 4);
 
-                // Atomically allocate a CPU ID — fetch_add is SeqCst so that
-                // all later stores (PercpuBlock, NUMA node) are ordered after.
-                let cpu_id = LogicalCpuId::new(crate::CPU_COUNT.fetch_add(1, Ordering::SeqCst));
-                if cpu_id.get() >= crate::cpu_set::MAX_CPU_COUNT {
+                let next_cpu = crate::CPU_COUNT.load(Ordering::Relaxed);
+                if next_cpu >= crate::cpu_set::MAX_CPU_COUNT {
                     println!(
                         "KERNEL AP: CPU {} exceeds logical CPU limit, skipping",
                         ap_local_apic.id
                     );
                     continue;
                 }
-=======
-    unsafe {
-        let preliminary_cpu_count = madt.iter().filter(|e| matches!(e, MadtEntry::LocalApic(entry) if u32::from(entry.id) == me.get() || entry.flags & 1 == 1)).count();
-        crate::profiling::allocate(preliminary_cpu_count as u32);
-    }
-
-    for madt_entry in madt.iter() {
-        debug!("      {:x?}", madt_entry);
-        if let MadtEntry::LocalApic(ap_local_apic) = madt_entry {
-            if u32::from(ap_local_apic.id) == me.get() {
-                debug!("        This is my local APIC");
-            } else if ap_local_apic.flags & 1 == 1 {
-                let cpu_id = LogicalCpuId::next();
-
-                // Allocate a stack
-                let stack_start = RmmA::phys_to_virt(
-                    allocate_p2frame(4)
-                        .expect("no more frames in acpi stack_start")
-                        .base(),
-                )
-                .data();
-                let stack_end = stack_start + (PAGE_SIZE << 4);
->>>>>>> master
+                let cpu_id = LogicalCpuId::new(next_cpu);
 
                 let pcr_ptr = crate::arch::gdt::allocate_and_init_pcr(cpu_id, stack_end);
 
@@ -503,23 +157,6 @@ pub(super) fn init(madt: Madt) {
                     #[expect(clippy::fn_to_numeric_cast)]
                     ap_code.write(kstart_ap as u64);
 
-<<<<<<< HEAD
-                    // Ensure all trampoline writes are visible to the AP before
-                    // it starts executing.  asm!("") is only a compiler barrier;
-                    // fence(SeqCst) is a full hardware memory barrier.
-                    core::sync::atomic::fence(Ordering::SeqCst);
-                };
-                AP_READY.store(false, Ordering::SeqCst);
-
-                // Clear APIC Error Status Register before starting AP.
-                // Intel SDM §8.4.4: ESR should be cleared before sending SIPI.
-                unsafe { local_apic.esr(); }
-
-                // Send INIT IPI (Assert)
-                {
-                    // ICR: Delivery Mode=INIT(101), Level=Assert, Trigger=Edge
-                    let mut icr = 0x4500u64;
-=======
                     // TODO: Is this necessary (this fence)?
                     core::arch::asm!("");
                 };
@@ -528,7 +165,6 @@ pub(super) fn init(madt: Madt) {
                 // Send INIT IPI
                 {
                     let mut icr = 0x4500;
->>>>>>> master
                     if local_apic.x2 {
                         icr |= u64::from(ap_local_apic.id) << 32;
                     } else {
@@ -537,62 +173,20 @@ pub(super) fn init(madt: Madt) {
                     local_apic.set_icr(icr);
                 }
 
-<<<<<<< HEAD
-                // Intel SDM Vol 3A §8.4.4: wait 10ms after INIT deassert
-                // before sending first SIPI. Modern CPUs may need less,
-                // but 10ms is the safe specification-compliant value.
-                early_udelay(10_000);
-
-                // Send START IPI #1
-                {
-                    let ap_segment = (TRAMPOLINE >> 12) & 0xFF;
-                    // ICR: Delivery Mode=StartUp(110), Vector=ap_segment
-                    // Note: bit 14 (Level) must be 0 for SIPI per Intel SDM.
-                    let mut icr = 0x0600 | ap_segment as u64;
-=======
                 // Send START IPI
                 {
                     let ap_segment = (TRAMPOLINE >> 12) & 0xFF;
                     let mut icr = 0x4600 | ap_segment as u64;
 
->>>>>>> master
                     if local_apic.x2 {
                         icr |= u64::from(ap_local_apic.id) << 32;
                     } else {
                         icr |= u64::from(ap_local_apic.id) << 56;
                     }
-<<<<<<< HEAD
+
                     local_apic.set_icr(icr);
                 }
 
-                // Intel SDM: wait 200µs between SIPIs
-                early_udelay(200);
-
-                // Send START IPI #2 (recommended for compatibility)
-                {
-                    let ap_segment = (TRAMPOLINE >> 12) & 0xFF;
-                    let mut icr = 0x0600 | ap_segment as u64;
-                    if local_apic.x2 {
-                        icr |= u64::from(ap_local_apic.id) << 32;
-                    } else {
-                        icr |= u64::from(ap_local_apic.id) << 56;
-                    }
-                    local_apic.set_icr(icr);
-                }
-
-                // Wait briefly for SIPI to be accepted
-                early_udelay(200);
-
-                // Check ESR for delivery errors after SIPI sequence.
-                // Bit 5 = Send Accept Error, Bit 6 = Send Illegal Vector.
-                let esr_val = unsafe { local_apic.esr() };
-                if esr_val != 0 {
-                    println!(
-                        "KERNEL AP: CPU {} SIPI delivery error (ESR={:#x}), continuing",
-                        ap_local_apic.id, esr_val
-                    );
-                }
-
                 // Wait for trampoline ready with timeout
                 let mut trampoline_ready = false;
                 for _ in 0..AP_SPIN_LIMIT {
@@ -620,16 +214,7 @@ pub(super) fn init(madt: Madt) {
                     continue;
                 }
 
-                // Record APIC→CPU mapping for NUMA topology.
-                unsafe {
-                    record_apic_mapping(u32::from(ap_local_apic.id), cpu_id);
-                }
-                // Set NUMA node from SRAT data.
-                if let Some(percpu) = crate::percpu::get_for_cpu(cpu_id) {
-                    if let Some(node) = crate::acpi::srat::numa_node_for_apic(u32::from(ap_local_apic.id)) {
-                        percpu.numa_node.set(node);
-                    }
-                }
+                crate::CPU_COUNT.fetch_add(1, Ordering::Relaxed);
 
                 RmmA::invalidate_all();
             }
@@ -637,14 +222,7 @@ pub(super) fn init(madt: Madt) {
             let apic_id = ap_x2apic.x2apic_id;
             let flags = ap_x2apic.flags;
 
-            // xAPIC mode: cannot target 32-bit x2APIC IDs via 8-bit ICR.
-            // Skip LocalX2Apic entries; use LocalApic entries exclusively.
-            if !local_apic.x2 {
-                debug!(
-                    "        Skipping 32-bit x2APIC id={} (xAPIC mode, using LocalApic entries)",
-                    apic_id
-                );
-            } else if apic_id == me.get() {
+            if apic_id == me.get() {
                 debug!("        This is my local x2APIC");
             } else if flags & 1 == 1 {
                 let alloc = match allocate_p2frame(4) {
@@ -657,16 +235,15 @@ pub(super) fn init(madt: Madt) {
                 let stack_start = RmmA::phys_to_virt(alloc.base()).data();
                 let stack_end = stack_start + (PAGE_SIZE << 4);
 
-                // Atomically allocate a CPU ID — fetch_add is SeqCst so that
-                // all later stores (PercpuBlock, NUMA node) are ordered after.
-                let cpu_id = LogicalCpuId::new(crate::CPU_COUNT.fetch_add(1, Ordering::SeqCst));
-                if cpu_id.get() >= crate::cpu_set::MAX_CPU_COUNT {
+                let next_cpu = crate::CPU_COUNT.load(Ordering::Relaxed);
+                if next_cpu >= crate::cpu_set::MAX_CPU_COUNT {
                     println!(
                         "KERNEL AP: CPU {} exceeds logical CPU limit, skipping",
                         apic_id
                     );
                     continue;
                 }
+                let cpu_id = LogicalCpuId::new(next_cpu);
 
                 let pcr_ptr = crate::arch::gdt::allocate_and_init_pcr(cpu_id, stack_end);
                 let idt_ptr = crate::arch::idt::allocate_and_init_idt(cpu_id);
@@ -689,53 +266,36 @@ pub(super) fn init(madt: Madt) {
                     ap_page_table.write(page_table_physaddr as u64);
                     #[expect(clippy::fn_to_numeric_cast)]
                     ap_code.write(kstart_ap as u64);
-                    // Ensure all trampoline writes are visible to the AP.
-                    core::sync::atomic::fence(Ordering::SeqCst);
+                    core::arch::asm!("");
                 }
                 AP_READY.store(false, Ordering::SeqCst);
 
-                // Clear APIC Error Status Register before starting AP.
-                unsafe { local_apic.esr(); }
-
-                // Send INIT IPI (Assert)
                 {
                     let mut icr = 0x4500u64;
                     icr |= u64::from(apic_id) << 32;
                     local_apic.set_icr(icr);
                 }
 
-                // Intel SDM Vol 3A §8.4.4: wait 10ms after INIT
-                early_udelay(10_000);
+                for _ in 0..100_000 {
+                    hint::spin_loop();
+                }
 
-                // Send START IPI #1
                 {
                     let ap_segment = (TRAMPOLINE >> 12) & 0xFF;
-                    let mut icr = 0x0600u64 | ap_segment as u64;
+                    let mut icr = 0x4600u64 | ap_segment as u64;
                     icr |= u64::from(apic_id) << 32;
                     local_apic.set_icr(icr);
                 }
 
-                // Intel SDM: wait 200µs between SIPIs
-                early_udelay(200);
-
-                // Send START IPI #2 (recommended for compatibility)
-                {
-                    let ap_segment = (TRAMPOLINE >> 12) & 0xFF;
-                    let mut icr = 0x0600u64 | ap_segment as u64;
-                    icr |= u64::from(apic_id) << 32;
-                    local_apic.set_icr(icr);
+                for _ in 0..2_000_000 {
+                    hint::spin_loop();
                 }
 
-                // Wait briefly for SIPI acceptance
-                early_udelay(200);
-
-                // Check ESR for delivery errors.
-                let esr_val = unsafe { local_apic.esr() };
-                if esr_val != 0 {
-                    println!(
-                        "KERNEL AP: CPU {} SIPI delivery error (ESR={:#x}), continuing",
-                        apic_id, esr_val
-                    );
+                {
+                    let ap_segment = (TRAMPOLINE >> 12) & 0xFF;
+                    let mut icr = 0x4600u64 | ap_segment as u64;
+                    icr |= u64::from(apic_id) << 32;
+                    local_apic.set_icr(icr);
                 }
 
                 let mut trampoline_ready = false;
@@ -764,17 +324,7 @@ pub(super) fn init(madt: Madt) {
                     continue;
                 }
 
-                // Record APIC→CPU mapping for NUMA topology.
-                unsafe {
-                    record_apic_mapping(apic_id, cpu_id);
-                }
-                // Set NUMA node from SRAT data.
-                if let Some(percpu) = crate::percpu::get_for_cpu(cpu_id) {
-                    if let Some(node) = crate::acpi::srat::numa_node_for_apic(apic_id) {
-                        percpu.numa_node.set(node);
-                    }
-                }
-
+                crate::CPU_COUNT.fetch_add(1, Ordering::Relaxed);
                 RmmA::invalidate_all();
             }
         } else if let MadtEntry::LocalApicNmi(nmi) = madt_entry {
@@ -792,33 +342,6 @@ pub(super) fn init(madt: Madt) {
         }
     }
 
-    // Initialize NUMA topology from APIC→CPU mappings and SRAT.
-    {
-        let mappings = unsafe { &APIC_MAPPINGS[..APIC_MAPPING_COUNT] };
-        let mappings_ref: Vec<(u32, LogicalCpuId)> = mappings
-            .iter()
-            .map(|m| (m.apic_id, m.cpu_id))
-            .collect();
-        crate::numa::init_from_srat(&mappings_ref);
-    }
-    // Set BSP's NUMA node from SRAT.
-    if let Some(node) = crate::acpi::srat::numa_node_for_apic(me.get()) {
-        crate::percpu::PercpuBlock::current().numa_node.set(node);
-    }
-
-    // Log final CPU count vs maximum
-    let cpu_count = crate::CPU_COUNT.load(Ordering::SeqCst);
-    info!(
-        "SMP: {} CPUs online (max {})",
-        cpu_count, crate::cpu_set::MAX_CPU_COUNT
-    );
-    if cpu_count > crate::cpu_set::MAX_CPU_COUNT * 80 / 100 {
-        warn!(
-            "SMP: CPU count approaching MAX_CPU_COUNT limit ({}/{})",
-            cpu_count, crate::cpu_set::MAX_CPU_COUNT
-        );
-    }
-
     // Unmap trampoline
     if let Some((_frame, _, flush)) = unsafe {
         KernelMapper::lock_rw()
@@ -828,30 +351,4 @@ pub(super) fn init(madt: Madt) {
     } else {
         println!("KERNEL AP: failed to unmap trampoline page (non-fatal)");
     }
-=======
-
-                    local_apic.set_icr(icr);
-                }
-
-                // Wait for trampoline ready
-                while unsafe { (*ap_ready.cast::<AtomicU8>()).load(Ordering::SeqCst) } == 0 {
-                    hint::spin_loop();
-                }
-                while !AP_READY.load(Ordering::SeqCst) {
-                    hint::spin_loop();
-                }
-
-                RmmA::invalidate_all();
-            }
-        }
-    }
-
-    // Unmap trampoline
-    let (_frame, _, flush) = unsafe {
-        KernelMapper::lock_rw()
-            .unmap_phys(trampoline_page.start_address())
-            .expect("failed to unmap trampoline page")
-    };
-    flush.flush();
->>>>>>> master
 }
diff --git a/recipes/core/kernel/source/src/acpi/madt/mod.rs b/recipes/core/kernel/source/src/acpi/madt/mod.rs
index cc56ffbbb7..e792b2e6c8 100644
--- a/recipes/core/kernel/source/src/acpi/madt/mod.rs
+++ b/recipes/core/kernel/source/src/acpi/madt/mod.rs
@@ -34,15 +34,6 @@ impl Madt {
         let madt = Madt::new(find_one_sdt!("APIC"));
 
         if let Some(madt) = madt {
-<<<<<<< HEAD
-            // Validate MADT checksum per ACPI 6.5 §5.2.2
-            if !madt.sdt.validate_checksum() {
-                error!("MADT checksum validation failed, skipping APIC initialization");
-                return;
-            }
-
-=======
->>>>>>> master
             // safe because no APs have been started yet.
             unsafe { MADT.get().write(Some(madt)) };
 
@@ -155,7 +146,6 @@ pub struct MadtGicd {
     _reserved2: [u8; 3],
 }
 
-<<<<<<< HEAD
 /// MADT Local x2APIC (entry type 0x9)
 #[derive(Clone, Copy, Debug)]
 #[repr(C, packed)]
@@ -198,8 +188,6 @@ const _: () = assert!(size_of::<MadtLocalApicNmi>() == 4);
 const _: () = assert!(size_of::<MadtLapicAddressOverride>() == 10);
 const _: () = assert!(size_of::<MadtLocalX2ApicNmi>() == 10);
 
-=======
->>>>>>> master
 /// MADT Entries
 #[derive(Debug)]
 #[allow(dead_code)]
@@ -210,24 +198,18 @@ pub enum MadtEntry {
     InvalidIoApic(usize),
     IntSrcOverride(&'static MadtIntSrcOverride),
     InvalidIntSrcOverride(usize),
-<<<<<<< HEAD
     LocalApicNmi(&'static MadtLocalApicNmi),
     InvalidLocalApicNmi(usize),
     LapicAddressOverride(&'static MadtLapicAddressOverride),
     InvalidLapicAddressOverride(usize),
-=======
->>>>>>> master
     Gicc(&'static MadtGicc),
     InvalidGicc(usize),
     Gicd(&'static MadtGicd),
     InvalidGicd(usize),
-<<<<<<< HEAD
     LocalX2Apic(&'static MadtLocalX2Apic),
     InvalidLocalX2Apic(usize),
     LocalX2ApicNmi(&'static MadtLocalX2ApicNmi),
     InvalidLocalX2ApicNmi(usize),
-=======
->>>>>>> master
     Unknown(u8),
 }
 
@@ -244,13 +226,10 @@ impl Iterator for MadtIter {
             let entry_len =
                 unsafe { *(self.sdt.data_address() as *const u8).add(self.i + 1) } as usize;
 
-<<<<<<< HEAD
             if entry_len < 2 {
                 return None;
             }
 
-=======
->>>>>>> master
             if self.i + entry_len <= self.sdt.data_len() {
                 let item = match entry_type {
                     0x0 => {
@@ -281,7 +260,6 @@ impl Iterator for MadtIter {
                             MadtEntry::InvalidIntSrcOverride(entry_len)
                         }
                     }
-<<<<<<< HEAD
                     0x4 => {
                         if entry_len == size_of::<MadtLocalApicNmi>() + 2 {
                             MadtEntry::LocalApicNmi(unsafe {
@@ -322,8 +300,6 @@ impl Iterator for MadtIter {
                             MadtEntry::InvalidLocalX2ApicNmi(entry_len)
                         }
                     }
-=======
->>>>>>> master
                     0xB => {
                         if entry_len >= size_of::<MadtGicc>() + 2 {
                             MadtEntry::Gicc(unsafe {
diff --git a/recipes/core/kernel/source/src/acpi/mod.rs b/recipes/core/kernel/source/src/acpi/mod.rs
index 2a559215b4..b3b80f0cec 100644
--- a/recipes/core/kernel/source/src/acpi/mod.rs
+++ b/recipes/core/kernel/source/src/acpi/mod.rs
@@ -20,11 +20,6 @@ mod rxsdt;
 pub mod sdt;
 #[cfg(target_arch = "aarch64")]
 mod spcr;
-<<<<<<< HEAD
-pub mod slit;
-pub mod srat;
-=======
->>>>>>> master
 mod xsdt;
 
 unsafe fn map_linearly(addr: PhysicalAddress, len: usize, mapper: &mut crate::memory::PageMapper) {
@@ -87,7 +82,6 @@ impl Rxsdt for RxsdtEnum {
 
 pub static RXSDT_ENUM: Once<RxsdtEnum> = Once::new();
 
-<<<<<<< HEAD
 #[derive(Clone, Copy, Debug)]
 pub struct AcpiRootInfo {
     pub revision: u8,
@@ -96,8 +90,6 @@ pub struct AcpiRootInfo {
 
 pub static ACPI_ROOT_INFO: Once<AcpiRootInfo> = Once::new();
 
-=======
->>>>>>> master
 /// Parse the ACPI tables to gather CPU, interrupt, and timer information
 pub unsafe fn init(already_supplied_rsdp: Option<*const u8>) {
     unsafe {
@@ -110,7 +102,6 @@ pub unsafe fn init(already_supplied_rsdp: Option<*const u8>) {
         let rsdp_opt = Rsdp::get_rsdp(already_supplied_rsdp);
 
         if let Some(rsdp) = rsdp_opt {
-<<<<<<< HEAD
             let root_info = ACPI_ROOT_INFO.call_once(|| AcpiRootInfo {
                 revision: rsdp.revision(),
                 root_sdt_address: rsdp.sdt_address(),
@@ -120,8 +111,6 @@ pub unsafe fn init(already_supplied_rsdp: Option<*const u8>) {
                 error!("ACPI_ROOT_INFO already initialized with a different RSDP root");
             }
 
-=======
->>>>>>> master
             debug!("SDT address: {:#x}", rsdp.sdt_address().data());
             let rxsdt = get_sdt(rsdp.sdt_address(), &mut KernelMapper::lock_rw());
 
@@ -174,18 +163,7 @@ pub unsafe fn init(already_supplied_rsdp: Option<*const u8>) {
 
             // TODO: Enumerate processors in userspace, and then provide an ACPI-independent interface
             // to initialize enumerated processors to userspace?
-<<<<<<< HEAD
-            // Parse SRAT BEFORE MADT so NUMA node mapping is available
-            // when APs are started and PercpuBlocks are created.
-            srat::init();
-
             Madt::init();
-
-            // Parse SLIT after MADT for the NUMA distance matrix.
-            slit::init();
-=======
-            Madt::init();
->>>>>>> master
             //TODO: support this on any arch
             // SPCR must be initialized after MADT for interrupt controllers
             #[cfg(target_arch = "aarch64")]
diff --git a/recipes/core/kernel/source/src/acpi/rsdp.rs b/recipes/core/kernel/source/src/acpi/rsdp.rs
index d105a015a3..94e8603743 100644
--- a/recipes/core/kernel/source/src/acpi/rsdp.rs
+++ b/recipes/core/kernel/source/src/acpi/rsdp.rs
@@ -17,7 +17,6 @@ pub struct Rsdp {
 
 impl Rsdp {
     pub unsafe fn get_rsdp(already_supplied_rsdp: Option<*const u8>) -> Option<Rsdp> {
-<<<<<<< HEAD
         already_supplied_rsdp.and_then(|rsdp_ptr| {
             let rsdp = unsafe { *(rsdp_ptr as *const Rsdp) };
 
@@ -45,11 +44,6 @@ impl Rsdp {
             }
 
             Some(rsdp)
-=======
-        already_supplied_rsdp.map(|rsdp_ptr| {
-            // TODO: Validate
-            unsafe { *(rsdp_ptr as *const Rsdp) }
->>>>>>> master
         })
     }
 
@@ -61,11 +55,8 @@ impl Rsdp {
             self.rsdt_address as usize
         })
     }
-<<<<<<< HEAD
 
     pub fn revision(&self) -> u8 {
         self.revision
     }
-=======
->>>>>>> master
 }
diff --git a/recipes/core/kernel/source/src/acpi/sdt.rs b/recipes/core/kernel/source/src/acpi/sdt.rs
index 9ff1c3bdc9..83ff67dac1 100644
--- a/recipes/core/kernel/source/src/acpi/sdt.rs
+++ b/recipes/core/kernel/source/src/acpi/sdt.rs
@@ -24,23 +24,4 @@ impl Sdt {
         let header_size = size_of::<Sdt>();
         total_size.saturating_sub(header_size)
     }
-<<<<<<< HEAD
-
-    /// Validate the SDT checksum.
-    ///
-    /// Per ACPI 6.5 §5.2.2: the entire table (including the checksum field)
-    /// must sum to 0 when all bytes are added together as unsigned 8-bit values.
-    pub fn validate_checksum(&self) -> bool {
-        let ptr = self as *const _ as *const u8;
-        let len = self.length as usize;
-        if len < size_of::<Sdt>() {
-            return false;
-        }
-        let sum = unsafe { core::slice::from_raw_parts(ptr, len) }
-            .iter()
-            .fold(0u8, |acc, &b| acc.wrapping_add(b));
-        sum == 0
-    }
-=======
->>>>>>> master
 }
diff --git a/recipes/core/kernel/source/src/acpi/slit.rs b/recipes/core/kernel/source/src/acpi/slit.rs
deleted file mode 100644
index 605f303390..0000000000
--- a/recipes/core/kernel/source/src/acpi/slit.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-//! SLIT (System Locality Information Table) parser.
-//!
-//! Parses the NUMA distance matrix for scheduler NUMA-aware work stealing.
-
-use super::sdt::Sdt;
-use crate::acpi::find_sdt;
-
-const MAX_NODES: usize = 8;
-
-static mut SLIT_MATRIX: [[u8; MAX_NODES]; MAX_NODES] = [[10u8; MAX_NODES]; MAX_NODES];
-static mut SLIT_NUM_NODES: usize = 0;
-static mut SLIT_AVAILABLE: bool = false;
-
-pub fn is_available() -> bool { unsafe { SLIT_AVAILABLE } }
-pub fn num_nodes() -> usize { unsafe { SLIT_NUM_NODES } }
-
-pub fn distance(from: u8, to: u8) -> u8 {
-    if !unsafe { SLIT_AVAILABLE } { return 10; }
-    let (from, to) = (from as usize, to as usize);
-    if from >= MAX_NODES || to >= MAX_NODES { return 10; }
-    unsafe { SLIT_MATRIX[from][to] }
-}
-
-pub fn same_socket(node1: u8, node2: u8) -> bool { distance(node1, node2) <= 20 }
-
-pub fn init() {
-    let sdt = match find_sdt("SLIT").as_slice() {
-        [] => return,
-        [x] => *x,
-        xs => { println!("SLIT: {} tables found, expected 1", xs.len()); return; }
-    };
-    if &sdt.signature != b"SLIT" { return; }
-    let data_addr = sdt.data_address();
-    let data_len = sdt.data_len();
-    if data_len < 8 { return; }
-    let num_nodes = unsafe { *(data_addr as *const u64) } as usize;
-    if num_nodes == 0 || num_nodes > MAX_NODES { println!("SLIT: {num_nodes} nodes (max {MAX_NODES}), ignoring"); return; }
-    let matrix_start = 8;
-    let matrix_size = num_nodes * num_nodes;
-    if data_len < matrix_start + matrix_size { println!("SLIT: matrix truncated ({data_len} < {})", matrix_start + matrix_size); return; }
-    let matrix = unsafe { &mut SLIT_MATRIX };
-    for i in 0..num_nodes { for j in 0..num_nodes { matrix[i][j] = unsafe { *((data_addr + matrix_start + i * num_nodes + j) as *const u8) }; } }
-    unsafe { SLIT_NUM_NODES = num_nodes; SLIT_AVAILABLE = true; }
-    debug!("SLIT: {} nodes, distance matrix loaded", num_nodes);
-}
diff --git a/recipes/core/kernel/source/src/acpi/srat.rs b/recipes/core/kernel/source/src/acpi/srat.rs
deleted file mode 100644
index 49b3ac0ac7..0000000000
--- a/recipes/core/kernel/source/src/acpi/srat.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-//! SRAT (System Resource Affinity Table) parser.
-//!
-//! Parses CPU-to-NUMA-node and memory-to-NUMA-node affinity information.
-//! Called before MADT init so that NUMA data is available during AP startup.
-
-use super::sdt::Sdt;
-use crate::acpi::find_sdt;
-
-const MAX_CPU_ENTRIES: usize = 256;
-const MAX_MEM_ENTRIES: usize = 64;
-
-#[derive(Clone, Copy)]
-struct SratCpuEntry { apic_id: u32, node: u8, enabled: bool }
-
-#[derive(Clone, Copy)]
-struct SratMemEntry { node: u8, base: u64, length: u64, enabled: bool }
-
-const CPU_NONE: SratCpuEntry = SratCpuEntry { apic_id: u32::MAX, node: 0, enabled: false };
-const MEM_NONE: SratMemEntry = SratMemEntry { node: 0, base: 0, length: 0, enabled: false };
-
-static mut SRAT_CPU_ENTRIES: [SratCpuEntry; MAX_CPU_ENTRIES] = [CPU_NONE; MAX_CPU_ENTRIES];
-static mut SRAT_MEM_ENTRIES: [SratMemEntry; MAX_MEM_ENTRIES] = [MEM_NONE; MAX_MEM_ENTRIES];
-static mut SRAT_CPU_COUNT: usize = 0;
-static mut SRAT_MEM_COUNT: usize = 0;
-static mut SRAT_AVAILABLE: bool = false;
-
-pub fn is_available() -> bool { unsafe { SRAT_AVAILABLE } }
-
-pub fn numa_node_for_apic(apic_id: u32) -> Option<u8> {
-    if !unsafe { SRAT_AVAILABLE } { return None; }
-    let count = unsafe { SRAT_CPU_COUNT };
-    let entries = unsafe { &SRAT_CPU_ENTRIES };
-    for i in 0..count {
-        if entries[i].apic_id == apic_id && entries[i].enabled { return Some(entries[i].node); }
-    }
-    None
-}
-
-pub fn numa_node_count() -> usize {
-    if !unsafe { SRAT_AVAILABLE } { return 1; }
-    let mut max_node: u8 = 0;
-    let count = unsafe { SRAT_CPU_COUNT };
-    let entries = unsafe { &SRAT_CPU_ENTRIES };
-    for i in 0..count { if entries[i].enabled && entries[i].node > max_node { max_node = entries[i].node; } }
-    (max_node as usize) + 1
-}
-
-#[repr(C, packed)]
-struct SratLocalApic { _proximity_lo: u8, apic_id: u8, flags: u32, _local_sapic_eid: u8, _proximity_hi: [u8; 3], _clock_domain: u32 }
-
-#[repr(C, packed)]
-struct SratMemoryAffinity { proximity_domain: u32, _reserved1: u16, base_address_lo: u32, base_address_hi: u32, length_lo: u32, length_hi: u32, _reserved2: u32, flags: u32, _reserved3: u64 }
-
-#[repr(C, packed)]
-struct SratLocalX2Apic { _reserved: u16, proximity_domain: u32, x2apic_id: u32, flags: u32, _clock_domain: u32, _reserved2: u32 }
-
-pub fn init() {
-    let sdt = match find_sdt("SRAT").as_slice() {
-        [] => return,
-        [x] => *x,
-        xs => { println!("SRAT: {} tables found, expected 1", xs.len()); return; }
-    };
-    if &sdt.signature != b"SRAT" { return; }
-    let data_addr = sdt.data_address();
-    let data_len = sdt.data_len();
-    if data_len < 12 { println!("SRAT: table too short ({data_len} bytes)"); return; }
-    let mut offset: usize = 12;
-    let cpu_entries = unsafe { &mut SRAT_CPU_ENTRIES };
-    let mem_entries = unsafe { &mut SRAT_MEM_ENTRIES };
-    let mut cpu_count: usize = 0;
-    let mut mem_count: usize = 0;
-    while offset + 2 <= data_len {
-        let entry_type = unsafe { *((data_addr + offset) as *const u8) };
-        let entry_len = unsafe { *((data_addr + offset + 1) as *const u8) } as usize;
-        if entry_len < 2 || offset + entry_len > data_len { break; }
-        let entry_data = data_addr + offset + 2;
-        match entry_type {
-            0x0 if entry_len >= size_of::<SratLocalApic>() + 2 => {
-                let e = unsafe { &*(entry_data as *const SratLocalApic) };
-                let enabled = (e.flags & 1) == 1;
-                let node = (e._proximity_lo as u32) | ((e._proximity_hi[0] as u32) << 8) | ((e._proximity_hi[1] as u32) << 16) | ((e._proximity_hi[2] as u32) << 24);
-                if cpu_count < MAX_CPU_ENTRIES { cpu_entries[cpu_count] = SratCpuEntry { apic_id: e.apic_id as u32, node: node as u8, enabled }; cpu_count += 1; }
-            }
-            0x1 if entry_len >= size_of::<SratMemoryAffinity>() + 2 => {
-                let e = unsafe { &*(entry_data as *const SratMemoryAffinity) };
-                let enabled = (e.flags & 1) == 1;
-                let base = (e.base_address_hi as u64) << 32 | e.base_address_lo as u64;
-                let length = (e.length_hi as u64) << 32 | e.length_lo as u64;
-                if mem_count < MAX_MEM_ENTRIES { mem_entries[mem_count] = SratMemEntry { node: e.proximity_domain as u8, base, length, enabled }; mem_count += 1; }
-            }
-            0x2 if entry_len >= size_of::<SratLocalX2Apic>() + 2 => {
-                let e = unsafe { &*(entry_data as *const SratLocalX2Apic) };
-                let enabled = (e.flags & 1) == 1;
-                if cpu_count < MAX_CPU_ENTRIES { cpu_entries[cpu_count] = SratCpuEntry { apic_id: e.x2apic_id, node: e.proximity_domain as u8, enabled }; cpu_count += 1; }
-            }
-            _ => {}
-        }
-        offset += entry_len;
-    }
-    unsafe { SRAT_CPU_COUNT = cpu_count; SRAT_MEM_COUNT = mem_count; SRAT_AVAILABLE = true; }
-    debug!("SRAT: {} CPU entries, {} memory entries", cpu_count, mem_count);
-}
diff --git a/recipes/core/kernel/source/src/allocator/mod.rs b/recipes/core/kernel/source/src/allocator/mod.rs
index 5122463d7d..aaa719635e 100644
--- a/recipes/core/kernel/source/src/allocator/mod.rs
+++ b/recipes/core/kernel/source/src/allocator/mod.rs
@@ -7,7 +7,6 @@ mod linked_list;
 /// Size of kernel heap
 const KERNEL_HEAP_SIZE: usize = ::rmm::MEGABYTE;
 
-<<<<<<< HEAD
 #[cold]
 fn halt_kernel_heap_init(message: &str) -> ! {
     print!("{message}");
@@ -17,15 +16,12 @@ fn halt_kernel_heap_init(message: &str) -> ! {
     }
 }
 
-=======
->>>>>>> master
 unsafe fn map_heap(mapper: &mut KernelMapper<true>, offset: usize, size: usize) {
     let mut flush_all = PageFlushAll::new();
 
     let heap_start_page = Page::containing_address(VirtualAddress::new(offset));
     let heap_end_page = Page::containing_address(VirtualAddress::new(offset + size - 1));
     for page in Page::range_inclusive(heap_start_page, heap_end_page) {
-<<<<<<< HEAD
         let phys = match mapper.allocator_mut().allocate_one() {
             Some(phys) => phys,
             None => halt_kernel_heap_init(
@@ -45,22 +41,6 @@ unsafe fn map_heap(mapper: &mut KernelMapper<true>, offset: usize, size: usize)
                     "FATAL: failed to map kernel heap virtual page\n",
                 ),
             }
-=======
-        let phys = mapper
-            .allocator_mut()
-            .allocate_one()
-            .expect("failed to allocate kernel heap");
-        let flush = unsafe {
-            mapper
-                .map_phys(
-                    page.start_address(),
-                    phys,
-                    PageFlags::new()
-                        .write(true)
-                        .global(cfg!(not(feature = "pti"))),
-                )
-                .expect("failed to map kernel heap")
->>>>>>> master
         };
         flush_all.consume(flush);
     }
diff --git a/recipes/core/kernel/source/src/arch/aarch64/start.rs b/recipes/core/kernel/source/src/arch/aarch64/start.rs
index f209bd709e..65e3fe339b 100644
--- a/recipes/core/kernel/source/src/arch/aarch64/start.rs
+++ b/recipes/core/kernel/source/src/arch/aarch64/start.rs
@@ -91,11 +91,7 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs) -> ! {
                 dtb::serial::init_early(dtb);
             }
 
-<<<<<<< HEAD
             info!("RedBear OS starting...");
-=======
-            info!("Redox OS starting...");
->>>>>>> master
             args.print();
 
             // Initialize RMM
diff --git a/recipes/core/kernel/source/src/arch/riscv64/start.rs b/recipes/core/kernel/source/src/arch/riscv64/start.rs
index d71dd14179..a825536aa9 100644
--- a/recipes/core/kernel/source/src/arch/riscv64/start.rs
+++ b/recipes/core/kernel/source/src/arch/riscv64/start.rs
@@ -97,11 +97,7 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs) -> ! {
                 init_early(dtb);
             }
 
-<<<<<<< HEAD
             info!("RedBear OS starting...");
-=======
-            info!("Redox OS starting...");
->>>>>>> master
             args.print();
 
             if let Some(dtb) = &dtb {
diff --git a/recipes/core/kernel/source/src/arch/x86_shared/cpuidle.rs b/recipes/core/kernel/source/src/arch/x86_shared/cpuidle.rs
deleted file mode 100644
index 156add78e8..0000000000
--- a/recipes/core/kernel/source/src/arch/x86_shared/cpuidle.rs
+++ /dev/null
@@ -1,186 +0,0 @@
-use core::cell::SyncUnsafeCell;
-use core::sync::atomic::{AtomicUsize, Ordering};
-
-use crate::arch::cpuid::cpuid;
-use crate::syscall::error::{Error, Result, EINVAL};
-
-#[repr(align(64))]
-struct MonitorTarget {
-    value: AtomicUsize,
-}
-
-static MONITOR_TARGET: MonitorTarget = MonitorTarget {
-    value: AtomicUsize::new(0),
-};
-
-bitflags::bitflags! {
-    #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-    pub struct CStateFlags: u32 {
-        const NEEDS_MONITOR = 1;
-        const NEEDS_WBINVD = 2;
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct CState {
-    pub name: &'static str,
-    pub typ: u32,
-    pub latency: u32,
-    pub power: u32,
-    pub mwait_hint: u32,
-    pub flags: CStateFlags,
-}
-
-const MAX_CSTATES: usize = 8;
-static CPUIDLE_STATES: SyncUnsafeCell<[Option<CState>; MAX_CSTATES]> =
-    SyncUnsafeCell::new([None; MAX_CSTATES]);
-static NUM_CPUIDLE_STATES: AtomicUsize = AtomicUsize::new(0);
-
-static CSTATE_POLICY_MAX: AtomicUsize = AtomicUsize::new(0);
-
-fn has_mwait() -> bool {
-    cpuid().get_feature_info().map_or(false, |info| info.has_monitor_mwait())
-}
-
-fn add_state(index: usize, state: CState) {
-    unsafe {
-        (*CPUIDLE_STATES.get())[index] = Some(state);
-    }
-}
-
-pub fn init() {
-    add_state(0, CState {
-        name: "C1",
-        typ: 1,
-        latency: 1,
-        power: 1000,
-        mwait_hint: 0x00,
-        flags: CStateFlags::empty(),
-    });
-    let mut count = 1;
-
-    if has_mwait() {
-        add_state(count, CState {
-            name: "C1E",
-            typ: 1,
-            latency: 2,
-            power: 800,
-            mwait_hint: 0x01,
-            flags: CStateFlags::NEEDS_MONITOR,
-        });
-        count += 1;
-
-        add_state(count, CState {
-            name: "C2",
-            typ: 2,
-            latency: 10,
-            power: 500,
-            mwait_hint: 0x10,
-            flags: CStateFlags::NEEDS_MONITOR,
-        });
-        count += 1;
-
-        add_state(count, CState {
-            name: "C3",
-            typ: 3,
-            latency: 50,
-            power: 100,
-            mwait_hint: 0x20,
-            flags: CStateFlags::NEEDS_MONITOR | CStateFlags::NEEDS_WBINVD,
-        });
-        count += 1;
-
-        add_state(count, CState {
-            name: "C6",
-            typ: 6,
-            latency: 100,
-            power: 50,
-            mwait_hint: 0x50,
-            flags: CStateFlags::NEEDS_MONITOR | CStateFlags::NEEDS_WBINVD,
-        });
-        count += 1;
-
-        add_state(count, CState {
-            name: "C7",
-            typ: 7,
-            latency: 200,
-            power: 30,
-            mwait_hint: 0x60,
-            flags: CStateFlags::NEEDS_MONITOR | CStateFlags::NEEDS_WBINVD,
-        });
-        count += 1;
-    }
-
-    NUM_CPUIDLE_STATES.store(count, Ordering::SeqCst);
-    log::info!("cpuidle: initialized {} states (mwait={})", count, has_mwait());
-}
-
-pub fn policy_read() -> usize {
-    CSTATE_POLICY_MAX.load(Ordering::Relaxed)
-}
-
-pub fn policy_write(buf: &[u8]) -> Result<usize> {
-    let s = core::str::from_utf8(buf).map_err(|_| Error::new(EINVAL))?;
-    let s = s.trim();
-    let val: usize = s.parse().map_err(|_| Error::new(EINVAL))?;
-    let num_states = NUM_CPUIDLE_STATES.load(Ordering::Relaxed);
-    if val >= num_states {
-        return Err(Error::new(EINVAL));
-    }
-    CSTATE_POLICY_MAX.store(val, Ordering::Relaxed);
-    log::info!("cpuidle: policy set to max state {}", val);
-    Ok(s.len())
-}
-
-pub fn resource() -> Result<alloc::vec::Vec<u8>> {
-    let mut output = alloc::string::String::new();
-    let num_states = NUM_CPUIDLE_STATES.load(Ordering::Relaxed);
-    let policy = CSTATE_POLICY_MAX.load(Ordering::Relaxed);
-    output.push_str(&format!("policy_max: {}\n", policy));
-    output.push_str(&format!("num_states: {}\n", num_states));
-    for i in 0..num_states {
-        if let Some(state) = unsafe { (*CPUIDLE_STATES.get())[i] } {
-            output.push_str(&format!(
-                "state{}: name={} type={} latency={}us power={} hint={:#x} flags={:?}\n",
-                i, state.name, state.typ, state.latency, state.power, state.mwait_hint, state.flags
-            ));
-        }
-    }
-    Ok(output.into_bytes())
-}
-
-pub unsafe fn enter_idle() {
-    let policy_max = CSTATE_POLICY_MAX.load(Ordering::Relaxed);
-    let num_states = NUM_CPUIDLE_STATES.load(Ordering::Relaxed);
-    let target_index = if num_states == 0 {
-        0
-    } else {
-        core::cmp::min(policy_max, num_states - 1)
-    };
-
-    if target_index == 0 {
-        unsafe { crate::arch::interrupt::enable_and_halt(); }
-        return;
-    }
-
-    let state = match unsafe { (*CPUIDLE_STATES.get())[target_index] } {
-        Some(s) => s,
-        None => {
-            unsafe { crate::arch::interrupt::enable_and_halt(); }
-            return;
-        }
-    };
-
-    if state.flags.contains(CStateFlags::NEEDS_MONITOR) {
-        let addr = &MONITOR_TARGET.value as *const AtomicUsize as *const u8;
-        unsafe { crate::arch::interrupt::monitor(addr, 0, 0); }
-    }
-
-    if state.flags.contains(CStateFlags::NEEDS_WBINVD) {
-        unsafe { core::arch::asm!("wbinvd", options(nostack)); }
-    }
-
-    unsafe {
-        crate::arch::interrupt::enable_and_mwait(state.mwait_hint, 0);
-    }
-}
diff --git a/recipes/core/kernel/source/src/arch/x86_shared/device/ioapic.rs b/recipes/core/kernel/source/src/arch/x86_shared/device/ioapic.rs
index c3f6910ca9..cd34c03b98 100644
--- a/recipes/core/kernel/source/src/arch/x86_shared/device/ioapic.rs
+++ b/recipes/core/kernel/source/src/arch/x86_shared/device/ioapic.rs
@@ -14,13 +14,10 @@ pub struct IoApicRegs {
     pointer: *const u32,
 }
 impl IoApicRegs {
-<<<<<<< HEAD
     fn redirection_index_valid(&mut self, idx: u8) -> bool {
         idx <= self.max_redirection_table_entries()
     }
 
-=======
->>>>>>> master
     fn ioregsel(&self) -> *const u32 {
         self.pointer
     }
@@ -51,7 +48,6 @@ impl IoApicRegs {
     pub fn read_ioapicver(&mut self) -> u32 {
         self.read_reg(0x01)
     }
-<<<<<<< HEAD
     pub fn read_ioredtbl(&mut self, idx: u8) -> Option<u64> {
         if !self.redirection_index_valid(idx) {
             warn!("IOAPIC read_ioredtbl index {} out of range", idx);
@@ -67,27 +63,13 @@ impl IoApicRegs {
             warn!("IOAPIC write_ioredtbl index {} out of range", idx);
             return false;
         }
-=======
-    pub fn read_ioredtbl(&mut self, idx: u8) -> u64 {
-        assert!(idx < 24);
-        let lo = self.read_reg(0x10 + idx * 2);
-        let hi = self.read_reg(0x10 + idx * 2 + 1);
-
-        u64::from(lo) | (u64::from(hi) << 32)
-    }
-    pub fn write_ioredtbl(&mut self, idx: u8, value: u64) {
-        assert!(idx < 24);
->>>>>>> master
 
         let lo = value as u32;
         let hi = (value >> 32) as u32;
 
         self.write_reg(0x10 + idx * 2, lo);
         self.write_reg(0x10 + idx * 2 + 1, hi);
-<<<<<<< HEAD
         true
-=======
->>>>>>> master
     }
 
     pub fn max_redirection_table_entries(&mut self) -> u8 {
@@ -121,22 +103,16 @@ impl IoApic {
     }
     /// Map an interrupt vector to a physical local APIC ID of a processor (thus physical mode).
     #[allow(dead_code)]
-<<<<<<< HEAD
     pub fn map(&self, idx: u8, info: MapInfo) -> bool {
         let Some(raw) = info.as_raw() else {
             return false;
         };
         self.regs.lock().write_ioredtbl(idx, raw)
-=======
-    pub fn map(&self, idx: u8, info: MapInfo) {
-        self.regs.lock().write_ioredtbl(idx, info.as_raw())
->>>>>>> master
     }
     pub fn set_mask(&self, gsi: u32, mask: bool) {
         let idx = (gsi - self.gsi_start) as u8;
         let mut guard = self.regs.lock();
 
-<<<<<<< HEAD
         let Some(mut reg) = guard.read_ioredtbl(idx) else {
             return;
         };
@@ -144,27 +120,6 @@ impl IoApic {
         reg |= u64::from(mask) << 16;
         let _ = guard.write_ioredtbl(idx, reg);
     }
-    /// Change the destination APIC for a GSI by reprogramming the redirection table entry.
-    /// Preserves all other fields (vector, polarity, trigger mode, delivery mode, mask).
-    /// Returns true if the entry was successfully updated.
-    pub fn set_irq_affinity(&self, gsi: u32, dest: ApicId) -> bool {
-        let idx = (gsi - self.gsi_start) as u8;
-        let mut guard = self.regs.lock();
-        let Some(mut entry) = guard.read_ioredtbl(idx) else {
-            return false;
-        };
-        // Clear destination field (bits 63:56 for xAPIC physical mode)
-        // and set new destination APIC ID
-        entry &= !(0xFF_u64 << 56);
-        entry |= u64::from(dest.get()) << 56;
-        guard.write_ioredtbl(idx, entry)
-=======
-        let mut reg = guard.read_ioredtbl(idx);
-        reg &= !(1 << 16);
-        reg |= u64::from(mask) << 16;
-        guard.write_ioredtbl(idx, reg);
->>>>>>> master
-    }
 }
 
 #[repr(u8)]
@@ -210,7 +165,6 @@ pub struct MapInfo {
 }
 
 impl MapInfo {
-<<<<<<< HEAD
     pub fn as_raw(&self) -> Option<u64> {
         if !(0x20..=0xFE).contains(&self.vector) {
             warn!(
@@ -224,26 +178,13 @@ impl MapInfo {
 
         Some(
             (u64::from(self.dest.get()) << 56)
-=======
-    pub fn as_raw(&self) -> u64 {
-        assert!(self.vector >= 0x20);
-        assert!(self.vector <= 0xFE);
-
-        // TODO: Check for reserved fields.
-
-        (u64::from(self.dest.get()) << 56)
->>>>>>> master
             | (u64::from(self.mask) << 16)
             | ((self.trigger_mode as u64) << 15)
             | ((self.polarity as u64) << 13)
             | ((self.dest_mode as u64) << 11)
             | ((self.delivery_mode as u64) << 8)
-<<<<<<< HEAD
             | u64::from(self.vector),
         )
-=======
-            | u64::from(self.vector)
->>>>>>> master
     }
 }
 
@@ -257,11 +198,7 @@ impl fmt::Debug for IoApic {
 
                 let count = guard.max_redirection_table_entries();
                 f.debug_list()
-<<<<<<< HEAD
                     .entries((0..=count).filter_map(|i| guard.read_ioredtbl(i)))
-=======
-                    .entries((0..count).map(|i| guard.read_ioredtbl(i)))
->>>>>>> master
                     .finish()
             }
         }
@@ -323,7 +260,6 @@ pub unsafe fn handle_ioapic(madt_ioapic: &'static MadtIoApic) {
         let ioapic_registers = virt.data() as *const u32;
         let ioapic = IoApic::new(ioapic_registers, madt_ioapic.gsi_base);
 
-<<<<<<< HEAD
         let detected_id = ioapic.regs.lock().id();
         if detected_id != madt_ioapic.id {
             warn!(
@@ -332,13 +268,6 @@ pub unsafe fn handle_ioapic(madt_ioapic: &'static MadtIoApic) {
                 detected_id
             );
         }
-=======
-        assert_eq!(
-            ioapic.regs.lock().id(),
-            madt_ioapic.id,
-            "mismatched ACPI MADT I/O APIC ID, and the ID reported by the I/O APIC"
-        );
->>>>>>> master
 
         (*IOAPICS.get()).get_or_insert_with(Vec::new).push(ioapic);
     }
@@ -407,19 +336,11 @@ pub unsafe fn init() {
                 }
             }
         }
-<<<<<<< HEAD
         for ioapic in ioapics() {
             for idx in 0..=ioapic.count {
                 ioapic.set_mask(ioapic.gsi_start + u32::from(idx), true);
             }
         }
-=======
-        println!(
-            "I/O APICs: {:?}, overrides: {:?}",
-            ioapics(),
-            src_overrides()
-        );
->>>>>>> master
 
         // map the legacy PC-compatible IRQs (0-15) to 32-47, just like we did with 8259 PIC (if it
         // wouldn't have been disabled due to this I/O APIC)
@@ -434,10 +355,6 @@ pub unsafe fn init() {
                             .iter()
                             .any(|over| over.bus_irq == legacy_irq)
                     {
-<<<<<<< HEAD
-=======
-                        // there's an IRQ conflict, making this legacy IRQ inaccessible.
->>>>>>> master
                         continue;
                     }
                     (
@@ -457,10 +374,6 @@ pub unsafe fn init() {
             let redir_tbl_index = (gsi - apic.gsi_start) as u8;
 
             let map_info = MapInfo {
-<<<<<<< HEAD
-=======
-                // only send to the BSP
->>>>>>> master
                 dest: bsp_apic_id,
                 dest_mode: DestinationMode::Physical,
                 delivery_mode: DeliveryMode::Fixed,
@@ -477,7 +390,6 @@ pub unsafe fn init() {
                 },
                 vector: 32 + legacy_irq,
             };
-<<<<<<< HEAD
             if !apic.map(redir_tbl_index, map_info) {
                 warn!(
                     "Unable to map legacy IRQ {} (GSI {}) through IOAPIC index {}",
@@ -504,9 +416,6 @@ pub unsafe fn init() {
                     );
                 }
             }
-=======
-            apic.map(redir_tbl_index, map_info);
->>>>>>> master
         }
         println!(
             "I/O APICs: {:?}, overrides: {:?}",
@@ -546,11 +455,7 @@ fn resolve(irq: u8) -> u32 {
 fn find_ioapic(gsi: u32) -> Option<&'static IoApic> {
     ioapics()
         .iter()
-<<<<<<< HEAD
         .find(|apic| gsi >= apic.gsi_start && gsi <= apic.gsi_start + u32::from(apic.count))
-=======
-        .find(|apic| gsi >= apic.gsi_start && gsi < apic.gsi_start + u32::from(apic.count))
->>>>>>> master
 }
 
 pub unsafe fn mask(irq: u8) {
@@ -569,17 +474,3 @@ pub unsafe fn unmask(irq: u8) {
     };
     apic.set_mask(gsi, false);
 }
-<<<<<<< HEAD
-
-/// Change the destination CPU for an IRQ by reprogramming the IOAPIC redirection entry.
-/// Resolves the legacy IRQ to its GSI, finds the owning IOAPIC, and updates the destination
-/// APIC ID in the redirection table while preserving all other fields.
-pub unsafe fn set_affinity(irq: u8, dest: ApicId) -> bool {
-    let gsi = resolve(irq);
-    match find_ioapic(gsi) {
-        Some(apic) => apic.set_irq_affinity(gsi, dest),
-        None => false,
-    }
-}
-=======
->>>>>>> master
diff --git a/recipes/core/kernel/source/src/arch/x86_shared/device/local_apic.rs b/recipes/core/kernel/source/src/arch/x86_shared/device/local_apic.rs
index 2bcbdd718e..b300e6fea5 100644
--- a/recipes/core/kernel/source/src/arch/x86_shared/device/local_apic.rs
+++ b/recipes/core/kernel/source/src/arch/x86_shared/device/local_apic.rs
@@ -59,17 +59,10 @@ impl LocalApic {
                 .is_some_and(|feature_info| feature_info.has_x2apic());
 
             if !self.x2 {
-<<<<<<< HEAD
-                info!("Detected xAPIC at {:#x}", physaddr.data());
-                self.address = map_device_memory(physaddr, 4096).data();
-            } else {
-                info!("Detected x2APIC");
-=======
                 debug!("Detected xAPIC at {:#x}", physaddr.data());
                 self.address = map_device_memory(physaddr, 4096).data();
             } else {
                 debug!("Detected x2APIC");
->>>>>>> master
             }
 
             self.init_ap();
@@ -110,11 +103,7 @@ impl LocalApic {
         ApicId::new(if self.x2 {
             unsafe { rdmsr(IA32_X2APIC_APICID) as u32 }
         } else {
-<<<<<<< HEAD
             unsafe { self.read(0x20) >> 24 }
-=======
-            unsafe { self.read(0x20) }
->>>>>>> master
         })
     }
 
@@ -137,7 +126,6 @@ impl LocalApic {
     pub fn set_icr(&mut self, value: u64) {
         if self.x2 {
             unsafe {
-<<<<<<< HEAD
                 const PENDING: u32 = 1 << 12;
                 while (rdmsr(IA32_X2APIC_ICR) as u32) & PENDING == PENDING {
                     core::hint::spin_loop();
@@ -146,9 +134,6 @@ impl LocalApic {
                 while (rdmsr(IA32_X2APIC_ICR) as u32) & PENDING == PENDING {
                     core::hint::spin_loop();
                 }
-=======
-                wrmsr(IA32_X2APIC_ICR, value);
->>>>>>> master
             }
         } else {
             unsafe {
@@ -278,7 +263,6 @@ impl LocalApic {
             }
         }
     }
-<<<<<<< HEAD
 
     pub unsafe fn set_lvt_nmi(&mut self, pin: u8, flags: u16) {
         let polarity = match flags & 0b11 {
@@ -312,8 +296,6 @@ impl LocalApic {
         }
     }
 
-=======
->>>>>>> master
     unsafe fn setup_error_int(&mut self) {
         unsafe {
             let vector = 49u32;
diff --git a/recipes/core/kernel/source/src/arch/x86_shared/device/mod.rs b/recipes/core/kernel/source/src/arch/x86_shared/device/mod.rs
index 2b1c141ea4..a1e0b78ad0 100644
--- a/recipes/core/kernel/source/src/arch/x86_shared/device/mod.rs
+++ b/recipes/core/kernel/source/src/arch/x86_shared/device/mod.rs
@@ -4,17 +4,11 @@ pub mod cpu;
 pub mod hpet;
 pub mod ioapic;
 pub mod local_apic;
-<<<<<<< HEAD
 pub mod msi;
 pub mod pic;
 pub mod pit;
 pub mod serial;
 pub mod vector;
-=======
-pub mod pic;
-pub mod pit;
-pub mod serial;
->>>>>>> master
 #[cfg(feature = "system76_ec_debug")]
 pub mod system76_ec;
 
@@ -31,12 +25,7 @@ pub unsafe fn init() {
     }
 }
 pub unsafe fn init_after_acpi() {
-<<<<<<< HEAD
     unsafe { ioapic::init() };
-=======
-    // this will disable the IOAPIC if needed.
-    //ioapic::init(mapper);
->>>>>>> master
 }
 
 unsafe fn init_hpet() -> bool {
diff --git a/recipes/core/kernel/source/src/arch/x86_shared/gdt.rs b/recipes/core/kernel/source/src/arch/x86_shared/gdt.rs
index e5424a6e51..f7acae35f3 100644
--- a/recipes/core/kernel/source/src/arch/x86_shared/gdt.rs
+++ b/recipes/core/kernel/source/src/arch/x86_shared/gdt.rs
@@ -192,7 +192,6 @@ impl ProcessorControlRegion {
     }
 }
 
-<<<<<<< HEAD
 #[cold]
 fn halt_pcr_init() -> ! {
     println!("FATAL: failed to allocate physical memory for Processor Control Region");
@@ -202,8 +201,6 @@ fn halt_pcr_init() -> ! {
     }
 }
 
-=======
->>>>>>> master
 pub unsafe fn pcr() -> *mut ProcessorControlRegion {
     unsafe {
         // Primitive benchmarking of RDFSBASE and RDGSBASE in userspace, appears to indicate that
@@ -387,14 +384,10 @@ pub fn allocate_and_init_pcr(
         .next_power_of_two()
         .trailing_zeros();
 
-<<<<<<< HEAD
     let pcr_frame = match crate::memory::allocate_p2frame(alloc_order) {
         Some(frame) => frame,
         None => halt_pcr_init(),
     };
-=======
-    let pcr_frame = crate::memory::allocate_p2frame(alloc_order).expect("failed to allocate PCR");
->>>>>>> master
     let pcr_ptr = RmmA::phys_to_virt(pcr_frame.base()).data() as *mut ProcessorControlRegion;
     unsafe { core::ptr::write(pcr_ptr, ProcessorControlRegion::new_partial_init(cpu_id)) };
 
diff --git a/recipes/core/kernel/source/src/arch/x86_shared/idt.rs b/recipes/core/kernel/source/src/arch/x86_shared/idt.rs
index a973649e7d..47f692f656 100644
--- a/recipes/core/kernel/source/src/arch/x86_shared/idt.rs
+++ b/recipes/core/kernel/source/src/arch/x86_shared/idt.rs
@@ -78,7 +78,6 @@ static INIT_BSP_IDT: SyncUnsafeCell<Idt> = SyncUnsafeCell::new(Idt::new());
 pub(crate) static IDTS: RwLock<HashMap<LogicalCpuId, &'static mut Idt>> =
     RwLock::new(HashMap::with_hasher(DefaultHashBuilder::new()));
 
-<<<<<<< HEAD
 #[cold]
 fn halt_idt_init() -> ! {
     println!("FATAL: failed to allocate physical pages for backup interrupt stack");
@@ -88,8 +87,6 @@ fn halt_idt_init() -> ! {
     }
 }
 
-=======
->>>>>>> master
 #[inline]
 pub fn is_reserved(cpu_id: LogicalCpuId, index: u8) -> bool {
     if cpu_id == LogicalCpuId::BSP {
@@ -113,11 +110,6 @@ pub fn set_reserved(cpu_id: LogicalCpuId, index: u8, reserved: bool) {
 }
 
 pub fn available_irqs_iter(cpu_id: LogicalCpuId) -> impl Iterator<Item = u8> + 'static {
-<<<<<<< HEAD
-    let count = (32..=254).filter(|&index| !is_reserved(cpu_id, index)).count();
-    info!("available_irqs_iter: cpu_id={} count={}", cpu_id.get(), count);
-=======
->>>>>>> master
     (32..=254).filter(move |&index| !is_reserved(cpu_id, index))
 }
 
@@ -178,15 +170,10 @@ pub fn allocate_and_init_idt(cpu_id: LogicalCpuId) -> *mut Idt {
         .or_insert_with(|| Box::leak(Box::new(Idt::new())));
 
     use crate::memory::{RmmA, RmmArch};
-<<<<<<< HEAD
     let frames = match crate::memory::allocate_p2frame(4) {
         Some(frames) => frames,
         None => halt_idt_init(),
     };
-=======
-    let frames = crate::memory::allocate_p2frame(4)
-        .expect("failed to allocate pages for backup interrupt stack");
->>>>>>> master
 
     // Physical pages are mapped linearly. So is the linearly mapped virtual memory.
     let base_address = RmmA::phys_to_virt(frames.base());
diff --git a/recipes/core/kernel/source/src/arch/x86_shared/interrupt/exception.rs b/recipes/core/kernel/source/src/arch/x86_shared/interrupt/exception.rs
index 7c7ee2f096..bfe9f096a2 100644
--- a/recipes/core/kernel/source/src/arch/x86_shared/interrupt/exception.rs
+++ b/recipes/core/kernel/source/src/arch/x86_shared/interrupt/exception.rs
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
 use core::sync::atomic::{AtomicBool, Ordering};
 
-=======
->>>>>>> master
 use syscall::Exception;
 use x86::irq::PageFaultError;
 
@@ -15,7 +12,6 @@ use crate::{
     syscall::flag::*,
 };
 
-<<<<<<< HEAD
 static NMI_IN_PROGRESS: AtomicBool = AtomicBool::new(false);
 
 unsafe fn nmi_raw_serial_write(bytes: &[u8]) {
@@ -32,8 +28,6 @@ unsafe fn nmi_raw_serial_write(bytes: &[u8]) {
     }
 }
 
-=======
->>>>>>> master
 interrupt_stack!(divide_by_zero, |stack| {
     println!("Divide by zero");
     stack.trace();
@@ -79,7 +73,6 @@ interrupt_stack!(non_maskable, @paranoid, |stack| {
 
     #[cfg(not(all(target_arch = "x86_64", feature = "profiling")))]
     {
-<<<<<<< HEAD
         if NMI_IN_PROGRESS.swap(true, Ordering::SeqCst) {
             return;
         }
@@ -109,11 +102,6 @@ interrupt_stack!(non_maskable, @paranoid, |stack| {
         }
 
         NMI_IN_PROGRESS.store(false, Ordering::SeqCst);
-=======
-        // TODO: This will likely deadlock
-        println!("Non-maskable interrupt");
-        stack.dump();
->>>>>>> master
     }
 });
 
diff --git a/recipes/core/kernel/source/src/arch/x86_shared/mod.rs b/recipes/core/kernel/source/src/arch/x86_shared/mod.rs
index ce4e333e33..11c33e9457 100644
--- a/recipes/core/kernel/source/src/arch/x86_shared/mod.rs
+++ b/recipes/core/kernel/source/src/arch/x86_shared/mod.rs
@@ -28,11 +28,8 @@ pub mod pti;
 /// Initialization and start function
 pub mod start;
 
-<<<<<<< HEAD
 pub mod sleep;
 
-=======
->>>>>>> master
 /// Stop function
 pub mod stop;
 
diff --git a/recipes/core/kernel/source/src/arch/x86_shared/start.rs b/recipes/core/kernel/source/src/arch/x86_shared/start.rs
index ad0b32185d..cf3e433bee 100644
--- a/recipes/core/kernel/source/src/arch/x86_shared/start.rs
+++ b/recipes/core/kernel/source/src/arch/x86_shared/start.rs
@@ -82,7 +82,6 @@ extern "C" fn kstart() {
 /// The entry to Rust, all things must be initialized
 unsafe extern "C" fn start(args_ptr: *const KernelArgs, stack_end: usize) -> ! {
     unsafe {
-<<<<<<< HEAD
         // EARLY CANARY: write 'R' to COM1 before any kernel init.
         // This proves the serial hardware works and the kernel reached Rust entry.
         // If this character appears but "RedBear OS starting..." does not,
@@ -92,8 +91,6 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs, stack_end: usize) -> ! {
             core::arch::asm!("out dx, al", in("dx") 0x3F8u16, in("al") b'R', options(nostack, preserves_flags));
         }
 
-=======
->>>>>>> master
         let bootstrap = {
             let args = args_ptr.read();
 
@@ -103,7 +100,6 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs, stack_end: usize) -> ! {
             // Set up graphical debug
             graphical_debug::init(args.env());
 
-<<<<<<< HEAD
             // SECOND CANARY: write 'S' to COM1 after serial init.
             // If 'R' appears but 'S' does not, the hang is in serial::init() or graphical_debug::init().
             #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
@@ -129,41 +125,24 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs, stack_end: usize) -> ! {
             #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
             { core::arch::asm!("out dx, al", in("dx") 0x3F8u16, in("al") b'3', options(nostack, preserves_flags)); }
 
-=======
-            info!("Redox OS starting...");
-            args.print();
-
-            // Set up GDT
-            gdt::init_bsp(stack_end);
-
-            // Set up IDT
-            idt::init_bsp();
-
->>>>>>> master
             // Initialize RMM
             #[cfg(target_arch = "x86")]
             crate::startup::memory::init(&args, Some(0x100000), Some(0x40000000));
             #[cfg(target_arch = "x86_64")]
             crate::startup::memory::init(&args, Some(0x100000), None);
 
-<<<<<<< HEAD
             #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
             { core::arch::asm!("out dx, al", in("dx") 0x3F8u16, in("al") b'4', options(nostack, preserves_flags)); }
 
-=======
->>>>>>> master
             // Initialize paging
             paging::init();
 
             #[cfg(target_arch = "x86_64")]
             crate::arch::alternative::early_init(true);
 
-<<<<<<< HEAD
             #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
             { core::arch::asm!("out dx, al", in("dx") 0x3F8u16, in("al") b'5', options(nostack, preserves_flags)); }
 
-=======
->>>>>>> master
             // Set up syscall instruction
             interrupt::syscall::init();
 
@@ -173,12 +152,9 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs, stack_end: usize) -> ! {
             // Activate memory logging
             crate::log::init();
 
-<<<<<<< HEAD
             #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
             { core::arch::asm!("out dx, al", in("dx") 0x3F8u16, in("al") b'6', options(nostack, preserves_flags)); }
 
-=======
->>>>>>> master
             // Initialize miscellaneous processor features
             #[cfg(target_arch = "x86_64")]
             crate::arch::misc::init(LogicalCpuId::BSP);
@@ -186,12 +162,9 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs, stack_end: usize) -> ! {
             // Initialize devices
             device::init();
 
-<<<<<<< HEAD
             #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
             { core::arch::asm!("out dx, al", in("dx") 0x3F8u16, in("al") b'7', options(nostack, preserves_flags)); }
 
-=======
->>>>>>> master
             // Read ACPI tables, starts APs
             if cfg!(feature = "acpi") {
                 crate::acpi::init(args.acpi_rsdp());
diff --git a/recipes/core/kernel/source/src/context/arch/aarch64.rs b/recipes/core/kernel/source/src/context/arch/aarch64.rs
index efbf394e30..33dc83a987 100644
--- a/recipes/core/kernel/source/src/context/arch/aarch64.rs
+++ b/recipes/core/kernel/source/src/context/arch/aarch64.rs
@@ -4,12 +4,6 @@ use crate::{
     percpu::PercpuBlock,
     syscall::FloatRegisters,
 };
-<<<<<<< HEAD
-use core::{mem::offset_of, ptr};
-use spin::Once;
-use syscall::{EnvRegisters, Result};
-
-=======
 use core::{mem::offset_of, ptr, sync::atomic::AtomicBool};
 use spin::Once;
 use syscall::{EnvRegisters, Result};
@@ -20,7 +14,6 @@ use syscall::{EnvRegisters, Result};
 /// This must be done, as no locks can be held on the stack during switch
 pub static CONTEXT_SWITCH_LOCK: AtomicBool = AtomicBool::new(false);
 
->>>>>>> master
 // 512 bytes for registers, extra bytes for fpcr and fpsr
 pub const KFX_ALIGN: usize = 16;
 
diff --git a/recipes/core/kernel/source/src/context/arch/riscv64.rs b/recipes/core/kernel/source/src/context/arch/riscv64.rs
index 2f5bbc95cc..4bd843e620 100644
--- a/recipes/core/kernel/source/src/context/arch/riscv64.rs
+++ b/recipes/core/kernel/source/src/context/arch/riscv64.rs
@@ -2,20 +2,13 @@ use crate::{
     arch::interrupt::InterruptStack, context::context::Kstack, memory::RmmA, percpu::PercpuBlock,
     syscall::FloatRegisters,
 };
-<<<<<<< HEAD
-use core::mem::offset_of;
-=======
 use core::{mem::offset_of, sync::atomic::AtomicBool};
->>>>>>> master
 use rmm::{Arch, VirtualAddress};
 use spin::Once;
 use syscall::{error::*, EnvRegisters};
 
-<<<<<<< HEAD
-=======
 pub static CONTEXT_SWITCH_LOCK: AtomicBool = AtomicBool::new(false);
 
->>>>>>> master
 pub const KFX_ALIGN: usize = 16;
 
 #[derive(Clone, Debug, Default)]
diff --git a/recipes/core/kernel/source/src/context/arch/x86.rs b/recipes/core/kernel/source/src/context/arch/x86.rs
index 7a0aca72af..2862d35f20 100644
--- a/recipes/core/kernel/source/src/context/arch/x86.rs
+++ b/recipes/core/kernel/source/src/context/arch/x86.rs
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-use core::mem::offset_of;
-=======
 use core::{mem::offset_of, sync::atomic::AtomicBool};
->>>>>>> master
 use rmm::{Arch, VirtualAddress};
 use spin::Once;
 use syscall::{error::*, EnvRegisters};
@@ -18,15 +14,12 @@ use crate::{
     syscall::FloatRegisters,
 };
 
-<<<<<<< HEAD
-=======
 /// This must be used by the kernel to ensure that context switches are done atomically
 /// Compare and exchange this to true when beginning a context switch on any CPU
 /// The `Context::switch_to` function will set it back to false, allowing other CPU's to switch
 /// This must be done, as no locks can be held on the stack during switch
 pub static CONTEXT_SWITCH_LOCK: AtomicBool = AtomicBool::new(false);
 
->>>>>>> master
 const ST_RESERVED: u128 = 0xFFFF_FFFF_FFFF_0000_0000_0000_0000_0000;
 
 pub const KFX_ALIGN: usize = 16;
diff --git a/recipes/core/kernel/source/src/context/arch/x86_64.rs b/recipes/core/kernel/source/src/context/arch/x86_64.rs
index 0c5062270a..6758c9fca5 100644
--- a/recipes/core/kernel/source/src/context/arch/x86_64.rs
+++ b/recipes/core/kernel/source/src/context/arch/x86_64.rs
@@ -1,9 +1,6 @@
 use core::{
     ptr::{addr_of, addr_of_mut},
-<<<<<<< HEAD
-=======
     sync::atomic::AtomicBool,
->>>>>>> master
 };
 
 use crate::syscall::FloatRegisters;
@@ -15,15 +12,12 @@ use spin::Once;
 use syscall::{error::*, EnvRegisters};
 use x86::msr;
 
-<<<<<<< HEAD
-=======
 /// This must be used by the kernel to ensure that context switches are done atomically
 /// Compare and exchange this to true when beginning a context switch on any CPU
 /// The `Context::switch_to` function will set it back to false, allowing other CPU's to switch
 /// This must be done, as no locks can be held on the stack during switch
 pub static CONTEXT_SWITCH_LOCK: AtomicBool = AtomicBool::new(false);
 
->>>>>>> master
 const ST_RESERVED: u128 = 0xFFFF_FFFF_FFFF_0000_0000_0000_0000_0000;
 
 #[cfg(cpu_feature_never = "xsave")]
diff --git a/recipes/core/kernel/source/src/context/context.rs b/recipes/core/kernel/source/src/context/context.rs
index 5886e32dc7..6d723f498f 100644
--- a/recipes/core/kernel/source/src/context/context.rs
+++ b/recipes/core/kernel/source/src/context/context.rs
@@ -148,11 +148,8 @@ pub struct Context {
     pub euid: u32,
     pub egid: u32,
     pub pid: usize,
-<<<<<<< HEAD
     /// Supplementary group IDs for access control decisions.
     pub groups: Vec<u32>,
-=======
->>>>>>> master
 
     // See [`PreemptGuard`]
     //
@@ -209,10 +206,7 @@ impl Context {
             euid: 0,
             egid: 0,
             pid: 0,
-<<<<<<< HEAD
             groups: Vec::new(),
-=======
->>>>>>> master
 
             #[cfg(feature = "syscall_debug")]
             syscall_debug_info: crate::syscall::debug::SyscallDebugInfo::default(),
@@ -488,10 +482,7 @@ impl Context {
             uid: self.euid,
             gid: self.egid,
             pid: self.pid,
-<<<<<<< HEAD
             groups: self.groups.clone(),
-=======
->>>>>>> master
         }
     }
 }
diff --git a/recipes/core/kernel/source/src/context/file.rs b/recipes/core/kernel/source/src/context/file.rs
index b0bc56aae0..150f483a47 100644
--- a/recipes/core/kernel/source/src/context/file.rs
+++ b/recipes/core/kernel/source/src/context/file.rs
@@ -4,11 +4,7 @@ use crate::{
     event,
     scheme::{self, SchemeId},
     sync::{CleanLockToken, RwLock, L6},
-<<<<<<< HEAD
     syscall::error::{Error, Result, ESTALE},
-=======
-    syscall::error::Result,
->>>>>>> master
 };
 use alloc::sync::Arc;
 use syscall::{schemev2::NewFdFlags, RwFlags, O_APPEND, O_NONBLOCK};
@@ -22,10 +18,7 @@ pub struct FileDescription {
     pub offset: u64,
     /// The scheme that this file refers to
     pub scheme: SchemeId,
-<<<<<<< HEAD
     pub scheme_generation: Option<u64>,
-=======
->>>>>>> master
     /// The number the scheme uses to refer to this file
     pub number: usize,
     /// The flags passed to open or fcntl(SETFL)
@@ -40,7 +33,6 @@ bitflags! {
     }
 }
 impl FileDescription {
-<<<<<<< HEAD
     pub fn with_generation(
         scheme: SchemeId,
         scheme_generation: Option<u64>,
@@ -87,8 +79,6 @@ impl FileDescription {
         scheme::get_scheme(token.token(), self.scheme)
     }
 
-=======
->>>>>>> master
     pub fn rw_flags(&self, rw: RwFlags) -> u32 {
         let mut ret = self.flags & !(O_NONBLOCK | O_APPEND) as u32;
         if rw.contains(RwFlags::APPEND) {
@@ -133,11 +123,7 @@ impl FileDescription {
     pub fn try_close(self, token: &mut CleanLockToken) -> Result<()> {
         event::unregister_file(self.scheme, self.number, token);
 
-<<<<<<< HEAD
         let scheme = self.get_scheme(token)?;
-=======
-        let scheme = scheme::get_scheme(token.token(), self.scheme)?;
->>>>>>> master
 
         scheme.close(self.number, token)
     }
@@ -146,21 +132,12 @@ impl FileDescription {
 impl FileDescriptor {
     pub fn close(self, token: &mut CleanLockToken) -> Result<()> {
         {
-<<<<<<< HEAD
             let (desc, number, internal_flags) = {
                 let desc = self.description.read(token.token());
                 (*desc, desc.number, desc.internal_flags)
             };
             if internal_flags.contains(InternalFlags::NOTIFY_ON_NEXT_DETACH) {
                 let scheme = desc.get_scheme(token)?;
-=======
-            let (scheme_id, number, internal_flags) = {
-                let desc = self.description.read(token.token());
-                (desc.scheme, desc.number, desc.internal_flags)
-            };
-            if internal_flags.contains(InternalFlags::NOTIFY_ON_NEXT_DETACH) {
-                let scheme = scheme::get_scheme(token.token(), scheme_id)?;
->>>>>>> master
                 scheme.detach(number, token)?;
             }
         }
diff --git a/recipes/core/kernel/source/src/context/memory.rs b/recipes/core/kernel/source/src/context/memory.rs
index fe632c506b..127a34fd87 100644
--- a/recipes/core/kernel/source/src/context/memory.rs
+++ b/recipes/core/kernel/source/src/context/memory.rs
@@ -64,7 +64,6 @@ impl UnmapResult {
             return Ok(());
         };
 
-<<<<<<< HEAD
         let (scheme, number) = {
             let desc = *description.read(token.token());
             (desc.get_scheme(token)?, desc.number)
@@ -72,16 +71,6 @@ impl UnmapResult {
 
         let funmap_result = scheme
             .kfunmap(number, base_offset, self.size, self.flags, token);
-=======
-        let (scheme_id, number) = {
-            let desc = description.write(token.token());
-            (desc.scheme, desc.number)
-        };
-
-        let scheme_opt = scheme::get_scheme(token.token(), scheme_id);
-        let funmap_result = scheme_opt
-            .and_then(|scheme| scheme.kfunmap(number, base_offset, self.size, self.flags, token));
->>>>>>> master
 
         if let Ok(fd) = Arc::try_unwrap(description) {
             fd.into_inner().try_close(token)?;
@@ -2697,7 +2686,6 @@ fn correct_inner<'l>(
             // XXX: This is cheating, but guaranteed we won't deadlock because we've dropped addr_space_guard
             let mut token = unsafe { CleanLockToken::new() };
 
-<<<<<<< HEAD
             let desc = *file_ref.description.read(token.token());
             let scheme = desc.get_scheme(&mut token).map_err(|_| PfError::Segv)?;
             let scheme_number = desc.number;
@@ -2705,22 +2693,6 @@ fn correct_inner<'l>(
                 KernelSchemes::User(user) => user.inner,
                 _ => return Err(PfError::Segv),
             };
-=======
-            let (scheme_id, scheme_number) = {
-                let desc = &file_ref.description.read(token.token());
-                (desc.scheme, desc.number)
-            };
-            let user_inner = scheme::get_scheme(token.token(), scheme_id)
-                .ok()
-                .and_then(|s| {
-                    if let KernelSchemes::User(user) = s {
-                        Some(user.inner)
-                    } else {
-                        None
-                    }
-                })
-                .ok_or(PfError::Segv)?;
->>>>>>> master
 
             let offset = file_ref.base_offset as u64 + (pages_from_grant_start * PAGE_SIZE) as u64;
             user_inner
diff --git a/recipes/core/kernel/source/src/context/mod.rs b/recipes/core/kernel/source/src/context/mod.rs
index c23a6e8fdc..37c73f5a37 100644
--- a/recipes/core/kernel/source/src/context/mod.rs
+++ b/recipes/core/kernel/source/src/context/mod.rs
@@ -14,13 +14,8 @@ use crate::{
     memory::{RmmA, RmmArch, TableKind},
     percpu::PercpuBlock,
     sync::{
-<<<<<<< HEAD
-        ArcRwLockWriteGuard, CleanLockToken, LockToken, McsMutex, McsMutexGuard, Mutex,
-        MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard, L0, L1, L2, L4,
-=======
         ArcRwLockWriteGuard, CleanLockToken, LockToken, Mutex, MutexGuard, RwLock, RwLockReadGuard,
         RwLockWriteGuard, L0, L1, L2, L4,
->>>>>>> master
     },
     syscall::error::Result,
 };
@@ -79,19 +74,10 @@ pub use self::arch::empty_cr3;
 // the context file descriptors.
 static CONTEXTS: RwLock<L2, BTreeSet<ContextRef>> = RwLock::new(BTreeSet::new());
 
-<<<<<<< HEAD
-// Actual context store for the scheduler — uses MCS fair spinlock to
-// eliminate cache-line bouncing under multi-CPU contention.
-static RUN_CONTEXTS: McsMutex<L1, RunContextData> = McsMutex::new(RunContextData::new());
-
-// Context that has been pushed out from RUN_CONTEXTS after being idle.
-// Uses regular Mutex (lower contention; wakeup_contexts uses try_lock).
-=======
 // Actual context store for the scheduler
 static RUN_CONTEXTS: Mutex<L1, RunContextData> = Mutex::new(RunContextData::new());
 
 // Context that has been pushed out from RUN_CONTEXTS after being idle
->>>>>>> master
 static IDLE_CONTEXTS: Mutex<L2, VecDeque<WeakContextRef>> = Mutex::new(VecDeque::new());
 
 pub struct RunContextData {
@@ -127,11 +113,7 @@ pub fn idle_contexts_try(
     IDLE_CONTEXTS.try_lock(token)
 }
 
-<<<<<<< HEAD
-pub fn run_contexts(token: LockToken<'_, L0>) -> McsMutexGuard<'_, L1, RunContextData> {
-=======
 pub fn run_contexts(token: LockToken<'_, L0>) -> MutexGuard<'_, L1, RunContextData> {
->>>>>>> master
     RUN_CONTEXTS.lock(token)
 }
 
diff --git a/recipes/core/kernel/source/src/context/switch.rs b/recipes/core/kernel/source/src/context/switch.rs
index 8e91b7987d..86684c8f4c 100644
--- a/recipes/core/kernel/source/src/context/switch.rs
+++ b/recipes/core/kernel/source/src/context/switch.rs
@@ -15,11 +15,7 @@ use crate::{
 use alloc::{sync::Arc, vec::Vec};
 use core::{
     cell::{Cell, RefCell},
-<<<<<<< HEAD
-    mem,
-=======
     hint, mem,
->>>>>>> master
     sync::atomic::Ordering,
 };
 use syscall::PtraceFlags;
@@ -30,14 +26,6 @@ enum UpdateResult {
     Blocked,
 }
 
-<<<<<<< HEAD
-/// Default number of PIT ticks before triggering a context switch.
-/// At ~2.25 ms per tick, 3 ticks ≈ 6.75 ms timeslice.
-/// Configurable per-CPU via `ContextSwitchPercpu::preempt_interval`.
-const DEFAULT_PREEMPT_INTERVAL: usize = 3;
-
-=======
->>>>>>> master
 // A simple geometric series where value[i] ~= value[i - 1] * 1.25
 const SCHED_PRIO_TO_WEIGHT: [usize; 40] = [
     88761, 71755, 56483, 46273, 36291, 29154, 23254, 18705, 14949, 11916, 9548, 7620, 6100, 4904,
@@ -102,24 +90,13 @@ struct SwitchResultInner {
 ///
 /// The function also calls the signal handler after switching contexts.
 pub fn tick(token: &mut CleanLockToken) {
-<<<<<<< HEAD
-    let percpu = PercpuBlock::current();
-    let ticks_cell = &percpu.switch_internals.pit_ticks;
-=======
     let ticks_cell = &PercpuBlock::current().switch_internals.pit_ticks;
->>>>>>> master
 
     let new_ticks = ticks_cell.get() + 1;
     ticks_cell.set(new_ticks);
 
-<<<<<<< HEAD
-    // Trigger a context switch when the per-CPU preempt interval is reached.
-    let interval = percpu.switch_internals.preempt_interval.get();
-    if new_ticks >= interval {
-=======
     // Trigger a context switch after every 3 ticks (approx. 6.75 ms).
     if new_ticks >= 3 {
->>>>>>> master
         switch(token);
         crate::context::signal::signal_handler(token);
     }
@@ -143,14 +120,7 @@ pub unsafe extern "C" fn switch_finish_hook() {
                 crate::arch::stop::emergency_reset();
             }
         }
-<<<<<<< HEAD
-        PercpuBlock::current()
-            .switch_internals
-            .in_context_switch
-            .set(false);
-=======
         arch::CONTEXT_SWITCH_LOCK.store(false, Ordering::SeqCst);
->>>>>>> master
         crate::percpu::switch_arch_hook();
     }
 }
@@ -180,17 +150,6 @@ pub fn switch(token: &mut CleanLockToken) -> SwitchResult {
     //set PIT Interrupt counter to 0, giving each process same amount of PIT ticks
     percpu.switch_internals.pit_ticks.set(0);
 
-<<<<<<< HEAD
-    // Acquire the per-CPU context switch flag. Each CPU can only be in one context
-    // switch at a time. The per-context write locks provide cross-CPU safety; this
-    // flag catches re-entrant switches on the same CPU (a kernel bug).
-    debug_assert!(
-        !percpu.switch_internals.in_context_switch.get(),
-        "context switch re-entry on CPU {}",
-        percpu.cpu_id
-    );
-    percpu.switch_internals.in_context_switch.set(true);
-=======
     // Acquire the global lock to ensure exclusive access during context switch and avoid
     // issues that would be caused by the unsafe operations below
     // TODO: Better memory orderings?
@@ -201,7 +160,6 @@ pub fn switch(token: &mut CleanLockToken) -> SwitchResult {
         hint::spin_loop();
         percpu.maybe_handle_tlb_shootdown();
     }
->>>>>>> master
 
     // Lock the previous context.
     let prev_context_lock = crate::context::current();
@@ -209,13 +167,8 @@ pub fn switch(token: &mut CleanLockToken) -> SwitchResult {
     let mut prev_context_guard = unsafe { prev_context_lock.write_arc() };
 
     if !prev_context_guard.is_preemptable() {
-<<<<<<< HEAD
-        // Unset per-CPU context switch flag
-        percpu.switch_internals.in_context_switch.set(false);
-=======
         // Unset global lock
         arch::CONTEXT_SWITCH_LOCK.store(false, Ordering::SeqCst);
->>>>>>> master
 
         // Pretend to have finished switching, so CPU is not idled
         return SwitchResult::Switched;
@@ -339,13 +292,8 @@ pub fn switch(token: &mut CleanLockToken) -> SwitchResult {
             SwitchResult::Switched
         }
         _ => {
-<<<<<<< HEAD
-            // No target was found, unset per-CPU context switch flag and return
-            percpu.switch_internals.in_context_switch.set(false);
-=======
             // No target was found, unset global lock and return
             arch::CONTEXT_SWITCH_LOCK.store(false, Ordering::SeqCst);
->>>>>>> master
 
             percpu.stats.set_state(cpu_stats::CpuState::Idle);
 
@@ -404,10 +352,6 @@ fn wakeup_contexts(token: &mut CleanLockToken, switch_time: u128) -> Vec<(usize,
 }
 
 /// This is the scheduler function which currently utilises Deficit Weighted Round Robin Scheduler
-<<<<<<< HEAD
-/// with NUMA-aware context selection preference.
-=======
->>>>>>> master
 fn select_next_context(
     token: &mut CleanLockToken,
     percpu: &PercpuBlock,
@@ -433,13 +377,6 @@ fn select_next_context(
     let total_contexts: usize = contexts_list.iter().map(|q| q.len()).sum();
     let mut skipped_contexts = 0;
 
-<<<<<<< HEAD
-    // NUMA-aware selection: remember cross-node fallback candidate.
-    let my_numa_node = percpu.numa_node.get();
-    let mut cross_node_fallback: Option<(usize, ArcContextLockWriteGuard)> = None;
-
-=======
->>>>>>> master
     'priority: loop {
         i = (i + 1) % 40;
         total_iters += 1;
@@ -504,50 +441,9 @@ fn select_next_context(
             // Is this context runnable on this CPU?
             let sw = unsafe { update_runnable(&mut next_context_guard, cpu_id, switch_time) };
             if let UpdateResult::CanSwitch = sw {
-<<<<<<< HEAD
-                // NUMA-aware selection: check if this context's last CPU was on the same node.
-                let same_node = if my_numa_node != u8::MAX {
-                    next_context_guard.cpu_id
-                        .map(|cid| {
-                            crate::percpu::get_for_cpu(cid)
-                                .map(|p| p.numa_node.get() == my_numa_node)
-                                .unwrap_or(false)
-                        })
-                        .unwrap_or(true) // New context (no last CPU) — treat as same node
-                } else {
-                    true // No NUMA info — treat all as same node
-                };
-
-                if same_node {
-                    // Cache-warm: select immediately
-                    percpu.current_prio.set(next_context_guard.prio);
-                    next_context_guard_opt = Some(next_context_guard);
-                    balance[i] -= SCHED_PRIO_TO_WEIGHT[20];
-                    break 'priority;
-                } else {
-                    // Cross-node candidate: save as fallback, keep scanning for same-node
-                    if cross_node_fallback.is_none() {
-                        // Cache the priority and balance for later
-                        cross_node_fallback =
-                            Some((next_context_guard.prio, next_context_guard));
-                        balance[i] -= SCHED_PRIO_TO_WEIGHT[20];
-                        // Don't break — keep looking for a same-node context
-                        continue;
-                    } else {
-                        // Already have a cross-node fallback; push this one back
-                        contexts.push_back(next_context_ref);
-                        skipped_contexts += 1;
-                        if skipped_contexts >= total_contexts {
-                            break 'priority;
-                        }
-                        continue;
-                    }
-                }
-=======
                 next_context_guard_opt = Some(next_context_guard);
                 balance[i] -= SCHED_PRIO_TO_WEIGHT[20];
                 break 'priority;
->>>>>>> master
             } else {
                 if matches!(sw, UpdateResult::Blocked) {
                     idle_contexts(token.token()).push_back(next_context_ref);
@@ -562,18 +458,6 @@ fn select_next_context(
             }
         }
     }
-<<<<<<< HEAD
-
-    // If we found a cross-node fallback but no same-node context, use it
-    if next_context_guard_opt.is_none() {
-        if let Some((prio, guard)) = cross_node_fallback {
-            percpu.current_prio.set(prio);
-            next_context_guard_opt = Some(guard);
-        }
-    }
-
-=======
->>>>>>> master
     percpu.balance.set(balance);
     percpu.last_queue.set(i);
 
@@ -581,14 +465,7 @@ fn select_next_context(
         // Send the old process to the back of the line (if it is still runnable)
         let prev_ctx = WeakContextRef(Arc::downgrade(&prev_context_lock));
         if prev_context_guard.status.is_runnable() {
-<<<<<<< HEAD
-            let raw_prio = prev_context_guard.prio;
-            let prio = percpu.effective_prio(raw_prio);
-            // Clear PI donation — previous context is being re-queued
-            percpu.pi_donated_prio.store(u32::MAX, Ordering::Relaxed);
-=======
             let prio = prev_context_guard.prio;
->>>>>>> master
             contexts_list[prio].push_back(prev_ctx);
         } else {
             idle_contexts(token.token()).push_back(prev_ctx);
@@ -600,12 +477,7 @@ fn select_next_context(
         return Ok(Some(next_context_guard));
     } else {
         if !was_idle && !Arc::ptr_eq(&prev_context_lock, &idle_context) {
-<<<<<<< HEAD
-            // Switching to idle context — cache lowest priority
-            percpu.current_prio.set(39);
-=======
             // We switch into the idle context
->>>>>>> master
             Ok(Some(unsafe { idle_context.write_arc() }))
         } else {
             // We found no other process to run.
@@ -622,16 +494,6 @@ pub struct ContextSwitchPercpu {
     switch_result: Cell<Option<SwitchResultInner>>,
     switch_time: Cell<u128>,
     pit_ticks: Cell<usize>,
-<<<<<<< HEAD
-    /// Per-CPU context switch flag. Set to true during a context switch on this CPU.
-    /// Replaced the global CONTEXT_SWITCH_LOCK to eliminate cross-CPU serialization.
-    in_context_switch: Cell<bool>,
-    /// Number of PIT ticks before triggering a context switch.
-    /// Default: 3 (≈6.75 ms). Lower values improve interactive responsiveness;
-    /// higher values improve throughput for batch/compute workloads.
-    preempt_interval: Cell<usize>,
-=======
->>>>>>> master
 
     current_ctxt: RefCell<Option<Arc<ContextLock>>>,
 
@@ -646,11 +508,6 @@ impl ContextSwitchPercpu {
             switch_result: Cell::new(None),
             switch_time: Cell::new(0),
             pit_ticks: Cell::new(0),
-<<<<<<< HEAD
-            in_context_switch: Cell::new(false),
-            preempt_interval: Cell::new(DEFAULT_PREEMPT_INTERVAL),
-=======
->>>>>>> master
             current_ctxt: RefCell::new(None),
             idle_ctxt: RefCell::new(None),
             being_sigkilled: Cell::new(false),
diff --git a/recipes/core/kernel/source/src/cpu_set.rs b/recipes/core/kernel/source/src/cpu_set.rs
index 00ce87f7df..4aae7781e9 100644
--- a/recipes/core/kernel/source/src/cpu_set.rs
+++ b/recipes/core/kernel/source/src/cpu_set.rs
@@ -42,29 +42,17 @@ impl core::fmt::Display for LogicalCpuId {
 }
 
 #[cfg(target_pointer_width = "64")]
-<<<<<<< HEAD
-pub const MAX_CPU_COUNT: u32 = 256;
-=======
 pub const MAX_CPU_COUNT: u32 = 128;
->>>>>>> master
 
 #[cfg(target_pointer_width = "32")]
 pub const MAX_CPU_COUNT: u32 = 32;
 
 const SET_WORDS: usize = (MAX_CPU_COUNT / usize::BITS) as usize;
 
-<<<<<<< HEAD
-// TODO: Support more than 256 CPUs.
-// The maximum number of CPUs on Linux is configurable, and the type for LogicalCpuSet and
-// LogicalCpuId may be optimized accordingly. In that case, box the mask if it's larger than some
-// base size (probably 256 bytes). AMD EPYC has 128C/256T, Threadripper PRO 96C/192T —
-// 256 covers current hardware.
-=======
 // TODO: Support more than 128 CPUs.
 // The maximum number of CPUs on Linux is configurable, and the type for LogicalCpuSet and
 // LogicalCpuId may be optimized accordingly. In that case, box the mask if it's larger than some
 // base size (probably 256 bytes).
->>>>>>> master
 #[derive(Debug)]
 pub struct LogicalCpuSet([AtomicUsize; SET_WORDS]);
 
diff --git a/recipes/core/kernel/source/src/event.rs b/recipes/core/kernel/source/src/event.rs
index 4cecd220de..f4f57c2351 100644
--- a/recipes/core/kernel/source/src/event.rs
+++ b/recipes/core/kernel/source/src/event.rs
@@ -1,9 +1,5 @@
 use alloc::sync::Arc;
-<<<<<<< HEAD
 use core::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
-=======
-use core::sync::atomic::{AtomicUsize, Ordering};
->>>>>>> master
 use hashbrown::{hash_map::DefaultHashBuilder, HashMap};
 use smallvec::SmallVec;
 use syscall::data::GlobalSchemes;
@@ -27,10 +23,7 @@ int_like!(EventQueueId, AtomicEventQueueId, usize, AtomicUsize);
 pub struct EventQueue {
     id: EventQueueId,
     queue: WaitQueue<Event>,
-<<<<<<< HEAD
     pub eventfd: Option<(AtomicU64, bool)>, // (counter, semaphore_mode)
-=======
->>>>>>> master
 }
 
 impl EventQueue {
@@ -38,7 +31,6 @@ impl EventQueue {
         EventQueue {
             id,
             queue: WaitQueue::new(),
-<<<<<<< HEAD
             eventfd: None,
         }
     }
@@ -48,8 +40,6 @@ impl EventQueue {
             id,
             queue: WaitQueue::new(),
             eventfd: Some((AtomicU64::new(initval), semaphore)),
-=======
->>>>>>> master
         }
     }
 
diff --git a/recipes/core/kernel/source/src/main.rs b/recipes/core/kernel/source/src/main.rs
index c8d957df0a..32f491d0e8 100644
--- a/recipes/core/kernel/source/src/main.rs
+++ b/recipes/core/kernel/source/src/main.rs
@@ -70,12 +70,6 @@ mod log;
 /// Memory management
 mod memory;
 
-<<<<<<< HEAD
-/// NUMA topology
-mod numa;
-
-=======
->>>>>>> master
 /// Panic
 mod panic;
 
diff --git a/recipes/core/kernel/source/src/numa.rs b/recipes/core/kernel/source/src/numa.rs
index cba73a4465..40c5a06812 100644
--- a/recipes/core/kernel/source/src/numa.rs
+++ b/recipes/core/kernel/source/src/numa.rs
@@ -1,15 +1,13 @@
 /// NUMA topology hints for the kernel scheduler.
-///
-/// NUMA discovery (SRAT/SLIT parsing) is performed during kernel ACPI init
-/// (`acpi::init()`). The kernel stores a lightweight copy for O(1) scheduling
-/// lookups. If no SRAT is found, `init_default()` creates a single-node topology.
-use crate::acpi::srat;
+/// NUMA discovery (SRAT/SLIT parsing) is performed by a userspace daemon
+/// (numad) via /scheme/acpi/, then pushed to the kernel via scheme:numa.
+/// The kernel stores a lightweight copy for O(1) scheduling lookups.
 use crate::cpu_set::{LogicalCpuId, LogicalCpuSet};
 use core::sync::atomic::{AtomicBool, Ordering};
 
 const MAX_NUMA_NODES: usize = 8;
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct NumaHint {
     pub node_id: u8,
     pub cpus: LogicalCpuSet,
@@ -23,12 +21,17 @@ pub struct NumaTopology {
 impl NumaTopology {
     pub const fn new() -> Self {
         const NONE: Option<NumaHint> = None;
-        Self { nodes: [NONE; MAX_NUMA_NODES], initialized: AtomicBool::new(false) }
+        Self {
+            nodes: [NONE; MAX_NUMA_NODES],
+            initialized: AtomicBool::new(false),
+        }
     }
 
     pub fn node_for_cpu(&self, cpu: LogicalCpuId) -> Option<u8> {
         for node in self.nodes.iter().flatten() {
-            if node.cpus.contains(cpu) { return Some(node.node_id); }
+            if node.cpus.contains(cpu) {
+                return Some(node.node_id);
+            }
         }
         None
     }
@@ -40,42 +43,20 @@ impl NumaTopology {
 
 static mut NUMA_TOPOLOGY: NumaTopology = NumaTopology::new();
 
-pub fn topology() -> &'static NumaTopology { unsafe { &NUMA_TOPOLOGY } }
-
-/// Initialize NUMA topology from SRAT data parsed during ACPI init.
-pub fn init_from_srat(apic_ids: &[(u32, LogicalCpuId)]) {
-    let topo = topology();
-    if topo.initialized.swap(true, Ordering::AcqRel) { return; }
-    if !srat::is_available() { init_default_inner(); return; }
-    unsafe {
-        let topo_mut = &mut *core::ptr::addr_of_mut!(NUMA_TOPOLOGY);
-        for &(apic_id, cpu_id) in apic_ids {
-            if let Some(node) = srat::numa_node_for_apic(apic_id) {
-                let idx = node as usize;
-                if idx < MAX_NUMA_NODES {
-                    topo_mut.nodes[idx].get_or_insert_with(|| NumaHint { node_id: node, cpus: LogicalCpuSet::empty() }).cpus.atomic_set(cpu_id);
-                }
-            }
-        }
-        if topo_mut.nodes.iter().all(|n| n.is_none()) {
-            topo_mut.nodes[0] = Some(NumaHint { node_id: 0, cpus: LogicalCpuSet::all() });
-        }
-    }
-    let node_count = topology().nodes.iter().filter(|n| n.is_some()).count();
-    debug!("NUMA: {node_count} node(s) from SRAT");
+pub fn topology() -> &'static NumaTopology {
+    unsafe { &NUMA_TOPOLOGY }
 }
 
-/// Fallback: single-node topology.
 pub fn init_default() {
     let topo = topology();
-    if topo.initialized.swap(true, Ordering::AcqRel) { return; }
-    init_default_inner();
-}
-
-fn init_default_inner() {
+    if topo.initialized.swap(true, Ordering::AcqRel) {
+        return;
+    }
     unsafe {
         let topo_mut = &mut *core::ptr::addr_of_mut!(NUMA_TOPOLOGY);
-        topo_mut.nodes[0] = Some(NumaHint { node_id: 0, cpus: LogicalCpuSet::all() });
+        topo_mut.nodes[0] = Some(NumaHint {
+            node_id: 0,
+            cpus: LogicalCpuSet::all(),
+        });
     }
-    debug!("NUMA: single-node topology (no SRAT)");
 }
diff --git a/recipes/core/kernel/source/src/percpu.rs b/recipes/core/kernel/source/src/percpu.rs
index b464c4eea3..f4ad5e66e6 100644
--- a/recipes/core/kernel/source/src/percpu.rs
+++ b/recipes/core/kernel/source/src/percpu.rs
@@ -4,20 +4,9 @@ use alloc::{
 };
 use core::{
     cell::{Cell, RefCell},
-<<<<<<< HEAD
-    hint,
-    sync::atomic::{AtomicBool, AtomicPtr, AtomicU32, AtomicU64, Ordering},
-};
-
-/// Maximum number of pages to flush individually using INVLPG before falling
-/// back to a full TLB flush (CR3 reload).
-const TLB_RANGE_THRESHOLD: u32 = 32;
-
-=======
     sync::atomic::{AtomicBool, AtomicPtr, Ordering},
 };
 
->>>>>>> master
 use rmm::Arch;
 use syscall::PtraceFlags;
 
@@ -27,11 +16,7 @@ use crate::{
     cpu_set::{LogicalCpuId, MAX_CPU_COUNT},
     cpu_stats::{CpuStats, CpuStatsData},
     ptrace::Session,
-<<<<<<< HEAD
-    sync::{mcs::McsNode, mcs::McsRawLock, CleanLockToken},
-=======
     sync::CleanLockToken,
->>>>>>> master
     syscall::debug::SyscallDebugInfo,
 };
 
@@ -49,41 +34,6 @@ pub struct PercpuBlock {
     pub balance: Cell<[usize; 40]>,
     pub last_queue: Cell<usize>,
 
-<<<<<<< HEAD
-    /// Per-CPU MCS node for the scheduler run-queue lock (RUN_CONTEXTS).
-    pub mcs_sched_node: McsNode,
-
-    /// Counts how many times the scheduler MCS lock acquisition was contended.
-    pub mcs_contention_count: Cell<u64>,
-
-    /// TLB shootdown range: start virtual address (page-aligned).
-    /// Set to 0 for a full flush. Only valid when `wants_tlb_shootdown` is true.
-    pub tlb_flush_start: AtomicU64,
-    /// TLB shootdown range: number of pages to invalidate.
-    pub tlb_flush_count: AtomicU32,
-
-    /// Priority inheritance donation. When another CPU is blocked waiting on a
-    /// lock this CPU holds, the blocked CPU may donate its priority here.
-    /// `u32::MAX` means no donation; otherwise it's a priority level (0-39).
-    pub pi_donated_prio: AtomicU32,
-
-    /// Cached priority of the currently-running context on this CPU.
-    /// Set by the scheduler when selecting a new context. Read by the MCS
-    /// lock during priority donation — avoids acquiring the context RwLock
-    /// from the spin loop. Default 39 (lowest priority).
-    pub current_prio: Cell<usize>,
-
-    /// NUMA proximity domain for this CPU. Set during ACPI init from SRAT.
-    /// `u8::MAX` means unknown (no SRAT or APIC ID not listed).
-    pub numa_node: Cell<u8>,
-
-    /// Pointer to the MCS lock this CPU is currently spinning on (for transitive PI).
-    /// `null` when not waiting on any lock. Set in McsRawLock::acquire() before
-    /// entering the spin loop, cleared upon acquisition.
-    pub waiting_on_lock: AtomicPtr<McsRawLock>,
-
-=======
->>>>>>> master
     // TODO: Put mailbox queues here, e.g. for TLB shootdown? Just be sure to 128-byte align it
     // first to avoid cache invalidation.
     pub profiling: Option<&'static crate::profiling::RingBuffer>,
@@ -107,18 +57,6 @@ pub unsafe fn init_tlb_shootdown(id: LogicalCpuId, block: *mut PercpuBlock) {
     ALL_PERCPU_BLOCKS[id.get() as usize].store(block, Ordering::Release)
 }
 
-<<<<<<< HEAD
-/// Get a reference to another CPU's PercpuBlock by logical CPU ID.
-pub fn get_for_cpu(id: LogicalCpuId) -> Option<&'static PercpuBlock> {
-    unsafe {
-        ALL_PERCPU_BLOCKS[id.get() as usize]
-            .load(Ordering::Acquire)
-            .as_ref()
-    }
-}
-
-=======
->>>>>>> master
 pub fn get_all_stats() -> Vec<(LogicalCpuId, CpuStatsData)> {
     let mut res = ALL_PERCPU_BLOCKS
         .iter()
@@ -163,131 +101,6 @@ pub fn shootdown_tlb_ipi(target: Option<LogicalCpuId>) {
                 core::hint::spin_loop();
             }
         }
-<<<<<<< HEAD
-        // Full flush — clear range info (Release ordering ensures the flag
-        // swap and these stores are visible to the handler before the IPI).
-        percpublock.tlb_flush_start.store(0, Ordering::Release);
-        percpublock.tlb_flush_count.store(0, Ordering::Release);
-
-        crate::ipi::ipi_single(crate::ipi::IpiKind::Tlb, percpublock);
-    } else {
-        // Broadcast TLB shootdown: set flag on all other CPUs, then send a single
-        // IPI with "all except self" destination shorthand instead of N individual IPIs.
-        let my_percpublock = PercpuBlock::current();
-        for id in 0..crate::cpu_count() {
-            let target_id = LogicalCpuId::new(id);
-            if target_id == my_percpublock.cpu_id {
-                continue;
-            }
-            let Some(percpublock) = (unsafe {
-                ALL_PERCPU_BLOCKS[id as usize]
-                    .load(Ordering::Acquire)
-                    .as_ref()
-            }) else {
-                continue;
-            };
-            // Wait if this CPU still has a pending shootdown from a previous request
-            #[expect(clippy::bool_comparison)]
-            while percpublock
-                .wants_tlb_shootdown
-                .swap(true, Ordering::Release)
-                == true
-            {
-                while percpublock.wants_tlb_shootdown.load(Ordering::Relaxed) == true {
-                    my_percpublock.maybe_handle_tlb_shootdown();
-                    hint::spin_loop();
-                }
-            }
-            // Full flush — clear range info (Release ordering)
-            percpublock.tlb_flush_start.store(0, Ordering::Release);
-            percpublock.tlb_flush_count.store(0, Ordering::Release);
-        }
-        // Single broadcast IPI to all other CPUs using destination shorthand
-        crate::ipi::ipi(crate::ipi::IpiKind::Tlb, crate::ipi::IpiTarget::Other);
-    }
-}
-
-/// Range-based TLB shootdown IPI. Only invalidates the specified virtual address
-/// range using INVLPG per page for ranges up to TLB_RANGE_THRESHOLD pages.
-/// Falls back to full flush for larger ranges.
-pub fn shootdown_tlb_ipi_range(target: Option<LogicalCpuId>, start: usize, count: usize) {
-    if cfg!(not(feature = "multi_core")) {
-        return;
-    }
-
-    let start_aligned = start as u64 & !0xFFF;
-    let count_u32 = count as u32;
-    let use_range = count_u32 > 0 && count_u32 <= TLB_RANGE_THRESHOLD;
-
-    let set_range = |percpublock: &PercpuBlock| {
-        if use_range {
-            percpublock.tlb_flush_start.store(start_aligned, Ordering::Release);
-            percpublock.tlb_flush_count.store(count_u32, Ordering::Release);
-        } else {
-            percpublock.tlb_flush_start.store(0, Ordering::Release);
-            percpublock.tlb_flush_count.store(0, Ordering::Release);
-        }
-    };
-
-    if let Some(target) = target {
-        let my_percpublock = PercpuBlock::current();
-        assert_ne!(target, my_percpublock.cpu_id);
-
-        let Some(percpublock) = (unsafe {
-            ALL_PERCPU_BLOCKS[target.get() as usize]
-                .load(Ordering::Acquire)
-                .as_ref()
-        }) else {
-            return;
-        };
-        #[expect(clippy::bool_comparison)]
-        while percpublock.wants_tlb_shootdown.swap(true, Ordering::Release) == true {
-            while percpublock.wants_tlb_shootdown.load(Ordering::Relaxed) == true {
-                my_percpublock.maybe_handle_tlb_shootdown();
-                hint::spin_loop();
-            }
-        }
-        set_range(percpublock);
-        crate::ipi::ipi_single(crate::ipi::IpiKind::Tlb, percpublock);
-    } else {
-        let my_percpublock = PercpuBlock::current();
-        for id in 0..crate::cpu_count() {
-            let target_id = LogicalCpuId::new(id);
-            if target_id == my_percpublock.cpu_id {
-                continue;
-            }
-            let Some(percpublock) = (unsafe {
-                ALL_PERCPU_BLOCKS[id as usize]
-                    .load(Ordering::Acquire)
-                    .as_ref()
-            }) else {
-                continue;
-            };
-            #[expect(clippy::bool_comparison)]
-            while percpublock.wants_tlb_shootdown.swap(true, Ordering::Release) == true {
-                while percpublock.wants_tlb_shootdown.load(Ordering::Relaxed) == true {
-                    my_percpublock.maybe_handle_tlb_shootdown();
-                    hint::spin_loop();
-                }
-            }
-            set_range(percpublock);
-        }
-        crate::ipi::ipi(crate::ipi::IpiKind::Tlb, crate::ipi::IpiTarget::Other);
-    }
-}
-impl PercpuBlock {
-    /// Return the effective scheduling priority, accounting for priority inheritance.
-    /// Lower number = higher priority (0-39 range).
-    pub fn effective_prio(&self, context_prio: usize) -> usize {
-        let donated = self.pi_donated_prio.load(Ordering::Relaxed);
-        if donated < context_prio as u32 {
-            donated as usize
-        } else {
-            context_prio
-        }
-    }
-
-=======
 
         crate::ipi::ipi_single(crate::ipi::IpiKind::Tlb, percpublock);
     } else {
@@ -299,31 +112,14 @@ impl PercpuBlock {
     }
 }
 impl PercpuBlock {
->>>>>>> master
     pub fn maybe_handle_tlb_shootdown(&self) {
         #[expect(clippy::bool_comparison)]
         if self.wants_tlb_shootdown.swap(false, Ordering::Relaxed) == false {
             return;
         }
 
-<<<<<<< HEAD
-        let start = self.tlb_flush_start.load(Ordering::Acquire);
-        let count = self.tlb_flush_count.load(Ordering::Acquire);
-
-        if start != 0 && count > 0 && count <= TLB_RANGE_THRESHOLD {
-            // Range-based flush using INVLPG per page — cheaper than full CR3 reload.
-            for i in 0..count {
-                let addr = start + (i as u64) * 4096;
-                crate::memory::RmmA::invalidate(rmm::VirtualAddress::new(addr as usize));
-            }
-        } else {
-            // Full TLB flush (CR3 reload) for large ranges or global shootdowns.
-            crate::memory::RmmA::invalidate_all();
-        }
-=======
         // TODO: Finer-grained flush
         crate::memory::RmmA::invalidate_all();
->>>>>>> master
 
         if let Some(addrsp) = &*self.current_addrsp.borrow() {
             addrsp.tlb_ack.fetch_add(1, Ordering::Release);
@@ -393,17 +189,6 @@ impl PercpuBlock {
             wants_tlb_shootdown: AtomicBool::new(false),
             balance: Cell::new([0; 40]),
             last_queue: Cell::new(39),
-<<<<<<< HEAD
-            mcs_sched_node: McsNode::new(),
-            mcs_contention_count: Cell::new(0),
-            tlb_flush_start: AtomicU64::new(0),
-            tlb_flush_count: AtomicU32::new(0),
-            pi_donated_prio: AtomicU32::new(u32::MAX),
-            current_prio: Cell::new(39),
-            numa_node: Cell::new(u8::MAX),
-            waiting_on_lock: AtomicPtr::new(core::ptr::null_mut()),
-=======
->>>>>>> master
             ptrace_flags: Cell::new(PtraceFlags::empty()),
             ptrace_session: RefCell::new(None),
             inside_syscall: Cell::new(false),
diff --git a/recipes/core/kernel/source/src/scheme/acpi.rs b/recipes/core/kernel/source/src/scheme/acpi.rs
index d61d55d063..5d734691a9 100644
--- a/recipes/core/kernel/source/src/scheme/acpi.rs
+++ b/recipes/core/kernel/source/src/scheme/acpi.rs
@@ -10,10 +10,7 @@ use syscall::{
 
 use crate::{
     acpi::{RxsdtEnum, RXSDT_ENUM},
-<<<<<<< HEAD
     arch::sleep,
-=======
->>>>>>> master
     context::file::InternalFlags,
     event,
     sync::{CleanLockToken, RwLock, WaitCondition, L1},
@@ -44,10 +41,7 @@ enum HandleKind {
     TopLevel,
     Rxsdt,
     ShutdownPipe,
-<<<<<<< HEAD
     SleepControl,
-=======
->>>>>>> master
     SchemeRoot,
 }
 
@@ -154,19 +148,11 @@ impl KernelScheme for AcpiScheme {
         if flags & O_EXCL == O_EXCL || flags & O_SYMLINK == O_SYMLINK {
             return Err(Error::new(EINVAL));
         }
-<<<<<<< HEAD
         let (handle_kind, int_flags) = match path {
             "" => {
                 if flags & O_ACCMODE != O_RDONLY && flags & O_STAT != O_STAT {
                     return Err(Error::new(EROFS));
                 }
-=======
-        if flags & O_ACCMODE != O_RDONLY && flags & O_STAT != O_STAT {
-            return Err(Error::new(EROFS));
-        }
-        let (handle_kind, int_flags) = match path {
-            "" => {
->>>>>>> master
                 if flags & O_DIRECTORY != O_DIRECTORY && flags & O_STAT != O_STAT {
                     return Err(Error::new(EISDIR));
                 }
@@ -174,30 +160,23 @@ impl KernelScheme for AcpiScheme {
                 (HandleKind::TopLevel, InternalFlags::POSITIONED)
             }
             "rxsdt" => {
-<<<<<<< HEAD
                 if flags & O_ACCMODE != O_RDONLY && flags & O_STAT != O_STAT {
                     return Err(Error::new(EROFS));
                 }
-=======
->>>>>>> master
                 if flags & O_DIRECTORY == O_DIRECTORY && flags & O_STAT != O_STAT {
                     return Err(Error::new(ENOTDIR));
                 }
                 (HandleKind::Rxsdt, InternalFlags::POSITIONED)
             }
             "kstop" => {
-<<<<<<< HEAD
                 if flags & O_ACCMODE != O_RDONLY && flags & O_STAT != O_STAT {
                     return Err(Error::new(EROFS));
                 }
-=======
->>>>>>> master
                 if flags & O_DIRECTORY == O_DIRECTORY && flags & O_STAT != O_STAT {
                     return Err(Error::new(ENOTDIR));
                 }
                 (HandleKind::ShutdownPipe, InternalFlags::empty())
             }
-<<<<<<< HEAD
             "sleep" => {
                 if flags & O_ACCMODE == O_RDONLY || flags & O_STAT == O_STAT {
                     // allowed
@@ -211,8 +190,6 @@ impl KernelScheme for AcpiScheme {
                 }
                 (HandleKind::SleepControl, InternalFlags::POSITIONED)
             }
-=======
->>>>>>> master
             _ => return Err(Error::new(ENOENT)),
         };
 
@@ -235,10 +212,7 @@ impl KernelScheme for AcpiScheme {
         Ok(match handle.kind {
             HandleKind::Rxsdt => DATA.get().ok_or(Error::new(EBADFD))?.len() as u64,
             HandleKind::ShutdownPipe => 1,
-<<<<<<< HEAD
             HandleKind::SleepControl => sleep::available_sleep_states().len() as u64,
-=======
->>>>>>> master
             HandleKind::TopLevel => 0,
             HandleKind::SchemeRoot => return Err(Error::new(EBADF))?,
         })
@@ -301,10 +275,7 @@ impl KernelScheme for AcpiScheme {
 
                 return dst_buf.copy_exactly(&[0x42]).map(|()| 1);
             }
-<<<<<<< HEAD
             HandleKind::SleepControl => sleep::available_sleep_states(),
-=======
->>>>>>> master
             HandleKind::Rxsdt => DATA.get().ok_or(Error::new(EBADFD))?,
             HandleKind::TopLevel => return Err(Error::new(EISDIR)),
             HandleKind::SchemeRoot => return Err(Error::new(EBADF)),
@@ -347,7 +318,6 @@ impl KernelScheme for AcpiScheme {
                 kind: DirentKind::Socket,
                 name: "kstop",
                 inode: 0,
-<<<<<<< HEAD
                 next_opaque_id: 2,
             })?;
         }
@@ -356,14 +326,11 @@ impl KernelScheme for AcpiScheme {
                 kind: DirentKind::Regular,
                 name: "sleep",
                 inode: 0,
-=======
->>>>>>> master
                 next_opaque_id: u64::MAX,
             })?;
         }
         Ok(buf.finalize())
     }
-<<<<<<< HEAD
     fn kwrite(
         &self,
         id: usize,
@@ -390,8 +357,6 @@ impl KernelScheme for AcpiScheme {
             _ => Err(Error::new(EBADF)),
         }
     }
-=======
->>>>>>> master
     fn kfpath(&self, _id: usize, buf: UserSliceWo, _token: &mut CleanLockToken) -> Result<usize> {
         //TODO: construct useful path?
         buf.copy_common_bytes_from_slice("/scheme/kernel.acpi/".as_bytes())
@@ -420,14 +385,11 @@ impl KernelScheme for AcpiScheme {
                 st_size: 1,
                 ..Default::default()
             },
-<<<<<<< HEAD
             HandleKind::SleepControl => Stat {
                 st_mode: MODE_FILE,
                 st_size: sleep::available_sleep_states().len().try_into().unwrap_or(u64::MAX),
                 ..Default::default()
             },
-=======
->>>>>>> master
             HandleKind::SchemeRoot => return Err(Error::new(EBADF)),
         })?;
 
diff --git a/recipes/core/kernel/source/src/scheme/debug.rs b/recipes/core/kernel/source/src/scheme/debug.rs
index 6e3c51e9f3..4a23b3cf4f 100644
--- a/recipes/core/kernel/source/src/scheme/debug.rs
+++ b/recipes/core/kernel/source/src/scheme/debug.rs
@@ -22,16 +22,10 @@ struct Handle {
 
 static HANDLES: RwLock<L1, HandleMap<Handle>> = RwLock::new(HandleMap::new());
 
-<<<<<<< HEAD
 /// Add to the input queue, translating CR to NL (ICRNL) for serial console compatibility.
 pub fn debug_input(data: u8, token: &mut CleanLockToken) {
     let translated = if data == b'\r' { b'\n' } else { data };
     INPUT.send(translated, token);
-=======
-/// Add to the input queue
-pub fn debug_input(data: u8, token: &mut CleanLockToken) {
-    INPUT.send(data, token);
->>>>>>> master
 }
 
 // Notify readers of input updates
@@ -113,24 +107,16 @@ impl KernelScheme for DebugScheme {
     fn fevent(
         &self,
         id: usize,
-<<<<<<< HEAD
         flags: EventFlags,
-=======
-        _flags: EventFlags,
->>>>>>> master
         token: &mut CleanLockToken,
     ) -> Result<EventFlags> {
         let _handle = *HANDLES.read(token.token()).get(id)?;
 
-<<<<<<< HEAD
         let mut ready = EventFlags::empty();
         if flags.contains(EventFlags::EVENT_READ) {
             ready |= EventFlags::EVENT_READ;
         }
         Ok(ready)
-=======
-        Ok(EventFlags::empty())
->>>>>>> master
     }
 
     fn fsync(&self, id: usize, token: &mut CleanLockToken) -> Result<()> {
diff --git a/recipes/core/kernel/source/src/scheme/event.rs b/recipes/core/kernel/source/src/scheme/event.rs
index 5039d0714f..e6e5142f56 100644
--- a/recipes/core/kernel/source/src/scheme/event.rs
+++ b/recipes/core/kernel/source/src/scheme/event.rs
@@ -1,8 +1,5 @@
 use alloc::sync::Arc;
-<<<<<<< HEAD
 use core::sync::atomic::Ordering;
-=======
->>>>>>> master
 use syscall::{EventFlags, O_NONBLOCK};
 
 use crate::{
@@ -29,17 +26,12 @@ impl KernelScheme for EventScheme {
     fn kopenat(
         &self,
         id: usize,
-<<<<<<< HEAD
         user_buf: StrOrBytes,
-=======
-        _user_buf: StrOrBytes,
->>>>>>> master
         _flags: usize,
         _fcntl_flags: u32,
         _ctx: CallerCtx,
         token: &mut CleanLockToken,
     ) -> Result<OpenResult> {
-<<<<<<< HEAD
         let path = match &user_buf {
             StrOrBytes::Str(s) => s,
             StrOrBytes::Bytes(b) => core::str::from_utf8(b).unwrap_or(""),
@@ -53,8 +45,6 @@ impl KernelScheme for EventScheme {
             queues_mut(token.token()).insert(id, Arc::new(EventQueue::new_eventfd(id, initval, sem)));
             return Ok(OpenResult::SchemeLocal(id.get(), InternalFlags::empty()));
         }
-=======
->>>>>>> master
         if id != SCHEME_ROOT_ID {
             return Err(Error::new(EACCES));
         }
@@ -91,7 +81,6 @@ impl KernelScheme for EventScheme {
             handle.clone()
         };
 
-<<<<<<< HEAD
         if let Some((ref counter, semaphore)) = queue.eventfd {
             let is_nonblock = flags & O_NONBLOCK as u32 != 0;
             if semaphore {
@@ -117,8 +106,6 @@ impl KernelScheme for EventScheme {
             }
         }
 
-=======
->>>>>>> master
         queue.read(buf, flags & O_NONBLOCK as u32 == 0, token)
     }
 
@@ -137,7 +124,6 @@ impl KernelScheme for EventScheme {
             let handle = handles.get(&id).ok_or(Error::new(EBADF))?;
             handle.clone()
         };
-<<<<<<< HEAD
 
         if let Some((ref counter, _semaphore)) = queue.eventfd {
             if buf.len() >= 8 {
@@ -151,8 +137,6 @@ impl KernelScheme for EventScheme {
             return Err(Error::new(EINVAL));
         }
 
-=======
->>>>>>> master
         let mut events_written = 0;
 
         for chunk in buf.in_exact_chunks(size_of::<Event>()) {
diff --git a/recipes/core/kernel/source/src/scheme/irq.rs b/recipes/core/kernel/source/src/scheme/irq.rs
index 45dbda4f0f..c76f411336 100644
--- a/recipes/core/kernel/source/src/scheme/irq.rs
+++ b/recipes/core/kernel/source/src/scheme/irq.rs
@@ -19,12 +19,6 @@ use crate::context::file::InternalFlags;
 
 use super::{CallerCtx, HandleMap, OpenResult, SchemeExt, StrOrBytes};
 #[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
-<<<<<<< HEAD
-use crate::arch::device::{ioapic, local_apic::ApicId};
-
-#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
-=======
->>>>>>> master
 use crate::arch::interrupt::{available_irqs_iter, irq::acknowledge, is_reserved, set_reserved};
 #[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
 use crate::dtb::irqchip::{acknowledge, available_irqs_iter, is_reserved, set_reserved, IRQ_CHIP};
@@ -62,16 +56,11 @@ const INO_AVAIL: u64 = 0x8000_0000_0000_0000;
 const INO_BSP: u64 = 0x8001_0000_0000_0000;
 const INO_PHANDLE: u64 = 0x8003_0000_0000_0000;
 
-<<<<<<< HEAD
 /// Add to the input queue, with iommu validation gate for MSI vectors
 pub fn irq_trigger(irq: u8, token: &mut CleanLockToken) {
     if irq >= 16 && !iommu_validate_msi_irq(irq) {
         return;
     }
-=======
-/// Add to the input queue
-pub fn irq_trigger(irq: u8, token: &mut CleanLockToken) {
->>>>>>> master
     COUNTS.lock()[irq as usize] += 1;
     let fds: SmallVec<[usize; 8]> = {
         HANDLES
@@ -91,28 +80,17 @@ pub fn irq_trigger(irq: u8, token: &mut CleanLockToken) {
 #[allow(dead_code)]
 enum Handle {
     SchemeRoot,
-<<<<<<< HEAD
-    Irq { ack: AtomicUsize, irq: u8, cpu_id: LogicalCpuId },
-=======
     Irq { ack: AtomicUsize, irq: u8 },
->>>>>>> master
     Avail(LogicalCpuId),
     TopLevel,
     Phandle(u8, Vec<u8>),
     Bsp,
-<<<<<<< HEAD
     IrqAffinity { irq: u8, mask: AtomicUsize },
-=======
->>>>>>> master
 }
 impl Handle {
     fn as_irq_handle(&self) -> Option<(&AtomicUsize, u8)> {
         match self {
-<<<<<<< HEAD
-            &Self::Irq { ref ack, irq, cpu_id: _ } => Some((ack, irq)),
-=======
             &Self::Irq { ref ack, irq } => Some((ack, irq)),
->>>>>>> master
             _ => None,
         }
     }
@@ -166,10 +144,6 @@ impl IrqScheme {
                     Handle::Irq {
                         ack: AtomicUsize::new(0),
                         irq: irq_number,
-<<<<<<< HEAD
-                        cpu_id: LogicalCpuId::BSP,
-=======
->>>>>>> master
                     },
                     InternalFlags::empty(),
                 )
@@ -188,10 +162,6 @@ impl IrqScheme {
                     Handle::Irq {
                         ack: AtomicUsize::new(0),
                         irq: irq_number,
-<<<<<<< HEAD
-                        cpu_id,
-=======
->>>>>>> master
                     },
                     InternalFlags::empty(),
                 )
@@ -233,10 +203,6 @@ impl IrqScheme {
                     Handle::Irq {
                         ack: AtomicUsize::new(0),
                         irq: irq_number as u8,
-<<<<<<< HEAD
-                        cpu_id: LogicalCpuId::new(0),
-=======
->>>>>>> master
                     },
                     InternalFlags::empty(),
                 )
@@ -252,7 +218,6 @@ const fn vector_to_irq(vector: u8) -> u8 {
     vector - 32
 }
 
-<<<<<<< HEAD
 const fn msi_vector_is_valid(vector: u8) -> bool {
     vector >= 32 && vector < 0xEF
 }
@@ -261,8 +226,6 @@ fn iommu_validate_msi_irq(_irq: u8) -> bool {
     true
 }
 
-=======
->>>>>>> master
 impl crate::scheme::KernelScheme for IrqScheme {
     fn scheme_root(&self, token: &mut CleanLockToken) -> Result<usize> {
         let id = HANDLES.write(token.token()).insert(Handle::SchemeRoot);
@@ -329,7 +292,6 @@ impl crate::scheme::KernelScheme for IrqScheme {
                     InternalFlags::POSITIONED,
                 )
             } else if let Some(path_str) = path_str.strip_prefix('/') {
-<<<<<<< HEAD
                 let (irq_str, affinity) = path_str
                     .trim_end_matches('/')
                     .rsplit_once('/')
@@ -345,9 +307,6 @@ impl crate::scheme::KernelScheme for IrqScheme {
                 } else {
                     Self::open_ext_irq(flags, LogicalCpuId::new(cpu_id.into()), path_str)?
                 }
-=======
-                Self::open_ext_irq(flags, LogicalCpuId::new(cpu_id.into()), path_str)?
->>>>>>> master
             } else {
                 return Err(Error::new(ENOENT));
             }
@@ -374,7 +333,6 @@ impl crate::scheme::KernelScheme for IrqScheme {
             }
             #[cfg(not(dtb))]
             panic!("")
-<<<<<<< HEAD
         } else if let Some(rest) = path_str.strip_suffix("/affinity") {
             let irq_number = u8::from_str(rest).or(Err(Error::new(ENOENT)))?;
             if irq_number >= TOTAL_IRQ_COUNT {
@@ -382,18 +340,12 @@ impl crate::scheme::KernelScheme for IrqScheme {
             }
             (Handle::IrqAffinity { irq: irq_number, mask: AtomicUsize::new(0) },
              InternalFlags::empty())
-=======
->>>>>>> master
         } else if let Ok(plain_irq_number) = u8::from_str(path_str) {
             if plain_irq_number < BASE_IRQ_COUNT {
                 (
                     Handle::Irq {
                         ack: AtomicUsize::new(0),
                         irq: plain_irq_number,
-<<<<<<< HEAD
-                        cpu_id: LogicalCpuId::BSP,
-=======
->>>>>>> master
                     },
                     InternalFlags::empty(),
                 )
@@ -449,10 +401,6 @@ impl crate::scheme::KernelScheme for IrqScheme {
                 }
             }
             Handle::Avail(cpu_id) => {
-<<<<<<< HEAD
-                let mut listed = 0;
-=======
->>>>>>> master
                 for vector in available_irqs_iter(cpu_id).skip(opaque) {
                     let irq = vector_to_irq(vector);
                     if cpu_id == LogicalCpuId::BSP && irq < BASE_IRQ_COUNT {
@@ -466,13 +414,7 @@ impl crate::scheme::KernelScheme for IrqScheme {
                         name: &intermediate,
                         next_opaque_id: u64::from(vector) + 1,
                     })?;
-<<<<<<< HEAD
-                    listed += 1;
                 }
-                info!("irq getdents Avail: cpu_id={} opaque={} listed={}", cpu_id.get(), opaque, listed);
-=======
-                }
->>>>>>> master
             }
             _ => return Err(Error::new(ENOTDIR)),
         }
@@ -507,22 +449,11 @@ impl crate::scheme::KernelScheme for IrqScheme {
         let handle = handles_guard.get(id)?;
 
         if let &Handle::Irq {
-<<<<<<< HEAD
-            irq: handle_irq,
-            cpu_id: handle_cpu_id,
-            ..
-        } = handle
-            && handle_irq > BASE_IRQ_COUNT
-        {
-            info!("irq close: unreserving vector {} on cpu_id={}", irq_to_vector(handle_irq), handle_cpu_id.get());
-            set_reserved(handle_cpu_id, irq_to_vector(handle_irq), false);
-=======
             irq: handle_irq, ..
         } = handle
             && handle_irq > BASE_IRQ_COUNT
         {
             set_reserved(LogicalCpuId::BSP, irq_to_vector(handle_irq), false);
->>>>>>> master
         }
         Ok(())
     }
@@ -538,7 +469,6 @@ impl crate::scheme::KernelScheme for IrqScheme {
         let handle = handles_guard.get(file)?;
 
         match handle {
-<<<<<<< HEAD
             &Handle::IrqAffinity { irq: _handle_irq, ref mask } => {
                 if buffer.len() < size_of::<u32>() {
                     return Err(Error::new(EINVAL));
@@ -550,26 +480,12 @@ impl crate::scheme::KernelScheme for IrqScheme {
                 if !cpus.contains(&(cpu_id as u8)) {
                     return Err(Error::new(EINVAL));
                 }
-                // Reprogram the IOAPIC redirection entry for x86 targets.
-                // Non-IOAPIC IRQs (e.g. MSI) will return false -> EIO.
-                #[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
-                {
-                    if !unsafe { ioapic::set_affinity(_handle_irq, ApicId::new(cpu_id)) } {
-                        return Err(Error::new(EIO));
-                    }
-                }
                 mask.store(cpu_id as usize, Ordering::Release);
                 Ok(size_of::<u32>())
             }
             &Handle::Irq {
                 irq: handle_irq,
                 ack: ref handle_ack,
-                cpu_id: _,
-=======
-            &Handle::Irq {
-                irq: handle_irq,
-                ack: ref handle_ack,
->>>>>>> master
             } => {
                 if buffer.len() < size_of::<usize>() {
                     return Err(Error::new(EINVAL));
@@ -606,7 +522,6 @@ impl crate::scheme::KernelScheme for IrqScheme {
                 st_nlink: 1,
                 ..Default::default()
             },
-<<<<<<< HEAD
             Handle::IrqAffinity { irq, .. } => Stat {
                 st_mode: MODE_CHR | 0o200,
                 st_size: size_of::<u32>() as u64,
@@ -616,8 +531,6 @@ impl crate::scheme::KernelScheme for IrqScheme {
                 st_nlink: 1,
                 ..Default::default()
             },
-=======
->>>>>>> master
             Handle::Bsp => Stat {
                 st_mode: MODE_CHR | 0o400,
                 st_size: size_of::<usize>() as u64,
@@ -659,14 +572,9 @@ impl crate::scheme::KernelScheme for IrqScheme {
 
         let scheme_path = match handle {
             Handle::Irq { irq, .. } => format!("irq:{}", irq),
-<<<<<<< HEAD
             Handle::IrqAffinity { irq, .. } => format!("irq:{}/affinity", irq),
             Handle::Bsp => "irq:bsp".to_owned(),
             Handle::Avail(cpu_id) => format!("irq:cpu-{:02x}", cpu_id.get()),
-=======
-            Handle::Bsp => "irq:bsp".to_owned(),
-            Handle::Avail(cpu_id) => format!("irq:cpu-{:2x}", cpu_id.get()),
->>>>>>> master
             Handle::Phandle(phandle, _) => format!("irq:phandle-{}", phandle),
             Handle::TopLevel => "irq:".to_owned(),
             _ => return Err(Error::new(EBADF)),
@@ -692,10 +600,6 @@ impl crate::scheme::KernelScheme for IrqScheme {
             Handle::Irq {
                 irq: handle_irq,
                 ack: ref handle_ack,
-<<<<<<< HEAD
-                cpu_id: _,
-=======
->>>>>>> master
             } => {
                 if buffer.len() < size_of::<usize>() {
                     return Err(Error::new(EINVAL));
@@ -715,11 +619,7 @@ impl crate::scheme::KernelScheme for IrqScheme {
                 buffer.write_u32(LogicalCpuId::BSP.get())?;
                 Ok(size_of::<usize>())
             }
-<<<<<<< HEAD
             Handle::Avail(_) | Handle::TopLevel | Handle::Phandle(_, _) | Handle::SchemeRoot | Handle::IrqAffinity { .. } => {
-=======
-            Handle::Avail(_) | Handle::TopLevel | Handle::Phandle(_, _) | Handle::SchemeRoot => {
->>>>>>> master
                 Err(Error::new(EISDIR))
             }
         }
diff --git a/recipes/core/kernel/source/src/scheme/mod.rs b/recipes/core/kernel/source/src/scheme/mod.rs
index 284d07da55..765e547f77 100644
--- a/recipes/core/kernel/source/src/scheme/mod.rs
+++ b/recipes/core/kernel/source/src/scheme/mod.rs
@@ -14,11 +14,7 @@ use alloc::{
 };
 use core::{
     str,
-<<<<<<< HEAD
     sync::atomic::{AtomicU64, AtomicUsize, Ordering},
-=======
-    sync::atomic::{AtomicUsize, Ordering},
->>>>>>> master
 };
 use hashbrown::hash_map::{self, DefaultHashBuilder, HashMap};
 use spin::Once;
@@ -173,10 +169,7 @@ enum Handle {
 
 /// Schemes list
 static HANDLES: Once<RwLock<L1, HashMap<SchemeId, Handle>>> = Once::new();
-<<<<<<< HEAD
 static SCHEME_GENERATIONS: Once<RwLock<L1, HashMap<SchemeId, AtomicU64>>> = Once::new();
-=======
->>>>>>> master
 static SCHEME_LIST_NEXT_ID: AtomicUsize = AtomicUsize::new(MAX_GLOBAL_SCHEMES);
 static SCHEME_LIST_ID: AtomicUsize = AtomicUsize::new(0);
 
@@ -212,13 +205,10 @@ fn init_schemes() -> RwLock<L1, HashMap<SchemeId, Handle>> {
     RwLock::new(handles)
 }
 
-<<<<<<< HEAD
 fn init_scheme_generations() -> RwLock<L1, HashMap<SchemeId, AtomicU64>> {
     RwLock::new(HashMap::new())
 }
 
-=======
->>>>>>> master
 /// Get a handle to a scheme.
 pub fn get_scheme(token: LockToken<'_, L0>, scheme_id: SchemeId) -> Result<KernelSchemes> {
     match handles().read(token).get(&scheme_id) {
@@ -227,7 +217,6 @@ pub fn get_scheme(token: LockToken<'_, L0>, scheme_id: SchemeId) -> Result<Kerne
     }
 }
 
-<<<<<<< HEAD
 pub fn current_scheme_generation(token: LockToken<'_, L0>, scheme_id: SchemeId) -> u64 {
     scheme_generations()
         .read(token)
@@ -236,13 +225,10 @@ pub fn current_scheme_generation(token: LockToken<'_, L0>, scheme_id: SchemeId)
         .unwrap_or(0)
 }
 
-=======
->>>>>>> master
 fn handles<'a>() -> &'a RwLock<L1, HashMap<SchemeId, Handle>> {
     HANDLES.call_once(init_schemes)
 }
 
-<<<<<<< HEAD
 fn scheme_generations<'a>() -> &'a RwLock<L1, HashMap<SchemeId, AtomicU64>> {
     SCHEME_GENERATIONS.call_once(init_scheme_generations)
 }
@@ -258,8 +244,6 @@ fn increment_scheme_generation(scheme_id: SchemeId, token: &mut CleanLockToken)
     }
 }
 
-=======
->>>>>>> master
 /// Scheme list type
 pub struct SchemeList;
 
@@ -304,7 +288,6 @@ impl SchemeList {
 
     /// Remove a scheme
     fn remove(&self, id: usize, token: &mut CleanLockToken) {
-<<<<<<< HEAD
         let scheme_id = SchemeId(id);
         let scheme = handles().write(token.token()).remove(&scheme_id);
 
@@ -313,11 +296,6 @@ impl SchemeList {
             user.inner.fail_pending_calls(token);
         }
         increment_scheme_generation(scheme_id, token);
-=======
-        let scheme = handles().write(token.token()).remove(&SchemeId(id));
-
-        assert!(scheme.is_some());
->>>>>>> master
         if let Some(Handle::Scheme(KernelSchemes::User(user))) = scheme
             && let Some(user) = Arc::into_inner(user.inner)
         {
@@ -342,7 +320,6 @@ impl KernelScheme for SchemeList {
         token: &mut CleanLockToken,
     ) -> Result<OpenResult> {
         let scheme_id = SchemeId(scheme_id);
-<<<<<<< HEAD
         let maybe_inner = {
             let handles = handles().read(token.token());
             match handles.get(&scheme_id).ok_or(Error::new(EBADF))? {
@@ -369,34 +346,6 @@ impl KernelScheme for SchemeList {
             ))));
         }
 
-=======
-        match handles()
-            .read(token.token())
-            .get(&scheme_id)
-            .ok_or(Error::new(EBADF))?
-        {
-            Handle::Scheme(KernelSchemes::User(UserScheme { inner })) => {
-                let inner = inner.clone();
-                assert!(scheme_id == inner.scheme_id);
-                let scheme = scheme_id;
-                let params = unsafe { user_buf.read_exact::<NewFdParams>()? };
-
-                return Ok(OpenResult::External(Arc::new(RwLock::new(
-                    FileDescription {
-                        scheme,
-                        number: params.number,
-                        offset: params.offset,
-                        flags: params.flags as u32,
-                        internal_flags: InternalFlags::from_extra0(params.internal_flags)
-                            .ok_or(Error::new(EINVAL))?,
-                    },
-                ))));
-            }
-            Handle::SchemeCreationCapability => (),
-            _ => return Err(Error::new(EBADF)),
-        };
-
->>>>>>> master
         const EXPECTED: &[u8] = b"create-scheme";
         let mut buf = [0u8; EXPECTED.len()];
 
@@ -861,10 +810,7 @@ pub struct CallerCtx {
     pub pid: usize,
     pub uid: u32,
     pub gid: u32,
-<<<<<<< HEAD
     pub groups: alloc::vec::Vec<u32>,
-=======
->>>>>>> master
 }
 impl CallerCtx {
     pub fn filter_uid_gid(self, euid: u32, egid: u32) -> Self {
@@ -873,10 +819,7 @@ impl CallerCtx {
                 pid: self.pid,
                 uid: euid,
                 gid: egid,
-<<<<<<< HEAD
                 groups: self.groups,
-=======
->>>>>>> master
             }
         } else {
             self
diff --git a/recipes/core/kernel/source/src/scheme/pipe.rs b/recipes/core/kernel/source/src/scheme/pipe.rs
index c4b1d92103..ebabb5daa2 100644
--- a/recipes/core/kernel/source/src/scheme/pipe.rs
+++ b/recipes/core/kernel/source/src/scheme/pipe.rs
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 use alloc::{
     collections::VecDeque,
     string::{String, ToString},
@@ -6,10 +5,6 @@ use alloc::{
     vec::Vec,
 };
 use core::sync::atomic::{AtomicUsize, Ordering};
-=======
-use alloc::{collections::VecDeque, sync::Arc, vec::Vec};
-use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
->>>>>>> master
 
 use syscall::{data::GlobalSchemes, CallFlags};
 
@@ -24,7 +19,6 @@ use crate::{
     sync::{CleanLockToken, Mutex, RwLock, WaitCondition, L1},
     syscall::{
         data::Stat,
-<<<<<<< HEAD
         error::{
             Error, Result, EAGAIN, EBADF, EEXIST, EINVAL, EINTR, ENOENT, ENOTDIR, EPIPE,
         },
@@ -32,17 +26,12 @@ use crate::{
             EventFlags, EVENT_READ, EVENT_WRITE, MODE_FIFO, O_ACCMODE, O_DIRECTORY,
             O_NONBLOCK, O_RDONLY, O_RDWR, O_STAT, O_WRONLY,
         },
-=======
-        error::{Error, Result, EAGAIN, EBADF, EINTR, EINVAL, ENOENT, EPIPE},
-        flag::{EventFlags, EVENT_READ, EVENT_WRITE, MODE_FIFO, O_NONBLOCK},
->>>>>>> master
         usercopy::{UserSliceRo, UserSliceRw, UserSliceWo},
     },
 };
 
 use super::{CallerCtx, KernelScheme, OpenResult, SchemeExt, StrOrBytes};
 
-<<<<<<< HEAD
 static PIPE_NEXT_ID: AtomicUsize = AtomicUsize::new(1);
 
 #[derive(Clone)]
@@ -84,24 +73,10 @@ struct NamedPipe {
 static HANDLES: RwLock<L1, HashMap<usize, Handle>> =
     RwLock::new(HashMap::with_hasher(DefaultHashBuilder::new()));
 static NAMED_PIPES: RwLock<L1, HashMap<String, Arc<NamedPipe>>> =
-=======
-// TODO: Preallocate a number of scheme IDs, since there can only be *one* root namespace, and
-// therefore only *one* pipe scheme.
-static PIPE_NEXT_ID: AtomicUsize = AtomicUsize::new(0);
-
-enum Handle {
-    Pipe(Arc<Pipe>),
-    SchemeRoot,
-}
-
-// TODO: SLOB?
-static PIPES: RwLock<L1, HashMap<usize, Handle>> =
->>>>>>> master
     RwLock::new(HashMap::with_hasher(DefaultHashBuilder::new()));
 
 const MAX_QUEUE_SIZE: usize = 65536;
 
-<<<<<<< HEAD
 fn next_id() -> usize {
     PIPE_NEXT_ID.fetch_add(1, Ordering::Relaxed)
 }
@@ -254,40 +229,11 @@ pub fn open_named_pipe(path: &str, flags: usize, token: &mut CleanLockToken) ->
 
 pub fn unlink_named_pipe(path: &str, token: &mut CleanLockToken) -> bool {
     NAMED_PIPES.write(token.token()).remove(path).is_some()
-=======
-// In almost all places where Rust (and LLVM) uses pointers, they are limited to nonnegative isize,
-// so this is fine.
-const WRITE_NOT_READ_BIT: usize = 1;
-
-fn from_raw_id(id: usize) -> (bool, usize) {
-    (id & WRITE_NOT_READ_BIT != 0, id & !WRITE_NOT_READ_BIT)
-}
-
-pub fn pipe(token: &mut CleanLockToken) -> Result<(usize, usize)> {
-    // Bit 0 is used for WRITE_NOT_READ_BIT
-    let id = PIPE_NEXT_ID.fetch_add(2, Ordering::Relaxed);
-
-    PIPES.write(token.token()).insert(
-        id,
-        Handle::Pipe(Arc::new(Pipe {
-            queue: Mutex::new(VecDeque::new()),
-            read_condition: WaitCondition::new(),
-            write_condition: WaitCondition::new(),
-            writer_is_alive: AtomicBool::new(true),
-            reader_is_alive: AtomicBool::new(true),
-            has_run_dup: AtomicBool::new(false),
-            fd_queue: Mutex::new(VecDeque::new()),
-        })),
-    );
-
-    Ok((id, id | WRITE_NOT_READ_BIT))
->>>>>>> master
 }
 
 pub struct PipeScheme;
 
 impl PipeScheme {
-<<<<<<< HEAD
     fn get_endpoint(id: usize, token: &mut CleanLockToken) -> Result<EndpointHandle> {
         HANDLES
             .read(token.token())
@@ -295,15 +241,6 @@ impl PipeScheme {
             .and_then(|handle| match handle {
                 Handle::Endpoint(endpoint) => Some(endpoint.clone()),
                 Handle::SchemeRoot => None,
-=======
-    fn get_pipe(key: usize, token: &mut CleanLockToken) -> Result<Arc<Pipe>> {
-        PIPES
-            .read(token.token())
-            .get(&key)
-            .and_then(|handle| match handle {
-                Handle::Pipe(pipe) => Some(Arc::clone(pipe)),
-                _ => None,
->>>>>>> master
             })
             .ok_or(Error::new(EBADF))
     }
@@ -311,25 +248,17 @@ impl PipeScheme {
 
 impl KernelScheme for PipeScheme {
     fn scheme_root(&self, token: &mut CleanLockToken) -> Result<usize> {
-<<<<<<< HEAD
         let id = next_id();
         HANDLES.write(token.token()).insert(id, Handle::SchemeRoot);
         Ok(id)
     }
 
-=======
-        let id = PIPE_NEXT_ID.fetch_add(2, Ordering::Relaxed);
-        PIPES.write(token.token()).insert(id, Handle::SchemeRoot);
-        Ok(id)
-    }
->>>>>>> master
     fn fevent(
         &self,
         id: usize,
         flags: EventFlags,
         token: &mut CleanLockToken,
     ) -> Result<EventFlags> {
-<<<<<<< HEAD
         let endpoint = Self::get_endpoint(id, token)?;
 
         let mut ready = EventFlags::empty();
@@ -346,24 +275,6 @@ impl KernelScheme for PipeScheme {
             && flags.contains(EVENT_READ)
             && (!endpoint.pipe.queue.lock(token.token()).is_empty()
                 || endpoint.pipe.writer_count.load(Ordering::Acquire) == 0)
-=======
-        let (is_writer_not_reader, key) = from_raw_id(id);
-        let pipe = Self::get_pipe(key, token)?;
-
-        let mut ready = EventFlags::empty();
-
-        if is_writer_not_reader
-            && flags.contains(EVENT_WRITE)
-            && (pipe.queue.lock(token.token()).len() <= MAX_QUEUE_SIZE
-                || !pipe.reader_is_alive.load(Ordering::Acquire))
-        {
-            ready |= EventFlags::EVENT_WRITE;
-        }
-        if !is_writer_not_reader
-            && flags.contains(EVENT_READ)
-            && (!pipe.queue.lock(token.token()).is_empty()
-                || !pipe.writer_is_alive.load(Ordering::Acquire))
->>>>>>> master
         {
             ready |= EventFlags::EVENT_READ;
         }
@@ -372,7 +283,6 @@ impl KernelScheme for PipeScheme {
     }
 
     fn close(&self, id: usize, token: &mut CleanLockToken) -> Result<()> {
-<<<<<<< HEAD
         let handle = HANDLES
             .write(token.token())
             .remove(&id)
@@ -415,48 +325,6 @@ impl KernelScheme for PipeScheme {
             }
 
             drop_wait_conditions_if_possible(endpoint.pipe, token);
-=======
-        let (is_write_not_read, key) = from_raw_id(id);
-
-        let pipe = Self::get_pipe(key, token)?;
-        let scheme_id = GlobalSchemes::Pipe.scheme_id();
-
-        let can_remove = if is_write_not_read {
-            pipe.writer_is_alive.store(false, Ordering::SeqCst);
-            event::trigger(scheme_id, key, EVENT_READ, token);
-            pipe.read_condition.notify(token);
-
-            !pipe.reader_is_alive.load(Ordering::SeqCst)
-        } else {
-            pipe.reader_is_alive.store(false, Ordering::SeqCst);
-            event::trigger(scheme_id, key | WRITE_NOT_READ_BIT, EVENT_WRITE, token);
-            pipe.write_condition.notify(token);
-
-            !pipe.writer_is_alive.load(Ordering::SeqCst)
-        };
-
-        if can_remove {
-            let handle = PIPES.write(token.token()).remove(&key);
-            if let Some(Handle::Pipe(pipe)) = handle
-                && let Some(pipe) = Arc::into_inner(pipe)
-            {
-                {
-                    pipe.read_condition.into_drop(token);
-                }
-                {
-                    pipe.write_condition.into_drop(token);
-                }
-            }
-        }
-
-        if let Some(pipe) = Arc::into_inner(pipe) {
-            {
-                pipe.read_condition.into_drop(token);
-            }
-            {
-                pipe.write_condition.into_drop(token);
-            }
->>>>>>> master
         }
 
         Ok(())
@@ -469,15 +337,9 @@ impl KernelScheme for PipeScheme {
         _ctx: CallerCtx,
         token: &mut CleanLockToken,
     ) -> Result<OpenResult> {
-<<<<<<< HEAD
         let endpoint = Self::get_endpoint(old_id, token)?;
 
         if !endpoint.kind.can_read() {
-=======
-        let (is_writer_not_reader, key) = from_raw_id(old_id);
-
-        if is_writer_not_reader {
->>>>>>> master
             return Err(Error::new(EBADF));
         }
 
@@ -487,7 +349,6 @@ impl KernelScheme for PipeScheme {
             return Err(Error::new(EINVAL));
         }
 
-<<<<<<< HEAD
         Ok(OpenResult::SchemeLocal(
             open_endpoint(
                 Arc::clone(&endpoint.pipe),
@@ -499,19 +360,6 @@ impl KernelScheme for PipeScheme {
         ))
     }
 
-=======
-        let pipe = Self::get_pipe(key, token)?;
-
-        if pipe.has_run_dup.swap(true, Ordering::SeqCst) {
-            return Err(Error::new(EBADF));
-        }
-
-        Ok(OpenResult::SchemeLocal(
-            key | WRITE_NOT_READ_BIT,
-            InternalFlags::empty(),
-        ))
-    }
->>>>>>> master
     fn kopenat(
         &self,
         id: usize,
@@ -521,7 +369,6 @@ impl KernelScheme for PipeScheme {
         _ctx: CallerCtx,
         token: &mut CleanLockToken,
     ) -> Result<OpenResult> {
-<<<<<<< HEAD
         let is_scheme_root = {
             let handles = HANDLES.read(token.token());
             match handles.get(&id) {
@@ -563,42 +410,6 @@ impl KernelScheme for PipeScheme {
             ),
             InternalFlags::empty(),
         ))
-=======
-        let (_, key) = from_raw_id(id);
-
-        {
-            let guard = PIPES.read(token.token());
-            if let Some(Handle::SchemeRoot) = guard.get(&key) {
-            } else if let Some(Handle::Pipe(pipe_arc)) = guard.get(&key) {
-                let pipe = Arc::clone(pipe_arc);
-                drop(guard);
-
-                if user_buf.as_bytes() == b"write" {
-                    return Err(Error::new(EINVAL));
-                }
-
-                if pipe.has_run_dup.swap(true, Ordering::SeqCst) {
-                    return Err(Error::new(EBADF));
-                }
-
-                return Ok(OpenResult::SchemeLocal(
-                    key | WRITE_NOT_READ_BIT,
-                    InternalFlags::empty(),
-                ));
-            } else {
-                return Err(Error::new(EBADF));
-            }
-        }
-
-        let path = user_buf.as_str().or(Err(Error::new(EINVAL)))?;
-        if !path.trim_start_matches('/').is_empty() {
-            return Err(Error::new(ENOENT));
-        }
-
-        let (read_id, _) = pipe(token)?;
-
-        Ok(OpenResult::SchemeLocal(read_id, InternalFlags::empty()))
->>>>>>> master
     }
 
     fn kread(
@@ -609,7 +420,6 @@ impl KernelScheme for PipeScheme {
         _stored_flags: u32,
         token: &mut CleanLockToken,
     ) -> Result<usize> {
-<<<<<<< HEAD
         let endpoint = Self::get_endpoint(id, token)?;
 
         if !endpoint.kind.can_read() {
@@ -619,18 +429,6 @@ impl KernelScheme for PipeScheme {
         loop {
             let vec = endpoint.pipe.queue.lock(token.token());
             let (mut vec, mut lock_token) = vec.into_split();
-=======
-        let (is_write_not_read, key) = from_raw_id(id);
-
-        if is_write_not_read {
-            return Err(Error::new(EBADF));
-        }
-        let pipe = Self::get_pipe(key, token)?;
-
-        loop {
-            let vec = pipe.queue.lock(token.token());
-            let (mut vec, mut token) = vec.into_split();
->>>>>>> master
 
             let (s1, s2) = vec.as_slices();
             let s1_count = core::cmp::min(user_buf.len(), s1.len());
@@ -650,7 +448,6 @@ impl KernelScheme for PipeScheme {
             let _ = vec.drain(..bytes_read);
 
             if bytes_read > 0 {
-<<<<<<< HEAD
                 drop(vec);
                 drop(lock_token);
                 trigger_matching(&endpoint.pipe, false, true, EVENT_WRITE, token);
@@ -674,34 +471,11 @@ impl KernelScheme for PipeScheme {
                 .read_condition
                 .wait(vec, "PipeRead::read", &mut lock_token)
             {
-=======
-                event::trigger_locked(
-                    GlobalSchemes::Pipe.scheme_id(),
-                    key | WRITE_NOT_READ_BIT,
-                    EVENT_WRITE,
-                    token.token(),
-                );
-                pipe.write_condition.notify_locked(token.token());
-
-                return Ok(bytes_read);
-            } else if user_buf.is_empty() {
-                return Ok(0);
-            }
-
-            if !pipe.writer_is_alive.load(Ordering::SeqCst) {
-                return Ok(0);
-            } else if fcntl_flags & O_NONBLOCK as u32 != 0 {
-                return Err(Error::new(EAGAIN));
-            } else if !pipe.read_condition.wait(vec, "PipeRead::read", &mut token) {
->>>>>>> master
                 return Err(Error::new(EINTR));
             }
         }
     }
-<<<<<<< HEAD
 
-=======
->>>>>>> master
     fn kwrite(
         &self,
         id: usize,
@@ -710,7 +484,6 @@ impl KernelScheme for PipeScheme {
         _stored_flags: u32,
         token: &mut CleanLockToken,
     ) -> Result<usize> {
-<<<<<<< HEAD
         let endpoint = Self::get_endpoint(id, token)?;
 
         if !endpoint.kind.can_write() {
@@ -722,20 +495,6 @@ impl KernelScheme for PipeScheme {
             let (mut vec, mut lock_token) = vec.into_split();
 
             if endpoint.pipe.reader_count.load(Ordering::Relaxed) == 0 {
-=======
-        let (is_write_not_read, key) = from_raw_id(id);
-
-        if !is_write_not_read {
-            return Err(Error::new(EBADF));
-        }
-        let pipe = Self::get_pipe(key, token)?;
-
-        loop {
-            let vec = pipe.queue.lock(token.token());
-            let (mut vec, mut token) = vec.into_split();
-
-            if !pipe.reader_is_alive.load(Ordering::Relaxed) {
->>>>>>> master
                 return Err(Error::new(EPIPE));
             }
 
@@ -750,10 +509,6 @@ impl KernelScheme for PipeScheme {
 
             let mut bytes_written = 0;
 
-<<<<<<< HEAD
-=======
-            // TODO: Modify VecDeque so that the unwritten portions can be accessed directly?
->>>>>>> master
             for (idx, chunk) in src_buf.in_variable_chunks(TMPBUF_SIZE).enumerate() {
                 let chunk_byte_count = match chunk.copy_common_bytes_to_slice(&mut tmp_buf) {
                     Ok(c) => c,
@@ -765,7 +520,6 @@ impl KernelScheme for PipeScheme {
             }
 
             if bytes_written > 0 {
-<<<<<<< HEAD
                 drop(vec);
                 drop(lock_token);
                 trigger_matching(&endpoint.pipe, true, false, EVENT_READ, token);
@@ -775,40 +529,21 @@ impl KernelScheme for PipeScheme {
             }
 
             if user_buf.is_empty() {
-=======
-                event::trigger_locked(
-                    GlobalSchemes::Pipe.scheme_id(),
-                    key,
-                    EVENT_READ,
-                    token.token(),
-                );
-                pipe.read_condition.notify_locked(token.token());
-
-                return Ok(bytes_written);
-            } else if user_buf.is_empty() {
->>>>>>> master
                 return Ok(0);
             }
 
             if fcntl_flags & O_NONBLOCK as u32 != 0 {
                 return Err(Error::new(EAGAIN));
-<<<<<<< HEAD
             }
             if !endpoint
                 .pipe
                 .write_condition
                 .wait(vec, "PipeWrite::write", &mut lock_token)
-=======
-            } else if !pipe
-                .write_condition
-                .wait(vec, "PipeWrite::write", &mut token)
->>>>>>> master
             {
                 return Err(Error::new(EINTR));
             }
         }
     }
-<<<<<<< HEAD
 
     fn kfpath(&self, id: usize, buf: UserSliceWo, token: &mut CleanLockToken) -> Result<usize> {
         let endpoint = Self::get_endpoint(id, token)?;
@@ -825,24 +560,12 @@ impl KernelScheme for PipeScheme {
 
         buf.copy_exactly(&Stat {
             st_mode: MODE_FIFO | mode,
-=======
-    fn kfpath(&self, _id: usize, buf: UserSliceWo, _token: &mut CleanLockToken) -> Result<usize> {
-        //TODO: construct useful path?
-        buf.copy_common_bytes_from_slice("/scheme/pipe/".as_bytes())
-    }
-    fn kfstat(&self, _id: usize, buf: UserSliceWo, _token: &mut CleanLockToken) -> Result<()> {
-        buf.copy_exactly(&Stat {
-            st_mode: MODE_FIFO | 0o666,
->>>>>>> master
             ..Default::default()
         })?;
 
         Ok(())
     }
-<<<<<<< HEAD
 
-=======
->>>>>>> master
     fn kfdwrite(
         &self,
         id: usize,
@@ -852,7 +575,6 @@ impl KernelScheme for PipeScheme {
         _metadata: &[u64],
         token: &mut CleanLockToken,
     ) -> Result<usize> {
-<<<<<<< HEAD
         let endpoint = Self::get_endpoint(id, token)?;
 
         if !endpoint.kind.can_write() {
@@ -864,25 +586,6 @@ impl KernelScheme for PipeScheme {
             let (mut vec, mut lock_token) = vec.into_split();
 
             if endpoint.pipe.reader_count.load(Ordering::Relaxed) == 0 {
-=======
-        let (is_write_not_read, key) = from_raw_id(id);
-
-        if !is_write_not_read {
-            return Err(Error::new(EBADF));
-        }
-        let pipe = match Self::get_pipe(key, token) {
-            Ok(p) => p,
-            Err(e) => {
-                return Err(e);
-            }
-        };
-
-        loop {
-            let vec = pipe.fd_queue.lock(token.token());
-            let (mut vec, mut token) = vec.into_split();
-
-            if !pipe.reader_is_alive.load(Ordering::Relaxed) {
->>>>>>> master
                 return Err(Error::new(EPIPE));
             }
             if descs.is_empty() {
@@ -902,43 +605,24 @@ impl KernelScheme for PipeScheme {
             let fds_written = vec.len() - before_len;
 
             if fds_written > 0 {
-<<<<<<< HEAD
                 drop(vec);
                 drop(lock_token);
                 trigger_matching(&endpoint.pipe, true, false, EVENT_READ, token);
                 endpoint.pipe.read_condition.notify(token);
-=======
-                event::trigger_locked(
-                    GlobalSchemes::Pipe.scheme_id(),
-                    key,
-                    EVENT_READ,
-                    token.token(),
-                );
-                pipe.read_condition.notify_locked(token.token());
->>>>>>> master
 
                 return Ok(fds_written);
             }
 
-<<<<<<< HEAD
             if !endpoint
                 .pipe
                 .write_condition
                 .wait(vec, "PipeWrite::write", &mut lock_token)
-=======
-            if !pipe
-                .write_condition
-                .wait(vec, "PipeWrite::write", &mut token)
->>>>>>> master
             {
                 return Err(Error::new(EINTR));
             }
         }
     }
-<<<<<<< HEAD
 
-=======
->>>>>>> master
     fn kfdread(
         &self,
         id: usize,
@@ -947,38 +631,19 @@ impl KernelScheme for PipeScheme {
         _metadata: &[u64],
         token: &mut CleanLockToken,
     ) -> Result<usize> {
-<<<<<<< HEAD
         let endpoint = Self::get_endpoint(id, token)?;
 
         if !endpoint.kind.can_read() {
             return Err(Error::new(EBADF));
         }
-=======
-        let (is_write_not_read, key) = from_raw_id(id);
-
-        if is_write_not_read {
-            return Err(Error::new(EBADF));
-        }
-        let pipe = match Self::get_pipe(key, token) {
-            Ok(p) => p,
-            Err(e) => {
-                return Err(e);
-            }
-        };
->>>>>>> master
 
         if payload.is_empty() {
             return Ok(0);
         }
 
         loop {
-<<<<<<< HEAD
             let vec = endpoint.pipe.fd_queue.lock(token.token());
             let (mut vec, mut lock_token) = vec.into_split();
-=======
-            let vec = pipe.fd_queue.lock(token.token());
-            let (mut vec, mut token) = vec.into_split();
->>>>>>> master
 
             let fds_available = vec.len();
             let max_fds_read = payload.len() / size_of::<usize>();
@@ -991,18 +656,13 @@ impl KernelScheme for PipeScheme {
                         fds_to_transfer,
                         payload,
                         flags.contains(CallFlags::FD_CLOEXEC),
-<<<<<<< HEAD
                         &mut lock_token,
-=======
-                        &mut token,
->>>>>>> master
                     )?;
                 } else {
                     bulk_add_fds(
                         fds_to_transfer,
                         payload,
                         flags.contains(CallFlags::FD_CLOEXEC),
-<<<<<<< HEAD
                         &mut lock_token,
                     )?;
                 }
@@ -1011,24 +671,10 @@ impl KernelScheme for PipeScheme {
                 drop(lock_token);
                 trigger_matching(&endpoint.pipe, false, true, EVENT_WRITE, token);
                 endpoint.pipe.write_condition.notify(token);
-=======
-                        &mut token,
-                    )?;
-                }
-
-                event::trigger_locked(
-                    GlobalSchemes::Pipe.scheme_id(),
-                    key | WRITE_NOT_READ_BIT,
-                    EVENT_WRITE,
-                    token.token(),
-                );
-                pipe.write_condition.notify_locked(token.token());
->>>>>>> master
 
                 return Ok(fds_to_read);
             }
 
-<<<<<<< HEAD
             if endpoint.pipe.writer_count.load(Ordering::SeqCst) == 0 {
                 return Ok(0);
             }
@@ -1037,11 +683,6 @@ impl KernelScheme for PipeScheme {
                 .read_condition
                 .wait(vec, "PipeRead::read", &mut lock_token)
             {
-=======
-            if !pipe.writer_is_alive.load(Ordering::SeqCst) {
-                return Ok(0);
-            } else if !pipe.read_condition.wait(vec, "PipeRead::read", &mut token) {
->>>>>>> master
                 return Err(Error::new(EINTR));
             }
         }
@@ -1049,7 +690,6 @@ impl KernelScheme for PipeScheme {
 }
 
 pub struct Pipe {
-<<<<<<< HEAD
     read_condition: WaitCondition,
     write_condition: WaitCondition,
     queue: Mutex<L1, VecDeque<u8>>,
@@ -1070,13 +710,3 @@ impl Pipe {
         }
     }
 }
-=======
-    read_condition: WaitCondition, // signals whether there are available bytes to read
-    write_condition: WaitCondition, // signals whether there is room for additional bytes
-    queue: Mutex<L1, VecDeque<u8>>,
-    reader_is_alive: AtomicBool, // starts set, unset when reader closes
-    writer_is_alive: AtomicBool, // starts set, unset when writer closes
-    has_run_dup: AtomicBool,
-    fd_queue: Mutex<L1, VecDeque<Arc<LockedFileDescription>>>,
-}
->>>>>>> master
diff --git a/recipes/core/kernel/source/src/scheme/proc.rs b/recipes/core/kernel/source/src/scheme/proc.rs
index 9d78f69b75..a9de02ea1a 100644
--- a/recipes/core/kernel/source/src/scheme/proc.rs
+++ b/recipes/core/kernel/source/src/scheme/proc.rs
@@ -105,10 +105,7 @@ enum ContextHandle {
     // Attr handles, to set ens/euid/egid/pid.
     Authority,
     Attr,
-<<<<<<< HEAD
     Groups,
-=======
->>>>>>> master
 
     Status {
         privileged: bool,
@@ -265,10 +262,7 @@ impl ProcScheme {
                 let handle = match actual_name {
                     "attrs" => ContextHandle::Attr,
                     "status" => ContextHandle::Status { privileged: true },
-<<<<<<< HEAD
                     "groups" => ContextHandle::Groups,
-=======
->>>>>>> master
                     _ => return Err(Error::new(ENOENT)),
                 };
 
@@ -314,14 +308,11 @@ impl ProcScheme {
                         let id = NonZeroUsize::new(NEXT_ID.fetch_add(1, Ordering::Relaxed))
                             .ok_or(Error::new(EMFILE))?;
                         let context = context::spawn(true, Some(id), ret, token)?;
-<<<<<<< HEAD
                         {
                             let parent_groups =
                                 context::current().read(token.token()).groups.clone();
                             context.write(token.token()).groups = parent_groups;
                         }
-=======
->>>>>>> master
                         HANDLES.write(token.token()).insert(
                             id.get(),
                             Handle {
@@ -441,10 +432,7 @@ impl KernelScheme for ProcScheme {
     }
 
     fn close(&self, id: usize, token: &mut CleanLockToken) -> Result<()> {
-<<<<<<< HEAD
         let mut inner_token = unsafe { CleanLockToken::new() };
-=======
->>>>>>> master
         let handle = HANDLES
             .write(token.token())
             .remove(&id)
@@ -472,13 +460,7 @@ impl KernelScheme for ProcScheme {
                     ))]
                     regs.set_arg1(arg1);
 
-<<<<<<< HEAD
                     Ok(context.set_addr_space(Some(new), inner_token.downgrade()))
-=======
-                    // TODO: Lock ordering violation
-                    let mut token = unsafe { CleanLockToken::new() };
-                    Ok(context.set_addr_space(Some(new), token.downgrade()))
->>>>>>> master
                 })?;
                 if let Some(old_ctx) = old_ctx
                     && let Some(addrspace) = Arc::into_inner(old_ctx)
@@ -517,10 +499,7 @@ impl KernelScheme for ProcScheme {
         consume: bool,
         token: &mut CleanLockToken,
     ) -> Result<usize> {
-<<<<<<< HEAD
         let mut inner_token = unsafe { CleanLockToken::new() };
-=======
->>>>>>> master
         let handle = HANDLES
             .read(token.token())
             .get(&id)
@@ -611,13 +590,7 @@ impl KernelScheme for ProcScheme {
                 };
                 // TODO: Allocated or AllocatedShared?
                 let addrsp = AddrSpace::current()?;
-<<<<<<< HEAD
                 let page = addrsp.acquire_write(inner_token.downgrade()).mmap_anywhere(
-=======
-                // TODO: Lock ordering violation
-                let mut token = unsafe { CleanLockToken::new() };
-                let page = addrsp.acquire_write(token.downgrade()).mmap_anywhere(
->>>>>>> master
                     &addrsp,
                     NonZeroUsize::new(1).unwrap(),
                     MapFlags::PROT_READ | MapFlags::PROT_WRITE,
@@ -881,7 +854,6 @@ impl KernelScheme for ProcScheme {
     }
 }
 fn extract_scheme_number(fd: usize, token: &mut CleanLockToken) -> Result<(KernelSchemes, usize)> {
-<<<<<<< HEAD
     let desc = {
         let current_lock = context::current();
         let mut current = current_lock.read(token.token());
@@ -893,19 +865,6 @@ fn extract_scheme_number(fd: usize, token: &mut CleanLockToken) -> Result<(Kerne
     };
     let scheme = desc.get_scheme(token)?;
     let number = desc.number;
-=======
-    let (scheme_id, number) = {
-        let current_lock = context::current();
-        let mut current = current_lock.read(token.token());
-        let (context, mut token) = current.token_split();
-        let file_descriptor = context
-            .get_file(FileHandle::from(fd), &mut token)
-            .ok_or(Error::new(EBADF))?;
-        let desc = file_descriptor.description.read(token.token());
-        (desc.scheme, desc.number)
-    };
-    let scheme = scheme::get_scheme(token.token(), scheme_id)?;
->>>>>>> master
 
     Ok((scheme, number))
 }
@@ -1317,7 +1276,6 @@ impl ContextHandle {
                 guard.prio = (info.prio as usize).min(39);
                 Ok(size_of::<ProcSchemeAttrs>())
             }
-<<<<<<< HEAD
             Self::Groups => {
                 const NGROUPS_MAX: usize = 65536;
                 if buf.len() % size_of::<u32>() != 0 {
@@ -1351,8 +1309,6 @@ impl ContextHandle {
                 }
                 Ok(count * size_of::<u32>())
             }
-=======
->>>>>>> master
             ContextHandle::OpenViaDup => {
                 let mut args = buf.usizes();
 
@@ -1557,7 +1513,6 @@ impl ContextHandle {
                     debug_name,
                 })
             }
-<<<<<<< HEAD
             Self::Groups => {
                 let c = &context.read(token.token());
                 let max = buf.len() / size_of::<u32>();
@@ -1567,8 +1522,6 @@ impl ContextHandle {
                 }
                 Ok(count * size_of::<u32>())
             }
-=======
->>>>>>> master
             ContextHandle::Sighandler => {
                 let data = match context.read(token.token()).sig {
                     Some(ref sig) => SetSighandlerData {
diff --git a/recipes/core/kernel/source/src/scheme/sys/cstate.rs b/recipes/core/kernel/source/src/scheme/sys/cstate.rs
deleted file mode 100644
index abd52cc3b3..0000000000
--- a/recipes/core/kernel/source/src/scheme/sys/cstate.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use alloc::vec::Vec;
-
-use crate::{
-    arch::cpuidle,
-    sync::CleanLockToken,
-    syscall::error::{Error, Result, EINVAL},
-};
-
-pub fn resource(_token: &mut CleanLockToken) -> Result<Vec<u8>> {
-    cpuidle::resource()
-}
-
-pub fn policy_write(buf: &[u8], _token: &mut CleanLockToken) -> Result<usize> {
-    cpuidle::policy_write(buf)
-}
diff --git a/recipes/core/kernel/source/src/scheme/sys/mod.rs b/recipes/core/kernel/source/src/scheme/sys/mod.rs
index cd94f33797..8f26187a79 100644
--- a/recipes/core/kernel/source/src/scheme/sys/mod.rs
+++ b/recipes/core/kernel/source/src/scheme/sys/mod.rs
@@ -45,14 +45,6 @@ enum Handle {
         data: Arc<RwLock<L1, Option<Vec<u8>>>>,
     },
     SchemeRoot,
-<<<<<<< HEAD
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    Msr {
-        cpu: usize,
-        msr: u32,
-    },
-=======
->>>>>>> master
 }
 
 #[derive(Clone, Copy)]
@@ -141,31 +133,6 @@ impl KernelScheme for SysScheme {
             let id = HANDLES.write(token.token()).insert(Handle::TopLevel);
 
             Ok(OpenResult::SchemeLocal(id, InternalFlags::POSITIONED))
-<<<<<<< HEAD
-        } else if path.starts_with("msr/") {
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-            {
-                if ctx.uid != 0 {
-                    return Err(Error::new(EPERM));
-                }
-                let rest = &path[4..];
-                let mut parts = rest.split('/');
-                let cpu_str = parts.next().ok_or(Error::new(EINVAL))?;
-                let msr_str = parts.next().ok_or(Error::new(EINVAL))?;
-                if parts.next().is_some() {
-                    return Err(Error::new(EINVAL));
-                }
-                let cpu: usize = cpu_str.parse().map_err(|_| Error::new(EINVAL))?;
-                let msr: u32 = u32::from_str_radix(msr_str, 16).map_err(|_| Error::new(EINVAL))?;
-                let id = HANDLES.write(token.token()).insert(Handle::Msr { cpu, msr });
-                Ok(OpenResult::SchemeLocal(id, InternalFlags::POSITIONED))
-            }
-            #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
-            {
-                Err(Error::new(ENOENT))
-            }
-=======
->>>>>>> master
         } else {
             //Have to iterate to get the path without allocation
             let entry = FILES
@@ -193,11 +160,6 @@ impl KernelScheme for SysScheme {
                 Handle::TopLevel => return Ok(0),
                 Handle::Resource { kind, data, .. } => (*kind, data.clone()),
                 Handle::SchemeRoot => return Err(Error::new(EBADF)),
-<<<<<<< HEAD
-                #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-                Handle::Msr { .. } => return Ok(0),
-=======
->>>>>>> master
             }
         };
         if matches!(kind, Kind::Wr(_)) {
@@ -226,19 +188,6 @@ impl KernelScheme for SysScheme {
             Handle::TopLevel => "",
             Handle::Resource { path, .. } => path,
             Handle::SchemeRoot => return Err(Error::new(EBADF)),
-<<<<<<< HEAD
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-            Handle::Msr { cpu, msr } => {
-                const FIRST: &[u8] = b"sys:msr/";
-                let mut bytes_read = buf.copy_common_bytes_from_slice(FIRST)?;
-                let suffix = format!("{}/{:x}", cpu, msr);
-                if let Some(remaining) = buf.advance(FIRST.len()) {
-                    bytes_read += remaining.copy_common_bytes_from_slice(suffix.as_bytes())?;
-                }
-                return Ok(bytes_read);
-            }
-=======
->>>>>>> master
         };
 
         const FIRST: &[u8] = b"sys:";
@@ -266,18 +215,6 @@ impl KernelScheme for SysScheme {
         let (kind, data_lock) = {
             match HANDLES.read(token.token()).get(id)? {
                 Handle::Resource { kind, data, .. } => (*kind, data.clone()),
-<<<<<<< HEAD
-                #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-                Handle::Msr { cpu, msr } => {
-                    if *cpu != crate::cpu_id().get() as usize {
-                        return Err(Error::new(EINVAL));
-                    }
-                    let val = unsafe { x86::msr::rdmsr(*msr) };
-                    let data = format!("{:016x}\n", val).into_bytes();
-                    return buffer.copy_common_bytes_from_slice(&data[pos..]);
-                }
-=======
->>>>>>> master
                 _ => return Err(Error::new(EBADF)),
             }
         };
@@ -316,21 +253,6 @@ impl KernelScheme for SysScheme {
                 let len = buffer.copy_common_bytes_to_slice(&mut intermediate)?;
                 (*handler, intermediate, len)
             }
-<<<<<<< HEAD
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-            Handle::Msr { cpu, msr } => {
-                if *cpu != crate::cpu_id().get() as usize {
-                    return Err(Error::new(EINVAL));
-                }
-                let mut intermediate = [0_u8; 32];
-                let len = buffer.copy_common_bytes_to_slice(&mut intermediate)?;
-                let val_str = core::str::from_utf8(&intermediate[..len]).map_err(|_| Error::new(EINVAL))?;
-                let val = u64::from_str_radix(val_str.trim(), 16).map_err(|_| Error::new(EINVAL))?;
-                unsafe { x86::msr::wrmsr(*msr, val); }
-                return Ok(len);
-            }
-=======
->>>>>>> master
             Handle::SchemeRoot => return Err(Error::new(EBADF)),
         };
         handler(&intermediate[..len], token)
@@ -347,12 +269,7 @@ impl KernelScheme for SysScheme {
             return Ok(0);
         };
         match HANDLES.read(token.token()).get(id)? {
-<<<<<<< HEAD
-            Handle::Resource { .. }
-            | Handle::Msr { .. } => Err(Error::new(ENOTDIR)),
-=======
             Handle::Resource { .. } => Err(Error::new(ENOTDIR)),
->>>>>>> master
             Handle::TopLevel => {
                 let mut buf = DirentBuf::new(buf, header_size).ok_or(Error::new(EIO))?;
                 for (this_idx, (name, _)) in FILES.iter().enumerate().skip(first_index) {
@@ -376,21 +293,6 @@ impl KernelScheme for SysScheme {
                 Handle::Resource { kind, data, .. } => Some((*kind, data.clone())),
                 Handle::TopLevel => None,
                 Handle::SchemeRoot => return Err(Error::new(EBADF)),
-<<<<<<< HEAD
-                #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-                Handle::Msr { .. } => {
-                    let stat = Stat {
-                        st_mode: 0o600 | MODE_FILE,
-                        st_uid: 0,
-                        st_gid: 0,
-                        st_size: 0,
-                        ..Default::default()
-                    };
-                    buf.copy_exactly(&stat)?;
-                    return Ok(());
-                }
-=======
->>>>>>> master
             }
         };
         let stat = if let Some((kind, data_lock)) = stat_base {
diff --git a/recipes/core/kernel/source/src/scheme/user.rs b/recipes/core/kernel/source/src/scheme/user.rs
index 8a9517f336..dfbf66b1b1 100644
--- a/recipes/core/kernel/source/src/scheme/user.rs
+++ b/recipes/core/kernel/source/src/scheme/user.rs
@@ -80,10 +80,7 @@ const ONE: NonZeroUsize = match NonZeroUsize::new(1) {
     Some(one) => one,
     None => unreachable!(),
 };
-<<<<<<< HEAD
 const MAX_SPURIOUS_WAKEUPS: usize = 100;
-=======
->>>>>>> master
 
 enum ParsedCqe {
     TriggerFevent {
@@ -213,11 +210,8 @@ impl UserInner {
         caller_responsible: &mut PageSpan,
         token: &mut CleanLockToken,
     ) -> Result<Response> {
-<<<<<<< HEAD
         let mut remaining_spurious_wakeups = MAX_SPURIOUS_WAKEUPS;
 
-=======
->>>>>>> master
         {
             // Disable preemption to avoid context switches between setting the
             // process state and sending the scheme request. The process is made
@@ -270,14 +264,10 @@ impl UserInner {
                     };
 
                 let states = self.states.lock(token.token());
-<<<<<<< HEAD
                 let (mut states, mut state_token) = states.into_split();
                 let mut timed_out_descriptions = None;
                 let mut remove_state = false;
                 let mut timed_out = false;
-=======
-                let (mut states, mut token) = states.into_split();
->>>>>>> master
                 match states.get_mut(sqe.tag as usize) {
                     // invalid state
                     None => return Err(Error::new(EBADFD)),
@@ -290,7 +280,6 @@ impl UserInner {
                             fds,
                         } => {
                             let maybe_eintr =
-<<<<<<< HEAD
                                 eintr_if_sigkill(&mut callee_responsible, &mut state_token.token());
 
                             if maybe_eintr.is_ok() {
@@ -320,26 +309,6 @@ impl UserInner {
                                     .write(state_token.token())
                                     .block("UserInner::call (woken up after cancelation request)");
                             }
-=======
-                                eintr_if_sigkill(&mut callee_responsible, &mut token.token());
-                            *o = State::Waiting {
-                                canceling: true,
-                                callee_responsible,
-                                context,
-                                fds,
-                            };
-
-                            maybe_eintr?;
-
-                            context::current()
-                                .write(token.token())
-                                .block("UserInner::call (woken up after cancelation request)");
-
-                            // We do not want to drop the lock before blocking
-                            // as if we get preempted in between we might miss a
-                            // wakeup.
-                            drop(states);
->>>>>>> master
                         }
                         // spurious wakeup
                         State::Waiting {
@@ -348,7 +317,6 @@ impl UserInner {
                             context,
                             mut callee_responsible,
                         } => {
-<<<<<<< HEAD
                             let current_context = context::current();
                             let maybe_eintr =
                                 eintr_if_sigkill(&mut callee_responsible, &mut state_token);
@@ -419,62 +387,6 @@ impl UserInner {
                                     .write(token.token())
                                     .block("UserInner::call (spurious wakeup)");
                             }
-=======
-                            let maybe_eintr = eintr_if_sigkill(&mut callee_responsible, &mut token);
-                            let current_context = context::current();
-
-                            *o = State::Waiting {
-                                // Currently we treat all spurious wakeups to have the same behavior
-                                // as signals (i.e., we send a cancellation request). It is not something
-                                // that should happen, but it certainly can happen, for example if a context
-                                // is awoken through its thread handle without setting any sig bits, or if the
-                                // caller clears its own sig bits. If it actually is a signal, then it is the
-                                // intended behavior.
-                                canceling: true,
-                                fds,
-                                context,
-                                callee_responsible,
-                            };
-
-                            maybe_eintr?;
-
-                            // We do not want to preempt between sending the
-                            // cancellation and blocking again where we might
-                            // miss a wakeup.
-                            let mut preempt = PreemptGuardL1::new(&current_context, &mut token);
-                            let token = preempt.token();
-
-                            self.todo.send_locked(
-                                Sqe {
-                                    opcode: Opcode::Cancel as u8,
-                                    sqe_flags: SqeFlags::ONEWAY,
-                                    tag: sqe.tag,
-                                    ..Default::default()
-                                },
-                                token.token(),
-                            );
-                            event::trigger_locked(
-                                self.root_id,
-                                self.scheme_id.get(),
-                                EVENT_READ,
-                                token.token(),
-                            );
-
-                            // 1. If cancellation was requested and arrived
-                            // before the scheme processed the request, an
-                            // acknowledgement will be sent back after the
-                            // cancellation is processed and we will be woken up
-                            // again. State will be State::Responded then.
-                            //
-                            // 2. If cancellation was requested but the scheme
-                            // already processed the request, we will receive
-                            // the actual response next and woken up again.
-                            // State will be State::Responded then.
-                            context::current()
-                                .write(token.token())
-                                .block("UserInner::call (spurious wakeup)");
-                            drop(states);
->>>>>>> master
                         }
 
                         // invalid state
@@ -489,7 +401,6 @@ impl UserInner {
                         }
                     },
                 }
-<<<<<<< HEAD
 
                 if let Some(descriptions) = timed_out_descriptions {
                     drop(states);
@@ -501,13 +412,10 @@ impl UserInner {
                 if timed_out {
                     return Err(Error::new(ETIMEDOUT));
                 }
-=======
->>>>>>> master
             }
         }
     }
 
-<<<<<<< HEAD
     fn collect_descriptions_to_close(
         fds: Vec<Arc<LockedFileDescription>>,
     ) -> Vec<FileDescription> {
@@ -557,8 +465,6 @@ impl UserInner {
         }
     }
 
-=======
->>>>>>> master
     /// Map a readable structure to the scheme's userspace and return the
     /// pointer
     #[must_use = "copying back to head/tail buffers can fail"]
@@ -1470,10 +1376,7 @@ impl UserInner {
     }
 
     pub fn into_drop(self, token: &mut CleanLockToken) {
-<<<<<<< HEAD
         self.fail_pending_calls(token);
-=======
->>>>>>> master
         self.todo.condition.into_drop(token);
     }
 }
diff --git a/recipes/core/kernel/source/src/startup/memory.rs b/recipes/core/kernel/source/src/startup/memory.rs
index d45d62e6d5..9fb5fb10d9 100644
--- a/recipes/core/kernel/source/src/startup/memory.rs
+++ b/recipes/core/kernel/source/src/startup/memory.rs
@@ -74,24 +74,16 @@ impl MemoryEntry {
 }
 
 struct MemoryMap {
-<<<<<<< HEAD
     entries: [MemoryEntry; 1024],
-=======
-    entries: [MemoryEntry; 512],
->>>>>>> master
     size: usize,
 }
 
 impl MemoryMap {
     fn register(&mut self, base: usize, size: usize, kind: BootloaderMemoryKind) {
         if self.size >= self.entries.len() {
-<<<<<<< HEAD
             #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
             unsafe { core::arch::asm!("out dx, al", in("dx") 0x3F8u16, in("al") b'!', options(nostack, preserves_flags)); }
             panic!("Early memory map overflow at entry {} (max {})", self.size, self.entries.len());
-=======
-            panic!("Early memory map overflow!");
->>>>>>> master
         }
         let start = if kind == BootloaderMemoryKind::Free {
             align_up(base)
@@ -144,11 +136,7 @@ static MEMORY_MAP: SyncUnsafeCell<MemoryMap> = SyncUnsafeCell::new(MemoryMap {
         start: 0,
         end: 0,
         kind: BootloaderMemoryKind::Null,
-<<<<<<< HEAD
     }; 1024],
-=======
-    }; 512],
->>>>>>> master
     size: 0,
 });
 
@@ -337,7 +325,6 @@ unsafe fn map_memory<A: Arch>(areas: &[MemoryArea], mut bump_allocator: &mut Bum
             }
         }
 
-<<<<<<< HEAD
         let kernel_area = match (*MEMORY_MAP.get()).kernel() {
             Some(area) => area,
             None => {
@@ -348,9 +335,6 @@ unsafe fn map_memory<A: Arch>(areas: &[MemoryArea], mut bump_allocator: &mut Bum
                 }
             }
         };
-=======
-        let kernel_area = (*MEMORY_MAP.get()).kernel().unwrap();
->>>>>>> master
         let kernel_base = kernel_area.start;
         let kernel_size = kernel_area.end.saturating_sub(kernel_area.start);
         // Map kernel at KERNEL_OFFSET
diff --git a/recipes/core/kernel/source/src/startup/mod.rs b/recipes/core/kernel/source/src/startup/mod.rs
index fb7f41266e..86aabc227a 100644
--- a/recipes/core/kernel/source/src/startup/mod.rs
+++ b/recipes/core/kernel/source/src/startup/mod.rs
@@ -149,7 +149,6 @@ static BOOTSTRAP: spin::Once<Bootstrap> = spin::Once::new();
 pub(crate) static AP_READY: AtomicBool = AtomicBool::new(false);
 static BSP_READY: AtomicBool = AtomicBool::new(false);
 
-<<<<<<< HEAD
 #[cold]
 fn halt_boot(message: &str) -> ! {
     print!("{message}");
@@ -159,8 +158,6 @@ fn halt_boot(message: &str) -> ! {
     }
 }
 
-=======
->>>>>>> master
 /// This is the kernel entry point for the primary CPU. The arch crate is responsible for calling this
 pub(crate) fn kmain(bootstrap: Bootstrap) -> ! {
     let mut token = unsafe { CleanLockToken::new() };
@@ -192,13 +189,7 @@ pub(crate) fn kmain(bootstrap: Bootstrap) -> ! {
             context.euid = 0;
             context.egid = 0;
         }
-<<<<<<< HEAD
         Err(_err) => halt_boot("FATAL: failed to spawn first userspace process userspace_init\n"),
-=======
-        Err(err) => {
-            panic!("failed to spawn userspace_init: {:?}", err);
-        }
->>>>>>> master
     }
 
     run_userspace(&mut token)
diff --git a/recipes/core/kernel/source/src/sync/mcs.rs b/recipes/core/kernel/source/src/sync/mcs.rs
deleted file mode 100644
index 3ccde13862..0000000000
--- a/recipes/core/kernel/source/src/sync/mcs.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-//! MCS (Mellor-Crummey Scott) fair spinlock.
-//!
-//! Each waiter spins on its own local `locked` flag instead of a shared lock
-//! word, eliminating cache-line bouncing under contention. FIFO ordering
-//! guarantees fairness. O(1) cache-line transfers on unlock.
-//!
-//! Supports transitive priority inheritance: when CPU A waits on a lock held
-//! by CPU B, and CPU B waits on a lock held by CPU C, A's priority is
-//! propagated through the chain to C (up to MAX_PI_CHAIN_DEPTH hops).
-
-use core::sync::atomic::{AtomicBool, AtomicPtr, AtomicU32, Ordering};
-use core::{hint, ptr};
-
-use crate::percpu::PercpuBlock;
-
-/// Maximum depth for transitive priority inheritance chain following.
-/// Prevents infinite loops from theoretical lock cycles and bounds latency.
-/// Linux uses 20; 8 is conservative for a microkernel with fewer nesting levels.
-const MAX_PI_CHAIN_DEPTH: u32 = 8;
-
-/// A node in the MCS lock queue.
-pub struct McsNode {
-    pub next: AtomicPtr<McsNode>,
-    pub locked: AtomicBool,
-}
-
-impl McsNode {
-    pub const fn new() -> Self {
-        Self {
-            next: AtomicPtr::new(ptr::null_mut()),
-            locked: AtomicBool::new(false),
-        }
-    }
-}
-
-/// Raw MCS spinlock primitive.
-pub struct McsRawLock {
-    tail: AtomicPtr<McsNode>,
-    /// CPU ID of the current lock holder (for priority inheritance).
-    /// `u32::MAX` means no holder.
-    holder_cpu: AtomicU32,
-}
-
-impl McsRawLock {
-    pub const fn new() -> Self {
-        Self {
-            tail: AtomicPtr::new(ptr::null_mut()),
-            holder_cpu: AtomicU32::new(u32::MAX),
-        }
-    }
-
-    #[inline]
-    pub fn acquire(&self, node: &McsNode) -> bool {
-        node.next.store(ptr::null_mut(), Ordering::Relaxed);
-        node.locked.store(true, Ordering::Relaxed);
-        let prev = self.tail.swap((node as *const McsNode).cast_mut(), Ordering::AcqRel);
-        if prev.is_null() {
-            // Uncontended — record ourselves as holder
-            let cpu_id = PercpuBlock::current().cpu_id.get();
-            self.holder_cpu.store(cpu_id, Ordering::Release);
-            return false;
-        }
-        unsafe {
-            (*prev).next.store((node as *const McsNode).cast_mut(), Ordering::Release);
-        }
-        let percpu = PercpuBlock::current();
-        // Record which lock we're spinning on (for transitive PI chain following)
-        percpu.waiting_on_lock.store(
-            (self as *const McsRawLock).cast_mut(),
-            Ordering::Release,
-        );
-        let mut donated = false;
-        while node.locked.load(Ordering::Acquire) {
-            percpu.maybe_handle_tlb_shootdown();
-            // Donate priority to the lock holder (transitively) once per acquisition
-            if !donated {
-                self.maybe_donate_priority(percpu);
-                donated = true;
-            }
-            hint::spin_loop();
-        }
-        // Clear waiting_on_lock before proceeding — we now hold the lock
-        percpu.waiting_on_lock.store(ptr::null_mut(), Ordering::Release);
-        self.holder_cpu.store(percpu.cpu_id.get(), Ordering::Release);
-        true
-    }
-
-    #[inline]
-    pub fn release(&self, node: &McsNode) {
-        // Clear priority inheritance donation — we no longer hold the lock
-        PercpuBlock::current().pi_donated_prio.store(u32::MAX, Ordering::Release);
-        // Clear holder CPU
-        self.holder_cpu.store(u32::MAX, Ordering::Release);
-
-        let next = node.next.load(Ordering::Acquire);
-        if next.is_null() {
-            if self
-                .tail
-                .compare_exchange(
-                    (node as *const McsNode).cast_mut(),
-                    ptr::null_mut(),
-                    Ordering::AcqRel,
-                    Ordering::Acquire,
-                )
-                .is_ok()
-            {
-                return;
-            }
-            while node.next.load(Ordering::Acquire).is_null() {
-                hint::spin_loop();
-            }
-        }
-        unsafe {
-            (*node.next.load(Ordering::Acquire)).locked.store(false, Ordering::Release);
-        }
-    }
-
-    #[inline]
-    pub fn try_acquire(&self, node: &McsNode) -> bool {
-        node.next.store(ptr::null_mut(), Ordering::Relaxed);
-        node.locked.store(true, Ordering::Relaxed);
-        let ok = self
-            .tail
-            .compare_exchange(
-                ptr::null_mut(),
-                (node as *const McsNode).cast_mut(),
-                Ordering::AcqRel,
-                Ordering::Acquire,
-            )
-            .is_ok();
-        if ok {
-            let cpu_id = PercpuBlock::current().cpu_id.get();
-            self.holder_cpu.store(cpu_id, Ordering::Release);
-        }
-        ok
-    }
-
-    /// Donate current CPU's context priority to the lock holder's CPU,
-    /// following the PI chain transitively (A→B→C).
-    ///
-    /// Reads priority from PercpuBlock::current_prio (cached by the scheduler)
-    /// to avoid acquiring any lock in the MCS spin loop.
-    ///
-    /// Chain following: if the holder is itself waiting on another lock,
-    /// we propagate our priority to that lock's holder too, up to
-    /// MAX_PI_CHAIN_DEPTH hops.
-    fn maybe_donate_priority(&self, my_percpu: &PercpuBlock) {
-        let my_prio = my_percpu.current_prio.get() as u32;
-        let mut current_holder_cpu = self.holder_cpu.load(Ordering::Relaxed);
-
-        for _ in 0..MAX_PI_CHAIN_DEPTH {
-            if current_holder_cpu == u32::MAX {
-                return;
-            }
-            let holder_percpu = crate::percpu::get_for_cpu(
-                crate::cpu_set::LogicalCpuId::new(current_holder_cpu),
-            );
-            let Some(holder) = holder_percpu else {
-                return;
-            };
-
-            // Donate if our priority is higher (lower number) than current donation
-            let current_donated = holder.pi_donated_prio.load(Ordering::Relaxed);
-            if my_prio < current_donated {
-                holder.pi_donated_prio.store(my_prio, Ordering::Release);
-            }
-
-            // Follow the chain: is this holder also waiting on another lock?
-            let next_lock_ptr = holder.waiting_on_lock.load(Ordering::Relaxed);
-            if next_lock_ptr.is_null() {
-                return;
-            }
-            // SAFETY: The pointed-to McsRawLock is a long-lived struct field
-            // (e.g., part of the run queue). The holder is currently spinning
-            // in acquire(), so the pointer is valid. We only read holder_cpu
-            // (an atomic u32) — no mutable access needed.
-            let next_holder_cpu =
-                unsafe { (*next_lock_ptr).holder_cpu.load(Ordering::Relaxed) };
-
-            // Cycle detection: if the next holder is the same CPU we just visited, stop
-            if next_holder_cpu == current_holder_cpu {
-                return;
-            }
-            current_holder_cpu = next_holder_cpu;
-        }
-        // Chain depth exhausted — stop to bound latency
-    }
-}
diff --git a/recipes/core/kernel/source/src/sync/mod.rs b/recipes/core/kernel/source/src/sync/mod.rs
index bb9a1bc416..6ad2708ba4 100644
--- a/recipes/core/kernel/source/src/sync/mod.rs
+++ b/recipes/core/kernel/source/src/sync/mod.rs
@@ -1,9 +1,5 @@
 pub use self::{ordered::*, wait_condition::WaitCondition, wait_queue::WaitQueue};
 
-<<<<<<< HEAD
-pub mod mcs;
-=======
->>>>>>> master
 pub mod ordered;
 pub mod wait_condition;
 pub mod wait_queue;
diff --git a/recipes/core/kernel/source/src/sync/ordered.rs b/recipes/core/kernel/source/src/sync/ordered.rs
index 4b2e150d85..91d46158db 100644
--- a/recipes/core/kernel/source/src/sync/ordered.rs
+++ b/recipes/core/kernel/source/src/sync/ordered.rs
@@ -52,13 +52,7 @@
 //! *g1 = 12;
 //! ```
 use alloc::sync::Arc;
-<<<<<<< HEAD
-use core::cell::UnsafeCell;
 use core::marker::PhantomData;
-use core::ptr;
-=======
-use core::marker::PhantomData;
->>>>>>> master
 
 use crate::percpu::PercpuBlock;
 
@@ -738,146 +732,3 @@ impl<L: Level, T> Drop for ArcRwLockWriteGuard<L, T> {
 /// This function can only be called if no lock is held by the calling thread/task
 #[inline]
 pub fn check_no_locks(_: LockToken<'_, L0>) {}
-<<<<<<< HEAD
-
-// ---------------------------------------------------------------------------
-// MCS-based fair mutex (McsMutex)
-// ---------------------------------------------------------------------------
-
-/// A mutual exclusion lock using the MCS fair spinlock algorithm.
-///
-/// Unlike `Mutex<L, T>` which uses a simple spinlock (no fairness under
-/// contention), `McsMutex` uses Mellor-Crummey Scott queue-based spinning:
-///
-/// - Each waiter spins on its **own** local flag — no shared cache-line bouncing.
-/// - FIFO ordering prevents starvation.
-/// - O(1) cache-line transfers on unlock.
-///
-/// The MCS node is stored in [`crate::percpu::PercpuBlock::mcs_sched_node`], so
-/// this type is suitable for scheduler-internal locks where the holder is always
-/// the current CPU.
-pub struct McsMutex<L: Level, T> {
-    raw: crate::sync::mcs::McsRawLock,
-    data: UnsafeCell<T>,
-    _phantom: PhantomData<L>,
-}
-
-unsafe impl<L: Level, T: Send> Sync for McsMutex<L, T> {}
-unsafe impl<L: Level, T: Send> Send for McsMutex<L, T> {}
-
-impl<L: Level, T> McsMutex<L, T> {
-    pub const fn new(val: T) -> Self {
-        Self {
-            raw: crate::sync::mcs::McsRawLock::new(),
-            data: UnsafeCell::new(val),
-            _phantom: PhantomData,
-        }
-    }
-}
-
-impl<L: Level, T> McsMutex<L, T> {
-    pub fn lock<'a, LP: Lower<L> + 'a>(
-        &'a self,
-        lock_token: LockToken<'a, LP>,
-    ) -> McsMutexGuard<'a, L, T> {
-        let percpu = PercpuBlock::current();
-        let contended = self.raw.acquire(&percpu.mcs_sched_node);
-        if contended {
-            percpu
-                .mcs_contention_count
-                .set(percpu.mcs_contention_count.get() + 1);
-        }
-        McsMutexGuard {
-            lock: self,
-            lock_token: LockToken::downgraded(lock_token),
-        }
-    }
-
-    pub fn try_lock<'a, LP: Lower<L> + 'a>(
-        &'a self,
-        lock_token: LockToken<'a, LP>,
-    ) -> Option<McsMutexGuard<'a, L, T>> {
-        let percpu = PercpuBlock::current();
-        if self.raw.try_acquire(&percpu.mcs_sched_node) {
-            Some(McsMutexGuard {
-                lock: self,
-                lock_token: LockToken::downgraded(lock_token),
-            })
-        } else {
-            None
-        }
-    }
-}
-
-pub struct McsMutexGuard<'a, L: Level, T: 'a> {
-    lock: &'a McsMutex<L, T>,
-    lock_token: LockToken<'a, L>,
-}
-
-impl<'a, L: Level, T: 'a> McsMutexGuard<'a, L, T> {
-    pub fn token_split(&mut self) -> (&mut T, LockToken<'_, L>) {
-        unsafe { (&mut *self.lock.data.get(), self.lock_token.token()) }
-    }
-
-    pub fn into_split(self) -> (McsRawGuard<'a, L, T>, LockToken<'a, L>) {
-        let lock_ref = self.lock;
-        let token = unsafe { core::ptr::read(&self.lock_token) };
-        core::mem::forget(self);
-        (McsRawGuard { lock: lock_ref }, token)
-    }
-
-    pub fn from_split(raw: McsRawGuard<'a, L, T>, token: LockToken<'a, L>) -> Self {
-        let lock_ref = raw.lock;
-        core::mem::forget(raw);
-        Self {
-            lock: lock_ref,
-            lock_token: token,
-        }
-    }
-}
-
-impl<L: Level, T> core::ops::Deref for McsMutexGuard<'_, L, T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*self.lock.data.get() }
-    }
-}
-
-impl<L: Level, T> core::ops::DerefMut for McsMutexGuard<'_, L, T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        unsafe { &mut *self.lock.data.get() }
-    }
-}
-
-impl<L: Level, T> Drop for McsMutexGuard<'_, L, T> {
-    fn drop(&mut self) {
-        let percpu = PercpuBlock::current();
-        self.lock.raw.release(&percpu.mcs_sched_node);
-    }
-}
-
-pub struct McsRawGuard<'a, L: Level, T: 'a> {
-    lock: &'a McsMutex<L, T>,
-}
-
-impl<L: Level, T> core::ops::Deref for McsRawGuard<'_, L, T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*self.lock.data.get() }
-    }
-}
-
-impl<L: Level, T> core::ops::DerefMut for McsRawGuard<'_, L, T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        unsafe { &mut *self.lock.data.get() }
-    }
-}
-
-impl<L: Level, T> Drop for McsRawGuard<'_, L, T> {
-    fn drop(&mut self) {
-        let percpu = PercpuBlock::current();
-        self.lock.raw.release(&percpu.mcs_sched_node);
-    }
-}
-=======
->>>>>>> master
diff --git a/recipes/core/kernel/source/src/syscall/fs.rs b/recipes/core/kernel/source/src/syscall/fs.rs
index bf984641f4..acd3bc2212 100644
--- a/recipes/core/kernel/source/src/syscall/fs.rs
+++ b/recipes/core/kernel/source/src/syscall/fs.rs
@@ -2,7 +2,7 @@
 
 use core::num::NonZeroUsize;
 
-use alloc::{string::String, sync::Arc, vec::Vec};
+use alloc::{format, string::{String, ToString}, sync::Arc, vec::Vec};
 use redox_path::RedoxPath;
 
 use crate::{
@@ -12,9 +12,9 @@ use crate::{
         memory::{AddrSpace, GenericFlusher, Grant, PageSpan, TlbShootdownActions},
     },
     memory::{Page, VirtualAddress, PAGE_SIZE},
-    scheme::{self, FileHandle, KernelScheme, OpenResult, StrOrBytes},
+    scheme::{self, pipe, FileHandle, KernelScheme, OpenResult, SchemeExt, StrOrBytes},
     sync::{CleanLockToken, RwLock},
-    syscall::{data::Stat, error::*, flag::*},
+    syscall::{data::{GlobalSchemes, Stat}, error::*, flag::*},
 };
 
 use super::usercopy::{UserSlice, UserSliceRo, UserSliceRw, UserSliceWo};
@@ -45,7 +45,7 @@ pub fn file_op_generic_ext<T>(
         (file, desc)
     };
 
-    let scheme = scheme::get_scheme(token.token(), desc.scheme)?;
+    let scheme = desc.get_scheme(token)?;
 
     op(&*scheme, file.description, desc, token)
 }
@@ -62,55 +62,32 @@ pub fn copy_path_to_buf(raw_path: UserSliceRo, max_len: usize) -> Result<String>
 // TODO: Define elsewhere
 const PATH_MAX: usize = PAGE_SIZE;
 
-pub fn openat(
-    fh: FileHandle,
-    raw_path: UserSliceRo,
+fn fifo_path_key(scheme_id: scheme::SchemeId, number: usize, path: &str) -> String {
+    if path.starts_with('/') {
+        path.to_string()
+    } else {
+        format!("@fifo:{}:{}:{}", scheme_id.get(), number, path)
+    }
+}
+
+fn install_open_result(
+    scheme_id: scheme::SchemeId,
     flags: usize,
-    fcntl_flags: u32,
-    euid: u32,
-    egid: u32,
+    open_result: OpenResult,
     token: &mut CleanLockToken,
 ) -> Result<FileHandle> {
-    let path_buf = copy_path_to_buf(raw_path, PATH_MAX)?;
-
-    let (scheme_id, number) = {
-        let current_lock = context::current();
-        let mut current = current_lock.read(token.token());
-        let (context, mut token) = current.token_split();
-        let pipe = context.get_file(fh, &mut token).ok_or(Error::new(EBADF))?;
-        let desc = pipe.description.read(token.token());
-        (desc.scheme, desc.number)
-    };
-
-    let caller_ctx = context::current()
-        .read(token.token())
-        .caller_ctx()
-        .filter_uid_gid(euid, egid);
-
-    let new_description = {
-        let scheme = scheme::get_scheme(token.token(), scheme_id)?;
-
-        let res = scheme.kopenat(
-            number,
-            StrOrBytes::from_str(&path_buf),
-            flags,
-            fcntl_flags,
-            caller_ctx,
-            token,
-        );
-
-        match res? {
-            OpenResult::SchemeLocal(number, internal_flags) => {
-                Arc::new(RwLock::new(FileDescription {
-                    offset: 0,
-                    internal_flags,
-                    scheme: scheme_id,
-                    number,
-                    flags: (flags & !O_CLOEXEC) as u32,
-                }))
-            }
-            OpenResult::External(desc) => desc,
-        }
+    let new_description = match open_result {
+        OpenResult::SchemeLocal(number, internal_flags) => Arc::new(RwLock::new(
+            FileDescription::new(
+                scheme_id,
+                number,
+                0,
+                (flags & !O_CLOEXEC) as u32,
+                internal_flags,
+                token,
+            ),
+        )),
+        OpenResult::External(desc) => desc,
     };
 
     let current_lock = context::current();
@@ -126,6 +103,102 @@ pub fn openat(
         )
         .ok_or(Error::new(EMFILE))
 }
+
+fn path_exists_in_scheme(
+    scheme: &dyn KernelScheme,
+    number: usize,
+    path: &str,
+    caller_ctx: scheme::CallerCtx,
+    token: &mut CleanLockToken,
+) -> Result<bool> {
+    match scheme.kopenat(number, StrOrBytes::from_str(path), O_STAT, 0, caller_ctx, token) {
+        Ok(OpenResult::SchemeLocal(number, _)) => {
+            let _ = scheme.close(number, token);
+            Ok(true)
+        }
+        Ok(OpenResult::External(_)) => Ok(true),
+        Err(err) if err.errno == ENOENT => Ok(false),
+        Err(err) => Err(err),
+    }
+}
+
+pub fn openat(
+    fh: FileHandle,
+    raw_path: UserSliceRo,
+    flags: usize,
+    fcntl_flags: u32,
+    euid: u32,
+    egid: u32,
+    token: &mut CleanLockToken,
+) -> Result<FileHandle> {
+    let path_buf = copy_path_to_buf(raw_path, PATH_MAX)?;
+
+    let desc = {
+        let current_lock = context::current();
+        let mut current = current_lock.read(token.token());
+        let (context, mut context_token) = current.token_split();
+        let pipe = context
+            .get_file(fh, &mut context_token)
+            .ok_or(Error::new(EBADF))?;
+        *pipe.description.read(context_token.token())
+    };
+    let scheme = desc.get_scheme(token)?;
+    let number = desc.number;
+    let scheme_id = desc.scheme;
+
+    let caller_ctx = context::current()
+        .read(token.token())
+        .caller_ctx()
+        .filter_uid_gid(euid, egid);
+
+    let fifo_mode_requested = flags & MODE_FIFO as usize == MODE_FIFO as usize;
+    let fifo_key = fifo_path_key(scheme_id, number, &path_buf);
+
+    if pipe::named_pipe_exists(&fifo_key, token) {
+        if flags & O_EXCL == O_EXCL && flags & O_CREAT == O_CREAT {
+            return Err(Error::new(EEXIST));
+        }
+        if fifo_mode_requested && flags & O_CREAT == O_CREAT {
+            return Err(Error::new(EEXIST));
+        }
+
+        let pipe_number = pipe::open_named_pipe(&fifo_key, flags, token)?
+            .ok_or(Error::new(ENOENT))?;
+        return install_open_result(
+            GlobalSchemes::Pipe.scheme_id(),
+            flags,
+            OpenResult::SchemeLocal(pipe_number, InternalFlags::empty()),
+            token,
+        );
+    }
+
+    if fifo_mode_requested && flags & O_CREAT == O_CREAT {
+        if path_exists_in_scheme(&*scheme, number, &path_buf, caller_ctx, token)? {
+            return Err(Error::new(EEXIST));
+        }
+
+        let mode = u16::try_from(flags & 0o7777).map_err(|_| Error::new(EINVAL))?;
+        let pipe_number = pipe::create_named_pipe(&fifo_key, &path_buf, mode, flags, token)?;
+
+        return install_open_result(
+            GlobalSchemes::Pipe.scheme_id(),
+            flags,
+            OpenResult::SchemeLocal(pipe_number, InternalFlags::empty()),
+            token,
+        );
+    }
+
+    let open_result = scheme.kopenat(
+        number,
+        StrOrBytes::from_str(&path_buf),
+        flags,
+        fcntl_flags,
+        caller_ctx,
+        token,
+    )?;
+
+    install_open_result(scheme_id, flags, open_result, token)
+}
 /// Unlinkat syscall
 pub fn unlinkat(
     fh: FileHandle,
@@ -137,22 +210,27 @@ pub fn unlinkat(
 ) -> Result<()> {
     let path_buf = copy_path_to_buf(raw_path, PATH_MAX)?;
 
-    let (number, scheme_id) = {
+    let desc = {
         let current_lock = context::current();
         let mut current = current_lock.read(token.token());
-        let (context, mut token) = current.token_split();
-        let pipe = context.get_file(fh, &mut token).ok_or(Error::new(EBADF))?;
-        let desc = pipe.description.read(token.token());
-        (desc.number, desc.scheme)
+        let (context, mut context_token) = current.token_split();
+        let pipe = context
+            .get_file(fh, &mut context_token)
+            .ok_or(Error::new(EBADF))?;
+        *pipe.description.read(context_token.token())
     };
-
-    let scheme = scheme::get_scheme(token.token(), scheme_id)?;
+    let number = desc.number;
+    let scheme = desc.get_scheme(token)?;
 
     let caller_ctx = context::current()
         .read(token.token())
         .caller_ctx()
         .filter_uid_gid(euid, egid);
 
+    if pipe::unlink_named_pipe(&fifo_path_key(desc.scheme, number, &path_buf), token) {
+        return Ok(());
+    }
+
     /*
     let mut path_buf = BorrowedHtBuf::head()?;
     let path = path_buf.use_for_string(raw_path)?;
@@ -199,17 +277,18 @@ fn duplicate_file(
         let description = { *file.description.read(token.token()) };
 
         let new_description = {
-            let scheme = scheme::get_scheme(token.token(), description.scheme)?;
+            let scheme = description.get_scheme(token)?;
 
             match scheme.kdup(description.number, user_buf, caller_ctx, token)? {
                 OpenResult::SchemeLocal(number, internal_flags) => {
-                    Arc::new(RwLock::new(FileDescription {
-                        offset: 0,
-                        internal_flags,
-                        scheme: description.scheme,
+                    Arc::new(RwLock::new(FileDescription::new(
+                        description.scheme,
                         number,
-                        flags: description.flags,
-                    }))
+                        0,
+                        description.flags,
+                        internal_flags,
+                        token,
+                    )))
                 }
                 OpenResult::External(desc) => desc,
             }
@@ -296,11 +375,10 @@ fn call_normal(
     }
     .ok_or(Error::new(EBADF))?;
 
-    let (scheme_id, number) = {
-        let desc = file.description.read(token.token());
-        (desc.scheme, desc.number)
+    let (scheme, number) = {
+        let desc = *file.description.read(token.token());
+        (desc.get_scheme(token)?, desc.number)
     };
-    let scheme = scheme::get_scheme(token.token(), scheme_id)?;
 
     if flags.contains(CallFlags::STD_FS) {
         scheme.translate_std_fs_call(number, file.description, payload, flags, metadata, token)
@@ -341,28 +419,28 @@ fn fdwrite_inner(
 ) -> Result<usize> {
     // TODO: Ensure deadlocks can't happen
     let (scheme, number, descs_to_send) = {
-        let (scheme, number) = {
+        let desc = {
             let current_lock = context::current();
             let mut current = current_lock.read(token.token());
-            let (context, mut token) = current.token_split();
+            let (context, mut context_token) = current.token_split();
             let file_descriptor = context
-                .get_file(socket, &mut token)
+                .get_file(socket, &mut context_token)
                 .ok_or(Error::new(EBADF))?;
-            let desc = &file_descriptor.description.read(token.token());
-            (desc.scheme, desc.number)
+            *file_descriptor.description.read(context_token.token())
         };
-        let scheme = scheme::get_scheme(token.token(), scheme)?;
+        let scheme = desc.get_scheme(token)?;
+        let number = desc.number;
 
         let current_lock = context::current();
         let mut current = current_lock.read(token.token());
-        let (context, mut token) = current.token_split();
+        let (context, mut context_token) = current.token_split();
         (
             scheme,
             number,
             if flags.contains(CallFlags::FD_CLONE) {
-                context.bulk_get_files(&target_fds, &mut token)
+                context.bulk_get_files(&target_fds, &mut context_token)
             } else {
-                context.bulk_remove_files(&target_fds, &mut token)
+                context.bulk_remove_files(&target_fds, &mut context_token)
             }?
             .into_iter()
             .map(|f| f.description)
@@ -395,18 +473,22 @@ fn call_fdread(
     metadata: &[u64],
     token: &mut CleanLockToken,
 ) -> Result<usize> {
+    let desc = {
+        let current_lock = context::current();
+        let mut current = current_lock.read(token.token());
+        let (context, mut context_token) = current.token_split();
+        let file_descriptor = context
+            .get_file(fd, &mut context_token)
+            .ok_or(Error::new(EBADF))?;
+        *file_descriptor.description.read(context_token.token())
+    };
     let (scheme, number) = {
-        let (scheme, number) = {
-            let current_lock = context::current();
-            let mut current = current_lock.read(token.token());
-            let (context, mut token) = current.token_split();
-            let file_descriptor = context.get_file(fd, &mut token).ok_or(Error::new(EBADF))?;
-            let desc = file_descriptor.description.read(token.token());
-            (desc.scheme, desc.number)
-        };
-        let scheme = scheme::get_scheme(token.token(), scheme)?;
-
-        (scheme, number)
+        let scheme = desc.get_scheme(token)?;
+        let number = desc.number;
+        (
+            scheme,
+            number,
+        )
     };
 
     scheme.kfdread(number, payload, flags, metadata, token)
@@ -440,9 +522,9 @@ pub fn fcntl(fd: FileHandle, cmd: usize, arg: usize, token: &mut CleanLockToken)
     }
     .ok_or(Error::new(EBADF))?;
 
-    let (scheme_id, number, flags) = {
-        let desc = file.description.write(token.token());
-        (desc.scheme, desc.number, desc.flags)
+    let (number, flags, desc) = {
+        let desc = *file.description.read(token.token());
+        (desc.number, desc.flags, desc)
     };
 
     if cmd == F_DUPFD || cmd == F_DUPFD_CLOEXEC {
@@ -460,7 +542,7 @@ pub fn fcntl(fd: FileHandle, cmd: usize, arg: usize, token: &mut CleanLockToken)
 
     // Communicate fcntl with scheme
     if cmd != F_GETFD && cmd != F_SETFD {
-        let scheme = scheme::get_scheme(token.token(), scheme_id)?;
+        let scheme = desc.get_scheme(token)?;
 
         scheme.fcntl(number, cmd, arg, token)?;
     };
@@ -518,13 +600,11 @@ pub fn flink(fd: FileHandle, raw_path: UserSliceRo, token: &mut CleanLockToken)
     let path = RedoxPath::from_absolute(&path_buf).ok_or(Error::new(EINVAL))?;
     let (_, reference) = path.as_parts().ok_or(Error::new(EINVAL))?;
 
-    let (number, scheme_id) = {
-        let desc = file.description.read(token.token());
-        (desc.number, desc.scheme)
+    let (number, scheme) = {
+        let desc = *file.description.read(token.token());
+        (desc.number, desc.get_scheme(token)?)
     };
 
-    let scheme = scheme::get_scheme(token.token(), scheme_id)?;
-
     // TODO: Check EXDEV.
     /*
     if scheme_id != description.scheme {
@@ -554,13 +634,11 @@ pub fn frename(fd: FileHandle, raw_path: UserSliceRo, token: &mut CleanLockToken
     let path = RedoxPath::from_absolute(&path_buf).ok_or(Error::new(EINVAL))?;
     let (_, reference) = path.as_parts().ok_or(Error::new(EINVAL))?;
 
-    let (number, scheme_id) = {
-        let desc = file.description.read(token.token());
-        (desc.number, desc.scheme)
+    let (number, scheme) = {
+        let desc = *file.description.read(token.token());
+        (desc.number, desc.get_scheme(token)?)
     };
 
-    let scheme = scheme::get_scheme(token.token(), scheme_id)?;
-
     // TODO: Check EXDEV.
     /*
     if scheme_id != description.scheme {
diff --git a/recipes/core/kernel/source/src/syscall/process.rs b/recipes/core/kernel/source/src/syscall/process.rs
index e83da427b4..8a1d385e50 100644
--- a/recipes/core/kernel/source/src/syscall/process.rs
+++ b/recipes/core/kernel/source/src/syscall/process.rs
@@ -271,23 +271,26 @@ unsafe fn bootstrap_mem(bootstrap: &crate::startup::Bootstrap) -> &'static [u8]
 }
 
 fn insert_fd(scheme: SchemeId, number: usize, cloexec: bool, token: &mut CleanLockToken) -> usize {
+    let description = Arc::new(RwLock::new(FileDescription::new(
+        scheme,
+        number,
+        0,
+        (O_CREAT | O_RDWR) as u32,
+        InternalFlags::empty(),
+        token,
+    )));
+
     let current_lock = context::current();
     let mut current = current_lock.read(token.token());
-    let (context, mut token) = current.token_split();
+    let (context, mut context_token) = current.token_split();
     context
         .add_file_min(
             FileDescriptor {
-                description: Arc::new(RwLock::new(FileDescription {
-                    scheme,
-                    number,
-                    offset: 0,
-                    flags: (O_CREAT | O_RDWR) as u32,
-                    internal_flags: InternalFlags::empty(),
-                })),
+                description,
                 cloexec,
             },
             syscall::flag::UPPER_FDTBL_TAG + scheme.get(),
-            &mut token,
+            &mut context_token,
         )
         .expect("failed to insert fd to current context")
         .get()
diff --git a/recipes/core/relibc/.editorconfig b/recipes/core/relibc/.editorconfig
new file mode 100644
index 0000000000..91e9b5061d
--- /dev/null
+++ b/recipes/core/relibc/.editorconfig
@@ -0,0 +1,7 @@
+[**.c]
+indent_size = 4
+indent_style = space
+
+[**.yml]
+indent_size = 4
+indent_style = space
diff --git a/recipes/core/relibc/.gitignore b/recipes/core/relibc/.gitignore
new file mode 100644
index 0000000000..e7dcd0d68d
--- /dev/null
+++ b/recipes/core/relibc/.gitignore
@@ -0,0 +1,11 @@
+.idea/
+prefix/
+sysroot/
+**/target/
+.gdb_history
+*.patch
+*.swp
+*.swo
+/.vim
+.vscode/
+
diff --git a/recipes/core/relibc/.gitlab-ci.yml b/recipes/core/relibc/.gitlab-ci.yml
new file mode 100644
index 0000000000..61e301ae68
--- /dev/null
+++ b/recipes/core/relibc/.gitlab-ci.yml
@@ -0,0 +1,73 @@
+image: "redoxos/redoxer:latest"
+
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+workflow:
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_NAMESPACE == "redox-os"'
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+
+stages:
+    - build
+    - cross-build
+    - test
+before_script:
+    cargo install cbindgen
+
+fmt:
+    stage: build
+    needs: []
+    script:
+        - rustup component add rustfmt-preview
+        - ./fmt.sh -- --check
+
+linux:
+    stage: build
+    script:
+        - ./check.sh --host
+
+x86_64:
+    stage: build
+    script:
+        - ./check.sh --arch=x86_64
+
+i586:
+    stage: cross-build
+    script:
+        - ./check.sh --arch=i586
+
+aarch64:
+    stage: cross-build
+    image: "redoxos/redoxer:aarch64"
+    script:
+        - ./check.sh --arch=aarch64
+
+riscv64gc:
+    stage: cross-build
+    script:
+        - ./check.sh --arch=riscv64gc
+
+test:linux:
+    stage: test
+    needs: [linux]
+    script:
+        - ./check.sh --host --test
+
+test:x86_64:
+    stage: test
+    needs: [x86_64]
+    script:
+        # timeout: https://gitlab.redox-os.org/redox-os/relibc/-/issues/238
+        - timeout -s KILL 9m ./check.sh --arch=x86_64 --test
+
+test:aarch64:
+    stage: test
+    needs: [aarch64]
+    image: "redoxos/redoxer:aarch64"
+    # many issues that not exist in x86_64, and lack of interest to fix so far
+    allow_failure: true
+    script:
+        - timeout -s KILL 9m ./check.sh --arch=aarch64 --test
+
+#TODO: Enable more arch once dynamic linker working
diff --git a/recipes/core/relibc/.gitmodules b/recipes/core/relibc/.gitmodules
new file mode 100644
index 0000000000..50a75a071b
--- /dev/null
+++ b/recipes/core/relibc/.gitmodules
@@ -0,0 +1,7 @@
+[submodule "openlibm"]
+	path = openlibm
+	url = https://gitlab.redox-os.org/redox-os/openlibm.git
+	branch = master
+[submodule "src/dlmalloc-rs"]
+	path = dlmalloc-rs
+	url = https://gitlab.redox-os.org/redox-os/dlmalloc-rs.git
diff --git a/recipes/core/relibc/CONTRIBUTING.md b/recipes/core/relibc/CONTRIBUTING.md
new file mode 100644
index 0000000000..e1d1a28dca
--- /dev/null
+++ b/recipes/core/relibc/CONTRIBUTING.md
@@ -0,0 +1,123 @@
+# Contributing
+
+## Table of contents
+1. [What to do](#what-to-do)
+2. [Code style](#code-style)
+3. [Sending merge requests](#sending-merge-requests)
+4. [Writing tests](#writing-tests)
+5. [Running tests](#running-tests)
+
+Maintaining a libc is tough work, and we'd love some help!
+
+## What to do
+
+For now, we are still trying to get full libc compatibility before we move on to
+any optimisation.
+
+- We currently have a number of unimplemented functions. Search for 
+    `unimplemented!()` and hop right in!
+- If you notice any missing functionality, feel free to add it in
+
+## Code style
+
+We have a `rustfmt.toml` in the root directory of relibc. Please run `./fmt.sh`
+before sending in any merge requests as it will automatically format your code.
+
+With regards to general style:
+
+### Where applicable, prefer using references to raw pointers
+
+This is most obvious when looking at `stdio` functions. If raw pointers were
+used instead of references, then the resulting code would be significantly
+uglier. Instead try to check for pointer being valid with `pointer::as_ref()`
+and `pointer::as_mut()` and then immediately use those references instead.
+
+Internal functions should always take references.
+
+### Use the c types exposed in our platform module instead of Rust's inbuilt integer types
+
+This is so we can guarantee that everything works across platforms. While it is
+generally accepted these days that an `int` has 32 bits (which matches against
+an `i32`), some platforms have `int` as having 16 bits, and others have long as
+being 32 bits instead of 64. If you use the types in platform, then we can
+guarantee that your code will "just work" should we port relibc to a different
+architecture.
+
+### Use our internal functions
+
+If you need to use a C string, don't reinvent the wheel. We have functions in
+the platform module that convert C strings to Rust slices.
+
+We also have structures that wrap files, wrap writable strings, and wrap various
+other commonly used things that you should use instead of rolling your own.
+
+## Sending merge requests
+
+If you have sent us a merge request, first of all, thanks for taking your time
+to help us!
+
+The first thing to note is that we do most of our development on our 
+[GitLab server](https://gitlab.redox-os.org/redox-os/relibc), and as such it is
+possible that none of the maintainers will see your merge request if it is
+opened on GitHub.
+
+In your merge request, please put in the description:
+- What functions (if any) have been implemented or changed
+- The rationale behind your merge request (e.g. why you thought this change was
+    required. If you are just implementing some functions, you can ignore this)
+- Any issues that are related to the merge request
+
+We have CI attached to our GitLab instance, so all merge requests are checked to
+make sure that they are tested before they are merged. Please write tests for
+the functions that you add/change and test locally on your own machine
+***before*** submitting a merge request.
+
+## Writing tests
+
+Every function that gets written needs to have a test in C in order to make sure
+it works as intended. Here are a few guidelines for writing good tests.
+
+### Ensure that any literals you have are mapped to variables instead of being directly passed to a function.
+
+Sometimes compilers take literals put into libc functions and run them 
+internally during compilation, which can cause some false positives.  All tests
+are compiled with `-fno-builtin`, which theoretically solves this issue, but
+just in case, it'd be a good idea to map inputs to variables.
+
+```c
+#include "string.h"
+#include "stdio.h"
+
+int main(void) {
+    // Don't do this
+    printf("%d\n", strcspn("Hello", "Hi"));
+
+    // Do this
+    char *first = "Hello";
+    char *second = "Hi";
+    printf("%d\n", strcspn(first, second));
+}
+```
+
+### Ensure your tests cover every section of code.
+
+What happens if a string in `strcmp()` is shorter than the other string? What 
+happens if the first argument to `strcspn()` is longer than the second string?  
+In order to make sure that all functions work as expected, we ask that any tests
+cover as much of the code that you have written as possible.
+
+## Running tests
+
+Running tests is an important part in trying to find bugs. Before opening a
+merge request, we ask that you test on your own machine to make sure there are
+no regressions.
+
+You can run tests with `make test` in the root directory of relibc to compile
+relibc, compile the tests and run them. This *will* print a lot of output to
+stdout, so be warned!
+
+You can test against verified correct output with `make verify` in the tests 
+directory. You will need to manually create the correct output and put it in the
+tests/expected directory. Running any `make` commands in the tests directory
+will ***not*** rebuild relibc, so you'll need to go back to the root directory
+if you need to rebuild relibc.
diff --git a/recipes/core/relibc/Cargo.toml b/recipes/core/relibc/Cargo.toml
new file mode 100644
index 0000000000..92bd94de32
--- /dev/null
+++ b/recipes/core/relibc/Cargo.toml
@@ -0,0 +1,148 @@
+[package]
+name = "relibc"
+version = "0.2.5"
+authors = ["Jeremy Soller <jackpot51@gmail.com>"]
+edition = "2024"
+
+[lib]
+name = "relibc"
+crate-type = ["staticlib"]
+
+[workspace]
+members = [
+    "src/crt0",
+    "src/crti",
+    "src/crtn",
+    "redox-rt",
+    "ld_so",
+    "generic-rt",
+]
+exclude = ["tests", "dlmalloc-rs"]
+
+[workspace.lints.clippy]
+borrow_as_ptr = "deny"
+cast_lossless = "warn" # TODO review occurrences
+cast_possible_truncation = "allow" # TODO review occurrences
+cast_possible_wrap = "allow" # TODO review occurrences
+cast_precision_loss = "allow" # TODO review occurrences
+cast_ptr_alignment = "allow" # TODO review occurrences
+cast_sign_loss = "allow" # TODO review occurrences
+missing_errors_doc = "allow" # TODO review occurrences
+missing_panics_doc = "allow" # TODO review occurrences
+missing_safety_doc = "allow" # TODO review occurrences
+mut_from_ref = "warn" # TODO review occurrences
+precedence = "deny"
+ptr_as_ptr = "warn" # TODO review occurrences
+ptr_cast_constness = "warn" # TODO review occurrences
+ref_as_ptr = "warn" # TODO review occurrences
+upper_case_acronyms = "allow" # TODO review occurrences
+zero_ptr = "warn" # must allow on public constants due to cbindgen issue
+
+[workspace.lints.rust]
+dangling_pointers_from_temporaries = "deny"
+dead_code = "allow" # TODO review occuurences
+deprecated = "deny"
+improper_ctypes_definitions = "deny"
+internal_features = "allow" # core_intrinsics and lang_items
+irrefutable_let_patterns = "deny"
+mismatched_lifetime_syntaxes = "deny"
+non_camel_case_types = "allow" # needed for most POSIX type names
+non_snake_case = "allow" # TODO review occuurences
+non_upper_case_globals = "allow" # TODO review occuurences
+unexpected_cfgs = "deny"
+unpredictable_function_pointer_comparisons = "deny"
+unreachable_code = "allow" # TODO review occuurences
+unsafe_op_in_unsafe_fn = "deny"
+unused_imports = "deny"
+unused_must_use = "deny"
+unused_mut = "deny"
+unused_unsafe = "deny"
+unused_variables = "allow" # TODO review occurrences (too many for now)
+
+[lints]
+workspace = true
+
+[workspace.dependencies]
+bitflags = "2"
+ioslice = { version = "0.6", default-features = false }
+plain = "0.2"
+redox-path = "0.3"
+redox_protocols = { package = "libredox", version = "0.1.16", default-features = false, features = ["protocol"] }
+redox_syscall = "0.7.4"
+
+[build-dependencies]
+cc = "1"
+
+[dependencies]
+bitflags.workspace = true
+cbitset = "0.2"
+posix-regex = { version = "0.1.4", features = ["no_std"] }
+
+rand = { version = "0.10", default-features = false }
+rand_xorshift = "0.5"
+rand_jitter = "0.6"
+
+memchr = { version = "2.2.0", default-features = false }
+plain.workspace = true
+unicode-width = "0.1"
+__libc_only_for_layout_checks = { package = "libc", version = "0.2.149", optional = true }
+md5-crypto = { package = "md-5", version = "0.10.6", default-features = false }
+sha-crypt = { version = "0.5", default-features = false }
+base64ct = { version = "1.6", default-features = false, features = ["alloc"] }
+bcrypt-pbkdf = { version = "0.10", default-features = false, features = [
+    "alloc",
+] }
+scrypt = { version = "0.11", default-features = false, features = ["simple"] }
+pbkdf2 = { version = "0.12", features = ["sha2"] }
+sha2 = { version = "0.10", default-features = false }
+generic-rt = { path = "generic-rt" }
+chrono-tz = { version = "0.10", default-features = false }
+chrono = { version = "0.4", default-features = false, features = ["alloc"] }
+libm = "0.2"
+log = "0.4"
+spin = "0.9.8"
+argon2 = "0.5.3"
+
+[dependencies.dlmalloc]
+path = "dlmalloc-rs"
+default-features = false
+features = ["c_api"]
+
+[dependencies.object]
+version = "0.36.7"
+git = "https://gitlab.redox-os.org/andypython/object"
+default-features = false
+features = ["elf", "read_core"]
+
+[target.'cfg(target_os = "linux")'.dependencies]
+sc = "0.2.7"
+
+[target.'cfg(target_os = "redox")'.dependencies]
+redox_syscall.workspace = true
+redox-rt = { path = "redox-rt" }
+redox-path.workspace = true
+redox_event = { version = "0.4.6", default-features = false, features = [
+    "redox_syscall",
+] }
+ioslice.workspace = true
+redox-ioctl = { path = "redox-ioctl" }
+redox_protocols.workspace = true
+
+[features]
+# to enable trace level, take out this `no_trace`
+default = ["check_against_libc_crate", "ld_so_cache", "no_trace"]
+check_against_libc_crate = ["__libc_only_for_layout_checks"]
+ld_so_cache = []
+math_libm = []
+no_trace = ["log/release_max_level_debug"]
+# for very verbose activity beyond trace level
+trace_tls = []
+
+[profile.dev]
+panic = "abort"
+
+[profile.release]
+panic = "abort"
+
+[patch.crates-io]
+cc-11 = { git = "https://github.com/tea/cc-rs", branch = "riscv-abi-arch-fix", package = "cc" }
diff --git a/recipes/core/relibc/LICENSE b/recipes/core/relibc/LICENSE
new file mode 100644
index 0000000000..897e4bc3ee
--- /dev/null
+++ b/recipes/core/relibc/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Redox OS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/recipes/core/relibc/Makefile b/recipes/core/relibc/Makefile
new file mode 100644
index 0000000000..a8586468fe
--- /dev/null
+++ b/recipes/core/relibc/Makefile
@@ -0,0 +1,227 @@
+include config.mk
+
+CARGO?=cargo
+CARGO_TEST?=$(CARGO)
+CARGO_COMMON_FLAGS=-Z build-std=core,alloc,compiler_builtins
+CARGOFLAGS?=$(CARGO_COMMON_FLAGS)
+CC_WRAPPER?=
+RUSTCFLAGS?=
+LINKFLAGS?=-lgcc
+USE_RUST_LIBM?=
+TESTBIN?=
+export OBJCOPY?=objcopy
+
+export CARGO_TARGET_DIR?=$(shell pwd)/target
+BUILD?=$(CARGO_TARGET_DIR)/$(TARGET)
+CARGOFLAGS+=--target=$(TARGET)
+EXCEPT_MATH=-not -name "math"
+FEATURE_MATH=
+ifneq ($(USE_RUST_LIBM),)
+FEATURE_MATH=--features math_libm
+EXCEPT_MATH=
+endif
+
+TARGET_HEADERS?=$(BUILD)/include
+export CFLAGS=-I$(TARGET_HEADERS)
+
+PROFILE?=release
+
+HEADERS_UNPARSED=$(shell find src/header -mindepth 1 -maxdepth 1 -type d -not -name "_*" $(EXCEPT_MATH) -printf "%f\n")
+HEADERS_DEPS=$(shell find src/header -type f \( -name "cbindgen.toml" -o -name "*.rs" \))
+#HEADERS=$(patsubst %,%.h,$(subst _,/,$(HEADERS_UNPARSED)))
+
+SRC=\
+	Cargo.* \
+	$(shell find src/ redox-rt/src/ ld_so/src/ redox-ioctl/src/ include/ -type f)
+
+BUILTINS_VERSION=0.1.70
+
+.PHONY: all clean fmt install install-libs install-headers install-tests libs headers submodules test
+
+all: | headers libs
+
+headers: $(HEADERS_DEPS)
+	rm -rf $(TARGET_HEADERS)
+	mkdir -p $(TARGET_HEADERS)
+	cp -r include/* $(TARGET_HEADERS)
+ifeq ($(USE_RUST_LIBM),)
+	cp "openlibm/include"/*.h $(TARGET_HEADERS)
+	cp "openlibm/src"/*.h $(TARGET_HEADERS)
+endif
+	@set -e ; \
+	for header in $(HEADERS_UNPARSED); do \
+		if test -f "src/header/$$header/cbindgen.toml"; then \
+			echo -e "\033[0;36;49mWriting Header $$header\033[0m"; \
+			out=`echo "$$header" | sed 's/_/\//g'`; \
+			out="$(TARGET_HEADERS)/$$out.h"; \
+			cat "src/header/$$header/cbindgen.toml" cbindgen.globdefs.toml \
+				 | cbindgen "src/header/$$header/mod.rs" --config=/dev/stdin --output "$$out"; \
+		fi \
+	done; echo -e "\033[0;36;49mAll headers written\033[0m";
+
+clean:
+	$(CARGO) clean
+	$(MAKE) -C tests clean
+	rm -rf sysroot
+
+check:
+	$(CARGO) check
+
+fmt:
+	./fmt.sh
+
+install-headers: headers libs
+	mkdir -pv "$(DESTDIR)/include"
+	cp -rv "$(TARGET_HEADERS)"/* "$(DESTDIR)/include"
+
+libs: \
+	$(BUILD)/$(PROFILE)/libc.a \
+	$(BUILD)/$(PROFILE)/libc.so \
+	$(BUILD)/$(PROFILE)/crt0.o \
+	$(BUILD)/$(PROFILE)/crti.o \
+	$(BUILD)/$(PROFILE)/crtn.o \
+	$(BUILD)/$(PROFILE)/ld_so
+
+install-libs: headers libs
+	mkdir -pv "$(DESTDIR)/lib"
+	cp -v "$(BUILD)/$(PROFILE)/libc.a" "$(DESTDIR)/lib"
+	cp -v "$(BUILD)/$(PROFILE)/libc.so" "$(DESTDIR)/lib"
+	ln -vnfs libc.so "$(DESTDIR)/lib/libc.so.6"
+	cp -v "$(BUILD)/$(PROFILE)/crt0.o" "$(DESTDIR)/lib"
+	ln -vnfs crt0.o "$(DESTDIR)/lib/crt1.o"
+	cp -v "$(BUILD)/$(PROFILE)/crti.o" "$(DESTDIR)/lib"
+	cp -v "$(BUILD)/$(PROFILE)/crtn.o" "$(DESTDIR)/lib"
+	cp -v "$(BUILD)/$(PROFILE)/ld_so" "$(DESTDIR)/$(LD_SO_PATH)"
+ifeq ($(USE_RUST_LIBM),)
+	cp -v "$(BUILD)/openlibm/libopenlibm.a" "$(DESTDIR)/lib/libm.a"
+endif
+	# Empty libraries for dl, pthread, and rt
+	$(AR) -rcs "$(DESTDIR)/lib/libdl.a"
+	$(AR) -rcs "$(DESTDIR)/lib/libpthread.a"
+	$(AR) -rcs "$(DESTDIR)/lib/librt.a"
+
+install-tests: tests
+	$(MAKE) -C tests
+	mkdir -p "$(DESTDIR)/relibc-tests"
+	cp -vr tests/build_$(TARGET)/* "$(DESTDIR)/relibc-tests/"
+
+install: install-headers install-libs
+
+submodules:
+	git submodule sync
+	git submodule update --init --recursive
+
+sysroot:
+	@mkdir -p $@
+
+.PHONY: sysroot/$(TARGET)
+sysroot/$(TARGET): | sysroot
+	rm -rf $@
+	rm -rf $@.partial
+	mkdir -p $@.partial
+	$(MAKE) install DESTDIR=$(shell pwd)/$@.partial
+	mv $@.partial $@
+	touch $@
+
+test: sysroot/$(TARGET)
+	# TODO: Fix SIGILL when running cargo test
+	# $(CARGO_TEST) test
+	$(MAKE) -C tests run
+
+test-once: sysroot/$(TARGET)
+	$(MAKE) -C tests run-once TESTBIN=$(TESTBIN)
+
+
+$(BUILD)/$(PROFILE)/libc.so: $(BUILD)/$(PROFILE)/librelibc.a $(BUILD)/openlibm/libopenlibm.a
+	$(CC) -nostdlib \
+		-shared \
+		-Wl,--gc-sections \
+		-Wl,-z,pack-relative-relocs \
+		-Wl,--sort-common \
+		-Wl,--allow-multiple-definition \
+		-Wl,--whole-archive $^ -Wl,--no-whole-archive \
+		-Wl,-soname,libc.so.6 \
+		$(LINKFLAGS) \
+		-o $@
+
+$(BUILD)/$(PROFILE)/ld_so: $(BUILD)/$(PROFILE)/ld_so.o $(BUILD)/$(PROFILE)/crti.o $(BUILD)/$(PROFILE)/libc.a $(BUILD)/$(PROFILE)/crtn.o
+	# TODO: merge ld.so with libc.so: --dynamic-list=dynamic-list-file
+	$(LD) --shared -Bsymbolic --no-relax -T ld_so/ld_script/$(TARGET).ld --allow-multiple-definition --gc-sections $^ -o $@
+
+$(BUILD)/$(PROFILE)/libc.a: $(BUILD)/$(PROFILE)/librelibc.a $(BUILD)/openlibm/libopenlibm.a
+	echo "create $@" > "$@.mri"
+	for lib in $^; do\
+		echo "addlib $$lib" >> "$@.mri"; \
+	done
+	echo "save" >> "$@.mri"
+	echo "end" >> "$@.mri"
+	$(AR) -M < "$@.mri"
+
+# Debug targets
+
+$(BUILD)/debug/librelibc.a: $(SRC)
+	$(CARGO) rustc $(CARGOFLAGS) $(FEATURE_MATH) -- --emit link=$@ -g -C debug-assertions=no $(RUSTCFLAGS)
+	./renamesyms.sh "$@" "$(BUILD)/debug/deps/"
+	./stripcore.sh "$@"
+	touch $@
+
+$(BUILD)/debug/crt0.o: $(SRC)
+	$(CARGO) rustc --manifest-path src/crt0/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	touch $@
+
+$(BUILD)/debug/crti.o: $(SRC)
+	$(CARGO) rustc --manifest-path src/crti/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	touch $@
+
+$(BUILD)/debug/crtn.o: $(SRC)
+	$(CARGO) rustc --manifest-path src/crtn/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	touch $@
+
+$(BUILD)/debug/ld_so.o: $(SRC)
+	$(CARGO) rustc --manifest-path ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort -g -C debug-assertions=no $(RUSTCFLAGS)
+	touch $@
+
+# Release targets
+
+$(BUILD)/release/librelibc.a: $(SRC)
+	$(CARGO) rustc --release $(CARGOFLAGS) -- --emit link=$@ $(RUSTCFLAGS)
+	@# TODO: Better to only allow a certain whitelisted set of symbols? Perhaps
+	@# use some cbindgen hook, specify them manually, or grep for #[unsafe(no_mangle)].
+	./renamesyms.sh "$@" "$(BUILD)/release/deps/"
+	./stripcore.sh "$@"
+	touch $@
+
+$(BUILD)/release/crt0.o: $(SRC)
+	$(CARGO) rustc --release --manifest-path src/crt0/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	touch $@
+
+$(BUILD)/release/crti.o: $(SRC)
+	$(CARGO) rustc --release --manifest-path src/crti/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	touch $@
+
+$(BUILD)/release/crtn.o: $(SRC)
+	$(CARGO) rustc --release --manifest-path src/crtn/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	touch $@
+
+$(BUILD)/release/ld_so.o: $(SRC)
+	$(CARGO) rustc --release --manifest-path ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	touch $@
+
+# Other targets
+
+$(BUILD)/openlibm: openlibm
+	rm -rf $@ $@.partial
+	mkdir -p $(BUILD)
+	cp -r $< $@.partial
+	mv $@.partial $@
+	touch $@
+
+ifeq ($(USE_RUST_LIBM),)
+$(BUILD)/openlibm/libopenlibm.a: $(BUILD)/openlibm $(BUILD)/$(PROFILE)/librelibc.a
+	$(MAKE) -s AR=$(AR) CC="$(CC_WRAPPER) $(CC)" LD=$(LD) CPPFLAGS="$(CPPFLAGS) -fno-stack-protector -I$(shell pwd)/include -I$(TARGET_HEADERS)" -C $< libopenlibm.a
+	./renamesyms.sh "$@" "$(BUILD)/release/deps/"
+else
+$(BUILD)/openlibm/libopenlibm.a:
+	mkdir -p "$(BUILD)/openlibm"
+	$(AR) -rcs "$(BUILD)/openlibm/libopenlibm.a"
+endif
diff --git a/recipes/core/relibc/README.md b/recipes/core/relibc/README.md
new file mode 100644
index 0000000000..0e8c6628dc
--- /dev/null
+++ b/recipes/core/relibc/README.md
@@ -0,0 +1,173 @@
+# Redox C Library (relibc)
+
+relibc is a portable C standard library written in Rust and is under heavy development, this library contain the following items:
+
+- C, Linux, BSD functions and extensions
+- POSIX compatibility layer
+- Interfaces for system components
+
+The motivation for this project is twofold: Reduce issues that the Redox developers were having with [newlib](https://sourceware.org/newlib/), and create a more stable and safe alternative to C standard libraries written in C. It is mainly designed to be used under Redox, as an alternative to newlib, but it also supports Linux via the [sc](https://crates.io/crates/sc) crate.
+
+Currently Redox and Linux are supported.
+
+## `redox-rt`
+
+`redox-rt` is a runtime library that provides much of the code that enables POSIX on Redox, like `fork`, `exec`, signal handling, etc.
+Relibc uses it as backend in `src/platform/redox`, and it's intended to eventually be usable independently, without relibc.
+
+## Repository Layout
+
+- `include` - Header files (mostly macros and variadic functions `cbindgen` can't generate)
+- `src` - Source files
+- `src/c` - C code
+- `src/crt0` - Runtime code
+- `src/crti` - Runtime code
+- `src/crtn` - Runtime code
+- `src/header` - Header files implementation
+- `src/header/*` - Each folder has a `cbindgen.toml` file, it generates a C-to-Rust interface and header files
+- `src/ld_so` - Dynamic loader code
+- `src/platform` - Platform-specific and common code
+- `src/platform/redox` - Redox-specific code
+- `src/platform/linux` - Linux-specific code
+- `src/pthread` - pthread implementation
+- `src/sync` - Synchronization primitives
+- `tests` - C tests (each MR needs to give success in all of them)
+
+## Download the sources
+
+To download the relibc sources run the following command:
+
+```sh
+git clone --recursive https://gitlab.redox-os.org/redox-os/relibc
+```
+
+## Build Instructions
+
+To build relibc out of the Redox build system, do the following steps:
+
+### Dependencies
+
+- Install `cbindgen`
+
+```sh
+cargo install cbindgen
+```
+
+#### Install the `expect` tool
+
+- Debian, Ubuntu and PopOS:
+
+```sh
+sudo apt install expect
+```
+
+- Fedora:
+
+```sh
+sudo dnf install expect
+```
+
+- Arch Linux:
+
+```sh
+sudo pacman -S expect
+```
+
+### Build Relibc
+
+To build the relibc library objects, run the following command:
+
+```sh
+make all
+```
+
+- Clean old library objects and tests
+
+```sh
+make clean
+```
+
+## Build relibc inside the Redox build system
+
+Inside of your Redox build system, run:
+
+```sh
+make prefix
+```
+
+If you need to rebuild `relibc` for testing a Cookbook recipe, run:
+
+```sh
+touch relibc
+make prefix r.recipe-name
+```
+
+Touching (changing the "last modified time" of) the `relibc` folder is needed to trigger recompilation for `make prefix`. Replace `recipe-name` with your desired recipe name.
+
+Note: Do not edit `relibc` inside `prefix` folder! Do your work on `relibc` folder directly inside your Redox build system instead.
+
+## Tests
+
+Relibc has a test suite that also runs every time a new commit get pushed. You can see `.gitlab-ci.yml` to see how it's being executed. That being said, `./check.sh` is the recommended way to run tests. Here's few examples:
+
++ `./check.sh` - Run build, without running the test
++ `./check.sh --test` - Run all tests in x86_64 Redox using Redoxer
++ `./check.sh --test --host` - Run all tests in host (Linux)
++ `./check.sh --test --arch=aarch64` - Run all tests in specified arch
+  - Arch can be `x86_64`, `aarch64`, `i586`, or `riscv64gc`
++ `./check.sh --test=stdio/printf` - Run a single test
+  - Can be combined with `--host` or `--arch`
+  - Will run statically linked test in Linux, dynamically linked in Redox
+
+Couple of notes:
+
+- Relibc and its tests will rebuild if files changed, however switching between arch or host requires you to run `make clean`
+- Redoxer is needed to run tests for Redox without `--host`. You can install it using `cargo install redoxer`
+- Tests can hangs, the test runner can anticipate this, assuming the kernel doesn't hang too.
+
+## Issues
+
+#### I'm building for my own platform which I run, and am getting `x86_64-linux-gnu-ar: command not found` (or similar)
+
+The Makefile expects GNU compiler tools prefixed with the platform specifier, as would be present when you installed a cross compiler. Since you are building for your own platform, some Linux distributions (like Manjaro) don't install/symlink the prefixed executables.
+
+An easy fix would be to replace the corresponding lines in `config.mk`, e.g.
+
+```diff
+ifeq ($(TARGET),x86_64-unknown-linux-gnu)
+-	export CC=x86_64-linux-gnu-gcc
+-	export LD=x86_64-linux-gnu-ld
+-	export AR=x86_64-linux-gnu-ar
+-	export NM=x86_64-linux-gnu-nm
++       export CC=gcc
++       export LD=ld
++       export AR=ar
++       export NM=nm
+	export OBJCOPY=objcopy
+	export CPPFLAGS=
+	LD_SO_PATH=lib/ld64.so.1
+endif
+```
+
+## Contributing
+
+Before starting to contribute, read [this](CONTRIBUTING.md) document.
+
+## Supported OSes
+
+- Redox OS
+- Linux
+
+## Supported architectures
+
+- i586 (Intel/AMD)
+- x86_64 (Intel/AMD)
+- aarch64 (ARM64)
+- riscv64gc (RISC-V)
+
+## Funding - _Unix-style Signals and Process Management_
+
+This project is funded through [NGI Zero Core](https://nlnet.nl/core), a fund established by [NLnet](https://nlnet.nl) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu) program. Learn more at the [NLnet project page](https://nlnet.nl/project/RedoxOS-Signals).
+
+[<img src="https://nlnet.nl/logo/banner.png" alt="NLnet foundation logo" width="20%" />](https://nlnet.nl)
+[<img src="https://nlnet.nl/image/logos/NGI0_tag.svg" alt="NGI Zero Logo" width="20%" />](https://nlnet.nl/core)
diff --git a/recipes/core/relibc/build.rs b/recipes/core/relibc/build.rs
new file mode 100644
index 0000000000..efdfda1143
--- /dev/null
+++ b/recipes/core/relibc/build.rs
@@ -0,0 +1,36 @@
+extern crate cc;
+
+use std::{env, fs};
+
+fn get_target() -> String {
+    env::var("TARGET").unwrap_or(
+        option_env!("TARGET").map_or("x86_64-unknown-redox".to_string(), |x| x.to_string()),
+    )
+}
+
+fn main() {
+    let _crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set");
+    let target = get_target();
+
+    println!("cargo:rerun-if-changed=src/c");
+
+    let mut cc_builder = &mut cc::Build::new();
+
+    cc_builder = cc_builder.flag("-nostdinc").flag("-nostdlib");
+
+    if target.starts_with("aarch64") {
+        cc_builder = cc_builder.flag("-mno-outline-atomics")
+    }
+
+    cc_builder
+        .flag("-fno-stack-protector")
+        .flag("-Wno-expansion-to-defined")
+        .files(
+            fs::read_dir("src/c")
+                .expect("src/c directory missing")
+                .map(|res| res.expect("read_dir error").path()),
+        )
+        .compile("relibc_c");
+
+    println!("cargo:rustc-link-lib=static=relibc_c");
+}
diff --git a/recipes/core/relibc/cbindgen.globdefs.toml b/recipes/core/relibc/cbindgen.globdefs.toml
new file mode 100644
index 0000000000..7e7e19e231
--- /dev/null
+++ b/recipes/core/relibc/cbindgen.globdefs.toml
@@ -0,0 +1,24 @@
+
+# needs a leading newline
+[defines]
+"target_os=redox" = "__redox__"
+"target_os=linux" = "__linux__"
+"target_pointer_width=64" = "__LP64__"
+"target_pointer_width=32" = "__ILP32__"
+"target_arch=x86" = "__i386__"
+"target_arch=x86_64" = "__x86_64__"
+"target_arch=aarch64" = "__aarch64__"
+# This is not exact. It should be `defined(__riscv) && defined(__LP64__)`, or `defined(__riscv) && __riscv_xlen==64`
+# This will do however, as long as we only support riscv64 and not riscv32
+"target_arch=riscv64" = "__riscv"
+
+# XXX: silences a warning
+"feature = no_std" = "__relibc__"
+
+# Ensure attributes are passed down from Rust
+# <features.h> must be included where attributes are used in relibc
+[fn]
+must_use = "__nodiscard"
+deprecated = "__deprecated"
+deprecated_with_note = "__deprecatedNote({})"
+no_return = "__noreturn"
diff --git a/recipes/core/base/check.sh b/recipes/core/relibc/check.sh
similarity index 50%
rename from recipes/core/base/check.sh
rename to recipes/core/relibc/check.sh
index 5b6e567b67..9e4040040b 100755
--- a/recipes/core/base/check.sh
+++ b/recipes/core/relibc/check.sh
@@ -8,10 +8,14 @@ show_help() {
     echo "Usage: $(basename "$0") [OPTIONS]"
     echo ""
     echo "Description:"
-    echo "  Wrapper for redoxer to run checks or tests on Redox OS targets."
+    echo "  Wrapper for Makefile / Cargo to run checks or tests on Redox OS targets."
     echo ""
     echo "Options:"
-    echo "  --test              Run 'cargo test' instead of 'cargo check'"
+    echo "  --test              Run 'make test' instead of 'make all'"
+    echo "  --test=             Run single 'make test'"
+    echo "  --cargo             Run 'cargo check' / 'cargo test' instead"
+    echo "                         (note: cargo test is currently not maintained for relibc)"
+    echo "  --host              Run the command on host (linux) target"
     echo "  --all-target        Run the command on all supported Redox architectures"
     echo "  --target=<target>   Override the target architecture (e.g., i586-unknown-redox)"
     echo "  --arch=<arch>       Override the target architecture using arch (e.g., i586)"
@@ -21,14 +25,15 @@ show_help() {
     for t in "${SUPPORTED_TARGETS[@]}"; do
         echo "  - $t"
     done
+    echo "  - $(uname -m)-unknown-linux-gnu"
     echo ""
     echo "Environment:"
     echo "  TARGET              Sets the default target (overridden by --target)"
 }
 
-if ! command -v redoxer &> /dev/null; then
-    echo "Error: 'redoxer' CLI not found."
-    echo "Please install it: cargo install redoxer"
+if ! command -v cbindgen &> /dev/null; then
+    echo "Error: 'cbindgen' CLI not found."
+    echo "Please install it: cargo install cbindgen"
     exit 1
 fi
 
@@ -41,14 +46,31 @@ SUPPORTED_TARGETS=(
 
 CURRENT_TARGET="${TARGET:-x86_64-unknown-redox}"
 CHECK_ALL=false
-CMD_ACTION="all"
+CMD_ACTION="make"
+CARGO_ACTION="check"
+MAKE_ACTION="all"
+TEST_BIN=""
+IS_HOST=0
+
 while [[ $# -gt 0 ]]; do
     case "$1" in
         --all-target)
             CHECK_ALL=true
             ;;
         --test)
-            CMD_ACTION="test"
+            MAKE_ACTION="test"
+            CARGO_ACTION="test"
+            ;;
+        --test=*)
+            TEST_BIN="${1#*=}"
+            MAKE_ACTION="test-once"
+            ;;
+        --cargo)
+            CMD_ACTION="cargo"
+            ;;
+        --host)
+            CURRENT_TARGET="$(uname -m)-unknown-linux-gnu"
+            IS_HOST=1
             ;;
         --target=*)
             CURRENT_TARGET="${1#*=}"
@@ -69,32 +91,65 @@ while [[ $# -gt 0 ]]; do
     shift
 done
 
+if [ "$IS_HOST" -eq 0 ]; then
+if ! command -v redoxer &> /dev/null; then
+    echo "Error: 'redoxer' CLI not found."
+    echo "Please install it: cargo install redoxer"
+    exit 1
+fi
+fi
+
 run_redoxer() {
     export TARGET=$1
-    redoxer toolchain || { echo -e "${RED}Fail: redoxer toolchain for: $target.${NC}" && exit 1; }
+    REDOXER_ENV="redoxer env"
+    if [ "$IS_HOST" -eq 0 ]; then
+        redoxer toolchain || { echo -e "${RED}Fail: redoxer toolchain for: $target.${NC}" && exit 1; }
+        export CARGO_TEST="redoxer"
+        export TEST_RUNNER="redoxer exec --folder ../../sysroot/$TARGET/:/usr --folder . --"
+# TODO: Identify hang issue with pthread/barrier and pthread/once tests in multi core to get rid of this limit
+        export REDOXER_QEMU_ARGS="-smp 1"
+
+        MAKE_ACTION="$MAKE_ACTION IS_REDOX=1"
+    else
+        REDOXER_ENV=""
+    fi
+
+    if [ "$TEST_BIN" != "" ]; then
+        if [ "$IS_HOST" -eq 0 ]; then
+            MAKE_ACTION="$MAKE_ACTION TESTBIN=bins_dynamic/$TEST_BIN"
+        else
+            MAKE_ACTION="$MAKE_ACTION TESTBIN=bins_static/$TEST_BIN"
+        fi
+    fi
+
+    if [ "$CMD_ACTION" == "make" ]; then
+        CMD_OPT="-j $(nproc) $MAKE_ACTION"
+    else
+        CMD_OPT="$CARGO_ACTION"
+    fi
 
     echo "----------------------------------------"
-    echo "Running make $CMD_ACTION for: $TARGET"
-
-    if make "$CMD_ACTION"; then
+    echo "Running $REDOXER_ENV $CMD_ACTION $CMD_OPT for: $TARGET"
+    
+    if $REDOXER_ENV $CMD_ACTION $CMD_OPT; then
         return 0
     else
-        echo -e "${RED}Fail: $CMD_ACTION $TARGET failed.${NC}"
+        echo -e "${RED}Fail: $CMD_ACTION $CMD_OPT for $TARGET failed.${NC}"
         return 1
     fi
 }
 
 if [ "$CHECK_ALL" = true ]; then
     echo "Running $CMD_ACTION for all supported Redox targets..."
-
+    
     has_error=false
-
+    
     for target in "${SUPPORTED_TARGETS[@]}"; do
         if ! run_redoxer "$target"; then
             has_error=true
         fi
     done
-
+    
     echo "----------------------------------------"
     if [ "$has_error" = true ]; then
         echo -e "${RED}Summary: One or more targets failed.${NC}"
@@ -105,7 +160,7 @@ if [ "$CHECK_ALL" = true ]; then
     fi
 else
     if run_redoxer "$CURRENT_TARGET"; then
-        echo -e "${GREEN}Success: $CMD_ACTION $CURRENT_TARGET passed.${NC}"
+        echo -e "${GREEN}Success: $CARGO_ACTION for $CURRENT_TARGET passed.${NC}"
         exit 0
     else
         exit 1
diff --git a/recipes/core/relibc/config.mk b/recipes/core/relibc/config.mk
new file mode 100644
index 0000000000..e9ffa218ae
--- /dev/null
+++ b/recipes/core/relibc/config.mk
@@ -0,0 +1,73 @@
+ifndef TARGET
+	export TARGET:=$(shell rustc -Z unstable-options --print target-spec-json | grep llvm-target | cut -d '"' -f4)
+endif
+
+ifeq ($(TARGET),aarch64-unknown-linux-gnu)
+	export CC=aarch64-linux-gnu-gcc
+	export LD=aarch64-linux-gnu-ld
+	export AR=aarch64-linux-gnu-ar
+	export NM=aarch64-linux-gnu-nm
+	export OBJCOPY=aarch64-linux-gnu-objcopy
+	export CPPFLAGS=
+	LD_SO_PATH=lib/ld.so.1
+endif
+
+ifeq ($(TARGET),aarch64-unknown-redox)
+	export CC=aarch64-unknown-redox-gcc
+	export LD=aarch64-unknown-redox-ld
+	export AR=aarch64-unknown-redox-ar
+	export NM=aarch64-unknown-redox-nm
+	export OBJCOPY=aarch64-unknown-redox-objcopy
+	export CPPFLAGS=
+	LD_SO_PATH=lib/ld.so.1
+endif
+
+ifeq ($(TARGET),i586-unknown-redox)
+	export CC=i586-unknown-redox-gcc
+	export LD=i586-unknown-redox-ld
+	export AR=i586-unknown-redox-ar
+	export NM=i586-unknown-redox-nm
+	export OBJCOPY=i586-unknown-redox-objcopy
+	export CPPFLAGS=
+	LD_SO_PATH=lib/libc.so.1
+endif
+
+ifeq ($(TARGET),i686-unknown-redox)
+	export CC=i686-unknown-redox-gcc
+	export LD=i686-unknown-redox-ld
+	export AR=i686-unknown-redox-ar
+	export NM=i686-unknown-redox-nm
+	export OBJCOPY=i686-unknown-redox-objcopy
+	export CPPFLAGS=
+	LD_SO_PATH=lib/libc.so.1
+endif
+
+ifeq ($(TARGET),x86_64-unknown-linux-gnu)
+	export CC=x86_64-linux-gnu-gcc
+	export LD=x86_64-linux-gnu-ld
+	export AR=x86_64-linux-gnu-ar
+	export NM=x86_64-linux-gnu-nm
+	export OBJCOPY=objcopy
+	export CPPFLAGS=
+	LD_SO_PATH=lib/ld64.so.1
+endif
+
+ifeq ($(TARGET),x86_64-unknown-redox)
+	export CC=x86_64-unknown-redox-gcc
+	export LD=x86_64-unknown-redox-ld
+	export AR=x86_64-unknown-redox-ar
+	export NM=x86_64-unknown-redox-nm
+	export OBJCOPY=x86_64-unknown-redox-objcopy
+	export CPPFLAGS=
+	LD_SO_PATH=lib/ld64.so.1
+endif
+
+ifeq ($(TARGET),riscv64gc-unknown-redox)
+	export CC=riscv64-unknown-redox-gcc
+	export LD=riscv64-unknown-redox-ld
+	export AR=riscv64-unknown-redox-ar
+	export NM=riscv64-unknown-redox-nm
+	export OBJCOPY=riscv64-unknown-redox-objcopy
+	export CPPFLAGS=-march=rv64gc -mabi=lp64d
+	LD_SO_PATH=lib/ld.so.1
+endif
diff --git a/recipes/core/relibc/fmt.sh b/recipes/core/relibc/fmt.sh
new file mode 100755
index 0000000000..8caff707ae
--- /dev/null
+++ b/recipes/core/relibc/fmt.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cargo fmt --package relibc --package crt0 --package redox-rt "$@"
diff --git a/recipes/core/relibc/generic-rt/Cargo.toml b/recipes/core/relibc/generic-rt/Cargo.toml
new file mode 100644
index 0000000000..ba01e30d2b
--- /dev/null
+++ b/recipes/core/relibc/generic-rt/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "generic-rt"
+version = "0.1.0"
+edition = "2024"
+
+[lints]
+workspace = true
diff --git a/recipes/core/relibc/generic-rt/src/lib.rs b/recipes/core/relibc/generic-rt/src/lib.rs
new file mode 100644
index 0000000000..dca94521f0
--- /dev/null
+++ b/recipes/core/relibc/generic-rt/src/lib.rs
@@ -0,0 +1,133 @@
+#![no_std]
+#![allow(internal_features)]
+#![feature(core_intrinsics)]
+#![deny(unsafe_op_in_unsafe_fn)]
+
+use core::{
+    arch::asm,
+    mem::{self, offset_of},
+};
+
+#[derive(Debug)]
+#[repr(C)]
+pub struct GenericTcb<Os> {
+    /// Pointer to the end of static TLS. Must be the first member
+    pub tls_end: *mut u8,
+    /// Size of the memory allocated for the static TLS in bytes (multiple of page size)
+    pub tls_len: usize,
+    /// Pointer to this structure
+    pub tcb_ptr: *mut Self,
+    /// Size of the memory allocated for this structure in bytes (should be same as page size)
+    pub tcb_len: usize,
+    pub os_specific: Os,
+}
+impl<Os> GenericTcb<Os> {
+    /// Architecture specific code to read a usize from the TCB - aarch64
+    #[allow(unsafe_op_in_unsafe_fn)]
+    #[inline(always)]
+    #[cfg(target_arch = "aarch64")]
+    pub unsafe fn arch_read(offset: usize) -> usize {
+        let abi_ptr: usize;
+        asm!(
+            "mrs {}, tpidr_el0",
+            out(reg) abi_ptr,
+        );
+
+        let tcb_ptr = *(abi_ptr as *const usize);
+        *((tcb_ptr + offset) as *const usize)
+    }
+
+    /// Architecture specific code to read a usize from the TCB - x86
+    #[allow(unsafe_op_in_unsafe_fn)]
+    #[inline(always)]
+    #[cfg(target_arch = "x86")]
+    pub unsafe fn arch_read(offset: usize) -> usize {
+        let value;
+        asm!(
+            "
+            mov {}, gs:[{}]
+            ",
+            out(reg) value,
+            in(reg) offset,
+        );
+        value
+    }
+
+    /// Architecture specific code to read a usize from the TCB - x86_64
+    #[allow(unsafe_op_in_unsafe_fn)]
+    #[inline(always)]
+    #[cfg(target_arch = "x86_64")]
+    pub unsafe fn arch_read(offset: usize) -> usize {
+        let value;
+        asm!(
+            "
+            mov {}, fs:[{}]
+            ",
+            out(reg) value,
+            in(reg) offset,
+        );
+        value
+    }
+
+    /// Architecture specific code to read a usize from the TCB - riscv64
+    #[allow(unsafe_op_in_unsafe_fn)]
+    #[inline(always)]
+    #[cfg(target_arch = "riscv64")]
+    unsafe fn arch_read(offset: usize) -> usize {
+        let value;
+        asm!(
+            "ld {value}, -8(tp)", // TCB
+            "add {value}, {value}, {offset}",
+            "ld {value}, 0({value})",
+            value = out(reg) value,
+            offset = in(reg) offset,
+        );
+        value
+    }
+
+    pub unsafe fn current_ptr() -> Option<*mut Self> {
+        let tcb_ptr = unsafe { Self::arch_read(offset_of!(Self, tcb_ptr)) as *mut Self };
+        let tcb_len = unsafe { Self::arch_read(offset_of!(Self, tcb_len)) };
+        if tcb_ptr.is_null() || tcb_len < mem::size_of::<Self>() {
+            None
+        } else {
+            Some(tcb_ptr)
+        }
+    }
+    pub unsafe fn current() -> Option<&'static mut Self> {
+        unsafe { Some(&mut *Self::current_ptr()?) }
+    }
+}
+pub fn panic_notls(_msg: impl core::fmt::Display) -> ! {
+    // TODO: actually print _msg, perhaps by having panic_notls take a `T: DebugBackend` that can
+    // propagate until called by e.g. relibc start
+    core::intrinsics::abort();
+}
+
+pub trait ExpectTlsFree {
+    type Unwrapped;
+
+    fn expect_notls(self, msg: &str) -> Self::Unwrapped;
+}
+impl<T, E: core::fmt::Debug> ExpectTlsFree for Result<T, E> {
+    type Unwrapped = T;
+
+    fn expect_notls(self, msg: &str) -> T {
+        match self {
+            Ok(t) => t,
+            Err(err) => panic_notls(format_args!(
+                "{msg}: expect failed for Result with err: {err:?}",
+            )),
+        }
+    }
+}
+impl<T> ExpectTlsFree for Option<T> {
+    type Unwrapped = T;
+
+    fn expect_notls(self, msg: &str) -> T {
+        match self {
+            Some(t) => t,
+            None => panic_notls(format_args!("{msg}: expect failed for Option")),
+        }
+    }
+}
diff --git a/recipes/core/relibc/include/alloca.h b/recipes/core/relibc/include/alloca.h
new file mode 100644
index 0000000000..047153c476
--- /dev/null
+++ b/recipes/core/relibc/include/alloca.h
@@ -0,0 +1,6 @@
+#ifndef _ALLOCA_H
+#define _ALLOCA_H
+
+#define alloca(size) __builtin_alloca (size)
+
+#endif /* _ALLOCA_H */
diff --git a/recipes/core/relibc/include/complex.h b/recipes/core/relibc/include/complex.h
new file mode 100644
index 0000000000..5ae2f020d5
--- /dev/null
+++ b/recipes/core/relibc/include/complex.h
@@ -0,0 +1 @@
+#include <openlibm_complex.h>
diff --git a/recipes/core/relibc/include/features.h b/recipes/core/relibc/include/features.h
new file mode 100644
index 0000000000..6d0a0d6225
--- /dev/null
+++ b/recipes/core/relibc/include/features.h
@@ -0,0 +1,95 @@
+/*
+ * MIT License
+ * Copyright (c) 2020 Rich Felker musl-libc
+ */
+
+#ifndef _FEATURES_H__RELIBC
+#define _FEATURES_H__RELIBC
+
+// Version metadata for feature gating
+// This is useful for divergent implementation specific behavior
+// glibc, ulibc, and likely others define a similar macro
+// musl does not define an equivalent macro
+#define __RELIBC__ 1
+#define __RELIBC__MAJOR 0
+#define __RELIBC__MINOR 2
+
+/*
+ * Sources:
+ * https://en.cppreference.com/w/c/language/attributes
+ * https://clang.llvm.org/docs/LanguageExtensions.html
+ * https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fc_005fattribute.html
+ * https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html
+ */
+
+// Clang doesn't define __has_cpp_attribute if compiling C code
+#if !defined(__has_cpp_attribute)
+    #define __has_cpp_attribute(x) 0
+#endif
+
+// Clang doesn't define __has_c_attribute if compiling C++ code
+#if !defined(__has_c_attribute)
+    #define __has_c_attribute(x) 0
+#endif
+
+// Check if C23+ attributes are available
+#if defined(__cplusplus)
+// HACK: GCC backports C++ attributes to C++98 but doesn't accept attributes
+// placed before the function like cbindgen emits.
+// Let's just disable attributes for C++98 by checking if a random C++11
+// feature is available.
+#define __HAS_ATTRIBUTE(x) __cpp_variable_templates &&__has_cpp_attribute(x)
+#else
+#define __HAS_ATTRIBUTE(x)                                                     \
+  (__has_c_attribute(x) || __STDC_VERSION__ >= 202311L ||                      \
+   __has_cpp_attribute(x))
+#endif
+
+// TODO: Not emitted with cbindgen
+#if __STDC_VERSION__ >= 199901L
+    #define __restrict restrict
+#elif !defined(__GNUC__)
+    #define __restrict
+#endif
+
+// TODO: Not emitted with cbindgen
+#if __STDC_VERSION__ >= 199901L || defined(__cplusplus)
+    #define __inline inline
+#elif !defined(__GNUC__)
+    #define __inline
+#endif
+
+// Analogous to Rust's Never type
+//TODO: clang fails to compile C with [[noreturn]]
+#if defined(__cplusplus) && __HAS_ATTRIBUTE(noreturn) && !(__clang__)
+    #define __noreturn [[noreturn]]
+// #elif __STDC_VERSION__ >= 201112L
+// FIXME: cbindgen incorrectly places _Noreturn
+// #define __noreturn _Noreturn
+#elif defined(__GNUC__)
+    #define __noreturn __attribute__((__noreturn__))
+#else
+    #define __noreturn
+#endif
+
+// Analogous to Rust's #[must_use]
+// C23 only
+#if __HAS_ATTRIBUTE(nodiscard)
+    #define __nodiscard [[nodiscard]]
+    #define __nodiscardNote(x) [[nodiscard(x)]]
+#else
+    #define __nodiscard
+    #define __nodiscardNote(x)
+#endif
+
+// Analogous to Rust's #[deprecated]
+// C23 only
+#if __HAS_ATTRIBUTE(deprecated)
+    #define __deprecated [[deprecated]]
+    #define __deprecatedNote(x) [[deprecated(x)]]
+#else
+    #define __deprecated
+    #define __deprecatedNote(x)
+#endif
+
+#endif
diff --git a/recipes/core/relibc/include/fenv.h b/recipes/core/relibc/include/fenv.h
new file mode 100644
index 0000000000..e2437bd8fd
--- /dev/null
+++ b/recipes/core/relibc/include/fenv.h
@@ -0,0 +1,3 @@
+#include <openlibm_fenv.h>
+#undef complex
+#undef I
diff --git a/recipes/core/relibc/include/getopt.h b/recipes/core/relibc/include/getopt.h
new file mode 100644
index 0000000000..3db90d7080
--- /dev/null
+++ b/recipes/core/relibc/include/getopt.h
@@ -0,0 +1,21 @@
+#ifndef _GETOPT_H
+#define _GETOPT_H
+
+// Generated from:
+// `grep "opt" target/include/unistd.h`
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern char* optarg;
+extern int opterr;
+extern int optind;
+extern int optopt;
+int getopt(int argc, char *const *argv, const char *optstring);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif
diff --git a/recipes/core/relibc/include/iso646.h b/recipes/core/relibc/include/iso646.h
new file mode 100644
index 0000000000..d94c240909
--- /dev/null
+++ b/recipes/core/relibc/include/iso646.h
@@ -0,0 +1,22 @@
+// Copied from musl
+
+#ifndef _ISO646_H
+#define _ISO646_H
+
+#ifndef __cplusplus
+
+#define and    &&
+#define and_eq &=
+#define bitand &
+#define bitor  |
+#define compl  ~
+#define not    !
+#define not_eq !=
+#define or     ||
+#define or_eq  |=
+#define xor    ^
+#define xor_eq ^=
+
+#endif
+
+#endif
diff --git a/recipes/core/relibc/include/machine/endian.h b/recipes/core/relibc/include/machine/endian.h
new file mode 100644
index 0000000000..68da686e7e
--- /dev/null
+++ b/recipes/core/relibc/include/machine/endian.h
@@ -0,0 +1,17 @@
+#ifndef __MACHINE_ENDIAN_H__
+
+/* TODO: Forcing little endian, if you need a big endian system, fix this { */
+#ifndef BIG_ENDIAN
+#define BIG_ENDIAN 4321
+#endif
+
+#ifndef LITTLE_ENDIAN
+#define LITTLE_ENDIAN 1234
+#endif
+
+#ifndef BYTE_ORDER
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif
+/* } */
+
+#endif /* __MACHINE_ENDIAN_H__ */
diff --git a/recipes/core/relibc/include/math.h b/recipes/core/relibc/include/math.h
new file mode 100644
index 0000000000..eba89dc734
--- /dev/null
+++ b/recipes/core/relibc/include/math.h
@@ -0,0 +1,113 @@
+#include <openlibm_math.h>
+
+// Missing typedefs
+typedef float float_t;
+typedef double double_t;
+
+/* double */
+
+#ifndef M_PI
+#define	M_PI		3.14159265358979323846	/* pi */
+#endif
+
+#ifndef M_PI_2
+#define	M_PI_2		1.57079632679489661923	/* pi/2 */
+#endif
+
+#ifndef M_PI_4
+#define	M_PI_4		0.78539816339744830962	/* pi/4 */
+#endif
+
+#ifndef M_2_PI
+#define M_2_PI		0.63661977236758134308	/* 2/pi */
+#endif
+
+#ifndef M_E
+#define M_E			2.7182818284590452354	/* e */
+#endif
+
+#ifndef M_LOG2E
+#define M_LOG2E		1.4426950408889634074	/* log_2 e */
+#endif
+
+#ifndef M_LOG10E
+#define M_LOG10E	0.43429448190325182765	/* log_10 e */
+#endif
+
+#ifndef M_LN2
+#define M_LN2		0.69314718055994530942	/* log_e 2 */
+#endif
+
+#ifndef M_LN10
+#define M_LN10		2.30258509299404568402	/* log_e 10 */
+#endif
+
+#ifndef M_1_PI
+#define M_1_PI		0.31830988618379067154	/* 1/pi */
+#endif
+
+#ifndef M_2_SQRTPI
+#define M_2_SQRTPI	1.12837916709551257390	/* 2/sqrt(pi) */
+#endif
+
+#ifndef M_SQRT2
+#define M_SQRT2		1.41421356237309504880	/* sqrt(2) */
+#endif
+
+#ifndef M_SQRT1_2
+#define M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
+#endif
+
+/* long double */
+
+#ifndef M_El
+#define M_El        2.718281828459045235360287471352662498L /* e */
+#endif
+
+#ifndef M_LOG2El
+#define M_LOG2El    1.442695040888963407359924681001892137L /* log_2 e */
+#endif
+
+#ifndef M_LOG10El
+#define M_LOG10El   0.434294481903251827651128918916605082L /* log_10 e */
+#endif
+
+#ifndef M_LN2l
+#define M_LN2l      0.693147180559945309417232121458176568L /* log_e 2 */
+#endif
+
+#ifndef M_LN10l
+#define M_LN10l     2.302585092994045684017991454684364208L /* log_e 10 */
+#endif
+
+#ifndef M_PIl
+#define M_PIl       3.141592653589793238462643383279502884L /* pi */
+#endif
+
+#ifndef M_PI_2l
+#define M_PI_2l     1.570796326794896619231321691639751442L /* pi/2 */
+#endif
+
+#ifndef M_PI_4l
+#define M_PI_4l     0.785398163397448309615660845819875721L /* pi/4 */
+#endif
+
+#ifndef M_1_PIl
+#define M_1_PIl     0.318309886183790671537767526745028724L /* 1/pi */
+#endif
+
+#ifndef M_2_PIl
+#define M_2_PIl     0.636619772367581343075535053490057448L /* 2/pi */
+#endif
+
+#ifndef M_2_SQRTPIl
+#define M_2_SQRTPIl 1.128379167095512573896158903121545172L /* 2/sqrt(pi) */
+#endif
+
+#ifndef M_SQRT2l
+#define M_SQRT2l    1.414213562373095048801688724209698079L /* sqrt(2) */
+#endif
+
+#ifndef M_SQRT1_2l
+#define M_SQRT1_2l  0.707106781186547524400844362104849039L /* 1/sqrt(2) */
+#endif
\ No newline at end of file
diff --git a/recipes/core/relibc/include/memory.h b/recipes/core/relibc/include/memory.h
new file mode 100644
index 0000000000..3b2f590027
--- /dev/null
+++ b/recipes/core/relibc/include/memory.h
@@ -0,0 +1 @@
+#include <string.h>
diff --git a/recipes/core/relibc/include/netinet/in_systm.h b/recipes/core/relibc/include/netinet/in_systm.h
new file mode 100644
index 0000000000..581326eb57
--- /dev/null
+++ b/recipes/core/relibc/include/netinet/in_systm.h
@@ -0,0 +1,10 @@
+#ifndef _NETINET_IN_SYSTM_H
+#define _NETINET_IN_SYSTM_H
+
+#include <stdint.h>
+
+typedef uint16_t n_short;
+typedef uint32_t n_long;
+typedef uint32_t n_time;
+
+#endif
diff --git a/recipes/core/relibc/include/paths.h b/recipes/core/relibc/include/paths.h
new file mode 100644
index 0000000000..8bbfa920c6
--- /dev/null
+++ b/recipes/core/relibc/include/paths.h
@@ -0,0 +1,6 @@
+#ifndef _RELIBC_PATHS_H
+#define _RELIBC_PATHS_H
+
+#define _PATH_BSHELL "/bin/sh"
+
+#endif
diff --git a/recipes/core/relibc/include/setjmp.h b/recipes/core/relibc/include/setjmp.h
new file mode 100644
index 0000000000..a8bb37622d
--- /dev/null
+++ b/recipes/core/relibc/include/setjmp.h
@@ -0,0 +1,81 @@
+#ifndef _SETJMP_H
+#define _SETJMP_H
+
+#ifdef __aarch64__
+typedef unsigned long jmp_buf[22];
+#endif
+
+#ifdef __arm__
+typedef unsigned long long jmp_buf[32];
+#endif
+
+#ifdef __i386__
+typedef unsigned long jmp_buf[6];
+#endif
+
+#ifdef __m68k__
+typedef unsigned long jmp_buf[39];
+#endif
+
+#ifdef __microblaze__
+typedef unsigned long jmp_buf[18];
+#endif
+
+#ifdef __mips__
+typedef unsigned long long jmp_buf[13];
+#endif
+
+#ifdef __mips64__
+typedef unsigned long long jmp_buf[23];
+#endif
+
+#ifdef __mipsn32__
+typedef unsigned long long jmp_buf[23];
+#endif
+
+#ifdef __or1k__
+typedef unsigned long jmp_buf[13];
+#endif
+
+#ifdef __powerpc__
+typedef unsigned long long jmp_buf[56];
+#endif
+
+#ifdef __powerpc64__
+typedef uint128_t jmp_buf[32];
+#endif
+
+#ifdef __s390x__
+typedef unsigned long jmp_buf[18];
+#endif
+
+#ifdef __sh__
+typedef unsigned long jmp_buf[15];
+#endif
+
+#ifdef __x32__
+typedef unsigned long long jmp_buf[8];
+#endif
+
+#ifdef __x86_64__
+typedef unsigned long jmp_buf[16];
+#endif
+
+#ifdef __riscv
+typedef unsigned long jmp_buf[26];
+#endif
+
+typedef jmp_buf sigjmp_buf;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int setjmp(jmp_buf buf);
+void longjmp(jmp_buf buf, int value);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif /* _SETJMP_H */
diff --git a/recipes/core/relibc/include/stdarg.h b/recipes/core/relibc/include/stdarg.h
new file mode 100644
index 0000000000..28ff0905ba
--- /dev/null
+++ b/recipes/core/relibc/include/stdarg.h
@@ -0,0 +1,10 @@
+#ifndef _STDARG_H
+#define _STDARG_H
+
+typedef __builtin_va_list va_list;
+#define va_start(v,l)   __builtin_va_start(v,l)
+#define va_end(v)       __builtin_va_end(v)
+#define va_arg(v,l)     __builtin_va_arg(v,l)
+#define va_copy(d,s) __builtin_va_copy(d,s)
+
+#endif /* _STDARG_H */
diff --git a/recipes/core/relibc/include/stdatomic.h b/recipes/core/relibc/include/stdatomic.h
new file mode 100644
index 0000000000..bfcfdf664c
--- /dev/null
+++ b/recipes/core/relibc/include/stdatomic.h
@@ -0,0 +1,243 @@
+/* Copyright (C) 2013-2022 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+/* ISO C11 Standard:  7.17  Atomics <stdatomic.h>.  */
+
+#ifndef _STDATOMIC_H
+#define _STDATOMIC_H
+
+typedef enum
+  {
+    memory_order_relaxed = __ATOMIC_RELAXED,
+    memory_order_consume = __ATOMIC_CONSUME,
+    memory_order_acquire = __ATOMIC_ACQUIRE,
+    memory_order_release = __ATOMIC_RELEASE,
+    memory_order_acq_rel = __ATOMIC_ACQ_REL,
+    memory_order_seq_cst = __ATOMIC_SEQ_CST
+  } memory_order;
+
+
+typedef _Atomic _Bool atomic_bool;
+typedef _Atomic char atomic_char;
+typedef _Atomic signed char atomic_schar;
+typedef _Atomic unsigned char atomic_uchar;
+typedef _Atomic short atomic_short;
+typedef _Atomic unsigned short atomic_ushort;
+typedef _Atomic int atomic_int;
+typedef _Atomic unsigned int atomic_uint;
+typedef _Atomic long atomic_long;
+typedef _Atomic unsigned long atomic_ulong;
+typedef _Atomic long long atomic_llong;
+typedef _Atomic unsigned long long atomic_ullong;
+typedef _Atomic __CHAR16_TYPE__ atomic_char16_t;
+typedef _Atomic __CHAR32_TYPE__ atomic_char32_t;
+typedef _Atomic __WCHAR_TYPE__ atomic_wchar_t;
+typedef _Atomic __INT_LEAST8_TYPE__ atomic_int_least8_t;
+typedef _Atomic __UINT_LEAST8_TYPE__ atomic_uint_least8_t;
+typedef _Atomic __INT_LEAST16_TYPE__ atomic_int_least16_t;
+typedef _Atomic __UINT_LEAST16_TYPE__ atomic_uint_least16_t;
+typedef _Atomic __INT_LEAST32_TYPE__ atomic_int_least32_t;
+typedef _Atomic __UINT_LEAST32_TYPE__ atomic_uint_least32_t;
+typedef _Atomic __INT_LEAST64_TYPE__ atomic_int_least64_t;
+typedef _Atomic __UINT_LEAST64_TYPE__ atomic_uint_least64_t;
+typedef _Atomic __INT_FAST8_TYPE__ atomic_int_fast8_t;
+typedef _Atomic __UINT_FAST8_TYPE__ atomic_uint_fast8_t;
+typedef _Atomic __INT_FAST16_TYPE__ atomic_int_fast16_t;
+typedef _Atomic __UINT_FAST16_TYPE__ atomic_uint_fast16_t;
+typedef _Atomic __INT_FAST32_TYPE__ atomic_int_fast32_t;
+typedef _Atomic __UINT_FAST32_TYPE__ atomic_uint_fast32_t;
+typedef _Atomic __INT_FAST64_TYPE__ atomic_int_fast64_t;
+typedef _Atomic __UINT_FAST64_TYPE__ atomic_uint_fast64_t;
+typedef _Atomic __INTPTR_TYPE__ atomic_intptr_t;
+typedef _Atomic __UINTPTR_TYPE__ atomic_uintptr_t;
+typedef _Atomic __SIZE_TYPE__ atomic_size_t;
+typedef _Atomic __PTRDIFF_TYPE__ atomic_ptrdiff_t;
+typedef _Atomic __INTMAX_TYPE__ atomic_intmax_t;
+typedef _Atomic __UINTMAX_TYPE__ atomic_uintmax_t;        
+
+
+#define ATOMIC_VAR_INIT(VALUE)	(VALUE)
+
+/* Initialize an atomic object pointed to by PTR with VAL.  */
+#define atomic_init(PTR, VAL)                           \
+  atomic_store_explicit (PTR, VAL, __ATOMIC_RELAXED)
+
+#define kill_dependency(Y)			\
+  __extension__					\
+  ({						\
+    __auto_type __kill_dependency_tmp = (Y);	\
+    __kill_dependency_tmp;			\
+  })
+
+extern void atomic_thread_fence (memory_order);
+#define atomic_thread_fence(MO)	__atomic_thread_fence (MO)
+extern void atomic_signal_fence (memory_order);
+#define atomic_signal_fence(MO)	__atomic_signal_fence  (MO)
+#define atomic_is_lock_free(OBJ) __atomic_is_lock_free (sizeof (*(OBJ)), (OBJ))
+
+#define ATOMIC_BOOL_LOCK_FREE		__GCC_ATOMIC_BOOL_LOCK_FREE
+#define ATOMIC_CHAR_LOCK_FREE		__GCC_ATOMIC_CHAR_LOCK_FREE
+#define ATOMIC_CHAR16_T_LOCK_FREE	__GCC_ATOMIC_CHAR16_T_LOCK_FREE
+#define ATOMIC_CHAR32_T_LOCK_FREE	__GCC_ATOMIC_CHAR32_T_LOCK_FREE
+#define ATOMIC_WCHAR_T_LOCK_FREE	__GCC_ATOMIC_WCHAR_T_LOCK_FREE
+#define ATOMIC_SHORT_LOCK_FREE		__GCC_ATOMIC_SHORT_LOCK_FREE
+#define ATOMIC_INT_LOCK_FREE		__GCC_ATOMIC_INT_LOCK_FREE
+#define ATOMIC_LONG_LOCK_FREE		__GCC_ATOMIC_LONG_LOCK_FREE
+#define ATOMIC_LLONG_LOCK_FREE		__GCC_ATOMIC_LLONG_LOCK_FREE
+#define ATOMIC_POINTER_LOCK_FREE	__GCC_ATOMIC_POINTER_LOCK_FREE
+
+
+/* Note that these macros require __auto_type to remove
+   _Atomic qualifiers (and const qualifiers, if those are valid on
+   macro operands).
+   
+   Also note that the header file uses the generic form of __atomic
+   builtins, which requires the address to be taken of the value
+   parameter, and then we pass that value on.  This allows the macros
+   to work for any type, and the compiler is smart enough to convert
+   these to lock-free _N variants if possible, and throw away the
+   temps.  */
+
+#define atomic_store_explicit(PTR, VAL, MO)				\
+  __extension__								\
+  ({									\
+    __auto_type __atomic_store_ptr = (PTR);				\
+    __typeof__ ((void)0, *__atomic_store_ptr) __atomic_store_tmp = (VAL);	\
+    __atomic_store (__atomic_store_ptr, &__atomic_store_tmp, (MO));	\
+  })
+
+#define atomic_store(PTR, VAL)				\
+  atomic_store_explicit (PTR, VAL, __ATOMIC_SEQ_CST)
+
+
+#define atomic_load_explicit(PTR, MO)					\
+  __extension__								\
+  ({									\
+    __auto_type __atomic_load_ptr = (PTR);				\
+    __typeof__ ((void)0, *__atomic_load_ptr) __atomic_load_tmp;			\
+    __atomic_load (__atomic_load_ptr, &__atomic_load_tmp, (MO));	\
+    __atomic_load_tmp;							\
+  })
+
+#define atomic_load(PTR)  atomic_load_explicit (PTR, __ATOMIC_SEQ_CST)
+
+
+#define atomic_exchange_explicit(PTR, VAL, MO)				\
+  __extension__								\
+  ({									\
+    __auto_type __atomic_exchange_ptr = (PTR);				\
+    __typeof__ ((void)0, *__atomic_exchange_ptr) __atomic_exchange_val = (VAL);	\
+    __typeof__ ((void)0, *__atomic_exchange_ptr) __atomic_exchange_tmp;		\
+    __atomic_exchange (__atomic_exchange_ptr, &__atomic_exchange_val,	\
+		       &__atomic_exchange_tmp, (MO));			\
+    __atomic_exchange_tmp;						\
+  })
+
+#define atomic_exchange(PTR, VAL) 			\
+  atomic_exchange_explicit (PTR, VAL, __ATOMIC_SEQ_CST)
+
+
+#define atomic_compare_exchange_strong_explicit(PTR, VAL, DES, SUC, FAIL) \
+  __extension__								\
+  ({									\
+    __auto_type __atomic_compare_exchange_ptr = (PTR);			\
+    __typeof__ ((void)0, *__atomic_compare_exchange_ptr) __atomic_compare_exchange_tmp \
+      = (DES);								\
+    __atomic_compare_exchange (__atomic_compare_exchange_ptr, (VAL),	\
+			       &__atomic_compare_exchange_tmp, 0,	\
+			       (SUC), (FAIL));				\
+  })
+
+#define atomic_compare_exchange_strong(PTR, VAL, DES) 			   \
+  atomic_compare_exchange_strong_explicit (PTR, VAL, DES, __ATOMIC_SEQ_CST, \
+					   __ATOMIC_SEQ_CST)
+
+#define atomic_compare_exchange_weak_explicit(PTR, VAL, DES, SUC, FAIL) \
+  __extension__								\
+  ({									\
+    __auto_type __atomic_compare_exchange_ptr = (PTR);			\
+    __typeof__ ((void)0, *__atomic_compare_exchange_ptr) __atomic_compare_exchange_tmp \
+      = (DES);								\
+    __atomic_compare_exchange (__atomic_compare_exchange_ptr, (VAL),	\
+			       &__atomic_compare_exchange_tmp, 1,	\
+			       (SUC), (FAIL));				\
+  })
+
+#define atomic_compare_exchange_weak(PTR, VAL, DES)			\
+  atomic_compare_exchange_weak_explicit (PTR, VAL, DES, __ATOMIC_SEQ_CST, \
+					 __ATOMIC_SEQ_CST)
+
+
+
+#define atomic_fetch_add(PTR, VAL) __atomic_fetch_add ((PTR), (VAL), 	\
+						       __ATOMIC_SEQ_CST)
+#define atomic_fetch_add_explicit(PTR, VAL, MO) 			\
+			  __atomic_fetch_add ((PTR), (VAL), (MO))
+
+#define atomic_fetch_sub(PTR, VAL) __atomic_fetch_sub ((PTR), (VAL), 	\
+						       __ATOMIC_SEQ_CST)
+#define atomic_fetch_sub_explicit(PTR, VAL, MO) 			\
+			  __atomic_fetch_sub ((PTR), (VAL), (MO))
+
+#define atomic_fetch_or(PTR, VAL) __atomic_fetch_or ((PTR), (VAL), 	\
+						       __ATOMIC_SEQ_CST)
+#define atomic_fetch_or_explicit(PTR, VAL, MO) 			\
+			  __atomic_fetch_or ((PTR), (VAL), (MO))
+
+#define atomic_fetch_xor(PTR, VAL) __atomic_fetch_xor ((PTR), (VAL), 	\
+						       __ATOMIC_SEQ_CST)
+#define atomic_fetch_xor_explicit(PTR, VAL, MO) 			\
+			  __atomic_fetch_xor ((PTR), (VAL), (MO))
+
+#define atomic_fetch_and(PTR, VAL) __atomic_fetch_and ((PTR), (VAL), 	\
+						       __ATOMIC_SEQ_CST)
+#define atomic_fetch_and_explicit(PTR, VAL, MO) 			\
+			  __atomic_fetch_and ((PTR), (VAL), (MO))
+
+
+typedef _Atomic struct
+{
+#if __GCC_ATOMIC_TEST_AND_SET_TRUEVAL == 1
+  _Bool __val;
+#else
+  unsigned char __val;
+#endif
+} atomic_flag;
+
+#define ATOMIC_FLAG_INIT	{ 0 }
+
+
+extern _Bool atomic_flag_test_and_set (volatile atomic_flag *);
+#define atomic_flag_test_and_set(PTR) 					\
+			__atomic_test_and_set ((PTR), __ATOMIC_SEQ_CST)
+extern _Bool atomic_flag_test_and_set_explicit (volatile atomic_flag *,
+						memory_order);
+#define atomic_flag_test_and_set_explicit(PTR, MO)			\
+			__atomic_test_and_set ((PTR), (MO))
+
+extern void atomic_flag_clear (volatile atomic_flag *);
+#define atomic_flag_clear(PTR)	__atomic_clear ((PTR), __ATOMIC_SEQ_CST)
+extern void atomic_flag_clear_explicit (volatile atomic_flag *, memory_order);
+#define atomic_flag_clear_explicit(PTR, MO)   __atomic_clear ((PTR), (MO))
+
+#endif  /* _STDATOMIC_H */
diff --git a/recipes/core/relibc/include/stdbool.h b/recipes/core/relibc/include/stdbool.h
new file mode 100644
index 0000000000..59cce7a961
--- /dev/null
+++ b/recipes/core/relibc/include/stdbool.h
@@ -0,0 +1,19 @@
+#ifndef _STDBOOL_H
+#define _STDBOOL_H
+
+#ifndef __cplusplus
+typedef _Bool bool;
+#define true 1
+#define false 0
+#else /* __cplusplus */
+typedef bool _Bool;
+#if __cplusplus < 201103L
+#define false false
+#define true true
+#endif /*__cplusplus < 201103L*/
+#endif /* __cplusplus */
+
+#define __bool_true_false_are_defined 1
+
+
+#endif /* _STDBOOL_H */
diff --git a/recipes/core/relibc/include/stddef.h b/recipes/core/relibc/include/stddef.h
new file mode 100644
index 0000000000..334267f457
--- /dev/null
+++ b/recipes/core/relibc/include/stddef.h
@@ -0,0 +1,18 @@
+#ifndef _STDDEF_H
+#define _STDDEF_H
+#include <stdint.h>
+
+#define NULL 0
+
+#ifndef __PTRDIFF_TYPE__
+#define __PTRDIFF_TYPE__ long int
+#endif
+typedef __PTRDIFF_TYPE__ ptrdiff_t;
+
+typedef long unsigned int size_t;
+
+typedef struct { long long __ll; long double __ld; } max_align_t;
+
+#define offsetof(type, member) __builtin_offsetof(type, member)
+
+#endif /* _STDDEF_H */
diff --git a/recipes/core/relibc/include/stdint.h b/recipes/core/relibc/include/stdint.h
new file mode 100644
index 0000000000..963b8e9b5d
--- /dev/null
+++ b/recipes/core/relibc/include/stdint.h
@@ -0,0 +1,377 @@
+/* Copyright (C) 2008-2018 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+/*
+ * ISO C Standard:  7.18  Integer types  <stdint.h>
+ */
+
+#ifndef _STDINT_H
+#define _STDINT_H
+
+/* 7.8.1.1 Exact-width integer types */
+
+#ifdef __INT8_TYPE__
+typedef __INT8_TYPE__ int8_t;
+#endif
+#ifdef __INT16_TYPE__
+typedef __INT16_TYPE__ int16_t;
+#endif
+#ifdef __INT32_TYPE__
+typedef __INT32_TYPE__ int32_t;
+#endif
+#ifdef __INT64_TYPE__
+typedef __INT64_TYPE__ int64_t;
+#endif
+#ifdef __UINT8_TYPE__
+typedef __UINT8_TYPE__ uint8_t;
+typedef __UINT8_TYPE__ u_int8_t;
+#endif
+#ifdef __UINT16_TYPE__
+typedef __UINT16_TYPE__ uint16_t;
+typedef __UINT16_TYPE__ u_int16_t;
+#endif
+#ifdef __UINT32_TYPE__
+typedef __UINT32_TYPE__ uint32_t;
+typedef __UINT32_TYPE__ u_int32_t;
+// Required by openlibm
+typedef __UINT32_TYPE__ __uint32_t;
+#endif
+#ifdef __UINT64_TYPE__
+typedef __UINT64_TYPE__ uint64_t;
+typedef __UINT64_TYPE__ u_int64_t;
+// Required by openlibm
+typedef __UINT64_TYPE__ __uint64_t;
+#endif
+
+/* 7.8.1.2 Minimum-width integer types */
+
+typedef __INT_LEAST8_TYPE__ int_least8_t;
+typedef __INT_LEAST16_TYPE__ int_least16_t;
+typedef __INT_LEAST32_TYPE__ int_least32_t;
+typedef __INT_LEAST64_TYPE__ int_least64_t;
+typedef __UINT_LEAST8_TYPE__ uint_least8_t;
+typedef __UINT_LEAST16_TYPE__ uint_least16_t;
+typedef __UINT_LEAST32_TYPE__ uint_least32_t;
+typedef __UINT_LEAST64_TYPE__ uint_least64_t;
+
+/* 7.8.1.3 Fastest minimum-width integer types */
+
+typedef __INT_FAST8_TYPE__ int_fast8_t;
+typedef __INT_FAST16_TYPE__ int_fast16_t;
+typedef __INT_FAST32_TYPE__ int_fast32_t;
+typedef __INT_FAST64_TYPE__ int_fast64_t;
+typedef __UINT_FAST8_TYPE__ uint_fast8_t;
+typedef __UINT_FAST16_TYPE__ uint_fast16_t;
+typedef __UINT_FAST32_TYPE__ uint_fast32_t;
+typedef __UINT_FAST64_TYPE__ uint_fast64_t;
+
+/* 7.8.1.4 Integer types capable of holding object pointers */
+
+#ifdef __INTPTR_TYPE__
+typedef __INTPTR_TYPE__ intptr_t;
+#endif
+#ifdef __UINTPTR_TYPE__
+typedef __UINTPTR_TYPE__ uintptr_t;
+#endif
+
+/* 7.8.1.5 Greatest-width integer types */
+
+typedef __INTMAX_TYPE__ intmax_t;
+typedef __UINTMAX_TYPE__ uintmax_t;
+
+#if (!defined __cplusplus || __cplusplus >= 201103L \
+     || defined __STDC_LIMIT_MACROS)
+
+/* 7.18.2 Limits of specified-width integer types */
+
+#ifdef __INT8_MAX__
+# undef INT8_MAX
+# define INT8_MAX __INT8_MAX__
+# undef INT8_MIN
+# define INT8_MIN (-INT8_MAX - 1)
+#endif
+#ifdef __UINT8_MAX__
+# undef UINT8_MAX
+# define UINT8_MAX __UINT8_MAX__
+#endif
+#ifdef __INT16_MAX__
+# undef INT16_MAX
+# define INT16_MAX __INT16_MAX__
+# undef INT16_MIN
+# define INT16_MIN (-INT16_MAX - 1)
+#endif
+#ifdef __UINT16_MAX__
+# undef UINT16_MAX
+# define UINT16_MAX __UINT16_MAX__
+#endif
+#ifdef __INT32_MAX__
+# undef INT32_MAX
+# define INT32_MAX __INT32_MAX__
+# undef INT32_MIN
+# define INT32_MIN (-INT32_MAX - 1)
+#endif
+#ifdef __UINT32_MAX__
+# undef UINT32_MAX
+# define UINT32_MAX __UINT32_MAX__
+#endif
+#ifdef __INT64_MAX__
+# undef INT64_MAX
+# define INT64_MAX __INT64_MAX__
+# undef INT64_MIN
+# define INT64_MIN (-INT64_MAX - 1)
+#endif
+#ifdef __UINT64_MAX__
+# undef UINT64_MAX
+# define UINT64_MAX __UINT64_MAX__
+#endif
+
+#undef INT_LEAST8_MAX
+#define INT_LEAST8_MAX __INT_LEAST8_MAX__
+#undef INT_LEAST8_MIN
+#define INT_LEAST8_MIN (-INT_LEAST8_MAX - 1)
+#undef UINT_LEAST8_MAX
+#define UINT_LEAST8_MAX __UINT_LEAST8_MAX__
+#undef INT_LEAST16_MAX
+#define INT_LEAST16_MAX __INT_LEAST16_MAX__
+#undef INT_LEAST16_MIN
+#define INT_LEAST16_MIN (-INT_LEAST16_MAX - 1)
+#undef UINT_LEAST16_MAX
+#define UINT_LEAST16_MAX __UINT_LEAST16_MAX__
+#undef INT_LEAST32_MAX
+#define INT_LEAST32_MAX __INT_LEAST32_MAX__
+#undef INT_LEAST32_MIN
+#define INT_LEAST32_MIN (-INT_LEAST32_MAX - 1)
+#undef UINT_LEAST32_MAX
+#define UINT_LEAST32_MAX __UINT_LEAST32_MAX__
+#undef INT_LEAST64_MAX
+#define INT_LEAST64_MAX __INT_LEAST64_MAX__
+#undef INT_LEAST64_MIN
+#define INT_LEAST64_MIN (-INT_LEAST64_MAX - 1)
+#undef UINT_LEAST64_MAX
+#define UINT_LEAST64_MAX __UINT_LEAST64_MAX__
+
+#undef INT_FAST8_MAX
+#define INT_FAST8_MAX __INT_FAST8_MAX__
+#undef INT_FAST8_MIN
+#define INT_FAST8_MIN (-INT_FAST8_MAX - 1)
+#undef UINT_FAST8_MAX
+#define UINT_FAST8_MAX __UINT_FAST8_MAX__
+#undef INT_FAST16_MAX
+#define INT_FAST16_MAX __INT_FAST16_MAX__
+#undef INT_FAST16_MIN
+#define INT_FAST16_MIN (-INT_FAST16_MAX - 1)
+#undef UINT_FAST16_MAX
+#define UINT_FAST16_MAX __UINT_FAST16_MAX__
+#undef INT_FAST32_MAX
+#define INT_FAST32_MAX __INT_FAST32_MAX__
+#undef INT_FAST32_MIN
+#define INT_FAST32_MIN (-INT_FAST32_MAX - 1)
+#undef UINT_FAST32_MAX
+#define UINT_FAST32_MAX __UINT_FAST32_MAX__
+#undef INT_FAST64_MAX
+#define INT_FAST64_MAX __INT_FAST64_MAX__
+#undef INT_FAST64_MIN
+#define INT_FAST64_MIN (-INT_FAST64_MAX - 1)
+#undef UINT_FAST64_MAX
+#define UINT_FAST64_MAX __UINT_FAST64_MAX__
+
+#ifdef __INTPTR_MAX__
+# undef INTPTR_MAX
+# define INTPTR_MAX __INTPTR_MAX__
+# undef INTPTR_MIN
+# define INTPTR_MIN (-INTPTR_MAX - 1)
+#endif
+#ifdef __UINTPTR_MAX__
+# undef UINTPTR_MAX
+# define UINTPTR_MAX __UINTPTR_MAX__
+#endif
+
+#undef INTMAX_MAX
+#define INTMAX_MAX __INTMAX_MAX__
+#undef INTMAX_MIN
+#define INTMAX_MIN (-INTMAX_MAX - 1)
+#undef UINTMAX_MAX
+#define UINTMAX_MAX __UINTMAX_MAX__
+
+/* 7.18.3 Limits of other integer types */
+
+#undef PTRDIFF_MAX
+#define PTRDIFF_MAX __PTRDIFF_MAX__
+#undef PTRDIFF_MIN
+#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)
+
+#undef SIG_ATOMIC_MAX
+#define SIG_ATOMIC_MAX __SIG_ATOMIC_MAX__
+#undef SIG_ATOMIC_MIN
+#define SIG_ATOMIC_MIN __SIG_ATOMIC_MIN__
+
+#undef SIZE_MAX
+#define SIZE_MAX __SIZE_MAX__
+
+#undef WCHAR_MAX
+#define WCHAR_MAX __WCHAR_MAX__
+#undef WCHAR_MIN
+#define WCHAR_MIN __WCHAR_MIN__
+
+#undef WINT_MAX
+#define WINT_MAX __WINT_MAX__
+#undef WINT_MIN
+#define WINT_MIN __WINT_MIN__
+
+#endif /* (!defined __cplusplus || __cplusplus >= 201103L
+	   || defined __STDC_LIMIT_MACROS)  */
+
+#if (!defined __cplusplus || __cplusplus >= 201103L \
+     || defined __STDC_CONSTANT_MACROS)
+
+#undef INT8_C
+#define INT8_C(c) __INT8_C(c)
+#undef INT16_C
+#define INT16_C(c) __INT16_C(c)
+#undef INT32_C
+#define INT32_C(c) __INT32_C(c)
+#undef INT64_C
+#define INT64_C(c) __INT64_C(c)
+#undef UINT8_C
+#define UINT8_C(c) __UINT8_C(c)
+#undef UINT16_C
+#define UINT16_C(c) __UINT16_C(c)
+#undef UINT32_C
+#define UINT32_C(c) __UINT32_C(c)
+#undef UINT64_C
+#define UINT64_C(c) __UINT64_C(c)
+#undef INTMAX_C
+#define INTMAX_C(c) __INTMAX_C(c)
+#undef UINTMAX_C
+#define UINTMAX_C(c) __UINTMAX_C(c)
+
+#endif /* (!defined __cplusplus || __cplusplus >= 201103L
+	   || defined __STDC_CONSTANT_MACROS) */
+
+#ifdef __STDC_WANT_IEC_60559_BFP_EXT__
+/* TS 18661-1 widths of integer types.  */
+
+#ifdef __INT8_TYPE__
+# undef INT8_WIDTH
+# define INT8_WIDTH 8
+#endif
+#ifdef __UINT8_TYPE__
+# undef UINT8_WIDTH
+# define UINT8_WIDTH 8
+#endif
+#ifdef __INT16_TYPE__
+# undef INT16_WIDTH
+# define INT16_WIDTH 16
+#endif
+#ifdef __UINT16_TYPE__
+# undef UINT16_WIDTH
+# define UINT16_WIDTH 16
+#endif
+#ifdef __INT32_TYPE__
+# undef INT32_WIDTH
+# define INT32_WIDTH 32
+#endif
+#ifdef __UINT32_TYPE__
+# undef UINT32_WIDTH
+# define UINT32_WIDTH 32
+#endif
+#ifdef __INT64_TYPE__
+# undef INT64_WIDTH
+# define INT64_WIDTH 64
+#endif
+#ifdef __UINT64_TYPE__
+# undef UINT64_WIDTH
+# define UINT64_WIDTH 64
+#endif
+
+#undef INT_LEAST8_WIDTH
+#define INT_LEAST8_WIDTH __INT_LEAST8_WIDTH__
+#undef UINT_LEAST8_WIDTH
+#define UINT_LEAST8_WIDTH __INT_LEAST8_WIDTH__
+#undef INT_LEAST16_WIDTH
+#define INT_LEAST16_WIDTH __INT_LEAST16_WIDTH__
+#undef UINT_LEAST16_WIDTH
+#define UINT_LEAST16_WIDTH __INT_LEAST16_WIDTH__
+#undef INT_LEAST32_WIDTH
+#define INT_LEAST32_WIDTH __INT_LEAST32_WIDTH__
+#undef UINT_LEAST32_WIDTH
+#define UINT_LEAST32_WIDTH __INT_LEAST32_WIDTH__
+#undef INT_LEAST64_WIDTH
+#define INT_LEAST64_WIDTH __INT_LEAST64_WIDTH__
+#undef UINT_LEAST64_WIDTH
+#define UINT_LEAST64_WIDTH __INT_LEAST64_WIDTH__
+
+#undef INT_FAST8_WIDTH
+#define INT_FAST8_WIDTH __INT_FAST8_WIDTH__
+#undef UINT_FAST8_WIDTH
+#define UINT_FAST8_WIDTH __INT_FAST8_WIDTH__
+#undef INT_FAST16_WIDTH
+#define INT_FAST16_WIDTH __INT_FAST16_WIDTH__
+#undef UINT_FAST16_WIDTH
+#define UINT_FAST16_WIDTH __INT_FAST16_WIDTH__
+#undef INT_FAST32_WIDTH
+#define INT_FAST32_WIDTH __INT_FAST32_WIDTH__
+#undef UINT_FAST32_WIDTH
+#define UINT_FAST32_WIDTH __INT_FAST32_WIDTH__
+#undef INT_FAST64_WIDTH
+#define INT_FAST64_WIDTH __INT_FAST64_WIDTH__
+#undef UINT_FAST64_WIDTH
+#define UINT_FAST64_WIDTH __INT_FAST64_WIDTH__
+
+#ifdef __INTPTR_TYPE__
+# undef INTPTR_WIDTH
+# define INTPTR_WIDTH __INTPTR_WIDTH__
+#endif
+#ifdef __UINTPTR_TYPE__
+# undef UINTPTR_WIDTH
+# define UINTPTR_WIDTH __INTPTR_WIDTH__
+#endif
+
+#undef INTMAX_WIDTH
+#define INTMAX_WIDTH __INTMAX_WIDTH__
+#undef UINTMAX_WIDTH
+#define UINTMAX_WIDTH __INTMAX_WIDTH__
+
+#undef PTRDIFF_WIDTH
+#define PTRDIFF_WIDTH __PTRDIFF_WIDTH__
+
+#undef SIG_ATOMIC_WIDTH
+#define SIG_ATOMIC_WIDTH __SIG_ATOMIC_WIDTH__
+
+#undef SIZE_WIDTH
+#define SIZE_WIDTH __SIZE_WIDTH__
+
+#undef WCHAR_WIDTH
+#define WCHAR_WIDTH __WCHAR_WIDTH__
+
+#undef WINT_WIDTH
+#define WINT_WIDTH __WINT_WIDTH__
+
+#ifdef __ILP32__
+#define SIZE_MAX UINT32_MAX
+#else
+#define SIZE_MAX UINT64_MAX
+#endif
+#endif
+
+#endif /* _GCC_STDINT_H */
diff --git a/recipes/core/relibc/include/stdio_ext.h b/recipes/core/relibc/include/stdio_ext.h
new file mode 100644
index 0000000000..aa95d16fcf
--- /dev/null
+++ b/recipes/core/relibc/include/stdio_ext.h
@@ -0,0 +1,6 @@
+#ifndef _STDIO_EXT_H
+#define _STDIO_EXT_H
+
+#include <stdio.h>
+
+#endif /* _STDIO_EXT_H */
diff --git a/recipes/core/relibc/include/stdnoreturn.h b/recipes/core/relibc/include/stdnoreturn.h
new file mode 100644
index 0000000000..7df19e742f
--- /dev/null
+++ b/recipes/core/relibc/include/stdnoreturn.h
@@ -0,0 +1,19 @@
+/* Spec:
+ * The <stdnoreturn.h> header shall define the macro noreturn which shall
+ * expand to _Noreturn */
+
+#ifndef _STDNORETURN_H
+#define _STDNORETURN_H
+
+#ifndef __cplusplus
+/* Borrowed from musl */
+#if __STDC_VERSION__ >= 201112L
+#elif defined(__GNUC__)
+    #define _Noreturn __attribute__((__noreturn__))
+#else
+    #define _Noreturn
+#endif
+#define noreturn _Noreturn
+#endif
+
+#endif
diff --git a/recipes/core/relibc/include/sys/param.h b/recipes/core/relibc/include/sys/param.h
new file mode 100644
index 0000000000..e52f9bca51
--- /dev/null
+++ b/recipes/core/relibc/include/sys/param.h
@@ -0,0 +1,36 @@
+#ifndef _SYS_PARAM_H
+#define _SYS_PARAM_H
+
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+
+#define __bitop(array, index, op) ((array)[(index) / 8] op (1 << (index) % 8))
+#define setbit(array, index) __bitop(array, index, |=)
+#define clrbit(array, index) __bitop(array, index, &= ~)
+#define isset(array, index) __bitop(array, index, &)
+#define isclr(array, index) !isset(array, index)
+
+#define howmany(bits, size) (((bits) + (size) - 1) / (size))
+#define roundup(bits, size) (howmany(bits, size) * (size))
+#define powerof2(n) !(((n) - 1) & (n))
+
+// Shamelessly copied from musl.
+// Tweak as needed.
+#define MAXSYMLINKS 20
+#define MAXHOSTNAMELEN 64
+#define MAXNAMLEN 255
+#define MAXPATHLEN 4096
+#define NBBY 8
+#define NGROUPS 32
+#define CANBSIZ 255
+#define NOFILE 256
+#define NCARGS 131072
+#define DEV_BSIZE 512
+#define NOGROUP (-1)
+
+#include <sys/resource.h>
+#include <limits.h>
+
+#include <machine/endian.h>
+
+#endif
diff --git a/recipes/core/relibc/include/sys/poll.h b/recipes/core/relibc/include/sys/poll.h
new file mode 100644
index 0000000000..779ec774fe
--- /dev/null
+++ b/recipes/core/relibc/include/sys/poll.h
@@ -0,0 +1 @@
+#include <poll.h>
diff --git a/recipes/core/relibc/include/sys/queue.h b/recipes/core/relibc/include/sys/queue.h
new file mode 100644
index 0000000000..a38499a267
--- /dev/null
+++ b/recipes/core/relibc/include/sys/queue.h
@@ -0,0 +1,846 @@
+/*	$NetBSD: queue.h,v 1.70 2015/11/02 15:21:23 christos Exp $	*/
+
+/*
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)queue.h	8.5 (Berkeley) 8/20/94
+ */
+
+#ifndef	_SYS_QUEUE_H_
+#define	_SYS_QUEUE_H_
+
+/*
+ * This file defines five types of data structures: singly-linked lists,
+ * lists, simple queues, tail queues, and circular queues.
+ *
+ * A singly-linked list is headed by a single forward pointer. The
+ * elements are singly linked for minimum space and pointer manipulation
+ * overhead at the expense of O(n) removal for arbitrary elements. New
+ * elements can be added to the list after an existing element or at the
+ * head of the list.  Elements being removed from the head of the list
+ * should use the explicit macro for this purpose for optimum
+ * efficiency. A singly-linked list may only be traversed in the forward
+ * direction.  Singly-linked lists are ideal for applications with large
+ * datasets and few or no removals or for implementing a LIFO queue.
+ *
+ * A list is headed by a single forward pointer (or an array of forward
+ * pointers for a hash table header). The elements are doubly linked
+ * so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before
+ * or after an existing element or at the head of the list. A list
+ * may only be traversed in the forward direction.
+ *
+ * A simple queue is headed by a pair of pointers, one the head of the
+ * list and the other to the tail of the list. The elements are singly
+ * linked to save space, so elements can only be removed from the
+ * head of the list. New elements can be added to the list after
+ * an existing element, at the head of the list, or at the end of the
+ * list. A simple queue may only be traversed in the forward direction.
+ *
+ * A tail queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or
+ * after an existing element, at the head of the list, or at the end of
+ * the list. A tail queue may be traversed in either direction.
+ *
+ * A circle queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the list.
+ * A circle queue may be traversed in either direction, but has a more
+ * complex end of list detection.
+ *
+ * For details on the use of these macros, see the queue(3) manual page.
+ */
+
+/*
+ * Include the definition of NULL only on NetBSD because sys/null.h
+ * is not available elsewhere.  This conditional makes the header
+ * portable and it can simply be dropped verbatim into any system.
+ * The caveat is that on other systems some other header
+ * must provide NULL before the macros can be used.
+ */
+#ifdef __NetBSD__
+#include <sys/null.h>
+#endif
+
+#if defined(QUEUEDEBUG)
+# if defined(_KERNEL)
+#  define QUEUEDEBUG_ABORT(...) panic(__VA_ARGS__)
+# else
+#  include <err.h>
+#  define QUEUEDEBUG_ABORT(...) err(1, __VA_ARGS__)
+# endif
+#endif
+
+/*
+ * Singly-linked List definitions.
+ */
+#define	SLIST_HEAD(name, type)						\
+struct name {								\
+	struct type *slh_first;	/* first element */			\
+}
+
+#define	SLIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define	SLIST_ENTRY(type)						\
+struct {								\
+	struct type *sle_next;	/* next element */			\
+}
+
+/*
+ * Singly-linked List access methods.
+ */
+#define	SLIST_FIRST(head)	((head)->slh_first)
+#define	SLIST_END(head)		NULL
+#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
+#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
+
+#define	SLIST_FOREACH(var, head, field)					\
+	for((var) = (head)->slh_first;					\
+	    (var) != SLIST_END(head);					\
+	    (var) = (var)->field.sle_next)
+
+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = SLIST_FIRST((head));				\
+	    (var) != SLIST_END(head) &&					\
+	    ((tvar) = SLIST_NEXT((var), field), 1);			\
+	    (var) = (tvar))
+
+/*
+ * Singly-linked List functions.
+ */
+#define	SLIST_INIT(head) do {						\
+	(head)->slh_first = SLIST_END(head);				\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
+	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
+	(slistelm)->field.sle_next = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
+	(elm)->field.sle_next = (head)->slh_first;			\
+	(head)->slh_first = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_REMOVE_AFTER(slistelm, field) do {			\
+	(slistelm)->field.sle_next =					\
+	    SLIST_NEXT(SLIST_NEXT((slistelm), field), field);		\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_REMOVE_HEAD(head, field) do {				\
+	(head)->slh_first = (head)->slh_first->field.sle_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_REMOVE(head, elm, type, field) do {			\
+	if ((head)->slh_first == (elm)) {				\
+		SLIST_REMOVE_HEAD((head), field);			\
+	}								\
+	else {								\
+		struct type *curelm = (head)->slh_first;		\
+		while(curelm->field.sle_next != (elm))			\
+			curelm = curelm->field.sle_next;		\
+		curelm->field.sle_next =				\
+		    curelm->field.sle_next->field.sle_next;		\
+	}								\
+} while (/*CONSTCOND*/0)
+
+
+/*
+ * List definitions.
+ */
+#define	LIST_HEAD(name, type)						\
+struct name {								\
+	struct type *lh_first;	/* first element */			\
+}
+
+#define	LIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define	LIST_ENTRY(type)						\
+struct {								\
+	struct type *le_next;	/* next element */			\
+	struct type **le_prev;	/* address of previous next element */	\
+}
+
+/*
+ * List access methods.
+ */
+#define	LIST_FIRST(head)		((head)->lh_first)
+#define	LIST_END(head)			NULL
+#define	LIST_EMPTY(head)		((head)->lh_first == LIST_END(head))
+#define	LIST_NEXT(elm, field)		((elm)->field.le_next)
+
+#define	LIST_FOREACH(var, head, field)					\
+	for ((var) = ((head)->lh_first);				\
+	    (var) != LIST_END(head);					\
+	    (var) = ((var)->field.le_next))
+
+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = LIST_FIRST((head));				\
+	    (var) != LIST_END(head) &&					\
+	    ((tvar) = LIST_NEXT((var), field), 1);			\
+	    (var) = (tvar))
+
+#define	LIST_MOVE(head1, head2) do {					\
+	LIST_INIT((head2));						\
+	if (!LIST_EMPTY((head1))) {					\
+		(head2)->lh_first = (head1)->lh_first;			\
+		LIST_INIT((head1));					\
+	}								\
+} while (/*CONSTCOND*/0)
+
+/*
+ * List functions.
+ */
+#if defined(QUEUEDEBUG)
+#define	QUEUEDEBUG_LIST_INSERT_HEAD(head, elm, field)			\
+	if ((head)->lh_first &&						\
+	    (head)->lh_first->field.le_prev != &(head)->lh_first)	\
+		QUEUEDEBUG_ABORT("LIST_INSERT_HEAD %p %s:%d", (head),	\
+		    __FILE__, __LINE__);
+#define	QUEUEDEBUG_LIST_OP(elm, field)					\
+	if ((elm)->field.le_next &&					\
+	    (elm)->field.le_next->field.le_prev !=			\
+	    &(elm)->field.le_next)					\
+		QUEUEDEBUG_ABORT("LIST_* forw %p %s:%d", (elm),		\
+		    __FILE__, __LINE__);				\
+	if (*(elm)->field.le_prev != (elm))				\
+		QUEUEDEBUG_ABORT("LIST_* back %p %s:%d", (elm),		\
+		    __FILE__, __LINE__);
+#define	QUEUEDEBUG_LIST_POSTREMOVE(elm, field)				\
+	(elm)->field.le_next = (void *)1L;				\
+	(elm)->field.le_prev = (void *)1L;
+#else
+#define	QUEUEDEBUG_LIST_INSERT_HEAD(head, elm, field)
+#define	QUEUEDEBUG_LIST_OP(elm, field)
+#define	QUEUEDEBUG_LIST_POSTREMOVE(elm, field)
+#endif
+
+#define	LIST_INIT(head) do {						\
+	(head)->lh_first = LIST_END(head);				\
+} while (/*CONSTCOND*/0)
+
+#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
+	QUEUEDEBUG_LIST_OP((listelm), field)				\
+	if (((elm)->field.le_next = (listelm)->field.le_next) != 	\
+	    LIST_END(head))						\
+		(listelm)->field.le_next->field.le_prev =		\
+		    &(elm)->field.le_next;				\
+	(listelm)->field.le_next = (elm);				\
+	(elm)->field.le_prev = &(listelm)->field.le_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
+	QUEUEDEBUG_LIST_OP((listelm), field)				\
+	(elm)->field.le_prev = (listelm)->field.le_prev;		\
+	(elm)->field.le_next = (listelm);				\
+	*(listelm)->field.le_prev = (elm);				\
+	(listelm)->field.le_prev = &(elm)->field.le_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	LIST_INSERT_HEAD(head, elm, field) do {				\
+	QUEUEDEBUG_LIST_INSERT_HEAD((head), (elm), field)		\
+	if (((elm)->field.le_next = (head)->lh_first) != LIST_END(head))\
+		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
+	(head)->lh_first = (elm);					\
+	(elm)->field.le_prev = &(head)->lh_first;			\
+} while (/*CONSTCOND*/0)
+
+#define	LIST_REMOVE(elm, field) do {					\
+	QUEUEDEBUG_LIST_OP((elm), field)				\
+	if ((elm)->field.le_next != NULL)				\
+		(elm)->field.le_next->field.le_prev = 			\
+		    (elm)->field.le_prev;				\
+	*(elm)->field.le_prev = (elm)->field.le_next;			\
+	QUEUEDEBUG_LIST_POSTREMOVE((elm), field)			\
+} while (/*CONSTCOND*/0)
+
+#define LIST_REPLACE(elm, elm2, field) do {				\
+	if (((elm2)->field.le_next = (elm)->field.le_next) != NULL)	\
+		(elm2)->field.le_next->field.le_prev =			\
+		    &(elm2)->field.le_next;				\
+	(elm2)->field.le_prev = (elm)->field.le_prev;			\
+	*(elm2)->field.le_prev = (elm2);				\
+	QUEUEDEBUG_LIST_POSTREMOVE((elm), field)			\
+} while (/*CONSTCOND*/0)
+
+/*
+ * Simple queue definitions.
+ */
+#define	SIMPLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *sqh_first;	/* first element */			\
+	struct type **sqh_last;	/* addr of last next element */		\
+}
+
+#define	SIMPLEQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).sqh_first }
+
+#define	SIMPLEQ_ENTRY(type)						\
+struct {								\
+	struct type *sqe_next;	/* next element */			\
+}
+
+/*
+ * Simple queue access methods.
+ */
+#define	SIMPLEQ_FIRST(head)		((head)->sqh_first)
+#define	SIMPLEQ_END(head)		NULL
+#define	SIMPLEQ_EMPTY(head)		((head)->sqh_first == SIMPLEQ_END(head))
+#define	SIMPLEQ_NEXT(elm, field)	((elm)->field.sqe_next)
+
+#define	SIMPLEQ_FOREACH(var, head, field)				\
+	for ((var) = ((head)->sqh_first);				\
+	    (var) != SIMPLEQ_END(head);					\
+	    (var) = ((var)->field.sqe_next))
+
+#define	SIMPLEQ_FOREACH_SAFE(var, head, field, next)			\
+	for ((var) = ((head)->sqh_first);				\
+	    (var) != SIMPLEQ_END(head) &&				\
+	    ((next = ((var)->field.sqe_next)), 1);			\
+	    (var) = (next))
+
+/*
+ * Simple queue functions.
+ */
+#define	SIMPLEQ_INIT(head) do {						\
+	(head)->sqh_first = NULL;					\
+	(head)->sqh_last = &(head)->sqh_first;				\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)	\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(head)->sqh_first = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.sqe_next = NULL;					\
+	*(head)->sqh_last = (elm);					\
+	(head)->sqh_last = &(elm)->field.sqe_next;			\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(listelm)->field.sqe_next = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_REMOVE_HEAD(head, field) do {				\
+	if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
+		(head)->sqh_last = &(head)->sqh_first;			\
+} while (/*CONSTCOND*/0)
+
+#define SIMPLEQ_REMOVE_AFTER(head, elm, field) do {			\
+	if (((elm)->field.sqe_next = (elm)->field.sqe_next->field.sqe_next) \
+	    == NULL)							\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_REMOVE(head, elm, type, field) do {			\
+	if ((head)->sqh_first == (elm)) {				\
+		SIMPLEQ_REMOVE_HEAD((head), field);			\
+	} else {							\
+		struct type *curelm = (head)->sqh_first;		\
+		while (curelm->field.sqe_next != (elm))			\
+			curelm = curelm->field.sqe_next;		\
+		if ((curelm->field.sqe_next =				\
+			curelm->field.sqe_next->field.sqe_next) == NULL) \
+			    (head)->sqh_last = &(curelm)->field.sqe_next; \
+	}								\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_CONCAT(head1, head2) do {				\
+	if (!SIMPLEQ_EMPTY((head2))) {					\
+		*(head1)->sqh_last = (head2)->sqh_first;		\
+		(head1)->sqh_last = (head2)->sqh_last;		\
+		SIMPLEQ_INIT((head2));					\
+	}								\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_LAST(head, type, field)					\
+	(SIMPLEQ_EMPTY((head)) ?						\
+		NULL :							\
+	        ((struct type *)(void *)				\
+		((char *)((head)->sqh_last) - offsetof(struct type, field))))
+
+/*
+ * Tail queue definitions.
+ */
+#define	_TAILQ_HEAD(name, type, qual)					\
+struct name {								\
+	qual type *tqh_first;		/* first element */		\
+	qual type *qual *tqh_last;	/* addr of last next element */	\
+}
+#define TAILQ_HEAD(name, type)	_TAILQ_HEAD(name, struct type,)
+
+#define	TAILQ_HEAD_INITIALIZER(head)					\
+	{ TAILQ_END(head), &(head).tqh_first }
+
+#define	_TAILQ_ENTRY(type, qual)					\
+struct {								\
+	qual type *tqe_next;		/* next element */		\
+	qual type *qual *tqe_prev;	/* address of previous next element */\
+}
+#define TAILQ_ENTRY(type)	_TAILQ_ENTRY(struct type,)
+
+/*
+ * Tail queue access methods.
+ */
+#define	TAILQ_FIRST(head)		((head)->tqh_first)
+#define	TAILQ_END(head)			(NULL)
+#define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
+#define	TAILQ_LAST(head, headname) \
+	(*(((struct headname *)(void *)((head)->tqh_last))->tqh_last))
+#define	TAILQ_PREV(elm, headname, field) \
+	(*(((struct headname *)(void *)((elm)->field.tqe_prev))->tqh_last))
+#define	TAILQ_EMPTY(head)		(TAILQ_FIRST(head) == TAILQ_END(head))
+
+
+#define	TAILQ_FOREACH(var, head, field)					\
+	for ((var) = ((head)->tqh_first);				\
+	    (var) != TAILQ_END(head);					\
+	    (var) = ((var)->field.tqe_next))
+
+#define	TAILQ_FOREACH_SAFE(var, head, field, next)			\
+	for ((var) = ((head)->tqh_first);				\
+	    (var) != TAILQ_END(head) &&					\
+	    ((next) = TAILQ_NEXT(var, field), 1); (var) = (next))
+
+#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
+	for ((var) = TAILQ_LAST((head), headname);			\
+	    (var) != TAILQ_END(head);					\
+	    (var) = TAILQ_PREV((var), headname, field))
+
+#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, prev)	\
+	for ((var) = TAILQ_LAST((head), headname);			\
+	    (var) != TAILQ_END(head) && 				\
+	    ((prev) = TAILQ_PREV((var), headname, field), 1); (var) = (prev))
+
+/*
+ * Tail queue functions.
+ */
+#if defined(QUEUEDEBUG)
+#define	QUEUEDEBUG_TAILQ_INSERT_HEAD(head, elm, field)			\
+	if ((head)->tqh_first &&					\
+	    (head)->tqh_first->field.tqe_prev != &(head)->tqh_first)	\
+		QUEUEDEBUG_ABORT("TAILQ_INSERT_HEAD %p %s:%d", (head),	\
+		    __FILE__, __LINE__);
+#define	QUEUEDEBUG_TAILQ_INSERT_TAIL(head, elm, field)			\
+	if (*(head)->tqh_last != NULL)					\
+		QUEUEDEBUG_ABORT("TAILQ_INSERT_TAIL %p %s:%d", (head),	\
+		    __FILE__, __LINE__);
+#define	QUEUEDEBUG_TAILQ_OP(elm, field)					\
+	if ((elm)->field.tqe_next &&					\
+	    (elm)->field.tqe_next->field.tqe_prev !=			\
+	    &(elm)->field.tqe_next)					\
+		QUEUEDEBUG_ABORT("TAILQ_* forw %p %s:%d", (elm),	\
+		    __FILE__, __LINE__);				\
+	if (*(elm)->field.tqe_prev != (elm))				\
+		QUEUEDEBUG_ABORT("TAILQ_* back %p %s:%d", (elm),	\
+		    __FILE__, __LINE__);
+#define	QUEUEDEBUG_TAILQ_PREREMOVE(head, elm, field)			\
+	if ((elm)->field.tqe_next == NULL &&				\
+	    (head)->tqh_last != &(elm)->field.tqe_next)			\
+		QUEUEDEBUG_ABORT("TAILQ_PREREMOVE head %p elm %p %s:%d",\
+		    (head), (elm), __FILE__, __LINE__);
+#define	QUEUEDEBUG_TAILQ_POSTREMOVE(elm, field)				\
+	(elm)->field.tqe_next = (void *)1L;				\
+	(elm)->field.tqe_prev = (void *)1L;
+#else
+#define	QUEUEDEBUG_TAILQ_INSERT_HEAD(head, elm, field)
+#define	QUEUEDEBUG_TAILQ_INSERT_TAIL(head, elm, field)
+#define	QUEUEDEBUG_TAILQ_OP(elm, field)
+#define	QUEUEDEBUG_TAILQ_PREREMOVE(head, elm, field)
+#define	QUEUEDEBUG_TAILQ_POSTREMOVE(elm, field)
+#endif
+
+#define	TAILQ_INIT(head) do {						\
+	(head)->tqh_first = TAILQ_END(head);				\
+	(head)->tqh_last = &(head)->tqh_first;				\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
+	QUEUEDEBUG_TAILQ_INSERT_HEAD((head), (elm), field)		\
+	if (((elm)->field.tqe_next = (head)->tqh_first) != TAILQ_END(head))\
+		(head)->tqh_first->field.tqe_prev =			\
+		    &(elm)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm)->field.tqe_next;		\
+	(head)->tqh_first = (elm);					\
+	(elm)->field.tqe_prev = &(head)->tqh_first;			\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
+	QUEUEDEBUG_TAILQ_INSERT_TAIL((head), (elm), field)		\
+	(elm)->field.tqe_next = TAILQ_END(head);			\
+	(elm)->field.tqe_prev = (head)->tqh_last;			\
+	*(head)->tqh_last = (elm);					\
+	(head)->tqh_last = &(elm)->field.tqe_next;			\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	QUEUEDEBUG_TAILQ_OP((listelm), field)				\
+	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != 	\
+	    TAILQ_END(head))						\
+		(elm)->field.tqe_next->field.tqe_prev = 		\
+		    &(elm)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm)->field.tqe_next;		\
+	(listelm)->field.tqe_next = (elm);				\
+	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
+	QUEUEDEBUG_TAILQ_OP((listelm), field)				\
+	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
+	(elm)->field.tqe_next = (listelm);				\
+	*(listelm)->field.tqe_prev = (elm);				\
+	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_REMOVE(head, elm, field) do {				\
+	QUEUEDEBUG_TAILQ_PREREMOVE((head), (elm), field)		\
+	QUEUEDEBUG_TAILQ_OP((elm), field)				\
+	if (((elm)->field.tqe_next) != TAILQ_END(head))			\
+		(elm)->field.tqe_next->field.tqe_prev = 		\
+		    (elm)->field.tqe_prev;				\
+	else								\
+		(head)->tqh_last = (elm)->field.tqe_prev;		\
+	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
+	QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field);			\
+} while (/*CONSTCOND*/0)
+
+#define TAILQ_REPLACE(head, elm, elm2, field) do {			\
+        if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != 	\
+	    TAILQ_END(head))   						\
+                (elm2)->field.tqe_next->field.tqe_prev =		\
+                    &(elm2)->field.tqe_next;				\
+        else								\
+                (head)->tqh_last = &(elm2)->field.tqe_next;		\
+        (elm2)->field.tqe_prev = (elm)->field.tqe_prev;			\
+        *(elm2)->field.tqe_prev = (elm2);				\
+	QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field);			\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_CONCAT(head1, head2, field) do {				\
+	if (!TAILQ_EMPTY(head2)) {					\
+		*(head1)->tqh_last = (head2)->tqh_first;		\
+		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
+		(head1)->tqh_last = (head2)->tqh_last;			\
+		TAILQ_INIT((head2));					\
+	}								\
+} while (/*CONSTCOND*/0)
+
+/*
+ * Singly-linked Tail queue declarations.
+ */
+#define	STAILQ_HEAD(name, type)						\
+struct name {								\
+	struct type *stqh_first;	/* first element */		\
+	struct type **stqh_last;	/* addr of last next element */	\
+}
+
+#define	STAILQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).stqh_first }
+
+#define	STAILQ_ENTRY(type)						\
+struct {								\
+	struct type *stqe_next;	/* next element */			\
+}
+
+/*
+ * Singly-linked Tail queue access methods.
+ */
+#define	STAILQ_FIRST(head)	((head)->stqh_first)
+#define	STAILQ_END(head)	NULL
+#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
+#define	STAILQ_EMPTY(head)	(STAILQ_FIRST(head) == STAILQ_END(head))
+
+/*
+ * Singly-linked Tail queue functions.
+ */
+#define	STAILQ_INIT(head) do {						\
+	(head)->stqh_first = NULL;					\
+	(head)->stqh_last = &(head)->stqh_first;				\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.stqe_next = (head)->stqh_first) == NULL)	\
+		(head)->stqh_last = &(elm)->field.stqe_next;		\
+	(head)->stqh_first = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.stqe_next = NULL;					\
+	*(head)->stqh_last = (elm);					\
+	(head)->stqh_last = &(elm)->field.stqe_next;			\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
+		(head)->stqh_last = &(elm)->field.stqe_next;		\
+	(listelm)->field.stqe_next = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_REMOVE_HEAD(head, field) do {				\
+	if (((head)->stqh_first = (head)->stqh_first->field.stqe_next) == NULL) \
+		(head)->stqh_last = &(head)->stqh_first;			\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_REMOVE(head, elm, type, field) do {			\
+	if ((head)->stqh_first == (elm)) {				\
+		STAILQ_REMOVE_HEAD((head), field);			\
+	} else {							\
+		struct type *curelm = (head)->stqh_first;		\
+		while (curelm->field.stqe_next != (elm))			\
+			curelm = curelm->field.stqe_next;		\
+		if ((curelm->field.stqe_next =				\
+			curelm->field.stqe_next->field.stqe_next) == NULL) \
+			    (head)->stqh_last = &(curelm)->field.stqe_next; \
+	}								\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_FOREACH(var, head, field)				\
+	for ((var) = ((head)->stqh_first);				\
+		(var);							\
+		(var) = ((var)->field.stqe_next))
+
+#define	STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = STAILQ_FIRST((head));				\
+	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	STAILQ_CONCAT(head1, head2) do {				\
+	if (!STAILQ_EMPTY((head2))) {					\
+		*(head1)->stqh_last = (head2)->stqh_first;		\
+		(head1)->stqh_last = (head2)->stqh_last;		\
+		STAILQ_INIT((head2));					\
+	}								\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_LAST(head, type, field)					\
+	(STAILQ_EMPTY((head)) ?						\
+		NULL :							\
+	        ((struct type *)(void *)				\
+		((char *)((head)->stqh_last) - offsetof(struct type, field))))
+
+
+#ifndef _KERNEL
+/*
+ * Circular queue definitions. Do not use. We still keep the macros
+ * for compatibility but because of pointer aliasing issues their use
+ * is discouraged!
+ */
+
+/*
+ * __launder_type():  We use this ugly hack to work around the the compiler
+ * noticing that two types may not alias each other and elide tests in code.
+ * We hit this in the CIRCLEQ macros when comparing 'struct name *' and
+ * 'struct type *' (see CIRCLEQ_HEAD()).  Modern compilers (such as GCC
+ * 4.8) declare these comparisons as always false, causing the code to
+ * not run as designed.
+ *
+ * This hack is only to be used for comparisons and thus can be fully const.
+ * Do not use for assignment.
+ *
+ * If we ever choose to change the ABI of the CIRCLEQ macros, we could fix
+ * this by changing the head/tail sentinal values, but see the note above
+ * this one.
+ */
+static __inline const void * __launder_type(const void *);
+static __inline const void *
+__launder_type(const void *__x)
+{
+	__asm __volatile("" : "+r" (__x));
+	return __x;
+}
+
+#if defined(QUEUEDEBUG)
+#define QUEUEDEBUG_CIRCLEQ_HEAD(head, field)				\
+	if ((head)->cqh_first != CIRCLEQ_ENDC(head) &&			\
+	    (head)->cqh_first->field.cqe_prev != CIRCLEQ_ENDC(head))	\
+		QUEUEDEBUG_ABORT("CIRCLEQ head forw %p %s:%d", (head),	\
+		      __FILE__, __LINE__);				\
+	if ((head)->cqh_last != CIRCLEQ_ENDC(head) &&			\
+	    (head)->cqh_last->field.cqe_next != CIRCLEQ_ENDC(head))	\
+		QUEUEDEBUG_ABORT("CIRCLEQ head back %p %s:%d", (head),	\
+		      __FILE__, __LINE__);
+#define QUEUEDEBUG_CIRCLEQ_ELM(head, elm, field)			\
+	if ((elm)->field.cqe_next == CIRCLEQ_ENDC(head)) {		\
+		if ((head)->cqh_last != (elm))				\
+			QUEUEDEBUG_ABORT("CIRCLEQ elm last %p %s:%d",	\
+			    (elm), __FILE__, __LINE__);			\
+	} else {							\
+		if ((elm)->field.cqe_next->field.cqe_prev != (elm))	\
+			QUEUEDEBUG_ABORT("CIRCLEQ elm forw %p %s:%d",	\
+			    (elm), __FILE__, __LINE__);			\
+	}								\
+	if ((elm)->field.cqe_prev == CIRCLEQ_ENDC(head)) {		\
+		if ((head)->cqh_first != (elm))				\
+			QUEUEDEBUG_ABORT("CIRCLEQ elm first %p %s:%d",	\
+			    (elm), __FILE__, __LINE__);			\
+	} else {							\
+		if ((elm)->field.cqe_prev->field.cqe_next != (elm))	\
+			QUEUEDEBUG_ABORT("CIRCLEQ elm prev %p %s:%d",	\
+			    (elm), __FILE__, __LINE__);			\
+	}
+#define QUEUEDEBUG_CIRCLEQ_POSTREMOVE(elm, field)			\
+	(elm)->field.cqe_next = (void *)1L;				\
+	(elm)->field.cqe_prev = (void *)1L;
+#else
+#define QUEUEDEBUG_CIRCLEQ_HEAD(head, field)
+#define QUEUEDEBUG_CIRCLEQ_ELM(head, elm, field)
+#define QUEUEDEBUG_CIRCLEQ_POSTREMOVE(elm, field)
+#endif
+
+#define	CIRCLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *cqh_first;		/* first element */		\
+	struct type *cqh_last;		/* last element */		\
+}
+
+#define	CIRCLEQ_HEAD_INITIALIZER(head)					\
+	{ CIRCLEQ_END(&head), CIRCLEQ_END(&head) }
+
+#define	CIRCLEQ_ENTRY(type)						\
+struct {								\
+	struct type *cqe_next;		/* next element */		\
+	struct type *cqe_prev;		/* previous element */		\
+}
+
+/*
+ * Circular queue functions.
+ */
+#define	CIRCLEQ_INIT(head) do {						\
+	(head)->cqh_first = CIRCLEQ_END(head);				\
+	(head)->cqh_last = CIRCLEQ_END(head);				\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	QUEUEDEBUG_CIRCLEQ_HEAD((head), field)				\
+	QUEUEDEBUG_CIRCLEQ_ELM((head), (listelm), field)		\
+	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
+	(elm)->field.cqe_prev = (listelm);				\
+	if ((listelm)->field.cqe_next == CIRCLEQ_ENDC(head))		\
+		(head)->cqh_last = (elm);				\
+	else								\
+		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
+	(listelm)->field.cqe_next = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
+	QUEUEDEBUG_CIRCLEQ_HEAD((head), field)				\
+	QUEUEDEBUG_CIRCLEQ_ELM((head), (listelm), field)		\
+	(elm)->field.cqe_next = (listelm);				\
+	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
+	if ((listelm)->field.cqe_prev == CIRCLEQ_ENDC(head))		\
+		(head)->cqh_first = (elm);				\
+	else								\
+		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
+	(listelm)->field.cqe_prev = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
+	QUEUEDEBUG_CIRCLEQ_HEAD((head), field)				\
+	(elm)->field.cqe_next = (head)->cqh_first;			\
+	(elm)->field.cqe_prev = CIRCLEQ_END(head);			\
+	if ((head)->cqh_last == CIRCLEQ_ENDC(head))			\
+		(head)->cqh_last = (elm);				\
+	else								\
+		(head)->cqh_first->field.cqe_prev = (elm);		\
+	(head)->cqh_first = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
+	QUEUEDEBUG_CIRCLEQ_HEAD((head), field)				\
+	(elm)->field.cqe_next = CIRCLEQ_END(head);			\
+	(elm)->field.cqe_prev = (head)->cqh_last;			\
+	if ((head)->cqh_first == CIRCLEQ_ENDC(head))			\
+		(head)->cqh_first = (elm);				\
+	else								\
+		(head)->cqh_last->field.cqe_next = (elm);		\
+	(head)->cqh_last = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
+	QUEUEDEBUG_CIRCLEQ_HEAD((head), field)				\
+	QUEUEDEBUG_CIRCLEQ_ELM((head), (elm), field)			\
+	if ((elm)->field.cqe_next == CIRCLEQ_ENDC(head))		\
+		(head)->cqh_last = (elm)->field.cqe_prev;		\
+	else								\
+		(elm)->field.cqe_next->field.cqe_prev =			\
+		    (elm)->field.cqe_prev;				\
+	if ((elm)->field.cqe_prev == CIRCLEQ_ENDC(head))		\
+		(head)->cqh_first = (elm)->field.cqe_next;		\
+	else								\
+		(elm)->field.cqe_prev->field.cqe_next =			\
+		    (elm)->field.cqe_next;				\
+	QUEUEDEBUG_CIRCLEQ_POSTREMOVE((elm), field)			\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_FOREACH(var, head, field)				\
+	for ((var) = ((head)->cqh_first);				\
+		(var) != CIRCLEQ_ENDC(head);				\
+		(var) = ((var)->field.cqe_next))
+
+#define	CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
+	for ((var) = ((head)->cqh_last);				\
+		(var) != CIRCLEQ_ENDC(head);				\
+		(var) = ((var)->field.cqe_prev))
+
+/*
+ * Circular queue access methods.
+ */
+#define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
+#define	CIRCLEQ_LAST(head)		((head)->cqh_last)
+/* For comparisons */
+#define	CIRCLEQ_ENDC(head)		(__launder_type(head))
+/* For assignments */
+#define	CIRCLEQ_END(head)		((void *)(head))
+#define	CIRCLEQ_NEXT(elm, field)	((elm)->field.cqe_next)
+#define	CIRCLEQ_PREV(elm, field)	((elm)->field.cqe_prev)
+#define	CIRCLEQ_EMPTY(head)						\
+    (CIRCLEQ_FIRST(head) == CIRCLEQ_ENDC(head))
+
+#define CIRCLEQ_LOOP_NEXT(head, elm, field)				\
+	(((elm)->field.cqe_next == CIRCLEQ_ENDC(head))			\
+	    ? ((head)->cqh_first)					\
+	    : (elm->field.cqe_next))
+#define CIRCLEQ_LOOP_PREV(head, elm, field)				\
+	(((elm)->field.cqe_prev == CIRCLEQ_ENDC(head))			\
+	    ? ((head)->cqh_last)					\
+	    : (elm->field.cqe_prev))
+#endif /* !_KERNEL */
+
+#endif	/* !_SYS_QUEUE_H_ */
diff --git a/recipes/core/relibc/include/sys/redox.h b/recipes/core/relibc/include/sys/redox.h
new file mode 100644
index 0000000000..14b906c05d
--- /dev/null
+++ b/recipes/core/relibc/include/sys/redox.h
@@ -0,0 +1,22 @@
+#ifndef _SYS_REDOX_H
+#define _SYS_REDOX_H
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __redox__
+
+ssize_t redox_fpath(int fd, void * buf, size_t count);
+void * redox_physalloc(size_t size);
+int redox_physfree(void * physical_address, size_t size);
+
+#endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif
diff --git a/recipes/core/relibc/include/sys/sysmacros.h b/recipes/core/relibc/include/sys/sysmacros.h
new file mode 100644
index 0000000000..efe296e7f0
--- /dev/null
+++ b/recipes/core/relibc/include/sys/sysmacros.h
@@ -0,0 +1,16 @@
+// From musl, license MIT
+#ifndef _SYS_SYSMACROS_H
+#define _SYS_SYSMACROS_H
+
+#define major(x) \
+	((unsigned)( (((x)>>31>>1) & 0xfffff000) | (((x)>>8) & 0x00000fff) ))
+#define minor(x) \
+	((unsigned)( (((x)>>12) & 0xffffff00) | ((x) & 0x000000ff) ))
+
+#define makedev(x,y) ( \
+        (((x)&0xfffff000ULL) << 32) | \
+	(((x)&0x00000fffULL) << 8) | \
+        (((y)&0xffffff00ULL) << 12) | \
+	(((y)&0x000000ffULL)) )
+
+#endif
\ No newline at end of file
diff --git a/recipes/core/relibc/include/sys/user.h b/recipes/core/relibc/include/sys/user.h
new file mode 100644
index 0000000000..aadbc7a659
--- /dev/null
+++ b/recipes/core/relibc/include/sys/user.h
@@ -0,0 +1,13 @@
+#ifndef _SYS_USER_H
+#define _SYS_USER_H
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_AMD64)
+#include <arch/x64/user.h>
+#elif defined(__aarch64__)
+#include <arch/aarch64/user.h>
+#elif defined(__riscv) && __riscv_xlen==64
+#include <arch/riscv64/user.h>
+#else
+#error "Unknown architecture"
+#endif
+
+#endif
diff --git a/recipes/core/relibc/include/sysexits.h b/recipes/core/relibc/include/sysexits.h
new file mode 100644
index 0000000000..4d4b28e778
--- /dev/null
+++ b/recipes/core/relibc/include/sysexits.h
@@ -0,0 +1,21 @@
+#ifndef _SYSEXITS_H
+#define _SYSEXITS_H
+
+#define EX_OK 0
+#define EX_USAGE 64
+#define EX_DATAERR 65
+#define EX_NOINPUT 66
+#define EX_NOUSER 67
+#define EX_NOHOST 68
+#define EX_UNAVAILABLE 69
+#define EX_SOFTWARE 70
+#define EX_OSERR 71
+#define EX_OSFILE 72
+#define EX_CANTCREAT 73
+#define EX_IOERR 74
+#define EX_TEMPFAIL 75
+#define EX_PROTOCOL 76
+#define EX_NOPERM 77
+#define EX_CONFIG 78
+
+#endif /* _SYSEXITS_H */
diff --git a/recipes/core/relibc/include/syslog.h b/recipes/core/relibc/include/syslog.h
new file mode 100644
index 0000000000..830b4928ad
--- /dev/null
+++ b/recipes/core/relibc/include/syslog.h
@@ -0,0 +1 @@
+#include <sys/syslog.h>
diff --git a/recipes/core/relibc/ld_so/Cargo.toml b/recipes/core/relibc/ld_so/Cargo.toml
new file mode 100644
index 0000000000..93b1fb1130
--- /dev/null
+++ b/recipes/core/relibc/ld_so/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "ld_so"
+version = "0.1.0"
+authors = ["Jeremy Soller <jackpot51@gmail.com>"]
+edition = "2024"
+
+[lib]
+name = "ld_so"
+crate-type = ["staticlib"]
+
+[lints]
+workspace = true
diff --git a/recipes/core/relibc/ld_so/ld_script/aarch64-unknown-linux-gnu.ld b/recipes/core/relibc/ld_so/ld_script/aarch64-unknown-linux-gnu.ld
new file mode 100644
index 0000000000..a344feef5d
--- /dev/null
+++ b/recipes/core/relibc/ld_so/ld_script/aarch64-unknown-linux-gnu.ld
@@ -0,0 +1,263 @@
+/* Script for -z combreloc */
+/* Copyright (C) 2014-2025 Free Software Foundation, Inc.
+   Copying and distribution of this script, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.  */
+OUTPUT_FORMAT("elf64-littleaarch64", "elf64-bigaarch64", "elf64-littleaarch64")
+OUTPUT_ARCH(aarch64)
+ENTRY(_start)
+SEARCH_DIR("=/usr/aarch64-linux-gnu/lib64"); SEARCH_DIR("=/usr/local/lib64"); SEARCH_DIR("=/lib64"); SEARCH_DIR("=/usr/lib64"); SEARCH_DIR("=/usr/aarch64-linux-gnu/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000));
+  . = SEGMENT_START("text-segment", 0x400000) + SIZEOF_HEADERS;
+  /* Place the build-id as close to the ELF headers as possible.  This
+     maximises the chance the build-id will be present in core files,
+     which GDB can then use to locate the associated debuginfo file.  */
+  .note.gnu.build-id  : { *(.note.gnu.build-id) }
+  .interp         : { *(.interp) }
+  .hash           : { *(.hash) }
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+  .rela.dyn       :
+    {
+      *(.rela.init)
+      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+      *(.rela.fini)
+      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+      *(.rela.ctors)
+      *(.rela.dtors)
+      *(.rela.got)
+      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+      *(.rela.ifunc)
+    }
+  .rela.plt       :
+    {
+      *(.rela.plt)
+      PROVIDE_HIDDEN (__rela_iplt_start = .);
+      *(.rela.iplt)
+      PROVIDE_HIDDEN (__rela_iplt_end = .);
+    }
+  .relr.dyn : { *(.relr.dyn) }
+  /* Start of the executable code region.  */
+  .init           :
+  {
+    KEEP (*(SORT_NONE(.init)))
+  } =0x1f2003d5
+  .plt            : ALIGN(16) { *(.plt) *(.iplt) }
+  .text           :
+  {
+    *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+    *(.text.exit .text.exit.*)
+    *(.text.startup .text.startup.*)
+    *(.text.hot .text.hot.*)
+    *(SORT(.text.sorted.*))
+    *(.text .stub .text.* .gnu.linkonce.t.*)
+    /* .gnu.warning sections are handled specially by elf.em.  */
+    *(.gnu.warning)
+  } =0x1f2003d5
+  .fini           :
+  {
+    KEEP (*(SORT_NONE(.fini)))
+  } =0x1f2003d5
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  /* Start of the Read Only Data region.  */
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1        : { *(.rodata1) }
+  .eh_frame_hdr   : { *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) }
+  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .sframe         : ONLY_IF_RO { *(.sframe) *(.sframe.*) }
+  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
+  .gnu_extab   : ONLY_IF_RO { *(.gnu_extab*) }
+  /* These sections are generated by the Sun/Oracle C++ compiler.  */
+  .exception_ranges   : ONLY_IF_RO { *(.exception_ranges*) }
+  /* Various note sections.  Placed here so that they are always included
+     in the read-only segment and not treated as orphan sections.  The
+     current orphan handling algorithm does place note sections after R/O
+     data, but this is not guaranteed to always be the case.  */
+  .note.build-id :      { *(.note.build-id) }
+  .note.GNU-stack :     { *(.note.GNU-stack) }
+  .note.gnu-property :  { *(.note.gnu-property) }
+  .note.ABI-tag :       { *(.note.ABI-tag) }
+  .note.package :       { *(.note.package) }
+  .note.dlopen :        { *(.note.dlopen) }
+  .note.netbsd.ident :  { *(.note.netbsd.ident) }
+  .note.openbsd.ident : { *(.note.openbsd.ident) }
+  /* Start of the Read Write Data region.  */
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  /* Exception handling.  */
+  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .sframe         : ONLY_IF_RW { *(.sframe) *(.sframe.*) }
+  .gnu_extab      : ONLY_IF_RW { *(.gnu_extab) }
+  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
+  .exception_ranges   : ONLY_IF_RW { *(.exception_ranges*) }
+  /* Thread Local Storage sections.  */
+  /* .tdata	  :
+   {
+     PROVIDE_HIDDEN (__tdata_start = .);
+     *(.tdata .tdata.* .gnu.linkonce.td.*)
+   }
+  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } */
+  .preinit_array    :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  }
+  /* .init_array    :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } */
+  .fini_array    :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+    KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  }
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  }
+  .dtors          :
+  {
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  }
+  .jcr            : { KEEP (*(.jcr)) }
+  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }
+  .dynamic        : { *(.dynamic) }
+  .got            : { *(.got) *(.igot) }
+  . = DATA_SEGMENT_RELRO_END (24, .);
+  .got.plt        : { *(.got.plt) *(.igot.plt) }
+  .data           :
+  {
+    PROVIDE (__data_start = .);
+    *(.data .data.* .gnu.linkonce.d.*)
+    SORT(CONSTRUCTORS)
+  }
+  .data1          : { *(.data1) }
+  _edata = .;
+  PROVIDE (edata = .);
+  . = ALIGN(ALIGNOF(NEXT_SECTION));
+  __bss_start = .;
+  __bss_start__ = .;
+  .bss            :
+  {
+    *(.dynbss)
+    *(.bss .bss.* .gnu.linkonce.b.*)
+    *(COMMON)
+    /* Align here to ensure that in the common case of there only being one
+       type of .bss section, the section occupies space up to _end.
+       Align after .bss to ensure correct alignment even if the
+       .bss section disappears because there are no input sections.
+       FIXME: Why do we need it? When there is no .bss section, we do not
+       pad the .data section.  */
+      . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  _bss_end__ = .; __bss_end__ = .;
+  . = ALIGN(64 / 8);
+  /* Start of the Large Data region.  */
+  . = SEGMENT_START("ldata-segment", .);
+  . = ALIGN(64 / 8);
+  __end__ = .;
+  _end = .;
+  PROVIDE (end = .);
+  . = DATA_SEGMENT_END (.);
+  /* Start of the Tiny Data region.  */
+  /* Stabs debugging sections.  */
+  .stab          0 : { *(.stab) }
+  .stabstr       0 : { *(.stabstr) }
+  .stab.excl     0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index    0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment 0 (INFO) : { *(.comment); LINKER_VERSION; }
+  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1.  */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions.  */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2.  */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2.  */
+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions.  */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+  /* DWARF 3.  */
+  .debug_pubtypes 0 : { *(.debug_pubtypes) }
+  .debug_ranges   0 : { *(.debug_ranges) }
+  /* DWARF 5.  */
+  .debug_addr     0 : { *(.debug_addr) }
+  .debug_line_str 0 : { *(.debug_line_str) }
+  .debug_loclists 0 : { *(.debug_loclists) }
+  .debug_macro    0 : { *(.debug_macro) }
+  .debug_names    0 : { *(.debug_names) }
+  .debug_rnglists 0 : { *(.debug_rnglists) }
+  .debug_str_offsets 0 : { *(.debug_str_offsets) }
+  .debug_sup      0 : { *(.debug_sup) }
+  .ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) }
+  .note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }
+  /DISCARD/ : {
+    *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*)
+    /*
+     * XXX: As of now, ld.so links with relibc which has the main functionality. In the next refactor,
+     * ld.so will be moved out of relibc. So, till that time, we have to discard any sections
+     * that may reference use thread local storage.
+     *
+     * .init_array also depends on TLS and is discarded as we don't need it.
+     */
+    *(.gnu.linkonce.tb.*) *(.tcommon)
+    *(.init_array)
+  }
+}
diff --git a/recipes/core/relibc/ld_so/ld_script/aarch64-unknown-redox.ld b/recipes/core/relibc/ld_so/ld_script/aarch64-unknown-redox.ld
new file mode 100644
index 0000000000..64ead42b5e
--- /dev/null
+++ b/recipes/core/relibc/ld_so/ld_script/aarch64-unknown-redox.ld
@@ -0,0 +1,255 @@
+/* Script for -z combreloc */
+/* Copyright (C) 2014-2020 Free Software Foundation, Inc.
+   Copying and distribution of this script, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.  */
+OUTPUT_FORMAT("elf64-littleaarch64", "elf64-littleaarch64",
+              "elf64-littleaarch64")
+OUTPUT_ARCH(aarch64)
+ENTRY(_start)
+SEARCH_DIR("/aarch64-unknown-redox/lib");
+SEARCH_DIR("/usr/local/lib64");
+SEARCH_DIR("/lib64");
+SEARCH_DIR("/usr/lib64");
+SEARCH_DIR("/usr/local/lib");
+SEARCH_DIR("/lib");
+SEARCH_DIR("/usr/lib");
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000)); . = SEGMENT_START("text-segment", 0x20000000) + SIZEOF_HEADERS;
+  .interp         : { *(.interp) }
+  .note.gnu.build-id  : { *(.note.gnu.build-id) }
+  .hash           : { *(.hash) }
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+  .rela.dyn       :
+    {
+      *(.rela.init)
+      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+      *(.rela.fini)
+      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+      *(.rela.ctors)
+      *(.rela.dtors)
+      *(.rela.got)
+      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+      *(.rela.ldata .rela.ldata.* .rela.gnu.linkonce.l.*)
+      *(.rela.lbss .rela.lbss.* .rela.gnu.linkonce.lb.*)
+      *(.rela.lrodata .rela.lrodata.* .rela.gnu.linkonce.lr.*)
+      *(.rela.ifunc)
+    }
+  .rela.plt       :
+    {
+      *(.rela.plt)
+      PROVIDE_HIDDEN (__rela_iplt_start = .);
+      *(.rela.iplt)
+      PROVIDE_HIDDEN (__rela_iplt_end = .);
+    }
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  .init           :
+  {
+    KEEP (*(SORT_NONE(.init)))
+  }
+  .plt            : { *(.plt) *(.iplt) }
+.plt.got        : { *(.plt.got) }
+.plt.sec        : { *(.plt.sec) }
+  .text           :
+  {
+    *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+    *(.text.exit .text.exit.*)
+    *(.text.startup .text.startup.*)
+    *(.text.hot .text.hot.*)
+    *(.text .stub .text.* .gnu.linkonce.t.*)
+    /* .gnu.warning sections are handled specially by elf.em.  */
+    *(.gnu.warning)
+  }
+  .fini           :
+  {
+    KEEP (*(SORT_NONE(.fini)))
+  }
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  /* Adjust the address for the rodata segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = SEGMENT_START("rodata-segment", ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)));
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1        : { *(.rodata1) }
+  .eh_frame_hdr   : { *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) }
+  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
+  .gnu_extab   : ONLY_IF_RO { *(.gnu_extab*) }
+  /* These sections are generated by the Sun/Oracle C++ compiler.  */
+  .exception_ranges   : ONLY_IF_RO { *(.exception_ranges*) }
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  /* Exception handling  */
+  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gnu_extab      : ONLY_IF_RW { *(.gnu_extab) }
+  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
+  .exception_ranges   : ONLY_IF_RW { *(.exception_ranges*) }
+  /* Thread Local Storage sections  */
+  /* .tdata          :
+   {
+     PROVIDE_HIDDEN (__tdata_start = .);
+     *(.tdata .tdata.* .gnu.linkonce.td.*)
+   }
+  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } */
+  .preinit_array    :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  }
+  .init_array    :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  }
+  .fini_array    :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+    KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  }
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  }
+  .dtors          :
+  {
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  }
+  .jcr            : { KEEP (*(.jcr)) }
+  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }
+  .dynamic        : { *(.dynamic) }
+  .got            : { *(.got) *(.igot) }
+  . = DATA_SEGMENT_RELRO_END (SIZEOF (.got.plt) >= 24 ? 24 : 0, .);
+  .got.plt        : { *(.got.plt) *(.igot.plt) }
+  .data           :
+  {
+    *(.data .data.* .gnu.linkonce.d.*)
+    SORT(CONSTRUCTORS)
+  }
+  .data1          : { *(.data1) }
+  _edata = .; PROVIDE (edata = .);
+  . = .;
+  __bss_start = .;
+  .bss            :
+  {
+   *(.dynbss)
+   *(.bss .bss.* .gnu.linkonce.b.*)
+   *(COMMON)
+   /* Align here to ensure that the .bss section occupies space up to
+      _end.  Align after .bss to ensure correct alignment even if the
+      .bss section disappears because there are no input sections.
+      FIXME: Why do we need it? When there is no .bss section, we do not
+      pad the .data section.  */
+   . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  .lbss   :
+  {
+    *(.dynlbss)
+    *(.lbss .lbss.* .gnu.linkonce.lb.*)
+    *(LARGE_COMMON)
+  }
+  . = ALIGN(64 / 8);
+  . = SEGMENT_START("ldata-segment", .);
+  .lrodata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.lrodata .lrodata.* .gnu.linkonce.lr.*)
+  }
+  .ldata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.ldata .ldata.* .gnu.linkonce.l.*)
+    . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  . = ALIGN(64 / 8);
+  _end = .; PROVIDE (end = .);
+  . = DATA_SEGMENT_END (.);
+  /* Stabs debugging sections.  */
+  .stab          0 : { *(.stab) }
+  .stabstr       0 : { *(.stabstr) }
+  .stab.excl     0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index    0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment       0 : { *(.comment) }
+  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+  /* DWARF 3 */
+  .debug_pubtypes 0 : { *(.debug_pubtypes) }
+  .debug_ranges   0 : { *(.debug_ranges) }
+  /* DWARF Extension.  */
+  .debug_macro    0 : { *(.debug_macro) }
+  .debug_addr     0 : { *(.debug_addr) }
+  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
+  /DISCARD/ : { 
+    *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) 
+    /*
+     * XXX: As of now, ld.so links with relibc which has the main functionality. In the next refactor,
+     * ld.so will be moved out of relibc. So, till that time, we have to discard any sections
+     * that may reference use thread local storage.
+     *
+     * .init_array need to be not discarded unlike x86_64 linker variant
+     */
+    *(.gnu.linkonce.tb.*) *(.tcommon)
+  }
+}
diff --git a/recipes/core/relibc/ld_so/ld_script/i586-unknown-redox.ld b/recipes/core/relibc/ld_so/ld_script/i586-unknown-redox.ld
new file mode 100644
index 0000000000..86b9e46c4c
--- /dev/null
+++ b/recipes/core/relibc/ld_so/ld_script/i586-unknown-redox.ld
@@ -0,0 +1,256 @@
+/* Script for -z combreloc */
+/* Copyright (C) 2014-2020 Free Software Foundation, Inc.
+   Copying and distribution of this script, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.  */
+OUTPUT_FORMAT("elf32-i386", "elf32-i386",
+              "elf32-i386")
+OUTPUT_ARCH(i386)
+ENTRY(_start)
+SEARCH_DIR("/i686-unknown-redox/lib");
+SEARCH_DIR("/usr/local/lib32");
+SEARCH_DIR("/lib32");
+SEARCH_DIR("/usr/lib32");
+SEARCH_DIR("/usr/local/lib");
+SEARCH_DIR("/lib");
+SEARCH_DIR("/usr/lib");
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000)); . = SEGMENT_START("text-segment", 0x20000000) + SIZEOF_HEADERS;
+  .interp         : { *(.interp) }
+  .note.gnu.build-id  : { *(.note.gnu.build-id) }
+  .hash           : { *(.hash) }
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+  .rela.dyn       :
+    {
+      *(.rela.init)
+      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+      *(.rela.fini)
+      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+      *(.rela.ctors)
+      *(.rela.dtors)
+      *(.rela.got)
+      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+      *(.rela.ldata .rela.ldata.* .rela.gnu.linkonce.l.*)
+      *(.rela.lbss .rela.lbss.* .rela.gnu.linkonce.lb.*)
+      *(.rela.lrodata .rela.lrodata.* .rela.gnu.linkonce.lr.*)
+      *(.rela.ifunc)
+    }
+  .rela.plt       :
+    {
+      *(.rela.plt)
+      PROVIDE_HIDDEN (__rela_iplt_start = .);
+      *(.rela.iplt)
+      PROVIDE_HIDDEN (__rela_iplt_end = .);
+    }
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  .init           :
+  {
+    KEEP (*(SORT_NONE(.init)))
+  }
+  .plt            : { *(.plt) *(.iplt) }
+.plt.got        : { *(.plt.got) }
+.plt.sec        : { *(.plt.sec) }
+  .text           :
+  {
+    *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+    *(.text.exit .text.exit.*)
+    *(.text.startup .text.startup.*)
+    *(.text.hot .text.hot.*)
+    *(.text .stub .text.* .gnu.linkonce.t.*)
+    /* .gnu.warning sections are handled specially by elf.em.  */
+    *(.gnu.warning)
+  }
+  .fini           :
+  {
+    KEEP (*(SORT_NONE(.fini)))
+  }
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  /* Adjust the address for the rodata segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = SEGMENT_START("rodata-segment", ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)));
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1        : { *(.rodata1) }
+  .eh_frame_hdr   : { *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) }
+  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
+  .gnu_extab   : ONLY_IF_RO { *(.gnu_extab*) }
+  /* These sections are generated by the Sun/Oracle C++ compiler.  */
+  .exception_ranges   : ONLY_IF_RO { *(.exception_ranges*) }
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  /* Exception handling  */
+  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gnu_extab      : ONLY_IF_RW { *(.gnu_extab) }
+  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
+  .exception_ranges   : ONLY_IF_RW { *(.exception_ranges*) }
+  /* Thread Local Storage sections  */
+  /* .tdata          :
+   {
+     PROVIDE_HIDDEN (__tdata_start = .);
+     *(.tdata .tdata.* .gnu.linkonce.td.*)
+   }
+  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } */
+  .preinit_array    :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  }
+  /* .init_array    :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } */
+  .fini_array    :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+    KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  }
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  }
+  .dtors          :
+  {
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  }
+  .jcr            : { KEEP (*(.jcr)) }
+  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }
+  .dynamic        : { *(.dynamic) }
+  .got            : { *(.got) *(.igot) }
+  . = DATA_SEGMENT_RELRO_END (SIZEOF (.got.plt) >= 24 ? 24 : 0, .);
+  .got.plt        : { *(.got.plt) *(.igot.plt) }
+  .data           :
+  {
+    *(.data .data.* .gnu.linkonce.d.*)
+    SORT(CONSTRUCTORS)
+  }
+  .data1          : { *(.data1) }
+  _edata = .; PROVIDE (edata = .);
+  . = .;
+  __bss_start = .;
+  .bss            :
+  {
+   *(.dynbss)
+   *(.bss .bss.* .gnu.linkonce.b.*)
+   *(COMMON)
+   /* Align here to ensure that the .bss section occupies space up to
+      _end.  Align after .bss to ensure correct alignment even if the
+      .bss section disappears because there are no input sections.
+      FIXME: Why do we need it? When there is no .bss section, we do not
+      pad the .data section.  */
+   . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  .lbss   :
+  {
+    *(.dynlbss)
+    *(.lbss .lbss.* .gnu.linkonce.lb.*)
+    *(LARGE_COMMON)
+  }
+  . = ALIGN(64 / 8);
+  . = SEGMENT_START("ldata-segment", .);
+  .lrodata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.lrodata .lrodata.* .gnu.linkonce.lr.*)
+  }
+  .ldata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.ldata .ldata.* .gnu.linkonce.l.*)
+    . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  . = ALIGN(64 / 8);
+  _end = .; PROVIDE (end = .);
+  . = DATA_SEGMENT_END (.);
+  /* Stabs debugging sections.  */
+  .stab          0 : { *(.stab) }
+  .stabstr       0 : { *(.stabstr) }
+  .stab.excl     0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index    0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment       0 : { *(.comment) }
+  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+  /* DWARF 3 */
+  .debug_pubtypes 0 : { *(.debug_pubtypes) }
+  .debug_ranges   0 : { *(.debug_ranges) }
+  /* DWARF Extension.  */
+  .debug_macro    0 : { *(.debug_macro) }
+  .debug_addr     0 : { *(.debug_addr) }
+  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
+  /DISCARD/ : {
+    *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*)
+    /*
+     * XXX: As of now, ld.so links with relibc which has the main functionality. In the next refactor,
+     * ld.so will be moved out of relibc. So, till that time, we have to discard any sections
+     * that may reference use thread local storage.
+     *
+     * .init_array also depends on TLS and is discarded as we don't need it.
+     */
+    *(.gnu.linkonce.tb.*) *(.tcommon)
+    *(.init_array)
+  }
+}
diff --git a/recipes/core/relibc/ld_so/ld_script/i686-unknown-redox.ld b/recipes/core/relibc/ld_so/ld_script/i686-unknown-redox.ld
new file mode 100644
index 0000000000..7e68c6c8bb
--- /dev/null
+++ b/recipes/core/relibc/ld_so/ld_script/i686-unknown-redox.ld
@@ -0,0 +1,256 @@
+/* Script for -z combreloc */
+/* Copyright (C) 2014-2020 Free Software Foundation, Inc.
+   Copying and distribution of this script, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.  */
+OUTPUT_FORMAT("elf32-i386", "elf32-i386",
+              "elf32-i386")
+OUTPUT_ARCH(i386)
+ENTRY(_start)
+SEARCH_DIR("/i686-unknown-redox/lib");
+SEARCH_DIR("/usr/local/lib32");
+SEARCH_DIR("/lib32");
+SEARCH_DIR("/usr/lib32");
+SEARCH_DIR("/usr/local/lib");
+SEARCH_DIR("/lib");
+SEARCH_DIR("/usr/lib");
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000)); . = SEGMENT_START("text-segment", 0x20000000) + SIZEOF_HEADERS;
+  .interp         : { *(.interp) }
+  .note.gnu.build-id  : { *(.note.gnu.build-id) }
+  .hash           : { *(.hash) }
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+  .rela.dyn       :
+    {
+      *(.rela.init)
+      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+      *(.rela.fini)
+      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+      *(.rela.ctors)
+      *(.rela.dtors)
+      *(.rela.got)
+      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+      *(.rela.ldata .rela.ldata.* .rela.gnu.linkonce.l.*)
+      *(.rela.lbss .rela.lbss.* .rela.gnu.linkonce.lb.*)
+      *(.rela.lrodata .rela.lrodata.* .rela.gnu.linkonce.lr.*)
+      *(.rela.ifunc)
+    }
+  .rela.plt       :
+    {
+      *(.rela.plt)
+      PROVIDE_HIDDEN (__rela_iplt_start = .);
+      *(.rela.iplt)
+      PROVIDE_HIDDEN (__rela_iplt_end = .);
+    }
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  .init           :
+  {
+    KEEP (*(SORT_NONE(.init)))
+  }
+  .plt            : { *(.plt) *(.iplt) }
+.plt.got        : { *(.plt.got) }
+.plt.sec        : { *(.plt.sec) }
+  .text           :
+  {
+    *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+    *(.text.exit .text.exit.*)
+    *(.text.startup .text.startup.*)
+    *(.text.hot .text.hot.*)
+    *(.text .stub .text.* .gnu.linkonce.t.*)
+    /* .gnu.warning sections are handled specially by elf.em.  */
+    *(.gnu.warning)
+  }
+  .fini           :
+  {
+    KEEP (*(SORT_NONE(.fini)))
+  }
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  /* Adjust the address for the rodata segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = SEGMENT_START("rodata-segment", ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)));
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1        : { *(.rodata1) }
+  .eh_frame_hdr   : { *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) }
+  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
+  .gnu_extab   : ONLY_IF_RO { *(.gnu_extab*) }
+  /* These sections are generated by the Sun/Oracle C++ compiler.  */
+  .exception_ranges   : ONLY_IF_RO { *(.exception_ranges*) }
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  /* Exception handling  */
+  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gnu_extab      : ONLY_IF_RW { *(.gnu_extab) }
+  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
+  .exception_ranges   : ONLY_IF_RW { *(.exception_ranges*) }
+  /* Thread Local Storage sections  */
+  /* .tdata          :
+   {
+     PROVIDE_HIDDEN (__tdata_start = .);
+     *(.tdata .tdata.* .gnu.linkonce.td.*)
+   }
+  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } */
+  .preinit_array    :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  }
+  /* .init_array    :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } */
+  .fini_array    :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+    KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  }
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  }
+  .dtors          :
+  {
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  }
+  .jcr            : { KEEP (*(.jcr)) }
+  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }
+  .dynamic        : { *(.dynamic) }
+  .got            : { *(.got) *(.igot) }
+  . = DATA_SEGMENT_RELRO_END (SIZEOF (.got.plt) >= 24 ? 24 : 0, .);
+  .got.plt        : { *(.got.plt) *(.igot.plt) }
+  .data           :
+  {
+    *(.data .data.* .gnu.linkonce.d.*)
+    SORT(CONSTRUCTORS)
+  }
+  .data1          : { *(.data1) }
+  _edata = .; PROVIDE (edata = .);
+  . = .;
+  __bss_start = .;
+  .bss            :
+  {
+   *(.dynbss)
+   *(.bss .bss.* .gnu.linkonce.b.*)
+   *(COMMON)
+   /* Align here to ensure that the .bss section occupies space up to
+      _end.  Align after .bss to ensure correct alignment even if the
+      .bss section disappears because there are no input sections.
+      FIXME: Why do we need it? When there is no .bss section, we do not
+      pad the .data section.  */
+   . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  .lbss   :
+  {
+    *(.dynlbss)
+    *(.lbss .lbss.* .gnu.linkonce.lb.*)
+    *(LARGE_COMMON)
+  }
+  . = ALIGN(64 / 8);
+  . = SEGMENT_START("ldata-segment", .);
+  .lrodata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.lrodata .lrodata.* .gnu.linkonce.lr.*)
+  }
+  .ldata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.ldata .ldata.* .gnu.linkonce.l.*)
+    . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  . = ALIGN(64 / 8);
+  _end = .; PROVIDE (end = .);
+  . = DATA_SEGMENT_END (.);
+  /* Stabs debugging sections.  */
+  .stab          0 : { *(.stab) }
+  .stabstr       0 : { *(.stabstr) }
+  .stab.excl     0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index    0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment       0 : { *(.comment) }
+  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+  /* DWARF 3 */
+  .debug_pubtypes 0 : { *(.debug_pubtypes) }
+  .debug_ranges   0 : { *(.debug_ranges) }
+  /* DWARF Extension.  */
+  .debug_macro    0 : { *(.debug_macro) }
+  .debug_addr     0 : { *(.debug_addr) }
+  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
+  /DISCARD/ : { 
+    *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) 
+    /*
+     * XXX: As of now, ld.so links with relibc which has the main functionality. In the next refactor,
+     * ld.so will be moved out of relibc. So, till that time, we have to discard any sections
+     * that may reference use thread local storage.
+     *
+     * .init_array also depends on TLS and is discarded as we don't need it.
+     */
+    *(.gnu.linkonce.tb.*) *(.tcommon)
+    *(.init_array)
+  }
+}
diff --git a/recipes/core/relibc/ld_so/ld_script/riscv64gc-unknown-redox.ld b/recipes/core/relibc/ld_so/ld_script/riscv64gc-unknown-redox.ld
new file mode 100644
index 0000000000..fc657797ea
--- /dev/null
+++ b/recipes/core/relibc/ld_so/ld_script/riscv64gc-unknown-redox.ld
@@ -0,0 +1,247 @@
+/* Script for -z combreloc */
+/* Copyright (C) 2014-2020 Free Software Foundation, Inc.
+   Copying and distribution of this script, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.  */
+OUTPUT_FORMAT("elf64-littleriscv", "elf64-littleriscv", "elf64-littleriscv" )
+OUTPUT_ARCH(riscv)
+ENTRY(_start)
+SEARCH_DIR("/riscv64-unknown-redox/lib");
+SEARCH_DIR("/usr/local/lib64");
+SEARCH_DIR("/lib64");
+SEARCH_DIR("/usr/lib64");
+SEARCH_DIR("/usr/local/lib");
+SEARCH_DIR("/lib");
+SEARCH_DIR("/usr/lib");
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000)); . = SEGMENT_START("text-segment", 0x20000000) + SIZEOF_HEADERS;
+  .interp         : { *(.interp) }
+  .note.gnu.build-id  : { *(.note.gnu.build-id) }
+  .hash           : { *(.hash) }
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+  .rela.dyn       :
+    {
+      *(.rela.init)
+      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+      *(.rela.fini)
+      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+      *(.rela.ctors)
+      *(.rela.dtors)
+      *(.rela.got)
+      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+      *(.rela.ldata .rela.ldata.* .rela.gnu.linkonce.l.*)
+      *(.rela.lbss .rela.lbss.* .rela.gnu.linkonce.lb.*)
+      *(.rela.lrodata .rela.lrodata.* .rela.gnu.linkonce.lr.*)
+      *(.rela.ifunc)
+    }
+  .rela.plt       :
+    {
+      *(.rela.plt)
+      PROVIDE_HIDDEN (__rela_iplt_start = .);
+      *(.rela.iplt)
+      PROVIDE_HIDDEN (__rela_iplt_end = .);
+    }
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  .plt            : { *(.plt) *(.iplt) }
+.plt.got        : { *(.plt.got) }
+.plt.sec        : { *(.plt.sec) }
+  .text           :
+  {
+    *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+    *(.text.exit .text.exit.*)
+    *(.text.startup .text.startup.*)
+    *(.text.hot .text.hot.*)
+    *(.text .stub .text.* .gnu.linkonce.t.*)
+    /* .gnu.warning sections are handled specially by elf.em.  */
+    *(.gnu.warning)
+  }
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  /* Adjust the address for the rodata segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = SEGMENT_START("rodata-segment", ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)));
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1        : { *(.rodata1) }
+  .eh_frame_hdr   : { *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) }
+  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
+  .gnu_extab   : ONLY_IF_RO { *(.gnu_extab*) }
+  /* These sections are generated by the Sun/Oracle C++ compiler.  */
+  .exception_ranges   : ONLY_IF_RO { *(.exception_ranges*) }
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  /* Exception handling  */
+  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gnu_extab      : ONLY_IF_RW { *(.gnu_extab) }
+  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
+  .exception_ranges   : ONLY_IF_RW { *(.exception_ranges*) }
+  /* Thread Local Storage sections  */
+  /* .tdata          :
+   {
+     PROVIDE_HIDDEN (__tdata_start = .);
+     *(.tdata .tdata.* .gnu.linkonce.td.*)
+   }
+  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } */
+  .preinit_array    :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  }
+  /* .init_array    :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } */
+  .fini_array    :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+    KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  }
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  }
+  .dtors          :
+  {
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  }
+  .jcr            : { KEEP (*(.jcr)) }
+  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }
+  .dynamic        : { *(.dynamic) }
+  .got            : { *(.got) *(.igot) }
+  . = DATA_SEGMENT_RELRO_END (SIZEOF (.got.plt) >= 24 ? 24 : 0, .);
+  .got.plt        : { *(.got.plt) *(.igot.plt) }
+  .data           :
+  {
+    *(.data .data.* .gnu.linkonce.d.*)
+    SORT(CONSTRUCTORS)
+  }
+  .data1          : { *(.data1) }
+  _edata = .; PROVIDE (edata = .);
+  . = .;
+  __bss_start = .;
+  .bss            :
+  {
+   *(.dynbss)
+   *(.bss .bss.* .gnu.linkonce.b.*)
+   *(COMMON)
+   /* Align here to ensure that the .bss section occupies space up to
+      _end.  Align after .bss to ensure correct alignment even if the
+      .bss section disappears because there are no input sections.
+      FIXME: Why do we need it? When there is no .bss section, we do not
+      pad the .data section.  */
+   . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  .lbss   :
+  {
+    *(.dynlbss)
+    *(.lbss .lbss.* .gnu.linkonce.lb.*)
+    *(LARGE_COMMON)
+  }
+  . = ALIGN(64 / 8);
+  . = SEGMENT_START("ldata-segment", .);
+  .lrodata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.lrodata .lrodata.* .gnu.linkonce.lr.*)
+  }
+  .ldata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.ldata .ldata.* .gnu.linkonce.l.*)
+    . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  . = ALIGN(64 / 8);
+  _end = .; PROVIDE (end = .);
+  . = DATA_SEGMENT_END (.);
+  /* Stabs debugging sections.  */
+  .stab          0 : { *(.stab) }
+  .stabstr       0 : { *(.stabstr) }
+  .stab.excl     0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index    0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment       0 : { *(.comment) }
+  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+  /* DWARF 3 */
+  .debug_pubtypes 0 : { *(.debug_pubtypes) }
+  .debug_ranges   0 : { *(.debug_ranges) }
+  /* DWARF Extension.  */
+  .debug_macro    0 : { *(.debug_macro) }
+  .debug_addr     0 : { *(.debug_addr) }
+  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
+  /DISCARD/ : { 
+    *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) 
+    /*
+     * XXX: As of now, ld.so links with relibc which has the main functionality. In the next refactor,
+     * ld.so will be moved out of relibc. So, till that time, we have to discard any sections
+     * that may reference use thread local storage.
+     *
+     * .init_array also depends on TLS and is discarded as we don't need it.
+     */
+    *(.gnu.linkonce.tb.*) *(.tcommon)
+    *(.init_array)
+  }
+}
diff --git a/recipes/core/relibc/ld_so/ld_script/x86_64-unknown-linux-gnu.ld b/recipes/core/relibc/ld_so/ld_script/x86_64-unknown-linux-gnu.ld
new file mode 100644
index 0000000000..be84e120e1
--- /dev/null
+++ b/recipes/core/relibc/ld_so/ld_script/x86_64-unknown-linux-gnu.ld
@@ -0,0 +1,259 @@
+/* Script for -z combreloc */
+/* Copyright (C) 2014-2020 Free Software Foundation, Inc.
+   Copying and distribution of this script, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.  */
+OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
+              "elf64-x86-64")
+OUTPUT_ARCH(i386:x86-64)
+ENTRY(_start)
+SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib64");
+SEARCH_DIR("/usr/lib64/binutils/x86_64-pc-linux-gnu/2.33.164");
+SEARCH_DIR("/usr/local/lib64");
+SEARCH_DIR("/lib64");
+SEARCH_DIR("/usr/lib64");
+SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib");
+SEARCH_DIR("/usr/lib64/binutils/x86_64-pc-linux-gnu/2.33.1");
+SEARCH_DIR("/usr/local/lib");
+SEARCH_DIR("/lib");
+SEARCH_DIR("/usr/lib");
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000)); . = SEGMENT_START("text-segment", 0x20000000) + SIZEOF_HEADERS;
+  .interp         : { *(.interp) }
+  .note.gnu.build-id  : { *(.note.gnu.build-id) }
+  .hash           : { *(.hash) }
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+  .rela.dyn       :
+    {
+      *(.rela.init)
+      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+      *(.rela.fini)
+      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+      *(.rela.ctors)
+      *(.rela.dtors)
+      *(.rela.got)
+      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+      *(.rela.ldata .rela.ldata.* .rela.gnu.linkonce.l.*)
+      *(.rela.lbss .rela.lbss.* .rela.gnu.linkonce.lb.*)
+      *(.rela.lrodata .rela.lrodata.* .rela.gnu.linkonce.lr.*)
+      *(.rela.ifunc)
+    }
+  .rela.plt       :
+    {
+      *(.rela.plt)
+      PROVIDE_HIDDEN (__rela_iplt_start = .);
+      *(.rela.iplt)
+      PROVIDE_HIDDEN (__rela_iplt_end = .);
+    }
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  .init           :
+  {
+    KEEP (*(SORT_NONE(.init)))
+  }
+  .plt            : { *(.plt) *(.iplt) }
+.plt.got        : { *(.plt.got) }
+.plt.sec        : { *(.plt.sec) }
+  .text           :
+  {
+    *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+    *(.text.exit .text.exit.*)
+    *(.text.startup .text.startup.*)
+    *(.text.hot .text.hot.*)
+    *(.text .stub .text.* .gnu.linkonce.t.*)
+    /* .gnu.warning sections are handled specially by elf.em.  */
+    *(.gnu.warning)
+  }
+  .fini           :
+  {
+    KEEP (*(SORT_NONE(.fini)))
+  }
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  /* Adjust the address for the rodata segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = SEGMENT_START("rodata-segment", ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)));
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1        : { *(.rodata1) }
+  .eh_frame_hdr   : { *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) }
+  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
+  .gnu_extab   : ONLY_IF_RO { *(.gnu_extab*) }
+  /* These sections are generated by the Sun/Oracle C++ compiler.  */
+  .exception_ranges   : ONLY_IF_RO { *(.exception_ranges*) }
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  /* Exception handling  */
+  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gnu_extab      : ONLY_IF_RW { *(.gnu_extab) }
+  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
+  .exception_ranges   : ONLY_IF_RW { *(.exception_ranges*) }
+  /* Thread Local Storage sections  */
+  /* .tdata          : ALIGN(4K)
+   {
+     PROVIDE_HIDDEN (__tdata_start = .);
+     *(.tdata .tdata.* .gnu.linkonce.td.*)
+   }
+  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } */
+  .preinit_array    :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  }
+  /* .init_array    :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } */
+  .fini_array    :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+    KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  }
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  }
+  .dtors          :
+  {
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  }
+  .jcr            : { KEEP (*(.jcr)) }
+  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }
+  .dynamic        : { *(.dynamic) }
+  .got            : { *(.got) *(.igot) }
+  . = DATA_SEGMENT_RELRO_END (SIZEOF (.got.plt) >= 24 ? 24 : 0, .);
+  .got.plt        : { *(.got.plt) *(.igot.plt) }
+  .data           :
+  {
+    *(.data .data.* .gnu.linkonce.d.*)
+    SORT(CONSTRUCTORS)
+  }
+  .data1          : { *(.data1) }
+  _edata = .; PROVIDE (edata = .);
+  . = .;
+  __bss_start = .;
+  .bss            :
+  {
+   *(.dynbss)
+   *(.bss .bss.* .gnu.linkonce.b.*)
+   *(COMMON)
+   /* Align here to ensure that the .bss section occupies space up to
+      _end.  Align after .bss to ensure correct alignment even if the
+      .bss section disappears because there are no input sections.
+      FIXME: Why do we need it? When there is no .bss section, we do not
+      pad the .data section.  */
+   . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  .lbss   :
+  {
+    *(.dynlbss)
+    *(.lbss .lbss.* .gnu.linkonce.lb.*)
+    *(LARGE_COMMON)
+  }
+  . = ALIGN(64 / 8);
+  . = SEGMENT_START("ldata-segment", .);
+  .lrodata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.lrodata .lrodata.* .gnu.linkonce.lr.*)
+  }
+  .ldata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.ldata .ldata.* .gnu.linkonce.l.*)
+    . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  . = ALIGN(64 / 8);
+  _end = .; PROVIDE (end = .);
+  . = DATA_SEGMENT_END (.);
+  /* Stabs debugging sections.  */
+  .stab          0 : { *(.stab) }
+  .stabstr       0 : { *(.stabstr) }
+  .stab.excl     0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index    0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment       0 : { *(.comment) }
+  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+  /* DWARF 3 */
+  .debug_pubtypes 0 : { *(.debug_pubtypes) }
+  .debug_ranges   0 : { *(.debug_ranges) }
+  /* DWARF Extension.  */
+  .debug_macro    0 : { *(.debug_macro) }
+  .debug_addr     0 : { *(.debug_addr) }
+  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
+  /DISCARD/ : { 
+    *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) 
+    /*
+     * XXX: As of now, ld.so links with relibc which has the main functionality. In the next refactor,
+     * ld.so will be moved out of relibc. So, till that time, we have to discard any sections
+     * that may reference use thread local storage.
+     *
+     * .init_array also depends on TLS and is discarded as we don't need it.
+     */
+    *(.gnu.linkonce.tb.*) *(.tcommon)
+    *(.init_array)
+  }
+}
diff --git a/recipes/core/relibc/ld_so/ld_script/x86_64-unknown-redox.ld b/recipes/core/relibc/ld_so/ld_script/x86_64-unknown-redox.ld
new file mode 100644
index 0000000000..3e54c4a6d7
--- /dev/null
+++ b/recipes/core/relibc/ld_so/ld_script/x86_64-unknown-redox.ld
@@ -0,0 +1,256 @@
+/* Script for -z combreloc */
+/* Copyright (C) 2014-2020 Free Software Foundation, Inc.
+   Copying and distribution of this script, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.  */
+OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
+              "elf64-x86-64")
+OUTPUT_ARCH(i386:x86-64)
+ENTRY(_start)
+SEARCH_DIR("/x86_64-unknown-redox/lib");
+SEARCH_DIR("/usr/local/lib64");
+SEARCH_DIR("/lib64");
+SEARCH_DIR("/usr/lib64");
+SEARCH_DIR("/usr/local/lib");
+SEARCH_DIR("/lib");
+SEARCH_DIR("/usr/lib");
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000)); . = SEGMENT_START("text-segment", 0x20000000) + SIZEOF_HEADERS;
+  .interp         : { *(.interp) }
+  .note.gnu.build-id  : { *(.note.gnu.build-id) }
+  .hash           : { *(.hash) }
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+  .gnu.version    : { *(.gnu.version) }
+  .gnu.version_d  : { *(.gnu.version_d) }
+  .gnu.version_r  : { *(.gnu.version_r) }
+  .rela.dyn       :
+    {
+      *(.rela.init)
+      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+      *(.rela.fini)
+      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+      *(.rela.ctors)
+      *(.rela.dtors)
+      *(.rela.got)
+      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+      *(.rela.ldata .rela.ldata.* .rela.gnu.linkonce.l.*)
+      *(.rela.lbss .rela.lbss.* .rela.gnu.linkonce.lb.*)
+      *(.rela.lrodata .rela.lrodata.* .rela.gnu.linkonce.lr.*)
+      *(.rela.ifunc)
+    }
+  .rela.plt       :
+    {
+      *(.rela.plt)
+      PROVIDE_HIDDEN (__rela_iplt_start = .);
+      *(.rela.iplt)
+      PROVIDE_HIDDEN (__rela_iplt_end = .);
+    }
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  .init           :
+  {
+    KEEP (*(SORT_NONE(.init)))
+  }
+  .plt            : { *(.plt) *(.iplt) }
+.plt.got        : { *(.plt.got) }
+.plt.sec        : { *(.plt.sec) }
+  .text           :
+  {
+    *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+    *(.text.exit .text.exit.*)
+    *(.text.startup .text.startup.*)
+    *(.text.hot .text.hot.*)
+    *(.text .stub .text.* .gnu.linkonce.t.*)
+    /* .gnu.warning sections are handled specially by elf.em.  */
+    *(.gnu.warning)
+  }
+  .fini           :
+  {
+    KEEP (*(SORT_NONE(.fini)))
+  }
+  PROVIDE (__etext = .);
+  PROVIDE (_etext = .);
+  PROVIDE (etext = .);
+  . = ALIGN(CONSTANT (MAXPAGESIZE));
+  /* Adjust the address for the rodata segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = SEGMENT_START("rodata-segment", ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)));
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+  .rodata1        : { *(.rodata1) }
+  .eh_frame_hdr   : { *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) }
+  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
+  .gnu_extab   : ONLY_IF_RO { *(.gnu_extab*) }
+  /* These sections are generated by the Sun/Oracle C++ compiler.  */
+  .exception_ranges   : ONLY_IF_RO { *(.exception_ranges*) }
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
+  . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+  /* Exception handling  */
+  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) *(.eh_frame.*) }
+  .gnu_extab      : ONLY_IF_RW { *(.gnu_extab) }
+  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
+  .exception_ranges   : ONLY_IF_RW { *(.exception_ranges*) }
+  /* Thread Local Storage sections  */
+  /* .tdata          : ALIGN(4K)
+   {
+     PROVIDE_HIDDEN (__tdata_start = .);
+     *(.tdata .tdata.* .gnu.linkonce.td.*)
+   }
+  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } */
+  .preinit_array    :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  }
+  /* .init_array    :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } */
+  .fini_array    :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+    KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  }
+  .ctors          :
+  {
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+  }
+  .dtors          :
+  {
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+  }
+  .jcr            : { KEEP (*(.jcr)) }
+  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }
+  .dynamic        : { *(.dynamic) }
+  .got            : { *(.got) *(.igot) }
+  . = DATA_SEGMENT_RELRO_END (SIZEOF (.got.plt) >= 24 ? 24 : 0, .);
+  .got.plt        : { *(.got.plt) *(.igot.plt) }
+  .data           :
+  {
+    *(.data .data.* .gnu.linkonce.d.*)
+    SORT(CONSTRUCTORS)
+  }
+  .data1          : { *(.data1) }
+  _edata = .; PROVIDE (edata = .);
+  . = .;
+  __bss_start = .;
+  .bss            :
+  {
+   *(.dynbss)
+   *(.bss .bss.* .gnu.linkonce.b.*)
+   *(COMMON)
+   /* Align here to ensure that the .bss section occupies space up to
+      _end.  Align after .bss to ensure correct alignment even if the
+      .bss section disappears because there are no input sections.
+      FIXME: Why do we need it? When there is no .bss section, we do not
+      pad the .data section.  */
+   . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  .lbss   :
+  {
+    *(.dynlbss)
+    *(.lbss .lbss.* .gnu.linkonce.lb.*)
+    *(LARGE_COMMON)
+  }
+  . = ALIGN(64 / 8);
+  . = SEGMENT_START("ldata-segment", .);
+  .lrodata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.lrodata .lrodata.* .gnu.linkonce.lr.*)
+  }
+  .ldata   ALIGN(CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 1)) :
+  {
+    *(.ldata .ldata.* .gnu.linkonce.l.*)
+    . = ALIGN(. != 0 ? 64 / 8 : 1);
+  }
+  . = ALIGN(64 / 8);
+  _end = .; PROVIDE (end = .);
+  . = DATA_SEGMENT_END (.);
+  /* Stabs debugging sections.  */
+  .stab          0 : { *(.stab) }
+  .stabstr       0 : { *(.stabstr) }
+  .stab.excl     0 : { *(.stab.excl) }
+  .stab.exclstr  0 : { *(.stab.exclstr) }
+  .stab.index    0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment       0 : { *(.comment) }
+  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
+  /* DWARF debug sections.
+     Symbols in the DWARF debugging sections are relative to the beginning
+     of the section so we begin them at 0.  */
+  /* DWARF 1 */
+  .debug          0 : { *(.debug) }
+  .line           0 : { *(.line) }
+  /* GNU DWARF 1 extensions */
+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line .debug_line.* .debug_line_end) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+  /* DWARF 3 */
+  .debug_pubtypes 0 : { *(.debug_pubtypes) }
+  .debug_ranges   0 : { *(.debug_ranges) }
+  /* DWARF Extension.  */
+  .debug_macro    0 : { *(.debug_macro) }
+  .debug_addr     0 : { *(.debug_addr) }
+  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
+  /DISCARD/ : { 
+    *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) 
+    /*
+     * XXX: As of now, ld.so links with relibc which has the main functionality. In the next refactor,
+     * ld.so will be moved out of relibc. So, till that time, we have to discard any sections
+     * that may reference use thread local storage.
+     *
+     * .init_array also depends on TLS and is discarded as we don't need it.
+     */
+    *(.gnu.linkonce.tb.*) *(.tcommon)
+    *(.init_array)
+  }
+}
diff --git a/recipes/core/relibc/ld_so/src/lib.rs b/recipes/core/relibc/ld_so/src/lib.rs
new file mode 100644
index 0000000000..e68f260ef6
--- /dev/null
+++ b/recipes/core/relibc/ld_so/src/lib.rs
@@ -0,0 +1,136 @@
+#![no_std]
+#![feature(linkage)]
+#![deny(unsafe_op_in_unsafe_fn)]
+
+use core::arch::global_asm;
+
+#[cfg(target_arch = "aarch64")]
+global_asm!(
+    "
+.weak _DYNAMIC
+.hidden _DYNAMIC
+
+.global _start
+_start:
+    mov x28, sp
+    // align stack to 16 bytes
+    and sp, x28, #0xfffffffffffffff0
+    adr x1, _start
+    mov x0, x28
+    adrp x2, _DYNAMIC
+    add x2, x2, #:lo12:_DYNAMIC
+    // ld_so_start(stack=x0, ld_entry=x1, dynamic=x2)
+    bl relibc_ld_so_start
+    // restore original stack, clear registers, and jump to the new start function
+    mov sp, x28
+    mov x1, xzr
+    mov x2, xzr
+    mov x3, xzr
+    mov x4, xzr
+    mov x5, xzr
+    mov x6, xzr
+    mov x7, xzr
+    mov x8, xzr
+    mov x9, xzr
+    mov x10, xzr
+    mov x11, xzr
+    mov x12, xzr
+    mov x13, xzr
+    mov x14, xzr
+    mov x15, xzr
+    mov x16, xzr
+    mov x17, xzr
+    mov x18, xzr
+    mov x19, xzr
+    mov x20, xzr
+    mov x21, xzr
+    mov x22, xzr
+    mov x23, xzr
+    mov x24, xzr
+    mov x25, xzr
+    mov x26, xzr
+    mov x27, xzr
+    mov x28, xzr
+    mov x29, xzr
+    mov x30, xzr
+    br x0
+    udf #0
+"
+);
+
+#[cfg(target_arch = "x86")]
+global_asm!(
+    "
+.globl _start
+_start:
+    push esp
+    call relibc_ld_so_start
+    pop esp
+    # TODO: x86
+    ud2
+"
+);
+
+#[cfg(target_arch = "x86_64")]
+global_asm!(
+    "
+.weak _DYNAMIC
+.hidden _DYNAMIC
+
+.globl _start
+_start:
+    lea rsi, [rip + _start]
+
+    # Save original stack and align stack to 16 bytes
+    mov rbp, rsp
+    and rsp, 0xfffffffffffffff0
+
+    # Call ld_so_start(stack=rdi, ld_entry=rsi, dynamic=rdx)
+    mov rdi, rbp
+    lea rdx, [rip + _DYNAMIC]
+    call relibc_ld_so_start
+
+    # Restore original stack, clear registers, and jump to new start function
+    mov rsp, rbp
+    xor rcx, rcx
+    xor rdx, rdx
+    xor rdi, rdi
+    xor rsi, rsi
+    xor r8, r8
+    xor r9, r9
+    xor r10, r10
+    xor r11, r11
+    fninit
+    jmp rax
+    ud2
+"
+);
+
+#[cfg(target_arch = "riscv64")]
+global_asm!(
+    "
+.globl _start
+_start:
+    mv a0, sp
+    jal relibc_ld_so_start
+    unimp
+"
+);
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn main(_argc: isize, _argv: *const *const i8) -> usize {
+    // LD
+    0x1D
+}
+
+#[linkage = "weak"]
+#[unsafe(no_mangle)]
+extern "C" fn relibc_panic(_pi: &::core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[panic_handler]
+#[linkage = "weak"]
+pub unsafe fn rust_begin_unwind(pi: &::core::panic::PanicInfo) -> ! {
+    relibc_panic(pi)
+}
diff --git a/recipes/core/relibc/recipe.toml b/recipes/core/relibc/recipe.toml
index cd37754eda..c41a946840 100644
--- a/recipes/core/relibc/recipe.toml
+++ b/recipes/core/relibc/recipe.toml
@@ -24,15 +24,16 @@ patches = [
     # timerfd: fix cbindgen.toml to generate C (not C++) headers
     "P3-timerfd-cbindgen-fix.patch",
 
-    # sys_types_internal: include stdint.h so uint32_t/int32_t are available to
-    # all downstream headers (signal.h, sys_signalfd.h, etc.) via the
-    # signal.h -> sys/types.h -> sys/types/internal.h include chain
-    "P3-sys-types-stdint-include.patch",
+    # REMOVED: P3-sys-types-stdint-include.patch — upstream already has
+    # sys_includes = ["stddef.h"] (no stdint.h). Adding stdint.h here creates
+    # a circular include chain with gnulib:
+    #   gnulib stdint.h → inttypes.h → wchar.h → stdio.h → sys/types.h →
+    #   sys/types/internal.h → stdint.h → cycle
+    # Headers needing stdint.h include it directly (signal.h, signalfd.h, eventfd.h).
 
-    # open_memstream: creates stdio/open_memstream.rs
-    "P3-open-memstream-create.patch",
-    # open_memstream: wires mod into stdio/mod.rs
-    "P3-stdio-open-memstream-mod.patch",
+    # open_memstream: temporarily disabled — module file and wiring need recreation
+    # "P3-open-memstream-create.patch",
+    # "P3-stdio-open-memstream-mod.patch",
     # F_DUPFD_CLOEXEC fallback (try CLOEXEC, fall back to DUPFD + SETFD)
     "P3-fcntl-dupfd-cloexec.patch",
     # Non-conflicting individual patches
@@ -67,6 +68,10 @@ patches = [
     "P3-signal-stdint-include.patch",
     # spawn.h implementation (new header module)
     "P3-spawn.patch",
+    # spawn: wire pub mod spawn into header/mod.rs
+    "P3-spawn-module-wire.patch",
+    # spawn: posix_spawnattr_setflags, posix_spawnattr_setsigmask + getters
+    "P3-spawn-setflags-setsigmask.patch",
     # C11 threads.h compatibility header
     "P3-threads.patch",
     # stdio_ext: __freadahead, __fpending, __fseterr helpers
@@ -87,6 +92,16 @@ patches = [
     # Remove relibc's DRM ioctl handler — libdrm's redox_drm_simple_ioctl()
     # handles all DRM ioctls with its own scheme:drm wire format.
     "P5-remove-drm-ioctl-intercept.patch",
+
+    # Break gnulib circular include chain: inttypes.h → wchar.h conditional guard
+    "P3-inttypes-wchar-guard.patch",
+    # Break gnulib circular include chain: wchar.h forward-declare FILE/tm instead
+    # of including stdio.h/time.h
+    "P3-wchar-forward-decls.patch",
+    # stdlib: getloadavg() — returns -1 (load average not available on Redox)
+    "P3-getloadavg.patch",
+    # pselect(): proper implementation using epoll_pwait for atomic signal mask
+    "P4-pselect-implementation.patch",
 ]
 
 [build]
diff --git a/recipes/core/relibc/redox-ioctl/Cargo.toml b/recipes/core/relibc/redox-ioctl/Cargo.toml
new file mode 100644
index 0000000000..2acdaa8e7e
--- /dev/null
+++ b/recipes/core/relibc/redox-ioctl/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "redox-ioctl"
+authors = ["bjorn3 <bjorn3_gh@protonmail.com>"]
+version = "0.1.0"
+edition = "2024"
+license = "MIT"
+description = "Ioctl definitions and (de)serialization for Redox"
+
+[dependencies]
+drm-sys = "0.8.0"
+redox_syscall = "0.7"
+
+[features]
diff --git a/recipes/core/relibc/redox-ioctl/src/drm.rs b/recipes/core/relibc/redox-ioctl/src/drm.rs
new file mode 100644
index 0000000000..062407b103
--- /dev/null
+++ b/recipes/core/relibc/redox-ioctl/src/drm.rs
@@ -0,0 +1,319 @@
+use alloc::vec::Vec;
+use core::{
+    cmp,
+    ffi::{c_char, c_int, c_uint},
+    iter, mem, slice,
+};
+use drm_sys::drm_clip_rect;
+
+pub use drm_sys::{
+    __kernel_size_t, DRM_PROP_NAME_LEN, drm_get_cap, drm_mode_card_res,
+    drm_mode_connector_set_property, drm_mode_create_dumb, drm_mode_crtc,
+    drm_mode_crtc_page_flip_target, drm_mode_cursor, drm_mode_cursor2, drm_mode_destroy_dumb,
+    drm_mode_fb_cmd, drm_mode_fb_cmd2, drm_mode_fb_dirty_cmd, drm_mode_get_blob,
+    drm_mode_get_connector, drm_mode_get_encoder, drm_mode_get_plane, drm_mode_get_plane_res,
+    drm_mode_get_property, drm_mode_map_dumb, drm_mode_modeinfo, drm_mode_obj_get_properties,
+    drm_mode_property_enum, drm_mode_set_plane, drm_set_client_cap, drm_version,
+};
+
+pub const VERSION: u64 = 0;
+define_ioctl_data! {
+    struct drm_version, DrmVersion {
+        version_major: c_int,
+        version_minor: c_int,
+        version_patchlevel: c_int,
+        name_len: __kernel_size_t,
+        name: *mut c_char [array<c_char, name_len>],
+        date_len: __kernel_size_t,
+        date: *mut c_char [array<c_char, date_len>],
+        desc_len: __kernel_size_t,
+        desc: *mut c_char [array<c_char, desc_len>],
+    }
+}
+
+pub const GET_CAP: u64 = 0x0C;
+pub use drm_sys::DRM_CAP_DUMB_BUFFER;
+define_ioctl_data! {
+    struct drm_get_cap, DrmGetCap {
+        capability: u64,
+        value: u64,
+    }
+}
+
+pub const SET_CLIENT_CAP: u64 = 0x0D;
+pub use drm_sys::DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT;
+define_ioctl_data! {
+    struct drm_set_client_cap, DrmSetClientCap {
+        capability: u64,
+        value: u64,
+    }
+}
+
+pub const MODE_CARD_RES: u64 = 0xA0;
+define_ioctl_data! {
+    struct drm_mode_card_res, DrmModeCardRes {
+        fb_id_ptr: u64 [array<u32, count_fbs>],
+        crtc_id_ptr: u64 [array<u32, count_crtcs>],
+        connector_id_ptr: u64 [array<u32, count_connectors>],
+        encoder_id_ptr: u64 [array<u32, count_encoders>],
+        count_fbs: u32,
+        count_crtcs: u32,
+        count_connectors: u32,
+        count_encoders: u32,
+        min_width: u32,
+        max_width: u32,
+        min_height: u32,
+        max_height: u32,
+    }
+}
+
+pub const MODE_GET_CRTC: u64 = 0xA1;
+pub const MODE_SET_CRTC: u64 = 0xA2;
+define_ioctl_data! {
+    struct drm_mode_crtc, DrmModeCrtc {
+        set_connectors_ptr: u64 [array<u32, count_connectors>],
+        count_connectors: u32,
+        crtc_id: u32,
+        fb_id: u32,
+        x: u32,
+        y: u32,
+        gamma_size: u32,
+        mode_valid: u32,
+        mode: drm_mode_modeinfo,
+    }
+}
+
+pub const MODE_CURSOR: u64 = 0xA3;
+define_ioctl_data! {
+    struct drm_mode_cursor, DrmModeCursor {
+        flags: u32,
+        crtc_id: u32,
+        x: i32,
+        y:i32,
+        width:u32,
+        height:u32,
+        handle:u32,
+    }
+}
+
+pub const MODE_GET_ENCODER: u64 = 0xA6;
+define_ioctl_data! {
+    struct drm_mode_get_encoder, DrmModeGetEncoder {
+        encoder_id: u32,
+        encoder_type: u32,
+        crtc_id: u32,
+        possible_crtcs: u32,
+        possible_clones: u32,
+    }
+}
+
+pub const MODE_GET_CONNECTOR: u64 = 0xA7;
+define_ioctl_data! {
+    struct drm_mode_get_connector, DrmModeGetConnector {
+        encoders_ptr: u64 [array<u32, count_encoders>],
+        modes_ptr: u64 [array<drm_mode_modeinfo, count_modes>],
+        props_ptr: u64 [array<u32, count_props>],
+        prop_values_ptr: u64 [array<u64, count_props>],
+        count_modes: u32,
+        count_props: u32,
+        count_encoders: u32,
+        encoder_id: u32,
+        connector_id: u32,
+        connector_type: u32,
+        connector_type_id: u32,
+        connection: u32,
+        mm_width: u32,
+        mm_height: u32,
+        subpixel: u32,
+        pad: u32,
+    }
+}
+
+pub const MODE_GET_PROPERTY: u64 = 0xAA;
+define_ioctl_data! {
+    struct drm_mode_get_property, DrmModeGetProperty {
+        values_ptr: u64 [array<u64, count_values>],
+        enum_blob_ptr: u64 [array<drm_mode_property_enum, count_enum_blobs>],
+        prop_id: u32,
+        flags: u32,
+        name: [c_char; DRM_PROP_NAME_LEN as usize],
+        count_values: u32,
+        count_enum_blobs: u32,
+    }
+}
+
+pub const MODE_SET_PROPERTY: u64 = 0xAB;
+define_ioctl_data! {
+    struct drm_mode_connector_set_property, DrmModeConnectorSetProperty {
+        value: u64,
+        prop_id: u32,
+        connector_id: u32,
+    }
+}
+
+pub const MODE_GET_PROP_BLOB: u64 = 0xAC;
+define_ioctl_data! {
+    struct drm_mode_get_blob, DrmModeGetBlob {
+        blob_id: u32,
+        length: u32,
+        data: u64 [array<u8, length>],
+    }
+}
+
+pub const MODE_GET_FB: u64 = 0xAD;
+pub const MODE_ADD_FB: u64 = 0xAE;
+define_ioctl_data! {
+    struct drm_mode_fb_cmd, DrmModeFbCmd {
+        fb_id: u32,
+        width: u32,
+        height: u32,
+        pitch: u32,
+        bpp: u32,
+        depth: u32,
+        handle: u32,
+    }
+}
+
+pub const MODE_RM_FB: u64 = 0xAF;
+define_ioctl_data! {
+    struct standin_for_uint, StandinForUint {
+        inner: c_uint,
+    }
+}
+
+#[repr(transparent)]
+#[allow(non_camel_case_types)]
+pub struct standin_for_uint {
+    pub inner: c_uint,
+}
+
+pub const MODE_PAGE_FLIP: u64 = 0xB0;
+define_ioctl_data! {
+    struct drm_mode_crtc_page_flip_target, DrmModeCrtcPageFlipTarget {
+        crtc_id: u32,
+        fb_id: u32,
+        flags: u32,
+        sequence: u32,
+        user_data: u64,
+    }
+}
+
+pub const MODE_DIRTYFB: u64 = 0xB1;
+define_ioctl_data! {
+    struct drm_mode_fb_dirty_cmd, DrmModeFbDirtyCmd {
+        fb_id: u32,
+        flags: u32,
+        color: u32,
+        num_clips: u32,
+        clips_ptr: u64 [array<drm_clip_rect, num_clips>],
+    }
+}
+
+pub const MODE_CREATE_DUMB: u64 = 0xB2;
+define_ioctl_data! {
+    struct drm_mode_create_dumb, DrmModeCreateDumb {
+        height: u32,
+        width: u32,
+        bpp: u32,
+        flags: u32,
+        handle: u32,
+        pitch: u32,
+        size: u64,
+    }
+}
+
+pub const MODE_MAP_DUMB: u64 = 0xB3;
+define_ioctl_data! {
+    struct drm_mode_map_dumb, DrmModeMapDumb {
+        handle: u32,
+        pad: u32,
+        offset: u64,
+    }
+}
+
+pub const MODE_DESTROY_DUMB: u64 = 0xB4;
+define_ioctl_data! {
+    struct drm_mode_destroy_dumb, DrmModeDestroyDumb {
+        handle: u32,
+    }
+}
+
+pub const MODE_GET_PLANE_RES: u64 = 0xB5;
+define_ioctl_data! {
+    struct drm_mode_get_plane_res, DrmModeGetPlaneRes {
+        plane_id_ptr: u64 [array<u32, count_planes>],
+        count_planes: u32,
+    }
+}
+
+pub const MODE_GET_PLANE: u64 = 0xB6;
+define_ioctl_data! {
+    struct drm_mode_get_plane, DrmModeGetPlane {
+        plane_id: u32,
+        crtc_id: u32,
+        fb_id: u32,
+        possible_crtcs: u32,
+        gamma_size: u32,
+        count_format_types: u32,
+        format_type_ptr: u64 [array<u32, count_format_types>],
+    }
+}
+
+pub const MODE_SET_PLANE: u64 = 0xB7;
+define_ioctl_data! {
+    struct drm_mode_set_plane, DrmModeSetPlane {
+        plane_id: u32,
+        crtc_id: u32,
+        fb_id: u32,
+        flags: u32,
+        crtc_x: i32,
+        crtc_y: i32,
+        crtc_w: u32,
+        crtc_h: u32,
+        src_x: u32,
+        src_y: u32,
+        src_h: u32,
+        src_w: u32,
+    }
+}
+
+pub const MODE_OBJ_GET_PROPERTIES: u64 = 0xB9;
+define_ioctl_data! {
+    struct drm_mode_obj_get_properties, DrmModeObjGetProperties {
+        props_ptr: u64 [array<u32, count_props>],
+        prop_values_ptr: u64 [array<u64, count_props>],
+        count_props: u32,
+        obj_id: u32,
+        obj_type: u32,
+    }
+}
+
+pub const MODE_CURSOR2: u64 = 0xBB;
+define_ioctl_data! {
+    struct drm_mode_cursor2, DrmModeCursor2 {
+        flags: u32,
+        crtc_id: u32,
+        x: i32,
+        y: i32,
+        width: u32,
+        height: u32,
+        handle: u32,
+        hot_x: i32,
+        hot_y: i32,
+    }
+}
+
+pub const MODE_GET_FB2: u64 = 0xCE;
+define_ioctl_data! {
+    struct drm_mode_fb_cmd2, DrmModeFbCmd2 {
+        fb_id: u32,
+        width: u32,
+        height: u32,
+        pixel_format: u32,
+        flags: u32,
+        handles: [u32; 4],
+        pitches: [u32; 4],
+        offsets: [u32; 4],
+        modifier: [u64; 4],
+    }
+}
diff --git a/recipes/core/relibc/redox-ioctl/src/ioctl_data.rs b/recipes/core/relibc/redox-ioctl/src/ioctl_data.rs
new file mode 100644
index 0000000000..f9673f6d7d
--- /dev/null
+++ b/recipes/core/relibc/redox-ioctl/src/ioctl_data.rs
@@ -0,0 +1,169 @@
+use alloc::vec::Vec;
+
+pub trait IoctlData {
+    unsafe fn write(&self) -> Vec<u8>;
+    unsafe fn read_from(&mut self, buf: &[u8]);
+}
+
+macro_rules! define_ioctl_data {
+    (struct $ioctl_ty:ident, $mem_ty:ident {
+        $($rest:tt)*
+    }) => {
+        define_ioctl_data!(
+            struct $ioctl_ty, $mem_ty { $($rest)* } => (), (), ()
+        );
+    };
+    (struct $ioctl_ty:ident, $mem_ty:ident {
+        $field:ident: $ty:ty,
+        $($rest:tt)*
+    } =>
+        ($($ioctl_fields:tt)*),
+        ($($counted_fields:tt)*),
+        ($($noncounted_fields:tt)*)
+    ) => {
+        define_ioctl_data!(
+            struct $ioctl_ty, $mem_ty { $($rest)* } =>
+                ($($ioctl_fields)* $field: $ty,),
+                ($($counted_fields)*),
+                ($($noncounted_fields)* $field: $ty,)
+        );
+    };
+    (struct $ioctl_ty:ident, $mem_ty:ident {
+        $field:ident: $ty:ty [array<$el:ty, $counted_by:ident>],
+        $($rest:tt)*
+    } =>
+        ($($ioctl_fields:tt)*),
+        ($($counted_fields:tt)*),
+        ($($noncounted_fields:tt)*)
+    ) => {
+        define_ioctl_data!(
+            struct $ioctl_ty, $mem_ty { $($rest)* } =>
+                ($($ioctl_fields)* $field: $ty,),
+                ($($counted_fields)* $field: $ty [array<$el, $counted_by>],),
+                ($($noncounted_fields)*)
+        );
+    };
+    (struct $ioctl_ty:ident, $mem_ty:ident {} =>
+        ($($ioctl_field:ident: $ioctl_field_ty:ty,)*),
+        ($($counted_field:ident: $counted_ty:ty [array<$el:ty, $counted_by:ident>],)*),
+        ($($noncounted_field:ident: $noncounted_ty:ty,)*)
+    ) => {
+        // FIXME check ioctl_ty doesn't have padding
+        const _: $ioctl_ty = $ioctl_ty {
+            $($ioctl_field: unsafe { mem::zeroed::<$ioctl_field_ty>() },)*
+        };
+
+        #[repr(C)]
+        pub struct ${concat(__, $mem_ty, Noncounted)} {
+            $($noncounted_field: $noncounted_ty,)*
+        }
+
+        pub struct $mem_ty<'a> {
+            noncounted_fields: &'a mut ${concat(__, $mem_ty, Noncounted)},
+            $($counted_field: &'a mut [$el],)*
+        }
+
+        impl $crate::ioctl_data::IoctlData for $ioctl_ty {
+            unsafe fn write(&self) -> Vec<u8> {
+                let noncounted_fields = ${concat(__, $mem_ty, Noncounted)} {
+                    $($noncounted_field: self.$noncounted_field,)*
+                };
+                // FIXME use Vec::with_capacity
+                let mut data = Vec::<u8>::new();
+                data.extend_from_slice(&unsafe {
+                    mem::transmute::<
+                        ${concat(__, $mem_ty, Noncounted)},
+                        [u8; size_of::<${concat(__, $mem_ty, Noncounted)}>()],
+                    >(noncounted_fields)
+                });
+                $(
+                    let size = self.$counted_by as usize * size_of::<$el>();
+                    if self.$counted_field as usize != 0 {
+                        let $counted_field = unsafe {
+                            slice::from_raw_parts(self.$counted_field as *const u8, size)
+                        };
+                        data.extend_from_slice(&$counted_field);
+                    } else {
+                        data.extend(iter::repeat(0u8).take(size));
+                    };
+
+                )*
+                data
+            }
+
+            unsafe fn read_from(&mut self, mut buf: &[u8]) {
+                // FIXME be robust against malicious scheme implementations by returning an error
+                // when the buf is the wrong size
+                let noncounted_fields = buf.split_off(..size_of::<${concat(__, $mem_ty, Noncounted)}>()).unwrap();
+
+                $(
+                    let size = self.$counted_by as usize * size_of::<$el>();
+                    let $counted_field = buf.split_off(..size).unwrap();
+                    if self.$counted_field as usize != 0 {
+                        unsafe {
+                            slice::from_raw_parts_mut(self.$counted_field as *mut u8, size).copy_from_slice($counted_field);
+                        }
+                    }
+                )*
+
+                assert!(buf.is_empty());
+
+                let noncounted_fields = unsafe { &*(noncounted_fields as *const _ as *const ${concat(__, $mem_ty, Noncounted)}) };
+                $(self.$noncounted_field = noncounted_fields.$noncounted_field;)*
+            }
+        }
+
+        impl<'a> $mem_ty<'a> {
+            pub fn with(
+                mut buf: &'a mut [u8],
+                f: impl FnOnce($mem_ty<'a>) -> syscall::Result<usize>,
+            ) -> syscall::Result<usize> {
+                let noncounted_fields = buf.split_off_mut(..size_of::<${concat(__, $mem_ty, Noncounted)}>())
+                    .ok_or(syscall::Error::new(syscall::EINVAL))?;
+                let noncounted_fields = unsafe { &mut *(noncounted_fields as *mut _ as *mut ${concat(__, $mem_ty, Noncounted)}) };
+
+                $(
+                    let $counted_field = buf.split_off_mut(..noncounted_fields.$counted_by as usize * size_of::<$el>())
+                        .ok_or(syscall::Error::new(syscall::EINVAL))?;
+                    let $counted_field = unsafe {
+                        slice::from_raw_parts_mut($counted_field as *mut _ as *mut $el, noncounted_fields.$counted_by as usize)
+                    };
+                )*
+
+                if !buf.is_empty() {
+                    return Err(syscall::Error::new(syscall::EINVAL));
+                }
+
+
+
+                Ok( f($mem_ty {
+                    noncounted_fields,
+                    $($counted_field,)*
+                })?)
+            }
+
+            $(
+                pub fn $noncounted_field(&self) -> $noncounted_ty {
+                    self.noncounted_fields.$noncounted_field
+                }
+
+                /// Should not be called for fields used as array length
+                pub fn ${concat(set_, $noncounted_field)}(&mut self, data: $noncounted_ty) {
+                    self.noncounted_fields.$noncounted_field = data;
+                }
+            )*
+
+            $(
+                pub fn $counted_field(&self) -> &[$el] {
+                    self.$counted_field
+                }
+
+                pub fn ${concat(set_, $counted_field)}(&mut self, data: &[$el]) {
+                    let copied_count = cmp::min(data.len(), self.$counted_field.len());
+                    self.$counted_field[..copied_count].copy_from_slice(&data[..copied_count]);
+                    self.noncounted_fields.$counted_by = data.len() as _;
+                }
+            )*
+        }
+    };
+}
diff --git a/recipes/core/relibc/redox-ioctl/src/lib.rs b/recipes/core/relibc/redox-ioctl/src/lib.rs
new file mode 100644
index 0000000000..0746aba78a
--- /dev/null
+++ b/recipes/core/relibc/redox-ioctl/src/lib.rs
@@ -0,0 +1,11 @@
+#![feature(macro_metavar_expr_concat)]
+#![deny(unsafe_op_in_unsafe_fn)]
+#![no_std]
+
+extern crate alloc;
+
+#[macro_use]
+mod ioctl_data;
+pub use ioctl_data::IoctlData;
+
+pub mod drm;
diff --git a/recipes/core/relibc/redox-rt/Cargo.toml b/recipes/core/relibc/redox-rt/Cargo.toml
new file mode 100644
index 0000000000..773af3bbef
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "redox-rt"
+authors = ["4lDO2 <4lDO2@protonmail.com>"]
+version = "0.1.0"
+edition = "2024"
+license = "MIT"
+description = "Libc-independent runtime for Redox"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bitflags.workspace = true
+goblin = { version = "0.10", default-features = false, features = ["elf32", "elf64", "endian_fd"] }
+plain.workspace = true
+ioslice.workspace = true
+redox_syscall.workspace = true
+redox-path.workspace = true
+redox_protocols.workspace = true
+
+generic-rt = { path = "../generic-rt" }
+
+[features]
+proc = []
+default = ["proc"]
+
+[lints]
+workspace = true
diff --git a/recipes/core/relibc/redox-rt/src/arch/aarch64.rs b/recipes/core/relibc/redox-rt/src/arch/aarch64.rs
new file mode 100644
index 0000000000..0724c9bb5b
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/arch/aarch64.rs
@@ -0,0 +1,485 @@
+use core::{cell::SyncUnsafeCell, mem::offset_of, ptr::NonNull};
+
+use syscall::{data::*, error::*};
+
+use crate::{
+    Tcb,
+    proc::{FdGuard, FdGuardUpper, ForkArgs, fork_inner},
+    signal::{PosixStackt, RtSigarea, SigStack, inner_c},
+};
+use redox_protocols::protocol::{ProcCall, RtSigInfo};
+
+use super::ForkScratchpad;
+
+// Setup a stack starting from the very end of the address space, and then growing downwards.
+pub const STACK_TOP: usize = 1 << 47;
+pub const STACK_SIZE: usize = 1024 * 1024;
+
+#[derive(Debug, Default)]
+#[repr(C)]
+pub struct SigArea {
+    pub altstack_top: usize,
+    pub altstack_bottom: usize,
+    pub tmp_x1_x2: [usize; 2],
+    pub tmp_x3_x4: [usize; 2],
+    pub tmp_x5_x6: [usize; 2],
+    pub tmp_x7_x8: [usize; 2],
+    pub tmp_sp: usize,
+    pub onstack: u64,
+    pub disable_signals_depth: u64,
+    pub pctl: usize, // TODO: remove
+    pub last_sig_was_restart: bool,
+    pub last_sigstack: Option<NonNull<SigStack>>,
+    pub tmp_rt_inf: RtSigInfo,
+    pub tmp_id_inf: u64,
+}
+#[repr(C)]
+#[derive(Debug, Default)]
+pub struct ArchIntRegs {
+    pub x30: usize,
+    pub x29: usize,
+    pub x28: usize,
+    pub x27: usize,
+    pub x26: usize,
+    pub x25: usize,
+    pub x24: usize,
+    pub x23: usize,
+    pub x22: usize,
+    pub x21: usize,
+    pub x20: usize,
+    pub x19: usize,
+    pub x18: usize,
+    pub x17: usize,
+    pub x16: usize,
+    pub x15: usize,
+    pub x14: usize,
+    pub x13: usize,
+    pub x12: usize,
+    pub x11: usize,
+    pub x10: usize,
+    pub x9: usize,
+    pub x8: usize,
+    pub x7: usize,
+    pub x6: usize,
+    pub x5: usize,
+    pub x4: usize,
+    pub x3: usize,
+    pub x2: usize,
+    pub x1: usize,
+
+    pub sp: usize,
+    pub nzcv: usize, // user-accessible PSTATE bits
+
+    pub pc: usize,
+    pub x0: usize,
+}
+
+/// Deactive TLS, used before exec() on Redox to not trick target executable into thinking TLS
+/// is already initialized as if it was a thread.
+pub unsafe fn deactivate_tcb(open_via_dup: &FdGuardUpper) -> Result<()> {
+    let mut env = syscall::EnvRegisters::default();
+
+    let file = open_via_dup.dup(b"regs/env")?;
+
+    env.tpidr_el0 = 0;
+
+    file.write(&mut env)?;
+    Ok(())
+}
+
+unsafe extern "C" fn fork_impl(args: &ForkArgs, initial_rsp: *mut usize) -> usize {
+    Error::mux(fork_inner(initial_rsp, args))
+}
+
+unsafe extern "C" fn child_hook(scratchpad: &ForkScratchpad) {
+    //let _ = syscall::write(1, alloc::format!("CUR{cur_filetable_fd}PROC{new_proc_fd}THR{new_thr_fd}\n").as_bytes());
+    let _ = syscall::close(scratchpad.cur_filetable_fd);
+    unsafe {
+        crate::child_hook_common(crate::ChildHookCommonArgs {
+            new_thr_fd: FdGuard::new(scratchpad.new_thr_fd),
+            new_proc_fd: if scratchpad.new_proc_fd == usize::MAX {
+                None
+            } else {
+                Some(FdGuard::new(scratchpad.new_proc_fd))
+            },
+        })
+    };
+}
+
+asmfunction!(__relibc_internal_fork_wrapper (usize) -> usize: ["
+    stp     x29, x30, [sp, #-16]!
+    stp     x27, x28, [sp, #-16]!
+    stp     x25, x26, [sp, #-16]!
+    stp     x23, x24, [sp, #-16]!
+    stp     x21, x22, [sp, #-16]!
+    stp     x19, x20, [sp, #-16]!
+
+    //TODO: store floating point regs
+
+    // x0: &ForkArgs
+    mov x1, sp
+    bl {fork_impl}
+
+    ldp     x19, x20, [sp], #16
+    ldp     x21, x22, [sp], #16
+    ldp     x23, x24, [sp], #16
+    ldp     x25, x26, [sp], #16
+    ldp     x27, x28, [sp], #16
+    ldp     x29, x30, [sp], #16
+    ret
+"] <= [fork_impl = sym fork_impl]);
+
+asmfunction!(__relibc_internal_fork_ret: ["
+    # scratchpad is in x1, move to x0 for child_hook
+    mov x0, x1
+
+    bl {child_hook}
+
+    //TODO: load floating point regs
+
+    mov x0, xzr
+
+    ldp     x19, x20, [sp], #16
+    ldp     x21, x22, [sp], #16
+    ldp     x23, x24, [sp], #16
+    ldp     x25, x26, [sp], #16
+    ldp     x27, x28, [sp], #16
+    ldp     x29, x30, [sp], #16
+
+    ret
+"] <= [child_hook = sym child_hook]);
+
+// https://devblogs.microsoft.com/oldnewthing/20220811-00/?p=106963
+asmfunction!(__relibc_internal_sigentry: ["
+    // Clear any active reservation.
+    clrex
+
+    // The old pc and x0 are saved in the sigcontrol struct.
+    mrs x0, tpidr_el0 // ABI ptr
+    ldr x0, [x0] // TCB ptr
+
+    // Save x1-x6 and sp
+    stp x1, x2, [x0, #{tcb_sa_off} + {sa_tmp_x1_x2}]
+    stp x3, x4, [x0, #{tcb_sa_off} + {sa_tmp_x3_x4}]
+    stp x5, x6, [x0, #{tcb_sa_off} + {sa_tmp_x5_x6}]
+    stp x7, x8, [x0, #{tcb_sa_off} + {sa_tmp_x7_x8}]
+    mov x1, sp
+    str x1, [x0, #{tcb_sa_off} + {sa_tmp_sp}]
+
+    ldr x6, [x0, #{tcb_sa_off} + {sa_pctl}]
+1:
+    // Load x1 with the thread's bits
+    add x5, x0, #{tcb_sc_off} + {sc_word}
+    ldaxr x1, [x5]
+
+    // First check if there are standard thread signals,
+    and x4, x1, x1, lsr #32 // x4 := x1 & (x1 >> 32)
+    cbnz x4, 3f // jump if x4 != 0
+    clrex
+
+    // and if not, load process pending bitset.
+    add x5, x6, #{pctl_pending}
+    ldaxr x2, [x5]
+
+    // Check if there are standard proc signals:
+    lsr x3, x1, #32 // mask
+    and w3, w2, w3 // pending unblocked proc
+    cbz w3, 4f // skip 'fetch_andn' step if zero
+
+    // If there was one, find which one, and try clearing the bit (last value in x3, addr in x6)
+    // this picks the MSB rather than the LSB, unlike x86. POSIX does not require any specific
+    // ordering though.
+    clz w3, w3
+    mov w4, #31
+    sub w3, w4, w3
+    // x3 now contains the sig_idx
+
+    mov x4, #1
+    lsl x4, x4, x3 // bit to remove
+
+    sub x4, x2, x4 // bit was certainly set, so sub is allowed
+    // x4 is now the new mask to be set
+    add x5, x6, #{pctl_pending}
+
+    add x2, x5, #{pctl_sender_infos}
+    add x2, x2, w3, uxtb 3
+    ldar x2, [x2]
+
+    // Try clearing the bit, retrying on failure.
+    stxr w1, x4, [x5] // try setting pending set to x4, set w1 := 0 on success
+    cbnz w1, 1b // retry everything if this fails
+    mov x1, x3
+    b 2f
+4:
+    // Check for realtime signals, thread/proc.
+    clrex
+
+    // Load the pending set again. TODO: optimize this?
+    // Process pending - realtime
+    add x1, x6, #{pctl_pending}
+    ldaxr x2, [x1]
+    lsr x2, x2, #32
+
+    // Thread pending - realtime and allowset
+    add x5, x0, #{tcb_sc_off} + {sc_word} + 8
+    ldar x1, [x5]
+
+    orr x2, x1, x2 // combine proc and thread pending
+    and x2, x2, x2, lsr #32 // AND pending with allowset
+    cbz x2, 7f // spurious signal if realtime is clear
+
+    rbit x2, x2
+    clz x2, x2
+    // x2 now contains sig_idx - 32
+
+    // If realtime signal was directed at thread, handle it as an idempotent signal.
+    lsr x3, x1, x2 // x3 := x1 >> x2; x1 is thread pending
+    tbnz x3, #0, 5f // jump if bit is nonzero
+
+    // SYS_CALL(fd, payload_base, payload_len, metadata_len, metadata_base | (flags << 8))
+    // x8       x0  x1            x2           x3            x4
+
+    mov x5, x0 // save TCB pointer
+    mov x6, x2
+    ldr x8, ={SYS_CALL}
+    adrp x0, {proc_fd}
+    ldr x0, [x0, #:lo12:{proc_fd}]
+    add x1, x5, #{tcb_sa_off} + {sa_tmp_rt_inf}
+    str x6, [x1]
+    mov x2, #{RTINF_SIZE}
+    adrp x4, {proc_call}
+    add x4, x4, :lo12:{proc_call}
+    mov x3, #1
+    svc 0
+    mov x3, x0
+    mov x0, x5 // restore TCB pointer
+    mov x2, x6 // restore signal number - 32
+    add x1, x2, #32 // signal number
+    cbnz x3, 1b
+    b 2f
+5:
+    // A realtime signal was sent to this thread, try clearing its bit.
+    // x3 contains last rt signal word, x2 contains rt_idx
+    clrex
+
+    // Calculate the absolute sig_idx
+    add x1, x3, 32
+
+    // Load si_pid and si_uid
+    add x2, x0, #{tcb_sc_off} + {sc_sender_infos}
+    add x2, x2, w1, uxtb #3
+    ldar x2, [x2]
+
+    add x3, x0, #{tcb_sc_off} + {sc_word} + 8
+    ldxr x2, [x3]
+
+    // Calculate new mask
+    mov x4, #1
+    lsl x4, x4, x2
+    sub x2, x2, x4 // remove bit
+
+    stxr w5, x2, [x3]
+    cbnz w5, 1b
+    str x2, [x0, #{tcb_sa_off} + {sa_tmp_id_inf}]
+    b 2f
+3:
+    // A standard signal was sent to this thread, try clearing its bit.
+    clz w1, w1
+    mov x2, #31
+    sub x1, x2, x1
+
+    // Load si_pid and si_uid
+    add x2, x0, #{tcb_sc_off} + {sc_sender_infos}
+    add x2, x2, w1, uxtb #3
+    ldar x2, [x2]
+
+    // Clear bit from mask
+    mov x3, #1
+    lsl x3, x3, x1
+    sub x4, x4, x3
+
+    // Try updating the mask
+    stxr w3, x1, [x5]
+    cbnz w3, 1b
+
+    str x2, [x0, #{tcb_sa_off} + {sa_tmp_id_inf}]
+2:
+    ldr x3, [x0, #{tcb_sa_off} + {sa_pctl}]
+    add x3, x3, {pctl_actions}
+    add x2, x3, w1, uxtb #4 // actions_base + sig_idx * sizeof Action
+    // TODO: NOT ATOMIC (tearing allowed between regs)!
+    ldxp x2, x3, [x2]
+    clrex
+
+    // Calculate new sp wrt redzone and alignment
+    mov x4, sp
+    sub x4, x4, {REDZONE_SIZE}
+    and x4, x4, -{STACK_ALIGN}
+    mov sp, x4
+
+    // skip sigaltstack step if SA_ONSTACK is clear
+    // tbz x2, #{SA_ONSTACK_BIT}, 2f
+
+    ldr x2, [x0, #{tcb_sc_off} + {sc_saved_pc}]
+    ldr x3, [x0, #{tcb_sc_off} + {sc_saved_x0}]
+    stp x2, x3, [sp, #-16]!
+
+    ldr x2, [x0, #{tcb_sa_off} + {sa_tmp_sp}]
+    mrs x3, nzcv
+    stp x2, x3, [sp, #-16]!
+
+    ldp x2, x3, [x0, #{tcb_sa_off} + {sa_tmp_x1_x2}]
+    stp x2, x3, [sp, #-16]!
+    ldp x3, x4, [x0, #{tcb_sa_off} + {sa_tmp_x3_x4}]
+    stp x4, x3, [sp, #-16]!
+    ldp x5, x6, [x0, #{tcb_sa_off} + {sa_tmp_x5_x6}]
+    stp x6, x5, [sp, #-16]!
+    ldp x7, x8, [x0, #{tcb_sa_off} + {sa_tmp_x7_x8}]
+    stp x8, x7, [sp, #-16]!
+
+    stp x10, x9, [sp, #-16]!
+    stp x12, x11, [sp, #-16]!
+    stp x14, x13, [sp, #-16]!
+    stp x16, x15, [sp, #-16]!
+    stp x18, x17, [sp, #-16]!
+    stp x20, x19, [sp, #-16]!
+    stp x22, x21, [sp, #-16]!
+    stp x24, x23, [sp, #-16]!
+    stp x26, x25, [sp, #-16]!
+    stp x28, x27, [sp, #-16]!
+    stp x30, x29, [sp, #-16]!
+
+    str w1, [sp, #-4]
+    sub sp, sp, #64
+
+    mov x0, sp
+    bl {inner}
+
+    add sp, sp, #64
+
+    ldp x30, x29, [sp], #16
+    ldp x28, x27, [sp], #16
+    ldp x26, x25, [sp], #16
+    ldp x24, x23, [sp], #16
+    ldp x22, x21, [sp], #16
+    ldp x20, x19, [sp], #16
+    ldp x18, x17, [sp], #16
+    ldp x16, x15, [sp], #16
+    ldp x14, x13, [sp], #16
+    ldp x12, x11, [sp], #16
+    ldp x10, x9, [sp], #16
+    ldp x8, x7, [sp], #16
+    ldp x6, x5, [sp], #16
+    ldp x4, x3, [sp], #16
+    ldp x2, x1, [sp], #16
+
+    ldr x0, [sp, #8]
+    msr nzcv, x0
+
+8:
+    // x18 is reserved by ABI as 'platform register', so clobbering it should be safe.
+    mov x18, sp
+    ldr x0, [x18]
+    mov sp, x0
+
+    ldp x18, x0, [x18, #16]
+    br x18
+7:
+    // Spurious signal, i.e. all bitsets were 0 at the time they were checked
+    clrex
+
+    ldr x1, [x0, #{tcb_sc_off} + {sc_flags}]
+    and x1, x1, ~1
+    str x1, [x0, #{tcb_sc_off} + {sc_flags}]
+
+    ldp x1, x2, [x0, #{tcb_sa_off} + {sa_tmp_x1_x2}]
+    ldp x3, x4, [x0, #{tcb_sa_off} + {sa_tmp_x3_x4}]
+    ldp x5, x6, [x0, #{tcb_sa_off} + {sa_tmp_x5_x6}]
+    ldr x18, [x0, #{tcb_sc_off} + {sc_saved_pc}]
+    ldr x0, [x0, #{tcb_sc_off} + {sc_saved_x0}]
+    br x18
+"] <= [
+    pctl_pending = const (offset_of!(SigProcControl, pending)),
+    pctl_actions = const (offset_of!(SigProcControl, actions)),
+    pctl_sender_infos = const (offset_of!(SigProcControl, sender_infos)),
+    tcb_sc_off = const (offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, control)),
+    tcb_sa_off = const (offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, arch)),
+    sa_tmp_x1_x2 = const offset_of!(SigArea, tmp_x1_x2),
+    sa_tmp_x3_x4 = const offset_of!(SigArea, tmp_x3_x4),
+    sa_tmp_x5_x6 = const offset_of!(SigArea, tmp_x5_x6),
+    sa_tmp_x7_x8 = const offset_of!(SigArea, tmp_x7_x8),
+    sa_tmp_sp = const offset_of!(SigArea, tmp_sp),
+    sa_tmp_rt_inf = const offset_of!(SigArea, tmp_rt_inf),
+    sa_tmp_id_inf = const offset_of!(SigArea, tmp_id_inf),
+    sa_pctl = const offset_of!(SigArea, pctl),
+    sc_saved_pc = const offset_of!(Sigcontrol, saved_ip),
+    sc_saved_x0 = const offset_of!(Sigcontrol, saved_archdep_reg),
+    sc_sender_infos = const offset_of!(Sigcontrol, sender_infos),
+    sc_word = const offset_of!(Sigcontrol, word),
+    sc_flags = const offset_of!(Sigcontrol, control_flags),
+    proc_fd = sym PROC_FD,
+    inner = sym inner_c,
+    proc_call = sym PROC_CALL,
+
+    SA_ONSTACK_BIT = const 58, // (1 << 58) >> 32 = 0x0400_0000
+
+    SYS_CALL = const syscall::SYS_CALL,
+
+    STACK_ALIGN = const 16,
+    REDZONE_SIZE = const 128,
+    RTINF_SIZE = const size_of::<RtSigInfo>(),
+]);
+
+asmfunction!(__relibc_internal_rlct_clone_ret: ["
+    # Load registers
+    ldp x8, x0, [sp], #16
+    ldp x1, x2, [sp], #16
+    ldp x3, x4, [sp], #16
+
+    # Call entry point
+    blr x8
+
+    ret
+"] <= []);
+
+pub fn current_sp() -> usize {
+    let sp: usize;
+    unsafe {
+        core::arch::asm!("mov {}, sp", out(reg) sp);
+    }
+    sp
+}
+
+pub unsafe fn manually_enter_trampoline() {
+    let ctl = unsafe { &Tcb::current().unwrap().os_specific.control };
+
+    ctl.saved_archdep_reg.set(0);
+    let ip_location = &ctl.saved_ip as *const _ as usize;
+
+    unsafe {
+        core::arch::asm!("
+                bl 2f
+                b 3f
+            2:
+                str lr, [x0]
+                b __relibc_internal_sigentry
+            3:
+            ",
+            inout("x0") ip_location => _, out("lr") _);
+    }
+}
+
+pub unsafe fn arch_pre(stack: &mut SigStack, os: &mut SigArea) -> PosixStackt {
+    PosixStackt {
+        sp: core::ptr::null_mut(), // TODO
+        size: 0,                   // TODO
+        flags: 0,                  // TODO
+    }
+}
+pub fn arch_ret_to_sig(stack: &mut SigStack, control: &Sigcontrol) {
+    let orig_pc = core::mem::replace(&mut stack.regs.pc, __relibc_internal_sigentry as usize);
+    control.saved_ip.set(orig_pc);
+    control.saved_archdep_reg.set(stack.regs.x0);
+}
+pub(crate) static PROC_FD: SyncUnsafeCell<usize> = SyncUnsafeCell::new(usize::MAX);
+static PROC_CALL: [usize; 1] = [ProcCall::Sigdeq as usize];
diff --git a/recipes/core/relibc/redox-rt/src/arch/i686.rs b/recipes/core/relibc/redox-rt/src/arch/i686.rs
new file mode 100644
index 0000000000..6461fe5f87
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/arch/i686.rs
@@ -0,0 +1,411 @@
+use core::{cell::SyncUnsafeCell, mem::offset_of, ptr::NonNull, sync::atomic::Ordering};
+
+use syscall::*;
+
+use crate::{
+    proc::{FdGuard, FdGuardUpper, ForkArgs, fork_inner},
+    signal::{PROC_CONTROL_STRUCT, PosixStackt, RtSigarea, SigStack, inner_fastcall},
+};
+use redox_protocols::protocol::{ProcCall, RtSigInfo};
+
+use super::ForkScratchpad;
+
+// Setup a stack starting from the very end of the address space, and then growing downwards.
+pub const STACK_TOP: usize = 1 << 31;
+pub const STACK_SIZE: usize = 1024 * 1024;
+
+#[derive(Debug, Default)]
+#[repr(C)]
+pub struct SigArea {
+    pub altstack_top: usize,
+    pub altstack_bottom: usize,
+    pub tmp_eip: usize,
+    pub tmp_esp: usize,
+    pub tmp_eax: usize,
+    pub tmp_ebx: usize,
+    pub tmp_ecx: usize,
+    pub tmp_edx: usize,
+    pub tmp_edi: usize,
+    pub tmp_esi: usize,
+    pub tmp_rt_inf: RtSigInfo,
+    pub tmp_signo: usize,
+    pub tmp_id_inf: u64,
+    pub tmp_mm0: u64,
+    pub disable_signals_depth: u64,
+    pub last_sig_was_restart: bool,
+    pub last_sigstack: Option<NonNull<SigStack>>,
+}
+#[derive(Debug, Default)]
+#[repr(C, align(16))]
+pub struct ArchIntRegs {
+    pub fxsave: [u16; 29],
+
+    // ensure fxsave region is 16 byte aligned
+    pub _pad: [usize; 2], // fxsave "available" +0
+
+    pub ebp: usize, // fxsave "available" +8
+    pub esi: usize, // avail +12
+    pub edi: usize, // avail +16
+    pub ebx: usize, // avail +20
+    pub eax: usize, // avail +24
+    pub ecx: usize, // avail +28
+    pub edx: usize, // avail +32
+
+    pub eflags: usize, // avail +36
+    pub eip: usize,    // avail +40
+    pub esp: usize,    // avail +44
+}
+
+/// Deactive TLS, used before exec() on Redox to not trick target executable into thinking TLS
+/// is already initialized as if it was a thread.
+pub unsafe fn deactivate_tcb(open_via_dup: &FdGuardUpper) -> Result<()> {
+    let mut env = syscall::EnvRegisters::default();
+
+    let file = open_via_dup.dup(b"regs/env")?;
+
+    env.fsbase = 0;
+    env.gsbase = 0;
+
+    file.write(&mut env)?;
+    Ok(())
+}
+
+unsafe extern "fastcall" fn fork_impl(args: &ForkArgs, initial_rsp: *mut usize) -> usize {
+    Error::mux(fork_inner(initial_rsp, args))
+}
+
+// TODO: duplicate code with x86_64
+unsafe extern "cdecl" fn child_hook(scratchpad: ForkScratchpad) {
+    let _ = syscall::close(scratchpad.cur_filetable_fd);
+    unsafe {
+        crate::child_hook_common(crate::ChildHookCommonArgs {
+            new_thr_fd: FdGuard::new(scratchpad.new_thr_fd),
+            new_proc_fd: if scratchpad.new_proc_fd == usize::MAX {
+                None
+            } else {
+                Some(FdGuard::new(scratchpad.new_proc_fd))
+            },
+        })
+    };
+}
+
+asmfunction!(__relibc_internal_fork_wrapper (usize) -> usize: ["
+    mov ecx, [esp+4]
+
+    push ebp
+    mov ebp, esp
+
+    // Push preserved registers
+    push ebx
+    push edi
+    push esi
+    push ebp
+
+    sub esp, 32
+
+    //TODO stmxcsr [esp+16]
+    fnstcw [esp+24]
+
+    mov edx, esp
+    call {fork_impl}
+
+    jmp 2f
+"] <= [fork_impl = sym fork_impl]);
+
+asmfunction!(__relibc_internal_fork_ret: ["
+    // Arguments already on the stack
+    call {child_hook}
+
+    //TODO ldmxcsr [esp+16]
+    fldcw [esp+24]
+
+    xor eax, eax
+
+    .p2align 4
+2:
+    add esp, 32
+
+    // Pop preserved registers
+    pop ebp
+    pop esi
+    pop edi
+    pop ebx
+
+    pop ebp
+
+    ret
+"] <= [child_hook = sym child_hook]);
+asmfunction!(__relibc_internal_sigentry: ["
+    // Save some registers
+    mov gs:[{tcb_sa_off} + {sa_tmp_esp}], esp
+    mov gs:[{tcb_sa_off} + {sa_tmp_eax}], eax
+    mov gs:[{tcb_sa_off} + {sa_tmp_edx}], edx
+    mov gs:[{tcb_sa_off} + {sa_tmp_ecx}], ecx
+    mov gs:[{tcb_sa_off} + {sa_tmp_ebx}], ebx
+    mov gs:[{tcb_sa_off} + {sa_tmp_edi}], edi
+    mov gs:[{tcb_sa_off} + {sa_tmp_esi}], esi
+1:
+    // Read standard signal word - first for this thread
+    mov edx, gs:[{tcb_sc_off} + {sc_word} + 4]
+    mov eax, gs:[{tcb_sc_off} + {sc_word}]
+    and eax, edx
+    bsf eax, eax
+    jnz 9f
+
+    // Read standard signal word - for the process
+    lea ecx, [{pctl}]
+    mov eax, [ecx + {pctl_pending}]
+    and eax, edx
+    bsf eax, eax
+    jz 3f
+
+    // Read si_pid and si_uid, atomically.
+    movq gs:[{tcb_sa_off} + {sa_tmp_mm0}], mm0
+    movq mm0, [ecx + {pctl_sender_infos} + eax * 8]
+    movq gs:[{tcb_sa_off} + {sa_tmp_id_inf}], mm0
+    movq mm0, gs:[{tcb_sa_off} + {sa_tmp_mm0}]
+
+    // Try clearing the pending bit, otherwise retry if another thread did that first
+    lock btr [ecx + {pctl_pending}], eax
+    jnc 1b
+    jmp 2f
+3:
+    // Read realtime thread and process signal word together
+    mov edx, [ecx + {pctl_pending} + 4]
+    mov eax, gs:[{tcb_sc_off} + {sc_word} + 8]
+    or eax, edx
+    and eax, gs:[{tcb_sc_off} + {sc_word} + 12]
+    bsf eax, eax
+    jz 7f // spurious signal
+
+    // If thread rather than process was specifically targeted, send the signal to it first.
+    bt edx, eax
+    jnc 8f
+
+    // SYS_CALL(fd, payload_base, payload_len, metadata_len, metadata_base)
+    // eax      ebx ecx           edx          esi           edi
+
+    mov ebx, [{proc_fd}]
+    mov ecx, gs:[0]
+    add ecx, {tcb_sa_off} + {sa_tmp_rt_inf}
+    mov [ecx], eax
+    mov gs:[{tcb_sa_off} + {sa_tmp_signo}], eax
+    mov edx, {RTINF_SIZE}
+    mov esi, 1
+    lea edi, [{proc_call}]
+    mov eax, {SYS_CALL}
+    int 0x80
+    test eax, eax
+    jnz 1b
+
+    mov eax, gs:[{tcb_sa_off} + {sa_tmp_signo}]
+    add eax, 32
+    jmp 2f
+8:
+    add eax, 32
+9:
+    // Read si_pid and si_uid, atomically.
+    movq gs:[{tcb_sa_off} + {sa_tmp_mm0}], mm0
+    movq mm0, gs:[{tcb_sc_off} + {sc_sender_infos} + eax * 8]
+    movq gs:[{tcb_sa_off} + {sa_tmp_id_inf}], mm0
+    movq mm0, gs:[{tcb_sa_off} + {sa_tmp_mm0}]
+    mov edx, eax
+    shr edx, 5
+    mov ecx, eax
+    and ecx, 31
+    lock btr gs:[{tcb_sc_off} + {sc_word} + edx * 8], ecx
+
+    add eax, 64
+2:
+    and esp, -{STACK_ALIGN}
+
+    mov edx, eax
+    add edx, edx
+    bt dword ptr [{pctl} + {pctl_actions} + edx * 8 + 4], 28
+    jnc 4f
+
+    mov edx, gs:[{tcb_sa_off} + {sa_altstack_top}]
+    cmp esp, edx
+    ja 3f
+
+    cmp esp, gs:[{tcb_sa_off} + {sa_altstack_bottom}]
+    jnbe 4f
+3:
+    mov esp, edx
+4:
+    // Now that we have a stack, we can finally start populating the signal stack.
+    push dword ptr gs:[{tcb_sa_off} + {sa_tmp_esp}]
+    push dword ptr gs:[{tcb_sc_off} + {sc_saved_eip}]
+    push dword ptr gs:[{tcb_sc_off} + {sc_saved_eflags}]
+
+    push dword ptr gs:[{tcb_sa_off} + {sa_tmp_edx}]
+    push dword ptr gs:[{tcb_sa_off} + {sa_tmp_ecx}]
+    push dword ptr gs:[{tcb_sa_off} + {sa_tmp_eax}]
+    push dword ptr gs:[{tcb_sa_off} + {sa_tmp_ebx}]
+    push dword ptr gs:[{tcb_sa_off} + {sa_tmp_edi}]
+    push dword ptr gs:[{tcb_sa_off} + {sa_tmp_esi}]
+    push ebp
+
+    sub esp, 2 * 4 + 29 * 16
+    fxsave [esp]
+
+    mov [esp - 4], eax
+    sub esp, 48
+
+    mov ecx, esp
+    call {inner}
+
+    fxrstor [esp + 48]
+    add esp, 48 + 29 * 16 + 2 * 4
+
+    pop ebp
+    pop esi
+    pop edi
+    pop ebx
+    pop eax
+    pop ecx
+    pop edx
+
+    popfd
+    pop dword ptr gs:[{tcb_sa_off} + {sa_tmp_eip}]
+
+    .globl __relibc_internal_sigentry_crit_first
+__relibc_internal_sigentry_crit_first:
+    pop esp
+
+    .globl __relibc_internal_sigentry_crit_second
+__relibc_internal_sigentry_crit_second:
+    jmp dword ptr gs:[{tcb_sa_off} + {sa_tmp_eip}]
+7:
+    mov eax, gs:[0]
+    lea esp, [eax + {tcb_sc_off} + {sc_saved_eflags}]
+    popfd
+
+    mov esp, gs:[{tcb_sa_off} + {sa_tmp_esp}]
+
+    mov eax, gs:[{tcb_sc_off} + {sc_saved_eip}]
+    mov gs:[{tcb_sa_off} + {sa_tmp_eip}], eax
+
+    mov eax, gs:[{tcb_sa_off} + {sa_tmp_eax}]
+    mov ebx, gs:[{tcb_sa_off} + {sa_tmp_ebx}]
+    mov ecx, gs:[{tcb_sa_off} + {sa_tmp_ecx}]
+    mov edx, gs:[{tcb_sa_off} + {sa_tmp_edx}]
+    mov edi, gs:[{tcb_sa_off} + {sa_tmp_edi}]
+    mov esi, gs:[{tcb_sa_off} + {sa_tmp_esi}]
+
+    and dword ptr gs:[{tcb_sc_off} + {sc_control}], ~1
+    .globl __relibc_internal_sigentry_crit_third
+__relibc_internal_sigentry_crit_third:
+    jmp dword ptr gs:[{tcb_sa_off} + {sa_tmp_eip}]
+"] <= [
+    inner = sym inner_fastcall,
+    sa_tmp_eip = const offset_of!(SigArea, tmp_eip),
+    sa_tmp_esp = const offset_of!(SigArea, tmp_esp),
+    sa_tmp_eax = const offset_of!(SigArea, tmp_eax),
+    sa_tmp_ebx = const offset_of!(SigArea, tmp_ebx),
+    sa_tmp_ecx = const offset_of!(SigArea, tmp_ecx),
+    sa_tmp_edx = const offset_of!(SigArea, tmp_edx),
+    sa_tmp_edi = const offset_of!(SigArea, tmp_edi),
+    sa_tmp_esi = const offset_of!(SigArea, tmp_esi),
+    sa_tmp_mm0 = const offset_of!(SigArea, tmp_mm0),
+    sa_tmp_rt_inf = const offset_of!(SigArea, tmp_rt_inf),
+    sa_tmp_id_inf = const offset_of!(SigArea, tmp_id_inf),
+    sa_tmp_signo = const offset_of!(SigArea, tmp_signo),
+    sa_altstack_top = const offset_of!(SigArea, altstack_top),
+    sa_altstack_bottom = const offset_of!(SigArea, altstack_bottom),
+    sc_control = const offset_of!(Sigcontrol, control_flags),
+    sc_saved_eflags = const offset_of!(Sigcontrol, saved_archdep_reg),
+    sc_saved_eip = const offset_of!(Sigcontrol, saved_ip),
+    sc_word = const offset_of!(Sigcontrol, word),
+    sc_sender_infos = const offset_of!(Sigcontrol, sender_infos),
+    tcb_sa_off = const offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, arch),
+    tcb_sc_off = const offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, control),
+    pctl_actions = const offset_of!(SigProcControl, actions),
+    pctl_sender_infos = const offset_of!(SigProcControl, sender_infos),
+    pctl_pending = const offset_of!(SigProcControl, pending),
+    pctl = sym PROC_CONTROL_STRUCT,
+    proc_fd = sym PROC_FD,
+    proc_call = sym PROC_CALL,
+    STACK_ALIGN = const 16,
+    SYS_CALL = const syscall::SYS_CALL,
+    RTINF_SIZE = const size_of::<RtSigInfo>(),
+]);
+
+asmfunction!(__relibc_internal_rlct_clone_ret -> usize: ["
+    # Load registers
+    pop eax
+
+    sub esp, 8
+
+    mov DWORD PTR [esp], 0x00001F80
+    # TODO: ldmxcsr [esp]
+    mov WORD PTR [esp], 0x037F
+    fldcw [esp]
+
+    add esp, 8
+
+    # Call entry point
+    call eax
+
+    ret
+"] <= []);
+unsafe extern "C" {
+    fn __relibc_internal_sigentry_crit_first();
+    fn __relibc_internal_sigentry_crit_second();
+    fn __relibc_internal_sigentry_crit_third();
+}
+pub unsafe fn arch_pre(stack: &mut SigStack, area: &mut SigArea) -> PosixStackt {
+    if stack.regs.eip == __relibc_internal_sigentry_crit_first as usize {
+        let stack_ptr = stack.regs.esp as *const usize;
+        stack.regs.esp = unsafe { stack_ptr.read() };
+        stack.regs.eip = unsafe { stack_ptr.sub(1).read() };
+    } else if stack.regs.eip == __relibc_internal_sigentry_crit_second as usize
+        || stack.regs.eip == __relibc_internal_sigentry_crit_third as usize
+    {
+        stack.regs.eip = area.tmp_eip;
+    }
+    PosixStackt {
+        sp: stack.regs.esp as *mut (),
+        size: 0,  // TODO
+        flags: 0, // TODO
+    }
+}
+pub fn arch_ret_to_sig(stack: &mut SigStack, control: &Sigcontrol) {
+    let orig_eip = core::mem::replace(&mut stack.regs.eip, __relibc_internal_sigentry as usize);
+    control.saved_ip.set(orig_eip);
+    control.saved_archdep_reg.set(stack.regs.eflags);
+}
+#[unsafe(no_mangle)]
+pub unsafe fn manually_enter_trampoline() {
+    let c = unsafe { &crate::Tcb::current().unwrap().os_specific.control };
+    c.control_flags.store(
+        c.control_flags.load(Ordering::Relaxed) | syscall::flag::INHIBIT_DELIVERY.bits(),
+        Ordering::Release,
+    );
+    c.saved_archdep_reg.set(0); // TODO: Just reset DF on x86?
+
+    unsafe {
+        core::arch::asm!("
+                call 2f
+                jmp 3f
+            2:
+                pop dword ptr gs:[{tcb_sc_off} + {sc_saved_eip}]
+                jmp __relibc_internal_sigentry
+            3:
+            ",
+            tcb_sc_off = const offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, control),
+            sc_saved_eip = const offset_of!(Sigcontrol, saved_ip),
+        );
+    }
+}
+/// Get current stack pointer, weak granularity guarantees.
+pub fn current_sp() -> usize {
+    let sp: usize;
+    unsafe {
+        core::arch::asm!("mov {}, esp", out(reg) sp);
+    }
+    sp
+}
+
+pub static PROC_FD: SyncUnsafeCell<usize> = SyncUnsafeCell::new(usize::MAX);
+static PROC_CALL: u64 = ProcCall::Sigdeq as u64;
diff --git a/recipes/core/relibc/redox-rt/src/arch/mod.rs b/recipes/core/relibc/redox-rt/src/arch/mod.rs
new file mode 100644
index 0000000000..282f28ed5d
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/arch/mod.rs
@@ -0,0 +1,27 @@
+#[cfg(target_arch = "aarch64")]
+pub use self::aarch64::*;
+#[cfg(target_arch = "aarch64")]
+pub mod aarch64;
+
+#[cfg(target_arch = "x86")]
+pub use self::i686::*;
+#[cfg(target_arch = "x86")]
+pub mod i686;
+
+#[cfg(target_arch = "x86_64")]
+pub use self::x86_64::*;
+#[cfg(target_arch = "x86_64")]
+pub mod x86_64;
+
+#[cfg(target_arch = "riscv64")]
+pub use self::riscv64::*;
+#[cfg(target_arch = "riscv64")]
+pub mod riscv64;
+
+#[derive(Debug)]
+#[repr(C)]
+pub struct ForkScratchpad {
+    pub cur_filetable_fd: usize,
+    pub new_proc_fd: usize,
+    pub new_thr_fd: usize,
+}
diff --git a/recipes/core/relibc/redox-rt/src/arch/riscv64.rs b/recipes/core/relibc/redox-rt/src/arch/riscv64.rs
new file mode 100644
index 0000000000..a72cc32913
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/arch/riscv64.rs
@@ -0,0 +1,654 @@
+use core::cell::SyncUnsafeCell;
+
+use crate::{
+    Tcb,
+    proc::{FdGuard, FdGuardUpper, ForkArgs, fork_inner},
+    signal::{PosixStackt, RtSigarea, SigStack, get_sigaltstack, inner_c},
+};
+use core::{mem::offset_of, ptr::NonNull, sync::atomic::Ordering};
+use redox_protocols::protocol::{ProcCall, RtSigInfo};
+use syscall::{data::*, error::*};
+
+use super::ForkScratchpad;
+
+// Setup a stack starting from the very end of the address space, and then growing downwards.
+pub const STACK_TOP: usize = 1 << 38;
+pub const STACK_SIZE: usize = 1024 * 1024;
+
+#[derive(Debug, Default)]
+#[repr(C)]
+pub struct SigArea {
+    pub tmp_sp: u64,
+    pub tmp_t1: u64,
+    pub tmp_t2: u64,
+    pub tmp_t3: u64,
+    pub tmp_t4: u64,
+    pub tmp_a0: u64,
+    pub tmp_a1: u64,
+    pub tmp_a2: u64,
+    pub tmp_a3: u64,
+    pub tmp_a4: u64,
+    pub tmp_a7: u64,
+
+    pub pctl: usize, // TODO: remove
+    pub tmp_ip: u64,
+    pub tmp_rt_inf: RtSigInfo,
+    pub tmp_id_inf: u64,
+    pub altstack_top: usize,
+    pub altstack_bottom: usize,
+    pub disable_signals_depth: u64,
+    pub last_sig_was_restart: bool,
+    pub last_sigstack: Option<NonNull<SigStack>>,
+}
+#[repr(C)]
+#[derive(Debug, Default)]
+pub struct ArchIntRegs {
+    pub int_regs: [u64; 31],
+    pub pc: u64,
+    pub fp_regs: [u64; 32],
+    pub fcsr: u32,
+    _pad: u32,
+}
+
+/// Deactive TLS, used before exec() on Redox to not trick target executable into thinking TLS
+/// is already initialized as if it was a thread.
+pub unsafe fn deactivate_tcb(open_via_dup: &FdGuardUpper) -> Result<()> {
+    let mut env = syscall::EnvRegisters::default();
+
+    let file = open_via_dup.dup(b"regs/env")?;
+
+    env.tp = 0;
+
+    file.write(&mut env)?;
+    Ok(())
+}
+
+unsafe extern "C" fn fork_impl(args: &ForkArgs, initial_rsp: *mut usize) -> usize {
+    Error::mux(fork_inner(initial_rsp, args))
+}
+
+unsafe extern "C" fn child_hook(scratchpad: &ForkScratchpad) {
+    let _ = syscall::close(scratchpad.cur_filetable_fd);
+    unsafe {
+        crate::child_hook_common(crate::ChildHookCommonArgs {
+            new_thr_fd: FdGuard::new(scratchpad.new_thr_fd),
+            new_proc_fd: if scratchpad.new_proc_fd == usize::MAX {
+                None
+            } else {
+                Some(FdGuard::new(scratchpad.new_proc_fd))
+            },
+        })
+    };
+}
+
+asmfunction!(__relibc_internal_fork_wrapper (usize) -> usize: ["
+    .attribute arch, \"rv64gc\"  # rust bug 80608
+    addi sp, sp, -200
+    sd   s0, 0(sp)
+    sd   s1, 8(sp)
+    sd   s2, 16(sp)
+    sd   s3, 24(sp)
+    sd   s4, 32(sp)
+    sd   s5, 40(sp)
+    sd   s6, 48(sp)
+    sd   s7, 56(sp)
+    sd   s8, 64(sp)
+    sd   s9, 72(sp)
+    sd   s10, 80(sp)
+    sd   s11, 88(sp)
+    sd   ra, 96(sp)
+
+    fsd  fs0, 104(sp)
+    fsd  fs1, 112(sp)
+    fsd  fs2, 120(sp)
+    fsd  fs3, 128(sp)
+    fsd  fs4, 136(sp)
+    fsd  fs5, 144(sp)
+    fsd  fs6, 152(sp)
+    fsd  fs7, 160(sp)
+    fsd  fs8, 168(sp)
+    fsd  fs9, 176(sp)
+    fsd  fs10, 184(sp)
+    fsd  fs11, 192(sp)
+
+    // a0 is forwarded from this function
+    mv   a1, sp
+    jal  {fork_impl}
+
+    ld   s0, 0(sp)
+    ld   s1, 8(sp)
+    ld   s2, 16(sp)
+    ld   s3, 24(sp)
+    ld   s4, 32(sp)
+    ld   s5, 40(sp)
+    ld   s6, 48(sp)
+    ld   s7, 56(sp)
+    ld   s8, 64(sp)
+    ld   s9, 72(sp)
+    ld   s10, 80(sp)
+    ld   s11, 88(sp)
+    ld   ra, 96(sp)
+
+    fld  fs0, 104(sp)
+    fld  fs1, 112(sp)
+    fld  fs2, 120(sp)
+    fld  fs3, 128(sp)
+    fld  fs4, 136(sp)
+    fld  fs5, 144(sp)
+    fld  fs6, 152(sp)
+    fld  fs7, 160(sp)
+    fld  fs8, 168(sp)
+    fld  fs9, 176(sp)
+    fld  fs10, 184(sp)
+    fld  fs11, 192(sp)
+
+    addi sp, sp, 200
+    ret
+"] <= [fork_impl = sym fork_impl]);
+
+asmfunction!(__relibc_internal_fork_ret: ["
+    .attribute arch, \"rv64gc\"  # rust bug 80608
+
+    # scratchpad is in a1, move to a0 for child_hook
+    mv a0, a1
+
+    jal  {child_hook}
+
+    mv   a0, zero
+
+    ld   s0, 0(sp)
+    ld   s1, 8(sp)
+    ld   s2, 16(sp)
+    ld   s3, 24(sp)
+    ld   s4, 32(sp)
+    ld   s5, 40(sp)
+    ld   s6, 48(sp)
+    ld   s7, 56(sp)
+    ld   s8, 64(sp)
+    ld   s9, 72(sp)
+    ld   s10, 80(sp)
+    ld   s11, 88(sp)
+    ld   ra, 96(sp)
+
+    fld  fs0, 104(sp)
+    fld  fs1, 112(sp)
+    fld  fs2, 120(sp)
+    fld  fs3, 128(sp)
+    fld  fs4, 136(sp)
+    fld  fs5, 144(sp)
+    fld  fs6, 152(sp)
+    fld  fs7, 160(sp)
+    fld  fs8, 168(sp)
+    fld  fs9, 176(sp)
+    fld  fs10, 184(sp)
+    fld  fs11, 192(sp)
+
+    addi sp, sp, 200
+    ret
+"] <= [child_hook = sym child_hook]);
+
+asmfunction!(__relibc_internal_sigentry: ["
+    .attribute arch, \"rv64gc\"  # rust bug 80608
+    // Save some registers
+    ld   t0, -8(tp) // Tcb
+    sd   sp, ({tcb_sa_off} + {sa_tmp_sp})(t0)
+    sd   t1, ({tcb_sa_off} + {sa_tmp_t1})(t0)
+    sd   t2, ({tcb_sa_off} + {sa_tmp_t2})(t0)
+    sd   t3, ({tcb_sa_off} + {sa_tmp_t3})(t0)
+    sd   t4, ({tcb_sa_off} + {sa_tmp_t4})(t0)
+    ld   t4, ({tcb_sa_off} + {sa_off_pctl})(t0)
+
+    // First, select signal, always pick first available bit
+99:
+    // Read first signal word
+    ld   t1, ({tcb_sc_off} + {sc_word})(t0)
+    srli t2, t1, 32 // bitset to low word
+    and  t1, t1, t2  // masked bitset in low word
+    beqz t1, 3f
+
+    // Found in first thread signal word
+    mv   t3, x0
+2:  andi t2, t1, 1
+    bnez t2, 10f
+    addi t3, t3, 1
+    srli t1, t1, 1
+    j 2b
+
+    // If no unblocked thread signal was found, check for process.
+    // This is competitive; we need to atomically check if *we* cleared the process-wide pending
+    // bit, otherwise restart.
+3:  lw   t1, {pctl_off_pending}(t4)
+    and  t1, t1, t2
+    beqz t1, 3f
+    // Found in first process signal word
+    li   t3, -1
+2:  andi t2, t1, 1
+    addi t3, t3, 1
+    srli t1, t1, 1
+    beqz t2, 2b
+    slli t1, t3, 3 // * 8 == size_of SenderInfo
+    add  t1, t1, t4
+    ld   t1, {pctl_off_sender_infos}(t1)
+    sd   t1, ({tcb_sa_off} + {sa_tmp_id_inf})(t0)
+    li   t1, 1
+    sll  t1, t1, t3
+    not  t1, t1
+    addi t2, t4, {pctl_off_pending}
+    amoand.w.aq t2, t1, (t2)
+    and  t1, t1, t2
+    bne  t1, t2, 9f
+
+3:
+    // Read second signal word - both process and thread simultaneously.
+    // This must be done since POSIX requires low realtime signals to be picked first.
+    ld   t1, ({tcb_sc_off} + {sc_word} + 8)(t0)
+    lw   t2, ({pctl_off_pending} + 4)(t4)
+    or   t4, t1, t2
+    srli t2, t1, 32
+    and  t4, t2, t4
+    beqz t4, 7f
+    li   t3, -1
+2:  andi t2, t4, 1
+    addi t3, t3, 1
+    srli t4, t4, 1
+    beqz t2, 2b
+    li   t2, 1
+    sll  t2, t2, t3
+    and  t1, t1, t2
+    addi t3, t3, 32
+    bnez t1, 10f // thread signal
+
+    // otherwise, try (competitively) dequeueing realtime signal
+
+    // SYS_CALL(fd, payload_base, payload_len, metadata_len, metadata_base)
+    // a7       a0  a1            a2           a3            a4
+
+    // TODO: This SYS_CALL invocation has not yet been tested due to toolchain issues.
+
+    sd   a0, ({tcb_sa_off} + {sa_tmp_a0})(t0)
+    sd   a1, ({tcb_sa_off} + {sa_tmp_a1})(t0)
+    sd   a2, ({tcb_sa_off} + {sa_tmp_a2})(t0)
+    sd   a3, ({tcb_sa_off} + {sa_tmp_a3})(t0)
+    sd   a4, ({tcb_sa_off} + {sa_tmp_a4})(t0)
+    sd   a7, ({tcb_sa_off} + {sa_tmp_a7})(t0)
+    li   a7, {SYS_CALL}
+    addi a2, t3, -32
+    add  a1, t0, {tcb_sa_off} + {sa_tmp_rt_inf} // out pointer of dequeued realtime sig
+    sd a2, (a1)
+    li a2, {RTINF_SIZE}
+    li a3, 1
+1337:
+    auipc a4, %pcrel_hi({proc_fd})
+    addi a4, a4, %pcrel_lo(1337b)
+    ecall
+    ld   a3, ({tcb_sa_off} + {sa_tmp_a3})(t0)
+    ld   a4, ({tcb_sa_off} + {sa_tmp_a4})(t0)
+    bnez a0, 99b // assumes error can only be EAGAIN
+    j   9f
+
+10: // thread signal. t3 holds signal number
+    srli t1, t3, 5
+    bnez t1, 2f // FIXME senderinfo?
+    sll  t2, t3, 3 // * 8 == size_of SenderInfo
+    add  t2, t2, t0
+    ld   t2, ({tcb_sc_off} + {sc_sender_infos})(t2)
+    sd   t2, ({tcb_sa_off} + {sa_tmp_id_inf})(t0)
+2:  andi t4, t3, 31
+    li   t2, 1
+    sll  t2, t2, t4
+    not  t2, t2
+    sll  t1, t1, 3
+    add  t1, t1, t0
+    addi t1, t1, {tcb_sc_off} + {sc_word}
+    amoand.w.aq x0, t2, (t1)
+    addi t3, t3, 64 // indicate signal was targeted at thread
+
+9: // process signal t3 holds signal number
+
+    // By now we have selected a signal, stored in eax (6-bit). We now need to choose whether or
+    // not to switch to the alternate signal stack. If SA_ONSTACK is clear for this signal, then
+    // skip the sigaltstack logic.
+    ld   t4, ({tcb_sa_off} + {sa_off_pctl})(t0)
+    andi t1, t3, 63
+    slli t1, t1, 4 // * 16 == size_of RawAction
+    add  t1, t1, t4
+    ld   t1, {pctl_off_actions}(t1)
+    slli t1, t1, 63-58 // SA_ONSTACK in sign bit
+    bgez t1, 3f
+
+    // If current RSP is above altstack region, switch to altstack
+    ld  t1, ({tcb_sa_off} + {sa_altstack_top})(t0)
+    bgtu sp, t1, 2f
+    ld  t2, ({tcb_sa_off} + {sa_altstack_bottom})(t0)
+    bgtu sp, t3, 3f
+2:  mv  sp, t1
+3:
+    // form mcontext on stack
+    addi sp, sp, -33 * 8
+    fsd  f0, (0 * 8)(sp)
+    fsd  f1, (1 * 8)(sp)
+    fsd  f2, (2 * 8)(sp)
+    fsd  f3, (3 * 8)(sp)
+    fsd  f4, (4 * 8)(sp)
+    fsd  f5, (5 * 8)(sp)
+    fsd  f6, (6 * 8)(sp)
+    fsd  f7, (7 * 8)(sp)
+    fsd  f8, (8 * 8)(sp)
+    fsd  f9, (9 * 8)(sp)
+    fsd  f10, (10 * 8)(sp)
+    fsd  f11, (11 * 8)(sp)
+    fsd  f12, (12 * 8)(sp)
+    fsd  f13, (13 * 8)(sp)
+    fsd  f14, (14 * 8)(sp)
+    fsd  f15, (15 * 8)(sp)
+    fsd  f16, (16 * 8)(sp)
+    fsd  f17, (17 * 8)(sp)
+    fsd  f18, (18 * 8)(sp)
+    fsd  f19, (19 * 8)(sp)
+    fsd  f20, (20 * 8)(sp)
+    fsd  f21, (21 * 8)(sp)
+    fsd  f22, (22 * 8)(sp)
+    fsd  f23, (23 * 8)(sp)
+    fsd  f24, (24 * 8)(sp)
+    fsd  f25, (25 * 8)(sp)
+    fsd  f26, (26 * 8)(sp)
+    fsd  f27, (27 * 8)(sp)
+    fsd  f28, (28 * 8)(sp)
+    fsd  f29, (29 * 8)(sp)
+    fsd  f30, (30 * 8)(sp)
+    fsd  f31, (31 * 8)(sp)
+    csrr t1, fcsr
+    sw   t1, (32 * 8)(sp)
+
+    addi sp, sp, -32 * 8
+    sd   x1, 0(sp)
+    ld   t1, ({tcb_sa_off} + {sa_tmp_sp})(t0)
+    sd   t1, (1 * 8)(sp)  // x2 is sp
+    sd   x3, (2 * 8)(sp)
+    sd   x4, (3 * 8)(sp)
+    ld   t1, ({tcb_sc_off} + {sc_saved_t0})(t0)
+    sd   t1, (4 * 8)(sp) // x5 is t0
+    ld   t1, ({tcb_sa_off} + {sa_tmp_t1})(t0)
+    sd   t1, (5 * 8)(sp) // x6 is t1
+    ld   t1, ({tcb_sa_off} + {sa_tmp_t2})(t0)
+    sd   t1, (6 * 8)(sp) // x7 is t2
+    sd   x8, (7 * 8)(sp)
+    sd   x9, (8 * 8)(sp)
+    sd   x10, (9 * 8)(sp)
+    sd   x11, (10 * 8)(sp)
+    sd   x12, (11 * 8)(sp)
+    sd   x13, (12 * 8)(sp)
+    sd   x14, (13 * 8)(sp)
+    sd   x15, (14 * 8)(sp)
+    sd   x16, (15 * 8)(sp)
+    sd   x17, (16 * 8)(sp)
+    sd   x18, (17 * 8)(sp)
+    sd   x19, (18 * 8)(sp)
+    sd   x20, (19 * 8)(sp)
+    sd   x21, (20 * 8)(sp)
+    sd   x22, (21 * 8)(sp)
+    sd   x23, (22 * 8)(sp)
+    sd   x24, (23 * 8)(sp)
+    sd   x25, (24 * 8)(sp)
+    sd   x26, (25 * 8)(sp)
+    sd   x27, (26 * 8)(sp)
+    ld   t1, ({tcb_sa_off} + {sa_tmp_t3})(t0)
+    sd   t1, (27 * 8)(sp) // t3 is x28
+    ld   t1, ({tcb_sa_off} + {sa_tmp_t4})(t0)
+    sd   t1, (28 * 8)(sp) // t4 is x29
+    sd   x30, (29 * 8)(sp)
+    sd   x31, (30 * 8)(sp)
+    ld   t1, ({tcb_sc_off} + {sc_saved_ip})(t0)
+    sd   t1, (31 * 8)(sp)
+
+    // form ucontext
+    addi sp, sp, -64
+    sw   t3, 60(sp)
+
+    mv   t0, sp
+    jal  {inner}
+
+    addi sp, sp, 64
+
+    addi t0, sp, 32 * 8
+    fld  f0, (0 * 8)(t0)
+    fld  f1, (1 * 8)(t0)
+    fld  f2, (2 * 8)(t0)
+    fld  f3, (3 * 8)(t0)
+    fld  f4, (4 * 8)(t0)
+    fld  f5, (5 * 8)(t0)
+    fld  f6, (6 * 8)(t0)
+    fld  f7, (7 * 8)(t0)
+    fld  f8, (8 * 8)(t0)
+    fld  f9, (9 * 8)(t0)
+    fld  f10, (10 * 8)(t0)
+    fld  f11, (11 * 8)(t0)
+    fld  f12, (12 * 8)(t0)
+    fld  f13, (13 * 8)(t0)
+    fld  f14, (14 * 8)(t0)
+    fld  f15, (15 * 8)(t0)
+    fld  f16, (16 * 8)(t0)
+    fld  f17, (17 * 8)(t0)
+    fld  f18, (18 * 8)(t0)
+    fld  f19, (19 * 8)(t0)
+    fld  f20, (20 * 8)(t0)
+    fld  f21, (21 * 8)(t0)
+    fld  f22, (22 * 8)(t0)
+    fld  f23, (23 * 8)(t0)
+    fld  f24, (24 * 8)(t0)
+    fld  f25, (25 * 8)(t0)
+    fld  f26, (26 * 8)(t0)
+    fld  f27, (27 * 8)(t0)
+    fld  f28, (28 * 8)(t0)
+    fld  f29, (29 * 8)(t0)
+    fld  f30, (30 * 8)(t0)
+    fld  f31, (31 * 8)(t0)
+    lw   t1, (32 * 8)(t0)
+    csrw fcsr, t1
+
+    ld   x1, 0(sp)
+    // skip sp
+    // skip gp
+    ld   x4, (3 * 8)(sp)
+    ld   x5, (4 * 8)(sp)
+    ld   x6, (5 * 8)(sp)
+    ld   x7, (6 * 8)(sp)
+    ld   x8, (7 * 8)(sp)
+    ld   x9, (8 * 8)(sp)
+    ld   x10, (9 * 8)(sp)
+    ld   x11, (10 * 8)(sp)
+    ld   x12, (11 * 8)(sp)
+    ld   x13, (12 * 8)(sp)
+    ld   x14, (13 * 8)(sp)
+    ld   x15, (14 * 8)(sp)
+    ld   x16, (15 * 8)(sp)
+    ld   x17, (16 * 8)(sp)
+    ld   x18, (17 * 8)(sp)
+    ld   x19, (18 * 8)(sp)
+    ld   x20, (19 * 8)(sp)
+    ld   x21, (20 * 8)(sp)
+    ld   x22, (21 * 8)(sp)
+    ld   x23, (22 * 8)(sp)
+    ld   x24, (23 * 8)(sp)
+    ld   x25, (24 * 8)(sp)
+    ld   x26, (25 * 8)(sp)
+    ld   x27, (26 * 8)(sp)
+    ld   x28, (27 * 8)(sp)
+    ld   x29, (28 * 8)(sp)
+    ld   x30, (29 * 8)(sp)
+    ld   x31, (30 * 8)(sp)
+    ld   gp, (31 * 8)(sp) // new IP; this clobbers register x3/gp which is ABI reserved
+    .global __relibc_internal_sigentry_crit_first
+__relibc_internal_sigentry_crit_first:
+    ld   sp, (1 * 8)(sp)
+    .global __relibc_internal_sigentry_crit_second
+__relibc_internal_sigentry_crit_second:
+    jr   gp
+7:
+    // A spurious signal occurred. Signals are still disabled here, but will need to be re-enabled.
+
+    // restore stack
+    ld   sp, ({tcb_sa_off} + {sa_tmp_sp})(t0)
+
+    // move saved IP away from control, allowing arch_pre to save us if interrupted.
+    ld t1, ({tcb_sc_off} + {sc_saved_ip})(t0)
+    sd t1, ({tcb_sa_off} + {sa_tmp_ip})(t0)
+
+    // restore regs
+    ld   t2, ({tcb_sa_off} + {sa_tmp_t2})(t0)
+    ld   t3, ({tcb_sa_off} + {sa_tmp_t3})(t0)
+    ld   t4, ({tcb_sa_off} + {sa_tmp_t4})(t0)
+
+    // move saved t0 away from control as well
+    mv   t1, t0
+    ld   t0, ({tcb_sc_off} + {sc_saved_t0})(t0)
+
+    // Re-enable signals. This code can be interrupted after this signal, so we need to define
+    // 'crit_third'.
+    ld   gp, ({tcb_sc_off} + {sc_control})(t1)
+    andi gp, gp, ~1
+    sd   gp, ({tcb_sc_off} + {sc_control})(t1)
+
+    .globl __relibc_internal_sigentry_crit_third
+__relibc_internal_sigentry_crit_third:
+    ld   gp, ({tcb_sa_off} + {sa_tmp_ip})(t1)
+    .globl __relibc_internal_sigentry_crit_fourth
+__relibc_internal_sigentry_crit_fourth:
+    ld   t1, ({tcb_sa_off} + {sa_tmp_t1})(t1)
+    .globl __relibc_internal_sigentry_crit_fifth
+__relibc_internal_sigentry_crit_fifth:
+    jr   gp
+ "] <= [
+    tcb_sc_off = const (offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, control)),
+    sc_word = const offset_of!(Sigcontrol, word),
+    sc_saved_t0 = const offset_of!(Sigcontrol, saved_archdep_reg),
+    sc_saved_ip = const offset_of!(Sigcontrol, saved_ip),
+    sc_sender_infos = const offset_of!(Sigcontrol, sender_infos),
+    sc_control = const offset_of!(Sigcontrol, control_flags),
+
+    tcb_sa_off = const (offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, arch)),
+    sa_off_pctl = const offset_of!(SigArea, pctl),
+    sa_tmp_sp = const offset_of!(SigArea, tmp_sp),
+    sa_tmp_t1 = const offset_of!(SigArea, tmp_t1),
+    sa_tmp_t2 = const offset_of!(SigArea, tmp_t2),
+    sa_tmp_t3 = const offset_of!(SigArea, tmp_t3),
+    sa_tmp_t4 = const offset_of!(SigArea, tmp_t4),
+    sa_tmp_a0 = const offset_of!(SigArea, tmp_a0),
+    sa_tmp_a1 = const offset_of!(SigArea, tmp_a1),
+    sa_tmp_a2 = const offset_of!(SigArea, tmp_a2),
+    sa_tmp_a3 = const offset_of!(SigArea, tmp_a3),
+    sa_tmp_a4 = const offset_of!(SigArea, tmp_a4),
+    sa_tmp_a7 = const offset_of!(SigArea, tmp_a7),
+    sa_tmp_ip = const offset_of!(SigArea, tmp_ip),
+    sa_tmp_id_inf = const offset_of!(SigArea, tmp_id_inf),
+    sa_tmp_rt_inf = const offset_of!(SigArea, tmp_rt_inf),
+    sa_altstack_top = const offset_of!(SigArea, altstack_top),
+    sa_altstack_bottom = const offset_of!(SigArea, altstack_bottom),
+
+    pctl_off_actions = const offset_of!(SigProcControl, actions),
+    inner = sym inner_c,
+    pctl_off_pending = const offset_of!(SigProcControl, pending),
+    pctl_off_sender_infos = const offset_of!(SigProcControl, sender_infos),
+    SYS_CALL = const syscall::SYS_CALL,
+    RTINF_SIZE = const size_of::<RtSigInfo>(),
+    proc_fd = sym PROC_FD,
+]);
+
+asmfunction!(__relibc_internal_rlct_clone_ret: ["
+    ld t0, 0(sp)
+    ld a0, 8(sp)
+    ld a1, 16(sp)
+    ld a2, 24(sp)
+    ld a3, 32(sp)
+    ld a4, 40(sp)
+    ld a5, 48(sp)
+    addi sp, sp, 56
+
+    jalr t0
+    ret
+"] <= []);
+
+pub fn current_sp() -> usize {
+    let sp: usize;
+    unsafe {
+        core::arch::asm!(
+        "mv {}, sp",
+        out(reg) sp,
+        options(nomem));
+    }
+    sp
+}
+
+pub unsafe fn manually_enter_trampoline() {
+    let ctl = unsafe { &Tcb::current().unwrap().os_specific.control };
+
+    ctl.control_flags.store(
+        ctl.control_flags.load(Ordering::Relaxed) | syscall::flag::INHIBIT_DELIVERY.bits(),
+        Ordering::Release,
+    );
+    ctl.saved_archdep_reg.set(0);
+    let ip_location = &ctl.saved_ip as *const _ as usize;
+
+    unsafe {
+        core::arch::asm!("
+                jal 2f
+                j 3f
+            2:
+                sd ra, 0(t0)
+                la t0, __relibc_internal_sigentry
+                jalr x0, t0
+            3:
+            ",
+            inout("t0") ip_location => _, out("ra") _);
+    }
+}
+
+unsafe extern "C" {
+    fn __relibc_internal_sigentry_crit_first();
+    fn __relibc_internal_sigentry_crit_second();
+    fn __relibc_internal_sigentry_crit_third();
+    fn __relibc_internal_sigentry_crit_fourth();
+    fn __relibc_internal_sigentry_crit_fifth();
+}
+pub unsafe fn arch_pre(stack: &mut SigStack, area: &mut SigArea) -> PosixStackt {
+    // It is impossible to update SP and PC atomically. Instead, we abuse the fact that
+    // signals are disabled in the prologue of the signal trampoline, which allows us to emulate
+    // atomicity inside the critical section, consisting of one instruction at 'crit_first', and
+    // one at 'crit_second', see asm.
+
+    if stack.regs.pc == __relibc_internal_sigentry_crit_first as u64 {
+        // Reexecute 'ld sp, (1 * 8)(sp)'
+        let stack_ptr = stack.regs.int_regs[1] as *const u64; // x2
+        stack.regs.int_regs[1] = unsafe { stack_ptr.add(1).read() };
+        // and 'jr gp' steps.
+        stack.regs.pc = stack.regs.int_regs[2];
+    } else if stack.regs.pc == __relibc_internal_sigentry_crit_second as u64
+        || stack.regs.pc == __relibc_internal_sigentry_crit_fifth as u64
+    {
+        // just reexecute the jump
+        stack.regs.pc = stack.regs.int_regs[2];
+    } else if stack.regs.pc == __relibc_internal_sigentry_crit_third as u64 {
+        // ld   gp, ({tcb_sa_off} + {sa_tmp_ip})(t1)
+        stack.regs.int_regs[2] = area.tmp_ip;
+        // ld   t1, ({tcb_sa_off} + {sa_tmp_t1})(t1)
+        stack.regs.int_regs[5] = area.tmp_t1;
+        // j    gp
+        stack.regs.pc = stack.regs.int_regs[2];
+    } else if stack.regs.pc == __relibc_internal_sigentry_crit_fourth as u64 {
+        // ld   t1, ({tcb_sa_off} + {sa_tmp_t1})(t1)
+        stack.regs.int_regs[5] = area.tmp_t1;
+        // jr   gp
+        stack.regs.pc = stack.regs.int_regs[2];
+    }
+
+    get_sigaltstack(area, stack.regs.int_regs[1] as usize).into()
+}
+pub fn arch_ret_to_sig(stack: &mut SigStack, control: &Sigcontrol) {
+    let orig_pc = core::mem::replace(&mut stack.regs.pc, __relibc_internal_sigentry as u64);
+    control.saved_ip.set(orig_pc as usize);
+    control
+        .saved_archdep_reg
+        .set(stack.regs.int_regs[4] as usize); // t0
+}
+pub(crate) static PROC_FD: SyncUnsafeCell<usize> = SyncUnsafeCell::new(usize::MAX);
+static PROC_CALL: [usize; 1] = [ProcCall::Sigdeq as usize];
diff --git a/recipes/core/relibc/redox-rt/src/arch/x86_64.rs b/recipes/core/relibc/redox-rt/src/arch/x86_64.rs
new file mode 100644
index 0000000000..b93c59b1d6
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/arch/x86_64.rs
@@ -0,0 +1,528 @@
+use core::{
+    cell::SyncUnsafeCell,
+    mem::offset_of,
+    ptr::NonNull,
+    sync::atomic::{AtomicU8, Ordering},
+};
+
+use syscall::{
+    data::{SigProcControl, Sigcontrol},
+    error::*,
+};
+
+use crate::{
+    Tcb,
+    proc::{FdGuard, FdGuardUpper, ForkArgs, fork_inner},
+    signal::{PROC_CONTROL_STRUCT, PosixStackt, RtSigarea, SigStack, get_sigaltstack, inner_c},
+};
+use redox_protocols::protocol::{ProcCall, RtSigInfo};
+
+use super::ForkScratchpad;
+
+// Setup a stack starting from the very end of the address space, and then growing downwards.
+pub const STACK_TOP: usize = 1 << 47;
+pub const STACK_SIZE: usize = 1024 * 1024;
+
+#[derive(Debug, Default)]
+#[repr(C)]
+pub struct SigArea {
+    pub tmp_rip: usize,
+    pub tmp_rsp: usize,
+    pub tmp_rax: usize,
+    pub tmp_rdx: usize,
+    pub tmp_rdi: usize,
+    pub tmp_rsi: usize,
+    pub tmp_r8: usize,
+    pub tmp_r10: usize,
+    pub tmp_r12: usize,
+    pub tmp_rt_inf: RtSigInfo,
+    pub tmp_id_inf: u64,
+
+    pub altstack_top: usize,
+    pub altstack_bottom: usize,
+    pub disable_signals_depth: u64,
+    pub last_sig_was_restart: bool,
+    pub last_sigstack: Option<NonNull<SigStack>>,
+}
+
+#[repr(C, align(16))]
+#[derive(Debug, Default)]
+pub struct ArchIntRegs {
+    pub ymm_upper: [u128; 16],
+    pub fxsave: [u128; 29],
+    pub r15: usize, // fxsave "available" +0
+    pub r14: usize, // available +8
+    pub r13: usize, // available +16
+    pub r12: usize, // available +24
+    pub rbp: usize, // available +32
+    pub rbx: usize, // available +40
+    pub r11: usize, // outside fxsave, and so on
+    pub r10: usize,
+    pub r9: usize,
+    pub r8: usize,
+    pub rax: usize,
+    pub rcx: usize,
+    pub rdx: usize,
+    pub rsi: usize,
+    pub rdi: usize,
+    pub rflags: usize,
+    pub rip: usize,
+    pub rsp: usize,
+}
+
+/// Deactive TLS, used before exec() on Redox to not trick target executable into thinking TLS
+/// is already initialized as if it was a thread.
+pub unsafe fn deactivate_tcb(open_via_dup: &FdGuardUpper) -> Result<()> {
+    let mut env = syscall::EnvRegisters::default();
+
+    let file = open_via_dup.dup(b"regs/env")?;
+
+    env.fsbase = 0;
+    env.gsbase = 0;
+
+    file.write(&mut env)?;
+    Ok(())
+}
+
+unsafe extern "sysv64" fn fork_impl(args: &ForkArgs, initial_rsp: *mut usize) -> usize {
+    Error::mux(fork_inner(initial_rsp, args))
+}
+
+#[allow(unsafe_op_in_unsafe_fn)]
+unsafe extern "sysv64" fn child_hook(scratchpad: &ForkScratchpad) {
+    let _ = syscall::close(scratchpad.cur_filetable_fd);
+    crate::child_hook_common(crate::ChildHookCommonArgs {
+        new_thr_fd: FdGuard::new(scratchpad.new_thr_fd),
+        new_proc_fd: if scratchpad.new_proc_fd == usize::MAX {
+            None
+        } else {
+            Some(FdGuard::new(scratchpad.new_proc_fd))
+        },
+    });
+}
+
+asmfunction!(__relibc_internal_fork_wrapper (usize) -> usize: ["
+    push rbp
+    mov rbp, rsp
+
+    push rbx
+    push rbp
+    push r12
+    push r13
+    push r14
+    push r15
+
+    sub rsp, 16
+
+    stmxcsr [rsp+16]
+    fnstcw [rsp+8]
+
+    // rdi: &ForkArgs
+    // rsi: initial_rsp
+    mov rsi, rsp
+    call {fork_impl}
+
+    add rsp, 64
+
+    pop rbp
+    ret
+
+"] <= [fork_impl = sym fork_impl]);
+asmfunction!(__relibc_internal_fork_ret: ["
+    # scratchpad is in rsi, move to rdi for child_hook
+    mov rdi, rsi
+
+    call {child_hook}
+
+    ldmxcsr [rsp + 16]
+    mov rcx, [rsp + 8]
+
+    xor rax, rax
+
+    add rsp, 16
+    pop r15
+    pop r14
+    pop r13
+    pop r12
+    pop rbp
+    pop rbx
+
+    pop rbp
+    ret
+"] <= [child_hook = sym child_hook]);
+asmfunction!(__relibc_internal_rlct_clone_ret: ["
+    # Load registers
+    pop rax
+    pop rdi
+    pop rsi
+    pop rdx
+    pop rcx
+    pop r8
+    pop r9
+
+    mov DWORD PTR [rsp - 8], 0x00001F80
+    ldmxcsr [rsp - 8]
+    mov WORD PTR [rsp - 8], 0x037F
+    fldcw [rsp - 8]
+
+    # Call entry point
+    call rax
+
+    ret
+"] <= []);
+
+asmfunction!(__relibc_internal_sigentry: ["
+    // Save some registers
+    mov fs:[{tcb_sa_off} + {sa_tmp_rsp}], rsp
+    mov fs:[{tcb_sa_off} + {sa_tmp_rax}], rax
+    mov fs:[{tcb_sa_off} + {sa_tmp_rdx}], rdx
+    mov fs:[{tcb_sa_off} + {sa_tmp_rdi}], rdi
+    mov fs:[{tcb_sa_off} + {sa_tmp_rsi}], rsi
+    mov fs:[{tcb_sa_off} + {sa_tmp_r8}], r8
+    mov fs:[{tcb_sa_off} + {sa_tmp_r10}], r10
+    mov fs:[{tcb_sa_off} + {sa_tmp_r12}], r12
+
+    // First, select signal, always pick first available bit
+1:
+    // Read standard signal word - first targeting this thread
+    mov rax, fs:[{tcb_sc_off} + {sc_word}]
+    mov rdx, rax
+    shr rdx, 32
+    and eax, edx
+    bsf eax, eax
+    jnz 2f
+
+    // If no unblocked thread signal was found, check for process.
+    // This is competitive; we need to atomically check if *we* cleared the process-wide pending
+    // bit, otherwise restart.
+    mov eax, [rip + {pctl} + {pctl_off_pending}]
+    and eax, edx
+    bsf eax, eax
+    jz 8f
+    lea rdi, [rip + {pctl} + {pctl_off_sender_infos}]
+    mov rdi, [rdi + rax * 8]
+    lock btr [rip + {pctl} + {pctl_off_pending}], eax
+    mov fs:[{tcb_sa_off} + {sa_tmp_id_inf}], rdi
+    jc 9f
+8:
+    // Read second signal word - both process and thread simultaneously.
+    // This must be done since POSIX requires low realtime signals to be picked first.
+    mov edx, fs:[{tcb_sc_off} + {sc_word} + 8]
+    mov eax, [rip + {pctl} + {pctl_off_pending} + 4]
+    or eax, edx
+    and eax, fs:[{tcb_sc_off} + {sc_word} + 12]
+    bsf eax, eax
+    jz 7f
+
+    bt edx, eax // check if signal was sent to thread specifically
+    jnc 81f
+    // if so, continue as usual
+    add eax, 32
+    jmp 2f
+81:
+    // otherwise, try (competitively) dequeueing realtime signal
+
+    // SYS_CALL(fd, payload_base, payload_len, metadata_len | (flags << 8), metadata_base)
+    // rax      rdi rsi           rdx          r10                          r8
+
+    mov r12d, eax
+    mov rsi, fs:[0]
+    mov rdi, [rip+{proc_fd}]
+    add rsi, {tcb_sa_off} + {sa_tmp_rt_inf} // out pointer of dequeued realtime sig
+    mov rdx, {RTINF_SIZE}
+    mov [rsi], eax
+    lea r8, [rip + {proc_call_sigdeq}]
+    mov r10, 1
+    mov eax, {SYS_CALL}
+    syscall
+    test eax, eax
+    jnz 1b // assumes error can only be EAGAIN
+    lea eax, [r12d + 32]
+    jmp 9f
+2:
+    mov edx, eax
+    shr edx, 5
+    mov rdi, fs:[{tcb_sc_off} + {sc_sender_infos} + eax * 8]
+    lock btr fs:[{tcb_sc_off} + {sc_word} + edx * 4], eax
+    mov fs:[{tcb_sa_off} + {sa_tmp_id_inf}], rdi
+    add eax, 64 // indicate signal was targeted at thread
+9:
+    sub rsp, {REDZONE_SIZE}
+    and rsp, -{STACK_ALIGN}
+
+    // By now we have selected a signal, stored in eax (6-bit). We now need to choose whether or
+    // not to switch to the alternate signal stack. If SA_ONSTACK is clear for this signal, then
+    // skip the sigaltstack logic.
+    lea rdx, [rip + {pctl} + {pctl_off_actions}]
+
+    mov ecx, eax
+    and ecx, 63
+
+    // LEA doesn't support 16x, so just do two x8s.
+    lea rdx, [rdx + 8 * rcx]
+    lea rdx, [rdx + 8 * rcx]
+
+    bt qword ptr [rdx], {SA_ONSTACK_BIT}
+    jnc 4f
+
+    // Otherwise, the altstack is already active. The sigaltstack being disabled, is equivalent
+    // to setting 'top' to usize::MAX and 'bottom' to 0.
+
+    // If current RSP is above altstack region, switch to altstack
+    mov rdx, fs:[{tcb_sa_off} + {sa_altstack_top}]
+    cmp rsp, rdx
+    cmova rsp, rdx
+
+    // If current RSP is below altstack region, also switch to altstack
+    cmp rsp, fs:[{tcb_sa_off} + {sa_altstack_bottom}]
+    cmovbe rsp, rdx
+
+    .p2align 4
+4:
+    // Now that we have a stack, we can finally start initializing the signal stack!
+
+    push fs:[{tcb_sa_off} + {sa_tmp_rsp}]
+    push fs:[{tcb_sc_off} + {sc_saved_rip}]
+    push fs:[{tcb_sc_off} + {sc_saved_rflags}]
+
+    push fs:[{tcb_sa_off} + {sa_tmp_rdi}]
+    push fs:[{tcb_sa_off} + {sa_tmp_rsi}]
+    push fs:[{tcb_sa_off} + {sa_tmp_rdx}]
+    push rcx
+    push fs:[{tcb_sa_off} + {sa_tmp_rax}]
+    push fs:[{tcb_sa_off} + {sa_tmp_r8}]
+    push r9
+    push fs:[{tcb_sa_off} + {sa_tmp_r10}]
+    push r11
+    push rbx
+    push rbp
+    push fs:[{tcb_sa_off} + {sa_tmp_r12}]
+    push r13
+    push r14
+    push r15
+    sub rsp, (29 + 16) * 16 // fxsave region minus available bytes
+    fxsave64 [rsp + 16 * 16]
+
+    // TODO: self-modifying?
+    cmp byte ptr [rip + {supports_avx}], 0
+    je 5f
+
+    // Prefer vextractf128 over vextracti128 since the former only requires AVX version 1.
+    vextractf128 [rsp + 15 * 16], ymm0, 1
+    vextractf128 [rsp + 14 * 16], ymm1, 1
+    vextractf128 [rsp + 13 * 16], ymm2, 1
+    vextractf128 [rsp + 12 * 16], ymm3, 1
+    vextractf128 [rsp + 11 * 16], ymm4, 1
+    vextractf128 [rsp + 10 * 16], ymm5, 1
+    vextractf128 [rsp + 9 * 16], ymm6, 1
+    vextractf128 [rsp + 8 * 16], ymm7, 1
+    vextractf128 [rsp + 7 * 16], ymm8, 1
+    vextractf128 [rsp + 6 * 16], ymm9, 1
+    vextractf128 [rsp + 5 * 16], ymm10, 1
+    vextractf128 [rsp + 4 * 16], ymm11, 1
+    vextractf128 [rsp + 3 * 16], ymm12, 1
+    vextractf128 [rsp + 2 * 16], ymm13, 1
+    vextractf128 [rsp + 16], ymm14, 1
+    vextractf128 [rsp], ymm15, 1
+5:
+    mov [rsp - 4], eax
+    sub rsp, 64 // alloc space for ucontext fields
+
+    mov rdi, rsp
+    call {inner}
+
+    add rsp, 64
+
+    fxrstor64 [rsp + 16 * 16]
+
+    cmp byte ptr [rip + {supports_avx}], 0
+    je 6f
+
+    vinsertf128 ymm0, ymm0, [rsp + 15 * 16], 1
+    vinsertf128 ymm1, ymm1, [rsp + 14 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 13 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 12 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 11 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 10 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 9 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 8 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 7 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 6 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 5 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 4 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 3 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 2 * 16], 1
+    vinsertf128 ymm2, ymm2, [rsp + 16], 1
+    vinsertf128 ymm2, ymm2, [rsp], 1
+6:
+    add rsp, (29 + 16) * 16
+
+    pop r15
+    pop r14
+    pop r13
+    pop r12
+    pop rbp
+    pop rbx
+    pop r11
+    pop r10
+    pop r9
+    pop r8
+    pop rax
+    pop rcx
+    pop rdx
+    pop rsi
+    pop rdi
+
+    popfq
+    pop qword ptr fs:[{tcb_sa_off} + {sa_tmp_rip}]
+
+    // x86 lacks atomic instructions for setting both the stack and instruction pointer
+    // simultaneously, except the slow microcoded IRETQ instruction. Thus, we let the arch_pre
+    // function emulate atomicity between the pop rsp and indirect jump.
+
+    .globl __relibc_internal_sigentry_crit_first
+__relibc_internal_sigentry_crit_first:
+
+    pop rsp
+
+    .globl __relibc_internal_sigentry_crit_second
+__relibc_internal_sigentry_crit_second:
+    jmp qword ptr fs:[{tcb_sa_off} + {sa_tmp_rip}]
+7:
+    // A spurious signal occurred. Signals are still disabled here, but will need to be re-enabled.
+
+    // restore flags
+    mov rax, fs:[0] // load FS base
+    // TODO: Use lahf/sahf rather than pushfq/popfq?
+    lea rsp, [rax + {tcb_sc_off} + {sc_saved_rflags}]
+    popfq
+
+    // restore stack
+    mov rsp, fs:[{tcb_sa_off} + {sa_tmp_rsp}]
+
+    // move saved RIP away from control, allowing arch_pre to save us if interrupted.
+    mov rax, fs:[{tcb_sc_off} + {sc_saved_rip}]
+    mov fs:[{tcb_sa_off} + {sa_tmp_rip}], rax
+
+    // restore regs
+    mov rax, fs:[{tcb_sa_off} + {sa_tmp_rax}]
+    mov rdx, fs:[{tcb_sa_off} + {sa_tmp_rdx}]
+
+    // Re-enable signals. This code can be interrupted after this signal, so we need to define
+    // 'crit_third'.
+    and qword ptr fs:[{tcb_sc_off} + {sc_control}], ~1
+
+    .globl __relibc_internal_sigentry_crit_third
+__relibc_internal_sigentry_crit_third:
+    jmp qword ptr fs:[{tcb_sa_off} + {sa_tmp_rip}]
+"] <= [
+    inner = sym inner_c,
+    sa_tmp_rip = const offset_of!(SigArea, tmp_rip),
+    sa_tmp_rsp = const offset_of!(SigArea, tmp_rsp),
+    sa_tmp_rax = const offset_of!(SigArea, tmp_rax),
+    sa_tmp_rdx = const offset_of!(SigArea, tmp_rdx),
+    sa_tmp_rdi = const offset_of!(SigArea, tmp_rdi),
+    sa_tmp_rsi = const offset_of!(SigArea, tmp_rsi),
+    sa_tmp_r8 = const offset_of!(SigArea, tmp_r8),
+    sa_tmp_r10 = const offset_of!(SigArea, tmp_r10),
+    sa_tmp_r12 = const offset_of!(SigArea, tmp_r12),
+    sa_tmp_rt_inf = const offset_of!(SigArea, tmp_rt_inf),
+    sa_tmp_id_inf = const offset_of!(SigArea, tmp_id_inf),
+    sa_altstack_top = const offset_of!(SigArea, altstack_top),
+    sa_altstack_bottom = const offset_of!(SigArea, altstack_bottom),
+    sc_saved_rflags = const offset_of!(Sigcontrol, saved_archdep_reg),
+    sc_saved_rip = const offset_of!(Sigcontrol, saved_ip),
+    sc_word = const offset_of!(Sigcontrol, word),
+    sc_sender_infos = const offset_of!(Sigcontrol, sender_infos),
+    sc_control = const offset_of!(Sigcontrol, control_flags),
+    tcb_sa_off = const offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, arch),
+    tcb_sc_off = const offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, control),
+    pctl_off_actions = const offset_of!(SigProcControl, actions),
+    pctl_off_pending = const offset_of!(SigProcControl, pending),
+    pctl_off_sender_infos = const offset_of!(SigProcControl, sender_infos),
+    pctl = sym PROC_CONTROL_STRUCT,
+    supports_avx = sym SUPPORTS_AVX,
+    REDZONE_SIZE = const 128,
+    STACK_ALIGN = const 16,
+    SA_ONSTACK_BIT = const 58, // (1 << 58) >> 32 = 0x0400_0000
+    SYS_CALL = const syscall::SYS_CALL,
+    proc_call_sigdeq = sym PROC_CALL_SIGDEQ,
+    RTINF_SIZE = const size_of::<RtSigInfo>(),
+    proc_fd = sym PROC_FD,
+]);
+
+unsafe extern "C" {
+    fn __relibc_internal_sigentry_crit_first();
+    fn __relibc_internal_sigentry_crit_second();
+    fn __relibc_internal_sigentry_crit_third();
+}
+/// Fixes some edge cases, and calculates the value for uc_stack.
+pub unsafe fn arch_pre(stack: &mut SigStack, area: &mut SigArea) -> PosixStackt {
+    // It is impossible to update RSP and RIP atomically on x86_64, without using IRETQ, which is
+    // almost as slow as calling a SIGRETURN syscall would be. Instead, we abuse the fact that
+    // signals are disabled in the prologue of the signal trampoline, which allows us to emulate
+    // atomicity inside the critical section, consisting of one instruction at 'crit_first', one at
+    // 'crit_second', and one at 'crit_third', see asm.
+
+    if stack.regs.rip == __relibc_internal_sigentry_crit_first as usize {
+        // Reexecute pop rsp and jump steps. This case needs to be different from the one below,
+        // since rsp has not been overwritten with the previous context's stack, just yet. At this
+        // point, we know [rsp+0] contains the saved RSP, and [rsp-8] contains the saved RIP.
+        let stack_ptr = stack.regs.rsp as *const usize;
+        stack.regs.rsp = unsafe { stack_ptr.read() };
+        stack.regs.rip = unsafe { stack_ptr.sub(1).read() };
+    } else if stack.regs.rip == __relibc_internal_sigentry_crit_second as usize
+        || stack.regs.rip == __relibc_internal_sigentry_crit_third as usize
+    {
+        // Almost finished, just reexecute the jump before tmp_rip is overwritten by this
+        // deeper-level signal.
+        stack.regs.rip = area.tmp_rip;
+    }
+
+    get_sigaltstack(area, stack.regs.rsp).into()
+}
+
+/// Rearrange the restore-stack and sigarea in a way that makes it look like a new signal was
+/// immediately delivered after restoring the allowset to what it was prior to the original signal delivery.
+pub fn arch_ret_to_sig(stack: &mut SigStack, control: &Sigcontrol) {
+    let orig_rip = core::mem::replace(&mut stack.regs.rip, __relibc_internal_sigentry as usize);
+    control.saved_ip.set(orig_rip);
+    control.saved_archdep_reg.set(stack.regs.rflags);
+}
+
+pub(crate) static SUPPORTS_AVX: AtomicU8 = AtomicU8::new(0);
+
+// __relibc will be prepended to the name, so no_mangle is fine
+#[allow(unsafe_op_in_unsafe_fn)]
+#[unsafe(no_mangle)]
+pub unsafe fn manually_enter_trampoline() {
+    let c = &Tcb::current().unwrap().os_specific.control;
+    c.control_flags.store(
+        c.control_flags.load(Ordering::Relaxed) | syscall::flag::INHIBIT_DELIVERY.bits(),
+        Ordering::Release,
+    );
+    c.saved_archdep_reg.set(0); // TODO: Just reset DF on x86?
+
+    core::arch::asm!("
+        lea rax, [rip + 2f]
+        mov fs:[{tcb_sc_off} + {sc_saved_rip}], rax
+        jmp __relibc_internal_sigentry
+    2:
+    ",
+        out("rax") _,
+        tcb_sc_off = const offset_of!(crate::Tcb, os_specific) + offset_of!(RtSigarea, control),
+        sc_saved_rip = const offset_of!(Sigcontrol, saved_ip),
+    );
+}
+
+/// Get current stack pointer, weak granularity guarantees.
+pub fn current_sp() -> usize {
+    let sp: usize;
+    unsafe {
+        core::arch::asm!("mov {}, rsp", out(reg) sp);
+    }
+    sp
+}
+
+static PROC_CALL_SIGDEQ: u64 = ProcCall::Sigdeq as u64;
+pub(crate) static PROC_FD: SyncUnsafeCell<usize> = SyncUnsafeCell::new(usize::MAX);
diff --git a/recipes/core/relibc/redox-rt/src/lib.rs b/recipes/core/relibc/redox-rt/src/lib.rs
new file mode 100644
index 0000000000..12835a6a7a
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/lib.rs
@@ -0,0 +1,313 @@
+#![no_std]
+#![allow(internal_features)]
+#![deny(unsafe_op_in_unsafe_fn)]
+#![feature(core_intrinsics, int_roundings, slice_ptr_get, sync_unsafe_cell)]
+#![forbid(unreachable_patterns)]
+
+use core::cell::UnsafeCell;
+
+#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
+use generic_rt::ExpectTlsFree; // not used on aarch64 or riscv64
+use generic_rt::GenericTcb;
+use redox_protocols::protocol::ProcMeta;
+use syscall::Sigcontrol;
+
+use self::{
+    proc::{FdGuard, FdGuardUpper, STATIC_PROC_INFO},
+    sync::Mutex,
+};
+
+extern crate alloc;
+
+#[macro_export]
+macro_rules! asmfunction(
+    ($name:ident $(($($arg:ty),*))? $(-> $ret:ty)? : [$($asmstmt:expr),*$(,)?] <= [$($decl:ident = $(sym $symname:ident)?$(const $constval:expr)?),*$(,)?]$(,)? ) => {
+        ::core::arch::global_asm!(concat!("
+            .p2align 4
+            .section .text.", stringify!($name), ", \"ax\", @progbits
+            .globl ", stringify!($name), "
+            .type ", stringify!($name), ", @function
+        ", stringify!($name), ":
+        ", $($asmstmt, "\n",)* "
+            .size ", stringify!($name), ", . - ", stringify!($name), "
+        "), $($decl = $(sym $symname)?$(const $constval)?),*);
+
+        unsafe extern "C" {
+            pub fn $name($($(_: $arg),*)?) $(-> $ret)?;
+        }
+    }
+);
+
+pub mod arch;
+pub mod proc;
+
+// TODO: Replace auxvs with a non-stack-based interface, but keep getauxval for compatibility
+#[path = "../../src/platform/auxv_defs.rs"]
+pub mod auxv_defs;
+
+pub mod signal;
+pub mod sync;
+pub mod sys;
+pub mod thread;
+
+#[derive(Debug, Default)]
+pub struct RtTcb {
+    pub control: Sigcontrol,
+    pub arch: UnsafeCell<crate::arch::SigArea>,
+    pub thr_fd: UnsafeCell<Option<FdGuardUpper>>,
+}
+impl RtTcb {
+    pub fn current() -> &'static Self {
+        unsafe { &Tcb::current().unwrap().os_specific }
+    }
+    pub fn thread_fd(&self) -> &FdGuardUpper {
+        unsafe { (&*self.thr_fd.get()).as_ref().unwrap() }
+    }
+}
+
+pub type Tcb = GenericTcb<RtTcb>;
+
+/// OS and architecture specific code to activate TLS - Redox aarch64
+#[allow(unsafe_op_in_unsafe_fn)]
+#[cfg(target_arch = "aarch64")]
+pub unsafe fn tcb_activate(_tcb: &RtTcb, tls_end: usize, tls_len: usize) {
+    // Uses ABI page
+    let abi_ptr = tls_end - tls_len - 16;
+    core::ptr::write(abi_ptr as *mut usize, tls_end);
+    core::arch::asm!(
+        "msr tpidr_el0, {}",
+        in(reg) abi_ptr,
+    );
+}
+
+/// OS and architecture specific code to activate TLS - Redox x86
+#[allow(unsafe_op_in_unsafe_fn)]
+#[cfg(target_arch = "x86")]
+pub unsafe fn tcb_activate(tcb: &RtTcb, tls_end: usize, _tls_len: usize) {
+    let mut env = syscall::EnvRegisters::default();
+
+    let file = tcb
+        .thread_fd()
+        .dup(b"regs/env")
+        .expect_notls("failed to open handle for process registers");
+
+    file.read(&mut env).expect_notls("failed to read gsbase");
+
+    env.gsbase = tls_end as u32;
+
+    file.write(&env).expect_notls("failed to write gsbase");
+}
+
+/// OS and architecture specific code to activate TLS - Redox x86_64
+#[allow(unsafe_op_in_unsafe_fn)]
+#[cfg(target_arch = "x86_64")]
+pub unsafe fn tcb_activate(tcb: &RtTcb, tls_end_and_tcb_start: usize, _tls_len: usize) {
+    let mut env = syscall::EnvRegisters::default();
+
+    let file = tcb
+        .thread_fd()
+        .dup(b"regs/env")
+        .expect_notls("failed to open handle for process registers");
+
+    file.read(&mut env).expect_notls("failed to read fsbase");
+
+    env.fsbase = tls_end_and_tcb_start as u64;
+
+    file.write(&env).expect_notls("failed to write fsbase");
+}
+
+/// OS and architecture specific code to activate TLS - Redox riscv64
+#[allow(unsafe_op_in_unsafe_fn)]
+#[cfg(target_arch = "riscv64")]
+pub unsafe fn tcb_activate(_tcb: &RtTcb, tls_end: usize, tls_len: usize) {
+    // tp points to static tls block
+    // FIXME limited to a single initial master
+    let tls_start = tls_end - tls_len;
+    let abi_ptr = tls_start - 8;
+    core::ptr::write(abi_ptr as *mut usize, tls_end);
+    core::arch::asm!(
+        "mv tp, {}",
+        in(reg) tls_start
+    );
+}
+
+/// Initialize redox-rt in situations where relibc is not used
+#[allow(unsafe_op_in_unsafe_fn)]
+#[cfg(not(feature = "proc"))]
+pub unsafe fn initialize_freestanding(this_thr_fd: FdGuardUpper) -> &'static FdGuardUpper {
+    // TODO: This code is a hack! Integrate the ld_so TCB code into generic-rt, and then use that
+    // (this function will need pointers to the ELF structs normally passed in auxvs), so the TCB
+    // is initialized properly.
+
+    // TODO: TLS
+    let page = {
+        &mut *(syscall::fmap(
+            !0,
+            &syscall::Map {
+                offset: 0,
+                size: syscall::PAGE_SIZE,
+                flags: syscall::MapFlags::PROT_READ
+                    | syscall::MapFlags::PROT_WRITE
+                    | syscall::MapFlags::MAP_PRIVATE,
+                address: 0,
+            },
+        )
+        .unwrap() as *mut Tcb)
+    };
+    page.tcb_ptr = page;
+    page.tcb_len = syscall::PAGE_SIZE;
+    page.tls_end = (page as *mut Tcb).cast();
+
+    // Make sure to use ptr::write to prevent dropping the existing FdGuard
+    page.os_specific.thr_fd.get().write(Some(this_thr_fd));
+
+    #[cfg(not(any(target_arch = "aarch64", target_arch = "riscv64")))]
+    unsafe {
+        let tcb_addr = page as *mut Tcb as usize;
+        tcb_activate(&page.os_specific, tcb_addr, 0)
+    }
+    #[cfg(target_arch = "aarch64")]
+    unsafe {
+        let abi_ptr = core::ptr::addr_of_mut!(page.tcb_ptr);
+        core::arch::asm!("msr tpidr_el0, {}", in(reg) abi_ptr);
+    }
+    #[cfg(target_arch = "riscv64")]
+    unsafe {
+        let abi_ptr = core::ptr::addr_of_mut!(page.tcb_ptr) as usize;
+        core::arch::asm!("mv tp, {}", in(reg) (abi_ptr + 8));
+    }
+    initialize();
+
+    (*page.os_specific.thr_fd.get()).as_ref().unwrap()
+}
+pub(crate) fn read_proc_meta(proc: &FdGuardUpper) -> syscall::Result<ProcMeta> {
+    let mut bytes = [0_u8; size_of::<ProcMeta>()];
+    proc.read(&mut bytes)?;
+    Ok(*plain::from_bytes::<ProcMeta>(&bytes).unwrap())
+}
+pub unsafe fn initialize(
+    #[cfg(feature = "proc")] proc_fd: FdGuardUpper,
+    #[cfg(feature = "proc")] ns_fd: Option<FdGuardUpper>,
+) {
+    #[cfg(feature = "proc")]
+    let metadata = read_proc_meta(&proc_fd).unwrap();
+
+    #[cfg(not(feature = "proc"))]
+    // Bootstrap mode, don't associate proc fds with PIDs
+    let metadata = ProcMeta::default();
+
+    #[cfg(feature = "proc")]
+    {
+        unsafe { crate::arch::PROC_FD.get().write(proc_fd.as_raw_fd()) };
+    }
+
+    unsafe {
+        STATIC_PROC_INFO.get().write(StaticProcInfo {
+            pid: metadata.pid,
+
+            #[cfg(feature = "proc")]
+            proc_fd: Some(proc_fd),
+
+            #[cfg(not(feature = "proc"))]
+            proc_fd: None,
+        })
+    };
+
+    #[cfg(feature = "proc")]
+    {
+        *DYNAMIC_PROC_INFO.lock() = DynamicProcInfo {
+            pgid: metadata.pgid,
+            ruid: metadata.ruid,
+            euid: metadata.euid,
+            suid: metadata.suid,
+            egid: metadata.egid,
+            rgid: metadata.rgid,
+            sgid: metadata.sgid,
+            ns_fd,
+        };
+    }
+}
+
+pub(crate) struct StaticProcInfo {
+    pid: u32,
+    proc_fd: Option<FdGuardUpper>,
+}
+pub struct DynamicProcInfo {
+    pub pgid: u32,
+    pub euid: u32,
+    pub suid: u32,
+    pub ruid: u32,
+    pub egid: u32,
+    pub rgid: u32,
+    pub sgid: u32,
+    pub ns_fd: Option<FdGuardUpper>,
+}
+
+static DYNAMIC_PROC_INFO: Mutex<DynamicProcInfo> = Mutex::new(DynamicProcInfo {
+    pgid: u32::MAX,
+    ruid: u32::MAX,
+    euid: u32::MAX,
+    suid: u32::MAX,
+    rgid: u32::MAX,
+    egid: u32::MAX,
+    sgid: u32::MAX,
+    ns_fd: None,
+});
+
+#[inline]
+pub(crate) fn static_proc_info() -> &'static StaticProcInfo {
+    unsafe { &*STATIC_PROC_INFO.get() }
+}
+#[inline]
+pub fn current_proc_fd() -> &'static FdGuardUpper {
+    let info = static_proc_info();
+    info.proc_fd.as_ref().unwrap()
+}
+#[inline]
+pub fn current_namespace_fd() -> syscall::Result<usize> {
+    DYNAMIC_PROC_INFO
+        .lock()
+        .ns_fd
+        .as_ref()
+        .map(|g| g.as_raw_fd())
+        .ok_or(syscall::Error::new(syscall::ENOENT))
+}
+struct ChildHookCommonArgs {
+    new_thr_fd: FdGuard,
+    new_proc_fd: Option<FdGuard>,
+}
+
+unsafe fn child_hook_common(args: ChildHookCommonArgs) {
+    let new_thr_fd = args.new_thr_fd.to_upper().unwrap();
+    let new_proc_fd = args.new_proc_fd.map(|x| x.to_upper().unwrap());
+
+    // TODO: just pass PID to child rather than obtaining it via IPC?
+    #[cfg(feature = "proc")]
+    let metadata = read_proc_meta(
+        new_proc_fd
+            .as_ref()
+            .expect("must be present with proc feature"),
+    )
+    .unwrap();
+
+    #[cfg(not(feature = "proc"))]
+    let metadata = ProcMeta::default();
+
+    if let Some(proc_fd) = &new_proc_fd {
+        unsafe { crate::arch::PROC_FD.get().write(proc_fd.as_raw_fd()) };
+    }
+
+    let old_proc_fd = unsafe {
+        STATIC_PROC_INFO
+            .get()
+            .replace(StaticProcInfo {
+                pid: metadata.pid,
+                proc_fd: new_proc_fd,
+            })
+            .proc_fd
+    };
+    drop(old_proc_fd);
+
+    let old_thr_fd = unsafe { RtTcb::current().thr_fd.get().replace(Some(new_thr_fd)) };
+    drop(old_thr_fd);
+}
diff --git a/recipes/core/relibc/redox-rt/src/proc.rs b/recipes/core/relibc/redox-rt/src/proc.rs
new file mode 100644
index 0000000000..48cce3453d
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/proc.rs
@@ -0,0 +1,1190 @@
+use core::{cell::SyncUnsafeCell, cmp, fmt::Debug, ops::Range};
+
+use crate::{
+    DYNAMIC_PROC_INFO, RtTcb, StaticProcInfo,
+    arch::*,
+    auxv_defs::*,
+    read_proc_meta,
+    sys::{fstat, open, proc_call, thread_call},
+};
+use redox_protocols::protocol::{ProcCall, ThreadCall};
+
+use alloc::{boxed::Box, vec};
+
+use goblin::elf::header::ET_DYN;
+//TODO: allow use of either 32-bit or 64-bit programs
+#[cfg(target_pointer_width = "32")]
+use goblin::elf32::{
+    header::Header,
+    program_header::program_header32::{PF_R, PF_W, PF_X, PT_INTERP, PT_LOAD, ProgramHeader},
+};
+#[cfg(target_pointer_width = "64")]
+use goblin::elf64::{
+    header::Header,
+    program_header::program_header64::{PF_R, PF_W, PF_X, PT_INTERP, PT_LOAD, ProgramHeader},
+};
+
+use syscall::{
+    CallFlags, F_GETFD, GrantDesc, GrantFlags, MAP_FIXED_NOREPLACE, MAP_SHARED, Map, O_CLOEXEC,
+    PAGE_SIZE, PROT_EXEC, PROT_READ, PROT_WRITE, SetSighandlerData,
+    error::*,
+    flag::{MapFlags, SEEK_SET},
+};
+
+pub enum FexecResult {
+    Interp {
+        path: Box<[u8]>,
+        interp_override: InterpOverride,
+    },
+}
+pub struct InterpOverride {
+    phdrs_vaddr: usize,
+    at_entry: usize,
+    at_phnum: usize,
+    at_phent: usize,
+    name: Box<[u8]>,
+    min_mmap_addr: usize,
+    grants_fd: usize,
+}
+
+pub struct ExtraInfo<'a> {
+    pub cwd: Option<&'a [u8]>,
+    // POSIX states that while sigactions are reset, ignored sigactions will remain ignored.
+    pub sigignmask: u64,
+    // POSIX also states that the sigprocmask must be preserved across execs.
+    pub sigprocmask: u64,
+    /// File mode creation mask (POSIX)
+    pub umask: u32,
+    /// Thread handle
+    pub thr_fd: usize,
+    /// Process handle
+    pub proc_fd: usize,
+    /// Namespace handle
+    pub ns_fd: Option<usize>,
+    /// CWD handle
+    pub cwd_fd: Option<usize>,
+}
+
+pub fn fexec_impl(
+    image_file: FdGuardUpper,
+    thread_fd: &FdGuardUpper,
+    proc_fd: &FdGuardUpper,
+    path: &[u8],
+    args: &[&[u8]],
+    envs: &[&[u8]],
+    extrainfo: &ExtraInfo,
+    interp_override: Option<InterpOverride>,
+) -> Result<FexecResult> {
+    // Here, we do the minimum part of loading an application, which is what the kernel used to do.
+    // We load the executable into memory (albeit at different offsets in this executable), fix
+    // some misalignments, and then switch address space.
+
+    let mut header_bytes = [0_u8; size_of::<Header>()];
+    pread_all(&image_file, 0, &mut header_bytes)?;
+    let header = Header::from_bytes(&header_bytes);
+
+    let grants_fd = if let Some(interp) = interp_override.as_ref() {
+        FdGuard::new(interp.grants_fd).to_upper()?
+    } else {
+        let current_addrspace_fd = thread_fd.dup(b"addrspace")?;
+        current_addrspace_fd.dup(b"empty")?.to_upper()?
+    };
+
+    // Never allow more than 1 MiB of program headers.
+    const MAX_PH_SIZE: usize = 1024 * 1024;
+    let phentsize = u64::from(header.e_phentsize) as usize;
+    let phnum = u64::from(header.e_phnum) as usize;
+    let pheaders_size = phentsize
+        .saturating_mul(phnum)
+        .saturating_add(size_of::<Header>());
+
+    if pheaders_size > MAX_PH_SIZE {
+        return Err(Error::new(E2BIG));
+    }
+    let mut phs_raw = vec![0_u8; pheaders_size];
+    phs_raw[..size_of::<Header>()].copy_from_slice(&header_bytes);
+    let phs = &mut phs_raw[size_of::<Header>()..];
+
+    // TODO: Remove clone, but this would require more as_refs and as_muts
+    let mut min_mmap_addr = interp_override
+        .as_ref()
+        .map(|interp| interp.min_mmap_addr)
+        .unwrap_or(PAGE_SIZE);
+    let mut update_min_mmap_addr = |addr: usize, size: usize| {
+        min_mmap_addr = cmp::max(min_mmap_addr, (addr + size).next_multiple_of(PAGE_SIZE));
+    };
+
+    pread_all(&image_file, u64::from(header.e_phoff), phs).map_err(|_| Error::new(EIO))?;
+
+    let mut span: Option<Range<usize>> = None;
+    for ph_idx in 0..phnum {
+        let ph_bytes = &phs[ph_idx * phentsize..(ph_idx + 1) * phentsize];
+        let segment: &ProgramHeader =
+            plain::from_bytes(ph_bytes).map_err(|_| Error::new(EINVAL))?;
+        if segment.p_type != PT_LOAD {
+            continue;
+        }
+
+        let voff = segment.p_vaddr as usize % PAGE_SIZE;
+        let vaddr = segment.p_vaddr as usize - voff;
+        let vsize = (segment.p_memsz as usize + voff).next_multiple_of(segment.p_align as usize);
+        let b = vaddr..vaddr + vsize;
+
+        span = Some(if let Some(a) = span {
+            a.start.min(b.start)..a.end.max(b.end)
+        } else {
+            b
+        });
+    }
+    let span = span.expect("ELF executables must contain at least one `PT_LOAD` segment");
+    let span_size = (span.end - span.start).next_multiple_of(PAGE_SIZE);
+
+    let base_addr = if header.e_type == ET_DYN {
+        // PIE
+        let addr = mmap_anon_remote(&grants_fd, 0, 0, span_size, MapFlags::PROT_NONE)?;
+        update_min_mmap_addr(addr, span_size);
+        addr
+    } else {
+        mmap_anon_remote(
+            &grants_fd,
+            0,
+            span.start,
+            span_size,
+            MapFlags::MAP_FIXED_NOREPLACE,
+        )?;
+        update_min_mmap_addr(span.start, span_size);
+        0
+    };
+
+    let mut phdrs_vaddr = 0;
+    let mut interpreter = None;
+
+    for ph_idx in 0..phnum {
+        let ph_bytes = &phs[ph_idx * phentsize..(ph_idx + 1) * phentsize];
+        let segment: &ProgramHeader =
+            plain::from_bytes(ph_bytes).map_err(|_| Error::new(EINVAL))?;
+        let mut flags = if segment.p_flags & PF_R == PF_R {
+            syscall::PROT_READ
+        } else {
+            syscall::PROT_NONE
+        };
+
+        // W ^ X. If it is executable, do not allow it to be writable, even if requested
+        if segment.p_flags & PF_X == PF_X {
+            flags |= syscall::PROT_EXEC;
+        } else if segment.p_flags & PF_W == PF_W {
+            flags |= syscall::PROT_WRITE;
+        }
+
+        match segment.p_type {
+            // PT_INTERP must come before any PT_LOAD, so we don't have to iterate twice.
+            PT_INTERP => {
+                let mut interp = vec![0_u8; segment.p_filesz as usize];
+                pread_all(&image_file, u64::from(segment.p_offset), &mut interp)?;
+
+                interpreter = Some(interp.into_boxed_slice());
+            }
+            PT_LOAD => {
+                let voff = segment.p_vaddr as usize % PAGE_SIZE;
+                let vaddr = segment.p_vaddr as usize - voff;
+                let filesz = segment.p_filesz as usize;
+
+                let total_page_count = (segment.p_memsz as usize + voff).div_ceil(PAGE_SIZE);
+
+                // The case where segments overlap so that they share one page, is not handled.
+                // TODO: Should it be?
+
+                if segment.p_filesz > segment.p_memsz {
+                    return Err(Error::new(ENOEXEC));
+                }
+
+                mmap_anon_remote(
+                    &grants_fd,
+                    0,
+                    base_addr + vaddr,
+                    total_page_count * PAGE_SIZE,
+                    flags | MapFlags::MAP_FIXED,
+                )?;
+
+                if segment.p_offset <= header.e_phoff
+                    && header.e_phoff < segment.p_offset + segment.p_filesz
+                {
+                    phdrs_vaddr =
+                        (header.e_phoff - segment.p_offset + segment.p_vaddr) as usize + base_addr;
+                }
+
+                // TODO: Attempt to mmap with MAP_PRIVATE directly from the image file instead.
+
+                if filesz > 0 {
+                    let (_guard, dst_memory) = unsafe {
+                        MmapGuard::map_mut_anywhere(
+                            &grants_fd,
+                            base_addr + vaddr,                           // offset
+                            (voff + filesz).next_multiple_of(PAGE_SIZE), // size
+                        )?
+                    };
+                    pread_all(
+                        &image_file,
+                        u64::from(segment.p_offset),
+                        &mut dst_memory[voff..voff + filesz],
+                    )?;
+                }
+            }
+            _ => continue,
+        }
+    }
+
+    if let Some(interpreter_path) = interpreter {
+        return Ok(FexecResult::Interp {
+            path: interpreter_path,
+            interp_override: InterpOverride {
+                at_entry: base_addr + header.e_entry as usize,
+                at_phnum: phnum,
+                at_phent: phentsize,
+                phdrs_vaddr,
+                name: path.into(),
+                min_mmap_addr,
+                grants_fd: grants_fd.take(),
+            },
+        });
+    }
+
+    mmap_anon_remote(
+        &grants_fd,
+        0,
+        STACK_TOP - STACK_SIZE,
+        STACK_SIZE,
+        MapFlags::PROT_READ | MapFlags::PROT_WRITE | MapFlags::MAP_FIXED_NOREPLACE,
+    )?;
+
+    let mut sp = STACK_TOP;
+    let mut stack_page = Option::<MmapGuard>::None;
+
+    let mut push = |word: usize| -> Result<()> {
+        let old_page_no = sp / PAGE_SIZE;
+        sp -= size_of::<usize>();
+        let new_page_no = sp / PAGE_SIZE;
+        let new_page_off = sp % PAGE_SIZE;
+
+        let page = if let Some(ref mut page) = stack_page
+            && old_page_no == new_page_no
+        {
+            page
+        } else if let Some(ref mut stack_page) = stack_page {
+            stack_page.remap(new_page_no * PAGE_SIZE, PROT_READ | PROT_WRITE)?;
+            stack_page
+        } else {
+            let new = MmapGuard::map(
+                &grants_fd,
+                &Map {
+                    offset: new_page_no * PAGE_SIZE,
+                    size: PAGE_SIZE,
+                    flags: PROT_READ | PROT_WRITE,
+                    address: 0, // let kernel decide
+                },
+            )?;
+
+            stack_page.insert(new)
+        };
+
+        unsafe {
+            page.as_mut_ptr_slice()
+                .as_mut_ptr()
+                .add(new_page_off)
+                .cast::<usize>()
+                .write(word);
+        }
+
+        Ok(())
+    };
+
+    push(0)?;
+    push(AT_NULL)?;
+    if let Some(ref r#override) = interp_override {
+        push(r#override.at_entry)?;
+        push(AT_ENTRY)?;
+        push(base_addr)?;
+        push(AT_BASE)?;
+        push(r#override.phdrs_vaddr)?;
+        push(AT_PHDR)?;
+    } else {
+        push(base_addr + header.e_entry as usize)?;
+        push(AT_ENTRY)?;
+        push(phdrs_vaddr)?;
+        push(AT_PHDR)?;
+    }
+    push(
+        interp_override
+            .as_ref()
+            .map_or(header.e_phnum as usize, |o| o.at_phnum),
+    )?;
+    push(AT_PHNUM)?;
+    push(
+        interp_override
+            .as_ref()
+            .map_or(header.e_phentsize as usize, |o| o.at_phent),
+    )?;
+    push(AT_PHENT)?;
+
+    let total_args_envs_auxvpointee_size = args.iter().map(|arg| arg.len() + 1).sum::<usize>()
+        + envs.iter().map(|env| env.len() + 1).sum::<usize>()
+        + extrainfo.cwd.map_or(0, |s| s.len() + 1);
+    let args_envs_size_aligned = total_args_envs_auxvpointee_size.next_multiple_of(PAGE_SIZE);
+    let target_args_env_address = mmap_anon_remote(
+        &grants_fd,
+        0,
+        0,
+        args_envs_size_aligned,
+        MapFlags::PROT_READ | MapFlags::PROT_WRITE,
+    )?;
+    update_min_mmap_addr(target_args_env_address, args_envs_size_aligned);
+
+    let mut offset = 0;
+
+    let mut argc = 0;
+
+    {
+        let mut append = |source_slice: &[u8]| -> Result<usize> {
+            // TODO
+            let address = target_args_env_address + offset;
+
+            if !source_slice.is_empty() {
+                let containing_page = address.div_floor(PAGE_SIZE) * PAGE_SIZE;
+                let displacement = address - containing_page;
+                let size = source_slice.len() + displacement;
+                let aligned_size = size.next_multiple_of(PAGE_SIZE);
+
+                let (_guard, memory) = unsafe {
+                    MmapGuard::map_mut_anywhere(&grants_fd, containing_page, aligned_size)?
+                };
+                memory[displacement..][..source_slice.len()].copy_from_slice(source_slice);
+            }
+
+            offset += source_slice.len() + 1;
+            Ok(address)
+        };
+
+        if let Some(cwd) = extrainfo.cwd {
+            push(append(cwd)?)?;
+            push(AT_REDOX_INITIAL_CWD_PTR)?;
+            push(cwd.len())?;
+            push(AT_REDOX_INITIAL_CWD_LEN)?;
+        }
+
+        #[cfg(target_pointer_width = "32")]
+        {
+            push((extrainfo.sigignmask >> 32) as usize)?;
+            push(AT_REDOX_INHERITED_SIGIGNMASK_HI)?;
+        }
+        push(extrainfo.sigignmask as usize)?;
+        push(AT_REDOX_INHERITED_SIGIGNMASK)?;
+        #[cfg(target_pointer_width = "32")]
+        {
+            push((extrainfo.sigprocmask >> 32) as usize)?;
+            push(AT_REDOX_INHERITED_SIGPROCMASK_HI)?;
+        }
+        push(extrainfo.sigprocmask as usize)?;
+        push(AT_REDOX_INHERITED_SIGPROCMASK)?;
+
+        push(extrainfo.umask as usize)?;
+        push(AT_REDOX_UMASK)?;
+
+        push(extrainfo.thr_fd as usize)?;
+        push(AT_REDOX_THR_FD)?;
+        push(extrainfo.proc_fd as usize)?;
+        push(AT_REDOX_PROC_FD)?;
+        push(extrainfo.ns_fd.unwrap_or(usize::MAX))?;
+        push(AT_REDOX_NS_FD)?;
+        push(extrainfo.cwd_fd.unwrap_or(usize::MAX))?;
+        push(AT_REDOX_CWD_FD)?;
+
+        push(0)?;
+
+        for env in envs.iter().rev() {
+            push(append(env)?)?;
+        }
+
+        push(0)?;
+
+        for arg in args.iter().rev() {
+            push(append(arg)?)?;
+            argc += 1;
+        }
+    }
+
+    push(argc)?;
+
+    if let Ok(sighandler_fd) = thread_fd.dup(b"sighandler") {
+        let _ = sighandler_fd.write(&SetSighandlerData {
+            user_handler: 0,
+            excp_handler: 0,
+            thread_control_addr: 0,
+            proc_control_addr: 0,
+        });
+        // TODO: sync with procmgr
+    }
+
+    // TODO: Restore old name if exec failed?
+    {
+        let mut buf = [0; 32];
+        let new_name = interp_override.as_ref().map_or(path, |o| &o.name);
+        let len = new_name.len().min(32);
+        buf[..len].copy_from_slice(&new_name[..len]);
+        // XXX: takes &mut [] since it can mutate, but we could unsafe{}ly pass it directly
+        // otherwise
+        let _ = proc_call(
+            proc_fd.as_raw_fd(),
+            &mut buf,
+            CallFlags::empty(),
+            &[ProcCall::Rename as u64],
+        );
+    }
+
+    // TODO: Error handling
+    let _ = proc_call(
+        proc_fd.as_raw_fd(),
+        &mut [],
+        CallFlags::empty(),
+        &[ProcCall::DisableSetpgid as u64],
+    );
+
+    if interp_override.is_some() {
+        let mmap_min_fd = grants_fd.dup(b"mmap-min-addr")?;
+        let _ = mmap_min_fd.write(&usize::to_ne_bytes(min_mmap_addr));
+    }
+
+    let addrspace_selection_fd = thread_fd.dup(b"current-addrspace")?.to_upper()?;
+
+    let _ = addrspace_selection_fd.write(&create_set_addr_space_buf(
+        grants_fd.as_raw_fd(),
+        base_addr + header.e_entry as usize,
+        sp,
+    ));
+
+    // Close all O_CLOEXEC file descriptors. TODO: close_range?
+    {
+        // NOTE: This approach of implementing O_CLOEXEC will not work in multithreaded
+        // scenarios. While execve() is undefined according to POSIX if there exist sibling
+        // threads, it could still be allowed by keeping certain file descriptors and instead
+        // set the active file table.
+        let files_fd = syscall::dup(thread_fd.as_raw_fd(), b"filetable-binary")?;
+        let mut files_reader = FileBufReader::from_fd(files_fd);
+        loop {
+            let fd = match files_reader.read_le_u64()? {
+                None => break,
+                Some(fd) => fd,
+            };
+            let fd = usize::try_from(fd).unwrap();
+
+            if fd == addrspace_selection_fd.as_raw_fd() || fd == files_fd {
+                continue; // Will be closed below
+            }
+
+            let flags = syscall::fcntl(fd, F_GETFD, 0)?;
+
+            if flags & O_CLOEXEC == O_CLOEXEC {
+                let _ = syscall::close(fd);
+            }
+        }
+    }
+
+    unsafe {
+        deactivate_tcb(&thread_fd)?;
+    }
+
+    // Dropping this FD will cause the address space switch.
+    drop(addrspace_selection_fd);
+
+    unreachable!();
+}
+fn write_usizes<const N: usize>(fd: &FdGuardUpper, usizes: [usize; N]) -> Result<usize> {
+    fd.write(unsafe { plain::as_bytes(&usizes) })
+}
+pub fn mmap_remote(
+    addrspace_fd: &FdGuardUpper,
+    fd: &FdGuardUpper,
+    offset: usize,
+    dst_addr: usize,
+    len: usize,
+    flags: MapFlags,
+) -> Result<usize> {
+    write_usizes(
+        addrspace_fd,
+        [
+            // op
+            syscall::flag::ADDRSPACE_OP_MMAP,
+            // fd
+            fd.as_raw_fd(),
+            // "offset"
+            offset,
+            // address
+            dst_addr,
+            // size
+            len,
+            // flags
+            flags.bits(),
+        ],
+    )
+}
+pub fn mmap_anon_remote(
+    addrspace_fd: &FdGuardUpper,
+    offset: usize,
+    dst_addr: usize,
+    len: usize,
+    flags: MapFlags,
+) -> Result<usize> {
+    write_usizes(
+        addrspace_fd,
+        [
+            // op
+            syscall::flag::ADDRSPACE_OP_MMAP,
+            // fd
+            !0,
+            // "offset"
+            offset,
+            // address
+            dst_addr,
+            // size
+            len,
+            // flags
+            flags.bits(),
+        ],
+    )
+}
+pub fn mprotect_remote(
+    addrspace_fd: &FdGuardUpper,
+    addr: usize,
+    len: usize,
+    flags: MapFlags,
+) -> Result<()> {
+    write_usizes(
+        addrspace_fd,
+        [
+            // op
+            syscall::flag::ADDRSPACE_OP_MPROTECT,
+            // address
+            addr,
+            // size
+            len,
+            // flags
+            flags.bits(),
+        ],
+    )?;
+    Ok(())
+}
+pub fn munmap_remote(addrspace_fd: &FdGuardUpper, addr: usize, len: usize) -> Result<()> {
+    write_usizes(
+        addrspace_fd,
+        [
+            // op
+            syscall::flag::ADDRSPACE_OP_MUNMAP,
+            // address
+            addr,
+            // size
+            len,
+        ],
+    )?;
+    Ok(())
+}
+pub fn munmap_transfer(
+    src: &FdGuardUpper,
+    dst: &FdGuardUpper,
+    src_addr: usize,
+    dst_addr: usize,
+    len: usize,
+    flags: MapFlags,
+) -> Result<()> {
+    write_usizes(
+        dst,
+        [
+            // op
+            syscall::flag::ADDRSPACE_OP_TRANSFER,
+            // fd
+            src.as_raw_fd(),
+            // "offset" (source address)
+            src_addr,
+            // address
+            dst_addr,
+            // size
+            len,
+            // flags
+            (flags | MapFlags::MAP_FIXED_NOREPLACE).bits(),
+        ],
+    )?;
+    Ok(())
+}
+fn pread_all(fd: &FdGuardUpper, offset: u64, buf: &mut [u8]) -> Result<()> {
+    fd.lseek(offset as isize, SEEK_SET)?;
+
+    let mut total_bytes_read = 0;
+
+    while total_bytes_read < buf.len() {
+        total_bytes_read += match fd.read(&mut buf[total_bytes_read..])? {
+            0 => return Err(Error::new(ENOEXEC)),
+            bytes_read => bytes_read,
+        }
+    }
+    Ok(())
+}
+
+pub struct MmapGuard<'a> {
+    fd: &'a FdGuardUpper,
+    base: usize,
+    size: usize,
+}
+impl<'a> MmapGuard<'a> {
+    pub fn map(fd: &'a FdGuardUpper, map: &Map) -> Result<Self> {
+        let base = unsafe { syscall::fmap(fd.as_raw_fd(), map)? };
+        Ok(Self {
+            fd,
+            size: map.size,
+            base,
+        })
+    }
+    pub fn remap(&mut self, offset: usize, mut flags: MapFlags) -> Result<()> {
+        flags.remove(MapFlags::MAP_FIXED_NOREPLACE);
+        flags.insert(MapFlags::MAP_FIXED);
+
+        let _new_base = unsafe {
+            syscall::fmap(
+                self.fd.as_raw_fd(),
+                &Map {
+                    offset,
+                    size: self.size,
+                    flags,
+                    address: self.base,
+                },
+            )?
+        };
+
+        Ok(())
+    }
+    pub unsafe fn map_mut_anywhere(
+        fd: &'a FdGuardUpper,
+        offset: usize,
+        size: usize,
+    ) -> Result<(Self, &'a mut [u8])> {
+        let mut this = Self::map(
+            fd,
+            &Map {
+                size,
+                offset,
+                address: 0,
+                flags: PROT_READ | PROT_WRITE,
+            },
+        )?;
+        let slice = unsafe { &mut *this.as_mut_ptr_slice() };
+
+        Ok((this, slice))
+    }
+    pub fn addr(&self) -> usize {
+        self.base
+    }
+    pub fn len(&self) -> usize {
+        self.size
+    }
+    pub fn as_mut_ptr_slice(&mut self) -> *mut [u8] {
+        core::ptr::slice_from_raw_parts_mut(self.base as *mut u8, self.size)
+    }
+    pub fn take(mut self) {
+        self.size = 0;
+    }
+}
+impl<'a> Drop for MmapGuard<'a> {
+    fn drop(&mut self) {
+        if self.size != 0 {
+            let _ = unsafe { syscall::funmap(self.base, self.size) };
+        }
+    }
+}
+
+struct FileBufReader {
+    fd: usize,
+    buf: [u8; 8192],
+    pos: usize,
+    cap: usize,
+}
+
+impl FileBufReader {
+    pub fn from_fd(fd: usize) -> FileBufReader {
+        FileBufReader {
+            fd,
+            buf: [0; 8192],
+            pos: 0,
+            cap: 0,
+        }
+    }
+}
+
+impl FileBufReader {
+    fn read_le_u64(&mut self) -> Result<Option<u64>> {
+        if self.pos >= self.cap {
+            debug_assert!(self.pos == self.cap);
+            self.cap = crate::sys::posix_read(self.fd, &mut self.buf)?;
+            self.pos = 0;
+        }
+
+        if self.cap == 0 {
+            return Ok(None);
+        }
+
+        if self.cap - self.pos < 8 {
+            unreachable!();
+        }
+
+        let num = u64::from_le_bytes(self.buf[self.pos..self.pos + 8].try_into().unwrap());
+
+        self.pos += 8;
+
+        Ok(Some(num))
+    }
+}
+
+#[repr(transparent)]
+pub struct FdGuard<const UPPER: bool = false> {
+    fd: usize,
+}
+pub type FdGuardUpper = FdGuard<true>;
+impl FdGuard<false> {
+    #[inline]
+    pub fn new(fd: usize) -> Self {
+        Self { fd }
+    }
+
+    #[inline]
+    pub fn open<T: AsRef<str>>(path: T, flags: usize) -> Result<Self> {
+        open(path, flags).map(Self::new)
+    }
+
+    #[inline]
+    pub fn to_upper(self) -> Result<FdGuardUpper> {
+        // Move to upper table if necessary
+        let fd = if self.fd & syscall::UPPER_FDTBL_TAG == 0 {
+            //TODO: use F_DUPFD_CLOEXEC?
+            let fd = syscall::fcntl(self.fd, syscall::F_DUPFD, syscall::UPPER_FDTBL_TAG)?;
+            drop(self);
+            fd
+        } else {
+            self.take()
+        };
+        Ok(FdGuard::<true> { fd })
+    }
+
+    // Not implemented for UPPER to prevent misuse
+    #[inline]
+    pub fn as_c_fd(&self) -> Option<i32> {
+        i32::try_from(self.fd).ok()
+    }
+}
+impl<const UPPER: bool> FdGuard<UPPER> {
+    #[inline]
+    pub fn openat<T: AsRef<str>>(
+        &self,
+        path: T,
+        flags: usize,
+        fcntl_flags: usize,
+    ) -> Result<FdGuard<false>> {
+        syscall::openat(self.fd, path, flags, fcntl_flags).map(FdGuard::new)
+    }
+    #[inline]
+    pub fn dup(&self, buf: &[u8]) -> Result<FdGuard<false>> {
+        syscall::dup(self.fd, buf).map(FdGuard::new)
+    }
+
+    #[inline]
+    pub fn fcntl(&self, cmd: usize, arg: usize) -> Result<usize> {
+        syscall::fcntl(self.fd, cmd, arg)
+    }
+
+    #[inline]
+    pub fn fstat(&self, stat: &mut syscall::Stat) -> Result<usize> {
+        fstat(self.fd, stat)
+    }
+
+    #[inline]
+    pub fn lseek(&self, offset: isize, whence: usize) -> Result<usize> {
+        syscall::lseek(self.fd, offset, whence)
+    }
+
+    #[inline]
+    pub fn read(&self, buf: &mut [u8]) -> Result<usize> {
+        syscall::read(self.fd, buf)
+    }
+
+    #[inline]
+    pub fn write(&self, buf: &[u8]) -> Result<usize> {
+        syscall::write(self.fd, buf)
+    }
+
+    #[inline]
+    pub fn call_ro(&self, payload: &mut [u8], flags: CallFlags, metadata: &[u64]) -> Result<usize> {
+        syscall::call_ro(self.fd, payload, flags, metadata)
+    }
+
+    #[inline]
+    pub fn call_wo(&self, payload: &[u8], flags: CallFlags, metadata: &[u64]) -> Result<usize> {
+        syscall::call_wo(self.fd, payload, flags, metadata)
+    }
+
+    #[inline]
+    pub fn call_rw(&self, payload: &mut [u8], flags: CallFlags, metadata: &[u64]) -> Result<usize> {
+        syscall::call_rw(self.fd, payload, flags, metadata)
+    }
+
+    #[inline]
+    pub fn as_raw_fd(&self) -> usize {
+        self.fd
+    }
+
+    #[inline]
+    pub fn take(self) -> usize {
+        let fd = self.fd;
+        core::mem::forget(self);
+        fd
+    }
+}
+impl<const UPPER: bool> Drop for FdGuard<UPPER> {
+    #[inline]
+    fn drop(&mut self) {
+        let _ = syscall::close(self.fd);
+    }
+}
+impl Debug for FdGuard<false> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(f, "[fd {}]", self.fd)
+    }
+}
+impl Debug for FdGuardUpper {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(f, "[fd upper {}]", self.fd & !syscall::UPPER_FDTBL_TAG)
+    }
+}
+pub fn create_set_addr_space_buf(
+    space: usize,
+    ip: usize,
+    sp: usize,
+) -> [u8; size_of::<usize>() * 3] {
+    let mut buf = [0u8; size_of::<usize>() * 3];
+    buf.copy_from_slice([space, sp, ip].map(usize::to_ne_bytes).as_flattened());
+    buf
+}
+pub fn create_set_addr_space_buf_for_fork(
+    space: usize,
+    ip: usize,
+    sp: usize,
+    arg1: usize,
+) -> [u8; size_of::<usize>() * 4] {
+    let mut buf = [0u8; size_of::<usize>() * 4];
+    buf.copy_from_slice([space, sp, ip, arg1].map(usize::to_ne_bytes).as_flattened());
+    buf
+}
+
+/// Spawns a new context which will not share the same address space as the current one. File
+/// descriptors from other schemes are reobtained with `dup`, and grants referencing such file
+/// descriptors are reobtained through `fmap`. Other mappings are kept but duplicated using CoW.
+pub fn fork_impl(args: &ForkArgs<'_>) -> Result<usize> {
+    let old_mask = crate::signal::get_sigmask()?;
+    let pid = unsafe {
+        Error::demux(__relibc_internal_fork_wrapper(
+            args as *const ForkArgs as usize,
+        ))?
+    };
+
+    if pid == 0 {
+        crate::signal::set_sigmask(Some(old_mask), None)?;
+    }
+    Ok(pid)
+}
+
+pub enum ForkArgs<'a> {
+    Init {
+        this_thr_fd: &'a FdGuardUpper,
+        auth: &'a FdGuard,
+    },
+    Managed,
+}
+
+pub fn fork_inner(initial_rsp: *mut usize, args: &ForkArgs) -> Result<usize> {
+    let (cur_filetable_fd, new_proc_fd, new_thr_fd, new_pid);
+
+    {
+        let cur_thr_fd = match args {
+            ForkArgs::Init { this_thr_fd, .. } => this_thr_fd,
+            ForkArgs::Managed => RtTcb::current().thread_fd(),
+        };
+        let NewChildProc {
+            proc_fd,
+            thr_fd,
+            pid,
+        } = new_child_process(args)?;
+        new_proc_fd = proc_fd;
+        new_thr_fd = thr_fd;
+        new_pid = pid;
+
+        // Copy existing files into new file table, but do not reuse the same file table (i.e. new
+        // parent FDs will not show up for the child).
+        let scratchpad = {
+            cur_filetable_fd = cur_thr_fd.dup(b"filetable")?;
+
+            // This must be done before the address space is copied.
+            let proc_fd = new_proc_fd.as_ref().map_or(usize::MAX, |p| p.as_raw_fd());
+            //let _ = syscall::write(1, alloc::format!("FDTBL{}PROC{}THR{}\n", *cur_filetable_fd, proc_fd, *new_thr_fd).as_bytes());
+
+            ForkScratchpad {
+                cur_filetable_fd: cur_filetable_fd.as_raw_fd(),
+                new_proc_fd: proc_fd,
+                new_thr_fd: new_thr_fd.as_raw_fd(),
+            }
+        };
+        #[cfg(any(
+            target_arch = "x86_64",
+            target_arch = "aarch64",
+            target_arch = "riscv64"
+        ))]
+        let arg1 = {
+            let scratchpad_ptr: *const ForkScratchpad = &scratchpad;
+            scratchpad_ptr as usize
+        };
+        #[cfg(target_arch = "x86")]
+        unsafe {
+            let scratchpad_ptr = initial_rsp as *mut ForkScratchpad;
+            scratchpad_ptr.write(scratchpad);
+        }
+
+        // CoW-duplicate address space.
+        {
+            let new_addr_space_sel_fd = new_thr_fd.dup(b"current-addrspace")?;
+
+            let cur_addr_space_fd = cur_thr_fd.dup(b"addrspace")?.to_upper()?;
+            let new_addr_space_fd = cur_addr_space_fd.dup(b"exclusive")?.to_upper()?;
+
+            let mut grant_desc_buf = [GrantDesc::default(); 16];
+            loop {
+                let bytes_read = {
+                    let buf = unsafe {
+                        core::slice::from_raw_parts_mut(
+                            grant_desc_buf.as_mut_ptr().cast(),
+                            grant_desc_buf.len() * size_of::<GrantDesc>(),
+                        )
+                    };
+                    cur_addr_space_fd.read(buf)?
+                };
+                if bytes_read == 0 {
+                    break;
+                }
+
+                let grants = &grant_desc_buf[..bytes_read / size_of::<GrantDesc>()];
+
+                for grant in grants {
+                    if !grant.flags.contains(GrantFlags::GRANT_SCHEME)
+                        || !grant.flags.contains(GrantFlags::GRANT_SHARED)
+                    {
+                        continue;
+                    }
+
+                    let buf;
+
+                    // TODO: write! using some #![no_std] Cursor type (tracking the length)?
+                    #[cfg(target_pointer_width = "64")]
+                    {
+                        //buf = *b"grant-fd-AAAABBBBCCCCDDDD";
+                        //write!(&mut buf, "grant-fd-{:>016x}", grant.base).unwrap();
+                        buf = alloc::format!("grant-fd-{:>016x}", grant.base).into_bytes();
+                    }
+
+                    #[cfg(target_pointer_width = "32")]
+                    {
+                        //buf = *b"grant-fd-AAAABBBB";
+                        //write!(&mut buf[..], "grant-fd-{:>08x}", grant.base).unwrap();
+                        buf = alloc::format!("grant-fd-{:>08x}", grant.base).into_bytes();
+                    }
+
+                    let grant_fd = cur_addr_space_fd.dup(&buf)?.to_upper()?;
+
+                    let mut flags = MAP_SHARED | MAP_FIXED_NOREPLACE;
+
+                    flags.set(PROT_READ, grant.flags.contains(GrantFlags::GRANT_READ));
+                    flags.set(PROT_WRITE, grant.flags.contains(GrantFlags::GRANT_WRITE));
+                    flags.set(PROT_EXEC, grant.flags.contains(GrantFlags::GRANT_EXEC));
+
+                    mmap_remote(
+                        &new_addr_space_fd,
+                        &grant_fd,
+                        grant.offset as usize,
+                        grant.base,
+                        grant.size,
+                        flags,
+                    )?;
+                }
+            }
+            #[cfg(any(
+                target_arch = "x86_64",
+                target_arch = "aarch64",
+                target_arch = "riscv64"
+            ))]
+            let buf = create_set_addr_space_buf_for_fork(
+                new_addr_space_fd.as_raw_fd(),
+                __relibc_internal_fork_ret as usize,
+                initial_rsp as usize,
+                arg1,
+            );
+            #[cfg(target_arch = "x86")]
+            let buf = create_set_addr_space_buf(
+                new_addr_space_fd.as_raw_fd(),
+                __relibc_internal_fork_ret as usize,
+                initial_rsp as usize,
+            );
+            new_addr_space_sel_fd.write(&buf)?;
+        }
+        {
+            // Reuse the same sigaltstack and signal entry (all memory will be re-mapped CoW later).
+            //
+            // Do this after the address space is cloned, since the kernel will get a shared
+            // reference to the TCB and whatever pages stores the signal proc control struct.
+            {
+                let new_sighandler_fd = new_thr_fd.dup(b"sighandler")?;
+                new_sighandler_fd.write(&crate::signal::current_setsighandler_struct())?;
+            }
+            if let Some(ref proc_fd) = new_proc_fd {
+                proc_call(
+                    proc_fd.as_raw_fd(),
+                    &mut [],
+                    CallFlags::empty(),
+                    &[ProcCall::SyncSigPctl as u64],
+                )?;
+                thread_call(
+                    new_thr_fd.as_raw_fd(),
+                    &mut [],
+                    CallFlags::empty(),
+                    &[ThreadCall::SyncSigTctl as u64],
+                )?;
+            }
+        }
+        {
+            // Copy environment registers.
+            let cur_env_regs_fd = cur_thr_fd.dup(b"regs/env")?;
+            let new_env_regs_fd = new_thr_fd.dup(b"regs/env")?;
+
+            let mut env_regs = syscall::EnvRegisters::default();
+            cur_env_regs_fd.read(&mut env_regs)?;
+            new_env_regs_fd.write(&env_regs)?;
+        }
+    }
+    // Copy the file table. We do this last to ensure that all previously used file descriptors are
+    // closed. The only exception -- the filetable selection fd and the current filetable fd --
+    // will be closed by the child process.
+    {
+        // TODO: Use file descriptor forwarding or something similar to avoid copying the file
+        // table in the kernel.
+        let new_filetable_fd = cur_filetable_fd.dup(b"copy")?;
+        let new_filetable_sel_fd = new_thr_fd.dup(b"current-filetable")?;
+        new_filetable_sel_fd.write(&usize::to_ne_bytes(new_filetable_fd.as_raw_fd()))?;
+    }
+    let start_fd = new_thr_fd.dup(b"start")?;
+    start_fd.write(&[0])?;
+    Ok(new_pid)
+}
+
+pub struct NewChildProc {
+    proc_fd: Option<FdGuardUpper>,
+
+    thr_fd: FdGuardUpper,
+    pid: usize,
+}
+
+pub fn new_child_process(args: &ForkArgs<'_>) -> Result<NewChildProc> {
+    match *args {
+        ForkArgs::Managed => {
+            let proc_info = crate::static_proc_info();
+            let this_proc_fd = proc_info
+                .proc_fd
+                .as_ref()
+                .expect("cannot use ForkArgs::Managed without an existing proc info");
+            let child_proc_fd = this_proc_fd.dup(b"fork")?.to_upper()?;
+            let only_thread_fd = child_proc_fd.dup(b"thread-0")?.to_upper()?;
+            let meta = read_proc_meta(&child_proc_fd)?;
+            Ok(NewChildProc {
+                proc_fd: Some(child_proc_fd),
+                thr_fd: only_thread_fd,
+                pid: meta.pid as usize,
+            })
+        }
+        #[cfg(feature = "proc")]
+        ForkArgs::Init { .. } => unreachable!(),
+
+        #[cfg(not(feature = "proc"))]
+        ForkArgs::Init { this_thr_fd, auth } => {
+            let thr_fd = auth.dup(b"new-context")?.to_upper()?;
+            let buf = syscall::ProcSchemeAttrs {
+                pid: 0,
+                euid: 0,
+                egid: 0,
+                prio: !0, // Value is overwritten later
+                debug_name: {
+                    let mut buf = [0; 32];
+                    let src = b"[init]";
+                    buf[..src.len()].copy_from_slice(src);
+                    buf
+                },
+            };
+            let attr_fd =
+                thr_fd.dup(alloc::format!("auth-{}-attrs", auth.as_raw_fd()).as_bytes())?;
+            attr_fd.write(&buf)?;
+            Ok(NewChildProc {
+                thr_fd,
+                pid: 1, // dummy fd to distinguish child from parent
+                proc_fd: None,
+            })
+        }
+    }
+}
+
+pub unsafe fn make_init(proc_cap: usize) -> (&'static FdGuardUpper, &'static FdGuardUpper) {
+    let proc_fd = FdGuard::new(
+        syscall::openat(proc_cap, "init", syscall::O_CLOEXEC, 0).expect("failed to create init"),
+    )
+    .to_upper()
+    .unwrap();
+
+    syscall::sendfd(
+        proc_fd.as_raw_fd(),
+        RtTcb::current().thread_fd().dup(&[]).unwrap().take(),
+        0,
+        0,
+    )
+    .expect("failed to assign current thread to init process");
+
+    let managed_thr_fd = proc_fd
+        .dup(b"thread-0")
+        .expect("failed to get managed thread for init")
+        .to_upper()
+        .unwrap();
+
+    let managed_thr_fd = unsafe { (*RtTcb::current().thr_fd.get()).insert(managed_thr_fd) };
+
+    unsafe {
+        STATIC_PROC_INFO.get().write(crate::StaticProcInfo {
+            pid: 1,
+            proc_fd: Some(proc_fd),
+        })
+    };
+    *DYNAMIC_PROC_INFO.lock() = crate::DynamicProcInfo {
+        pgid: 1,
+        ruid: 0,
+        euid: 0,
+        suid: 0,
+        rgid: 0,
+        egid: 0,
+        sgid: 0,
+        ns_fd: None,
+    };
+    (
+        unsafe { (*STATIC_PROC_INFO.get()).proc_fd.as_ref().unwrap() },
+        managed_thr_fd,
+    )
+}
+pub(crate) static STATIC_PROC_INFO: SyncUnsafeCell<StaticProcInfo> =
+    SyncUnsafeCell::new(StaticProcInfo {
+        pid: 0,
+        proc_fd: None,
+    });
diff --git a/recipes/core/relibc/redox-rt/src/signal.rs b/recipes/core/relibc/redox-rt/src/signal.rs
new file mode 100644
index 0000000000..022f8737d1
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/signal.rs
@@ -0,0 +1,1015 @@
+use core::{ffi::c_int, ptr::NonNull, sync::atomic::Ordering};
+
+use syscall::{
+    CallFlags, EAGAIN, EINTR, EINVAL, ENOMEM, EPERM, Error, RawAction, Result, SenderInfo,
+    SetSighandlerData, SigProcControl, Sigcontrol, SigcontrolFlags, TimeSpec, data::AtomicU64,
+};
+
+use crate::{
+    RtTcb, Tcb,
+    arch::*,
+    current_proc_fd, static_proc_info,
+    sync::Mutex,
+    sys::{proc_call, this_thread_call},
+};
+
+use redox_protocols::protocol::{
+    ProcCall, RtSigInfo, SIGCHLD, SIGCONT, SIGKILL, SIGSTOP, SIGTSTP, SIGTTIN, SIGTTOU, SIGURG,
+    SIGWINCH, ThreadCall,
+};
+
+#[cfg(target_arch = "x86_64")]
+static CPUID_EAX1_ECX: core::sync::atomic::AtomicU32 = core::sync::atomic::AtomicU32::new(0);
+
+pub fn sighandler_function() -> usize {
+    // TODO: HWCAP?
+
+    __relibc_internal_sigentry as usize
+}
+
+/// ucontext_t representation
+#[repr(C)]
+pub struct SigStack {
+    #[cfg(any(
+        target_arch = "x86_64",
+        target_arch = "aarch64",
+        target_arch = "riscv64"
+    ))]
+    _pad: [usize; 1], // pad from 7*8 to 64
+
+    #[cfg(target_arch = "x86")]
+    _pad: [usize; 3], // pad from 9*4 to 12*4
+
+    pub link: *mut SigStack,
+
+    pub old_stack: PosixStackt,
+    pub old_mask: u64,
+    pub(crate) sival: usize,
+    pub(crate) sig_code: u32,
+    pub(crate) sig_num: u32,
+
+    // x86_64: 864 bytes
+    // i686: 512 bytes
+    // aarch64: 272 bytes (SIMD TODO)
+    // riscv64: 520 bytes (vector extensions TODO)
+    pub regs: ArchIntRegs,
+}
+#[repr(C)]
+pub struct PosixStackt {
+    pub sp: *mut (),
+    pub flags: i32,
+    pub size: usize,
+}
+
+pub const SS_ONSTACK: usize = 1;
+pub const SS_DISABLE: usize = 2;
+
+impl From<Sigaltstack> for PosixStackt {
+    fn from(value: Sigaltstack) -> Self {
+        match value {
+            Sigaltstack::Disabled => PosixStackt {
+                sp: core::ptr::null_mut(),
+                size: 0,
+                flags: SS_DISABLE.try_into().unwrap(),
+            },
+            Sigaltstack::Enabled {
+                onstack,
+                base,
+                size,
+            } => PosixStackt {
+                sp: base.cast(),
+                size,
+                flags: if onstack {
+                    SS_ONSTACK.try_into().unwrap()
+                } else {
+                    0
+                },
+            },
+        }
+    }
+}
+
+#[repr(C)]
+// TODO: This struct is for practical reasons locked to Linux's ABI, but avoid redefining
+// it here. Alternatively, check at compile time that the structs are equivalent.
+pub struct SiginfoAbi {
+    pub si_signo: i32,
+    pub si_errno: i32,
+    pub si_code: i32,
+    pub si_pid: i32,      // pid_t
+    pub si_uid: i32,      // uid_t
+    pub si_addr: *mut (), // *mut c_void
+    pub si_status: i32,
+    pub si_value: usize, // sigval
+}
+
+#[inline(always)]
+unsafe fn inner(stack: &mut SigStack) {
+    let os = unsafe { &Tcb::current().unwrap().os_specific };
+
+    let stack_ptr = NonNull::from(&mut *stack);
+    stack.link = core::mem::replace(
+        unsafe { &mut (*os.arch.get()).last_sigstack },
+        Some(stack_ptr),
+    )
+    .map_or_else(core::ptr::null_mut, |x| x.as_ptr());
+
+    let signals_were_disabled = unsafe { (*os.arch.get()).disable_signals_depth > 0 };
+
+    let targeted_thread_not_process = stack.sig_num >= 64;
+    stack.sig_num %= 64;
+
+    // asm counts from 0
+    stack.sig_num += 1;
+
+    let (sender_pid, sender_uid) = {
+        let area = unsafe { &mut *os.arch.get() };
+
+        // Undefined if the signal was not realtime
+        stack.sival = area.tmp_rt_inf.arg;
+
+        stack.old_stack = unsafe { arch_pre(stack, area) };
+
+        if (stack.sig_num - 1) / 32 == 1 && !targeted_thread_not_process {
+            stack.sig_code = area.tmp_rt_inf.code as u32;
+            (area.tmp_rt_inf.pid, area.tmp_rt_inf.uid)
+        } else {
+            stack.sig_code = 0; // TODO: SI_USER constant?
+            // TODO: Handle SIGCHLD. Maybe that should always be queued though?
+            let inf = SenderInfo::from_raw(area.tmp_id_inf);
+            (inf.pid, inf.ruid)
+        }
+    };
+
+    let sigaction = {
+        let guard = SIGACTIONS_LOCK.lock();
+        let action = convert_old(&PROC_CONTROL_STRUCT.actions[stack.sig_num as usize - 1]);
+        if action.flags.contains(SigactionFlags::RESETHAND) {
+            drop(guard);
+            // TODO: handle error?
+            let _ = sigaction(
+                stack.sig_num as u8,
+                Some(&Sigaction {
+                    kind: SigactionKind::Default,
+                    mask: 0,
+                    flags: SigactionFlags::empty(),
+                }),
+                None,
+            );
+        }
+        action
+    };
+    let shall_restart = sigaction.flags.contains(SigactionFlags::RESTART);
+    let sig = (stack.sig_num & 0x3f) as u8;
+
+    let handler = match sigaction.kind {
+        // TODO: Since sigaction may be called while procmgr is checking the IGNORED bit, it is
+        // likely possible there can be a race condition resulting in the signal trampoline running
+        // and reaching this code. If so, we do already know whether the signal is IGNORED *now*,
+        // and so we should return early ideally without even temporarily touching the signal mask.
+        SigactionKind::Ignore => {
+            panic!("ctl {:#x?} signal {}", os.control, stack.sig_num)
+        }
+        // this case should be treated equally as the one above
+        //
+        // _ if sigaction.flags.contains(SigactionFlags::IGNORED) => {
+        //     panic!("ctl2 {:#x?} signal {}", os.control, stack.sig_num)
+        // }
+        SigactionKind::Default if usize::from(sig) == SIGCONT => SignalHandler { handler: None },
+        SigactionKind::Default => {
+            let _ = proc_call(
+                current_proc_fd().as_raw_fd(),
+                &mut [],
+                CallFlags::empty(),
+                &[ProcCall::Exit as u64, u64::from(sig) << 8],
+            );
+            panic!()
+        }
+        SigactionKind::Handled { handler } => handler,
+    };
+
+    // Set sigmask to sa_mask and unmark the signal as pending.
+    let prev_sigallow = get_allowset_raw(&os.control.word);
+
+    let mut sigallow_inside = !sigaction.mask & prev_sigallow;
+    if !sigaction.flags.contains(SigactionFlags::NODEFER) {
+        sigallow_inside &= !sig_bit(stack.sig_num);
+    }
+
+    let _pending_when_sa_mask = set_allowset_raw(&os.control.word, prev_sigallow, sigallow_inside);
+
+    // TODO: If sa_mask caused signals to be unblocked, deliver one or all of those first?
+
+    // Re-enable signals again.
+    let control_flags = &os.control.control_flags;
+    control_flags.store(
+        control_flags.load(Ordering::Relaxed) & !SigcontrolFlags::INHIBIT_DELIVERY.bits(),
+        Ordering::Release,
+    );
+    core::sync::atomic::compiler_fence(Ordering::Acquire);
+
+    stack.old_mask = prev_sigallow;
+
+    // Call handler, either sa_handler or sa_siginfo depending on flag.
+    if sigaction.flags.contains(SigactionFlags::SIGINFO)
+        && let Some(sigaction) = unsafe { handler.sigaction }
+    {
+        let info = SiginfoAbi {
+            si_signo: stack.sig_num as c_int,
+            si_addr: core::ptr::null_mut(),
+            si_code: stack.sig_code as i32,
+            si_errno: 0,
+            si_pid: sender_pid as i32,
+            si_status: 0,
+            si_uid: sender_uid as i32,
+            si_value: stack.sival,
+        };
+        unsafe {
+            sigaction(
+                stack.sig_num as c_int,
+                core::ptr::addr_of!(info).cast(),
+                stack as *mut SigStack as *mut (),
+            )
+        };
+    } else if let Some(handler) = unsafe { handler.handler } {
+        handler(stack.sig_num as c_int);
+    }
+
+    // Disable signals while we modify the sigmask again
+    control_flags.store(
+        control_flags.load(Ordering::Relaxed) | SigcontrolFlags::INHIBIT_DELIVERY.bits(),
+        Ordering::Release,
+    );
+    core::sync::atomic::compiler_fence(Ordering::Acquire);
+
+    // Update allowset again, and obtain the set of pending unblocked signals with this new
+    // allowset. If this is nonempty, we must deliver the signal here rather than wait for it
+    // asynchronously, as shown e.g. in https://gitlab.redox-os.org/redox-os/relibc/-/issues/239.
+    // We do this even if signals_were_disabled beforehand (where the caller hence explicitly
+    // must have jumped to this trampoline).
+
+    let new_mask = stack.old_mask;
+    let old_mask = get_allowset_raw(&os.control.word);
+
+    let pending_unblocked = {
+        let thread_pending = set_allowset_raw(&os.control.word, old_mask, new_mask);
+        let proc_pending = PROC_CONTROL_STRUCT.pending.load(Ordering::Relaxed);
+        (thread_pending | proc_pending) & new_mask
+    };
+
+    unsafe { (*os.arch.get()).last_sig_was_restart = shall_restart };
+
+    // TODO: Support setting uc_link to jump back to a different context?
+    unsafe { (*os.arch.get()).last_sigstack = NonNull::new(stack.link) };
+
+    // TODO: Support restoring uc_stack?
+
+    if pending_unblocked > 0 {
+        // If there were signals visible at the time we checked (otherwise it can be considered
+        // "asynchronous" and will be delivered the next time an EINTR is seen, or after the
+        // post-preemption check in the kernel), we delay clearing the INHIBIT_DELIVERY bit, and
+        // rearrange the saved instr ptr field on the stack and the sc_saved_rip field, so that it
+        // returns to the start of the trampoline in a way that makes it look like a new signal was
+        // immediately delivered. There's no need to worry about the __crit_* sections since
+        // INHIBIT_DELIVERY is still set.
+        arch_ret_to_sig(stack, &os.control);
+    } else if !signals_were_disabled {
+        // Re-enable signals again, except in the case where they were disabled and the trampoline
+        // was explicitly jumped to when handling EINTR.
+        core::sync::atomic::compiler_fence(Ordering::Release);
+        control_flags.store(
+            control_flags.load(Ordering::Relaxed) & !SigcontrolFlags::INHIBIT_DELIVERY.bits(),
+            Ordering::Relaxed,
+        );
+    }
+}
+#[cfg(not(target_arch = "x86"))]
+pub(crate) unsafe extern "C" fn inner_c(stack: usize) {
+    unsafe { inner(&mut *(stack as *mut SigStack)) }
+}
+#[cfg(target_arch = "x86")]
+pub(crate) unsafe extern "fastcall" fn inner_fastcall(stack: usize) {
+    unsafe { inner(&mut *(stack as *mut SigStack)) }
+}
+
+pub fn get_sigmask() -> Result<u64> {
+    let mut mask = 0;
+    modify_sigmask(Some(&mut mask), Option::<fn(u64) -> u64>::None)?;
+    Ok(mask)
+}
+pub fn set_sigmask(new: Option<u64>, old: Option<&mut u64>) -> Result<()> {
+    modify_sigmask(old, new.map(move |newmask| move |_| newmask))
+}
+pub fn or_sigmask(new: Option<u64>, old: Option<&mut u64>) -> Result<()> {
+    // Parsing nightmare... :)
+    modify_sigmask(
+        old,
+        new.map(move |newmask| move |oldmask| oldmask | newmask),
+    )
+}
+pub fn andn_sigmask(new: Option<u64>, old: Option<&mut u64>) -> Result<()> {
+    modify_sigmask(
+        old,
+        new.map(move |newmask| move |oldmask| oldmask & !newmask),
+    )
+}
+fn get_allowset_raw(words: &[AtomicU64; 2]) -> u64 {
+    (words[0].load(Ordering::Relaxed) >> 32) | ((words[1].load(Ordering::Relaxed) >> 32) << 32)
+}
+/// Sets mask from old to new, returning what was pending at the time.
+fn set_allowset_raw(words: &[AtomicU64; 2], old: u64, new_raw: u64) -> u64 {
+    // TODO: should these bits always be set, or never be set?
+    let new = new_raw | ALLOWSET_ALWAYS;
+
+    // This assumes *only this thread* can change the allowset. If this rule is broken, the use of
+    // fetch_add will corrupt the words entirely. fetch_add is very efficient on x86, being
+    // generated as LOCK XADD which is the fastest RMW instruction AFAIK.
+    let prev_w0 = words[0].fetch_add(
+        ((new & 0xffff_ffff) << 32).wrapping_sub((old & 0xffff_ffff) << 32),
+        Ordering::Relaxed,
+    ) & 0xffff_ffff;
+    let prev_w1 = words[1].fetch_add(
+        ((new >> 32) << 32).wrapping_sub((old >> 32) << 32),
+        Ordering::Relaxed,
+    ) & 0xffff_ffff;
+
+    prev_w0 | (prev_w1 << 32)
+}
+const ALLOWSET_ALWAYS: u64 = sig_bit(SIGSTOP as u32) | sig_bit(SIGKILL as u32);
+fn modify_sigmask(old: Option<&mut u64>, op: Option<impl FnOnce(u64) -> u64>) -> Result<()> {
+    let _guard = tmp_disable_signals();
+    let ctl = current_sigctl();
+
+    let prev = get_allowset_raw(&ctl.word);
+
+    if let Some(old) = old {
+        *old = !prev;
+    }
+    let Some(op) = op else {
+        return Ok(());
+    };
+
+    let next = !op(!prev);
+
+    let thread_pending = set_allowset_raw(&ctl.word, prev, next);
+    let proc_pending = PROC_CONTROL_STRUCT.pending.load(Ordering::Relaxed);
+
+    // POSIX requires that at least one pending unblocked signal be delivered before
+    // pthread_sigmask returns, if there is one.
+    if (thread_pending | proc_pending) & next != 0 {
+        unsafe {
+            manually_enter_trampoline();
+        }
+    }
+
+    Ok(())
+}
+
+#[derive(Clone, Copy, Default)]
+pub enum SigactionKind {
+    #[default]
+    Default,
+
+    Ignore,
+    Handled {
+        handler: SignalHandler,
+    },
+}
+
+#[derive(Clone, Copy, Default)]
+pub struct Sigaction {
+    pub kind: SigactionKind,
+    pub mask: u64,
+    pub flags: SigactionFlags,
+}
+
+impl Sigaction {
+    fn ip(&self) -> usize {
+        unsafe {
+            match self.kind {
+                SigactionKind::Handled { handler } => {
+                    if self.flags.contains(SigactionFlags::SIGINFO) {
+                        handler.sigaction.map_or(0, |a| a as usize)
+                    } else {
+                        handler.handler.map_or(0, |a| a as usize)
+                    }
+                }
+                _ => 0,
+            }
+        }
+    }
+}
+
+const MASK_DONTCARE: u64 = !0;
+
+fn convert_old(action: &RawAction) -> Sigaction {
+    let old_first = action.first.load(Ordering::Relaxed);
+    let old_mask = action.user_data.load(Ordering::Relaxed);
+
+    let handler = (old_first & !(u64::from(STORED_FLAGS) << 32)) as usize;
+    let flags = SigactionFlags::from_bits_retain(((old_first >> 32) as u32) & STORED_FLAGS);
+
+    let kind = if handler == default_handler as usize {
+        SigactionKind::Default
+    } else if flags.contains(SigactionFlags::IGNORED) {
+        SigactionKind::Ignore
+    } else {
+        SigactionKind::Handled {
+            handler: unsafe { core::mem::transmute(handler as usize) },
+        }
+    };
+
+    Sigaction {
+        mask: old_mask,
+        flags,
+        kind,
+    }
+}
+
+pub fn sigaction(signal: u8, new: Option<&Sigaction>, old: Option<&mut Sigaction>) -> Result<()> {
+    let _sigguard = tmp_disable_signals();
+    let ctl = current_sigctl();
+
+    let _guard = SIGACTIONS_LOCK.lock();
+    sigaction_inner(ctl, signal, new, old)
+}
+fn sigaction_inner(
+    ctl: &Sigcontrol,
+    signal: u8,
+    new: Option<&Sigaction>,
+    old: Option<&mut Sigaction>,
+) -> Result<()> {
+    // TODO: Now that the goal of keeping logic out of the IPC backend, no longer holds when
+    // procmgr has taken over signal handling from the kernel, it would probably make sense to make
+    // parts of this function an IPC call, for synchronization purposes. Apart from SA_RESETHAND
+    // logic which may need to be fast, regular sigaction is typically in the 'configuration'
+    // category, allowed to be slower.
+
+    if matches!(usize::from(signal), 0 | 32 | 65..) {
+        return Err(Error::new(EINVAL));
+    }
+    if matches!(usize::from(signal), SIGKILL | SIGSTOP) {
+        if new.is_some() {
+            return Err(Error::new(EINVAL));
+        }
+        if let Some(old) = old {
+            // TODO: Is this the correct value to set it to?
+            *old = Sigaction {
+                kind: SigactionKind::Default,
+                mask: 0,
+                flags: SigactionFlags::empty(),
+            };
+        }
+        return Ok(());
+    }
+
+    let action = &PROC_CONTROL_STRUCT.actions[usize::from(signal) - 1];
+
+    if let Some(old) = old {
+        *old = convert_old(action);
+    }
+
+    let Some(new) = new else {
+        return Ok(());
+    };
+
+    let explicit_handler = new.ip();
+
+    let sig_group = (signal - 1) / 32;
+    let sig_idx = (signal - 1) % 32;
+
+    let (mask, flags, handler) = match (usize::from(signal), new.kind) {
+        (_, SigactionKind::Ignore) | (SIGURG | SIGWINCH, SigactionKind::Default) => {
+            // TODO: relibc and procmgr have access to all threads, redox_rt doesn't currently.
+            // Do this for all threads!
+            ctl.word[usize::from(sig_group)].fetch_and(!(1 << sig_idx), Ordering::Relaxed);
+            PROC_CONTROL_STRUCT
+                .pending
+                .fetch_and(!sig_bit(signal.into()), Ordering::Relaxed);
+
+            // TODO: handle tmp_disable_signals
+            (
+                MASK_DONTCARE,
+                SigactionFlags::IGNORED,
+                if matches!(new.kind, SigactionKind::Default) {
+                    default_handler as usize
+                } else {
+                    0
+                },
+            )
+        }
+        // TODO: Handle pending signals before these flags are set.
+        (SIGTSTP | SIGTTOU | SIGTTIN, SigactionKind::Default) => (
+            MASK_DONTCARE,
+            SigactionFlags::SIG_SPECIFIC,
+            default_handler as usize,
+        ),
+        (SIGCHLD, SigactionKind::Default) => {
+            let nocldstop_bit = new.flags & SigactionFlags::SIG_SPECIFIC;
+
+            // Default action is to ignore. Hence all pending SIGCHLD signals should be discarded.
+
+            // TODO: relibc and procmgr have access to all threads, redox_rt doesn't currently.
+            // Do this for all threads!
+            ctl.word[usize::from(sig_group)].fetch_and(!(1 << sig_idx), Ordering::Relaxed);
+            PROC_CONTROL_STRUCT
+                .pending
+                .fetch_and(!sig_bit(signal.into()), Ordering::Relaxed);
+
+            (
+                MASK_DONTCARE,
+                SigactionFlags::IGNORED | nocldstop_bit,
+                default_handler as usize,
+            )
+        }
+
+        (_, SigactionKind::Default) => (new.mask, new.flags, default_handler as usize),
+        (_, SigactionKind::Handled { .. }) => (new.mask, new.flags, explicit_handler),
+    };
+    let new_first = (handler as u64) | (u64::from(flags.bits() & STORED_FLAGS) << 32);
+    action.first.store(new_first, Ordering::Relaxed);
+    action.user_data.store(mask, Ordering::Relaxed);
+
+    Ok(())
+}
+
+fn current_sigctl() -> &'static Sigcontrol {
+    &unsafe { Tcb::current() }.unwrap().os_specific.control
+}
+
+pub struct TmpDisableSignalsGuard {
+    _inner: (),
+}
+
+pub fn tmp_disable_signals() -> TmpDisableSignalsGuard {
+    unsafe {
+        let ctl = &current_sigctl().control_flags;
+        ctl.store(
+            ctl.load(Ordering::Relaxed) | syscall::flag::INHIBIT_DELIVERY.bits(),
+            Ordering::Release,
+        );
+        core::sync::atomic::compiler_fence(Ordering::Acquire);
+
+        // TODO: fence?
+        (*Tcb::current().unwrap().os_specific.arch.get()).disable_signals_depth += 1;
+    }
+
+    TmpDisableSignalsGuard { _inner: () }
+}
+impl Drop for TmpDisableSignalsGuard {
+    fn drop(&mut self) {
+        unsafe {
+            let depth =
+                &mut (*Tcb::current().unwrap().os_specific.arch.get()).disable_signals_depth;
+            *depth -= 1;
+
+            if *depth == 0 {
+                let ctl = &current_sigctl().control_flags;
+                ctl.store(
+                    ctl.load(Ordering::Relaxed) & !syscall::flag::INHIBIT_DELIVERY.bits(),
+                    Ordering::Release,
+                );
+                core::sync::atomic::compiler_fence(Ordering::Acquire);
+            }
+        }
+    }
+}
+
+bitflags::bitflags! {
+    // Some flags are ignored by the rt, but they match relibc's 1:1 to simplify conversion.
+    #[derive(Clone, Copy, Default)]
+    pub struct SigactionFlags: u32 {
+        const NOCLDWAIT = 2;
+        const RESTORER = 4;
+        const SIGINFO = 0x0200_0000;
+        const ONSTACK = 0x0400_0000;
+        const RESTART = 0x0800_0000;
+        const NODEFER = 0x1000_0000;
+        const RESETHAND = 0x2000_0000;
+        const SIG_SPECIFIC = 0x4000_0000;
+        const IGNORED = 0x8000_0000;
+    }
+}
+
+const STORED_FLAGS: u32 = 0xfe00_0000;
+
+fn default_handler(_sig: c_int) {
+    unreachable!();
+}
+
+#[derive(Clone, Copy)]
+pub union SignalHandler {
+    pub handler: Option<extern "C" fn(c_int)>,
+    pub sigaction: Option<unsafe extern "C" fn(c_int, *const (), *mut ())>,
+}
+
+static SIGACTIONS_LOCK: Mutex<()> = Mutex::new(());
+
+pub(crate) static PROC_CONTROL_STRUCT: SigProcControl = SigProcControl {
+    pending: AtomicU64::new(0),
+    actions: [const {
+        RawAction {
+            first: AtomicU64::new(0),
+            user_data: AtomicU64::new(0),
+        }
+    }; 64],
+    sender_infos: [const { AtomicU64::new(0) }; 32],
+};
+
+const fn sig_bit(sig: u32) -> u64 {
+    //assert_ne!(sig, 32);
+    //assert_ne!(sig, 0);
+    1 << (sig - 1)
+}
+
+pub fn setup_sighandler(tcb: &RtTcb, first_thread: bool) {
+    if first_thread {
+        let _guard = SIGACTIONS_LOCK.lock();
+        for (sig_idx, action) in PROC_CONTROL_STRUCT.actions.iter().enumerate() {
+            let sig = sig_idx + 1;
+            let bits = if matches!(sig, SIGTSTP | SIGTTIN | SIGTTOU) {
+                SigactionFlags::SIG_SPECIFIC
+            } else if matches!(sig, SIGCHLD | SIGURG | SIGWINCH) {
+                SigactionFlags::IGNORED
+            } else {
+                SigactionFlags::empty()
+            };
+            action.first.store(
+                (u64::from(bits.bits()) << 32) | default_handler as u64,
+                Ordering::Relaxed,
+            );
+        }
+    }
+    let arch = unsafe { &mut *tcb.arch.get() };
+    {
+        // The asm decides whether to use the altstack, based on whether the saved stack pointer
+        // was already on that stack. Thus, setting the altstack to the entire address space, is
+        // equivalent to not using any altstack at all (the default).
+        arch.altstack_top = usize::MAX;
+        arch.altstack_bottom = 0;
+        #[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
+        {
+            arch.pctl = core::ptr::addr_of!(PROC_CONTROL_STRUCT) as usize;
+        }
+    }
+
+    #[cfg(target_arch = "x86_64")]
+    {
+        let cpuid_eax1_ecx = unsafe { core::arch::x86_64::__cpuid(1) }.ecx;
+        CPUID_EAX1_ECX.store(cpuid_eax1_ecx, core::sync::atomic::Ordering::Relaxed);
+        SUPPORTS_AVX.store(u8::from(cpuid_eax1_ecx & 1 << 28 != 0), Ordering::Relaxed);
+    }
+
+    let data = current_setsighandler_struct();
+
+    let fd = tcb
+        .thread_fd()
+        .dup(b"sighandler")
+        .expect("failed to open sighandler fd");
+    fd.write(&data).expect("failed to write to sighandler fd");
+    this_thread_call(
+        &mut [],
+        CallFlags::empty(),
+        &[ThreadCall::SyncSigTctl as u64],
+    )
+    .expect("failed to sync signal tctl");
+
+    // TODO: Inherited set of ignored signals
+    // TODO: handle error
+    let _ = set_sigmask(Some(0), None);
+}
+pub type RtSigarea = RtTcb; // TODO
+pub fn current_setsighandler_struct() -> SetSighandlerData {
+    SetSighandlerData {
+        user_handler: sighandler_function(),
+        excp_handler: 0, // TODO
+        thread_control_addr: core::ptr::addr_of!(
+            unsafe { Tcb::current() }.unwrap().os_specific.control
+        ) as usize,
+        proc_control_addr: &PROC_CONTROL_STRUCT as *const SigProcControl as usize,
+    }
+}
+
+#[derive(Clone, Copy, Default, PartialEq)]
+pub enum Sigaltstack {
+    #[default]
+    Disabled,
+
+    Enabled {
+        onstack: bool,
+        base: *mut (),
+        size: usize,
+    },
+}
+
+pub(crate) fn get_sigaltstack(tcb: &SigArea, sp: usize) -> Sigaltstack {
+    if tcb.altstack_bottom == 0 && tcb.altstack_top == usize::MAX {
+        Sigaltstack::Disabled
+    } else {
+        Sigaltstack::Enabled {
+            base: tcb.altstack_bottom as *mut (),
+            size: tcb.altstack_top - tcb.altstack_bottom,
+            onstack: (tcb.altstack_bottom..=tcb.altstack_top).contains(&sp),
+        }
+    }
+}
+
+pub unsafe fn sigaltstack(
+    new: Option<&Sigaltstack>,
+    old_out: Option<&mut Sigaltstack>,
+) -> Result<()> {
+    let _g = tmp_disable_signals();
+    let tcb = unsafe { &mut *Tcb::current().unwrap().os_specific.arch.get() };
+
+    let old = get_sigaltstack(tcb, crate::arch::current_sp());
+
+    if matches!(old, Sigaltstack::Enabled { onstack: true, .. })
+        && new.is_some_and(|new| *new != old)
+    {
+        return Err(Error::new(EPERM));
+    }
+
+    if let Some(old_out) = old_out {
+        *old_out = old;
+    }
+    if let Some(new) = new {
+        match *new {
+            Sigaltstack::Disabled => {
+                tcb.altstack_bottom = 0;
+                tcb.altstack_top = usize::MAX;
+            }
+            Sigaltstack::Enabled { onstack: true, .. } => return Err(Error::new(EINVAL)),
+            Sigaltstack::Enabled {
+                base,
+                size,
+                onstack: false,
+            } => {
+                if size < MIN_SIGALTSTACK_SIZE {
+                    return Err(Error::new(ENOMEM));
+                }
+
+                tcb.altstack_bottom = base as usize;
+                tcb.altstack_top = base as usize + size;
+            }
+        }
+    }
+    Ok(())
+}
+
+pub const MIN_SIGALTSTACK_SIZE: usize = 2048;
+
+pub fn currently_pending_blocked() -> u64 {
+    let control = &unsafe { Tcb::current().unwrap() }.os_specific.control;
+    let w0 = control.word[0].load(Ordering::Relaxed);
+    let w1 = control.word[1].load(Ordering::Relaxed);
+    let allow = (w0 >> 32) | ((w1 >> 32) << 32);
+    let thread_pending = (w0 & 0xffff_ffff) | ((w1 & 0xffff_ffff) << 32);
+    let proc_pending = PROC_CONTROL_STRUCT.pending.load(Ordering::Relaxed);
+
+    core::sync::atomic::fence(Ordering::Acquire); // TODO: Correct ordering?
+
+    (thread_pending | proc_pending) & !allow
+}
+pub enum Unreachable {}
+
+pub fn await_signal_async(inner_allowset: u64) -> Result<Unreachable> {
+    let _guard = tmp_disable_signals();
+    let control = &unsafe { Tcb::current().unwrap() }.os_specific.control;
+
+    let old_allowset = get_allowset_raw(&control.word);
+    set_allowset_raw(&control.word, old_allowset, inner_allowset);
+
+    let res = syscall::nanosleep(
+        &TimeSpec {
+            tv_sec: i64::MAX,
+            tv_nsec: 0,
+        },
+        &mut TimeSpec::default(),
+    );
+
+    if res == Err(Error::new(EINTR)) {
+        unsafe {
+            manually_enter_trampoline();
+        }
+    }
+    // POSIX says it shall restore the mask to what it was prior to the call, which is interpreted
+    // as allowing any changes to sigprocmask inside the signal handler, to be discarded.
+    set_allowset_raw(&control.word, inner_allowset, old_allowset);
+
+    res?;
+    unreachable!()
+}
+
+/// Run a callback with the specified signal mask, atomically
+pub fn callback_or_signal_async<T, F: FnOnce() -> Result<T>>(
+    inner_allowset: u64,
+    callback: F,
+) -> Result<T> {
+    let _guard = tmp_disable_signals();
+    let control = &unsafe { Tcb::current().unwrap() }.os_specific.control;
+
+    let old_allowset = get_allowset_raw(&control.word);
+    set_allowset_raw(&control.word, old_allowset, inner_allowset);
+    let res = callback();
+    if let Err(err) = &res {
+        if err.errno == EINTR {
+            // Run trampoline if EINTR returned
+            unsafe {
+                manually_enter_trampoline();
+            }
+        }
+    }
+
+    // POSIX says it shall restore the mask to what it was prior to the call, which is interpreted
+    // as allowing any changes to sigprocmask inside the signal handler, to be discarded.
+    set_allowset_raw(&control.word, inner_allowset, old_allowset);
+
+    res
+}
+
+/*#[unsafe(no_mangle)]
+pub extern "C" fn __redox_rt_debug_sigctl() {
+    let tcb = &RtTcb::current().control;
+    let _ = syscall::write(1, alloc::format!("SIGCTL: {tcb:#x?}\n").as_bytes());
+}*/
+
+// TODO: deadline-based API
+pub fn await_signal_sync(inner_allowset: u64, timeout: Option<&TimeSpec>) -> Result<SiginfoAbi> {
+    let _guard = tmp_disable_signals();
+    let control = &unsafe { Tcb::current().unwrap() }.os_specific.control;
+
+    let old_allowset = get_allowset_raw(&control.word);
+    let proc_pending = PROC_CONTROL_STRUCT.pending.load(Ordering::Acquire);
+    let thread_pending = set_allowset_raw(&control.word, old_allowset, inner_allowset);
+
+    // Check if there are already signals matching the requested set, before waiting.
+    if let Some(info) = try_claim_multiple(proc_pending, thread_pending, inner_allowset, control) {
+        // TODO: RAII
+        set_allowset_raw(&control.word, inner_allowset, old_allowset);
+        return Ok(info);
+    }
+
+    let res = match timeout {
+        Some(t) => syscall::nanosleep(&t, &mut TimeSpec::default()),
+        None => syscall::nanosleep(
+            &TimeSpec {
+                tv_sec: i64::MAX,
+                tv_nsec: 0,
+            },
+            &mut TimeSpec::default(),
+        ),
+    };
+
+    let thread_pending = set_allowset_raw(&control.word, inner_allowset, old_allowset);
+    let proc_pending = PROC_CONTROL_STRUCT.pending.load(Ordering::Acquire);
+
+    if let Err(error) = res
+        && error.errno != EINTR
+    {
+        return Err(error);
+    }
+
+    // Then check if there were any signals left after waiting.
+    try_claim_multiple(proc_pending, thread_pending, inner_allowset, control)
+        // Normally ETIMEDOUT but not for sigtimedwait.
+        .ok_or(Error::new(EAGAIN))
+}
+
+fn try_claim_multiple(
+    mut proc_pending: u64,
+    mut thread_pending: u64,
+    allowset: u64,
+    control: &Sigcontrol,
+) -> Option<SiginfoAbi> {
+    while (proc_pending | thread_pending) & allowset != 0 {
+        let sig_idx = ((proc_pending | thread_pending) & allowset).trailing_zeros();
+        if thread_pending & allowset & (1 << sig_idx) != 0
+            && let Some(res) = try_claim_single(sig_idx, Some(control))
+        {
+            return Some(res);
+        }
+        thread_pending &= !(1 << sig_idx);
+        if proc_pending & allowset & (1 << sig_idx) != 0
+            && let Some(res) = try_claim_single(sig_idx, None)
+        {
+            return Some(res);
+        }
+        proc_pending &= !(1 << sig_idx);
+    }
+    None
+}
+fn try_claim_single(sig_idx: u32, thread_control: Option<&Sigcontrol>) -> Option<SiginfoAbi> {
+    let sig_group = sig_idx / 32;
+
+    if sig_group == 1 && thread_control.is_none() {
+        // Queued (realtime) signal
+        let rt_inf: RtSigInfo = unsafe {
+            let mut buf = [0_u8; size_of::<RtSigInfo>()];
+            buf[..4].copy_from_slice(&(sig_idx - 32).to_ne_bytes());
+            proc_call(
+                static_proc_info().proc_fd.as_ref().unwrap().as_raw_fd(),
+                &mut buf,
+                CallFlags::empty(),
+                &[ProcCall::Sigdeq as u64],
+            )
+            .ok()?;
+            core::mem::transmute(buf)
+        };
+        Some(SiginfoAbi {
+            si_signo: sig_idx as i32 + 1,
+            si_errno: 0,
+            si_code: rt_inf.code,
+            si_pid: rt_inf.pid as i32,
+            si_uid: rt_inf.uid as i32,
+            si_status: 0,
+            si_value: rt_inf.arg,
+            si_addr: core::ptr::null_mut(),
+        })
+    } else {
+        // Idempotent (standard or thread realtime) signal
+        let info = SenderInfo::from_raw(match thread_control {
+            Some(ctl) => {
+                // Only this thread can clear pending bits, so this will always succeed.
+                let info = match ctl.sender_infos.get(sig_idx as usize) {
+                    Some(i) => i.load(Ordering::Relaxed),
+                    // TODO: Protocol will need to be extended in order to allow passing si_uid and
+                    // si_pid for per-thread (non-queued) realtime signals.
+                    None => 0,
+                };
+                // TODO: Ordering?
+                ctl.word[sig_group as usize].fetch_and(!(1 << (sig_idx % 32)), Ordering::Release);
+                info
+            }
+            None => {
+                // Must have sig_group == 0 here due to the above if stmt
+                let info =
+                    PROC_CONTROL_STRUCT.sender_infos[sig_idx as usize].load(Ordering::Acquire);
+                if PROC_CONTROL_STRUCT
+                    .pending
+                    .fetch_and(!(1 << sig_idx), Ordering::Release)
+                    & (1 << sig_idx)
+                    == 0
+                {
+                    // already claimed
+                    return None;
+                }
+                info
+            }
+        });
+        Some(SiginfoAbi {
+            si_signo: sig_idx as i32 + 1,
+            si_errno: 0,
+            si_code: 0, // TODO: SI_USER const?
+            si_pid: info.pid as i32,
+            si_uid: info.ruid as i32,
+            si_status: 0,
+            si_value: 0, // undefined
+            si_addr: core::ptr::null_mut(),
+        })
+    }
+}
+pub fn apply_inherited_sigignmask(inherited: u64) {
+    let _sig_guard = tmp_disable_signals();
+    let _guard = SIGACTIONS_LOCK.lock();
+    let ctl = current_sigctl();
+
+    // Set all signals in the inherited set that have explicitly been set to SIG_IGN. Those whose
+    // (default) effective action is to ignore but are set to SIG_DFL, are not in this set, and the
+    // initial SIG_DFL state would be "Ignore" anyway but still return SIG_DFL when asked, as
+    // usual.
+    for bit in (0..64).filter(|b| inherited & (1 << b) != 0) {
+        let sig = u8::try_from(bit + 1).unwrap();
+        let _ = sigaction_inner(
+            ctl,
+            sig,
+            Some(&Sigaction {
+                // TODO: correct fields?
+                flags: SigactionFlags::IGNORED,
+                kind: SigactionKind::Ignore,
+                mask: 0,
+            }),
+            None,
+        );
+    }
+}
+pub fn get_sigignmask_to_inherit() -> u64 {
+    let _sig_guard = tmp_disable_signals();
+    let _guard = SIGACTIONS_LOCK.lock();
+    let ctl = current_sigctl();
+
+    let mut mask = 0_u64;
+    // Fill the mask with the set of the inherited signals that have explicitly been set to
+    // SIG_IGN. Again this excludes signals that would have returned SIG_DFL from sigaction,
+    // despite their default action being "Ignore".
+
+    for bit in 0..64 {
+        let sig = u8::try_from(bit + 1).unwrap();
+        let mut old = Sigaction::default();
+        let _ = sigaction_inner(ctl, sig, None, Some(&mut old));
+        if matches!(old.kind, SigactionKind::Ignore) {
+            mask |= 1 << bit;
+        }
+    }
+
+    mask
+}
diff --git a/recipes/core/relibc/redox-rt/src/sync.rs b/recipes/core/relibc/redox-rt/src/sync.rs
new file mode 100644
index 0000000000..beae40aa05
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/sync.rs
@@ -0,0 +1,68 @@
+// TODO: Share code for simple futex-based mutex between relibc's Mutex<()> and this.
+
+use core::{
+    cell::UnsafeCell,
+    ops::{Deref, DerefMut},
+    sync::atomic::{AtomicU32, Ordering},
+};
+
+pub struct Mutex<T> {
+    pub lockword: AtomicU32,
+    pub inner: UnsafeCell<T>,
+}
+
+unsafe impl<T: Send> Send for Mutex<T> {}
+unsafe impl<T: Send> Sync for Mutex<T> {}
+
+impl<T> Mutex<T> {
+    /// Represents an unlocked [Mutex].
+    pub const UNLOCKED: u32 = 0;
+    /// Represents a locked [Mutex].
+    pub const LOCKED: u32 = 1;
+    /// Represents a waiting [Mutex].
+    pub const WAITING: u32 = 2;
+
+    pub const fn new(t: T) -> Self {
+        Self {
+            lockword: AtomicU32::new(0),
+            inner: UnsafeCell::new(t),
+        }
+    }
+    pub fn lock(&self) -> MutexGuard<'_, T> {
+        while self
+            .lockword
+            .compare_exchange(
+                Self::UNLOCKED,
+                Self::LOCKED,
+                Ordering::Acquire,
+                Ordering::Relaxed,
+            )
+            .is_err()
+        {
+            core::hint::spin_loop();
+        }
+        MutexGuard { lock: self }
+    }
+}
+pub struct MutexGuard<'l, T> {
+    lock: &'l Mutex<T>,
+}
+impl<T> Deref for MutexGuard<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.lock.inner.get() }
+    }
+}
+impl<T> DerefMut for MutexGuard<'_, T> {
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.lock.inner.get() }
+    }
+}
+impl<T> Drop for MutexGuard<'_, T> {
+    fn drop(&mut self) {
+        self.lock
+            .lockword
+            .store(Mutex::<T>::UNLOCKED, Ordering::Release);
+    }
+}
diff --git a/recipes/core/relibc/redox-rt/src/sys.rs b/recipes/core/relibc/redox-rt/src/sys.rs
new file mode 100644
index 0000000000..f0363a39a9
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/sys.rs
@@ -0,0 +1,563 @@
+use core::{
+    mem::{replace, size_of},
+    ptr::addr_of,
+    sync::atomic::{AtomicU32, Ordering},
+};
+
+use ioslice::IoSlice;
+use syscall::{
+    CallFlags, EINVAL, ERESTART, StdFsCallKind, TimeSpec,
+    data::StdFsCallMeta,
+    error::{self, EINTR, ENODEV, ESRCH, Error, Result},
+};
+
+use crate::{
+    DYNAMIC_PROC_INFO, DynamicProcInfo, RtTcb, Tcb,
+    arch::manually_enter_trampoline,
+    proc::{FdGuard, FdGuardUpper},
+    read_proc_meta,
+    signal::tmp_disable_signals,
+};
+use alloc::vec::Vec;
+use redox_protocols::protocol::{
+    NsDup, ProcCall, ProcKillTarget, RtSigInfo, ThreadCall, WaitFlags,
+};
+
+#[inline]
+fn wrapper<T>(restart: bool, erestart: bool, mut f: impl FnMut() -> Result<T>) -> Result<T> {
+    loop {
+        let _guard = tmp_disable_signals();
+        let rt_sigarea = unsafe { &Tcb::current().unwrap().os_specific };
+        let res = f();
+        let code = if erestart { ERESTART } else { EINTR };
+
+        if let Err(err) = res
+            && err == Error::new(code)
+        {
+            unsafe {
+                manually_enter_trampoline();
+            }
+            if restart && unsafe { (*rt_sigarea.arch.get()).last_sig_was_restart } {
+                continue;
+            }
+        }
+
+        return res;
+    }
+}
+// TODO: uninitialized memory?
+#[inline]
+pub fn posix_read(fd: usize, buf: &mut [u8]) -> Result<usize> {
+    wrapper(true, false, || syscall::read(fd, buf))
+}
+#[inline]
+pub fn posix_write(fd: usize, buf: &[u8]) -> Result<usize> {
+    wrapper(true, false, || syscall::write(fd, buf))
+}
+#[inline]
+pub fn posix_kill(target: ProcKillTarget, sig: usize) -> Result<()> {
+    if sig > 64 {
+        return Err(Error::new(EINVAL));
+    }
+
+    match wrapper(false, true, || {
+        this_proc_call(
+            &mut [],
+            CallFlags::empty(),
+            &[ProcCall::Kill as u64, target.raw() as u64, sig as u64],
+        )
+    }) {
+        Ok(_) | Err(Error { errno: ERESTART }) => Ok(()),
+        Err(error) => Err(error),
+    }
+}
+#[inline]
+pub fn posix_sigqueue(pid: usize, sig: usize, arg: usize) -> Result<()> {
+    let target = ProcKillTarget::from_raw(pid);
+    if !matches!(target, ProcKillTarget::SingleProc(_)) {
+        return Err(Error::new(ESRCH));
+    }
+    if sig <= 32 {
+        return posix_kill(target, sig);
+    }
+    let mut siginf = RtSigInfo {
+        arg,
+        code: -1, // TODO: SI_QUEUE constant
+        uid: 0,   // TODO
+        pid: posix_getpid(),
+    };
+    match wrapper(false, true, || {
+        this_proc_call(
+            unsafe { plain::as_mut_bytes(&mut siginf) },
+            CallFlags::empty(),
+            &[ProcCall::Sigq as u64, pid as u64, sig as u64],
+        )
+    }) {
+        Ok(_)
+        | Err(Error {
+            errno: error::ERESTART,
+        }) => Ok(()),
+        Err(error) => Err(error),
+    }
+}
+#[inline]
+pub fn posix_getpid() -> u32 {
+    // SAFETY: read-only except during program/fork child initialization
+    unsafe { addr_of!((*crate::STATIC_PROC_INFO.get()).pid).read() }
+}
+#[inline]
+pub fn posix_getppid() -> u32 {
+    this_proc_call(&mut [], CallFlags::empty(), &[ProcCall::Getppid as u64]).expect("cannot fail")
+        as u32
+}
+
+#[inline]
+pub fn posix_setpriority(which: i32, who: u32, prio: u32) -> Result<(), syscall::Error> {
+    if which != 0 {
+        return Err(syscall::Error::new(syscall::EINVAL)); // TODO: Add support for PRIO_PGRP and PRIO_PROCESS
+    }
+
+    this_proc_call(
+        &mut [],
+        CallFlags::empty(),
+        &[ProcCall::SetProcPriority as u64, who as u64, prio as u64],
+    )?;
+
+    Ok(())
+}
+
+#[inline]
+pub fn posix_getpriority(which: i32, who: u32) -> Result<u32, syscall::Error> {
+    if which != 0 {
+        return Err(syscall::Error::new(syscall::EINVAL));
+    }
+
+    let res = this_proc_call(
+        &mut [],
+        CallFlags::empty(),
+        &[ProcCall::GetProcPriority as u64, who as u64],
+    )?;
+
+    Ok(res as u32)
+}
+
+#[inline]
+pub unsafe fn sys_futex_wait(addr: *mut u32, val: u32, deadline: Option<&TimeSpec>) -> Result<()> {
+    wrapper(true, false, || {
+        unsafe {
+            syscall::syscall5(
+                syscall::SYS_FUTEX,
+                addr as usize,
+                syscall::FUTEX_WAIT,
+                val as usize,
+                deadline.map_or(0, |d| d as *const _ as usize),
+                0,
+            )
+        }
+        .map(|_| ())
+    })
+}
+#[inline]
+pub unsafe fn sys_futex_wake(addr: *mut u32, num: u32) -> Result<u32> {
+    unsafe {
+        syscall::syscall5(
+            syscall::SYS_FUTEX,
+            addr as usize,
+            syscall::FUTEX_WAKE,
+            num as usize,
+            0,
+            0,
+        )
+    }
+    .map(|awoken| awoken as u32)
+}
+unsafe fn raw_sys_call(
+    fd: usize,
+    payload_ptr: *const u8,
+    len: usize,
+    flags: CallFlags,
+    metadata: &[u64],
+) -> Result<usize> {
+    unsafe {
+        syscall::syscall5(
+            syscall::SYS_CALL,
+            fd,
+            payload_ptr as usize,
+            len,
+            metadata.len() | flags.bits(),
+            metadata.as_ptr() as usize,
+        )
+    }
+}
+pub fn sys_call_ro(
+    fd: usize,
+    payload: &mut [u8],
+    flags: CallFlags,
+    metadata: &[u64],
+) -> Result<usize> {
+    unsafe {
+        raw_sys_call(
+            fd,
+            payload.as_mut_ptr(),
+            payload.len(),
+            flags | CallFlags::READ,
+            metadata,
+        )
+    }
+}
+pub fn sys_call_wo(fd: usize, payload: &[u8], flags: CallFlags, metadata: &[u64]) -> Result<usize> {
+    unsafe {
+        raw_sys_call(
+            fd,
+            payload.as_ptr(),
+            payload.len(),
+            flags | CallFlags::WRITE,
+            metadata,
+        )
+    }
+}
+pub fn sys_call_rw(
+    fd: usize,
+    payload: &mut [u8],
+    flags: CallFlags,
+    metadata: &[u64],
+) -> Result<usize> {
+    unsafe {
+        raw_sys_call(
+            fd,
+            payload.as_mut_ptr(),
+            payload.len(),
+            flags | CallFlags::READ | CallFlags::WRITE,
+            metadata,
+        )
+    }
+}
+pub fn sys_call(
+    fd: usize,
+    payload: &mut [u8],
+    flags: CallFlags,
+    metadata: &[u64],
+) -> Result<usize> {
+    unsafe { raw_sys_call(fd, payload.as_mut_ptr(), payload.len(), flags, metadata) }
+}
+pub fn this_proc_call(payload: &mut [u8], flags: CallFlags, metadata: &[u64]) -> Result<usize> {
+    proc_call(
+        crate::current_proc_fd().as_raw_fd(),
+        payload,
+        flags,
+        metadata,
+    )
+}
+pub fn proc_call(
+    proc_fd: usize,
+    payload: &mut [u8],
+    flags: CallFlags,
+    metadata: &[u64],
+) -> Result<usize> {
+    sys_call(proc_fd, payload, flags, metadata)
+}
+pub fn thread_call(
+    thread_fd: usize,
+    payload: &mut [u8],
+    flags: CallFlags,
+    metadata: &[u64],
+) -> Result<usize> {
+    sys_call(thread_fd, payload, flags, metadata)
+}
+pub fn this_thread_call(payload: &mut [u8], flags: CallFlags, metadata: &[u64]) -> Result<usize> {
+    thread_call(
+        RtTcb::current().thread_fd().as_raw_fd(),
+        payload,
+        flags,
+        metadata,
+    )
+}
+
+#[derive(Clone, Copy, Debug)]
+pub enum WaitpidTarget {
+    AnyChild,
+    AnyGroupMember,
+    SingleProc { pid: usize },
+    ProcGroup { pgid: usize },
+}
+impl WaitpidTarget {
+    pub fn from_posix_arg(raw: isize) -> Self {
+        match raw {
+            0 => Self::AnyGroupMember,
+            -1 => Self::AnyChild,
+            1.. => Self::SingleProc { pid: raw as usize },
+            ..-1 => Self::ProcGroup {
+                pgid: -raw as usize,
+            },
+        }
+    }
+}
+
+pub fn sys_waitpid(target: WaitpidTarget, status: &mut usize, flags: WaitFlags) -> Result<usize> {
+    let (call, pid) = match target {
+        WaitpidTarget::AnyChild => (ProcCall::Waitpid, 0),
+        WaitpidTarget::SingleProc { pid } => (ProcCall::Waitpid, pid),
+        WaitpidTarget::AnyGroupMember => (ProcCall::Waitpgid, 0),
+        WaitpidTarget::ProcGroup { pgid } => (ProcCall::Waitpgid, pgid),
+    };
+    wrapper(true, false, || {
+        this_proc_call(
+            unsafe { plain::as_mut_bytes(status) },
+            CallFlags::empty(),
+            &[call as u64, pid as u64, flags.bits() as u64],
+        )
+    })
+}
+pub fn posix_kill_thread(thread_fd: usize, signal: u32) -> Result<()> {
+    // TODO: don't hardcode?
+    if signal > 64 {
+        return Err(Error::new(EINVAL));
+    }
+
+    match wrapper(false, true, || {
+        thread_call(
+            thread_fd,
+            &mut [],
+            CallFlags::empty(),
+            &[ThreadCall::SignalThread as u64, signal.into()],
+        )
+    }) {
+        Ok(_) | Err(Error { errno: ERESTART }) => Ok(()),
+        Err(error) => Err(error),
+    }
+}
+
+static UMASK: AtomicU32 = AtomicU32::new(0o022);
+
+/// Controls the set of bits removed from the `mode` mask when new file descriptors are created.
+///
+/// Must be validated by the caller
+//
+// TODO: validate here?
+#[inline]
+pub fn swap_umask(mask: u32) -> u32 {
+    UMASK.swap(mask, Ordering::AcqRel)
+}
+
+#[inline]
+pub fn get_umask() -> u32 {
+    UMASK.load(Ordering::Acquire)
+}
+
+/// Real/Effective/Set-User/Group ID
+pub struct Resugid<T> {
+    pub ruid: T,
+    pub euid: T,
+    pub suid: T,
+    pub rgid: T,
+    pub egid: T,
+    pub sgid: T,
+}
+
+/// Sets [res][ug]id, fields that are None will be unchanged.
+pub fn posix_setresugid(ids: &Resugid<Option<u32>>) -> Result<()> {
+    // TODO: not sure how "tmp" an IPC call is?
+    let _sig_guard = tmp_disable_signals();
+    let mut guard = DYNAMIC_PROC_INFO.lock();
+
+    let mut buf = [0_u8; size_of::<u32>() * 6];
+    plain::slice_from_mut_bytes(&mut buf)
+        .unwrap()
+        .copy_from_slice(&[
+            ids.ruid.unwrap_or(u32::MAX),
+            ids.euid.unwrap_or(u32::MAX),
+            ids.suid.unwrap_or(u32::MAX),
+            ids.rgid.unwrap_or(u32::MAX),
+            ids.egid.unwrap_or(u32::MAX),
+            ids.sgid.unwrap_or(u32::MAX),
+        ]);
+
+    this_proc_call(&mut buf, CallFlags::empty(), &[ProcCall::SetResugid as u64])?;
+
+    if let Some(ruid) = ids.ruid {
+        guard.ruid = ruid;
+    }
+    if let Some(euid) = ids.euid {
+        guard.euid = euid;
+    }
+    if let Some(suid) = ids.suid {
+        guard.suid = suid;
+    }
+    if let Some(rgid) = ids.rgid {
+        guard.rgid = rgid;
+    }
+    if let Some(egid) = ids.egid {
+        guard.egid = egid;
+    }
+    if let Some(sgid) = ids.sgid {
+        guard.sgid = sgid;
+    }
+
+    Ok(())
+}
+pub fn posix_getresugid() -> Resugid<u32> {
+    let _sig_guard = tmp_disable_signals();
+    let DynamicProcInfo {
+        ruid,
+        euid,
+        suid,
+        rgid,
+        egid,
+        sgid,
+        ..
+    } = *DYNAMIC_PROC_INFO.lock();
+    Resugid {
+        ruid,
+        euid,
+        suid,
+        rgid,
+        egid,
+        sgid,
+    }
+}
+pub fn getens() -> Result<usize> {
+    read_proc_meta(crate::current_proc_fd()).map(|meta| meta.ens as usize)
+}
+pub fn get_proc_credentials(cap_fd: usize, target_pid: usize, buf: &mut [u8]) -> Result<usize> {
+    if buf.len() < size_of::<redox_protocols::protocol::ProcMeta>() {
+        return Err(Error::new(EINVAL));
+    }
+    proc_call(
+        cap_fd,
+        buf,
+        CallFlags::empty(),
+        &[ProcCall::GetProcCredentials as u64, target_pid as u64],
+    )
+}
+pub fn posix_exit(status: i32) -> ! {
+    this_proc_call(
+        &mut [],
+        CallFlags::empty(),
+        &[ProcCall::Exit as u64, (status & 0xFF) as u64],
+    )
+    .expect("failed to call proc mgr with Exit");
+    let _ = syscall::write(1, b"redox-rt: ProcCall::Exit FAILED, abort()ing!\n");
+    core::intrinsics::abort();
+}
+pub fn posix_getpgid(pid: usize) -> Result<usize> {
+    this_proc_call(
+        &mut [],
+        CallFlags::empty(),
+        &[ProcCall::Setpgid as u64, pid as u64, u64::wrapping_neg(1)],
+    )
+}
+pub fn posix_setpgid(pid: usize, pgid: usize) -> Result<()> {
+    if pgid == usize::wrapping_neg(1) {
+        return Err(Error::new(EINVAL));
+    }
+    this_proc_call(
+        &mut [],
+        CallFlags::empty(),
+        &[ProcCall::Setpgid as u64, pid as u64, pgid as u64],
+    )?;
+    Ok(())
+}
+pub fn posix_getsid(pid: usize) -> Result<usize> {
+    this_proc_call(
+        &mut [],
+        CallFlags::empty(),
+        &[ProcCall::Getsid as u64, pid as u64],
+    )
+}
+pub fn posix_setsid() -> Result<u32> {
+    this_proc_call(&mut [], CallFlags::empty(), &[ProcCall::Setsid as u64])?;
+    Ok(posix_getpid())
+}
+pub fn posix_nanosleep(rqtp: &TimeSpec, rmtp: &mut TimeSpec) -> Result<()> {
+    wrapper(false, false, || syscall::nanosleep(rqtp, rmtp))?;
+    Ok(())
+}
+pub fn setns(fd: usize) -> Option<FdGuardUpper> {
+    let mut info = DYNAMIC_PROC_INFO.lock();
+    let new_fd_guard = FdGuard::new(fd).to_upper().unwrap();
+    let old_fd_guard = replace(&mut info.ns_fd, Some(new_fd_guard));
+    old_fd_guard
+}
+pub fn getns() -> Result<usize> {
+    let cur_ns = crate::current_namespace_fd()?;
+    if cur_ns == usize::MAX {
+        Err(Error::new(ENODEV))
+    } else {
+        Ok(cur_ns)
+    }
+}
+pub fn open<T: AsRef<str>>(path: T, flags: usize) -> Result<usize> {
+    let path = path.as_ref();
+    let fcntl_flags = flags & syscall::O_FCNTL_MASK;
+    unsafe {
+        syscall::syscall5(
+            syscall::SYS_OPENAT,
+            crate::current_namespace_fd()?,
+            path.as_ptr() as usize,
+            path.len(),
+            flags,
+            fcntl_flags,
+        )
+    }
+}
+pub fn openat<T: AsRef<str>>(
+    fd: usize,
+    path: T,
+    flags: usize,
+    fcntl_flags: usize,
+) -> Result<usize> {
+    let path = path.as_ref();
+    unsafe {
+        syscall::syscall5(
+            syscall::SYS_OPENAT,
+            fd,
+            path.as_ptr() as usize,
+            path.len(),
+            flags,
+            fcntl_flags,
+        )
+    }
+}
+pub fn unlink<T: AsRef<str>>(path: T, flags: usize) -> Result<usize> {
+    let path = path.as_ref();
+    unsafe {
+        syscall::syscall4(
+            syscall::SYS_UNLINKAT,
+            crate::current_namespace_fd()?,
+            path.as_ptr() as usize,
+            path.len(),
+            flags,
+        )
+    }
+}
+pub fn mkns(names: &[IoSlice]) -> Result<FdGuardUpper> {
+    let mut buf = Vec::from((NsDup::ForkNs as usize).to_ne_bytes());
+    for name in names {
+        let name_bytes = name.as_slice();
+        let len = name_bytes.len();
+        let _scheme_name = core::str::from_utf8(name_bytes).map_err(|_| Error::new(EINVAL))?;
+        buf.extend_from_slice(&len.to_ne_bytes());
+        buf.extend_from_slice(name_bytes);
+    }
+    FdGuard::new(syscall::dup(crate::current_namespace_fd()?, &buf)?).to_upper()
+}
+pub fn register_scheme_to_ns(ns_fd: usize, name: &str, cap_fd: usize) -> Result<()> {
+    let mut buf = alloc::vec::Vec::from((NsDup::IssueRegister as usize).to_ne_bytes());
+    buf.extend_from_slice(name.as_bytes());
+    let ns_this_scheme = FdGuard::new(syscall::dup(ns_fd, &buf)?);
+    let cap_bytes = cap_fd.to_ne_bytes();
+    ns_this_scheme.call_wo(&cap_bytes, CallFlags::FD, &[])?;
+    Ok(())
+}
+pub fn std_fs_call_ro(fd: usize, payload: &mut [u8], metadata: &StdFsCallMeta) -> Result<usize> {
+    sys_call_ro(fd, payload, CallFlags::STD_FS, metadata)
+}
+pub fn std_fs_call_wo(fd: usize, payload: &[u8], metadata: &StdFsCallMeta) -> Result<usize> {
+    sys_call_wo(fd, payload, CallFlags::STD_FS, metadata)
+}
+pub fn std_fs_call_rw(fd: usize, payload: &mut [u8], metadata: &StdFsCallMeta) -> Result<usize> {
+    sys_call_rw(fd, payload, CallFlags::STD_FS, metadata)
+}
+pub fn fstat(fd: usize, stat: &mut syscall::Stat) -> Result<usize> {
+    std_fs_call_ro(fd, stat, &StdFsCallMeta::new(StdFsCallKind::Fstat, 0, 0))
+}
diff --git a/recipes/core/relibc/redox-rt/src/thread.rs b/recipes/core/relibc/redox-rt/src/thread.rs
new file mode 100644
index 0000000000..9ad1d4615a
--- /dev/null
+++ b/recipes/core/relibc/redox-rt/src/thread.rs
@@ -0,0 +1,70 @@
+use core::mem::size_of;
+
+use syscall::Result;
+
+use crate::{RtTcb, arch::*, proc::*, signal::tmp_disable_signals, static_proc_info};
+
+/// Spawns a new context sharing the same address space as the current one (i.e. a new thread).
+pub unsafe fn rlct_clone_impl(stack: *mut usize, tcb: &RtTcb) -> Result<usize> {
+    let proc_info = static_proc_info();
+    let cur_proc_fd = proc_info.proc_fd.as_ref().unwrap();
+
+    let cur_thr_fd = RtTcb::current().thread_fd();
+    let new_thr_fd = cur_proc_fd.dup(b"new-thread")?.to_upper().unwrap();
+
+    // Inherit existing address space
+    {
+        let cur_addr_space_fd = cur_thr_fd.dup(b"addrspace")?;
+        let new_addr_space_sel_fd = new_thr_fd.dup(b"current-addrspace")?;
+
+        let buf = create_set_addr_space_buf(
+            cur_addr_space_fd.as_raw_fd(),
+            __relibc_internal_rlct_clone_ret as *const () as usize,
+            stack as usize,
+        );
+        new_addr_space_sel_fd.write(&buf)?;
+    }
+
+    // Inherit reference to file table
+    {
+        let cur_filetable_fd = cur_thr_fd.dup(b"filetable")?;
+        let new_filetable_sel_fd = new_thr_fd.dup(b"current-filetable")?;
+
+        new_filetable_sel_fd.write(&usize::to_ne_bytes(cur_filetable_fd.as_raw_fd()))?;
+    }
+
+    // Since the signal handler is not yet initialized, signals specifically targeting the thread
+    // (relibc is only required to implement thread-specific signals that already originate from
+    // the same process) will be discarded. Process-specific signals will ignore this new thread,
+    // until it has initialized its own signal handler.
+
+    let start_fd = new_thr_fd.dup(b"start")?;
+
+    let fd = new_thr_fd.as_raw_fd();
+    unsafe {
+        tcb.thr_fd.get().write(Some(new_thr_fd));
+    }
+
+    // Unblock context.
+    start_fd.write(&[0])?;
+
+    Ok(fd)
+}
+
+pub unsafe fn exit_this_thread(stack_base: *mut (), stack_size: usize) -> ! {
+    let _guard = tmp_disable_signals();
+
+    let tcb = RtTcb::current();
+    // TODO: modify interface so it writes directly to the thread fd?
+    let status_fd = tcb.thread_fd().dup(b"status").unwrap();
+
+    let _ = unsafe { syscall::funmap(tcb as *const RtTcb as usize, syscall::PAGE_SIZE) };
+
+    let mut buf = [0; size_of::<usize>() * 3];
+    plain::slice_from_mut_bytes(&mut buf)
+        .unwrap()
+        .copy_from_slice(&[usize::MAX, stack_base as usize, stack_size]);
+    // TODO: SYS_CALL w/CONSUME
+    status_fd.write(&buf).unwrap();
+    unreachable!()
+}
diff --git a/recipes/core/relibc/renamesyms.sh b/recipes/core/relibc/renamesyms.sh
new file mode 100755
index 0000000000..4ab73f8d54
--- /dev/null
+++ b/recipes/core/relibc/renamesyms.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+set -e
+
+target=$1
+deps_dir=$2
+
+if [ -z "$target" ] || [ -z "$deps_dir" ]; then
+    echo "Usage:\n\t./renamesyms.sh TARGET DEPS_DIR"
+    exit 1
+fi
+
+if [ ! -f "$target" ]; then
+    echo "Target file '$target' does not exist"
+    exit 1
+fi
+if [ ! -d "$deps_dir" ] ; then
+    echo "Deps dir '$deps_dir' does not exist or not a directory"
+    exit 1
+fi
+
+symbols_file=`mktemp`
+special_syms=(
+    __rdl_oom
+    __rg_alloc
+    __rg_alloc_zeroed
+    __rg_dealloc
+    __rg_oom
+    __rg_realloc
+    __rust_alloc
+    __rust_alloc_error_handler
+    __rust_alloc_error_handler_should_panic
+    __rust_alloc_zeroed
+    __rust_dealloc
+    __rust_no_alloc_shim_is_unstable
+    __rust_realloc
+)
+
+for dep in `find $deps_dir -type f -name "*.rlib"`; do
+    "${NM}" --format=posix -g "$dep" 2>/dev/null | sed 's/.*:.*//g' | awk '{if ($2 == "T") print $1}' | sed 's/^\(.*\)$/\1 __relibc_\1/g' >> $symbols_file
+done
+
+for special_sym in "${special_syms[@]}"; do
+    echo "$special_sym __relibc_$special_sym" >> $symbols_file
+done
+
+mangled_alloc_syms=$("${NM}" --format=posix -g "$target" 2>/dev/null | awk '{print $1}' | grep "7___rustc" || true)
+for sym in $mangled_alloc_syms; do
+    echo "$sym __relibc_$sym" >> $symbols_file
+done
+
+sorted_file=`mktemp`
+sort -u "$symbols_file" > "$sorted_file"
+rm -f "$symbols_file"
+
+"${OBJCOPY}" --redefine-syms="$sorted_file" "$target"
+
+rm -f "$sorted_file"
diff --git a/recipes/core/relibc/rust-toolchain.toml b/recipes/core/relibc/rust-toolchain.toml
new file mode 100644
index 0000000000..b3394ccad7
--- /dev/null
+++ b/recipes/core/relibc/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2025-11-15"
+components = ["rust-src"]
diff --git a/recipes/core/relibc/rustfmt.toml b/recipes/core/relibc/rustfmt.toml
new file mode 100644
index 0000000000..3a0fc9168d
--- /dev/null
+++ b/recipes/core/relibc/rustfmt.toml
@@ -0,0 +1,21 @@
+blank_lines_lower_bound = 0
+blank_lines_upper_bound = 1
+brace_style = "SameLineWhere"
+disable_all_formatting = false
+edition = "2024"
+empty_item_single_line = true
+fn_single_line = false
+force_explicit_abi = true
+format_strings = false
+hard_tabs = false
+imports_granularity = "Crate"
+imports_indent = "Block"
+imports_layout = "Mixed"
+indent_style = "Block"
+max_width = 100
+newline_style = "Unix"
+show_parse_errors = true
+skip_children = false
+tab_spaces = 4
+trailing_comma = "Vertical"
+where_single_line = false
diff --git a/recipes/core/relibc/src/c/stdlib.c b/recipes/core/relibc/src/c/stdlib.c
new file mode 100644
index 0000000000..62e98108bb
--- /dev/null
+++ b/recipes/core/relibc/src/c/stdlib.c
@@ -0,0 +1,13 @@
+double strtod(const char *nptr, char **endptr);
+
+long double strtold(const char *nptr, char **endptr) {
+    return (long double)strtod(nptr, endptr);
+}
+
+double relibc_ldtod(const long double* val) {
+    return (double)(*val);
+}
+
+void relibc_dtold(double val, long double* out) {
+    *out = (long double)val;
+}
diff --git a/recipes/core/relibc/src/c_str.rs b/recipes/core/relibc/src/c_str.rs
new file mode 100644
index 0000000000..37880314a7
--- /dev/null
+++ b/recipes/core/relibc/src/c_str.rs
@@ -0,0 +1,322 @@
+//! Nul-terminated byte strings.
+
+use core::{marker::PhantomData, ptr::NonNull, str::Utf8Error};
+
+use alloc::{borrow::Cow, string::String};
+
+use crate::platform::types::{c_char, wchar_t};
+
+mod private {
+    pub trait Sealed {}
+}
+#[derive(Clone, Copy, Debug)]
+pub enum Thin {}
+
+#[derive(Clone, Copy, Debug)]
+pub enum Wide {}
+
+impl private::Sealed for Thin {}
+impl private::Sealed for Wide {}
+
+pub trait Kind: private::Sealed + Copy + 'static {
+    /// c_char or wchar_t
+    type C: Copy + 'static;
+    // u8 or u32
+    type Char: Copy + From<u8> + Into<u32> + PartialEq + 'static;
+
+    const NUL: Self::Char;
+
+    const IS_THIN_NOT_WIDE: bool;
+
+    fn r2c(c: Self::Char) -> Self::C;
+    fn c2r(c: Self::C) -> Self::Char;
+
+    fn chars_from_bytes(b: &[u8]) -> Option<&[Self::Char]>;
+    fn chars_to_bytes(c: &[Self::Char]) -> Option<&[u8]>;
+
+    unsafe fn strlen(s: *const Self::C) -> usize;
+    unsafe fn strchr(s: *const Self::C, c: Self::C) -> *const Self::C;
+    unsafe fn strchrnul(s: *const Self::C, c: Self::C) -> *const Self::C;
+}
+impl Kind for Thin {
+    type C = c_char;
+    type Char = u8;
+
+    const NUL: Self::Char = 0;
+    const IS_THIN_NOT_WIDE: bool = true;
+
+    unsafe fn strlen(s: *const c_char) -> usize {
+        unsafe { crate::header::string::strlen(s) }
+    }
+    unsafe fn strchr(s: *const c_char, c: c_char) -> *const c_char {
+        unsafe { crate::header::string::strchr(s, c.into()) }
+    }
+    unsafe fn strchrnul(s: *const c_char, c: c_char) -> *const c_char {
+        unsafe { crate::header::string::strchrnul(s, c.into()) }
+    }
+    fn r2c(c: u8) -> c_char {
+        c as _
+    }
+    fn c2r(c: c_char) -> u8 {
+        c as _
+    }
+    fn chars_from_bytes(b: &[u8]) -> Option<&[Self::Char]> {
+        Some(b)
+    }
+    fn chars_to_bytes(c: &[Self::Char]) -> Option<&[u8]> {
+        Some(c)
+    }
+}
+impl Kind for Wide {
+    type C = wchar_t;
+    type Char = u32;
+
+    const NUL: Self::Char = 0;
+    const IS_THIN_NOT_WIDE: bool = false;
+
+    unsafe fn strlen(s: *const Self::C) -> usize {
+        unsafe { crate::header::wchar::wcslen(s) }
+    }
+    unsafe fn strchr(s: *const Self::C, c: Self::C) -> *const Self::C {
+        unsafe { crate::header::wchar::wcschr(s, c) }
+    }
+    unsafe fn strchrnul(mut s: *const Self::C, c: Self::C) -> *const Self::C {
+        // TODO: optimized function
+        while unsafe { s.read() } != c && unsafe { s.read() } != 0 {
+            s = unsafe { s.add(1) };
+        }
+        s
+    }
+    fn r2c(c: Self::Char) -> Self::C {
+        c as _
+    }
+    fn c2r(c: Self::C) -> Self::Char {
+        c as _
+    }
+    fn chars_from_bytes(b: &[u8]) -> Option<&[Self::Char]> {
+        None
+    }
+    fn chars_to_bytes(c: &[Self::Char]) -> Option<&[u8]> {
+        None
+    }
+}
+
+/// Safe wrapper for immutable borrowed C strings, guaranteed to be the same layout as `*const u8`.
+#[derive(Clone, Copy)]
+#[repr(transparent)]
+pub struct NulStr<'a, T: Kind> {
+    ptr: NonNull<T::C>,
+    _marker: PhantomData<&'a [u8]>,
+}
+pub type CStr<'a> = NulStr<'a, Thin>;
+pub type WStr<'a> = NulStr<'a, Wide>;
+
+impl<'a, T: Kind> NulStr<'a, T> {
+    /// Safety
+    ///
+    /// The ptr must be valid up to and including the first NUL byte from the base ptr.
+    pub const unsafe fn from_ptr(ptr: *const T::C) -> Self {
+        Self {
+            ptr: unsafe { NonNull::new_unchecked(ptr.cast_mut()) },
+            _marker: PhantomData,
+        }
+    }
+    pub unsafe fn from_nullable_ptr(ptr: *const T::C) -> Option<Self> {
+        if ptr.is_null() {
+            None
+        } else {
+            Some(unsafe { Self::from_ptr(ptr) })
+        }
+    }
+    /// Look for the closest occurence of `c`, and if found, split the string into a slice up to
+    /// that byte and a `CStr` starting at that byte.
+    #[inline]
+    #[doc(alias = "strchrnul")]
+    pub fn find_get_subslice_or_all(
+        self,
+        c: impl Into<T::Char>,
+    ) -> Result<(&'a [T::Char], Self), (&'a [T::Char], Self)> {
+        let c = c.into();
+
+        // SAFETY: strchrnul expects self.as_ptr() to be valid up to and including its last NUL
+        // byte
+        let found = unsafe { T::strchrnul(self.as_ptr(), T::r2c(c)) };
+
+        // SAFETY: the pointer returned from strchrnul is always a substring of this string, and
+        // hence always valid as a CStr.
+        let found = unsafe { Self::from_ptr(found) };
+        let until = unsafe { self.slice_until_substr(found) };
+
+        if found.first() == T::NUL {
+            // The character was not found, and we got the end of the string instead.
+            Err((until, found))
+        } else {
+            Ok((until, found))
+        }
+    }
+    /// # Safety
+    ///
+    /// `substr` must be contained within `self`
+    #[inline]
+    pub unsafe fn slice_until_substr(self, substr: NulStr<'_, T>) -> &'a [T::Char] {
+        let index = unsafe {
+            // SAFETY: the sub-pointer as returned by strchr must be derived from the same
+            // allocation
+            substr.as_ptr().offset_from(self.as_ptr()) as usize
+        };
+        unsafe { core::slice::from_raw_parts(self.as_ptr().cast::<T::Char>(), index) }
+    }
+    /// Look for the closest occurence of `c`, and if found, split the string into a slice up to
+    /// that byte and a `CStr` starting at that byte.
+    #[inline]
+    pub fn find_get_subslice(self, c: T::Char) -> Option<(&'a [T::Char], Self)> {
+        let rest = self.find(c)?;
+
+        // SAFETY: the output of strchr is obviously a substring if it doesn't return NULL
+        Some((unsafe { self.slice_until_substr(rest) }, rest))
+    }
+    /// Look for the closest occurence of `c`, and return a new string starting at that byte if
+    /// found.
+    #[doc(alias = "strchr")]
+    #[doc(alias = "wcschr")]
+    #[inline]
+    pub fn find(self, c: T::Char) -> Option<Self> {
+        unsafe {
+            // SAFETY: the only requirement is for self.as_ptr() to be valid up to and including
+            // the nearest NUL byte, which this type requires
+            let ret = T::strchr(self.as_ptr(), T::r2c(c));
+            // SAFETY: strchr must either return NULL (not found) or a substring of self, which can
+            // never exceed the nearest NUL byte of self
+            Self::from_nullable_ptr(ret)
+        }
+    }
+    // TODO: strrchr, strchrnul wrappers
+
+    #[inline]
+    pub fn contains(self, c: T::Char) -> bool {
+        self.find(c).is_some()
+    }
+    #[inline]
+    pub fn first(self) -> T::Char {
+        unsafe {
+            // SAFETY: Self must be valid up to and including its nearest NUL byte, which certainly
+            // implies its readable length is nonzero (string is empty if this first byte is 0).
+            T::c2r(self.ptr.read())
+        }
+    }
+    #[inline]
+    pub fn first_char(self) -> Option<char> {
+        char::from_u32(self.first().into())
+    }
+    /// Same as `split_first` except also requires that the first char be convertible into `char`
+    #[inline]
+    pub fn split_first_char(self) -> Option<(char, Self)> {
+        self.split_first()
+            .and_then(|(c, r)| Some((char::from_u32(c.into())?, r)))
+    }
+    /// Split this string into `Some((first_byte, string_after_that))` or `None` if empty.
+    #[inline]
+    pub fn split_first(self) -> Option<(T::Char, Self)> {
+        if self.first() == T::NUL {
+            return None;
+        }
+        Some((self.first(), unsafe {
+            Self::from_ptr(self.as_ptr().add(1))
+        }))
+    }
+    pub fn to_chars_with_nul(self) -> &'a [T::Char] {
+        unsafe {
+            // SAFETY: The string must be valid at least until (and including) the NUL byte.
+            let len = T::strlen(self.ptr.as_ptr());
+            core::slice::from_raw_parts(self.ptr.as_ptr().cast(), len + 1)
+        }
+    }
+    pub fn to_chars(self) -> &'a [T::Char] {
+        let s = self.to_chars_with_nul();
+        &s[..s.len() - 1]
+    }
+    pub const fn as_ptr(self) -> *const T::C {
+        self.ptr.as_ptr()
+    }
+    pub const unsafe fn from_chars_with_nul_unchecked(chars: &'a [T::Char]) -> Self {
+        unsafe { Self::from_ptr(chars.as_ptr().cast()) }
+    }
+    pub fn from_chars_with_nul(chars: &'a [T::Char]) -> Result<Self, FromCharsWithNulError> {
+        if chars.last() != Some(&T::NUL) || chars[..chars.len() - 1].contains(&T::NUL) {
+            return Err(FromCharsWithNulError);
+        }
+
+        Ok(unsafe { Self::from_chars_with_nul_unchecked(chars) })
+    }
+    pub fn from_chars_until_nul(chars: &'a [T::Char]) -> Result<Self, FromCharsUntilNulError> {
+        if !chars.contains(&T::NUL) {
+            return Err(FromCharsUntilNulError);
+        }
+
+        Ok(unsafe { Self::from_chars_with_nul_unchecked(chars) })
+    }
+    /// Scan the string to get its length.
+    #[doc(alias = "strlen")]
+    #[doc(alias = "wcslen")]
+    pub fn len(self) -> usize {
+        self.to_chars().len()
+    }
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.first() == T::NUL
+    }
+}
+impl<'a> CStr<'a> {
+    pub fn to_owned_cstring(self) -> CString {
+        CString::from(unsafe { core::ffi::CStr::from_ptr(self.ptr.as_ptr()) })
+    }
+    pub fn borrow(string: &'a CString) -> Self {
+        unsafe { Self::from_ptr(string.as_ptr()) }
+    }
+    #[inline]
+    pub fn to_bytes(self) -> &'a [u8] {
+        self.to_chars()
+    }
+    #[inline]
+    pub fn to_bytes_with_nul(self) -> &'a [u8] {
+        self.to_chars_with_nul()
+    }
+    pub fn to_str(self) -> Result<&'a str, Utf8Error> {
+        core::str::from_utf8(self.to_bytes())
+    }
+    pub fn to_string_lossy(self) -> Cow<'a, str> {
+        String::from_utf8_lossy(self.to_bytes())
+    }
+    #[inline]
+    pub const unsafe fn from_bytes_with_nul_unchecked(bytes: &'a [u8]) -> Self {
+        unsafe { Self::from_chars_with_nul_unchecked(bytes) }
+    }
+    #[inline]
+    pub fn from_bytes_with_nul(bytes: &'a [u8]) -> Result<Self, FromCharsWithNulError> {
+        Self::from_chars_with_nul(bytes)
+    }
+    #[inline]
+    pub fn from_bytes_until_nul(bytes: &'a [u8]) -> Result<Self, FromCharsUntilNulError> {
+        Self::from_chars_until_nul(bytes)
+    }
+}
+
+unsafe impl<T: Kind> Send for NulStr<'_, T> {}
+unsafe impl<T: Kind> Sync for NulStr<'_, T> {}
+
+impl From<&core::ffi::CStr> for CStr<'_> {
+    fn from(s: &core::ffi::CStr) -> Self {
+        // SAFETY:
+        // * We can assume that `s` is valid because the caller should have upheld its
+        // safety concerns when constructing it.
+        unsafe { Self::from_ptr(s.as_ptr()) }
+    }
+}
+
+#[derive(Debug)]
+pub struct FromCharsWithNulError;
+
+#[derive(Debug)]
+pub struct FromCharsUntilNulError;
+
+pub use alloc::ffi::CString;
diff --git a/recipes/core/relibc/src/c_vec.rs b/recipes/core/relibc/src/c_vec.rs
new file mode 100644
index 0000000000..e5e35af527
--- /dev/null
+++ b/recipes/core/relibc/src/c_vec.rs
@@ -0,0 +1,294 @@
+//! Equivalent of Rust's `Vec<T>`, but using relibc's own allocator.
+
+use crate::{
+    io::{self, Write},
+    platform::{self, WriteByte, types::*},
+};
+use core::{
+    cmp, fmt,
+    iter::IntoIterator,
+    mem,
+    ops::{Deref, DerefMut},
+    ptr::{self, NonNull},
+    slice,
+};
+
+/// Error that occurs when an allocation fails
+#[derive(Debug, Default, Hash, PartialEq, Eq, Clone, Copy)]
+pub struct AllocError;
+
+/// A normal vector allocated in Rust needs to be dropped from Rust
+/// too, in order to avoid UB. This CVec is an abstraction that works
+/// using only C allocations functions and can therefore be dropped
+/// from C. Just like the Rust Vec, this does bounds checks to assure
+/// you never reach isize::MAX. Unless you need to drop something from
+/// C, prefer Rust's builtin Vec.
+pub struct CVec<T> {
+    ptr: NonNull<T>,
+    len: usize,
+    cap: usize,
+}
+impl<T> CVec<T> {
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self {
+            ptr: NonNull::dangling(),
+            len: 0,
+            cap: 0,
+        }
+    }
+    fn check_bounds(i: usize) -> Result<usize, AllocError> {
+        if i > isize::MAX as usize {
+            Err(AllocError)
+        } else {
+            Ok(i)
+        }
+    }
+    fn check_mul(x: usize, y: usize) -> Result<usize, AllocError> {
+        x.checked_mul(y)
+            .ok_or(AllocError)
+            .and_then(Self::check_bounds)
+    }
+    pub fn with_capacity(cap: usize) -> Result<Self, AllocError> {
+        if cap == 0 {
+            return Ok(Self::new());
+        }
+        let size = Self::check_mul(cap, mem::size_of::<T>())?;
+        let ptr = NonNull::new(unsafe { platform::alloc(size).cast::<T>() }).ok_or(AllocError)?;
+        Ok(Self { ptr, len: 0, cap })
+    }
+    unsafe fn resize(&mut self, cap: usize) -> Result<(), AllocError> {
+        let size = Self::check_mul(cap, mem::size_of::<T>())?;
+        let ptr = if cap == 0 {
+            NonNull::dangling()
+        } else if self.cap > 0 {
+            NonNull::new(
+                unsafe { platform::realloc(self.ptr.as_ptr().cast::<c_void>(), size) }.cast::<T>(),
+            )
+            .ok_or(AllocError)?
+        } else {
+            NonNull::new((unsafe { platform::alloc(size) }).cast::<T>()).ok_or(AllocError)?
+        };
+        self.ptr = ptr;
+        self.cap = cap;
+        Ok(())
+    }
+    unsafe fn drop_range(&mut self, start: usize, end: usize) {
+        let mut start = unsafe { self.ptr.as_ptr().add(start) };
+        let end = unsafe { self.ptr.as_ptr().add(end) };
+        while start < end {
+            unsafe { ptr::drop_in_place(start) };
+            start = unsafe { start.add(1) };
+        }
+    }
+
+    // Push stuff
+
+    pub fn reserve(&mut self, required: usize) -> Result<(), AllocError> {
+        let required_len = self
+            .len
+            .checked_add(required)
+            .ok_or(AllocError)
+            .and_then(Self::check_bounds)?;
+        if required_len > self.cap {
+            let new_cap = cmp::min(required_len.next_power_of_two(), isize::MAX as usize);
+            unsafe {
+                self.resize(new_cap)?;
+            }
+        }
+        Ok(())
+    }
+    pub fn push(&mut self, elem: T) -> Result<(), AllocError> {
+        self.reserve(1)?;
+        unsafe {
+            ptr::write(self.ptr.as_ptr().add(self.len), elem);
+        }
+        self.len += 1; // no need to bounds check, as new len <= cap
+        Ok(())
+    }
+    pub fn extend_from_slice(&mut self, elems: &[T]) -> Result<(), AllocError>
+    where
+        T: Copy,
+    {
+        self.reserve(elems.len())?;
+        unsafe {
+            ptr::copy_nonoverlapping(elems.as_ptr(), self.ptr.as_ptr().add(self.len), elems.len());
+        }
+        self.len += elems.len(); // no need to bounds check, as new len <= cap
+        Ok(())
+    }
+    pub fn append(&mut self, other: &mut Self) -> Result<(), AllocError> {
+        let len = other.len;
+        other.len = 0; // move
+        self.reserve(len)?;
+        unsafe {
+            ptr::copy_nonoverlapping(other.as_ptr(), self.ptr.as_ptr().add(self.len), len);
+        }
+        self.len += other.len(); // no need to bounds check, as new len <= cap
+        Ok(())
+    }
+
+    // Pop stuff
+
+    pub fn truncate(&mut self, len: usize) {
+        if len < self.len {
+            unsafe {
+                let old_len = self.len;
+                self.drop_range(len, old_len);
+            }
+            self.len = len;
+        }
+    }
+    pub fn shrink_to_fit(&mut self) -> Result<(), AllocError> {
+        if self.len < self.cap {
+            unsafe {
+                let new_cap = self.len;
+                self.resize(new_cap)?;
+            }
+        }
+        Ok(())
+    }
+    pub fn pop(&mut self) -> Option<T> {
+        if self.is_empty() {
+            None
+        } else {
+            let elem = unsafe { ptr::read(self.as_ptr().add(self.len - 1)) };
+            self.len -= 1;
+            Some(elem)
+        }
+    }
+
+    // Misc stuff
+
+    pub fn capacity(&self) -> usize {
+        self.cap
+    }
+    pub fn as_ptr(&self) -> *const T {
+        self.ptr.as_ptr()
+    }
+    pub fn as_mut_ptr(&mut self) -> *mut T {
+        self.ptr.as_ptr()
+    }
+    /// Leaks the inner data. This is safe to drop from C!
+    pub fn leak(mut self) -> *mut T {
+        let ptr = self.as_mut_ptr();
+        mem::forget(self);
+        ptr
+    }
+}
+impl<T> Deref for CVec<T> {
+    type Target = [T];
+
+    fn deref(&self) -> &Self::Target {
+        unsafe { slice::from_raw_parts(self.ptr.as_ptr(), self.len) }
+    }
+}
+impl<T> DerefMut for CVec<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        unsafe { slice::from_raw_parts_mut(self.ptr.as_ptr(), self.len) }
+    }
+}
+impl<T> Drop for CVec<T> {
+    fn drop(&mut self) {
+        unsafe {
+            let len = self.len;
+            self.drop_range(0, len);
+        }
+    }
+}
+impl<'a, T> IntoIterator for &'a CVec<T> {
+    type Item = <&'a [T] as IntoIterator>::Item;
+    type IntoIter = <&'a [T] as IntoIterator>::IntoIter;
+    fn into_iter(self) -> Self::IntoIter {
+        <&[T]>::into_iter(&*self)
+    }
+}
+impl<'a, T> IntoIterator for &'a mut CVec<T> {
+    type Item = <&'a mut [T] as IntoIterator>::Item;
+    type IntoIter = <&'a mut [T] as IntoIterator>::IntoIter;
+    fn into_iter(self) -> Self::IntoIter {
+        <&mut [T]>::into_iter(&mut *self)
+    }
+}
+
+impl Write for CVec<u8> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.extend_from_slice(buf).map_err(|err| {
+            io::Error::new(
+                io::ErrorKind::Other,
+                "AllocStringWriter::write failed to allocate",
+            )
+        })?;
+        Ok(buf.len())
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+impl fmt::Write for CVec<u8> {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        self.write(s.as_bytes()).map_err(|_| fmt::Error)?;
+        Ok(())
+    }
+}
+impl WriteByte for CVec<u8> {
+    fn write_u8(&mut self, byte: u8) -> fmt::Result {
+        self.write(&[byte]).map_err(|_| fmt::Error)?;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::CVec;
+
+    #[test]
+    fn push_pop() {
+        let mut vec = CVec::new();
+        vec.push(1).unwrap();
+        vec.push(2).unwrap();
+        vec.push(3).unwrap();
+        assert_eq!(&vec[..], &[1, 2, 3]);
+        assert_eq!(vec.pop().unwrap(), 3);
+        assert_eq!(&vec[..], &[1, 2]);
+    }
+    #[test]
+    fn extend_from_slice() {
+        use crate::io::Write;
+
+        let mut vec = CVec::new();
+        vec.extend_from_slice(&[1, 2, 3]).unwrap();
+        vec.extend_from_slice(&[4, 5, 6]).unwrap();
+        assert_eq!(&vec[..], &[1, 2, 3, 4, 5, 6]);
+        assert_eq!(vec.write(&[7, 8, 9]).unwrap(), 3);
+        assert_eq!(&vec[..], &[1, 2, 3, 4, 5, 6, 7, 8, 9]);
+    }
+    #[test]
+    fn dropped() {
+        use alloc::rc::Rc;
+
+        let counter = Rc::new(());
+        let mut vec = CVec::with_capacity(3).unwrap();
+        vec.push(Rc::clone(&counter)).unwrap();
+        vec.push(Rc::clone(&counter)).unwrap();
+        vec.push(Rc::clone(&counter)).unwrap();
+        assert_eq!(Rc::strong_count(&counter), 4);
+
+        let popped = vec.pop().unwrap();
+        assert_eq!(Rc::strong_count(&counter), 4);
+        drop(popped);
+        assert_eq!(Rc::strong_count(&counter), 3);
+
+        vec.push(Rc::clone(&counter)).unwrap();
+        vec.push(Rc::clone(&counter)).unwrap();
+        vec.push(Rc::clone(&counter)).unwrap();
+
+        assert_eq!(vec.len(), 5);
+        assert_eq!(Rc::strong_count(&counter), 6);
+        vec.truncate(1);
+        assert_eq!(Rc::strong_count(&counter), 2);
+
+        drop(vec);
+        assert_eq!(Rc::strong_count(&counter), 1);
+    }
+}
diff --git a/recipes/core/base/dhcpd/Cargo.toml b/recipes/core/relibc/src/crt0/Cargo.toml
similarity index 56%
rename from recipes/core/base/dhcpd/Cargo.toml
rename to recipes/core/relibc/src/crt0/Cargo.toml
index c96d80a7cc..3ca5057316 100644
--- a/recipes/core/base/dhcpd/Cargo.toml
+++ b/recipes/core/relibc/src/crt0/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
-name = "dhcpd"
-version = "0.0.0"
-edition = "2024"
+name = "crt0"
+version = "0.1.0"
 authors = ["Jeremy Soller <jackpot51@gmail.com>"]
+edition = "2024"
 
-[dependencies]
+[lib]
+name = "crt0"
+crate-type = ["staticlib"]
 
 [lints]
 workspace = true
diff --git a/recipes/core/relibc/src/crt0/src/lib.rs b/recipes/core/relibc/src/crt0/src/lib.rs
new file mode 100644
index 0000000000..fef86f62f4
--- /dev/null
+++ b/recipes/core/relibc/src/crt0/src/lib.rs
@@ -0,0 +1,105 @@
+//! crt0
+
+#![no_std]
+#![feature(linkage)]
+
+use core::{
+    arch::global_asm,
+    ffi::{c_char, c_int},
+};
+
+#[cfg(target_arch = "aarch64")]
+global_asm!(
+    "
+    .globl _start
+_start:
+    mov x0, sp
+    and sp, x0, #0xfffffffffffffff0 //align sp
+    bl relibc_crt0
+"
+);
+
+#[cfg(target_arch = "x86")]
+global_asm!(
+    "
+    .globl _start
+    .type _start, @function
+_start:
+    sub esp, 8
+
+    mov DWORD PTR [esp], 0x00001F80
+    # ldmxcsr [esp]
+    mov WORD PTR [esp], 0x037F
+    fldcw [esp]
+
+    add esp, 8
+
+    push esp
+    call relibc_crt0
+    .size _start, . - _start
+"
+);
+
+#[cfg(target_arch = "x86_64")]
+global_asm!(
+    "
+    .globl _start
+    .type _start, @function
+_start:
+    mov rdi, rsp
+    and rsp, 0xFFFFFFFFFFFFFFF0
+
+    sub rsp, 8
+
+    mov DWORD PTR [rsp], 0x00001F80
+    ldmxcsr [rsp]
+    mov WORD PTR [rsp], 0x037F
+    fldcw [rsp]
+
+    add rsp, 8
+
+    call relibc_crt0
+    .size _start, . - _start
+"
+);
+
+#[cfg(target_arch = "riscv64")]
+global_asm!(
+    "
+    .globl _start
+_start:
+    mv a0, sp
+    la t0, relibc_crt0
+    jalr ra, t0
+"
+);
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn relibc_crt0(sp: usize) -> ! {
+    // This wrapper ensures a dynamic libc.so can access a hidden main function
+    //TODO: common definition of types
+    unsafe extern "C" {
+        fn main(argc: isize, argv: *mut *mut c_char, envp: *mut *mut c_char) -> c_int;
+        fn relibc_start_v1(
+            sp: usize,
+            main: unsafe extern "C" fn(
+                argc: isize,
+                argv: *mut *mut c_char,
+                envp: *mut *mut c_char,
+            ) -> c_int,
+        ) -> !;
+    }
+    unsafe { relibc_start_v1(sp, main) }
+}
+
+#[linkage = "weak"]
+#[unsafe(no_mangle)]
+pub extern "C" fn relibc_panic(_pi: &::core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[panic_handler]
+#[linkage = "weak"]
+pub unsafe fn rust_begin_unwind(pi: &::core::panic::PanicInfo) -> ! {
+    relibc_panic(pi)
+}
diff --git a/recipes/core/relibc/src/crti/Cargo.toml b/recipes/core/relibc/src/crti/Cargo.toml
new file mode 100644
index 0000000000..cd17d091b8
--- /dev/null
+++ b/recipes/core/relibc/src/crti/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "crti"
+version = "0.1.0"
+authors = ["jD91mZM2 <me@krake.one>"]
+edition = "2024"
+
+[lib]
+name = "crti"
+crate-type = ["staticlib"]
+
+[lints]
+workspace = true
diff --git a/recipes/core/relibc/src/crti/src/lib.rs b/recipes/core/relibc/src/crti/src/lib.rs
new file mode 100644
index 0000000000..5283a70ad2
--- /dev/null
+++ b/recipes/core/relibc/src/crti/src/lib.rs
@@ -0,0 +1,88 @@
+//! crti
+
+#![no_std]
+#![feature(linkage)]
+
+#[cfg(not(target_arch = "riscv64"))]
+use core::arch::global_asm;
+
+#[cfg(target_arch = "x86")]
+global_asm!(
+    r#"
+    .section .init
+    .global _init
+    _init:
+        push ebp
+        mov ebp, esp
+        // Created a new stack frame and updated the stack pointer
+        // Body will be filled in by gcc and ended by crtn.o
+
+    .section .fini
+    .global _fini
+    _fini:
+        push ebp
+        mov ebp, esp
+        // Created a new stack frame and updated the stack pointer
+        // Body will be filled in by gcc and ended by crtn.o
+"#
+);
+
+// https://wiki.osdev.org/Creating_a_C_Library#crtbegin.o.2C_crtend.o.2C_crti.o.2C_and_crtn.o
+#[cfg(target_arch = "x86_64")]
+global_asm!(
+    r#"
+    .section .init
+    .global _init
+    _init:
+        push rbp
+        mov rbp, rsp
+        // Created a new stack frame and updated the stack pointer
+        // Body will be filled in by gcc and ended by crtn.o
+
+    .section .fini
+    .global _fini
+    _fini:
+        push rbp
+        mov rbp, rsp
+        // Created a new stack frame and updated the stack pointer
+        // Body will be filled in by gcc and ended by crtn.o
+"#
+);
+
+// https://git.musl-libc.org/cgit/musl/tree/crt/aarch64/crti.s
+#[cfg(target_arch = "aarch64")]
+global_asm!(
+    r#"
+    .section .init
+    .global _init
+    .type _init,%function
+    _init:
+        stp x29,x30,[sp,-16]!
+        mov x29,sp
+        // stp: "stores two doublewords from the first and second argument to memory addressed by addr"
+        // Body will be filled in by gcc and ended by crtn.o
+
+    .section .fini
+    .global _fini
+    .type _fini,%function
+    _fini:
+        stp x29,x30,[sp,-16]!
+        mov x29,sp
+        // stp: "stores two doublewords from the first and second argument to memory addressed by addr"
+        // Body will be filled in by gcc and ended by crtn.o
+"#
+);
+
+// risc-v has no _init / _fini functions; it exclusively uses init/fini arrays
+
+#[linkage = "weak"]
+#[unsafe(no_mangle)]
+extern "C" fn relibc_panic(_pi: &::core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[panic_handler]
+#[linkage = "weak"]
+pub unsafe fn rust_begin_unwind(pi: &::core::panic::PanicInfo) -> ! {
+    relibc_panic(pi)
+}
diff --git a/recipes/core/relibc/src/crtn/Cargo.toml b/recipes/core/relibc/src/crtn/Cargo.toml
new file mode 100644
index 0000000000..40e6259c1d
--- /dev/null
+++ b/recipes/core/relibc/src/crtn/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "crtn"
+version = "0.1.0"
+authors = ["jD91mZM2 <me@krake.one>"]
+edition = "2024"
+
+[lib]
+name = "crtn"
+crate-type = ["staticlib"]
+
+[lints]
+workspace = true
diff --git a/recipes/core/relibc/src/crtn/src/lib.rs b/recipes/core/relibc/src/crtn/src/lib.rs
new file mode 100644
index 0000000000..25b0418fd5
--- /dev/null
+++ b/recipes/core/relibc/src/crtn/src/lib.rs
@@ -0,0 +1,74 @@
+//! crti
+
+#![no_std]
+#![feature(linkage)]
+
+#[cfg(not(target_arch = "riscv64"))]
+use core::arch::global_asm;
+
+#[cfg(target_arch = "x86")]
+global_asm!(
+    r#"
+    .section .init
+        // This happens after crti.o and gcc has inserted code
+        // Pop the stack frame
+        pop ebp
+        ret
+
+    .section .fini
+        // This happens after crti.o and gcc has inserted code
+        // Pop the stack frame
+        pop ebp
+        ret
+"#
+);
+
+// https://wiki.osdev.org/Creating_a_C_Library#crtbegin.o.2C_crtend.o.2C_crti.o.2C_and_crtn.o
+#[cfg(target_arch = "x86_64")]
+global_asm!(
+    r#"
+    .section .init
+        // This happens after crti.o and gcc has inserted code
+        // Pop the stack frame
+        pop rbp
+        ret
+
+    .section .fini
+        // This happens after crti.o and gcc has inserted code
+        // Pop the stack frame
+        pop rbp
+        ret
+"#
+);
+
+// https://git.musl-libc.org/cgit/musl/tree/crt/aarch64/crtn.s
+#[cfg(target_arch = "aarch64")]
+global_asm!(
+    r#"
+    .section .init
+        // This happens after crti.o and gcc has inserted code
+        // ldp: "loads two doublewords from memory addressed by the third argument to the first and second"
+        ldp x29,x30,[sp],#16
+        ret
+
+    .section .fini
+        // This happens after crti.o and gcc has inserted code
+        // ldp: "loads two doublewords from memory addressed by the third argument to the first and second"
+        ldp x29,x30,[sp],#16
+        ret
+"#
+);
+
+// risc-v has no _init / _fini functions; it exclusively uses init/fini arrays
+
+#[linkage = "weak"]
+#[unsafe(no_mangle)]
+extern "C" fn relibc_panic(_pi: &::core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[panic_handler]
+#[linkage = "weak"]
+pub unsafe fn rust_begin_unwind(pi: &::core::panic::PanicInfo) -> ! {
+    relibc_panic(pi)
+}
diff --git a/recipes/core/relibc/src/cxa.rs b/recipes/core/relibc/src/cxa.rs
new file mode 100644
index 0000000000..cd75de7440
--- /dev/null
+++ b/recipes/core/relibc/src/cxa.rs
@@ -0,0 +1,103 @@
+use crate::platform::types::{c_int, c_void};
+use alloc::vec::Vec;
+use core::cell::RefCell;
+use spin::Mutex;
+
+#[derive(Clone, Copy)]
+struct CxaAtExitFunc {
+    func: extern "C" fn(*mut c_void),
+    arg: usize,
+    dso: usize,
+}
+
+#[derive(Clone, Copy)]
+struct CxaThreadAtExitFunc {
+    func: extern "C" fn(*mut c_void),
+    obj: *mut c_void,
+    dso: *mut c_void,
+}
+
+static CXA_ATEXIT_FUNCS: Mutex<Vec<Option<CxaAtExitFunc>>> = Mutex::new(Vec::new());
+#[thread_local]
+static DTORS: RefCell<Vec<CxaThreadAtExitFunc>> = RefCell::new(Vec::new());
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __cxa_atexit(
+    func: Option<extern "C" fn(*mut c_void)>,
+    arg: *mut c_void,
+    dso: *mut c_void,
+) -> c_int {
+    let Some(func) = func else {
+        return 0;
+    };
+
+    let entry = CxaAtExitFunc {
+        func,
+        arg: arg as usize,
+        dso: dso as usize,
+    };
+
+    let mut funcs = CXA_ATEXIT_FUNCS.lock();
+
+    for slot in funcs.iter_mut() {
+        if slot.is_none() {
+            *slot = Some(entry);
+            return 0;
+        }
+    }
+
+    // No empty slots
+    funcs.push(Some(entry));
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __cxa_finalize(dso: *mut c_void) {
+    let mut funcs = CXA_ATEXIT_FUNCS.lock();
+
+    let dso_usize = dso as usize;
+
+    for slot in funcs.iter_mut().rev() {
+        if let Some(entry) = slot.as_ref()
+            && (dso.is_null() || entry.dso == dso_usize)
+            && let Some(entry_to_run) = slot.take()
+        {
+            (entry_to_run.func)(entry_to_run.arg as *mut c_void);
+        }
+    }
+
+    // clean up remaining list
+    if dso.is_null() {
+        funcs.clear();
+    } else {
+        funcs.retain(|opt| opt.is_some());
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __cxa_thread_atexit_impl(
+    func: extern "C" fn(*mut c_void),
+    obj: *mut c_void,
+    dso: *mut c_void,
+) {
+    let entry = CxaThreadAtExitFunc { func, obj, dso };
+    DTORS.borrow_mut().push(entry);
+}
+
+// called internally
+pub unsafe fn __cxa_thread_finalize() {
+    let mut dtors = DTORS.borrow_mut();
+    while let Some(entry) = dtors.pop() {
+        (entry.func)(entry.obj);
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn _ITM_deregisterTMCloneTable(_ptr: *mut c_void) {
+    // No-op
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn _ITM_registerTMCloneTable(_ptr: *mut c_void, _len: usize) {
+    // No-op
+}
diff --git a/recipes/core/relibc/src/db.rs b/recipes/core/relibc/src/db.rs
new file mode 100644
index 0000000000..777fbba8d8
--- /dev/null
+++ b/recipes/core/relibc/src/db.rs
@@ -0,0 +1,51 @@
+use alloc::{string::String, vec::Vec};
+
+use crate::{
+    c_str::CStr,
+    fs::File,
+    header::fcntl,
+    io::{self, BufRead, BufReader},
+};
+
+pub enum Separator {
+    Character(char),
+    Whitespace,
+}
+
+pub struct Db<R: BufRead> {
+    reader: R,
+    separator: Separator,
+}
+
+impl<R: BufRead> Db<R> {
+    pub fn new(reader: R, separator: Separator) -> Self {
+        Db { reader, separator }
+    }
+
+    pub fn read(&mut self) -> io::Result<Option<Vec<String>>> {
+        let mut line = String::new();
+        if self.reader.read_line(&mut line)? == 0 {
+            return Ok(None);
+        }
+
+        let vec = if let Some(not_comment) = line.trim().split('#').next() {
+            match self.separator {
+                Separator::Character(c) => not_comment.split(c).map(String::from).collect(),
+                Separator::Whitespace => not_comment.split_whitespace().map(String::from).collect(),
+            }
+        } else {
+            Vec::new()
+        };
+
+        Ok(Some(vec))
+    }
+}
+
+pub type FileDb = Db<BufReader<File>>;
+
+impl FileDb {
+    pub fn open(path: CStr, separator: Separator) -> io::Result<Self> {
+        let file = File::open(path, fcntl::O_RDONLY | fcntl::O_CLOEXEC)?;
+        Ok(Db::new(BufReader::new(file), separator))
+    }
+}
diff --git a/recipes/core/relibc/src/error.rs b/recipes/core/relibc/src/error.rs
new file mode 100644
index 0000000000..21d470b3b8
--- /dev/null
+++ b/recipes/core/relibc/src/error.rs
@@ -0,0 +1,90 @@
+use alloc::boxed::Box;
+
+use crate::{header::errno::STR_ERROR, platform::types::c_int};
+
+/// Positive error codes (EINVAL, not -EINVAL).
+#[derive(Debug, Eq, PartialEq)]
+// TODO: Move to a more generic place.
+pub struct Errno(pub c_int);
+
+impl Errno {
+    pub fn sync(self) -> Self {
+        crate::platform::ERRNO.set(self.0);
+        self
+    }
+}
+
+pub type Result<T, E = Errno> = core::result::Result<T, E>;
+
+#[cfg(target_os = "redox")]
+impl From<syscall::Error> for Errno {
+    #[inline]
+    fn from(value: syscall::Error) -> Self {
+        Errno(value.errno)
+    }
+}
+#[cfg(target_os = "redox")]
+impl From<Errno> for syscall::Error {
+    #[inline]
+    fn from(value: Errno) -> Self {
+        syscall::Error::new(value.0)
+    }
+}
+
+impl From<Errno> for crate::io::Error {
+    #[inline]
+    fn from(Errno(errno): Errno) -> Self {
+        Self::from_raw_os_error(errno)
+    }
+}
+
+// TODO: core::error::Error
+
+impl core::fmt::Display for Errno {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        match usize::try_from(self.0).ok().and_then(|i| STR_ERROR.get(i)) {
+            Some(desc) => write!(f, "{desc}"),
+            None => write!(f, "unknown error ({})", self.0),
+        }
+    }
+}
+
+pub trait ResultExt<T> {
+    fn or_minus_one_errno(self) -> T;
+}
+impl<T: From<i8>> ResultExt<T> for Result<T, Errno> {
+    fn or_minus_one_errno(self) -> T {
+        match self {
+            Self::Ok(v) => v,
+            Self::Err(Errno(errno)) => {
+                crate::platform::ERRNO.set(errno);
+                T::from(-1)
+            }
+        }
+    }
+}
+pub trait ResultExtPtrMut<T> {
+    fn or_errno_null_mut(self) -> *mut T;
+}
+impl<T> ResultExtPtrMut<T> for Result<*mut T, Errno> {
+    fn or_errno_null_mut(self) -> *mut T {
+        match self {
+            Self::Ok(ptr) => ptr,
+            Self::Err(Errno(errno)) => {
+                crate::platform::ERRNO.set(errno);
+                core::ptr::null_mut()
+            }
+        }
+    }
+}
+impl<T> ResultExtPtrMut<T> for Result<Box<T>, Errno> {
+    fn or_errno_null_mut(self) -> *mut T {
+        match self {
+            Self::Ok(ptr) => Box::into_raw(ptr),
+            Self::Err(Errno(errno)) => {
+                crate::platform::ERRNO.set(errno);
+                core::ptr::null_mut()
+            }
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/fs.rs b/recipes/core/relibc/src/fs.rs
new file mode 100644
index 0000000000..3f2b4265b0
--- /dev/null
+++ b/recipes/core/relibc/src/fs.rs
@@ -0,0 +1,156 @@
+use crate::{
+    c_str::CStr,
+    error::{Errno, ResultExt},
+    header::{
+        fcntl::O_CREAT,
+        sys_stat::stat,
+        unistd::{SEEK_CUR, SEEK_END, SEEK_SET},
+    },
+    io,
+    out::Out,
+    platform::{Pal, Sys, types::*},
+};
+use core::ops::Deref;
+
+pub struct File {
+    pub fd: c_int,
+    /// To avoid self referential FILE struct that needs both a reader and a writer,
+    /// make "reference" files that share fd but don't close on drop.
+    pub reference: bool,
+}
+
+impl File {
+    pub fn new(fd: c_int) -> Self {
+        Self {
+            fd,
+            reference: false,
+        }
+    }
+
+    pub fn open(path: CStr, oflag: c_int) -> Result<Self, Errno> {
+        Sys::open(path, oflag, 0)
+            .map(Self::new)
+            .map_err(Errno::sync)
+    }
+
+    pub fn openat(dirfd: c_int, path: CStr, oflag: c_int) -> Result<Self, Errno> {
+        Sys::openat(dirfd, path, oflag, 0)
+            .map(Self::new)
+            .map_err(Errno::sync)
+    }
+
+    pub fn create(path: CStr, oflag: c_int, mode: mode_t) -> Result<Self, Errno> {
+        Sys::open(path, oflag | O_CREAT, mode)
+            .map(Self::new)
+            .map_err(Errno::sync)
+    }
+
+    pub fn createat(dirfd: c_int, path: CStr, oflag: c_int, mode: mode_t) -> Result<Self, Errno> {
+        Sys::openat(dirfd, path, oflag | O_CREAT, mode)
+            .map(Self::new)
+            .map_err(Errno::sync)
+    }
+
+    pub fn sync_all(&self) -> Result<(), Errno> {
+        Sys::fsync(self.fd).map_err(Errno::sync)
+    }
+
+    pub fn set_len(&self, size: u64) -> Result<(), Errno> {
+        Sys::ftruncate(self.fd, size as off_t).map_err(Errno::sync)
+    }
+
+    pub fn fstat(&self) -> Result<stat, Errno> {
+        let mut file_st = stat::default();
+        Sys::fstat(self.fd, Out::from_mut(&mut file_st)).map_err(Errno::sync)?;
+        Ok(file_st)
+    }
+
+    pub fn try_clone(&self) -> io::Result<Self> {
+        Ok(Self::new(Sys::dup(self.fd)?))
+    }
+
+    /// Create a new file pointing to the same underlying descriptor. This file
+    /// will know it's a "reference" and won't close the fd. It will, however,
+    /// not prevent the original file from closing the fd.
+    pub unsafe fn get_ref(&self) -> Self {
+        Self {
+            fd: self.fd,
+            reference: true,
+        }
+    }
+}
+
+impl io::Read for &File {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        match Sys::read(self.fd, buf).map(|read| read as ssize_t).or_minus_one_errno() /* TODO */ {
+            -1 => Err(io::last_os_error()),
+            ok => Ok(ok as usize),
+        }
+    }
+}
+
+impl io::Write for &File {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        match Sys::write(self.fd, buf)
+            .map(|read| read as ssize_t)
+            .or_minus_one_errno()
+        {
+            -1 => Err(io::last_os_error()),
+            ok => Ok(ok as usize),
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl io::Seek for &File {
+    fn seek(&mut self, pos: io::SeekFrom) -> io::Result<u64> {
+        let (offset, whence) = match pos {
+            io::SeekFrom::Start(start) => (start as off_t, SEEK_SET),
+            io::SeekFrom::Current(current) => (current as off_t, SEEK_CUR),
+            io::SeekFrom::End(end) => (end as off_t, SEEK_END),
+        };
+
+        Ok(Sys::lseek(self.fd, offset, whence)? as u64)
+    }
+}
+
+impl io::Read for File {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        (&mut &*self).read(buf)
+    }
+}
+
+impl io::Write for File {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        (&mut &*self).write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        (&mut &*self).flush()
+    }
+}
+
+impl io::Seek for File {
+    fn seek(&mut self, pos: io::SeekFrom) -> io::Result<u64> {
+        (&mut &*self).seek(pos)
+    }
+}
+
+impl Deref for File {
+    type Target = c_int;
+
+    fn deref(&self) -> &Self::Target {
+        &self.fd
+    }
+}
+
+impl Drop for File {
+    fn drop(&mut self) {
+        if !self.reference {
+            let _ = Sys::close(self.fd);
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/header/_aio/cbindgen.toml b/recipes/core/relibc/src/header/_aio/cbindgen.toml
new file mode 100644
index 0000000000..fd387cb50e
--- /dev/null
+++ b/recipes/core/relibc/src/header/_aio/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = []
+include_guard = "_RELIBC_AIO_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/_aio/mod.rs b/recipes/core/relibc/src/header/_aio/mod.rs
new file mode 100644
index 0000000000..b75ba38f78
--- /dev/null
+++ b/recipes/core/relibc/src/header/_aio/mod.rs
@@ -0,0 +1,75 @@
+//! `aio.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/aio.h.html>.
+
+use crate::{
+    header::{bits_timespec::timespec, signal::sigevent},
+    platform::types::{c_int, c_void},
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/aio.h.html>.
+pub struct aiocb {
+    pub aio_fildes: c_int,
+    pub aio_lio_opcode: c_int,
+    pub aio_reqprio: c_int,
+    pub aio_buf: *mut c_void,
+    pub aio_nbytes: usize,
+    pub aio_sigevent: sigevent,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/aio_read.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn aio_read(aiocbp: *mut aiocb) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/aio_write.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn aio_write(aiocbp: *mut aiocb) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lio_listio.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn lio_listio(
+    mode: c_int,
+    list: *const *const aiocb,
+    nent: c_int,
+    sig: *mut sigevent,
+) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/aio_error.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn aio_error(aiocbp: *const aiocb) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/aio_return.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn aio_return(aiocbp: *mut aiocb) -> usize {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/aio_cancel.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn aio_cancel(fildes: c_int, aiocbp: *mut aiocb) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/aio_suspend.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn aio_suspend(
+    list: *const *const aiocb,
+    nent: c_int,
+    timeout: *const timespec,
+) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/aio_fsync.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn aio_fsync(operation: c_int, aiocbp: *mut aiocb) -> c_int {
+    unimplemented!();
+}
diff --git a/recipes/core/relibc/src/header/_fenv/cbindgen.toml b/recipes/core/relibc/src/header/_fenv/cbindgen.toml
new file mode 100644
index 0000000000..e8ca9b12ad
--- /dev/null
+++ b/recipes/core/relibc/src/header/_fenv/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = ["stdint.h", "sys/types.h"]
+include_guard = "_RELIBC_FENV_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/_fenv/mod.rs b/recipes/core/relibc/src/header/_fenv/mod.rs
new file mode 100644
index 0000000000..54dd24062c
--- /dev/null
+++ b/recipes/core/relibc/src/header/_fenv/mod.rs
@@ -0,0 +1,85 @@
+//! `fenv.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/fenv.h.html>.
+
+use crate::platform::types::c_int;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/fenv.h.html>.
+pub const FE_ALL_EXCEPT: c_int = 0;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/fenv.h.html>.
+pub const FE_TONEAREST: c_int = 0;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/fenv.h.html>.
+pub type fexcept_t = u64;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/fenv.h.html>.
+#[repr(C)]
+pub struct fenv_t {
+    pub cw: u64,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/feclearexcept.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn feclearexcept(excepts: c_int) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fegetenv.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn fegetenv(envp: *mut fenv_t) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fegetexceptflag.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn fegetexceptflag(flagp: *mut fexcept_t, excepts: c_int) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fegetround.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn fegetround() -> c_int {
+    FE_TONEAREST
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/feholdexcept.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn feholdexcept(envp: *mut fenv_t) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/feraiseexcept.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn feraiseexcept(except: c_int) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fesetenv.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn fesetenv(envp: *const fenv_t) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fesetexceptflag.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn fesetexceptflag(flagp: *const fexcept_t, excepts: c_int) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fegetround.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn fesetround(round: c_int) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fetestexcept.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn fetestexcept(excepts: c_int) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/feupdateenv.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn feupdateenv(envp: *const fenv_t) -> c_int {
+    unimplemented!();
+}
diff --git a/recipes/core/relibc/src/header/_paths/cbindgen.toml b/recipes/core/relibc/src/header/_paths/cbindgen.toml
new file mode 100644
index 0000000000..885a98f571
--- /dev/null
+++ b/recipes/core/relibc/src/header/_paths/cbindgen.toml
@@ -0,0 +1,5 @@
+include_guard = "_RELIBC_PATHS_H"
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
diff --git a/recipes/core/relibc/src/header/_paths/linux.rs b/recipes/core/relibc/src/header/_paths/linux.rs
new file mode 100644
index 0000000000..34cf290f7a
--- /dev/null
+++ b/recipes/core/relibc/src/header/_paths/linux.rs
@@ -0,0 +1,29 @@
+//! Linux specific constants for paths.h.
+//! Entirely borrowed from musl as there isn't a list of what to include.
+
+pub const _PATH_DEFPATH: &str = "/usr/local/bin:/bin:/usr/bin";
+pub const _PATH_STDPATH: &str = "/bin:/usr/bin:/sbin:/usr/sbin";
+
+pub const _PATH_BSHELL: &str = "/bin/sh";
+pub const _PATH_CONSOLE: &str = "/dev/console";
+pub const _PATH_DEVNULL: &str = "/dev/null";
+pub const _PATH_KLOG: &str = "/proc/kmsg";
+pub const _PATH_LASTLOG: &str = "/var/log/lastlog";
+pub const _PATH_MAILDIR: &str = "/var/mail";
+pub const _PATH_MAN: &str = "/usr/share/man";
+pub const _PATH_MNTTAB: &str = "/etc/fstab";
+pub const _PATH_NOLOGIN: &str = "/etc/nologin";
+pub const _PATH_SENDMAIL: &str = "/usr/sbin/sendmail";
+pub const _PATH_SHADOW: &str = "/etc/shadow";
+pub const _PATH_SHELLS: &str = "/etc/shells";
+pub const _PATH_TTY: &str = "/dev/tty";
+pub const _PATH_UTMP: &str = "/var/run/utmp";
+pub const _PATH_WTMP: &str = "/var/log/wtmp";
+pub const _PATH_VI: &str = "/usr/bin/vi";
+
+// Trailing backslash intentional as these are dir paths.
+pub const _PATH_DEV: &str = "/dev/";
+pub const _PATH_TMP: &str = "/tmp/";
+pub const _PATH_VARDB: &str = "/var/lib/misc/";
+pub const _PATH_VARRUN: &str = "/var/run/";
+pub const _PATH_VARTMP: &str = "/var/tmp/";
diff --git a/recipes/core/relibc/src/header/_paths/mod.rs b/recipes/core/relibc/src/header/_paths/mod.rs
new file mode 100644
index 0000000000..7c391b437c
--- /dev/null
+++ b/recipes/core/relibc/src/header/_paths/mod.rs
@@ -0,0 +1,11 @@
+//! Implementation specific, non-standard path aliases
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+mod sys;
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+mod sys;
+
+pub use sys::*;
diff --git a/recipes/core/relibc/src/header/_paths/redox.rs b/recipes/core/relibc/src/header/_paths/redox.rs
new file mode 100644
index 0000000000..a2a0ed0274
--- /dev/null
+++ b/recipes/core/relibc/src/header/_paths/redox.rs
@@ -0,0 +1,13 @@
+//! Redox specific constants for paths.h.
+
+// NOTE: Cross check that new entries correspond to files on Redox before adding.
+
+pub const _PATH_BSHELL: &str = "/bin/sh";
+pub const _PATH_DEVNULL: &str = "/dev/null";
+pub const _PATH_MAN: &str = "/usr/share/man";
+pub const _PATH_TTY: &str = "/dev/tty";
+
+// Trailing backslash intentional as these are dir paths.
+pub const _PATH_DEV: &str = "/dev/";
+pub const _PATH_TMP: &str = "/tmp/";
+pub const _PATH_VARTMP: &str = "/var/tmp/";
diff --git a/recipes/core/relibc/src/header/_template/cbindgen.toml b/recipes/core/relibc/src/header/_template/cbindgen.toml
new file mode 100644
index 0000000000..fbdebd78fd
--- /dev/null
+++ b/recipes/core/relibc/src/header/_template/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = []
+include_guard = "_RELIBC_TEMPLATE_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/_template/mod.rs b/recipes/core/relibc/src/header/_template/mod.rs
new file mode 100644
index 0000000000..3696d1e784
--- /dev/null
+++ b/recipes/core/relibc/src/header/_template/mod.rs
@@ -0,0 +1,10 @@
+//! template implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/template.h.html
+
+use platform::types::*;
+
+/*
+#[unsafe(no_mangle)]
+pub extern "C" fn func(args) -> c_int {
+    unimplemented!();
+}
+*/
diff --git a/recipes/core/relibc/src/header/arch_aarch64_user/cbindgen.toml b/recipes/core/relibc/src/header/arch_aarch64_user/cbindgen.toml
new file mode 100644
index 0000000000..2000868e87
--- /dev/null
+++ b/recipes/core/relibc/src/header/arch_aarch64_user/cbindgen.toml
@@ -0,0 +1,7 @@
+sys_includes = []
+include_guard = "_AARCH64_USER_H"
+language = "C"
+style = "Tag"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/arch_aarch64_user/mod.rs b/recipes/core/relibc/src/header/arch_aarch64_user/mod.rs
new file mode 100644
index 0000000000..5586c38bac
--- /dev/null
+++ b/recipes/core/relibc/src/header/arch_aarch64_user/mod.rs
@@ -0,0 +1,30 @@
+use crate::platform::types::{c_double, c_uint, c_ulong, c_ulonglong};
+
+#[repr(C)]
+pub struct user_regs_struct {
+    pub regs: [c_ulonglong; 31],
+    pub sp: c_ulonglong,
+    pub pc: c_ulonglong,
+    pub pstate: c_ulonglong,
+}
+
+#[repr(C)]
+pub struct user_fpsimd_struct {
+    pub vregs: [c_double; 32], // BUG: rust doesn't have f128 which is equivalent for long double
+    pub fpsr: c_uint,
+    pub fpcr: c_uint,
+}
+
+pub type elf_greg_t = c_ulong;
+pub type elf_gregset_t = *mut [c_ulong; 34];
+pub type elf_fpregset_t = user_fpsimd_struct;
+
+#[unsafe(no_mangle)]
+pub extern "C" fn _cbindgen_export_aarch64_user(
+    a: user_regs_struct,
+    b: user_fpsimd_struct,
+    c: elf_gregset_t,
+    d: elf_greg_t,
+    e: elf_fpregset_t,
+) {
+}
diff --git a/recipes/core/relibc/src/header/arch_riscv64_user/cbindgen.toml b/recipes/core/relibc/src/header/arch_riscv64_user/cbindgen.toml
new file mode 100644
index 0000000000..369bf8c1d6
--- /dev/null
+++ b/recipes/core/relibc/src/header/arch_riscv64_user/cbindgen.toml
@@ -0,0 +1,7 @@
+sys_includes = []
+include_guard = "_RISCV64_USER_H"
+language = "C"
+style = "Tag"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/arch_riscv64_user/mod.rs b/recipes/core/relibc/src/header/arch_riscv64_user/mod.rs
new file mode 100644
index 0000000000..e0e9794f15
--- /dev/null
+++ b/recipes/core/relibc/src/header/arch_riscv64_user/mod.rs
@@ -0,0 +1,39 @@
+use crate::platform::types::{c_double, c_float, c_uint, c_ulong};
+
+#[repr(C)]
+pub struct user_regs_struct {
+    pub regs: [c_ulong; 31], // x1-x31
+    pub pc: c_ulong,
+}
+
+#[repr(C)]
+pub struct user_fpregs_f_struct {
+    pub fpregs: [c_float; 32],
+    pub fcsr: c_uint,
+}
+
+#[repr(C)]
+pub struct user_fpregs_g_struct {
+    pub fpregs: [c_double; 32],
+    pub fcsr: c_uint,
+}
+
+#[repr(C)]
+pub struct user_fpregs_struct {
+    pub f_regs: user_fpregs_f_struct,
+    pub g_regs: user_fpregs_g_struct,
+}
+
+pub type elf_greg_t = c_ulong;
+pub type elf_gregset_t = user_regs_struct;
+pub type elf_fpregset_t = user_fpregs_struct;
+
+#[unsafe(no_mangle)]
+pub extern "C" fn _cbindgen_only_generates_structs_if_they_are_mentioned_which_is_dumb_riscv64_user(
+    a: user_regs_struct,
+    b: user_fpregs_struct,
+    c: elf_gregset_t,
+    d: elf_greg_t,
+    e: elf_fpregset_t,
+) {
+}
diff --git a/recipes/core/relibc/src/header/arch_x64_user/cbindgen.toml b/recipes/core/relibc/src/header/arch_x64_user/cbindgen.toml
new file mode 100644
index 0000000000..04a2ccea4e
--- /dev/null
+++ b/recipes/core/relibc/src/header/arch_x64_user/cbindgen.toml
@@ -0,0 +1,7 @@
+sys_includes = []
+include_guard = "_X64_USER_H"
+language = "C"
+style = "Tag"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/arch_x64_user/mod.rs b/recipes/core/relibc/src/header/arch_x64_user/mod.rs
new file mode 100644
index 0000000000..116b990282
--- /dev/null
+++ b/recipes/core/relibc/src/header/arch_x64_user/mod.rs
@@ -0,0 +1,83 @@
+//! A part of the ptrace compatibility for Redox OS
+
+use crate::platform::types::{c_char, c_int, c_long, c_ulong};
+
+#[repr(C)]
+pub struct user_fpregs_struct {
+    pub cwd: u16,
+    pub swd: u16,
+    pub ftw: u16,
+    pub fop: u16,
+    pub rip: u64,
+    pub rdp: u64,
+    pub mxcsr: u32,
+    pub mxcr_mask: u32,
+    pub st_space: [u32; 32],
+    pub xmm_space: [u32; 64],
+    pub padding: [u32; 24],
+}
+
+#[repr(C)]
+pub struct user_regs_struct {
+    pub r15: c_ulong,
+    pub r14: c_ulong,
+    pub r13: c_ulong,
+    pub r12: c_ulong,
+    pub rbp: c_ulong,
+    pub rbx: c_ulong,
+    pub r11: c_ulong,
+    pub r10: c_ulong,
+    pub r9: c_ulong,
+    pub r8: c_ulong,
+    pub rax: c_ulong,
+    pub rcx: c_ulong,
+    pub rdx: c_ulong,
+    pub rsi: c_ulong,
+    pub rdi: c_ulong,
+    pub orig_rax: c_ulong,
+    pub rip: c_ulong,
+    pub cs: c_ulong,
+    pub eflags: c_ulong,
+    pub rsp: c_ulong,
+    pub ss: c_ulong,
+    pub fs_base: c_ulong,
+    pub gs_base: c_ulong,
+    pub ds: c_ulong,
+    pub es: c_ulong,
+    pub fs: c_ulong,
+    pub gs: c_ulong,
+}
+
+pub type elf_greg_t = c_ulong;
+
+pub type elf_gregset_t = *mut [c_ulong; 27];
+pub type elf_fpregset_t = user_fpregs_struct;
+#[repr(C)]
+pub struct user {
+    pub regs: user_regs_struct,
+    pub u_fpvalid: c_int,
+    pub i387: user_fpregs_struct,
+    pub u_tsize: c_ulong,
+    pub u_dsize: c_ulong,
+    pub u_ssize: c_ulong,
+    pub start_code: c_ulong,
+    pub start_stack: c_ulong,
+    pub signal: c_long,
+    pub reserved: c_int,
+    pub u_ar0: *mut user_regs_struct,
+    pub u_fpstate: *mut user_fpregs_struct,
+    pub magic: c_ulong,
+    pub u_comm: [c_char; 32],
+    pub u_debugreg: [c_ulong; 8],
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn _cbindgen_export_x86_user(
+    a: user_fpregs_struct,
+    b: user_regs_struct,
+    c: user,
+    d: elf_gregset_t,
+    e: elf_greg_t,
+    f: elf_fpregset_t,
+) {
+}
diff --git a/recipes/core/relibc/src/header/arpa_inet/cbindgen.toml b/recipes/core/relibc/src/header/arpa_inet/cbindgen.toml
new file mode 100644
index 0000000000..e6205e3805
--- /dev/null
+++ b/recipes/core/relibc/src/header/arpa_inet/cbindgen.toml
@@ -0,0 +1,31 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/arpa_inet.h.html
+#
+# Spec quotations relating to includes:
+# - "The <arpa/inet.h> header shall define the in_port_t and in_addr_t types as described in <netinet/in.h> and the socklen_t type as defined in <sys/socket.h>."
+# - "The <arpa/inet.h> header shall define the in_addr structure as described in <netinet/in.h>."
+# - "The <arpa/inet.h> header shall define the INET_ADDRSTRLEN and INET6_ADDRSTRLEN macros as described in <netinet/in.h>."
+# - "The <arpa/inet.h> header shall define the uint32_t and uint16_t types as described in <inttypes.h>."
+# - "Inclusion of the <arpa/inet.h> header may also make visible all symbols from <netinet/in.h> and <inttypes.h>."
+#
+# Possible cycle between arpa/inet.h and netinet/in.h solved by:
+# - including netinet/in.h in arpa/inet.h
+# - splitting out functions (htonl, htons, ntohl, ntohs) into bits/arpainet.h
+#
+# netinet/in.h brings in sys/types.h which brings in features.h (needed for #[deprecated] annotation)
+# bits/arpainet.h brings in inttypes.h
+sys_includes = ["netinet/in.h"]
+include_guard = "_ARPA_INET_H"
+after_includes = """
+#include <bits/arpainet.h> // for htonl, htons, ntohl, ntohs
+#include <bits/socklen-t.h> // for socklen_t
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"in_addr" = "struct in_addr"
diff --git a/recipes/core/relibc/src/header/arpa_inet/mod.rs b/recipes/core/relibc/src/header/arpa_inet/mod.rs
new file mode 100644
index 0000000000..e982353f71
--- /dev/null
+++ b/recipes/core/relibc/src/header/arpa_inet/mod.rs
@@ -0,0 +1,237 @@
+//! `arpa/inet.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/arpa_inet.h.html>.
+
+use core::{
+    ptr, slice,
+    str::{self, FromStr},
+};
+
+use crate::{
+    c_str::CStr,
+    header::{
+        bits_arpainet::ntohl,
+        bits_socklen_t::socklen_t,
+        errno::{EAFNOSUPPORT, ENOSPC},
+        netinet_in::{INADDR_NONE, in_addr, in_addr_t},
+        sys_socket::constants::AF_INET,
+    },
+    platform::{
+        self,
+        types::{c_char, c_int, c_void},
+    },
+    raw_cell::RawCell,
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/inet_addr.html>.
+///
+/// # Deprecated
+/// The `inet_addr()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn inet_addr(cp: *const c_char) -> in_addr_t {
+    let mut val: in_addr = in_addr { s_addr: 0 };
+
+    if unsafe { inet_aton(cp, &raw mut val) } > 0 {
+        val.s_addr
+    } else {
+        INADDR_NONE
+    }
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/inet_aton.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn inet_aton(cp: *const c_char, inp: *mut in_addr) -> c_int {
+    let cp_cstr = unsafe { CStr::from_ptr(cp) };
+    let mut four_parts_decimal_only = false;
+    if cp_cstr.contains(b'.') {
+        // 2, 3 or 4 part address
+        let parts = unsafe { str::from_utf8_unchecked(cp_cstr.to_bytes()).split('.') };
+        let mut count = 0;
+        for part in parts {
+            if let Some(hex_or_oct) = part.strip_prefix('0')
+                && part.len() > 1
+            {
+                match hex_or_oct.bytes().next() {
+                    Some(b'x' | b'X') => todo_skip!(0, "parsing hex values unimplemented"),
+                    // TODO: C2Y accept `0o` or `0O` as octal prefixes, C23 and below only use `0`
+                    _ => todo_skip!(0, "parsing octal values unimplemented"),
+                }
+            } else {
+                count += 1;
+            }
+        }
+        if count == 4 {
+            four_parts_decimal_only = true;
+        }
+    } else if cp_cstr.len() == 4 {
+        // 1 part address (32 bit value to be stored directly into address without byte rearrangement)
+        let s_addr_bytes: [u8; 4] = cp_cstr.to_bytes().try_into().expect("guaranteed 4 bytes");
+        unsafe {
+            (*inp.cast::<in_addr>()).s_addr = in_addr_t::from_ne_bytes(s_addr_bytes);
+        }
+        return 1; // successful
+    }
+    if four_parts_decimal_only {
+        unsafe { inet_pton(AF_INET, cp, inp.cast::<c_void>()) }
+    } else {
+        todo_skip!(0, "parsing 2 or more non-decimal values unimplemented");
+        // TODO convert octal and hexadecimal parts into decimal and feed into `inet_pton`
+        0 // indicates `cp` is an invalid string
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xns/inet_lnaof.html>.
+///
+/// # Deprecation
+/// The `inet_lnaof()` function was specified in Networking Services Issue 5,
+/// but not in the Open Group Base Specifications Issue 6 and later.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub extern "C" fn inet_lnaof(r#in: in_addr) -> in_addr_t {
+    if r#in.s_addr >> 24 < 128 {
+        r#in.s_addr & 0xff_ffff
+    } else if r#in.s_addr >> 24 < 192 {
+        r#in.s_addr & 0xffff
+    } else {
+        r#in.s_addr & 0xff
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xns/inet_makeaddr.html>.
+///
+/// # Deprecation
+/// The `inet_makeaddr()` function was specified in Networking Services Issue
+/// 5, but not in the Open Group Base Specifications Issue 6 and later.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub extern "C" fn inet_makeaddr(net: in_addr_t, lna: in_addr_t) -> in_addr {
+    let mut output: in_addr = in_addr { s_addr: 0 };
+
+    if net < 256 {
+        output.s_addr = lna | net << 24;
+    } else if net < 65536 {
+        output.s_addr = lna | net << 16;
+    } else {
+        output.s_addr = lna | net << 8;
+    }
+
+    output
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xns/inet_netof.html>.
+///
+/// # Deprecation
+/// The `inet_netof()` function was specified in Networking Services Issue 5,
+/// but not in the Open Group Base Specifications Issue 6 and later.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub extern "C" fn inet_netof(r#in: in_addr) -> in_addr_t {
+    if r#in.s_addr >> 24 < 128 {
+        r#in.s_addr & 0xff_ffff
+    } else if r#in.s_addr >> 24 < 192 {
+        r#in.s_addr & 0xffff
+    } else {
+        r#in.s_addr & 0xff
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xns/inet_network.html>.
+///
+/// # Deprecation
+/// The `inet_network()` function was specified in Networking Services Issue 5,
+/// but not in the Open Group Base Specifications Issue 6 and later.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn inet_network(cp: *const c_char) -> in_addr_t {
+    ntohl(unsafe {
+        #[allow(deprecated)]
+        inet_addr(cp)
+    })
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/inet_addr.html>.
+///
+/// # Deprecation
+/// The `inet_ntoa()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn inet_ntoa(r#in: in_addr) -> *mut c_char {
+    static NTOA_ADDR: RawCell<[c_char; 16]> = RawCell::new([0; 16]);
+
+    unsafe {
+        let ptr = inet_ntop(
+            AF_INET,
+            ptr::from_ref::<in_addr>(&r#in).cast::<c_void>(),
+            NTOA_ADDR.unsafe_mut().as_mut_ptr(),
+            NTOA_ADDR.unsafe_ref().len() as socklen_t,
+        );
+        // Mutable pointer is required, inet_ntop returns destination as const pointer
+        ptr.cast_mut()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/inet_ntop.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn inet_ntop(
+    af: c_int,
+    src: *const c_void,
+    dst: *mut c_char,
+    size: socklen_t,
+) -> *const c_char {
+    if af != AF_INET {
+        platform::ERRNO.set(EAFNOSUPPORT);
+        ptr::null()
+    } else if size < 16 {
+        platform::ERRNO.set(ENOSPC);
+        ptr::null()
+    } else {
+        let s_addr = unsafe {
+            slice::from_raw_parts(
+                ptr::from_ref(&(*(src.cast::<in_addr>())).s_addr).cast::<u8>(),
+                4,
+            )
+        };
+        let addr = format!("{}.{}.{}.{}\0", s_addr[0], s_addr[1], s_addr[2], s_addr[3]);
+        unsafe {
+            ptr::copy(addr.as_ptr().cast::<c_char>(), dst, addr.len());
+        }
+        dst
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/inet_ntop.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn inet_pton(af: c_int, src: *const c_char, dst: *mut c_void) -> c_int {
+    if af != AF_INET {
+        platform::ERRNO.set(EAFNOSUPPORT);
+        -1
+    } else {
+        let s_addr = unsafe {
+            slice::from_raw_parts_mut(
+                ptr::from_mut(&mut (*dst.cast::<in_addr>()).s_addr).cast::<u8>(),
+                4,
+            )
+        };
+        let src_cstr = unsafe { CStr::from_ptr(src) };
+        let mut octets = unsafe { str::from_utf8_unchecked(src_cstr.to_bytes()).split('.') };
+        for part in s_addr.iter_mut().take(4) {
+            if let Some(n) = octets
+                .next()
+                .filter(|x| !x.len() > 3)
+                .and_then(|x| u8::from_str(x).ok())
+            {
+                *part = n;
+            } else {
+                return 0;
+            }
+        }
+        if octets.next().is_none() {
+            1 // Success
+        } else {
+            0
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/header/assert/cbindgen.toml b/recipes/core/relibc/src/header/assert/cbindgen.toml
new file mode 100644
index 0000000000..eea531eabd
--- /dev/null
+++ b/recipes/core/relibc/src/header/assert/cbindgen.toml
@@ -0,0 +1,28 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/assert.h.html
+#
+# There are no spec quotations relating to includes
+#
+# features.h included for Rust never type (no return)
+sys_includes = ["features.h"]
+include_guard = "_RELIBC_ASSERT_H"
+# trailer is placed outside include_guard
+trailer = """
+// Do not use include guard, to ensure assert is always defined
+#ifdef assert
+#undef assert
+#endif
+
+#ifdef NDEBUG
+# define assert(cond) (void) 0
+#else
+# define assert(cond) \
+  ((void)((cond) || (__assert_fail(__func__, __FILE__, __LINE__, #cond), 0)))
+#endif
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/assert/mod.rs b/recipes/core/relibc/src/header/assert/mod.rs
new file mode 100644
index 0000000000..208d9019ae
--- /dev/null
+++ b/recipes/core/relibc/src/header/assert/mod.rs
@@ -0,0 +1,24 @@
+//! `assert.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/assert.h.html>.
+
+use crate::{
+    c_str::CStr,
+    platform::types::{c_char, c_int},
+};
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __assert_fail(
+    func: *const c_char,
+    file: *const c_char,
+    line: c_int,
+    cond: *const c_char,
+) -> ! {
+    let func = unsafe { CStr::from_ptr(func) }.to_string_lossy();
+    let file = unsafe { CStr::from_ptr(file) }.to_string_lossy();
+    let cond = unsafe { CStr::from_ptr(cond) }.to_string_lossy();
+
+    eprintln!("{}: {}:{}: Assertion `{}` failed.", func, file, line, cond);
+
+    core::intrinsics::abort();
+}
diff --git a/recipes/core/relibc/src/header/bits_arpainet/cbindgen.toml b/recipes/core/relibc/src/header/bits_arpainet/cbindgen.toml
new file mode 100644
index 0000000000..2db885b93e
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_arpainet/cbindgen.toml
@@ -0,0 +1,19 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/arpa_inet.h.html
+#
+# The arpa/inet header should define the following functions:
+# - htonl
+# - htons
+# - ntohl
+# - ntohs
+#
+# They are also meant to be available in the netinet/in header.
+# The arpa/inet and netinet/in headers both say that they may include each other which creates a cycle.
+# To break the cycle we include netinet/in in the arpa/inet header and split out the above functions.
+#
+# include inttypes.h to get uint16_t and uint32_t
+sys_includes = ["inttypes.h"]
+include_guard = "_RELIBC_BITS_ARPAINET_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
diff --git a/recipes/core/relibc/src/header/bits_arpainet/mod.rs b/recipes/core/relibc/src/header/bits_arpainet/mod.rs
new file mode 100644
index 0000000000..176b4d7958
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_arpainet/mod.rs
@@ -0,0 +1,25 @@
+use crate::platform::types::{uint16_t, uint32_t};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/htonl.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn htonl(hostlong: uint32_t) -> uint32_t {
+    hostlong.to_be()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/htonl.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn htons(hostshort: uint16_t) -> uint16_t {
+    hostshort.to_be()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/htonl.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ntohl(netlong: uint32_t) -> uint32_t {
+    u32::from_be(netlong)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/htonl.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ntohs(netshort: uint16_t) -> uint16_t {
+    u16::from_be(netshort)
+}
diff --git a/recipes/core/relibc/src/header/bits_iovec/cbindgen.toml b/recipes/core/relibc/src/header/bits_iovec/cbindgen.toml
new file mode 100644
index 0000000000..c9c51fbb10
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_iovec/cbindgen.toml
@@ -0,0 +1,18 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_uio.h.html
+#
+# Split out to avoid including all of sys/uio.h in sys/socket.h.
+#
+# POSIX headers that require iovec:
+# - sys/socket.h
+# - sys/uio.h (where it should be defined)
+#
+# sys/types.h included for c_void and size_t
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_BITS_IOVEC_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/bits_iovec/mod.rs b/recipes/core/relibc/src/header/bits_iovec/mod.rs
new file mode 100644
index 0000000000..2136ad90e1
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_iovec/mod.rs
@@ -0,0 +1,38 @@
+use alloc::vec::Vec;
+use core::slice;
+
+use crate::platform::types::{c_void, size_t};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_uio.h.html>.
+#[repr(C)]
+#[derive(Debug, CheckVsLibcCrate)]
+pub struct iovec {
+    pub iov_base: *mut c_void,
+    pub iov_len: size_t,
+}
+
+impl iovec {
+    unsafe fn to_slice(&self) -> &mut [u8] {
+        unsafe { slice::from_raw_parts_mut(self.iov_base.cast::<u8>(), self.iov_len) }
+    }
+}
+
+pub unsafe fn gather(iovs: &[iovec]) -> Vec<u8> {
+    let mut vec = Vec::new();
+    for iov in iovs.iter() {
+        vec.extend_from_slice(unsafe { iov.to_slice() });
+    }
+    vec
+}
+
+pub unsafe fn scatter(iovs: &[iovec], vec: Vec<u8>) {
+    let mut i = 0;
+    for iov in iovs.iter() {
+        let slice = unsafe { iov.to_slice() };
+        slice.copy_from_slice(&vec[i..][..slice.len()]);
+        i += slice.len();
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbindgen_alias_iovec(_: iovec) {}
diff --git a/recipes/core/relibc/src/header/bits_locale-t/cbindgen.toml b/recipes/core/relibc/src/header/bits_locale-t/cbindgen.toml
new file mode 100644
index 0000000000..bd79a605d1
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_locale-t/cbindgen.toml
@@ -0,0 +1,29 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/locale.h.html
+#
+# The locale header should define this type but multiple headers make use of it.
+# This type is split out from the locale header to avoid including all of locale in the other headers.
+#
+# POSIX headers that require locale_t:
+# - ctype.h
+# - langinfo.h
+# - libintl.h (Redox does not have this header, it seems to be supplied externally)
+# - monetary.h (TODO note exists, not currently imported)
+# - string.h
+# - strings.h (TODO note exists, not currently imported)
+# - time.h (TODO note exists, not currently imported)
+# - wchar.h (required by *_l functions, no TODO note present)
+# - wctype.h (required by *_l functions, TODO note exists, not currently imported)
+sys_includes = []
+include_guard = "_RELIBC_BITS_LOCALE_T_H"
+language = "C"
+style = "type"
+no_includes = true
+cpp_compat = true
+
+[export]
+include = [
+  "locale_t"
+]
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/bits_locale-t/mod.rs b/recipes/core/relibc/src/header/bits_locale-t/mod.rs
new file mode 100644
index 0000000000..0e1c4c3611
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_locale-t/mod.rs
@@ -0,0 +1 @@
+pub type locale_t = *mut core::ffi::c_void;
diff --git a/recipes/core/relibc/src/header/bits_pthread/cbindgen.toml b/recipes/core/relibc/src/header/bits_pthread/cbindgen.toml
new file mode 100644
index 0000000000..ea30c3892b
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_pthread/cbindgen.toml
@@ -0,0 +1,53 @@
+sys_includes = []
+include_guard = "_RELIBC_BITS_PTHREAD_H"
+language = "C"
+style = "type"
+no_includes = true
+cpp_compat = true
+# TODO: Any better way to implement pthread_cleanup_push/pthread_cleanup_pop?
+after_includes = """
+#define PTHREAD_COND_INITIALIZER ((pthread_cond_t){0})
+#define PTHREAD_MUTEX_INITIALIZER ((pthread_mutex_t){0})
+#define PTHREAD_ONCE_INIT ((pthread_once_t){0})
+#define PTHREAD_RWLOCK_INITIALIZER ((pthread_rwlock_t){0})
+
+#define pthread_cleanup_push(ROUTINE, ARG) do { \\
+  struct { \\
+    void (*routine)(void *); \\
+    void *arg; \\
+    void *prev; \\
+  } __relibc_internal_pthread_ll_entry = { \\
+    .routine = (void (*)(void *))(ROUTINE), \\
+    .arg = (void *)(ARG), \\
+  }; \\
+  __relibc_internal_pthread_cleanup_push(&__relibc_internal_pthread_ll_entry);
+
+#define pthread_cleanup_pop(EXECUTE) \\
+  __relibc_internal_pthread_cleanup_pop((EXECUTE)); \\
+} while(0)
+
+"""
+
+[export.rename]
+"AtomicInt" = "int"
+"AtomicUint" = "unsigned"
+
+[export]
+include = [
+  "pthread_attr_t",
+  "pthread_rwlockattr_t",
+  "pthread_rwlock_t",
+  "pthread_barrier_t",
+  "pthread_barrierattr_t",
+  "pthread_mutex_t",
+  "pthread_mutexattr_t",
+  "pthread_condattr_t",
+  "pthread_cond_t",
+  "pthread_spinlock_t",
+  "pthread_once_t",
+  "pthread_t",
+  "pthread_key_t",
+]
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/bits_pthread/mod.rs b/recipes/core/relibc/src/header/bits_pthread/mod.rs
new file mode 100644
index 0000000000..ce21b6a3fa
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_pthread/mod.rs
@@ -0,0 +1,123 @@
+#![allow(non_camel_case_types)]
+
+use crate::platform::types::{c_int, c_uchar, c_ulong, c_void, size_t};
+
+// XXX: https://github.com/eqrion/cbindgen/issues/685
+//
+// We need to write the opaque types ourselves, and apparently cbindgen doesn't even support
+// expanding macros! Instead, we rely on checking that the lengths are correct, when these headers
+// are parsed in the regular compilation phase.
+
+/// The `pthread_attr_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_attr_t {
+    __relibc_internal_size: [c_uchar; 32],
+    __relibc_internal_align: size_t,
+}
+/// The `pthread_rwlockattr_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_rwlockattr_t {
+    __relibc_internal_size: [c_uchar; 1],
+    __relibc_internal_align: c_uchar,
+}
+/// The `pthread_rwlock_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_rwlock_t {
+    __relibc_internal_size: [c_uchar; 4],
+    __relibc_internal_align: c_int,
+}
+/// The `pthread_barrier_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_barrier_t {
+    __relibc_internal_size: [c_uchar; 24],
+    __relibc_internal_align: c_int,
+}
+/// The `pthread_barrierattr_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_barrierattr_t {
+    __relibc_internal_size: [c_uchar; 4],
+    __relibc_internal_align: c_int,
+}
+/// The `pthread_mutex_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_mutex_t {
+    __relibc_internal_size: [c_uchar; 12],
+    __relibc_internal_align: c_int,
+}
+/// The `pthread_mutexattr_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_mutexattr_t {
+    __relibc_internal_size: [c_uchar; 20],
+    __relibc_internal_align: c_int,
+}
+/// The `pthread_cond_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_cond_t {
+    __relibc_internal_size: [c_uchar; 8],
+    __relibc_internal_align: c_int,
+}
+/// The `pthread_condattr_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_condattr_t {
+    __relibc_internal_size: [c_uchar; 8],
+    __relibc_internal_align: c_int,
+}
+/// The `pthread_spinlock_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_spinlock_t {
+    __relibc_internal_size: [c_uchar; 4],
+    __relibc_internal_align: c_int,
+}
+/// The `pthread_once_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[repr(C)]
+pub union pthread_once_t {
+    __relibc_internal_size: [c_uchar; 4],
+    __relibc_internal_align: c_int,
+}
+
+macro_rules! assert_equal_size(
+    ($export:ident, $wrapped:ident) => {
+        const _: () = unsafe {
+            type Wrapped = crate::header::pthread::$wrapped;
+
+            // Fail at compile-time if sizes differ.
+
+            // TODO: Is this UB?
+            let export = $export { __relibc_internal_align: 0 };
+            let _: Wrapped = core::mem::transmute(export.__relibc_internal_size);
+
+            // Fail at compile-time if alignments differ.
+            let a = [0_u8; core::mem::align_of::<$export>()];
+            #[allow(clippy::useless_transmute)]
+            let b: [u8; core::mem::align_of::<Wrapped>()] = core::mem::transmute(a);
+        };
+        // TODO: Turn into a macro?
+        #[cfg(all(target_os = "redox", feature = "check_against_libc_crate"))]
+        const _: () = unsafe {
+            use ::__libc_only_for_layout_checks as libc;
+
+            let export = $export { __relibc_internal_align: 0 };
+            let _: libc::$export = core::mem::transmute(export.__relibc_internal_size);
+
+            let a = [0_u8; core::mem::align_of::<$export>()];
+            let b: [u8; core::mem::align_of::<libc::$export>()] = core::mem::transmute(a);
+
+        };
+    }
+);
+assert_equal_size!(pthread_attr_t, RlctAttr);
+assert_equal_size!(pthread_rwlock_t, RlctRwlock);
+assert_equal_size!(pthread_rwlockattr_t, RlctRwlockAttr);
+assert_equal_size!(pthread_barrier_t, RlctBarrier);
+assert_equal_size!(pthread_barrierattr_t, RlctBarrierAttr);
+assert_equal_size!(pthread_mutex_t, RlctMutex);
+assert_equal_size!(pthread_mutexattr_t, RlctMutexAttr);
+assert_equal_size!(pthread_cond_t, RlctCond);
+assert_equal_size!(pthread_condattr_t, RlctCondAttr);
+assert_equal_size!(pthread_spinlock_t, RlctSpinlock);
+assert_equal_size!(pthread_once_t, RlctOnce);
+
+/// The `pthread_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type pthread_t = *mut c_void;
+/// The `pthread_key_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type pthread_key_t = c_ulong;
diff --git a/recipes/core/relibc/src/header/bits_safamily-t/cbindgen.toml b/recipes/core/relibc/src/header/bits_safamily-t/cbindgen.toml
new file mode 100644
index 0000000000..9b70509927
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_safamily-t/cbindgen.toml
@@ -0,0 +1,21 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html
+#
+# The sys/socket header should define this type.
+# It is split out to avoid other headers from including all of sys/socket.
+#
+# POSIX headers that require sa_family_t:
+# - netinet/in.h
+# - sys/socket.h
+# - sys/un.h
+sys_includes = []
+include_guard = "_RELIBC_BITS_SA_FAMILY_T_H"
+language = "C"
+style = "type"
+no_includes = true
+cpp_compat = true
+
+[export]
+include = ["sa_family_t"]
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/bits_safamily-t/mod.rs b/recipes/core/relibc/src/header/bits_safamily-t/mod.rs
new file mode 100644
index 0000000000..706ee0a78e
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_safamily-t/mod.rs
@@ -0,0 +1,3 @@
+use crate::platform::types::c_ushort;
+
+pub type sa_family_t = c_ushort;
diff --git a/recipes/core/relibc/src/header/bits_socklen-t/cbindgen.toml b/recipes/core/relibc/src/header/bits_socklen-t/cbindgen.toml
new file mode 100644
index 0000000000..94a53c8954
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_socklen-t/cbindgen.toml
@@ -0,0 +1,12 @@
+sys_includes = []
+include_guard = "_RELIBC_BITS_SOCKLEN_T_H"
+language = "C"
+style = "type"
+no_includes = true
+cpp_compat = true
+[export]
+include = [
+  "socklen_t"
+]
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/bits_socklen-t/mod.rs b/recipes/core/relibc/src/header/bits_socklen-t/mod.rs
new file mode 100644
index 0000000000..74de941e6c
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_socklen-t/mod.rs
@@ -0,0 +1 @@
+pub type socklen_t = u32;
diff --git a/recipes/core/relibc/src/header/bits_timespec/cbindgen.toml b/recipes/core/relibc/src/header/bits_timespec/cbindgen.toml
new file mode 100644
index 0000000000..817170d32f
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_timespec/cbindgen.toml
@@ -0,0 +1,25 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/time.h.html
+#
+# The time header should define timespec but multiple headers make use of it.
+# This type is split out from the time header to avoid including all of time in the other headers.
+#
+# POSIX headers that require timespec:
+# - aio.h (all functions currently unimplemented but timespec imported)
+# - poll.h
+# - sched.h
+# - semaphore.h
+# - signal.h
+# - sys/select.h (not currently imported, needed for pselect, no TODO)
+# - sys/stat.h
+# - sys/time.h
+#
+# include sys/types.h to get time_t for timespec
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_BITS_TIME_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/bits_timespec/mod.rs b/recipes/core/relibc/src/header/bits_timespec/mod.rs
new file mode 100644
index 0000000000..7c3e031ec9
--- /dev/null
+++ b/recipes/core/relibc/src/header/bits_timespec/mod.rs
@@ -0,0 +1,64 @@
+use crate::{
+    header::time::NANOSECONDS,
+    platform::types::{c_long, time_t},
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/time.h.html>.
+#[repr(C)]
+#[derive(Clone, Default, Debug)]
+pub struct timespec {
+    pub tv_sec: time_t,
+    pub tv_nsec: c_long,
+}
+
+impl timespec {
+    // TODO: Write test
+
+    /// similar logic with timeradd
+    #[allow(clippy::should_implement_trait)] // not to confuse std::ops::Add
+    pub fn add(base: timespec, interval: timespec) -> Option<timespec> {
+        let delta_sec = base.tv_sec.checked_add(interval.tv_sec)?;
+        let delta_nsec = base.tv_nsec.checked_add(interval.tv_nsec)?;
+
+        if delta_sec < 0 || delta_nsec < 0 {
+            return None;
+        }
+
+        Some(Self {
+            tv_sec: delta_sec + (delta_nsec / NANOSECONDS) as time_t,
+            tv_nsec: delta_nsec % NANOSECONDS,
+        })
+    }
+    /// similar logic with timersub
+    pub fn subtract(later: timespec, earlier: timespec) -> Option<timespec> {
+        let delta_sec = later.tv_sec.checked_sub(earlier.tv_sec)?;
+        let delta_nsec = later.tv_nsec.checked_sub(earlier.tv_nsec)?;
+
+        let time = if delta_nsec < 0 {
+            let roundup_sec = -delta_nsec / NANOSECONDS + 1;
+            timespec {
+                tv_sec: delta_sec - (roundup_sec as time_t),
+                tv_nsec: roundup_sec * NANOSECONDS - delta_nsec,
+            }
+        } else {
+            timespec {
+                tv_sec: delta_sec + (delta_nsec / NANOSECONDS) as time_t,
+                tv_nsec: delta_nsec % NANOSECONDS,
+            }
+        };
+
+        if time.tv_sec < 0 {
+            // https://man7.org/linux/man-pages/man2/settimeofday.2.html
+            // caller should return EINVAL
+            return None;
+        }
+
+        Some(time)
+    }
+    pub fn is_default(&self) -> bool {
+        self.tv_nsec == 0 && self.tv_sec == 0
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbindgen_stupid_alias_timespec(_: timespec) {}
diff --git a/recipes/core/relibc/src/header/cpio/cbindgen.toml b/recipes/core/relibc/src/header/cpio/cbindgen.toml
new file mode 100644
index 0000000000..c578d9b65e
--- /dev/null
+++ b/recipes/core/relibc/src/header/cpio/cbindgen.toml
@@ -0,0 +1,16 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/cpio.h.html
+#
+# There are no spec quotations relating to includes
+sys_includes = []
+include_guard = "_RELIBC_CPIO_H"
+# cbindgen still can't handle exporting CStr
+after_includes = """
+#define MAGIC "070707"
+"""
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/cpio/mod.rs b/recipes/core/relibc/src/header/cpio/mod.rs
new file mode 100644
index 0000000000..a53ea2c0ab
--- /dev/null
+++ b/recipes/core/relibc/src/header/cpio/mod.rs
@@ -0,0 +1,48 @@
+//! `cpio.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/cpio.h.html>.
+
+use crate::platform::types::c_int;
+
+/// Read by owner.
+pub const C_IRUSR: c_int = 0o0000400;
+/// Write by owner.
+pub const C_IWUSR: c_int = 0o0000200;
+/// Execute by owner.
+pub const C_IXUSR: c_int = 0o0000100;
+/// Read by group.
+pub const C_IRGRP: c_int = 0o0000040;
+/// Write by group.
+pub const C_IWGRP: c_int = 0o0000020;
+/// Execute by group.
+pub const C_IXGRP: c_int = 0o0000010;
+/// Read by others.
+pub const C_IROTH: c_int = 0o0000004;
+/// Write by others.
+pub const C_IWOTH: c_int = 0o0000002;
+/// Execute by others.
+pub const C_IXOTH: c_int = 0o0000001;
+
+/// Set user ID.
+pub const C_ISUID: c_int = 0o0004000;
+/// Set group ID.
+pub const C_ISGID: c_int = 0o0002000;
+/// On directories, restricted deletion flag.
+pub const C_ISVTX: c_int = 0o0001000;
+
+/// Directory.
+pub const C_ISDIR: c_int = 0o0040000;
+/// FIFO.
+pub const C_ISFIFO: c_int = 0o0010000;
+/// Regular file.
+pub const C_ISREG: c_int = 0o0100000;
+/// Block special.
+pub const C_ISBLK: c_int = 0o0060000;
+/// Character special.
+pub const C_ISCHR: c_int = 0o0020000;
+/// Reserved.
+pub const C_ISCTG: c_int = 0o0110000;
+/// Symbolic link.
+pub const C_ISLNK: c_int = 0o0120000;
+/// Socket.
+pub const C_ISSOCK: c_int = 0o0140000;
diff --git a/recipes/core/relibc/src/header/crypt/argon2.rs b/recipes/core/relibc/src/header/crypt/argon2.rs
new file mode 100644
index 0000000000..99b7e57e2d
--- /dev/null
+++ b/recipes/core/relibc/src/header/crypt/argon2.rs
@@ -0,0 +1,16 @@
+use alloc::string::{String, ToString};
+use argon2::{
+    Argon2,
+    password_hash::{PasswordHash, PasswordVerifier},
+};
+
+pub fn crypt_argon2(key: &str, setting: &str) -> Option<String> {
+    let hash = PasswordHash::new(setting).ok()?;
+    let argon2 = Argon2::default();
+
+    if argon2.verify_password(key.as_bytes(), &hash).is_ok() {
+        Some(setting.to_string())
+    } else {
+        None
+    }
+}
diff --git a/recipes/core/relibc/src/header/crypt/blowfish.rs b/recipes/core/relibc/src/header/crypt/blowfish.rs
new file mode 100644
index 0000000000..54e9fe1082
--- /dev/null
+++ b/recipes/core/relibc/src/header/crypt/blowfish.rs
@@ -0,0 +1,90 @@
+use crate::platform::types::{c_uchar, c_uint};
+use alloc::{string::String, vec::Vec};
+use base64ct::{Base64Bcrypt, Encoding};
+use bcrypt_pbkdf::bcrypt_pbkdf;
+use core::str;
+
+const MIN_COST: u32 = 4;
+const MAX_COST: u32 = 31;
+const BHASH_WORDS: usize = 8;
+const BHASH_OUTPUT_SIZE: usize = BHASH_WORDS * 4;
+
+/// Inspired by https://github.com/Keats/rust-bcrypt/blob/87fc59e917bcb6cf3f3752fc7f2b4c659d415597/src/lib.rs#L135
+fn split_with_prefix(hash: &str) -> Option<(&str, &str, c_uint)> {
+    let valid_prefixes = ["2y", "2b", "2a", "2x"];
+
+    // Should be [prefix, cost, hash]
+    let raw_parts: Vec<_> = hash.split('$').skip(1).collect();
+    if raw_parts.len() != 3 {
+        return None;
+    }
+
+    let prefix = raw_parts[0];
+    let setting = raw_parts[2];
+
+    if !valid_prefixes.contains(&prefix) {
+        return None;
+    }
+
+    raw_parts[1]
+        .parse::<c_uint>()
+        .ok()
+        .map(|cost| (prefix, setting, cost))
+}
+
+/// Performs Blowfish key derivation on a given password with a specific setting.
+///
+/// # Parameters
+/// * `passw`: The password to be hashed. It must be a string slice (`&str`).
+/// * `setting`: The settings for the Blowfish key derivation. It must be a string slice (`&str`)
+///   and should follow the format `$<prefix>$<cost>$<setting>`, where `<prefix>` is a string that
+///   indicates the type of the hash (e.g., "$2a$"), `<cost>` is a decimal number representing
+///   the cost factor for the Blowfish operation, and `<setting>` is a base64-encoded string
+///   representing the salt to be used for the Blowfish function.
+///
+/// # Returns
+/// * `Option<String>`: Returns `Some(String)` if the Blowfish operation was successful, where the
+///   returned string is the result of the Blowfish operation formatted according to the Modular
+///   Crypt Format (MCF). If the Blowfish operation failed, it returns `None`.
+///
+/// # Errors
+/// * If the cost factor is outside the range `[MIN_COST, MAX_COST]`.
+///
+/// # Example
+/// ```
+/// let password = "correctbatteryhorsestapler";
+/// let setting = "$2y$12$L6Bc/AlTQHyd9liGgGEZyO";
+/// let result = crypt_blowfish(password, setting);
+/// assert!(result.is_some());
+///```
+///
+/// # Note
+/// The `crypt_blowfish` function uses the Blowfish block cipher for hashing.
+/// The output of the Blowfish operation is base64-encoded using the BCrypt variant of base64.
+pub fn crypt_blowfish(passw: &str, setting: &str) -> Option<String> {
+    if let Some((prefix, setting, cost)) = split_with_prefix(setting) {
+        if !(MIN_COST..=MAX_COST).contains(&cost) {
+            return None;
+        }
+        // Passwords need to be null terminated
+        let mut vec = Vec::with_capacity(passw.len() + 1);
+        vec.extend_from_slice(passw.as_bytes());
+        vec.push(0);
+
+        // We only consider the first 72 chars; truncate if necessary.
+        let passw_t = if vec.len() > 72 { &vec[..72] } else { &vec };
+        let passw: &[c_uchar] = passw_t;
+        let setting = setting.as_bytes();
+        let mut output = vec![0; BHASH_OUTPUT_SIZE + 1];
+
+        bcrypt_pbkdf(passw, setting, cost, &mut output).ok()?;
+        Some(format!(
+            "${}${}${}",
+            prefix,
+            cost,
+            Base64Bcrypt::encode_string(&output),
+        ))
+    } else {
+        None
+    }
+}
diff --git a/recipes/core/relibc/src/header/crypt/cbindgen.toml b/recipes/core/relibc/src/header/crypt/cbindgen.toml
new file mode 100644
index 0000000000..bdcf5ebda1
--- /dev/null
+++ b/recipes/core/relibc/src/header/crypt/cbindgen.toml
@@ -0,0 +1,9 @@
+include_guard = "_RELIBC_CRYPT_H"
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+
+[enum]
+prefix_with_name = true
\ No newline at end of file
diff --git a/recipes/core/relibc/src/header/crypt/md5.rs b/recipes/core/relibc/src/header/crypt/md5.rs
new file mode 100644
index 0000000000..25cfacff37
--- /dev/null
+++ b/recipes/core/relibc/src/header/crypt/md5.rs
@@ -0,0 +1,146 @@
+use crate::platform::types::c_uchar;
+use alloc::string::String;
+use base64ct::{Base64ShaCrypt, Encoding};
+use core::str;
+use md5_crypto::{Digest, Md5};
+
+// Block size for MD5
+const BLOCK_SIZE: usize = 16;
+// PWD part length of the password string
+const PW_SIZE_MD5: usize = 22;
+// Maximum length of a setting
+const SALT_MAX: usize = 8;
+// Inverse encoding map for MD5.
+const MAP_MD5: [c_uchar; BLOCK_SIZE] = [12, 6, 0, 13, 7, 1, 14, 8, 2, 15, 9, 3, 5, 10, 4, 11];
+
+const KEY_MAX: usize = 30000;
+
+fn encode_md5(source: &[c_uchar]) -> Option<[c_uchar; PW_SIZE_MD5]> {
+    let mut transposed = [0; BLOCK_SIZE];
+    for (i, &ti) in MAP_MD5.iter().enumerate() {
+        transposed[i] = source[ti as usize];
+    }
+    let mut buf = [0; PW_SIZE_MD5];
+    Base64ShaCrypt::encode(&transposed, &mut buf).ok()?;
+    Some(buf)
+}
+
+/// Function taken from PR: https://github.com/RustCrypto/password-hashes/pull/351
+/// This won't be needed once the PR is merged
+fn inner_md5(passw: &str, setting: &str) -> Option<String> {
+    let mut digest_b = Md5::default();
+    digest_b.update(passw);
+    digest_b.update(setting);
+    digest_b.update(passw);
+    let hash_b = digest_b.finalize();
+
+    let mut digest_a = Md5::default();
+    digest_a.update(passw);
+    digest_a.update("$1$");
+    digest_a.update(setting);
+
+    let mut pw_len = passw.len();
+    let rounds = pw_len / BLOCK_SIZE;
+    for _ in 0..rounds {
+        digest_a.update(hash_b);
+    }
+
+    // leftover passw
+    digest_a.update(&hash_b[..(pw_len - rounds * BLOCK_SIZE)]);
+
+    while pw_len > 0 {
+        match pw_len & 1 {
+            0 => digest_a.update(&passw[..1]),
+            1 => digest_a.update([0u8]),
+            _ => unreachable!(),
+        }
+        pw_len >>= 1;
+    }
+
+    let mut hash_a = digest_a.finalize();
+
+    // Repeatedly run the collected hash value through MD5 to burn
+    // CPU cycles
+    for i in 0..1000_usize {
+        // new hasher
+        let mut hasher = Md5::default();
+
+        // Add key or last result
+        if (i & 1) != 0 {
+            hasher.update(passw);
+        } else {
+            hasher.update(hash_a);
+        }
+
+        // Add setting for numbers not divisible by 3
+        if i % 3 != 0 {
+            hasher.update(setting);
+        }
+
+        // Add key for numbers not divisible by 7
+        if i % 7 != 0 {
+            hasher.update(passw);
+        }
+
+        // Add key or last result
+        if (i & 1) != 0 {
+            hasher.update(hash_a);
+        } else {
+            hasher.update(passw);
+        }
+
+        // digest_c.clone_from_slice(&hasher.finalize());
+        hash_a = hasher.finalize();
+    }
+    encode_md5(hash_a.as_slice())
+        .map(|encstr| format!("$1${}${}", setting, str::from_utf8(&encstr).unwrap()))
+}
+
+/// Performs MD5 hashing on a given password with a specific setting.
+///
+/// # Parameters
+/// * `passw`: The password to be hashed. It must be a string slice (`&str`).
+/// * `setting`: The settings for the MD5 hashing. It must be a string slice (`&str`)
+///   and should start with "$1$". The rest of the string should represent the salt
+///   to be used for the MD5 hashing.
+///
+/// # Returns
+/// * `Option<String>`: Returns `Some(String)` if the MD5 operation was successful, where the
+///   returned string is the result of the MD5 operation formatted according to the Modular
+///   Crypt Format (MCF). If the MD5 operation failed, it returns `None`.
+///
+/// # Errors
+/// * If the `passw` length exceeds `KEY_MAX`.
+/// * If the `setting` does not start with "$1$".
+///
+/// # Example
+/// ```
+/// let password = "my_password";
+/// let setting = "$1$saltstring";
+/// let result = crypt_md5(password, setting);
+/// assert!(result.is_some());
+/// ```
+///
+/// # Note
+/// The `crypt_md5` function uses the MD5 hashing algorithm for hashing.
+/// The output of the MD5 operation is base64-encoded using the BCrypt variant of base64.
+pub fn crypt_md5(passw: &str, setting: &str) -> Option<String> {
+    /* reject large keys */
+    if passw.len() > KEY_MAX {
+        return None;
+    }
+
+    if &setting[0..3] != "$1$" {
+        return None;
+    }
+
+    let cursor = 3;
+    let slen = cursor
+        + setting[cursor..cursor + SALT_MAX]
+            .chars()
+            .take_while(|c| *c != '$')
+            .count();
+    let setting = &setting[cursor..slen];
+
+    inner_md5(passw, setting)
+}
diff --git a/recipes/core/relibc/src/header/crypt/mod.rs b/recipes/core/relibc/src/header/crypt/mod.rs
new file mode 100644
index 0000000000..4a3edd6872
--- /dev/null
+++ b/recipes/core/relibc/src/header/crypt/mod.rs
@@ -0,0 +1,121 @@
+//! `crypt.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/crypt.3.html>.
+
+use ::scrypt::password_hash::{Salt, SaltString};
+use alloc::{
+    ffi::CString,
+    string::{String, ToString},
+};
+use core::ptr;
+use rand::{Rng, SeedableRng, rngs::SmallRng};
+
+use crate::{
+    c_str::CStr,
+    header::{errno::EINVAL, stdlib::rand},
+    platform::{
+        self,
+        types::{c_char, c_int},
+    },
+};
+
+mod argon2;
+mod blowfish;
+mod md5;
+mod pbkdf2;
+mod scrypt;
+mod sha;
+
+use self::{
+    argon2::crypt_argon2,
+    blowfish::crypt_blowfish,
+    md5::crypt_md5,
+    pbkdf2::crypt_pbkdf2,
+    scrypt::crypt_scrypt,
+    sha::{
+        ShaType::{Sha256, Sha512},
+        crypt_sha,
+    },
+};
+
+/// See <https://www.man7.org/linux/man-pages/man3/crypt.3.html>.
+#[repr(C)]
+pub struct crypt_data {
+    initialized: c_int,
+    buff: [c_char; 256],
+}
+
+impl crypt_data {
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        crypt_data {
+            initialized: 1,
+            buff: [0; 256],
+        }
+    }
+}
+
+fn gen_salt() -> Option<String> {
+    let mut rng = SmallRng::seed_from_u64(unsafe { rand() as u64 });
+    let mut bytes = [0u8; Salt::RECOMMENDED_LENGTH];
+    rng.fill_bytes(&mut bytes);
+    Some(SaltString::encode_b64(&bytes).ok()?.as_str().to_string())
+}
+
+/// See <https://www.man7.org/linux/man-pages/man3/crypt.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn crypt_r(
+    key: *const c_char,
+    setting: *const c_char,
+    data: *mut crypt_data,
+) -> *mut c_char {
+    if unsafe { (*data).initialized } == 0 {
+        unsafe { *data = crypt_data::new() };
+    }
+
+    let key = unsafe { CStr::from_ptr(key) }
+        .to_str()
+        .expect("key must be utf-8");
+    let setting = unsafe { CStr::from_ptr(setting) }
+        .to_str()
+        .expect("setting must be utf-8");
+
+    let encoded = if setting.starts_with('$') {
+        if setting.starts_with("$1$") {
+            crypt_md5(key, setting)
+        } else if setting.starts_with("$2") && setting.as_bytes().get(3) == Some(&b'$') {
+            crypt_blowfish(key, setting)
+        } else if setting.starts_with("$5$") {
+            crypt_sha(key, setting, Sha256)
+        } else if setting.starts_with("$6$") {
+            crypt_sha(key, setting, Sha512)
+        } else if setting.starts_with("$7$") {
+            crypt_scrypt(key, setting)
+        } else if setting.starts_with("$8$") {
+            crypt_pbkdf2(key, setting)
+        } else if setting.starts_with("$argon2") {
+            crypt_argon2(key, setting)
+        } else {
+            platform::ERRNO.set(EINVAL);
+            return ptr::null_mut();
+        }
+    } else {
+        None
+    };
+
+    if let Some(inner) = encoded {
+        let len = inner.len();
+        if let Ok(ret) = CString::new(inner) {
+            let ret_ptr = ret.into_raw();
+            unsafe {
+                let dst = (*data).buff.as_mut_ptr();
+                ptr::copy_nonoverlapping(ret_ptr, dst.cast(), len);
+            }
+            ret_ptr.cast()
+        } else {
+            ptr::null_mut()
+        }
+    } else {
+        ptr::null_mut()
+    }
+}
diff --git a/recipes/core/relibc/src/header/crypt/pbkdf2.rs b/recipes/core/relibc/src/header/crypt/pbkdf2.rs
new file mode 100644
index 0000000000..9a614873e6
--- /dev/null
+++ b/recipes/core/relibc/src/header/crypt/pbkdf2.rs
@@ -0,0 +1,64 @@
+use super::gen_salt;
+use alloc::string::{String, ToString};
+use base64ct::{Base64Bcrypt, Encoding};
+use core::str;
+use pbkdf2::pbkdf2_hmac;
+use sha2::Sha256;
+
+/// Performs PBKDF2 key derivation on a given password with a specific setting.
+///
+/// # Parameters
+/// * `passw`: The password to be hashed. It must be a string slice (`&str`).
+/// * `setting`: The settings for the PBKDF2 key derivation. It must be a string slice (`&str`)
+///   and should follow the format `$<iter>$<salt>`. The `<iter>` part should be a hexadecimal
+///   number representing the iteration count for the PBKDF2 function. The `<salt>` part should
+///   be a base64-encoded string representing the salt to be used for the PBKDF2 function.
+///
+/// # Returns
+/// * `Option<String>`: Returns `Some(String)` if the PBKDF2 operation was successful, where the
+///   returned string is the result of the PBKDF2 operation formatted according to the Modular
+///   Crypt Format (MCF). If the PBKDF2 operation failed, it returns `None`.
+///
+/// # Errors
+/// * If the `setting` does not contain a '$' character.
+/// * If the `setting` contains another '$' character after the first one.
+/// * If the `<salt>` part of the `setting` is empty.
+/// * If the `<iter>` part of the `setting` cannot be converted into a `u32` integer.
+///
+/// # Example
+/// ```
+/// let password = "my_password";
+/// let setting = "$8$3e8$salt";
+/// let result = crypt_pbkdf2(password, setting);
+/// assert!(result.is_some());
+/// ```
+///
+/// # Note
+/// The `crypt_pbkdf2` function uses the SHA256 hashing algorithm for the PBKDF2 operation.
+/// The output of the PBKDF2 operation is base64-encoded using the BCrypt variant of base64.
+pub fn crypt_pbkdf2(passw: &str, setting: &str) -> Option<String> {
+    if let Some((iter_str, salt)) = &setting[3..].split_once('$') {
+        if salt.contains('$') {
+            return None;
+        }
+
+        let actual_salt = if !salt.is_empty() {
+            salt.to_string()
+        } else {
+            gen_salt()?
+        };
+
+        let iter = u32::from_str_radix(iter_str, 16).ok()?;
+        let mut buffer = [0u8; 32];
+        pbkdf2_hmac::<Sha256>(passw.as_bytes(), actual_salt.as_bytes(), iter, &mut buffer);
+
+        Some(format!(
+            "$8${}${}${}",
+            iter_str,
+            salt,
+            Base64Bcrypt::encode_string(&buffer)
+        ))
+    } else {
+        None
+    }
+}
diff --git a/recipes/core/relibc/src/header/crypt/scrypt.rs b/recipes/core/relibc/src/header/crypt/scrypt.rs
new file mode 100644
index 0000000000..334d9dfdb4
--- /dev/null
+++ b/recipes/core/relibc/src/header/crypt/scrypt.rs
@@ -0,0 +1,113 @@
+use super::gen_salt;
+use crate::platform::types::{c_uchar, c_uint};
+use alloc::string::{String, ToString};
+use base64ct::{Base64Bcrypt, Encoding};
+use core::str;
+use scrypt::{Params, scrypt};
+
+/// Map for encoding and decoding
+#[inline(always)]
+fn to_digit(c: char, radix: u32) -> Option<u32> {
+    match c {
+        '.' => Some(0),
+        '/' => Some(1),
+        _ => c.to_digit(radix).map(|d| d + 2),
+    }
+}
+
+/// Decodes a 5 character lengt str value to c_uint
+///
+/// # Arguments
+///
+/// * `value` - A string slice that represents a u32 value in base64
+///
+/// # Returns
+///
+/// * `Option<c_uint>` - Returns the decoded c_uint value if successful, otherwise None
+fn dencode_uint(value: &str) -> Option<c_uint> {
+    if value.len() != 5 {
+        return None;
+    }
+
+    value
+        .chars()
+        .enumerate()
+        .try_fold(0 as c_uint, |acc, (i, c)| {
+            acc.checked_add((to_digit(c, 30)? as c_uint) << (i * 6))
+        })
+}
+
+/// Reads settings for password encryption
+///
+/// # Arguments
+///
+/// * `setting` - A string slice that represents the settings
+///
+/// # Returns
+///
+/// * `Option<(c_uchar, c_uint, c_uint, String)>` - Returns a tuple containing the settings if successful, otherwise None
+fn read_setting(setting: &str) -> Option<(c_uchar, c_uint, c_uint, String)> {
+    let nlog2 = to_digit(setting.chars().next()?, 30)? as c_uchar;
+    let r = dencode_uint(&setting[1..6])?;
+    let p = dencode_uint(&setting[6..11])?;
+
+    let salt = &setting[11..];
+    let actual_salt = if !salt.is_empty() {
+        salt.to_string()
+    } else {
+        gen_salt()?
+    };
+
+    Some((nlog2, r, p, actual_salt))
+}
+
+/// Performs Scrypt key derivation on a given password with a specific setting.
+///
+/// # Parameters
+/// * `passw`: The password to be hashed. It must be a string slice (`&str`).
+/// * `setting`: The settings for the Scrypt key derivation. It must be a string slice (`&str`)
+///   and should follow the format `$<Nlog2>$<r>$<p>$<salt>`. The `<Nlog2>` part should be a decimal
+///   number representing the logarithm base 2 of the CPU/memory cost factor N for Scrypt. The `<r>`
+///   part should be a decimal number representing the block size r. The `<p>` part should be a decimal
+///   number representing the parallelization factor p. The `<salt>` part should be a base64-encoded
+///   string representing the salt to be used for the Scrypt function.
+///
+/// # Returns
+/// * `Option<String>`: Returns `Some(String)` if the Scrypt operation was successful, where the
+///   returned string is the result of the Scrypt operation formatted according to the Modular
+///   Crypt Format (MCF). If the Scrypt operation failed, it returns `None`.
+///
+/// # Errors
+/// * If the `setting` length is less than 14 characters.
+/// * If the `scrypt` function fails to perform the Scrypt operation.
+///
+/// # Example
+/// ```
+/// let password = "my_password";
+/// let setting = "$7$C6..../....SodiumChloride";
+/// let result = crypt_scrypt(password, setting);
+/// assert!(result.is_some());
+/// ```
+///
+/// # Note
+/// The `crypt_scrypt` function uses the Scrypt key derivation function for hashing.
+/// The output of the Scrypt operation is base64-encoded using the BCrypt variant of base64.
+pub fn crypt_scrypt(passw: &str, setting: &str) -> Option<String> {
+    if setting.len() < 14 {
+        return None;
+    }
+
+    let (nlog2, r, p, salt) = read_setting(&setting[3..])?;
+
+    let params = Params::new(nlog2, r, p, 32).ok()?;
+    let mut output = [0u8; 32];
+
+    scrypt(passw.as_bytes(), salt.as_bytes(), &params, &mut output).ok()?;
+
+    Some(format!(
+        "$7${}${}${}",
+        &setting[3..14],
+        salt,
+        Base64Bcrypt::encode_string(&output)
+    ))
+}
diff --git a/recipes/core/relibc/src/header/crypt/sha.rs b/recipes/core/relibc/src/header/crypt/sha.rs
new file mode 100644
index 0000000000..a2935a77a2
--- /dev/null
+++ b/recipes/core/relibc/src/header/crypt/sha.rs
@@ -0,0 +1,141 @@
+use alloc::string::{String, ToString};
+
+use sha_crypt::{
+    ROUNDS_DEFAULT, ROUNDS_MAX, ROUNDS_MIN, Sha256Params, Sha512Params, sha256_crypt_b64,
+    sha512_crypt_b64,
+};
+
+use crate::platform::types::c_ulong;
+
+// key limit is not part of the original design, added for DoS protection.
+// rounds limit has been lowered (versus the reference/spec), also for DoS
+// protection. runtime is O(klen^2 + klen*rounds)
+const KEY_MAX: usize = 256;
+const SALT_MAX: usize = 16;
+const RSTRING: &str = "rounds=";
+
+pub enum ShaType {
+    Sha256,
+    Sha512,
+}
+
+/// Performs SHA hashing on a given password with a specific setting.
+///
+/// # Parameters
+/// * `passw`: The password to be hashed. It must be a string slice (`&str`).
+/// * `setting`: The settings for the SHA hashing. It must be a string slice (`&str`)
+///   and should start with "$5$" for SHA256 or "$6$" for SHA512. The rest of the string should represent the salt
+///   to be used for the SHA hashing.
+/// * `cipher`: The type of SHA algorithm to use. It should be either `ShaType::Sha256` or `ShaType::Sha512`.
+///
+/// # Returns
+/// * `Option<String>`: Returns `Some(String)` if the SHA operation was successful, where the
+///   returned string is the result of the SHA operation formatted according to the Modular
+///   Crypt Format (MCF). If the SHA operation failed, it returns `None`.
+///
+/// # Errors
+/// * If the `passw` length exceeds `KEY_MAX`.
+/// * If the `setting` does not start with "$5$" or "$6$".
+/// * If the `setting` does not contain a '$' character.
+/// * If the `setting` contains another '$' character after the first one.
+/// * If the `setting` contains invalid characters.
+/// * If the `setting` contains an invalid number of rounds.
+/// * If the `sha256_crypt_b64` or `sha512_crypt_b64` function fails to hash the password.
+///
+/// # Example
+/// ```
+/// let password = "my_password";
+/// let setting = "$5$rounds=1400$anotherlongsaltstringg";
+/// let result = crypt_sha(password, setting, ShaType::Sha256);
+/// assert!(result.is_some());
+/// ```
+///
+/// # Note
+/// The `crypt_sha` function uses the SHA256 or SHA512 hashing algorithm for hashing.
+/// The output of the SHA operation is base64-encoded using the BCrypt variant of base64.
+pub fn crypt_sha(passw: &str, setting: &str, cipher: ShaType) -> Option<String> {
+    let mut cursor = 3;
+    let rounds;
+
+    /* reject large keys */
+    if passw.len() > KEY_MAX {
+        return None;
+    }
+
+    // SHA256
+    // setting: $5$rounds=n$setting$ (rounds=n$ and closing $ are optional)
+    // SHA512
+    // setting: $6$rounds=n$setting$ (rounds=n$ and closing $ are optional)
+    let param = match cipher {
+        ShaType::Sha256 => "$5$",
+        ShaType::Sha512 => "$6$",
+    };
+
+    if &setting[0..3] != param {
+        return None;
+    }
+
+    let has_round;
+    // 7 is len("rounds=")
+    if &setting[cursor..cursor + 7] == RSTRING {
+        cursor += 7;
+        has_round = true;
+        if let Some(c_end) = setting[cursor..].chars().position(|r| r == '$') {
+            if let Ok(u) = setting[cursor..cursor + c_end].parse::<c_ulong>() {
+                cursor += c_end + 1;
+                rounds = u.min(ROUNDS_MAX as c_ulong).max(ROUNDS_MIN as c_ulong);
+            } else {
+                return None;
+            }
+        } else {
+            return None;
+        }
+    } else {
+        has_round = false;
+        rounds = ROUNDS_DEFAULT as c_ulong;
+    }
+
+    let mut slen = cursor;
+
+    for i in 0..SALT_MAX.min(setting.len() - cursor) {
+        let idx = cursor + i;
+
+        if &setting[idx..idx + 1] == "$" {
+            break;
+        }
+
+        // reject characters that interfere with /etc/shadow parsing
+        if &setting[idx..idx + 1] == "\n" || &setting[idx..idx + 1] == ":" {
+            return None;
+        }
+        slen += 1;
+    }
+
+    let setting = &setting[cursor..slen];
+
+    if let Ok(enc) = match cipher {
+        ShaType::Sha256 => {
+            let params = Sha256Params::new(rounds as usize)
+                .unwrap_or(Sha256Params::new(ROUNDS_DEFAULT).unwrap());
+            sha256_crypt_b64(passw.as_bytes(), setting.as_bytes(), &params)
+        }
+        ShaType::Sha512 => {
+            let params = Sha512Params::new(rounds as usize)
+                .unwrap_or(Sha512Params::new(ROUNDS_DEFAULT).unwrap());
+            sha512_crypt_b64(passw.as_bytes(), setting.as_bytes(), &params)
+        }
+    } {
+        let (r_slice, rn_slice) = if has_round {
+            (RSTRING, rounds.to_string() + "$")
+        } else {
+            ("", String::new())
+        };
+
+        Some(format!(
+            "{}{}{}{}${}",
+            param, r_slice, rn_slice, setting, enc
+        ))
+    } else {
+        None
+    }
+}
diff --git a/recipes/core/relibc/src/header/ctype/cbindgen.toml b/recipes/core/relibc/src/header/ctype/cbindgen.toml
new file mode 100644
index 0000000000..c0b42f8c49
--- /dev/null
+++ b/recipes/core/relibc/src/header/ctype/cbindgen.toml
@@ -0,0 +1,21 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/ctype.h.html
+#
+# Spec quotations relating to includes:
+# - "The <ctype.h> header shall define the locale_t type as described in <locale.h>, representing a locale object."
+#
+# features.h included for #[deprecated] annotation
+sys_includes = ["features.h"]
+include_guard = "_RELIBC_CTYPE_H"
+after_includes = """
+#include <bits/locale-t.h> // for locale_t
+
+#define _tolower(c) tolower(c)
+#define _toupper(c) toupper(c)
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/ctype/mod.rs b/recipes/core/relibc/src/header/ctype/mod.rs
new file mode 100644
index 0000000000..3d8da3cffe
--- /dev/null
+++ b/recipes/core/relibc/src/header/ctype/mod.rs
@@ -0,0 +1,205 @@
+//! `ctype.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/ctype.h.html>.
+
+use crate::{header::bits_locale_t::locale_t, platform::types::c_int};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isalnum.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isalnum(c: c_int) -> c_int {
+    c_int::from(isdigit(c) != 0 || isalpha(c) != 0)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isalnum_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isalnum_l(c: c_int, _loc: locale_t) -> c_int {
+    isalnum(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isalpha.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isalpha(c: c_int) -> c_int {
+    c_int::from(islower(c) != 0 || isupper(c) != 0)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isalpha_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isalpha_l(c: c_int, _loc: locale_t) -> c_int {
+    isalpha(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/isascii.html>.
+///
+/// The `isascii()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub extern "C" fn isascii(c: c_int) -> c_int {
+    c_int::from((c & !0x7f) == 0)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isblank.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isblank(c: c_int) -> c_int {
+    c_int::from(c == c_int::from(b' ') || c == c_int::from(b'\t'))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isblank_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isblank_l(c: c_int, _loc: locale_t) -> c_int {
+    isblank(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iscntrl.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iscntrl(c: c_int) -> c_int {
+    c_int::from((0x00..=0x1f).contains(&c) || c == 0x7f)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iscntrl_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iscntrl_l(c: c_int, _loc: locale_t) -> c_int {
+    iscntrl(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isdigit.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isdigit(c: c_int) -> c_int {
+    c_int::from(c >= c_int::from(b'0') && c <= c_int::from(b'9'))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isdigit_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isdigit_l(c: c_int, _loc: locale_t) -> c_int {
+    isdigit(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isgraph.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isgraph(c: c_int) -> c_int {
+    c_int::from((0x21..=0x7e).contains(&c))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isgraph_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isgraph_l(c: c_int, _loc: locale_t) -> c_int {
+    isgraph(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/islower.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn islower(c: c_int) -> c_int {
+    c_int::from(c >= c_int::from(b'a') && c <= c_int::from(b'z'))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/islower_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn islower_l(c: c_int, _loc: locale_t) -> c_int {
+    islower(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isprint.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isprint(c: c_int) -> c_int {
+    c_int::from((0x20..0x7f).contains(&c))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isprint_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isprint_l(c: c_int, _loc: locale_t) -> c_int {
+    isprint(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ispunct.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ispunct(c: c_int) -> c_int {
+    c_int::from(
+        (c >= c_int::from(b'!') && c <= c_int::from(b'/'))
+            || (c >= c_int::from(b':') && c <= c_int::from(b'@'))
+            || (c >= c_int::from(b'[') && c <= c_int::from(b'`'))
+            || (c >= c_int::from(b'{') && c <= c_int::from(b'~')),
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ispunct_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ispunct_l(c: c_int, _loc: locale_t) -> c_int {
+    ispunct(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isspace.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isspace(c: c_int) -> c_int {
+    c_int::from(
+        c == c_int::from(b' ')
+            || c == c_int::from(b'\t')
+            || c == c_int::from(b'\n')
+            || c == c_int::from(b'\r')
+            || c == 0x0b
+            || c == 0x0c,
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isspace_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isspace_l(c: c_int, _loc: locale_t) -> c_int {
+    isspace(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isupper.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isupper(c: c_int) -> c_int {
+    c_int::from(c >= c_int::from(b'A') && c <= c_int::from(b'Z'))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isupper_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isupper_l(c: c_int, _loc: locale_t) -> c_int {
+    isupper(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isxdigit.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isxdigit(c: c_int) -> c_int {
+    c_int::from(isdigit(c) != 0 || (c | 32 >= c_int::from(b'a') && c | 32 <= c_int::from(b'f')))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isxdigit_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isxdigit_l(c: c_int, _loc: locale_t) -> c_int {
+    isxdigit(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/toascii.html>.
+///
+/// The `toascii()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub extern "C" fn toascii(c: c_int) -> c_int {
+    c & 0x7f
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tolower.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn tolower(c: c_int) -> c_int {
+    if isupper(c) != 0 { c | 0x20 } else { c }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tolower_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn tolower_l(c: c_int, _loc: locale_t) -> c_int {
+    tolower(c)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/toupper.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn toupper(c: c_int) -> c_int {
+    if islower(c) != 0 { c & !0x20 } else { c }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/toupper_l.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn toupper_l(c: c_int, _loc: locale_t) -> c_int {
+    toupper(c)
+}
diff --git a/recipes/core/relibc/src/header/dirent/cbindgen.toml b/recipes/core/relibc/src/header/dirent/cbindgen.toml
new file mode 100644
index 0000000000..e229472647
--- /dev/null
+++ b/recipes/core/relibc/src/header/dirent/cbindgen.toml
@@ -0,0 +1,20 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/dirent.h.html
+#
+# Spec quotations relating to includes:
+# - "The <dirent.h> header shall define the ino_t, reclen_t, size_t, and ssize_t types as described in <sys/types.h>."
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_DIRENT_H"
+language = "C"
+style = "Both"
+after_includes = """
+
+// Shamelessly stolen from musl
+// Macros to convert between struct dirent and struct stat types.
+#define IFTODT(x) ((x)>>12 & 017)
+#define DTTOIF(x) ((x)<<12)
+"""
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/dirent/mod.rs b/recipes/core/relibc/src/header/dirent/mod.rs
new file mode 100644
index 0000000000..17eccf0b4e
--- /dev/null
+++ b/recipes/core/relibc/src/header/dirent/mod.rs
@@ -0,0 +1,399 @@
+//! `dirent.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/dirent.h.html>.
+
+use alloc::{boxed::Box, vec::Vec};
+use core::{mem, ptr, slice};
+
+use crate::{
+    c_str::CStr,
+    c_vec::CVec,
+    error::{Errno, ResultExt, ResultExtPtrMut},
+    fs::File,
+    header::{
+        errno::{EINVAL, EIO, ENOMEM, ENOTDIR},
+        fcntl, stdlib, string, sys_stat,
+    },
+    out::Out,
+    platform::{
+        self, Pal, Sys,
+        types::{
+            c_char, c_int, c_long, c_uchar, c_ushort, c_void, ino_t, off_t, reclen_t, size_t,
+            ssize_t,
+        },
+    },
+};
+
+// values of below constants taken from musl
+
+/// Unknown file type.
+pub const DT_UNKNOWN: c_int = 0;
+/// FIFO special.
+pub const DT_FIFO: c_int = 1;
+/// Character special.
+pub const DT_CHR: c_int = 2;
+/// Directory.
+pub const DT_DIR: c_int = 4;
+/// Block special.
+pub const DT_BLK: c_int = 6;
+/// Regular.
+pub const DT_REG: c_int = 8;
+/// Symbolic link.
+pub const DT_LNK: c_int = 10;
+/// Socket.
+pub const DT_SOCK: c_int = 12;
+/// Non-POSIX.
+/// Whiteout inode.
+pub const DT_WHT: c_int = 14;
+
+// values of above constants taken from musl
+
+/// cbindgen:ignore
+const INITIAL_BUFSIZE: usize = 512;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/dirent.h.html>.
+// No repr(C) needed, as this is a completely opaque struct. Being accessed as a pointer, in C it's
+// just defined as `struct DIR`.
+pub struct DIR {
+    file: File,
+    buf: Vec<u8>,
+    buf_offset: usize,
+
+    // The last value of d_off, used by telldir
+    opaque_offset: u64,
+}
+impl DIR {
+    pub fn new(path: CStr) -> Result<Box<Self>, Errno> {
+        Ok(Box::new(Self {
+            file: File::open(
+                path,
+                fcntl::O_RDONLY | fcntl::O_DIRECTORY | fcntl::O_CLOEXEC,
+            )?,
+            buf: Vec::with_capacity(INITIAL_BUFSIZE),
+            buf_offset: 0,
+            opaque_offset: 0,
+        }))
+    }
+    pub fn from_fd(fd: c_int) -> Result<Box<Self>, Errno> {
+        let mut stat = sys_stat::stat::default();
+        Sys::fstat(fd, Out::from_mut(&mut stat))?;
+        if (stat.st_mode & sys_stat::S_IFMT) != sys_stat::S_IFDIR {
+            return Err(Errno(ENOTDIR));
+        }
+        Sys::fcntl(fd, fcntl::F_SETFD, fcntl::FD_CLOEXEC as _)?;
+
+        // Take ownership now but not earlier so we don't close the fd on error.
+        let file = File::new(fd);
+        Ok(Self {
+            file,
+            buf: Vec::with_capacity(INITIAL_BUFSIZE),
+            buf_offset: 0,
+            opaque_offset: 0,
+        }
+        .into())
+    }
+    fn next_dirent(&mut self) -> Result<*mut dirent, Errno> {
+        let mut this_dent = self.buf.get(self.buf_offset..).ok_or(Errno(EIO))?;
+        if this_dent.is_empty() {
+            let size = loop {
+                self.buf.resize(self.buf.capacity(), 0_u8);
+                // TODO: uninitialized memory?
+                match Sys::getdents(*self.file, &mut self.buf, self.opaque_offset) {
+                    Ok(size) => break size,
+                    Err(Errno(EINVAL)) => {
+                        self.buf
+                            .try_reserve_exact(self.buf.len())
+                            .map_err(|_| Errno(ENOMEM))?;
+                        continue;
+                    }
+                    Err(Errno(other)) => return Err(Errno(other)),
+                }
+            };
+            self.buf.truncate(size);
+            self.buf_offset = 0;
+
+            if size == 0 {
+                return Ok(core::ptr::null_mut());
+            }
+            this_dent = &self.buf;
+        }
+        let (this_reclen, this_next_opaque) =
+            unsafe { Sys::dent_reclen_offset(this_dent, self.buf_offset).ok_or(Errno(EIO))? };
+
+        //println!("CDENT {} {}+{}", self.opaque_offset, self.buf_offset, this_reclen);
+
+        let next_off = self
+            .buf_offset
+            .checked_add(usize::from(this_reclen))
+            .ok_or(Errno(EIO))?;
+        if next_off > self.buf.len() {
+            return Err(Errno(EIO));
+        }
+        if this_dent.len() < usize::from(this_reclen) {
+            // Don't want memory corruption if a scheme is adversarial.
+            return Err(Errno(EIO));
+        }
+        let dent_ptr = this_dent.as_ptr() as *mut dirent;
+
+        self.opaque_offset = this_next_opaque;
+        self.buf_offset = next_off;
+        Ok(dent_ptr)
+    }
+    fn seek(&mut self, off: u64) {
+        let Ok(_) = Sys::dir_seek(*self.file, off) else {
+            return;
+        };
+        self.buf.clear();
+        self.buf_offset = 0;
+        self.opaque_offset = off;
+    }
+    fn rewind(&mut self) {
+        self.opaque_offset = 0;
+        let Ok(_) = Sys::dir_seek(*self.file, 0) else {
+            return;
+        };
+        self.buf.clear();
+        self.buf_offset = 0;
+        self.opaque_offset = 0;
+    }
+    fn close(mut self) -> Result<(), Errno> {
+        // Reference files aren't closed when dropped
+        self.file.reference = true;
+
+        // TODO: result
+        Sys::close(*self.file)
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/dirent.h.html>.
+#[repr(C)]
+#[derive(Clone)]
+pub struct dirent {
+    pub d_ino: ino_t,
+    pub d_off: off_t,
+    pub d_reclen: c_ushort,
+    pub d_type: c_uchar,
+    pub d_name: [c_char; 256],
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/dirent.h.html>.
+/// must have the same struct layout as dirent
+#[repr(C)]
+#[derive(Clone)]
+pub struct posix_dent {
+    pub d_ino: ino_t,
+    pub d_off: off_t, // not specified by posix
+    pub d_reclen: reclen_t,
+    pub d_type: c_uchar,
+    pub d_name: [c_char; 256],
+}
+
+/// cbindgen:ignore
+#[cfg(target_os = "redox")]
+const _: () = {
+    use core::mem::{offset_of, size_of};
+    use syscall::dirent::DirentHeader;
+
+    if offset_of!(dirent, d_ino) != offset_of!(DirentHeader, inode) {
+        panic!("struct dirent layout mismatch (inode)");
+    }
+    if offset_of!(dirent, d_off) != offset_of!(DirentHeader, next_opaque_id) {
+        panic!("struct dirent layout mismatch (inode)");
+    }
+    if offset_of!(dirent, d_reclen) != offset_of!(DirentHeader, record_len) {
+        panic!("struct dirent layout mismatch (len)");
+    }
+    if offset_of!(dirent, d_type) != offset_of!(DirentHeader, kind) {
+        panic!("struct dirent layout mismatch (kind)");
+    }
+    if offset_of!(dirent, d_name) != size_of::<DirentHeader>() {
+        panic!("struct dirent layout mismatch (name)");
+    }
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/alphasort.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn alphasort(first: *mut *const dirent, second: *mut *const dirent) -> c_int {
+    unsafe { string::strcoll((**first).d_name.as_ptr(), (**second).d_name.as_ptr()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/closedir.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn closedir(dir: Box<DIR>) -> c_int {
+    dir.close().map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://man.freebsd.org/cgi/man.cgi?query=fdopendir&sektion=3>
+///
+/// FreeBSD extension that transfers ownership of the directory file descriptor to the user.
+///
+/// It doesn't matter if DIR was opened with [`opendir`] or [`fdopendir`].
+#[unsafe(no_mangle)]
+pub extern "C" fn fdclosedir(dir: Box<DIR>) -> c_int {
+    let mut file = dir.file;
+    file.reference = true;
+
+    *file
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dirfd.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn dirfd(dir: &mut DIR) -> c_int {
+    *dir.file
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fdopendir.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn opendir(path: *const c_char) -> *mut DIR {
+    let path = unsafe { CStr::from_ptr(path) };
+
+    DIR::new(path).or_errno_null_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fdopendir.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn fdopendir(fd: c_int) -> *mut DIR {
+    DIR::from_fd(fd).or_errno_null_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/posix_getdents.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn posix_getdents(
+    fildes: c_int,
+    buf: *mut c_void,
+    nbyte: size_t,
+    _flags: c_int,
+) -> ssize_t {
+    let slice = unsafe { slice::from_raw_parts_mut(buf.cast::<u8>(), nbyte) };
+
+    Sys::posix_getdents(fildes, slice)
+        .map(|s| s as ssize_t)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/readdir.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn readdir(dir: &mut DIR) -> *mut dirent {
+    dir.next_dirent().or_errno_null_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/readdir.html>.
+///
+/// # Deprecation
+/// The `readdir_r()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 8.
+#[deprecated]
+// #[unsafe(no_mangle)]
+pub extern "C" fn readdir_r(
+    _dir: *mut DIR,
+    _entry: *mut dirent,
+    _result: *mut *mut dirent,
+) -> *mut dirent {
+    unimplemented!(); // plus, deprecated
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/rewinddir.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn rewinddir(dir: &mut DIR) {
+    dir.rewind();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/alphasort.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn scandir(
+    dirp: *const c_char,
+    namelist: *mut *mut *mut dirent,
+    filter: Option<extern "C" fn(_: *const dirent) -> c_int>,
+    compare: Option<extern "C" fn(_: *mut *const dirent, _: *mut *const dirent) -> c_int>,
+) -> c_int {
+    let dir = unsafe { opendir(dirp) };
+    if dir.is_null() {
+        return -1;
+    }
+
+    let mut vec = match CVec::with_capacity(4) {
+        Ok(vec) => vec,
+        Err(err) => return -1,
+    };
+
+    let old_errno = platform::ERRNO.get();
+    platform::ERRNO.set(0);
+
+    loop {
+        let entry: *mut dirent = readdir(unsafe { &mut *dir });
+        if entry.is_null() {
+            break;
+        }
+
+        if let Some(filter) = filter
+            && filter(entry) == 0
+        {
+            continue;
+        }
+
+        let copy = unsafe { platform::alloc(mem::size_of::<dirent>()) }.cast::<dirent>();
+        if copy.is_null() {
+            break;
+        }
+        unsafe { ptr::write(copy, (*entry).clone()) };
+        if vec.push(copy).is_err() {
+            break;
+        }
+    }
+
+    closedir(unsafe { Box::from_raw(dir) });
+
+    let len = vec.len();
+    if vec.shrink_to_fit().is_err() {
+        return -1;
+    }
+
+    if platform::ERRNO.get() != 0 {
+        for ptr in &mut vec {
+            unsafe { platform::free((*ptr).cast::<c_void>()) };
+        }
+        -1
+    } else {
+        unsafe {
+            // Empty CVecs use a dangling pointer which cannot be freed, return null instead
+            if vec.is_empty() {
+                *namelist = ptr::null_mut();
+            } else {
+                *namelist = vec.leak();
+            }
+        }
+
+        platform::ERRNO.set(old_errno);
+        unsafe {
+            stdlib::qsort(
+                (*namelist).cast::<c_void>(),
+                len as size_t,
+                mem::size_of::<*mut dirent>(),
+                #[allow(clippy::missing_transmute_annotations)] // too verbose
+                mem::transmute(compare),
+            )
+        };
+
+        len as c_int
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/seekdir.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn seekdir(dir: &mut DIR, off: c_long) {
+    let Ok(off) = off.try_into() else {
+        platform::ERRNO.set(EINVAL);
+        return;
+    };
+
+    dir.seek(off);
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/telldir.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn telldir(dir: &mut DIR) -> c_long {
+    dir.opaque_offset as c_long
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbindgen_stupid_struct_user_for_posix_dent(_: posix_dent) {}
diff --git a/recipes/core/relibc/src/header/dl-tls/cbindgen.toml b/recipes/core/relibc/src/header/dl-tls/cbindgen.toml
new file mode 100644
index 0000000000..c09ca25349
--- /dev/null
+++ b/recipes/core/relibc/src/header/dl-tls/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = []
+include_guard = "_DL_TLS_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/dl-tls/mod.rs b/recipes/core/relibc/src/header/dl-tls/mod.rs
new file mode 100644
index 0000000000..0196bf7bc8
--- /dev/null
+++ b/recipes/core/relibc/src/header/dl-tls/mod.rs
@@ -0,0 +1,102 @@
+//! dl-tls implementation for Redox
+
+// FIXME(andypython): remove this when #![allow(warnings, unused_variables)] is
+// dropped from src/lib.rs.
+#![warn(warnings, unused_variables)]
+
+#[cfg(target_arch = "x86")]
+use core::arch::global_asm;
+
+use alloc::alloc::alloc;
+use core::{alloc::Layout, ptr};
+
+use crate::{ld_so::tcb::Tcb, platform::types::c_void};
+
+#[repr(C)]
+#[allow(non_camel_case_types)]
+pub struct dl_tls_index {
+    pub ti_module: usize,
+    pub ti_offset: usize,
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __tls_get_addr(ti: *mut dl_tls_index) -> *mut c_void {
+    let tcb = unsafe { Tcb::current().unwrap() };
+    let ti = unsafe { &*ti };
+    let masters = tcb.masters().unwrap();
+
+    #[cfg(feature = "trace_tls")]
+    log::trace!(
+        "__tls_get_addr({:p}: {:#x}, {:#x}, masters_len={}, dtv_len={})",
+        ti,
+        ti.ti_module,
+        ti.ti_offset,
+        masters.len(),
+        tcb.dtv_mut().len()
+    );
+
+    if tcb.dtv_mut().len() < masters.len() {
+        // Reallocate DTV.
+        tcb.setup_dtv(masters.len());
+    }
+
+    let dtv_index = ti.ti_module - 1;
+
+    if tcb.dtv_mut()[dtv_index].is_null() {
+        // Allocate TLS for module.
+        let master = &masters[dtv_index];
+
+        let module_tls = unsafe {
+            // FIXME(andypython): master.align
+            let layout = Layout::from_size_align_unchecked(master.segment_size, 16);
+            let ptr = alloc(layout);
+
+            ptr::copy_nonoverlapping(master.ptr, ptr, master.image_size);
+            ptr::write_bytes(
+                ptr.add(master.image_size),
+                0,
+                master.segment_size - master.image_size,
+            );
+
+            ptr
+        };
+
+        // Set the DTV entry.
+        tcb.dtv_mut()[dtv_index] = module_tls;
+    }
+
+    let mut ptr = tcb.dtv_mut()[dtv_index];
+
+    if ptr.is_null() {
+        panic!(
+            "__tls_get_addr({ti:p}: {:#x}, {:#x})",
+            ti.ti_module, ti.ti_offset
+        );
+    }
+
+    if cfg!(target_arch = "riscv64") {
+        ptr = unsafe { ptr.add(0x800 + ti.ti_offset) }; // dynamic offsets are 0x800-based on risc-v
+    } else {
+        ptr = unsafe { ptr.add(ti.ti_offset) };
+    }
+
+    ptr.cast::<c_void>()
+}
+
+// x86 can define a version that passes a pointer to dl_tls_index in eax
+#[cfg(target_arch = "x86")]
+global_asm!(
+    "
+    .globl ___tls_get_addr
+    .type ___tls_get_addr, @function
+___tls_get_addr:
+    push ebp
+    mov ebp, esp
+    push eax
+    call __tls_get_addr
+    add esp, 4
+    pop ebp
+    ret
+    .size ___tls_get_addr, . - ___tls_get_addr
+"
+);
diff --git a/recipes/core/relibc/src/header/dlfcn/cbindgen.toml b/recipes/core/relibc/src/header/dlfcn/cbindgen.toml
new file mode 100644
index 0000000000..4ea36e2a96
--- /dev/null
+++ b/recipes/core/relibc/src/header/dlfcn/cbindgen.toml
@@ -0,0 +1,12 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/dlfcn.h.html
+#
+# There are no spec quotations relating to includes
+sys_includes = []
+include_guard = "_RELIBC_DLFCN_H"
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/dlfcn/mod.rs b/recipes/core/relibc/src/header/dlfcn/mod.rs
new file mode 100644
index 0000000000..923c057169
--- /dev/null
+++ b/recipes/core/relibc/src/header/dlfcn/mod.rs
@@ -0,0 +1,197 @@
+//! `dlfcn.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/dlfcn.h.html>.
+
+// FIXME(andypython): remove this when #![allow(warnings, unused_variables)] is
+// dropped from src/lib.rs.
+#![warn(warnings, unused_variables)]
+
+use core::{
+    ptr, str,
+    sync::atomic::{AtomicUsize, Ordering},
+};
+
+use crate::{
+    c_str::CStr,
+    ld_so::{
+        linker::{DlError, ObjectHandle, Resolve, ScopeKind},
+        tcb::Tcb,
+    },
+    platform::types::{c_char, c_int, c_void},
+};
+
+pub const RTLD_LAZY: c_int = 1 << 0;
+pub const RTLD_NOW: c_int = 1 << 1;
+pub const RTLD_NOLOAD: c_int = 1 << 2;
+pub const RTLD_GLOBAL: c_int = 1 << 8;
+pub const RTLD_LOCAL: c_int = 0x0000;
+
+#[allow(clippy::zero_ptr)] // related cbindgen issue: https://github.com/mozilla/cbindgen/issues/948
+pub const RTLD_DEFAULT: *mut c_void = 0 as *mut c_void; // XXX: cbindgen doesn't like ptr::null_mut() for publically exported constants
+
+static ERROR_NOT_SUPPORTED: &core::ffi::CStr = c"dlfcn not supported";
+
+#[thread_local]
+static ERROR: AtomicUsize = AtomicUsize::new(0);
+
+fn set_last_error(error: DlError) {
+    ERROR.store(error.repr().as_ptr() as usize, Ordering::SeqCst);
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/dlfcn.h.html>.
+#[repr(C)]
+#[allow(non_camel_case_types)]
+pub struct Dl_info_t {
+    dli_fname: *const c_char,
+    dli_fbase: *mut c_void,
+    dli_sname: *const c_char,
+    dli_saddr: *mut c_void,
+}
+
+/// alias as per spec update: <https://www.austingroupbugs.net/view.php?id=1847>
+pub type Dl_info = Dl_info_t;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dladdr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn dladdr(_addr: *const c_void, info: *mut Dl_info_t) -> c_int {
+    //TODO
+    unsafe {
+        (*info).dli_fname = ptr::null();
+        (*info).dli_fbase = ptr::null_mut();
+        (*info).dli_sname = ptr::null();
+        (*info).dli_saddr = ptr::null_mut();
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dlopen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn dlopen(cfilename: *const c_char, flags: c_int) -> *mut c_void {
+    //TODO support all sort of flags
+    let resolve = if flags & RTLD_NOW == RTLD_NOW {
+        Resolve::Now
+    } else {
+        Resolve::Lazy
+    };
+
+    let scope = if flags & RTLD_GLOBAL == RTLD_GLOBAL {
+        ScopeKind::Global
+    } else {
+        ScopeKind::Local
+    };
+
+    let noload = flags & RTLD_NOLOAD == RTLD_NOLOAD;
+
+    let filename = if cfilename.is_null() {
+        None
+    } else {
+        unsafe {
+            Some(str::from_utf8_unchecked(
+                CStr::from_ptr(cfilename).to_bytes(),
+            ))
+        }
+    };
+
+    let tcb = match unsafe { Tcb::current() } {
+        Some(tcb) => tcb,
+        None => {
+            ERROR.store(ERROR_NOT_SUPPORTED.as_ptr() as usize, Ordering::SeqCst);
+            return ptr::null_mut();
+        }
+    };
+
+    if tcb.linker_ptr.is_null() {
+        ERROR.store(ERROR_NOT_SUPPORTED.as_ptr() as usize, Ordering::SeqCst);
+        return ptr::null_mut();
+    }
+
+    let mut linker = unsafe { (*tcb.linker_ptr).lock() };
+
+    let cbs_c = linker.cbs.clone();
+    let cbs = cbs_c.borrow();
+
+    match (cbs.load_library)(&mut linker, filename, resolve, scope, noload) {
+        Ok(handle) => handle.as_ptr().cast_mut(),
+        Err(error) => {
+            set_last_error(error);
+            ptr::null_mut()
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dlsym.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void {
+    let handle = ObjectHandle::from_ptr(handle);
+
+    if symbol.is_null() {
+        ERROR.store(ERROR_NOT_SUPPORTED.as_ptr() as usize, Ordering::SeqCst);
+        return ptr::null_mut();
+    }
+
+    let symbol_str = unsafe { str::from_utf8_unchecked(CStr::from_ptr(symbol).to_bytes()) };
+
+    // FIXME(andypython): just call obj.scope.get_sym() directly or search the
+    // global scope.  The rest is unnecessary as Linker::get_sym() does not
+    // depend on the Linker state.
+    let tcb = match unsafe { Tcb::current() } {
+        Some(tcb) => tcb,
+        None => {
+            ERROR.store(ERROR_NOT_SUPPORTED.as_ptr() as usize, Ordering::SeqCst);
+            return ptr::null_mut();
+        }
+    };
+
+    if tcb.linker_ptr.is_null() {
+        ERROR.store(ERROR_NOT_SUPPORTED.as_ptr() as usize, Ordering::SeqCst);
+        return ptr::null_mut();
+    }
+
+    let linker = unsafe { (*tcb.linker_ptr).lock() };
+    let cbs_c = linker.cbs.clone();
+    let cbs = cbs_c.borrow();
+    match (cbs.get_sym)(&linker, handle, symbol_str) {
+        Some(sym) => sym,
+        _ => {
+            ERROR.store(ERROR_NOT_SUPPORTED.as_ptr() as usize, Ordering::SeqCst);
+            ptr::null_mut()
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dlclose.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn dlclose(handle: *mut c_void) -> c_int {
+    let tcb = match unsafe { Tcb::current() } {
+        Some(tcb) => tcb,
+        None => {
+            ERROR.store(ERROR_NOT_SUPPORTED.as_ptr() as usize, Ordering::SeqCst);
+            return -1;
+        }
+    };
+
+    if tcb.linker_ptr.is_null() {
+        ERROR.store(ERROR_NOT_SUPPORTED.as_ptr() as usize, Ordering::SeqCst);
+        return -1;
+    };
+
+    let Some(handle) = ObjectHandle::from_ptr(handle) else {
+        set_last_error(DlError::InvalidHandle);
+        return -1;
+    };
+
+    let mut linker = unsafe { (*tcb.linker_ptr).lock() };
+    let cbs_c = linker.cbs.clone();
+    let cbs = cbs_c.borrow();
+    (cbs.unload)(&mut linker, handle);
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dlerror.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn dlerror() -> *mut c_char {
+    ERROR.swap(0, Ordering::SeqCst) as *mut c_char
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbindgen_stupid_alias_dlinfo_for_dladdr(_: Dl_info) {}
diff --git a/recipes/core/relibc/src/header/elf/cbindgen.toml b/recipes/core/relibc/src/header/elf/cbindgen.toml
new file mode 100644
index 0000000000..cf53dfec97
--- /dev/null
+++ b/recipes/core/relibc/src/header/elf/cbindgen.toml
@@ -0,0 +1,46 @@
+after_includes = """
+#define ELF32_ST_BIND(val)      (((unsigned char) (val)) >> 4)
+#define ELF32_ST_TYPE(val)      ((val) & 0xf)
+#define ELF32_ST_INFO(bind, type)   (((bind) << 4) + ((type) & 0xf))
+
+#define ELF64_ST_BIND(val)      ELF32_ST_BIND (val)
+#define ELF64_ST_TYPE(val)      ELF32_ST_TYPE (val)
+#define ELF64_ST_INFO(bind, type)   ELF32_ST_INFO ((bind), (type))
+
+
+#define ELF32_ST_VISIBILITY(o)  ((o) & 0x03)
+#define ELF64_ST_VISIBILITY(o)  ELF32_ST_VISIBILITY (o)
+
+#define ELF32_R_SYM(val)        ((val) >> 8)
+#define ELF32_R_TYPE(val)       ((val) & 0xff)
+#define ELF32_R_INFO(sym, type)     (((sym) << 8) + ((type) & 0xff))
+
+#define ELF64_R_SYM(i)          ((i) >> 32)
+#define ELF64_R_TYPE(i)         ((i) & 0xffffffff)
+#define ELF64_R_INFO(sym,type)      ((((Elf64_Xword) (sym)) << 32) + (type))
+
+#define DT_VALRNGHI 0x6ffffdff
+#define DT_VALTAGIDX(tag)   (DT_VALRNGHI - (tag))
+
+#define DT_ADDRRNGHI    0x6ffffeff
+#define DT_ADDRTAGIDX(tag)  (DT_ADDRRNGHI - (tag))
+
+#define DT_VERNEEDNUM   0x6fffffff
+#define DT_VERSIONTAGIDX(tag)   (DT_VERNEEDNUM - (tag))
+
+#define ELF32_M_SYM(info)   ((info) >> 8)
+#define ELF32_M_SIZE(info)  ((unsigned char) (info))
+#define ELF32_M_INFO(sym, size) (((sym) << 8) + (unsigned char) (size))
+
+#define ELF64_M_SYM(info)   ELF32_M_SYM (info)
+#define ELF64_M_SIZE(info)  ELF32_M_SIZE (info)
+#define ELF64_M_INFO(sym, size) ELF32_M_INFO (sym, size)
+"""
+include_guard = "_ELF_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/elf/mod.rs b/recipes/core/relibc/src/header/elf/mod.rs
new file mode 100644
index 0000000000..6fff4c5f9c
--- /dev/null
+++ b/recipes/core/relibc/src/header/elf/mod.rs
@@ -0,0 +1,996 @@
+//! `elf.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+
+use crate::platform::types::{c_char, c_uchar, int32_t, int64_t, uint16_t, uint32_t, uint64_t};
+
+pub type Elf32_Half = uint16_t;
+pub type Elf64_Half = uint16_t;
+
+pub type Elf32_Word = uint32_t;
+pub type Elf32_Sword = int32_t;
+pub type Elf64_Word = uint64_t;
+pub type Elf64_Sword = int64_t;
+
+pub type Elf32_Xword = uint64_t;
+pub type Elf32_Sxword = int64_t;
+pub type Elf64_Xword = uint64_t;
+pub type Elf64_Sxword = int64_t;
+
+pub type Elf32_Addr = uint32_t;
+pub type Elf64_Addr = uint64_t;
+
+pub type Elf32_Off = uint32_t;
+pub type Elf64_Off = uint64_t;
+
+pub type Elf32_Section = uint16_t;
+pub type Elf64_Section = uint16_t;
+
+pub type Elf32_Versym = Elf32_Half;
+pub type Elf64_Versym = Elf64_Half;
+
+pub const EI_NIDENT: usize = 16;
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf32_Ehdr {
+    pub e_ident: [c_uchar; EI_NIDENT],
+    pub e_type: Elf32_Half,
+    pub e_machine: Elf32_Half,
+    pub e_version: Elf32_Word,
+    pub e_entry: Elf32_Addr,
+    pub e_phoff: Elf32_Off,
+    pub e_shoff: Elf32_Off,
+    pub e_flags: Elf32_Word,
+    pub e_ehsize: Elf32_Half,
+    pub e_phentsize: Elf32_Half,
+    pub e_phnum: Elf32_Half,
+    pub e_shentsize: Elf32_Half,
+    pub e_shnum: Elf32_Half,
+    pub e_shstrndx: Elf32_Half,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf64_Ehdr {
+    pub e_ident: [c_uchar; EI_NIDENT],
+    pub e_type: Elf64_Half,
+    pub e_machine: Elf64_Half,
+    pub e_version: Elf64_Word,
+    pub e_entry: Elf64_Addr,
+    pub e_phoff: Elf64_Off,
+    pub e_shoff: Elf64_Off,
+    pub e_flags: Elf64_Word,
+    pub e_ehsize: Elf64_Half,
+    pub e_phentsize: Elf64_Half,
+    pub e_phnum: Elf64_Half,
+    pub e_shentsize: Elf64_Half,
+    pub e_shnum: Elf64_Half,
+    pub e_shstrndx: Elf64_Half,
+}
+
+pub const EI_MAG0: usize = 0;
+pub const ELFMAG0: usize = 0x7f;
+pub const EI_MAG1: usize = 1;
+pub const ELFMAG1: c_char = 'E' as c_char;
+pub const EI_MAG2: usize = 2;
+pub const ELFMAG2: c_char = 'L' as c_char;
+pub const EI_MAG3: usize = 3;
+pub const ELFMAG3: c_char = 'F' as c_char;
+pub const ELFMAG: &str = "\x7fELF";
+pub const SELFMAG: usize = 4;
+pub const EI_CLASS: usize = 4;
+pub const ELFCLASSNONE: usize = 0;
+pub const ELFCLASS32: usize = 1;
+pub const ELFCLASS64: usize = 2;
+pub const ELFCLASSNUM: usize = 3;
+pub const EI_DATA: usize = 5;
+pub const ELFDATANONE: usize = 0;
+pub const ELFDATA2LSB: usize = 1;
+pub const ELFDATA2MSB: usize = 2;
+pub const ELFDATANUM: usize = 3;
+pub const EI_VERSION: usize = 6;
+pub const EI_OSABI: usize = 7;
+pub const ELFOSABI_NONE: usize = 0;
+pub const ELFOSABI_SYSV: usize = 0;
+pub const ELFOSABI_HPUX: usize = 1;
+pub const ELFOSABI_NETBSD: usize = 2;
+pub const ELFOSABI_LINUX: usize = 3;
+pub const ELFOSABI_GNU: usize = 3;
+pub const ELFOSABI_SOLARIS: usize = 6;
+pub const ELFOSABI_AIX: usize = 7;
+pub const ELFOSABI_IRIX: usize = 8;
+pub const ELFOSABI_FREEBSD: usize = 9;
+pub const ELFOSABI_TRU64: usize = 10;
+pub const ELFOSABI_MODESTO: usize = 11;
+pub const ELFOSABI_OPENBSD: usize = 12;
+pub const ELFOSABI_ARM: usize = 97;
+pub const ELFOSABI_STANDALONE: usize = 255;
+pub const EI_ABIVERSION: usize = 8;
+pub const EI_PAD: usize = 9;
+pub const ET_NONE: usize = 0;
+pub const ET_REL: usize = 1;
+pub const ET_EXEC: usize = 2;
+pub const ET_DYN: usize = 3;
+pub const ET_CORE: usize = 4;
+pub const ET_NUM: usize = 5;
+pub const ET_LOOS: usize = 0xfe00;
+pub const ET_HIOS: usize = 0xfeff;
+pub const ET_LOPROC: usize = 0xff00;
+pub const ET_HIPROC: usize = 0xffff;
+pub const EM_NONE: usize = 0;
+pub const EM_M32: usize = 1;
+pub const EM_SPARC: usize = 2;
+pub const EM_386: usize = 3;
+pub const EM_68K: usize = 4;
+pub const EM_88K: usize = 5;
+pub const EM_860: usize = 7;
+pub const EM_MIPS: usize = 8;
+pub const EM_S370: usize = 9;
+pub const EM_MIPS_RS3_LE: usize = 10;
+pub const EM_PARISC: usize = 15;
+pub const EM_VPP500: usize = 17;
+pub const EM_SPARC32PLUS: usize = 18;
+pub const EM_960: usize = 19;
+pub const EM_PPC: usize = 20;
+pub const EM_PPC64: usize = 21;
+pub const EM_S390: usize = 22;
+pub const EM_V800: usize = 36;
+pub const EM_FR20: usize = 37;
+pub const EM_RH32: usize = 38;
+pub const EM_RCE: usize = 39;
+pub const EM_ARM: usize = 40;
+pub const EM_FAKE_ALPHA: usize = 41;
+pub const EM_SH: usize = 42;
+pub const EM_SPARCV9: usize = 43;
+pub const EM_TRICORE: usize = 44;
+pub const EM_ARC: usize = 45;
+pub const EM_H8_300: usize = 46;
+pub const EM_H8_300H: usize = 47;
+pub const EM_H8S: usize = 48;
+pub const EM_H8_500: usize = 49;
+pub const EM_IA_64: usize = 50;
+pub const EM_MIPS_X: usize = 51;
+pub const EM_COLDFIRE: usize = 52;
+pub const EM_68HC12: usize = 53;
+pub const EM_MMA: usize = 54;
+pub const EM_PCP: usize = 55;
+pub const EM_NCPU: usize = 56;
+pub const EM_NDR1: usize = 57;
+pub const EM_STARCORE: usize = 58;
+pub const EM_ME16: usize = 59;
+pub const EM_ST100: usize = 60;
+pub const EM_TINYJ: usize = 61;
+pub const EM_X86_64: usize = 62;
+pub const EM_PDSP: usize = 63;
+pub const EM_FX66: usize = 66;
+pub const EM_ST9PLUS: usize = 67;
+pub const EM_ST7: usize = 68;
+pub const EM_68HC16: usize = 69;
+pub const EM_68HC11: usize = 70;
+pub const EM_68HC08: usize = 71;
+pub const EM_68HC05: usize = 72;
+pub const EM_SVX: usize = 73;
+pub const EM_ST19: usize = 74;
+pub const EM_VAX: usize = 75;
+pub const EM_CRIS: usize = 76;
+pub const EM_JAVELIN: usize = 77;
+pub const EM_FIREPATH: usize = 78;
+pub const EM_ZSP: usize = 79;
+pub const EM_MMIX: usize = 80;
+pub const EM_HUANY: usize = 81;
+pub const EM_PRISM: usize = 82;
+pub const EM_AVR: usize = 83;
+pub const EM_FR30: usize = 84;
+pub const EM_D10V: usize = 85;
+pub const EM_D30V: usize = 86;
+pub const EM_V850: usize = 87;
+pub const EM_M32R: usize = 88;
+pub const EM_MN10300: usize = 89;
+pub const EM_MN10200: usize = 90;
+pub const EM_PJ: usize = 91;
+pub const EM_OR1K: usize = 92;
+pub const EM_ARC_A5: usize = 93;
+pub const EM_XTENSA: usize = 94;
+pub const EM_AARCH64: usize = 183;
+pub const EM_TILEPRO: usize = 188;
+pub const EM_MICROBLAZE: usize = 189;
+pub const EM_TILEGX: usize = 191;
+pub const EM_NUM: usize = 192;
+pub const EM_ALPHA: usize = 0x9026;
+pub const EV_NONE: usize = 0;
+pub const EV_CURRENT: usize = 1;
+pub const EV_NUM: usize = 2;
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf32_Shdr {
+    pub sh_name: Elf32_Word,
+    pub sh_type: Elf32_Word,
+    pub sh_flags: Elf32_Word,
+    pub sh_addr: Elf32_Addr,
+    pub sh_offset: Elf32_Off,
+    pub sh_size: Elf32_Word,
+    pub sh_link: Elf32_Word,
+    pub sh_info: Elf32_Word,
+    pub sh_addralign: Elf32_Word,
+    pub sh_entsize: Elf32_Word,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf64_Shdr {
+    pub sh_name: Elf64_Word,
+    pub sh_type: Elf64_Word,
+    pub sh_flags: Elf64_Xword,
+    pub sh_addr: Elf64_Addr,
+    pub sh_offset: Elf64_Off,
+    pub sh_size: Elf64_Xword,
+    pub sh_link: Elf64_Word,
+    pub sh_info: Elf64_Word,
+    pub sh_addralign: Elf64_Xword,
+    pub sh_entsize: Elf64_Xword,
+}
+
+pub const SHN_UNDEF: usize = 0;
+pub const SHN_LORESERVE: usize = 0xff00;
+pub const SHN_LOPROC: usize = 0xff00;
+pub const SHN_BEFORE: usize = 0xff00;
+pub const SHN_AFTER: usize = 0xff01;
+pub const SHN_HIPROC: usize = 0xff1f;
+pub const SHN_LOOS: usize = 0xff20;
+pub const SHN_HIOS: usize = 0xff3f;
+pub const SHN_ABS: usize = 0xfff1;
+pub const SHN_COMMON: usize = 0xfff2;
+pub const SHN_XINDEX: usize = 0xffff;
+pub const SHN_HIRESERVE: usize = 0xffff;
+pub const SHT_NULL: usize = 0;
+pub const SHT_PROGBITS: usize = 1;
+pub const SHT_SYMTAB: usize = 2;
+pub const SHT_STRTAB: usize = 3;
+pub const SHT_RELA: usize = 4;
+pub const SHT_HASH: usize = 5;
+pub const SHT_DYNAMIC: usize = 6;
+pub const SHT_NOTE: usize = 7;
+pub const SHT_NOBITS: usize = 8;
+pub const SHT_REL: usize = 9;
+pub const SHT_SHLIB: usize = 10;
+pub const SHT_DYNSYM: usize = 11;
+pub const SHT_INIT_ARRAY: usize = 14;
+pub const SHT_FINI_ARRAY: usize = 15;
+pub const SHT_PREINIT_ARRAY: usize = 16;
+pub const SHT_GROUP: usize = 17;
+pub const SHT_SYMTAB_SHNDX: usize = 18;
+pub const SHT_NUM: usize = 19;
+pub const SHT_LOOS: usize = 0x60000000;
+pub const SHT_GNU_ATTRIBUTES: usize = 0x6ffffff5;
+pub const SHT_GNU_HASH: usize = 0x6ffffff6;
+pub const SHT_GNU_LIBLIST: usize = 0x6ffffff7;
+pub const SHT_CHECKSUM: usize = 0x6ffffff8;
+pub const SHT_LOSUNW: usize = 0x6ffffffa;
+pub const SHT_SUNW_move: usize = 0x6ffffffa;
+pub const SHT_SUNW_COMDAT: usize = 0x6ffffffb;
+pub const SHT_SUNW_syminfo: usize = 0x6ffffffc;
+pub const SHT_GNU_verdef: usize = 0x6ffffffd;
+pub const SHT_GNU_verneed: usize = 0x6ffffffe;
+pub const SHT_GNU_versym: usize = 0x6fffffff;
+pub const SHT_HISUNW: usize = 0x6fffffff;
+pub const SHT_HIOS: usize = 0x6fffffff;
+pub const SHT_LOPROC: usize = 0x70000000;
+pub const SHT_HIPROC: usize = 0x7fffffff;
+pub const SHT_LOUSER: usize = 0x80000000;
+pub const SHT_HIUSER: usize = 0x8fffffff;
+
+pub const SHF_WRITE: usize = 1 << 0;
+pub const SHF_ALLOC: usize = 1 << 1;
+pub const SHF_EXECINSTR: usize = 1 << 2;
+pub const SHF_MERGE: usize = 1 << 4;
+pub const SHF_STRINGS: usize = 1 << 5;
+pub const SHF_INFO_LINK: usize = 1 << 6;
+pub const SHF_LINK_ORDER: usize = 1 << 7;
+pub const SHF_OS_NONCONFORMING: usize = 1 << 8;
+pub const SHF_GROUP: usize = 1 << 9;
+pub const SHF_TLS: usize = 1 << 10;
+pub const SHF_MASKOS: usize = 0x0ff00000;
+pub const SHF_MASKPROC: usize = 0xf0000000;
+pub const SHF_ORDERED: usize = 1 << 30;
+pub const SHF_EXCLUDE: usize = 1 << 31;
+pub const GRP_COMDAT: usize = 0x1;
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf32_Sym {
+    pub st_name: Elf32_Word,
+    pub st_value: Elf32_Addr,
+    pub st_size: Elf32_Word,
+    pub st_info: c_uchar,
+    pub st_other: c_uchar,
+    pub st_shndx: Elf32_Section,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf64_Sym {
+    pub st_name: Elf64_Word,
+    pub st_info: c_uchar,
+    pub st_other: c_uchar,
+    pub st_shndx: Elf64_Section,
+    pub st_value: Elf64_Addr,
+    pub st_size: Elf64_Xword,
+}
+
+#[repr(C)]
+pub struct Elf32_Syminfo {
+    pub si_boundto: Elf32_Half,
+    pub si_flags: Elf32_Half,
+}
+
+#[repr(C)]
+pub struct Elf64_Syminfo {
+    pub si_boundto: Elf64_Half,
+    pub si_flags: Elf64_Half,
+}
+
+pub const SYMINFO_BT_SELF: usize = 0xffff;
+pub const SYMINFO_BT_PARENT: usize = 0xfffe;
+pub const SYMINFO_BT_LOWRESERVE: usize = 0xff00;
+pub const SYMINFO_FLG_DIRECT: usize = 0x0001;
+pub const SYMINFO_FLG_PASSTHRU: usize = 0x0002;
+pub const SYMINFO_FLG_COPY: usize = 0x0004;
+pub const SYMINFO_FLG_LAZYLOAD: usize = 0x0008;
+pub const SYMINFO_NONE: usize = 0;
+pub const SYMINFO_CURRENT: usize = 1;
+pub const SYMINFO_NUM: usize = 2;
+
+pub const STB_LOCAL: usize = 0;
+pub const STB_GLOBAL: usize = 1;
+pub const STB_WEAK: usize = 2;
+pub const STB_NUM: usize = 3;
+pub const STB_LOOS: usize = 10;
+pub const STB_GNU_UNIQUE: usize = 10;
+pub const STB_HIOS: usize = 12;
+pub const STB_LOPROC: usize = 13;
+pub const STB_HIPROC: usize = 15;
+pub const STT_NOTYPE: usize = 0;
+pub const STT_OBJECT: usize = 1;
+pub const STT_FUNC: usize = 2;
+pub const STT_SECTION: usize = 3;
+pub const STT_FILE: usize = 4;
+pub const STT_COMMON: usize = 5;
+pub const STT_TLS: usize = 6;
+pub const STT_NUM: usize = 7;
+pub const STT_LOOS: usize = 10;
+pub const STT_GNU_IFUNC: usize = 10;
+pub const STT_HIOS: usize = 12;
+pub const STT_LOPROC: usize = 13;
+pub const STT_HIPROC: usize = 15;
+pub const STN_UNDEF: usize = 0;
+
+pub const STV_DEFAULT: usize = 0;
+pub const STV_INTERNAL: usize = 1;
+pub const STV_HIDDEN: usize = 2;
+pub const STV_PROTECTED: usize = 3;
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf32_Rel {
+    pub r_offset: Elf32_Addr,
+    pub r_info: Elf32_Word,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf64_Rel {
+    pub r_offset: Elf64_Addr,
+    pub r_info: Elf64_Xword,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf32_Rela {
+    pub r_offset: Elf32_Addr,
+    pub r_info: Elf32_Word,
+    pub r_addend: Elf32_Sword,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf64_Rela {
+    pub r_offset: Elf64_Addr,
+    pub r_info: Elf64_Xword,
+    pub r_addend: Elf64_Sxword,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf32_Phdr {
+    pub p_type: Elf32_Word,
+    pub p_offset: Elf32_Off,
+    pub p_vaddr: Elf32_Addr,
+    pub p_paddr: Elf32_Addr,
+    pub p_filesz: Elf32_Word,
+    pub p_memsz: Elf32_Word,
+    pub p_flags: Elf32_Word,
+    pub p_align: Elf32_Word,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf64_Phdr {
+    pub p_type: Elf64_Word,
+    pub p_flags: Elf64_Word,
+    pub p_offset: Elf64_Off,
+    pub p_vaddr: Elf64_Addr,
+    pub p_paddr: Elf64_Addr,
+    pub p_filesz: Elf64_Xword,
+    pub p_memsz: Elf64_Xword,
+    pub p_align: Elf64_Xword,
+}
+
+pub const PT_NULL: usize = 0;
+pub const PT_LOAD: usize = 1;
+pub const PT_DYNAMIC: usize = 2;
+pub const PT_INTERP: usize = 3;
+pub const PT_NOTE: usize = 4;
+pub const PT_SHLIB: usize = 5;
+pub const PT_PHDR: usize = 6;
+pub const PT_TLS: usize = 7;
+pub const PT_NUM: usize = 8;
+pub const PT_LOOS: usize = 0x60000000;
+pub const PT_GNU_EH_FRAME: usize = 0x6474e550;
+pub const PT_GNU_STACK: usize = 0x6474e551;
+pub const PT_GNU_RELRO: usize = 0x6474e552;
+pub const PT_LOSUNW: usize = 0x6ffffffa;
+pub const PT_SUNWBSS: usize = 0x6ffffffa;
+pub const PT_SUNWSTACK: usize = 0x6ffffffb;
+pub const PT_HISUNW: usize = 0x6fffffff;
+pub const PT_HIOS: usize = 0x6fffffff;
+pub const PT_LOPROC: usize = 0x70000000;
+pub const PT_HIPROC: usize = 0x7fffffff;
+pub const PN_XNUM: usize = 0xffff;
+pub const PF_X: usize = 1 << 0;
+pub const PF_W: usize = 1 << 1;
+pub const PF_R: usize = 1 << 2;
+pub const PF_MASKOS: usize = 0x0ff00000;
+pub const PF_MASKPROC: usize = 0xf0000000;
+
+pub const NT_PRSTATUS: usize = 1;
+pub const NT_FPREGSET: usize = 2;
+pub const NT_PRPSINFO: usize = 3;
+pub const NT_PRXREG: usize = 4;
+pub const NT_TASKSTRUCT: usize = 4;
+pub const NT_PLATFORM: usize = 5;
+pub const NT_AUXV: usize = 6;
+pub const NT_GWINDOWS: usize = 7;
+pub const NT_ASRS: usize = 8;
+pub const NT_PSTATUS: usize = 10;
+pub const NT_PSINFO: usize = 13;
+pub const NT_PRCRED: usize = 14;
+pub const NT_UTSNAME: usize = 15;
+pub const NT_LWPSTATUS: usize = 16;
+pub const NT_LWPSINFO: usize = 17;
+pub const NT_PRFPXREG: usize = 20;
+pub const NT_SIGINFO: usize = 0x53494749;
+pub const NT_FILE: usize = 0x46494c45;
+pub const NT_PRXFPREG: usize = 0x46e62b7f;
+pub const NT_PPC_VMX: usize = 0x100;
+pub const NT_PPC_SPE: usize = 0x101;
+pub const NT_PPC_VSX: usize = 0x102;
+pub const NT_386_TLS: usize = 0x200;
+pub const NT_386_IOPERM: usize = 0x201;
+pub const NT_X86_XSTATE: usize = 0x202;
+pub const NT_S390_HIGH_GPRS: usize = 0x300;
+pub const NT_S390_TIMER: usize = 0x301;
+pub const NT_S390_TODCMP: usize = 0x302;
+pub const NT_S390_TODPREG: usize = 0x303;
+pub const NT_S390_CTRS: usize = 0x304;
+pub const NT_S390_PREFIX: usize = 0x305;
+pub const NT_S390_LAST_BREAK: usize = 0x306;
+pub const NT_S390_SYSTEM_CALL: usize = 0x307;
+pub const NT_S390_TDB: usize = 0x308;
+pub const NT_ARM_VFP: usize = 0x400;
+pub const NT_ARM_TLS: usize = 0x401;
+pub const NT_ARM_HW_BREAK: usize = 0x402;
+pub const NT_ARM_HW_WATCH: usize = 0x403;
+pub const NT_METAG_CBUF: usize = 0x500;
+pub const NT_METAG_RPIPE: usize = 0x501;
+pub const NT_METAG_TLS: usize = 0x502;
+pub const NT_VERSION: usize = 1;
+
+#[repr(C)]
+pub union Elf32_Dyn_Union {
+    d_val: Elf32_Word,
+    d_ptr: Elf32_Addr,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf32_Dyn {
+    pub d_tag: Elf32_Sword,
+    pub d_un: Elf32_Dyn_Union,
+}
+
+#[repr(C)]
+pub union Elf64_Dyn_Union {
+    d_val: Elf64_Xword,
+    d_ptr: Elf64_Addr,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf64_Dyn {
+    pub d_tag: Elf64_Sxword,
+    pub d_un: Elf64_Dyn_Union,
+}
+
+pub const DT_NULL: usize = 0;
+pub const DT_NEEDED: usize = 1;
+pub const DT_PLTRELSZ: usize = 2;
+pub const DT_PLTGOT: usize = 3;
+pub const DT_HASH: usize = 4;
+pub const DT_STRTAB: usize = 5;
+pub const DT_SYMTAB: usize = 6;
+pub const DT_RELA: usize = 7;
+pub const DT_RELASZ: usize = 8;
+pub const DT_RELAENT: usize = 9;
+pub const DT_STRSZ: usize = 10;
+pub const DT_SYMENT: usize = 11;
+pub const DT_INIT: usize = 12;
+pub const DT_FINI: usize = 13;
+pub const DT_SONAME: usize = 14;
+pub const DT_RPATH: usize = 15;
+pub const DT_SYMBOLIC: usize = 16;
+pub const DT_REL: usize = 17;
+pub const DT_RELSZ: usize = 18;
+pub const DT_RELENT: usize = 19;
+pub const DT_PLTREL: usize = 20;
+pub const DT_DEBUG: usize = 21;
+pub const DT_TEXTREL: usize = 22;
+pub const DT_JMPREL: usize = 23;
+pub const DT_BIND_NOW: usize = 24;
+pub const DT_INIT_ARRAY: usize = 25;
+pub const DT_FINI_ARRAY: usize = 26;
+pub const DT_INIT_ARRAYSZ: usize = 27;
+pub const DT_FINI_ARRAYSZ: usize = 28;
+pub const DT_RUNPATH: usize = 29;
+pub const DT_FLAGS: usize = 30;
+pub const DT_ENCODING: usize = 32;
+pub const DT_PREINIT_ARRAY: usize = 32;
+pub const DT_PREINIT_ARRAYSZ: usize = 33;
+pub const DT_NUM: usize = 34;
+pub const DT_LOOS: usize = 0x6000000d;
+pub const DT_HIOS: usize = 0x6ffff000;
+pub const DT_LOPROC: usize = 0x70000000;
+pub const DT_HIPROC: usize = 0x7fffffff;
+pub const DT_VALRNGLO: usize = 0x6ffffd00;
+pub const DT_GNU_PRELINKED: usize = 0x6ffffdf5;
+pub const DT_GNU_CONFLICTSZ: usize = 0x6ffffdf6;
+pub const DT_GNU_LIBLISTSZ: usize = 0x6ffffdf7;
+pub const DT_CHECKSUM: usize = 0x6ffffdf8;
+pub const DT_PLTPADSZ: usize = 0x6ffffdf9;
+pub const DT_MOVEENT: usize = 0x6ffffdfa;
+pub const DT_MOVESZ: usize = 0x6ffffdfb;
+pub const DT_FEATURE_1: usize = 0x6ffffdfc;
+pub const DT_POSFLAG_1: usize = 0x6ffffdfd;
+pub const DT_SYMINSZ: usize = 0x6ffffdfe;
+pub const DT_SYMINENT: usize = 0x6ffffdff;
+pub const DT_VALNUM: usize = 12;
+
+pub const DT_ADDRRNGLO: usize = 0x6ffffe00;
+pub const DT_GNU_HASH: usize = 0x6ffffef5;
+pub const DT_TLSDESC_PLT: usize = 0x6ffffef6;
+pub const DT_TLSDESC_GOT: usize = 0x6ffffef7;
+pub const DT_GNU_CONFLICT: usize = 0x6ffffef8;
+pub const DT_GNU_LIBLIST: usize = 0x6ffffef9;
+pub const DT_CONFIG: usize = 0x6ffffefa;
+pub const DT_DEPAUDIT: usize = 0x6ffffefb;
+pub const DT_AUDIT: usize = 0x6ffffefc;
+pub const DT_PLTPAD: usize = 0x6ffffefd;
+pub const DT_MOVETAB: usize = 0x6ffffefe;
+pub const DT_SYMINFO: usize = 0x6ffffeff;
+pub const DT_ADDRNUM: usize = 11;
+pub const DT_VERSYM: usize = 0x6ffffff0;
+pub const DT_RELACOUNT: usize = 0x6ffffff9;
+pub const DT_RELCOUNT: usize = 0x6ffffffa;
+pub const DT_FLAGS_1: usize = 0x6ffffffb;
+pub const DT_VERDEF: usize = 0x6ffffffc;
+pub const DT_VERDEFNUM: usize = 0x6ffffffd;
+pub const DT_VERNEED: usize = 0x6ffffffe;
+pub const DT_VERSIONTAGNUM: usize = 16;
+pub const DT_AUXILIARY: usize = 0x7ffffffd;
+pub const DT_FILTER: usize = 0x7fffffff;
+pub const DT_EXTRANUM: usize = 3;
+pub const DF_ORIGIN: usize = 0x00000001;
+pub const DF_SYMBOLIC: usize = 0x00000002;
+pub const DF_TEXTREL: usize = 0x00000004;
+pub const DF_BIND_NOW: usize = 0x00000008;
+pub const DF_STATIC_TLS: usize = 0x00000010;
+pub const DF_1_NOW: usize = 0x00000001;
+pub const DF_1_GLOBAL: usize = 0x00000002;
+pub const DF_1_GROUP: usize = 0x00000004;
+pub const DF_1_NODELETE: usize = 0x00000008;
+pub const DF_1_LOADFLTR: usize = 0x00000010;
+pub const DF_1_INITFIRST: usize = 0x00000020;
+pub const DF_1_NOOPEN: usize = 0x00000040;
+pub const DF_1_ORIGIN: usize = 0x00000080;
+pub const DF_1_DIRECT: usize = 0x00000100;
+pub const DF_1_TRANS: usize = 0x00000200;
+pub const DF_1_INTERPOSE: usize = 0x00000400;
+pub const DF_1_NODEFLIB: usize = 0x00000800;
+pub const DF_1_NODUMP: usize = 0x00001000;
+pub const DF_1_CONFALT: usize = 0x00002000;
+pub const DF_1_ENDFILTEE: usize = 0x00004000;
+pub const DF_1_DISPRELDNE: usize = 0x00008000;
+pub const DF_1_DISPRELPND: usize = 0x00010000;
+pub const DF_1_NODIRECT: usize = 0x00020000;
+pub const DF_1_IGNMULDEF: usize = 0x00040000;
+pub const DF_1_NOKSYMS: usize = 0x00080000;
+pub const DF_1_NOHDR: usize = 0x00100000;
+pub const DF_1_EDITED: usize = 0x00200000;
+pub const DF_1_NORELOC: usize = 0x00400000;
+pub const DF_1_SYMINTPOSE: usize = 0x00800000;
+pub const DF_1_GLOBAUDIT: usize = 0x01000000;
+pub const DF_1_SINGLETON: usize = 0x02000000;
+pub const DTF_1_PARINIT: usize = 0x00000001;
+pub const DTF_1_CONFEXP: usize = 0x00000002;
+pub const DF_P1_LAZYLOAD: usize = 0x00000001;
+pub const DF_P1_GROUPPERM: usize = 0x00000002;
+
+#[repr(C)]
+pub struct Elf32_Verdef {
+    pub vd_version: Elf32_Half,
+    pub vd_flags: Elf32_Half,
+    pub vd_ndx: Elf32_Half,
+    pub vd_cnt: Elf32_Half,
+    pub vd_hash: Elf32_Word,
+    pub vd_aux: Elf32_Word,
+    pub vd_next: Elf32_Word,
+}
+
+#[repr(C)]
+pub struct Elf64_Verdef {
+    pub vd_version: Elf64_Half,
+    pub vd_flags: Elf64_Half,
+    pub vd_ndx: Elf64_Half,
+    pub vd_cnt: Elf64_Half,
+    pub vd_hash: Elf64_Word,
+    pub vd_aux: Elf64_Word,
+    pub vd_next: Elf64_Word,
+}
+
+pub const VER_DEF_NONE: usize = 0;
+pub const VER_DEF_CURRENT: usize = 1;
+pub const VER_DEF_NUM: usize = 2;
+
+pub const VER_FLG_BASE: usize = 0x1;
+pub const VER_FLG_WEAK: usize = 0x2;
+pub const VER_NDX_LOCAL: usize = 0;
+pub const VER_NDX_GLOBAL: usize = 1;
+pub const VER_NDX_LORESERVE: usize = 0xff00;
+pub const VER_NDX_ELIMINATE: usize = 0xff01;
+
+#[repr(C)]
+pub struct Elf32_Verdaux {
+    pub vda_name: Elf32_Word,
+    pub vda_next: Elf32_Word,
+}
+
+#[repr(C)]
+pub struct Elf64_Verdaux {
+    pub vda_name: Elf64_Word,
+    pub vda_next: Elf64_Word,
+}
+
+#[repr(C)]
+pub struct Elf32_Verneed {
+    pub vn_version: Elf32_Half,
+    pub vn_cnt: Elf32_Half,
+    pub vn_file: Elf32_Word,
+    pub vn_aux: Elf32_Word,
+    pub vn_next: Elf32_Word,
+}
+
+#[repr(C)]
+pub struct Elf64_Verneed {
+    pub vn_version: Elf64_Half,
+    pub vn_cnt: Elf64_Half,
+    pub vn_file: Elf64_Word,
+    pub vn_aux: Elf64_Word,
+    pub vn_next: Elf64_Word,
+}
+
+pub const VER_NEED_NONE: usize = 0;
+pub const VER_NEED_CURRENT: usize = 1;
+pub const VER_NEED_NUM: usize = 2;
+
+#[repr(C)]
+pub struct Elf64_Vernaux {
+    pub vna_hash: Elf64_Word,
+    pub vna_flags: Elf64_Half,
+    pub vna_other: Elf64_Half,
+    pub vna_name: Elf64_Word,
+    pub vna_next: Elf64_Word,
+}
+
+#[repr(C)]
+pub union A_UN {
+    a_val: uint64_t,
+}
+
+#[repr(C)]
+pub struct Elf64_auxv_t {
+    pub a_type: uint64_t,
+    pub a_un: A_UN,
+}
+
+pub const AT_NULL: usize = 0;
+pub const AT_IGNORE: usize = 1;
+pub const AT_EXECFD: usize = 2;
+pub const AT_PHDR: usize = 3;
+pub const AT_PHENT: usize = 4;
+pub const AT_PHNUM: usize = 5;
+pub const AT_PAGESZ: usize = 6;
+pub const AT_BASE: usize = 7;
+pub const AT_FLAGS: usize = 8;
+pub const AT_ENTRY: usize = 9;
+pub const AT_NOTELF: usize = 10;
+pub const AT_UID: usize = 11;
+pub const AT_EUID: usize = 12;
+pub const AT_GID: usize = 13;
+pub const AT_EGID: usize = 14;
+pub const AT_CLKTCK: usize = 17;
+pub const AT_PLATFORM: usize = 15;
+pub const AT_HWCAP: usize = 16;
+pub const AT_FPUCW: usize = 18;
+pub const AT_DCACHEBSIZE: usize = 19;
+pub const AT_ICACHEBSIZE: usize = 20;
+pub const AT_UCACHEBSIZE: usize = 21;
+pub const AT_IGNOREPPC: usize = 22;
+pub const AT_SECURE: usize = 23;
+pub const AT_BASE_PLATFORM: usize = 24;
+pub const AT_RANDOM: usize = 25;
+pub const AT_HWCAP2: usize = 26;
+pub const AT_EXECFN: usize = 31;
+pub const AT_SYSINFO: usize = 32;
+pub const AT_SYSINFO_EHDR: usize = 33;
+pub const AT_L1I_CACHESHAPE: usize = 34;
+pub const AT_L1D_CACHESHAPE: usize = 35;
+pub const AT_L2_CACHESHAPE: usize = 36;
+pub const AT_L3_CACHESHAPE: usize = 37;
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf32_Nhdr {
+    pub n_namesz: Elf32_Word,
+    pub n_descsz: Elf32_Word,
+    pub n_type: Elf32_Word,
+}
+
+/// See <https://www.man7.org/linux/man-pages/man5/elf.5.html>.
+#[repr(C)]
+pub struct Elf64_Nhdr {
+    pub n_namesz: Elf64_Word,
+    pub n_descsz: Elf64_Word,
+    pub n_type: Elf64_Word,
+}
+
+pub const ELF_NOTE_SOLARIS: &str = "SUNW Solaris";
+pub const ELF_NOTE_GNU: &str = "GNU";
+
+pub const ELF_NOTE_PAGESIZE_HINT: usize = 1;
+
+pub const NT_GNU_ABI_TAG: usize = 1;
+pub const ELF_NOTE_ABI: usize = NT_GNU_ABI_TAG;
+
+pub const ELF_NOTE_OS_LINUX: usize = 0;
+pub const ELF_NOTE_OS_GNU: usize = 1;
+pub const ELF_NOTE_OS_SOLARIS2: usize = 2;
+pub const ELF_NOTE_OS_FREEBSD: usize = 3;
+
+pub const NT_GNU_BUILD_ID: usize = 3;
+pub const NT_GNU_GOLD_VERSION: usize = 4;
+
+#[repr(C)]
+pub struct Elf64_Move {
+    pub m_value: Elf64_Xword,
+    pub m_info: Elf64_Xword,
+    pub m_poffset: Elf64_Xword,
+    pub m_repeat: Elf64_Half,
+    pub m_stride: Elf64_Half,
+}
+
+pub const R_AARCH64_NONE: usize = 0;
+pub const R_AARCH64_ABS64: usize = 257;
+pub const R_AARCH64_ABS32: usize = 258;
+pub const R_AARCH64_ABS16: usize = 259;
+pub const R_AARCH64_PREL64: usize = 260;
+pub const R_AARCH64_PREL32: usize = 261;
+pub const R_AARCH64_PREL16: usize = 262;
+pub const R_AARCH64_MOVW_UABS_G0: usize = 263;
+pub const R_AARCH64_MOVW_UABS_G0_NC: usize = 264;
+pub const R_AARCH64_MOVW_UABS_G1: usize = 265;
+pub const R_AARCH64_MOVW_UABS_G1_NC: usize = 266;
+pub const R_AARCH64_MOVW_UABS_G2: usize = 267;
+pub const R_AARCH64_MOVW_UABS_G2_NC: usize = 268;
+pub const R_AARCH64_MOVW_UABS_G3: usize = 269;
+pub const R_AARCH64_MOVW_SABS_G0: usize = 270;
+pub const R_AARCH64_MOVW_SABS_G1: usize = 271;
+pub const R_AARCH64_MOVW_SABS_G2: usize = 272;
+pub const R_AARCH64_LD_PREL_LO19: usize = 273;
+pub const R_AARCH64_ADR_PREL_LO21: usize = 274;
+pub const R_AARCH64_ADR_PREL_PG_HI21: usize = 275;
+pub const R_AARCH64_ADR_PREL_PG_HI21_NC: usize = 276;
+pub const R_AARCH64_ADD_ABS_LO12_NC: usize = 277;
+pub const R_AARCH64_LDST8_ABS_LO12_NC: usize = 278;
+pub const R_AARCH64_TSTBR14: usize = 279;
+pub const R_AARCH64_CONDBR19: usize = 280;
+pub const R_AARCH64_JUMP26: usize = 282;
+pub const R_AARCH64_CALL26: usize = 283;
+pub const R_AARCH64_LDST16_ABS_LO12_NC: usize = 284;
+pub const R_AARCH64_LDST32_ABS_LO12_NC: usize = 285;
+pub const R_AARCH64_LDST64_ABS_LO12_NC: usize = 286;
+pub const R_AARCH64_MOVW_PREL_G0: usize = 287;
+pub const R_AARCH64_MOVW_PREL_G0_NC: usize = 288;
+pub const R_AARCH64_MOVW_PREL_G1: usize = 289;
+pub const R_AARCH64_MOVW_PREL_G1_NC: usize = 290;
+pub const R_AARCH64_MOVW_PREL_G2: usize = 291;
+pub const R_AARCH64_MOVW_PREL_G2_NC: usize = 292;
+pub const R_AARCH64_MOVW_PREL_G3: usize = 293;
+pub const R_AARCH64_LDST128_ABS_LO12_NC: usize = 299;
+pub const R_AARCH64_MOVW_GOTOFF_G0: usize = 300;
+pub const R_AARCH64_MOVW_GOTOFF_G0_NC: usize = 301;
+pub const R_AARCH64_MOVW_GOTOFF_G1: usize = 302;
+pub const R_AARCH64_MOVW_GOTOFF_G1_NC: usize = 303;
+pub const R_AARCH64_MOVW_GOTOFF_G2: usize = 304;
+pub const R_AARCH64_MOVW_GOTOFF_G2_NC: usize = 305;
+pub const R_AARCH64_MOVW_GOTOFF_G3: usize = 306;
+pub const R_AARCH64_GOTREL64: usize = 307;
+pub const R_AARCH64_GOTREL32: usize = 308;
+pub const R_AARCH64_GOT_LD_PREL19: usize = 309;
+pub const R_AARCH64_LD64_GOTOFF_LO15: usize = 310;
+pub const R_AARCH64_ADR_GOT_PAGE: usize = 311;
+pub const R_AARCH64_LD64_GOT_LO12_NC: usize = 312;
+pub const R_AARCH64_LD64_GOTPAGE_LO15: usize = 313;
+pub const R_AARCH64_TLSGD_ADR_PREL21: usize = 512;
+pub const R_AARCH64_TLSGD_ADR_PAGE21: usize = 513;
+pub const R_AARCH64_TLSGD_ADD_LO12_NC: usize = 514;
+pub const R_AARCH64_TLSGD_MOVW_G1: usize = 515;
+pub const R_AARCH64_TLSGD_MOVW_G0_NC: usize = 516;
+pub const R_AARCH64_TLSLD_ADR_PREL21: usize = 517;
+pub const R_AARCH64_TLSLD_ADR_PAGE21: usize = 518;
+pub const R_AARCH64_TLSLD_ADD_LO12_NC: usize = 519;
+pub const R_AARCH64_TLSLD_MOVW_G1: usize = 520;
+pub const R_AARCH64_TLSLD_MOVW_G0_NC: usize = 521;
+pub const R_AARCH64_TLSLD_LD_PREL19: usize = 522;
+pub const R_AARCH64_TLSLD_MOVW_DTPREL_G2: usize = 523;
+pub const R_AARCH64_TLSLD_MOVW_DTPREL_G1: usize = 524;
+pub const R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC: usize = 525;
+pub const R_AARCH64_TLSLD_MOVW_DTPREL_G0: usize = 526;
+pub const R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC: usize = 527;
+pub const R_AARCH64_TLSLD_ADD_DTPREL_HI12: usize = 528;
+pub const R_AARCH64_TLSLD_ADD_DTPREL_LO12: usize = 529;
+pub const R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC: usize = 530;
+pub const R_AARCH64_TLSLD_LDST8_DTPREL_LO12: usize = 531;
+pub const R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC: usize = 532;
+pub const R_AARCH64_TLSLD_LDST16_DTPREL_LO12: usize = 533;
+pub const R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC: usize = 534;
+pub const R_AARCH64_TLSLD_LDST32_DTPREL_LO12: usize = 535;
+pub const R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC: usize = 536;
+pub const R_AARCH64_TLSLD_LDST64_DTPREL_LO12: usize = 537;
+pub const R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC: usize = 538;
+pub const R_AARCH64_TLSIE_MOVW_GOTTPREL_G1: usize = 539;
+pub const R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC: usize = 540;
+pub const R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: usize = 541;
+pub const R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: usize = 542;
+pub const R_AARCH64_TLSIE_LD_GOTTPREL_PREL19: usize = 543;
+pub const R_AARCH64_TLSLE_MOVW_TPREL_G2: usize = 544;
+pub const R_AARCH64_TLSLE_MOVW_TPREL_G1: usize = 545;
+pub const R_AARCH64_TLSLE_MOVW_TPREL_G1_NC: usize = 546;
+pub const R_AARCH64_TLSLE_MOVW_TPREL_G0: usize = 547;
+pub const R_AARCH64_TLSLE_MOVW_TPREL_G0_NC: usize = 548;
+pub const R_AARCH64_TLSLE_ADD_TPREL_HI12: usize = 549;
+pub const R_AARCH64_TLSLE_ADD_TPREL_LO12: usize = 550;
+pub const R_AARCH64_TLSLE_ADD_TPREL_LO12_NC: usize = 551;
+pub const R_AARCH64_TLSLE_LDST8_TPREL_LO12: usize = 552;
+pub const R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC: usize = 553;
+pub const R_AARCH64_TLSLE_LDST16_TPREL_LO12: usize = 554;
+pub const R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC: usize = 555;
+pub const R_AARCH64_TLSLE_LDST32_TPREL_LO12: usize = 556;
+pub const R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC: usize = 557;
+pub const R_AARCH64_TLSLE_LDST64_TPREL_LO12: usize = 558;
+pub const R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC: usize = 559;
+pub const R_AARCH64_TLSDESC_LD_PREL19: usize = 560;
+pub const R_AARCH64_TLSDESC_ADR_PREL21: usize = 561;
+pub const R_AARCH64_TLSDESC_ADR_PAGE21: usize = 562;
+pub const R_AARCH64_TLSDESC_LD64_LO12: usize = 563;
+pub const R_AARCH64_TLSDESC_ADD_LO12: usize = 564;
+pub const R_AARCH64_TLSDESC_OFF_G1: usize = 565;
+pub const R_AARCH64_TLSDESC_OFF_G0_NC: usize = 566;
+pub const R_AARCH64_TLSDESC_LDR: usize = 567;
+pub const R_AARCH64_TLSDESC_ADD: usize = 568;
+pub const R_AARCH64_TLSDESC_CALL: usize = 569;
+pub const R_AARCH64_TLSLE_LDST128_TPREL_LO12: usize = 570;
+pub const R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC: usize = 571;
+pub const R_AARCH64_TLSLD_LDST128_DTPREL_LO12: usize = 572;
+pub const R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC: usize = 573;
+pub const R_AARCH64_COPY: usize = 1024;
+pub const R_AARCH64_GLOB_DAT: usize = 1025;
+pub const R_AARCH64_JUMP_SLOT: usize = 1026;
+pub const R_AARCH64_RELATIVE: usize = 1027;
+pub const R_AARCH64_TLS_DTPMOD64: usize = 1028;
+pub const R_AARCH64_TLS_DTPREL64: usize = 1029;
+pub const R_AARCH64_TLS_TPREL64: usize = 1030;
+pub const R_AARCH64_TLSDESC: usize = 1031;
+
+pub const R_X86_64_NONE: usize = 0;
+pub const R_X86_64_64: usize = 1;
+pub const R_X86_64_PC32: usize = 2;
+pub const R_X86_64_GOT32: usize = 3;
+pub const R_X86_64_PLT32: usize = 4;
+pub const R_X86_64_COPY: usize = 5;
+pub const R_X86_64_GLOB_DAT: usize = 6;
+pub const R_X86_64_JUMP_SLOT: usize = 7;
+pub const R_X86_64_RELATIVE: usize = 8;
+pub const R_X86_64_GOTPCREL: usize = 9;
+pub const R_X86_64_32: usize = 10;
+pub const R_X86_64_32S: usize = 11;
+pub const R_X86_64_16: usize = 12;
+pub const R_X86_64_PC16: usize = 13;
+pub const R_X86_64_8: usize = 14;
+pub const R_X86_64_PC8: usize = 15;
+pub const R_X86_64_DTPMOD64: usize = 16;
+pub const R_X86_64_DTPOFF64: usize = 17;
+pub const R_X86_64_TPOFF64: usize = 18;
+pub const R_X86_64_TLSGD: usize = 19;
+pub const R_X86_64_TLSLD: usize = 20;
+pub const R_X86_64_DTPOFF32: usize = 21;
+pub const R_X86_64_GOTTPOFF: usize = 22;
+pub const R_X86_64_TPOFF32: usize = 23;
+pub const R_X86_64_PC64: usize = 24;
+pub const R_X86_64_GOTOFF64: usize = 25;
+pub const R_X86_64_GOTPC32: usize = 26;
+pub const R_X86_64_GOT64: usize = 27;
+pub const R_X86_64_GOTPCREL64: usize = 28;
+pub const R_X86_64_GOTPC64: usize = 29;
+pub const R_X86_64_GOTPLT64: usize = 30;
+pub const R_X86_64_PLTOFF64: usize = 31;
+pub const R_X86_64_SIZE32: usize = 32;
+pub const R_X86_64_SIZE64: usize = 33;
+pub const R_X86_64_GOTPC32_TLSDESC: usize = 34;
+pub const R_X86_64_TLSDESC_CALL: usize = 35;
+pub const R_X86_64_TLSDESC: usize = 36;
+pub const R_X86_64_IRELATIVE: usize = 37;
+pub const R_X86_64_RELATIVE64: usize = 38;
+pub const R_X86_64_NUM: usize = 39;
+
+#[unsafe(no_mangle)]
+pub extern "C" fn _cbindgen_export_elf(
+    a: Elf32_Ehdr,
+    b: Elf64_Ehdr,
+    c: Elf32_Shdr,
+    d: Elf64_Shdr,
+    e: Elf32_Sym,
+    f: Elf64_Sym,
+    g: Elf32_Syminfo,
+    h: Elf64_Syminfo,
+    i: Elf32_Rel,
+    j: Elf64_Rel,
+    k: Elf32_Rela,
+    l: Elf64_Rela,
+    m: Elf32_Phdr,
+    n: Elf64_Phdr,
+    o: Elf32_Dyn,
+    p: Elf64_Dyn,
+    q: Elf32_Verdef,
+    r: Elf64_Verdef,
+    s: Elf32_Verdaux,
+    t: Elf64_Verdaux,
+    u: Elf32_Verneed,
+    v: Elf64_Verneed,
+    w: Elf64_Vernaux,
+    x: Elf64_auxv_t,
+    y: Elf32_Nhdr,
+    z: Elf64_Nhdr,
+    aa: Elf64_Move,
+) {
+}
diff --git a/recipes/core/relibc/src/header/endian/cbindgen.toml b/recipes/core/relibc/src/header/endian/cbindgen.toml
new file mode 100644
index 0000000000..698eb0088c
--- /dev/null
+++ b/recipes/core/relibc/src/header/endian/cbindgen.toml
@@ -0,0 +1,12 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/endian.h.html
+#
+# Spec quotations relating to includes:
+# - "The <endian.h> header shall define the uint16_t, uint32_t, and uint64_t types as described in <stdint.h>."
+# - "Inclusion of the <endian.h> header may also make visible all symbols from <stdint.h>."
+sys_includes = ["stdint.h"]
+include_guard = "_RELIBC_ENDIAN_H"
+trailer = "#include <machine/endian.h>"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
diff --git a/recipes/core/relibc/src/header/endian/mod.rs b/recipes/core/relibc/src/header/endian/mod.rs
new file mode 100644
index 0000000000..8c78b3bdfa
--- /dev/null
+++ b/recipes/core/relibc/src/header/endian/mod.rs
@@ -0,0 +1,77 @@
+//! `endian.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/endian.h.html>.
+
+use crate::platform::types::{uint16_t, uint32_t, uint64_t};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn be16toh(x: uint16_t) -> uint16_t {
+    uint16_t::from_be(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn be32toh(x: uint32_t) -> uint32_t {
+    uint32_t::from_be(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn be64toh(x: uint64_t) -> uint64_t {
+    uint64_t::from_be(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn htobe16(x: uint16_t) -> uint16_t {
+    x.to_be()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn htobe32(x: uint32_t) -> uint32_t {
+    x.to_be()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn htobe64(x: uint64_t) -> uint64_t {
+    x.to_be()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn htole16(x: uint16_t) -> uint16_t {
+    x.to_le()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn htole32(x: uint32_t) -> uint32_t {
+    x.to_le()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn htole64(x: uint64_t) -> uint64_t {
+    x.to_le()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn le16toh(x: uint16_t) -> uint16_t {
+    uint16_t::from_le(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn le32toh(x: uint32_t) -> uint32_t {
+    uint32_t::from_le(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/be16toh.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn le64toh(x: uint64_t) -> uint64_t {
+    uint64_t::from_le(x)
+}
diff --git a/recipes/core/relibc/src/header/err/cbindgen.toml b/recipes/core/relibc/src/header/err/cbindgen.toml
new file mode 100644
index 0000000000..7319d182ab
--- /dev/null
+++ b/recipes/core/relibc/src/header/err/cbindgen.toml
@@ -0,0 +1,5 @@
+sys_includes = ["stdarg.h", "stdio.h", "features.h"]
+include_guard = "_RELIBC_ERR_H"
+language = "C"
+no_includes = true
+cpp_compat = true
diff --git a/recipes/core/relibc/src/header/err/mod.rs b/recipes/core/relibc/src/header/err/mod.rs
new file mode 100644
index 0000000000..5e47ee4e7c
--- /dev/null
+++ b/recipes/core/relibc/src/header/err/mod.rs
@@ -0,0 +1,204 @@
+//! `err.h` implementation.
+//!
+//! See <https://man.freebsd.org/cgi/man.cgi?err>
+//!
+//! `err.h` is a BSD extension to the C library which provides functions for printing formatted
+//! errors. Errors are printed to [`stdio::stderr`] by default or to a file set by
+//! [`err_set_file`]. This family of functions is non-portable, but it is also supported by `glibc`
+//! and `musl`.
+//!
+//! The functions come in sets of three. Each of them print the program binary name (the last path
+//! segment of `argv[0]`) and an optional user message along with these differences:
+//! * No suffix: Prints an error message for ERRNO based on [`strerror`]
+//! * `c` suffix: Prints an error message for an arbitrary error code
+//! * `x` suffix: Does not print an error code
+//!
+//! For example, `err` does not have a suffix so it would print the program name, the user message,
+//! and an error string for ERRNO. `errc` would operate in the same way except the functions takes
+//! an error code for which to print an error string.
+
+// Allow is intentional. Almost every line of the simple functions below are unsafe.
+// unsafe_op_in_unsafe_fn only adds visual noise or a needless indentation here.
+#![allow(unsafe_op_in_unsafe_fn)]
+
+use core::{
+    ffi::{VaList as va_list, c_char, c_int},
+    ptr,
+};
+
+use crate::{
+    header::{
+        stdio::{self, FILE, fprintf, fputc, fputs, vfprintf},
+        stdlib::exit,
+        string::strerror,
+    },
+    platform::{self, ERRNO},
+};
+
+// Optional callback from user invoked on exit.
+type ExitCallback = Option<unsafe extern "C" fn(c_int)>;
+static mut on_exit: ExitCallback = None;
+
+// Messages from this module are written to this sink.
+static mut error_sink: *mut FILE = ptr::null_mut();
+
+/// Set global [`FILE`] sink to write errors and warnings.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn err_set_file(fp: *mut FILE) {
+    if fp.is_null() {
+        error_sink = stdio::stderr;
+    } else {
+        error_sink = fp;
+    }
+}
+
+/// Set or remove a callback to invoke before exiting on error.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn err_set_exit(ef: ExitCallback) {
+    on_exit = ef;
+}
+
+/// Print a user message then an error message for [`ERRNO`] followed by exiting with `eval`.
+///
+/// The message format is `progname: fmt: strerror(ERRNO)`
+///
+/// # Return
+/// Does not return. Exits with `eval` as an error code.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn err(eval: c_int, fmt: *const c_char, mut va_list: ...) -> ! {
+    let code = Some(ERRNO.get());
+    err_exit(eval, code, fmt, va_list.as_va_list())
+}
+
+/// Print a user message then an error message for `code` before exiting with `eval` as a return.
+///
+/// The message format is `progname: fmt: strerror(code)`
+///
+/// # Return
+/// Exits with `eval` as an error code.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn errc(eval: c_int, code: c_int, fmt: *const c_char, mut va_list: ...) -> ! {
+    err_exit(eval, Some(code), fmt, va_list.as_va_list())
+}
+
+/// Print a user message then exits with `eval` as a return.
+///
+/// The message format is `progname: fmt`
+///
+/// # Return
+/// Exits with `eval` as an error code.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn errx(eval: c_int, fmt: *const c_char, mut va_list: ...) -> ! {
+    err_exit(eval, None, fmt, va_list.as_va_list())
+}
+
+/// Print a user message and then an error message for [`ERRNO`].
+///
+/// The message format is `progname: fmt: strerror(ERRNO)`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn warn(fmt: *const c_char, mut va_list: ...) {
+    let code = Some(ERRNO.get());
+    display_message(code, fmt, va_list.as_va_list());
+}
+
+/// Print a user message then an error message for `code`.
+///
+/// The message format is `progname: fmt: strerror(code)`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn warnc(code: c_int, fmt: *const c_char, mut va_list: ...) {
+    display_message(Some(code), fmt, va_list.as_va_list());
+}
+
+/// Print a user message as a warning.
+///
+/// The message format is `progname: fmt`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn warnx(fmt: *const c_char, mut va_list: ...) {
+    display_message(None, fmt, va_list.as_va_list());
+}
+
+/// See [`err`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn verr(eval: c_int, fmt: *const c_char, args: va_list) -> ! {
+    let code = Some(ERRNO.get());
+    err_exit(eval, code, fmt, args);
+}
+
+/// See [`errc`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn verrc(eval: c_int, code: c_int, fmt: *const c_char, args: va_list) -> ! {
+    err_exit(eval, Some(code), fmt, args)
+}
+
+/// See [`errx`];
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn verrx(eval: c_int, fmt: *const c_char, args: va_list) -> ! {
+    err_exit(eval, None, fmt, args)
+}
+
+/// See [`warn`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vwarn(fmt: *const c_char, args: va_list) {
+    let code = Some(ERRNO.get());
+    display_message(code, fmt, args);
+}
+
+/// See [`warnc`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vwarnc(code: c_int, fmt: *const c_char, args: va_list) {
+    display_message(Some(code), fmt, args);
+}
+
+/// See [`warnx`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vwarnx(fmt: *const c_char, args: va_list) {
+    display_message(None, fmt, args);
+}
+
+// Write error messages for err and warn to the currently set sink.
+unsafe fn display_message(code: Option<c_int>, fmt: *const c_char, args: va_list) {
+    // SAFETY:
+    // * error_sink is only null once on start but otherwise always stderr or a user set file
+    // * User is trusted to pass in a valid file pointer if err_set_file is used
+    if error_sink.is_null() {
+        error_sink = stdio::stderr;
+    }
+    let sink = error_sink;
+
+    // "progname:" is always printed
+    // SAFETY:
+    // * program_invocation_short_name is never null as it is set on start
+    // * program_invocation_short_name is not globally mutable so the user can't mangle it
+    fprintf(
+        sink,
+        c"%s".as_ptr(),
+        platform::program_invocation_short_name,
+    );
+
+    // Print user message if any
+    if !fmt.is_null() {
+        fputs(c": ".as_ptr(), sink);
+        vfprintf(sink, fmt, args);
+    }
+
+    // Print error message for non-x functions
+    if let Some(code) = code {
+        let message = strerror(code);
+        fprintf(sink, c": %s".as_ptr(), message);
+    }
+
+    // Always write new line
+    fputc(b'\n'.into(), sink);
+}
+
+// Write an error message as per err and then exit.
+unsafe fn err_exit(eval: c_int, code: Option<c_int>, fmt: *const c_char, args: va_list) -> ! {
+    display_message(code, fmt, args);
+
+    if let Some(callback) = on_exit {
+        // errx will hit the unwrap.
+        callback(code.unwrap_or_else(|| ERRNO.get()));
+    }
+
+    exit(eval);
+}
diff --git a/recipes/core/relibc/src/header/errno/cbindgen.toml b/recipes/core/relibc/src/header/errno/cbindgen.toml
new file mode 100644
index 0000000000..93f418381d
--- /dev/null
+++ b/recipes/core/relibc/src/header/errno/cbindgen.toml
@@ -0,0 +1,17 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/errno.h.html
+#
+# There are no spec quotations relating to includes
+sys_includes = []
+after_includes = """
+#define errno (*__errno_location())
+#define program_invocation_name (*__program_invocation_name())
+#define program_invocation_short_name (*__program_invocation_short_name())
+"""
+include_guard = "_RELIBC_ERRNO_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/errno/mod.rs b/recipes/core/relibc/src/header/errno/mod.rs
new file mode 100644
index 0000000000..aceb031138
--- /dev/null
+++ b/recipes/core/relibc/src/header/errno/mod.rs
@@ -0,0 +1,344 @@
+//! `errno.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/errno.h.html>.
+
+use crate::platform::{
+    self,
+    types::{c_char, c_int},
+};
+
+//TODO: Consider removing, provided for compatibility with newlib
+#[unsafe(no_mangle)]
+pub extern "C" fn __errno() -> *mut c_int {
+    __errno_location()
+}
+
+/// Provide a pointer to relibc's internal `errno` variable.
+///
+/// This is the basis of the C-facing macro definition of `errno`, and should
+/// not be used directly.
+#[unsafe(no_mangle)]
+pub extern "C" fn __errno_location() -> *mut c_int {
+    platform::ERRNO.as_ptr()
+}
+
+/// Get the name used to invoke the program, similar to `argv[0]`.
+///
+/// This provides the basis for the C-facing macro definition of
+/// `program_invocation_name`, and should not be used directly.
+///
+/// The `program_invocation_name` variable is a GNU extension.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __program_invocation_name() -> *mut *mut c_char {
+    &raw mut platform::program_invocation_name
+}
+
+/// Get the directory-less name used to invoke the program.
+///
+/// This provides the basis for the C-facing macro definition of
+/// `program_invocation_short_name`, and should not be used directly.
+///
+/// The `program_invocation_short_name` variable is a GNU extension.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __program_invocation_short_name() -> *mut *mut c_char {
+    &raw mut platform::program_invocation_short_name
+}
+
+pub const EPERM: c_int = 1; /* Operation not permitted */
+pub const ENOENT: c_int = 2; /* No such file or directory */
+pub const ESRCH: c_int = 3; /* No such process */
+pub const EINTR: c_int = 4; /* Interrupted system call */
+pub const EIO: c_int = 5; /* I/O error */
+pub const ENXIO: c_int = 6; /* No such device or address */
+pub const E2BIG: c_int = 7; /* Argument list too long */
+pub const ENOEXEC: c_int = 8; /* Exec format error */
+pub const EBADF: c_int = 9; /* Bad file number */
+pub const ECHILD: c_int = 10; /* No child processes */
+pub const EAGAIN: c_int = 11; /* Try again */
+pub const ENOMEM: c_int = 12; /* Out of memory */
+pub const EACCES: c_int = 13; /* Permission denied */
+pub const EFAULT: c_int = 14; /* Bad address */
+pub const ENOTBLK: c_int = 15; /* Block device required */
+pub const EBUSY: c_int = 16; /* Device or resource busy */
+pub const EEXIST: c_int = 17; /* File exists */
+pub const EXDEV: c_int = 18; /* Cross-device link */
+pub const ENODEV: c_int = 19; /* No such device */
+pub const ENOTDIR: c_int = 20; /* Not a directory */
+pub const EISDIR: c_int = 21; /* Is a directory */
+pub const EINVAL: c_int = 22; /* Invalid argument */
+pub const ENFILE: c_int = 23; /* File table overflow */
+pub const EMFILE: c_int = 24; /* Too many open files */
+pub const ENOTTY: c_int = 25; /* Not a typewriter */
+pub const ETXTBSY: c_int = 26; /* Text file busy */
+pub const EFBIG: c_int = 27; /* File too large */
+pub const ENOSPC: c_int = 28; /* No space left on device */
+pub const ESPIPE: c_int = 29; /* Illegal seek */
+pub const EROFS: c_int = 30; /* Read-only file system */
+pub const EMLINK: c_int = 31; /* Too many links */
+pub const EPIPE: c_int = 32; /* Broken pipe */
+pub const EDOM: c_int = 33; /* Math argument out of domain of func */
+pub const ERANGE: c_int = 34; /* Math result not representable */
+pub const EDEADLK: c_int = 35; /* Resource deadlock would occur */
+pub const ENAMETOOLONG: c_int = 36; /* File name too long */
+pub const ENOLCK: c_int = 37; /* No record locks available */
+pub const ENOSYS: c_int = 38; /* Function not implemented */
+pub const ENOTEMPTY: c_int = 39; /* Directory not empty */
+pub const ELOOP: c_int = 40; /* Too many symbolic links encountered */
+pub const EWOULDBLOCK: c_int = 41; /* Operation would block */
+pub const ENOMSG: c_int = 42; /* No message of desired type */
+pub const EIDRM: c_int = 43; /* Identifier removed */
+pub const ECHRNG: c_int = 44; /* Channel number out of range */
+pub const EL2NSYNC: c_int = 45; /* Level 2 not synchronized */
+pub const EL3HLT: c_int = 46; /* Level 3 halted */
+pub const EL3RST: c_int = 47; /* Level 3 reset */
+pub const ELNRNG: c_int = 48; /* Link number out of range */
+pub const EUNATCH: c_int = 49; /* Protocol driver not attached */
+pub const ENOCSI: c_int = 50; /* No CSI structure available */
+pub const EL2HLT: c_int = 51; /* Level 2 halted */
+pub const EBADE: c_int = 52; /* Invalid exchange */
+pub const EBADR: c_int = 53; /* Invalid request descriptor */
+pub const EXFULL: c_int = 54; /* Exchange full */
+pub const ENOANO: c_int = 55; /* No anode */
+pub const EBADRQC: c_int = 56; /* Invalid request code */
+pub const EBADSLT: c_int = 57; /* Invalid slot */
+pub const EDEADLOCK: c_int = 58; /* Resource deadlock would occur */
+pub const EBFONT: c_int = 59; /* Bad font file format */
+pub const ENOSTR: c_int = 60; /* Device not a stream */
+pub const ENODATA: c_int = 61; /* No data available */
+pub const ETIME: c_int = 62; /* Timer expired */
+pub const ENOSR: c_int = 63; /* Out of streams resources */
+pub const ENONET: c_int = 64; /* Machine is not on the network */
+pub const ENOPKG: c_int = 65; /* Package not installed */
+pub const EREMOTE: c_int = 66; /* Object is remote */
+pub const ENOLINK: c_int = 67; /* Link has been severed */
+pub const EADV: c_int = 68; /* Advertise error */
+pub const ESRMNT: c_int = 69; /* Srmount error */
+pub const ECOMM: c_int = 70; /* Communication error on send */
+pub const EPROTO: c_int = 71; /* Protocol error */
+pub const EMULTIHOP: c_int = 72; /* Multihop attempted */
+pub const EDOTDOT: c_int = 73; /* RFS specific error */
+pub const EBADMSG: c_int = 74; /* Not a data message */
+pub const EOVERFLOW: c_int = 75; /* Value too large for defined data type */
+pub const ENOTUNIQ: c_int = 76; /* Name not unique on network */
+pub const EBADFD: c_int = 77; /* File descriptor in bad state */
+pub const EREMCHG: c_int = 78; /* Remote address changed */
+pub const ELIBACC: c_int = 79; /* Can not access a needed shared library */
+pub const ELIBBAD: c_int = 80; /* Accessing a corrupted shared library */
+pub const ELIBSCN: c_int = 81; /* .lib section in a.out corrupted */
+pub const ELIBMAX: c_int = 82; /* Attempting to link in too many shared libraries */
+pub const ELIBEXEC: c_int = 83; /* Cannot exec a shared library directly */
+pub const EILSEQ: c_int = 84; /* Illegal byte sequence */
+pub const ERESTART: c_int = 85; /* Interrupted system call should be restarted */
+pub const ESTRPIPE: c_int = 86; /* Streams pipe error */
+pub const EUSERS: c_int = 87; /* Too many users */
+pub const ENOTSOCK: c_int = 88; /* Socket operation on non-socket */
+pub const EDESTADDRREQ: c_int = 89; /* Destination address required */
+pub const EMSGSIZE: c_int = 90; /* Message too long */
+pub const EPROTOTYPE: c_int = 91; /* Protocol wrong type for socket */
+pub const ENOPROTOOPT: c_int = 92; /* Protocol not available */
+pub const EPROTONOSUPPORT: c_int = 93; /* Protocol not supported */
+pub const ESOCKTNOSUPPORT: c_int = 94; /* Socket type not supported */
+pub const EOPNOTSUPP: c_int = 95; /* Operation not supported on transport endpoint */
+pub const ENOTSUP: c_int = EOPNOTSUPP; /* Not supported */
+pub const EPFNOSUPPORT: c_int = 96; /* Protocol family not supported */
+pub const EAFNOSUPPORT: c_int = 97; /* Address family not supported by protocol */
+pub const EADDRINUSE: c_int = 98; /* Address already in use */
+pub const EADDRNOTAVAIL: c_int = 99; /* Cannot assign requested address */
+pub const ENETDOWN: c_int = 100; /* Network is down */
+pub const ENETUNREACH: c_int = 101; /* Network is unreachable */
+pub const ENETRESET: c_int = 102; /* Network dropped connection because of reset */
+pub const ECONNABORTED: c_int = 103; /* Software caused connection abort */
+pub const ECONNRESET: c_int = 104; /* Connection reset by peer */
+pub const ENOBUFS: c_int = 105; /* No buffer space available */
+pub const EISCONN: c_int = 106; /* Transport endpoint is already connected */
+pub const ENOTCONN: c_int = 107; /* Transport endpoint is not connected */
+pub const ESHUTDOWN: c_int = 108; /* Cannot send after transport endpoint shutdown */
+pub const ETOOMANYREFS: c_int = 109; /* Too many references: cannot splice */
+pub const ETIMEDOUT: c_int = 110; /* Connection timed out */
+pub const ECONNREFUSED: c_int = 111; /* Connection refused */
+pub const EHOSTDOWN: c_int = 112; /* Host is down */
+pub const EHOSTUNREACH: c_int = 113; /* No route to host */
+pub const EALREADY: c_int = 114; /* Operation already in progress */
+pub const EINPROGRESS: c_int = 115; /* Operation now in progress */
+pub const ESTALE: c_int = 116; /* Stale NFS file handle */
+pub const EUCLEAN: c_int = 117; /* Structure needs cleaning */
+pub const ENOTNAM: c_int = 118; /* Not a XENIX named type file */
+pub const ENAVAIL: c_int = 119; /* No XENIX semaphores available */
+pub const EISNAM: c_int = 120; /* Is a named type file */
+pub const EREMOTEIO: c_int = 121; /* Remote I/O error */
+pub const EDQUOT: c_int = 122; /* Quota exceeded */
+pub const ENOMEDIUM: c_int = 123; /* No medium found */
+pub const EMEDIUMTYPE: c_int = 124; /* Wrong medium type */
+pub const ECANCELED: c_int = 125; /* Operation Canceled */
+pub const ENOKEY: c_int = 126; /* Required key not available */
+pub const EKEYEXPIRED: c_int = 127; /* Key has expired */
+pub const EKEYREVOKED: c_int = 128; /* Key has been revoked */
+pub const EKEYREJECTED: c_int = 129; /* Key was rejected by service */
+pub const EOWNERDEAD: c_int = 130; /* Owner died */
+pub const ENOTRECOVERABLE: c_int = 131; /* State not recoverable */
+
+/// String representations for the respective `errno` values.
+pub(crate) const STR_ERROR: [&str; 132] = [
+    "Success",
+    "Operation not permitted",
+    "No such file or directory",
+    "No such process",
+    "Interrupted system call",
+    "I/O error",
+    "No such device or address",
+    "Argument list too long",
+    "Exec format error",
+    "Bad file number",
+    "No child processes",
+    "Try again",
+    "Out of memory",
+    "Permission denied",
+    "Bad address",
+    "Block device required",
+    "Device or resource busy",
+    "File exists",
+    "Cross-device link",
+    "No such device",
+    "Not a directory",
+    "Is a directory",
+    "Invalid argument",
+    "File table overflow",
+    "Too many open files",
+    "Not a typewriter",
+    "Text file busy",
+    "File too large",
+    "No space left on device",
+    "Illegal seek",
+    "Read-only file system",
+    "Too many links",
+    "Broken pipe",
+    "Math argument out of domain of func",
+    "Math result not representable",
+    "Resource deadlock would occur",
+    "File name too long",
+    "No record locks available",
+    "Function not implemented",
+    "Directory not empty",
+    "Too many symbolic links encountered",
+    "Operation would block",
+    "No message of desired type",
+    "Identifier removed",
+    "Channel number out of range",
+    "Level 2 not synchronized",
+    "Level 3 halted",
+    "Level 3 reset",
+    "Link number out of range",
+    "Protocol driver not attached",
+    "No CSI structure available",
+    "Level 2 halted",
+    "Invalid exchange",
+    "Invalid request descriptor",
+    "Exchange full",
+    "No anode",
+    "Invalid request code",
+    "Invalid slot",
+    "Resource deadlock would occur",
+    "Bad font file format",
+    "Device not a stream",
+    "No data available",
+    "Timer expired",
+    "Out of streams resources",
+    "Machine is not on the network",
+    "Package not installed",
+    "Object is remote",
+    "Link has been severed",
+    "Advertise error",
+    "Srmount error",
+    "Communication error on send",
+    "Protocol error",
+    "Multihop attempted",
+    "RFS specific error",
+    "Not a data message",
+    "Value too large for defined data type",
+    "Name not unique on network",
+    "File descriptor in bad state",
+    "Remote address changed",
+    "Can not access a needed shared library",
+    "Accessing a corrupted shared library",
+    ".lib section in a.out corrupted",
+    "Attempting to link in too many shared libraries",
+    "Cannot exec a shared library directly",
+    "Illegal byte sequence",
+    "Interrupted system call should be restarted",
+    "Streams pipe error",
+    "Too many users",
+    "Socket operation on non-socket",
+    "Destination address required",
+    "Message too long",
+    "Protocol wrong type for socket",
+    "Protocol not available",
+    "Protocol not supported",
+    "Socket type not supported",
+    "Operation not supported on transport endpoint",
+    "Protocol family not supported",
+    "Address family not supported by protocol",
+    "Address already in use",
+    "Cannot assign requested address",
+    "Network is down",
+    "Network is unreachable",
+    "Network dropped connection because of reset",
+    "Software caused connection abort",
+    "Connection reset by peer",
+    "No buffer space available",
+    "Transport endpoint is already connected",
+    "Transport endpoint is not connected",
+    "Cannot send after transport endpoint shutdown",
+    "Too many references: cannot splice",
+    "Connection timed out",
+    "Connection refused",
+    "Host is down",
+    "No route to host",
+    "Operation already in progress",
+    "Operation now in progress",
+    "Stale NFS file handle",
+    "Structure needs cleaning",
+    "Not a XENIX named type file",
+    "No XENIX semaphores available",
+    "Is a named type file",
+    "Remote I/O error",
+    "Quota exceeded",
+    "No medium found",
+    "Wrong medium type",
+    "Operation Canceled",
+    "Required key not available",
+    "Key has expired",
+    "Key has been revoked",
+    "Key was rejected by service",
+    "Owner died",
+    "State not recoverable",
+];
+
+/// Longest error message length
+pub(crate) const STRERROR_MAX: usize = {
+    // Number of digits of the max value of this platform's c_int
+    let digits = {
+        let mut len = 0;
+        let mut i = c_int::MAX;
+
+        while i > 0 {
+            i /= 10;
+            len += 1;
+        }
+
+        len
+    };
+
+    let mut longest: usize = "Unknown error: ".len() + digits + 1;
+
+    let mut i = 0;
+    while i < STR_ERROR.len() {
+        let len = STR_ERROR[i].len() + 1;
+        if len > longest {
+            longest = len;
+        }
+
+        i += 1;
+    }
+
+    longest
+};
diff --git a/recipes/core/relibc/src/header/fcntl/cbindgen.toml b/recipes/core/relibc/src/header/fcntl/cbindgen.toml
new file mode 100644
index 0000000000..1e54313f42
--- /dev/null
+++ b/recipes/core/relibc/src/header/fcntl/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = ["stdarg.h", "sys/stat.h", "unistd.h"]
+include_guard = "_RELIBC_FCNTL_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/fcntl/linux.rs b/recipes/core/relibc/src/header/fcntl/linux.rs
new file mode 100644
index 0000000000..6be617fd26
--- /dev/null
+++ b/recipes/core/relibc/src/header/fcntl/linux.rs
@@ -0,0 +1,31 @@
+use crate::platform::types::c_int;
+
+pub const O_RDONLY: c_int = 0x0000;
+pub const O_WRONLY: c_int = 0x0001;
+pub const O_RDWR: c_int = 0x0002;
+pub const O_ACCMODE: c_int = 0x0003;
+pub const O_CREAT: c_int = 0x0040;
+pub const O_EXCL: c_int = 0x0080;
+pub const O_NOCTTY: c_int = 0x0100;
+pub const O_TRUNC: c_int = 0x0200;
+pub const O_APPEND: c_int = 0x0400;
+pub const O_NONBLOCK: c_int = 0x0800;
+pub const O_DIRECTORY: c_int = 0x1_0000;
+pub const O_NOFOLLOW: c_int = 0x2_0000;
+pub const O_CLOEXEC: c_int = 0x8_0000;
+pub const O_PATH: c_int = 0x20_0000;
+
+pub const FD_CLOEXEC: c_int = 0x8_0000;
+
+// Defined for compatibility
+pub const O_NDELAY: c_int = O_NONBLOCK;
+
+// Flags for capability based "at" functions
+pub const AT_FDCWD: c_int = -100;
+pub const AT_SYMLINK_NOFOLLOW: c_int = 0x100;
+// AT_EACCESS only used for faccessat
+pub const AT_EACCESS: c_int = 0x200;
+// AT_REMOVEDIR only used for unlinkat
+pub const AT_REMOVEDIR: c_int = 0x200;
+pub const AT_SYMLINK_FOLLOW: c_int = 0x400;
+pub const AT_EMPTY_PATH: c_int = 0x1000;
diff --git a/recipes/core/relibc/src/header/fcntl/mod.rs b/recipes/core/relibc/src/header/fcntl/mod.rs
new file mode 100644
index 0000000000..28455c94cf
--- /dev/null
+++ b/recipes/core/relibc/src/header/fcntl/mod.rs
@@ -0,0 +1,124 @@
+//! `fcntl.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/fcntl.h.html>.
+
+use core::num::NonZeroU64;
+
+use crate::{
+    c_str::CStr,
+    error::ResultExt,
+    platform::{
+        Pal, Sys,
+        types::{c_char, c_int, c_short, c_ulonglong, mode_t, off_t, pid_t},
+    },
+};
+
+pub use self::sys::*;
+
+use super::errno::EINVAL;
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+pub mod sys;
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+pub mod sys;
+
+pub const F_DUPFD: c_int = 0;
+pub const F_GETFD: c_int = 1;
+pub const F_SETFD: c_int = 2;
+pub const F_GETFL: c_int = 3;
+pub const F_SETFL: c_int = 4;
+pub const F_GETLK: c_int = 5;
+pub const F_SETLK: c_int = 6;
+pub const F_SETLKW: c_int = 7;
+pub const F_OFD_GETLK: c_int = 36;
+pub const F_OFD_SETLK: c_int = 37;
+pub const F_OFD_SETLKW: c_int = 38;
+pub const F_DUPFD_CLOEXEC: c_int = 1030;
+
+pub const F_RDLCK: c_int = 0;
+pub const F_WRLCK: c_int = 1;
+pub const F_UNLCK: c_int = 2;
+
+pub const F_ULOCK: c_int = 0;
+pub const F_LOCK: c_int = 1;
+pub const F_TLOCK: c_int = 2;
+pub const F_TEST: c_int = 3;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/creat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn creat(path: *const c_char, mode: mode_t) -> c_int {
+    unsafe { open(path, O_WRONLY | O_CREAT | O_TRUNC, mode) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/fcntl.h.html>.
+#[repr(C)]
+#[derive(Clone, Copy, Default)]
+pub struct flock {
+    pub l_type: c_short,
+    pub l_whence: c_short,
+    pub l_start: off_t,
+    pub l_len: off_t,
+    pub l_pid: pid_t,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fcntl.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fcntl(fildes: c_int, cmd: c_int, mut __valist: ...) -> c_int {
+    // c_ulonglong
+    let arg = match cmd {
+        F_DUPFD | F_SETFD | F_SETFL | F_GETLK | F_SETLK | F_SETLKW | F_OFD_GETLK | F_OFD_SETLK
+        | F_OFD_SETLKW | F_DUPFD_CLOEXEC => unsafe { __valist.arg::<c_ulonglong>() },
+        _ => 0,
+    };
+
+    Sys::fcntl(fildes, cmd, arg).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/open.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn open(path: *const c_char, oflag: c_int, mut __valist: ...) -> c_int {
+    unsafe { openat(AT_FDCWD, path, oflag, __valist) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/openat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn openat(
+    fd: c_int,
+    path: *const c_char,
+    oflag: c_int,
+    mut __valist: ...
+) -> c_int {
+    let mode = if oflag & O_CREAT == O_CREAT
+    /* || oflag & O_TMPFILE == O_TMPFILE */
+    {
+        unsafe { __valist.arg::<mode_t>() }
+    } else {
+        0
+    };
+
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::openat(fd, path, oflag, mode).or_minus_one_errno()
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbindgen_stupid_struct_user_for_fcntl(_: flock) {}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn posix_fallocate(fd: c_int, offset: off_t, length: off_t) -> c_int {
+    // Length can't be zero and offset must be positive.
+    let Ok(offset) = offset.try_into() else {
+        return EINVAL;
+    };
+    let Some(length) = length.try_into().ok().and_then(NonZeroU64::new) else {
+        return EINVAL;
+    };
+
+    // posix_fallocate does not set errno but instead returns it.
+    Sys::posix_fallocate(fd, offset, length)
+        .err()
+        .map(|e| e.0)
+        .unwrap_or_default()
+}
diff --git a/recipes/core/relibc/src/header/fcntl/redox.rs b/recipes/core/relibc/src/header/fcntl/redox.rs
new file mode 100644
index 0000000000..0d54c33883
--- /dev/null
+++ b/recipes/core/relibc/src/header/fcntl/redox.rs
@@ -0,0 +1,40 @@
+use crate::platform::types::c_int;
+
+pub const O_RDONLY: c_int = 0x0001_0000;
+pub const O_WRONLY: c_int = 0x0002_0000;
+pub const O_RDWR: c_int = 0x0003_0000;
+pub const O_ACCMODE: c_int = 0x0003_0000;
+pub const O_NONBLOCK: c_int = 0x0004_0000;
+pub const O_APPEND: c_int = 0x0008_0000;
+pub const O_SHLOCK: c_int = 0x0010_0000;
+pub const O_EXLOCK: c_int = 0x0020_0000;
+pub const O_ASYNC: c_int = 0x0040_0000;
+pub const O_FSYNC: c_int = 0x0080_0000;
+pub const O_SYNC: c_int = O_FSYNC;
+pub const O_CLOEXEC: c_int = 0x0100_0000;
+pub const O_CREAT: c_int = 0x0200_0000;
+pub const O_TRUNC: c_int = 0x0400_0000;
+pub const O_EXCL: c_int = 0x0800_0000;
+pub const O_DIRECTORY: c_int = 0x1000_0000;
+pub const O_PATH: c_int = 0x2000_0000;
+pub const O_SYMLINK: c_int = 0x4000_0000;
+// Negative to allow it to be used as int
+pub const O_NOFOLLOW: c_int = -0x8000_0000;
+
+pub const FD_CLOEXEC: c_int = 0x0100_0000;
+
+pub const O_NOCTTY: c_int = 0x00000200;
+
+// Defined for compatibility
+pub const O_NDELAY: c_int = O_NONBLOCK;
+
+// Flags for capability based "at" functions
+pub const AT_FDCWD: c_int = -100;
+pub const AT_SYMLINK_NOFOLLOW: c_int = 0x200;
+pub const AT_REMOVEDIR: c_int = 0x200;
+// Used by linkat()
+pub const AT_SYMLINK_FOLLOW: c_int = 0x2000;
+// nonstandard extension, but likely to be in a future standard
+pub const AT_EMPTY_PATH: c_int = 0x4000;
+// only used for faccessat()
+pub const AT_EACCESS: c_int = 0x400;
diff --git a/recipes/core/relibc/src/header/float/cbindgen.toml b/recipes/core/relibc/src/header/float/cbindgen.toml
new file mode 100644
index 0000000000..dc4839c9ae
--- /dev/null
+++ b/recipes/core/relibc/src/header/float/cbindgen.toml
@@ -0,0 +1,62 @@
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_FLOAT_H"
+after_includes = """
+#ifndef _RELIBC_BITS_FLOAT_H
+#define _RELIBC_BITS_FLOAT_H
+
+#define FLT_ROUNDS (flt_rounds())
+
+// Shamelessly copy pasted from musl:
+
+#define FLT_TRUE_MIN 1.40129846432481707092e-45F
+#define FLT_MIN 1.17549435082228750797e-38F
+#define FLT_MAX 3.40282346638528859812e+38F
+#define FLT_EPSILON 1.1920928955078125e-07F
+
+#define FLT_MANT_DIG 24
+#define FLT_MIN_EXP (-125)
+#define FLT_MAX_EXP 128
+#define FLT_HAS_SUBNORM 1
+
+#define FLT_DIG 6
+#define FLT_DECIMAL_DIG 9
+#define FLT_MIN_10_EXP (-37)
+#define FLT_MAX_10_EXP 38
+
+#define DBL_TRUE_MIN 4.94065645841246544177e-324
+#define DBL_MIN 2.22507385850720138309e-308
+#define DBL_MAX 1.79769313486231570815e+308
+#define DBL_EPSILON 2.22044604925031308085e-16
+
+#define DBL_MANT_DIG 53
+#define DBL_MIN_EXP (-1021)
+#define DBL_MAX_EXP 1024
+#define DBL_HAS_SUBNORM 1
+
+#define DBL_DIG 15
+#define DBL_DECIMAL_DIG 17
+#define DBL_MIN_10_EXP (-307)
+#define DBL_MAX_10_EXP 308
+
+#define LDBL_HAS_SUBNORM 1
+#define LDBL_DECIMAL_DIG DECIMAL_DIG
+
+// TODO: Support more architectures than x86_64 here:
+#define LDBL_TRUE_MIN 3.6451995318824746025e-4951L
+#define LDBL_MIN     3.3621031431120935063e-4932L
+#define LDBL_MAX     1.1897314953572317650e+4932L
+#define LDBL_EPSILON 1.0842021724855044340e-19L
+
+#define LDBL_MANT_DIG 64
+#define LDBL_MIN_EXP (-16381)
+#define LDBL_MAX_EXP 16384
+
+#endif // _RELIBC_BITS_FLOAT_H
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/float/mod.rs b/recipes/core/relibc/src/header/float/mod.rs
new file mode 100644
index 0000000000..e806f0ce91
--- /dev/null
+++ b/recipes/core/relibc/src/header/float/mod.rs
@@ -0,0 +1,20 @@
+//! `float.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/float.h.html>.
+
+use crate::{
+    header::_fenv::{FE_TONEAREST, fegetround},
+    platform::types::c_int,
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/float.h.html>.
+pub const FLT_RADIX: c_int = 2;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/float.h.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn flt_rounds() -> c_int {
+    match unsafe { fegetround() } {
+        FE_TONEAREST => 1,
+        _ => -1,
+    }
+}
diff --git a/recipes/core/relibc/src/header/fnmatch/cbindgen.toml b/recipes/core/relibc/src/header/fnmatch/cbindgen.toml
new file mode 100644
index 0000000000..f28cb9123e
--- /dev/null
+++ b/recipes/core/relibc/src/header/fnmatch/cbindgen.toml
@@ -0,0 +1,11 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/fnmatch.h.html
+#
+# There are no spec quotations relating to includes
+include_guard = "_RELIBC_FNMATCH_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/fnmatch/mod.rs b/recipes/core/relibc/src/header/fnmatch/mod.rs
new file mode 100644
index 0000000000..8b09bc0759
--- /dev/null
+++ b/recipes/core/relibc/src/header/fnmatch/mod.rs
@@ -0,0 +1,159 @@
+//! `fnmatch.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/fnmatch.h.html>.
+
+use alloc::{borrow::Cow, vec::Vec};
+use core::slice;
+
+use crate::platform::types::{c_char, c_int};
+use posix_regex::{
+    PosixRegex,
+    compile::{Collation, Range, Token},
+    tree::{Tree, TreeBuilder},
+};
+
+const ONCE: Range = Range(1, Some(1));
+
+pub const FNM_NOMATCH: c_int = 1;
+
+pub const FNM_NOESCAPE: c_int = 1;
+pub const FNM_PATHNAME: c_int = 2;
+pub const FNM_PERIOD: c_int = 4;
+pub const FNM_CASEFOLD: c_int = 8;
+pub const FNM_IGNORECASE: c_int = FNM_CASEFOLD;
+// TODO: FNM_EXTMATCH
+
+unsafe fn tokenize(mut pattern: *const u8, flags: c_int) -> Tree {
+    fn any(leading: bool, flags: c_int) -> Token {
+        let mut list = Vec::new();
+        if flags & FNM_PATHNAME == FNM_PATHNAME {
+            list.push(Collation::Char(b'/'))
+        }
+        if leading && flags & FNM_PERIOD == FNM_PERIOD {
+            list.push(Collation::Char(b'.'))
+        }
+        Token::OneOf { invert: true, list }
+    }
+    fn can_push(leading: bool, flags: c_int, c: u8) -> bool {
+        (c != b'/' || flags & FNM_PATHNAME != FNM_PATHNAME)
+            && (c != b'.' || !leading || flags & FNM_PERIOD != FNM_PERIOD)
+    }
+    fn is_leading(flags: c_int, c: u8) -> bool {
+        c == b'/' && flags & FNM_PATHNAME == FNM_PATHNAME
+    }
+
+    let mut leading = true;
+    let mut need_collapsing = false;
+
+    let mut builder = TreeBuilder::default();
+    builder.start_internal(Token::Root, Range(1, Some(1)));
+    builder.start_internal(Token::Alternative, Range(1, Some(1)));
+
+    while unsafe { *pattern != 0 } {
+        let was_leading = leading;
+        leading = false;
+
+        let c = unsafe { *pattern };
+        pattern = unsafe { pattern.offset(1) };
+
+        match (c == b'*', need_collapsing) {
+            (true, true) => continue,
+            (true, false) => need_collapsing = true,
+            (false, _) => need_collapsing = false,
+        }
+
+        let (token, range) = match c {
+            b'\\' if flags & FNM_NOESCAPE == FNM_NOESCAPE => {
+                let c = unsafe { *pattern };
+                if c == 0 {
+                    // Trailing backslash. Maybe error here?
+                    break;
+                }
+                pattern = unsafe { pattern.offset(1) };
+                leading = is_leading(flags, c);
+                (Token::Char(c), ONCE)
+            }
+            b'?' => (any(was_leading, flags), ONCE),
+            b'*' => (any(was_leading, flags), Range(0, None)),
+            b'[' => {
+                let mut list: Vec<Collation> = Vec::new();
+                let invert = if unsafe { *pattern == b'!' } {
+                    pattern = unsafe { pattern.offset(1) };
+                    true
+                } else {
+                    false
+                };
+
+                loop {
+                    let mut c = unsafe { *pattern };
+                    if c == 0 {
+                        break;
+                    }
+                    pattern = unsafe { pattern.offset(1) };
+                    match c {
+                        b']' => break,
+                        b'\\' => {
+                            c = unsafe { *pattern };
+                            pattern = unsafe { pattern.offset(1) };
+                            if c == 0 {
+                                // Trailing backslash. Maybe error?
+                                break;
+                            }
+                        }
+                        _ => (),
+                    }
+                    if unsafe { *pattern == b'-' && *pattern.offset(1) != 0 } {
+                        let end = unsafe { *pattern.offset(1) };
+                        pattern = unsafe { pattern.offset(2) };
+                        for c in c..=end {
+                            if can_push(was_leading, flags, c) {
+                                list.push(Collation::Char(c));
+                            }
+                        }
+                    } else if can_push(was_leading, flags, c) {
+                        list.push(Collation::Char(c));
+                    }
+                }
+                // Otherwise, there was no closing ]. Maybe error?
+
+                (Token::OneOf { invert, list }, ONCE)
+            }
+            c => {
+                leading = is_leading(flags, c);
+                (Token::Char(c), ONCE)
+            }
+        };
+        builder.leaf(token, range);
+    }
+    builder.leaf(Token::End, ONCE);
+    builder.finish_internal();
+    builder.finish_internal();
+    builder.finish()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fnmatch.html>.
+#[unsafe(no_mangle)]
+#[linkage = "weak"] // often redefined in GNU programs
+pub unsafe extern "C" fn fnmatch(
+    pattern: *const c_char,
+    input: *const c_char,
+    flags: c_int,
+) -> c_int {
+    let mut len = 0;
+    while unsafe { *input.offset(len) != 0 } {
+        len += 1;
+    }
+    let input = unsafe { slice::from_raw_parts(input.cast::<u8>(), len as usize) };
+
+    let tokens = unsafe { tokenize(pattern.cast::<u8>(), flags) };
+
+    if PosixRegex::new(Cow::Owned(tokens))
+        .case_insensitive(flags & FNM_CASEFOLD == FNM_CASEFOLD)
+        .matches_exact(input)
+        .is_some()
+    {
+        0
+    } else {
+        FNM_NOMATCH
+    }
+}
diff --git a/recipes/core/relibc/src/header/getopt/cbindgen.toml b/recipes/core/relibc/src/header/getopt/cbindgen.toml
new file mode 100644
index 0000000000..36e260094b
--- /dev/null
+++ b/recipes/core/relibc/src/header/getopt/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = ["unistd.h"]
+include_guard = "_RELIBC_GETOPT_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/getopt/mod.rs b/recipes/core/relibc/src/header/getopt/mod.rs
new file mode 100644
index 0000000000..13c079703b
--- /dev/null
+++ b/recipes/core/relibc/src/header/getopt/mod.rs
@@ -0,0 +1,244 @@
+//! `getopt.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getopt.3.html>.
+
+use crate::{
+    header::{
+        stdio, string,
+        unistd::{optarg, opterr, optind, optopt},
+    },
+    platform::types::{c_char, c_int, size_t},
+};
+use core::ptr;
+
+static mut CURRENT_OPT: *mut c_char = ptr::null_mut();
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getopt.3.html>.
+pub const no_argument: c_int = 0;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getopt.3.html>.
+pub const required_argument: c_int = 1;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getopt.3.html>.
+pub const optional_argument: c_int = 2;
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getopt.3.html>.
+#[repr(C)]
+pub struct option {
+    name: *const c_char,
+    has_arg: c_int,
+    flag: *mut c_int,
+    val: c_int,
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getopt.3.html>.
+///
+/// Functions the same as `getopt` but also accepts long options.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getopt_long(
+    argc: c_int,
+    argv: *const *mut c_char,
+    optstring: *const c_char,
+    longopts: *const option,
+    longindex: *mut c_int,
+) -> c_int {
+    // if optarg is not set, we still don't want the previous value leaking
+    unsafe {
+        optarg = ptr::null_mut();
+    }
+
+    // handle reinitialization request
+    unsafe {
+        if optind == 0 {
+            optind = 1;
+            CURRENT_OPT = ptr::null_mut();
+        }
+    }
+
+    if unsafe { CURRENT_OPT.is_null() || *CURRENT_OPT == 0 } {
+        if unsafe { optind >= argc } {
+            -1
+        } else {
+            let current_arg = unsafe { *argv.offset(optind as isize) };
+            if unsafe {
+                current_arg.is_null()
+                    || *current_arg != b'-' as c_char
+                    || *current_arg.offset(1) == 0
+            } {
+                -1
+            } else if unsafe { string::strcmp(current_arg, c"--".as_ptr()) == 0 } {
+                unsafe {
+                    optind += 1;
+                }
+                -1
+            } else {
+                // remove the '-'
+                let current_arg = unsafe { current_arg.offset(1) };
+
+                if unsafe { *current_arg == b'-' as c_char } && !longopts.is_null() {
+                    let current_arg = unsafe { current_arg.offset(1) };
+                    // is a long option
+                    for i in 0.. {
+                        let opt = unsafe { &*longopts.offset(i) };
+                        if opt.name.is_null() {
+                            break;
+                        }
+
+                        let mut end = 0;
+                        while {
+                            let c = unsafe { *current_arg.offset(end) };
+                            c != 0 && c != b'=' as c_char
+                        } {
+                            end += 1;
+                        }
+
+                        if unsafe { string::strncmp(current_arg, opt.name, end as size_t) == 0 } {
+                            unsafe {
+                                optind += 1;
+                                if !longindex.is_null() {
+                                    *longindex = i as c_int;
+                                }
+                            }
+
+                            if opt.has_arg == optional_argument {
+                                unsafe {
+                                    if *current_arg.offset(end) == b'=' as c_char {
+                                        optarg = current_arg.offset(end + 1);
+                                    }
+                                }
+                            } else if opt.has_arg == required_argument {
+                                unsafe {
+                                    if *current_arg.offset(end) == b'=' as c_char {
+                                        optarg = current_arg.offset(end + 1);
+                                    } else if optind < argc {
+                                        optarg = *argv.offset(optind as isize);
+                                        optind += 1;
+                                    } else if *optstring == b':' as c_char {
+                                        return c_int::from(b':');
+                                    } else {
+                                        stdio::fputs((*argv).cast_const(), &raw mut *stdio::stderr);
+                                        stdio::fputs(
+                                            c": option '--".as_ptr().cast(),
+                                            &raw mut *stdio::stderr,
+                                        );
+                                        stdio::fputs(current_arg, &raw mut *stdio::stderr);
+                                        stdio::fputs(
+                                            c"' requires an argument\n".as_ptr().cast(),
+                                            &raw mut *stdio::stderr,
+                                        );
+                                        return c_int::from(b'?');
+                                    }
+                                }
+                            }
+
+                            if opt.flag.is_null() {
+                                return opt.val;
+                            } else {
+                                unsafe { *opt.flag = opt.val };
+                                return 0;
+                            }
+                        }
+                    }
+                }
+
+                unsafe { parse_arg(argc, argv, current_arg, optstring) }
+            }
+        }
+    } else {
+        unsafe { parse_arg(argc, argv, CURRENT_OPT, optstring) }
+    }
+}
+
+unsafe fn parse_arg(
+    argc: c_int,
+    argv: *const *mut c_char,
+    current_arg: *mut c_char,
+    optstring: *const c_char,
+) -> c_int {
+    let update_current_opt = || unsafe {
+        CURRENT_OPT = current_arg.offset(1);
+        if *CURRENT_OPT == 0 {
+            optind += 1;
+        }
+    };
+
+    let print_error = |desc: &[u8]| unsafe {
+        // NOTE: we don't use fprintf to get around the usage of va_list
+        stdio::fputs((*argv).cast_const(), &raw mut *stdio::stderr);
+        stdio::fputs(desc.as_ptr().cast(), &raw mut *stdio::stderr);
+        stdio::fputc((*current_arg).into(), &raw mut *stdio::stderr);
+        stdio::fputc(b'\n'.into(), &raw mut *stdio::stderr);
+    };
+
+    match unsafe { find_option(*current_arg, optstring) } {
+        Some(GetoptOption::Flag) => {
+            update_current_opt();
+
+            unsafe { c_int::from(*current_arg) }
+        }
+        Some(GetoptOption::OptArg) => unsafe {
+            CURRENT_OPT = c"".as_ptr().cast_mut();
+            if *current_arg.offset(1) == 0 {
+                optind += 2;
+                if optind > argc {
+                    CURRENT_OPT = ptr::null_mut();
+
+                    optopt = c_int::from(*current_arg);
+                    let errch = if *optstring == b':' as c_char {
+                        b':'
+                    } else {
+                        if opterr != 0 {
+                            print_error(b": option requries an argument -- \0");
+                        }
+
+                        b'?'
+                    };
+                    c_int::from(errch)
+                } else {
+                    optarg = *argv.offset(optind as isize - 1);
+
+                    c_int::from(*current_arg)
+                }
+            } else {
+                optarg = current_arg.offset(1);
+                optind += 1;
+
+                c_int::from(*current_arg)
+            }
+        },
+        None => {
+            // couldn't find the given option in optstring
+            if unsafe { opterr != 0 } {
+                print_error(b": illegal option -- \0");
+            }
+
+            update_current_opt();
+
+            unsafe {
+                optopt = c_int::from(*current_arg);
+            }
+            c_int::from(b'?')
+        }
+    }
+}
+
+enum GetoptOption {
+    Flag,
+    OptArg,
+}
+
+unsafe fn find_option(ch: c_char, optstring: *const c_char) -> Option<GetoptOption> {
+    let mut i = 0;
+
+    while unsafe { *optstring.offset(i) != 0 } {
+        if unsafe { *optstring.offset(i) == ch } {
+            let result = if unsafe { *optstring.offset(i + 1) == b':' as c_char } {
+                GetoptOption::OptArg
+            } else {
+                GetoptOption::Flag
+            };
+            return Some(result);
+        }
+        i += 1;
+    }
+
+    None
+}
diff --git a/recipes/core/relibc/src/header/glob/cbindgen.toml b/recipes/core/relibc/src/header/glob/cbindgen.toml
new file mode 100644
index 0000000000..d8de241ec3
--- /dev/null
+++ b/recipes/core/relibc/src/header/glob/cbindgen.toml
@@ -0,0 +1,16 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/glob.h.html
+#
+# Spec quotations relating to includes:
+# - "The <glob.h> header shall define the size_t type as described in <sys/types.h>."
+#
+# size_t is defined in stddef.h (sys/types.h gets size_t by including stddef.h)
+# just use stddef.h to avoid importing all of sys/types.h
+sys_includes = ["stddef.h"]
+include_guard = "_RELIBC_GLOB_H"
+language = "C"
+style = "type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/glob/mod.rs b/recipes/core/relibc/src/header/glob/mod.rs
new file mode 100644
index 0000000000..fcbaa7f7b0
--- /dev/null
+++ b/recipes/core/relibc/src/header/glob/mod.rs
@@ -0,0 +1,401 @@
+//! `glob.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/glob.h.html>.
+
+use core::ptr;
+
+use alloc::{boxed::Box, vec::Vec};
+
+use crate::{
+    c_str::{CStr, CString},
+    header::{
+        dirent::{closedir, opendir, readdir},
+        errno::*,
+        fnmatch::{FNM_NOESCAPE, FNM_PERIOD, fnmatch},
+        sys_stat::{S_IFDIR, S_IFMT, stat},
+    },
+    platform::{
+        self,
+        types::{c_char, c_int, c_uchar, c_void, size_t},
+    },
+};
+
+// Cause glob() to return on error
+pub const GLOB_ERR: c_int = 0x0001;
+// Each pathname that is a directory that matches pattern has a slash appended
+pub const GLOB_MARK: c_int = 0x0002;
+// Do not sort returned pathnames
+pub const GLOB_NOSORT: c_int = 0x0004;
+// Add gl_offs amount of null pointers to the beginning of `gl_pathv`
+pub const GLOB_DOOFFS: c_int = 0x0008;
+// If pattern does not match, return a list containing only pattern
+pub const GLOB_NOCHECK: c_int = 0x0010;
+// Append generated pathnames to those previously obtained
+pub const GLOB_APPEND: c_int = 0x0020;
+// Disable backslash escaping
+pub const GLOB_NOESCAPE: c_int = 0x0040;
+// Allow wildcards to match '.' (GNU extension)
+pub const GLOB_PERIOD: c_int = 0x0080;
+
+// Attempt to allocate memory failed
+pub const GLOB_NOSPACE: c_int = 1;
+// Scan was stopped because GLOB_ERR was set or `errfunc` returned non-zero
+pub const GLOB_ABORTED: c_int = 2;
+// Pattern does not match any existing pathname, and GLOB_NOCHECK was not set
+pub const GLOB_NOMATCH: c_int = 3;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/glob.h.html>.
+#[derive(Debug)]
+#[repr(C)]
+pub struct glob_t {
+    pub gl_pathc: size_t, // Count of paths matched by pattern (POSIX required field)
+    pub gl_offs: size_t,  // Slots to reserve at the beginning of gl_pathv (POSIX required field)
+    pub gl_pathv: *mut *mut c_char, // Pointer to list of matched pathnames (POSIX required field)
+
+    // Opaque pointer to allocation data
+    __opaque: *mut c_void, // Vec<*mut c_char>
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/glob.html>.
+#[linkage = "weak"] // GNU prefers its own glob e.g. in Make
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn glob(
+    pattern: *const c_char,
+    flags: c_int,
+    errfunc: Option<unsafe extern "C" fn(epath: *const c_char, eerrno: c_int) -> c_int>,
+    pglob: *mut glob_t,
+) -> c_int {
+    if flags & GLOB_APPEND != GLOB_APPEND {
+        unsafe {
+            (*pglob).gl_pathc = 0;
+            (*pglob).gl_pathv = ptr::null_mut();
+            (*pglob).__opaque = ptr::null_mut();
+        }
+    }
+
+    let glob_expr = unsafe { CStr::from_ptr(pattern) };
+
+    if glob_expr.to_bytes() == b"" {
+        return GLOB_NOMATCH;
+    }
+
+    let base_path = unsafe {
+        CStr::from_bytes_with_nul_unchecked(if glob_expr.to_bytes().first() == Some(&b'/') {
+            b"/\0"
+        } else {
+            b"\0"
+        })
+    };
+
+    let errfunc = match errfunc {
+        Some(f) => f,
+        None => default_errfunc,
+    };
+
+    // Do the globbing
+    let mut results = match inner_glob(&base_path, &glob_expr, flags, errfunc) {
+        Ok(res) => res,
+        Err(e) => return e,
+    };
+
+    // Handle GLOB_NOCHECK and no matches
+    if results.is_empty() {
+        if flags & GLOB_NOCHECK == GLOB_NOCHECK {
+            results.push(glob_expr.to_owned_cstring());
+        } else {
+            return GLOB_NOMATCH;
+        }
+    }
+
+    // Handle GLOB_NOSORT
+    if flags & GLOB_NOSORT != GLOB_NOSORT {
+        results.sort();
+    }
+
+    // Set gl_pathc
+    if flags & GLOB_APPEND == GLOB_APPEND {
+        unsafe {
+            (*pglob).gl_pathc += results.len();
+        }
+    } else {
+        unsafe {
+            (*pglob).gl_pathc = results.len();
+        }
+    }
+
+    let mut pathv: Box<Vec<*mut c_char>>;
+    if flags & GLOB_APPEND == GLOB_APPEND {
+        pathv = unsafe { Box::from_raw((*pglob).__opaque.cast()) };
+        pathv.pop(); // Remove NULL from end
+    } else {
+        pathv = Box::new(Vec::new());
+        if flags & GLOB_DOOFFS == GLOB_DOOFFS {
+            let gl_offs = unsafe { (*pglob).gl_offs };
+            pathv.reserve(gl_offs);
+            for _ in 0..gl_offs {
+                pathv.push(ptr::null_mut());
+            }
+        }
+    }
+
+    pathv.reserve_exact(results.len() + 1);
+    pathv.extend(results.into_iter().map(|s| s.into_raw()));
+
+    pathv.push(ptr::null_mut());
+
+    unsafe {
+        (*pglob).gl_pathv = pathv.as_ptr().cast_mut();
+        (*pglob).__opaque = Box::into_raw(pathv).cast();
+    }
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/glob.html>.
+#[linkage = "weak"] // GNU prefers its own glob e.g. in Make
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn globfree(pglob: *mut glob_t) {
+    // Retake ownership
+    if unsafe { !(*pglob).__opaque.is_null() } {
+        let pathv: Box<Vec<*mut c_char>> = unsafe { Box::from_raw((*pglob).__opaque.cast()) };
+        for (idx, path) in pathv.into_iter().enumerate() {
+            if unsafe { idx < (*pglob).gl_offs } {
+                continue;
+            }
+            if !path.is_null() {
+                unsafe {
+                    drop(CString::from_raw(path));
+                }
+            }
+        }
+        unsafe {
+            (*pglob).gl_pathv = ptr::null_mut();
+        }
+    }
+}
+
+type GlobErrorFunc = unsafe extern "C" fn(epath: *const c_char, eerrno: c_int) -> c_int;
+
+struct DirEntry {
+    name: CString,
+    is_dir: bool,
+}
+
+unsafe extern "C" fn default_errfunc(epath: *const c_char, eerrno: c_int) -> c_int {
+    0
+}
+
+fn list_dir(
+    path: &CStr,
+    errfunc: GlobErrorFunc,
+    abort_on_error: bool,
+) -> Result<Vec<DirEntry>, c_int> {
+    const DT_DIR: c_uchar = 4; // From dirent.h
+    const DT_LNK: c_uchar = 10; // From dirent.h
+
+    let old_errno = platform::ERRNO.get();
+    let mut results: Vec<DirEntry> = Vec::new();
+    let open_path = if path.to_bytes().is_empty() {
+        unsafe { &CStr::from_bytes_with_nul_unchecked(b".\0") }
+    } else {
+        path
+    };
+    let dir = unsafe { opendir(open_path.as_ptr()) };
+
+    if dir.is_null() {
+        let new_errno = platform::ERRNO.get();
+        platform::ERRNO.set(old_errno);
+
+        if unsafe { errfunc(path.as_ptr(), new_errno) } != 0 || abort_on_error {
+            return Err(GLOB_ABORTED);
+        }
+
+        return Ok(results);
+    }
+
+    platform::ERRNO.set(0);
+
+    loop {
+        let entry = unsafe { readdir(&mut *dir) };
+        if entry.is_null() {
+            break;
+        }
+
+        let name = unsafe { CStr::from_ptr((*entry).d_name.as_ptr()).to_owned_cstring() };
+
+        if name.as_bytes() == b"." || name.as_bytes() == b".." {
+            continue;
+        }
+
+        let is_dir: bool = unsafe {
+            if (*entry).d_type == DT_DIR {
+                true
+            } else if (*entry).d_type == DT_LNK {
+                // Resolve symbolic link
+                let mut full_path = path.to_owned_cstring().into_string().unwrap();
+                if !full_path.ends_with('/') {
+                    full_path.push('/');
+                }
+                full_path.push_str(name.to_str().unwrap());
+                full_path.push('\0');
+
+                let mut link_info = stat::default();
+                if stat(
+                    full_path.as_ptr().cast::<c_char>(),
+                    ptr::from_mut(&mut link_info),
+                ) != 0
+                {
+                    let errno = platform::ERRNO.get();
+                    platform::ERRNO.set(old_errno);
+                    if errfunc(full_path.as_ptr().cast::<c_char>(), errno) != 0 || abort_on_error {
+                        return Err(GLOB_ABORTED);
+                    }
+                }
+                link_info.st_mode & S_IFMT == S_IFDIR
+            } else {
+                false
+            }
+        };
+
+        results.push(DirEntry { name, is_dir });
+    }
+
+    // Check if entry == NULL because of an error
+    let errno = platform::ERRNO.get();
+
+    unsafe { closedir(Box::from_raw(dir)) };
+
+    // Restore the old errno
+    platform::ERRNO.set(old_errno);
+
+    if errno != 0 && (unsafe { errfunc(path.as_ptr(), errno) } != 0 || abort_on_error) {
+        return Err(GLOB_ABORTED);
+    }
+
+    Ok(results)
+}
+
+fn inner_glob(
+    current_dir: &CStr,
+    glob_expr: &CStr,
+    flags: c_int,
+    errfunc: GlobErrorFunc,
+) -> Result<Vec<CString>, c_int> {
+    let mut pattern: Vec<u8> = Vec::new();
+
+    // Remove any '/' chars at the start of the expression
+    let glob_expr = {
+        let mut expr = glob_expr.to_bytes_with_nul();
+        while expr.first() == Some(&b'/') {
+            expr = &expr[1..];
+        }
+        unsafe { CStr::from_bytes_with_nul_unchecked(expr) }
+    };
+
+    // Get the next section of the glob expression (up to non-escaped '/')
+    let glob_iter = glob_expr.to_bytes();
+    let mut in_bracket = false;
+    let mut escaped = false;
+    let mut glob_consumed = 0;
+
+    for ch in glob_iter {
+        // Don't consume nul
+        if ch == &b'\0' {
+            break;
+        }
+
+        glob_consumed += 1;
+
+        if ch == &b'/' && !escaped {
+            break;
+        }
+
+        if ch == &b'[' && !escaped {
+            in_bracket = true;
+        } else if ch == &b']' {
+            // '\' is a normal character in brackets so doesn't escape
+            in_bracket = false;
+        }
+
+        escaped =
+            ch == &b'\\' && !in_bracket && !escaped && (flags & GLOB_NOESCAPE != GLOB_NOESCAPE);
+
+        pattern.push(*ch);
+    }
+
+    // Needs to be C-string
+    pattern.push(b'\0');
+
+    let new_glob_expr = unsafe {
+        CStr::from_bytes_with_nul_unchecked(&glob_expr.to_bytes_with_nul()[glob_consumed..])
+    };
+
+    // Handle special path sections
+    if pattern == b".\0" || pattern == b"..\0" {
+        let mut new_dir: Vec<u8> = Vec::new();
+        new_dir.extend_from_slice(current_dir.to_bytes());
+        new_dir.extend_from_slice(&pattern);
+        let new_dir_c = unsafe { CStr::from_bytes_with_nul_unchecked(&new_dir) };
+        return inner_glob(&new_dir_c, &new_glob_expr, flags, errfunc);
+    }
+
+    let mut fnmatch_flags = 0;
+    if flags & GLOB_NOESCAPE == GLOB_NOESCAPE {
+        fnmatch_flags |= FNM_NOESCAPE;
+    }
+    if flags & GLOB_PERIOD == GLOB_PERIOD {
+        fnmatch_flags |= FNM_PERIOD;
+    }
+
+    let mut matches: Vec<CString> = Vec::new();
+
+    for entry in list_dir(current_dir, errfunc, flags & GLOB_ERR == GLOB_ERR)? {
+        // If we still have pattern to match ignore non-directories
+        if !new_glob_expr.to_bytes().is_empty() && !entry.is_dir {
+            continue;
+        }
+
+        let mut path = current_dir.to_bytes().to_vec();
+
+        if path != b"" && !path.ends_with(b"/") {
+            path.push(b'/');
+        }
+        path.extend_from_slice(entry.name.as_bytes());
+
+        if flags & GLOB_MARK == GLOB_MARK && new_glob_expr.to_bytes() == b"" && entry.is_dir {
+            path.push(b'/');
+        }
+
+        // This shouldn't ever panic, we know the vec has no nul bytes
+        let path = CString::new(path).unwrap();
+
+        if unsafe {
+            fnmatch(
+                pattern.as_ptr().cast::<c_char>(),
+                entry.name.as_ptr(),
+                fnmatch_flags,
+            )
+        } == 0
+        {
+            if entry.is_dir && new_glob_expr.to_bytes() != b"" {
+                let new_matches = inner_glob(&CStr::borrow(&path), &new_glob_expr, flags, errfunc)?;
+                matches.extend(new_matches);
+            } else {
+                matches.push(path);
+            }
+        }
+    }
+
+    // It is an error if we don't find a directory when we expect one
+    if matches.is_empty() && !new_glob_expr.to_bytes().is_empty() {
+        let mut path = current_dir.to_bytes().to_vec();
+        path.extend_from_slice(&pattern);
+        if unsafe { errfunc(path.as_ptr().cast::<c_char>(), ENOENT) } != 0
+            || flags & GLOB_ERR == GLOB_ERR
+        {
+            return Err(GLOB_ABORTED);
+        }
+    }
+
+    Ok(matches)
+}
diff --git a/recipes/core/relibc/src/header/grp/cbindgen.toml b/recipes/core/relibc/src/header/grp/cbindgen.toml
new file mode 100644
index 0000000000..5383c8adf6
--- /dev/null
+++ b/recipes/core/relibc/src/header/grp/cbindgen.toml
@@ -0,0 +1,17 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/grp.h.html
+#
+# Spec quotations relating to includes:
+# - "The <grp.h> header shall define the gid_t and size_t types as described in <sys/types.h>."
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_GRP_H"
+language = "C"
+style = "Tag"
+usize_is_size_t = true
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export]
+include = ["group"]
diff --git a/recipes/core/relibc/src/header/grp/mod.rs b/recipes/core/relibc/src/header/grp/mod.rs
new file mode 100644
index 0000000000..1f5ef44a6f
--- /dev/null
+++ b/recipes/core/relibc/src/header/grp/mod.rs
@@ -0,0 +1,558 @@
+//! `grp.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/grp.h.html>.
+
+use core::{
+    cell::SyncUnsafeCell,
+    convert::TryInto,
+    mem::{self, MaybeUninit},
+    num::ParseIntError,
+    ops::{Deref, DerefMut},
+    pin::Pin,
+    ptr, slice,
+};
+
+use alloc::{
+    borrow::ToOwned,
+    string::{FromUtf8Error, String},
+};
+
+use crate::{
+    error::ResultExt,
+    fs::File,
+    header::{errno, fcntl, limits, string::strlen},
+    io::{self, BufReader, Lines, prelude::*},
+    platform::{
+        self, Pal, Sys,
+        types::{c_char, c_int, c_void, gid_t, size_t},
+    },
+};
+
+use super::{errno::*, string::strncmp};
+
+#[cfg(target_os = "linux")]
+const SEPARATOR: char = ':';
+
+#[cfg(target_os = "redox")]
+const SEPARATOR: char = ';';
+
+const GROUP_FILE: &core::ffi::CStr = c"/etc/group";
+
+#[derive(Clone, Copy, Debug)]
+struct DestBuffer {
+    ptr: *mut u8,
+    len: usize,
+}
+
+// Shamelessly stolen from pwd/mod.rs
+#[derive(Debug)]
+enum MaybeAllocated {
+    Owned(Pin<Box<[u8]>>),
+    Borrowed(DestBuffer),
+}
+impl Deref for MaybeAllocated {
+    type Target = [u8];
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            MaybeAllocated::Owned(boxed) => boxed,
+            MaybeAllocated::Borrowed(dst) => unsafe {
+                core::slice::from_raw_parts(dst.ptr, dst.len)
+            },
+        }
+    }
+}
+impl DerefMut for MaybeAllocated {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            MaybeAllocated::Owned(boxed) => boxed,
+            MaybeAllocated::Borrowed(dst) => unsafe {
+                core::slice::from_raw_parts_mut(dst.ptr, dst.len)
+            },
+        }
+    }
+}
+
+static mut GROUP_BUF: Option<MaybeAllocated> = None;
+static mut GROUP: group = group {
+    gr_name: ptr::null_mut(),
+    gr_passwd: ptr::null_mut(),
+    gr_gid: 0,
+    gr_mem: ptr::null_mut(),
+};
+
+static LINE_READER: SyncUnsafeCell<Option<Lines<BufReader<File>>>> = SyncUnsafeCell::new(None);
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/grp.h.html>.
+#[repr(C)]
+#[derive(Debug)]
+pub struct group {
+    pub gr_name: *mut c_char,
+    pub gr_passwd: *mut c_char,
+    pub gr_gid: gid_t,
+    pub gr_mem: *mut *mut c_char,
+}
+
+#[derive(Debug)]
+enum Error {
+    EOF,
+    SyntaxError,
+    BufTooSmall,
+    Misc(io::Error),
+    FromUtf8Error(FromUtf8Error),
+    ParseIntError(ParseIntError),
+    Other,
+}
+
+#[derive(Debug)]
+struct OwnedGrp {
+    buffer: MaybeAllocated,
+    reference: group,
+}
+
+impl OwnedGrp {
+    fn into_global(self) -> *mut group {
+        unsafe {
+            GROUP_BUF = Some(self.buffer);
+            GROUP = self.reference;
+            &raw mut GROUP
+        }
+    }
+}
+
+fn split(buf: &mut [u8]) -> Option<group> {
+    let gr_gid = match buf[0..mem::size_of::<gid_t>()].try_into() {
+        Ok(buf) => gid_t::from_ne_bytes(buf),
+        Err(err) => return None,
+    };
+
+    // Get address of buffer for fixing up gr_mem
+    let buf_addr = buf.as_ptr() as usize;
+
+    // We moved the gid to the beginning of the byte buffer so we can do this.
+    let mut parts = buf[mem::size_of::<gid_t>()..].split_mut(|&c| c == b'\0');
+    let gr_name = parts.next()?.as_mut_ptr().cast::<c_char>();
+    let gr_passwd = parts.next()?.as_mut_ptr().cast::<c_char>();
+    let gr_mem = parts.next()?.as_mut_ptr().cast::<usize>();
+
+    // Adjust gr_mem address by buffer base address
+    // TODO: max group members length?
+    for i in 0..4096 {
+        unsafe {
+            if *gr_mem.add(i) == 0 {
+                // End of gr_mem pointer array
+                break;
+            }
+            *gr_mem.add(i) += buf_addr;
+        }
+    }
+
+    Some(group {
+        gr_name,
+        gr_passwd,
+        gr_gid,
+        gr_mem: gr_mem.cast::<*mut c_char>(),
+    })
+}
+
+fn parse_grp(line: String, destbuf: Option<DestBuffer>) -> Result<OwnedGrp, Error> {
+    let buffer = line.to_owned().into_bytes();
+
+    let mut buffer = buffer
+        .into_iter()
+        .map(|i| if i == SEPARATOR as u8 { b'\0' } else { i })
+        .chain([b'\0'])
+        .collect::<Vec<_>>();
+    let mut buffer = buffer.split_mut(|i| *i == b'\0');
+
+    let strings = {
+        let mut vec: Vec<u8> = Vec::new();
+
+        let gr_name = buffer.next().ok_or(Error::EOF)?.to_vec();
+        let gr_passwd = buffer.next().ok_or(Error::EOF)?.to_vec();
+        let gr_gid = String::from_utf8(buffer.next().ok_or(Error::EOF)?.to_vec())
+            .map_err(Error::FromUtf8Error)?
+            .parse::<gid_t>()
+            .map_err(Error::ParseIntError)?;
+
+        // Place the gid at the beginning of the byte buffer to make getting it back out again later, much faster.
+
+        vec.extend(gr_gid.to_ne_bytes());
+        vec.extend(gr_name);
+        vec.push(0);
+        vec.extend(gr_passwd);
+        vec.push(0);
+
+        let members = buffer.next().ok_or(Error::EOF)?;
+
+        // Get the offset of the members array
+        let member_array_start = vec.len();
+
+        // Push enough null pointers to fit all members
+        for _member in members
+            .split(|b| *b == b',')
+            .filter(|member| !member.is_empty())
+        {
+            vec.extend(0usize.to_ne_bytes());
+        }
+        let member_array_end = vec.len();
+        // Push a null pointer to terminate the members array
+        vec.extend(0usize.to_ne_bytes());
+
+        // Fill in member names
+        for (i, member) in members
+            .split(|b| *b == b',')
+            .filter(|member| !member.is_empty())
+            .enumerate()
+        {
+            let cur_offset = vec.len();
+
+            // This must be recomputed each time, because `vec` is undergoing extensions and so
+            // its backing memory might be reallocated and moved and its old memory deallocated.
+            let member_array = &mut vec[member_array_start..member_array_end];
+            let member_ptr = {
+                const SIZEOF_PTR: usize = mem::size_of::<*mut c_void>();
+                let start = i * SIZEOF_PTR;
+                let end = start + SIZEOF_PTR;
+                &mut member_array[start..end]
+            };
+
+            // Store offset to start of member, MUST BE ADJUSTED LATER BASED ON THE ADDRESS OF THE BUFFER
+            member_ptr.copy_from_slice(&cur_offset.to_ne_bytes());
+
+            vec.extend(member);
+            vec.push(0);
+        }
+
+        vec
+    };
+
+    let mut buffer = match destbuf {
+        None => MaybeAllocated::Owned(Box::into_pin(strings.into_boxed_slice())),
+        Some(buf) => {
+            let mut buf = MaybeAllocated::Borrowed(buf);
+
+            if buf.len() < strings.len() {
+                platform::ERRNO.set(errno::ERANGE);
+                return Err(Error::BufTooSmall);
+            }
+
+            buf[..strings.len()].copy_from_slice(&strings);
+            buf
+        }
+    };
+    let reference = split(&mut buffer).ok_or(Error::Other)?;
+
+    Ok(OwnedGrp { buffer, reference })
+}
+
+/// MT-Unsafe race:grgid locale
+///
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getgrgid.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getgrgid(gid: gid_t) -> *mut group {
+    let Ok(db) = File::open(GROUP_FILE.into(), fcntl::O_RDONLY) else {
+        return ptr::null_mut();
+    };
+
+    for line in BufReader::new(db).lines() {
+        let Ok(line) = line else {
+            return ptr::null_mut();
+        };
+        let Ok(grp) = parse_grp(line, None) else {
+            return ptr::null_mut();
+        };
+
+        if grp.reference.gr_gid == gid {
+            return grp.into_global();
+        }
+    }
+
+    ptr::null_mut()
+}
+
+/// MT-Unsafe race:grnam locale
+///
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getgrnam.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getgrnam(name: *const c_char) -> *mut group {
+    let Ok(db) = File::open(GROUP_FILE.into(), fcntl::O_RDONLY) else {
+        return ptr::null_mut();
+    };
+
+    for line in BufReader::new(db).lines() {
+        let Ok(line) = line else {
+            return ptr::null_mut();
+        };
+
+        let Ok(grp) = parse_grp(line, None) else {
+            return ptr::null_mut();
+        };
+
+        // Attempt to prevent BO vulnerabilities
+        if unsafe {
+            strncmp(
+                grp.reference.gr_name,
+                name,
+                strlen(grp.reference.gr_name).min(strlen(name)),
+            ) == 0
+        } {
+            return grp.into_global();
+        }
+    }
+
+    ptr::null_mut()
+}
+
+/// MT-Safe locale
+///
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getgrgid_r.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getgrgid_r(
+    gid: gid_t,
+    result_buf: *mut group,
+    buffer: *mut c_char,
+    buflen: usize,
+    result: *mut *mut group,
+) -> c_int {
+    // In case of error or the requested entry is not found.
+    unsafe {
+        *result = ptr::null_mut();
+    }
+
+    let Ok(db) = File::open(GROUP_FILE.into(), fcntl::O_RDONLY) else {
+        return ENOENT;
+    };
+
+    for line in BufReader::new(db).lines() {
+        let Ok(line) = line else { return EINVAL };
+        let grp = match parse_grp(
+            line,
+            Some(DestBuffer {
+                ptr: buffer.cast::<u8>(),
+                len: buflen,
+            }),
+        ) {
+            Ok(grp) => grp,
+            Err(err) => {
+                return match err {
+                    Error::BufTooSmall => ERANGE,
+                    Error::EOF
+                    | Error::SyntaxError
+                    | Error::FromUtf8Error(_)
+                    | Error::ParseIntError(_)
+                    | Error::Other => EINVAL,
+                    Error::Misc(io_err) => match io_err.kind() {
+                        io::ErrorKind::InvalidData | io::ErrorKind::UnexpectedEof => EINVAL,
+                        io::ErrorKind::NotFound => ENOENT,
+                        _ => EIO,
+                    },
+                };
+            }
+        };
+
+        if grp.reference.gr_gid == gid {
+            unsafe {
+                *result_buf = grp.reference;
+                *result = result_buf;
+            }
+
+            return 0;
+        }
+    }
+
+    // The requested entry was not found.
+    0
+}
+
+/// MT-Safe locale
+///
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getgrnam_r.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getgrnam_r(
+    name: *const c_char,
+    result_buf: *mut group,
+    buffer: *mut c_char,
+    buflen: usize,
+    result: *mut *mut group,
+) -> c_int {
+    let Ok(db) = File::open(GROUP_FILE.into(), fcntl::O_RDONLY) else {
+        return ENOENT;
+    };
+
+    for line in BufReader::new(db).lines() {
+        let Ok(line) = line else { return EINVAL };
+        let Ok(grp) = parse_grp(
+            line,
+            Some(DestBuffer {
+                ptr: buffer.cast::<u8>(),
+                len: buflen,
+            }),
+        ) else {
+            return EINVAL;
+        };
+
+        if unsafe {
+            strncmp(
+                grp.reference.gr_name,
+                name,
+                strlen(grp.reference.gr_name).min(strlen(name)),
+            ) == 0
+        } {
+            unsafe {
+                *result_buf = grp.reference;
+                *result = result_buf;
+            }
+
+            return 0;
+        }
+    }
+
+    ENOENT
+}
+
+/// MT-Unsafe race:grent race:grentbuf locale
+///
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endgrent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getgrent() -> *mut group {
+    let mut line_reader = unsafe { &mut *LINE_READER.get() };
+
+    if line_reader.is_none() {
+        let Ok(db) = File::open(GROUP_FILE.into(), fcntl::O_RDONLY) else {
+            return ptr::null_mut();
+        };
+        *line_reader = Some(BufReader::new(db).lines());
+    }
+
+    if let Some(lines) = line_reader.deref_mut() {
+        let Some(line) = lines.next() else {
+            return ptr::null_mut();
+        };
+        let Ok(line) = line else {
+            return ptr::null_mut();
+        };
+
+        if let Ok(grp) = parse_grp(line, None) {
+            grp.into_global()
+        } else {
+            ptr::null_mut()
+        }
+    } else {
+        ptr::null_mut()
+    }
+}
+
+/// MT-Unsafe race:grent locale
+///
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endgrent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn endgrent() {
+    unsafe {
+        *(&mut *LINE_READER.get()) = None;
+    }
+}
+
+/// MT-Unsafe race:grent locale
+///
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endgrent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setgrent() {
+    let line_reader = unsafe { &mut *LINE_READER.get() };
+    let Ok(db) = File::open(GROUP_FILE.into(), fcntl::O_RDONLY) else {
+        return;
+    };
+    *line_reader = Some(BufReader::new(db).lines());
+}
+
+/// MT-Safe locale
+/// Not POSIX
+///
+/// See <https://www.man7.org/linux/man-pages/man3/getgrouplist.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getgrouplist(
+    user: *const c_char,
+    group: gid_t,
+    groups: *mut gid_t,
+    ngroups: *mut c_int,
+) -> c_int {
+    let grps = unsafe {
+        slice::from_raw_parts_mut(groups.cast::<MaybeUninit<gid_t>>(), ngroups.read() as usize)
+    };
+
+    // FIXME: This API probably expects the group database to already exist in memory, as it
+    // doesn't seem to have any documented error handling.
+
+    let Ok(user) = (unsafe { crate::c_str::CStr::from_ptr(user).to_str() }) else {
+        return 0;
+    };
+
+    let Ok(db) = File::open(GROUP_FILE.into(), fcntl::O_RDONLY) else {
+        return 0;
+    };
+
+    let mut groups_found: c_int = 0;
+
+    for line in BufReader::new(db).lines() {
+        let Ok(line) = line else {
+            return 0;
+        };
+
+        let mut parts = line.split(SEPARATOR);
+
+        let group_name = parts.next().unwrap_or("");
+        let group_password = parts.next().unwrap_or("");
+        let group_id = parts.next().unwrap_or("-1").parse::<c_int>().unwrap();
+        let members = parts
+            .next()
+            .unwrap_or("")
+            .split(",")
+            .map(|i| i.trim())
+            .collect::<Vec<_>>();
+
+        if !members.contains(&user) {
+            continue;
+        }
+
+        if let Some(dst) = grps.get_mut(groups_found as usize) {
+            dst.write(group_id);
+        }
+
+        groups_found = match groups_found.checked_add(1) {
+            Some(g) => g,
+            None => break,
+        };
+    }
+
+    unsafe {
+        ngroups.write(groups_found);
+    }
+
+    if groups_found as usize > grps.len() {
+        -1
+    } else {
+        groups_found
+    }
+}
+
+/// MT-Safe locale
+/// Not POSIX
+///
+/// See <https://www.man7.org/linux/man-pages/man3/initgroups.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn initgroups(user: *const c_char, gid: gid_t) -> c_int {
+    let mut groups = [0; limits::NGROUPS_MAX];
+    let mut count = groups.len() as c_int;
+    if unsafe { getgrouplist(user, gid, groups.as_mut_ptr(), &raw mut count) < 0 } {
+        return -1;
+    }
+    unsafe { setgroups(count as size_t, groups.as_ptr()) }
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man2/setgroups.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setgroups(size: size_t, list: *const gid_t) -> c_int {
+    unsafe { Sys::setgroups(size, list) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/ifaddrs/cbindgen.toml b/recipes/core/relibc/src/header/ifaddrs/cbindgen.toml
new file mode 100644
index 0000000000..b507c6f75f
--- /dev/null
+++ b/recipes/core/relibc/src/header/ifaddrs/cbindgen.toml
@@ -0,0 +1,17 @@
+# netinet/in.h brings in sys/socket.h
+sys_includes = ["features.h", "netinet/in.h"]
+include_guard = "_RELIBC_IFADDRS_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+trailer = """
+#define ifa_broadaddr ifa_ifu.ifu_broadaddr
+#define ifa_dstaddr ifa_ifu.ifu_dstaddr
+"""
+
+[export.rename]
+"sockaddr" = "struct sockaddr"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/ifaddrs/mod.rs b/recipes/core/relibc/src/header/ifaddrs/mod.rs
new file mode 100644
index 0000000000..bddb69b858
--- /dev/null
+++ b/recipes/core/relibc/src/header/ifaddrs/mod.rs
@@ -0,0 +1,44 @@
+//! `ifaddrs.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getifaddrs.3.html>.
+
+use crate::{
+    header::{errno, stdlib, sys_socket::sockaddr},
+    platform::{
+        self,
+        types::{c_char, c_int, c_uint, c_void},
+    },
+};
+
+#[repr(C)]
+union ifaddrs_ifa_ifu {
+    ifu_broadaddr: *mut sockaddr,
+    ifu_dstaddr: *mut sockaddr,
+}
+
+#[repr(C)]
+pub struct ifaddrs {
+    ifa_next: *mut ifaddrs,
+    ifa_name: *mut c_char,
+    ifa_flags: c_uint,
+    ifa_addr: *mut sockaddr,
+    ifa_netmask: *mut sockaddr,
+    ifa_ifu: ifaddrs_ifa_ifu,
+    ifa_data: *mut c_void,
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn freeifaddrs(mut ifa: *mut ifaddrs) {
+    while !ifa.is_null() {
+        let next = unsafe { (*ifa).ifa_next };
+        unsafe { stdlib::free(ifa.cast()) };
+        ifa = next;
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getifaddrs(ifap: *mut *mut ifaddrs) -> c_int {
+    //TODO: implement getifaddrs
+    platform::ERRNO.set(errno::ENOSYS);
+    -1
+}
diff --git a/recipes/core/relibc/src/header/inttypes/cbindgen.toml b/recipes/core/relibc/src/header/inttypes/cbindgen.toml
new file mode 100644
index 0000000000..568f0cd552
--- /dev/null
+++ b/recipes/core/relibc/src/header/inttypes/cbindgen.toml
@@ -0,0 +1,213 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/inttypes.h.html
+#
+# Spec quotations relating to includes:
+# - "The <inttypes.h> header shall include the <stdint.h> header."
+# - "wchar_t As described in <stddef.h>."
+#
+# wchar.h brings in both stdint.h and stddef.h
+sys_includes = ["wchar.h"]
+include_guard = "_RELIBC_INTTYPES_H"
+trailer = """
+#ifndef _RELIBC_BITS_INTTYPES_H
+#define _RELIBC_BITS_INTTYPES_H
+
+#define PRId8  "hhd"
+#define PRId16 "hd"
+#define PRId32 "d"
+#define PRId64 "ld"
+
+#define PRIdLEAST8  "hhd"
+#define PRIdLEAST16 "hd"
+#define PRIdLEAST32 "d"
+#define PRIdLEAST64 "ld"
+
+#define PRIdFAST8  "hhd"
+#define PRIdFAST16 "hd"
+#define PRIdFAST32 "d"
+#define PRIdFAST64 "ld"
+
+#define PRIi8  "hhi"
+#define PRIi16 "hi"
+#define PRIi32 "i"
+#define PRIi64 "li"
+
+#define PRIiLEAST8  "hhi"
+#define PRIiLEAST16 "hi"
+#define PRIiLEAST32 "i"
+#define PRIiLEAST64 "li"
+
+#define PRIiFAST8  "hhi"
+#define PRIiFAST16 "hi"
+#define PRIiFAST32 "i"
+#define PRIiFAST64 "li"
+
+#define PRIo8  "hho"
+#define PRIo16 "ho"
+#define PRIo32 "o"
+#define PRIo64 "lo"
+
+#define PRIoLEAST8  "hho"
+#define PRIoLEAST16 "ho"
+#define PRIoLEAST32 "o"
+#define PRIoLEAST64 "lo"
+
+#define PRIoFAST8  "hho"
+#define PRIoFAST16 "ho"
+#define PRIoFAST32 "o"
+#define PRIoFAST64 "lo"
+
+#define PRIu8  "hhu"
+#define PRIu16 "hu"
+#define PRIu32 "u"
+#define PRIu64 "lu"
+
+#define PRIuLEAST8  "hhu"
+#define PRIuLEAST16 "hu"
+#define PRIuLEAST32 "u"
+#define PRIuLEAST64 "lu"
+
+#define PRIuFAST8  "hhu"
+#define PRIuFAST16 "hu"
+#define PRIuFAST32 "u"
+#define PRIuFAST64 "lu"
+
+#define PRIx8  "hhx"
+#define PRIx16 "hx"
+#define PRIx32 "x"
+#define PRIx64 "lx"
+
+#define PRIxLEAST8  "hhx"
+#define PRIxLEAST16 "hx"
+#define PRIxLEAST32 "x"
+#define PRIxLEAST64 "lx"
+
+#define PRIxFAST8  "hhx"
+#define PRIxFAST16 "hx"
+#define PRIxFAST32 "x"
+#define PRIxFAST64 "lx"
+
+#define PRIX8  "hhX"
+#define PRIX16 "hX"
+#define PRIX32 "X"
+#define PRIX64 "lX"
+
+#define PRIXLEAST8  "hhX"
+#define PRIXLEAST16 "hX"
+#define PRIXLEAST32 "X"
+#define PRIXLEAST64 "lX"
+
+#define PRIXFAST8  "hhX"
+#define PRIXFAST16 "hX"
+#define PRIXFAST32 "X"
+#define PRIXFAST64 "lX"
+
+#define PRIdMAX "jd"
+#define PRIiMAX "ji"
+#define PRIoMAX "jo"
+#define PRIuMAX "ju"
+#define PRIxMAX "jx"
+#define PRIXMAX "jX"
+
+#define PRIdPTR "td"
+#define PRIiPTR "ti"
+#define PRIoPTR "to"
+#define PRIuPTR "tu"
+#define PRIxPTR "tx"
+#define PRIXPTR "tX"
+
+#define SCNd8  PRId8
+#define SCNd16 PRId16
+#define SCNd32 PRId32
+#define SCNd64 PRId64
+
+#define SCNdLEAST8  PRIdLEAST8
+#define SCNdLEAST16 PRIdLEAST16
+#define SCNdLEAST32 PRIdLEAST32
+#define SCNdLEAST64 PRIdLEAST64
+
+#define SCNdFAST8  PRIdFAST8
+#define SCNdFAST16 PRIdFAST16
+#define SCNdFAST32 PRIdFAST32
+#define SCNdFAST64 PRIdFAST64
+
+#define SCNi8  PRIi8
+#define SCNi16 PRIi16
+#define SCNi32 PRIi32
+#define SCNi64 PRIi64
+
+#define SCNiLEAST8  PRIiLEAST8
+#define SCNiLEAST16 PRIiLEAST16
+#define SCNiLEAST32 PRIiLEAST32
+#define SCNiLEAST64 PRIiLEAST64
+
+#define SCNiFAST8  PRIiFAST8
+#define SCNiFAST16 PRIiFAST16
+#define SCNiFAST32 PRIiFAST32
+#define SCNiFAST64 PRIiFAST64
+
+#define SCNo8  PRIo8
+#define SCNo16 PRIo16
+#define SCNo32 PRIo32
+#define SCNo64 PRIo64
+
+#define SCNoLEAST8  PRIoLEAST8
+#define SCNoLEAST16 PRIoLEAST16
+#define SCNoLEAST32 PRIoLEAST32
+#define SCNoLEAST64 PRIoLEAST64
+
+#define SCNoFAST8  PRIoFAST8
+#define SCNoFAST16 PRIoFAST16
+#define SCNoFAST32 PRIoFAST32
+#define SCNoFAST64 PRIoFAST64
+
+#define SCNu8  PRIu8
+#define SCNu16 PRIu16
+#define SCNu32 PRIu32
+#define SCNu64 PRIu64
+
+#define SCNuLEAST8  PRIuLEAST8
+#define SCNuLEAST16 PRIuLEAST16
+#define SCNuLEAST32 PRIuLEAST32
+#define SCNuLEAST64 PRIuLEAST64
+
+#define SCNuFAST8  PRIuFAST8
+#define SCNuFAST16 PRIuFAST16
+#define SCNuFAST32 PRIuFAST32
+#define SCNuFAST64 PRIuFAST64
+
+#define SCNx8  PRIx8
+#define SCNx16 PRIx16
+#define SCNx32 PRIx32
+#define SCNx64 PRIx64
+
+#define SCNxLEAST8  PRIxLEAST8
+#define SCNxLEAST16 PRIxLEAST16
+#define SCNxLEAST32 PRIxLEAST32
+#define SCNxLEAST64 PRIxLEAST64
+
+#define SCNxFAST8  PRIxFAST8
+#define SCNxFAST16 PRIxFAST16
+#define SCNxFAST32 PRIxFAST32
+#define SCNxFAST64 PRIxFAST64
+
+#define SCNdMAX PRIdMAX
+#define SCNiMAX PRIiMAX
+#define SCNoMAX PRIoMAX
+#define SCNuMAX PRIuMAX
+#define SCNxMAX PRIxMAX
+
+#define SCNdPTR PRIdPTR
+#define SCNiPTR PRIiPTR
+#define SCNoPTR PRIoPTR
+#define SCNuPTR PRIuPTR
+#define SCNxPTR PRIxPTR
+
+#endif // _RELIBC_BITS_INTTYPES_H
+"""
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/inttypes/mod.rs b/recipes/core/relibc/src/header/inttypes/mod.rs
new file mode 100644
index 0000000000..29eff295dd
--- /dev/null
+++ b/recipes/core/relibc/src/header/inttypes/mod.rs
@@ -0,0 +1,103 @@
+//! `inttypes.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/inttypes.h.html>.
+
+use crate::{
+    header::{
+        ctype::{self, isspace},
+        errno::{EINVAL, ERANGE},
+        stdlib::{convert_hex, convert_integer, convert_octal, detect_base, is_positive},
+    },
+    platform::{
+        self,
+        types::{c_char, c_int, c_long, intmax_t, uintmax_t, wchar_t},
+    },
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/imaxabs.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn imaxabs(i: intmax_t) -> intmax_t {
+    i.abs()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/inttypes.h.html>.
+#[repr(C)]
+pub struct imaxdiv_t {
+    quot: intmax_t,
+    rem: intmax_t,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/imaxdiv.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn imaxdiv(i: intmax_t, j: intmax_t) -> imaxdiv_t {
+    imaxdiv_t {
+        quot: i / j,
+        rem: i % j,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtoimax.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtoimax(
+    s: *const c_char,
+    endptr: *mut *mut c_char,
+    base: c_int,
+) -> intmax_t {
+    strto_impl!(
+        intmax_t,
+        false,
+        intmax_t::MAX,
+        intmax_t::MIN,
+        s,
+        endptr,
+        base
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtoimax.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtoumax(
+    s: *const c_char,
+    endptr: *mut *mut c_char,
+    base: c_int,
+) -> uintmax_t {
+    strto_impl!(
+        uintmax_t,
+        false,
+        uintmax_t::MAX,
+        uintmax_t::MIN,
+        s,
+        endptr,
+        base
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcstoimax.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcstoimax(
+    mut ptr: *const wchar_t,
+    end: *mut *mut wchar_t,
+    base: c_int,
+) -> intmax_t {
+    skipws!(ptr);
+    let result = strto_impl!(intmax_t, ptr, base);
+    if !end.is_null() {
+        unsafe { *end = ptr.cast_mut() };
+    }
+    result
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcstoimax.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcstoumax(
+    mut ptr: *const wchar_t,
+    end: *mut *mut wchar_t,
+    base: c_int,
+) -> uintmax_t {
+    skipws!(ptr);
+    let result = strtou_impl!(uintmax_t, ptr, base);
+    if !end.is_null() {
+        unsafe { *end = ptr.cast_mut() };
+    }
+    result
+}
diff --git a/recipes/core/relibc/src/header/langinfo/cbindgen.toml b/recipes/core/relibc/src/header/langinfo/cbindgen.toml
new file mode 100644
index 0000000000..993abcb8ed
--- /dev/null
+++ b/recipes/core/relibc/src/header/langinfo/cbindgen.toml
@@ -0,0 +1,10 @@
+sys_includes = ["stddef.h", "stdint.h", "features.h"]
+include_guard = "_RELIBC_LANGINFO_H"
+after_includes = "#include <bits/locale-t.h> // locale_t"
+language = "C"
+style = "tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/langinfo/mod.rs b/recipes/core/relibc/src/header/langinfo/mod.rs
new file mode 100644
index 0000000000..8f1eb6f81d
--- /dev/null
+++ b/recipes/core/relibc/src/header/langinfo/mod.rs
@@ -0,0 +1,225 @@
+//! `langinfo.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/langinfo.h.html>.
+
+// TODO : involve loading locale data. Currently, the implementation only supports the "C" locale.
+
+use crate::header::bits_locale_t::locale_t;
+use core::ffi::c_char;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/langinfo.h.html>.
+///
+/// POSIX type for items used with `nl_langinfo`
+/// In practice, this is an integer index into the string table.
+pub type nl_item = i32;
+
+// Static string table for langinfo constants
+static STRING_TABLE: [&[u8]; 81] = [
+    b"UTF-8\0",                // CODESET
+    b"%a %b %e %H:%M:%S %Y\0", // D_T_FMT
+    b"%m/%d/%y\0",             // D_FMT
+    b"%H:%M:%S\0",             // T_FMT
+    b"%I:%M:%S %p\0",          // T_FMT_AMPM
+    b"AM\0",                   // AM_STR
+    b"PM\0",                   // PM_STR
+    b"Sunday\0",               // DAY_1
+    b"Monday\0",               // DAY_2
+    b"Tuesday\0",              // DAY_3
+    b"Wednesday\0",            // DAY_4
+    b"Thursday\0",             // DAY_5
+    b"Friday\0",               // DAY_6
+    b"Saturday\0",             // DAY_7
+    b"Sun\0",                  // ABDAY_1
+    b"Mon\0",                  // ABDAY_2
+    b"Tue\0",                  // ABDAY_3
+    b"Wed\0",                  // ABDAY_4
+    b"Thu\0",                  // ABDAY_5
+    b"Fri\0",                  // ABDAY_6
+    b"Sat\0",                  // ABDAY_7
+    b"January\0",              // MON_1
+    b"February\0",             // MON_2
+    b"March\0",                // MON_3
+    b"April\0",                // MON_4
+    b"May\0",                  // MON_5
+    b"June\0",                 // MON_6
+    b"July\0",                 // MON_7
+    b"August\0",               // MON_8
+    b"September\0",            // MON_9
+    b"October\0",              // MON_10
+    b"November\0",             // MON_11
+    b"December\0",             // MON_12
+    b"Jan\0",                  // ABMON_1
+    b"Feb\0",                  // ABMON_2
+    b"Mar\0",                  // ABMON_3
+    b"Apr\0",                  // ABMON_4
+    b"May\0",                  // ABMON_5
+    b"Jun\0",                  // ABMON_6
+    b"Jul\0",                  // ABMON_7
+    b"Aug\0",                  // ABMON_8
+    b"Sep\0",                  // ABMON_9
+    b"Oct\0",                  // ABMON_10
+    b"Nov\0",                  // ABMON_11
+    b"Dec\0",                  // ABMON_12
+    b"\0",                     // ERA
+    b"\0",                     // ERA_D_FMT
+    b"\0",                     // ERA_D_T_FMT
+    b"\0",                     // ERA_T_FMT
+    b"\0",                     // ALT_DIGITS
+    b".\0",                    // RADIXCHAR
+    b"\0",                     // THOUSEP
+    b"^[yY]\0",                // YESEXPR
+    b"^[nN]\0",                // NOEXPR
+    b"yes\0",                  // YESSTR
+    b"no\0",                   // NOSTR
+    b".\0",                    // CRNCYSTR
+    // Some languages have alternative names for
+    // months. For the "C" locale, we just use one.
+    b"January\0",   // ALTMON_1
+    b"February\0",  // ALTMON_2
+    b"March\0",     // ALTMON_3
+    b"April\0",     // ALTMON_4
+    b"May\0",       // ALTMON_5
+    b"June\0",      // ALTMON_6
+    b"July\0",      // ALTMON_7
+    b"August\0",    // ALTMON_8
+    b"September\0", // ALTMON_9
+    b"October\0",   // ALTMON_10
+    b"November\0",  // ALTMON_11
+    b"December\0",  // ALTMON_12
+    b"Jan\0",       // ABALTMON_1
+    b"Feb\0",       // ABALTMON_2
+    b"Mar\0",       // ABALTMON_3
+    b"Apr\0",       // ABALTMON_4
+    b"May\0",       // ABALTMON_5
+    b"Jun\0",       // ABALTMON_6
+    b"Jul\0",       // ABALTMON_7
+    b"Aug\0",       // ABALTMON_8
+    b"Sep\0",       // ABALTMON_9
+    b"Oct\0",       // ABALTMON_10
+    b"Nov\0",       // ABALTMON_11
+    b"Dec\0",       // ABALTMON_12
+];
+
+// Item constants
+pub const CODESET: nl_item = 0;
+pub const D_T_FMT: nl_item = 1;
+pub const D_FMT: nl_item = 2;
+pub const T_FMT: nl_item = 3;
+pub const T_FMT_AMPM: nl_item = 4;
+pub const AM_STR: nl_item = 5;
+pub const PM_STR: nl_item = 6;
+
+pub const DAY_1: nl_item = 7;
+pub const DAY_2: nl_item = 8;
+pub const DAY_3: nl_item = 9;
+pub const DAY_4: nl_item = 10;
+pub const DAY_5: nl_item = 11;
+pub const DAY_6: nl_item = 12;
+pub const DAY_7: nl_item = 13;
+
+pub const ABDAY_1: nl_item = 14;
+pub const ABDAY_2: nl_item = 15;
+pub const ABDAY_3: nl_item = 16;
+pub const ABDAY_4: nl_item = 17;
+pub const ABDAY_5: nl_item = 18;
+pub const ABDAY_6: nl_item = 19;
+pub const ABDAY_7: nl_item = 20;
+
+pub const MON_1: nl_item = 21;
+pub const MON_2: nl_item = 22;
+pub const MON_3: nl_item = 23;
+pub const MON_4: nl_item = 24;
+pub const MON_5: nl_item = 25;
+pub const MON_6: nl_item = 26;
+pub const MON_7: nl_item = 27;
+pub const MON_8: nl_item = 28;
+pub const MON_9: nl_item = 29;
+pub const MON_10: nl_item = 30;
+pub const MON_11: nl_item = 31;
+pub const MON_12: nl_item = 32;
+
+pub const ABMON_1: nl_item = 33;
+pub const ABMON_2: nl_item = 34;
+pub const ABMON_3: nl_item = 35;
+pub const ABMON_4: nl_item = 36;
+pub const ABMON_5: nl_item = 37;
+pub const ABMON_6: nl_item = 38;
+pub const ABMON_7: nl_item = 39;
+pub const ABMON_8: nl_item = 40;
+pub const ABMON_9: nl_item = 41;
+pub const ABMON_10: nl_item = 42;
+pub const ABMON_11: nl_item = 43;
+pub const ABMON_12: nl_item = 44;
+
+pub const ERA: nl_item = 45;
+pub const ERA_D_FMT: nl_item = 46;
+pub const ERA_D_T_FMT: nl_item = 47;
+pub const ERA_T_FMT: nl_item = 48;
+pub const ALT_DIGITS: nl_item = 49;
+pub const RADIXCHAR: nl_item = 50;
+pub const THOUSEP: nl_item = 51;
+pub const YESEXPR: nl_item = 52;
+pub const NOEXPR: nl_item = 53;
+pub const YESSTR: nl_item = 54; // Legacy
+pub const NOSTR: nl_item = 55; // Legacy
+pub const CRNCYSTR: nl_item = 56;
+
+pub const ALTMON_1: nl_item = 57;
+pub const ALTMON_2: nl_item = 58;
+pub const ALTMON_3: nl_item = 59;
+pub const ALTMON_4: nl_item = 60;
+pub const ALTMON_5: nl_item = 61;
+pub const ALTMON_6: nl_item = 62;
+pub const ALTMON_7: nl_item = 63;
+pub const ALTMON_8: nl_item = 64;
+pub const ALTMON_9: nl_item = 65;
+pub const ALTMON_10: nl_item = 66;
+pub const ALTMON_11: nl_item = 67;
+pub const ALTMON_12: nl_item = 68;
+
+pub const ABALTMON_1: nl_item = 69;
+pub const ABALTMON_2: nl_item = 70;
+pub const ABALTMON_3: nl_item = 71;
+pub const ABALTMON_4: nl_item = 72;
+pub const ABALTMON_5: nl_item = 73;
+pub const ABALTMON_6: nl_item = 74;
+pub const ABALTMON_7: nl_item = 75;
+pub const ABALTMON_8: nl_item = 76;
+pub const ABALTMON_9: nl_item = 77;
+pub const ABALTMON_10: nl_item = 78;
+pub const ABALTMON_11: nl_item = 79;
+pub const ABALTMON_12: nl_item = 80;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/nl_langinfo.html>.
+///
+/// Get a string from the langinfo table
+///
+/// # Safety
+/// - Caller must ensure `item` is a valid `nl_item` index.
+/// - Returns a pointer to a null-terminated string, or an empty string if the item is invalid.
+/// - Compatibility requires mutable pointer to be returned, but it should not be mutated!
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn nl_langinfo(item: nl_item) -> *mut c_char {
+    // Validate the item and perform the lookup
+    let ptr = if (item as usize) < STRING_TABLE.len() {
+        STRING_TABLE[item as usize].as_ptr().cast::<c_char>()
+    } else {
+        // Return a pointer to an empty string if the item is invalid
+        c"".as_ptr().cast::<c_char>()
+    };
+    // Mutable pointer is required (unsafe!)
+    ptr.cast_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/nl_langinfo_l.html>.
+///
+/// Get a string from the langinfo table
+///
+/// # Safety
+/// - Caller must ensure `item` is a valid `nl_item` index.
+/// - Returns a pointer to a null-terminated string, or an empty string if the item is invalid.
+/// - Compatibility requires mutable pointer to be returned, but it should not be mutated!
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn nl_langinfo_l(item: nl_item, _loc: locale_t) -> *mut c_char {
+    unsafe { nl_langinfo(item) }
+}
diff --git a/recipes/core/relibc/src/header/libgen/cbindgen.toml b/recipes/core/relibc/src/header/libgen/cbindgen.toml
new file mode 100644
index 0000000000..0dfb9a44a7
--- /dev/null
+++ b/recipes/core/relibc/src/header/libgen/cbindgen.toml
@@ -0,0 +1,12 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/libgen.h.html
+#
+# There are no spec quotations relating to includes
+sys_includes = []
+include_guard = "_RELIBC_LIBGEN_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/libgen/mod.rs b/recipes/core/relibc/src/header/libgen/mod.rs
new file mode 100644
index 0000000000..a4e39c7584
--- /dev/null
+++ b/recipes/core/relibc/src/header/libgen/mod.rs
@@ -0,0 +1,55 @@
+//! `libgen.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/libgen.h.html>.
+
+use crate::platform::types::c_char;
+
+use crate::header::string::strlen;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/basename.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn basename(str: *mut c_char) -> *mut c_char {
+    if str.is_null() || unsafe { strlen(str) == 0 } {
+        return c".".as_ptr().cast_mut();
+    }
+    let mut end = unsafe { strlen(str) as isize - 1 };
+    while end >= 0 && unsafe { *str.offset(end) == b'/' as c_char } {
+        end -= 1;
+    }
+    if end == -1 {
+        return c"/".as_ptr().cast_mut();
+    }
+    let mut begin = end;
+    while begin >= 0 && unsafe { *str.offset(begin) != b'/' as c_char } {
+        begin -= 1;
+    }
+    unsafe {
+        *str.offset(end + 1) = 0;
+        str.offset(begin + 1).cast::<c_char>()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dirname.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn dirname(str: *mut c_char) -> *mut c_char {
+    if str.is_null() || unsafe { strlen(str) == 0 } {
+        return c".".as_ptr().cast_mut();
+    }
+    let mut end = unsafe { strlen(str) as isize - 1 };
+    while end > 0 && unsafe { *str.offset(end) == b'/' as c_char } {
+        end -= 1;
+    }
+    while end >= 0 && unsafe { *str.offset(end) != b'/' as c_char } {
+        end -= 1;
+    }
+    while end > 0 && unsafe { *str.offset(end) == b'/' as c_char } {
+        end -= 1;
+    }
+    if end == -1 {
+        return c".".as_ptr().cast_mut();
+    }
+    unsafe {
+        *str.offset(end + 1) = 0;
+    }
+    str
+}
diff --git a/recipes/core/relibc/src/header/limits/cbindgen.toml b/recipes/core/relibc/src/header/limits/cbindgen.toml
new file mode 100644
index 0000000000..bd3b52720e
--- /dev/null
+++ b/recipes/core/relibc/src/header/limits/cbindgen.toml
@@ -0,0 +1,12 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/limits.h.html
+#
+# There are no spec quotations relating to includes
+sys_includes = []
+include_guard = "_RELIBC_LIMITS_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/limits/mod.rs b/recipes/core/relibc/src/header/limits/mod.rs
new file mode 100644
index 0000000000..45c37f06ca
--- /dev/null
+++ b/recipes/core/relibc/src/header/limits/mod.rs
@@ -0,0 +1,131 @@
+//! `limits.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/limits.h.html>.
+
+use crate::platform::types::{
+    c_char, c_int, c_long, c_longlong, c_schar, c_short, c_uchar, c_uint, c_ulong, c_ulonglong,
+    c_ushort, ssize_t,
+};
+
+pub const NAME_MAX: usize = 255;
+pub const PASS_MAX: usize = 128;
+pub const PATH_MAX: usize = 4096;
+pub const NGROUPS_MAX: usize = 65536;
+
+pub const CHAR_BIT: u32 = 8;
+pub const WORD_BIT: u32 = 32;
+#[cfg(target_pointer_width = "32")]
+pub const LONG_BIT: u32 = 32;
+#[cfg(target_pointer_width = "64")]
+pub const LONG_BIT: u32 = 64;
+
+#[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
+pub const CHAR_MAX: c_char = 0xFF;
+#[cfg(not(any(target_arch = "aarch64", target_arch = "riscv64")))]
+pub const CHAR_MAX: c_char = 0x7F;
+pub const SCHAR_MAX: c_schar = 0x7F;
+pub const SHRT_MAX: c_short = 0x7FFF;
+pub const INT_MAX: c_int = 0x7FFF_FFFF;
+#[cfg(target_pointer_width = "32")]
+pub const LONG_MAX: c_long = 0x7FFF_FFFF;
+#[cfg(target_pointer_width = "64")]
+pub const LONG_MAX: c_long = 0x7FFF_FFFF_FFFF_FFFF;
+pub const LLONG_MAX: c_longlong = 0x7FFF_FFFF_FFFF_FFFF;
+#[cfg(target_pointer_width = "32")]
+pub const SSIZE_MAX: ssize_t = 0x7FFF_FFFF;
+#[cfg(target_pointer_width = "64")]
+pub const SSIZE_MAX: ssize_t = 0x7FFF_FFFF_FFFF_FFFF;
+pub const UCHAR_MAX: c_uchar = 0xFF;
+pub const USHRT_MAX: c_ushort = 0xFFFF;
+pub const UINT_MAX: c_uint = 0xFFFFFFFF;
+
+#[cfg(target_pointer_width = "32")]
+pub const ULONG_MAX: c_ulong = 0xFFFF_FFFF;
+#[cfg(target_pointer_width = "64")]
+pub const ULONG_MAX: c_ulong = 0xFFFF_FFFF_FFFF_FFFF;
+pub const ULLONG_MAX: c_ulonglong = 0xFFFF_FFFF_FFFF_FFFF;
+
+#[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
+pub const CHAR_MIN: c_char = 0;
+#[cfg(not(any(target_arch = "aarch64", target_arch = "riscv64")))]
+pub const CHAR_MIN: c_char = -0x80;
+pub const SCHAR_MIN: c_schar = -SCHAR_MAX - 1;
+pub const SHRT_MIN: c_short = -SHRT_MAX - 1;
+pub const INT_MIN: c_int = -INT_MAX - 1;
+pub const LONG_MIN: c_long = -LONG_MAX - 1;
+pub const LLONG_MIN: c_longlong = -LLONG_MAX - 1;
+
+// TODO: 4096 for most architectures as determined by a quick grep of musl's source; need a better
+// way to determine it for other archs or to hard code a value.
+#[cfg(target_os = "linux")]
+pub const PAGE_SIZE: usize = 4096;
+
+// These POSIX symbols must have these values regardless of OS
+pub const _POSIX_AIO_LISTIO_MAX: c_long = 2;
+pub const _POSIX_AIO_MAX: c_long = 1;
+pub const _POSIX_ARG_MAX: c_long = 4096;
+pub const _POSIX_CHILD_MAX: c_long = 25;
+pub const _POSIX_CLOCKRES_MIN: c_long = 20000000;
+pub const _POSIX_DELAYTIMER_MAX: c_long = 32;
+pub const _POSIX_HOST_NAME_MAX: c_long = 255;
+pub const _POSIX_LINK_MAX: c_long = 8;
+pub const _POSIX_LOGIN_NAME_MAX: c_long = 9;
+pub const _POSIX_MAX_CANON: c_long = 255;
+pub const _POSIX_MAX_INPUT: c_long = 255;
+pub const _POSIX_NAME_MAX: c_long = 14;
+pub const _POSIX_NGROUPS_MAX: c_long = 8;
+pub const _POSIX_OPEN_MAX: c_long = 20;
+pub const _POSIX_PATH_MAX: c_long = 256;
+pub const _POSIX_PIPE_BUF: c_long = 512;
+pub const _POSIX_RE_DUP_MAX: c_long = 255;
+pub const _POSIX_RTSIG_MAX: c_long = 8;
+pub const _POSIX_SEM_NSEMS_MAX: c_long = 256;
+pub const _POSIX_SEM_VALUE_MAX: c_long = 32767;
+pub const _POSIX_SIGQUEUE_MAX: c_long = 32;
+pub const _POSIX_SSIZE_MAX: c_long = 32767;
+pub const _POSIX_STREAM_MAX: c_long = 8;
+pub const _POSIX_SYMLINK_MAX: c_long = 255;
+pub const _POSIX_SYMLOOP_MAX: c_long = 8;
+pub const _POSIX_THREAD_DESTRUCTOR_ITERATIONS: c_long = 4;
+pub const _POSIX_THREAD_KEYS_MAX: c_long = 128;
+pub const _POSIX_THREAD_THREADS_MAX: c_long = 64;
+pub const _POSIX_TIMER_MAX: c_long = 32;
+pub const _POSIX_TTY_NAME_MAX: c_long = 9;
+pub const _POSIX_TZNAME_MAX: c_long = 6;
+
+pub const _POSIX2_BC_BASE_MAX: c_long = 99;
+pub const _POSIX2_BC_DIM_MAX: c_long = 2048;
+pub const _POSIX2_BC_SCALE_MAX: c_long = 99;
+pub const _POSIX2_BC_STRING_MAX: c_long = 1000;
+pub const _POSIX2_CHARCLASS_NAME_MAX: c_long = 14;
+pub const _POSIX2_COLL_WEIGHTS_MAX: c_long = 2;
+pub const _POSIX2_EXPR_NEST_MAX: c_long = 32;
+pub const _POSIX2_LINE_MAX: c_long = 2048;
+pub const _POSIX2_RE_DUP_MAX: c_long = 255;
+
+// These symbols must be at least the POSIX values, and sysconf will return the actual value between
+// the posix minimum and this maximum.
+pub const BC_BASE_MAX: c_long = _POSIX2_BC_BASE_MAX;
+pub const BC_DIM_MAX: c_long = _POSIX2_BC_DIM_MAX;
+pub const BC_SCALE_MAX: c_long = _POSIX2_BC_SCALE_MAX;
+pub const BC_STRING_MAX: c_long = _POSIX2_BC_STRING_MAX;
+pub const CHARCLASS_NAME_MAX: c_long = _POSIX2_CHARCLASS_NAME_MAX;
+pub const COLL_WEIGHTS_MAX: c_long = _POSIX2_COLL_WEIGHTS_MAX;
+pub const EXPR_NEST_MAX: c_long = _POSIX2_EXPR_NEST_MAX;
+pub const LINE_MAX: c_long = _POSIX2_LINE_MAX;
+pub const RE_DUP_MAX: c_long = _POSIX2_RE_DUP_MAX;
+pub const HOST_NAME_MAX: c_long = _POSIX_HOST_NAME_MAX;
+pub const LOGIN_NAME_MAX: c_long = 255;
+pub const GETENTROPY_MAX: c_long = 256;
+pub const LINK_MAX: c_long = 127;
+pub const PIPE_BUF: c_long = 4096;
+pub const FILESIZEBITS: c_long = 64;
+pub const MAX_CANON: c_long = _POSIX_MAX_CANON;
+pub const MAX_INPUT: c_long = _POSIX_MAX_INPUT;
+pub const SYMLINK_MAX: c_long = _POSIX_SYMLINK_MAX;
+pub const POSIX_ALLOC_SIZE_MIN: c_long = 4096;
+
+pub const PTHREAD_DESTRUCTOR_ITERATIONS: c_long = _POSIX_THREAD_DESTRUCTOR_ITERATIONS;
+// TODO: What should this limit be? Both glibc and musl have it as 1024
+pub const PTHREAD_KEYS_MAX: c_long = 4096 * 32;
+pub const PTHREAD_STACK_MIN: c_long = 65536;
diff --git a/recipes/core/relibc/src/header/locale/cbindgen.toml b/recipes/core/relibc/src/header/locale/cbindgen.toml
new file mode 100644
index 0000000000..f8e9cb6a83
--- /dev/null
+++ b/recipes/core/relibc/src/header/locale/cbindgen.toml
@@ -0,0 +1,16 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/locale.h.html
+#
+# Spec quotations relating to includes:
+# - "The <locale.h> header shall define NULL (as described in <stddef.h>) and at least the following as macros:"
+sys_includes = ["stddef.h"]
+include_guard = "_RELIBC_LOCALE_H"
+after_includes = """
+#include <bits/locale-t.h> // for locale_t
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/locale/constants.rs b/recipes/core/relibc/src/header/locale/constants.rs
new file mode 100644
index 0000000000..0652ba8dad
--- /dev/null
+++ b/recipes/core/relibc/src/header/locale/constants.rs
@@ -0,0 +1,16 @@
+use crate::platform::types::c_int;
+
+pub const LC_COLLATE: c_int = 0;
+pub const LC_CTYPE: c_int = 1;
+pub const LC_MESSAGES: c_int = 2;
+pub const LC_MONETARY: c_int = 3;
+pub const LC_NUMERIC: c_int = 4;
+pub const LC_TIME: c_int = 5;
+pub const LC_ALL: c_int = 6;
+pub const LC_COLLATE_MASK: c_int = 0x1;
+pub const LC_CTYPE_MASK: c_int = 0x2;
+pub const LC_MESSAGES_MASK: c_int = 0x4;
+pub const LC_MONETARY_MASK: c_int = 0x8;
+pub const LC_NUMERIC_MASK: c_int = 0x10;
+pub const LC_TIME_MASK: c_int = 0x20;
+pub const LC_ALL_MASK: c_int = 0b111111;
diff --git a/recipes/core/relibc/src/header/locale/data.rs b/recipes/core/relibc/src/header/locale/data.rs
new file mode 100644
index 0000000000..128f39a184
--- /dev/null
+++ b/recipes/core/relibc/src/header/locale/data.rs
@@ -0,0 +1,392 @@
+use core::str::FromStr;
+
+use alloc::{boxed::Box, ffi::CString, string::String, vec::Vec};
+
+use super::constants::*;
+use crate::platform::types::{c_char, c_int};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/locale.h.html>.
+/// this struct is not ordered like in the posix spec for readability
+#[repr(C)]
+#[derive(Clone)]
+pub struct lconv {
+    pub decimal_point: *mut c_char,
+    pub thousands_sep: *mut c_char,
+    pub grouping: *mut c_char,
+    pub int_curr_symbol: *mut c_char,
+    pub currency_symbol: *mut c_char,
+    pub mon_decimal_point: *mut c_char,
+    pub mon_thousands_sep: *mut c_char,
+    pub mon_grouping: *mut c_char,
+    pub positive_sign: *mut c_char,
+    pub negative_sign: *mut c_char,
+    pub int_frac_digits: c_char,
+    pub frac_digits: c_char,
+    pub p_cs_precedes: c_char,
+    pub p_sep_by_space: c_char,
+    pub n_cs_precedes: c_char,
+    pub n_sep_by_space: c_char,
+    pub p_sign_posn: c_char,
+    pub n_sign_posn: c_char,
+    pub int_p_cs_precedes: c_char,
+    pub int_p_sep_by_space: c_char,
+    pub int_n_cs_precedes: c_char,
+    pub int_n_sep_by_space: c_char,
+    pub int_p_sign_posn: c_char,
+    pub int_n_sign_posn: c_char,
+}
+unsafe impl Sync for lconv {}
+
+/// "POSIX" or "C" default
+pub(crate) const fn posix_lconv() -> lconv {
+    lconv {
+        // numeric, non-monetary
+        decimal_point: c".".as_ptr().cast_mut(),
+        thousands_sep: c"".as_ptr().cast_mut(),
+        grouping: c"".as_ptr().cast_mut(),
+        // local monetary
+        int_curr_symbol: c"".as_ptr().cast_mut(),
+        currency_symbol: c"".as_ptr().cast_mut(),
+        mon_decimal_point: c"".as_ptr().cast_mut(),
+        mon_thousands_sep: c"".as_ptr().cast_mut(),
+        mon_grouping: c"".as_ptr().cast_mut(),
+        positive_sign: c"".as_ptr().cast_mut(),
+        negative_sign: c"".as_ptr().cast_mut(),
+        // delimiters, unspecified
+        int_frac_digits: c_char::MAX,
+        frac_digits: c_char::MAX,
+        p_cs_precedes: c_char::MAX,
+        p_sep_by_space: c_char::MAX,
+        n_cs_precedes: c_char::MAX,
+        n_sep_by_space: c_char::MAX,
+        p_sign_posn: c_char::MAX,
+        n_sign_posn: c_char::MAX,
+        // international format
+        int_p_cs_precedes: c_char::MAX,
+        int_p_sep_by_space: c_char::MAX,
+        int_n_cs_precedes: c_char::MAX,
+        int_n_sep_by_space: c_char::MAX,
+        int_p_sign_posn: c_char::MAX,
+        int_n_sign_posn: c_char::MAX,
+    }
+}
+
+#[repr(C)]
+pub(crate) struct LocaleData {
+    pub name: CString,
+    pub lconv: lconv,
+    // Owned memory buffers
+    pub decimal_point: CString,
+    pub thousands_sep: CString,
+    pub grouping: Vec<c_char>,
+    pub int_curr_symbol: CString,
+    pub currency_symbol: CString,
+    pub mon_decimal_point: CString,
+    pub mon_thousands_sep: CString,
+    pub mon_grouping: Vec<c_char>,
+    pub positive_sign: CString,
+    pub negative_sign: CString,
+}
+unsafe impl Sync for LocaleData {}
+
+impl LocaleData {
+    pub fn new(name: CString, defs: PosixLocaleDef) -> Box<Self> {
+        let mut data = Box::new(LocaleData {
+            name,
+            decimal_point: Self::to_cstring(defs.decimal_point),
+            thousands_sep: Self::to_cstring(defs.thousands_sep),
+            grouping: Self::to_grouping_char(defs.grouping),
+            int_curr_symbol: Self::to_cstring(defs.int_curr_symbol),
+            currency_symbol: Self::to_cstring(defs.currency_symbol),
+            mon_decimal_point: Self::to_cstring(defs.mon_decimal_point),
+            mon_thousands_sep: Self::to_cstring(defs.mon_thousands_sep),
+            mon_grouping: Self::to_grouping_char(defs.mon_grouping),
+            positive_sign: Self::to_cstring(defs.positive_sign),
+            negative_sign: Self::to_cstring(defs.negative_sign),
+            lconv: unsafe { core::mem::zeroed() },
+        });
+
+        data.lconv.int_frac_digits = defs.int_frac_digits.unwrap_or(c_char::MAX);
+        data.lconv.frac_digits = defs.frac_digits.unwrap_or(c_char::MAX);
+        data.lconv.p_cs_precedes = defs.p_cs_precedes.unwrap_or(c_char::MAX);
+        data.lconv.p_sep_by_space = defs.p_sep_by_space.unwrap_or(c_char::MAX);
+        data.lconv.n_cs_precedes = defs.n_cs_precedes.unwrap_or(c_char::MAX);
+        data.lconv.n_sep_by_space = defs.n_sep_by_space.unwrap_or(c_char::MAX);
+        data.lconv.p_sign_posn = defs.p_sign_posn.unwrap_or(c_char::MAX);
+        data.lconv.n_sign_posn = defs.n_sign_posn.unwrap_or(c_char::MAX);
+        data.lconv.int_p_cs_precedes = defs.int_p_cs_precedes.unwrap_or(c_char::MAX);
+        data.lconv.int_p_sep_by_space = defs.int_p_sep_by_space.unwrap_or(c_char::MAX);
+        data.lconv.int_n_cs_precedes = defs.int_n_cs_precedes.unwrap_or(c_char::MAX);
+        data.lconv.int_n_sep_by_space = defs.int_n_sep_by_space.unwrap_or(c_char::MAX);
+        data.lconv.int_p_sign_posn = defs.int_p_sign_posn.unwrap_or(c_char::MAX);
+        data.lconv.int_n_sign_posn = defs.int_n_sign_posn.unwrap_or(c_char::MAX);
+
+        data.update_lconv_pointers();
+        data
+    }
+
+    pub fn posix() -> Box<Self> {
+        LocaleData::new(CString::from_str("C").unwrap(), PosixLocaleDef::default())
+    }
+
+    fn update_lconv_pointers(&mut self) {
+        self.lconv.decimal_point = self.decimal_point.as_ptr().cast_mut();
+        self.lconv.thousands_sep = self.thousands_sep.as_ptr().cast_mut();
+        self.lconv.grouping = self.grouping.as_ptr().cast_mut();
+        self.lconv.int_curr_symbol = self.int_curr_symbol.as_ptr().cast_mut();
+        self.lconv.currency_symbol = self.currency_symbol.as_ptr().cast_mut();
+        self.lconv.mon_decimal_point = self.mon_decimal_point.as_ptr().cast_mut();
+        self.lconv.mon_thousands_sep = self.mon_thousands_sep.as_ptr().cast_mut();
+        self.lconv.mon_grouping = self.mon_grouping.as_ptr().cast_mut();
+        self.lconv.positive_sign = self.positive_sign.as_ptr().cast_mut();
+        self.lconv.negative_sign = self.negative_sign.as_ptr().cast_mut();
+    }
+
+    pub fn copy_category(&mut self, other: &Self, category: c_int) {
+        match category {
+            LC_NUMERIC => {
+                self.decimal_point = other.decimal_point.clone();
+                self.thousands_sep = other.thousands_sep.clone();
+                self.grouping = other.grouping.clone();
+                self.lconv.frac_digits = other.lconv.frac_digits;
+            }
+            LC_MONETARY => {
+                self.int_curr_symbol = other.int_curr_symbol.clone();
+                self.currency_symbol = other.currency_symbol.clone();
+                self.mon_decimal_point = other.mon_decimal_point.clone();
+                self.mon_thousands_sep = other.mon_thousands_sep.clone();
+                self.mon_grouping = other.mon_grouping.clone();
+                self.positive_sign = other.positive_sign.clone();
+                self.negative_sign = other.negative_sign.clone();
+                self.lconv.int_frac_digits = other.lconv.int_frac_digits;
+                self.lconv.p_cs_precedes = other.lconv.p_cs_precedes;
+                self.lconv.p_sep_by_space = other.lconv.p_sep_by_space;
+                self.lconv.n_cs_precedes = other.lconv.n_cs_precedes;
+                self.lconv.n_sep_by_space = other.lconv.n_sep_by_space;
+                self.lconv.p_sign_posn = other.lconv.p_sign_posn;
+                self.lconv.n_sign_posn = other.lconv.n_sign_posn;
+                self.lconv.int_p_cs_precedes = other.lconv.int_p_cs_precedes;
+                self.lconv.int_p_sep_by_space = other.lconv.int_p_sep_by_space;
+                self.lconv.int_n_cs_precedes = other.lconv.int_n_cs_precedes;
+                self.lconv.int_n_sep_by_space = other.lconv.int_n_sep_by_space;
+                self.lconv.int_p_sign_posn = other.lconv.int_p_sign_posn;
+                self.lconv.int_n_sign_posn = other.lconv.int_n_sign_posn;
+            }
+            LC_ALL => {
+                *self = other.clone();
+            }
+            _ => {}
+        }
+
+        self.update_lconv_pointers();
+    }
+
+    fn to_cstring(opt: Option<CString>) -> CString {
+        opt.unwrap_or_else(|| CString::new("").unwrap())
+    }
+
+    fn to_grouping_char(opt: Vec<Option<c_char>>) -> Vec<c_char> {
+        let mut v: Vec<c_char> = opt.into_iter().map(Self::to_char).collect();
+        v.push(0);
+        v
+    }
+
+    fn to_char(opt: Option<c_char>) -> c_char {
+        opt.unwrap_or(c_char::MAX)
+    }
+}
+
+impl Clone for LocaleData {
+    fn clone(&self) -> Self {
+        let mut data = Self {
+            name: self.name.clone(),
+            lconv: self.lconv.clone(),
+            decimal_point: self.decimal_point.clone(),
+            thousands_sep: self.thousands_sep.clone(),
+            grouping: self.grouping.clone(),
+            int_curr_symbol: self.int_curr_symbol.clone(),
+            currency_symbol: self.currency_symbol.clone(),
+            mon_decimal_point: self.mon_decimal_point.clone(),
+            mon_thousands_sep: self.mon_thousands_sep.clone(),
+            mon_grouping: self.mon_grouping.clone(),
+            positive_sign: self.positive_sign.clone(),
+            negative_sign: self.negative_sign.clone(),
+        };
+        data.update_lconv_pointers();
+        data
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct GlobalLocaleData {
+    // names per LC_* constant
+    pub names: [CString; 7],
+    pub data: LocaleData,
+}
+
+impl GlobalLocaleData {
+    pub fn new() -> Box<Self> {
+        let data = LocaleData::posix();
+        let names = [
+            data.name.clone(),
+            data.name.clone(),
+            data.name.clone(),
+            data.name.clone(),
+            data.name.clone(),
+            data.name.clone(),
+            data.name.clone(),
+        ];
+        let mut r = Box::new(GlobalLocaleData { data: *data, names });
+        r.data.update_lconv_pointers();
+        r
+    }
+
+    pub fn get_name(&self, category: i32) -> Option<&CString> {
+        self.names.get(category as usize)
+    }
+    pub fn set_name(&mut self, category: i32, name: CString) -> Option<&CString> {
+        if self.names.get(category as usize).is_some() {
+            self.names[category as usize] = name;
+            self.names.get(category as usize)
+        } else {
+            None
+        }
+    }
+}
+unsafe impl Sync for GlobalLocaleData {}
+
+#[derive(Default)]
+pub(crate) struct PosixLocaleDef {
+    pub decimal_point: Option<CString>,
+    pub thousands_sep: Option<CString>,
+    pub grouping: Vec<Option<c_char>>,
+    pub int_curr_symbol: Option<CString>,
+    pub currency_symbol: Option<CString>,
+    pub mon_decimal_point: Option<CString>,
+    pub mon_thousands_sep: Option<CString>,
+    pub mon_grouping: Vec<Option<c_char>>,
+    pub positive_sign: Option<CString>,
+    pub negative_sign: Option<CString>,
+    pub int_frac_digits: Option<c_char>,
+    pub frac_digits: Option<c_char>,
+    pub p_cs_precedes: Option<c_char>,
+    pub p_sep_by_space: Option<c_char>,
+    pub n_cs_precedes: Option<c_char>,
+    pub n_sep_by_space: Option<c_char>,
+    pub p_sign_posn: Option<c_char>,
+    pub n_sign_posn: Option<c_char>,
+    pub int_p_cs_precedes: Option<c_char>,
+    pub int_p_sep_by_space: Option<c_char>,
+    pub int_n_cs_precedes: Option<c_char>,
+    pub int_n_sep_by_space: Option<c_char>,
+    pub int_p_sign_posn: Option<c_char>,
+    pub int_n_sign_posn: Option<c_char>,
+}
+impl PosixLocaleDef {
+    //! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/V1_chap07.html>
+    pub fn parse(content: &str) -> Self {
+        let mut locale = PosixLocaleDef::default();
+
+        let mut lines = content.lines();
+        loop {
+            let Some(line) = lines.next() else {
+                break;
+            };
+
+            let trimmed = line.trim();
+            if trimmed.is_empty() || trimmed.starts_with('#') {
+                continue;
+            }
+
+            let mut parts = trimmed.split_ascii_whitespace();
+            let Some(key) = parts.next() else {
+                continue;
+            };
+            let mut val: String = String::new();
+            loop {
+                let Some(chunk) = parts.next() else {
+                    break;
+                };
+                if !chunk.ends_with('\\') {
+                    val.push_str(chunk);
+                    break;
+                }
+                // multiline values
+                val.push_str(&chunk[0..chunk.len() - 1]);
+                let Some(next_line) = lines.next() else {
+                    break;
+                };
+                parts = next_line.split_ascii_whitespace();
+            }
+
+            if key.is_empty() || val.is_empty() {
+                continue;
+            }
+
+            match key {
+                "decimal_point" => locale.decimal_point = Self::parse_str(&val),
+                "thousands_sep" => locale.thousands_sep = Self::parse_str(&val),
+                "int_curr_symbol" => locale.int_curr_symbol = Self::parse_str(&val),
+                "currency_symbol" => locale.currency_symbol = Self::parse_str(&val),
+                "mon_decimal_point" => locale.mon_decimal_point = Self::parse_str(&val),
+                "mon_thousands_sep" => locale.mon_thousands_sep = Self::parse_str(&val),
+                "positive_sign" => locale.positive_sign = Self::parse_str(&val),
+                "negative_sign" => locale.negative_sign = Self::parse_str(&val),
+                "grouping" => locale.grouping = Self::parse_int_group(&val),
+                "mon_grouping" => locale.mon_grouping = Self::parse_int_group(&val),
+                "int_frac_digits" => locale.int_frac_digits = Self::parse_int(&val),
+                "frac_digits" => locale.frac_digits = Self::parse_int(&val),
+                "p_cs_precedes" => locale.p_cs_precedes = Self::parse_int(&val),
+                "p_sep_by_space" => locale.p_sep_by_space = Self::parse_int(&val),
+                "n_cs_precedes" => locale.n_cs_precedes = Self::parse_int(&val),
+                "n_sep_by_space" => locale.n_sep_by_space = Self::parse_int(&val),
+                "p_sign_posn" => locale.p_sign_posn = Self::parse_int(&val),
+                "n_sign_posn" => locale.n_sign_posn = Self::parse_int(&val),
+                "int_p_cs_precedes" => locale.int_p_cs_precedes = Self::parse_int(&val),
+                "int_p_sep_by_space" => locale.int_p_sep_by_space = Self::parse_int(&val),
+                "int_n_cs_precedes" => locale.int_n_cs_precedes = Self::parse_int(&val),
+                "int_n_sep_by_space" => locale.int_n_sep_by_space = Self::parse_int(&val),
+                "int_p_sign_posn" => locale.int_p_sign_posn = Self::parse_int(&val),
+                "int_n_sign_posn" => locale.int_n_sign_posn = Self::parse_int(&val),
+                _ => {}
+            }
+        }
+        locale
+    }
+
+    /// parse e.g. `3;3;0` -> [ 3,3,0 ], `-1` -> [ None ]
+    fn parse_int_group(val: &str) -> Vec<Option<c_char>> {
+        val.split(';').map(Self::parse_int).collect()
+    }
+
+    /// parse e.g. `-1` -> None, `1` -> Some(1)
+    fn parse_int(val: &str) -> Option<c_char> {
+        let r = val.trim().parse::<c_char>().ok();
+        // c_char is u8 on aarch64 and riscv64 so comparison is useless
+        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+        if r.is_some_and(|i| i < 0) {
+            return None;
+        }
+        r
+    }
+
+    /// parse e.g. `""`
+    fn parse_str(val: &str) -> Option<CString> {
+        let mut r = String::new();
+        let mut v = val.chars();
+        if v.next() != Some('"') {
+            return None;
+        }
+        while let Some(c) = v.next() {
+            if c == '"' {
+                if v.next().is_some() {
+                    return None;
+                }
+                break;
+            }
+            // TODO: Parse <..>
+            r.push(c);
+        }
+        CString::new(r).ok()
+    }
+}
diff --git a/recipes/core/relibc/src/header/locale/mod.rs b/recipes/core/relibc/src/header/locale/mod.rs
new file mode 100644
index 0000000000..d8f9e54bd3
--- /dev/null
+++ b/recipes/core/relibc/src/header/locale/mod.rs
@@ -0,0 +1,182 @@
+//! `locale.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/locale.h.html>.
+
+use alloc::{boxed::Box, ffi::CString, string::String};
+use core::{ptr, str::FromStr};
+
+use crate::{
+    c_str::CStr,
+    error::{Errno, ResultExtPtrMut},
+    fs::File,
+    header::{errno, fcntl},
+    io::Read,
+    platform::types::{c_char, c_int},
+};
+
+// Can't use &str because of the mutability
+static mut C_LOCALE: [c_char; 2] = [b'C' as c_char, 0];
+
+mod constants;
+use constants::*;
+mod data;
+use data::*;
+
+use super::bits_locale_t::locale_t;
+/// constant struct to "C" or "POSIX" locale
+/// mutable because POSIX demands a mutable pointer
+static mut POSIX_LOCALE: lconv = posix_lconv();
+pub const LC_GLOBAL_LOCALE: locale_t = -1isize as locale_t;
+/// process-wide locale, used by setlocale() and localeconv()
+static mut GLOBAL_LOCALE: *mut GlobalLocaleData = ptr::null_mut();
+/// thread-wide locale, used by uselocale() and localeconv()
+#[thread_local]
+pub(crate) static mut THREAD_LOCALE: *mut LocaleData = ptr::null_mut();
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/localeconv.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn localeconv() -> *mut lconv {
+    let current = unsafe { uselocale(ptr::null_mut()) };
+    if current == LC_GLOBAL_LOCALE || current.is_null() {
+        if !unsafe { GLOBAL_LOCALE.is_null() } {
+            // safety: GLOBAL_LOCALE is never set to null again
+            unsafe { &raw mut (*GLOBAL_LOCALE).data.lconv }
+        } else {
+            &raw mut POSIX_LOCALE
+        }
+    } else {
+        let current = current.cast::<LocaleData>();
+        unsafe { &raw mut (*current).lconv }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setlocale.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setlocale(category: c_int, locale: *const c_char) -> *mut c_char {
+    if unsafe { GLOBAL_LOCALE.is_null() } {
+        let new_global = GlobalLocaleData::new();
+        unsafe { GLOBAL_LOCALE = Box::into_raw(new_global) };
+    };
+    let Some(global) = (unsafe { GLOBAL_LOCALE.as_mut() }) else {
+        return ptr::null_mut();
+    };
+
+    if locale.is_null() {
+        let Some(name) = global.get_name(category) else {
+            return ptr::null_mut();
+        };
+        return name.as_ptr().cast_mut();
+    }
+
+    let name = unsafe { CStr::from_ptr(locale).to_str().unwrap_or("C") };
+
+    let locale_file = if name.is_empty() || name == "C" || name == "POSIX" {
+        // TODO: name == "" should read from LANG env
+        Ok(LocaleData::posix())
+    } else {
+        load_locale_file(name)
+    };
+
+    match locale_file {
+        Ok(loc_ptr) => {
+            global.data.copy_category(&loc_ptr, category);
+            let Some(name) = global.set_name(category, CString::from_str(name).unwrap()) else {
+                return ptr::null_mut();
+            };
+            name.as_ptr().cast_mut()
+        }
+        Err(_) => ptr::null_mut(),
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/uselocale.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn uselocale(newloc: locale_t) -> locale_t {
+    let old_loc = if unsafe { THREAD_LOCALE.is_null() } {
+        LC_GLOBAL_LOCALE
+    } else {
+        (unsafe { THREAD_LOCALE }) as locale_t
+    };
+
+    if !newloc.is_null() {
+        unsafe {
+            THREAD_LOCALE = if newloc == LC_GLOBAL_LOCALE {
+                ptr::null_mut()
+            } else {
+                newloc.cast::<LocaleData>()
+            }
+        };
+    }
+
+    old_loc
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/newlocale.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn newlocale(mask: c_int, locale: *const c_char, base: locale_t) -> locale_t {
+    let name = unsafe { CStr::from_ptr(locale) }
+        .to_string_lossy()
+        .into_owned();
+    let name = name.as_str();
+    let mut new_locale = if name.is_empty() || name == "C" || name == "POSIX" {
+        // TODO: name == "" should read from LANG env
+        Ok(LocaleData::posix())
+    } else {
+        load_locale_file(name)
+    };
+    if base != LC_GLOBAL_LOCALE {
+        // borrowing here
+        let base = base.cast_const().cast::<LocaleData>();
+        if let Ok(new_locale) = new_locale.as_mut()
+            && let Some(base) = unsafe { base.as_ref() }
+        {
+            // copy old values if not containing the mask
+            if (mask & LC_NUMERIC_MASK) == 0 {
+                new_locale.copy_category(base, LC_NUMERIC);
+            }
+            if (mask & LC_MONETARY_MASK) == 0 {
+                new_locale.copy_category(base, LC_MONETARY);
+            }
+            // TODO: other categories?
+        }
+    }
+    new_locale.or_errno_null_mut().cast()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/freelocale.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn freelocale(loc: locale_t) {
+    if !loc.is_null() && loc != LC_GLOBAL_LOCALE {
+        drop(unsafe { Box::from_raw(loc.cast::<LocaleData>()) });
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/duplocale.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn duplocale(loc: locale_t) -> locale_t {
+    if loc.is_null() {
+        // TODO: errno?
+        loc
+    } else if loc == LC_GLOBAL_LOCALE {
+        Box::into_raw(LocaleData::posix()) as locale_t
+    } else {
+        // borrowing here
+        let loc = loc.cast_const().cast::<LocaleData>();
+        Box::into_raw(unsafe { Box::from((*loc).clone()) }) as locale_t
+    }
+}
+
+pub(crate) fn load_locale_file(name: &str) -> Result<Box<LocaleData>, Errno> {
+    let mut path = String::from("/usr/share/i18n/locales/");
+    path.push_str(name);
+
+    let path_c = CString::new(path).map_err(|_| Errno(errno::EINVAL))?;
+    let mut content = String::new();
+
+    let mut file = File::open(path_c.as_c_str().into(), fcntl::O_RDONLY)?;
+    file.read_to_string(&mut content)
+        .map_err(|_| Errno(errno::EIO))?;
+
+    let toml = PosixLocaleDef::parse(&content);
+    Ok(LocaleData::new(CString::from_str(name).unwrap(), toml))
+}
diff --git a/recipes/core/relibc/src/header/malloc/cbindgen.toml b/recipes/core/relibc/src/header/malloc/cbindgen.toml
new file mode 100644
index 0000000000..18db86526d
--- /dev/null
+++ b/recipes/core/relibc/src/header/malloc/cbindgen.toml
@@ -0,0 +1,30 @@
+sys_includes = ["features.h", "stddef.h"]
+include_guard = "_RELIBC_MALLOC_H"
+trailer = """
+#ifndef _RELIBC_MALLOC_EXTRA_H
+#define _RELIBC_MALLOC_EXTRA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *calloc(size_t nelem, size_t elsize);
+void free(void *ptr);
+void *malloc(size_t size);
+void *memalign(size_t alignment, size_t size);
+void *realloc(void *ptr, size_t size);
+void *valloc(size_t size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+"""
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/malloc/mod.rs b/recipes/core/relibc/src/header/malloc/mod.rs
new file mode 100644
index 0000000000..2b73052b42
--- /dev/null
+++ b/recipes/core/relibc/src/header/malloc/mod.rs
@@ -0,0 +1,48 @@
+//! `malloc.h` implementation.
+//!
+//! Non-POSIX, see <https://man7.org/linux/man-pages/man3/posix_memalign.3.html>.
+
+use crate::{
+    header::errno::ENOMEM,
+    platform::{
+        self, Pal, Sys,
+        types::{c_void, size_t},
+    },
+};
+use core::ptr;
+
+/// See <https://man7.org/linux/man-pages/man3/posix_memalign.3.html>.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pvalloc(size: size_t) -> *mut c_void {
+    let page_size = Sys::getpagesize();
+    // Find the smallest multiple of the page size in which the requested size
+    // will fit. The result of the division will always be less than or equal
+    // to size_t::MAX - 1, and the num_pages calculation will therefore never
+    // overflow.
+    let num_pages = if size != 0 {
+        (size - 1) / page_size + 1
+    } else {
+        0
+    };
+
+    match num_pages.checked_mul(page_size) {
+        Some(alloc_size) => {
+            let ptr = unsafe { platform::alloc_align(alloc_size, page_size) };
+            if ptr.is_null() {
+                platform::ERRNO.set(ENOMEM);
+            }
+            ptr
+        }
+        None => {
+            platform::ERRNO.set(ENOMEM);
+            ptr::null_mut()
+        }
+    }
+}
+
+/// See <https://man7.org/linux/man-pages/man3/malloc_usable_size.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn malloc_usable_size(ptr: *mut c_void) -> size_t {
+    unsafe { platform::alloc_usable_size(ptr) }
+}
diff --git a/recipes/core/relibc/src/header/math/cbindgen.toml b/recipes/core/relibc/src/header/math/cbindgen.toml
new file mode 100644
index 0000000000..97345d7770
--- /dev/null
+++ b/recipes/core/relibc/src/header/math/cbindgen.toml
@@ -0,0 +1,57 @@
+# Note: changing this file requires `make clean`.
+sys_includes = []
+include_guard = "_RELIBC_MATH_H"
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+# constants from openlibm
+after_includes = """
+
+#define	HUGE_VALF	(float)HUGE_VAL
+#define	HUGE_VALL	(long double)HUGE_VAL
+#define	INFINITY	HUGE_VALF
+#define	NAN		(__nan.__uf)
+
+#define	FP_ILOGB0	(-INT_MAX)
+#define	FP_ILOGBNAN	INT_MAX
+
+#define MAXFLOAT        3.40282346638528859812e+38F
+
+#define M_E             2.7182818284590452354   /* e */
+#define M_LOG2E         1.4426950408889634074   /* log_2 e */
+#define M_LOG10E        0.43429448190325182765  /* log_10 e */
+#define M_LN2           0.69314718055994530942  /* log_e 2 */
+#define M_LN10          2.30258509299404568402  /* log_e 10 */
+#define M_PI            3.14159265358979323846  /* pi */
+#define M_PI_2          1.57079632679489661923  /* pi/2 */
+#define M_PI_4          0.78539816339744830962  /* pi/4 */
+#define M_1_PI          0.31830988618379067154  /* 1/pi */
+#define M_2_PI          0.63661977236758134308  /* 2/pi */
+#define M_2_SQRTPI      1.12837916709551257390  /* 2/sqrt(pi) */
+#define M_SQRT2         1.41421356237309504880  /* sqrt(2) */
+#define M_SQRT1_2       0.70710678118654752440  /* 1/sqrt(2) */
+
+#define FP_NAN 0
+#define FP_INFINITE 1
+#define FP_ZERO 2
+#define FP_SUBNORMAL 3
+#define FP_NORMAL 4
+#define fpclassify(x) __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL, FP_SUBNORMAL, FP_ZERO, x)
+
+#define signbit(x) __builtin_signbit(x)
+#define isnan(x) __builtin_isnan(x)
+#define isinf(x) __builtin_isinf_sign(x)
+#define isfinite(x) __builtin_isfinite(x)
+#define isnormal(x) __builtin_isnormal(x)
+#define isgreater(x, y) __builtin_isgreater((x), (y))
+#define isgreaterequal(x, y) __builtin_isgreaterequal((x), (y))
+#define isless(x, y) __builtin_isless((x), (y))
+#define islessequal(x, y) __builtin_islessequal((x), (y))
+#define islessgreater(x, y) __builtin_islessgreater((x), (y))
+#define isunordered(x, y) __builtin_isunordered((x), (y))
+
+"""
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/math/mod.rs b/recipes/core/relibc/src/header/math/mod.rs
new file mode 100644
index 0000000000..b529bd2633
--- /dev/null
+++ b/recipes/core/relibc/src/header/math/mod.rs
@@ -0,0 +1,867 @@
+//! `math.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/math.h.html>.
+
+use crate::platform::types::{c_double, c_float, c_int, c_long, c_longlong};
+
+// TODO move constants from cbindgen (openlibm)
+// TODO all is* function is defined as "real-floating", so it can both f32 and f64
+// TODO cover edge cases (EDOM and ERANGE)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/acos.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn acos(x: c_double) -> c_double {
+    libm::acos(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/acos.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn acosf(x: c_float) -> c_float {
+    libm::acosf(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/acosh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn acosh(x: c_double) -> c_double {
+    libm::acosh(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/acosh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn acoshf(x: c_float) -> c_float {
+    libm::acoshf(x)
+}
+
+// TODO acoshl, acosl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/asin.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn asin(x: c_double) -> c_double {
+    libm::asin(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/asin.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn asinf(x: c_float) -> c_float {
+    libm::asinf(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/asinh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn asinh(x: c_double) -> c_double {
+    libm::asinh(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/asinh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn asinhf(x: c_float) -> c_float {
+    libm::asinhf(x)
+}
+
+// TODO asinhl, asinl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atan.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atan(x: c_double) -> c_double {
+    libm::atan(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atan2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atan2(y: c_double, x: c_double) -> c_double {
+    libm::atan2(y, x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atan2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atan2f(y: c_float, x: c_float) -> c_float {
+    libm::atan2f(y, x)
+}
+
+// TODO atan2l (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atan.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atanf(x: c_float) -> c_float {
+    libm::atanf(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atanh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atanh(x: c_double) -> c_double {
+    libm::atanh(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atanh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atanhf(x: c_float) -> c_float {
+    libm::atanhf(x)
+}
+
+// TODO atanhl, atanl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cbrt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbrt(x: c_double) -> c_double {
+    libm::cbrt(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cbrt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbrtf(x: c_float) -> c_float {
+    libm::cbrtf(x)
+}
+
+// TODO cbrtl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ceil.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ceil(x: c_double) -> c_double {
+    libm::ceil(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ceil.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ceilf(x: c_float) -> c_float {
+    libm::ceilf(x)
+}
+
+// TODO ceill (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/copysign.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn copysign(x: c_double, y: c_double) -> c_double {
+    libm::copysign(x, y)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/copysign.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn copysignf(x: c_float, y: c_float) -> c_float {
+    libm::copysignf(x, y)
+}
+
+// TODO copysignl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cos.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cos(x: c_double) -> c_double {
+    libm::cos(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cos.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cosf(x: c_float) -> c_float {
+    libm::cosf(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cosh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cosh(x: c_double) -> c_double {
+    libm::cosh(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cosh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn coshf(x: c_float) -> c_float {
+    libm::coshf(x)
+}
+
+// TODO coshl, cosl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/erf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn erf(x: c_double) -> c_double {
+    libm::erf(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/erfc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn erfc(x: c_double) -> c_double {
+    libm::erfc(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/erfc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn erfcf(x: c_float) -> c_float {
+    libm::erfcf(x)
+}
+
+// TODO erfcl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/erf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn erff(x: c_float) -> c_float {
+    libm::erff(x)
+}
+
+// TODO erfl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn exp(x: c_double) -> c_double {
+    libm::exp(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exp2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn exp2(x: c_double) -> c_double {
+    libm::exp2(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exp2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn exp2f(x: c_float) -> c_float {
+    libm::exp2f(x)
+}
+
+// TODO exp2l (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn expf(x: c_float) -> c_float {
+    libm::expf(x)
+}
+
+// TODO expl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/expm1.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn expm1(x: c_double) -> c_double {
+    libm::expm1(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/expm1.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn expm1f(x: c_float) -> c_float {
+    libm::expm1f(x)
+}
+
+// TODO expm1l (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fabs.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fabs(x: c_double) -> c_double {
+    libm::fabs(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fabsf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fabsf(x: c_float) -> c_float {
+    libm::fabsf(x)
+}
+
+// TODO fabsl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fdim.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fdim(x: c_double, y: c_double) -> c_double {
+    libm::fdim(x, y)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fdim.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fdimf(x: c_float, y: c_float) -> c_float {
+    libm::fdimf(x, y)
+}
+
+// TODO fdiml (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/floor.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn floor(x: c_double) -> c_double {
+    libm::floor(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/floor.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn floorf(x: c_float) -> c_float {
+    libm::floorf(x)
+}
+
+// TODO floorl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fma.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fma(x: c_double, y: c_double, z: c_double) -> c_double {
+    libm::fma(x, y, z)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fma.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fmaf(x: c_float, y: c_float, z: c_float) -> c_float {
+    libm::fmaf(x, y, z)
+}
+
+// TODO fmal (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fmax.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fmax(x: c_double, y: c_double) -> c_double {
+    libm::fmax(x, y)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fmax.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fmaxf(x: c_float, y: c_float) -> c_float {
+    libm::fmaxf(x, y)
+}
+
+// TODO fmaxl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fmin.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fmin(x: c_double, y: c_double) -> c_double {
+    libm::fmin(x, y)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fmin.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fminf(x: c_float, y: c_float) -> c_float {
+    libm::fminf(x, y)
+}
+
+// TODO fminl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fmod.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fmod(x: c_double, y: c_double) -> c_double {
+    libm::fmod(x, y)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fmod.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fmodf(x: c_float, y: c_float) -> c_float {
+    libm::fmodf(x, y)
+}
+
+// TODO fmodl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/frexp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn frexp(num: c_double, exp: *mut c_int) -> c_double {
+    let (number, exponent) = libm::frexp(num);
+    unsafe {
+        *exp = exponent;
+    }
+    number
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/frexp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn frexpf(num: c_float, exp: *mut c_int) -> c_float {
+    let (number, exponent) = libm::frexpf(num);
+    unsafe {
+        *exp = exponent;
+    }
+    number
+}
+
+// TODO frexpl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/hypot.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn hypot(x: c_double, y: c_double) -> c_double {
+    libm::hypot(x, y)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/hypot.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn hypotf(x: c_float, y: c_float) -> c_float {
+    libm::hypotf(x, y)
+}
+
+// TODO hypotl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ilogb.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ilogb(x: c_double) -> c_int {
+    libm::ilogb(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ilogb.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ilogbf(x: c_float) -> c_int {
+    libm::ilogbf(x)
+}
+
+// TODO ilogbl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isfinite.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn isfinite(x: c_double) -> c_int {
+    if x.is_finite() { 1 } else { 0 }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isinf.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn isinf(x: c_double) -> c_int {
+    match x {
+        f64::INFINITY => 1,
+        f64::NEG_INFINITY => -1,
+        _ => 0,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isnan.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn isnan(x: c_double) -> c_int {
+    if x.is_nan() { 1 } else { 0 }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isnormal.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn isnormal(x: c_double) -> c_int {
+    if x.is_normal() { 1 } else { 0 }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/j0.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn j0(x: c_double) -> c_double {
+    libm::j0(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/j0.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn j1(x: c_double) -> c_double {
+    libm::j1(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/j0.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn jn(n: c_int, x: c_double) -> c_double {
+    libm::jn(n, x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ldexp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ldexp(x: c_double, exp: c_int) -> c_double {
+    libm::ldexp(x, exp)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ldexp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ldexpf(x: c_float, exp: c_int) -> c_float {
+    libm::ldexpf(x, exp)
+}
+
+// TODO ldexpl (long double)
+
+#[unsafe(no_mangle)]
+static mut signgam: c_int = 0;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lgamma.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn lgamma(x: c_double) -> c_double {
+    let (a, b) = libm::lgamma_r(x);
+    unsafe { signgam = b };
+    a
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lgamma.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn lgammaf(x: c_float) -> c_float {
+    let (a, b) = libm::lgammaf_r(x);
+    unsafe { signgam = b };
+    a
+}
+
+// TODO lgammal (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/llrint.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn llrint(x: c_double) -> c_longlong {
+    libm::rint(x) as _
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/llrintf.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn llrintf(x: c_float) -> c_longlong {
+    libm::rintf(x) as _
+}
+
+// TODO llrintl (long double to c_longlong)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/llround.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn llround(x: c_double) -> c_longlong {
+    libm::round(x) as _
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/llroundf.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn llroundf(x: c_float) -> c_longlong {
+    libm::roundf(x) as _
+}
+
+// TODO llroundl (long double to c_longlong)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/log.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn log(x: c_double) -> c_double {
+    libm::log(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/log10.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn log10(x: c_double) -> c_double {
+    libm::log10(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/log10.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn log10f(x: c_float) -> c_float {
+    libm::log10f(x)
+}
+
+// TODO log10l (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/log1p.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn log1p(x: c_double) -> c_double {
+    libm::log1p(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/log1p.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn log1pf(x: c_float) -> c_float {
+    libm::log1pf(x)
+}
+
+// TODO log1pl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/log2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn log2(x: c_double) -> c_double {
+    libm::log2(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/log2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn log2f(x: c_float) -> c_float {
+    libm::log2f(x)
+}
+
+// TODO log2l (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/logb.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn logb(x: c_double) -> c_double {
+    // TODO: errno
+    libm::ilogb(x) as _
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/logbf.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn logbf(x: c_float) -> c_float {
+    // TODO: errno
+    libm::ilogbf(x) as _
+}
+
+// TODO logbl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/log.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn logf(x: c_float) -> c_float {
+    libm::logf(x)
+}
+
+// TODO logl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lrint.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn lrint(x: c_double) -> c_long {
+    // TODO: errno
+    libm::rint(x) as _
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lrintf.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn lrintf(x: c_float) -> c_long {
+    // TODO: errno
+    libm::rintf(x) as _
+}
+
+// TODO lrintl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lround.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn lround(x: c_double) -> c_long {
+    libm::round(x) as _
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lroundf.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn lroundf(x: c_float) -> c_long {
+    libm::roundf(x) as _
+}
+
+// TODO lroundl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/modf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn modf(x: c_double, iptr: *mut c_double) -> c_double {
+    let (integral, fractional) = libm::modf(x);
+    unsafe {
+        *iptr = integral;
+    }
+    fractional
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/modf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn modff(value: c_float, iptr: *mut c_float) -> c_float {
+    let (integral, fractional) = libm::modff(value);
+    unsafe {
+        *iptr = integral;
+    }
+    fractional
+}
+
+// TODO modfl (long double)
+
+// TODO do we want to support quiet NaN or just return 0?
+// TODO nan (c_double)
+// TODO nanf (c_float)
+// TODO nanl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/nearbyint.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn nearbyint(x: c_double) -> c_double {
+    libm::rint(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/nearbyintf.html>.
+#[unsafe(no_mangle)]
+unsafe extern "C" fn nearbyintf(x: c_float) -> c_float {
+    libm::rintf(x)
+}
+
+// TODO nearbyintl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/nextafter.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn nextafter(x: c_double, y: c_double) -> c_double {
+    libm::nextafter(x, y)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/nextafter.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn nextafterf(x: c_float, y: c_float) -> c_float {
+    libm::nextafterf(x, y)
+}
+
+// TODO nextafterl (long double)
+
+// TODO nexttoward (c_double)
+// TODO nexttowardf (c_float)
+// TODO nexttowardl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pow.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pow(x: c_double, y: c_double) -> c_double {
+    libm::pow(x, y)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pow.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn powf(x: c_float, y: c_float) -> c_float {
+    libm::powf(x, y)
+}
+
+// TODO powl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/remainder.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn remainder(x: c_double, y: c_double) -> c_double {
+    libm::remainder(x, y)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/remainder.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn remainderf(x: c_float, y: c_float) -> c_float {
+    libm::remainderf(x, y)
+}
+
+// TODO remainderl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/remquo.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn remquo(x: c_double, y: c_double, quo: *mut c_int) -> c_double {
+    let (remainder, quotient) = libm::remquo(x, y);
+    unsafe {
+        *quo = quotient;
+    }
+    remainder
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/remquo.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn remquof(x: c_float, y: c_float, quo: *mut c_int) -> c_float {
+    let (remainder, quotient) = libm::remquof(x, y);
+    unsafe {
+        *quo = quotient;
+    }
+    remainder
+}
+
+// TODO remquol (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/rint.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn rint(x: c_double) -> c_double {
+    libm::rint(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/rint.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn rintf(x: c_float) -> c_float {
+    libm::rintf(x)
+}
+
+// TODO rintl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/round.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn round(x: c_double) -> c_double {
+    libm::round(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/round.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn roundf(x: c_float) -> c_float {
+    libm::roundf(x)
+}
+
+// TODO roundl (long double)
+
+// TODO scalbln (c_double, c_long)
+// TODO scalblnf (c_float, c_long)
+// TODO scalblnl (long double, c_long)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/scalbln.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn scalbn(x: c_double, n: c_int) -> c_double {
+    libm::scalbn(x, n)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/scalbln.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn scalbnf(x: c_float, n: c_int) -> c_float {
+    libm::scalbnf(x, n)
+}
+
+// TODO scalbnl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sin.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sin(x: c_double) -> c_double {
+    libm::sin(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sin.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sinf(x: c_float) -> c_float {
+    libm::sinf(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sinh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sinh(x: c_double) -> c_double {
+    libm::sinh(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sinh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sinhf(x: c_float) -> c_float {
+    libm::sinhf(x)
+}
+
+// TODO sinhl (long double)
+// TODO sinl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sqrt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sqrt(x: c_double) -> c_double {
+    libm::sqrt(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sqrt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sqrtf(x: c_float) -> c_float {
+    libm::sqrtf(x)
+}
+
+// TODO sqrtl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tan.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tan(x: c_double) -> c_double {
+    libm::tan(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tan.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tanf(x: c_float) -> c_float {
+    libm::tanf(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tanh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tanh(x: c_double) -> c_double {
+    libm::tanh(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tanh.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tanhf(x: c_float) -> c_float {
+    libm::tanhf(x)
+}
+
+// TODO tanhl (long double)
+// TODO tanl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tgamma.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tgamma(x: c_double) -> c_double {
+    libm::tgamma(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tgamma.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tgammaf(x: c_float) -> c_float {
+    libm::tgammaf(x)
+}
+
+// TODO tgammal (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/trunc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn trunc(x: c_double) -> c_double {
+    libm::trunc(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/trunc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn truncf(x: c_float) -> c_float {
+    libm::truncf(x)
+}
+
+// TODO truncl (long double)
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/y0.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn y0(x: c_double) -> c_double {
+    libm::y0(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/y0.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn y1(x: c_double) -> c_double {
+    libm::y1(x)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/y0.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn yn(n: c_int, x: c_double) -> c_double {
+    libm::yn(n, x)
+}
diff --git a/recipes/core/relibc/src/header/mod.rs b/recipes/core/relibc/src/header/mod.rs
new file mode 100644
index 0000000000..5afeb0c2d1
--- /dev/null
+++ b/recipes/core/relibc/src/header/mod.rs
@@ -0,0 +1,144 @@
+//! POSIX header implementations.
+
+pub mod _aio;
+pub mod _fenv;
+pub mod arpa_inet;
+pub mod assert;
+pub mod bits_arpainet;
+pub mod bits_iovec;
+#[path = "bits_locale-t/mod.rs"]
+pub mod bits_locale_t;
+pub mod bits_pthread;
+#[path = "bits_safamily-t/mod.rs"]
+pub mod bits_safamily_t;
+#[path = "bits_socklen-t/mod.rs"]
+pub mod bits_socklen_t;
+pub mod bits_timespec;
+// complex.h implemented in C
+pub mod cpio;
+pub mod crypt;
+pub mod ctype;
+// TODO: curses.h (deprecated)
+// TODO: devctl.h
+pub mod dirent;
+#[path = "dl-tls/mod.rs"]
+pub mod dl_tls;
+pub mod dlfcn;
+pub mod elf;
+pub mod endian;
+pub mod err;
+pub mod errno;
+pub mod fcntl;
+pub mod float;
+// TODO: fmtmsg.h
+pub mod fnmatch;
+// TODO: ftw.h
+pub mod getopt;
+pub mod glob;
+pub mod grp;
+// TODO: iconv.h
+pub mod ifaddrs;
+pub mod inttypes;
+// iso646.h implemented in C
+pub mod langinfo;
+// TODO: libintl.h
+pub mod libgen;
+pub mod limits;
+pub mod locale;
+pub mod malloc;
+// TODO unfinished, unguard feature when ready
+#[cfg(feature = "math_libm")]
+pub mod math;
+pub mod monetary;
+// TODO: mqueue.h
+// TODO: ndbm.h
+pub mod net_if;
+pub mod netdb;
+pub mod netinet_in;
+pub mod netinet_ip;
+pub mod netinet_tcp;
+// TODO: nl_types.h
+// TODO: Remove C header paths.h when cbindgen can export C/Rust strs
+// pub mod paths;
+pub mod poll;
+pub mod pthread;
+pub mod pty;
+pub mod pwd;
+// TODO: re_comp.h (deprecated)
+pub mod regex;
+// TODO: regexp.h (deprecated)
+pub mod sched;
+// TODO: search.h
+pub mod semaphore;
+pub mod setjmp;
+pub mod sgtty;
+pub mod shadow;
+pub mod signal;
+// TODO: spawn.h
+// TODO: stdalign.h (likely C implementation)
+// stdarg.h implemented in C
+// stdatomic.h implemented in C
+// stdbool.h implemented in C
+// stddef.h implemented in C
+// stdint.h implemented in C
+pub mod stdio;
+pub mod stdlib;
+// TODO: stdnoreturn.h (likely C implementation)
+pub mod string;
+pub mod strings;
+// TODO: stropts.h (deprecated)
+pub mod sys_auxv;
+pub mod sys_epoll;
+pub mod sys_file;
+pub mod sys_ioctl;
+// TODO: sys/ipc.h
+pub mod sys_mman;
+// TODO: sys/msg.h
+pub mod sys_ptrace;
+pub mod sys_resource;
+pub mod sys_select;
+// TODO: sys/sem.h
+// TODO: sys/shm.h
+pub mod sys_socket;
+pub mod sys_stat;
+pub mod sys_statvfs;
+#[allow(non_upper_case_globals)]
+pub mod sys_syscall;
+pub mod sys_time;
+#[deprecated]
+pub mod sys_timeb;
+//pub mod sys_times;
+pub mod arch_aarch64_user;
+pub mod arch_riscv64_user;
+pub mod arch_x64_user;
+#[cfg(not(target_arch = "x86"))] // TODO: x86
+pub mod sys_procfs;
+pub mod sys_random;
+pub mod sys_syslog;
+pub mod sys_types;
+#[allow(non_camel_case_types)]
+pub mod sys_types_internal;
+pub mod sys_uio;
+pub mod sys_un;
+pub mod sys_utsname;
+pub mod sys_wait;
+pub mod tar;
+// TODO: term.h (deprecated)
+pub mod termios;
+// TODO: tgmath.h (likely C implementation)
+// TODO: threads.h
+pub mod time;
+// TODO: uchar.h
+// TODO: ucontext.h (deprecated)
+// TODO: ulimit.h (deprecated)
+// TODO: unctrl.h (deprecated)
+pub mod unistd;
+#[deprecated]
+pub mod utime;
+pub mod utmp;
+// TODO: utmpx.h
+// TODO: varargs.h (deprecated)
+pub mod wchar;
+pub mod wctype;
+// TODO: wordexp.h
+// TODO: xti.h (deprecated)
diff --git a/recipes/core/relibc/src/header/monetary/cbindgen.toml b/recipes/core/relibc/src/header/monetary/cbindgen.toml
new file mode 100644
index 0000000000..003cbd5026
--- /dev/null
+++ b/recipes/core/relibc/src/header/monetary/cbindgen.toml
@@ -0,0 +1,21 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/monetary.h.html
+#
+# Spec quotations relating to includes:
+# - "The <monetary.h> header shall define the locale_t type as described in <locale.h>."
+# - "The <monetary.h> header shall define the size_t type as described in <stddef.h>."
+# - "The <monetary.h> header shall define the ssize_t type as described in <sys/types.h>."
+#
+# sys/types.h brings in stddef.h
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_MONETARY_H"
+after_includes = """
+#include <bits/locale-t.h> // for locale_t from locale.h
+"""
+language = "C"
+style = "tag"
+no_includes = true
+cpp_compat = true
+usize_is_size_t = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/monetary/mod.rs b/recipes/core/relibc/src/header/monetary/mod.rs
new file mode 100644
index 0000000000..973b1830a3
--- /dev/null
+++ b/recipes/core/relibc/src/header/monetary/mod.rs
@@ -0,0 +1,102 @@
+//! `monetary.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/monetary.h.html>.
+
+// We should provide a strfmon() implementation that formats a monetary value,
+// according to the current locale (TODO).
+
+use alloc::string::{String, ToString};
+use core::str;
+
+use libm::{fabs, pow, round, trunc};
+
+extern crate alloc;
+
+mod strfmon;
+#[repr(C)]
+struct LocaleMonetaryInfo {
+    int_curr_symbol: &'static str,
+    currency_symbol: &'static str,
+    mon_decimal_point: &'static str,
+    mon_thousands_sep: &'static str,
+    mon_grouping: &'static [u8],
+    positive_sign: &'static str,
+    negative_sign: &'static str,
+    int_frac_digits: u8,
+    frac_digits: u8,
+    p_cs_precedes: bool,
+    p_sep_by_space: bool,
+    p_sign_posn: u8,
+    n_cs_precedes: bool,
+    n_sep_by_space: bool,
+    n_sign_posn: u8,
+}
+
+const DEFAULT_MONETARY: LocaleMonetaryInfo = LocaleMonetaryInfo {
+    int_curr_symbol: "USD ",
+    currency_symbol: "$",
+    mon_decimal_point: ".",
+    mon_thousands_sep: ",",
+    mon_grouping: &[3, 3],
+    positive_sign: "",
+    negative_sign: "-",
+    int_frac_digits: 2,
+    frac_digits: 2,
+    p_cs_precedes: true,
+    p_sep_by_space: false,
+    p_sign_posn: 1,
+    n_cs_precedes: true,
+    n_sep_by_space: false,
+    n_sign_posn: 1,
+};
+
+#[derive(Default)]
+struct FormatFlags {
+    left_justify: bool,
+    force_sign: bool,
+    space_sign: bool,
+    use_parens: bool,
+    suppress_symbol: bool,
+    field_width: Option<usize>,
+    left_precision: Option<usize>,
+    right_precision: Option<usize>,
+    international: bool,
+}
+
+/// Formats a monetary value according to the current locale.
+fn apply_grouping(int_str: &str, monetary: &LocaleMonetaryInfo) -> String {
+    let mut grouped = String::with_capacity(int_str.len() * 2);
+    let mut group_idx = 0;
+    let current_grouping = &monetary.mon_grouping;
+    let separator = monetary.mon_thousands_sep;
+
+    for (count, c) in int_str.chars().enumerate() {
+        if count > 0 {
+            let current_group = current_grouping[group_idx.min(current_grouping.len() - 1)];
+            if current_group > 0 && (count as u8).is_multiple_of(current_group) {
+                grouped.push_str(separator);
+                if group_idx + 1 < current_grouping.len() {
+                    group_idx += 1;
+                }
+            }
+        }
+        grouped.push(c);
+    }
+
+    grouped
+}
+
+/// Safe handling of large monetary values. Returns None if the value is too large to format
+fn format_value_parts(value: f64, frac_digits: usize) -> Option<(String, i64)> {
+    let abs_value = fabs(value);
+    if abs_value > (i64::MAX as f64) {
+        // Check if the value is too large to format
+        return None;
+    }
+
+    let int_part = trunc(abs_value) as i64;
+    let scale = pow(10.0, frac_digits as f64);
+    let frac_part = round((abs_value - int_part as f64) * scale) as i64;
+
+    Some((int_part.to_string(), frac_part))
+}
diff --git a/recipes/core/relibc/src/header/monetary/strfmon.rs b/recipes/core/relibc/src/header/monetary/strfmon.rs
new file mode 100644
index 0000000000..c0f380604e
--- /dev/null
+++ b/recipes/core/relibc/src/header/monetary/strfmon.rs
@@ -0,0 +1,326 @@
+use crate::platform::types::{c_char, size_t, ssize_t};
+
+use super::{DEFAULT_MONETARY, FormatFlags, LocaleMonetaryInfo, apply_grouping};
+use alloc::string::{String, ToString};
+use core::{ffi::CStr, slice};
+use libm::{fabs, pow, round, trunc};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strfmon.html>.
+///
+/// The `strfmon()` function formats a monetary value according to the format string `format`
+/// and writes the result to the character array `s` of size `maxsize`.
+/// The format string can contain plain characters and format specifiers.
+///
+/// Returns:
+/// - The number of characters written (excluding the null terminator), or -1 if
+///   an error occurs (e.g., invalid input, buffer overflow)
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strfmon(
+    s: *mut c_char,        // Output buffer
+    maxsize: size_t,       // Maximum size of the buffer
+    format: *const c_char, // Format string
+    mut args: ...          // Variadic arguments for monetary values
+) -> ssize_t {
+    // Validate input pointers and buffer size
+    if s.is_null() || format.is_null() || maxsize == 0 {
+        return -1; // Invalid input
+    }
+
+    // Convert the format string from C to string
+    let format_str = match unsafe { CStr::from_ptr(format) }.to_str() {
+        Ok(s) => s,
+        Err(_) => return -1, // Invalid format string
+    };
+
+    // Create a mutable slice for the output buffer
+    let buffer = unsafe { slice::from_raw_parts_mut(s.cast::<u8>(), maxsize) };
+    let mut pos = 0;
+    let mut format_chars = format_str.chars().peekable();
+
+    // Parse the format string
+    while let Some(c) = format_chars.next() {
+        // Handle plain characters (non-`%`)
+        if c != '%' {
+            if pos >= buffer.len() {
+                return -1; // Buffer overflow
+            }
+            buffer[pos] = c as u8; // Write the character to the buffer
+            pos += 1;
+            continue;
+        }
+
+        // Handle `%%` escape sequence
+        if format_chars.peek() == Some(&'%') {
+            if pos >= buffer.len() {
+                return -1; // Buffer overflow
+            }
+            buffer[pos] = b'%'; // Write a literal `%`
+            pos += 1;
+            format_chars.next(); // Skip the second `%`
+            continue;
+        }
+
+        // Parse format specifiers
+        let mut flags = FormatFlags::default();
+
+        // Parse flags (`+`, `(`, ...)
+        while let Some(&next_char) = format_chars.peek() {
+            match next_char {
+                '=' => flags.left_justify = true,
+                '+' => flags.force_sign = true,
+                ' ' => flags.space_sign = true,
+                '(' => flags.use_parens = true,
+                '!' => flags.suppress_symbol = true,
+                _ => break, // Stop when no more flags are found
+            }
+            format_chars.next();
+        }
+
+        // Parse field width
+        let mut num_str = String::new();
+        while let Some(&c) = format_chars.peek() {
+            if !c.is_ascii_digit() {
+                break;
+            }
+            num_str.push(c);
+            format_chars.next();
+        }
+        if !num_str.is_empty() {
+            flags.field_width = num_str.parse().ok(); // Parse as integer
+        }
+
+        // Parse left precision (`#`)
+        if format_chars.peek() == Some(&'#') {
+            format_chars.next(); // Skip `#`
+            num_str.clear(); // Clear the string for precision
+            while let Some(&c) = format_chars.peek() {
+                if !c.is_ascii_digit() {
+                    break;
+                }
+                num_str.push(c);
+                format_chars.next();
+            }
+            flags.left_precision = num_str.parse().ok(); // Parse as integer
+        }
+
+        // Parse right precision indicated by `.`
+        if format_chars.peek() == Some(&'.') {
+            format_chars.next(); // Skip `.`
+            num_str.clear(); // Clear the string for precision
+            while let Some(&c) = format_chars.peek() {
+                if !c.is_ascii_digit() {
+                    break;
+                }
+                num_str.push(c);
+                format_chars.next();
+            }
+            flags.right_precision = num_str.parse().ok(); // Parse as integer
+        }
+
+        // Handle conversion specifiers (`i` or `n`)
+        match format_chars.next() {
+            Some('i') => {
+                // International formatting
+                flags.international = true;
+                let value = unsafe { args.arg::<f64>() }; // Get the argument as f64
+                if let Some(written) =
+                    format_monetary(&mut buffer[pos..], value, &DEFAULT_MONETARY, &flags)
+                {
+                    pos += written; // Update the position
+                } else {
+                    return -1; // Formatting failed
+                }
+            }
+            Some('n') => {
+                // Locale-specific formatting
+                let value = unsafe { args.arg::<f64>() }; // Get the argument as f64
+                if let Some(written) =
+                    format_monetary(&mut buffer[pos..], value, &DEFAULT_MONETARY, &flags)
+                {
+                    pos += written; // Update the position
+                } else {
+                    return -1; // Failed to format the value
+                }
+            }
+            _ => return -1,
+        }
+    }
+
+    // Ensure there is space for the null terminator
+    if pos >= buffer.len() {
+        return -1; // Buffer overflow
+    }
+    buffer[pos] = 0; // Null-terminate the buffer
+    pos as ssize_t // Return the number of characters written
+}
+
+/// Formats a monetary value into the given `buffer` using locale-specific rules
+/// from `monetary` and formatting options from `flags`.
+/// Returns `Some(len)` if successful, where `len` is the number of bytes written,
+/// or `None` on error.
+///
+/// # Parameters
+/// - `buffer`: The output slice in which to write the formatted string
+/// - `value`: The numeric value to format as monetary
+/// - `monetary`: Locale-specific formatting rules, including symbols, separators,
+///   and grouping sizes
+/// - `flags`: Additional formatting options
+///
+fn format_monetary(
+    buffer: &mut [u8],
+    value: f64,
+    monetary: &LocaleMonetaryInfo,
+    flags: &FormatFlags,
+) -> Option<usize> {
+    // 1) determine sign and absolute value
+    let is_negative = value < 0.0;
+    let abs_value = fabs(value);
+
+    // 2) figure out how many fractionals digits to use
+    let frac_digits = if flags.international {
+        flags
+            .right_precision
+            .unwrap_or(monetary.int_frac_digits as usize)
+    } else {
+        flags
+            .right_precision
+            .unwrap_or(monetary.frac_digits as usize)
+    };
+
+    // 3) split the value into integer and fractional parts
+    let scale = pow(10.0, frac_digits as f64);
+
+    // Check for overflow
+    let max_safe_int = (i64::MAX as f64) / scale;
+    if abs_value >= max_safe_int {
+        return None;
+    }
+
+    let mut int_part = trunc(abs_value) as i64;
+    let mut frac_part = round((abs_value - int_part as f64) * scale) as i64;
+
+    // 4) handle carry-over if frac_part equals or exceeds scale after rounding
+    if frac_part >= scale as i64 {
+        int_part += 1;
+        frac_part = 0;
+    }
+
+    // 5) convert the integer part to string
+    let mut int_str = int_part.to_string();
+
+    // 6) apply left precision if specified (padding with '0')
+    //    So if left_precision is 5 and int_str is "42", it becomes "00042".
+    if let Some(left_prec) = flags.left_precision {
+        if int_str.len() > left_prec {
+            // The integer part is too large to fit the precision
+            return None;
+        }
+        // Right-align the number in a field of `left_prec` width, padded with '0'
+        int_str = format!("{:0>width$}", int_str, width = left_prec);
+    }
+
+    // 7) build the final formatted output in a temporary String
+    let mut result = String::with_capacity(int_str.len() * 2 + 20);
+
+    // 7a) determine currency symbol placement and sign rules
+    let (cs_precedes, sep_by_space, sign_posn) = if is_negative {
+        (
+            monetary.n_cs_precedes,
+            monetary.n_sep_by_space,
+            monetary.n_sign_posn,
+        )
+    } else {
+        (
+            monetary.p_cs_precedes,
+            monetary.p_sep_by_space,
+            monetary.p_sign_posn,
+        )
+    };
+
+    // 7b) determine which sign to display
+    //     - negative sign if value is negative
+    //     - positive_sign if user forced sign
+    //     - space if space_sign is set and value is positive
+    //     - empty otherwise
+    let sign = match (is_negative, flags.force_sign, flags.space_sign) {
+        (true, _, _) => monetary.negative_sign,
+        (false, true, _) => monetary.positive_sign,
+        (false, false, true) => " ",
+        _ => "",
+    };
+
+    // 7c) choose which currency symbol to display
+    //     - maybe empty if suppressed
+    //     - int_curr_symbol for international format
+    //     - currency_symbol for local format
+    let symbol = if flags.suppress_symbol {
+        ""
+    } else if flags.international {
+        monetary.int_curr_symbol
+    } else {
+        monetary.currency_symbol
+    };
+
+    // 8) add opening parenthesis if sign position is 0
+    if sign_posn == 0 {
+        result.push('(');
+    } else if sign_posn == 1 {
+        result.push_str(sign);
+    }
+
+    // 9) add currency symbol if it precedes the amount
+    if cs_precedes {
+        result.push_str(symbol);
+        if sep_by_space {
+            result.push(' ');
+        }
+    }
+
+    // 10) group the integer string and append it
+    let grouped = apply_grouping(&int_str, monetary);
+    result.push_str(&grouped);
+
+    // 11) append the fractional part, if any
+    if frac_digits > 0 {
+        result.push_str(monetary.mon_decimal_point);
+        // Zero-pad fractional part to the specified width
+        result.push_str(&format!("{:0>width$}", frac_part, width = frac_digits));
+    }
+
+    // 12) if the currency symbol follows the amount, add it now
+    if !cs_precedes {
+        if sep_by_space {
+            result.push(' ');
+        }
+        result.push_str(symbol);
+    }
+
+    // 13) if sign_posn == 0, close the parenthesis
+    if sign_posn == 0 {
+        result.push(')');
+    }
+
+    // 14) checks if the user specified a total field width
+    //     - if the final result is shorter, we padd it
+    //     - if `left_justify` is true, padd on the right otherwise padd on the left
+    if let Some(width) = flags.field_width
+        && result.len() < width
+    {
+        let padding = " ".repeat(width - result.len());
+        result = if flags.left_justify {
+            result + &padding
+        } else {
+            padding + &result
+        };
+    }
+
+    // 15) write the final string to the buffer
+    if result.len() > buffer.len() {
+        // Not enough space in the output buffer
+        return None;
+    }
+    buffer[..result.len()].copy_from_slice(result.as_bytes());
+
+    // 16) return how many bytes we wrote
+    Some(result.len())
+}
diff --git a/recipes/core/relibc/src/header/net_if/cbindgen.toml b/recipes/core/relibc/src/header/net_if/cbindgen.toml
new file mode 100644
index 0000000000..a434e2f0dc
--- /dev/null
+++ b/recipes/core/relibc/src/header/net_if/cbindgen.toml
@@ -0,0 +1,12 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/net_if.h.html
+#
+# There are no spec quotations relating to includes
+sys_includes = []
+include_guard = "_NET_IF_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/net_if/mod.rs b/recipes/core/relibc/src/header/net_if/mod.rs
new file mode 100644
index 0000000000..edbfedec50
--- /dev/null
+++ b/recipes/core/relibc/src/header/net_if/mod.rs
@@ -0,0 +1,119 @@
+//! `net/if.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/net_if.h.html>.
+
+use core::ptr::null;
+
+use crate::{
+    c_str::CStr,
+    platform::{
+        ERRNO,
+        types::{c_char, c_int, c_uint},
+    },
+};
+
+use super::errno::ENXIO;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/net_if.h.html>.
+#[repr(C)]
+pub struct if_nameindex {
+    if_index: c_uint,
+    if_name: *const c_char,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/net_if.h.html>.
+pub const IF_NAMESIZE: usize = 16;
+
+const IF_STUB_INTERFACE: *const c_char = (c"stub").as_ptr();
+
+const INTERFACES: &[if_nameindex] = &[
+    if_nameindex {
+        if_index: 1,
+        if_name: IF_STUB_INTERFACE,
+    },
+    if_nameindex {
+        if_index: 0,
+        if_name: null::<c_char>(),
+    },
+];
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/if_freenameindex.html>.
+///
+/// # Safety
+/// this is a no-op: the list returned by if_nameindex() is a ref to a constant
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn if_freenameindex(s: *mut if_nameindex) {}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/if_indextoname.html>.
+///
+/// # Safety
+/// Returns only static lifetime references to const names, does not reuse the buf pointer.
+/// Returns NULL in case of not found + ERRNO being set to ENXIO.
+/// Currently only checks against inteface index 1.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn if_indextoname(idx: c_uint, buf: *mut c_char) -> *const c_char {
+    if idx == 1 {
+        return IF_STUB_INTERFACE;
+    }
+    ERRNO.set(ENXIO);
+    null::<c_char>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/if_nameindex.html>.
+///
+/// # Safety
+/// Returns a constant pointer to a pre defined const stub list
+/// The end of the list is determined by an if_nameindex struct having if_index 0 and if_name NULL
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn if_nameindex() -> *const if_nameindex {
+    core::ptr::from_ref::<if_nameindex>(&INTERFACES[0])
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/if_nametoindex.html>.
+///
+/// # Safety
+/// Compares the name to a constant string and only returns an int as a result.
+/// An invalid name string will return an index of 0
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn if_nametoindex(name: *const c_char) -> c_uint {
+    if name.is_null() {
+        return 0;
+    }
+    let name = unsafe { CStr::from_ptr(name).to_str().unwrap_or("") };
+    if name.eq("stub") {
+        return 1;
+    }
+    0
+}
+
+// Nonstandard, used alongside ifaddrs.h
+// See https://man7.org/linux/man-pages/man7/netdevice.7.html
+
+pub const IFF_UP: c_int = 0x1;
+pub const IFF_BROADCAST: c_int = 0x2;
+pub const IFF_DEBUG: c_int = 0x4;
+pub const IFF_LOOPBACK: c_int = 0x8;
+pub const IFF_POINTOPOINT: c_int = 0x10;
+pub const IFF_NOTRAILERS: c_int = 0x20;
+pub const IFF_RUNNING: c_int = 0x40;
+pub const IFF_NOARP: c_int = 0x80;
+pub const IFF_PROMISC: c_int = 0x100;
+pub const IFF_ALLMULTI: c_int = 0x200;
+pub const IFF_MASTER: c_int = 0x400;
+pub const IFF_SLAVE: c_int = 0x800;
+pub const IFF_MULTICAST: c_int = 0x1000;
+pub const IFF_PORTSEL: c_int = 0x2000;
+pub const IFF_AUTOMEDIA: c_int = 0x4000;
+pub const IFF_DYNAMIC: c_int = 0x8000;
+pub const IFF_LOWER_UP: c_int = 0x10000;
+pub const IFF_DORMANT: c_int = 0x20000;
+pub const IFF_ECHO: c_int = 0x40000;
+pub const IFF_VOLATILE: c_int = IFF_LOOPBACK
+    | IFF_POINTOPOINT
+    | IFF_BROADCAST
+    | IFF_ECHO
+    | IFF_MASTER
+    | IFF_SLAVE
+    | IFF_RUNNING
+    | IFF_LOWER_UP
+    | IFF_DORMANT;
diff --git a/recipes/core/relibc/src/header/netdb/cbindgen.toml b/recipes/core/relibc/src/header/netdb/cbindgen.toml
new file mode 100644
index 0000000000..b031875f72
--- /dev/null
+++ b/recipes/core/relibc/src/header/netdb/cbindgen.toml
@@ -0,0 +1,22 @@
+# netinet/in.h brings in sys/socket.h
+sys_includes = ["inttypes.h", "netinet/in.h", "features.h"]
+include_guard = "_RELIBC_NETDB_H"
+trailer = """
+#ifndef _RELIBC_BITS_NETDB_H
+#define _RELIBC_BITS_NETDB_H
+
+#define h_errno (*__h_errno_location())
+#define h_addr  h_addr_list[0] /* Address, for backward compatibility.*/
+
+#endif // _RELIBC_BITS_NETDB_H
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[export.rename]
+"sockaddr" = "struct sockaddr"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/netdb/dns/answer.rs b/recipes/core/relibc/src/header/netdb/dns/answer.rs
new file mode 100644
index 0000000000..544c77f558
--- /dev/null
+++ b/recipes/core/relibc/src/header/netdb/dns/answer.rs
@@ -0,0 +1,21 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use alloc::{string::String, vec::Vec};
+
+#[derive(Clone, Debug)]
+pub struct DnsAnswer {
+    pub name: String,
+    pub a_type: u16,
+    pub a_class: u16,
+    pub ttl_a: u16,
+    pub ttl_b: u16,
+    pub data: Vec<u8>,
+}
diff --git a/recipes/core/relibc/src/header/netdb/dns/mod.rs b/recipes/core/relibc/src/header/netdb/dns/mod.rs
new file mode 100644
index 0000000000..9d7e44bd1c
--- /dev/null
+++ b/recipes/core/relibc/src/header/netdb/dns/mod.rs
@@ -0,0 +1,166 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub use self::{answer::DnsAnswer, query::DnsQuery};
+
+use alloc::{string::String, vec::Vec};
+
+mod answer;
+mod query;
+
+#[derive(Clone, Debug)]
+pub struct Dns {
+    pub transaction_id: u16,
+    pub flags: u16,
+    pub queries: Vec<DnsQuery>,
+    pub answers: Vec<DnsAnswer>,
+}
+
+impl Dns {
+    pub fn compile(&self) -> Vec<u8> {
+        let mut data = Vec::new();
+
+        macro_rules! push_u8 {
+            ($value:expr) => {
+                data.push($value);
+            };
+        }
+
+        macro_rules! push_n16 {
+            ($value:expr) => {
+                data.extend_from_slice(&u16::to_be_bytes($value));
+            };
+        }
+
+        push_n16!(self.transaction_id);
+        push_n16!(self.flags);
+        push_n16!(self.queries.len() as u16);
+        push_n16!(self.answers.len() as u16);
+        push_n16!(0);
+        push_n16!(0);
+
+        for query in self.queries.iter() {
+            for part in query.name.split('.') {
+                push_u8!(part.len() as u8);
+                data.extend_from_slice(part.as_bytes());
+            }
+            push_u8!(0);
+            push_n16!(query.q_type);
+            push_n16!(query.q_class);
+        }
+        data
+    }
+
+    pub fn parse(data: &[u8]) -> Result<Self, String> {
+        let name_ind = 0b1100_0000;
+        let mut i = 0;
+
+        macro_rules! pop_u8 {
+            () => {{
+                i += 1;
+                if i > data.len() {
+                    return Err(format!("{}: {}: pop_u8", file!(), line!()));
+                }
+                data[i - 1]
+            }};
+        }
+
+        macro_rules! pop_n16 {
+            () => {{
+                use core::convert::TryInto;
+                i += 2;
+                if i > data.len() {
+                    return Err(format!("{}: {}: pop_n16", file!(), line!()));
+                }
+                let bytes: [u8; 2] = data[i - 2..i].try_into().unwrap();
+                u16::from_be_bytes(bytes)
+            }};
+        }
+
+        macro_rules! pop_data {
+            () => {{
+                let mut data = Vec::new();
+
+                let data_len = pop_n16!();
+                for _data_i in 0..data_len {
+                    data.push(pop_u8!());
+                }
+
+                data
+            }};
+        }
+
+        macro_rules! pop_name {
+            () => {{
+                let mut name = String::new();
+                let old_i = i;
+
+                loop {
+                    let name_len = pop_u8!();
+                    if name_len & name_ind == name_ind {
+                        i -= 1;
+                        i = (pop_n16!() - ((name_ind as u16) << 8)) as usize;
+                        continue;
+                    }
+                    if name_len == 0 {
+                        break;
+                    }
+                    if !name.is_empty() {
+                        name.push('.');
+                    }
+                    for _name_i in 0..name_len {
+                        name.push(pop_u8!() as char);
+                    }
+                }
+
+                if i <= old_i {
+                    i = old_i + 2;
+                }
+
+                name
+            }};
+        }
+
+        let transaction_id = pop_n16!();
+        let flags = pop_n16!();
+        let queries_len = pop_n16!();
+        let answers_len = pop_n16!();
+        let _ = pop_n16!();
+        let _ = pop_n16!();
+
+        let mut queries = Vec::new();
+        for _query_i in 0..queries_len {
+            queries.push(DnsQuery {
+                name: pop_name!(),
+                q_type: pop_n16!(),
+                q_class: pop_n16!(),
+            });
+        }
+
+        let mut answers = Vec::new();
+        for _answer_i in 0..answers_len {
+            answers.push(DnsAnswer {
+                name: pop_name!(),
+                a_type: pop_n16!(),
+                a_class: pop_n16!(),
+                ttl_a: pop_n16!(),
+                ttl_b: pop_n16!(),
+                data: pop_data!(),
+            });
+        }
+
+        Ok(Dns {
+            transaction_id,
+            flags,
+            queries,
+            answers,
+        })
+    }
+}
diff --git a/recipes/core/relibc/src/header/netdb/dns/query.rs b/recipes/core/relibc/src/header/netdb/dns/query.rs
new file mode 100644
index 0000000000..0ac852f4e4
--- /dev/null
+++ b/recipes/core/relibc/src/header/netdb/dns/query.rs
@@ -0,0 +1,18 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use alloc::string::String;
+
+#[derive(Clone, Debug)]
+pub struct DnsQuery {
+    pub name: String,
+    pub q_type: u16,
+    pub q_class: u16,
+}
diff --git a/recipes/core/relibc/src/header/netdb/host.rs b/recipes/core/relibc/src/header/netdb/host.rs
new file mode 100644
index 0000000000..9d8c6a4347
--- /dev/null
+++ b/recipes/core/relibc/src/header/netdb/host.rs
@@ -0,0 +1,132 @@
+use alloc::{boxed::Box, str::SplitWhitespace, vec::Vec};
+use core::{mem, ptr};
+
+use crate::{
+    error::ResultExt,
+    header::{
+        arpa_inet::inet_aton, fcntl::O_RDONLY, netinet_in::in_addr, sys_socket::constants::AF_INET,
+        unistd::SEEK_SET,
+    },
+    platform::{
+        Pal, Sys,
+        rlb::{Line, RawLineBuffer},
+        types::{c_char, c_int},
+    },
+    raw_cell::RawCell,
+};
+
+use super::{bytes_to_box_str, hostent};
+
+static mut HOSTDB: c_int = -1;
+pub static mut HOST_ENTRY: hostent = hostent {
+    h_name: ptr::null_mut(),
+    h_aliases: ptr::null_mut(),
+    h_addrtype: 0,
+    h_length: 0,
+    h_addr_list: ptr::null_mut(),
+};
+pub static HOST_NAME: RawCell<Option<Vec<u8>>> = RawCell::new(None);
+pub static HOST_ALIASES: RawCell<Option<Vec<Vec<u8>>>> = RawCell::new(None);
+static _HOST_ALIASES: RawCell<Option<Vec<*mut c_char>>> = RawCell::new(None);
+pub static mut HOST_ADDR: Option<in_addr> = None;
+pub static mut HOST_ADDR_LIST: [*mut c_char; 2] = [ptr::null_mut(); 2];
+pub static mut _HOST_ADDR_LIST: [u8; 4] = [0u8; 4];
+static mut H_POS: usize = 0;
+pub static mut HOST_STAYOPEN: c_int = 0;
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn endhostent() {
+    if unsafe { HOSTDB } >= 0
+        && let Ok(()) = Sys::close(unsafe { HOSTDB })
+    {} // TODO handle error
+    unsafe { HOSTDB = -1 };
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sethostent(stayopen: c_int) {
+    unsafe { HOST_STAYOPEN = stayopen };
+    if unsafe { HOSTDB } < 0 {
+        unsafe { HOSTDB = Sys::open(c"/etc/hosts".into(), O_RDONLY, 0).or_minus_one_errno() }
+    } else if Sys::lseek(unsafe { HOSTDB }, 0, SEEK_SET).is_ok() {
+    } // TODO handle error
+    unsafe { H_POS = 0 };
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn gethostent() -> *mut hostent {
+    if unsafe { HOSTDB } < 0 {
+        unsafe { HOSTDB = Sys::open(c"/etc/hosts".into(), O_RDONLY, 0).or_minus_one_errno() };
+    }
+    let mut rlb = RawLineBuffer::new(unsafe { HOSTDB });
+    rlb.seek(unsafe { H_POS });
+
+    let mut r: Box<str> = Box::default();
+    while r.is_empty() || r.split_whitespace().next().is_none() || r.starts_with('#') {
+        r = match rlb.next() {
+            Line::Some(s) => bytes_to_box_str(s),
+            _ => {
+                if unsafe { HOST_STAYOPEN } == 0 {
+                    unsafe { endhostent() };
+                }
+                return ptr::null_mut();
+            }
+        };
+    }
+    rlb.next();
+    unsafe { H_POS = rlb.line_pos() };
+
+    let mut iter: SplitWhitespace = r.split_whitespace();
+
+    let addr_vec: Vec<u8> = iter.next().unwrap().bytes().chain(Some(b'\0')).collect();
+    let addr_cstr = addr_vec.as_slice().as_ptr().cast::<c_char>();
+    let mut addr = mem::MaybeUninit::uninit();
+    unsafe { inet_aton(addr_cstr, addr.as_mut_ptr()) };
+    let addr = unsafe { addr.assume_init() };
+
+    unsafe {
+        _HOST_ADDR_LIST = addr.s_addr.to_ne_bytes();
+        HOST_ADDR_LIST = [(&raw mut _HOST_ADDR_LIST).cast::<c_char>(), ptr::null_mut()];
+
+        HOST_ADDR = Some(addr);
+    }
+
+    let host_name = iter.next().unwrap().bytes().chain(Some(b'\0')).collect();
+
+    let mut _host_aliases: Vec<Vec<u8>> = iter
+        .map(|alias| alias.bytes().chain(Some(b'\0')).collect())
+        .collect();
+    unsafe { HOST_ALIASES.unsafe_set(Some(_host_aliases)) };
+
+    let mut host_aliases: Vec<*mut c_char> = unsafe {
+        HOST_ALIASES
+            .unsafe_mut()
+            .as_mut()
+            .unwrap()
+            .iter_mut()
+            .map(|x| x.as_mut_ptr().cast::<c_char>())
+            .chain([ptr::null_mut(), ptr::null_mut()])
+            .collect()
+    };
+
+    unsafe { HOST_NAME.unsafe_set(Some(host_name)) };
+
+    unsafe {
+        HOST_ENTRY = hostent {
+            h_name: HOST_NAME
+                .unsafe_mut()
+                .as_mut()
+                .unwrap()
+                .as_mut_ptr()
+                .cast::<c_char>(),
+            h_aliases: host_aliases.as_mut_slice().as_mut_ptr(),
+            h_addrtype: AF_INET,
+            h_length: 4,
+            h_addr_list: (&raw mut HOST_ADDR_LIST).cast(),
+        };
+        _HOST_ALIASES.unsafe_set(Some(host_aliases));
+    }
+    if unsafe { HOST_STAYOPEN } == 0 {
+        unsafe { endhostent() };
+    }
+    (&raw mut HOST_ENTRY).cast::<hostent>()
+}
diff --git a/recipes/core/relibc/src/header/netdb/linux.rs b/recipes/core/relibc/src/header/netdb/linux.rs
new file mode 100644
index 0000000000..2601051164
--- /dev/null
+++ b/recipes/core/relibc/src/header/netdb/linux.rs
@@ -0,0 +1,19 @@
+use crate::{
+    error::Errno,
+    fs::File,
+    header::{errno, fcntl},
+    io::{BufRead, BufReader},
+};
+use alloc::string::String;
+
+pub fn get_dns_server() -> Result<String, Errno> {
+    let file = File::open(c"/etc/resolv.conf".into(), fcntl::O_RDONLY).map(BufReader::new)?;
+
+    for line in file.lines().map_while(Result::ok) {
+        if let Some(dns) = line.strip_prefix("nameserver ") {
+            return Ok(dns.into());
+        }
+    }
+
+    Err(Errno(errno::EIO).sync())
+}
diff --git a/recipes/core/relibc/src/header/netdb/lookup.rs b/recipes/core/relibc/src/header/netdb/lookup.rs
new file mode 100644
index 0000000000..0734eec668
--- /dev/null
+++ b/recipes/core/relibc/src/header/netdb/lookup.rs
@@ -0,0 +1,371 @@
+use alloc::{boxed::Box, string::ToString, vec::Vec};
+use core::{mem, ptr};
+
+use crate::{
+    out::Out,
+    platform::{
+        Pal, Sys,
+        types::{c_int, c_void},
+    },
+};
+
+use crate::header::{
+    bits_arpainet::htons,
+    bits_socklen_t::socklen_t,
+    bits_timespec::timespec,
+    errno::*,
+    netinet_in::{IPPROTO_UDP, in_addr, sockaddr_in},
+    sys_socket::{
+        self,
+        constants::{AF_INET, SOCK_DGRAM},
+        sockaddr,
+    },
+    time,
+};
+
+use super::{
+    dns::{Dns, DnsQuery},
+    sys::get_dns_server,
+};
+
+pub type LookupHost = Vec<in_addr>;
+
+pub fn lookup_host(host: &str) -> Result<LookupHost, c_int> {
+    if let Some(host_direct_addr) = parse_ipv4_string(host) {
+        // already an ip address
+        return Ok(vec![in_addr {
+            s_addr: host_direct_addr,
+        }]);
+    }
+
+    let dns_string = get_dns_server().map_err(|e| e.0)?;
+
+    if let Some(dns_addr) = parse_ipv4_string(&dns_string) {
+        let mut timespec = timespec::default();
+        if let Ok(()) = Sys::clock_gettime(
+            time::constants::CLOCK_REALTIME,
+            Out::from_mut(&mut timespec),
+        ) {}; // TODO handle error
+        let tid = (timespec.tv_nsec >> 16) as u16;
+
+        let packet = Dns {
+            transaction_id: tid,
+            flags: 0x0100,
+            queries: vec![DnsQuery {
+                name: host.to_string(),
+                q_type: 0x0001,
+                q_class: 0x0001,
+            }],
+            answers: vec![],
+        };
+
+        let packet_data = packet.compile();
+        let packet_data_len = packet_data.len();
+
+        let packet_data_box = packet_data.into_boxed_slice();
+        let packet_data_ptr = Box::into_raw(packet_data_box) as *mut _ as *mut c_void;
+
+        let dest = sockaddr_in {
+            sin_family: AF_INET as u16,
+            sin_port: htons(53),
+            sin_addr: in_addr { s_addr: dns_addr },
+            ..Default::default()
+        };
+        let dest_ptr = ptr::from_ref(&dest).cast::<sockaddr>();
+
+        let sock = unsafe {
+            let sock = sys_socket::socket(AF_INET, SOCK_DGRAM, i32::from(IPPROTO_UDP));
+            if sys_socket::connect(sock, dest_ptr, mem::size_of_val(&dest) as socklen_t) < 0 {
+                return Err(EIO);
+            }
+            if sys_socket::send(sock, packet_data_ptr, packet_data_len, 0) < 0 {
+                drop(Box::from_raw(packet_data_ptr));
+                return Err(EIO);
+            }
+            sock
+        };
+
+        unsafe {
+            drop(Box::from_raw(packet_data_ptr));
+        }
+
+        let i = 0 as socklen_t;
+        let mut buf = vec![0u8; 65536];
+        let buf_ptr = buf.as_mut_ptr().cast::<c_void>();
+
+        let count = unsafe { sys_socket::recv(sock, buf_ptr, 65536, 0) };
+        if count < 0 {
+            return Err(EIO);
+        }
+
+        match Dns::parse(&buf[..count as usize]) {
+            Ok(response) => {
+                let addrs: Vec<_> = response
+                    .answers
+                    .into_iter()
+                    .filter_map(|answer| {
+                        if answer.a_type == 0x0001
+                            && answer.a_class == 0x0001
+                            && answer.data.len() == 4
+                        {
+                            let addr = in_addr {
+                                s_addr: u32::from_ne_bytes([
+                                    answer.data[0],
+                                    answer.data[1],
+                                    answer.data[2],
+                                    answer.data[3],
+                                ]),
+                            };
+                            Some(addr)
+                        } else {
+                            None
+                        }
+                    })
+                    .collect();
+
+                Ok(addrs)
+            }
+            Err(_err) => Err(EINVAL),
+        }
+    } else {
+        Err(EINVAL)
+    }
+}
+
+pub fn lookup_addr(addr: in_addr) -> Result<Vec<Vec<u8>>, c_int> {
+    let dns_string = get_dns_server().map_err(|e| e.0)?;
+
+    if let Some(dns_addr) = parse_ipv4_string(&dns_string) {
+        let addr: [u8; 4] = addr.s_addr.to_ne_bytes();
+        // Address intentionally backwards for reverse lookup
+        let name = format!(
+            "{}.{}.{}.{}.in-addr.arpa",
+            addr[3], addr[2], addr[1], addr[0]
+        );
+
+        let mut timespec = timespec::default();
+        if let Ok(()) = Sys::clock_gettime(
+            time::constants::CLOCK_REALTIME,
+            Out::from_mut(&mut timespec),
+        ) {}; // TODO handle error
+        let tid = (timespec.tv_nsec >> 16) as u16;
+
+        let packet = Dns {
+            transaction_id: tid,
+            flags: 0x0100,
+            queries: vec![DnsQuery {
+                name,
+                q_type: 0x000C,
+                q_class: 0x0001,
+            }],
+            answers: vec![],
+        };
+
+        let packet_data = packet.compile();
+        let packet_data_len = packet_data.len();
+        let packet_data_box = packet_data.into_boxed_slice();
+        let packet_data_ptr = Box::into_raw(packet_data_box) as *mut _ as *mut c_void;
+
+        let dest = sockaddr_in {
+            sin_family: AF_INET as u16,
+            sin_port: htons(53),
+            sin_addr: in_addr { s_addr: dns_addr },
+            ..Default::default()
+        };
+
+        let dest_ptr = ptr::from_ref(&dest).cast::<sockaddr>();
+
+        let sock = unsafe {
+            let sock = sys_socket::socket(AF_INET, SOCK_DGRAM, i32::from(IPPROTO_UDP));
+            if sys_socket::connect(sock, dest_ptr, mem::size_of_val(&dest) as socklen_t) < 0 {
+                return Err(EIO);
+            }
+            sock
+        };
+
+        unsafe {
+            if sys_socket::send(sock, packet_data_ptr, packet_data_len, 0) < 0 {
+                return Err(EIO);
+            }
+        }
+
+        unsafe {
+            drop(Box::from_raw(packet_data_ptr));
+        }
+
+        let i = mem::size_of::<sockaddr_in>() as socklen_t;
+        let mut buf = [0u8; 65536];
+        let buf_ptr = buf.as_mut_ptr().cast::<c_void>();
+
+        let count = unsafe { sys_socket::recv(sock, buf_ptr, 65536, 0) };
+        if count < 0 {
+            return Err(EIO);
+        }
+
+        match Dns::parse(&buf[..count as usize]) {
+            Ok(response) => {
+                let names = response
+                    .answers
+                    .into_iter()
+                    .filter_map(|answer| {
+                        if answer.a_type == 0x000C && answer.a_class == 0x0001 {
+                            // answer.data is encoded kinda weird.
+                            // Basically length-prefixed strings for each
+                            // subsection of the domain.
+                            // We need to parse this to insert periods where
+                            // they belong (ie at the end of each string)
+                            Some(parse_revdns_answer(&answer.data))
+                        } else {
+                            None
+                        }
+                    })
+                    .collect();
+                Ok(names)
+            }
+            Err(_err) => Err(EINVAL),
+        }
+    } else {
+        Err(EINVAL)
+    }
+}
+
+fn parse_revdns_answer(data: &[u8]) -> Vec<u8> {
+    if data.is_empty() || data[0] == 0 {
+        return vec![0];
+    }
+
+    let mut cursor = 0;
+    let mut index = 0;
+    // First byte is a length; discard
+    let mut output = data[1..].to_vec();
+    let length = data.len() - 1;
+    while index < length {
+        let offset = data[index] as usize;
+        // CVE-2024-21342
+        if offset > length {
+            return vec![0];
+        }
+        index = cursor + offset + 1;
+        // First byte was skipped so index is one less
+        output[index - 1] = b'.';
+        cursor = index;
+    }
+    // Response is NUL terminated so we must preserve that for C
+    match output.last_mut() {
+        Some(nul) => *nul = b'\0',
+        // XXX: Likely unreachable
+        None => {
+            debug_assert!(output.is_empty());
+            output = vec![0];
+        }
+    }
+    output
+}
+
+pub fn parse_ipv4_string(ip_string: &str) -> Option<u32> {
+    let dns_vec: Vec<u8> = ip_string
+        .trim()
+        .split('.')
+        .map(|octet| octet.parse::<u8>().unwrap_or(0))
+        .collect();
+
+    if dns_vec.len() != 4 {
+        return None;
+    }
+
+    let mut dns_arr = [0u8; 4];
+
+    for (i, octet) in dns_vec.iter().enumerate() {
+        dns_arr[i] = *octet;
+    }
+
+    Some(u32::from_ne_bytes(dns_arr))
+}
+
+#[cfg(test)]
+mod tests {
+    use alloc::str;
+    use core::ffi::CStr;
+
+    use super::parse_revdns_answer;
+
+    // Actual response from a query
+    const DNS_GOOGLE: &[u8] = &[3, 100, 110, 115, 6, 103, 111, 111, 103, 108, 101, 0];
+    const EXPECTED_DNS_GOOGLE: &str = "dns.google\0";
+    const EXPECTED_DNS_GOOGLE_RT: &str = "dns.google";
+
+    // Fake response that has numbers within the name (e.g. like CDNs)
+    const FAKE_WITH_NUMS: &[u8] = &[
+        14, 102, 97, 107, 101, 45, 49, 48, 48, 45, 50, 45, 51, 45, 52, 8, 102, 111, 111, 98, 97,
+        114, 50, 52, 4, 102, 97, 107, 101, 0,
+    ];
+    const EXPECTED_FAKE_RESPONSE: &str = "fake-100-2-3-4.foobar24.fake\0";
+    const EXPECTED_FAKE_RESPONSE_RT: &str = "fake-100-2-3-4.foobar24.fake";
+
+    const EMPTY_RESPONSE: &[u8] = &[0];
+    const EXPECTED_EMPTY_RESPONSE: &str = "\0";
+    const EXPECTED_EMPTY_RESPONSE_RT: &str = "";
+
+    #[test]
+    fn dns_response_dns_google() {
+        let response = parse_revdns_answer(DNS_GOOGLE);
+        assert_eq!(
+            0,
+            *response.last().unwrap(),
+            "Response should end with a NUL byte"
+        );
+
+        let response_str = str::from_utf8(&response)
+            .expect("Response is valid UTF-8; parsing shouldn't change that");
+        assert_eq!(EXPECTED_DNS_GOOGLE, response_str);
+
+        let response_cstr = CStr::from_bytes_with_nul(&response)
+            .expect("Parsed response should have only one NUL byte");
+        let response_cstr_str = response_cstr
+            .to_str()
+            .expect("Valid UTF-8 bytes to CStr to Rust str should be valid");
+        assert_eq!(EXPECTED_DNS_GOOGLE_RT, response_cstr_str);
+    }
+
+    #[test]
+    fn dns_response_fake_with_nums() {
+        let response = parse_revdns_answer(FAKE_WITH_NUMS);
+        assert_eq!(
+            0,
+            *response.last().unwrap(),
+            "Response should end with a NUL byte"
+        );
+
+        let response_str = str::from_utf8(&response)
+            .expect("Response is valid UTF-8; parsing shouldn't change that");
+        assert_eq!(EXPECTED_FAKE_RESPONSE, response_str);
+
+        let response_cstr = CStr::from_bytes_with_nul(&response)
+            .expect("Parsed response should have only one NUL byte");
+        let response_cstr_str = response_cstr
+            .to_str()
+            .expect("Valid UTF-8 bytes to CStr to Rust str should be valid");
+        assert_eq!(EXPECTED_FAKE_RESPONSE_RT, response_cstr_str);
+    }
+
+    #[test]
+    fn dns_response_empty() {
+        let response = parse_revdns_answer(EMPTY_RESPONSE);
+        assert_eq!(
+            0,
+            *response.last().unwrap(),
+            "Response should end with a NUL byte"
+        );
+
+        let response_str = str::from_utf8(&response)
+            .expect("Response is valid UTF-8; parsing shouldn't change that");
+        assert_eq!(EXPECTED_EMPTY_RESPONSE, response_str);
+
+        let response_cstr = CStr::from_bytes_with_nul(&response)
+            .expect("Parsed response should have only one NUL byte");
+        let response_cstr_str = response_cstr
+            .to_str()
+            .expect("Valid UTF-8 bytes to CStr to Rust str should be valid");
+        assert_eq!(EXPECTED_EMPTY_RESPONSE_RT, response_cstr_str);
+    }
+}
diff --git a/recipes/core/relibc/src/header/netdb/mod.rs b/recipes/core/relibc/src/header/netdb/mod.rs
new file mode 100644
index 0000000000..1d9941cbc5
--- /dev/null
+++ b/recipes/core/relibc/src/header/netdb/mod.rs
@@ -0,0 +1,1158 @@
+//! `netdb.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netdb.h.html>.
+
+mod dns;
+
+use core::{cell::Cell, fmt::Write, mem, net::Ipv4Addr, ptr, str};
+
+use alloc::{boxed::Box, str::SplitWhitespace, string::ToString, vec::Vec};
+
+use crate::{
+    c_str::{CStr, CString},
+    error::ResultExt,
+    header::{
+        arpa_inet::inet_aton,
+        bits_arpainet::{htons, ntohl},
+        bits_safamily_t::sa_family_t,
+        bits_socklen_t::socklen_t,
+        errno::*,
+        fcntl::O_RDONLY,
+        netinet_in::{in_addr, sockaddr_in, sockaddr_in6},
+        stdlib::atoi,
+        strings::strcasecmp,
+        sys_socket::{constants::AF_INET, sockaddr},
+        unistd::SEEK_SET,
+    },
+    platform::{
+        self, Pal, Sys,
+        rlb::{Line, RawLineBuffer},
+        types::{c_char, c_int, c_void, uint32_t},
+    },
+    raw_cell::RawCell,
+};
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+pub mod sys;
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+pub mod sys;
+
+pub use self::host::*;
+pub mod host;
+
+pub use self::lookup::*;
+pub mod lookup;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netdb.h.html>.
+#[repr(C)]
+pub struct hostent {
+    h_name: *mut c_char,
+    h_aliases: *mut *mut c_char,
+    h_addrtype: c_int,
+    h_length: c_int,
+    h_addr_list: *mut *mut c_char,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netdb.h.html>.
+#[repr(C)]
+pub struct netent {
+    n_name: *mut c_char,         /* official name of net */
+    n_aliases: *mut *mut c_char, /* alias list */
+    n_addrtype: c_int,           /* net address type */
+    n_net: uint32_t,             /* network # */
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netdb.h.html>.
+#[repr(C)]
+pub struct protoent {
+    p_name: *mut c_char,         /* official protocol name */
+    p_aliases: *mut *mut c_char, /* alias list */
+    p_proto: c_int,              /* protocol # */
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netdb.h.html>.
+#[repr(C)]
+pub struct servent {
+    s_name: *mut c_char,         /* official service name */
+    s_aliases: *mut *mut c_char, /* alias list */
+    s_port: c_int,               /* port # */
+    s_proto: *mut c_char,        /* protocol to use */
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netdb.h.html>.
+#[repr(C)]
+#[derive(Debug)]
+pub struct addrinfo {
+    ai_flags: c_int,           /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
+    ai_family: c_int,          /* PF_xxx */
+    ai_socktype: c_int,        /* SOCK_xxx */
+    ai_protocol: c_int,        /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+    ai_addrlen: socklen_t,     /* length of ai_addr */
+    ai_canonname: *mut c_char, /* canonical name for hostname */
+    ai_addr: *mut sockaddr,    /* binary address */
+    ai_next: *mut addrinfo,    /* next structure in linked list */
+}
+
+pub const AI_PASSIVE: c_int = 0x0001;
+pub const AI_CANONNAME: c_int = 0x0002;
+pub const AI_NUMERICHOST: c_int = 0x0004;
+pub const AI_V4MAPPED: c_int = 0x0008;
+pub const AI_ALL: c_int = 0x0010;
+pub const AI_ADDRCONFIG: c_int = 0x0020;
+pub const AI_NUMERICSERV: c_int = 0x0400;
+
+pub const EAI_BADFLAGS: c_int = -1;
+pub const EAI_NONAME: c_int = -2;
+pub const EAI_AGAIN: c_int = -3;
+pub const EAI_FAIL: c_int = -4;
+pub const EAI_NODATA: c_int = -5;
+pub const EAI_FAMILY: c_int = -6;
+pub const EAI_SOCKTYPE: c_int = -7;
+pub const EAI_SERVICE: c_int = -8;
+pub const EAI_ADDRFAMILY: c_int = -9;
+pub const EAI_MEMORY: c_int = -10;
+pub const EAI_SYSTEM: c_int = -11;
+pub const EAI_OVERFLOW: c_int = -12;
+
+pub const NI_MAXHOST: c_int = 1025;
+pub const NI_MAXSERV: c_int = 32;
+
+pub const NI_NUMERICHOST: c_int = 0x0001;
+pub const NI_NUMERICSERV: c_int = 0x0002;
+pub const NI_NOFQDN: c_int = 0x0004;
+pub const NI_NAMEREQD: c_int = 0x0008;
+pub const NI_DGRAM: c_int = 0x0010;
+
+static mut NETDB: c_int = 0;
+pub static mut NET_ENTRY: netent = netent {
+    n_name: ptr::null_mut(),
+    n_aliases: ptr::null_mut(),
+    n_addrtype: 0,
+    n_net: 0,
+};
+pub static NET_NAME: RawCell<Option<Vec<u8>>> = RawCell::new(None);
+pub static NET_ALIASES: RawCell<Option<Vec<Vec<u8>>>> = RawCell::new(None);
+pub static mut NET_ADDR: Option<u32> = None;
+static mut N_POS: usize = 0;
+static mut NET_STAYOPEN: c_int = 0;
+
+#[thread_local]
+pub static H_ERRNO: Cell<c_int> = Cell::new(0);
+const H_UNSET: c_int = 0;
+pub const HOST_NOT_FOUND: c_int = 1;
+pub const NO_DATA: c_int = 2;
+pub const NO_RECOVERY: c_int = 3;
+pub const TRY_AGAIN: c_int = 4;
+
+// Expected length of addresses
+const SOCKLEN_AF_INET4: socklen_t = 4;
+const SOCKLEN_AF_INET6: socklen_t = 16;
+
+static mut PROTODB: c_int = 0;
+static mut PROTO_ENTRY: protoent = protoent {
+    p_name: ptr::null_mut(),
+    p_aliases: ptr::null_mut(),
+    p_proto: 0 as c_int,
+};
+static PROTO_NAME: RawCell<Option<Vec<u8>>> = RawCell::new(None);
+static PROTO_ALIASES: RawCell<Option<Vec<Vec<u8>>>> = RawCell::new(None);
+static mut PROTO_NUM: Option<c_int> = None;
+static mut P_POS: usize = 0;
+static mut PROTO_STAYOPEN: c_int = 0;
+
+static mut SERVDB: c_int = 0;
+static mut SERV_ENTRY: servent = servent {
+    s_name: ptr::null_mut(),
+    s_aliases: ptr::null_mut(),
+    s_port: 0 as c_int,
+    s_proto: ptr::null_mut(),
+};
+static SERV_NAME: RawCell<Option<Vec<u8>>> = RawCell::new(None);
+static SERV_ALIASES: RawCell<Option<Vec<Vec<u8>>>> = RawCell::new(None);
+static mut SERV_PORT: Option<c_int> = None;
+static SERV_PROTO: RawCell<Option<Vec<u8>>> = RawCell::new(None);
+static mut S_POS: usize = 0;
+static mut SERV_STAYOPEN: c_int = 0;
+
+fn bytes_to_box_str(bytes: &[u8]) -> Box<str> {
+    Box::from(core::str::from_utf8(bytes).unwrap_or(""))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endnetent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn endnetent() {
+    if let Ok(()) = Sys::close(unsafe { NETDB }) {}; // TODO handle error
+    unsafe { NETDB = 0 };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endprotoent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn endprotoent() {
+    if let Ok(()) = Sys::close(unsafe { PROTODB }) {}; // TODO handle error
+    unsafe { PROTODB = 0 };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endservent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn endservent() {
+    if let Ok(()) = Sys::close(unsafe { SERVDB }) {}; // TODO handle error
+    unsafe { SERVDB = 0 };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009696799/functions/gethostbyaddr.html>.
+/// Resolve a host name from a given network address.
+///
+/// # Arguments
+/// * `v` - Address to resolve as a non-null [`in_addr`]
+/// * `length` -
+/// * `format` - AF_INET or AF_INET6
+///
+/// # Safety
+/// * `v` must be a valid pointer.
+/// * `length` must correctly match the size of `v` as expected by `format` (usually 4 or 16).
+/// * This function is not reentrant and may modify static data.
+///
+/// # Panics
+/// Panics if `v` is a null pointer.
+///
+/// # Deprecation
+/// Deprecated as of POSIX.1-2001 and removed in POSIX.1-2008.
+/// New code should use [`getaddrinfo`] instead.
+#[unsafe(no_mangle)]
+#[deprecated]
+pub unsafe extern "C" fn gethostbyaddr(
+    v: *const c_void,
+    length: socklen_t,
+    format: c_int,
+) -> *mut hostent {
+    assert!(
+        !v.is_null(),
+        "`gethostbyaddr()` called with null `v` (in_addr)"
+    );
+    // Uncomment if optional IPv6 support is added
+    // if length != SOCKLEN_AF_INET4 || length != SOCKLEN_AF_INET6 {
+    //     H_ERRNO.set(NO_RECOVERY);
+    //     return ptr::null_mut();
+    // }
+    if length != SOCKLEN_AF_INET4 {
+        H_ERRNO.set(NO_RECOVERY);
+        return ptr::null_mut();
+    }
+    let addr: in_addr = unsafe { (*(v as *mut in_addr)).clone() };
+
+    // check the hosts file first
+    let mut p: *mut hostent;
+    unsafe { sethostent(HOST_STAYOPEN) };
+    while {
+        p = unsafe { gethostent() };
+        !p.is_null()
+    } {
+        let mut cp = unsafe { (*p).h_addr_list };
+        loop {
+            if cp.is_null() {
+                break;
+            }
+            if (unsafe { *cp }).is_null() {
+                break;
+            }
+            let mut cp_slice: [c_char; 4] = [0; 4];
+            unsafe { (*cp).copy_to(cp_slice.as_mut_ptr(), 4) };
+            #[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
+            let cp_s_addr = unsafe { mem::transmute::<[c_char; 4], u32>(cp_slice) };
+            #[cfg(any(target_arch = "riscv64", target_arch = "aarch64"))]
+            let cp_s_addr = u32::from_ne_bytes(cp_slice);
+            if cp_s_addr == addr.s_addr {
+                unsafe { sethostent(HOST_STAYOPEN) };
+                return p;
+            }
+            cp = unsafe { cp.offset(1) };
+        }
+    }
+
+    //TODO actually get aliases
+    let mut _host_aliases: Vec<Vec<u8>> = Vec::new();
+    _host_aliases.push(vec![b'\0']);
+    let mut host_aliases: Vec<*mut c_char> = Vec::new();
+    host_aliases.push(ptr::null_mut());
+    unsafe { HOST_ALIASES.unsafe_set(Some(_host_aliases)) };
+
+    match lookup_addr(addr.clone()).map(|host_names| host_names.into_iter().next()) {
+        Ok(Some(host_name)) => {
+            unsafe { _HOST_ADDR_LIST = addr.s_addr.to_ne_bytes() };
+            unsafe {
+                HOST_ADDR_LIST = [(&raw mut _HOST_ADDR_LIST).cast::<c_char>(), ptr::null_mut()]
+            };
+            unsafe { HOST_NAME.unsafe_set(Some(host_name)) };
+            unsafe {
+                HOST_ENTRY = hostent {
+                    h_name: HOST_NAME
+                        .unsafe_mut()
+                        .as_mut()
+                        .unwrap()
+                        .as_mut_ptr()
+                        .cast::<c_char>(),
+                    h_aliases: host_aliases.as_mut_slice().as_mut_ptr(),
+                    h_addrtype: format,
+                    h_length: length as i32,
+                    h_addr_list: (&raw mut HOST_ADDR_LIST).cast(),
+                }
+            };
+            &raw mut HOST_ENTRY
+        }
+        // `glibc` sets errno if an address doesn't have a host name
+        // `musl` uses the address as the host name in said case
+        Ok(None) => {
+            H_ERRNO.set(HOST_NOT_FOUND);
+            ptr::null_mut()
+        }
+        Err(e) => {
+            // TODO: Better error separation in lookup_addr
+            H_ERRNO.set(NO_RECOVERY);
+            ptr::null_mut()
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009696799/functions/gethostbyaddr.html>.
+/// Resolve host information by name or IP address.
+///
+/// # Arguments
+/// * `name` - Host name or IP address.
+///
+/// # Safety
+/// `name` must be a valid string.
+/// This function is not reentrant and may modify static data.
+///
+/// # Panics
+/// Panics if `name` is a null pointer.
+///
+/// # Deprecation
+/// Deprecated as of POSIX.1-2001 and removed in POSIX.1-2008.
+/// New code should use [`getaddrinfo`] instead.
+#[unsafe(no_mangle)]
+#[deprecated]
+pub unsafe extern "C" fn gethostbyname(name: *const c_char) -> *mut hostent {
+    let name_cstr = unsafe {
+        CStr::from_nullable_ptr(name).expect("gethostbyname() called with a NULL pointer")
+    };
+    let Ok(name_str) = str::from_utf8(name_cstr.to_bytes()) else {
+        H_ERRNO.set(NO_RECOVERY);
+        return ptr::null_mut();
+    };
+
+    // Addresses and hostnames are both valid, so we'll check addresses first
+    // The standard doesn't define what to do when called with addresses
+    // Some implementations just skip resolution and copy the address to h_name
+    if let Some(s_addr) = parse_ipv4_string(name_str) {
+        let addr = in_addr { s_addr };
+        return unsafe {
+            #[allow(deprecated)]
+            gethostbyaddr(ptr::from_ref(&addr).cast::<c_void>(), 4, AF_INET)
+        };
+    }
+
+    // check the hosts file first
+    let mut p: *mut hostent;
+    unsafe { sethostent(HOST_STAYOPEN) };
+    while {
+        p = unsafe { gethostent() };
+        !p.is_null()
+    } {
+        if unsafe { strcasecmp((*p).h_name, name) } == 0 {
+            unsafe { sethostent(HOST_STAYOPEN) };
+            return p;
+        }
+        let mut cp = unsafe { (*p).h_aliases };
+        loop {
+            if cp.is_null() {
+                break;
+            }
+            if (unsafe { *cp }).is_null() {
+                break;
+            }
+            if unsafe { strcasecmp(*cp, name) } == 0 {
+                unsafe { sethostent(HOST_STAYOPEN) };
+                return p;
+            }
+            cp = unsafe { cp.offset(1) };
+        }
+    }
+
+    let host = match lookup_host(name_str) {
+        Ok(lookuphost) => lookuphost,
+        Err(e) => {
+            H_ERRNO.set(NO_RECOVERY);
+            return ptr::null_mut();
+        }
+    };
+    let host_addr = match host.into_iter().next() {
+        Some(result) => result,
+        None => {
+            H_ERRNO.set(HOST_NOT_FOUND);
+            return ptr::null_mut();
+        }
+    };
+
+    let host_name: Vec<u8> = name_cstr.to_bytes().to_vec();
+    unsafe { HOST_NAME.unsafe_set(Some(host_name)) };
+    unsafe { _HOST_ADDR_LIST = host_addr.s_addr.to_ne_bytes() };
+    unsafe { HOST_ADDR_LIST = [(&raw mut _HOST_ADDR_LIST).cast::<c_char>(), ptr::null_mut()] };
+    unsafe { HOST_ADDR = Some(host_addr) };
+
+    //TODO actually get aliases
+    let mut _host_aliases: Vec<Vec<u8>> = Vec::new();
+    _host_aliases.push(vec![b'\0']);
+    let mut host_aliases: Vec<*mut c_char> = Vec::new();
+    host_aliases.push(ptr::null_mut());
+    host_aliases.push(ptr::null_mut());
+    unsafe { HOST_ALIASES.unsafe_set(Some(_host_aliases)) };
+
+    unsafe {
+        HOST_ENTRY = hostent {
+            h_name: HOST_NAME
+                .unsafe_mut()
+                .as_mut()
+                .unwrap()
+                .as_mut_ptr()
+                .cast::<c_char>(),
+            h_aliases: host_aliases.as_mut_slice().as_mut_ptr(),
+            h_addrtype: AF_INET,
+            h_length: 4,
+            h_addr_list: (&raw mut HOST_ADDR_LIST).cast(),
+        }
+    };
+    unsafe { sethostent(HOST_STAYOPEN) };
+    (&raw mut HOST_ENTRY).cast::<hostent>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endnetent.html>.
+pub unsafe extern "C" fn getnetbyaddr(net: u32, net_type: c_int) -> *mut netent {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endnetent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getnetbyname(name: *const c_char) -> *mut netent {
+    let mut n: *mut netent;
+    unsafe { setnetent(NET_STAYOPEN) };
+    while {
+        n = unsafe { getnetent() };
+        !n.is_null()
+    } {
+        if unsafe { strcasecmp((*n).n_name, name) } == 0 {
+            unsafe { setnetent(NET_STAYOPEN) };
+            return n;
+        }
+    }
+    unsafe { setnetent(NET_STAYOPEN) };
+
+    platform::ERRNO.set(ENOENT);
+    ptr::null_mut::<netent>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endnetent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getnetent() -> *mut netent {
+    // TODO: Rustify implementation
+
+    if unsafe { NETDB } == 0 {
+        unsafe { NETDB = Sys::open(c"/etc/networks".into(), O_RDONLY, 0).or_minus_one_errno() };
+    }
+
+    let mut rlb = RawLineBuffer::new(unsafe { NETDB });
+    rlb.seek(unsafe { N_POS });
+
+    let mut r: Box<str> = Box::default();
+    while r.is_empty() || r.split_whitespace().next().is_none() || r.starts_with('#') {
+        r = match rlb.next() {
+            Line::Some(s) => bytes_to_box_str(s),
+            _ => {
+                if unsafe { NET_STAYOPEN } == 0 {
+                    unsafe { endnetent() };
+                }
+                return ptr::null_mut();
+            }
+        };
+    }
+    rlb.next();
+    unsafe { N_POS = rlb.line_pos() };
+
+    let mut iter: SplitWhitespace = r.split_whitespace();
+
+    let net_name = iter.next().unwrap().bytes().chain(Some(b'\0')).collect();
+    unsafe { NET_NAME.unsafe_set(Some(net_name)) };
+
+    let addr_vec: Vec<u8> = iter.next().unwrap().bytes().chain(Some(b'\0')).collect();
+    let addr_cstr = addr_vec.as_slice().as_ptr().cast::<c_char>();
+    let mut addr = mem::MaybeUninit::uninit();
+    unsafe { inet_aton(addr_cstr, addr.as_mut_ptr()) };
+    let addr = unsafe { addr.assume_init() };
+    unsafe { NET_ADDR = Some(ntohl(addr.s_addr)) };
+
+    let mut _net_aliases: Vec<Vec<u8>> = iter
+        .map(|alias| alias.bytes().chain(Some(b'\0')).collect())
+        .collect();
+    let mut net_aliases: Vec<*mut c_char> = _net_aliases
+        .iter_mut()
+        .map(|x| x.as_mut_ptr().cast::<c_char>())
+        .chain(Some(ptr::null_mut()))
+        .collect();
+    unsafe { NET_ALIASES.unsafe_set(Some(_net_aliases)) };
+
+    unsafe {
+        NET_ENTRY = netent {
+            n_name: NET_NAME
+                .unsafe_mut()
+                .as_mut()
+                .unwrap()
+                .as_mut_ptr()
+                .cast::<c_char>(),
+            n_aliases: net_aliases.as_mut_slice().as_mut_ptr(),
+            n_addrtype: AF_INET,
+            n_net: uint32_t::from(NET_ADDR.unwrap()),
+        }
+    };
+    (&raw mut NET_ENTRY).cast::<netent>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endprotoent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getprotobyname(name: *const c_char) -> *mut protoent {
+    let mut p: *mut protoent;
+    unsafe { setprotoent(PROTO_STAYOPEN) };
+    while {
+        p = unsafe { getprotoent() };
+        !p.is_null()
+    } {
+        if unsafe { strcasecmp((*p).p_name, name) } == 0 {
+            unsafe { setprotoent(PROTO_STAYOPEN) };
+            return p;
+        }
+
+        let mut cp = unsafe { (*p).p_aliases };
+        loop {
+            if cp.is_null() {
+                unsafe { setprotoent(PROTO_STAYOPEN) };
+                break;
+            }
+            if (unsafe { *cp }).is_null() {
+                unsafe { setprotoent(PROTO_STAYOPEN) };
+                break;
+            }
+            if unsafe { strcasecmp(*cp, name) } == 0 {
+                unsafe { setprotoent(PROTO_STAYOPEN) };
+                return p;
+            }
+            cp = unsafe { cp.offset(1) };
+        }
+    }
+    unsafe { setprotoent(PROTO_STAYOPEN) };
+
+    platform::ERRNO.set(ENOENT);
+    ptr::null_mut::<protoent>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endprotoent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getprotobynumber(number: c_int) -> *mut protoent {
+    unsafe { setprotoent(PROTO_STAYOPEN) };
+    let mut p: *mut protoent;
+    while {
+        p = unsafe { getprotoent() };
+        !p.is_null()
+    } {
+        if unsafe { (*p).p_proto } == number {
+            unsafe { setprotoent(PROTO_STAYOPEN) };
+            return p;
+        }
+    }
+    unsafe { setprotoent(PROTO_STAYOPEN) };
+    platform::ERRNO.set(ENOENT);
+    ptr::null_mut::<protoent>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endprotoent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getprotoent() -> *mut protoent {
+    if unsafe { PROTODB } == 0 {
+        unsafe { PROTODB = Sys::open(c"/etc/protocols".into(), O_RDONLY, 0).or_minus_one_errno() };
+    }
+
+    let mut rlb = RawLineBuffer::new(unsafe { PROTODB });
+    rlb.seek(unsafe { P_POS });
+
+    let mut r: Box<str> = Box::default();
+    while r.is_empty() || r.split_whitespace().next().is_none() || r.starts_with('#') {
+        r = match rlb.next() {
+            Line::Some(s) => bytes_to_box_str(s),
+            _ => {
+                if unsafe { PROTO_STAYOPEN } == 0 {
+                    unsafe { endprotoent() };
+                }
+                return ptr::null_mut();
+            }
+        };
+    }
+    rlb.next();
+    unsafe { P_POS = rlb.line_pos() };
+
+    let mut iter: SplitWhitespace = r.split_whitespace();
+
+    let mut proto_name: Vec<u8> = iter.next().unwrap().as_bytes().to_vec();
+    proto_name.push(b'\0');
+
+    let mut num = iter.next().unwrap().as_bytes().to_vec();
+    num.push(b'\0');
+    unsafe { PROTO_NUM = Some(atoi(num.as_mut_slice().as_mut_ptr().cast::<c_char>())) };
+
+    let mut _proto_aliases: Vec<Vec<u8>> = iter
+        .map(|alias| alias.bytes().chain(Some(b'\0')).collect())
+        .collect();
+    let mut proto_aliases: Vec<*mut i8> = _proto_aliases
+        .iter_mut()
+        .map(|x| x.as_mut_ptr().cast::<i8>())
+        .chain(Some(ptr::null_mut()))
+        .collect();
+
+    unsafe { PROTO_ALIASES.unsafe_set(Some(_proto_aliases)) };
+    unsafe { PROTO_NAME.unsafe_set(Some(proto_name)) };
+
+    unsafe {
+        PROTO_ENTRY = protoent {
+            p_name: PROTO_NAME
+                .unsafe_mut()
+                .as_mut()
+                .unwrap()
+                .as_mut_slice()
+                .as_mut_ptr()
+                .cast::<c_char>(),
+            p_aliases: proto_aliases
+                .as_mut_slice()
+                .as_mut_ptr()
+                .cast::<*mut c_char>(),
+            p_proto: PROTO_NUM.unwrap(),
+        }
+    };
+    if unsafe { PROTO_STAYOPEN } == 0 {
+        unsafe { endprotoent() };
+    }
+    (&raw mut PROTO_ENTRY).cast::<protoent>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endservent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getservbyname(name: *const c_char, proto: *const c_char) -> *mut servent {
+    unsafe { setservent(SERV_STAYOPEN) };
+    let mut p: *mut servent;
+    if proto.is_null() {
+        while {
+            p = unsafe { getservent() };
+            !p.is_null()
+        } {
+            if unsafe { strcasecmp((*p).s_name, name) } == 0 {
+                unsafe { setservent(SERV_STAYOPEN) };
+                return p;
+            }
+        }
+    } else {
+        while {
+            p = unsafe { getservent() };
+            !p.is_null()
+        } {
+            if unsafe { strcasecmp((*p).s_name, name) } == 0
+                && unsafe { strcasecmp((*p).s_proto, proto) } == 0
+            {
+                unsafe { setservent(SERV_STAYOPEN) };
+                return p;
+            }
+        }
+    }
+    unsafe { setservent(SERV_STAYOPEN) };
+    platform::ERRNO.set(ENOENT);
+    ptr::null_mut::<servent>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endservent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getservbyport(port: c_int, proto: *const c_char) -> *mut servent {
+    unsafe { setservent(SERV_STAYOPEN) };
+    let mut p: *mut servent;
+    if proto.is_null() {
+        while {
+            p = unsafe { getservent() };
+            !p.is_null()
+        } {
+            if unsafe { (*p).s_port } == port {
+                unsafe { setservent(SERV_STAYOPEN) };
+                return p;
+            }
+        }
+    } else {
+        while {
+            p = unsafe { getservent() };
+            !p.is_null()
+        } {
+            if unsafe { (*p).s_port } == port && unsafe { strcasecmp((*p).s_proto, proto) } == 0 {
+                unsafe { setservent(SERV_STAYOPEN) };
+                return p;
+            }
+        }
+    }
+    unsafe { setservent(SERV_STAYOPEN) };
+    platform::ERRNO.set(ENOENT);
+    ptr::null_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endservent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getservent() -> *mut servent {
+    if unsafe { SERVDB } == 0 {
+        // TODO: Rustify
+        unsafe { SERVDB = Sys::open(c"/etc/services".into(), O_RDONLY, 0).or_minus_one_errno() };
+    }
+    let mut rlb = RawLineBuffer::new(unsafe { SERVDB });
+    rlb.seek(unsafe { S_POS });
+
+    let r: Box<str> = Box::default();
+
+    loop {
+        let r = match rlb.next() {
+            Line::Some(s) => bytes_to_box_str(s),
+            _ => {
+                if unsafe { SERV_STAYOPEN } == 0 {
+                    unsafe { endservent() };
+                }
+                return ptr::null_mut();
+            }
+        };
+
+        let mut iter = r.split_whitespace();
+        let serv_name = match iter.next() {
+            Some(serv_name) => serv_name.bytes().chain(Some(b'\0')).collect(),
+            None => continue,
+        };
+        let port_proto = match iter.next() {
+            Some(port_proto) => port_proto,
+            None => continue,
+        };
+        let mut split = port_proto.split('/');
+        let mut port: Vec<u8> = match split.next() {
+            Some(port) => port.bytes().chain(Some(b'\0')).collect(),
+            None => continue,
+        };
+        unsafe {
+            SERV_PORT = Some(u32::from(htons(
+                atoi(port.as_mut_slice().as_mut_ptr().cast::<c_char>()) as u16,
+            )) as i32)
+        };
+        let proto = match split.next() {
+            Some(proto) => proto.bytes().chain(Some(b'\0')).collect(),
+            None => continue,
+        };
+
+        rlb.next();
+        unsafe { S_POS = rlb.line_pos() };
+
+        /*
+         *let mut _serv_aliases: Vec<Vec<u8>> = Vec::new();
+         *loop {
+         *    let mut alias = match iter.next() {
+         *        Some(s) => s.as_bytes().to_vec(),
+         *        _ => break
+         *    };
+         *    alias.push(b'\0');
+         *    _serv_aliases.push(alias);
+         *}
+         *let mut serv_aliases: Vec<*mut i8> = _serv_aliases.iter_mut().map(|x| x.as_mut_ptr() as *mut i8).collect();
+         *serv_aliases.push(ptr::null_mut());
+         *
+         */
+        let mut _serv_aliases: Vec<Vec<u8>> = Vec::new();
+        _serv_aliases.push(vec![b'\0']);
+        let mut serv_aliases: Vec<*mut i8> = Vec::new();
+        serv_aliases.push(ptr::null_mut());
+        serv_aliases.push(ptr::null_mut());
+
+        unsafe { SERV_ALIASES.unsafe_set(Some(_serv_aliases)) };
+        unsafe { SERV_NAME.unsafe_set(Some(serv_name)) };
+        unsafe { SERV_PROTO.unsafe_set(Some(proto)) };
+
+        unsafe {
+            SERV_ENTRY = servent {
+                s_name: SERV_NAME
+                    .unsafe_mut()
+                    .as_mut()
+                    .unwrap()
+                    .as_mut_slice()
+                    .as_mut_ptr()
+                    .cast::<c_char>(),
+                s_aliases: serv_aliases
+                    .as_mut_slice()
+                    .as_mut_ptr()
+                    .cast::<*mut c_char>(),
+                s_port: SERV_PORT.unwrap(),
+                s_proto: SERV_PROTO
+                    .unsafe_mut()
+                    .as_mut()
+                    .unwrap()
+                    .as_mut_slice()
+                    .as_mut_ptr()
+                    .cast::<c_char>(),
+            }
+        };
+
+        if unsafe { SERV_STAYOPEN } == 0 {
+            unsafe { endservent() };
+        }
+        break (&raw mut SERV_ENTRY).cast::<servent>();
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endnetent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setnetent(stayopen: c_int) {
+    unsafe { NET_STAYOPEN = stayopen };
+    if unsafe { NETDB } == 0 {
+        unsafe { NETDB = Sys::open(c"/etc/networks".into(), O_RDONLY, 0).or_minus_one_errno() }
+    } else {
+        if Sys::lseek(unsafe { NETDB }, 0, SEEK_SET).is_ok() {}; // TODO handle errror
+        unsafe { N_POS = 0 };
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endprotoent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setprotoent(stayopen: c_int) {
+    unsafe { PROTO_STAYOPEN = stayopen };
+    if unsafe { PROTODB } == 0 {
+        unsafe { PROTODB = Sys::open(c"/etc/protocols".into(), O_RDONLY, 0).or_minus_one_errno() }
+    } else {
+        if Sys::lseek(unsafe { PROTODB }, 0, SEEK_SET).is_ok() {}; // TODO handle error
+        unsafe { P_POS = 0 };
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endservent.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setservent(stayopen: c_int) {
+    unsafe { SERV_STAYOPEN = stayopen };
+    if unsafe { SERVDB } == 0 {
+        unsafe { SERVDB = Sys::open(c"/etc/services".into(), O_RDONLY, 0).or_minus_one_errno() }
+    } else {
+        if Sys::lseek(unsafe { SERVDB }, 0, SEEK_SET).is_ok() {}; // TODO handle error
+        unsafe { S_POS = 0 };
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/freeaddrinfo.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getaddrinfo(
+    node: *const c_char,
+    service: *const c_char,
+    hints: *const addrinfo,
+    res: *mut *mut addrinfo,
+) -> c_int {
+    let node_opt = unsafe { CStr::from_nullable_ptr(node) };
+    let service_opt = unsafe { CStr::from_nullable_ptr(service) };
+
+    let hints_opt = if hints.is_null() {
+        None
+    } else {
+        Some(unsafe { &*hints })
+    };
+
+    log::trace!(
+        "getaddrinfo({:?}, {:?}, {:?})",
+        node_opt.map(|c| unsafe { str::from_utf8_unchecked(c.to_bytes()) }),
+        service_opt.map(|c| unsafe { str::from_utf8_unchecked(c.to_bytes()) }),
+        hints_opt
+    );
+
+    //TODO: Use hints
+    let mut ai_flags = hints_opt.map_or(0, |hints| hints.ai_flags);
+    let mut ai_family; // = hints_opt.map_or(AF_UNSPEC, |hints| hints.ai_family);
+    let ai_socktype = hints_opt.map_or(0, |hints| hints.ai_socktype);
+    let mut ai_protocol; // = hints_opt.map_or(0, |hints| hints.ai_protocol);
+
+    unsafe { *res = ptr::null_mut() };
+
+    let mut port = 0;
+    if let Some(service) = service_opt {
+        //TODO: Support other service definitions as well as AI_NUMERICSERV
+        match unsafe { str::from_utf8_unchecked(service.to_bytes()) }.parse::<u16>() {
+            Ok(ok) => port = ok,
+            Err(_err) => (),
+        }
+    }
+    let node = node_opt.unwrap_or_else(|| {
+        //TODO: Optimize by bypassing string parsing
+        if ai_flags & AI_PASSIVE > 0 {
+            c"0.0.0.0".into()
+        } else {
+            c"127.0.0.1".into()
+        }
+    });
+
+    let lookuphost = if ai_flags & AI_NUMERICHOST > 0 {
+        match parse_ipv4_string(unsafe { str::from_utf8_unchecked(node.to_bytes()) }) {
+            Some(s_addr) => vec![in_addr { s_addr }],
+            None => {
+                return EAI_NONAME;
+            }
+        }
+    } else {
+        match lookup_host(unsafe { str::from_utf8_unchecked(node.to_bytes()) }) {
+            Ok(lookuphost) => lookuphost,
+            Err(e) => {
+                platform::ERRNO.set(e);
+                return EAI_SYSTEM;
+            }
+        }
+    };
+
+    for in_addr in lookuphost {
+        ai_family = AF_INET;
+        ai_protocol = 0;
+
+        let ai_addr = Box::into_raw(Box::new(sockaddr_in {
+            sin_family: ai_family as sa_family_t,
+            sin_port: htons(port),
+            sin_addr: in_addr,
+            sin_zero: [0; 8],
+        }))
+        .cast::<sockaddr>();
+
+        let ai_addrlen = mem::size_of::<sockaddr_in>() as socklen_t;
+
+        let ai_canonname = if ai_flags & AI_CANONNAME > 0 {
+            if node_opt.is_none() {
+                return EAI_BADFLAGS;
+            }
+            ai_flags &= !AI_CANONNAME;
+            node.to_owned_cstring().into_raw()
+        } else {
+            ptr::null_mut()
+        };
+
+        let addrinfo = Box::new(addrinfo {
+            ai_flags: 0,
+            ai_family,
+            ai_socktype,
+            ai_protocol,
+            ai_addrlen,
+            ai_canonname,
+            ai_addr,
+            ai_next: ptr::null_mut(),
+        });
+        unsafe {
+            let mut indirect = res;
+            while !(*indirect).is_null() {
+                indirect = &raw mut (**indirect).ai_next;
+            }
+            *indirect = Box::into_raw(addrinfo)
+        }
+    }
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getnameinfo.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getnameinfo(
+    addr: *const sockaddr,
+    addrlen: socklen_t,
+    host: *mut c_char,
+    hostlen: socklen_t,
+    serv: *mut c_char,
+    servlen: socklen_t,
+    flags: c_int,
+) -> c_int {
+    if addr.is_null() || addrlen as usize != mem::size_of::<sockaddr_in>() {
+        return EAI_FAMILY;
+    }
+
+    let sa = unsafe { &*(addr.cast::<sockaddr_in>()) };
+
+    if !serv.is_null() && servlen > 0 {
+        if flags & NI_NUMERICSERV != 0 {
+            let port_str = sa.sin_port.to_be().to_string();
+            let port_bytes = port_str.as_bytes();
+            if (servlen as usize) <= port_bytes.len() {
+                return EAI_MEMORY; // Buffer too small
+            }
+            unsafe {
+                ptr::copy_nonoverlapping(
+                    port_bytes.as_ptr().cast::<c_char>(),
+                    serv,
+                    port_bytes.len(),
+                )
+            };
+            unsafe { *serv.add(port_bytes.len()) = 0 };
+        } else {
+            // TODO: Implement service name lookup (e.g., from /etc/services)
+            unsafe { *serv = 0 };
+        }
+    }
+
+    if !host.is_null() && hostlen > 0 {
+        if flags & NI_NUMERICHOST != 0 {
+            let ip_addr = Ipv4Addr::from(sa.sin_addr.s_addr.to_be());
+            let ip_str = ip_addr.to_string();
+            let ip_bytes = ip_str.as_bytes();
+            if (hostlen as usize) <= ip_bytes.len() {
+                return EAI_MEMORY; // Buffer too small
+            }
+            unsafe {
+                ptr::copy_nonoverlapping(ip_bytes.as_ptr().cast::<c_char>(), host, ip_bytes.len())
+            };
+            unsafe { *host.add(ip_bytes.len()) = 0 };
+        } else {
+            match lookup_addr(sa.sin_addr.clone()).map(|host_names| host_names.into_iter().next()) {
+                Ok(Some(hostname)) => {
+                    if (hostlen as usize) <= hostname.len() {
+                        return EAI_MEMORY; // Buffer too small
+                    }
+                    unsafe {
+                        ptr::copy_nonoverlapping(
+                            hostname.as_ptr().cast::<c_char>(),
+                            host,
+                            hostname.len(),
+                        );
+                        *host.add(hostname.len()) = 0;
+                    }
+                }
+                Ok(None) => {
+                    if flags & NI_NAMEREQD != 0 {
+                        return EAI_NONAME;
+                    }
+                }
+                Err(_) => {
+                    if flags & NI_NAMEREQD != 0 {
+                        return EAI_NONAME;
+                    }
+                    let ip_addr = Ipv4Addr::from(sa.sin_addr.s_addr.to_be());
+                    let ip_str = ip_addr.to_string();
+                    let ip_bytes = ip_str.as_bytes();
+                    if (hostlen as usize) <= ip_bytes.len() {
+                        return EAI_MEMORY;
+                    }
+                    unsafe {
+                        ptr::copy_nonoverlapping(
+                            ip_bytes.as_ptr().cast::<c_char>(),
+                            host,
+                            ip_bytes.len(),
+                        );
+                        *host.add(ip_bytes.len()) = 0;
+                    }
+                }
+            }
+        }
+    }
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/freeaddrinfo.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn freeaddrinfo(res: *mut addrinfo) {
+    let mut ai = res;
+    while !ai.is_null() {
+        let bai = unsafe { Box::from_raw(ai) };
+        if !bai.ai_canonname.is_null() {
+            drop(unsafe { CString::from_raw(bai.ai_canonname) });
+        }
+        if !bai.ai_addr.is_null() {
+            if bai.ai_addrlen == mem::size_of::<sockaddr_in>() as socklen_t {
+                unsafe { drop(Box::from_raw(bai.ai_addr.cast::<sockaddr_in>())) };
+            } else if bai.ai_addrlen == mem::size_of::<sockaddr_in6>() as socklen_t {
+                unsafe { drop(Box::from_raw(bai.ai_addr.cast::<sockaddr_in6>())) };
+            } else {
+                todo_skip!(0, "freeaddrinfo: unknown ai_addrlen {}", bai.ai_addrlen);
+            }
+        }
+        ai = bai.ai_next;
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/gai_strerror.html>.
+#[unsafe(no_mangle)]
+pub const extern "C" fn gai_strerror(errcode: c_int) -> *const c_char {
+    match errcode {
+        EAI_BADFLAGS => c"Invalid flags",
+        EAI_NONAME => c"Name does not resolve",
+        EAI_AGAIN => c"Try again",
+        EAI_FAIL => c"Non-recoverable error",
+        EAI_NODATA => c"Unknown error",
+        EAI_FAMILY => c"Unrecognized address family or invalid length",
+        EAI_SOCKTYPE => c"Unrecognized socket type",
+        EAI_SERVICE => c"Unrecognized service",
+        EAI_ADDRFAMILY => c"Address family for name not supported",
+        EAI_MEMORY => c"Out of memory",
+        EAI_SYSTEM => c"System error",
+        EAI_OVERFLOW => c"Overflow",
+        _ => c"Unknown error",
+    }
+    .as_ptr()
+}
+
+/// Provide a pointer to relibc's internal [`H_ERRNO`].
+#[unsafe(no_mangle)]
+#[deprecated]
+pub extern "C" fn __h_errno_location() -> *mut c_int {
+    H_ERRNO.as_ptr()
+}
+
+#[unsafe(no_mangle)]
+#[deprecated]
+pub const extern "C" fn hstrerror(errcode: c_int) -> *const c_char {
+    match errcode {
+        H_UNSET => c"Resolver error unset",
+        HOST_NOT_FOUND => c"Unknown hostname",
+        NO_DATA => c"No address for hostname",
+        NO_RECOVERY => c"Unknown server error",
+        TRY_AGAIN => c"Hostname lookup failure",
+        _ => c"Unknown error",
+    }
+    .as_ptr()
+}
+
+/// Print error message associated with [`H_ERRNO`] to stderr.
+///
+/// # Arguments
+/// * `prefix` - An optional prefix to prepend to the error message. May be null or an empty
+///   (`""`) C string.
+///
+/// # Safety
+/// Like [`crate::header::stdio::perror`], `prefix` should be a valid, NUL terminated C string if
+/// used. The caller may safely call this function with a null pointer.
+///
+/// # Deprecation
+/// [`H_ERRNO`], [`hstrerror`], [`herror`], and other functions are deprecated as of
+/// POSIX.1-2001 and removed as of POSIX.1-2008. These functions are provided for backwards
+/// compatibility but should not be used by new code.
+#[allow(clippy::not_unsafe_ptr_arg_deref)]
+#[unsafe(no_mangle)]
+#[deprecated]
+pub extern "C" fn herror(prefix: *const c_char) {
+    let code = H_ERRNO.get();
+    // Safety: `hstrerror` handles every error code case and always returns a valid C string
+    let error = unsafe {
+        #[allow(deprecated)]
+        let msg_cstr = CStr::from_ptr(hstrerror(code));
+        str::from_utf8_unchecked(msg_cstr.to_bytes())
+    };
+
+    let mut writer = platform::FileWriter::new(2);
+    // Prefix is optional
+    match unsafe { CStr::from_nullable_ptr(prefix) }
+        .and_then(|prefix| str::from_utf8(prefix.to_bytes()).ok())
+    {
+        Some(prefix) if !prefix.is_empty() => writer
+            .write_fmt(format_args!("{prefix}: {error}\n"))
+            .unwrap(),
+        _ => writer.write_fmt(format_args!("{error}\n")).unwrap(),
+    }
+}
diff --git a/recipes/core/relibc/src/header/netdb/redox.rs b/recipes/core/relibc/src/header/netdb/redox.rs
new file mode 100644
index 0000000000..314dffcd05
--- /dev/null
+++ b/recipes/core/relibc/src/header/netdb/redox.rs
@@ -0,0 +1,16 @@
+use crate::{
+    error::Errno,
+    fs::File,
+    header::{errno, fcntl},
+    io::Read,
+};
+use alloc::string::String;
+
+pub fn get_dns_server() -> Result<String, Errno> {
+    let mut string = String::new();
+    let mut file = File::open(c"/etc/net/dns".into(), fcntl::O_RDONLY)?;
+    file.read_to_string(&mut string)
+        .map_err(|_| Errno(errno::EIO).sync())?;
+
+    Ok(string)
+}
diff --git a/recipes/core/relibc/src/header/netinet_in/cbindgen.toml b/recipes/core/relibc/src/header/netinet_in/cbindgen.toml
new file mode 100644
index 0000000000..d88dc7fd31
--- /dev/null
+++ b/recipes/core/relibc/src/header/netinet_in/cbindgen.toml
@@ -0,0 +1,122 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html
+#
+# Spec quotations relating to includes:
+# - "The <netinet/in.h> header shall define in_port_t Equivalent to the type uint16_t as described in <inttypes.h>."
+# - "The <netinet/in.h> header shall define in_addr_t Equivalent to the type uint32_t as described in <inttypes.h>."
+# - "The <netinet/in.h> header shall define the sa_family_t type as described in <sys/socket.h>."
+# - "The <netinet/in.h> header shall define the uint8_t and uint32_t types as described in <inttypes.h>."
+# - "Inclusion of the <netinet/in.h> header may also make visible all symbols from <inttypes.h> and <sys/socket.h>."
+# - "The htonl(), htons(), ntohl(), and ntohs() functions shall be available as described in <arpa/inet.h>."
+# - "Inclusion of the <netinet/in.h> header may also make visible all symbols from <arpa/inet.h>."
+#
+# Possible cycle between arpa/inet.h and netinet/in.h solved by:
+# - including netinet/in.h in arpa/inet.h
+# - splitting out functions (htonl, htons, ntohl, ntohs) into bits/arpainet.h
+#
+# sys/types.h needed for c_int and c_char
+# bits/arpainet.h brings in inttypes.h
+sys_includes = ["sys/types.h", "sys/socket.h"]
+after_includes = """
+#include <bits/arpainet.h> // for htonl, htons, ntohl, ntohs
+"""
+include_guard = "_RELIBC_NETINET_IN_H"
+trailer = """
+#ifndef _RELIBC_BITS_NETINET_IN_H
+#define _RELIBC_BITS_NETINET_IN_H
+
+extern const struct in6_addr in6addr_any;
+extern const struct in6_addr in6addr_loopback;
+#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
+#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
+
+// from musl {
+#define IN6_IS_ADDR_UNSPECIFIED(a) \
+        (((uint32_t *) (a))[0] == 0 && ((uint32_t *) (a))[1] == 0 && \
+         ((uint32_t *) (a))[2] == 0 && ((uint32_t *) (a))[3] == 0)
+
+#define IN6_IS_ADDR_LOOPBACK(a) \
+        (((uint32_t *) (a))[0] == 0 && ((uint32_t *) (a))[1] == 0 && \
+         ((uint32_t *) (a))[2] == 0 && \
+         ((uint8_t *) (a))[12] == 0 && ((uint8_t *) (a))[13] == 0 && \
+         ((uint8_t *) (a))[14] == 0 && ((uint8_t *) (a))[15] == 1 )
+
+#define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
+
+#define IN6_IS_ADDR_LINKLOCAL(a) \
+        ((((uint8_t *) (a))[0]) == 0xfe && (((uint8_t *) (a))[1] & 0xc0) == 0x80)
+
+#define IN6_IS_ADDR_SITELOCAL(a) \
+        ((((uint8_t *) (a))[0]) == 0xfe && (((uint8_t *) (a))[1] & 0xc0) == 0xc0)
+
+#define IN6_IS_ADDR_V4MAPPED(a) \
+        (((uint32_t *) (a))[0] == 0 && ((uint32_t *) (a))[1] == 0 && \
+         ((uint8_t *) (a))[8] == 0 && ((uint8_t *) (a))[9] == 0 && \
+         ((uint8_t *) (a))[10] == 0xff && ((uint8_t *) (a))[11] == 0xff)
+
+#define IN6_IS_ADDR_V4COMPAT(a) \
+        (((uint32_t *) (a))[0] == 0 && ((uint32_t *) (a))[1] == 0 && \
+         ((uint32_t *) (a))[2] == 0 && ((uint8_t *) (a))[15] > 1)
+
+#define IN6_IS_ADDR_MC_NODELOCAL(a) \
+        (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0x1))
+
+#define IN6_IS_ADDR_MC_LINKLOCAL(a) \
+        (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0x2))
+
+#define IN6_IS_ADDR_MC_SITELOCAL(a) \
+        (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0x5))
+
+#define IN6_IS_ADDR_MC_ORGLOCAL(a) \
+        (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0x8))
+
+#define IN6_IS_ADDR_MC_GLOBAL(a) \
+        (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe))
+
+#define __ARE_4_EQUAL(a,b) \
+    (!( (0[a]-0[b]) | (1[a]-1[b]) | (2[a]-2[b]) | (3[a]-3[b]) ))
+#define IN6_ARE_ADDR_EQUAL(a,b) \
+    __ARE_4_EQUAL((const uint32_t *)(a), (const uint32_t *)(b))
+
+#define IN_CLASSA(a)        ((((in_addr_t)(a)) & 0x80000000) == 0)
+#define IN_CLASSA_NET       0xff000000
+#define IN_CLASSA_NSHIFT    24
+#define IN_CLASSA_HOST      (0xffffffff & ~IN_CLASSA_NET)
+#define IN_CLASSA_MAX       128
+#define IN_CLASSB(a)        ((((in_addr_t)(a)) & 0xc0000000) == 0x80000000)
+#define IN_CLASSB_NET       0xffff0000
+#define IN_CLASSB_NSHIFT    16
+#define IN_CLASSB_HOST      (0xffffffff & ~IN_CLASSB_NET)
+#define IN_CLASSB_MAX       65536
+#define IN_CLASSC(a)        ((((in_addr_t)(a)) & 0xe0000000) == 0xc0000000)
+#define IN_CLASSC_NET       0xffffff00
+#define IN_CLASSC_NSHIFT    8
+#define IN_CLASSC_HOST      (0xffffffff & ~IN_CLASSC_NET)
+#define IN_CLASSD(a)        ((((in_addr_t)(a)) & 0xf0000000) == 0xe0000000)
+#define IN_MULTICAST(a)     IN_CLASSD(a)
+#define IN_EXPERIMENTAL(a)  ((((in_addr_t)(a)) & 0xe0000000) == 0xe0000000)
+#define IN_BADCLASS(a) ((((in_addr_t)(a)) & 0xf0000000) == 0xf0000000)
+// } from musl
+
+#endif // _RELIBC_BITS_NETINET_IN_H
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[export]
+include = [
+  "sockaddr_in6",
+  "sockaddr_in",
+  "ipv6_mreq",
+  "ip_mreq",
+  "ip_mreq_source",
+  "group_req",
+  "group_source_req",
+]
+
+[export.rename]
+"sockaddr_storage" = "struct sockaddr_storage"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/netinet_in/mod.rs b/recipes/core/relibc/src/header/netinet_in/mod.rs
new file mode 100644
index 0000000000..0e4ced5c15
--- /dev/null
+++ b/recipes/core/relibc/src/header/netinet_in/mod.rs
@@ -0,0 +1,177 @@
+//! `netinet/in.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+
+#![allow(non_camel_case_types)]
+
+use crate::{
+    header::{bits_safamily_t::sa_family_t, sys_socket::sockaddr_storage},
+    platform::types::{c_char, c_int},
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub type in_addr_t = u32;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub type in_port_t = u16;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+#[repr(C)]
+#[derive(Debug, Clone, Default)]
+pub struct in_addr {
+    pub s_addr: in_addr_t,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+#[repr(C)]
+pub struct in6_addr {
+    pub s6_addr: [u8; 16],
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+#[repr(C)]
+#[derive(Debug, Default)]
+pub struct sockaddr_in {
+    pub sin_family: sa_family_t,
+    pub sin_port: in_port_t,
+    pub sin_addr: in_addr,
+    pub sin_zero: [c_char; 8],
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+#[repr(C)]
+pub struct sockaddr_in6 {
+    pub sin6_family: sa_family_t,
+    pub sin6_port: in_port_t,
+    pub sin6_flowinfo: u32,
+    pub sin6_addr: in6_addr,
+    pub sin6_scope_id: u32,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+#[repr(C)]
+pub struct ipv6_mreq {
+    pub ipv6mr_multiaddr: in6_addr,
+    pub ipv6mr_interface: u32,
+}
+
+// Address String Lengths
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const INET_ADDRSTRLEN: c_int = 16;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const INET6_ADDRSTRLEN: c_int = 46;
+
+// IP options
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+pub const IP_TOS: c_int = 1;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+pub const IP_RECVTOS: c_int = 13;
+
+// Protocol Numbers
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPPROTO_IP: u8 = 0;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPPROTO_ICMP: u8 = 1;
+/// Non-POSIX.
+pub const IPPROTO_IGMP: u8 = 2;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPPROTO_TCP: u8 = 6;
+/// Non-POSIX.
+pub const IPPROTO_PUP: u8 = 12;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPPROTO_UDP: u8 = 17;
+/// Non-POSIX.
+pub const IPPROTO_IDP: u8 = 22;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPPROTO_IPV6: u8 = 41;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPPROTO_RAW: u8 = 0xff;
+/// Non-POSIX.
+pub const IPPROTO_MAX: u8 = 0xff;
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+pub const IP_TTL: c_int = 2;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPV6_UNICAST_HOPS: c_int = 16;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPV6_MULTICAST_IF: c_int = 17;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPV6_MULTICAST_HOPS: c_int = 18;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPV6_MULTICAST_LOOP: c_int = 19;
+/// Non-POSIX.
+pub const IPV6_ADD_MEMBERSHIP: c_int = 20;
+pub const IPV6_JOIN_GROUP: c_int = 20;
+/// Non-POSIX.
+pub const IPV6_DROP_MEMBERSHIP: c_int = 21;
+pub const IPV6_LEAVE_GROUP: c_int = 21;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const IPV6_V6ONLY: c_int = 26;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+pub const IP_MULTICAST_IF: c_int = 32;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+pub const IP_MULTICAST_TTL: c_int = 33;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+pub const IP_MULTICAST_LOOP: c_int = 34;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+pub const IP_ADD_MEMBERSHIP: c_int = 35;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+pub const IP_DROP_MEMBERSHIP: c_int = 36;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const INADDR_ANY: u32 = 0; // Can't use in_addr_t alias because cbindgen :(
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+pub const INADDR_BROADCAST: u32 = 0xFFFF_FFFF; // Can't use core::u32::MAX because cbindgen :(
+/// Non-POSIX.
+pub const INADDR_NONE: u32 = 0xFFFF_FFFF;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+pub const INADDR_LOOPBACK: u32 = 0x7F00_0001;
+/// Non-POSIX.
+pub const INADDR_UNSPEC_GROUP: u32 = 0xE000_0000;
+/// Non-POSIX.
+pub const INADDR_ALLHOSTS_GROUP: u32 = 0xE000_0001;
+/// Non-POSIX.
+pub const INADDR_ALLRTRS_GROUP: u32 = 0xE000_0002;
+/// Non-POSIX.
+pub const INADDR_MAX_LOCAL_GROUP: u32 = 0xE000_00FF;
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+#[repr(C)]
+pub struct ip_mreq_source {
+    pub imr_multiaddr: in_addr,
+    pub imr_interface: in_addr,
+    pub imr_sourceaddr: in_addr,
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/ip.7.html>.
+#[repr(C)]
+pub struct ip_mreq {
+    pub imr_multiaddr: in_addr,
+    pub imr_interface: in_addr,
+}
+
+/// Non-POSIX.
+#[repr(C)]
+pub struct group_req {
+    pub gr_interface: u32,
+    pub gr_group: sockaddr_storage,
+}
+
+/// Non-POSIX.
+#[repr(C)]
+pub struct group_source_req {
+    pub gsr_interface: u32,
+    pub gsr_group: sockaddr_storage,
+    pub gsr_source: sockaddr_storage,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+#[unsafe(no_mangle)]
+pub static in6addr_any: in6_addr = in6_addr {
+    s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html>.
+#[unsafe(no_mangle)]
+pub static in6addr_loopback: in6_addr = in6_addr {
+    s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
+};
diff --git a/recipes/core/relibc/src/header/netinet_ip/cbindgen.toml b/recipes/core/relibc/src/header/netinet_ip/cbindgen.toml
new file mode 100644
index 0000000000..11f2e66c4c
--- /dev/null
+++ b/recipes/core/relibc/src/header/netinet_ip/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = []
+include_guard = "_NETINET_IP_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/netinet_ip/mod.rs b/recipes/core/relibc/src/header/netinet_ip/mod.rs
new file mode 100644
index 0000000000..30ddb6ebf4
--- /dev/null
+++ b/recipes/core/relibc/src/header/netinet_ip/mod.rs
@@ -0,0 +1,3 @@
+//! `netinet/ip.h` implementation.
+//!
+//! Non-POSIX.
diff --git a/recipes/core/relibc/src/header/netinet_tcp/cbindgen.toml b/recipes/core/relibc/src/header/netinet_tcp/cbindgen.toml
new file mode 100644
index 0000000000..64807753a2
--- /dev/null
+++ b/recipes/core/relibc/src/header/netinet_tcp/cbindgen.toml
@@ -0,0 +1,12 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_tcp.h.html
+#
+# There are no spec quotations relating to includes
+sys_includes = []
+include_guard = "_NETINET_TCP_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/netinet_tcp/mod.rs b/recipes/core/relibc/src/header/netinet_tcp/mod.rs
new file mode 100644
index 0000000000..99812e14e5
--- /dev/null
+++ b/recipes/core/relibc/src/header/netinet_tcp/mod.rs
@@ -0,0 +1,16 @@
+//! `netinet/tcp.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_tcp.h.html>.
+
+use crate::platform::types::c_int;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_tcp.h.html>.
+pub const TCP_NODELAY: c_int = 1;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/tcp.7.html>.
+pub const TCP_MAXSEG: c_int = 2;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/tcp.7.html>.
+pub const TCP_KEEPIDLE: c_int = 4;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/tcp.7.html>.
+pub const TCP_KEEPINTVL: c_int = 5;
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man7/tcp.7.html>.
+pub const TCP_KEEPCNT: c_int = 6;
diff --git a/recipes/core/relibc/src/header/poll/cbindgen.toml b/recipes/core/relibc/src/header/poll/cbindgen.toml
new file mode 100644
index 0000000000..246d5924cc
--- /dev/null
+++ b/recipes/core/relibc/src/header/poll/cbindgen.toml
@@ -0,0 +1,15 @@
+sys_includes = ["signal.h"]
+include_guard = "_RELIBC_POLL_H"
+after_includes = """
+#include <bits/timespec.h> // for timespec
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"timespec" = "struct timespec"
diff --git a/recipes/core/relibc/src/header/poll/mod.rs b/recipes/core/relibc/src/header/poll/mod.rs
new file mode 100644
index 0000000000..024a8d600e
--- /dev/null
+++ b/recipes/core/relibc/src/header/poll/mod.rs
@@ -0,0 +1,191 @@
+//! `poll.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/poll.h.html>.
+
+use core::{mem, ptr, slice};
+
+use crate::{
+    fs::File,
+    header::{
+        bits_timespec::timespec,
+        errno::EBADF,
+        signal::sigset_t,
+        sys_epoll::{
+            EPOLL_CLOEXEC, EPOLL_CTL_ADD, EPOLLERR, EPOLLHUP, EPOLLIN, EPOLLNVAL, EPOLLOUT,
+            EPOLLPRI, EPOLLRDBAND, EPOLLRDNORM, EPOLLWRBAND, EPOLLWRNORM, epoll_create1, epoll_ctl,
+            epoll_data, epoll_event, epoll_pwait,
+        },
+    },
+    platform::{
+        self,
+        types::{c_int, c_short, c_ulong},
+    },
+};
+
+pub const POLLIN: c_short = 0x001;
+pub const POLLPRI: c_short = 0x002;
+pub const POLLOUT: c_short = 0x004;
+pub const POLLERR: c_short = 0x008;
+pub const POLLHUP: c_short = 0x010;
+pub const POLLNVAL: c_short = 0x020;
+pub const POLLRDNORM: c_short = 0x040;
+pub const POLLRDBAND: c_short = 0x080;
+pub const POLLWRNORM: c_short = 0x100;
+pub const POLLWRBAND: c_short = 0x200;
+
+pub type nfds_t = c_ulong;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/poll.h.html>.
+#[repr(C)]
+pub struct pollfd {
+    pub fd: c_int,
+    pub events: c_short,
+    pub revents: c_short,
+}
+
+pub unsafe fn poll_epoll(fds: &mut [pollfd], timeout: c_int, sigmask: *const sigset_t) -> c_int {
+    let event_map = [
+        (POLLIN, EPOLLIN),
+        (POLLPRI, EPOLLPRI),
+        (POLLOUT, EPOLLOUT),
+        (POLLERR, EPOLLERR),
+        (POLLHUP, EPOLLHUP),
+        (POLLNVAL, EPOLLNVAL),
+        (POLLRDNORM, EPOLLRDNORM),
+        (POLLWRNORM, EPOLLWRNORM),
+        (POLLRDBAND, EPOLLRDBAND),
+        (POLLWRBAND, EPOLLWRBAND),
+    ];
+
+    let ep = {
+        let epfd = epoll_create1(EPOLL_CLOEXEC);
+        if epfd < 0 {
+            return -1;
+        }
+        File::new(epfd)
+    };
+
+    let mut closed = 0;
+    for (i, fd) in fds.iter_mut().enumerate() {
+        let pfd = fd;
+
+        pfd.revents = 0;
+
+        // Ignore the entry with negative fd
+        if pfd.fd < 0 {
+            continue;
+        }
+
+        let mut event = epoll_event {
+            events: 0,
+            data: epoll_data { u64: i as u64 },
+            ..Default::default()
+        };
+
+        for (p, ep) in event_map.iter() {
+            if pfd.events & p > 0 {
+                event.events |= ep;
+            }
+        }
+
+        if unsafe { epoll_ctl(*ep, EPOLL_CTL_ADD, pfd.fd, &raw mut event) } < 0 {
+            if platform::ERRNO.get() == EBADF {
+                pfd.revents |= POLLNVAL;
+                closed += 1;
+            } else {
+                return -1;
+            }
+        }
+    }
+
+    // Early exit if there are fds, and all are closed (revents = POLLNVAL)
+    if closed > 0 && closed == fds.len() {
+        return closed as i32;
+    }
+
+    let mut events: [epoll_event; 32] = unsafe { mem::zeroed() };
+    let res = unsafe {
+        epoll_pwait(
+            *ep,
+            events.as_mut_ptr(),
+            events.len() as c_int,
+            timeout,
+            sigmask,
+        )
+    };
+    if res < 0 {
+        return -1;
+    }
+
+    for event in events.iter().take(res as usize) {
+        let pi = unsafe { event.data.u64 as usize };
+        // TODO: Error status when fd does not match?
+        if let Some(pfd) = fds.get_mut(pi) {
+            for (p, ep) in event_map.iter() {
+                if event.events & ep > 0 {
+                    pfd.revents |= p;
+                }
+            }
+        }
+    }
+
+    let mut count = 0;
+    for pfd in fds.iter() {
+        if pfd.revents > 0 {
+            count += 1;
+        }
+    }
+    count
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/poll.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn poll(fds: *mut pollfd, nfds: nfds_t, timeout: c_int) -> c_int {
+    trace_expr!(
+        unsafe {
+            poll_epoll(
+                slice::from_raw_parts_mut(fds, nfds as usize),
+                timeout,
+                ptr::null_mut(),
+            )
+        },
+        "poll({:p}, {}, {})",
+        fds,
+        nfds,
+        timeout,
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ppoll.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ppoll(
+    fds: *mut pollfd,
+    nfds: nfds_t,
+    tmo_p: *const timespec,
+    sigmask: *const sigset_t,
+) -> c_int {
+    let timeout = if tmo_p.is_null() {
+        -1
+    } else {
+        let tmo = unsafe { &*tmo_p };
+        if tmo.tv_sec > (c_int::MAX / 1000) as _ {
+            c_int::MAX
+        } else {
+            ((tmo.tv_sec as c_int) * 1000) + ((tmo.tv_nsec as c_int) / 1000000)
+        }
+    };
+    trace_expr!(
+        unsafe {
+            poll_epoll(
+                slice::from_raw_parts_mut(fds, nfds as usize),
+                timeout,
+                sigmask,
+            )
+        },
+        "ppoll({:p}, {}, {:p}, {:p})",
+        fds,
+        nfds,
+        tmo_p,
+        sigmask
+    )
+}
diff --git a/recipes/core/relibc/src/header/pthread/attr.rs b/recipes/core/relibc/src/header/pthread/attr.rs
new file mode 100644
index 0000000000..a975f9ea75
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/attr.rs
@@ -0,0 +1,228 @@
+use core::{ptr, sync::atomic::Ordering};
+
+use super::*;
+
+use crate::{
+    header::bits_pthread::{pthread_attr_t, pthread_t},
+    pthread::{Pthread, PthreadFlags},
+};
+
+impl Default for RlctAttr {
+    fn default() -> Self {
+        Self {
+            // Default according to POSIX.
+            detachstate: PTHREAD_CREATE_JOINABLE as _,
+            // Default according to POSIX.
+            inheritsched: PTHREAD_INHERIT_SCHED as _,
+            // TODO: Linux
+            // Redox uses a round-robin scheduler
+            schedpolicy: SCHED_RR as _,
+            // TODO: Linux uses this one.
+            scope: PTHREAD_SCOPE_SYSTEM as _,
+            guardsize: Sys::getpagesize(),
+            // TODO
+            stack: 0,
+            // TODO
+            stacksize: 1024 * 1024,
+            param: sched_param {
+                // TODO
+                sched_priority: 0,
+            },
+            #[cfg(target_pointer_width = "32")]
+            _pad: [0; 12],
+        }
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_destroy(attr: *mut pthread_attr_t) -> c_int {
+    unsafe { ptr::drop_in_place(attr) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_getdetachstate(
+    attr: *const pthread_attr_t,
+    detachstate: *mut c_int,
+) -> c_int {
+    unsafe { ptr::write(detachstate, (*attr.cast::<RlctAttr>()).detachstate.into()) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_getguardsize(
+    attr: *const pthread_attr_t,
+    size: *mut size_t,
+) -> c_int {
+    unsafe { ptr::write(size, (*attr.cast::<RlctAttr>()).guardsize) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_getinheritsched(
+    attr: *const pthread_attr_t,
+    inheritsched: *mut c_int,
+) -> c_int {
+    unsafe { ptr::write(inheritsched, (*attr.cast::<RlctAttr>()).inheritsched.into()) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_getschedparam(
+    attr: *const pthread_attr_t,
+    param: *mut sched_param,
+) -> c_int {
+    unsafe { param.write((*attr.cast::<RlctAttr>()).param) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_getschedpolicy(
+    attr: *const pthread_attr_t,
+    policy: *mut c_int,
+) -> c_int {
+    unsafe { ptr::write(policy, (*attr.cast::<RlctAttr>()).schedpolicy.into()) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_getscope(
+    attr: *const pthread_attr_t,
+    scope: *mut c_int,
+) -> c_int {
+    unsafe { ptr::write(scope, (*attr.cast::<RlctAttr>()).scope.into()) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_getstack(
+    attr: *const pthread_attr_t,
+    stackaddr: *mut *mut c_void,
+    stacksize: *mut size_t,
+) -> c_int {
+    unsafe { ptr::write(stackaddr, (*attr.cast::<RlctAttr>()).stack as _) };
+    unsafe { ptr::write(stacksize, (*attr.cast::<RlctAttr>()).stacksize as _) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_getstacksize(
+    attr: *const pthread_attr_t,
+    stacksize: *mut size_t,
+) -> c_int {
+    unsafe { ptr::write(stacksize, (*attr.cast::<RlctAttr>()).stacksize as _) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_init(attr: *mut pthread_attr_t) -> c_int {
+    unsafe { ptr::write(attr.cast::<RlctAttr>(), RlctAttr::default()) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_setdetachstate(
+    attr: *mut pthread_attr_t,
+    detachstate: c_int,
+) -> c_int {
+    unsafe {
+        (*attr.cast::<RlctAttr>()).detachstate = detachstate as _;
+    }
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_setguardsize(
+    attr: *mut pthread_attr_t,
+    guardsize: c_int,
+) -> c_int {
+    unsafe {
+        (*attr.cast::<RlctAttr>()).guardsize = guardsize as _;
+    }
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_setinheritsched(
+    attr: *mut pthread_attr_t,
+    inheritsched: c_int,
+) -> c_int {
+    unsafe {
+        (*attr.cast::<RlctAttr>()).inheritsched = inheritsched as _;
+    }
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_setschedparam(
+    attr: *mut pthread_attr_t,
+    param: *const sched_param,
+) -> c_int {
+    unsafe {
+        (*attr.cast::<RlctAttr>()).param = param.read();
+    }
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_setschedpolicy(
+    attr: *mut pthread_attr_t,
+    policy: c_int,
+) -> c_int {
+    unsafe {
+        (*attr.cast::<RlctAttr>()).schedpolicy = policy as u8;
+    }
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_setscope(attr: *mut pthread_attr_t, scope: c_int) -> c_int {
+    unsafe {
+        (*attr.cast::<RlctAttr>()).scope = scope as u8;
+    }
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_setstack(
+    attr: *mut pthread_attr_t,
+    stackaddr: *mut c_void,
+    stacksize: size_t,
+) -> c_int {
+    unsafe {
+        (*attr.cast::<RlctAttr>()).stack = stackaddr as usize;
+    }
+    unsafe {
+        (*attr.cast::<RlctAttr>()).stacksize = stacksize;
+    }
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_attr_setstacksize(
+    attr: *mut pthread_attr_t,
+    stacksize: size_t,
+) -> c_int {
+    unsafe {
+        (*attr.cast::<RlctAttr>()).stacksize = stacksize;
+    }
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_getattr_np(
+    thread_ptr: pthread_t,
+    attr_ptr: *mut pthread_attr_t,
+) -> c_int {
+    let thread = unsafe { &*thread_ptr.cast::<Pthread>() };
+    let attr_ptr = attr_ptr.cast::<RlctAttr>();
+    unsafe { ptr::write(attr_ptr, RlctAttr::default()) };
+    let attr = unsafe { &mut *attr_ptr };
+    if thread.flags.load(Ordering::Acquire) & PthreadFlags::DETACHED.bits() != 0 {
+        attr.detachstate = PTHREAD_CREATE_DETACHED as _;
+    }
+    attr.stack = thread.stack_base as usize;
+    attr.stacksize = thread.stack_size;
+    //TODO: more values?
+    0
+}
diff --git a/recipes/core/relibc/src/header/pthread/barrier.rs b/recipes/core/relibc/src/header/pthread/barrier.rs
new file mode 100644
index 0000000000..dedf715f7e
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/barrier.rs
@@ -0,0 +1,104 @@
+use crate::header::errno::*;
+
+use core::num::NonZeroU32;
+
+use crate::sync::barrier::*;
+
+use super::*;
+
+pub(crate) type RlctBarrier = Barrier;
+
+#[derive(Clone, Copy)]
+pub(crate) struct RlctBarrierAttr {
+    pshared: c_int,
+}
+impl Default for RlctBarrierAttr {
+    fn default() -> Self {
+        // pshared = PTHREAD_PROCESS_PRIVATE is default according to POSIX.
+        Self {
+            pshared: PTHREAD_PROCESS_PRIVATE,
+        }
+    }
+}
+
+// Not async-signal-safe.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_barrier_destroy(barrier: *mut pthread_barrier_t) -> c_int {
+    // Behavior is undefined if any thread is currently waiting when this is called.
+
+    // No-op, currently.
+    unsafe { core::ptr::drop_in_place(barrier.cast::<RlctBarrier>()) };
+
+    0
+}
+
+// Not async-signal-safe.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_barrier_init(
+    barrier: *mut pthread_barrier_t,
+    attr: *const pthread_barrierattr_t,
+    count: c_uint,
+) -> c_int {
+    let attr = unsafe { attr.cast::<RlctBarrierAttr>().as_ref() }
+        .copied()
+        .unwrap_or_default();
+
+    let Some(count) = NonZeroU32::new(count) else {
+        return EINVAL;
+    };
+
+    unsafe { barrier.cast::<RlctBarrier>().write(RlctBarrier::new(count)) };
+    0
+}
+
+fn unlikely(condition: bool) -> bool {
+    condition
+}
+
+// Not async-signal-safe.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_barrier_wait(barrier: *mut pthread_barrier_t) -> c_int {
+    let barrier = unsafe { &*barrier.cast::<RlctBarrier>() };
+
+    match barrier.wait() {
+        WaitResult::NotifiedAll => PTHREAD_BARRIER_SERIAL_THREAD,
+        WaitResult::Waited => 0,
+    }
+}
+
+// Not async-signal-safe.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_barrierattr_init(attr: *mut pthread_barrierattr_t) -> c_int {
+    unsafe { core::ptr::write(attr.cast::<RlctBarrierAttr>(), RlctBarrierAttr::default()) };
+
+    0
+}
+
+// Not async-signal-safe.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_barrierattr_setpshared(
+    attr: *mut pthread_barrierattr_t,
+    pshared: c_int,
+) -> c_int {
+    unsafe {
+        (*attr.cast::<RlctBarrierAttr>()).pshared = pshared;
+    }
+    0
+}
+
+// Not async-signal-safe.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_barrierattr_getpshared(
+    attr: *const pthread_barrierattr_t,
+    pshared: *mut c_int,
+) -> c_int {
+    unsafe { core::ptr::write(pshared, (*attr.cast::<RlctBarrierAttr>()).pshared) };
+    0
+}
+
+// Not async-signal-safe.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_barrierattr_destroy(attr: *mut pthread_barrierattr_t) -> c_int {
+    unsafe { core::ptr::drop_in_place(attr) };
+    0
+}
diff --git a/recipes/core/relibc/src/header/pthread/cbindgen.toml b/recipes/core/relibc/src/header/pthread/cbindgen.toml
new file mode 100644
index 0000000000..04b8d7da80
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/cbindgen.toml
@@ -0,0 +1,13 @@
+sys_includes = ["sched.h", "time.h", "bits/pthread.h", "features.h"]
+include_guard = "_RELIBC_PTHREAD_H"
+language = "C"
+style = "tag"
+no_includes = true
+cpp_compat = true
+
+[export.rename]
+"timespec" = "struct timespec"
+"sched_param" = "struct sched_param"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/pthread/cond.rs b/recipes/core/relibc/src/header/pthread/cond.rs
new file mode 100644
index 0000000000..49467238da
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/cond.rs
@@ -0,0 +1,132 @@
+// Used design from https://www.remlab.net/op/futex-condvar.shtml
+
+use crate::header::time::CLOCK_REALTIME;
+
+use super::*;
+
+// PTHREAD_COND_INITIALIZER is defined manually in bits_pthread/cbindgen.toml
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_cond_broadcast(cond: *mut pthread_cond_t) -> c_int {
+    e((unsafe { &*cond.cast::<RlctCond>() }).broadcast())
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_cond_destroy(cond: *mut pthread_cond_t) -> c_int {
+    // No-op
+    unsafe { core::ptr::drop_in_place(cond.cast::<RlctCond>()) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_cond_init(
+    cond: *mut pthread_cond_t,
+    attr: *const pthread_condattr_t,
+) -> c_int {
+    let attr = unsafe { attr.cast::<RlctCondAttr>().as_ref() }
+        .copied()
+        .unwrap_or_default();
+
+    if attr.clock != CLOCK_REALTIME {
+        // As monotonic clock always smaller than realtime clock, this always result in instant timeout.
+        todo_skip!(0, "pthread_cond_init with monotonic clock");
+    }
+
+    unsafe { cond.cast::<RlctCond>().write(RlctCond::new()) };
+
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_cond_signal(cond: *mut pthread_cond_t) -> c_int {
+    e((unsafe { &*cond.cast::<RlctCond>() }).signal())
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_cond_timedwait(
+    cond: *mut pthread_cond_t,
+    mutex: *mut pthread_mutex_t,
+    timeout: *const timespec,
+) -> c_int {
+    e((unsafe { &*cond.cast::<RlctCond>() })
+        .timedwait(unsafe { &*mutex.cast::<RlctMutex>() }, unsafe { &*timeout }))
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_cond_clockwait(
+    cond: *mut pthread_cond_t,
+    mutex: *mut pthread_mutex_t,
+    clock_id: clockid_t,
+    timeout: *const timespec,
+) -> c_int {
+    e((unsafe { &*cond.cast::<RlctCond>() }).clockwait(
+        unsafe { &*mutex.cast::<RlctMutex>() },
+        unsafe { &*timeout },
+        clock_id,
+    ))
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_cond_wait(
+    cond: *mut pthread_cond_t,
+    mutex: *mut pthread_mutex_t,
+) -> c_int {
+    e((unsafe { &*cond.cast::<RlctCond>() }).wait(unsafe { &*mutex.cast::<RlctMutex>() }))
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_condattr_destroy(condattr: *mut pthread_condattr_t) -> c_int {
+    unsafe { core::ptr::drop_in_place(condattr.cast::<RlctCondAttr>()) };
+    // No-op
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_condattr_getclock(
+    condattr: *const pthread_condattr_t,
+    clock: *mut clockid_t,
+) -> c_int {
+    unsafe { core::ptr::write(clock, (*condattr.cast::<RlctCondAttr>()).clock) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_condattr_getpshared(
+    condattr: *const pthread_condattr_t,
+    pshared: *mut c_int,
+) -> c_int {
+    unsafe { core::ptr::write(pshared, (*condattr.cast::<RlctCondAttr>()).pshared) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_condattr_init(condattr: *mut pthread_condattr_t) -> c_int {
+    unsafe {
+        condattr
+            .cast::<RlctCondAttr>()
+            .write(RlctCondAttr::default())
+    };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_condattr_setclock(
+    condattr: *mut pthread_condattr_t,
+    clock: clockid_t,
+) -> c_int {
+    (unsafe { *condattr.cast::<RlctCondAttr>() }).clock = clock;
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_condattr_setpshared(
+    condattr: *mut pthread_condattr_t,
+    pshared: c_int,
+) -> c_int {
+    (unsafe { *condattr.cast::<RlctCondAttr>() }).pshared = pshared;
+    0
+}
+
+pub(crate) type RlctCondAttr = crate::sync::cond::CondAttr;
+
+pub(crate) type RlctCond = crate::sync::cond::Cond;
diff --git a/recipes/core/relibc/src/header/pthread/mod.rs b/recipes/core/relibc/src/header/pthread/mod.rs
new file mode 100644
index 0000000000..c742a425ff
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/mod.rs
@@ -0,0 +1,352 @@
+//! `pthread.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/pthread.h.html>.
+
+use alloc::collections::LinkedList;
+use core::{cell::Cell, ptr::NonNull};
+
+use crate::{
+    error::Errno,
+    header::{bits_timespec::timespec, sched::*},
+    platform::{
+        Pal, Sys,
+        types::{
+            c_int, c_uchar, c_uint, c_void, clockid_t, pthread_attr_t, pthread_barrier_t,
+            pthread_barrierattr_t, pthread_cond_t, pthread_condattr_t, pthread_key_t,
+            pthread_mutex_t, pthread_mutexattr_t, pthread_once_t, pthread_rwlock_t,
+            pthread_rwlockattr_t, pthread_spinlock_t, pthread_t, size_t,
+        },
+    },
+    pthread,
+};
+
+pub fn e(result: Result<(), Errno>) -> i32 {
+    match result {
+        Ok(()) => 0,
+        Err(Errno(error)) => error,
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct RlctAttr {
+    pub detachstate: c_uchar,
+    pub inheritsched: c_uchar,
+    pub schedpolicy: c_uchar,
+    pub scope: c_uchar,
+    pub guardsize: size_t,
+    pub stacksize: size_t,
+    pub stack: size_t,
+    pub param: sched_param,
+    #[cfg(target_pointer_width = "32")]
+    _pad: [u8; 12],
+}
+
+pub const _POSIX_THREADS: c_int = 1;
+
+pub const PTHREAD_BARRIER_SERIAL_THREAD: c_int = -1;
+
+pub const PTHREAD_CANCEL_ASYNCHRONOUS: c_int = 0;
+pub const PTHREAD_CANCEL_ENABLE: c_int = 1;
+pub const PTHREAD_CANCEL_DEFERRED: c_int = 2;
+pub const PTHREAD_CANCEL_DISABLE: c_int = 3;
+pub const PTHREAD_CANCELED: *mut c_void = (!0_usize) as *mut c_void;
+
+pub const PTHREAD_CREATE_DETACHED: c_int = 0;
+pub const PTHREAD_CREATE_JOINABLE: c_int = 1;
+
+pub const PTHREAD_EXPLICIT_SCHED: c_int = 0;
+pub const PTHREAD_INHERIT_SCHED: c_int = 1;
+
+pub const PTHREAD_MUTEX_DEFAULT: c_int = 0;
+pub const PTHREAD_MUTEX_ERRORCHECK: c_int = 1;
+pub const PTHREAD_MUTEX_NORMAL: c_int = 2;
+pub const PTHREAD_MUTEX_RECURSIVE: c_int = 3;
+
+pub const PTHREAD_MUTEX_ROBUST: c_int = 0;
+pub const PTHREAD_MUTEX_STALLED: c_int = 1;
+
+pub const PTHREAD_PRIO_INHERIT: c_int = 0;
+
+pub const PTHREAD_PRIO_NONE: c_int = 0;
+
+pub const PTHREAD_PRIO_PROTECT: c_int = 0;
+
+pub const PTHREAD_PROCESS_SHARED: c_int = 0;
+pub const PTHREAD_PROCESS_PRIVATE: c_int = 1;
+
+pub const PTHREAD_SCOPE_PROCESS: c_int = 0;
+pub const PTHREAD_SCOPE_SYSTEM: c_int = 1;
+
+pub mod attr;
+pub use self::attr::*;
+
+pub mod barrier;
+pub use self::barrier::*;
+
+pub mod cond;
+pub use self::cond::*;
+
+#[thread_local]
+pub static mut fork_hooks: [LinkedList<extern "C" fn()>; 3] = [const { LinkedList::new() }; 3];
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_cancel.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_cancel(thread: pthread_t) -> c_int {
+    match unsafe { pthread::cancel(&*thread.cast()) } {
+        Ok(()) => 0,
+        Err(Errno(error)) => error,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_create.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_create(
+    pthread: *mut pthread_t,
+    attr: *const pthread_attr_t,
+    start_routine: extern "C" fn(arg: *mut c_void) -> *mut c_void,
+    arg: *mut c_void,
+) -> c_int {
+    let attr = unsafe { attr.cast::<RlctAttr>().as_ref() };
+
+    match unsafe { pthread::create(attr, start_routine, arg) } {
+        Ok(ptr) => {
+            unsafe { core::ptr::write(pthread, ptr) };
+            0
+        }
+        Err(Errno(code)) => code,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_detach.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_detach(pthread: pthread_t) -> c_int {
+    match unsafe { pthread::detach(&*pthread.cast()) } {
+        Ok(()) => 0,
+        Err(Errno(errno)) => errno,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_equal.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn pthread_equal(pthread1: pthread_t, pthread2: pthread_t) -> c_int {
+    core::ptr::eq(pthread1, pthread2).into()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_atfork.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn pthread_atfork(
+    prepare: Option<extern "C" fn()>,
+    parent: Option<extern "C" fn()>,
+    child: Option<extern "C" fn()>,
+) -> c_int {
+    if let Some(prepare) = prepare {
+        unsafe {
+            fork_hooks[0].push_back(prepare);
+        }
+    }
+    if let Some(parent) = parent {
+        unsafe {
+            fork_hooks[1].push_back(parent);
+        }
+    }
+    if let Some(child) = child {
+        unsafe {
+            fork_hooks[2].push_back(child);
+        }
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_exit.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_exit(retval: *mut c_void) -> ! {
+    unsafe { pthread::exit_current_thread(pthread::Retval(retval)) }
+}
+
+// Not in latest POSIX, mark as depreciated?
+/// See <https://pubs.opengroup.org/onlinepubs/009696799/functions/pthread_getconcurrency.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_getconcurrency() -> c_int {
+    // Redox and Linux threads are 1:1, not M:N.
+    1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_getcpuclockid.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_getcpuclockid(
+    thread: pthread_t,
+    clock_out: *mut clockid_t,
+) -> c_int {
+    match pthread::get_cpu_clkid(unsafe { &*thread.cast() }) {
+        Ok(clock) => {
+            unsafe { clock_out.write(clock) };
+            0
+        }
+        Err(Errno(error)) => error,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_getschedparam.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_getschedparam(
+    thread: pthread_t,
+    policy_out: *mut c_int,
+    param_out: *mut sched_param,
+) -> c_int {
+    match pthread::get_sched_param(unsafe { &*thread.cast() }) {
+        Ok((policy, param)) => {
+            unsafe { policy_out.write(policy) };
+            unsafe { param_out.write(param) };
+            0
+        }
+        Err(Errno(error)) => error,
+    }
+}
+
+pub mod tls;
+pub use tls::*;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_join.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_join(thread: pthread_t, retval: *mut *mut c_void) -> c_int {
+    match unsafe { pthread::join(&*thread.cast()) } {
+        Ok(pthread::Retval(ret)) => {
+            if !retval.is_null() {
+                unsafe { core::ptr::write(retval, ret) };
+            }
+            0
+        }
+        Err(Errno(error)) => error,
+    }
+}
+
+pub mod mutex;
+pub use self::mutex::*;
+
+pub mod once;
+pub use self::once::*;
+
+pub mod rwlock;
+pub use self::rwlock::*;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_self.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_self() -> pthread_t {
+    core::ptr::from_ref(unsafe { pthread::current_thread().unwrap_unchecked() }) as *mut _
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_setcancelstate.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_setcancelstate(state: c_int, oldstate: *mut c_int) -> c_int {
+    match pthread::set_cancel_state(state) {
+        Ok(old) => {
+            // POSIX doesn't imply oldstate can be NULL anywhere, but a lot of C code probably
+            // relies on it...
+            if let Some(oldstate) = NonNull::new(oldstate) {
+                unsafe { oldstate.write(old) };
+            }
+            0
+        }
+        Err(Errno(error)) => error,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_setcancelstate.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_setcanceltype(ty: c_int, oldty: *mut c_int) -> c_int {
+    match pthread::set_cancel_type(ty) {
+        Ok(old) => {
+            // POSIX doesn't imply oldty can be NULL anywhere, but a lot of C code probably relies
+            // on it...
+            if let Some(oldty) = NonNull::new(oldty) {
+                unsafe { oldty.write(old) };
+            }
+            0
+        }
+        Err(Errno(error)) => error,
+    }
+}
+
+// Not in latest POSIX, mark as depreciated?
+/// See <https://pubs.opengroup.org/onlinepubs/000095399/functions/pthread_setconcurrency.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn pthread_setconcurrency(concurrency: c_int) -> c_int {
+    // Redox and Linux threads are 1:1, not M:N.
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_setschedparam.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_setschedparam(
+    thread: pthread_t,
+    policy: c_int,
+    param: *const sched_param,
+) -> c_int {
+    e(pthread::set_sched_param(
+        unsafe { &*thread.cast() },
+        policy,
+        unsafe { &*param },
+    ))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_setschedprio.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_setschedprio(thread: pthread_t, prio: c_int) -> c_int {
+    e(pthread::set_sched_priority(
+        unsafe { &*thread.cast() },
+        prio,
+    ))
+}
+
+pub mod spin;
+pub use self::spin::*;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_setcancelstate.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_testcancel() {
+    unsafe { pthread::testcancel() };
+}
+
+// Must be the same struct as defined in the pthread_cleanup_push macro.
+#[repr(C)]
+pub(crate) struct CleanupLinkedListEntry {
+    routine: extern "C" fn(*mut c_void),
+    arg: *mut c_void,
+    prev: *const c_void,
+}
+
+#[thread_local]
+pub(crate) static CLEANUP_LL_HEAD: Cell<*const CleanupLinkedListEntry> =
+    Cell::new(core::ptr::null());
+
+// TODO: unwind? setjmp/longjmp?
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __relibc_internal_pthread_cleanup_push(new_entry: *mut c_void) {
+    let new_entry = unsafe { &mut *new_entry.cast::<CleanupLinkedListEntry>() };
+
+    new_entry.prev = CLEANUP_LL_HEAD.get().cast();
+    CLEANUP_LL_HEAD.set(new_entry);
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __relibc_internal_pthread_cleanup_pop(execute: c_int) {
+    let prev_head = unsafe { CLEANUP_LL_HEAD.get().read() };
+    CLEANUP_LL_HEAD.set(prev_head.prev.cast());
+
+    if execute != 0 {
+        (prev_head.routine)(prev_head.arg);
+    }
+}
+
+pub(crate) unsafe fn run_destructor_stack() {
+    unsafe { crate::cxa::__cxa_thread_finalize() };
+
+    let mut ptr = CLEANUP_LL_HEAD.get();
+
+    while !ptr.is_null() {
+        let entry = unsafe { ptr.read() };
+        ptr = entry.prev.cast();
+
+        (entry.routine)(entry.arg);
+    }
+}
diff --git a/recipes/core/relibc/src/header/pthread/mutex.rs b/recipes/core/relibc/src/header/pthread/mutex.rs
new file mode 100644
index 0000000000..9f53257dbf
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/mutex.rs
@@ -0,0 +1,217 @@
+// FIXME(andypython): remove this when #![allow(warnings, unused_variables)] is
+// dropped from src/lib.rs.
+#![warn(warnings, unused_variables)]
+
+use super::*;
+pub use crate::sync::pthread_mutex::RlctMutex;
+use crate::{error::Errno, header::time::timespec_realtime_to_monotonic};
+
+// PTHREAD_MUTEX_INITIALIZER is defined in bits_pthread/cbindgen.toml
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutex_consistent(mutex: *mut pthread_mutex_t) -> c_int {
+    e((unsafe { &*mutex.cast::<RlctMutex>() }).make_consistent())
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutex_destroy(mutex: *mut pthread_mutex_t) -> c_int {
+    // No-op
+    unsafe { core::ptr::drop_in_place(mutex.cast::<RlctMutex>()) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutex_getprioceiling(
+    mutex: *const pthread_mutex_t,
+    prioceiling: *mut c_int,
+) -> c_int {
+    match (unsafe { &*mutex.cast::<RlctMutex>() }).prioceiling() {
+        Ok(value) => {
+            unsafe { prioceiling.write(value) };
+            0
+        }
+        Err(Errno(errno)) => errno,
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutex_init(
+    mutex: *mut pthread_mutex_t,
+    attr: *const pthread_mutexattr_t,
+) -> c_int {
+    let attr = unsafe { attr.cast::<RlctMutexAttr>().as_ref() }
+        .cloned()
+        .unwrap_or_default();
+
+    match RlctMutex::new(&attr) {
+        Ok(new) => {
+            unsafe { mutex.cast::<RlctMutex>().write(new) };
+
+            0
+        }
+        Err(Errno(errno)) => errno,
+    }
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutex_lock(mutex: *mut pthread_mutex_t) -> c_int {
+    e((unsafe { &*mutex.cast::<RlctMutex>() }).lock())
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutex_setprioceiling(
+    mutex: *mut pthread_mutex_t,
+    prioceiling: c_int,
+    old_prioceiling: *mut c_int,
+) -> c_int {
+    match (unsafe { &*mutex.cast::<RlctMutex>() }).replace_prioceiling(prioceiling) {
+        Ok(old) => {
+            unsafe { old_prioceiling.write(old) };
+            0
+        }
+        Err(Errno(errno)) => errno,
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutex_timedlock(
+    mutex: *mut pthread_mutex_t,
+    abstime: &timespec,
+) -> c_int {
+    let relative = match timespec_realtime_to_monotonic(abstime.clone()) {
+        Ok(relative) => relative,
+        Err(err) => return e(Err(err)),
+    };
+
+    e((unsafe { &*mutex.cast::<RlctMutex>() }).lock_with_timeout(&relative))
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutex_trylock(mutex: *mut pthread_mutex_t) -> c_int {
+    e((unsafe { &*mutex.cast::<RlctMutex>() }).try_lock())
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutex_unlock(mutex: *mut pthread_mutex_t) -> c_int {
+    e((unsafe { &*mutex.cast::<RlctMutex>() }).unlock())
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_destroy(attr: *mut pthread_mutexattr_t) -> c_int {
+    // No-op
+    unsafe { core::ptr::drop_in_place(attr.cast::<RlctMutexAttr>()) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_getprioceiling(
+    attr: *const pthread_mutexattr_t,
+    prioceiling: &mut c_int,
+) -> c_int {
+    *prioceiling = unsafe { &*attr.cast::<RlctMutexAttr>() }.prioceiling;
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_getprotocol(
+    attr: *const pthread_mutexattr_t,
+    protocol: &mut c_int,
+) -> c_int {
+    *protocol = unsafe { &*attr.cast::<RlctMutexAttr>() }.protocol;
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_getpshared(
+    attr: *const pthread_mutexattr_t,
+    pshared: &mut c_int,
+) -> c_int {
+    *pshared = unsafe { &*attr.cast::<RlctMutexAttr>() }.pshared;
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_getrobust(
+    attr: *const pthread_mutexattr_t,
+    robust: &mut c_int,
+) -> c_int {
+    *robust = unsafe { &*attr.cast::<RlctMutexAttr>() }.robust;
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_gettype(
+    attr: *const pthread_mutexattr_t,
+    ty: &mut c_int,
+) -> c_int {
+    *ty = unsafe { &*attr.cast::<RlctMutexAttr>() }.ty;
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_init(attr: *mut pthread_mutexattr_t) -> c_int {
+    unsafe { attr.cast::<RlctMutexAttr>().write(RlctMutexAttr::default()) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_setprioceiling(
+    attr: *mut pthread_mutexattr_t,
+    prioceiling: c_int,
+) -> c_int {
+    unsafe { &mut *attr.cast::<RlctMutexAttr>() }.prioceiling = prioceiling;
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_setprotocol(
+    attr: *mut pthread_mutexattr_t,
+    protocol: c_int,
+) -> c_int {
+    unsafe { &mut *attr.cast::<RlctMutexAttr>() }.protocol = protocol;
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_setpshared(
+    attr: *mut pthread_mutexattr_t,
+    pshared: c_int,
+) -> c_int {
+    unsafe { &mut *attr.cast::<RlctMutexAttr>() }.pshared = pshared;
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_setrobust(
+    attr: *mut pthread_mutexattr_t,
+    robust: c_int,
+) -> c_int {
+    unsafe { &mut *attr.cast::<RlctMutexAttr>() }.robust = robust;
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_mutexattr_settype(
+    attr: *mut pthread_mutexattr_t,
+    ty: c_int,
+) -> c_int {
+    unsafe { &mut *attr.cast::<RlctMutexAttr>() }.ty = ty;
+    0
+}
+
+#[repr(C)]
+#[derive(Clone)]
+pub(crate) struct RlctMutexAttr {
+    pub prioceiling: c_int,
+    pub protocol: c_int,
+    pub pshared: c_int,
+    pub robust: c_int,
+    pub ty: c_int,
+}
+
+impl Default for RlctMutexAttr {
+    fn default() -> Self {
+        Self {
+            robust: PTHREAD_MUTEX_STALLED,
+            pshared: PTHREAD_PROCESS_PRIVATE,
+            protocol: PTHREAD_PRIO_NONE,
+            // TODO
+            prioceiling: 0,
+            ty: PTHREAD_MUTEX_DEFAULT,
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/header/pthread/once.rs b/recipes/core/relibc/src/header/pthread/once.rs
new file mode 100644
index 0000000000..76348bbcf6
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/once.rs
@@ -0,0 +1,20 @@
+use super::*;
+
+// PTHREAD_ONCE_INIT
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_once(
+    once: *mut pthread_once_t,
+    constructor: extern "C" fn(),
+) -> c_int {
+    let once = unsafe { &*once.cast::<RlctOnce>() };
+
+    // TODO: Cancellation points
+
+    once.call_once(|| constructor());
+
+    //crate::sync::once::call_once_generic(&once.inner, || constructor());
+
+    0
+}
+pub(crate) type RlctOnce = crate::sync::Once<()>;
diff --git a/recipes/core/relibc/src/header/pthread/rwlock.rs b/recipes/core/relibc/src/header/pthread/rwlock.rs
new file mode 100644
index 0000000000..916579bd86
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/rwlock.rs
@@ -0,0 +1,156 @@
+use super::*;
+
+use crate::header::errno::{EBUSY, EINVAL};
+
+use crate::{header::time::CLOCK_REALTIME, pthread::Pshared};
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_init(
+    rwlock: *mut pthread_rwlock_t,
+    attr: *const pthread_rwlockattr_t,
+) -> c_int {
+    let attr = unsafe { attr.cast::<RlctRwlockAttr>().as_ref() }
+        .copied()
+        .unwrap_or_default();
+
+    unsafe {
+        rwlock
+            .cast::<RlctRwlock>()
+            .write(RlctRwlock::new(attr.pshared))
+    };
+
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_rdlock(rwlock: *mut pthread_rwlock_t) -> c_int {
+    match unsafe { get(rwlock) }.acquire_read_lock(None) {
+        Ok(()) => 0,
+        Err(e) => e.0,
+    }
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_clockrdlock(
+    rwlock: *mut pthread_rwlock_t,
+    clock_id: clockid_t,
+    abstime: *const timespec,
+) -> c_int {
+    match unsafe { get(rwlock) }.acquire_read_lock(Some((unsafe { &*abstime }, clock_id))) {
+        Ok(()) => 0,
+        Err(e) => e.0,
+    }
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_timedrdlock(
+    rwlock: *mut pthread_rwlock_t,
+    abstime: *const timespec,
+) -> c_int {
+    match unsafe { get(rwlock) }.acquire_read_lock(Some((unsafe { &*abstime }, CLOCK_REALTIME))) {
+        Ok(()) => 0,
+        Err(e) => e.0,
+    }
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_clockwrlock(
+    rwlock: *mut pthread_rwlock_t,
+    clock_id: clockid_t,
+    abstime: *const timespec,
+) -> c_int {
+    match unsafe { get(rwlock) }.acquire_write_lock(Some((unsafe { &*abstime }, clock_id))) {
+        Ok(()) => 0,
+        Err(e) => e.0,
+    }
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_timedwrlock(
+    rwlock: *mut pthread_rwlock_t,
+    abstime: *const timespec,
+) -> c_int {
+    match unsafe { get(rwlock) }.acquire_write_lock(Some((unsafe { &*abstime }, CLOCK_REALTIME))) {
+        Ok(()) => 0,
+        Err(e) => e.0,
+    }
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_tryrdlock(rwlock: *mut pthread_rwlock_t) -> c_int {
+    match unsafe { get(rwlock) }.try_acquire_read_lock() {
+        Ok(()) => 0,
+        Err(_) => EBUSY,
+    }
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_trywrlock(rwlock: *mut pthread_rwlock_t) -> c_int {
+    match unsafe { get(rwlock) }.try_acquire_write_lock() {
+        Ok(()) => 0,
+        Err(_) => EBUSY,
+    }
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_unlock(rwlock: *mut pthread_rwlock_t) -> c_int {
+    unsafe { get(rwlock) }.unlock();
+
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_wrlock(rwlock: *mut pthread_rwlock_t) -> c_int {
+    match unsafe { get(rwlock) }.acquire_write_lock(None) {
+        Ok(()) => 0,
+        Err(e) => e.0,
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlockattr_init(attr: *mut pthread_rwlockattr_t) -> c_int {
+    unsafe {
+        attr.cast::<RlctRwlockAttr>()
+            .write(RlctRwlockAttr::default())
+    };
+
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlockattr_getpshared(
+    attr: *const pthread_rwlockattr_t,
+    pshared_out: *mut c_int,
+) -> c_int {
+    unsafe { core::ptr::write(pshared_out, (*attr.cast::<RlctRwlockAttr>()).pshared.raw()) };
+
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlockattr_setpshared(
+    attr: *mut pthread_rwlockattr_t,
+    pshared: c_int,
+) -> c_int {
+    let Some(pshared) = Pshared::from_raw(pshared) else {
+        return EINVAL;
+    };
+
+    (unsafe { *attr.cast::<RlctRwlockAttr>() }).pshared = pshared;
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlockattr_destroy(attr: *mut pthread_rwlockattr_t) -> c_int {
+    unsafe { core::ptr::drop_in_place(attr) };
+
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_rwlock_destroy(rwlock: *mut pthread_rwlock_t) -> c_int {
+    unsafe { core::ptr::drop_in_place(rwlock) };
+
+    0
+}
+
+pub(crate) type RlctRwlock = crate::sync::rwlock::InnerRwLock;
+
+#[derive(Clone, Copy, Default)]
+pub(crate) struct RlctRwlockAttr {
+    pshared: Pshared,
+}
+#[inline]
+unsafe fn get<'a>(ptr: *mut pthread_rwlock_t) -> &'a RlctRwlock {
+    unsafe { &*ptr.cast() }
+}
diff --git a/recipes/core/relibc/src/header/pthread/spin.rs b/recipes/core/relibc/src/header/pthread/spin.rs
new file mode 100644
index 0000000000..094a9ea31b
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/spin.rs
@@ -0,0 +1,75 @@
+use core::sync::atomic::{AtomicI32 as AtomicInt, Ordering};
+
+use crate::header::errno::EBUSY;
+
+use super::*;
+
+const UNLOCKED: c_int = 0;
+const LOCKED: c_int = 1;
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_spin_destroy(spinlock: *mut pthread_spinlock_t) -> c_int {
+    let _spinlock = unsafe { &mut *spinlock.cast::<RlctSpinlock>() };
+
+    // No-op
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_spin_init(
+    spinlock: *mut pthread_spinlock_t,
+    _pshared: c_int,
+) -> c_int {
+    // TODO: pshared doesn't matter in most situations, as memory is just memory, but this may be
+    // different on some architectures...
+
+    unsafe {
+        spinlock.cast::<RlctSpinlock>().write(RlctSpinlock {
+            inner: AtomicInt::new(UNLOCKED),
+        })
+    };
+
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_spin_lock(spinlock: *mut pthread_spinlock_t) -> c_int {
+    let spinlock = unsafe { &*spinlock.cast::<RlctSpinlock>() };
+
+    loop {
+        match spinlock.inner.compare_exchange_weak(
+            UNLOCKED,
+            LOCKED,
+            Ordering::Acquire,
+            Ordering::Relaxed,
+        ) {
+            Ok(_) => break,
+            Err(_) => core::hint::spin_loop(),
+        }
+    }
+
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_spin_trylock(spinlock: *mut pthread_spinlock_t) -> c_int {
+    let spinlock = unsafe { &*spinlock.cast::<RlctSpinlock>() };
+
+    match spinlock
+        .inner
+        .compare_exchange(UNLOCKED, LOCKED, Ordering::Acquire, Ordering::Relaxed)
+    {
+        Ok(_) => (),
+        Err(_) => return EBUSY,
+    }
+
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_spin_unlock(spinlock: *mut pthread_spinlock_t) -> c_int {
+    let spinlock = unsafe { &*spinlock.cast::<RlctSpinlock>() };
+
+    spinlock.inner.store(UNLOCKED, Ordering::Release);
+
+    0
+}
+pub(crate) struct RlctSpinlock {
+    pub inner: AtomicInt,
+}
diff --git a/recipes/core/relibc/src/header/pthread/tls.rs b/recipes/core/relibc/src/header/pthread/tls.rs
new file mode 100644
index 0000000000..83f2826c46
--- /dev/null
+++ b/recipes/core/relibc/src/header/pthread/tls.rs
@@ -0,0 +1,130 @@
+// FIXME(andypython): remove this when #![allow(warnings, unused_variables)] is
+// dropped from src/lib.rs.
+#![warn(warnings, unused_variables)]
+
+use super::*;
+
+// TODO: Hashmap?
+use alloc::{collections::BTreeMap, vec::Vec};
+
+use core::{
+    cell::RefCell,
+    ptr,
+    sync::atomic::{AtomicUsize, Ordering},
+};
+
+use crate::{
+    header::{errno::EINVAL, limits::PTHREAD_DESTRUCTOR_ITERATIONS},
+    sync::Mutex,
+};
+
+type Dtor = Option<extern "C" fn(value: *mut c_void)>;
+
+struct Record {
+    data: *mut c_void,
+}
+
+#[thread_local]
+static VALUES: RefCell<BTreeMap<pthread_key_t, Record>> = RefCell::new(BTreeMap::new());
+static KEYS: Mutex<BTreeMap<pthread_key_t, Dtor>> = Mutex::new(BTreeMap::new());
+static NEXTKEY: AtomicUsize = AtomicUsize::new(1);
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_getspecific(key: pthread_key_t) -> *mut c_void {
+    // According to POSIX (issue 8): Calling [`pthread_getspecific`] with a key
+    // that has been deleted with [`pthread_key_delete`] or not obtained from
+    // [`pthread_key_create`] results in undefined behaviour. Therefore, we only
+    // do this check when debug assertions are explicitly enabled to avoid
+    // acquiring the global [`KEYS`] lock when it is not necessary.
+    debug_assert!(KEYS.lock().contains_key(&key));
+    VALUES
+        .borrow_mut()
+        .get(&key)
+        .map(|record| record.data)
+        .unwrap_or(ptr::null_mut())
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_setspecific(key: pthread_key_t, value: *const c_void) -> c_int {
+    if !KEYS.lock().contains_key(&key) {
+        // We don't have to return anything, but it's not less expensive to ignore it.
+        //println!("Invalid key for pthread_setspecific key {:#0x} value {:p}", key, value);
+        return EINVAL;
+    }
+
+    let mut guard = VALUES.borrow_mut();
+
+    let record = guard.entry(key).or_insert(Record {
+        data: core::ptr::null_mut(),
+    });
+    //println!("Valid key for pthread_setspecific key {:#0x} value {:p} (was {:p})", key, value, record.data);
+
+    record.data = value.cast_mut();
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_key_create(
+    key_ptr: *mut pthread_key_t,
+    destructor: Dtor,
+) -> c_int {
+    let key = NEXTKEY.fetch_add(1, Ordering::SeqCst) as pthread_key_t;
+
+    // TODO
+    //if key >= PTHREAD_KEYS_MAX {
+    //}
+
+    KEYS.lock().insert(key, destructor);
+
+    unsafe { key_ptr.write(key) };
+    0
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_key_delete(key: pthread_key_t) -> c_int {
+    if KEYS.lock().remove(&key).is_none() || VALUES.borrow_mut().remove(&key).is_none() {
+        // We don't have to return anything, but it's not less expensive to ignore it.
+        return EINVAL;
+    }
+
+    0
+}
+
+pub(crate) unsafe fn run_all_destructors() {
+    for _ in 0..PTHREAD_DESTRUCTOR_ITERATIONS {
+        let mut any_run = false;
+        let dtors = {
+            let keys = KEYS.lock();
+            keys.iter()
+                .filter_map(|(&key, &dtor)| dtor.map(|dtor| (key, dtor)))
+                .collect::<Vec<_>>()
+        };
+
+        // According to POSIX (issue 8): There is no specific order in which we
+        // have to run the destructors.
+        for (key, dtor) in dtors {
+            let mut values = VALUES.borrow_mut();
+            if let Some(record) = values.get_mut(&key) {
+                let val = record.data;
+                if val.is_null() {
+                    continue;
+                }
+                record.data = ptr::null_mut();
+                drop(values);
+                dtor(val);
+                any_run = true;
+            }
+        }
+
+        if !any_run {
+            break;
+        }
+    }
+
+    // According to POSIX (issue 8): If even after
+    // [`PTHREAD_DESTRUCTOR_ITERATIONS`] iterations there are still some
+    // non-NULL values with associated destructors, the behaviour is
+    // implementation-defined. We can choose to stop calling them or continue
+    // calling them until none are left. Both musl and glibc choose to stop
+    // calling them so we do the same.
+}
diff --git a/recipes/core/relibc/src/header/pty/cbindgen.toml b/recipes/core/relibc/src/header/pty/cbindgen.toml
new file mode 100644
index 0000000000..3ecd31cfcf
--- /dev/null
+++ b/recipes/core/relibc/src/header/pty/cbindgen.toml
@@ -0,0 +1,13 @@
+sys_includes = ["sys/ioctl.h", "termios.h"]
+include_guard = "_RELIBC_PTY_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"winsize" = "struct winsize"
+"termios" = "struct termios"
\ No newline at end of file
diff --git a/recipes/core/relibc/src/header/pty/linux.rs b/recipes/core/relibc/src/header/pty/linux.rs
new file mode 100644
index 0000000000..020e336915
--- /dev/null
+++ b/recipes/core/relibc/src/header/pty/linux.rs
@@ -0,0 +1,58 @@
+use core::ptr;
+
+use crate::{
+    header::{fcntl, sys_ioctl, unistd},
+    io::{Cursor, Write},
+    platform::types::{c_char, c_int, c_void},
+};
+
+pub(super) unsafe fn openpty(name: &mut [u8]) -> Result<(c_int, c_int), ()> {
+    //TODO: wrap in auto-close struct
+    let master = unsafe { fcntl::open(c"/dev/ptmx".as_ptr(), fcntl::O_RDWR | fcntl::O_NOCTTY, 0) };
+    if master < 0 {
+        return Err(());
+    }
+
+    let mut lock: c_int = 0;
+    if unsafe {
+        sys_ioctl::ioctl(
+            master,
+            sys_ioctl::TIOCSPTLCK,
+            ptr::from_mut::<c_int>(&mut lock).cast::<c_void>(),
+        )
+    } != 0
+    {
+        unistd::close(master);
+        return Err(());
+    }
+
+    let mut ptn: c_int = 0;
+    if unsafe {
+        sys_ioctl::ioctl(
+            master,
+            sys_ioctl::TIOCGPTN,
+            ptr::from_mut::<c_int>(&mut ptn).cast::<c_void>(),
+        )
+    } != 0
+    {
+        unistd::close(master);
+        return Err(());
+    }
+
+    let mut cursor = Cursor::new(name);
+    if let Ok(()) = write!(cursor, "/dev/pts/{}\0", ptn) {}; // TODO handle error
+
+    let slave = unsafe {
+        fcntl::open(
+            cursor.get_ref().as_ptr().cast::<c_char>(),
+            fcntl::O_RDWR | fcntl::O_NOCTTY,
+            0,
+        )
+    };
+    if slave < 0 {
+        unistd::close(master);
+        return Err(());
+    }
+
+    Ok((master, slave))
+}
diff --git a/recipes/core/relibc/src/header/pty/mod.rs b/recipes/core/relibc/src/header/pty/mod.rs
new file mode 100644
index 0000000000..19b2442221
--- /dev/null
+++ b/recipes/core/relibc/src/header/pty/mod.rs
@@ -0,0 +1,134 @@
+//! `pty.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/openpty.3.html>.
+
+use core::{mem, ptr, slice};
+
+use crate::{
+    header::{fcntl, limits, pthread, signal, sys_ioctl, sys_wait, termios, unistd, utmp},
+    platform::{
+        self,
+        types::{c_char, c_int, c_void},
+    },
+};
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+mod imp;
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+mod imp;
+
+/// See <https://www.man7.org/linux/man-pages/man3/openpty.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn openpty(
+    amaster: *mut c_int,
+    aslave: *mut c_int,
+    namep: *mut c_char,
+    termp: *const termios::termios,
+    winp: *const sys_ioctl::winsize,
+) -> c_int {
+    let mut tmp_name = [0; limits::PATH_MAX];
+    let name = if !namep.is_null() {
+        unsafe { slice::from_raw_parts_mut(namep.cast::<u8>(), limits::PATH_MAX) }
+    } else {
+        &mut tmp_name
+    };
+
+    let (master, slave) = match unsafe { imp::openpty(name) } {
+        Ok(ok) => ok,
+        Err(()) => return -1,
+    };
+
+    if !termp.is_null() {
+        unsafe { termios::tcsetattr(slave, termios::TCSANOW, termp) };
+    }
+
+    if !winp.is_null() {
+        unsafe { sys_ioctl::ioctl(slave, sys_ioctl::TIOCSWINSZ, winp as *mut c_void) };
+    }
+
+    unsafe { *amaster = master };
+    unsafe { *aslave = slave };
+
+    0
+}
+
+/// See <https://www.man7.org/linux/man-pages/man3/openpty.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn forkpty(
+    pm: *mut c_int,
+    name: *mut c_char,
+    tio: *const termios::termios,
+    ws: *const sys_ioctl::winsize,
+) -> c_int {
+    let mut m = 0;
+    let mut s = 0;
+    let mut ec = 0;
+    let mut p: [c_int; 2] = [0; 2];
+    let mut cs = 0;
+    let mut pid = -1;
+    let mut set = signal::sigset_t::default();
+    let mut oldset = signal::sigset_t::default();
+
+    if unsafe { openpty(&raw mut m, &raw mut s, name, tio, ws) } < 0 {
+        return -1;
+    }
+
+    unsafe { signal::sigfillset(&raw mut set) };
+    unsafe { signal::pthread_sigmask(signal::SIG_BLOCK, &raw const set, &raw mut oldset) };
+    unsafe { pthread::pthread_setcancelstate(pthread::PTHREAD_CANCEL_DISABLE, &raw mut cs) };
+
+    if unsafe { unistd::pipe2(p.as_mut_ptr(), fcntl::O_CLOEXEC) } != 0 {
+        unistd::close(s);
+    } else {
+        pid = unsafe { unistd::fork() };
+        if pid == 0 {
+            unistd::close(m);
+            unistd::close(p[0]);
+            if unsafe { utmp::login_tty(s) } != 0 {
+                unsafe {
+                    unistd::write(
+                        p[1],
+                        platform::ERRNO.as_ptr().cast(),
+                        mem::size_of_val(&platform::ERRNO),
+                    )
+                };
+                unistd::_exit(127);
+            }
+            unistd::close(p[1]);
+            unsafe { pthread::pthread_setcancelstate(cs, ptr::null_mut()) };
+            unsafe {
+                signal::pthread_sigmask(signal::SIG_SETMASK, &raw const oldset, ptr::null_mut())
+            };
+            return 0;
+        }
+
+        unistd::close(s);
+        unistd::close(p[1]);
+
+        if unsafe {
+            unistd::read(
+                p[0],
+                ptr::from_mut::<c_int>(&mut ec).cast::<c_void>(),
+                mem::size_of::<c_int>(),
+            )
+        } > 0
+        {
+            let mut status = 0;
+            unsafe { sys_wait::waitpid(pid, &raw mut status, 0) };
+            pid = -1;
+            platform::ERRNO.set(ec);
+        }
+        unistd::close(p[0]);
+    }
+    if pid > 0 {
+        unsafe { *pm = m };
+    } else {
+        unistd::close(m);
+    }
+    unsafe { pthread::pthread_setcancelstate(cs, ptr::null_mut()) };
+    unsafe { signal::pthread_sigmask(signal::SIG_SETMASK, &raw const oldset, ptr::null_mut()) };
+    pid
+}
diff --git a/recipes/core/relibc/src/header/pty/redox.rs b/recipes/core/relibc/src/header/pty/redox.rs
new file mode 100644
index 0000000000..a4fad5c608
--- /dev/null
+++ b/recipes/core/relibc/src/header/pty/redox.rs
@@ -0,0 +1,33 @@
+use crate::{
+    error::ResultExt,
+    header::{fcntl, unistd},
+    platform::{
+        Pal, Sys,
+        types::{c_char, c_int, ssize_t},
+    },
+};
+
+pub(super) unsafe fn openpty(name: &mut [u8]) -> Result<(c_int, c_int), ()> {
+    let master = unsafe { fcntl::open(c"/scheme/pty".as_ptr(), fcntl::O_RDWR, 0) };
+    if master < 0 {
+        return Err(());
+    }
+
+    // TODO: better error handling
+    let count = Sys::fpath(master, name)
+        .map(|u| u as ssize_t)
+        .or_minus_one_errno();
+    if count < 0 {
+        unistd::close(master);
+        return Err(());
+    }
+    name[count as usize] = 0;
+
+    let slave = unsafe { fcntl::open(name.as_ptr() as *const c_char, fcntl::O_RDWR, 0) };
+    if slave < 0 {
+        unistd::close(master);
+        return Err(());
+    }
+
+    Ok((master, slave))
+}
diff --git a/recipes/core/relibc/src/header/pwd/cbindgen.toml b/recipes/core/relibc/src/header/pwd/cbindgen.toml
new file mode 100644
index 0000000000..92e53b6f90
--- /dev/null
+++ b/recipes/core/relibc/src/header/pwd/cbindgen.toml
@@ -0,0 +1,13 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/pwd.h.html
+#
+# Spec quotations relating to includes:
+# - "The <pwd.h> header shall define the gid_t, uid_t, and size_t types as described in <sys/types.h>."
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_PWD_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/pwd/linux.rs b/recipes/core/relibc/src/header/pwd/linux.rs
new file mode 100644
index 0000000000..70e1fb1221
--- /dev/null
+++ b/recipes/core/relibc/src/header/pwd/linux.rs
@@ -0,0 +1,15 @@
+use super::{parsed, passwd};
+use crate::platform::types::c_char;
+
+pub fn split(line: &mut [u8]) -> Option<passwd> {
+    let mut parts = line.split_mut(|&c| c == b'\0');
+    Some(passwd {
+        pw_name: parts.next()?.as_mut_ptr().cast::<c_char>(),
+        pw_passwd: parts.next()?.as_mut_ptr().cast::<c_char>(),
+        pw_uid: parsed(parts.next())?,
+        pw_gid: parsed(parts.next())?,
+        pw_gecos: parts.next()?.as_mut_ptr().cast::<c_char>(),
+        pw_dir: parts.next()?.as_mut_ptr().cast::<c_char>(),
+        pw_shell: parts.next()?.as_mut_ptr().cast::<c_char>(),
+    })
+}
diff --git a/recipes/core/relibc/src/header/pwd/mod.rs b/recipes/core/relibc/src/header/pwd/mod.rs
new file mode 100644
index 0000000000..e581a74ba0
--- /dev/null
+++ b/recipes/core/relibc/src/header/pwd/mod.rs
@@ -0,0 +1,330 @@
+//! `pwd.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/pwd.h.html>.
+
+use alloc::{boxed::Box, vec::Vec};
+use core::{
+    ops::{Deref, DerefMut},
+    pin::Pin,
+    ptr,
+};
+
+use crate::{
+    fs::File,
+    header::{errno, fcntl, string::strcmp},
+    io::{BufReader, SeekFrom, prelude::*},
+    platform::{
+        self,
+        types::{c_char, c_int, gid_t, size_t, uid_t},
+    },
+    raw_cell::RawCell,
+};
+
+#[cfg(target_os = "linux")]
+mod linux;
+#[cfg(target_os = "redox")]
+mod redox;
+
+#[cfg(target_os = "linux")]
+use self::linux as sys;
+#[cfg(target_os = "redox")]
+use self::redox as sys;
+
+#[cfg(target_os = "linux")]
+const SEPARATOR: u8 = b':';
+
+#[cfg(target_os = "redox")]
+const SEPARATOR: u8 = b';';
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/pwd.h.html>
+/// for POSIX minimum requirements, and
+/// <https://www.man7.org/linux/man-pages/man3/getpwnam.3.html> for further
+/// details.
+#[repr(C)]
+#[derive(Debug)]
+pub struct passwd {
+    pub pw_name: *mut c_char,
+    pub pw_passwd: *mut c_char,
+    pub pw_uid: uid_t,
+    pub pw_gid: gid_t,
+    pub pw_gecos: *mut c_char,
+    pub pw_dir: *mut c_char,
+    pub pw_shell: *mut c_char,
+}
+
+static mut PASSWD_BUF: Option<MaybeAllocated> = None;
+static PASSWD: RawCell<passwd> = RawCell::new(passwd {
+    pw_name: ptr::null_mut(),
+    pw_passwd: ptr::null_mut(),
+    pw_uid: 0,
+    pw_gid: 0,
+    pw_gecos: ptr::null_mut(),
+    pw_dir: ptr::null_mut(),
+    pw_shell: ptr::null_mut(),
+});
+
+#[derive(Clone, Copy, Debug)]
+struct DestBuffer {
+    ptr: *mut u8,
+    len: usize,
+}
+
+#[derive(Debug)]
+enum MaybeAllocated {
+    Owned(Pin<Box<[u8]>>),
+    Borrowed(DestBuffer),
+}
+impl Deref for MaybeAllocated {
+    type Target = [u8];
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            MaybeAllocated::Owned(boxed) => boxed,
+            MaybeAllocated::Borrowed(dst) => unsafe {
+                core::slice::from_raw_parts(dst.ptr, dst.len)
+            },
+        }
+    }
+}
+impl DerefMut for MaybeAllocated {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            MaybeAllocated::Owned(boxed) => boxed,
+            MaybeAllocated::Borrowed(dst) => unsafe {
+                core::slice::from_raw_parts_mut(dst.ptr, dst.len)
+            },
+        }
+    }
+}
+
+#[derive(Debug)]
+struct OwnedPwd {
+    buffer: MaybeAllocated,
+    reference: passwd,
+}
+
+impl OwnedPwd {
+    fn into_global(self) -> *mut passwd {
+        unsafe {
+            PASSWD_BUF = Some(self.buffer);
+            PASSWD.unsafe_set(self.reference);
+            PASSWD.as_mut_ptr()
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+enum Cause {
+    Eof,
+    Other,
+}
+
+static READER: RawCell<Option<BufReader<File>>> = RawCell::new(None);
+
+fn parsed<I, O>(buf: Option<I>) -> Option<O>
+where
+    I: core::borrow::Borrow<[u8]>,
+    O: core::str::FromStr,
+{
+    let buf = buf?;
+    let string = core::str::from_utf8(buf.borrow()).ok()?;
+    string.parse().ok()
+}
+
+/// See <https://www.man7.org/linux/man-pages/man3/getpwent_r.3.html>.
+///
+/// Non-POSIX
+fn getpwent_r(
+    reader: &mut BufReader<File>,
+    destination: Option<DestBuffer>,
+) -> Result<OwnedPwd, Cause> {
+    let mut buf = Vec::new();
+    if reader
+        .read_until(b'\n', &mut buf)
+        .map_err(|_| Cause::Other)?
+        == 0
+    {
+        return Err(Cause::Eof);
+    }
+
+    // Replace all occurences of seperator with terminating NUL byte
+    let mut start = 0;
+    while let Some(i) = memchr::memchr(SEPARATOR, &buf[start..]) {
+        buf[start + i] = 0;
+        start += i + 1;
+    }
+
+    // Place terminating NUL byte at the end, replace newline
+    let last = buf.last_mut();
+    if last == Some(&mut b'\n') {
+        *last.unwrap() = 0;
+    } else {
+        buf.push(0);
+    }
+
+    let mut buf = match destination {
+        None => MaybeAllocated::Owned(Box::into_pin(buf.into_boxed_slice())),
+        Some(dst) => {
+            let mut new = MaybeAllocated::Borrowed(dst);
+            if new.len() < buf.len() {
+                platform::ERRNO.set(errno::ERANGE);
+                return Err(Cause::Other);
+            }
+            new[..buf.len()].copy_from_slice(&buf);
+            new
+        }
+    };
+
+    // Chop up the result into a valid structure
+    let passwd = sys::split(&mut buf).ok_or(Cause::Other)?;
+
+    Ok(OwnedPwd {
+        buffer: buf,
+        reference: passwd,
+    })
+}
+
+fn pwd_lookup<F>(mut matches: F, destination: Option<DestBuffer>) -> Result<OwnedPwd, Cause>
+where
+    F: FnMut(&passwd) -> bool,
+{
+    let file = match File::open(c"/etc/passwd".into(), fcntl::O_RDONLY) {
+        Ok(file) => file,
+        Err(_) => return Err(Cause::Other),
+    };
+
+    let mut reader = BufReader::new(file);
+
+    loop {
+        let entry = getpwent_r(&mut reader, destination)?;
+
+        if matches(&entry.reference) {
+            return Ok(entry);
+        }
+    }
+}
+
+unsafe fn mux(
+    status: Result<OwnedPwd, Cause>,
+    out: *mut passwd,
+    result: *mut *mut passwd,
+) -> c_int {
+    match status {
+        Ok(owned) => {
+            unsafe { *out = owned.reference };
+            unsafe { *result = out };
+            0
+        }
+        Err(Cause::Eof) => {
+            unsafe { *result = ptr::null_mut() };
+            0
+        }
+        Err(Cause::Other) => {
+            unsafe { *result = ptr::null_mut() };
+            -1
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endpwent.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn endpwent() {
+    unsafe {
+        READER.unsafe_set(None);
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endpwent.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getpwent() -> *mut passwd {
+    let reader = match unsafe { &mut *READER.as_mut_ptr() } {
+        Some(reader) => reader,
+        None => {
+            let file = match File::open(c"/etc/passwd".into(), fcntl::O_RDONLY) {
+                Ok(file) => file,
+                Err(_) => return ptr::null_mut(),
+            };
+            let reader = BufReader::new(file);
+            unsafe {
+                READER.unsafe_set(Some(reader));
+                READER.unsafe_mut().as_mut().unwrap()
+            }
+        }
+    };
+    getpwent_r(reader, None)
+        .map(|res| res.into_global())
+        .unwrap_or(ptr::null_mut())
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getpwnam.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getpwnam(name: *const c_char) -> *mut passwd {
+    pwd_lookup(|parts| unsafe { strcmp(parts.pw_name, name) } == 0, None)
+        .map(|res| res.into_global())
+        .unwrap_or(ptr::null_mut())
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getpwnam.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getpwnam_r(
+    name: *const c_char,
+    out: *mut passwd,
+    buf: *mut c_char,
+    size: size_t,
+    result: *mut *mut passwd,
+) -> c_int {
+    unsafe {
+        mux(
+            pwd_lookup(
+                |parts| strcmp(parts.pw_name, name) == 0,
+                Some(DestBuffer {
+                    ptr: buf.cast::<u8>(),
+                    len: size,
+                }),
+            ),
+            out,
+            result,
+        )
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getpwuid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getpwuid(uid: uid_t) -> *mut passwd {
+    pwd_lookup(|parts| parts.pw_uid == uid, None)
+        .map(|res| res.into_global())
+        .unwrap_or(ptr::null_mut())
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getpwuid.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getpwuid_r(
+    uid: uid_t,
+    out: *mut passwd,
+    buf: *mut c_char,
+    size: size_t,
+    result: *mut *mut passwd,
+) -> c_int {
+    let slice = unsafe { core::slice::from_raw_parts_mut(buf.cast::<u8>(), size) };
+    unsafe {
+        mux(
+            pwd_lookup(
+                |part| part.pw_uid == uid,
+                Some(DestBuffer {
+                    ptr: buf.cast::<u8>(),
+                    len: size,
+                }),
+            ),
+            out,
+            result,
+        )
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/endpwent.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setpwent() {
+    if let Some(reader) = unsafe { &mut *READER.as_mut_ptr() } {
+        let _ = reader.seek(SeekFrom::Start(0));
+    }
+}
diff --git a/recipes/core/relibc/src/header/pwd/redox.rs b/recipes/core/relibc/src/header/pwd/redox.rs
new file mode 100644
index 0000000000..8b3d723907
--- /dev/null
+++ b/recipes/core/relibc/src/header/pwd/redox.rs
@@ -0,0 +1,15 @@
+use super::{parsed, passwd};
+use crate::platform::types::c_char;
+
+pub fn split(line: &mut [u8]) -> Option<passwd> {
+    let mut parts = line.split_mut(|&c| c == b'\0');
+    Some(passwd {
+        pw_name: parts.next()?.as_mut_ptr().cast::<c_char>(),
+        pw_passwd: c"x".as_ptr() as *const c_char as *mut c_char,
+        pw_uid: parsed(parts.next())?,
+        pw_gid: parsed(parts.next())?,
+        pw_gecos: parts.next()?.as_mut_ptr().cast::<c_char>(),
+        pw_dir: parts.next()?.as_mut_ptr().cast::<c_char>(),
+        pw_shell: parts.next()?.as_mut_ptr().cast::<c_char>(),
+    })
+}
diff --git a/recipes/core/relibc/src/header/regex/cbindgen.toml b/recipes/core/relibc/src/header/regex/cbindgen.toml
new file mode 100644
index 0000000000..fa1c711c04
--- /dev/null
+++ b/recipes/core/relibc/src/header/regex/cbindgen.toml
@@ -0,0 +1,13 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/regex.h.html
+#
+# Spec quotations relating to includes:
+# - "The <regex.h> header shall define the size_t type as described in <sys/types.h>."
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_REGEX_H"
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/regex/mod.rs b/recipes/core/relibc/src/header/regex/mod.rs
new file mode 100644
index 0000000000..1b8da49041
--- /dev/null
+++ b/recipes/core/relibc/src/header/regex/mod.rs
@@ -0,0 +1,172 @@
+//! `regex.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/regex.h.html>.
+
+use crate::{
+    header::string::strlen,
+    platform::types::{c_char, c_int, c_void, size_t},
+};
+use alloc::{borrow::Cow, boxed::Box};
+use core::{ptr, slice};
+use posix_regex::{PosixRegex, PosixRegexBuilder, compile::Error as CompileError, tree::Tree};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/regex.h.html>.
+pub type regoff_t = size_t;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/regex.h.html>.
+#[repr(C)]
+pub struct regex_t {
+    // Points to a posix_regex::Tree
+    ptr: *mut c_void,
+    cflags: c_int,
+    re_nsub: size_t,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/regex.h.html>.
+#[repr(C)]
+pub struct regmatch_t {
+    rm_so: regoff_t,
+    rm_eo: regoff_t,
+}
+
+pub const REG_EXTENDED: c_int = 1;
+pub const REG_ICASE: c_int = 2;
+pub const REG_NOSUB: c_int = 4;
+pub const REG_NEWLINE: c_int = 8;
+pub const REG_NOTBOL: c_int = 16;
+pub const REG_NOTEOL: c_int = 32;
+pub const REG_MINIMAL: c_int = 64;
+
+pub const REG_NOMATCH: c_int = 1;
+pub const REG_BADPAT: c_int = 2;
+pub const REG_ECOLLATE: c_int = 3;
+pub const REG_ECTYPE: c_int = 4;
+pub const REG_EESCAPE: c_int = 5;
+pub const REG_ESUBREG: c_int = 6;
+pub const REG_EBRACK: c_int = 7;
+pub const REG_ENOSYS: c_int = 8;
+pub const REG_EPAREN: c_int = 9;
+pub const REG_EBRACE: c_int = 10;
+pub const REG_BADBR: c_int = 11;
+pub const REG_ERANGE: c_int = 12;
+pub const REG_ESPACE: c_int = 13;
+pub const REG_BADRPT: c_int = 14;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/regcomp.html>.
+#[unsafe(no_mangle)]
+#[linkage = "weak"] // redefined in GIT
+pub unsafe extern "C" fn regcomp(out: *mut regex_t, pat: *const c_char, cflags: c_int) -> c_int {
+    let pat = unsafe { slice::from_raw_parts(pat.cast::<u8>(), strlen(pat)) };
+    let res = PosixRegexBuilder::new(pat)
+        .with_default_classes()
+        .extended(cflags & REG_EXTENDED == REG_EXTENDED)
+        .compile_tokens();
+
+    match res {
+        Ok(branches) => {
+            let re_nsub = PosixRegex::new(Cow::Borrowed(&branches)).count_groups();
+            unsafe {
+                *out = regex_t {
+                    ptr: Box::into_raw(Box::new(branches)).cast::<c_void>(),
+
+                    cflags,
+                    re_nsub,
+                }
+            };
+            0
+        }
+        Err(CompileError::EmptyRepetition)
+        | Err(CompileError::IntegerOverflow)
+        | Err(CompileError::IllegalRange) => REG_BADBR,
+        Err(CompileError::UnclosedRepetition) => REG_EBRACE,
+        Err(CompileError::LeadingRepetition) => REG_BADRPT,
+        Err(CompileError::UnknownCollation) => REG_ECOLLATE,
+        Err(CompileError::UnknownClass(_)) => REG_ECTYPE,
+        Err(_) => REG_BADPAT,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/regfree.html>.
+#[unsafe(no_mangle)]
+#[linkage = "weak"] // redefined in GIT
+pub unsafe extern "C" fn regfree(regex: *mut regex_t) {
+    unsafe { drop(Box::from_raw((*regex).ptr)) };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/regexec.html>.
+#[unsafe(no_mangle)]
+#[linkage = "weak"] // redefined in GIT
+pub unsafe extern "C" fn regexec(
+    regex: *const regex_t,
+    input: *const c_char,
+    nmatch: size_t,
+    pmatch: *mut regmatch_t,
+    eflags: c_int,
+) -> c_int {
+    let regex = unsafe { &*regex };
+
+    // Allow specifying a compiler argument to the executor and viceversa
+    // because why not?
+    let flags = regex.cflags | eflags;
+
+    let input = unsafe { slice::from_raw_parts(input.cast::<u8>(), strlen(input)) };
+    let branches = unsafe { &*(regex.ptr.cast::<Tree>()) };
+
+    let matches = PosixRegex::new(Cow::Borrowed(branches))
+        .case_insensitive(flags & REG_ICASE == REG_ICASE)
+        .newline(flags & REG_NEWLINE == REG_NEWLINE)
+        .no_start(flags & REG_NOTBOL == REG_NOTBOL)
+        .no_end(flags & REG_NOTEOL == REG_NOTEOL)
+        .matches(input, Some(1));
+
+    if !matches.is_empty() && eflags & REG_NOSUB != REG_NOSUB && !pmatch.is_null() && nmatch > 0 {
+        let first = &matches[0];
+
+        for i in 0..nmatch {
+            let (start, end) = first.get(i).and_then(|&range| range).unwrap_or((!0, !0));
+            unsafe {
+                *pmatch.add(i) = regmatch_t {
+                    rm_so: start,
+                    rm_eo: end,
+                }
+            };
+        }
+    }
+
+    if matches.is_empty() { REG_NOMATCH } else { 0 }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/regerror.html>.
+#[unsafe(no_mangle)]
+#[linkage = "weak"] // redefined in GIT
+pub extern "C" fn regerror(
+    code: c_int,
+    _regex: *const regex_t,
+    out: *mut c_char,
+    max: size_t,
+) -> size_t {
+    let string = match code {
+        0 => "No error\0",
+        REG_NOMATCH => "No match\0",
+        REG_BADPAT => "Invalid regexp\0",
+        REG_ECOLLATE => "Unknown collating element\0",
+        REG_ECTYPE => "Unknown character class name\0",
+        REG_EESCAPE => "Trailing backslash\0",
+        REG_ESUBREG => "Invalid back reference\0",
+        REG_EBRACK => "Missing ']'\0",
+        REG_ENOSYS => "Unsupported operation\0",
+        REG_EPAREN => "Missing ')'\0",
+        REG_EBRACE => "Missing '}'\0",
+        REG_BADBR => "Invalid contents of {}\0",
+        REG_ERANGE => "Invalid character range\0",
+        REG_ESPACE => "Out of memory\0",
+        REG_BADRPT => "Repetition not preceded by valid expression\0",
+        _ => "Unknown error\0",
+    };
+
+    unsafe {
+        ptr::copy_nonoverlapping(string.as_ptr(), out.cast::<u8>(), string.len().min(max));
+    }
+
+    string.len()
+}
diff --git a/recipes/core/relibc/src/header/sched/cbindgen.toml b/recipes/core/relibc/src/header/sched/cbindgen.toml
new file mode 100644
index 0000000000..b361fa4531
--- /dev/null
+++ b/recipes/core/relibc/src/header/sched/cbindgen.toml
@@ -0,0 +1,22 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sched.h.html
+#
+# Spec quotations relating to includes:
+# - "[PS] The <sched.h> header shall define the pid_t type as described in <sys/types.h>."
+# - "[SS|TSP] The <sched.h> header shall define the time_t type as described in <sys/types.h>."
+# - "The <sched.h> header shall define the timespec structure as described in <time.h>."
+# - "Inclusion of the <sched.h> header may make visible all symbols from the <time.h> header."
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_SCHED_H"
+after_includes = """
+#include <bits/timespec.h> // for timespec
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"timespec" = "struct timespec"
diff --git a/recipes/core/relibc/src/header/sched/mod.rs b/recipes/core/relibc/src/header/sched/mod.rs
new file mode 100644
index 0000000000..bcdd34696c
--- /dev/null
+++ b/recipes/core/relibc/src/header/sched/mod.rs
@@ -0,0 +1,76 @@
+//! `sched.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sched.h.html>.
+
+use crate::{
+    error::ResultExt,
+    header::bits_timespec::timespec,
+    platform::{
+        Pal, Sys,
+        types::{c_int, pid_t},
+    },
+};
+
+// TODO: There are extensions, but adding more member is breaking ABI for pthread_attr_t
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sched.h.html>.
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct sched_param {
+    pub sched_priority: c_int,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sched.h.html>.
+pub const SCHED_FIFO: c_int = 0;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sched.h.html>.
+pub const SCHED_RR: c_int = 1;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sched.h.html>.
+pub const SCHED_OTHER: c_int = 2;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sched_get_priority_max.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn sched_get_priority_max(policy: c_int) -> c_int {
+    todo!()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sched_get_priority_max.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn sched_get_priority_min(policy: c_int) -> c_int {
+    todo!()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sched_getparam.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn sched_getparam(pid: pid_t, param: *mut sched_param) -> c_int {
+    todo!()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sched_rr_get_interval.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn sched_rr_get_interval(pid: pid_t, time: *const timespec) -> c_int {
+    todo!()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sched_setparam.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn sched_setparam(pid: pid_t, param: *const sched_param) -> c_int {
+    todo!()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sched_setscheduler.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn sched_setscheduler(
+    pid: pid_t,
+    policy: c_int,
+    param: *const sched_param,
+) -> c_int {
+    todo!()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sched_yield.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn sched_yield() -> c_int {
+    Sys::sched_yield().map(|()| 0).or_minus_one_errno()
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbindgen_stupid_struct_user_for_sched_param(_: sched_param) {}
diff --git a/recipes/core/relibc/src/header/semaphore/cbindgen.toml b/recipes/core/relibc/src/header/semaphore/cbindgen.toml
new file mode 100644
index 0000000000..be8f845c58
--- /dev/null
+++ b/recipes/core/relibc/src/header/semaphore/cbindgen.toml
@@ -0,0 +1,15 @@
+sys_includes = []
+include_guard = "_RELIBC_SEMAPHORE_H"
+after_includes = """
+#include <bits/timespec.h> // for timespec
+"""
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"timespec" = "struct timespec"
diff --git a/recipes/core/relibc/src/header/semaphore/mod.rs b/recipes/core/relibc/src/header/semaphore/mod.rs
new file mode 100644
index 0000000000..0ca2fa9ef1
--- /dev/null
+++ b/recipes/core/relibc/src/header/semaphore/mod.rs
@@ -0,0 +1,115 @@
+//! `semaphore.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/semaphore.h.html>.
+
+use crate::{
+    header::{
+        bits_timespec::timespec,
+        time::{CLOCK_MONOTONIC, CLOCK_REALTIME},
+    },
+    platform::types::{c_char, c_int, c_long, c_uint, clockid_t},
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/semaphore.h.html>.
+// TODO: Statically verify size and align
+#[repr(C)]
+#[derive(Clone, Copy)]
+pub union sem_t {
+    pub size: [c_char; 4],
+    pub align: c_long,
+}
+pub type RlctSempahore = crate::sync::Semaphore;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_close.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_close(sem: *mut sem_t) -> c_int {
+    todo!("named semaphores")
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_destroy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_destroy(sem: *mut sem_t) -> c_int {
+    unsafe { core::ptr::drop_in_place(sem.cast::<RlctSempahore>()) };
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_getvalue.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_getvalue(sem: *mut sem_t, sval: *mut c_int) -> c_int {
+    unsafe { sval.write(get(sem).value() as c_int) };
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_init.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_init(sem: *mut sem_t, _pshared: c_int, value: c_uint) -> c_int {
+    unsafe { sem.cast::<RlctSempahore>().write(RlctSempahore::new(value)) };
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_open.html>.
+// TODO: va_list
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_open(
+    name: *const c_char,
+    oflag: c_int, /* (va_list) value: c_uint */
+) -> *mut sem_t {
+    todo!("named semaphores")
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_post.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_post(sem: *mut sem_t) -> c_int {
+    unsafe { get(sem) }.post(1);
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_trywait.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_trywait(sem: *mut sem_t) -> c_int {
+    unsafe { get(sem) }.try_wait();
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_unlink.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_unlink(name: *const c_char) -> c_int {
+    todo!("named semaphores")
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_trywait.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_wait(sem: *mut sem_t) -> c_int {
+    if let Ok(()) = unsafe { get(sem) }.wait(None, CLOCK_MONOTONIC) {}; // TODO handle error
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_clockwait.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_clockwait(
+    sem: *mut sem_t,
+    clock_id: clockid_t,
+    abstime: *const timespec,
+) -> c_int {
+    if let Ok(()) = unsafe { get(sem) }.wait(Some(&unsafe { (*abstime).clone() }), clock_id) {}; // TODO handle error
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_timedwait.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sem_timedwait(sem: *mut sem_t, abstime: *const timespec) -> c_int {
+    if let Ok(()) = unsafe { get(sem) }.wait(Some(&unsafe { (*abstime).clone() }), CLOCK_REALTIME) {
+    }; // TODO handle error
+
+    0
+}
+
+unsafe fn get<'any>(sem: *mut sem_t) -> &'any RlctSempahore {
+    unsafe { &*sem.cast() }
+}
diff --git a/recipes/core/relibc/src/header/setjmp/impl/README.md b/recipes/core/relibc/src/header/setjmp/impl/README.md
new file mode 100644
index 0000000000..be1ebb9ee7
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/README.md
@@ -0,0 +1,6 @@
+# setjmp implementation
+
+All this code belongs to [musl libc](https://www.musl-libc.org/).
+They own it. All rights go to them.
+Huge thanks to them for doing this tedious per-arch assembly work!
+We will reuse this awesome effort :)
diff --git a/recipes/core/relibc/src/header/setjmp/impl/aarch64/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/aarch64/longjmp.s
new file mode 100644
index 0000000000..7c4655fa96
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/aarch64/longjmp.s
@@ -0,0 +1,24 @@
+.global _longjmp
+.global longjmp
+.type _longjmp,%function
+.type longjmp,%function
+_longjmp:
+longjmp:
+	// IHI0055B_aapcs64.pdf 5.1.1, 5.1.2 callee saved registers
+	ldp x19, x20, [x0,#0]
+	ldp x21, x22, [x0,#16]
+	ldp x23, x24, [x0,#32]
+	ldp x25, x26, [x0,#48]
+	ldp x27, x28, [x0,#64]
+	ldp x29, x30, [x0,#80]
+	ldr x2, [x0,#104]
+	mov sp, x2
+	ldp d8 , d9, [x0,#112]
+	ldp d10, d11, [x0,#128]
+	ldp d12, d13, [x0,#144]
+	ldp d14, d15, [x0,#160]
+
+	mov x0, x1
+	cbnz x1, 1f
+	mov x0, #1
+1:	br x30
diff --git a/recipes/core/relibc/src/header/setjmp/impl/aarch64/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/aarch64/setjmp.s
new file mode 100644
index 0000000000..f49288aa1c
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/aarch64/setjmp.s
@@ -0,0 +1,24 @@
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	// IHI0055B_aapcs64.pdf 5.1.1, 5.1.2 callee saved registers
+	stp x19, x20, [x0,#0]
+	stp x21, x22, [x0,#16]
+	stp x23, x24, [x0,#32]
+	stp x25, x26, [x0,#48]
+	stp x27, x28, [x0,#64]
+	stp x29, x30, [x0,#80]
+	mov x2, sp
+	str x2, [x0,#104]
+	stp  d8,  d9, [x0,#112]
+	stp d10, d11, [x0,#128]
+	stp d12, d13, [x0,#144]
+	stp d14, d15, [x0,#160]
+	mov x0, #0
+	ret
diff --git a/recipes/core/relibc/src/header/setjmp/impl/aarch64/sigsetjmp.s b/recipes/core/relibc/src/header/setjmp/impl/aarch64/sigsetjmp.s
new file mode 100644
index 0000000000..75910c4321
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/aarch64/sigsetjmp.s
@@ -0,0 +1,21 @@
+.global sigsetjmp
+.global __sigsetjmp
+.type sigsetjmp,%function
+.type __sigsetjmp,%function
+sigsetjmp:
+__sigsetjmp:
+	cbz x1,setjmp
+
+	str x30,[x0,#176]
+	str x19,[x0,#176+8+8]
+	mov x19,x0
+
+	bl setjmp
+
+	mov w1,w0
+	mov x0,x19
+	ldr x30,[x0,#176]
+	ldr x19,[x0,#176+8+8]
+
+.hidden __sigsetjmp_tail
+	b __sigsetjmp_tail
diff --git a/recipes/core/relibc/src/header/setjmp/impl/arm/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/arm/longjmp.s
new file mode 100644
index 0000000000..76cc2920a3
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/arm/longjmp.s
@@ -0,0 +1,43 @@
+.syntax unified
+.global _longjmp
+.global longjmp
+.type _longjmp,%function
+.type longjmp,%function
+_longjmp:
+longjmp:
+	mov ip,r0
+	movs r0,r1
+	moveq r0,#1
+	ldmia ip!, {v1,v2,v3,v4,v5,v6,sl,fp}
+	ldmia ip!, {r2,lr}
+	mov sp,r2
+
+	adr r1,1f
+	ldr r2,1f
+	ldr r1,[r1,r2]
+
+	tst r1,#0x260
+	beq 3f
+	tst r1,#0x20
+	beq 2f
+	ldc p2, cr4, [ip], #48
+2:	tst r1,#0x40
+	beq 2f
+	.fpu vfp
+	vldmia ip!, {d8-d15}
+	.fpu softvfp
+	.eabi_attribute 10, 0
+	.eabi_attribute 27, 0
+2:	tst r1,#0x200
+	beq 3f
+	ldcl p1, cr10, [ip], #8
+	ldcl p1, cr11, [ip], #8
+	ldcl p1, cr12, [ip], #8
+	ldcl p1, cr13, [ip], #8
+	ldcl p1, cr14, [ip], #8
+	ldcl p1, cr15, [ip], #8
+3:	bx lr
+
+.hidden __hwcap
+.align 2
+1:	.word __hwcap-1b
diff --git a/recipes/core/relibc/src/header/setjmp/impl/arm/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/arm/setjmp.s
new file mode 100644
index 0000000000..011315b70f
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/arm/setjmp.s
@@ -0,0 +1,45 @@
+.syntax unified
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,%function
+.type _setjmp,%function
+.type setjmp,%function
+__setjmp:
+_setjmp:
+setjmp:
+	mov ip,r0
+	stmia ip!,{v1,v2,v3,v4,v5,v6,sl,fp}
+	mov r2,sp
+	stmia ip!,{r2,lr}
+	mov r0,#0
+
+	adr r1,1f
+	ldr r2,1f
+	ldr r1,[r1,r2]
+
+	tst r1,#0x260
+	beq 3f
+	tst r1,#0x20
+	beq 2f
+	stc p2, cr4, [ip], #48
+2:	tst r1,#0x40
+	beq 2f
+	.fpu vfp
+	vstmia ip!, {d8-d15}
+	.fpu softvfp
+	.eabi_attribute 10, 0
+	.eabi_attribute 27, 0
+2:	tst r1,#0x200
+	beq 3f
+	stcl p1, cr10, [ip], #8
+	stcl p1, cr11, [ip], #8
+	stcl p1, cr12, [ip], #8
+	stcl p1, cr13, [ip], #8
+	stcl p1, cr14, [ip], #8
+	stcl p1, cr15, [ip], #8
+3:	bx lr
+
+.hidden __hwcap
+.align 2
+1:	.word __hwcap-1b
diff --git a/recipes/core/relibc/src/header/setjmp/impl/i386/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/i386/longjmp.s
new file mode 100644
index 0000000000..a2378b9fc3
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/i386/longjmp.s
@@ -0,0 +1,16 @@
+.global _longjmp
+.global longjmp
+.type _longjmp,@function
+.type longjmp,@function
+_longjmp:
+longjmp:
+	mov edx, [esp + 4]
+	mov eax, [esp + 8]
+	cmp eax, 1
+	adc al, 0
+	mov ebx, [edx]
+	mov esi, [edx + 4]
+	mov edi, [edx + 8]
+	mov ebp, [edx + 12]
+	mov esp, [edx + 16]
+	jmp [edx + 20]
diff --git a/recipes/core/relibc/src/header/setjmp/impl/i386/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/i386/setjmp.s
new file mode 100644
index 0000000000..03678fdf41
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/i386/setjmp.s
@@ -0,0 +1,23 @@
+.global ___setjmp
+.hidden ___setjmp
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+	mov eax, [esp + 4]
+	mov [eax], ebx
+	mov [eax + 4], esi
+	mov [eax + 8], edi
+	mov [eax + 12], ebp
+	lea ecx, [esp + 4]
+	mov [eax + 16], ecx
+	mov ecx, [esp]
+	mov [eax + 20], ecx
+	xor eax, eax
+	ret
diff --git a/recipes/core/relibc/src/header/setjmp/impl/i386/sigsetjmp.s b/recipes/core/relibc/src/header/setjmp/impl/i386/sigsetjmp.s
new file mode 100644
index 0000000000..e1be3b444f
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/i386/sigsetjmp.s
@@ -0,0 +1,26 @@
+.global sigsetjmp
+.global __sigsetjmp
+.type sigsetjmp,@function
+.type __sigsetjmp,@function
+sigsetjmp:
+__sigsetjmp:
+	mov ecx, dword ptr [esp + 8]
+	jecxz 1f
+
+	mov eax, dword ptr [esp + 4]
+	pop [eax + 24]
+	mov dword ptr [eax + 8 + 28], ebx
+	mov ebx, eax
+
+.hidden ___setjmp
+	call ___setjmp
+
+	push [ebx + 24]
+	mov dword ptr [esp + 4], ebx
+	mov dword ptr [esp + 8], eax
+	mov ebx, dword ptr [ebx + 8 + 28]
+
+.hidden __sigsetjmp_tail
+	jmp __sigsetjmp_tail
+
+1:	jmp ___setjmp
diff --git a/recipes/core/relibc/src/header/setjmp/impl/m68k/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/m68k/longjmp.s
new file mode 100644
index 0000000000..cdb05fb5a6
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/m68k/longjmp.s
@@ -0,0 +1,14 @@
+.global _longjmp
+.global longjmp
+.type _longjmp,@function
+.type longjmp,@function
+_longjmp:
+longjmp:
+	movea.l 4(%sp),%a0
+	move.l 8(%sp),%d0
+	bne 1f
+	move.l #1,%d0
+1:	movem.l (%a0),%d2-%d7/%a2-%a7
+	fmovem.x 52(%a0),%fp2-%fp7
+	move.l 48(%a0),(%sp)
+	rts
diff --git a/recipes/core/relibc/src/header/setjmp/impl/m68k/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/m68k/setjmp.s
new file mode 100644
index 0000000000..15e549b0ef
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/m68k/setjmp.s
@@ -0,0 +1,18 @@
+.global ___setjmp
+.hidden ___setjmp
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+	movea.l 4(%sp),%a0
+	movem.l %d2-%d7/%a2-%a7,(%a0)
+	move.l (%sp),48(%a0)
+	fmovem.x %fp2-%fp7,52(%a0)
+	clr.l %d0
+	rts
diff --git a/recipes/core/relibc/src/header/setjmp/impl/microblaze/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/microblaze/longjmp.s
new file mode 100644
index 0000000000..c0760288a7
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/microblaze/longjmp.s
@@ -0,0 +1,29 @@
+.global _longjmp
+.global longjmp
+.type   _longjmp,@function
+.type   longjmp,@function
+_longjmp:
+longjmp:
+	addi    r3, r6, 0
+	bnei    r3, 1f
+	addi    r3, r3, 1
+1:      lwi     r1,  r5, 0
+	lwi     r15, r5, 4
+	lwi     r2,  r5, 8
+	lwi     r13, r5, 12
+	lwi     r18, r5, 16
+	lwi     r19, r5, 20
+	lwi     r20, r5, 24
+	lwi     r21, r5, 28
+	lwi     r22, r5, 32
+	lwi     r23, r5, 36
+	lwi     r24, r5, 40
+	lwi     r25, r5, 44
+	lwi     r26, r5, 48
+	lwi     r27, r5, 52
+	lwi     r28, r5, 56
+	lwi     r29, r5, 60
+	lwi     r30, r5, 64
+	lwi     r31, r5, 68
+	rtsd    r15, 8
+	nop
diff --git a/recipes/core/relibc/src/header/setjmp/impl/microblaze/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/microblaze/setjmp.s
new file mode 100644
index 0000000000..605ab20e4b
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/microblaze/setjmp.s
@@ -0,0 +1,32 @@
+.global ___setjmp
+.hidden ___setjmp
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+	swi     r1,  r5, 0
+	swi     r15, r5, 4
+	swi     r2,  r5, 8
+	swi     r13, r5, 12
+	swi     r18, r5, 16
+	swi     r19, r5, 20
+	swi     r20, r5, 24
+	swi     r21, r5, 28
+	swi     r22, r5, 32
+	swi     r23, r5, 36
+	swi     r24, r5, 40
+	swi     r25, r5, 44
+	swi     r26, r5, 48
+	swi     r27, r5, 52
+	swi     r28, r5, 56
+	swi     r29, r5, 60
+	swi     r30, r5, 64
+	swi     r31, r5, 68
+	rtsd    r15, 8
+	ori     r3, r0, 0
diff --git a/recipes/core/relibc/src/header/setjmp/impl/mips/longjmp.S b/recipes/core/relibc/src/header/setjmp/impl/mips/longjmp.S
new file mode 100644
index 0000000000..fdb6c95d25
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/mips/longjmp.S
@@ -0,0 +1,40 @@
+.set noreorder
+
+.global _longjmp
+.global longjmp
+.type   _longjmp,@function
+.type   longjmp,@function
+_longjmp:
+longjmp:
+	move    $2, $5
+	bne     $2, $0, 1f
+	nop
+	addu    $2, $2, 1
+1:
+#ifndef __mips_soft_float
+	lwc1    $20, 56($4)
+	lwc1    $21, 60($4)
+	lwc1    $22, 64($4)
+	lwc1    $23, 68($4)
+	lwc1    $24, 72($4)
+	lwc1    $25, 76($4)
+	lwc1    $26, 80($4)
+	lwc1    $27, 84($4)
+	lwc1    $28, 88($4)
+	lwc1    $29, 92($4)
+	lwc1    $30, 96($4)
+	lwc1    $31, 100($4)
+#endif
+	lw      $ra,  0($4)
+	lw      $sp,  4($4)
+	lw      $16,  8($4)
+	lw      $17, 12($4)
+	lw      $18, 16($4)
+	lw      $19, 20($4)
+	lw      $20, 24($4)
+	lw      $21, 28($4)
+	lw      $22, 32($4)
+	lw      $23, 36($4)
+	lw      $30, 40($4)
+	jr      $ra
+	lw      $28, 44($4)
diff --git a/recipes/core/relibc/src/header/setjmp/impl/mips/setjmp.S b/recipes/core/relibc/src/header/setjmp/impl/mips/setjmp.S
new file mode 100644
index 0000000000..501d5264e6
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/mips/setjmp.S
@@ -0,0 +1,39 @@
+.set noreorder
+
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type   __setjmp,@function
+.type   _setjmp,@function
+.type   setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	sw      $ra,  0($4)
+	sw      $sp,  4($4)
+	sw      $16,  8($4)
+	sw      $17, 12($4)
+	sw      $18, 16($4)
+	sw      $19, 20($4)
+	sw      $20, 24($4)
+	sw      $21, 28($4)
+	sw      $22, 32($4)
+	sw      $23, 36($4)
+	sw      $30, 40($4)
+	sw      $28, 44($4)
+#ifndef __mips_soft_float
+	swc1    $20, 56($4)
+	swc1    $21, 60($4)
+	swc1    $22, 64($4)
+	swc1    $23, 68($4)
+	swc1    $24, 72($4)
+	swc1    $25, 76($4)
+	swc1    $26, 80($4)
+	swc1    $27, 84($4)
+	swc1    $28, 88($4)
+	swc1    $29, 92($4)
+	swc1    $30, 96($4)
+	swc1    $31, 100($4)
+#endif
+	jr      $ra
+	li      $2, 0
diff --git a/recipes/core/relibc/src/header/setjmp/impl/mips64/longjmp.S b/recipes/core/relibc/src/header/setjmp/impl/mips64/longjmp.S
new file mode 100644
index 0000000000..3db8a883c6
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/mips64/longjmp.S
@@ -0,0 +1,37 @@
+.set	noreorder
+.global	_longjmp
+.global	longjmp
+.type	_longjmp,@function
+.type	longjmp,@function
+_longjmp:
+longjmp:
+	move	$2, $5
+
+	bne	$2, $0, 1f
+	nop
+	daddu	$2, $2, 1
+1:
+#ifndef __mips_soft_float
+	ldc1	$24, 96($4)
+	ldc1	$25, 104($4)
+	ldc1	$26, 112($4)
+	ldc1	$27, 120($4)
+	ldc1	$28, 128($4)
+	ldc1	$29, 136($4)
+	ldc1	$30, 144($4)
+	ldc1	$31, 152($4)
+#endif
+	ld	$ra, 0($4)
+	ld	$sp, 8($4)
+	ld	$gp, 16($4)
+	ld	$16, 24($4)
+	ld	$17, 32($4)
+	ld	$18, 40($4)
+	ld	$19, 48($4)
+	ld	$20, 56($4)
+	ld	$21, 64($4)
+	ld	$22, 72($4)
+	ld	$23, 80($4)
+	ld	$30, 88($4)
+	jr	$ra
+	nop
diff --git a/recipes/core/relibc/src/header/setjmp/impl/mips64/setjmp.S b/recipes/core/relibc/src/header/setjmp/impl/mips64/setjmp.S
new file mode 100644
index 0000000000..b9646c2abe
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/mips64/setjmp.S
@@ -0,0 +1,34 @@
+.set	noreorder
+.global	__setjmp
+.global	_setjmp
+.global	setjmp
+.type	__setjmp,@function
+.type	_setjmp,@function
+.type	setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	sd	$ra, 0($4)
+	sd	$sp, 8($4)
+	sd	$gp, 16($4)
+	sd	$16, 24($4)
+	sd	$17, 32($4)
+	sd	$18, 40($4)
+	sd	$19, 48($4)
+	sd	$20, 56($4)
+	sd	$21, 64($4)
+	sd	$22, 72($4)
+	sd	$23, 80($4)
+	sd	$30, 88($4)
+#ifndef __mips_soft_float
+	sdc1	$24, 96($4)
+	sdc1	$25, 104($4)
+	sdc1	$26, 112($4)
+	sdc1	$27, 120($4)
+	sdc1	$28, 128($4)
+	sdc1	$29, 136($4)
+	sdc1	$30, 144($4)
+	sdc1	$31, 152($4)
+#endif
+	jr	$ra
+	li	$2, 0
diff --git a/recipes/core/relibc/src/header/setjmp/impl/mipsn32/longjmp.S b/recipes/core/relibc/src/header/setjmp/impl/mipsn32/longjmp.S
new file mode 100644
index 0000000000..30c3ee0b0c
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/mipsn32/longjmp.S
@@ -0,0 +1,36 @@
+.set	noreorder
+.global	_longjmp
+.global	longjmp
+.type	_longjmp,@function
+.type	longjmp,@function
+_longjmp:
+longjmp:
+	move	$2, $5
+	bne	$2, $0, 1f
+	nop
+	addu	$2, $2, 1
+1:
+#ifndef __mips_soft_float
+	ldc1	$24, 96($4)
+	ldc1	$25, 104($4)
+	ldc1	$26, 112($4)
+	ldc1	$27, 120($4)
+	ldc1	$28, 128($4)
+	ldc1	$29, 136($4)
+	ldc1	$30, 144($4)
+	ldc1	$31, 152($4)
+#endif
+	ld	$ra, 0($4)
+	ld	$sp, 8($4)
+	ld	$gp, 16($4)
+	ld	$16, 24($4)
+	ld	$17, 32($4)
+	ld	$18, 40($4)
+	ld	$19, 48($4)
+	ld	$20, 56($4)
+	ld	$21, 64($4)
+	ld	$22, 72($4)
+	ld	$23, 80($4)
+	ld	$30, 88($4)
+	jr	$ra
+	nop
diff --git a/recipes/core/relibc/src/header/setjmp/impl/mipsn32/setjmp.S b/recipes/core/relibc/src/header/setjmp/impl/mipsn32/setjmp.S
new file mode 100644
index 0000000000..b9646c2abe
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/mipsn32/setjmp.S
@@ -0,0 +1,34 @@
+.set	noreorder
+.global	__setjmp
+.global	_setjmp
+.global	setjmp
+.type	__setjmp,@function
+.type	_setjmp,@function
+.type	setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	sd	$ra, 0($4)
+	sd	$sp, 8($4)
+	sd	$gp, 16($4)
+	sd	$16, 24($4)
+	sd	$17, 32($4)
+	sd	$18, 40($4)
+	sd	$19, 48($4)
+	sd	$20, 56($4)
+	sd	$21, 64($4)
+	sd	$22, 72($4)
+	sd	$23, 80($4)
+	sd	$30, 88($4)
+#ifndef __mips_soft_float
+	sdc1	$24, 96($4)
+	sdc1	$25, 104($4)
+	sdc1	$26, 112($4)
+	sdc1	$27, 120($4)
+	sdc1	$28, 128($4)
+	sdc1	$29, 136($4)
+	sdc1	$30, 144($4)
+	sdc1	$31, 152($4)
+#endif
+	jr	$ra
+	li	$2, 0
diff --git a/recipes/core/relibc/src/header/setjmp/impl/or1k/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/or1k/longjmp.s
new file mode 100644
index 0000000000..1db9fd9339
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/or1k/longjmp.s
@@ -0,0 +1,25 @@
+.global _longjmp
+.global longjmp
+.type   _longjmp,@function
+.type   longjmp,@function
+_longjmp:
+longjmp:
+	l.sfeqi	r4, 0
+	l.bnf	1f
+	 l.addi	r11, r4,0
+	l.ori	r11, r0, 1
+1:	l.lwz	r1, 0(r3)
+	l.lwz	r2, 4(r3)
+	l.lwz	r9, 8(r3)
+	l.lwz	r10, 12(r3)
+	l.lwz	r14, 16(r3)
+	l.lwz	r16, 20(r3)
+	l.lwz	r18, 24(r3)
+	l.lwz	r20, 28(r3)
+	l.lwz	r22, 32(r3)
+	l.lwz	r24, 36(r3)
+	l.lwz	r26, 40(r3)
+	l.lwz	r28, 44(r3)
+	l.lwz	r30, 48(r3)
+	l.jr	r9
+	 l.nop
diff --git a/recipes/core/relibc/src/header/setjmp/impl/or1k/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/or1k/setjmp.s
new file mode 100644
index 0000000000..0677033843
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/or1k/setjmp.s
@@ -0,0 +1,27 @@
+.global ___setjmp
+.hidden ___setjmp
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+	l.sw	0(r3), r1
+	l.sw	4(r3), r2
+	l.sw	8(r3), r9
+	l.sw	12(r3), r10
+	l.sw	16(r3), r14
+	l.sw	20(r3), r16
+	l.sw	24(r3), r18
+	l.sw	28(r3), r20
+	l.sw	32(r3), r22
+	l.sw	36(r3), r24
+	l.sw	40(r3), r26
+	l.sw	44(r3), r28
+	l.sw	48(r3), r30
+	l.jr	r9
+	 l.ori	r11,r0,0
diff --git a/recipes/core/relibc/src/header/setjmp/impl/powerpc/longjmp.S b/recipes/core/relibc/src/header/setjmp/impl/powerpc/longjmp.S
new file mode 100644
index 0000000000..e598bd056e
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/powerpc/longjmp.S
@@ -0,0 +1,69 @@
+	.global _longjmp
+	.global longjmp
+	.type   _longjmp,@function
+	.type   longjmp,@function
+_longjmp:
+longjmp:
+	/*
+	 * void longjmp(jmp_buf env, int val);
+	 * put val into return register and restore the env saved in setjmp
+	 * if val(r4) is 0, put 1 there.
+	 */
+	/* 0) move old return address into r0 */
+	lwz 0, 0(3)
+	/* 1) put it into link reg */
+	mtlr 0
+	/* 2 ) restore stack ptr */
+	lwz 1, 4(3)
+	/* 3) restore control reg */
+	lwz 0, 8(3)
+	mtcr 0
+	/* 4) restore r14-r31 */
+	lwz 14, 12(3)
+	lwz 15, 16(3)
+	lwz 16, 20(3)
+	lwz 17, 24(3)
+	lwz 18, 28(3)
+	lwz 19, 32(3)
+	lwz 20, 36(3)
+	lwz 21, 40(3)
+	lwz 22, 44(3)
+	lwz 23, 48(3)
+	lwz 24, 52(3)
+	lwz 25, 56(3)
+	lwz 26, 60(3)
+	lwz 27, 64(3)
+	lwz 28, 68(3)
+	lwz 29, 72(3)
+	lwz 30, 76(3)
+	lwz 31, 80(3)
+#ifndef _SOFT_FLOAT
+	lfd 14,88(3)
+	lfd 15,96(3)
+	lfd 16,104(3)
+	lfd 17,112(3)
+	lfd 18,120(3)
+	lfd 19,128(3)
+	lfd 20,136(3)
+	lfd 21,144(3)
+	lfd 22,152(3)
+	lfd 23,160(3)
+	lfd 24,168(3)
+	lfd 25,176(3)
+	lfd 26,184(3)
+	lfd 27,192(3)
+	lfd 28,200(3)
+	lfd 29,208(3)
+	lfd 30,216(3)
+	lfd 31,224(3)
+#endif
+	/* 5) put val into return reg r3 */
+	mr 3, 4
+
+	/* 6) check if return value is 0, make it 1 in that case */
+	cmpwi cr7, 4, 0
+	bne cr7, 1f
+	li 3, 1
+1:
+	blr
+
diff --git a/recipes/core/relibc/src/header/setjmp/impl/powerpc/setjmp.S b/recipes/core/relibc/src/header/setjmp/impl/powerpc/setjmp.S
new file mode 100644
index 0000000000..cd91a207f5
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/powerpc/setjmp.S
@@ -0,0 +1,63 @@
+	.global ___setjmp
+	.hidden ___setjmp
+	.global __setjmp
+	.global _setjmp
+	.global setjmp
+	.type   __setjmp,@function
+	.type   _setjmp,@function
+	.type   setjmp,@function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+	/* 0) store IP int 0, then into the jmpbuf pointed to by r3 (first arg) */
+	mflr 0
+	stw 0, 0(3)
+	/* 1) store reg1 (SP) */
+	stw 1, 4(3)
+	/* 2) store cr */
+	mfcr 0
+	stw 0, 8(3)
+	/* 3) store r14-31 */
+	stw 14, 12(3)
+	stw 15, 16(3)
+	stw 16, 20(3)
+	stw 17, 24(3)
+	stw 18, 28(3)
+	stw 19, 32(3)
+	stw 20, 36(3)
+	stw 21, 40(3)
+	stw 22, 44(3)
+	stw 23, 48(3)
+	stw 24, 52(3)
+	stw 25, 56(3)
+	stw 26, 60(3)
+	stw 27, 64(3)
+	stw 28, 68(3)
+	stw 29, 72(3)
+	stw 30, 76(3)
+	stw 31, 80(3)
+#ifndef _SOFT_FLOAT
+	stfd 14,88(3)
+	stfd 15,96(3)
+	stfd 16,104(3)
+	stfd 17,112(3)
+	stfd 18,120(3)
+	stfd 19,128(3)
+	stfd 20,136(3)
+	stfd 21,144(3)
+	stfd 22,152(3)
+	stfd 23,160(3)
+	stfd 24,168(3)
+	stfd 25,176(3)
+	stfd 26,184(3)
+	stfd 27,192(3)
+	stfd 28,200(3)
+	stfd 29,208(3)
+	stfd 30,216(3)
+	stfd 31,224(3)
+#endif
+	/* 4) set return value to 0 */
+	li 3, 0
+	/* 5) return */
+	blr
diff --git a/recipes/core/relibc/src/header/setjmp/impl/powerpc64/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/powerpc64/longjmp.s
new file mode 100644
index 0000000000..81d45ff60b
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/powerpc64/longjmp.s
@@ -0,0 +1,81 @@
+	.global _longjmp
+	.global longjmp
+	.type   _longjmp,@function
+	.type   longjmp,@function
+_longjmp:
+longjmp:
+	# 0) move old return address into the link register
+	ld   0,  0*8(3)
+	mtlr 0
+	# 1) restore cr
+	ld   0,  1*8(3)
+	mtcr 0
+	# 2) restore SP
+	ld   1,  2*8(3)
+	# 3) restore TOC into both r2 and the caller's stack.
+	#    Which location is required depends on whether setjmp was called
+	#    locally or non-locally, but it's always safe to restore to both.
+	ld   2,  3*8(3)
+	std  2,   24(1)
+	# 4) restore r14-r31
+	ld  14,  4*8(3)
+	ld  15,  5*8(3)
+	ld  16,  6*8(3)
+	ld  17,  7*8(3)
+	ld  18,  8*8(3)
+	ld  19,  9*8(3)
+	ld  20, 10*8(3)
+	ld  21, 11*8(3)
+	ld  22, 12*8(3)
+	ld  23, 13*8(3)
+	ld  24, 14*8(3)
+	ld  25, 15*8(3)
+	ld  26, 16*8(3)
+	ld  27, 17*8(3)
+	ld  28, 18*8(3)
+	ld  29, 19*8(3)
+	ld  30, 20*8(3)
+	ld  31, 21*8(3)
+	# 5) restore floating point registers f14-f31
+	lfd 14, 22*8(3)
+	lfd 15, 23*8(3)
+	lfd 16, 24*8(3)
+	lfd 17, 25*8(3)
+	lfd 18, 26*8(3)
+	lfd 19, 27*8(3)
+	lfd 20, 28*8(3)
+	lfd 21, 29*8(3)
+	lfd 22, 30*8(3)
+	lfd 23, 31*8(3)
+	lfd 24, 32*8(3)
+	lfd 25, 33*8(3)
+	lfd 26, 34*8(3)
+	lfd 27, 35*8(3)
+	lfd 28, 36*8(3)
+	lfd 29, 37*8(3)
+	lfd 30, 38*8(3)
+	lfd 31, 39*8(3)
+
+	# 6) restore vector registers v20-v31
+	addi 3, 3, 40*8
+	lvx 20, 0, 3 ; addi 3, 3, 16
+	lvx 21, 0, 3 ; addi 3, 3, 16
+	lvx 22, 0, 3 ; addi 3, 3, 16
+	lvx 23, 0, 3 ; addi 3, 3, 16
+	lvx 24, 0, 3 ; addi 3, 3, 16
+	lvx 25, 0, 3 ; addi 3, 3, 16
+	lvx 26, 0, 3 ; addi 3, 3, 16
+	lvx 27, 0, 3 ; addi 3, 3, 16
+	lvx 28, 0, 3 ; addi 3, 3, 16
+	lvx 29, 0, 3 ; addi 3, 3, 16
+	lvx 30, 0, 3 ; addi 3, 3, 16
+	lvx 31, 0, 3
+
+	# 7) return r4 ? r4 : 1
+	mr    3,   4
+	cmpwi cr7, 4, 0
+	bne   cr7, 1f
+	li    3,   1
+1:
+	blr
+
diff --git a/recipes/core/relibc/src/header/setjmp/impl/powerpc64/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/powerpc64/setjmp.s
new file mode 100644
index 0000000000..37683fdaf4
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/powerpc64/setjmp.s
@@ -0,0 +1,89 @@
+	.global __setjmp
+	.global _setjmp
+	.global setjmp
+	.type   __setjmp,@function
+	.type   _setjmp,@function
+	.type   setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	ld 5, 24(1)   # load from the TOC slot in the caller's stack frame
+	b __setjmp_toc
+
+	.localentry __setjmp,.-__setjmp
+	.localentry _setjmp,.-_setjmp
+	.localentry setjmp,.-setjmp
+	mr 5, 2
+
+	.global __setjmp_toc
+	.hidden __setjmp_toc
+	# same as normal setjmp, except TOC pointer to save is provided in r5.
+	# r4 would normally be the 2nd parameter, but we're using r5 to simplify calling from sigsetjmp.
+	# solves the problem of knowing whether to save the TOC pointer from r2 or the caller's stack frame.
+__setjmp_toc:
+	# 0) store IP into 0, then into the jmpbuf pointed to by r3 (first arg)
+	mflr  0
+	std   0,  0*8(3)
+	# 1) store cr
+	mfcr  0
+	std   0,  1*8(3)
+	# 2) store SP and TOC
+	std   1,  2*8(3)
+	std   5,  3*8(3)
+	# 3) store r14-31
+	std  14,  4*8(3)
+	std  15,  5*8(3)
+	std  16,  6*8(3)
+	std  17,  7*8(3)
+	std  18,  8*8(3)
+	std  19,  9*8(3)
+	std  20, 10*8(3)
+	std  21, 11*8(3)
+	std  22, 12*8(3)
+	std  23, 13*8(3)
+	std  24, 14*8(3)
+	std  25, 15*8(3)
+	std  26, 16*8(3)
+	std  27, 17*8(3)
+	std  28, 18*8(3)
+	std  29, 19*8(3)
+	std  30, 20*8(3)
+	std  31, 21*8(3)
+	# 4) store floating point registers f14-f31
+	stfd 14, 22*8(3)
+	stfd 15, 23*8(3)
+	stfd 16, 24*8(3)
+	stfd 17, 25*8(3)
+	stfd 18, 26*8(3)
+	stfd 19, 27*8(3)
+	stfd 20, 28*8(3)
+	stfd 21, 29*8(3)
+	stfd 22, 30*8(3)
+	stfd 23, 31*8(3)
+	stfd 24, 32*8(3)
+	stfd 25, 33*8(3)
+	stfd 26, 34*8(3)
+	stfd 27, 35*8(3)
+	stfd 28, 36*8(3)
+	stfd 29, 37*8(3)
+	stfd 30, 38*8(3)
+	stfd 31, 39*8(3)
+
+	# 5) store vector registers v20-v31
+	addi  3, 3, 40*8
+	stvx 20, 0, 3 ; addi 3, 3, 16
+	stvx 21, 0, 3 ; addi 3, 3, 16
+	stvx 22, 0, 3 ; addi 3, 3, 16
+	stvx 23, 0, 3 ; addi 3, 3, 16
+	stvx 24, 0, 3 ; addi 3, 3, 16
+	stvx 25, 0, 3 ; addi 3, 3, 16
+	stvx 26, 0, 3 ; addi 3, 3, 16
+	stvx 27, 0, 3 ; addi 3, 3, 16
+	stvx 28, 0, 3 ; addi 3, 3, 16
+	stvx 29, 0, 3 ; addi 3, 3, 16
+	stvx 30, 0, 3 ; addi 3, 3, 16
+	stvx 31, 0, 3
+
+	# 6) return 0
+	li 3, 0
+	blr
diff --git a/recipes/core/relibc/src/header/setjmp/impl/riscv64/longjmp.S b/recipes/core/relibc/src/header/setjmp/impl/riscv64/longjmp.S
new file mode 100644
index 0000000000..09b36da0a8
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/riscv64/longjmp.S
@@ -0,0 +1,41 @@
+.attribute arch, "rv64gc" # see rust issue #80608
+.global __longjmp
+.global _longjmp
+.global longjmp
+.type __longjmp, %function
+.type _longjmp,  %function
+.type longjmp,   %function
+__longjmp:
+_longjmp:
+longjmp:
+	ld s0,    0(a0)
+	ld s1,    8(a0)
+	ld s2,    16(a0)
+	ld s3,    24(a0)
+	ld s4,    32(a0)
+	ld s5,    40(a0)
+	ld s6,    48(a0)
+	ld s7,    56(a0)
+	ld s8,    64(a0)
+	ld s9,    72(a0)
+	ld s10,   80(a0)
+	ld s11,   88(a0)
+	ld sp,    96(a0)
+	ld ra,    104(a0)
+
+	fld fs0,  112(a0)
+	fld fs1,  120(a0)
+	fld fs2,  128(a0)
+	fld fs3,  136(a0)
+	fld fs4,  144(a0)
+	fld fs5,  152(a0)
+	fld fs6,  160(a0)
+	fld fs7,  168(a0)
+	fld fs8,  176(a0)
+	fld fs9,  184(a0)
+	fld fs10, 192(a0)
+	fld fs11, 200(a0)
+
+	seqz a0, a1
+	add a0, a0, a1
+	ret
diff --git a/recipes/core/relibc/src/header/setjmp/impl/riscv64/setjmp.S b/recipes/core/relibc/src/header/setjmp/impl/riscv64/setjmp.S
new file mode 100644
index 0000000000..243a8f744b
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/riscv64/setjmp.S
@@ -0,0 +1,40 @@
+.attribute arch, "rv64gc" # see rust issue #80608
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp, %function
+.type _setjmp,  %function
+.type setjmp,   %function
+__setjmp:
+_setjmp:
+setjmp:
+	sd s0,    0(a0)
+	sd s1,    8(a0)
+	sd s2,    16(a0)
+	sd s3,    24(a0)
+	sd s4,    32(a0)
+	sd s5,    40(a0)
+	sd s6,    48(a0)
+	sd s7,    56(a0)
+	sd s8,    64(a0)
+	sd s9,    72(a0)
+	sd s10,   80(a0)
+	sd s11,   88(a0)
+	sd sp,    96(a0)
+	sd ra,    104(a0)
+
+	fsd fs0,  112(a0)
+	fsd fs1,  120(a0)
+	fsd fs2,  128(a0)
+	fsd fs3,  136(a0)
+	fsd fs4,  144(a0)
+	fsd fs5,  152(a0)
+	fsd fs6,  160(a0)
+	fsd fs7,  168(a0)
+	fsd fs8,  176(a0)
+	fsd fs9,  184(a0)
+	fsd fs10, 192(a0)
+	fsd fs11, 200(a0)
+
+	li a0, 0
+	ret
diff --git a/recipes/core/relibc/src/header/setjmp/impl/riscv64/sigsetjmp.S b/recipes/core/relibc/src/header/setjmp/impl/riscv64/sigsetjmp.S
new file mode 100644
index 0000000000..f9bc162a0a
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/riscv64/sigsetjmp.S
@@ -0,0 +1,23 @@
+.global sigsetjmp
+.global __sigsetjmp
+.type sigsetjmp, %function
+.type __sigsetjmp, %function
+sigsetjmp:
+__sigsetjmp:
+	bnez a1, 1f
+	tail setjmp
+1:
+
+	sd ra, 208(a0)
+	sd s0, 224(a0)
+	mv s0, a0
+
+	call setjmp
+
+	mv a1, a0
+	mv a0, s0
+	ld s0, 224(a0)
+	ld ra, 208(a0)
+
+.hidden __sigsetjmp_tail
+	tail __sigsetjmp_tail
diff --git a/recipes/core/relibc/src/header/setjmp/impl/s390x/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/s390x/longjmp.s
new file mode 100644
index 0000000000..b2310f8ad1
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/s390x/longjmp.s
@@ -0,0 +1,23 @@
+	.global _longjmp
+	.global longjmp
+	.type   _longjmp,@function
+	.type   longjmp,@function
+_longjmp:
+longjmp:
+
+1:
+	lmg %r6, %r15, 0(%r2)
+
+	ld  %f8, 10*8(%r2)
+	ld  %f9, 11*8(%r2)
+	ld %f10, 12*8(%r2)
+	ld %f11, 13*8(%r2)
+	ld %f12, 14*8(%r2)
+	ld %f13, 15*8(%r2)
+	ld %f14, 16*8(%r2)
+	ld %f15, 17*8(%r2)
+
+	ltgr %r2, %r3
+	bnzr %r14
+	lhi  %r2, 1
+	br   %r14
diff --git a/recipes/core/relibc/src/header/setjmp/impl/s390x/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/s390x/setjmp.s
new file mode 100644
index 0000000000..afae1b6755
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/s390x/setjmp.s
@@ -0,0 +1,25 @@
+	.global ___setjmp
+	.hidden ___setjmp
+	.global __setjmp
+	.global _setjmp
+	.global setjmp
+	.type   __setjmp,@function
+	.type   _setjmp,@function
+	.type   setjmp,@function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+	stmg %r6, %r15, 0(%r2)
+
+	std  %f8,  10*8(%r2)
+	std  %f9,  11*8(%r2)
+	std  %f10, 12*8(%r2)
+	std  %f11, 13*8(%r2)
+	std  %f12, 14*8(%r2)
+	std  %f13, 15*8(%r2)
+	std  %f14, 16*8(%r2)
+	std  %f15, 17*8(%r2)
+
+	lghi %r2, 0
+	br   %r14
diff --git a/recipes/core/relibc/src/header/setjmp/impl/sh/longjmp.S b/recipes/core/relibc/src/header/setjmp/impl/sh/longjmp.S
new file mode 100644
index 0000000000..08f668b880
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/sh/longjmp.S
@@ -0,0 +1,28 @@
+.global _longjmp
+.global longjmp
+.type   _longjmp, @function
+.type   longjmp,  @function
+_longjmp:
+longjmp:
+	mov.l  @r4+, r8
+	mov.l  @r4+, r9
+	mov.l  @r4+, r10
+	mov.l  @r4+, r11
+	mov.l  @r4+, r12
+	mov.l  @r4+, r13
+	mov.l  @r4+, r14
+	mov.l  @r4+, r15
+	lds.l  @r4+, pr
+#if __SH_FPU_ANY__ || __SH4__
+	fmov.s @r4+, fr12
+	fmov.s @r4+, fr13
+	fmov.s @r4+, fr14
+	fmov.s @r4+, fr15
+#endif
+
+	tst  r5, r5
+	movt r0
+	add  r5, r0
+
+	rts
+	 nop
diff --git a/recipes/core/relibc/src/header/setjmp/impl/sh/setjmp.S b/recipes/core/relibc/src/header/setjmp/impl/sh/setjmp.S
new file mode 100644
index 0000000000..d476e6395f
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/sh/setjmp.S
@@ -0,0 +1,32 @@
+.global ___setjmp
+.hidden ___setjmp
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type   __setjmp, @function
+.type   _setjmp,  @function
+.type   setjmp,   @function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+#if __SH_FPU_ANY__ || __SH4__
+	add   #52, r4
+	fmov.s fr15, @-r4
+	fmov.s fr14, @-r4
+	fmov.s fr13, @-r4
+	fmov.s fr12, @-r4
+#else
+	add   #36, r4
+#endif
+	sts.l  pr,   @-r4
+	mov.l  r15,  @-r4
+	mov.l  r14,  @-r4
+	mov.l  r13,  @-r4
+	mov.l  r12,  @-r4
+	mov.l  r11,  @-r4
+	mov.l  r10,  @-r4
+	mov.l  r9,   @-r4
+	mov.l  r8,   @-r4
+	rts
+	 mov  #0, r0
diff --git a/recipes/core/relibc/src/header/setjmp/impl/x32/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/x32/longjmp.s
new file mode 100644
index 0000000000..e175a4b960
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/x32/longjmp.s
@@ -0,0 +1,22 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.global _longjmp
+.global longjmp
+.type _longjmp,@function
+.type longjmp,@function
+_longjmp:
+longjmp:
+	mov %rsi,%rax           /* val will be longjmp return */
+	test %rax,%rax
+	jnz 1f
+	inc %rax                /* if val==0, val=1 per longjmp semantics */
+1:
+	mov (%rdi),%rbx         /* rdi is the jmp_buf, restore regs from it */
+	mov 8(%rdi),%rbp
+	mov 16(%rdi),%r12
+	mov 24(%rdi),%r13
+	mov 32(%rdi),%r14
+	mov 40(%rdi),%r15
+	mov 48(%rdi),%rdx       /* this ends up being the stack pointer */
+	mov %rdx,%rsp
+	mov 56(%rdi),%rdx       /* this is the instruction pointer */
+	jmp *%rdx               /* goto saved address without altering rsp */
diff --git a/recipes/core/relibc/src/header/setjmp/impl/x32/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/x32/setjmp.s
new file mode 100644
index 0000000000..98f58b8d65
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/x32/setjmp.s
@@ -0,0 +1,22 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	mov %rbx,(%rdi)         /* rdi is jmp_buf, move registers onto it */
+	mov %rbp,8(%rdi)
+	mov %r12,16(%rdi)
+	mov %r13,24(%rdi)
+	mov %r14,32(%rdi)
+	mov %r15,40(%rdi)
+	lea 8(%rsp),%rdx        /* this is our rsp WITHOUT current ret addr */
+	mov %rdx,48(%rdi)
+	mov (%rsp),%rdx         /* save return addr ptr for new rip */
+	mov %rdx,56(%rdi)
+	xor %rax,%rax           /* always return 0 */
+	ret
diff --git a/recipes/core/relibc/src/header/setjmp/impl/x86_64/longjmp.s b/recipes/core/relibc/src/header/setjmp/impl/x86_64/longjmp.s
new file mode 100644
index 0000000000..c6b4e0e0f6
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/x86_64/longjmp.s
@@ -0,0 +1,22 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.global _longjmp
+.global longjmp
+.type _longjmp,@function
+.type longjmp,@function
+_longjmp:
+longjmp:
+	mov rax,rsi								/* val will be longjmp return */
+	test rax,rax
+	jnz 1f
+	inc rax										/* if val==0, val=1 per longjmp semantics */
+1:
+	mov rbx, [rdi]						/* rdi is the jmp_buf, restore regs from it */
+	mov rbp, [rdi + 8]
+	mov r12, [rdi + 16]
+	mov r13, [rdi + 24]
+	mov r14, [rdi + 32]
+	mov r15, [rdi + 40]
+	mov rdx, [rdi + 48] 			/* this ends up being the stack pointer */
+	mov rsp, rdx 
+	mov rdx, [rdi + 56]   		/* this is the instruction pointer */
+	jmp rdx									  /* goto saved address without altering rsp */
diff --git a/recipes/core/relibc/src/header/setjmp/impl/x86_64/setjmp.s b/recipes/core/relibc/src/header/setjmp/impl/x86_64/setjmp.s
new file mode 100644
index 0000000000..1aa521f997
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/x86_64/setjmp.s
@@ -0,0 +1,22 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	mov [rdi], rbx						/* rdi is jmp_buf, move registers onto it */
+	mov [rdi + 8], rbp
+	mov [rdi + 16], r12
+	mov [rdi + 24], r13
+	mov [rdi + 32], r14
+	mov [rdi + 40], r15
+	lea rdx, [rsp + 8]				/* this is our rsp WITHOUT current ret addr */
+	mov [rdi + 48], rdx
+	mov rdx, [rsp]						/* save return addr ptr for new rip */
+	mov [rdi + 56], rdx
+	xor rax, rax							/* always return 0 */
+	ret
diff --git a/recipes/core/relibc/src/header/setjmp/impl/x86_64/sigsetjmp.s b/recipes/core/relibc/src/header/setjmp/impl/x86_64/sigsetjmp.s
new file mode 100644
index 0000000000..41bd05b518
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/impl/x86_64/sigsetjmp.s
@@ -0,0 +1,24 @@
+.global sigsetjmp
+.global __sigsetjmp
+.type sigsetjmp,@function
+.type __sigsetjmp,@function
+sigsetjmp:
+__sigsetjmp:
+	test esi, esi
+	jz 1f
+
+	pop [rdi + 64]
+	mov qword ptr [rdi + 8 + 72], rbx
+	mov rbx, rdi
+
+	call setjmp
+
+	push [rbx + 64]
+	mov rdi, rbx
+	mov esi, eax
+	mov rbx, qword ptr [rbx + 8 + 72]
+
+.hidden __sigsetjmp_tail
+	jmp __sigsetjmp_tail
+
+1:	jmp setjmp
diff --git a/recipes/core/relibc/src/header/setjmp/mod.rs b/recipes/core/relibc/src/header/setjmp/mod.rs
new file mode 100644
index 0000000000..3ec61d2b0b
--- /dev/null
+++ b/recipes/core/relibc/src/header/setjmp/mod.rs
@@ -0,0 +1,33 @@
+//! `setjmp.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/setjmp.h.html>.
+
+use core::arch::global_asm;
+
+macro_rules! platform_specific {
+    ($($rust_arch:expr,$c_arch:expr,$ext:expr;)+) => {
+        $(
+            #[cfg(target_arch = $rust_arch)]
+            global_asm!(include_str!(concat!("impl/", $c_arch, "/setjmp.", $ext)));
+            #[cfg(target_arch = $rust_arch)]
+            global_asm!(include_str!(concat!("impl/", $c_arch, "/sigsetjmp.", $ext)));
+            #[cfg(target_arch = $rust_arch)]
+            global_asm!(include_str!(concat!("impl/", $c_arch, "/longjmp.", $ext)));
+        )+
+    }
+}
+
+platform_specific! {
+    "aarch64","aarch64", "s";
+    "x86","i386","s";
+    "x86_64","x86_64","s";
+    "riscv64", "riscv64", "S";
+}
+
+//Each platform has different sizes for sigjmp_buf, currently only x86_64 is supported
+unsafe extern "C" {
+    /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setjmp.html>.
+    pub fn setjmp(jb: *mut u64) -> i32;
+    /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/longjmp.html>.
+    pub fn longjmp(jb: *mut u64, ret: i32);
+}
diff --git a/recipes/core/relibc/src/header/sgtty/cbindgen.toml b/recipes/core/relibc/src/header/sgtty/cbindgen.toml
new file mode 100644
index 0000000000..e442f18f50
--- /dev/null
+++ b/recipes/core/relibc/src/header/sgtty/cbindgen.toml
@@ -0,0 +1,12 @@
+sys_includes = ["sys/ioctl.h"]
+include_guard = "_RELIBC_SGTTY_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[export.rename]
+"sgttyb" = "struct sgttyb"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sgtty/mod.rs b/recipes/core/relibc/src/header/sgtty/mod.rs
new file mode 100644
index 0000000000..7d63a33a94
--- /dev/null
+++ b/recipes/core/relibc/src/header/sgtty/mod.rs
@@ -0,0 +1,9 @@
+//! sgtty implementation that won't work on redox because no ioctl
+
+use crate::{header::sys_ioctl::sgttyb, platform::types::c_int};
+
+#[unsafe(no_mangle)]
+pub extern "C" fn gtty(fd: c_int, out: *mut sgttyb) -> c_int {
+    todo_skip!(0, "gtty({}, {:p})", fd, out);
+    -1
+}
diff --git a/recipes/core/relibc/src/header/shadow/cbindgen.toml b/recipes/core/relibc/src/header/shadow/cbindgen.toml
new file mode 100644
index 0000000000..8d36c91ba6
--- /dev/null
+++ b/recipes/core/relibc/src/header/shadow/cbindgen.toml
@@ -0,0 +1,12 @@
+sys_includes = ["sys/types.h", "stdint.h", "stdio.h"]
+include_guard = "_RELIBC_SHADOW_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export]
+include = ["group"]
diff --git a/recipes/core/relibc/src/header/shadow/mod.rs b/recipes/core/relibc/src/header/shadow/mod.rs
new file mode 100644
index 0000000000..23492c4e8f
--- /dev/null
+++ b/recipes/core/relibc/src/header/shadow/mod.rs
@@ -0,0 +1,275 @@
+//! `shadow.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getspnam.3.html>.
+
+use core::{
+    cell::SyncUnsafeCell,
+    ops::{Deref, DerefMut},
+    pin::Pin,
+    ptr,
+    str::FromStr,
+};
+
+use alloc::{boxed::Box, string::String};
+
+use crate::{
+    c_str::CStr,
+    fs::File,
+    header::fcntl,
+    io::{BufReader, Lines, prelude::*},
+    platform,
+    platform::types::{c_char, c_int, c_long, c_ulong, size_t},
+};
+
+use super::errno::*;
+
+#[cfg(target_os = "linux")]
+const SEPARATOR: char = ':';
+
+#[cfg(target_os = "redox")]
+const SEPARATOR: char = ';';
+
+const SHADOW_FILE: &core::ffi::CStr = c"/etc/shadow";
+
+#[derive(Clone, Copy, Debug)]
+struct DestBuffer {
+    ptr: *mut u8,
+    len: usize,
+}
+
+#[derive(Debug)]
+enum MaybeAllocated {
+    Owned(Pin<Box<[u8]>>),
+    Borrowed(DestBuffer),
+}
+impl Deref for MaybeAllocated {
+    type Target = [u8];
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            MaybeAllocated::Owned(boxed) => boxed,
+            MaybeAllocated::Borrowed(dst) => unsafe {
+                core::slice::from_raw_parts(dst.ptr, dst.len)
+            },
+        }
+    }
+}
+impl DerefMut for MaybeAllocated {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            MaybeAllocated::Owned(boxed) => boxed,
+            MaybeAllocated::Borrowed(dst) => unsafe {
+                core::slice::from_raw_parts_mut(dst.ptr, dst.len)
+            },
+        }
+    }
+}
+
+static mut SHADOW_BUF: Option<MaybeAllocated> = None;
+static mut SHADOW: spwd = spwd {
+    sp_namp: ptr::null_mut(),
+    sp_pwdp: ptr::null_mut(),
+    sp_lstchg: -1,
+    sp_min: -1,
+    sp_max: -1,
+    sp_warn: -1,
+    sp_inact: -1,
+    sp_expire: -1,
+    sp_flag: 0,
+};
+
+static LINE_READER: SyncUnsafeCell<Option<Lines<BufReader<File>>>> = SyncUnsafeCell::new(None);
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getspnam.3.html>.
+#[repr(C)]
+#[derive(Debug, Clone, Copy)]
+pub struct spwd {
+    pub sp_namp: *mut c_char,
+    pub sp_pwdp: *mut c_char,
+    pub sp_lstchg: c_long,
+    pub sp_min: c_long,
+    pub sp_max: c_long,
+    pub sp_warn: c_long,
+    pub sp_inact: c_long,
+    pub sp_expire: c_long,
+    pub sp_flag: c_ulong,
+}
+
+#[derive(Debug)]
+enum Error {
+    EOF,
+    BufTooSmall,
+    Syntax,
+}
+
+#[derive(Debug)]
+struct OwnedSpwd {
+    buffer: MaybeAllocated,
+    reference: spwd,
+}
+
+impl OwnedSpwd {
+    fn into_global(self) -> *mut spwd {
+        unsafe {
+            SHADOW_BUF = Some(self.buffer);
+            SHADOW = self.reference;
+            &raw mut SHADOW
+        }
+    }
+}
+fn to_long(s: &str) -> c_long {
+    c_long::from_str(s).unwrap_or(-1)
+}
+fn to_ulong(s: &str) -> c_ulong {
+    c_ulong::from_str(s).unwrap_or(0)
+}
+
+fn parse_spwd(line: String, destbuf: Option<DestBuffer>) -> Result<OwnedSpwd, Error> {
+    let mut parts = line.split(SEPARATOR);
+
+    let sp_namp_str = parts.next().ok_or(Error::Syntax)?;
+    let sp_pwdp_str = parts.next().ok_or(Error::Syntax)?;
+
+    //TODO: these are not implemented redox-users crate
+    let sp_lstchg = to_long(parts.next().unwrap_or(""));
+    let sp_min = to_long(parts.next().unwrap_or(""));
+    let sp_max = to_long(parts.next().unwrap_or(""));
+    let sp_warn = to_long(parts.next().unwrap_or(""));
+    let sp_inact = to_long(parts.next().unwrap_or(""));
+    let sp_expire = to_long(parts.next().unwrap_or(""));
+    let sp_flag = to_ulong(parts.next().unwrap_or(""));
+
+    let string_data_len = sp_namp_str.len() + 1 + sp_pwdp_str.len() + 1;
+
+    let mut buffer = match destbuf {
+        Some(buf) => {
+            if buf.len < string_data_len {
+                platform::ERRNO.set(ERANGE);
+                return Err(Error::BufTooSmall);
+            }
+            MaybeAllocated::Borrowed(buf)
+        }
+        None => {
+            let vec = vec![0; string_data_len];
+            MaybeAllocated::Owned(Box::into_pin(vec.into_boxed_slice()))
+        }
+    };
+
+    let (name_slice, rest) = buffer.split_at_mut(sp_namp_str.len() + 1);
+    name_slice[..sp_namp_str.len()].copy_from_slice(sp_namp_str.as_bytes());
+    name_slice[sp_namp_str.len()] = 0;
+
+    let (pwd_slice, _) = rest.split_at_mut(sp_pwdp_str.len() + 1);
+    pwd_slice[..sp_pwdp_str.len()].copy_from_slice(sp_pwdp_str.as_bytes());
+    pwd_slice[sp_pwdp_str.len()] = 0;
+
+    let sp_namp = name_slice.as_mut_ptr().cast::<c_char>();
+    let sp_pwdp = pwd_slice.as_mut_ptr().cast::<c_char>();
+
+    let reference = spwd {
+        sp_namp,
+        sp_pwdp,
+        sp_lstchg,
+        sp_min,
+        sp_max,
+        sp_warn,
+        sp_inact,
+        sp_expire,
+        sp_flag,
+    };
+
+    Ok(OwnedSpwd { buffer, reference })
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getspnam.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getspnam(name: *const c_char) -> *mut spwd {
+    let Ok(db) = File::open(SHADOW_FILE.into(), fcntl::O_RDONLY) else {
+        return ptr::null_mut();
+    };
+    let c_name = unsafe { CStr::from_ptr(name) };
+
+    for line in BufReader::new(db).lines() {
+        let Ok(line) = line else { continue };
+        if line.starts_with(c_name.to_str().unwrap_or("\0"))
+            && let Ok(pwd) = parse_spwd(line, None)
+        {
+            return pwd.into_global();
+        }
+    }
+    ptr::null_mut()
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getspnam.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getspnam_r(
+    name: *const c_char,
+    result_buf: *mut spwd,
+    buffer: *mut c_char,
+    buflen: size_t,
+    result: *mut *mut spwd,
+) -> c_int {
+    unsafe { *result = ptr::null_mut() };
+
+    let Ok(db) = File::open(SHADOW_FILE.into(), fcntl::O_RDONLY) else {
+        return ENOENT;
+    };
+    let c_name = unsafe { CStr::from_ptr(name).to_str().unwrap_or("\0") };
+
+    for line in BufReader::new(db).lines() {
+        let Ok(line) = line else { continue };
+        if line.starts_with(c_name) {
+            let dest_buf = Some(DestBuffer {
+                ptr: buffer.cast::<u8>(),
+                len: buflen,
+            });
+            return match parse_spwd(line, dest_buf) {
+                Ok(sp) => {
+                    unsafe {
+                        *result_buf = sp.reference;
+                        *result = result_buf;
+                    }
+                    0
+                }
+                Err(Error::BufTooSmall) => ERANGE,
+                _ => ENOENT,
+            };
+        }
+    }
+    ENOENT
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getspnam.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setspent() {
+    let line_reader = unsafe { &mut *LINE_READER.get() };
+    if let Ok(db) = File::open(SHADOW_FILE.into(), fcntl::O_RDONLY) {
+        *line_reader = Some(BufReader::new(db).lines());
+    }
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getspnam.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn endspent() {
+    unsafe {
+        *LINE_READER.get() = None;
+    }
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getspnam.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getspent() -> *mut spwd {
+    let line_reader = unsafe { &mut *LINE_READER.get() };
+    if line_reader.is_none() {
+        unsafe {
+            setspent();
+        }
+    }
+    if let Some(lines) = line_reader
+        && let Some(Ok(line)) = lines.next()
+        && let Ok(sp) = parse_spwd(line, None)
+    {
+        return sp.into_global();
+    }
+    ptr::null_mut()
+}
diff --git a/recipes/core/relibc/src/header/signal/cbindgen.toml b/recipes/core/relibc/src/header/signal/cbindgen.toml
new file mode 100644
index 0000000000..e2e7cd120e
--- /dev/null
+++ b/recipes/core/relibc/src/header/signal/cbindgen.toml
@@ -0,0 +1,45 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html
+#
+# Spec quotations relating to includes:
+# - "The <signal.h> header shall define the pthread_t, size_t, and uid_t types as described in <sys/types.h>."
+# - "The <signal.h> header shall define the timespec structure as described in <time.h>."
+# - "pid_t As described in <sys/types.h>."
+# - "The <signal.h> header shall define the pthread_attr_t type as described in <sys/types.h>."
+# - "Inclusion of the <signal.h> header may make visible all symbols from the <time.h> header."
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_SIGNAL_H"
+after_includes = """
+#include <bits/timespec.h> // for timespec from time.h
+
+#define SIG_DFL ((void (*)(int))0)
+#define SIG_IGN ((void (*)(int))1)
+#define SIG_ERR ((void (*)(int))-1)
+#define SIG_HOLD ((void (*)(int))2)
+
+typedef struct siginfo siginfo_t;
+typedef unsigned long long sigset_t;
+typedef struct ucontext ucontext_t;
+typedef struct mcontext mcontext_t;
+typedef long sig_atomic_t;
+
+struct sigaction {
+  union {
+    void (*sa_handler)(int);
+    void (*sa_sigaction)(int, siginfo_t *, void *);
+  };
+  int sa_flags;
+  void (*sa_restorer)(void);
+  sigset_t sa_mask;
+};
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"sigaction" = "struct sigaction"
+"timespec" = "struct timespec"
diff --git a/recipes/core/relibc/src/header/signal/linux.rs b/recipes/core/relibc/src/header/signal/linux.rs
new file mode 100644
index 0000000000..e933e3054a
--- /dev/null
+++ b/recipes/core/relibc/src/header/signal/linux.rs
@@ -0,0 +1,179 @@
+use super::{sigset_t, stack_t};
+use crate::platform::types::{c_longlong, c_uchar, c_uint, c_ulong, c_ulonglong, c_ushort};
+use core::arch::global_asm;
+
+// Needs to be defined in assembly because it can't have a function prologue
+// rax is register, 15 is RT_SIGRETURN
+#[cfg(target_arch = "x86_64")]
+global_asm!(
+    "
+    .global __restore_rt
+    __restore_rt:
+        mov rax, 15
+        syscall
+"
+);
+// x8 is register, 139 is RT_SIGRETURN
+#[cfg(target_arch = "aarch64")]
+global_asm!(
+    "
+    .global __restore_rt
+    __restore_rt:
+        mov x8, #139
+        svc 0
+"
+);
+
+#[cfg(target_arch = "riscv64")]
+global_asm!(
+    "
+    .global __restore_rt
+    __restore_rt:
+        li a7, 139
+        ecall
+"
+);
+
+pub const SIGHUP: usize = 1;
+pub const SIGINT: usize = 2;
+pub const SIGQUIT: usize = 3;
+pub const SIGILL: usize = 4;
+pub const SIGTRAP: usize = 5;
+pub const SIGABRT: usize = 6;
+pub const SIGIOT: usize = SIGABRT;
+pub const SIGBUS: usize = 7;
+pub const SIGFPE: usize = 8;
+pub const SIGKILL: usize = 9;
+pub const SIGUSR1: usize = 10;
+pub const SIGSEGV: usize = 11;
+pub const SIGUSR2: usize = 12;
+pub const SIGPIPE: usize = 13;
+pub const SIGALRM: usize = 14;
+pub const SIGTERM: usize = 15;
+pub const SIGSTKFLT: usize = 16;
+pub const SIGCHLD: usize = 17;
+pub const SIGCONT: usize = 18;
+pub const SIGSTOP: usize = 19;
+pub const SIGTSTP: usize = 20;
+pub const SIGTTIN: usize = 21;
+pub const SIGTTOU: usize = 22;
+pub const SIGURG: usize = 23;
+pub const SIGXCPU: usize = 24;
+pub const SIGXFSZ: usize = 25;
+pub const SIGVTALRM: usize = 26;
+pub const SIGPROF: usize = 27;
+pub const SIGWINCH: usize = 28;
+pub const SIGIO: usize = 29;
+pub const SIGPOLL: usize = SIGIO;
+pub const SIGPWR: usize = 30;
+pub const SIGSYS: usize = 31;
+pub const SIGUNUSED: usize = SIGSYS;
+pub const NSIG: usize = 32;
+
+pub const SIGRTMIN: usize = 35; // TODO: decrease to 34
+pub const SIGRTMAX: usize = 64;
+
+pub const SA_NOCLDSTOP: usize = 1;
+pub const SA_NOCLDWAIT: usize = 2;
+pub const SA_SIGINFO: usize = 4;
+pub const SA_ONSTACK: usize = 0x0800_0000;
+pub const SA_RESTART: usize = 0x1000_0000;
+pub const SA_NODEFER: usize = 0x4000_0000;
+pub const SA_RESETHAND: usize = 0x8000_0000;
+pub const SA_RESTORER: usize = 0x0400_0000;
+
+pub const SS_ONSTACK: usize = 1;
+pub const SS_DISABLE: usize = 2;
+
+// Those two should be updated from kernel headers
+pub const MINSIGSTKSZ: usize = 2048;
+pub const SIGSTKSZ: usize = 8096;
+
+pub const SI_QUEUE: i32 = -1;
+pub const SI_USER: i32 = 0;
+pub const SI_TIMER: i32 = 1;
+pub const SI_ASYNCIO: i32 = 2;
+pub const SI_MESGQ: i32 = 3;
+
+// si_code values (signal-specific)
+pub const ILL_ILLOPC: i32 = 1;
+pub const ILL_ILLOPN: i32 = 2;
+pub const ILL_ILLADR: i32 = 3;
+pub const ILL_ILLTRP: i32 = 4;
+pub const ILL_PRVOPC: i32 = 5;
+pub const ILL_PRVREG: i32 = 6;
+pub const ILL_COPROC: i32 = 7;
+pub const ILL_BADSTK: i32 = 8;
+
+pub const FPE_INTDIV: i32 = 1;
+pub const FPE_INTOVF: i32 = 2;
+pub const FPE_FLTDIV: i32 = 3;
+pub const FPE_FLTOVF: i32 = 4;
+pub const FPE_FLTUND: i32 = 5;
+pub const FPE_FLTRES: i32 = 6;
+pub const FPE_FLTINV: i32 = 7;
+pub const FPE_FLTSUB: i32 = 8;
+
+pub const SEGV_MAPERR: i32 = 1;
+pub const SEGV_ACCERR: i32 = 2;
+
+pub const BUS_ADRALN: i32 = 1;
+pub const BUS_ADRERR: i32 = 2;
+pub const BUS_OBJERR: i32 = 3;
+
+pub const TRAP_BRKPT: i32 = 1;
+pub const TRAP_TRACE: i32 = 2;
+
+pub const CLD_EXITED: i32 = 1;
+pub const CLD_KILLED: i32 = 2;
+pub const CLD_DUMPED: i32 = 3;
+pub const CLD_TRAPPED: i32 = 4;
+pub const CLD_STOPPED: i32 = 5;
+pub const CLD_CONTINUED: i32 = 6;
+
+// Mirrors the ucontext_t struct from the libc crate on Linux.
+
+pub(crate) type ucontext_t = ucontext;
+pub(crate) type mcontext_t = mcontext;
+
+#[repr(C)]
+pub struct ucontext {
+    pub uc_flags: c_ulong,
+    pub uc_link: *mut ucontext_t,
+    pub uc_stack: stack_t,
+    pub uc_mcontext: mcontext_t,
+    pub uc_sigmask: sigset_t,
+    __private: [c_uchar; 512],
+}
+
+#[repr(C)]
+pub struct _libc_fpstate {
+    pub cwd: c_ushort,
+    pub swd: c_ushort,
+    pub ftw: c_ushort,
+    pub fop: c_ushort,
+    pub rip: c_ulonglong,
+    pub rdp: c_ulonglong,
+    pub mxcsr: c_uint,
+    pub mxcr_mask: c_uint,
+    pub _st: [_libc_fpxreg; 8],
+    pub _xmm: [_libc_xmmreg; 16],
+    __private: [c_ulonglong; 12],
+}
+#[repr(C)]
+pub struct _libc_fpxreg {
+    pub significand: [c_ushort; 4],
+    pub exponent: c_ushort,
+    __private: [c_ushort; 3],
+}
+
+#[repr(C)]
+pub struct _libc_xmmreg {
+    pub element: [c_uint; 4],
+}
+#[repr(C)]
+pub struct mcontext {
+    pub gregs: [c_longlong; 23], // TODO: greg_t?
+    pub fpregs: *mut _libc_fpstate,
+    __private: [c_ulonglong; 8],
+}
diff --git a/recipes/core/relibc/src/header/signal/mod.rs b/recipes/core/relibc/src/header/signal/mod.rs
new file mode 100644
index 0000000000..a1913a0c09
--- /dev/null
+++ b/recipes/core/relibc/src/header/signal/mod.rs
@@ -0,0 +1,586 @@
+//! `signal.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html>.
+
+use core::{mem, ptr};
+
+use cbitset::BitSet;
+
+use crate::{
+    error::{Errno, ResultExt},
+    header::{bits_timespec::timespec, errno, setjmp},
+    platform::{
+        self, ERRNO, Pal, PalSignal, Sys,
+        types::{
+            c_char, c_int, c_ulonglong, c_void, pid_t, pthread_attr_t, pthread_t, size_t, uid_t,
+        },
+    },
+};
+
+pub use self::sys::*;
+
+use super::{
+    errno::EFAULT,
+    stdio::{fprintf, stderr},
+};
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+pub mod sys;
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+pub mod sys;
+
+type SigSet = BitSet<[u64; 1]>;
+
+pub(crate) const SIG_DFL: usize = 0;
+pub(crate) const SIG_IGN: usize = 1;
+pub(crate) const SIG_ERR: isize = -1;
+pub(crate) const SIG_HOLD: isize = 2;
+
+pub const SIG_BLOCK: c_int = 0;
+pub const SIG_UNBLOCK: c_int = 1;
+pub const SIG_SETMASK: c_int = 2;
+
+pub const SIGEV_SIGNAL: c_int = 0;
+pub const SIGEV_NONE: c_int = 1;
+pub const SIGEV_THREAD: c_int = 2;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html>.
+#[repr(C)]
+#[derive(Clone, Debug)]
+/// cbindgen:ignore
+pub struct sigaction {
+    pub sa_handler: Option<extern "C" fn(c_int)>,
+    pub sa_flags: c_int,
+    pub sa_restorer: Option<unsafe extern "C" fn()>,
+    pub sa_mask: sigset_t,
+}
+
+#[repr(C)]
+#[derive(Clone)]
+pub struct sigaltstack {
+    pub ss_sp: *mut c_void,
+    pub ss_flags: c_int,
+    pub ss_size: size_t,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html>.
+#[repr(C)]
+#[derive(Clone)]
+pub struct sigevent {
+    pub sigev_value: sigval,
+    pub sigev_signo: c_int,
+    pub sigev_notify: c_int,
+    pub sigev_notify_function: Option<extern "C" fn(sigval)>,
+    pub sigev_notify_attributes: *mut pthread_attr_t,
+}
+
+// FIXME: This struct is wrong on Linux
+#[repr(C)]
+#[derive(Clone, Copy)]
+pub struct siginfo {
+    pub si_signo: c_int,
+    pub si_errno: c_int,
+    pub si_code: c_int,
+    pub si_pid: pid_t,
+    pub si_uid: uid_t,
+    pub si_addr: *mut c_void,
+    pub si_status: c_int,
+    pub si_value: sigval,
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn _cbindgen_export_siginfo(a: siginfo) {}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html>.
+#[derive(Clone, Copy)]
+#[repr(C)]
+pub union sigval {
+    pub sival_int: c_int,
+    pub sival_ptr: *mut c_void,
+}
+
+/// cbindgen:ignore
+pub type sigset_t = c_ulonglong;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html>.
+/// cbindgen:ignore
+pub type siginfo_t = siginfo;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html>
+pub type stack_t = sigaltstack;
+
+unsafe extern "C" {
+    pub fn sigsetjmp(jb: *mut c_ulonglong, savemask: c_int) -> c_int;
+}
+
+//NOTE for the following two functions, to see why they're implemented slightly differently from their intended behavior, read
+//     https://git.musl-libc.org/cgit/musl/commit/?id=583e55122e767b1586286a0d9c35e2a4027998ab
+#[unsafe(no_mangle)]
+unsafe extern "C" fn __sigsetjmp_tail(jb: *mut c_ulonglong, ret: c_int) -> c_int {
+    let set = jb.wrapping_add(9);
+    if ret > 0 {
+        unsafe { sigprocmask(SIG_SETMASK, set, ptr::null_mut()) };
+    } else {
+        unsafe { sigprocmask(SIG_SETMASK, ptr::null_mut(), set) };
+    }
+    ret
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn siglongjmp(jb: *mut c_ulonglong, ret: c_int) {
+    unsafe { setjmp::longjmp(jb, ret) };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/kill.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn kill(pid: pid_t, sig: c_int) -> c_int {
+    Sys::kill(pid, sig).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigqueue.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn sigqueue(pid: pid_t, sig: c_int, val: sigval) -> c_int {
+    Sys::sigqueue(pid, sig, val)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/killpg.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn killpg(pgrp: pid_t, sig: c_int) -> c_int {
+    Sys::killpg(pgrp, sig).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_kill.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_kill(thread: pthread_t, sig: c_int) -> c_int {
+    let os_tid = {
+        let pthread = unsafe { &*(thread as *const crate::pthread::Pthread) };
+        unsafe { pthread.os_tid.get().read() }
+    };
+    crate::header::pthread::e(unsafe { Sys::rlct_kill(os_tid, sig as usize) })
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pthread_sigmask.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pthread_sigmask(
+    how: c_int,
+    set: *const sigset_t,
+    oldset: *mut sigset_t,
+) -> c_int {
+    // On Linux and Redox, pthread_sigmask and sigprocmask are equivalent
+    if unsafe { sigprocmask(how, set, oldset) } == 0 {
+        0
+    } else {
+        //TODO: Fix race
+        platform::ERRNO.get()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/raise.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn raise(sig: c_int) -> c_int {
+    Sys::raise(sig).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigaction.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigaction(
+    sig: c_int,
+    act: *const sigaction,
+    oact: *mut sigaction,
+) -> c_int {
+    Sys::sigaction(sig, unsafe { act.as_ref() }, unsafe { oact.as_mut() })
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigaddset.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigaddset(set: *mut sigset_t, signo: c_int) -> c_int {
+    if signo <= 0 || signo as usize > NSIG.max(SIGRTMAX)
+    /* TODO */
+    {
+        platform::ERRNO.set(errno::EINVAL);
+        return -1;
+    }
+
+    if let Some(set) = unsafe { (set.cast::<SigSet>()).as_mut() } {
+        set.insert(signo as usize - 1); // 0-indexed usize, please!
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigaltstack.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigaltstack(ss: *const stack_t, old_ss: *mut stack_t) -> c_int {
+    unsafe {
+        Sys::sigaltstack(ss.as_ref(), old_ss.as_mut())
+            .map(|()| 0)
+            .or_minus_one_errno()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigdelset.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigdelset(set: *mut sigset_t, signo: c_int) -> c_int {
+    if signo <= 0 || signo as usize > NSIG.max(SIGRTMAX)
+    /* TODO */
+    {
+        platform::ERRNO.set(errno::EINVAL);
+        return -1;
+    }
+
+    if let Some(set) = unsafe { (set.cast::<SigSet>()).as_mut() } {
+        set.remove(signo as usize - 1); // 0-indexed usize, please!
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigemptyset.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigemptyset(set: *mut sigset_t) -> c_int {
+    if let Some(set) = unsafe { (set.cast::<SigSet>()).as_mut() } {
+        set.clear();
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigfillset.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigfillset(set: *mut sigset_t) -> c_int {
+    if let Some(set) = unsafe { (set.cast::<SigSet>()).as_mut() } {
+        set.fill(.., true);
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sighold.html>.
+///
+/// Present in issue 7. Removed in issue 8.
+///
+/// Use of this function is unspecified in a multi-threaded process.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sighold(sig: c_int) -> c_int {
+    let mut pset = mem::MaybeUninit::<sigset_t>::uninit();
+    unsafe { sigemptyset(pset.as_mut_ptr()) };
+    let mut set = unsafe { pset.assume_init() };
+    if unsafe { sigaddset(&raw mut set, sig) } < 0 {
+        return -1;
+    }
+    unsafe { sigprocmask(SIG_BLOCK, &raw const set, ptr::null_mut()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sighold.html>.
+///
+/// Present in issue 7. Removed in issue 8.
+///
+/// Use of this function is unspecified in a multi-threaded process.
+#[allow(clippy::missing_transmute_annotations)]
+#[unsafe(no_mangle)]
+pub extern "C" fn sigignore(sig: c_int) -> c_int {
+    let mut psa = mem::MaybeUninit::<sigaction>::uninit();
+    unsafe { sigemptyset(&raw mut (*psa.as_mut_ptr()).sa_mask) };
+    let mut sa = unsafe { psa.assume_init() };
+    sa.sa_handler = unsafe { mem::transmute(SIG_IGN) };
+    sa.sa_flags = 0;
+    unsafe { sigaction(sig, &raw const sa, ptr::null_mut()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/siginterrupt.html>.
+///
+/// Marked obsolescent in issue 7. Removed in issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub extern "C" fn siginterrupt(sig: c_int, flag: c_int) -> c_int {
+    let mut psa = mem::MaybeUninit::<sigaction>::uninit();
+    unsafe { sigaction(sig, ptr::null_mut(), psa.as_mut_ptr()) };
+    let mut sa = unsafe { psa.assume_init() };
+    if flag != 0 {
+        sa.sa_flags &= !SA_RESTART as c_int;
+    } else {
+        sa.sa_flags |= SA_RESTART as c_int;
+    }
+
+    unsafe { sigaction(sig, &raw const sa, ptr::null_mut()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigismember.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigismember(set: *const sigset_t, signo: c_int) -> c_int {
+    if signo <= 0 || signo as usize > NSIG.max(SIGRTMAX)
+    /* TODO */
+    {
+        platform::ERRNO.set(errno::EINVAL);
+        return -1;
+    }
+
+    if let Some(set) = unsafe { (set as *mut SigSet).as_mut() }
+        && set.contains(signo as usize - 1)
+    {
+        return 1;
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/signal.html>.
+#[allow(clippy::missing_transmute_annotations)]
+#[unsafe(no_mangle)]
+pub extern "C" fn signal(
+    sig: c_int,
+    func: Option<extern "C" fn(c_int)>,
+) -> Option<extern "C" fn(c_int)> {
+    let sa = sigaction {
+        sa_handler: func,
+        sa_flags: SA_RESTART as _,
+        sa_restorer: None, // set by platform if applicable
+        sa_mask: sigset_t::default(),
+    };
+    let mut old_sa = mem::MaybeUninit::uninit();
+    if unsafe { sigaction(sig, &raw const sa, old_sa.as_mut_ptr()) } < 0 {
+        mem::forget(old_sa);
+        return unsafe { mem::transmute(SIG_ERR) };
+    }
+    unsafe { old_sa.assume_init() }.sa_handler
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sighold.html>.
+///
+/// Present in issue 7. Removed in issue 8.
+///
+/// Use of this function is unspecified in a multi-threaded process.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigpause(sig: c_int) -> c_int {
+    let mut pset = mem::MaybeUninit::<sigset_t>::uninit();
+    unsafe { sigprocmask(0, ptr::null_mut(), pset.as_mut_ptr()) };
+    let mut set = unsafe { pset.assume_init() };
+    if unsafe { sigdelset(&raw mut set, sig) } == -1 {
+        return -1;
+    }
+    unsafe { sigsuspend(&raw const set) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigpending.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigpending(set: *mut sigset_t) -> c_int {
+    (|| Sys::sigpending(unsafe { set.as_mut().ok_or(Errno(EFAULT)) }?))()
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+// TODO: Double-check this mask.
+// This prevents the application from blocking the two signals SIGRTMIN - 1 and SIGRTMIN - 2 which
+// are (at least meant to be) used internally for timers and pthread cancellation. On Linux this is
+// 32 and 33 (same as NPTL reserves), whereas this on Redox is 33 and 34 (TODO: could this be
+// changed to 32 and 33 for Redox too, since there's currently no support for "sigqueue" targeting
+// specific threads).
+const RLCT_SIGNAL_MASK: sigset_t = (1 << ((SIGRTMIN - 1) - 1)) | (1 << ((SIGRTMIN - 2) - 1));
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigprocmask.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigprocmask(
+    how: c_int,
+    set: *const sigset_t,
+    oset: *mut sigset_t,
+) -> c_int {
+    (|| {
+        let set = unsafe { set.as_ref().map(|&block| block & !RLCT_SIGNAL_MASK) };
+        let mut oset = unsafe { oset.as_mut() };
+
+        Sys::sigprocmask(
+            how,
+            set.as_ref(),
+            oset.as_deref_mut(), // as_deref_mut for lifetime reasons
+        )?;
+
+        if let Some(oset) = oset {
+            *oset &= !RLCT_SIGNAL_MASK;
+        }
+
+        Ok(0)
+    })()
+    .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sighold.html>.
+///
+/// Present in issue 7. Removed in issue 8.
+///
+/// Use of this function is unspecified in a multi-threaded process.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigrelse(sig: c_int) -> c_int {
+    let mut pset = mem::MaybeUninit::<sigset_t>::uninit();
+    unsafe { sigemptyset(pset.as_mut_ptr()) };
+    let mut set = unsafe { pset.assume_init() };
+    if unsafe { sigaddset(&raw mut set, sig) } < 0 {
+        return -1;
+    }
+    unsafe { sigprocmask(SIG_UNBLOCK, &raw const set, ptr::null_mut()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sighold.html>.
+///
+/// Present in issue 7. Removed in issue 8.
+///
+/// Use of this function is unspecified in a multi-threaded process.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigset(
+    sig: c_int,
+    func: Option<extern "C" fn(c_int)>,
+) -> Option<extern "C" fn(c_int)> {
+    let mut old_sa = mem::MaybeUninit::uninit();
+    let mut pset = mem::MaybeUninit::<sigset_t>::uninit();
+    let sig_hold: Option<extern "C" fn(c_int)> = unsafe { mem::transmute(SIG_HOLD) };
+    let sig_err: Option<extern "C" fn(c_int)> = unsafe { mem::transmute(SIG_ERR) };
+    unsafe { sigemptyset(pset.as_mut_ptr()) };
+    let mut set = unsafe { pset.assume_init() };
+    if unsafe { sigaddset(&raw mut set, sig) } < 0 {
+        return sig_err;
+    } else {
+        let is_equal = {
+            match (func, sig_hold) {
+                (None, None) => true,
+                (Some(_), None) | (None, Some(_)) => false,
+                (Some(f), Some(sh)) => ptr::fn_addr_eq(f, sh),
+            }
+        };
+        if is_equal {
+            if unsafe { sigaction(sig, ptr::null_mut(), old_sa.as_mut_ptr()) } < 0
+                || unsafe { sigprocmask(SIG_BLOCK, &raw const set, &raw mut set) } < 0
+            {
+                mem::forget(old_sa);
+                return sig_err;
+            }
+        } else {
+            let mut sa = sigaction {
+                sa_handler: func,
+                sa_flags: c_int::from(0),
+                sa_restorer: None, // set by platform if applicable
+                sa_mask: sigset_t::default(),
+            };
+            unsafe { sigemptyset(&raw mut sa.sa_mask) };
+            if unsafe { sigaction(sig, &raw const sa, old_sa.as_mut_ptr()) } < 0
+                || unsafe { sigprocmask(SIG_UNBLOCK, &raw const set, &raw mut set) } < 0
+            {
+                mem::forget(old_sa);
+                return sig_err;
+            }
+        }
+    }
+    if unsafe { sigismember(&raw const set, sig) } == 1 {
+        return sig_hold;
+    }
+    unsafe { old_sa.assume_init().sa_handler }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigsuspend.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigsuspend(sigmask: *const sigset_t) -> c_int {
+    Err(Sys::sigsuspend(unsafe { &*sigmask })).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigwait.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigwait(set: *const sigset_t, sig: *mut c_int) -> c_int {
+    let mut pinfo = mem::MaybeUninit::<siginfo_t>::uninit();
+    if unsafe { sigtimedwait(set, pinfo.as_mut_ptr(), ptr::null_mut()) } < 0 {
+        return -1;
+    }
+    let info = unsafe { pinfo.assume_init() };
+    unsafe { (*sig) = info.si_signo };
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigtimedwait.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigtimedwait(
+    set: *const sigset_t,
+    // s/siginfo_t/siginfo due to https://github.com/mozilla/cbindgen/issues/621
+    sig: *mut siginfo,
+    // POSIX leaves behavior unspecified if this is NULL, but on both Linux and Redox, NULL is used
+    // to differentiate between sigtimedwait and sigwaitinfo internally
+    tp: *const timespec,
+) -> c_int {
+    Sys::sigtimedwait(unsafe { &*set }, unsafe { sig.as_mut() }, unsafe {
+        tp.as_ref()
+    })
+    .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sigwaitinfo.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sigwaitinfo(set: *const sigset_t, sig: *mut siginfo_t) -> c_int {
+    unsafe { sigtimedwait(set, sig, core::ptr::null()) }
+}
+
+pub(crate) const SIGNAL_STRINGS: [&str; 32] = [
+    "Unknown signal\0",
+    "Hangup\0",
+    "Interrupt\0",
+    "Quit\0",
+    "Illegal instruction\0",
+    "Trace/breakpoint trap\0",
+    "Aborted\0",
+    "Bus error\0",
+    "Arithmetic exception\0",
+    "Killed\0",
+    "User defined signal 1\0",
+    "Segmentation fault\0",
+    "User defined signal 2\0",
+    "Broken pipe\0",
+    "Alarm clock\0",
+    "Terminated\0",
+    "Stack fault\0",
+    "Child process status\0",
+    "Continued\0",
+    "Stopped (signal)\0",
+    "Stopped\0",
+    "Stopped (tty input)\0",
+    "Stopped (tty output)\0",
+    "Urgent I/O condition\0",
+    "CPU time limit exceeded\0",
+    "File size limit exceeded\0",
+    "Virtual timer expired\0",
+    "Profiling timer expired\0",
+    "Window changed\0",
+    "I/O possible\0",
+    "Power failure\0",
+    "Bad system call\0",
+];
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/psignal.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn psignal(sig: c_int, prefix: *const c_char) {
+    let c_description = usize::try_from(sig)
+        .ok()
+        .and_then(|idx| SIGNAL_STRINGS.get(idx))
+        .unwrap_or(&SIGNAL_STRINGS[0])
+        .as_ptr();
+    // fprintf can affect errno, so we save errno and restore it
+    let old_errno = ERRNO.get();
+    // POSIX says that "prefix" shall be written if it isn't null or an empty string.
+    // Otherwise, only the signal description should be written
+    if prefix.is_null() {
+        unsafe {
+            fprintf(stderr, c"%s\n".as_ptr(), c_description);
+        }
+    } else {
+        unsafe {
+            fprintf(stderr, c"%s: %s\n".as_ptr(), prefix, c_description);
+        }
+    }
+    ERRNO.set(old_errno);
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/psiginfo.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn psiginfo(info: *const siginfo_t, prefix: *const c_char) {
+    unsafe {
+        psignal((*info).si_signo, prefix);
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbindgen_stupid_struct_sigevent_for_timer(_: sigevent) {}
diff --git a/recipes/core/relibc/src/header/signal/redox.rs b/recipes/core/relibc/src/header/signal/redox.rs
new file mode 100644
index 0000000000..0159dbdc5a
--- /dev/null
+++ b/recipes/core/relibc/src/header/signal/redox.rs
@@ -0,0 +1,197 @@
+use redox_rt::signal::SiginfoAbi;
+
+#[cfg(any(target_arch = "x86", target_arch = "aarch64", target_arch = "riscv64"))]
+use crate::platform::types::c_uchar;
+use crate::platform::types::{c_uint, c_ulong};
+
+use super::{siginfo_t, sigset_t, stack_t};
+
+pub const SIGHUP: usize = 1;
+pub const SIGINT: usize = 2;
+pub const SIGQUIT: usize = 3;
+pub const SIGILL: usize = 4;
+pub const SIGTRAP: usize = 5;
+pub const SIGABRT: usize = 6;
+pub const SIGBUS: usize = 7;
+pub const SIGFPE: usize = 8;
+pub const SIGKILL: usize = 9;
+pub const SIGUSR1: usize = 10;
+pub const SIGSEGV: usize = 11;
+pub const SIGUSR2: usize = 12;
+pub const SIGPIPE: usize = 13;
+pub const SIGALRM: usize = 14;
+pub const SIGTERM: usize = 15;
+pub const SIGSTKFLT: usize = 16;
+pub const SIGCHLD: usize = 17;
+pub const SIGCONT: usize = 18;
+pub const SIGSTOP: usize = 19;
+pub const SIGTSTP: usize = 20;
+pub const SIGTTIN: usize = 21;
+pub const SIGTTOU: usize = 22;
+pub const SIGURG: usize = 23;
+pub const SIGXCPU: usize = 24;
+pub const SIGXFSZ: usize = 25;
+pub const SIGVTALRM: usize = 26;
+pub const SIGPROF: usize = 27;
+pub const SIGWINCH: usize = 28;
+pub const SIGIO: usize = 29;
+pub const SIGPWR: usize = 30;
+pub const SIGSYS: usize = 31;
+pub const NSIG: usize = 32;
+
+pub const SIGRTMIN: usize = 35;
+pub const SIGRTMAX: usize = 64;
+
+pub const SA_NOCLDWAIT: usize = 0x0000_0002;
+pub const SA_RESTORER: usize = 0x0000_0004; // TODO: remove
+pub const SA_SIGINFO: usize = 0x0200_0000;
+pub const SA_ONSTACK: usize = 0x0400_0000;
+pub const SA_RESTART: usize = 0x0800_0000;
+pub const SA_NODEFER: usize = 0x1000_0000;
+pub const SA_RESETHAND: usize = 0x2000_0000;
+pub const SA_NOCLDSTOP: usize = 0x4000_0000;
+
+pub const SS_ONSTACK: usize = 0x00000001;
+pub const SS_DISABLE: usize = 0x00000002;
+
+const _: () = {
+    if SS_ONSTACK != redox_rt::signal::SS_ONSTACK {
+        panic!();
+    }
+    if SS_DISABLE != redox_rt::signal::SS_DISABLE {
+        panic!();
+    }
+    if MINSIGSTKSZ != redox_rt::signal::MIN_SIGALTSTACK_SIZE {
+        panic!();
+    }
+};
+
+// should include both SigStack size, and some extra room for the libc handler
+pub const MINSIGSTKSZ: usize = 2048;
+
+pub const SIGSTKSZ: usize = 8096;
+
+pub const SI_QUEUE: i32 = -1;
+pub const SI_USER: i32 = 0;
+pub const SI_TIMER: i32 = 1;
+pub const SI_ASYNCIO: i32 = 2;
+pub const SI_MESGQ: i32 = 3;
+
+// si_code values (signal-specific)
+pub const ILL_ILLOPC: i32 = 1;
+pub const ILL_ILLOPN: i32 = 2;
+pub const ILL_ILLADR: i32 = 3;
+pub const ILL_ILLTRP: i32 = 4;
+pub const ILL_PRVOPC: i32 = 5;
+pub const ILL_PRVREG: i32 = 6;
+pub const ILL_COPROC: i32 = 7;
+pub const ILL_BADSTK: i32 = 8;
+
+pub const FPE_INTDIV: i32 = 1;
+pub const FPE_INTOVF: i32 = 2;
+pub const FPE_FLTDIV: i32 = 3;
+pub const FPE_FLTOVF: i32 = 4;
+pub const FPE_FLTUND: i32 = 5;
+pub const FPE_FLTRES: i32 = 6;
+pub const FPE_FLTINV: i32 = 7;
+pub const FPE_FLTSUB: i32 = 8;
+
+pub const SEGV_MAPERR: i32 = 1;
+pub const SEGV_ACCERR: i32 = 2;
+
+pub const BUS_ADRALN: i32 = 1;
+pub const BUS_ADRERR: i32 = 2;
+pub const BUS_OBJERR: i32 = 3;
+
+pub const TRAP_BRKPT: i32 = 1;
+pub const TRAP_TRACE: i32 = 2;
+
+pub const CLD_EXITED: i32 = 1;
+pub const CLD_KILLED: i32 = 2;
+pub const CLD_DUMPED: i32 = 3;
+pub const CLD_TRAPPED: i32 = 4;
+pub const CLD_STOPPED: i32 = 5;
+pub const CLD_CONTINUED: i32 = 6;
+
+pub(crate) type ucontext_t = ucontext;
+pub(crate) type mcontext_t = mcontext;
+
+//TODO: share definition with SigStack?
+#[repr(C)]
+pub struct ucontext {
+    #[cfg(any(
+        target_arch = "x86_64",
+        target_arch = "aarch64",
+        target_arch = "riscv64"
+    ))]
+    _pad: [c_ulong; 1], // pad from 7*8 to 64
+
+    #[cfg(target_arch = "x86")]
+    _pad: [c_ulong; 3], // pad from 9*4 to 12*4
+
+    pub uc_link: *mut ucontext_t,
+    pub uc_stack: stack_t,
+    pub uc_sigmask: sigset_t,
+    _sival: c_ulong,
+    _sigcode: c_uint,
+    _signum: c_uint,
+    pub uc_mcontext: mcontext_t,
+}
+
+#[cfg(target_arch = "x86")]
+#[repr(C)]
+pub struct mcontext {
+    _opaque: [c_uchar; 512],
+}
+
+//TODO: share definition with ArchIntRegs?
+//TODO: repr(align(16))?
+#[cfg(target_arch = "x86_64")]
+#[repr(C)]
+pub struct mcontext {
+    pub ymm_upper: [[c_ulong; 2]; 16],
+    pub fxsave: [[c_ulong; 2]; 29],
+    pub r15: c_ulong, // fxsave "available" +0
+    pub r14: c_ulong, // available +8
+    pub r13: c_ulong, // available +16
+    pub r12: c_ulong, // available +24
+    pub rbp: c_ulong, // available +32
+    pub rbx: c_ulong, // available +40
+    pub r11: c_ulong, // outside fxsave, and so on
+    pub r10: c_ulong,
+    pub r9: c_ulong,
+    pub r8: c_ulong,
+    pub rax: c_ulong,
+    pub rcx: c_ulong,
+    pub rdx: c_ulong,
+    pub rsi: c_ulong,
+    pub rdi: c_ulong,
+    pub rflags: c_ulong,
+    pub rip: c_ulong,
+    pub rsp: c_ulong,
+}
+
+#[cfg(target_arch = "aarch64")]
+#[repr(C)]
+pub struct mcontext {
+    _opaque: [c_uchar; 272],
+}
+
+#[cfg(target_arch = "riscv64")]
+#[repr(C)]
+pub struct mcontext {
+    _opaque: [c_uchar; 520],
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn __completely_unused_cbindgen_workaround_fn_ucontext_mcontext(
+    a: *const ucontext_t,
+    b: *const mcontext_t,
+) {
+}
+
+impl From<SiginfoAbi> for siginfo_t {
+    fn from(value: SiginfoAbi) -> Self {
+        unsafe { core::mem::transmute(value) }
+    }
+}
diff --git a/recipes/core/relibc/src/header/stdio/cbindgen.toml b/recipes/core/relibc/src/header/stdio/cbindgen.toml
new file mode 100644
index 0000000000..7a6860140b
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/cbindgen.toml
@@ -0,0 +1,32 @@
+sys_includes = ["stdarg.h", "stddef.h", "stdint.h", "sys/types.h", "features.h"]
+include_guard = "_RELIBC_STDIO_H"
+trailer = """
+#ifndef _RELIBC_BITS_STDIO_H
+#define _RELIBC_BITS_STDIO_H
+
+// XXX: this is only here because cbindgen can't handle string constants
+#define P_tmpdir "/tmp"
+
+// TODO: figure out why this duplicate is needed to compile libiconv
+typedef struct FILE FILE;
+
+// A typedef doesn't suffice, because libgmp uses this definition to check if
+// STDIO was loaded.
+#define FILE FILE
+// Likewise, stdin, stdout, and stderr are expected to be macros.
+#define stdin stdin
+#define stdout stdout
+#define stderr stderr
+
+#endif // _RELIBC_BITS_STDIO_H
+"""
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"AtomicBool" = "volatile char"
diff --git a/recipes/core/relibc/src/header/stdio/constants.rs b/recipes/core/relibc/src/header/stdio/constants.rs
new file mode 100644
index 0000000000..ff19da78e2
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/constants.rs
@@ -0,0 +1,50 @@
+use crate::platform::types::{c_int, c_uint, int32_t, off_t};
+
+pub const EOF: c_int = -1;
+pub const BUFSIZ: c_int = 1024;
+
+pub const UNGET: c_int = 8;
+
+pub const FILENAME_MAX: c_int = 4096;
+
+pub const F_PERM: c_int = 1;
+pub const F_NORD: c_int = 4;
+pub const F_NOWR: c_int = 8;
+pub const F_EOF: c_int = 16;
+pub const F_ERR: c_int = 32;
+pub const F_SVB: c_int = 64;
+pub const F_APP: c_int = 128;
+pub const F_BADJ: c_int = 256;
+
+pub const SEEK_SET: c_int = 0;
+pub const SEEK_CUR: c_int = 1;
+pub const SEEK_END: c_int = 2;
+
+pub const _IOFBF: c_int = 0;
+pub const _IOLBF: c_int = 1;
+pub const _IONBF: c_int = 2;
+
+// renameat2
+// (uint instead of int is intentional)
+/// Rename but don't replace the target if it exists.
+pub const RENAME_NOREPLACE: c_uint = 0x01;
+/// Atomically swap two files.
+#[cfg(target_os = "linux")]
+pub const RENAME_EXCHANGE: c_uint = 0x02;
+#[cfg(target_os = "linux")]
+pub const RENAME_WHITEOUT: c_uint = 0x04;
+
+// /dev/tty + nul
+pub const L_ctermid: usize = 9;
+// form of name is /XXXXXX, so 7
+pub const L_tmpnam: c_int = 7;
+// 36^6 (26 letters + 10 digits) is larger than i32::MAX, so just set to that
+// for now
+pub const TMP_MAX: int32_t = 2_147_483_647;
+// XXX: defined manually in cbindgen as well because it can't handle
+//      string constants in any form AFAICT
+/// cbindgen:ignore
+pub const P_tmpdir: &[u8; 5] = b"/tmp\0";
+
+#[allow(non_camel_case_types)]
+pub type fpos_t = off_t;
diff --git a/recipes/core/relibc/src/header/stdio/default.rs b/recipes/core/relibc/src/header/stdio/default.rs
new file mode 100644
index 0000000000..36ef4bf5d7
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/default.rs
@@ -0,0 +1,61 @@
+use super::{BUFSIZ, Buffer, FILE, constants};
+use core::{cell::UnsafeCell, ptr};
+
+use crate::{fs::File, header::pthread, io::LineWriter, platform::types::c_int, sync::Once};
+use alloc::{boxed::Box, vec::Vec};
+
+// TODO: Change FILE to allow const fn initialization?
+pub struct GlobalFile(UnsafeCell<FILE>);
+
+impl GlobalFile {
+    fn new(file: c_int, flags: c_int) -> Self {
+        let file = File::new(file);
+        let writer = Box::new(LineWriter::new(unsafe { file.get_ref() }));
+        let mutex_attr = pthread::RlctMutexAttr {
+            ty: pthread::PTHREAD_MUTEX_RECURSIVE,
+            ..Default::default()
+        };
+        GlobalFile(UnsafeCell::new(FILE {
+            lock: pthread::RlctMutex::new(&mutex_attr).unwrap(),
+
+            file,
+            flags: constants::F_PERM | flags,
+            read_buf: Buffer::Owned(vec![0; BUFSIZ as usize]),
+            read_pos: 0,
+            read_size: 0,
+            unget: Vec::new(),
+            writer,
+
+            pid: None,
+
+            orientation: 0,
+        }))
+    }
+    pub fn get(&self) -> *mut FILE {
+        self.0.get()
+    }
+}
+// statics need to be Sync
+unsafe impl Sync for GlobalFile {}
+
+// TODO: Allow const fn initialization of FILE
+static DEFAULT_STDIN: Once<GlobalFile> = Once::new();
+static DEFAULT_STDOUT: Once<GlobalFile> = Once::new();
+static DEFAULT_STDERR: Once<GlobalFile> = Once::new();
+
+pub fn default_stdin() -> &'static GlobalFile {
+    DEFAULT_STDIN.call_once(|| GlobalFile::new(0, constants::F_NOWR))
+}
+pub fn default_stdout() -> &'static GlobalFile {
+    DEFAULT_STDOUT.call_once(|| GlobalFile::new(1, constants::F_NORD))
+}
+pub fn default_stderr() -> &'static GlobalFile {
+    DEFAULT_STDERR.call_once(|| GlobalFile::new(2, constants::F_NORD))
+}
+
+#[unsafe(no_mangle)]
+pub static mut stdin: *mut FILE = ptr::null_mut();
+#[unsafe(no_mangle)]
+pub static mut stdout: *mut FILE = ptr::null_mut();
+#[unsafe(no_mangle)]
+pub static mut stderr: *mut FILE = ptr::null_mut();
diff --git a/recipes/core/relibc/src/header/stdio/ext.rs b/recipes/core/relibc/src/header/stdio/ext.rs
new file mode 100644
index 0000000000..3156087c2f
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/ext.rs
@@ -0,0 +1,41 @@
+use crate::{
+    header::stdio::{F_NORD, F_NOWR, FILE},
+    platform::types::{c_int, size_t},
+};
+
+#[unsafe(no_mangle)]
+pub extern "C" fn __fpending(stream: *mut FILE) -> size_t {
+    let stream = unsafe { &mut *stream }.lock();
+
+    stream.writer.pending()
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn __freadable(stream: *mut FILE) -> c_int {
+    let stream = unsafe { &mut *stream }.lock();
+
+    c_int::from(stream.flags & F_NORD == 0)
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn __fwritable(stream: *mut FILE) -> c_int {
+    let stream = unsafe { &mut *stream }.lock();
+
+    c_int::from(stream.flags & F_NOWR == 0)
+}
+
+//TODO: Check last operation when read-write
+#[unsafe(no_mangle)]
+pub extern "C" fn __freading(stream: *mut FILE) -> c_int {
+    let stream = unsafe { &mut *stream }.lock();
+
+    c_int::from(stream.flags & F_NORD == 0)
+}
+
+//TODO: Check last operation when read-write
+#[unsafe(no_mangle)]
+pub extern "C" fn __fwriting(stream: *mut FILE) -> c_int {
+    let stream = unsafe { &mut *stream }.lock();
+
+    c_int::from(stream.flags & F_NOWR == 0)
+}
diff --git a/recipes/core/relibc/src/header/stdio/getdelim.rs b/recipes/core/relibc/src/header/stdio/getdelim.rs
new file mode 100644
index 0000000000..145aa25b31
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/getdelim.rs
@@ -0,0 +1,145 @@
+// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getline.html>.
+
+use alloc::vec::Vec;
+use core::{intrinsics::unlikely, ptr};
+
+use crate::{
+    header::{
+        errno::{EINVAL, ENOMEM, EOVERFLOW},
+        stdio::FILE,
+        stdlib,
+    },
+    io::BufRead,
+    platform::types::{c_char, c_int, c_void, size_t, ssize_t},
+};
+
+use crate::{
+    header::stdio::{F_EOF, F_ERR, feof, ferror},
+    platform::ERRNO,
+};
+
+/// see getdelim (getline is a special case of getdelim with delim == '\n')
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getline(
+    lineptr: *mut *mut c_char,
+    n: *mut size_t,
+    stream: *mut FILE,
+) -> ssize_t {
+    unsafe { getdelim(lineptr, n, c_int::from(b'\n'), stream) }
+}
+
+// One *could* read the standard as 'getdelim sets the stream error flag on *any* error, though
+// since glibc doesn't seem to do this, I won't either
+
+/// <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getline.html>
+///
+/// # Safety
+/// - `lineptr, *lineptr, `n`, `stream` pointers must be valid and have to be aligned.
+/// - `stream` has to be a valid file handle returned by fopen and likes.
+///
+/// # Deviation from POSIX
+/// - **EINVAL is set on stream being NULL or delim not fitting into char** (POSIX allows UB)
+/// - **`*n` can contain invalid data.** The buffer size `n` is not read, instead realloc is called each time. That is in principle
+///   inefficent since the buffer is reallocated in memory for every call, but if `n` is by mistake
+///   bigger than the number of bytes allocated for the buffer, there can be no out-of-bounds write.
+/// - On non-stream-related errors, the error indicator of the stream is *not* set. Posix states
+///   "If an error occurs, the error indicator for the stream shall be set, and the function shall
+///   return -1 and set errno to indicate the error." but in cases that produce EINVAL even glibc
+///   doesn't seem to set the error indicator, so we also don't.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getdelim(
+    lineptr: *mut *mut c_char,
+    n: *mut size_t,
+    delim: c_int,
+    stream: *mut FILE,
+) -> ssize_t {
+    let (lineptr, n, stream) = if let (Some(ptr), Some(n), Some(file)) =
+        (unsafe { lineptr.as_mut() }, unsafe { n.as_mut() }, unsafe {
+            stream.as_mut()
+        }) {
+        (ptr, n, file)
+    } else {
+        ERRNO.set(EINVAL);
+        return -1 as ssize_t;
+    };
+
+    if unsafe { feof(stream) } != 0 || unsafe { ferror(stream) } != 0 {
+        return -1 as ssize_t;
+    }
+
+    // POSIX specifies UB but we test anyway
+    // returning EINVAL in that case
+    let delim: u8 = if let Ok(delim) = delim.try_into() {
+        delim
+    } else {
+        ERRNO.set(EINVAL);
+        return -1;
+    };
+
+    //TODO: More efficient algorithm using lineptr and n instead of this vec
+    let mut buf = Vec::new();
+    let count = {
+        let mut stream = (*stream).lock();
+        match stream.read_until(delim, &mut buf) {
+            Ok(ok) => ok,
+            Err(err) => {
+                stream.flags &= F_ERR;
+                return -1;
+            }
+        }
+    };
+
+    // "[EOVERFLOW]
+    // The number of bytes to be written into the buffer, including the delimiter character (if encountered), would exceed {SSIZE_MAX}."
+    if unlikely(count > ssize_t::MAX as usize) {
+        ERRNO.set(EOVERFLOW);
+        return -1;
+    }
+
+    // we reached EOF if either
+    // - we have no last elem (because vec is empty), or
+    // - the last elem doesn't match the delimiter
+    let eof_reached = if let Some(last) = buf.last() {
+        *last == delim
+    } else {
+        true
+    };
+
+    // "If the end-of-file indicator for the stream is set, or if no characters were read and the
+    // stream is at end-of-file, the end-of-file indicator for the stream shall be set and the
+    // function shall return -1."
+    if eof_reached {
+        stream.flags &= F_EOF;
+        if count == 0 {
+            return -1;
+        }
+    }
+
+    //TODO: Check errors and improve safety
+    {
+        // Allocate lineptr to size of buf plus NUL byte and set n to size of lineptr
+        *n = count + 1;
+        // The advantage in always realloc'ing is that even if the user supplies a wrong n, this
+        // doesn't break
+        *lineptr = unsafe { stdlib::realloc((*lineptr).cast::<c_void>(), *n) }.cast::<c_char>();
+        if unlikely(lineptr.is_null() && *n != 0usize) {
+            // memory error; realloc returns NULL on alloc'ing 0 bytes
+            ERRNO.set(ENOMEM);
+            return -1;
+        }
+
+        // Copy buf to lineptr
+        unsafe { ptr::copy(buf.as_ptr(), (*lineptr).cast::<u8>(), count) };
+
+        // NUL terminate lineptr
+        unsafe { *lineptr.add(count) = 0 };
+
+        // TODO remove
+        /*eprintln!(
+            "[DBG]{}: {}, {:?}, {:?}, {:?}", line!(),
+            String::from_utf8(buf).unwrap(), count, *n, *lineptr
+        );*/
+        // Return allocated size
+        count as ssize_t
+    }
+}
diff --git a/recipes/core/relibc/src/header/stdio/helpers.rs b/recipes/core/relibc/src/header/stdio/helpers.rs
new file mode 100644
index 0000000000..d070673b0a
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/helpers.rs
@@ -0,0 +1,97 @@
+use alloc::boxed::Box;
+
+use super::{
+    Buffer, FILE,
+    constants::{BUFSIZ, F_APP, F_NORD, F_NOWR},
+};
+use crate::{
+    c_str::CStr,
+    error::Errno,
+    fs::File,
+    header::{
+        errno::EINVAL,
+        fcntl::{
+            F_GETFL, F_SETFD, F_SETFL, FD_CLOEXEC, O_APPEND, O_CLOEXEC, O_CREAT, O_EXCL, O_RDONLY,
+            O_RDWR, O_TRUNC, O_WRONLY, fcntl,
+        },
+        pthread,
+    },
+    io::BufWriter,
+    platform::types::{c_int, c_ulonglong},
+};
+use alloc::vec::Vec;
+
+/// Parse mode flags as a string and output a mode flags integer
+pub fn parse_mode_flags(mode_str: CStr) -> i32 {
+    let mut flags = if mode_str.contains(b'+') {
+        O_RDWR
+    } else if mode_str.first() == b'r' {
+        O_RDONLY
+    } else {
+        O_WRONLY
+    };
+    if mode_str.contains(b'x') {
+        flags |= O_EXCL;
+    }
+    if mode_str.contains(b'e') {
+        flags |= O_CLOEXEC;
+    }
+    if mode_str.first() != b'r' {
+        flags |= O_CREAT;
+    }
+    if mode_str.first() == b'w' {
+        flags |= O_TRUNC;
+    } else if mode_str.first() == b'a' {
+        flags |= O_APPEND;
+    }
+
+    flags
+}
+
+/// Open a file with the file descriptor `fd` in the mode `mode`
+pub fn _fdopen(fd: c_int, mode: CStr) -> Result<Box<FILE>, Errno> {
+    if mode.first() != b'r' && mode.first() != b'w' && mode.first() != b'a' {
+        return Err(Errno(EINVAL));
+    }
+
+    let mut flags = 0;
+    if !mode.contains(b'+') {
+        flags |= if mode.first() == b'r' { F_NOWR } else { F_NORD };
+    }
+
+    if mode.contains(b'e') {
+        unsafe {
+            fcntl(fd, F_SETFD, FD_CLOEXEC as c_ulonglong);
+        }
+    }
+
+    if mode.first() == b'a' {
+        let f = unsafe { fcntl(fd, F_GETFL, 0) };
+        if (f & O_APPEND) == 0 {
+            unsafe { fcntl(fd, F_SETFL, (f | O_APPEND) as c_ulonglong) };
+        }
+        flags |= F_APP;
+    }
+
+    let file = File::new(fd);
+    let writer = Box::new(BufWriter::new(unsafe { file.get_ref() }));
+    let mutex_attr = pthread::RlctMutexAttr {
+        ty: pthread::PTHREAD_MUTEX_RECURSIVE,
+        ..Default::default()
+    };
+    Ok(Box::new(FILE {
+        lock: pthread::RlctMutex::new(&mutex_attr).unwrap(),
+
+        file,
+        flags,
+        read_buf: Buffer::Owned(vec![0; BUFSIZ as usize]),
+        read_pos: 0,
+        read_size: 0,
+        unget: Vec::new(),
+        writer,
+
+        pid: None,
+
+        orientation: 0,
+    }))
+}
diff --git a/recipes/core/relibc/src/header/stdio/mod.rs b/recipes/core/relibc/src/header/stdio/mod.rs
new file mode 100644
index 0000000000..a1d43be6c4
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/mod.rs
@@ -0,0 +1,1604 @@
+//! `stdio.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdio.h.html>.
+
+use alloc::{
+    borrow::{Borrow, BorrowMut},
+    boxed::Box,
+    vec::Vec,
+};
+use core::{
+    cmp,
+    ffi::VaList as va_list,
+    fmt::{self, Write as WriteFmt},
+    mem,
+    ops::{Deref, DerefMut},
+    ptr, slice, str,
+};
+
+use crate::{
+    c_str::{CStr, Thin},
+    c_vec::CVec,
+    error::{ResultExt, ResultExtPtrMut},
+    fs::File,
+    header::{
+        errno::{self, STR_ERROR},
+        fcntl,
+        pthread::RlctMutex,
+        pwd, stdlib,
+        string::{self, strlen, strncpy},
+        unistd,
+    },
+    io::{self, BufRead, BufWriter, LineWriter, Read, Write},
+    out::Out,
+    platform::{
+        self, ERRNO, Pal, Sys, WriteByte,
+        types::{c_char, c_int, c_long, c_uint, c_ulonglong, c_void, off_t, size_t},
+    },
+};
+use reader::Reader;
+
+pub use self::constants::*;
+mod constants;
+
+pub use self::default::*;
+mod default;
+
+pub use self::getdelim::*;
+mod getdelim;
+
+mod ext;
+mod helpers;
+pub mod printf;
+pub mod reader;
+pub mod scanf;
+static mut TMPNAM_BUF: [c_char; L_tmpnam as usize + 1] = [0; L_tmpnam as usize + 1];
+
+enum Buffer<'a> {
+    Borrowed(&'a mut [u8]),
+    Owned(Vec<u8>),
+}
+
+impl<'a> Deref for Buffer<'a> {
+    type Target = [u8];
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            Buffer::Borrowed(inner) => inner,
+            Buffer::Owned(inner) => inner.borrow(),
+        }
+    }
+}
+
+impl<'a> DerefMut for Buffer<'a> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            Buffer::Borrowed(inner) => inner,
+            Buffer::Owned(inner) => inner.borrow_mut(),
+        }
+    }
+}
+
+pub trait Pending {
+    fn pending(&self) -> size_t;
+}
+
+impl<W: crate::io::Write> Pending for BufWriter<W> {
+    fn pending(&self) -> size_t {
+        self.buf.len() as size_t
+    }
+}
+
+impl<W: crate::io::Write> Pending for LineWriter<W> {
+    fn pending(&self) -> size_t {
+        self.inner.buf.len() as size_t
+    }
+}
+
+pub trait Writer: Write + Pending {
+    fn purge(&mut self);
+}
+
+impl<W: crate::io::Write> Writer for BufWriter<W> {
+    fn purge(&mut self) {
+        self.buf.clear();
+    }
+}
+
+impl<W: crate::io::Write> Writer for LineWriter<W> {
+    fn purge(&mut self) {
+        self.inner.buf.clear();
+    }
+}
+
+/// This struct gets exposed to the C API.
+pub struct FILE {
+    lock: RlctMutex,
+
+    file: File,
+    // pub for stdio_ext
+    pub(crate) flags: c_int,
+
+    // TODO: Is the read_buf dropped?
+    read_buf: Buffer<'static>,
+
+    read_pos: usize,
+    read_size: usize,
+    unget: Vec<u8>,
+    // pub for stdio_ext
+
+    // TODO: To support const fn initialization, use static dispatch (perhaps partially)?
+    pub(crate) writer: Box<dyn Writer + Send>,
+
+    // Optional pid for use with popen/pclose
+    pid: Option<c_int>,
+
+    // wchar support
+    pub(crate) orientation: c_int,
+}
+
+impl Read for FILE {
+    fn read(&mut self, out: &mut [u8]) -> io::Result<usize> {
+        let unget_read_size = cmp::min(out.len(), self.unget.len());
+        for inner in out.iter_mut().take(unget_read_size) {
+            *inner = self.unget.pop().unwrap();
+        }
+        if unget_read_size != 0 {
+            return Ok(unget_read_size);
+        }
+
+        let len = {
+            let buf = self.fill_buf()?;
+            let len = buf.len().min(out.len());
+
+            out[..len].copy_from_slice(&buf[..len]);
+            len
+        };
+        self.consume(len);
+        Ok(len)
+    }
+}
+
+impl BufRead for FILE {
+    fn fill_buf(&mut self) -> io::Result<&[u8]> {
+        if self.read_pos == self.read_size {
+            self.read_size = match self.file.read(&mut self.read_buf) {
+                Ok(0) => {
+                    self.flags |= F_EOF;
+                    0
+                }
+                Ok(n) => n,
+                Err(err) => {
+                    self.flags |= F_ERR;
+                    return Err(err);
+                }
+            };
+            self.read_pos = 0;
+        }
+        Ok(&self.read_buf[self.read_pos..self.read_size])
+    }
+    fn consume(&mut self, i: usize) {
+        self.read_pos = (self.read_pos + i).min(self.read_size);
+    }
+}
+
+impl Write for FILE {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        match self.writer.write(buf) {
+            Ok(n) => Ok(n),
+            Err(err) => {
+                self.flags |= F_ERR;
+                Err(err)
+            }
+        }
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        match self.writer.flush() {
+            Ok(()) => Ok(()),
+            Err(err) => {
+                self.flags |= F_ERR;
+                Err(err)
+            }
+        }
+    }
+}
+
+impl WriteFmt for FILE {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        self.write_all(s.as_bytes())
+            .map(|_| ())
+            .map_err(|_| fmt::Error)
+    }
+}
+
+impl WriteByte for FILE {
+    fn write_u8(&mut self, c: u8) -> fmt::Result {
+        self.write_all(&[c]).map(|_| ()).map_err(|_| fmt::Error)
+    }
+}
+
+impl FILE {
+    pub fn lock(&mut self) -> LockGuard<'_> {
+        unsafe {
+            flockfile(self);
+        }
+        LockGuard(self)
+    }
+
+    pub fn try_set_orientation(&mut self, mode: c_int) -> c_int {
+        let stream = self.lock();
+        stream.0.try_set_orientation_unlocked(mode)
+    }
+
+    pub fn try_set_orientation_unlocked(&mut self, mode: c_int) -> c_int {
+        if self.orientation == 0 {
+            self.orientation = match mode {
+                1..=i32::MAX => 1,
+                i32::MIN..=-1 => -1,
+                0 => self.orientation,
+            };
+        }
+        self.orientation
+    }
+
+    pub fn try_set_byte_orientation_unlocked(&mut self) -> core::result::Result<(), c_int> {
+        match self.try_set_orientation_unlocked(-1) {
+            i32::MIN..=-1 => Ok(()),
+            x => Err(x),
+        }
+    }
+
+    pub fn try_set_wide_orientation_unlocked(&mut self) -> core::result::Result<(), c_int> {
+        match self.try_set_orientation_unlocked(1) {
+            1..=i32::MAX => Ok(()),
+            x => Err(x),
+        }
+    }
+
+    pub fn purge(&mut self) {
+        // Purge read buffer
+        self.read_pos = 0;
+        self.read_size = 0;
+        // Purge unget
+        self.unget.clear();
+        // Purge write buffer
+        self.writer.purge();
+    }
+}
+
+pub struct LockGuard<'a>(&'a mut FILE);
+
+impl<'a> Deref for LockGuard<'a> {
+    type Target = FILE;
+
+    fn deref(&self) -> &Self::Target {
+        self.0
+    }
+}
+
+impl<'a> DerefMut for LockGuard<'a> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.0
+    }
+}
+
+impl<'a> Drop for LockGuard<'a> {
+    fn drop(&mut self) {
+        unsafe {
+            funlockfile(self.0);
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/clearerr.html>.
+///
+/// Clears EOF and ERR indicators on a stream
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn clearerr(stream: *mut FILE) {
+    let mut stream = unsafe { (*stream).lock() };
+    stream.flags &= !(F_EOF | F_ERR);
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ctermid.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ctermid(s: *mut c_char) -> *mut c_char {
+    static mut TERMID: [u8; L_ctermid] = *b"/dev/tty\0";
+
+    if s.is_null() {
+        return (&raw mut TERMID).cast::<c_char>();
+    }
+
+    unsafe { strncpy(s, (&raw mut TERMID).cast::<c_char>(), L_ctermid) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/cuserid.html>
+///
+/// Marked legacy in SUS Version 2.
+// #[unsafe(no_mangle)]
+#[deprecated]
+pub unsafe extern "C" fn cuserid(s: *mut c_char) -> *mut c_char {
+    let mut buf: Vec<c_char> = vec![0; 256];
+    let mut pwd: pwd::passwd = unsafe { mem::zeroed() };
+    let mut pwdbuf: *mut pwd::passwd = unsafe { mem::zeroed() };
+    if !s.is_null() {
+        unsafe {
+            *s.add(0) = 0;
+        }
+    }
+    unsafe {
+        pwd::getpwuid_r(
+            unistd::geteuid(),
+            &raw mut pwd,
+            buf.as_mut_ptr(),
+            buf.len(),
+            &raw mut pwdbuf,
+        )
+    };
+    if pwdbuf.is_null() {
+        return s;
+    }
+
+    if !s.is_null() {
+        unsafe { strncpy(s, (*pwdbuf).pw_name, unistd::L_cuserid) };
+        return s;
+    }
+
+    unsafe { (*pwdbuf).pw_name }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fclose.html>.
+///
+/// Close a file
+/// This function does not guarentee that the file buffer will be flushed or that the file
+/// descriptor will be closed, so if it is important that the file be written to, use `fflush()`
+/// prior to using this function.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fclose(stream: *mut FILE) -> c_int {
+    let stream = unsafe { &mut *stream };
+    unsafe { flockfile(stream) };
+
+    let mut r = stream.flush().is_err();
+    // TODO: better error handling
+    let close = Sys::close(*stream.file).map(|()| 0).or_minus_one_errno() == -1;
+    r = r || close;
+
+    if stream.flags & constants::F_PERM == 0 {
+        // Not one of stdin, stdout or stderr
+        let mut stream = unsafe { Box::from_raw(stream) };
+        // Reference files aren't closed on drop, so pretend to be a reference
+        stream.file.reference = true;
+    } else {
+        unsafe { funlockfile(stream) };
+    }
+
+    c_int::from(r)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fdopen.html>.
+///
+/// Open a file from a file descriptor
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fdopen(fildes: c_int, mode: *const c_char) -> *mut FILE {
+    helpers::_fdopen(fildes, unsafe { CStr::from_ptr(mode) })
+        .map(Box::into_raw)
+        .or_errno_null_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/feof.html>.
+///
+/// Check for EOF
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn feof(stream: *mut FILE) -> c_int {
+    let stream = unsafe { (*stream).lock() };
+    stream.flags & F_EOF
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ferror.html>.
+///
+/// Check for ERR
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ferror(stream: *mut FILE) -> c_int {
+    let stream = unsafe { (*stream).lock() };
+    stream.flags & F_ERR
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fflush.html>.
+///
+/// Flush output to stream, or sync read position
+/// Ensure the file is unlocked before calling this function, as it will attempt to lock the file
+/// itself.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fflush(stream: *mut FILE) -> c_int {
+    if stream.is_null() {
+        //TODO: flush all files!
+
+        if unsafe { fflush(stdout) } != 0 {
+            return EOF;
+        }
+
+        if unsafe { fflush(stderr) } != 0 {
+            return EOF;
+        }
+    } else {
+        let mut stream = unsafe { (*stream).lock() };
+        if stream.flush().is_err() {
+            return EOF;
+        }
+    }
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fgetc.html>.
+///
+/// Get a single char from a stream
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fgetc(stream: *mut FILE) -> c_int {
+    let mut stream = unsafe { (*stream).lock() };
+    if (*stream).try_set_byte_orientation_unlocked().is_err() {
+        return -1;
+    }
+
+    unsafe { getc_unlocked(&raw mut *stream) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fgetpos.html>.
+///
+/// Get the position of the stream and store it in pos
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fgetpos(stream: *mut FILE, pos: *mut fpos_t) -> c_int {
+    let off = unsafe { ftello(stream) };
+    if off < 0 {
+        return -1;
+    }
+    unsafe { *pos = off };
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fgets.html>.
+///
+/// Get a string from the stream
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fgets(
+    original: *mut c_char,
+    max: c_int,
+    stream: *mut FILE,
+) -> *mut c_char {
+    let mut stream = unsafe { (*stream).lock() };
+    if (*stream).try_set_byte_orientation_unlocked().is_err() {
+        return ptr::null_mut();
+    }
+
+    let mut out = original;
+    let max = max as usize;
+    let mut left = max.saturating_sub(1); // Make space for the terminating NUL-byte
+    let mut wrote = false;
+
+    if left >= 1 {
+        let unget_read_size = cmp::min(left, stream.unget.len());
+        for _ in 0..unget_read_size {
+            unsafe { *out = stream.unget.pop().unwrap() as c_char };
+            out = unsafe { out.offset(1) };
+        }
+        left -= unget_read_size;
+    }
+
+    loop {
+        if left == 0 {
+            break;
+        }
+
+        // TODO: When NLL is a thing, this block can be flattened out
+        let (read, exit) = {
+            let buf = match stream.fill_buf() {
+                Ok(buf) => buf,
+                Err(_) => return ptr::null_mut(),
+            };
+            if buf.is_empty() {
+                break;
+            }
+            wrote = true;
+            let len = buf.len().min(left);
+
+            let newline = buf[..len].iter().position(|&c| c == b'\n');
+            let len = newline.map(|i| i + 1).unwrap_or(len);
+
+            unsafe { ptr::copy_nonoverlapping(buf.as_ptr(), out.cast::<u8>(), len) };
+
+            (len, newline.is_some())
+        };
+
+        stream.consume(read);
+
+        out = unsafe { out.add(read) };
+        left -= read;
+
+        if exit {
+            break;
+        }
+    }
+
+    if max >= 1 {
+        // Write the NUL byte
+        unsafe { *out = 0 };
+    }
+    if wrote { original } else { ptr::null_mut() }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fileno.html>.
+///
+/// Get the underlying file descriptor
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fileno(stream: *mut FILE) -> c_int {
+    let stream = unsafe { (*stream).lock() };
+    *stream.file
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/flockfile.html>.
+///
+/// Lock the file
+/// Do not call any functions other than those with the `_unlocked` postfix while the file is
+/// locked
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn flockfile(file: *mut FILE) {
+    if let Err(e) = unsafe { (*file).lock.lock() } {
+        todo_error!(0, e, "flockfile error")
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fopen.html>.
+///
+/// Open the file in mode `mode`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE {
+    let initial_mode = unsafe { *mode };
+    if initial_mode != b'r' as c_char
+        && initial_mode != b'w' as c_char
+        && initial_mode != b'a' as c_char
+    {
+        platform::ERRNO.set(errno::EINVAL);
+        return ptr::null_mut();
+    }
+
+    let flags = helpers::parse_mode_flags(unsafe { CStr::from_ptr(mode) });
+
+    let new_mode = if flags & fcntl::O_CREAT == fcntl::O_CREAT {
+        0o666
+    } else {
+        0
+    };
+
+    let fd = unsafe { fcntl::open(filename, flags, new_mode) };
+    if fd < 0 {
+        return ptr::null_mut();
+    }
+
+    if flags & fcntl::O_CLOEXEC > 0 {
+        unsafe { fcntl::fcntl(fd, fcntl::F_SETFD, fcntl::FD_CLOEXEC as c_ulonglong) };
+    }
+
+    helpers::_fdopen(fd, unsafe { CStr::from_ptr(mode) })
+        .map(Box::into_raw)
+        .inspect_err(|err| {
+            // TODO: guard type
+            if let Ok(()) = Sys::close(fd) {}; // TODO handle error
+        })
+        .or_errno_null_mut()
+}
+
+/// See <https://www.man7.org/linux/man-pages/man3/fpurge.3.html>.
+///
+/// Non-POSIX. From Solaris.
+///
+/// Clear the buffers of a stream
+/// Ensure the file is unlocked before calling this function, as it will attempt to lock the file
+/// itself.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __fpurge(stream: *mut FILE) {
+    if !stream.is_null() {
+        let mut stream = unsafe { (*stream).lock() };
+        stream.purge();
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fputc.html>.
+///
+/// Insert a character into the stream
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fputc(c: c_int, stream: *mut FILE) -> c_int {
+    let mut stream = unsafe { (*stream).lock() };
+    if (*stream).try_set_byte_orientation_unlocked().is_err() {
+        return -1;
+    }
+
+    unsafe { putc_unlocked(c, &raw mut *stream) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fputs.html>.
+///
+/// Insert a string into a stream
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fputs(s: *const c_char, stream: *mut FILE) -> c_int {
+    let mut stream = unsafe { (*stream).lock() };
+    if (*stream).try_set_byte_orientation_unlocked().is_err() {
+        return -1;
+    }
+
+    let buf = unsafe { slice::from_raw_parts(s as *mut u8, strlen(s)) };
+
+    if stream.write_all(buf).is_ok() { 0 } else { -1 }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fread.html>.
+///
+/// Read `nitems` of size `size` into `ptr` from `stream`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fread(
+    ptr: *mut c_void,
+    size: size_t,
+    nitems: size_t,
+    stream: *mut FILE,
+) -> size_t {
+    if size == 0 || nitems == 0 {
+        return 0;
+    }
+
+    let mut stream = unsafe { (*stream).lock() };
+    if (*stream).try_set_byte_orientation_unlocked().is_err() {
+        return 0;
+    }
+
+    let buf = unsafe { slice::from_raw_parts_mut(ptr.cast::<u8>(), size * nitems) };
+    let mut read = 0;
+    while read < buf.len() {
+        match stream.read(&mut buf[read..]) {
+            Ok(0) | Err(_) => break,
+            Ok(n) => read += n,
+        }
+    }
+    (read / size) as size_t
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/freopen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn freopen(
+    filename: *const c_char,
+    mode: *const c_char,
+    stream: &mut FILE,
+) -> *mut FILE {
+    let mut flags = helpers::parse_mode_flags(unsafe { CStr::from_ptr(mode) });
+    unsafe { flockfile(stream) };
+
+    let _ = stream.flush();
+    if filename.is_null() {
+        // Reopen stream in new mode
+        if flags & fcntl::O_CLOEXEC > 0 {
+            unsafe {
+                fcntl::fcntl(
+                    *stream.file,
+                    fcntl::F_SETFD,
+                    fcntl::FD_CLOEXEC as c_ulonglong,
+                )
+            };
+        }
+        flags &= !(fcntl::O_CREAT | fcntl::O_EXCL | fcntl::O_CLOEXEC);
+        if unsafe { fcntl::fcntl(*stream.file, fcntl::F_SETFL, flags as c_ulonglong) } < 0 {
+            unsafe { funlockfile(stream) };
+            unsafe { fclose(stream) };
+            return ptr::null_mut();
+        }
+    } else {
+        let new = unsafe { fopen(filename, mode) };
+        if new.is_null() {
+            unsafe { funlockfile(stream) };
+            unsafe { fclose(stream) };
+            return ptr::null_mut();
+        }
+        let new = unsafe { &mut *new }; // Should be safe, new is not null
+        if *new.file == *stream.file {
+            new.file.fd = -1;
+        } else if Sys::dup2(*new.file, *stream.file).or_minus_one_errno() == -1
+            || unsafe {
+                fcntl::fcntl(
+                    *stream.file,
+                    fcntl::F_SETFL,
+                    (flags & fcntl::O_CLOEXEC) as c_ulonglong,
+                )
+            } < 0
+        {
+            unsafe { funlockfile(stream) };
+            unsafe { fclose(new) };
+            unsafe { fclose(stream) };
+            return ptr::null_mut();
+        }
+        stream.flags = (stream.flags & constants::F_PERM) | new.flags;
+        unsafe { fclose(new) };
+    }
+    stream.orientation = 0;
+    unsafe { funlockfile(stream) };
+    stream
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fseek.html>.
+///
+/// Seek to an offset `offset` from `whence`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fseek(stream: *mut FILE, offset: c_long, whence: c_int) -> c_int {
+    unsafe { fseeko(stream, offset as off_t, whence) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fseek.html>.
+///
+/// Seek to an offset `offset` from `whence`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fseeko(stream: *mut FILE, off: off_t, whence: c_int) -> c_int {
+    let mut stream = unsafe { (*stream).lock() };
+    unsafe { fseek_locked(&mut stream, off, whence) }
+}
+
+pub unsafe fn fseek_locked(stream: &mut FILE, mut off: off_t, whence: c_int) -> c_int {
+    if whence == SEEK_CUR {
+        // Since it's a buffered writer, our actual cursor isn't where the user
+        // thinks
+        off -= (stream.read_size - stream.read_pos) as off_t;
+    }
+
+    // Flush write buffer before seek
+    if stream.flush().is_err() {
+        return -1;
+    }
+
+    let err = Sys::lseek(*stream.file, off, whence).or_minus_one_errno();
+    if err < 0 {
+        return err as c_int;
+    }
+
+    stream.flags &= !(F_EOF | F_ERR);
+    stream.read_pos = 0;
+    stream.read_size = 0;
+    stream.unget = Vec::new();
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fsetpos.html>.
+///
+/// Seek to a position `pos` in the file from the beginning of the file
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fsetpos(stream: *mut FILE, pos: *const fpos_t) -> c_int {
+    unsafe { fseeko(stream, *pos, SEEK_SET) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ftell.html>.
+///
+/// Get the current position of the cursor in the file
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ftell(stream: *mut FILE) -> c_long {
+    unsafe { ftello(stream) as c_long }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ftell.html>.
+///
+/// Get the current position of the cursor in the file
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ftello(stream: *mut FILE) -> off_t {
+    let mut stream = unsafe { (*stream).lock() };
+    unsafe { ftell_locked(&mut stream) }
+}
+
+pub unsafe extern "C" fn ftell_locked(stream: &mut FILE) -> off_t {
+    let pos = Sys::lseek(*stream.file, 0, SEEK_CUR).or_minus_one_errno();
+    if pos < 0 {
+        return -1;
+    }
+
+    // Adjust for read buffer, ungetc, and write buffer
+    pos - (stream.read_size - stream.read_pos) as off_t - stream.unget.len() as off_t
+        + stream.writer.pending() as off_t
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/flockfile.html>.
+///
+/// Try to lock the file. Returns 0 for success, 1 for failure
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ftrylockfile(file: *mut FILE) -> c_int {
+    if unsafe { (*file).lock.try_lock() }.is_ok() {
+        0
+    } else {
+        1
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/flockfile.html>.
+///
+/// Unlock the file
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn funlockfile(file: *mut FILE) {
+    if let Err(e) = unsafe { (*file).lock.unlock() } {
+        todo_error!(0, e, "RELIBC: funlockfile error")
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fwrite.html>.
+///
+/// Write `nitems` of size `size` from `ptr` to `stream`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fwrite(
+    ptr: *const c_void,
+    size: size_t,
+    nitems: size_t,
+    stream: *mut FILE,
+) -> size_t {
+    if size == 0 || nitems == 0 {
+        return 0;
+    }
+    let mut stream = unsafe { (*stream).lock() };
+    if (*stream).try_set_byte_orientation_unlocked().is_err() {
+        return 0;
+    }
+
+    let buf = unsafe { slice::from_raw_parts(ptr.cast::<u8>(), size * nitems) };
+    let mut written = 0;
+    while written < buf.len() {
+        match stream.write(&buf[written..]) {
+            Ok(0) | Err(_) => break,
+            Ok(n) => written += n,
+        }
+    }
+    (written / size) as size_t
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getc.html>.
+///
+/// Get a single char from a stream
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getc(stream: *mut FILE) -> c_int {
+    let mut stream = unsafe { (*stream).lock() };
+    unsafe { getc_unlocked(&raw mut *stream) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getchar.html>.
+///
+/// Get a single char from `stdin`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getchar() -> c_int {
+    unsafe { fgetc(&raw mut *stdin) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getc_unlocked.html>.
+///
+/// Get a char from a stream without locking the stream
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getc_unlocked(stream: *mut FILE) -> c_int {
+    if unsafe { (*stream).try_set_byte_orientation_unlocked() }.is_err() {
+        return -1;
+    }
+
+    let mut buf = [0];
+
+    match unsafe { (*stream).read(&mut buf) } {
+        Ok(0) | Err(_) => EOF,
+        Ok(_) => c_int::from(buf[0]),
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getc_unlocked.html>.
+///
+/// Get a char from `stdin` without locking `stdin`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getchar_unlocked() -> c_int {
+    unsafe { getc_unlocked(&raw mut *stdin) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/gets.html>.
+///
+/// Marked obsolescent in issue 7.
+/// `fgets` is recommended instead, which is what this implementation calls.
+///
+/// Get a string from `stdin`
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn gets(s: *mut c_char) -> *mut c_char {
+    unsafe { fgets(s, c_int::MAX, &raw mut *stdin) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/getw.html>.
+///
+/// Was marked legacy and removed in issue 6.
+///
+/// Get an integer from `stream`
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getw(stream: *mut FILE) -> c_int {
+    let mut ret: c_int = 0;
+    if unsafe {
+        fread(
+            ptr::from_mut(&mut ret).cast::<c_void>(),
+            mem::size_of_val(&ret),
+            1,
+            stream,
+        )
+    } > 0
+    {
+        ret
+    } else {
+        -1
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pclose.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pclose(stream: *mut FILE) -> c_int {
+    // TODO: rusty error handling?
+    let pid = {
+        let mut stream = unsafe { (*stream).lock() };
+
+        if let Some(pid) = stream.pid.take() {
+            pid
+        } else {
+            ERRNO.set(errno::ECHILD);
+            return -1;
+        }
+    };
+
+    unsafe { fclose(stream) };
+
+    let mut wstatus = 0;
+    if Sys::waitpid(pid, Some(Out::from_mut(&mut wstatus)), 0).or_minus_one_errno() == -1 {
+        return -1;
+    }
+
+    wstatus
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/perror.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn perror(s: *const c_char) {
+    let err = ERRNO.get();
+    let err_str = if err >= 0 && err < STR_ERROR.len() as c_int {
+        STR_ERROR[err as usize]
+    } else {
+        "Unknown error"
+    };
+    let mut w = platform::FileWriter::new(2);
+
+    // The prefix, `s`, is optional (empty or NULL) according to the spec
+    match unsafe { CStr::from_nullable_ptr(s) }
+        .and_then(|s_cstr| str::from_utf8(s_cstr.to_bytes()).ok())
+    {
+        Some(s_str) if !s_str.is_empty() => w
+            .write_fmt(format_args!("{}: {}\n", s_str, err_str))
+            .unwrap(),
+        _ => w.write_fmt(format_args!("{}\n", err_str)).unwrap(),
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/popen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn popen(command: *const c_char, mode: *const c_char) -> *mut FILE {
+    //TODO: share code with system
+
+    let mode = unsafe { CStr::from_ptr(mode) };
+
+    let mut cloexec = false;
+    let mut write_opt = None;
+    for b in mode.to_bytes().iter() {
+        match b {
+            b'e' => cloexec = true,
+            b'r' if write_opt.is_none() => write_opt = Some(false),
+            b'w' if write_opt.is_none() => write_opt = Some(true),
+            _ => {
+                ERRNO.set(errno::EINVAL);
+                return ptr::null_mut();
+            }
+        }
+    }
+
+    let write = match write_opt {
+        Some(some) => some,
+        None => {
+            ERRNO.set(errno::EINVAL);
+            return ptr::null_mut();
+        }
+    };
+
+    let mut pipes = [-1, -1];
+    if unsafe { unistd::pipe(pipes.as_mut_ptr()) } != 0 {
+        return ptr::null_mut();
+    }
+
+    let child_pid = unsafe { unistd::fork() };
+    if child_pid == 0 {
+        let command_nonnull = if command.is_null() {
+            c"exit 0".as_ptr()
+        } else {
+            command.cast::<c_char>()
+        };
+
+        let shell = c"/bin/sh".as_ptr();
+
+        let args = [c"sh".as_ptr(), c"-c".as_ptr(), command_nonnull, ptr::null()];
+
+        // Setup up stdin or stdout
+        //TODO: dup errors are ignored, should they be?
+        {
+            if write {
+                match unistd::dup2(pipes[0], 0) {
+                    0 => {}
+                    e => unsafe { stdlib::exit(127) },
+                }
+            } else {
+                match unistd::dup2(pipes[1], 1) {
+                    1 => {}
+                    e => unsafe { stdlib::exit(127) },
+                }
+            }
+
+            unistd::close(pipes[0]);
+            unistd::close(pipes[1]);
+        }
+
+        unsafe { unistd::execv(shell.cast::<c_char>(), args.as_ptr().cast::<*mut c_char>()) };
+
+        unsafe { stdlib::exit(127) };
+
+        unreachable!();
+    } else if child_pid > 0 {
+        let (fd, fd_mode): (_, CStr) = if write {
+            unistd::close(pipes[0]);
+            (pipes[1], if cloexec { c"we".into() } else { c"w".into() })
+        } else {
+            unistd::close(pipes[1]);
+            (pipes[0], if cloexec { c"re".into() } else { c"r".into() })
+        };
+
+        helpers::_fdopen(fd, fd_mode)
+            .map(|mut f| {
+                f.pid = Some(child_pid);
+                Box::into_raw(f)
+            })
+            .or_errno_null_mut()
+    } else {
+        ptr::null_mut()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/putc.html>.
+///
+/// Put a character `c` into `stream`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn putc(c: c_int, stream: *mut FILE) -> c_int {
+    let mut stream = unsafe { (*stream).lock() };
+    unsafe { putc_unlocked(c, &raw mut *stream) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/putchar.html>.
+///
+/// Put a character `c` into `stdout`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn putchar(c: c_int) -> c_int {
+    unsafe { fputc(c, &raw mut *stdout) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getc_unlocked.html>.
+///
+/// Put a character `c` into `stream` without locking `stream`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn putc_unlocked(c: c_int, stream: *mut FILE) -> c_int {
+    if unsafe { (*stream).try_set_byte_orientation_unlocked() }.is_err() {
+        return -1;
+    }
+
+    match unsafe { (*stream).write(&[c as u8]) } {
+        Ok(0) | Err(_) => EOF,
+        Ok(_) => c,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getc_unlocked.html>.
+///
+/// Put a character `c` into `stdout` without locking `stdout`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn putchar_unlocked(c: c_int) -> c_int {
+    unsafe { putc_unlocked(c, stdout) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/puts.html>.
+///
+/// Put a string `s` into `stdout`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn puts(s: *const c_char) -> c_int {
+    let mut stream = unsafe { (&mut *stdout).lock() };
+    if (*stream).try_set_byte_orientation_unlocked().is_err() {
+        return -1;
+    }
+
+    let buf = unsafe { slice::from_raw_parts(s as *mut u8, strlen(s)) };
+
+    if stream.write_all(buf).is_err() {
+        return -1;
+    }
+    if stream.write(b"\n").is_err() {
+        return -1;
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/putw.html>.
+///
+/// Marked legacy in SUS Version 2.
+///
+/// Put an integer `w` into `stream`
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn putw(w: c_int, stream: *mut FILE) -> c_int {
+    (unsafe {
+        fwrite(
+            ptr::from_ref::<c_int>(&w).cast(),
+            mem::size_of_val(&w),
+            1,
+            stream,
+        )
+    }) as i32
+        - 1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/remove.html>.
+///
+/// Delete file or directory `path`
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn remove(path: *const c_char) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::unlink(path)
+        .or_else(|_err| Sys::rmdir(path))
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/rename.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn rename(oldpath: *const c_char, newpath: *const c_char) -> c_int {
+    let oldpath = unsafe { CStr::from_ptr(oldpath) };
+    let newpath = unsafe { CStr::from_ptr(newpath) };
+    Sys::rename(oldpath, newpath)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/renameat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn renameat(
+    old_dir: c_int,
+    old_path: *const c_char,
+    new_dir: c_int,
+    new_path: *const c_char,
+) -> c_int {
+    let old_path = unsafe { CStr::from_ptr(old_path) };
+    let new_path = unsafe { CStr::from_ptr(new_path) };
+    Sys::renameat(old_dir, old_path, new_dir, new_path)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://www.man7.org/linux/man-pages/man2/rename.2.html>.
+///
+/// Non-POSIX. Seems to be a GNU extension.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn renameat2(
+    old_dir: c_int,
+    old_path: *const c_char,
+    new_dir: c_int,
+    new_path: *const c_char,
+    flags: c_uint,
+) -> c_int {
+    let old_path = unsafe { CStr::from_ptr(old_path) };
+    let new_path = unsafe { CStr::from_ptr(new_path) };
+    Sys::renameat2(old_dir, old_path, new_dir, new_path, flags)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/rewind.html>.
+///
+/// Rewind `stream` back to the beginning of it
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn rewind(stream: *mut FILE) {
+    unsafe { fseeko(stream, 0, SEEK_SET) };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setbuf.html>.
+///
+/// Reset `stream` to use buffer `buf`. Buffer must be `BUFSIZ` in length
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setbuf(stream: *mut FILE, buf: *mut c_char) {
+    unsafe {
+        setvbuf(
+            stream,
+            buf,
+            if buf.is_null() { _IONBF } else { _IOFBF },
+            BUFSIZ as usize,
+        )
+    };
+}
+
+/// See <https://www.man7.org/linux/man-pages/man3/setlinebuf.3.html>.
+///
+/// Non-POSIX.
+///
+/// Set buffering of `stream` to line buffered
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setlinebuf(stream: *mut FILE) {
+    unsafe { setvbuf(stream, ptr::null_mut(), _IOLBF, 0) };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setvbuf.html>.
+///
+/// Reset `stream` to use buffer `buf` of size `size`
+/// If this isn't the meaning of unsafe, idk what is
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setvbuf(
+    stream: *mut FILE,
+    buf: *mut c_char,
+    mode: c_int,
+    mut size: size_t,
+) -> c_int {
+    let mut stream = unsafe { (*stream).lock() };
+    // Set a buffer of size `size` if no buffer is given
+    stream.read_buf = if buf.is_null() || size == 0 {
+        if size == 0 {
+            size = BUFSIZ as usize;
+        }
+        // TODO: Make it unbuffered if _IONBF
+        // if mode == _IONBF {
+        // } else {
+        Buffer::Owned(vec![0; size])
+    // }
+    } else {
+        Buffer::Borrowed(unsafe { slice::from_raw_parts_mut(buf.cast::<u8>(), size) })
+    };
+    stream.flags |= F_SVB;
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009604599/functions/tempnam.html>.
+///
+/// Marked obsolescent in issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tempnam(dir: *const c_char, pfx: *const c_char) -> *mut c_char {
+    unsafe fn is_appropriate(pos_dir: *const c_char) -> bool {
+        !pos_dir.is_null() && unsafe { unistd::access(pos_dir, unistd::W_OK) } == 0
+    }
+
+    // directory search order is env!(TMPDIR), dir, P_tmpdir, "/tmp"
+    let dirname = {
+        let tmpdir = unsafe { stdlib::getenv(c"TMPDIR".as_ptr().cast()) };
+        [tmpdir, dir, P_tmpdir.as_ptr().cast()]
+            .iter()
+            .copied()
+            .skip_while(|&d| !unsafe { is_appropriate(d) })
+            .next()
+            .unwrap_or(c"/tmp".as_ptr().cast())
+    };
+    let dirname_len = unsafe { string::strlen(dirname) };
+
+    let prefix_len = unsafe { string::strnlen_s(pfx, 5) };
+
+    // allocate enough for dirname "/" prefix "XXXXXX\0"
+    let mut out_buf =
+        unsafe { platform::alloc(dirname_len + 1 + prefix_len + L_tmpnam as usize + 1) }
+            .cast::<c_char>();
+
+    if !out_buf.is_null() {
+        // copy the directory name and prefix into the allocated buffer
+        unsafe { out_buf.copy_from_nonoverlapping(dirname, dirname_len) };
+        unsafe { *out_buf.add(dirname_len) = b'/' as _ };
+        unsafe {
+            out_buf
+                .add(dirname_len + 1)
+                .copy_from_nonoverlapping(pfx, prefix_len)
+        };
+
+        // use the same mechanism as tmpnam to get the file name
+        if unsafe {
+            #[allow(deprecated)]
+            tmpnam_inner(out_buf, dirname_len + 1 + prefix_len)
+        }
+        .is_null()
+        {
+            // failed to find a valid file name, so we need to free the buffer
+            unsafe { platform::free(out_buf.cast()) };
+            out_buf = ptr::null_mut();
+        }
+    }
+
+    out_buf
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tmpfile.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tmpfile() -> *mut FILE {
+    let mut file_name = *b"/tmp/tmpfileXXXXXX\0";
+    let file_name = file_name.as_mut_ptr().cast::<c_char>();
+    let fd = unsafe { stdlib::mkstemp(file_name) };
+
+    if fd < 0 {
+        return ptr::null_mut();
+    }
+
+    let fp = unsafe { fdopen(fd, c"w+".as_ptr()) };
+    {
+        let file_name = unsafe { CStr::from_ptr(file_name) };
+        if let Ok(()) = Sys::unlink(file_name) {}; // TODO handle error
+    }
+
+    if fp.is_null()
+        && let Ok(()) = Sys::close(fd)
+    {}; // TODO handle error
+
+    fp
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tmpnam.html>.
+///
+/// Marked obsolescent in issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tmpnam(s: *mut c_char) -> *mut c_char {
+    let buf = if s.is_null() {
+        (&raw mut TMPNAM_BUF).cast()
+    } else {
+        s
+    };
+
+    unsafe { *buf = b'/' as _ };
+    unsafe {
+        #[allow(deprecated)]
+        tmpnam_inner(buf, 1)
+    }
+}
+
+#[deprecated]
+unsafe extern "C" fn tmpnam_inner(buf: *mut c_char, offset: usize) -> *mut c_char {
+    const TEMPLATE: &[u8] = b"XXXXXX\0";
+
+    unsafe {
+        buf.add(offset)
+            .copy_from_nonoverlapping(TEMPLATE.as_ptr().cast(), TEMPLATE.len())
+    };
+
+    let err = platform::ERRNO.get();
+    unsafe {
+        #[allow(deprecated)]
+        stdlib::mktemp(buf)
+    };
+    platform::ERRNO.set(err);
+
+    if unsafe { *buf } == 0 {
+        ptr::null_mut()
+    } else {
+        buf
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ungetc.html>.
+///
+/// Push character `c` back onto `stream` so it'll be read next
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ungetc(c: c_int, stream: *mut FILE) -> c_int {
+    let mut stream = unsafe { (*stream).lock() };
+    if (*stream).try_set_byte_orientation_unlocked().is_err() {
+        return -1;
+    }
+
+    stream.unget.push(c as u8);
+    c
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vfprintf(file: *mut FILE, format: *const c_char, ap: va_list) -> c_int {
+    let mut file = unsafe { (*file).lock() };
+    if file.try_set_byte_orientation_unlocked().is_err() {
+        return -1;
+    }
+
+    unsafe { printf::printf(&mut *file, CStr::from_ptr(format), ap) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fprintf(
+    file: *mut FILE,
+    format: *const c_char,
+    mut __valist: ...
+) -> c_int {
+    unsafe { vfprintf(file, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vdprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vdprintf(fd: c_int, format: *const c_char, ap: va_list) -> c_int {
+    let mut f = File::new(fd);
+
+    // We don't want to close the file on drop; we're merely
+    // borrowing the file descriptor here
+    f.reference = true;
+
+    unsafe { printf::printf(f, CStr::from_ptr(format), ap) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn dprintf(fd: c_int, format: *const c_char, mut __valist: ...) -> c_int {
+    unsafe { vdprintf(fd, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vprintf(format: *const c_char, ap: va_list) -> c_int {
+    unsafe { vfprintf(&raw mut *stdout, format, ap) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn printf(format: *const c_char, mut __valist: ...) -> c_int {
+    unsafe { vfprintf(&raw mut *stdout, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vasprintf(
+    strp: *mut *mut c_char,
+    format: *const c_char,
+    ap: va_list,
+) -> c_int {
+    let mut alloc_writer = CVec::new();
+    let ret = unsafe { printf::printf(&mut alloc_writer, CStr::from_ptr(format), ap) };
+    alloc_writer.push(0).unwrap();
+    alloc_writer.shrink_to_fit().unwrap();
+    unsafe { *strp = alloc_writer.leak().cast::<c_char>() };
+    ret
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn asprintf(
+    strp: *mut *mut c_char,
+    format: *const c_char,
+    mut __valist: ...
+) -> c_int {
+    unsafe { vasprintf(strp, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vsnprintf(
+    s: *mut c_char,
+    n: size_t,
+    format: *const c_char,
+    ap: va_list,
+) -> c_int {
+    unsafe {
+        printf::printf(
+            &mut platform::StringWriter(s.cast::<u8>(), n),
+            CStr::from_ptr(format),
+            ap,
+        )
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn snprintf(
+    s: *mut c_char,
+    n: size_t,
+    format: *const c_char,
+    mut __valist: ...
+) -> c_int {
+    unsafe {
+        printf::printf(
+            &mut platform::StringWriter(s.cast::<u8>(), n),
+            CStr::from_ptr(format),
+            __valist.as_va_list(),
+        )
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vsprintf(s: *mut c_char, format: *const c_char, ap: va_list) -> c_int {
+    unsafe {
+        printf::printf(
+            &mut platform::UnsafeStringWriter(s.cast::<u8>()),
+            CStr::from_ptr(format),
+            ap,
+        )
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sprintf(
+    s: *mut c_char,
+    format: *const c_char,
+    mut __valist: ...
+) -> c_int {
+    unsafe {
+        printf::printf(
+            &mut platform::UnsafeStringWriter(s.cast::<u8>()),
+            CStr::from_ptr(format),
+            __valist.as_va_list(),
+        )
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vfscanf(file: *mut FILE, format: *const c_char, ap: va_list) -> c_int {
+    let mut file = unsafe { (*file).lock() };
+    if file.try_set_byte_orientation_unlocked().is_err() {
+        return -1;
+    }
+
+    let f: &mut FILE = &mut file;
+    let reader: Reader<Thin> = f.into();
+    unsafe {
+        let format = CStr::from_ptr(format);
+        scanf::scanf(reader, format.into(), ap)
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fscanf(
+    file: *mut FILE,
+    format: *const c_char,
+    mut __valist: ...
+) -> c_int {
+    unsafe { vfscanf(file, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vscanf(format: *const c_char, ap: va_list) -> c_int {
+    unsafe { vfscanf(&raw mut *stdin, format, ap) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn scanf(format: *const c_char, mut __valist: ...) -> c_int {
+    unsafe { vfscanf(&raw mut *stdin, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vsscanf(s: *const c_char, format: *const c_char, ap: va_list) -> c_int {
+    unsafe {
+        let format = CStr::from_ptr(format);
+        let s = CStr::from_ptr(s);
+        scanf::scanf(s.into(), format.into(), ap)
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sscanf(
+    s: *const c_char,
+    format: *const c_char,
+    mut __valist: ...
+) -> c_int {
+    unsafe {
+        let format = CStr::from_ptr(format);
+        let s = CStr::from_ptr(s);
+        scanf::scanf(s.into(), format.into(), __valist.as_va_list())
+    }
+}
+
+pub unsafe fn flush_io_streams() {
+    let flush = |stream: *mut FILE| {
+        let stream = unsafe { &mut *stream };
+        let _ = stream.flush();
+    };
+    flush(unsafe { stdout });
+    flush(unsafe { stderr });
+}
diff --git a/recipes/core/relibc/src/header/stdio/printf.rs b/recipes/core/relibc/src/header/stdio/printf.rs
new file mode 100644
index 0000000000..2f63b420ed
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/printf.rs
@@ -0,0 +1,1447 @@
+// TODO: reuse more code with the wide printf impl
+use crate::{
+    c_str::{self, CStr, NulStr},
+    io::{self, Write},
+};
+use alloc::{
+    collections::BTreeMap,
+    string::{String, ToString},
+    vec::Vec,
+};
+use core::{cmp, ffi::VaList, fmt, num::FpCategory, ops::Range, slice};
+
+use crate::{
+    header::errno::{self, EILSEQ},
+    platform::{
+        self,
+        types::{
+            c_char, c_double, c_int, c_long, c_longdouble, c_longlong, c_short, c_uchar, c_uint,
+            c_ulong, c_ulonglong, c_ushort, c_void, intmax_t, ptrdiff_t, size_t, ssize_t,
+            uintmax_t, wchar_t, wint_t,
+        },
+    },
+};
+
+#[allow(unused_doc_comments)]
+/// cbindgen:ignore
+unsafe extern "C" {
+    pub unsafe fn relibc_ldtod(x: *const c_longdouble) -> c_double;
+    pub unsafe fn relibc_dtold(x: c_double, out: *mut c_longdouble);
+}
+
+//  ____        _ _                 _       _
+// | __ )  ___ (_) | ___ _ __ _ __ | | __ _| |_ ___ _
+// |  _ \ / _ \| | |/ _ \ '__| '_ \| |/ _` | __/ _ (_)
+// | |_) | (_) | | |  __/ |  | |_) | | (_| | ||  __/_
+// |____/ \___/|_|_|\___|_|  | .__/|_|\__,_|\__\___(_)
+//                           |_|
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum IntKind {
+    Byte,
+    Short,
+    Int,
+    Long,
+    LongLong,
+    IntMax,
+    PtrDiff,
+    Size,
+}
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum FmtKind {
+    Percent,
+
+    Signed,
+    Unsigned,
+
+    Scientific,
+    Decimal,
+    AnyNotation,
+
+    String,
+    Char,
+    Pointer,
+    GetWritten,
+}
+#[derive(Clone, Copy, Debug)]
+pub(crate) enum Number {
+    Static(usize),
+    Index(usize),
+    Next,
+}
+impl Number {
+    pub(crate) unsafe fn resolve(self, varargs: &mut VaListCache, ap: &mut VaList) -> usize {
+        let arg = match self {
+            Number::Static(num) => return num,
+            Number::Index(i) => unsafe { varargs.get(i - 1, ap, None) },
+            Number::Next => {
+                let i = varargs.i;
+                varargs.i += 1;
+                unsafe { varargs.get(i, ap, None) }
+            }
+        };
+        match arg {
+            VaArg::c_char(i) => i as usize,
+            VaArg::c_double(i) => i as usize,
+            #[cfg(target_pointer_width = "32")]
+            VaArg::c_longdouble(_) => 0 as usize,
+            #[cfg(target_pointer_width = "64")]
+            VaArg::c_longdouble(i) => i as usize,
+            VaArg::c_int(i) => i as usize,
+            VaArg::c_long(i) => i as usize,
+            VaArg::c_longlong(i) => i as usize,
+            VaArg::c_short(i) => i as usize,
+            VaArg::intmax_t(i) => i as usize,
+            VaArg::pointer(i) => i as usize,
+            VaArg::ptrdiff_t(i) => i as usize,
+            VaArg::ssize_t(i) => i as usize,
+            VaArg::wint_t(i) => i as usize,
+        }
+    }
+}
+#[derive(Clone, Copy, Debug)]
+pub(crate) enum VaArg {
+    c_char(c_char),
+    c_double(c_double),
+    c_longdouble(c_longdouble),
+    c_int(c_int),
+    c_long(c_long),
+    c_longlong(c_longlong),
+    c_short(c_short),
+    intmax_t(intmax_t),
+    pointer(*const c_void),
+    ptrdiff_t(ptrdiff_t),
+    ssize_t(ssize_t),
+    wint_t(wint_t),
+}
+impl VaArg {
+    pub(crate) unsafe fn arg_from(fmtkind: FmtKind, intkind: IntKind, ap: &mut VaList) -> VaArg {
+        // Per the C standard using va_arg with a type with a size
+        // less than that of an int for integers and double for floats
+        // is invalid. As a result any arguments smaller than an int or
+        // double passed to a function will be promoted to the smallest
+        // possible size. The VaList::arg function will handle this
+        // automagically.
+
+        match (fmtkind, intkind) {
+            (FmtKind::Percent, _) => panic!("Can't call arg_from on %"),
+
+            (FmtKind::Char, IntKind::Long) | (FmtKind::Char, IntKind::LongLong) => {
+                VaArg::wint_t(unsafe { ap.arg::<wint_t>() })
+            }
+
+            (FmtKind::Char, _)
+            | (FmtKind::Unsigned, IntKind::Byte)
+            | (FmtKind::Signed, IntKind::Byte) => {
+                // c_int is passed but truncated to c_char
+                VaArg::c_char(unsafe { ap.arg::<c_int>() } as c_char)
+            }
+            (FmtKind::Unsigned, IntKind::Short) | (FmtKind::Signed, IntKind::Short) => {
+                // c_int is passed but truncated to c_short
+                VaArg::c_short(unsafe { ap.arg::<c_int>() } as c_short)
+            }
+            (FmtKind::Unsigned, IntKind::Int) | (FmtKind::Signed, IntKind::Int) => {
+                VaArg::c_int(unsafe { ap.arg::<c_int>() })
+            }
+            (FmtKind::Unsigned, IntKind::Long) | (FmtKind::Signed, IntKind::Long) => {
+                VaArg::c_long(unsafe { ap.arg::<c_long>() })
+            }
+            (FmtKind::Unsigned, IntKind::LongLong) | (FmtKind::Signed, IntKind::LongLong) => {
+                VaArg::c_longlong(unsafe { ap.arg::<c_longlong>() })
+            }
+            (FmtKind::Unsigned, IntKind::IntMax) | (FmtKind::Signed, IntKind::IntMax) => {
+                VaArg::intmax_t(unsafe { ap.arg::<intmax_t>() })
+            }
+            (FmtKind::Unsigned, IntKind::PtrDiff) | (FmtKind::Signed, IntKind::PtrDiff) => {
+                VaArg::ptrdiff_t(unsafe { ap.arg::<ptrdiff_t>() })
+            }
+            (FmtKind::Unsigned, IntKind::Size) | (FmtKind::Signed, IntKind::Size) => {
+                VaArg::ssize_t(unsafe { ap.arg::<ssize_t>() })
+            }
+
+            (FmtKind::AnyNotation, IntKind::LongLong)
+            | (FmtKind::Decimal, IntKind::LongLong)
+            | (FmtKind::Scientific, IntKind::LongLong) => {
+                VaArg::c_longdouble(unsafe { VaArg::extract_longdouble(ap) })
+            }
+            (FmtKind::AnyNotation, _) | (FmtKind::Decimal, _) | (FmtKind::Scientific, _) => {
+                VaArg::c_double(unsafe { ap.arg::<c_double>() })
+            }
+
+            (FmtKind::GetWritten, _) | (FmtKind::Pointer, _) | (FmtKind::String, _) => {
+                VaArg::pointer(unsafe { ap.arg::<*const c_void>() })
+            }
+        }
+    }
+    #[cfg(target_arch = "x86")]
+    unsafe fn extract_longdouble(ap: &mut core::ffi::VaList) -> c_longdouble {
+        todo_skip!(0, "long double in variadic printf is not supported");
+        [0, 0, 0]
+    }
+    #[cfg(target_arch = "x86_64")]
+    unsafe fn extract_longdouble(ap: &mut core::ffi::VaList) -> c_longdouble {
+        // https://refspecs.linuxfoundation.org/elf/x86_64-abi-0.95.pdf (long double)
+
+        // exactly same as core::ffi::VaListImpl but all variables exposed
+        #[repr(C)]
+        struct VaListImpl {
+            gp_offset: i32,
+            fp_offset: i32,
+            overflow_arg_area: *mut u8,
+            reg_save_area: *mut u8,
+        }
+
+        let ap_impl = unsafe {
+            // The double deconstruct is intended
+            let ptr_to_struct = *(ap as *mut core::ffi::VaList as *mut *mut VaListImpl);
+            &mut *ptr_to_struct
+        };
+
+        let ptr = ap_impl.overflow_arg_area as *const c_longdouble;
+        let val = unsafe { ptr.read() };
+
+        ap_impl.overflow_arg_area = unsafe { ap_impl.overflow_arg_area.add(16) };
+
+        val
+    }
+    #[cfg(target_arch = "aarch64")]
+    unsafe fn extract_longdouble(ap: &mut core::ffi::VaList) -> c_longdouble {
+        // https://c9x.me/compile/bib/abi-arm64.pdf (quad precision)
+
+        // exactly same as core::ffi::VaListImpl but all variables exposed
+        #[repr(C)]
+        struct VaListImpl {
+            stack: *mut u8,
+            gr_top: *mut u8,
+            vr_top: *mut u8,
+            gr_offs: i32,
+            vr_offs: i32,
+        }
+
+        let ap_impl: &mut VaListImpl = unsafe {
+            // The double deconstruct is intended
+            let ptr_to_struct = *(ap as *mut core::ffi::VaList as *mut *mut VaListImpl);
+            &mut *ptr_to_struct
+        };
+
+        let ptr = unsafe { ap_impl.vr_top.offset(ap_impl.vr_offs as isize) as *const c_longdouble };
+
+        ap_impl.vr_offs += 16;
+
+        unsafe { ptr.read() }
+    }
+
+    #[cfg(target_arch = "riscv64")]
+    unsafe fn extract_longdouble(ap: &mut core::ffi::VaList) -> c_longdouble {
+        todo_skip!(0, "long double in variadic printf is not supported");
+        0u128
+    }
+    unsafe fn transmute(&self, fmtkind: FmtKind, intkind: IntKind) -> VaArg {
+        // At this point, there are conflicting printf arguments. An
+        // example of this is:
+        // ```c
+        // printf("%1$d %1$lf\n", 5, 0.1);
+        // ```
+        // We handle it just like glibc: We read it from the VaList
+        // using the *last* argument type, but we transmute it when we
+        // try to access the other ones.
+        union Untyped {
+            c_char: c_char,
+            c_double: c_double,
+            c_longdouble: c_longdouble,
+            c_int: c_int,
+            c_long: c_long,
+            c_longlong: c_longlong,
+            c_short: c_short,
+            intmax_t: intmax_t,
+            pointer: *const c_void,
+            ptrdiff_t: ptrdiff_t,
+            ssize_t: ssize_t,
+            wint_t: wint_t,
+        }
+        let untyped = match *self {
+            VaArg::c_char(i) => Untyped { c_char: i },
+            VaArg::c_double(i) => Untyped { c_double: i },
+            VaArg::c_longdouble(i) => Untyped { c_longdouble: i },
+            VaArg::c_int(i) => Untyped { c_int: i },
+            VaArg::c_long(i) => Untyped { c_long: i },
+            VaArg::c_longlong(i) => Untyped { c_longlong: i },
+            VaArg::c_short(i) => Untyped { c_short: i },
+            VaArg::intmax_t(i) => Untyped { intmax_t: i },
+            VaArg::pointer(i) => Untyped { pointer: i },
+            VaArg::ptrdiff_t(i) => Untyped { ptrdiff_t: i },
+            VaArg::ssize_t(i) => Untyped { ssize_t: i },
+            VaArg::wint_t(i) => Untyped { wint_t: i },
+        };
+        match (fmtkind, intkind) {
+            (FmtKind::Percent, _) => panic!("Can't call transmute on %"),
+
+            (FmtKind::Char, IntKind::Long) | (FmtKind::Char, IntKind::LongLong) => {
+                VaArg::wint_t(unsafe { untyped.wint_t })
+            }
+
+            (FmtKind::Char, _)
+            | (FmtKind::Unsigned, IntKind::Byte)
+            | (FmtKind::Signed, IntKind::Byte) => VaArg::c_char(unsafe { untyped.c_char }),
+            (FmtKind::Unsigned, IntKind::Short) | (FmtKind::Signed, IntKind::Short) => {
+                VaArg::c_short(unsafe { untyped.c_short })
+            }
+            (FmtKind::Unsigned, IntKind::Int) | (FmtKind::Signed, IntKind::Int) => {
+                VaArg::c_int(unsafe { untyped.c_int })
+            }
+            (FmtKind::Unsigned, IntKind::Long) | (FmtKind::Signed, IntKind::Long) => {
+                VaArg::c_long(unsafe { untyped.c_long })
+            }
+            (FmtKind::Unsigned, IntKind::LongLong) | (FmtKind::Signed, IntKind::LongLong) => {
+                VaArg::c_longlong(unsafe { untyped.c_longlong })
+            }
+            (FmtKind::Unsigned, IntKind::IntMax) | (FmtKind::Signed, IntKind::IntMax) => {
+                VaArg::intmax_t(unsafe { untyped.intmax_t })
+            }
+            (FmtKind::Unsigned, IntKind::PtrDiff) | (FmtKind::Signed, IntKind::PtrDiff) => {
+                VaArg::ptrdiff_t(unsafe { untyped.ptrdiff_t })
+            }
+            (FmtKind::Unsigned, IntKind::Size) | (FmtKind::Signed, IntKind::Size) => {
+                VaArg::ssize_t(unsafe { untyped.ssize_t })
+            }
+
+            (FmtKind::AnyNotation, IntKind::LongLong)
+            | (FmtKind::Decimal, IntKind::LongLong)
+            | (FmtKind::Scientific, IntKind::LongLong) => {
+                VaArg::c_longdouble(unsafe { untyped.c_longdouble })
+            }
+            (FmtKind::AnyNotation, _) | (FmtKind::Decimal, _) | (FmtKind::Scientific, _) => {
+                VaArg::c_double(unsafe { untyped.c_double })
+            }
+
+            (FmtKind::GetWritten, _) | (FmtKind::Pointer, _) | (FmtKind::String, _) => {
+                VaArg::pointer(unsafe { untyped.pointer })
+            }
+        }
+    }
+}
+#[derive(Default)]
+pub(crate) struct VaListCache {
+    pub(crate) args: Vec<VaArg>,
+    pub(crate) i: usize,
+}
+impl VaListCache {
+    pub(crate) unsafe fn get(
+        &mut self,
+        i: usize,
+        ap: &mut VaList,
+        default: Option<(FmtKind, IntKind)>,
+    ) -> VaArg {
+        if let Some(&arg) = self.args.get(i) {
+            // This value is already cached
+            let mut arg = arg;
+            if let Some((fmtkind, intkind)) = default {
+                // ...but as a different type
+                arg = unsafe { arg.transmute(fmtkind, intkind) };
+            }
+            return arg;
+        }
+
+        // Get all values before this value
+        while self.args.len() < i {
+            // We can't POSSIBLY know the type if we reach this
+            // point. Reaching here means there are unused gaps in the
+            // arguments. Ultimately we'll have to settle down with
+            // defaulting to c_int.
+            self.args.push(VaArg::c_int(unsafe { ap.arg::<c_int>() }))
+        }
+
+        // Add the value to the cache
+        self.args.push(match default {
+            Some((fmtkind, intkind)) => unsafe { VaArg::arg_from(fmtkind, intkind, ap) },
+            None => VaArg::c_int(unsafe { ap.arg::<c_int>() }),
+        });
+
+        // Return the value
+        self.args[i]
+    }
+}
+
+//  ___                 _                           _        _   _
+// |_ _|_ __ ___  _ __ | | ___ _ __ ___   ___ _ __ | |_ __ _| |_(_) ___  _ __  _
+//  | || '_ ` _ \| '_ \| |/ _ \ '_ ` _ \ / _ \ '_ \| __/ _` | __| |/ _ \| '_ \(_)
+//  | || | | | | | |_) | |  __/ | | | | |  __/ | | | || (_| | |_| | (_) | | | |_
+// |___|_| |_| |_| .__/|_|\___|_| |_| |_|\___|_| |_|\__\__,_|\__|_|\___/|_| |_(_)
+//               |_|
+
+enum FmtCase {
+    Lower,
+    Upper,
+}
+
+// The spelled-out "infinity"/"INFINITY" is also permitted by the standard
+static INF_STR_LOWER: &str = "inf";
+static INF_STR_UPPER: &str = "INF";
+
+static NAN_STR_LOWER: &str = "nan";
+static NAN_STR_UPPER: &str = "NAN";
+
+fn pop_int_raw<T: c_str::Kind>(format: &mut NulStr<T>) -> Option<usize> {
+    let mut int = None;
+    while let Some((digit, rest)) = format
+        .split_first_char()
+        .and_then(|(d, r)| Some((d.to_digit(10)?, r)))
+    {
+        *format = rest;
+        if int.is_none() {
+            int = Some(0);
+        }
+        *int.as_mut().unwrap() *= 10;
+        *int.as_mut().unwrap() += digit as usize;
+    }
+    int
+}
+fn pop_index<T: c_str::Kind>(format: &mut NulStr<T>) -> Option<usize> {
+    // Peek ahead for a positional argument:
+    let mut format2 = *format;
+    if let Some(i) = pop_int_raw(&mut format2)
+        && let Some(('$', format2)) = format2.split_first_char()
+    {
+        *format = format2;
+        return Some(i);
+    }
+    None
+}
+fn pop_int<T: c_str::Kind>(format: &mut NulStr<T>) -> Option<Number> {
+    if let Some(('*', rest)) = format.split_first_char() {
+        *format = rest;
+        Some(pop_index(format).map(Number::Index).unwrap_or(Number::Next))
+    } else {
+        pop_int_raw(format).map(Number::Static)
+    }
+}
+
+fn fmt_int<I, T: c_str::Kind>(fmt: char, i: I) -> String
+where
+    I: fmt::Display + fmt::Octal + fmt::LowerHex + fmt::UpperHex + fmt::Binary,
+{
+    match fmt {
+        'o' => format!("{:o}", i),
+        'u' => i.to_string(),
+        'x' => format!("{:x}", i),
+        'X' => format!("{:X}", i),
+        'b' | 'B' if T::IS_THIN_NOT_WIDE => format!("{:b}", i),
+        _ => panic!("fmt_int should never be called with the fmt {:?}", fmt,),
+    }
+}
+
+fn pad<W: Write>(
+    w: &mut W,
+    current_side: bool,
+    pad_char: u8,
+    range: Range<usize>,
+) -> io::Result<()> {
+    if current_side {
+        for _ in range {
+            w.write_all(&[pad_char])?;
+        }
+    }
+    Ok(())
+}
+
+fn float_string(float: c_double, precision: usize, trim: bool, alternate: bool) -> String {
+    // The Rust format! macro doesn't keep the dot on precision = 0 and alternate = true,
+    // so we have to perform a fix-up
+    //
+    // POSIX.1-2024 says "... if the precision is zero and no '#' flag is present,
+    // no radix character shall appear."
+    //
+    // This case is covered here.
+    let mut string = format!("{:.p$}", float, p = precision);
+    //
+    // Additionally, it says "For a, A, e, E, f, F, g, and G conversion specifiers,
+    // the result shall always contain a radix character, even if no digits follow
+    // the radix character."
+    //
+    if alternate && precision == 0 {
+        string.push('.');
+    } else if trim && string.contains('.') {
+        let truncate = {
+            let slice = string.trim_end_matches('0');
+            let mut truncate = slice.len();
+            if slice.ends_with('.') {
+                truncate -= 1;
+            }
+            truncate
+        };
+        string.truncate(truncate);
+    }
+    string
+}
+
+fn float_exp(mut float: c_double) -> (c_double, isize) {
+    let mut exp: isize = 0;
+    while float.abs() >= 10.0 {
+        float /= 10.0;
+        exp += 1;
+    }
+    while f64::EPSILON < float.abs() && float.abs() < 1.0 {
+        float *= 10.0;
+        exp -= 1;
+    }
+    (float, exp)
+}
+
+fn fmt_float_exp<W: Write>(
+    w: &mut W,
+    exp_fmt: char,
+    trim: bool,
+    alternate: bool,
+    precision: usize,
+    float: c_double,
+    exp: isize,
+    left: bool,
+    pad_space: usize,
+    pad_zero: usize,
+) -> io::Result<()> {
+    let mut exp2 = exp;
+    let mut exp_len = 1;
+    while exp2 >= 10 {
+        exp2 /= 10;
+        exp_len += 1;
+    }
+
+    let string = float_string(float, precision, trim, alternate);
+    let len = string.len() + 2 + 2.max(exp_len);
+
+    pad(w, !left, b' ', len..pad_space)?;
+    let bytes = if string.starts_with('-') {
+        w.write_all(b"-")?;
+        &string.as_bytes()[1..]
+    } else {
+        string.as_bytes()
+    };
+    pad(w, !left, b'0', len..pad_zero)?;
+    w.write_all(bytes)?;
+    write!(w, "{}{:+03}", exp_fmt, exp)?;
+    pad(w, left, b' ', len..pad_space)?;
+
+    Ok(())
+}
+
+fn fmt_float_normal<W: Write>(
+    w: &mut W,
+    trim: bool,
+    alternate: bool,
+    precision: usize,
+    float: c_double,
+    left: bool,
+    pad_space: usize,
+    pad_zero: usize,
+) -> io::Result<usize> {
+    let string = float_string(float, precision, trim, alternate);
+
+    pad(w, !left, b' ', string.len()..pad_space)?;
+    let bytes = if string.starts_with('-') {
+        w.write_all(b"-")?;
+        &string.as_bytes()[1..]
+    } else {
+        string.as_bytes()
+    };
+    pad(w, true, b'0', string.len()..pad_zero)?;
+    w.write_all(bytes)?;
+    pad(w, left, b' ', string.len()..pad_space)?;
+
+    Ok(string.len())
+}
+
+/// Write ±infinity or ±NaN representation for any floating-point style
+fn fmt_float_nonfinite<W: Write>(
+    w: &mut W,
+    float: c_double,
+    case: FmtCase,
+    left: bool,
+    pad_space: usize,
+    pad_zero: usize,
+) -> io::Result<()> {
+    let string = match float.classify() {
+        FpCategory::Infinite => match case {
+            FmtCase::Lower => INF_STR_LOWER,
+            FmtCase::Upper => INF_STR_UPPER,
+        },
+        FpCategory::Nan => match case {
+            FmtCase::Lower => NAN_STR_LOWER,
+            FmtCase::Upper => NAN_STR_UPPER,
+        },
+        _ => {
+            // This function should only be called with infinite or NaN value.
+            panic!("fmt_float_nonfinite called with finite float")
+        }
+    };
+
+    // Infinity is always padded with spaces, rather than zeroes
+    pad(w, !left, b' ', string.len()..pad_space + pad_zero)?;
+    if float.is_sign_negative() {
+        w.write_all(b"-")?;
+    }
+    w.write_all(string.as_bytes())?;
+    pad(w, left, b' ', string.len()..pad_space + pad_zero)?;
+
+    Ok(())
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct PrintfIter<'a, T: c_str::Kind> {
+    pub(crate) format: NulStr<'a, T>,
+}
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct PrintfArg {
+    pub(crate) index: Option<usize>,
+    pub(crate) alternate: bool,
+    pub(crate) zero: bool,
+    pub(crate) left: bool,
+    pub(crate) sign_reserve: bool,
+    pub(crate) sign_always: bool,
+    pub(crate) min_width: Number,
+    pub(crate) precision: Option<Number>,
+    pub(crate) intkind: IntKind,
+    pub(crate) fmt: char,
+    pub(crate) fmtkind: FmtKind,
+}
+#[derive(Debug)]
+pub(crate) enum PrintfFmt<'a, U> {
+    Plain(&'a [U]),
+    Arg(PrintfArg),
+}
+impl<'a, T: c_str::Kind> Iterator for PrintfIter<'a, T> {
+    type Item = Result<PrintfFmt<'a, T::Char>, ()>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        // Send PrintfFmt::Plain until the next %
+        let first_percent = match self.format.find_get_subslice_or_all(b'%') {
+            Err(([], _)) => return None,
+            Ok((chunk @ [_, ..], rest)) | Err((chunk @ [_, ..], rest)) => {
+                self.format = rest;
+                return Some(Ok(PrintfFmt::Plain(chunk)));
+            }
+            Ok(([], rest)) => rest,
+        };
+
+        // at this point the next char must be %
+        self.format = first_percent.split_first().expect("must be %").1;
+
+        let mut peekahead = self.format;
+        let index = pop_index(&mut peekahead).inspect(|i| {
+            self.format = peekahead;
+        });
+
+        // Flags:
+        let mut alternate = false;
+        let mut zero = false;
+        let mut left = false;
+        let mut sign_reserve = false;
+        let mut sign_always = false;
+
+        while let Some((c, rest)) = self.format.split_first_char() {
+            match c {
+                '#' => alternate = true,
+                '0' => zero = true,
+                '-' => left = true,
+                ' ' => sign_reserve = true,
+                '+' => sign_always = true,
+                _ => break,
+            }
+            self.format = rest;
+        }
+
+        // Width and precision:
+        let min_width = pop_int(&mut self.format).unwrap_or(Number::Static(0));
+        let precision = if let Some(('.', rest)) = self.format.split_first_char() {
+            self.format = rest;
+            match pop_int(&mut self.format) {
+                int @ Some(_) => int,
+                None => return Some(Err(())),
+            }
+        } else {
+            None
+        };
+
+        // Integer size:
+        let mut intkind = IntKind::Int;
+        while let Some((byte, rest)) = self.format.split_first_char() {
+            intkind = match byte {
+                'h' => {
+                    if intkind == IntKind::Short || intkind == IntKind::Byte {
+                        IntKind::Byte
+                    } else {
+                        IntKind::Short
+                    }
+                }
+                'j' => IntKind::IntMax,
+                'l' => {
+                    if intkind == IntKind::Long || intkind == IntKind::LongLong {
+                        IntKind::LongLong
+                    } else {
+                        IntKind::Long
+                    }
+                }
+                'q' | 'L' => IntKind::LongLong,
+                't' => IntKind::PtrDiff,
+                'z' => IntKind::Size,
+                _ => break,
+            };
+
+            self.format = rest;
+        }
+        let Some((fmt, rest)) = self.format.split_first_char() else {
+            return Some(Err(()));
+        };
+        self.format = rest;
+        let fmtkind = match fmt {
+            '%' => FmtKind::Percent,
+            'd' | 'i' => FmtKind::Signed,
+            'o' | 'u' | 'x' | 'X' => FmtKind::Unsigned,
+            'b' | 'B' if T::IS_THIN_NOT_WIDE => FmtKind::Unsigned,
+            'e' | 'E' => FmtKind::Scientific,
+            'f' | 'F' | 'L' => FmtKind::Decimal,
+            'g' | 'G' => FmtKind::AnyNotation,
+            's' => FmtKind::String,
+            'c' => FmtKind::Char,
+            'p' => FmtKind::Pointer,
+            'n' => FmtKind::GetWritten,
+            'm' if T::IS_THIN_NOT_WIDE => {
+                // %m is technically for syslog only, but musl and glibc implement it for
+                // printf because it is difficult and error prone to implement a format
+                // specifier for just *one* function.
+                return Some(Ok(PrintfFmt::Plain(
+                    T::chars_from_bytes(
+                        errno::STR_ERROR
+                            .get(platform::ERRNO.get() as usize)
+                            .map(|e| e.as_bytes())
+                            .unwrap_or(b"unknown error"),
+                    )
+                    .expect("string must be thin"),
+                )));
+            }
+            _ => return Some(Err(())),
+        };
+        // "For b, B, d, i, o, u, x, and X conversions,
+        // if a precision is specified, the 0 flag is ignored."
+        match fmt {
+            'b' | 'B' | 'd' | 'i' | 'o' | 'u' | 'x' | 'X' => {
+                if precision.is_some() {
+                    zero = false;
+                }
+            }
+            _ => (),
+        }
+
+        Some(Ok(PrintfFmt::Arg(PrintfArg {
+            index,
+            alternate,
+            zero,
+            left,
+            sign_reserve,
+            sign_always,
+            min_width,
+            precision,
+            intkind,
+            fmt,
+            fmtkind,
+        })))
+    }
+}
+
+pub(crate) unsafe fn inner_printf<T: c_str::Kind>(
+    w: impl Write,
+    format: NulStr<T>,
+    mut ap: VaList,
+) -> io::Result<c_int> {
+    let w = &mut platform::CountingWriter::new(w);
+
+    let iterator = PrintfIter { format };
+
+    // Pre-fetch vararg types
+    let mut varargs = VaListCache::default();
+    let mut positional = BTreeMap::new();
+    // ^ NOTE: This depends on the sorted order, do not change to HashMap or whatever
+
+    for section in iterator {
+        let arg = match section {
+            Ok(PrintfFmt::Plain(text)) => continue,
+            Ok(PrintfFmt::Arg(arg)) => arg,
+            Err(()) => return Ok(-1),
+        };
+        if arg.fmtkind == FmtKind::Percent {
+            continue;
+        }
+        for num in &[arg.min_width, arg.precision.unwrap_or(Number::Static(0))] {
+            match num {
+                Number::Next => varargs
+                    .args
+                    .push(VaArg::c_int(unsafe { ap.arg::<c_int>() })),
+                Number::Index(i) => {
+                    positional.insert(i - 1, (FmtKind::Signed, IntKind::Int));
+                }
+                Number::Static(_) => (),
+            }
+        }
+        match arg.index {
+            Some(i) => {
+                positional.insert(i - 1, (arg.fmtkind, arg.intkind));
+            }
+            None => varargs
+                .args
+                .push(unsafe { VaArg::arg_from(arg.fmtkind, arg.intkind, &mut ap) }),
+        }
+    }
+
+    // Make sure, in order, the positional arguments exist with the specified type
+    for (i, arg) in positional {
+        unsafe { varargs.get(i, &mut ap, Some(arg)) };
+    }
+
+    // Main loop
+    for section in iterator {
+        let arg = match section {
+            Ok(PrintfFmt::Plain(text)) => {
+                if T::IS_THIN_NOT_WIDE {
+                    let bytes = T::chars_to_bytes(text).expect("is thin");
+                    w.write_all(bytes)?;
+                } else {
+                    // TODO: wcsrtombs wrapper
+                    for c in text.iter().filter_map(|u| char::from_u32((*u).into())) {
+                        if let Ok(()) = write!(w, "{}", c) {}; // TODO handle error
+                    }
+                }
+                continue;
+            }
+            Ok(PrintfFmt::Arg(arg)) => arg,
+            Err(()) => return Ok(-1),
+        };
+        let alternate = arg.alternate;
+        let zero = arg.zero;
+        let mut left = arg.left;
+        let sign_reserve = arg.sign_reserve;
+        let sign_always = arg.sign_always;
+        let min_width = unsafe { arg.min_width.resolve(&mut varargs, &mut ap) };
+        let precision = arg
+            .precision
+            .map(|n| unsafe { n.resolve(&mut varargs, &mut ap) })
+            .filter(|&n| (n as c_int) >= 0);
+        let pad_zero = if zero { min_width } else { 0 };
+        let signed_space = match pad_zero {
+            0 => min_width as isize,
+            _ => 0,
+        };
+        let pad_space = if signed_space < 0 {
+            left = true;
+            -signed_space as usize
+        } else {
+            signed_space as usize
+        };
+        let intkind = arg.intkind;
+        let fmt = arg.fmt;
+        let fmtkind = arg.fmtkind;
+        let fmtcase = match fmt {
+            'b' if T::IS_THIN_NOT_WIDE => Some(FmtCase::Lower),
+            'B' if T::IS_THIN_NOT_WIDE => Some(FmtCase::Upper),
+            'x' | 'f' | 'e' | 'g' => Some(FmtCase::Lower),
+            'X' | 'F' | 'E' | 'G' => Some(FmtCase::Upper),
+            _ => None,
+        };
+
+        let index = arg.index.map(|i| i - 1).unwrap_or_else(|| {
+            if fmtkind == FmtKind::Percent {
+                0
+            } else {
+                let i = varargs.i;
+                varargs.i += 1;
+                i
+            }
+        });
+
+        match fmtkind {
+            FmtKind::Percent => w.write_all(b"%")?,
+            FmtKind::Signed => {
+                let string = match unsafe {
+                    varargs.get(index, &mut ap, Some((arg.fmtkind, arg.intkind)))
+                } {
+                    VaArg::c_char(i) => i.to_string(),
+                    VaArg::c_double(i) => panic!("this should not be possible"),
+                    VaArg::c_longdouble(i) => panic!("this should not be possible"),
+                    VaArg::c_int(i) => i.to_string(),
+                    VaArg::c_long(i) => i.to_string(),
+                    VaArg::c_longlong(i) => i.to_string(),
+                    VaArg::c_short(i) => i.to_string(),
+                    VaArg::intmax_t(i) => i.to_string(),
+                    VaArg::pointer(i) => (i as usize).to_string(),
+                    VaArg::ptrdiff_t(i) => i.to_string(),
+                    VaArg::ssize_t(i) => i.to_string(),
+                    VaArg::wint_t(_) => unreachable!("this should not be possible"),
+                };
+                let positive = !string.starts_with('-');
+                let zero = precision == Some(0) && string == "0";
+
+                let mut len = string.len();
+                let mut final_len = string.len().max(precision.unwrap_or(0));
+                if positive && (sign_reserve || sign_always) {
+                    final_len += 1;
+                }
+                if zero {
+                    len = 0;
+                    final_len = 0;
+                }
+
+                pad(w, !left, b' ', final_len..pad_space)?;
+
+                let bytes = if positive {
+                    if sign_reserve {
+                        w.write_all(b" ")?;
+                    } else if sign_always {
+                        w.write_all(b"+")?;
+                    }
+                    string.as_bytes()
+                } else {
+                    w.write_all(b"-")?;
+                    &string.as_bytes()[1..]
+                };
+                pad(w, true, b'0', len..precision.unwrap_or(pad_zero))?;
+
+                if !zero {
+                    w.write_all(bytes)?;
+                }
+
+                pad(w, left, b' ', final_len..pad_space)?;
+            }
+            FmtKind::Unsigned => {
+                let string = match unsafe {
+                    varargs.get(index, &mut ap, Some((arg.fmtkind, arg.intkind)))
+                } {
+                    VaArg::c_char(i) => fmt_int::<_, T>(fmt, i as c_uchar),
+                    VaArg::c_double(i) => panic!("this should not be possible"),
+                    VaArg::c_longdouble(i) => panic!("this should not be possible"),
+                    VaArg::c_int(i) => fmt_int::<_, T>(fmt, i as c_uint),
+                    VaArg::c_long(i) => fmt_int::<_, T>(fmt, i as c_ulong),
+                    VaArg::c_longlong(i) => fmt_int::<_, T>(fmt, i as c_ulonglong),
+                    VaArg::c_short(i) => fmt_int::<_, T>(fmt, i as c_ushort),
+                    VaArg::intmax_t(i) => fmt_int::<_, T>(fmt, i as uintmax_t),
+                    VaArg::pointer(i) => fmt_int::<_, T>(fmt, i as usize),
+                    VaArg::ptrdiff_t(i) => fmt_int::<_, T>(fmt, i as size_t),
+                    VaArg::ssize_t(i) => fmt_int::<_, T>(fmt, i as size_t),
+                    VaArg::wint_t(_) => unreachable!("this should not be possible"),
+                };
+                let zero = precision == Some(0) && string == "0";
+
+                // If this int is padded out to be larger than it is, don't
+                // add an extra zero if octal.
+                let no_precision = precision.map(|pad| pad < string.len()).unwrap_or(true);
+
+                let len;
+                let final_len = if zero {
+                    len = 0;
+                    0
+                } else {
+                    len = string.len();
+                    len.max(precision.unwrap_or(0))
+                        + if alternate && string != "0" {
+                            match fmt {
+                                'o' if no_precision => 1,
+                                'x' | 'X' => 2,
+                                'b' | 'B' if T::IS_THIN_NOT_WIDE => 2,
+                                _ => 0,
+                            }
+                        } else {
+                            0
+                        }
+                };
+
+                pad(w, !left, b' ', final_len..pad_space)?;
+
+                if alternate && string != "0" {
+                    match fmt {
+                        'o' if no_precision => w.write_all(b"0")?,
+                        'x' => w.write_all(b"0x")?,
+                        'X' => w.write_all(b"0X")?,
+                        'b' if T::IS_THIN_NOT_WIDE => w.write_all(b"0b")?,
+                        'B' if T::IS_THIN_NOT_WIDE => w.write_all(b"0B")?,
+                        _ => (),
+                    }
+                }
+                pad(w, true, b'0', len..precision.unwrap_or(pad_zero))?;
+
+                if !zero {
+                    w.write_all(string.as_bytes())?;
+                }
+
+                pad(w, left, b' ', final_len..pad_space)?;
+            }
+            FmtKind::Scientific => {
+                let float = match unsafe {
+                    varargs.get(index, &mut ap, Some((arg.fmtkind, arg.intkind)))
+                } {
+                    VaArg::c_double(i) => i,
+                    VaArg::c_longdouble(i) => unsafe { relibc_ldtod(&raw const i) },
+                    _ => panic!("this should not be possible"),
+                };
+                if float.is_finite() {
+                    let (float, exp) = float_exp(float);
+                    let precision = precision.unwrap_or(6);
+
+                    fmt_float_exp(
+                        w, fmt, false, alternate, precision, float, exp, left, pad_space, pad_zero,
+                    )?;
+                } else {
+                    fmt_float_nonfinite(w, float, fmtcase.unwrap(), left, pad_space, pad_zero)?;
+                }
+            }
+            FmtKind::Decimal => {
+                let float = match unsafe {
+                    varargs.get(index, &mut ap, Some((arg.fmtkind, arg.intkind)))
+                } {
+                    VaArg::c_double(i) => i,
+                    VaArg::c_longdouble(i) => unsafe { relibc_ldtod(&raw const i) },
+                    _ => panic!("this should not be possible"),
+                };
+                if float.is_finite() {
+                    let precision = precision.unwrap_or(6);
+
+                    fmt_float_normal(
+                        w, false, alternate, precision, float, left, pad_space, pad_zero,
+                    )?;
+                } else {
+                    fmt_float_nonfinite(w, float, fmtcase.unwrap(), left, pad_space, pad_zero)?;
+                }
+            }
+            FmtKind::AnyNotation => {
+                let float = match unsafe {
+                    varargs.get(index, &mut ap, Some((arg.fmtkind, arg.intkind)))
+                } {
+                    VaArg::c_double(i) => i,
+                    VaArg::c_longdouble(i) => unsafe { relibc_ldtod(&raw const i) },
+                    _ => panic!("this should not be possible"),
+                };
+                if float.is_finite() {
+                    let (log, exp) = float_exp(float);
+                    // TODO: .is_uppercase()?
+                    let exp_fmt = if fmt as u32 & 32 == 32 { 'e' } else { 'E' };
+                    let precision = precision.unwrap_or(6);
+                    let use_exp_format = exp < -4 || exp >= precision as isize;
+
+                    if use_exp_format {
+                        // Length of integral part will always be 1 here,
+                        // because that's how x/floor(log10(x)) works
+                        let precision = precision.saturating_sub(1);
+                        fmt_float_exp(
+                            w, exp_fmt, !alternate, alternate, precision, log, exp, left,
+                            pad_space, pad_zero,
+                        )?;
+                    } else {
+                        // Length of integral part will be the exponent of
+                        // the unused logarithm, unless the exponent is
+                        // negative which in case the integral part must
+                        // of course be 0, 1 in length
+                        let len = 1 + cmp::max(0, exp) as usize;
+                        let precision = precision.saturating_sub(len);
+                        fmt_float_normal(
+                            w, !alternate, alternate, precision, float, left, pad_space, pad_zero,
+                        )?;
+                    }
+                } else {
+                    fmt_float_nonfinite(w, float, fmtcase.unwrap(), left, pad_space, pad_zero)?;
+                }
+            }
+            FmtKind::String => {
+                let ptr = match unsafe {
+                    varargs.get(index, &mut ap, Some((arg.fmtkind, arg.intkind)))
+                } {
+                    VaArg::pointer(p) => p,
+                    _ => panic!("this should not be possible"),
+                }
+                .cast::<c_char>();
+
+                if ptr.is_null() {
+                    w.write_all(b"(null)")?;
+                } else {
+                    let max = precision.unwrap_or(usize::MAX);
+
+                    if intkind == IntKind::Long || intkind == IntKind::LongLong {
+                        // Handle wchar_t
+                        let mut ptr = ptr.cast::<wchar_t>();
+                        let mut string = String::new();
+
+                        while unsafe { *ptr } != 0 {
+                            let c = match char::from_u32(unsafe { *ptr } as _) {
+                                Some(c) => c,
+                                None => {
+                                    platform::ERRNO.set(EILSEQ);
+                                    return Err(io::last_os_error());
+                                }
+                            };
+                            if string.len() + c.len_utf8() >= max {
+                                break;
+                            }
+                            string.push(c);
+                            ptr = unsafe { ptr.add(1) };
+                        }
+
+                        pad(w, !left, b' ', string.len()..pad_space)?;
+                        w.write_all(string.as_bytes())?;
+                        pad(w, left, b' ', string.len()..pad_space)?;
+                    } else {
+                        let mut len = 0;
+                        while unsafe { *ptr.add(len) } != 0 && len < max {
+                            len += 1;
+                        }
+
+                        pad(w, !left, b' ', len..pad_space)?;
+                        w.write_all(unsafe { slice::from_raw_parts(ptr.cast::<u8>(), len) })?;
+                        pad(w, left, b' ', len..pad_space)?;
+                    }
+                }
+            }
+            FmtKind::Char => {
+                match unsafe { varargs.get(index, &mut ap, Some((arg.fmtkind, arg.intkind))) } {
+                    VaArg::c_char(c) => {
+                        pad(w, !left, b' ', 1..pad_space)?;
+                        w.write_all(&[c as u8])?;
+                        pad(w, left, b' ', 1..pad_space)?;
+                    }
+                    VaArg::wint_t(c) => {
+                        let c = match char::from_u32(c as _) {
+                            Some(c) => c,
+                            None => {
+                                platform::ERRNO.set(EILSEQ);
+                                return Err(io::last_os_error());
+                            }
+                        };
+                        let mut buf = [0; 4];
+
+                        pad(w, !left, b' ', 1..pad_space)?;
+                        w.write_all(c.encode_utf8(&mut buf).as_bytes())?;
+                        pad(w, left, b' ', 1..pad_space)?;
+                    }
+                    _ => unreachable!("this should not be possible"),
+                }
+            }
+            FmtKind::Pointer => {
+                let ptr = match unsafe {
+                    varargs.get(index, &mut ap, Some((arg.fmtkind, arg.intkind)))
+                } {
+                    VaArg::pointer(p) => p,
+                    _ => panic!("this should not be possible"),
+                };
+
+                let mut len = 1;
+                if ptr.is_null() {
+                    len = "(nil)".len();
+                } else {
+                    let mut ptr = ptr as usize;
+                    while ptr >= 10 {
+                        ptr /= 10;
+                        len += 1;
+                    }
+                }
+
+                pad(w, !left, b' ', len..pad_space)?;
+                if ptr.is_null() {
+                    write!(w, "(nil)")?;
+                } else {
+                    write!(w, "0x{:x}", ptr as usize)?;
+                }
+                pad(w, left, b' ', len..pad_space)?;
+            }
+            FmtKind::GetWritten => {
+                let ptr = match unsafe {
+                    varargs.get(index, &mut ap, Some((arg.fmtkind, arg.intkind)))
+                } {
+                    VaArg::pointer(p) => p,
+                    _ => panic!("this should not be possible"),
+                };
+
+                match intkind {
+                    IntKind::Byte => unsafe { *(ptr as *mut c_char) = w.written as c_char },
+                    IntKind::Short => unsafe { *(ptr as *mut c_short) = w.written as c_short },
+                    IntKind::Int => unsafe { *(ptr as *mut c_int) = w.written as c_int },
+                    IntKind::Long => unsafe { *(ptr as *mut c_long) = w.written as c_long },
+                    IntKind::LongLong => unsafe {
+                        *(ptr as *mut c_longlong) = w.written as c_longlong
+                    },
+                    IntKind::IntMax => unsafe { *(ptr as *mut intmax_t) = w.written as intmax_t },
+                    IntKind::PtrDiff => unsafe {
+                        *(ptr as *mut ptrdiff_t) = w.written as ptrdiff_t
+                    },
+                    IntKind::Size => unsafe { *(ptr as *mut size_t) = w.written as size_t },
+                }
+            }
+        }
+    }
+    Ok(w.written as c_int)
+}
+
+/// Implementation of `printf` formatting function, generic over a `writer`
+///
+/// This implementation in currently compliant over C17 specification (lacking a few one from C23)
+/// and contains extensions as well.
+///
+/// # The Format Specification
+/// ```text
+/// %[conversion-flags][field-width][precision][length-modifier]<conversion-format>
+/// ```
+///
+/// <div class="warning">
+/// ※ : This symbol means it is not implemented yet, but it is defined in the C standard
+/// </div>
+///
+/// ## Conversion Flags
+/// Conversion flags are flags that modify the behavior of the [conversion
+/// format]. Each one can happen only once per format specifier. They are:
+///
+/// - `-`: The result of the conversion is left-justified within the field (by default it is
+///   right-justified).
+/// - `+`: The sign of signed conversions is always prepended to the result of the conversion (by
+///   default the result is preceded by minus **only** when it is negative).
+/// - ` `(space): If the result of a signed conversion does not start with a sign character, or is
+///   empty, space is prepended to the result.
+///   - It is ignored if `+` flag is present.
+/// - `#`: Alternative form of the conversion is performed. See the documentation for each
+///   [conversion format] for details.
+/// - `0`: For integer and floating-point number conversions, leading zeros are used to pad the
+///   field instead of space characters.
+///   - For integer numbers it is ignored if the precision is explicitly specified.
+///   - For other conversions using this flag results in undefined behavior.
+///   - It is ignored if `-` flag is present.
+///
+/// ## Field Width
+/// Specifies minimum field width. This makes the result to be padded (with spaces by default, with
+/// zeroes if `0` conversion flag is specified) if the converted value has fewer characters than the
+/// specified width. It can take three forms:
+///
+/// - `N` where N is a positive integer: Specifies the field width value of `N`.
+/// - `*`: The width is specified by an extra argument of type [`int`], which has to appear before
+///   the argument to be converted and the [precision] (if specified with `.*`).
+///   - If the value of e extra argument is negative, it is interpreted as with `-` [conversion
+///     flag], i.e. left-justified result.
+/// - `*P$` where P is a positive integer: The width is specified by an extra argument of type
+///   [`int`], which has to appear exactly at the position specified by `P`.
+///   - This is a popular extension of the C and POSIX standards.
+///   - If the value of e extra argument is negative, it is interpreted as with `-` [conversion
+///     flag], i.e. left-justified result.
+///
+/// ## Precision
+/// Specifies the precision of the conversion.
+///
+/// For integer [conversion formats], this specifies the number of digits to appear in the result.
+///
+/// For float point [conversion formats], this specifies the number of digits to appear after the
+/// decimal-point character.
+///
+/// It can take three forms:
+///
+/// - `.N` where N is a positive integer: Specifies the precision value of `N`.
+/// - `.*`: The precision is specified by an extra argument of type [`int`], which  has to appear
+///   before the argument to be converted and after the the [field width] (if specified with `*`).
+///   - If the value of the extra argument is negative, it is interpreted as if the precision were
+///     omitted.
+/// - `.*P$` where P is a positive integer: The precision is specified by an extra argument of type
+///   [`int`], which has to appear exactly at the position specified by `P`.
+///   - This is an popular extension of the C and POSIX standards.
+///   - If the value of e extra argument is negative, it is interpreted as if the precision were
+///     omitted.
+///
+/// ## Length Modifier
+/// Specifies the size of the argument. In combination with the [conversion format], it specifies
+/// the type of the corresponding argument.
+///
+/// - `hh`: Byte size
+///   - Works with integer conversion formats (`d`, `i`, `o`, `x`, `X`, `b`, `B`)
+///   - Works with written number conversion format (`n`)
+/// - `h`: Short size
+///   - Works with integer conversion formats (`d`, `i`, `o`, `x`, `X`, `b`, `B`)
+///   - Works with written number conversion format (`n`)
+/// - `l`: Long size
+///   - Works with integer conversion formats (`d`, `i`, `o`, `x`, `X`, `b`, `B`)
+///   - Works with character conversion format (`c`)
+///   - Works with string conversion format (`s`)
+///   - Works with written number conversion format (`n`)
+///   - Works with float conversion formats (`f`, `F`, `e`, `E`, `a`, `A`, `g`, `G`) (C99)
+/// - `ll`: Long long size
+///   - Works with integer conversion formats (`d`, `i`, `o`, `x`, `X`, `b`, `B`)
+///   - Works with written number conversion format (`n`)
+/// - `j`: Maximum width
+///   - Works with integer conversion formats (`d`, `i`, `o`, `x`, `X`, `b`, `B`)
+///   - Works with written number conversion format (`n`)
+/// - `z`: Pointer width size
+///   - Works with integer conversion formats (`d`, `i`, `o`, `x`, `X`, `b`, `B`)
+///   - Works with written number conversion format (`n`)
+/// - `t`: Pointer diff width
+///   - Works with integer conversion formats (`d`, `i`, `o`, `x`, `X`, `b`, `B`)
+///   - Works with written number conversion format (`n`)
+/// - `wN` (C23 ※): Specifies that the size should be N bits width version of the supported
+///   conversion format.
+///   - Works with integer conversion formats (`d`, `i`, `o`, `x`, `X`, `b`, `B`)
+///   - The supported values of `N` must be the same as the widths specified in `stdint.h`
+/// - `wfN` (C23 ※): Specifies that the size should be the fast N bits width version of the
+///   supported conversion format.
+///   - Works with integer conversion formats (`d`, `i`, `o`, `x`, `X`, `b`, `B`)
+///   - The supported values of `N` must be the same as the widths specified in `stdint.h`
+/// - `L`: Long double size
+///   - Works with float conversion formats (`f`, `F`, `e`, `E`, `a`, `A`, `g`, `G`)
+/// - `H` (C23 ※): _Decimal32 size
+///   - Works with float conversion formats (`f`, `F`, `e`, `E`, `a`, `A`, `g`, `G`)
+/// - `D` (C23 ※): _Decimal64 size
+///   - Works with float conversion formats (`f`, `F`, `e`, `E`, `a`, `A`, `g`, `G`)
+/// - `DD` (C23 ※): _Decimal128 size
+///   - Works with float conversion formats (`f`, `F`, `e`, `E`, `a`, `A`, `g`, `G`)
+///
+/// ## Conversion Format
+/// Specifies the conversion format as one of the following:
+///
+/// - `%`: Writes a percent symbol. The full conversion format must be `%%`.
+/// - `c`: Writes as single character
+///   - Without length modifier:
+///     - The argument is first converted to [`unsigned char`]
+///   - With `l` length modifier:
+///     - The argument is first converted to a character string as if by `%ls` with a array of 2
+///       [`wchar_t`] argument.
+/// - `s`: Writes a character string
+///   - The argument is a pointer to the first character
+///   - The [precision] specifies the maximum number of bytes to be written. If not specified,
+///     writes up to the first null character found.
+/// - `d` and `i`: Writes a decimal representation of a signed integer
+///   - The [precision] specifies the minimal number to appear (defaults to `1`).
+///   - If the precision is zero and the value to be written is also zero, the result is no
+///     characters written.
+/// - `u`: Writes the decimal representation of a unsigned integer
+///   - The [precision] specifies the minimal number to appear (defaults to `1`).
+///   - If the precision is zero and the value to be written is also zero, the result is no
+///     characters written.
+/// - `o`: Writes the octal representation of a unsigned integer.
+///   - The [precision] specifies the minimal number to appear (defaults to `1`).
+///   - If the precision is zero and the value to be written is also zero, the result is no
+///     characters written.
+///   - The alternative representation includes a leading `0`.
+///   - The types are the same as `u`
+/// - `x`: Writes the hexadecimal representation of a unsigned integer with lowercase characters.
+///   - The [precision] specifies the minimal number to appear (defaults to `1`).
+///   - If the precision is zero and the value to be written is also zero, the result is no
+///     characters written.
+///   - The alternative representation includes a leading `0x`.
+///   - The types are the same as `u`
+/// - `X`: Writes the hexadecimal representation of a unsigned integer with uppercase characters.
+///   - The [precision] specifies the minimal number to appear (defaults to `1`).
+///   - If the precision is zero and the value to be written is also zero, the result is no
+///     characters written.
+///   - The alternative representation includes a leading `0X`.
+///   - The types are the same as `u`.
+/// - `b` | `B` (C23): Writes the binary representation of a unsigned integer.
+///   - The [precision] specifies the minimal number to appear (defaults to `1`).
+///   - If the precision is zero and the value to be written is also zero, the result is no
+///     characters written.
+///   - The alternative representation includes a leading `0b` and `0B`, respectively.
+///   - The types are the same as `u`.
+/// - `f` | `F`: Writes the decimal representation of a float point number.
+///   - The [precision] specifies the exact number of digits to appear after the decimal point
+///     character (defaults to `6`).
+///   - The alternative representation, the decimal point character is written even if no digits
+///     follow it.
+/// - `e` | `E`: Writes the float point number with the decimal exponential notation (\[-\]d.ddd
+///   **e**±dd | \[-\]d.ddd **E**±dd)
+///   - The [precision] specifies the exact number of digits to appear after the decimal point
+///     character (defaults to `6`).
+///   - The exponent contains at least two digits, more digits are used only if necessary.
+///   - If the value is ​zero, the exponent is also ​zero​.
+///   - The alternative representation: decimal point character is written even if no digits follow
+///     it.
+/// - `a` | `A`: Writes the float point number with the hexadecimal exponential notation (\[-\]
+///   **0x**h.hhh **p**±d | \[-\] **0X**h.hhh **P**±d)
+///   - The [precision] specifies the exact number of digits to appear after the hexadecimal point
+///     character (defaults to `6`).
+///   - If the value is ​zero, the exponent is also ​zero​.
+///   - The alternative representation: decimal point character is written even if no digits follow
+///     it.
+/// - `g` | `G`: Writes the float point number to decimal or decimal exponent notation depending on
+///   the value and the [precision].
+///   - Let `P` equal the precision if nonzero, `6` if the precision is not specified, or `1` if the
+///     precision is `​0`​. Then, if a conversion with style `E` would have an exponent of `X`:
+///     - If `P > X ≥ −4`, the conversion is with the format `f` and precision `P − 1 − X`.
+///     - Otherwise, the conversion is with the format `e` or `E` and precision `P − 1`.
+///   - Unless alternative representation is requested, the trailing zeros are removed. Also the
+///     decimal point character is removed if no fractional part is left.
+/// - `n`: Writes the number of characters written in the call into the argument pointer
+///   - It can not contain any [conversion flag], [field width], or [precision].
+/// - `p`: Writes an implementation defined character sequence defining a pointer.
+///
+/// ### Types
+/// The types expected by the format string can change with the [length modifier].
+///
+/// For the `c`:
+/// - Without length modifier: [`int`]
+/// - With `l` length modifier: [`wint_t`]
+///
+/// For the `s`:
+/// - Without length modifier: pointer to [`char`] (`char*`, `const char*`)
+/// - With `l` length modifier: pointer to [`wchar_t`] (`wchar_t*`, `const wchar_t*`)
+///
+/// For the `d` and `i`:
+/// - Without length modifier: [`int`]
+/// - With `hh` length modifier: [`signed char`]
+/// - With `h` length modifier: [`short`]
+/// - With `l` length modifier: [`long`]
+/// - With `ll` length modifier: [`long long`]
+/// - With `j` length modifier: [`intmax_t`]
+/// - With `z` length modifier: [`ssize_t`]
+/// - With `t` length modifier: [`ptrdiff_t`]
+///
+/// For the `u`, `o`, `x`, `X`, `b`, `B`:
+/// - Without length modifier: [`unsigned int`]
+/// - With `hh` length modifier: [`unsigned char`]
+/// - With `h` length modifier: [`unsigned short`]
+/// - With `l` length modifier: [`unsigned long`]
+/// - With `ll` length modifier: [`unsigned long long`]
+/// - With `j` length modifier: [`uintmax_t`]
+/// - With `z` length modifier: [`size_t`]
+/// - With `t` length modifier: [`unsigned ptrdiff_t`]
+///
+/// For the `f`, `F`, `e`, `E`, `a`, `A`, `g`, `G`:
+/// - Without length modifier: [`double`]
+/// - With `l` length modifier: [`double`]
+/// - With `L` length modifier: `long double`
+/// - With `H` length modifier (C23 ※): `_Decimal32`
+/// - With `D` length modifier (C23 ※): `_Decimal64`
+/// - With `DD` length modifier (C23 ※): `_Decimal128`
+///
+/// For the `n`
+/// - Without length modifier: pointer to [`int`] (`int*`)
+/// - With `hh` length modifier: pointer to [`signed char`] (`signed char*`)
+/// - With `h` length modifier: pointer to [`short`] (`short*`)
+/// - With `l` length modifier: pointer to [`long`] (`long*`)
+/// - With `ll` length modifier: pointer to [`long long`] (`long long*`)
+/// - With `j` length modifier: pointer to [`intmax_t`] (`intmax_t*`)
+/// - With `z` length modifier: pointer to [`ssize_t`] (`ssize_t*`)
+/// - With `t` length modifier: pointer to [`ptrdiff_t`] (`ptrdiff_t*`)
+///
+/// For the `p`, it must always be a pointer to [`void`] (`void*` | `const void*`)
+///
+/// [precision]: #precision
+/// [field width]: #field-width
+/// [length modifier]: #length-modifier
+/// [conversion format]: #conversion-format
+/// [`int`]: c_int
+/// [`unsigned char`]: c_uchar
+/// [`unsigned short`]: c_ushort
+/// [`unsigned int`]: c_uint
+/// [`unsigned long`]: c_ulong
+/// [`unsigned long long`]: c_ulonglong
+/// [`unsigned ptrdiff_t`]: ptrdiff_t
+/// [`wchar_t`]: wchar_t
+/// [`char`]: c_char
+/// [`signed char`]: c_schar
+/// [`short`]: c_short
+/// [`long`]: c_long
+/// [`long long`]: c_longlong
+/// [`double`]: c_double
+/// [`long double`]: c_longdouble
+/// [`void`]: c_void
+///
+/// # Safety
+/// Behavior is undefined if any of the following conditions are violated:
+/// - `ap` must follow the safety contract of variable arguments of C.
+pub unsafe fn printf(w: impl Write, format: CStr, ap: VaList) -> c_int {
+    unsafe { inner_printf::<c_str::Thin>(w, format, ap).unwrap_or(-1) }
+}
diff --git a/recipes/core/relibc/src/header/stdio/reader.rs b/recipes/core/relibc/src/header/stdio/reader.rs
new file mode 100644
index 0000000000..aaf6ea05e2
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/reader.rs
@@ -0,0 +1,180 @@
+use super::{FILE, SEEK_SET, fseek_locked, ftell_locked};
+use crate::{
+    c_str::{CStr, Kind, NulStr, Thin, WStr, Wide},
+    header::{
+        errno::EILSEQ,
+        stdlib::MB_CUR_MAX,
+        wchar::{get_char_encoded_length, mbrtowc},
+        wctype::WEOF,
+    },
+    io::Read,
+    platform::{
+        ERRNO,
+        types::{c_char, off_t, wchar_t, wint_t},
+    },
+};
+use core::{
+    iter::Iterator,
+    marker::PhantomData,
+    ptr::{self},
+};
+
+pub struct BufferReader<'a, T: Kind> {
+    buf: NulStr<'a, T>,
+}
+
+impl<'a> From<WStr<'a>> for BufferReader<'a, Wide> {
+    fn from(buff: WStr<'a>) -> Self {
+        BufferReader { buf: buff }
+    }
+}
+
+impl<'a> From<CStr<'a>> for BufferReader<'a, Thin> {
+    fn from(buff: CStr<'a>) -> Self {
+        BufferReader { buf: buff }
+    }
+}
+
+impl<'a, T: Kind> Iterator for BufferReader<'a, T> {
+    type Item = Result<T::Char, i32>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.buf.split_first().map(|(c, r)| {
+            self.buf = r;
+            Ok(c)
+        })
+    }
+}
+
+pub struct FileReader<'a, T: Kind> {
+    f: &'a mut FILE,
+    position: off_t,
+    phantom: PhantomData<T>,
+}
+
+impl<'a, T: Kind> FileReader<'a, T> {
+    // Gets the wchar at the current position
+    #[inline]
+    fn get_curret_char(&mut self) -> Result<Option<(T::Char, usize)>, i32> {
+        if T::IS_THIN_NOT_WIDE {
+            let mut buf: [u8; 1] = [0];
+            match self.f.read(&mut buf) {
+                Ok(0) => Ok(None),
+                Ok(n) => Ok(Some((T::Char::from(buf[0]), n))),
+                Err(_) => Err(-1),
+            }
+        } else {
+            let buf = &mut [0; MB_CUR_MAX as usize];
+            let mut encoded_length = 0;
+            let mut bytes_read = 0;
+
+            loop {
+                match self.f.read(&mut buf[bytes_read..bytes_read + 1]) {
+                    Ok(0) => return Ok(None),
+                    Ok(_) => {}
+                    Err(_) => return Err(-1),
+                }
+
+                bytes_read += 1;
+
+                if bytes_read == 1 {
+                    encoded_length = if let Some(el) = get_char_encoded_length(buf[0]) {
+                        el
+                    } else {
+                        ERRNO.set(EILSEQ);
+                        return Self::get_char_from_wint(WEOF).map(|c| Some((c, 0)));
+                    };
+                }
+
+                if bytes_read >= encoded_length {
+                    break;
+                }
+            }
+
+            let mut wc: wchar_t = 0;
+            unsafe {
+                mbrtowc(
+                    &raw mut wc,
+                    buf.as_ptr().cast::<c_char>(),
+                    encoded_length,
+                    ptr::null_mut(),
+                );
+            }
+
+            Self::get_char_from_wint(wc as wint_t).map(|c| Some((c, encoded_length)))
+        }
+    }
+
+    fn get_char_from_wint(wc: wint_t) -> Result<T::Char, i32> {
+        if let Some(wc_char) = T::chars_from_bytes(&wc.to_be_bytes())
+            && wc_char.len() == 1
+        {
+            Ok(wc_char[0])
+        } else {
+            Err(-1)
+        }
+    }
+}
+
+impl<'a, T: Kind> Iterator for FileReader<'a, T> {
+    type Item = Result<T::Char, i32>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        unsafe { fseek_locked(self.f, self.position, SEEK_SET) };
+
+        match self.get_curret_char() {
+            Ok(Some((wc, encoded_length))) => {
+                unsafe { fseek_locked(self.f, self.position, SEEK_SET) };
+                self.position += encoded_length as off_t;
+                Some(Ok(wc))
+            }
+            Ok(None) => None,
+            Err(e) => Some(Err(e)),
+        }
+    }
+}
+
+impl<'a, T: Kind> From<&'a mut FILE> for FileReader<'a, T> {
+    fn from(f: &'a mut FILE) -> Self {
+        let position = unsafe { ftell_locked(f) } as off_t;
+        FileReader {
+            f,
+            position,
+            phantom: PhantomData::<T>,
+        }
+    }
+}
+
+pub enum Reader<'a, T: Kind> {
+    FILE(FileReader<'a, T>, PhantomData<T>),
+    BUFFER(BufferReader<'a, T>),
+}
+
+impl<'a, T: Kind> Iterator for Reader<'a, T> {
+    type Item = Result<T::Char, i32>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self {
+            Self::FILE(r, _) => r.next(),
+            Self::BUFFER(r) => r.next(),
+        }
+    }
+}
+
+impl<'a, T: Kind> From<&'a mut FILE> for Reader<'a, T> {
+    fn from(f: &'a mut FILE) -> Self {
+        Self::FILE(f.into(), PhantomData::<T>)
+    }
+}
+
+impl<'a> From<WStr<'a>> for Reader<'a, Wide> {
+    fn from(buff: WStr<'a>) -> Self {
+        Self::BUFFER(buff.into())
+    }
+}
+
+impl<'a> From<CStr<'a>> for Reader<'a, Thin> {
+    fn from(buff: CStr<'a>) -> Self {
+        Self::BUFFER(buff.into())
+    }
+}
diff --git a/recipes/core/relibc/src/header/stdio/scanf.rs b/recipes/core/relibc/src/header/stdio/scanf.rs
new file mode 100644
index 0000000000..1d89cc54e6
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdio/scanf.rs
@@ -0,0 +1,514 @@
+use super::reader::Reader;
+use crate::{
+    c_str::Kind,
+    header::stdio::printf::IntKind,
+    platform::types::{
+        c_char, c_double, c_float, c_int, c_long, c_longlong, c_short, c_uchar, c_uint, c_ulong,
+        c_ulonglong, c_ushort, c_void, intmax_t, ptrdiff_t, size_t, ssize_t, uintmax_t, wchar_t,
+    },
+};
+use alloc::{string::String, vec::Vec};
+use core::{ffi::VaList as va_list, iter::Peekable};
+
+#[derive(PartialEq, Eq)]
+enum CharKind {
+    Ascii,
+    Wide,
+}
+
+fn next_char<T: Kind>(lar: &mut Peekable<Reader<'_, T>>) -> Result<char, c_int> {
+    if let Some(c) = lar.next().transpose()? {
+        char::try_from(c.into()).map_err(|_| -1)
+    } else {
+        Ok('\0')
+    }
+}
+
+macro_rules! wc_as_char {
+    ($c:ident) => {
+        char::try_from($c.into()).map_err(|_| -1)?
+    };
+}
+
+pub unsafe fn inner_scanf<T: Kind>(
+    mut r: Reader<T>,
+    format: Reader<T>,
+    mut ap: va_list,
+) -> Result<c_int, c_int> {
+    let mut matched = 0;
+    let mut character: char = '\0';
+    let mut skip_read = false;
+    let mut count = 0;
+    let mut format = format.peekable();
+
+    macro_rules! read {
+        () => {{
+            match r.next() {
+                None => false,
+                Some(Ok(b)) => {
+                    character = wc_as_char!(b);
+                    count += 1;
+                    true
+                }
+                Some(Err(x)) => return Err(x),
+            }
+        }};
+    }
+
+    macro_rules! maybe_read {
+        () => {
+            maybe_read!(inner false);
+        };
+        (noreset) => {
+            maybe_read!(inner);
+        };
+        (inner $($placeholder:expr)*) => {
+            if !skip_read && !read!() {
+                match matched {
+                    0 => return Ok(-1),
+                    a => return Ok(a),
+                }
+            }
+            $(else {
+                // Hacky way of having this optional
+                skip_read = $placeholder;
+            })*
+        }
+    }
+
+    while format.peek().is_some() {
+        let mut c = next_char(&mut format)?;
+
+        if c == ' ' {
+            maybe_read!(noreset);
+
+            while (character).is_whitespace() {
+                if !read!() {
+                    return Ok(matched);
+                }
+            }
+
+            skip_read = true;
+        } else if c != '%' {
+            maybe_read!();
+            if c != character {
+                return Ok(matched);
+            }
+        } else {
+            c = next_char(&mut format)?;
+
+            let mut ignore = false;
+            if c == '*' {
+                ignore = true;
+                c = next_char(&mut format)?;
+            }
+
+            let mut width = String::new();
+            while c.is_ascii_digit() {
+                width.push(c);
+                c = next_char(&mut format)?;
+            }
+            let mut width = if width.is_empty() {
+                None
+            } else {
+                match width.parse::<usize>() {
+                    Ok(n) => Some(n),
+                    Err(_) => return Err(-1),
+                }
+            };
+
+            // When an EOF occurs, eof is set, stuff is marked matched
+            // as usual, and finally it is returned
+            let mut eof = false;
+
+            let mut kind = IntKind::Int;
+            let mut c_kind = CharKind::Ascii;
+            loop {
+                match c {
+                    'h' => {
+                        if kind == IntKind::Short || kind == IntKind::Byte {
+                            kind = IntKind::Byte;
+                        } else {
+                            kind = IntKind::Short;
+                        }
+                    }
+                    'j' => kind = IntKind::IntMax,
+                    'l' => {
+                        if kind == IntKind::Long || kind == IntKind::LongLong {
+                            kind = IntKind::LongLong;
+                        } else {
+                            kind = IntKind::Long;
+                        }
+                    }
+                    'q' | 'L' => kind = IntKind::LongLong,
+                    't' => kind = IntKind::PtrDiff,
+                    'z' => kind = IntKind::Size,
+                    // If kind is Long, means we found a 'l' before finding 'c' or 's'. In this
+                    // case the format corresponds to a wide char/string
+                    'c' | 's' if kind == IntKind::Long && !T::IS_THIN_NOT_WIDE => {
+                        c_kind = CharKind::Wide;
+                        break;
+                    }
+                    _ => break,
+                }
+
+                c = next_char(&mut format)?;
+            }
+
+            if c != 'n' {
+                maybe_read!(noreset);
+            }
+            match c {
+                '%' => {
+                    while (character).is_whitespace() {
+                        if !read!() {
+                            return Ok(matched);
+                        }
+                    }
+
+                    if character != '%' {
+                        return Err(matched);
+                    } else if !read!() {
+                        return Ok(matched);
+                    }
+                }
+
+                'd' | 'i' | 'o' | 'u' | 'x' | 'X' | 'f' | 'e' | 'g' | 'E' | 'a' | 'p' => {
+                    while character.is_whitespace() {
+                        if !read!() {
+                            return Ok(matched);
+                        }
+                    }
+
+                    let pointer = c == 'p';
+                    // Pointers aren't automatic, but we do want to parse "0x"
+                    let auto = c == 'i' || pointer;
+                    let float = c == 'f' || c == 'e' || c == 'g' || c == 'E' || c == 'a';
+
+                    let mut radix = match c {
+                        'o' => 8,
+                        'x' | 'X' | 'p' => 16,
+                        _ => 10,
+                    };
+
+                    let mut n = String::new();
+                    let mut dot = false;
+
+                    while width.map(|w| w > 0).unwrap_or(true)
+                        && (('0'..='7').contains(&character)
+                            || (radix >= 10 && ('8'..='9').contains(&character))
+                            || (float && !dot && character == '.')
+                            || (radix == 16
+                                && (('a'..='f').contains(&character)
+                                    || ('A'..='F').contains(&character))))
+                    {
+                        if auto
+                            && n.is_empty()
+                            && character == '0'
+                            && width.map(|w| w > 0).unwrap_or(true)
+                        {
+                            if !pointer {
+                                radix = 8;
+                            }
+                            width = width.map(|w| w - 1);
+                            if !read!() {
+                                return Ok(matched);
+                            }
+                            if width.map(|w| w > 0).unwrap_or(true)
+                                && (character == 'x' || character == 'X')
+                            {
+                                radix = 16;
+                                width = width.map(|w| w - 1);
+                                if width.map(|w| w > 0).unwrap_or(true) && !read!() {
+                                    return Ok(matched);
+                                }
+                            }
+                            continue;
+                        }
+                        if character == '.' {
+                            // Don't allow another dot
+                            dot = true;
+                        }
+                        n.push(character);
+                        width = width.map(|w| w - 1);
+                        if width.map(|w| w > 0).unwrap_or(true) && !read!() {
+                            break;
+                        }
+                    }
+
+                    macro_rules! parse_type {
+                        (noformat $type:ident) => {{
+                            let n = if n.is_empty() {
+                                0 as $type
+                            } else {
+                                n.parse::<$type>().map_err(|_| 0)?
+                            };
+                            if !ignore {
+                                unsafe { *ap.arg::<*mut $type>() = n };
+                                matched += 1;
+                            }
+                        }};
+                        (c_double) => {
+                            parse_type!(noformat c_double)
+                        };
+                        (c_float) => {
+                            parse_type!(noformat c_float)
+                        };
+                        ($type:ident) => {
+                            parse_type!($type, $type)
+                        };
+                        ($type:ident, $final:ty) => {{
+                            let n = if n.is_empty() {
+                                0 as $type
+                            } else {
+                                $type::from_str_radix(&n, radix).map_err(|_| 0)?
+                            };
+                            if !ignore {
+                                unsafe { *ap.arg::<*mut $final>() = n as $final };
+                                matched += 1;
+                            }
+                        }};
+                    }
+
+                    if float {
+                        if kind == IntKind::Long || kind == IntKind::LongLong {
+                            parse_type!(c_double);
+                        } else {
+                            parse_type!(c_float);
+                        }
+                    } else if c == 'p' {
+                        parse_type!(size_t, *mut c_void);
+                    } else {
+                        let unsigned = c == 'o' || c == 'u' || c == 'x' || c == 'X';
+
+                        match kind {
+                            IntKind::Byte => {
+                                if unsigned {
+                                    parse_type!(c_uchar);
+                                } else {
+                                    parse_type!(c_char);
+                                }
+                            }
+                            IntKind::Short => {
+                                if unsigned {
+                                    parse_type!(c_ushort)
+                                } else {
+                                    parse_type!(c_short)
+                                }
+                            }
+                            IntKind::Int => {
+                                if unsigned {
+                                    parse_type!(c_uint)
+                                } else {
+                                    parse_type!(c_int)
+                                }
+                            }
+                            IntKind::Long => {
+                                if unsigned {
+                                    parse_type!(c_ulong)
+                                } else {
+                                    parse_type!(c_long)
+                                }
+                            }
+                            IntKind::LongLong => {
+                                if unsigned {
+                                    parse_type!(c_ulonglong)
+                                } else {
+                                    parse_type!(c_longlong)
+                                }
+                            }
+                            IntKind::IntMax => {
+                                if unsigned {
+                                    parse_type!(uintmax_t)
+                                } else {
+                                    parse_type!(intmax_t)
+                                }
+                            }
+                            IntKind::PtrDiff => parse_type!(ptrdiff_t),
+                            IntKind::Size => {
+                                if unsigned {
+                                    parse_type!(size_t)
+                                } else {
+                                    parse_type!(ssize_t)
+                                }
+                            }
+                        }
+                    }
+                }
+
+                's' => {
+                    macro_rules! parse_string_type {
+                        ($type:ident) => {
+                            while character.is_whitespace() {
+                                if !read!() {
+                                    return Ok(matched);
+                                }
+                            }
+
+                            let mut ptr: Option<*mut $type> =
+                                if ignore { None } else { Some(ap.arg()) };
+
+                            while width.map(|w| w > 0).unwrap_or(true) && !character.is_whitespace()
+                            {
+                                if let Some(ref mut ptr) = ptr {
+                                    **ptr = character as $type;
+                                    *ptr = ptr.offset(1);
+                                }
+                                width = width.map(|w| w - 1);
+                                if width.map(|w| w > 0).unwrap_or(true) && !read!() {
+                                    eof = true;
+                                    break;
+                                }
+                            }
+
+                            // If we read the width, we end up in the last character of was
+                            // intended to be read, so we advance one
+                            if let Some(0) = width {
+                                read!();
+                            }
+
+                            if let Some(ptr) = ptr {
+                                *ptr = 0;
+                                matched += 1;
+                            }
+                        };
+                    }
+
+                    if c_kind == CharKind::Ascii {
+                        unsafe {
+                            parse_string_type!(c_char);
+                        }
+                    } else {
+                        unsafe {
+                            parse_string_type!(wchar_t);
+                        }
+                    }
+                }
+
+                'c' => {
+                    macro_rules! parse_char_type {
+                        ($type:ident) => {
+                            let ptr: Option<*mut $type> = if ignore {
+                                None
+                            } else {
+                                Some(unsafe { ap.arg() })
+                            };
+
+                            for i in 0..width.unwrap_or(1) {
+                                if let Some(ptr) = ptr {
+                                    unsafe { *ptr.add(i) = character as $type };
+                                }
+                                width = width.map(|w| w - 1);
+                                if width.map(|w| w > 0).unwrap_or(true) && !read!() {
+                                    eof = true;
+                                    break;
+                                }
+                            }
+
+                            if ptr.is_some() {
+                                matched += 1;
+                            }
+                        };
+                    }
+
+                    if c_kind == CharKind::Ascii {
+                        parse_char_type!(c_char);
+                    } else {
+                        parse_char_type!(wchar_t);
+                    }
+                }
+
+                '[' => {
+                    c = next_char(&mut format)?;
+
+                    let mut matches = Vec::new();
+                    let invert = if c == '^' {
+                        c = next_char(&mut format)?;
+                        true
+                    } else {
+                        false
+                    };
+
+                    let mut prev: u32;
+                    loop {
+                        matches.push(c);
+                        prev = c.into();
+                        c = next_char(&mut format)?;
+                        if c == '-' {
+                            if prev as u8 == b']' {
+                                continue;
+                            }
+                            c = next_char(&mut format)?;
+                            if c == ']' {
+                                matches.push('-');
+                                break;
+                            }
+                            prev += 1;
+                            while prev < c.into() {
+                                matches.push(char::try_from(prev).map_err(|_| -1)?);
+                                prev += 1;
+                            }
+                        } else if c == ']' {
+                            break;
+                        }
+                    }
+
+                    let mut ptr: Option<*mut c_char> = if ignore {
+                        None
+                    } else {
+                        Some(unsafe { ap.arg() })
+                    };
+
+                    // While we haven't used up all the width, and it matches
+                    let mut data_stored = false;
+                    while width.map(|w| w > 0).unwrap_or(true)
+                        && invert != matches.contains(&character)
+                    {
+                        if let Some(ref mut ptr) = ptr {
+                            unsafe { **ptr = character as c_char };
+                            *ptr = unsafe { ptr.offset(1) };
+                            data_stored = true;
+                        }
+                        // Decrease the width, and read a new character unless the width is 0
+                        width = width.map(|w| w - 1);
+                        if width.map(|w| w > 0).unwrap_or(true) && !read!() {
+                            // Reading a new character has failed, return after
+                            // actually marking this as matched
+                            eof = true;
+                            break;
+                        }
+                    }
+
+                    if data_stored {
+                        unsafe { *ptr.unwrap() = 0 };
+                        matched += 1;
+                    }
+                }
+                'n' => {
+                    if !ignore {
+                        unsafe { *ap.arg::<*mut c_int>() = count as c_int };
+                    }
+                }
+                _ => return Err(-1),
+            }
+
+            if eof {
+                return Ok(matched);
+            }
+
+            if width != Some(0) && c != 'n' {
+                // It didn't hit the width, so an extra character was read and matched.
+                // But this character did not match so let's reuse it.
+                skip_read = true;
+            }
+        }
+    }
+    Ok(matched)
+}
+
+pub unsafe fn scanf<T: Kind>(r: Reader<T>, format: Reader<T>, ap: va_list) -> c_int {
+    match unsafe { inner_scanf(r, format, ap) } {
+        Ok(n) => n,
+        Err(n) => n,
+    }
+}
diff --git a/recipes/core/relibc/src/header/stdlib/cbindgen.toml b/recipes/core/relibc/src/header/stdlib/cbindgen.toml
new file mode 100644
index 0000000000..c105da5486
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdlib/cbindgen.toml
@@ -0,0 +1,25 @@
+sys_includes = ["stddef.h", "alloca.h", "wchar.h", "features.h"]
+include_guard = "_RELIBC_STDLIB_H"
+trailer = """
+#ifndef _RELIBC_STDLIB_EXTRA_H
+#define _RELIBC_STDLIB_EXTRA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+long double strtold(const char *nptr, char **endptr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+"""
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/stdlib/mod.rs b/recipes/core/relibc/src/header/stdlib/mod.rs
new file mode 100644
index 0000000000..78e64e8d18
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdlib/mod.rs
@@ -0,0 +1,1708 @@
+//! `stdlib.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdlib.h.html>.
+
+use core::{convert::TryFrom, intrinsics, iter, mem, ptr, slice};
+use rand::{
+    RngExt, SeedableRng,
+    distr::{Alphanumeric, Distribution, Uniform},
+};
+use rand_jitter::JitterRng;
+use rand_xorshift::XorShiftRng;
+
+use crate::{
+    c_str::CStr,
+    error::{Errno, ResultExt},
+    fs::File,
+    header::{
+        ctype,
+        errno::{self, *},
+        fcntl::*,
+        limits,
+        stdio::flush_io_streams,
+        string::*,
+        sys_ioctl::*,
+        time::constants::CLOCK_MONOTONIC,
+        unistd::{self, _SC_PAGESIZE, sysconf},
+        wchar::*,
+    },
+    ld_so,
+    out::Out,
+    platform::{
+        self, Pal, Sys,
+        types::{
+            c_char, c_double, c_float, c_int, c_long, c_longlong, c_uint, c_ulong, c_ulonglong,
+            c_ushort, c_void, size_t, ssize_t, uintptr_t, wchar_t,
+        },
+    },
+    raw_cell::RawCell,
+    sync::Once,
+};
+
+mod rand48;
+mod random;
+mod sort;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdlib.h.html>.
+pub const EXIT_FAILURE: c_int = 1;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdlib.h.html>.
+pub const EXIT_SUCCESS: c_int = 0;
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdlib.h.html>.
+pub const RAND_MAX: c_int = 2_147_483_647;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdlib.h.html>.
+//Maximum number of bytes in a multibyte character for the current locale
+pub const MB_CUR_MAX: c_int = 4;
+/// Actually specified for `limits.h`?
+//Maximum number of bytes in a multibyte characters for any locale
+pub const MB_LEN_MAX: c_int = 4;
+
+static ATEXIT_FUNCS: RawCell<[Option<extern "C" fn()>; 32]> = RawCell::new([None; 32]);
+static AT_QUICK_EXIT_FUNCS: RawCell<[Option<extern "C" fn()>; 32]> = RawCell::new([None; 32]);
+static L64A_BUFFER: RawCell<[c_char; 7]> = RawCell::new([0; 7]); // up to 6 digits plus null terminator
+static mut RNG: Option<XorShiftRng> = None;
+
+// TODO: This could be const fn, but the trait system won't allow that.
+static RNG_SAMPLER: Once<Uniform<c_int>> = Once::new();
+
+fn rng_sampler() -> &'static Uniform<c_int> {
+    RNG_SAMPLER.call_once(|| Uniform::new_inclusive(0, RAND_MAX).expect("within bounds"))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/_Exit.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn _Exit(status: c_int) -> ! {
+    unistd::_exit(status);
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/a64l.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn a64l(s: *const c_char) -> c_long {
+    // Early return upon null pointer argument
+    if s.is_null() {
+        return 0;
+    }
+
+    // POSIX says only the low-order 32 bits are used.
+    let mut l: i32 = 0;
+
+    // Handle up to 6 input characters (excl. null terminator)
+    for i in 0..6 {
+        let digit_char = unsafe { *s.offset(i) };
+
+        let digit_value = match digit_char {
+            0 => break, // Null terminator encountered
+            46..=57 => {
+                // ./0123456789 represents values 0 to 11. b'.' == 46
+                digit_char - 46
+            }
+            65..=90 => {
+                // A-Z for values 12 to 37. b'A' == 65, 65-12 == 53
+                digit_char - 53
+            }
+            97..=122 => {
+                // a-z for values 38 to 63. b'a' == 97, 97-38 == 59
+                digit_char - 59
+            }
+            _ => return 0, // Early return for anything else
+        };
+
+        l |= i32::from(digit_value) << (6 * i);
+    }
+
+    c_long::from(l)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/abort.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn abort() -> ! {
+    log::error!("Abort");
+    intrinsics::abort();
+}
+
+#[cfg(not(target_pointer_width = "64"))]
+#[unsafe(no_mangle)]
+static __stack_chk_guard: uintptr_t = 0x19fcadfe;
+
+#[cfg(target_pointer_width = "64")]
+#[unsafe(no_mangle)]
+static __stack_chk_guard: uintptr_t = 0xd048c37519fcadfe;
+
+#[unsafe(no_mangle)]
+unsafe extern "C" fn __stack_chk_fail() -> ! {
+    unsafe { abort() };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/abs.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn abs(i: c_int) -> c_int {
+    i.abs()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/aligned_alloc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn aligned_alloc(alignment: size_t, size: size_t) -> *mut c_void {
+    if alignment == 0 || !size.is_multiple_of(alignment) {
+        platform::ERRNO.set(EINVAL);
+        return ptr::null_mut();
+    }
+    let mut pointer = ptr::null_mut();
+    unsafe { posix_memalign(ptr::from_mut(&mut pointer), alignment, size) };
+    pointer
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/at_quick_exit.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn at_quick_exit(func: Option<extern "C" fn()>) -> c_int {
+    for i in 0..unsafe { AT_QUICK_EXIT_FUNCS.unsafe_ref().len() } {
+        if unsafe { AT_QUICK_EXIT_FUNCS.unsafe_ref() }[i].is_none() {
+            (unsafe { AT_QUICK_EXIT_FUNCS.unsafe_mut() })[i] = func;
+            return 0;
+        }
+    }
+
+    1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atexit.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atexit(func: Option<extern "C" fn()>) -> c_int {
+    for i in 0..unsafe { ATEXIT_FUNCS.unsafe_ref().len() } {
+        if unsafe { ATEXIT_FUNCS.unsafe_ref() }[i].is_none() {
+            (unsafe { ATEXIT_FUNCS.unsafe_mut() })[i] = func;
+            return 0;
+        }
+    }
+
+    1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atof.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atof(s: *const c_char) -> c_double {
+    unsafe { strtod(s, ptr::null_mut()) }
+}
+
+macro_rules! dec_num_from_ascii {
+    ($s:expr, $t:ty) => {{
+        let mut s = $s;
+        // Iterate past whitespace
+        while ctype::isspace(c_int::from(unsafe { *s })) != 0 {
+            s = unsafe { s.offset(1) };
+        }
+
+        // Find out if there is a - sign
+        let neg_sign = match unsafe { *s } {
+            0x2d => {
+                s = unsafe { s.offset(1) };
+                true
+            }
+            // '+' increment s and continue parsing
+            0x2b => {
+                s = unsafe { s.offset(1) };
+                false
+            }
+            _ => false,
+        };
+
+        let mut n: $t = 0;
+        while ctype::isdigit(c_int::from(unsafe { *s })) != 0 {
+            n = 10 * n - (unsafe { *s } as $t - 0x30);
+            s = unsafe { s.offset(1) };
+        }
+
+        if neg_sign { n } else { -n }
+    }};
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atoi.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atoi(s: *const c_char) -> c_int {
+    dec_num_from_ascii!(s, c_int)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atol.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atol(s: *const c_char) -> c_long {
+    dec_num_from_ascii!(s, c_long)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/atol.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn atoll(s: *const c_char) -> c_longlong {
+    dec_num_from_ascii!(s, c_longlong)
+}
+
+unsafe extern "C" fn void_cmp(a: *const c_void, b: *const c_void) -> c_int {
+    (unsafe { *(a.cast::<i32>()) }) - unsafe { *(b.cast::<i32>()) } as c_int
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/bsearch.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn bsearch(
+    key: *const c_void,
+    base: *const c_void,
+    nel: size_t,
+    width: size_t,
+    compar: Option<unsafe extern "C" fn(*const c_void, *const c_void) -> c_int>,
+) -> *mut c_void {
+    let mut start = base;
+    let mut len = nel;
+    let cmp_fn = compar.unwrap_or(void_cmp);
+    while len > 0 {
+        let med = (start as size_t + (len >> 1) * width) as *const c_void;
+        let diff = unsafe { cmp_fn(key, med) };
+        if diff == 0 {
+            return med.cast_mut();
+        } else if diff > 0 {
+            start = (med as usize + width) as *const c_void;
+            len -= 1;
+        }
+        len >>= 1;
+    }
+    ptr::null_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/calloc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn calloc(nelem: size_t, elsize: size_t) -> *mut c_void {
+    //Handle possible integer overflow in size calculation
+    match nelem.checked_mul(elsize) {
+        Some(size) => {
+            /* If allocation fails here, errno setting will be handled
+             * by malloc() */
+            let ptr = unsafe { malloc(size) };
+            if !ptr.is_null() {
+                unsafe { ptr.write_bytes(0, size) };
+            }
+            ptr
+        }
+        None => {
+            // For overflowing multiplication, we have to set errno here
+            platform::ERRNO.set(ENOMEM);
+            ptr::null_mut()
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/div.html>.
+#[repr(C)]
+pub struct div_t {
+    quot: c_int,
+    rem: c_int,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/div.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn div(numer: c_int, denom: c_int) -> div_t {
+    div_t {
+        quot: numer / denom,
+        rem: numer % denom,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+///
+/// # Panics
+/// Panics if the function is unable to obtain a lock on the generator's global
+/// state.
+#[unsafe(no_mangle)]
+pub extern "C" fn drand48() -> c_double {
+    let params = rand48::params();
+    let mut xsubi = rand48::xsubi_lock();
+    *xsubi = params.step(*xsubi);
+    xsubi.get_f64()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/ecvt.html>.
+///
+/// # Deprecation
+/// The `ecvt()` function was marked as legacy in the Open Group Base
+/// Specifications Issue 6, and the function was removed in Issue 7.
+#[deprecated]
+// #[unsafe(no_mangle)]
+pub extern "C" fn ecvt(
+    value: c_double,
+    ndigit: c_int,
+    decpt: *mut c_int,
+    sign: *mut c_int,
+) -> *mut c_char {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+///
+/// # Safety
+/// The caller must ensure that `xsubi` is convertible to a
+/// `&mut [c_ushort; 3]`.
+///
+/// # Panics
+/// Panics if the function is unable to obtain a lock on the generator's global
+/// state.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn erand48(xsubi: *mut c_ushort) -> c_double {
+    let params = rand48::params();
+    let xsubi_mut: &mut [c_ushort; 3] =
+        unsafe { slice::from_raw_parts_mut(xsubi, 3).try_into().unwrap() };
+    let new_xsubi_value = params.step(xsubi_mut.into());
+    *xsubi_mut = new_xsubi_value.into();
+    new_xsubi_value.get_f64()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exit.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn exit(status: c_int) -> ! {
+    unsafe extern "C" {
+        static __fini_array_start: extern "C" fn();
+        static __fini_array_end: extern "C" fn();
+
+        fn _fini();
+    }
+
+    for i in (0..unsafe { ATEXIT_FUNCS.unsafe_ref().len() }).rev() {
+        if let Some(func) = unsafe { ATEXIT_FUNCS.unsafe_ref() }[i] {
+            (func)();
+        }
+    }
+
+    // Look for the neighbor functions in memory until the end
+    let mut f = unsafe { &__fini_array_end } as *const _;
+    #[allow(clippy::op_ref)]
+    while f > &raw const __fini_array_start {
+        f = unsafe { f.offset(-1) };
+        (unsafe { *f })();
+    }
+
+    #[cfg(not(target_arch = "riscv64"))] // risc-v uses arrays exclusively
+    {
+        unsafe { _fini() };
+    }
+
+    unsafe { ld_so::fini() };
+
+    unsafe { crate::pthread::terminate_from_main_thread() };
+
+    unsafe { flush_io_streams() };
+
+    Sys::exit(status);
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/ecvt.html>.
+///
+/// # Deprecation
+/// The `fcvt()` function was marked as legacy in the Open Group Base
+/// Specifications Issue 6, and the function was removed in Issue 7.
+#[deprecated]
+// #[unsafe(no_mangle)]
+pub extern "C" fn fcvt(
+    value: c_double,
+    ndigit: c_int,
+    decpt: *mut c_int,
+    sign: *mut c_int,
+) -> *mut c_char {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/free.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn free(ptr: *mut c_void) {
+    unsafe { platform::free(ptr) };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/ecvt.html>.
+///
+/// # Deprecation
+/// The `gcvt()` function was marked as legacy in the Open Group Base
+/// Specifications Issue 6, and the function was removed in Issue 7.
+#[deprecated]
+// #[unsafe(no_mangle)]
+pub extern "C" fn gcvt(value: c_double, ndigit: c_int, buf: *mut c_char) -> *mut c_char {
+    unimplemented!();
+}
+
+unsafe fn find_env(search: *const c_char) -> Option<(usize, *mut c_char)> {
+    for (i, mut item) in platform::environ_iter().enumerate() {
+        let mut search = search;
+        loop {
+            let end_of_query = unsafe { *search } == 0 || unsafe { *search } == b'=' as c_char;
+            if unsafe { *item } == 0 {
+                //TODO: environ has an item without value, is this a problem?
+                break;
+            }
+            if unsafe { *item } == b'=' as c_char || end_of_query {
+                if unsafe { *item } == b'=' as c_char && end_of_query {
+                    // Both keys env here
+                    return Some((i, unsafe { item.add(1) }));
+                } else {
+                    break;
+                }
+            }
+
+            if unsafe { *item } != unsafe { *search } {
+                break;
+            }
+
+            item = unsafe { item.add(1) };
+            search = unsafe { search.add(1) };
+        }
+    }
+
+    None
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getenv.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getenv(name: *const c_char) -> *mut c_char {
+    unsafe { find_env(name) }
+        .map(|val| val.1)
+        .unwrap_or(ptr::null_mut())
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getsubopt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getsubopt(
+    optionp: *mut *mut c_char,
+    keylistp: *const *mut c_char,
+    valuep: *mut *mut c_char,
+) -> c_int {
+    if optionp.is_null()
+        || (unsafe { *optionp }).is_null()
+        || keylistp.is_null()
+        || valuep.is_null()
+    {
+        return -1;
+    }
+
+    let start = unsafe { *optionp };
+    let mut cursor = start;
+    let mut found_comma = false;
+
+    while unsafe { *cursor } != 0 {
+        if unsafe { *cursor } == b',' as c_char {
+            unsafe { *cursor = 0 };
+            unsafe { *optionp = cursor.add(1) };
+            found_comma = true;
+            break;
+        }
+        cursor = unsafe { cursor.add(1) };
+    }
+
+    if !found_comma {
+        unsafe { *optionp = cursor };
+    }
+
+    let mut i = 0;
+    while !(unsafe { *keylistp.add(i) }).is_null() {
+        let token = unsafe { *keylistp.add(i) };
+        let token_len = unsafe { strlen(token) };
+
+        if unsafe { strncmp(start, token, token_len) } == 0 {
+            let suffix_char = unsafe { *start.add(token_len) };
+
+            if suffix_char == b'=' as c_char {
+                unsafe { *valuep = start.add(token_len + 1) };
+                return i as c_int;
+            } else if suffix_char == 0 {
+                unsafe { *valuep = ptr::null_mut() };
+                return i as c_int;
+            }
+        }
+        i += 1;
+    }
+
+    unsafe { *valuep = start };
+    -1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/grantpt.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn grantpt(fildes: c_int) -> c_int {
+    // No-op on Linux and Redox
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/initstate.html>.
+// Ported from musl
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn initstate(seed: c_uint, state: *mut c_char, size: size_t) -> *mut c_char {
+    if size < 8 {
+        ptr::null_mut()
+    } else {
+        let mut random_state = random::state_lock();
+        let old_state = unsafe { random_state.save() };
+        random_state.n = match size {
+            0..=7 => unreachable!(), // ensured above
+            8..=31 => 0,
+            32..=63 => 7,
+            64..=127 => 15,
+            128..=255 => 31,
+            _ => 63,
+        };
+
+        random_state.x_ptr = unsafe { (state.cast::<[u8; 4]>()).offset(1) };
+        unsafe { random_state.seed(seed) };
+        unsafe { random_state.save() };
+
+        old_state.cast::<_>()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+///
+/// # Safety
+/// The caller must ensure that `xsubi` is convertible to a
+/// `&mut [c_ushort; 3]`.
+///
+/// # Panics
+/// Panics if the function is unable to obtain a lock on the generator's global
+/// state.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn jrand48(xsubi: *mut c_ushort) -> c_long {
+    let params = rand48::params();
+    let xsubi_mut: &mut [c_ushort; 3] = unsafe { slice::from_raw_parts_mut(xsubi, 3) }
+        .try_into()
+        .unwrap();
+    let new_xsubi_value = params.step(xsubi_mut.into());
+    *xsubi_mut = new_xsubi_value.into();
+    new_xsubi_value.get_i32()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/a64l.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn l64a(value: c_long) -> *mut c_char {
+    // POSIX says we should only consider the lower 32 bits of value.
+    let value_as_i32 = value as i32;
+
+    /* If we pretend to extend the 32-bit value with 4 binary zeros, we
+     * would get a 36-bit integer. The number of base-64 digits to be
+     * left unused can then be found by taking the number of leading
+     * zeros, dividing by 6 and rounding down (i.e. using integer
+     * division). */
+    let num_output_digits = usize::try_from(6 - (value_as_i32.leading_zeros() + 4) / 6).unwrap();
+
+    // Reset buffer (and have null terminator in place for any result)
+    unsafe { L64A_BUFFER.unsafe_set([0; 7]) };
+
+    for i in 0..num_output_digits {
+        // Conversion to c_char always succeeds for the range 0..=63
+        let digit_value = c_char::try_from((value_as_i32 >> (6 * i)) & 63).unwrap();
+
+        (unsafe { L64A_BUFFER.unsafe_mut() })[i] = match digit_value {
+            0..=11 => {
+                // ./0123456789 for values 0 to 11. b'.' == 46
+                46 + digit_value
+            }
+            12..=37 => {
+                // A-Z for values 12 to 37. b'A' == 65, 65-12 == 53
+                53 + digit_value
+            }
+            38..=63 => {
+                // a-z for values 38 to 63. b'a' == 97, 97-38 == 59
+                59 + digit_value
+            }
+            _ => unreachable!(), // Guaranteed by taking "& 63" above
+        };
+    }
+
+    unsafe { L64A_BUFFER.unsafe_mut().as_mut_ptr() }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/labs.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn labs(i: c_long) -> c_long {
+    i.abs()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+///
+/// # Safety
+/// The caller must ensure that `param` is convertible to a
+/// `&mut [c_ushort; 7]`.
+///
+/// # Panics
+/// Panics if the function is unable to obtain a lock on the generator's global
+/// state.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn lcong48(param: *mut c_ushort) {
+    let mut xsubi = rand48::xsubi_lock();
+    let mut params = rand48::params_mut();
+
+    let param_slice = unsafe { slice::from_raw_parts(param, 7) };
+
+    let xsubi_ref: &[c_ushort; 3] = param_slice[0..3].try_into().unwrap();
+    let a_ref: &[c_ushort; 3] = param_slice[3..6].try_into().unwrap();
+    let c = param_slice[6];
+
+    *xsubi = xsubi_ref.into();
+    params.set(a_ref, c);
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ldiv.html>.
+#[repr(C)]
+pub struct ldiv_t {
+    quot: c_long,
+    rem: c_long,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ldiv.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ldiv(numer: c_long, denom: c_long) -> ldiv_t {
+    ldiv_t {
+        quot: numer / denom,
+        rem: numer % denom,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/labs.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn llabs(i: c_longlong) -> c_longlong {
+    i.abs()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ldiv.html>.
+#[repr(C)]
+pub struct lldiv_t {
+    quot: c_longlong,
+    rem: c_longlong,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ldiv.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn lldiv(numer: c_longlong, denom: c_longlong) -> lldiv_t {
+    lldiv_t {
+        quot: numer / denom,
+        rem: numer % denom,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+///
+/// # Panics
+/// Panics if the function is unable to obtain a lock on the generator's global
+/// state.
+#[unsafe(no_mangle)]
+pub extern "C" fn lrand48() -> c_long {
+    let params = rand48::params();
+    let mut xsubi = rand48::xsubi_lock();
+    *xsubi = params.step(*xsubi);
+    xsubi.get_u31()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/malloc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn malloc(size: size_t) -> *mut c_void {
+    let ptr = unsafe { platform::alloc(size) };
+    if ptr.is_null() {
+        platform::ERRNO.set(ENOMEM);
+    }
+    ptr
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/posix_memalign.3.html>.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn memalign(alignment: size_t, size: size_t) -> *mut c_void {
+    if alignment.is_power_of_two() {
+        let ptr = unsafe { platform::alloc_align(size, alignment) };
+        if ptr.is_null() {
+            platform::ERRNO.set(ENOMEM);
+        }
+        ptr
+    } else {
+        platform::ERRNO.set(EINVAL);
+        ptr::null_mut()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mblen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mblen(s: *const c_char, n: size_t) -> c_int {
+    let mut wc: wchar_t = 0;
+    let mut state: mbstate_t = mbstate_t {};
+    let result: usize = unsafe { mbrtowc(&raw mut wc, s, n, &raw mut state) };
+
+    if result == -1isize as usize {
+        return -1;
+    }
+    if result == -2isize as usize {
+        return -1;
+    }
+
+    result as i32
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mbstowcs.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mbstowcs(pwcs: *mut wchar_t, mut s: *const c_char, n: size_t) -> size_t {
+    let mut state: mbstate_t = mbstate_t {};
+    unsafe { mbsrtowcs(pwcs, &raw mut s, n, &raw mut state) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mbtowc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mbtowc(pwc: *mut wchar_t, s: *const c_char, n: size_t) -> c_int {
+    let mut state: mbstate_t = mbstate_t {};
+    (unsafe { mbrtowc(pwc, s, n, &raw mut state) }) as c_int
+}
+
+fn inner_mktemp<T, F>(name: *mut c_char, suffix_len: c_int, mut attempt: F) -> Option<T>
+where
+    F: FnMut() -> Option<T>,
+{
+    let len = unsafe { strlen(name) as c_int };
+
+    if len < 6 || suffix_len > len - 6 {
+        platform::ERRNO.set(errno::EINVAL);
+        return None;
+    }
+
+    for i in (len - suffix_len - 6)..(len - suffix_len) {
+        if unsafe { *name.offset(i as isize) } != b'X' as c_char {
+            platform::ERRNO.set(errno::EINVAL);
+            return None;
+        }
+    }
+
+    let mut rng = JitterRng::new_with_timer(get_nstime);
+    let _ = rng.test_timer();
+
+    for _ in 0..100 {
+        let char_iter = iter::repeat(())
+            .map(|()| rng.sample(Alphanumeric))
+            .take(6)
+            .enumerate();
+        unsafe {
+            for (i, c) in char_iter {
+                *name.offset((len as isize) - (suffix_len as isize) - (i as isize) - 1) =
+                    c as c_char
+            }
+        }
+
+        if let result @ Some(_) = attempt() {
+            return result;
+        }
+    }
+
+    platform::ERRNO.set(errno::EEXIST);
+
+    None
+}
+
+fn get_nstime() -> u64 {
+    unsafe {
+        let mut ts = mem::MaybeUninit::uninit();
+        if Sys::clock_gettime(CLOCK_MONOTONIC, Out::from_uninit_mut(&mut ts)).is_ok() {}; // TODO what to do if Err?
+        ts.assume_init().tv_nsec as u64
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkdtemp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mkdtemp(name: *mut c_char) -> *mut c_char {
+    inner_mktemp(name, 0, || {
+        let name_c = unsafe { CStr::from_ptr(name) };
+        match Sys::mkdir(name_c, 0o700) {
+            Ok(()) => Some(name),
+            Err(_) => None,
+        }
+    })
+    .unwrap_or(ptr::null_mut())
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkdtemp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mkostemp(name: *mut c_char, flags: c_int) -> c_int {
+    unsafe { mkostemps(name, 0, flags) }
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/mkstemp.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mkostemps(
+    name: *mut c_char,
+    suffix_len: c_int,
+    mut flags: c_int,
+) -> c_int {
+    // TODO: Rustify impl
+
+    flags &= !O_ACCMODE;
+    flags |= O_RDWR | O_CREAT | O_EXCL;
+
+    inner_mktemp(name, suffix_len, || {
+        let name = unsafe { CStr::from_ptr(name) };
+        let fd = Sys::open(name, flags, 0o600).or_minus_one_errno();
+
+        if fd >= 0 { Some(fd) } else { None }
+    })
+    .unwrap_or(-1)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkdtemp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mkstemp(name: *mut c_char) -> c_int {
+    unsafe { mkostemps(name, 0, 0) }
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/mkstemp.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mkstemps(name: *mut c_char, suffix_len: c_int) -> c_int {
+    unsafe { mkostemps(name, suffix_len, 0) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/mktemp.html>.
+///
+/// # Deprecation
+/// The `mktemp()` function was marked as legacy in the Open Group Base
+/// Specifications Issue 6, and the function was removed in Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mktemp(name: *mut c_char) -> *mut c_char {
+    if inner_mktemp(name, 0, || {
+        let name = unsafe { CStr::from_ptr(name) };
+        if Sys::access(name, 0) == Err(Errno(ENOENT)) {
+            Some(())
+        } else {
+            None
+        }
+    })
+    .is_none()
+    {
+        unsafe { *name = 0 };
+    }
+    name
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+///
+/// # Panics
+/// Panics if the function is unable to obtain a lock on the generator's global
+/// state.
+#[unsafe(no_mangle)]
+pub extern "C" fn mrand48() -> c_long {
+    let params = rand48::params();
+    let mut xsubi = rand48::xsubi_lock();
+    *xsubi = params.step(*xsubi);
+    xsubi.get_i32()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+///
+/// # Safety
+/// The caller must ensure that `xsubi` is convertible to a
+/// `&mut [c_ushort; 3]`.
+///
+/// # Panics
+/// Panics if the function is unable to obtain a lock on the generator's global
+/// state.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn nrand48(xsubi: *mut c_ushort) -> c_long {
+    let params = rand48::params();
+    let xsubi_mut: &mut [c_ushort; 3] = unsafe { slice::from_raw_parts_mut(xsubi, 3) }
+        .try_into()
+        .unwrap();
+    let new_xsubi_value = params.step(xsubi_mut.into());
+    *xsubi_mut = new_xsubi_value.into();
+    new_xsubi_value.get_u31()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/posix_memalign.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn posix_memalign(
+    memptr: *mut *mut c_void,
+    alignment: size_t,
+    size: size_t,
+) -> c_int {
+    const VOID_PTR_SIZE: usize = mem::size_of::<*mut c_void>();
+
+    if alignment.is_multiple_of(VOID_PTR_SIZE) && alignment.is_power_of_two() {
+        let ptr = unsafe { platform::alloc_align(size, alignment) };
+        unsafe { *memptr = ptr };
+        if ptr.is_null() { ENOMEM } else { 0 }
+    } else {
+        unsafe { *memptr = ptr::null_mut() };
+        EINVAL
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/posix_openpt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn posix_openpt(flags: c_int) -> c_int {
+    #[cfg(target_os = "redox")]
+    let r = unsafe { open((b"/scheme/pty\0" as *const u8).cast(), O_CREAT) };
+
+    #[cfg(target_os = "linux")]
+    let r = unsafe { open((b"/dev/ptmx\0" as *const u8).cast(), flags) };
+
+    if r < 0 && platform::ERRNO.get() == ENOSPC {
+        platform::ERRNO.set(EAGAIN);
+    }
+
+    r
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ptsname.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ptsname(fd: c_int) -> *mut c_char {
+    const PTS_BUFFER_LEN: usize = 9 + mem::size_of::<c_int>() * 3 + 1;
+    static mut PTS_BUFFER: [c_char; PTS_BUFFER_LEN] = [0; PTS_BUFFER_LEN];
+    if unsafe { ptsname_r(fd, (&raw mut PTS_BUFFER).cast(), PTS_BUFFER_LEN) } != 0 {
+        ptr::null_mut()
+    } else {
+        (&raw mut PTS_BUFFER).cast()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ptsname.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ptsname_r(fd: c_int, buf: *mut c_char, buflen: size_t) -> c_int {
+    if buf.is_null() {
+        platform::ERRNO.set(EINVAL);
+        EINVAL
+    } else {
+        unsafe { __ptsname_r(fd, buf, buflen) }
+    }
+}
+
+#[cfg(target_os = "redox")]
+#[inline(always)]
+unsafe fn __ptsname_r(fd: c_int, buf: *mut c_char, buflen: size_t) -> c_int {
+    let tty_ptr = unsafe { unistd::ttyname(fd) };
+
+    if !tty_ptr.is_null() {
+        if let Ok(name) = unsafe { CStr::from_ptr(tty_ptr) }.to_str() {
+            let len = name.len();
+            if len > buflen {
+                platform::ERRNO.set(ERANGE);
+                return ERANGE;
+            } else {
+                // we have checked the string will fit in the buffer
+                // so can use strcpy safely
+                let s = name.as_ptr().cast();
+                unsafe {
+                    ptr::copy_nonoverlapping(s, buf, len);
+                }
+                return 0;
+            }
+        }
+    }
+    platform::ERRNO.get()
+}
+
+#[cfg(target_os = "linux")]
+#[inline(always)]
+unsafe fn __ptsname_r(fd: c_int, buf: *mut c_char, buflen: size_t) -> c_int {
+    let mut pty = 0;
+    let err = platform::ERRNO.get();
+
+    if unsafe { ioctl(fd, TIOCGPTN, ptr::from_mut(&mut pty).cast::<c_void>()) } == 0 {
+        let name = format!("/dev/pts/{}", pty);
+        let len = name.len();
+        if len > buflen {
+            platform::ERRNO.set(ERANGE);
+            ERANGE
+        } else {
+            // we have checked the string will fit in the buffer
+            // so can use strcpy safely
+            let s = name.as_ptr().cast();
+            unsafe { ptr::copy_nonoverlapping(s, buf, len) };
+            platform::ERRNO.set(err);
+            0
+        }
+    } else {
+        platform::ERRNO.get()
+    }
+}
+
+unsafe fn put_new_env(insert: *mut c_char) {
+    // XXX: Another problem is that `environ` can be set to any pointer, which means there is a
+    // chance of a memory leak. But we can check if it was the same as before, like musl does.
+    if unsafe { platform::environ } == unsafe { platform::OUR_ENVIRON.unsafe_mut().as_mut_ptr() } {
+        {
+            let our_environ = unsafe { &mut *platform::OUR_ENVIRON.as_mut_ptr() };
+            *our_environ.last_mut().unwrap() = insert;
+            our_environ.push(core::ptr::null_mut());
+        }
+        // Likely a no-op but is needed due to Stacked Borrows.
+        unsafe { platform::environ = platform::OUR_ENVIRON.unsafe_mut().as_mut_ptr() };
+    } else {
+        {
+            let our_environ = unsafe { &mut *platform::OUR_ENVIRON.as_mut_ptr() };
+            our_environ.clear();
+            our_environ.extend(platform::environ_iter());
+            our_environ.push(insert);
+            our_environ.push(core::ptr::null_mut());
+        }
+        unsafe { platform::environ = platform::OUR_ENVIRON.unsafe_mut().as_mut_ptr() };
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/putenv.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn putenv(insert: *mut c_char) -> c_int {
+    assert_ne!(insert, ptr::null_mut(), "putenv(NULL)");
+    if let Some((i, _)) = unsafe { find_env(insert) } {
+        // XXX: The POSIX manual states that environment variables can be *set* via the `environ`
+        // global variable. While we can check if a pointer belongs to our allocator, or check
+        // `environ` against a vector which we control, it is likely not worth the effort.
+        unsafe { platform::environ.add(i).write(insert) };
+    } else {
+        unsafe { put_new_env(insert) };
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/qsort.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn qsort(
+    base: *mut c_void,
+    nel: size_t,
+    width: size_t,
+    compar: Option<extern "C" fn(*const c_void, *const c_void) -> c_int>,
+) {
+    if let Some(comp) = compar {
+        // XXX: check width too?  not specified
+        if nel > 0 {
+            // XXX: maybe try to do mergesort/timsort first and fallback to introsort if memory
+            //      allocation fails?  not sure what is ideal
+            unsafe { sort::introsort(base.cast::<c_char>(), nel, width, comp) };
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/qsort.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn qsort_r(
+    base: *mut c_void,
+    nel: size_t,
+    width: size_t,
+    compar: Option<extern "C" fn(*const c_void, *const c_void, *mut c_void) -> c_int>,
+    arg: *mut c_void,
+) {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/quick_exit.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn quick_exit(status: c_int) -> ! {
+    for i in (0..unsafe { AT_QUICK_EXIT_FUNCS.unsafe_ref() }.len()).rev() {
+        if let Some(func) = unsafe { AT_QUICK_EXIT_FUNCS.unsafe_ref() }[i] {
+            (func)();
+        }
+    }
+
+    Sys::exit(status);
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/rand.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn rand() -> c_int {
+    unsafe {
+        match RNG {
+            Some(ref mut rng) => rng_sampler().sample(rng),
+            None => {
+                let mut rng = XorShiftRng::from_seed([1; 16]);
+                let ret = rng_sampler().sample(&mut rng);
+                RNG = Some(rng);
+                ret
+            }
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/rand.html>.
+///
+/// # Deprecation
+/// The `rand_r()` function was marked as obsolescent in the Open Group Base
+/// Specifications Issue 7, and the function was removed in Issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn rand_r(seed: *mut c_uint) -> c_int {
+    if seed.is_null() {
+        errno::EINVAL
+    } else {
+        // set the type explicitly so this will fail if the array size for XorShiftRng changes
+        let seed_arr: [u8; 16] = unsafe { mem::transmute([*seed; 16 / mem::size_of::<c_uint>()]) };
+
+        let mut rng = XorShiftRng::from_seed(seed_arr);
+        let ret = rng_sampler().sample(&mut rng);
+
+        unsafe { *seed = ret as _ };
+
+        ret
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/initstate.html>.
+// Ported from musl
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn random() -> c_long {
+    let mut random_state = random::state_lock();
+
+    let k: u32;
+
+    unsafe { random_state.ensure_x_ptr_init() };
+
+    if random_state.n == 0 {
+        let x_old = u32::from_ne_bytes(unsafe { *random_state.x_ptr });
+        let x_new = random::lcg31_step(x_old);
+        unsafe { *random_state.x_ptr = x_new.to_ne_bytes() };
+        k = x_new;
+    } else {
+        // The non-u32-aligned way of saying x[i] += x[j]...
+        let x_i_old =
+            u32::from_ne_bytes(unsafe { *random_state.x_ptr.add(usize::from(random_state.i)) });
+        let x_j =
+            u32::from_ne_bytes(unsafe { *random_state.x_ptr.add(usize::from(random_state.j)) });
+        let x_i_new = x_i_old.wrapping_add(x_j);
+        unsafe { *random_state.x_ptr.add(usize::from(random_state.i)) = x_i_new.to_ne_bytes() };
+
+        k = x_i_new >> 1;
+
+        random_state.i += 1;
+        if random_state.i == random_state.n {
+            random_state.i = 0;
+        }
+
+        random_state.j += 1;
+        if random_state.j == random_state.n {
+            random_state.j = 0;
+        }
+    }
+
+    /* Both branches of this function result in a "u31", which will
+     * always fit in a c_long. */
+    #[cfg(not(target_arch = "x86"))]
+    return c_long::from(k);
+    #[cfg(target_arch = "x86")] // c_long on x86 is i32 so not infallible cast
+    c_long::try_from(k).unwrap()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/realloc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn realloc(ptr: *mut c_void, size: size_t) -> *mut c_void {
+    let new_ptr = unsafe { platform::realloc(ptr, size) };
+    if new_ptr.is_null() {
+        platform::ERRNO.set(ENOMEM);
+    }
+    new_ptr
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/realloc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn reallocarray(ptr: *mut c_void, m: size_t, n: size_t) -> *mut c_void {
+    //Handle possible integer overflow in size calculation
+    match m.checked_mul(n) {
+        Some(size) => unsafe { realloc(ptr, size) },
+        None => {
+            // For overflowing multiplication, we have to set errno here
+            platform::ERRNO.set(ENOMEM);
+            ptr::null_mut()
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/realpath.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn realpath(pathname: *const c_char, resolved: *mut c_char) -> *mut c_char {
+    let ptr = if resolved.is_null() {
+        (unsafe { malloc(limits::PATH_MAX) }).cast::<c_char>()
+    } else {
+        resolved
+    };
+
+    let out = unsafe { slice::from_raw_parts_mut(ptr.cast::<u8>(), limits::PATH_MAX) };
+    {
+        let file = match File::open(unsafe { CStr::from_ptr(pathname) }, O_PATH | O_CLOEXEC) {
+            Ok(file) => file,
+            Err(_) => return ptr::null_mut(),
+        };
+
+        let len = out.len();
+        // TODO: better error handling
+        let read = Sys::fpath(*file, &mut out[..len - 1])
+            .map(|read| read as ssize_t)
+            .or_minus_one_errno();
+        if read < 0 {
+            return ptr::null_mut();
+        }
+        out[read as usize] = 0;
+    }
+
+    ptr
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getenv.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn secure_getenv(name: *const c_char) -> *mut c_char {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+///
+/// # Safety
+/// The caller must ensure that `seed16v` is convertible to a `&[c_ushort; 3]`.
+/// Additionally, the caller must ensure that the function has exclusive access
+/// to the static buffer it returns; this includes avoiding simultaneous calls
+/// to this function.
+///
+/// # Panics
+/// Panics if the function is unable to obtain a lock on the generator's global
+/// state.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn seed48(seed16v: *mut c_ushort) -> *mut c_ushort {
+    static RETURN_BUFFER: RawCell<[c_ushort; 3]> = RawCell::new([0; 3]);
+
+    let mut params = rand48::params_mut();
+    let mut xsubi = rand48::xsubi_lock();
+
+    // SAFETY: the caller is required to ensure seed16v is convertible to
+    // &[c_ushort; 3].
+    let seed16v_ref: &[c_ushort; 3] = unsafe { slice::from_raw_parts(seed16v, 3) }
+        .try_into()
+        .unwrap();
+
+    // SAFETY: the caller is required to ensure exclusive access to
+    // RETURN_BUFFER.
+    let return_buffer_mut = unsafe { RETURN_BUFFER.unsafe_mut() };
+    *return_buffer_mut = (*xsubi).into();
+    *xsubi = seed16v_ref.into();
+    params.reset();
+    RETURN_BUFFER.as_mut_ptr().cast()
+}
+
+unsafe fn copy_kv(
+    existing: *mut c_char,
+    key: *const c_char,
+    value: *const c_char,
+    key_len: usize,
+    value_len: usize,
+) {
+    unsafe { core::ptr::copy_nonoverlapping(key, existing, key_len) };
+    unsafe { core::ptr::write(existing.add(key_len), b'=' as c_char) };
+    unsafe { core::ptr::copy_nonoverlapping(value, existing.add(key_len + 1), value_len) };
+    unsafe { core::ptr::write(existing.add(key_len + 1 + value_len), 0) };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setenv.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setenv(
+    key: *const c_char,
+    value: *const c_char,
+    overwrite: c_int,
+) -> c_int {
+    let key_len = unsafe { strlen(key) };
+    let value_len = unsafe { strlen(value) };
+
+    if let Some((i, existing)) = unsafe { find_env(key) } {
+        if overwrite == 0 {
+            return 0;
+        }
+
+        let existing_len = unsafe { strlen(existing) };
+
+        if existing_len >= value_len {
+            // Reuse existing element's allocation
+            unsafe { core::ptr::copy_nonoverlapping(value, existing, value_len) };
+            //TODO: fill to end with zeroes
+            unsafe { core::ptr::write(existing.add(value_len), 0) };
+        } else {
+            // Reuse platform::environ slot, but allocate a new pointer.
+            let ptr = unsafe { platform::alloc(key_len as usize + 1 + value_len as usize + 1) }
+                .cast::<c_char>();
+            unsafe { copy_kv(ptr, key, value, key_len, value_len) };
+            unsafe { platform::environ.add(i).write(ptr) };
+        }
+    } else {
+        // Expand platform::environ and allocate a new pointer.
+        let ptr = unsafe { platform::alloc(key_len as usize + 1 + value_len as usize + 1) }
+            .cast::<c_char>();
+        unsafe { copy_kv(ptr, key, value, key_len, value_len) };
+        unsafe { put_new_env(ptr) };
+    }
+
+    //platform::free(platform::inner_environ[index] as *mut c_void);
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setkey.html>.
+///
+/// # Deprecation
+/// The `setkey()` function was marked as obsolescent in the Open Group Base
+/// Specifications Issue 8.
+#[deprecated]
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn setkey(key: *const c_char) {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/initstate.html>.
+// Ported from musl. The state parameter is no longer const in newer versions of POSIX.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setstate(state: *mut c_char) -> *mut c_char {
+    let mut random_state = random::state_lock();
+
+    let old_state = unsafe { random_state.save() };
+    unsafe { random_state.load(state.cast::<_>()) };
+
+    old_state.cast::<_>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/rand.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn srand(seed: c_uint) {
+    unsafe { RNG = Some(XorShiftRng::from_seed([seed as u8; 16])) };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+///
+/// # Panics
+/// Panics if the function is unable to obtain a lock on the generator's global
+/// state.
+#[unsafe(no_mangle)]
+pub extern "C" fn srand48(seedval: c_long) {
+    let mut params = rand48::params_mut();
+    let mut xsubi = rand48::xsubi_lock();
+
+    params.reset();
+    /* Set the high 32 bits of the 48-bit X_i value to the lower 32 bits
+     * of the input argument, and the lower 16 bits to 0x330e, as
+     * specified in POSIX. */
+    *xsubi = ((u64::from(seedval as u32) << 16) | 0x330e)
+        .try_into()
+        .unwrap();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/initstate.html>.
+// Ported from musl
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn srandom(seed: c_uint) {
+    let mut random_state = random::state_lock();
+
+    unsafe { random_state.seed(seed) };
+}
+
+pub fn is_positive(ch: c_char) -> Option<(bool, isize)> {
+    match ch {
+        0 => None,
+        ch if ch == b'+' as c_char => Some((true, 1)),
+        ch if ch == b'-' as c_char => Some((false, 1)),
+        _ => Some((true, 0)),
+    }
+}
+
+pub unsafe fn detect_base(s: *const c_char) -> Option<(c_int, isize)> {
+    let first = unsafe { *s } as u8;
+    match first {
+        0 => None,
+        b'0' => {
+            let second = unsafe { *s.offset(1) } as u8;
+            if second == b'X' || second == b'x' {
+                Some((16, 2))
+            } else if (b'0'..=b'7').contains(&second) {
+                Some((8, 1))
+            } else {
+                // in this case, the prefix (0) is going to be the number
+                Some((8, 0))
+            }
+        }
+        _ => Some((10, 0)),
+    }
+}
+
+pub unsafe fn convert_octal(s: *const c_char) -> Option<(c_ulong, isize, bool)> {
+    if unsafe { *s } != 0 && unsafe { *s } == b'0' as c_char {
+        if let Some((val, idx, overflow)) = unsafe { convert_integer(s.offset(1), 8) } {
+            Some((val, idx + 1, overflow))
+        } else {
+            // in case the prefix is not actually a prefix
+            Some((0, 1, false))
+        }
+    } else {
+        None
+    }
+}
+
+pub unsafe fn convert_hex(s: *const c_char) -> Option<(c_ulong, isize, bool)> {
+    if (unsafe { *s } != 0 && unsafe { *s } == b'0' as c_char)
+        && (unsafe { *s.offset(1) } != 0
+            && (unsafe { *s.offset(1) } == b'x' as c_char
+                || unsafe { *s.offset(1) } == b'X' as c_char))
+    {
+        unsafe { convert_integer(s.offset(2), 16) }
+            .map(|(val, idx, overflow)| (val, idx + 2, overflow))
+    } else {
+        unsafe { convert_integer(s, 16) }
+    }
+}
+
+pub unsafe fn convert_integer(s: *const c_char, base: c_int) -> Option<(c_ulong, isize, bool)> {
+    // -1 means the character is invalid
+    #[rustfmt::skip]
+    const LOOKUP_TABLE: [c_long; 256] = [
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+         0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1,
+        -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+        25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
+        -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+        25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    ];
+
+    let mut num: c_ulong = 0;
+    let mut idx = 0;
+    let mut overflowed = false;
+
+    loop {
+        // `-1 as usize` is usize::MAX
+        // `-1 as u8 as usize` is u8::MAX
+        // It extends by the sign bit unless we cast it to unsigned first.
+        let val = LOOKUP_TABLE[unsafe { *s.offset(idx) } as u8 as usize];
+        if val == -1 || val as c_int >= base {
+            break;
+        } else {
+            if let Some(res) = num
+                .checked_mul(base as c_ulong)
+                .and_then(|num| num.checked_add(val as c_ulong))
+            {
+                num = res;
+            } else {
+                platform::ERRNO.set(ERANGE);
+                num = c_ulong::MAX;
+                overflowed = true;
+            }
+
+            idx += 1;
+        }
+    }
+
+    if idx > 0 {
+        Some((num, idx, overflowed))
+    } else {
+        None
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtod.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtod(s: *const c_char, endptr: *mut *mut c_char) -> c_double {
+    strto_float_impl!(c_double, s, endptr)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtod.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtof(s: *const c_char, endptr: *mut *mut c_char) -> c_float {
+    strto_float_impl!(c_float, s, endptr)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtol.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtol(s: *const c_char, endptr: *mut *mut c_char, base: c_int) -> c_long {
+    strto_impl!(c_long, true, c_long::MAX, c_long::MIN, s, endptr, base)
+}
+
+// TODO: strtold(), when long double is available
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtol.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtoll(
+    s: *const c_char,
+    endptr: *mut *mut c_char,
+    base: c_int,
+) -> c_longlong {
+    strto_impl!(
+        c_longlong,
+        true,
+        c_longlong::MAX,
+        c_longlong::MIN,
+        s,
+        endptr,
+        base
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtoul.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtoul(
+    s: *const c_char,
+    endptr: *mut *mut c_char,
+    base: c_int,
+) -> c_ulong {
+    strto_impl!(c_ulong, false, c_ulong::MAX, c_ulong::MIN, s, endptr, base)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtoul.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtoull(
+    s: *const c_char,
+    endptr: *mut *mut c_char,
+    base: c_int,
+) -> c_ulonglong {
+    strto_impl!(
+        c_ulonglong,
+        false,
+        c_ulonglong::MAX,
+        c_ulonglong::MIN,
+        s,
+        endptr,
+        base
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/system.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn system(command: *const c_char) -> c_int {
+    // TODO: rusty error handling?
+    //TODO: share code with popen
+
+    // handle shell detection on command == NULL
+    if command.is_null() {
+        let status = unsafe { system(c"exit 0".as_ptr().cast::<c_char>()) };
+        if status == 0 {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    let child_pid = unsafe { unistd::fork() };
+    if child_pid == 0 {
+        let command_nonnull = command.cast::<c_char>();
+
+        let shell = c"/bin/sh".as_ptr();
+
+        let args = [c"sh".as_ptr(), c"-c".as_ptr(), command_nonnull, ptr::null()];
+
+        unsafe { unistd::execv(shell.cast::<c_char>(), args.as_ptr().cast::<*mut c_char>()) };
+
+        unsafe { exit(127) };
+
+        unreachable!();
+    } else if child_pid > 0 {
+        let mut wstatus = 0;
+        if Sys::waitpid(child_pid, Some(Out::from_mut(&mut wstatus)), 0).or_minus_one_errno() == -1
+        {
+            return -1;
+        }
+
+        wstatus
+    } else {
+        -1
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/ttyslot.html>.
+///
+/// # Deprecation
+/// The `ttyslot()` function was marked as obsolescent in the Open Group Base
+/// Specifications Issue 5, and the function was removed in Issue 6.
+#[deprecated]
+// #[unsafe(no_mangle)]
+pub extern "C" fn ttyslot() -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/unlockpt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn unlockpt(fildes: c_int) -> c_int {
+    let mut u: c_int = 0;
+    unsafe {
+        ioctl(
+            fildes,
+            TIOCSPTLCK,
+            ptr::from_mut::<i32>(&mut u).cast::<c_void>(),
+        )
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/unsetenv.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn unsetenv(key: *const c_char) -> c_int {
+    if let Some((i, _)) = unsafe { find_env(key) } {
+        if unsafe { platform::environ }
+            == unsafe { platform::OUR_ENVIRON.unsafe_mut().as_mut_ptr() }
+        {
+            // No need to worry about updating the pointer, this does not
+            // reallocate in any way. And the final null is already shifted back.
+            {
+                let our_environ = unsafe { &mut *platform::OUR_ENVIRON.as_mut_ptr() };
+                our_environ.remove(i);
+            }
+
+            // My UB paranoia.
+            unsafe { platform::environ = platform::OUR_ENVIRON.unsafe_mut().as_mut_ptr() };
+        } else {
+            {
+                let our_environ = unsafe { &mut *platform::OUR_ENVIRON.as_mut_ptr() };
+                our_environ.clear();
+                our_environ.extend(
+                    platform::environ_iter()
+                        .enumerate()
+                        .filter(|&(j, _)| j != i)
+                        .map(|(_, v)| v),
+                );
+                our_environ.push(core::ptr::null_mut());
+            }
+            unsafe { platform::environ = platform::OUR_ENVIRON.unsafe_mut().as_mut_ptr() };
+        }
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/valloc.html>.
+///
+/// # Deprecation
+/// The `valloc()` function was marked as obsolescent in the Open Group Base
+/// Specifications Issue 5, and the function was removed in Issue 6.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn valloc(size: size_t) -> *mut c_void {
+    /* sysconf(_SC_PAGESIZE) is a c_long and may in principle not
+     * convert correctly to a size_t. */
+    match size_t::try_from(unsafe { sysconf(_SC_PAGESIZE) }) {
+        Ok(page_size) => {
+            /* valloc() is not supposed to be able to set errno to
+             * EINVAL, hence no call to memalign(). */
+            let ptr = unsafe { platform::alloc_align(size, page_size) };
+            if ptr.is_null() {
+                platform::ERRNO.set(ENOMEM);
+            }
+            ptr
+        }
+        Err(_) => {
+            // A corner case. No errno setting.
+            ptr::null_mut()
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcstombs.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcstombs(s: *mut c_char, mut pwcs: *const wchar_t, n: size_t) -> size_t {
+    let mut state: mbstate_t = mbstate_t {};
+    unsafe { wcsrtombs(s, &raw mut pwcs, n, &raw mut state) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wctomb.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wctomb(s: *mut c_char, wc: wchar_t) -> c_int {
+    let mut state: mbstate_t = mbstate_t {};
+    let result: usize = unsafe { wcrtomb(s, wc, &raw mut state) };
+
+    if result == -1isize as usize {
+        return -1;
+    }
+    if result == -2isize as usize {
+        return -1;
+    }
+
+    result as c_int
+}
diff --git a/recipes/core/relibc/src/header/stdlib/rand48.rs b/recipes/core/relibc/src/header/stdlib/rand48.rs
new file mode 100644
index 0000000000..f8b3b4e35a
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdlib/rand48.rs
@@ -0,0 +1,141 @@
+//! Helper functions for pseudorandom number generation using LCG, see <https://pubs.opengroup.org/onlinepubs/9799919799/functions/drand48.html>.
+
+use crate::{
+    platform::types::{c_double, c_long, c_ushort},
+    sync::{
+        Mutex, MutexGuard,
+        rwlock::{self, RwLock},
+    },
+};
+
+/// A 48-bit integer, used for the 48-bit arithmetic in these functions.
+#[derive(Clone, Copy, Default)]
+#[repr(C)]
+pub struct U48(u64);
+
+impl From<&[c_ushort; 3]> for U48 {
+    fn from(value: &[c_ushort; 3]) -> Self {
+        /* c_ushort is u16 so we get only the lower 16 bits of each
+         * element, as specified by POSIX. */
+        Self(u64::from(value[0]) | (u64::from(value[1]) << 16) | (u64::from(value[2]) << 32))
+    }
+}
+
+impl From<&mut [c_ushort; 3]> for U48 {
+    fn from(value: &mut [c_ushort; 3]) -> Self {
+        Self::from(&*value)
+    }
+}
+
+impl TryFrom<u64> for U48 {
+    type Error = u64;
+
+    fn try_from(value: u64) -> Result<Self, u64> {
+        if value < 0x1_0000_0000_0000 {
+            Ok(Self(value))
+        } else {
+            Err(value)
+        }
+    }
+}
+
+impl From<U48> for u64 {
+    fn from(value: U48) -> Self {
+        value.0
+    }
+}
+
+impl From<U48> for [c_ushort; 3] {
+    fn from(value: U48) -> Self {
+        [
+            (value.0 as u16),
+            ((value.0 >> 16) as u16),
+            ((value.0 >> 32) as u16),
+        ]
+    }
+}
+
+impl U48 {
+    /// Get a C `double` in the interval [0.0, 1.0) (for `drand48()` and `erand48()`).
+    pub fn get_f64(self) -> c_double {
+        /* We set the exponent to 0, and the 48-bit integer is copied into the high
+         * 48 of the 52 significand bits. The value then lies in the range
+         * [1.0, 2.0), from which we simply subtract 1.0. */
+        f64::from_bits(0x3ff0_0000_0000_0000_u64 | (self.0 << 4)) - 1.0
+    }
+
+    /// Get the high 31 bits (for `lrand48()` and `nrand48()`).
+    pub fn get_u31(self) -> c_long {
+        (self.0 >> 17).try_into().unwrap()
+    }
+
+    /// Get the high 32 bits, signed (for `mrand48()` and `jrand48()`).
+    pub fn get_i32(self) -> c_long {
+        // Cast via i32 to ensure we get the sign correct
+        ((self.0 >> 16) as i32).into()
+    }
+}
+
+/// The a and c parameters of an LCG.
+#[derive(Default)]
+#[repr(C)]
+pub struct Params {
+    pub a: U48,
+    pub c: u16,
+}
+
+impl Params {
+    pub const fn new() -> Self {
+        // Default values as specified in POSIX
+        Params {
+            a: U48(0x5deece66d),
+            c: 0xb,
+        }
+    }
+
+    pub fn reset(&mut self) {
+        *self = Self::new();
+    }
+
+    /// For use in lcong48().
+    pub fn set(&mut self, a: &[c_ushort; 3], c: c_ushort) {
+        self.a = a.into();
+        self.c = c;
+    }
+
+    pub fn step(&self, xsubi: U48) -> U48 {
+        /* The recurrence relation of the linear congruential generator,
+         * X_(n+1) = (a * X_n + c) % m,
+         * with m = 2**48. The multiplication and addition can overflow a u64, but
+         * we just let it wrap since we take mod 2**48 anyway. */
+        (u64::from(self.a)
+            .wrapping_mul(u64::from(xsubi))
+            .wrapping_add(u64::from(self.c))
+            & 0xffff_ffff_ffff)
+            .try_into()
+            .unwrap()
+    }
+}
+
+static PARAMS: RwLock<Params> = RwLock::<Params>::new(Params::new());
+
+/// Immediately get the global [`Params`] lock for reading, or panic if unsuccessful.
+pub fn params<'a>() -> rwlock::ReadGuard<'a, Params> {
+    PARAMS
+        .try_read()
+        .expect("unable to acquire LCG parameter lock")
+}
+
+/// Immediately get the global [`Params`] lock for writing, or panic if unsuccessful.
+pub fn params_mut<'a>() -> rwlock::WriteGuard<'a, Params> {
+    PARAMS
+        .try_write()
+        .expect("unable to acquire LCG parameter lock")
+}
+
+/// Immediately get the global X_i lock, or panic if unsuccessful.
+pub fn xsubi_lock<'a>() -> MutexGuard<'a, U48> {
+    static XSUBI: Mutex<U48> = Mutex::<U48>::new(U48(0));
+
+    XSUBI.try_lock().expect("unable to acquire LCG X_i lock")
+}
diff --git a/recipes/core/relibc/src/header/stdlib/random.rs b/recipes/core/relibc/src/header/stdlib/random.rs
new file mode 100644
index 0000000000..86aec6f3db
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdlib/random.rs
@@ -0,0 +1,118 @@
+//! Helper functions for random() and friends, see <https://pubs.opengroup.org/onlinepubs/9799919799/functions/initstate.html>.
+// Ported from musl's implementation (src/prng/random.c)
+
+use crate::{
+    platform::types::c_uint,
+    sync::{Mutex, MutexGuard},
+};
+use core::{cell::SyncUnsafeCell, convert::TryFrom, ptr};
+
+// This is the default buffer for X. Not guarded by mutex as a mutable pointer to this is available to the user through initstate() and setstate().
+#[rustfmt::skip]
+pub static DEFAULT_X: SyncUnsafeCell<[u32; 32]> = SyncUnsafeCell::new([
+    0x00000000, 0x5851f42d, 0xc0b18ccf, 0xcbb5f646,
+    0xc7033129, 0x30705b04, 0x20fd5db4, 0x9a8b7f78,
+    0x502959d8, 0xab894868, 0x6c0356a7, 0x88cdb7ff,
+    0xb477d43f, 0x70a3a52b, 0xa8e4baf1, 0xfd8341fc,
+    0x8ae16fd9, 0x742d2f7a, 0x0d1f0796, 0x76035e09,
+    0x40f7702c, 0x6fa72ca5, 0xaaa84157, 0x58a0df74,
+    0xc74a0364, 0xae533cc4, 0x04185faf, 0x6de3b115,
+    0x0cab8628, 0xf043bfa4, 0x398150e9, 0x37521657,
+]);
+
+pub struct State {
+    pub x_ptr: *mut [u8; 4],
+    pub n: u8,
+    pub i: u8,
+    pub j: u8,
+}
+
+// Necessary because raw pointers are not Send
+unsafe impl Send for State {}
+
+impl State {
+    /// To be called in any function that may read from X_PTR
+    pub unsafe fn ensure_x_ptr_init(&mut self) {
+        if self.x_ptr.is_null() {
+            let x_u32_ptr: *mut u32 = unsafe { DEFAULT_X.get().cast::<u32>().add(1) };
+            self.x_ptr = x_u32_ptr.cast::<[u8; 4]>();
+        }
+    }
+
+    pub unsafe fn save(&mut self) -> *mut [u8; 4] {
+        unsafe { self.ensure_x_ptr_init() };
+
+        let stash_value: u32 =
+            (u32::from(self.n) << 16) | (u32::from(self.i) << 8) | u32::from(self.j);
+        unsafe { *self.x_ptr.offset(-1) = stash_value.to_ne_bytes() };
+        unsafe { self.x_ptr.offset(-1) }
+    }
+
+    pub unsafe fn load(&mut self, state_ptr: *mut [u8; 4]) {
+        let stash_value = u32::from_ne_bytes(unsafe { *state_ptr });
+        self.x_ptr = unsafe { state_ptr.offset(1) };
+
+        /* This calculation of n does not have a bit mask in the musl
+         * original, in principle resulting in a u16, but obtaining a value
+         * larger than 63 can probably be dismissed as pathological. */
+        self.n = u8::try_from((stash_value >> 16) & 0xff).unwrap();
+
+        // i and j calculations are straight from musl
+        self.i = u8::try_from((stash_value >> 8) & 0xff).unwrap();
+        self.j = u8::try_from(stash_value & 0xff).unwrap();
+    }
+
+    pub unsafe fn seed(&mut self, seed: c_uint) {
+        unsafe { self.ensure_x_ptr_init() };
+
+        let mut s = u64::from(seed);
+
+        if self.n == 0 {
+            unsafe { *self.x_ptr = (s as u32).to_ne_bytes() };
+        } else {
+            self.i = if self.n == 31 || self.n == 7 { 3 } else { 1 };
+
+            self.j = 0;
+
+            for k in 0..usize::from(self.n) {
+                s = lcg64_step(s);
+
+                // Conversion will always succeed (value is a 32-bit right-
+                // shift of a 64-bit integer).
+                unsafe { *self.x_ptr.add(k) = u32::try_from(s >> 32).unwrap().to_ne_bytes() };
+            }
+
+            // ensure X contains at least one odd number
+            unsafe { *self.x_ptr = (u32::from_ne_bytes(*self.x_ptr) | 1).to_ne_bytes() };
+        }
+    }
+}
+
+pub fn state_lock<'a>() -> MutexGuard<'a, State> {
+    static STATE: Mutex<State> = Mutex::new(State {
+        /* As such, random() and related functions work on u32 values, but POSIX
+         * allows the user to supply a custom state data array as a `char *`
+         * with no requirements on alignment. Thus, we must assume the worst in
+         * terms of alignment and convert back and forth from [u8; 4].
+         *
+         * Also, unlike in C, we can't take the address of the initializing
+         * array outside of a function. */
+        x_ptr: ptr::null_mut(),
+        /* N needs to accommodate values up to 63, corresponding to the maximum
+         * state array size of 256 bytes. I and J must be able to accommodate
+         * values less than or equal to N. */
+        n: 31,
+        i: 3,
+        j: 0,
+    });
+
+    STATE.try_lock().expect("unable to acquire PRNG lock")
+}
+
+pub fn lcg31_step(x: u32) -> u32 {
+    1103515245_u32.wrapping_mul(x).wrapping_add(12345_u32) & 0x7fffffff
+}
+
+pub fn lcg64_step(x: u64) -> u64 {
+    6364136223846793005_u64.wrapping_mul(x).wrapping_add(1_u64)
+}
diff --git a/recipes/core/relibc/src/header/stdlib/sort.rs b/recipes/core/relibc/src/header/stdlib/sort.rs
new file mode 100644
index 0000000000..943707f0d0
--- /dev/null
+++ b/recipes/core/relibc/src/header/stdlib/sort.rs
@@ -0,0 +1,245 @@
+use crate::platform::types::{c_char, c_int, c_void, size_t};
+
+pub unsafe fn introsort(
+    base: *mut c_char,
+    nel: size_t,
+    width: size_t,
+    comp: extern "C" fn(*const c_void, *const c_void) -> c_int,
+) {
+    /*TODO: introsort is much faster than insertion sort, but is currently broken
+    let maxdepth = 2 * log2(nel);
+    introsort_helper(base, nel, width, maxdepth, comp);
+    */
+    unsafe { insertion_sort(base, nel, width, comp) };
+}
+
+// NOTE: if num is 0, the result should be considered undefined
+fn log2(num: size_t) -> size_t {
+    const IS_32_BIT: bool = size_t::MAX as u32 as size_t == size_t::MAX;
+
+    let max_bits = if IS_32_BIT {
+        31
+    } else {
+        // assuming we are 64-bit (this may or may not need to be updated in the future)
+        63
+    };
+
+    max_bits - num.to_le().leading_zeros() as size_t
+}
+
+unsafe fn introsort_helper(
+    mut base: *mut c_char,
+    mut nel: size_t,
+    width: size_t,
+    mut maxdepth: size_t,
+    comp: extern "C" fn(*const c_void, *const c_void) -> c_int,
+) {
+    const THRESHOLD: size_t = 8;
+
+    // this loop is a trick to save stack space because TCO is not a thing in Rustland
+    // basically, we just change the arguments and loop rather than recursing for the second call
+    // to introsort_helper()
+    loop {
+        if nel < THRESHOLD {
+            unsafe { insertion_sort(base, nel, width, comp) };
+            break;
+        } else if nel > 1 {
+            if maxdepth == 0 {
+                unsafe { heapsort(base, nel, width, comp) };
+                break;
+            } else {
+                let (left, right) = unsafe { partition(base, nel, width, comp) };
+                let right_base = unsafe { base.add((right + 1) * width) };
+                let right_nel = nel - (right + 1);
+                maxdepth -= 1;
+                if left < nel - right {
+                    unsafe { introsort_helper(base, left, width, maxdepth, comp) };
+                    base = right_base;
+                    nel = right_nel;
+                } else {
+                    unsafe { introsort_helper(right_base, right_nel, width, maxdepth, comp) };
+                    nel = left;
+                }
+            }
+        }
+    }
+}
+
+unsafe fn insertion_sort(
+    base: *mut c_char,
+    nel: size_t,
+    width: size_t,
+    comp: extern "C" fn(*const c_void, *const c_void) -> c_int,
+) {
+    for i in 0..nel {
+        for j in (0..i).rev() {
+            let current = unsafe { base.add(j * width) };
+            let prev = unsafe { base.add((j + 1) * width) };
+            if comp(current as *const c_void, prev as *const c_void) > 0 {
+                unsafe { swap(current, prev, width) };
+            } else {
+                break;
+            }
+        }
+    }
+}
+
+unsafe fn heapsort(
+    base: *mut c_char,
+    nel: size_t,
+    width: size_t,
+    comp: extern "C" fn(*const c_void, *const c_void) -> c_int,
+) {
+    unsafe { heapify(base, nel, width, comp) };
+
+    let mut end = nel - 1;
+    while end > 0 {
+        let end_ptr = unsafe { base.add(end * width) };
+        unsafe { swap(end_ptr, base, width) };
+        end -= 1;
+        unsafe { heap_sift_down(base, 0, end, width, comp) };
+    }
+}
+
+unsafe fn heapify(
+    base: *mut c_char,
+    nel: size_t,
+    width: size_t,
+    comp: extern "C" fn(*const c_void, *const c_void) -> c_int,
+) {
+    // we start at the last parent in the heap (the parent of the last child)
+    let last_parent = (nel - 2) / 2;
+
+    for start in (0..=last_parent).rev() {
+        unsafe { heap_sift_down(base, start, nel - 1, width, comp) };
+    }
+}
+
+unsafe fn heap_sift_down(
+    base: *mut c_char,
+    start: size_t,
+    end: size_t,
+    width: size_t,
+    comp: extern "C" fn(*const c_void, *const c_void) -> c_int,
+) {
+    // get the left child of the node at the given index
+    let left_child = |idx| 2 * idx + 1;
+
+    let mut root = start;
+
+    while left_child(root) <= end {
+        let child = left_child(root);
+        let mut swap_idx = root;
+
+        let root_ptr = unsafe { base.add(root * width) };
+        let mut swap_ptr = unsafe { base.add(swap_idx * width) };
+        let first_child_ptr = unsafe { base.add(child * width) };
+        let second_child_ptr = unsafe { base.add((child + 1) * width) };
+
+        if comp(swap_ptr as *const c_void, first_child_ptr as *const c_void) < 0 {
+            swap_idx = child;
+            swap_ptr = first_child_ptr;
+        }
+        if child < end && comp(swap_ptr as *const c_void, second_child_ptr as *const c_void) < 0 {
+            swap_idx = child + 1;
+            swap_ptr = second_child_ptr;
+        }
+
+        if swap_idx == root {
+            break;
+        } else {
+            unsafe { swap(root_ptr, swap_ptr, width) };
+            root = swap_idx;
+        }
+    }
+}
+
+#[inline]
+unsafe fn partition(
+    base: *mut c_char,
+    nel: size_t,
+    width: size_t,
+    comp: extern "C" fn(*const c_void, *const c_void) -> c_int,
+) -> (size_t, size_t) {
+    // calculate the median of the first, middle, and last elements and use it as the pivot
+    // to do fewer comparisons, also swap the elements into their correct positions
+    let mut pivot = unsafe { median_of_three(base, nel, width, comp) };
+
+    let mut i = 1;
+    let mut j = 1;
+    let mut n = nel - 2;
+
+    // use this to deal with the Dutch national flag problem
+    while j <= n {
+        let i_ptr = unsafe { base.add(i * width) };
+        let j_ptr = unsafe { base.add(j * width) };
+        let n_ptr = unsafe { base.add(n * width) };
+        let pivot_ptr = unsafe { base.add(pivot * width) };
+
+        let comparison = comp(j_ptr as *const c_void, pivot_ptr as *const c_void);
+        if comparison < 0 {
+            unsafe { swap(i_ptr, j_ptr, width) };
+            if i == pivot {
+                pivot = j;
+            }
+            i += 1;
+            j += 1;
+        } else if comparison > 0 {
+            unsafe { swap(j_ptr, n_ptr, width) };
+            if n == pivot {
+                pivot = j;
+            }
+            n -= 1;
+        } else {
+            j += 1;
+        }
+    }
+
+    (i, n)
+}
+
+unsafe fn median_of_three(
+    base: *mut c_char,
+    nel: size_t,
+    width: size_t,
+    comp: extern "C" fn(*const c_void, *const c_void) -> c_int,
+) -> size_t {
+    let pivot = nel / 2;
+
+    let mid = unsafe { base.add(pivot * width) };
+    let last = unsafe { base.add((nel - 1) * width) };
+    if comp(mid as *const c_void, base as *const c_void) < 0 {
+        unsafe { swap(mid, base, width) };
+    }
+    if comp(last as *const c_void, mid as *const c_void) < 0 {
+        unsafe { swap(mid, last, width) };
+        if comp(mid as *const c_void, base as *const c_void) < 0 {
+            unsafe { swap(mid, base, width) };
+        }
+    }
+
+    pivot
+}
+
+#[inline]
+unsafe fn swap(mut ptr1: *mut c_char, mut ptr2: *mut c_char, mut width: size_t) {
+    use core::mem;
+
+    const BUFSIZE: usize = 128;
+
+    let mut buffer = mem::MaybeUninit::<[c_char; BUFSIZE]>::uninit();
+    while width > 0 {
+        let copy_size = BUFSIZE.min(width);
+        let buf = buffer.as_mut_ptr().cast::<c_char>();
+
+        unsafe {
+            buf.copy_from_nonoverlapping(ptr1, copy_size);
+            ptr1.copy_from_nonoverlapping(ptr2, copy_size);
+            ptr2.copy_from_nonoverlapping(buf, copy_size);
+
+            ptr1 = ptr1.add(copy_size);
+            ptr2 = ptr2.add(copy_size);
+        }
+        width -= copy_size as size_t;
+    }
+}
diff --git a/recipes/core/relibc/src/header/string/cbindgen.toml b/recipes/core/relibc/src/header/string/cbindgen.toml
new file mode 100644
index 0000000000..f928e7282f
--- /dev/null
+++ b/recipes/core/relibc/src/header/string/cbindgen.toml
@@ -0,0 +1,20 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/string.h.html
+#
+# Spec quotations relating to includes:
+# - "The <string.h> header shall define NULL and size_t as described in <stddef.h>."
+# - "The <string.h> header shall define the locale_t type as described in <locale.h>."
+# - "Inclusion of the <string.h> header may also make visible all symbols from <stddef.h>."
+sys_includes = ["stddef.h"]
+include_guard = "_RELIBC_STRING_H"
+after_includes = """
+#include <bits/locale-t.h> // for locale_t from locale.h
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+# make size_t actually size_t instead of uintptr_t (which would require stdint.h)
+usize_is_size_t = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/string/mod.rs b/recipes/core/relibc/src/header/string/mod.rs
new file mode 100644
index 0000000000..45621c2dcc
--- /dev/null
+++ b/recipes/core/relibc/src/header/string/mod.rs
@@ -0,0 +1,670 @@
+//! `string.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/string.h.html>.
+
+use core::{iter::once, mem, ptr, slice};
+
+use cbitset::BitSet256;
+
+use crate::{
+    header::{errno::*, signal},
+    iter::{NulTerminated, NulTerminatedInclusive, SrcDstPtrIter},
+    platform::{
+        self,
+        types::{c_char, c_int, c_void, size_t},
+    },
+    raw_cell::RawCell,
+};
+
+use super::{bits_locale_t::locale_t, locale::THREAD_LOCALE};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/memccpy.html>.
+///
+/// # Safety
+/// The caller must ensure that:
+/// - `n` is not longer than the memory area pointed to by `s1`, and
+/// - `n` is not longer than the memory area pointed to by `s2`.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn memccpy(
+    s1: *mut c_void,
+    s2: *const c_void,
+    c: c_int,
+    n: size_t,
+) -> *mut c_void {
+    let to = unsafe { memchr(s2, c, n) };
+    let dist = if to.is_null() {
+        n
+    } else {
+        ((to as usize) - (s2 as usize)) + 1
+    };
+    unsafe { memcpy(s1, s2, dist) };
+    if to.is_null() {
+        ptr::null_mut()
+    } else {
+        unsafe { s1.cast::<u8>().add(dist).cast::<c_void>() }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/memchr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn memchr(
+    haystack: *const c_void,
+    needle: c_int,
+    len: size_t,
+) -> *mut c_void {
+    let haystack = unsafe { slice::from_raw_parts(haystack.cast::<u8>(), len) };
+
+    match memchr::memchr(needle as u8, haystack) {
+        Some(index) => haystack[index..].as_ptr() as *mut c_void,
+        None => ptr::null_mut(),
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/memcmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn memcmp(s1: *const c_void, s2: *const c_void, n: size_t) -> c_int {
+    let (div, rem) = (n / mem::size_of::<size_t>(), n % mem::size_of::<size_t>());
+    let mut a = s1.cast::<usize>();
+    let mut b = s2.cast::<usize>();
+    for _ in 0..div {
+        // SAFETY: `s1` and `s2` are `*const c_void`, which only guarantees byte
+        // alignment. Hence `a` and `b` may be unaligned.
+        if unsafe { a.read_unaligned() } != unsafe { b.read_unaligned() } {
+            for i in 0..mem::size_of::<usize>() {
+                let c = unsafe { *(a.cast::<u8>()).add(i) };
+                let d = unsafe { *(b.cast::<u8>()).add(i) };
+                if c != d {
+                    return c_int::from(c) - c_int::from(d);
+                }
+            }
+            unreachable!()
+        }
+        a = unsafe { a.offset(1) };
+        b = unsafe { b.offset(1) };
+    }
+
+    let mut a = a.cast::<u8>();
+    let mut b = b.cast::<u8>();
+    for _ in 0..rem {
+        if unsafe { *a } != unsafe { *b } {
+            return c_int::from(unsafe { *a }) - c_int::from(unsafe { *b });
+        }
+        a = unsafe { a.offset(1) };
+        b = unsafe { b.offset(1) };
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/memcpy.html>.
+///
+/// # Safety
+/// The caller must ensure that *either*:
+/// - `n` is 0, *or*
+///     - `s1` is convertible to a `&mut [MaybeUninit<u8>]` with length `n`,
+///       and
+///     - `s2` is convertible to a `&[MaybeUninit<u8>]` with length `n`.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn memcpy(s1: *mut c_void, s2: *const c_void, n: size_t) -> *mut c_void {
+    for i in 0..n {
+        unsafe { *s1.cast::<u8>().add(i) = *s2.cast::<u8>().add(i) };
+    }
+    s1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/memmem.html>.
+///
+/// # Safety
+/// The caller must ensure that:
+/// - `haystack` is convertible to a `&[u8]` with length `haystacklen`, and
+/// - `needle` is convertible to a `&[u8]` with length `needlelen`.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn memmem(
+    haystack: *const c_void,
+    haystacklen: size_t,
+    needle: *const c_void,
+    needlelen: size_t,
+) -> *mut c_void {
+    match needlelen {
+        // Required to satisfy spec (would otherwise cause .windows() to panic)
+        0 => haystack,
+        _ => {
+            // SAFETY: the caller is required to ensure that the provided
+            // pointers are valid.
+            let haystack_slice =
+                unsafe { slice::from_raw_parts(haystack.cast::<u8>(), haystacklen) };
+            let needle_slice = unsafe { slice::from_raw_parts(needle.cast::<u8>(), needlelen) };
+
+            // At this point, .windows() will receive a nonzero `needlelen` and
+            // thus not panic.
+            match haystack_slice
+                .windows(needlelen)
+                .find(|&haystack_window| haystack_window == needle_slice)
+            {
+                Some(match_slice) => match_slice.as_ptr().cast(),
+                None => ptr::null(),
+            }
+        }
+    }
+    .cast_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/memmove.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn memmove(s1: *mut c_void, s2: *const c_void, n: size_t) -> *mut c_void {
+    if s2 < s1.cast_const() {
+        // copy from end
+        let mut i = n;
+        while i != 0 {
+            i -= 1;
+            unsafe { *s1.cast::<u8>().add(i) = *s2.cast::<u8>().add(i) };
+        }
+    } else {
+        // copy from beginning
+        let mut i = 0;
+        while i < n {
+            unsafe { *s1.cast::<u8>().add(i) = *s2.cast::<u8>().add(i) };
+            i += 1;
+        }
+    }
+    s1
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/memchr.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn memrchr(
+    haystack: *const c_void,
+    needle: c_int,
+    len: size_t,
+) -> *mut c_void {
+    let haystack = unsafe { slice::from_raw_parts(haystack.cast::<u8>(), len) };
+
+    match memchr::memrchr(needle as u8, haystack) {
+        Some(index) => haystack[index..].as_ptr() as *mut c_void,
+        None => ptr::null_mut(),
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/memset.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn memset(s: *mut c_void, c: c_int, n: size_t) -> *mut c_void {
+    for i in 0..n {
+        unsafe { *s.cast::<u8>().add(i) = c as u8 };
+    }
+    s
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcpy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn stpcpy(mut s1: *mut c_char, mut s2: *const c_char) -> *mut c_char {
+    loop {
+        unsafe { *s1 = *s2 };
+
+        if unsafe { *s1 } == 0 {
+            break;
+        }
+
+        s1 = unsafe { s1.add(1) };
+        s2 = unsafe { s2.add(1) };
+    }
+
+    s1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strncpy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn stpncpy(
+    mut s1: *mut c_char,
+    mut s2: *const c_char,
+    mut n: size_t,
+) -> *mut c_char {
+    while n > 0 {
+        unsafe { *s1 = *s2 };
+
+        if unsafe { *s1 } == 0 {
+            break;
+        }
+
+        n -= 1;
+        s1 = unsafe { s1.add(1) };
+        s2 = unsafe { s2.add(1) };
+    }
+
+    unsafe { memset(s1.cast(), 0, n) };
+
+    s1
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/strstr.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strcasestr(haystack: *const c_char, needle: *const c_char) -> *mut c_char {
+    unsafe { inner_strstr(haystack, needle, !32) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strcat(s1: *mut c_char, s2: *const c_char) -> *mut c_char {
+    unsafe { strncat(s1, s2, usize::MAX) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strchr.html>.
+///
+/// # Safety
+/// The caller is required to ensure that `s` is a valid pointer to a buffer
+/// containing at least one nul value. The pointed-to buffer must not be
+/// modified for the duration of the call.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strchr(s: *const c_char, c: c_int) -> *mut c_char {
+    let c_as_c_char = c as c_char;
+
+    // We iterate over non-mut references and thus need to coerce the
+    // resulting reference via a *const pointer before we can get our *mut.
+    // SAFETY: the caller is required to ensure that s points to a valid
+    // nul-terminated buffer.
+    let ptr: *const c_char =
+        match unsafe { NulTerminatedInclusive::new(s) }.find(|&&sc| sc == c_as_c_char) {
+            Some(sc_ref) => sc_ref,
+            None => ptr::null(),
+        };
+    ptr.cast_mut()
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man3/strchr.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strchrnul(s: *const c_char, c: c_int) -> *mut c_char {
+    let mut s = s.cast_mut();
+    loop {
+        if unsafe { *s } == c as _ {
+            break;
+        }
+        if unsafe { *s } == 0 {
+            break;
+        }
+        s = unsafe { s.add(1) };
+    }
+    s
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strcmp(s1: *const c_char, s2: *const c_char) -> c_int {
+    unsafe { strncmp(s1, s2, usize::MAX) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcoll_l.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strcoll_l(s1: *const c_char, s2: *const c_char, _loc: locale_t) -> c_int {
+    // relibc has no locale stuff (yet)
+    unsafe { strcmp(s1, s2) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcoll.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strcoll(s1: *const c_char, s2: *const c_char) -> c_int {
+    unsafe { strcoll_l(s1, s2, THREAD_LOCALE as locale_t) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcpy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char {
+    let src_iter = unsafe { NulTerminated::new(src).unwrap() };
+    let src_dest_iter = unsafe { SrcDstPtrIter::new(src_iter.chain(once(&0)), dst) };
+    for (src_item, dst_item) in src_dest_iter {
+        dst_item.write(*src_item);
+    }
+
+    dst
+}
+
+pub unsafe fn inner_strspn(s1: *const c_char, s2: *const c_char, cmp: bool) -> size_t {
+    let mut s1 = s1.cast::<u8>();
+    let mut s2 = s2.cast::<u8>();
+
+    // The below logic is effectively ripped from the musl implementation. It
+    // works by placing each byte as it's own bit in an array of numbers. Each
+    // number can hold up to 8 * mem::size_of::<usize>() bits. We need 256 bits
+    // in total, to fit one byte.
+
+    let mut set = BitSet256::new();
+
+    while unsafe { *s2 } != 0 {
+        set.insert(unsafe { *s2 } as usize);
+        s2 = unsafe { s2.offset(1) };
+    }
+
+    let mut i = 0;
+    while unsafe { *s1 } != 0 {
+        if set.contains(unsafe { *s1 } as usize) != cmp {
+            break;
+        }
+        i += 1;
+        s1 = unsafe { s1.offset(1) };
+    }
+    i
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcspn.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strcspn(s1: *const c_char, s2: *const c_char) -> size_t {
+    unsafe { inner_strspn(s1, s2, false) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strdup.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strdup(s1: *const c_char) -> *mut c_char {
+    unsafe { strndup(s1, usize::MAX) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strerror_l.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strerror_l(errnum: c_int, _loc: locale_t) -> *mut c_char {
+    use core::fmt::Write;
+
+    static strerror_buf: RawCell<[u8; STRERROR_MAX]> = RawCell::new([0; STRERROR_MAX]);
+    let mut w = platform::StringWriter(unsafe { strerror_buf.unsafe_mut().as_mut_ptr() }, unsafe {
+        strerror_buf.unsafe_ref().len()
+    });
+
+    let _ = match STR_ERROR.get(errnum as usize) {
+        Some(e) => w.write_str(e),
+        None => w.write_fmt(format_args!("Unknown error {}", errnum)),
+    };
+
+    (unsafe { strerror_buf.unsafe_mut().as_mut_ptr() }).cast::<c_char>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strerror.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strerror(errnum: c_int) -> *mut c_char {
+    unsafe { strerror_l(errnum, THREAD_LOCALE as locale_t) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strerror_r.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strerror_r(errnum: c_int, buf: *mut c_char, buflen: size_t) -> c_int {
+    let msg = unsafe { strerror(errnum) };
+    let len = unsafe { strlen(msg) };
+
+    if len >= buflen {
+        if buflen != 0 {
+            unsafe { memcpy(buf.cast::<c_void>(), msg as *const c_void, buflen - 1) };
+            unsafe { *buf.add(buflen - 1) = 0 };
+        }
+        return ERANGE as c_int;
+    }
+    unsafe { memcpy(buf.cast::<c_void>(), msg as *const c_void, len + 1) };
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strlcat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strlcat(dst: *mut c_char, src: *const c_char, dstsize: size_t) -> size_t {
+    let dst_len = unsafe { strnlen(dst, dstsize) };
+    let d = unsafe { dst.add(dst_len) };
+    let src_len = unsafe { strlcpy(d, src, dstsize - dst_len) };
+    src_len + if dst_len > dstsize { dstsize } else { dst_len }
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/strsep.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strsep(str_: *mut *mut c_char, sep: *const c_char) -> *mut c_char {
+    let s = unsafe { *str_ };
+    if s.is_null() {
+        return ptr::null_mut();
+    }
+    let mut end = unsafe { s.add(strcspn(s, sep)) };
+    if unsafe { *end } != 0 {
+        unsafe { *end = 0 };
+        end = unsafe { end.add(1) };
+    } else {
+        end = ptr::null_mut();
+    }
+    unsafe { *str_ = end };
+    s
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strlcat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strlcpy(dst: *mut c_char, src: *const c_char, dstsize: size_t) -> size_t {
+    let mut i = 0;
+
+    if dstsize != 0 {
+        while unsafe { *src.add(i) } != 0 && i < dstsize - 1 {
+            unsafe {
+                *dst.add(i) = *src.add(i);
+            }
+            i += 1;
+        }
+        unsafe {
+            *dst.add(i) = 0;
+        }
+    }
+
+    while unsafe { *src.add(i) } != 0 {
+        i += 1;
+    }
+
+    i as size_t
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strlen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strlen(s: *const c_char) -> size_t {
+    unsafe { NulTerminated::new(s) }
+        .map(|s| s.count())
+        .unwrap_or(0)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strncat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strncat(s1: *mut c_char, s2: *const c_char, n: size_t) -> *mut c_char {
+    let len = unsafe { strlen(s1.cast()) };
+    let mut i = 0;
+    while i < n {
+        let b = unsafe { *s2.add(i) };
+        if b == 0 {
+            break;
+        }
+
+        unsafe { *s1.add(len + i) = b };
+        i += 1;
+    }
+    unsafe { *s1.add(len + i) = 0 };
+
+    s1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strncmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strncmp(s1: *const c_char, s2: *const c_char, n: size_t) -> c_int {
+    for i in 0..n {
+        // These must be cast as u8 to have correct comparisons
+        let a = unsafe { *s1.add(i) } as u8;
+        let b = unsafe { *s2.add(i) } as u8;
+        if a != b || a == 0 {
+            return c_int::from(a) - c_int::from(b);
+        }
+    }
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strncpy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strncpy(s1: *mut c_char, s2: *const c_char, n: size_t) -> *mut c_char {
+    unsafe { stpncpy(s1, s2, n) };
+    s1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strdup.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strndup(s1: *const c_char, size: size_t) -> *mut c_char {
+    let len = unsafe { strnlen(s1, size) };
+
+    // the "+ 1" is to account for the NUL byte
+    let buffer = unsafe { platform::alloc(len + 1) }.cast::<c_char>();
+    if buffer.is_null() {
+        platform::ERRNO.set(ENOMEM as c_int);
+    } else {
+        //memcpy(buffer, s1, len)
+        for i in 0..len {
+            unsafe { *buffer.add(i) = *s1.add(i) };
+        }
+        unsafe { *buffer.add(len) = 0 };
+    }
+
+    buffer
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strlen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strnlen(s: *const c_char, size: size_t) -> size_t {
+    unsafe { NulTerminated::new(s).unwrap() }.take(size).count()
+}
+
+/// Non-POSIX, see <https://en.cppreference.com/w/c/string/byte/strlen>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strnlen_s(s: *const c_char, size: size_t) -> size_t {
+    if s.is_null() {
+        0
+    } else {
+        unsafe { strnlen(s, size) }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strpbrk.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strpbrk(s1: *const c_char, s2: *const c_char) -> *mut c_char {
+    let p = unsafe { s1.add(strcspn(s1, s2)) };
+    if unsafe { *p } != 0 {
+        p.cast_mut()
+    } else {
+        ptr::null_mut()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strrchr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strrchr(s: *const c_char, c: c_int) -> *mut c_char {
+    let len = unsafe { strlen(s) } as isize;
+    let c = c as c_char;
+    let mut i = len - 1;
+    while i >= 0 {
+        if unsafe { *s.offset(i) } == c {
+            return unsafe { s.offset(i) }.cast_mut();
+        }
+        i -= 1;
+    }
+    ptr::null_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strsignal.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strsignal(sig: c_int) -> *mut c_char {
+    signal::SIGNAL_STRINGS
+        .get(sig as usize)
+        .unwrap_or(&signal::SIGNAL_STRINGS[0]) // Unknown signal message
+        .as_ptr() as *mut c_char
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strspn.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strspn(s1: *const c_char, s2: *const c_char) -> size_t {
+    unsafe { inner_strspn(s1, s2, true) }
+}
+
+unsafe fn inner_strstr(
+    mut haystack: *const c_char,
+    needle: *const c_char,
+    mask: c_char,
+) -> *mut c_char {
+    while unsafe { *haystack } != 0 {
+        let mut i = 0;
+        loop {
+            if unsafe { *needle.offset(i) } == 0 {
+                // We reached the end of the needle, everything matches this far
+                return haystack.cast_mut();
+            }
+            if unsafe { *haystack.offset(i) } & mask != unsafe { *needle.offset(i) } & mask {
+                break;
+            }
+
+            i += 1;
+        }
+
+        haystack = unsafe { haystack.offset(1) };
+    }
+    ptr::null_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strstr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strstr(haystack: *const c_char, needle: *const c_char) -> *mut c_char {
+    unsafe { inner_strstr(haystack, needle, !0) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtok.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtok(s1: *mut c_char, delimiter: *const c_char) -> *mut c_char {
+    static mut HAYSTACK: *mut c_char = ptr::null_mut();
+    unsafe { strtok_r(s1, delimiter, &raw mut HAYSTACK) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strtok.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strtok_r(
+    s: *mut c_char,
+    delimiter: *const c_char,
+    lasts: *mut *mut c_char,
+) -> *mut c_char {
+    // musl returns null if both s and lasts are null, it sets s to lasts otherwise
+    let mut haystack = s;
+    if haystack.is_null() {
+        if (unsafe { *lasts }).is_null() {
+            return ptr::null_mut();
+        }
+        haystack = unsafe { *lasts };
+    }
+
+    // Skip past any extra delimiter left over from previous call
+    haystack = unsafe { haystack.add(strspn(haystack, delimiter)) };
+    if unsafe { *haystack } == 0 {
+        unsafe { *lasts = haystack };
+        return ptr::null_mut();
+    }
+
+    // Build token by injecting null byte into delimiter
+    let token = haystack;
+    haystack = unsafe { strpbrk(token, delimiter) };
+    if !haystack.is_null() {
+        unsafe { haystack.write(0) };
+        haystack = unsafe { haystack.add(1) };
+        unsafe { *lasts = haystack };
+    } else {
+        unsafe { *lasts = token.add(strlen(token)) };
+    }
+
+    token
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strxfrm_l.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strxfrm_l(
+    s1: *mut c_char,
+    s2: *const c_char,
+    n: size_t,
+    _loc: locale_t,
+) -> size_t {
+    // relibc has no locale stuff (yet)
+    let len = unsafe { strlen(s2) };
+    if len < n {
+        unsafe { strcpy(s1, s2) };
+    }
+    len
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strxfrm.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strxfrm(s1: *mut c_char, s2: *const c_char, n: size_t) -> size_t {
+    unsafe { strxfrm_l(s1, s2, n, THREAD_LOCALE as locale_t) }
+}
diff --git a/recipes/core/relibc/src/header/strings/cbindgen.toml b/recipes/core/relibc/src/header/strings/cbindgen.toml
new file mode 100644
index 0000000000..4479f685d6
--- /dev/null
+++ b/recipes/core/relibc/src/header/strings/cbindgen.toml
@@ -0,0 +1,22 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/strings.h.html
+#
+# Spec quotations relating to includes:
+# - "The <strings.h> header shall define the locale_t type as described in <locale.h>."
+# - "The <strings.h> header shall define the size_t type as described in <sys/types.h>."
+#
+# sys/types.h gets size_t from stddef.h (just include stddef.h here instead of importing all of sys/types.h)
+# features.h required for deprecated annotations
+sys_includes = ["features.h", "stddef.h"]
+include_guard = "_RELIBC_STRINGS_H"
+after_includes = """
+#include <bits/locale-t.h> // for locale_t from locale.h
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+# make size_t actually size_t instead of uintptr_t (which would require stdint.h)
+usize_is_size_t = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/strings/mod.rs b/recipes/core/relibc/src/header/strings/mod.rs
new file mode 100644
index 0000000000..9f33d65f54
--- /dev/null
+++ b/recipes/core/relibc/src/header/strings/mod.rs
@@ -0,0 +1,157 @@
+//! `strings.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/strings.h.html>.
+
+use core::{
+    arch,
+    iter::{once, zip},
+    ptr,
+};
+
+use crate::{
+    header::{ctype, string},
+    iter::NulTerminated,
+    platform::types::{c_char, c_int, c_long, c_longlong, c_void, size_t},
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/bcmp.html>.
+///
+/// # Deprecation
+/// The `bcmp()` function was marked legacy in the Open Group Base
+/// Specifications Issue 6, and removed in Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn bcmp(first: *const c_void, second: *const c_void, n: size_t) -> c_int {
+    unsafe { string::memcmp(first, second, n) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/bcopy.html>.
+///
+/// # Deprecation
+/// The `bcopy()` function was marked legacy in the Open Group Base
+/// Specifications Issue 6, and removed in Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn bcopy(src: *const c_void, dst: *mut c_void, n: size_t) {
+    unsafe {
+        ptr::copy(src.cast::<u8>(), dst.cast::<u8>(), n);
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/bzero.html>.
+///
+/// # Deprecation
+/// The `bzero()` function was marked legacy in the Open Group Base
+/// Specifications Issue 6, and removed in Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn bzero(dst: *mut c_void, n: size_t) {
+    unsafe {
+        ptr::write_bytes(dst.cast::<u8>(), 0, n);
+    }
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man3/bzero.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn explicit_bzero(s: *mut c_void, n: size_t) {
+    for i in 0..n {
+        unsafe {
+            *s.cast::<u8>().add(i) = 0_u8;
+        }
+    }
+    unsafe {
+        arch::asm!("");
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ffs.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ffs(i: c_int) -> c_int {
+    if i == 0 {
+        return 0;
+    }
+    1 + i.trailing_zeros() as c_int
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ffs.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ffsl(i: c_long) -> c_int {
+    if i == 0 {
+        return 0;
+    }
+    1 + i.trailing_zeros() as c_int
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ffs.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ffsll(i: c_longlong) -> c_int {
+    if i == 0 {
+        return 0;
+    }
+    1 + i.trailing_zeros() as c_int
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/index.html>.
+///
+/// # Deprecation
+/// The `index()` function was marked legacy in the Open Group Base
+/// Specifications Issue 6, and removed in Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn index(s: *const c_char, c: c_int) -> *mut c_char {
+    unsafe { string::strchr(s, c) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/rindex.html>.
+///
+/// # Deprecation
+/// The `rindex()` function was marked legacy in the Open Group Base
+/// Specifications Issue 6, and removed in Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn rindex(s: *const c_char, c: c_int) -> *mut c_char {
+    unsafe { string::strrchr(s, c) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcasecmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int {
+    // SAFETY: the caller must ensure that s1 and s2 point to nul-terminated buffers.
+    let s1_iter = unsafe { NulTerminated::new(s1).unwrap() }.chain(once(&0));
+    let s2_iter = unsafe { NulTerminated::new(s2).unwrap() }.chain(once(&0));
+
+    let zipped = zip(s1_iter, s2_iter);
+    inner_casecmp(zipped)
+}
+
+// TODO: needs locale_t
+// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcasecmp.html>.
+// #[unsafe(no_mangle)]
+/*pub extern "C" fn strcasecmp_l(s1: *const c_char, s2: *const c_char, locale: locale_t) -> c_int {
+    unimplemented!();
+}*/
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcasecmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strncasecmp(s1: *const c_char, s2: *const c_char, n: size_t) -> c_int {
+    // SAFETY: the caller must ensure that s1 and s2 point to nul-terminated buffers.
+    let s1_iter = unsafe { NulTerminated::new(s1).unwrap() }.chain(once(&0));
+    let s2_iter = unsafe { NulTerminated::new(s2).unwrap() }.chain(once(&0));
+
+    let zipped = zip(s1_iter, s2_iter).take(n);
+    inner_casecmp(zipped)
+}
+
+// TODO: needs locale_t
+// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcasecmp.html>.
+// #[unsafe(no_mangle)]
+/*pub extern "C" fn strncasecmp_l(s1: *const c_char, s2: *const c_char, n: size_t, locale: locale_t) -> c_int {
+    unimplemented!();
+}*/
+
+/// Given two zipped `&c_char` iterators, either find the first comparison != 0, or return 0.
+fn inner_casecmp<'a>(iterator: impl Iterator<Item = (&'a c_char, &'a c_char)>) -> c_int {
+    let cmp_iter = iterator.map(|(&c1, &c2)| ctype::tolower(c1.into()) - ctype::tolower(c2.into()));
+    let mut skip_iter = cmp_iter.skip_while(|&cmp| cmp == 0);
+    skip_iter.next().unwrap_or(0)
+}
diff --git a/recipes/core/relibc/src/header/sys_auxv/cbindgen.toml b/recipes/core/relibc/src/header/sys_auxv/cbindgen.toml
new file mode 100644
index 0000000000..44924e2e2c
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_auxv/cbindgen.toml
@@ -0,0 +1,8 @@
+include_guard = "_SYS_AUXV_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_auxv/mod.rs b/recipes/core/relibc/src/header/sys_auxv/mod.rs
new file mode 100644
index 0000000000..dbd26a8c75
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_auxv/mod.rs
@@ -0,0 +1,13 @@
+//! `sys/auxv.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getauxval.3.html>.
+
+use crate::platform::types::c_ulong;
+
+pub use crate::platform::auxv_defs::*;
+
+/// See <https://www.man7.org/linux/man-pages/man3/getauxval.3.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getauxval(_t: c_ulong) -> c_ulong {
+    0
+}
diff --git a/recipes/core/relibc/src/header/sys_epoll/cbindgen.toml b/recipes/core/relibc/src/header/sys_epoll/cbindgen.toml
new file mode 100644
index 0000000000..64ce6c75b7
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_epoll/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = ["signal.h"]
+include_guard = "_SYS_EPOLL_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_epoll/linux.rs b/recipes/core/relibc/src/header/sys_epoll/linux.rs
new file mode 100644
index 0000000000..89b5365017
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_epoll/linux.rs
@@ -0,0 +1,20 @@
+use crate::platform::types::{c_int, c_uint};
+
+pub const EPOLL_CLOEXEC: c_int = 0x8_0000;
+
+pub const EPOLLIN: c_uint = 0x001;
+pub const EPOLLPRI: c_uint = 0x002;
+pub const EPOLLOUT: c_uint = 0x004;
+pub const EPOLLERR: c_uint = 0x008;
+pub const EPOLLHUP: c_uint = 0x010;
+pub const EPOLLNVAL: c_uint = 0x020;
+pub const EPOLLRDNORM: c_uint = 0x040;
+pub const EPOLLRDBAND: c_uint = 0x080;
+pub const EPOLLWRNORM: c_uint = 0x100;
+pub const EPOLLWRBAND: c_uint = 0x200;
+pub const EPOLLMSG: c_uint = 0x400;
+pub const EPOLLRDHUP: c_uint = 0x2000;
+pub const EPOLLEXCLUSIVE: c_uint = 1 << 28;
+pub const EPOLLWAKEUP: c_uint = 1 << 29;
+pub const EPOLLONESHOT: c_uint = 1 << 30;
+pub const EPOLLET: c_uint = 1 << 31;
diff --git a/recipes/core/relibc/src/header/sys_epoll/mod.rs b/recipes/core/relibc/src/header/sys_epoll/mod.rs
new file mode 100644
index 0000000000..7cad658c7a
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_epoll/mod.rs
@@ -0,0 +1,136 @@
+//! `sys/epoll.h` implementation.
+//!
+//! Non-POSIX, see <http://man7.org/linux/man-pages/man7/epoll.7.html>.
+
+use core::ptr;
+
+use crate::{
+    error::ResultExt,
+    header::signal::sigset_t,
+    platform::{
+        PalEpoll, Sys,
+        types::{c_int, c_void},
+    },
+};
+
+pub use self::sys::*;
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+pub mod sys;
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+pub mod sys;
+
+pub const EPOLL_CTL_ADD: c_int = 1;
+pub const EPOLL_CTL_DEL: c_int = 2;
+pub const EPOLL_CTL_MOD: c_int = 3;
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man3/epoll_event.3type.html>.
+#[repr(C)]
+#[derive(Clone, Copy)]
+pub union epoll_data {
+    pub ptr: *mut c_void,
+    pub fd: c_int,
+    pub u32: u32,
+    pub u64: u64,
+}
+impl Default for epoll_data {
+    fn default() -> Self {
+        Self { u64: 0 }
+    }
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man3/epoll_event.3type.html>.
+#[cfg(all(target_os = "redox", target_pointer_width = "64"))]
+#[repr(C)]
+#[derive(Clone, Copy, Default)]
+// This will match in size with syscall::Event (24 bytes on 64-bit
+// systems) on redox. The `Default` trait is here so we don't need to
+// worry about the padding when using this type.
+pub struct epoll_event {
+    pub events: u32, // 4 bytes
+    // 4 automatic alignment bytes
+    pub data: epoll_data, // 8 bytes
+
+    pub _pad: u64, // 8 bytes
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man3/epoll_event.3type.html>.
+#[cfg(not(all(target_os = "redox", target_pointer_width = "64")))]
+#[repr(C)]
+#[derive(Clone, Copy, Default)]
+pub struct epoll_event {
+    pub events: u32,
+    pub data: epoll_data,
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man2/epoll_create.2.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn epoll_create(_size: c_int) -> c_int {
+    epoll_create1(0)
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man2/epoll_create1.2.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn epoll_create1(flags: c_int) -> c_int {
+    trace_expr!(
+        Sys::epoll_create1(flags).or_minus_one_errno(),
+        "epoll_create1({:#x})",
+        flags
+    )
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man2/epoll_ctl.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn epoll_ctl(
+    epfd: c_int,
+    op: c_int,
+    fd: c_int,
+    event: *mut epoll_event,
+) -> c_int {
+    trace_expr!(
+        unsafe { Sys::epoll_ctl(epfd, op, fd, event) }
+            .map(|()| 0)
+            .or_minus_one_errno(),
+        "epoll_ctl({}, {}, {}, {:p})",
+        epfd,
+        op,
+        fd,
+        event
+    )
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man2/epoll_wait.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn epoll_wait(
+    epfd: c_int,
+    events: *mut epoll_event,
+    maxevents: c_int,
+    timeout: c_int,
+) -> c_int {
+    unsafe { epoll_pwait(epfd, events, maxevents, timeout, ptr::null()) }
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man2/epoll_wait.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn epoll_pwait(
+    epfd: c_int,
+    events: *mut epoll_event,
+    maxevents: c_int,
+    timeout: c_int,
+    sigmask: *const sigset_t,
+) -> c_int {
+    trace_expr!(
+        unsafe { Sys::epoll_pwait(epfd, events, maxevents, timeout, sigmask) }
+            .map(|e| e as c_int)
+            .or_minus_one_errno(),
+        "epoll_pwait({}, {:p}, {}, {}, {:p})",
+        epfd,
+        events,
+        maxevents,
+        timeout,
+        sigmask
+    )
+}
diff --git a/recipes/core/relibc/src/header/sys_epoll/redox.rs b/recipes/core/relibc/src/header/sys_epoll/redox.rs
new file mode 100644
index 0000000000..dfaf15fd6d
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_epoll/redox.rs
@@ -0,0 +1,20 @@
+use crate::platform::types::{c_int, c_uint};
+
+pub const EPOLL_CLOEXEC: c_int = 0x0100_0000;
+
+pub const EPOLLIN: c_uint = 0x001;
+pub const EPOLLPRI: c_uint = 0x002;
+pub const EPOLLOUT: c_uint = 0x004;
+pub const EPOLLERR: c_uint = 0x008;
+pub const EPOLLHUP: c_uint = 0x010;
+pub const EPOLLNVAL: c_uint = 0x020;
+pub const EPOLLRDNORM: c_uint = 0x040;
+pub const EPOLLRDBAND: c_uint = 0x080;
+pub const EPOLLWRNORM: c_uint = 0x100;
+pub const EPOLLWRBAND: c_uint = 0x200;
+pub const EPOLLMSG: c_uint = 0x400;
+pub const EPOLLRDHUP: c_uint = 0x2000;
+pub const EPOLLEXCLUSIVE: c_uint = 1 << 28;
+pub const EPOLLWAKEUP: c_uint = 1 << 29;
+pub const EPOLLONESHOT: c_uint = 1 << 30;
+pub const EPOLLET: c_uint = 1 << 31;
diff --git a/recipes/core/relibc/src/header/sys_file/cbindgen.toml b/recipes/core/relibc/src/header/sys_file/cbindgen.toml
new file mode 100644
index 0000000000..d5d26dfa5b
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_file/cbindgen.toml
@@ -0,0 +1,8 @@
+include_guard = "_SYS_FILE_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_file/mod.rs b/recipes/core/relibc/src/header/sys_file/mod.rs
new file mode 100644
index 0000000000..810540213d
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_file/mod.rs
@@ -0,0 +1,23 @@
+//! `sys/file.h` implementation.
+//!
+//! Non-POSIX, see <https://man7.org/linux/man-pages/man2/flock.2.html>.
+
+use crate::{
+    error::ResultExt,
+    platform::{Pal, Sys, types::c_int},
+};
+
+pub const LOCK_SH: c_int = 1;
+pub const LOCK_EX: c_int = 2;
+pub const LOCK_NB: c_int = 4;
+pub const LOCK_UN: c_int = 8;
+
+pub const L_SET: c_int = 0;
+pub const L_INCR: c_int = 1;
+pub const L_XTND: c_int = 2;
+
+/// See <https://man7.org/linux/man-pages/man2/flock.2.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn flock(fd: c_int, operation: c_int) -> c_int {
+    Sys::flock(fd, operation).map(|()| 0).or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/sys_ioctl/cbindgen.toml b/recipes/core/relibc/src/header/sys_ioctl/cbindgen.toml
new file mode 100644
index 0000000000..64117641a7
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_ioctl/cbindgen.toml
@@ -0,0 +1,24 @@
+include_guard = "_SYS_IOCTL_H"
+language = "C"
+style = "Tag"
+trailer = """
+// Shamelessly copy-pasted from musl
+
+#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
+#define _IOC_NONE  0U
+#define _IOC_WRITE 1U
+#define _IOC_READ  2U
+
+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
+"""
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export]
+include = ["sgttyb", "winsize"]
diff --git a/recipes/core/relibc/src/header/sys_ioctl/linux.rs b/recipes/core/relibc/src/header/sys_ioctl/linux.rs
new file mode 100644
index 0000000000..62d5946c0a
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_ioctl/linux.rs
@@ -0,0 +1,201 @@
+use crate::{
+    error::ResultExt,
+    platform::{
+        Sys,
+        types::{c_int, c_ulong, c_void},
+    },
+};
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ioctl(fd: c_int, request: c_ulong, out: *mut c_void) -> c_int {
+    // TODO: Somehow support varargs to syscall??
+    unsafe { Sys::ioctl(fd, request, out).or_minus_one_errno() }
+}
+
+pub const TCGETS: c_ulong = 0x5401;
+pub const TCSETS: c_ulong = 0x5402;
+pub const TCSETSW: c_ulong = 0x5403;
+pub const TCSETSF: c_ulong = 0x5404;
+pub const TCGETA: c_ulong = 0x5405;
+pub const TCSETA: c_ulong = 0x5406;
+pub const TCSETAW: c_ulong = 0x5407;
+pub const TCSETAF: c_ulong = 0x5408;
+pub const TCSBRK: c_ulong = 0x5409;
+pub const TCXONC: c_ulong = 0x540A;
+pub const TCFLSH: c_ulong = 0x540B;
+pub const TIOCEXCL: c_ulong = 0x540C;
+pub const TIOCNXCL: c_ulong = 0x540D;
+pub const TIOCSCTTY: c_ulong = 0x540E;
+pub const TIOCGPGRP: c_ulong = 0x540F;
+pub const TIOCSPGRP: c_ulong = 0x5410;
+pub const TIOCOUTQ: c_ulong = 0x5411;
+pub const TIOCSTI: c_ulong = 0x5412;
+pub const TIOCGWINSZ: c_ulong = 0x5413;
+pub const TIOCSWINSZ: c_ulong = 0x5414;
+pub const TIOCMGET: c_ulong = 0x5415;
+pub const TIOCMBIS: c_ulong = 0x5416;
+pub const TIOCMBIC: c_ulong = 0x5417;
+pub const TIOCMSET: c_ulong = 0x5418;
+pub const TIOCGSOFTCAR: c_ulong = 0x5419;
+pub const TIOCSSOFTCAR: c_ulong = 0x541A;
+pub const FIONREAD: c_ulong = 0x541B;
+pub const TIOCINQ: c_ulong = FIONREAD;
+pub const TIOCLINUX: c_ulong = 0x541C;
+pub const TIOCCONS: c_ulong = 0x541D;
+pub const TIOCGSERIAL: c_ulong = 0x541E;
+pub const TIOCSSERIAL: c_ulong = 0x541F;
+pub const TIOCPKT: c_ulong = 0x5420;
+pub const FIONBIO: c_ulong = 0x5421;
+pub const TIOCNOTTY: c_ulong = 0x5422;
+pub const TIOCSETD: c_ulong = 0x5423;
+pub const TIOCGETD: c_ulong = 0x5424;
+pub const TCSBRKP: c_ulong = 0x5425;
+pub const TIOCSBRK: c_ulong = 0x5427;
+pub const TIOCCBRK: c_ulong = 0x5428;
+pub const TIOCGSID: c_ulong = 0x5429;
+pub const TIOCGRS485: c_ulong = 0x542E;
+pub const TIOCSRS485: c_ulong = 0x542F;
+pub const TIOCGPTN: c_ulong = 0x8004_5430;
+pub const TIOCSPTLCK: c_ulong = 0x4004_5431;
+pub const TIOCGDEV: c_ulong = 0x8004_5432;
+pub const TCGETX: c_ulong = 0x5432;
+pub const TCSETX: c_ulong = 0x5433;
+pub const TCSETXF: c_ulong = 0x5434;
+pub const TCSETXW: c_ulong = 0x5435;
+pub const TIOCSIG: c_ulong = 0x4004_5436;
+pub const TIOCVHANGUP: c_ulong = 0x5437;
+pub const TIOCGPKT: c_ulong = 0x8004_5438;
+pub const TIOCGPTLCK: c_ulong = 0x8004_5439;
+pub const TIOCGEXCL: c_ulong = 0x8004_5440;
+pub const TIOCGPTPEER: c_ulong = 0x5441;
+
+pub const FIONCLEX: c_ulong = 0x5450;
+pub const FIOCLEX: c_ulong = 0x5451;
+pub const FIOASYNC: c_ulong = 0x5452;
+pub const TIOCSERCONFIG: c_ulong = 0x5453;
+pub const TIOCSERGWILD: c_ulong = 0x5454;
+pub const TIOCSERSWILD: c_ulong = 0x5455;
+pub const TIOCGLCKTRMIOS: c_ulong = 0x5456;
+pub const TIOCSLCKTRMIOS: c_ulong = 0x5457;
+pub const TIOCSERGSTRUCT: c_ulong = 0x5458;
+pub const TIOCSERGETLSR: c_ulong = 0x5459;
+pub const TIOCSERGETMULTI: c_ulong = 0x545A;
+pub const TIOCSERSETMULTI: c_ulong = 0x545B;
+
+pub const TIOCMIWAIT: c_ulong = 0x545C;
+pub const TIOCGICOUNT: c_ulong = 0x545D;
+pub const FIOQSIZE: c_ulong = 0x5460;
+
+pub const TIOCPKT_DATA: c_ulong = 0;
+pub const TIOCPKT_FLUSHREAD: c_ulong = 1;
+pub const TIOCPKT_FLUSHWRITE: c_ulong = 2;
+pub const TIOCPKT_STOP: c_ulong = 4;
+pub const TIOCPKT_START: c_ulong = 8;
+pub const TIOCPKT_NOSTOP: c_ulong = 16;
+pub const TIOCPKT_DOSTOP: c_ulong = 32;
+pub const TIOCPKT_IOCTL: c_ulong = 64;
+
+pub const TIOCSER_TEMT: c_ulong = 0x01;
+
+pub const TIOCM_LE: c_ulong = 0x001;
+pub const TIOCM_DTR: c_ulong = 0x002;
+pub const TIOCM_RTS: c_ulong = 0x004;
+pub const TIOCM_ST: c_ulong = 0x008;
+pub const TIOCM_SR: c_ulong = 0x010;
+pub const TIOCM_CTS: c_ulong = 0x020;
+pub const TIOCM_CAR: c_ulong = 0x040;
+pub const TIOCM_RNG: c_ulong = 0x080;
+pub const TIOCM_DSR: c_ulong = 0x100;
+pub const TIOCM_CD: c_ulong = TIOCM_CAR;
+pub const TIOCM_RI: c_ulong = TIOCM_RNG;
+pub const TIOCM_OUT1: c_ulong = 0x2000;
+pub const TIOCM_OUT2: c_ulong = 0x4000;
+pub const TIOCM_LOOP: c_ulong = 0x8000;
+
+pub const N_TTY: c_ulong = 0;
+pub const N_SLIP: c_ulong = 1;
+pub const N_MOUSE: c_ulong = 2;
+pub const N_PPP: c_ulong = 3;
+pub const N_STRIP: c_ulong = 4;
+pub const N_AX25: c_ulong = 5;
+pub const N_X25: c_ulong = 6;
+pub const N_6PACK: c_ulong = 7;
+pub const N_MASC: c_ulong = 8;
+pub const N_R3964: c_ulong = 9;
+pub const N_PROFIBUS_FDL: c_ulong = 10;
+pub const N_IRDA: c_ulong = 11;
+pub const N_SMSBLOCK: c_ulong = 12;
+pub const N_HDLC: c_ulong = 13;
+pub const N_SYNC_PPP: c_ulong = 14;
+pub const N_HCI: c_ulong = 15;
+
+pub const FIOSETOWN: c_ulong = 0x8901;
+pub const SIOCSPGRP: c_ulong = 0x8902;
+pub const FIOGETOWN: c_ulong = 0x8903;
+pub const SIOCGPGRP: c_ulong = 0x8904;
+pub const SIOCATMARK: c_ulong = 0x8905;
+pub const SIOCGSTAMP: c_ulong = 0x8906;
+pub const SIOCGSTAMPNS: c_ulong = 0x8907;
+
+pub const SIOCADDRT: c_ulong = 0x890B;
+pub const SIOCDELRT: c_ulong = 0x890C;
+pub const SIOCRTMSG: c_ulong = 0x890D;
+
+pub const SIOCGIFNAME: c_ulong = 0x8910;
+pub const SIOCSIFLINK: c_ulong = 0x8911;
+pub const SIOCGIFCONF: c_ulong = 0x8912;
+pub const SIOCGIFFLAGS: c_ulong = 0x8913;
+pub const SIOCSIFFLAGS: c_ulong = 0x8914;
+pub const SIOCGIFADDR: c_ulong = 0x8915;
+pub const SIOCSIFADDR: c_ulong = 0x8916;
+pub const SIOCGIFDSTADDR: c_ulong = 0x8917;
+pub const SIOCSIFDSTADDR: c_ulong = 0x8918;
+pub const SIOCGIFBRDADDR: c_ulong = 0x8919;
+pub const SIOCSIFBRDADDR: c_ulong = 0x891a;
+pub const SIOCGIFNETMASK: c_ulong = 0x891b;
+pub const SIOCSIFNETMASK: c_ulong = 0x891c;
+pub const SIOCGIFMETRIC: c_ulong = 0x891d;
+pub const SIOCSIFMETRIC: c_ulong = 0x891e;
+pub const SIOCGIFMEM: c_ulong = 0x891f;
+pub const SIOCSIFMEM: c_ulong = 0x8920;
+pub const SIOCGIFMTU: c_ulong = 0x8921;
+pub const SIOCSIFMTU: c_ulong = 0x8922;
+pub const SIOCSIFNAME: c_ulong = 0x8923;
+pub const SIOCSIFHWADDR: c_ulong = 0x8924;
+pub const SIOCGIFENCAP: c_ulong = 0x8925;
+pub const SIOCSIFENCAP: c_ulong = 0x8926;
+pub const SIOCGIFHWADDR: c_ulong = 0x8927;
+pub const SIOCGIFSLAVE: c_ulong = 0x8929;
+pub const SIOCSIFSLAVE: c_ulong = 0x8930;
+pub const SIOCADDMULTI: c_ulong = 0x8931;
+pub const SIOCDELMULTI: c_ulong = 0x8932;
+pub const SIOCGIFINDEX: c_ulong = 0x8933;
+pub const SIOGIFINDEX: c_ulong = SIOCGIFINDEX;
+pub const SIOCSIFPFLAGS: c_ulong = 0x8934;
+pub const SIOCGIFPFLAGS: c_ulong = 0x8935;
+pub const SIOCDIFADDR: c_ulong = 0x8936;
+pub const SIOCSIFHWBROADCAST: c_ulong = 0x8937;
+pub const SIOCGIFCOUNT: c_ulong = 0x8938;
+
+pub const SIOCGIFBR: c_ulong = 0x8940;
+pub const SIOCSIFBR: c_ulong = 0x8941;
+
+pub const SIOCGIFTXQLEN: c_ulong = 0x8942;
+pub const SIOCSIFTXQLEN: c_ulong = 0x8943;
+
+pub const SIOCDARP: c_ulong = 0x8953;
+pub const SIOCGARP: c_ulong = 0x8954;
+pub const SIOCSARP: c_ulong = 0x8955;
+
+pub const SIOCDRARP: c_ulong = 0x8960;
+pub const SIOCGRARP: c_ulong = 0x8961;
+pub const SIOCSRARP: c_ulong = 0x8962;
+
+pub const SIOCGIFMAP: c_ulong = 0x8970;
+pub const SIOCSIFMAP: c_ulong = 0x8971;
+
+pub const SIOCADDDLCI: c_ulong = 0x8980;
+pub const SIOCDELDLCI: c_ulong = 0x8981;
+
+pub const SIOCDEVPRIVATE: c_ulong = 0x89F0;
+pub const SIOCPROTOPRIVATE: c_ulong = 0x89E0;
diff --git a/recipes/core/relibc/src/header/sys_ioctl/mod.rs b/recipes/core/relibc/src/header/sys_ioctl/mod.rs
new file mode 100644
index 0000000000..2b80f7536f
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_ioctl/mod.rs
@@ -0,0 +1,40 @@
+//! ioctl implementation for linux
+
+use crate::platform::types::{c_char, c_ushort};
+
+// This is used from sgtty
+#[repr(C)]
+pub struct sgttyb {
+    sg_ispeed: c_char,
+    sg_ospeed: c_char,
+    sg_erase: c_char,
+    sg_kill: c_char,
+    sg_flags: c_ushort,
+}
+
+#[repr(C)]
+#[derive(Default)]
+pub struct winsize {
+    ws_row: c_ushort,
+    ws_col: c_ushort,
+    ws_xpixel: c_ushort,
+    ws_ypixel: c_ushort,
+}
+
+impl winsize {
+    pub fn get_row_col(&self) -> (c_ushort, c_ushort) {
+        (self.ws_row, self.ws_col)
+    }
+}
+
+#[cfg(target_os = "linux")]
+pub use self::linux::*;
+
+#[cfg(target_os = "linux")]
+pub mod linux;
+
+#[cfg(target_os = "redox")]
+pub use self::redox::*;
+
+#[cfg(target_os = "redox")]
+pub mod redox;
diff --git a/recipes/core/relibc/src/header/sys_ioctl/redox/drm.rs b/recipes/core/relibc/src/header/sys_ioctl/redox/drm.rs
new file mode 100644
index 0000000000..0557178ee8
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_ioctl/redox/drm.rs
@@ -0,0 +1,135 @@
+use core::slice;
+
+use redox_ioctl::{IoctlData, drm::*};
+
+use crate::{
+    error::{Errno, Result},
+    header::errno::EINVAL,
+    platform::types::c_int,
+};
+
+use super::IoctlBuffer;
+
+const DRM_FORMAT_ARGB8888: u32 = 0x34325241; // 'AR24' fourcc code, for ARGB8888
+
+fn id_index(id: u32) -> u32 {
+    id & 0xFF
+}
+
+fn conn_id(i: u32) -> u32 {
+    id_index(i) | (1 << 8)
+}
+
+fn crtc_id(i: u32) -> u32 {
+    id_index(i) | (1 << 9)
+}
+
+fn enc_id(i: u32) -> u32 {
+    id_index(i) | (1 << 10)
+}
+
+fn fb_id(i: u32) -> u32 {
+    id_index(i) | (1 << 11)
+}
+
+fn fb_handle_id(i: u32) -> u32 {
+    id_index(i) | (1 << 12)
+}
+
+fn plane_id(i: u32) -> u32 {
+    id_index(i) | (1 << 13)
+}
+
+unsafe fn copy_array<T: Copy>(src: &[T], dst_ptr: *mut T, dst_len: usize) -> usize {
+    let dst = unsafe { slice::from_raw_parts_mut(dst_ptr, dst_len) };
+    dst.copy_from_slice(&src[..src.len().min(dst_len)]);
+    src.len()
+}
+
+struct Dev {
+    fd: c_int,
+}
+
+impl Dev {
+    fn new(fd: c_int) -> Result<Self> {
+        //TODO: check display scheme using fpath?
+        Ok(Self { fd })
+    }
+
+    unsafe fn read_write_ioctl<T: IoctlData>(
+        &self,
+        mut buf: IoctlBuffer,
+        func: u64,
+    ) -> Result<c_int> {
+        let mut data = unsafe { buf.read::<T>() }?;
+        let mut wire = unsafe { data.write() };
+        let res = redox_rt::sys::sys_call_rw(
+            self.fd as usize,
+            &mut wire,
+            syscall::CallFlags::empty(),
+            &[func],
+        )?;
+        unsafe { data.read_from(&wire) };
+        (unsafe { buf.write(data) })?;
+        Ok(res as c_int)
+    }
+
+    unsafe fn write_ioctl<T: IoctlData>(&self, buf: IoctlBuffer, func: u64) -> Result<c_int> {
+        let data = unsafe { buf.read::<T>() }?;
+        let wire = unsafe { data.write() };
+        let res = redox_rt::sys::sys_call_wo(
+            self.fd as usize,
+            &wire,
+            syscall::CallFlags::empty(),
+            &[func],
+        )?;
+        Ok(res as c_int)
+    }
+}
+
+pub(super) unsafe fn ioctl(fd: c_int, func: u8, buf: IoctlBuffer) -> Result<c_int> {
+    let dev = Dev::new(fd)?;
+    match func {
+        0x00 => unsafe { dev.read_write_ioctl::<drm_version>(buf, VERSION) },
+        0x0C => unsafe { dev.read_write_ioctl::<drm_get_cap>(buf, GET_CAP) },
+        0x0D => unsafe { dev.write_ioctl::<drm_set_client_cap>(buf, SET_CLIENT_CAP) },
+        0xA0 => unsafe { dev.read_write_ioctl::<drm_mode_card_res>(buf, MODE_CARD_RES) },
+        0xA1 => unsafe { dev.read_write_ioctl::<drm_mode_crtc>(buf, MODE_GET_CRTC) },
+        0xA2 => unsafe { dev.read_write_ioctl::<drm_mode_crtc>(buf, MODE_SET_CRTC) },
+        0xA3 => unsafe { dev.write_ioctl::<drm_mode_cursor>(buf, MODE_CURSOR) },
+        0xA6 => unsafe { dev.read_write_ioctl::<drm_mode_get_encoder>(buf, MODE_GET_ENCODER) },
+        0xA7 => unsafe { dev.read_write_ioctl::<drm_mode_get_connector>(buf, MODE_GET_CONNECTOR) },
+        0xAA => unsafe { dev.read_write_ioctl::<drm_mode_get_property>(buf, MODE_GET_PROPERTY) },
+        0xAB => unsafe {
+            dev.read_write_ioctl::<drm_mode_connector_set_property>(buf, MODE_SET_PROPERTY)
+        },
+        0xAC => unsafe { dev.read_write_ioctl::<drm_mode_get_blob>(buf, MODE_GET_PROP_BLOB) },
+        0xAD => unsafe { dev.read_write_ioctl::<drm_mode_fb_cmd>(buf, MODE_GET_FB) },
+        0xAE => unsafe { dev.read_write_ioctl::<drm_mode_fb_cmd>(buf, MODE_ADD_FB) },
+        0xAF => unsafe { dev.read_write_ioctl::<standin_for_uint>(buf, MODE_RM_FB) },
+        0xB0 => unsafe {
+            dev.read_write_ioctl::<drm_mode_crtc_page_flip_target>(buf, MODE_PAGE_FLIP)
+        },
+        0xB1 => unsafe { dev.read_write_ioctl::<drm_mode_fb_dirty_cmd>(buf, MODE_DIRTYFB) },
+        0xB2 => unsafe { dev.read_write_ioctl::<drm_mode_create_dumb>(buf, MODE_CREATE_DUMB) },
+        0xB3 => unsafe { dev.read_write_ioctl::<drm_mode_map_dumb>(buf, MODE_MAP_DUMB) },
+        0xB4 => unsafe { dev.read_write_ioctl::<drm_mode_destroy_dumb>(buf, MODE_DESTROY_DUMB) },
+        0xB5 => unsafe { dev.read_write_ioctl::<drm_mode_get_plane_res>(buf, MODE_GET_PLANE_RES) },
+        0xB6 => unsafe { dev.read_write_ioctl::<drm_mode_get_plane>(buf, MODE_GET_PLANE) },
+        0xB9 => unsafe {
+            dev.read_write_ioctl::<drm_mode_obj_get_properties>(buf, MODE_OBJ_GET_PROPERTIES)
+        },
+        0xBB => unsafe { dev.write_ioctl::<drm_mode_cursor2>(buf, MODE_CURSOR2) },
+        0xCE => unsafe { dev.read_write_ioctl::<drm_mode_fb_cmd2>(buf, MODE_GET_FB2) },
+        _ => {
+            todo_skip!(
+                0,
+                "unimplemented DRM ioctl({}, 0x{:02x}, {:?})",
+                fd,
+                func,
+                buf
+            );
+            Err(Errno(EINVAL))
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/header/sys_ioctl/redox/mod.rs b/recipes/core/relibc/src/header/sys_ioctl/redox/mod.rs
new file mode 100644
index 0000000000..8b3cf8fc23
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_ioctl/redox/mod.rs
@@ -0,0 +1,196 @@
+use core::{mem, ptr, slice};
+use redox_rt::proc::FdGuard;
+use syscall;
+
+use crate::{
+    error::{Errno, Result, ResultExt},
+    header::{errno::EINVAL, fcntl, termios},
+    platform::{
+        Pal, Sys,
+        types::{c_int, c_ulong, c_ulonglong, c_void, pid_t},
+    },
+};
+
+use super::winsize;
+
+mod drm;
+
+pub const TCGETS: c_ulong = 0x5401;
+pub const TCSETS: c_ulong = 0x5402;
+pub const TCSETSW: c_ulong = 0x5403;
+pub const TCSETSF: c_ulong = 0x5404;
+
+pub const TCSBRK: c_ulong = 0x5409;
+pub const TCXONC: c_ulong = 0x540A;
+pub const TCFLSH: c_ulong = 0x540B;
+
+pub const TIOCSCTTY: c_ulong = 0x540E;
+pub const TIOCGPGRP: c_ulong = 0x540F;
+pub const TIOCSPGRP: c_ulong = 0x5410;
+
+pub const TIOCGWINSZ: c_ulong = 0x5413;
+pub const TIOCSWINSZ: c_ulong = 0x5414;
+
+//TODO: used by tcgetsid, not implemented yet on redox
+pub const TIOCGSID: c_ulong = 0x5429;
+
+pub const FIONREAD: c_ulong = 0x541B;
+
+pub const FIONBIO: c_ulong = 0x5421;
+
+pub const TIOCSPTLCK: c_ulong = 0x4004_5431;
+pub const TIOCGPTLCK: c_ulong = 0x8004_5439;
+
+pub const SIOCATMARK: c_ulong = 0x8905;
+
+// TODO: some of the structs passed as T have padding bytes, so casting to a byte slice is UB
+
+fn dup_read<T>(fd: c_int, name: &str, t: &mut T) -> syscall::Result<usize> {
+    let dup = FdGuard::new(syscall::dup(fd as usize, name.as_bytes())?);
+
+    let size = mem::size_of::<T>();
+
+    let bytes = dup.read(unsafe { slice::from_raw_parts_mut(t as *mut T as *mut u8, size) })?;
+
+    Ok(bytes / size)
+}
+
+// FIXME: unsound
+fn dup_write<T>(fd: c_int, name: &str, t: &T) -> Result<usize> {
+    let dup = FdGuard::new(syscall::dup(fd as usize, name.as_bytes())?);
+
+    let size = mem::size_of::<T>();
+
+    let bytes = dup.write(unsafe { slice::from_raw_parts(t as *const T as *const u8, size) })?;
+
+    Ok(bytes / size)
+}
+
+#[derive(Debug)]
+enum IoctlBuffer {
+    None,
+    Read(*mut c_void, usize),    // read (write to userspace)
+    Write(*const c_void, usize), // write (read from userspace)
+    ReadWrite(*mut c_void, usize),
+}
+
+impl IoctlBuffer {
+    unsafe fn read<T>(&self) -> Result<T> {
+        let (ptr, size) = match *self {
+            Self::Write(ptr, size) => (ptr, size),
+            Self::ReadWrite(ptr, size) => (ptr as *const c_void, size),
+            _ => {
+                return Err(Errno(EINVAL));
+            }
+        };
+        if size == mem::size_of::<T>() {
+            let value = unsafe { ptr::read(ptr as *const T) };
+            Ok(value)
+        } else {
+            Err(Errno(EINVAL))
+        }
+    }
+
+    unsafe fn write<T>(&mut self, value: T) -> Result<()> {
+        let (ptr, size) = match *self {
+            Self::Read(ptr, size) | Self::ReadWrite(ptr, size) => (ptr, size),
+            _ => {
+                return Err(Errno(EINVAL));
+            }
+        };
+        if size == mem::size_of::<T>() {
+            unsafe { ptr::write(ptr as *mut T, value) };
+            Ok(())
+        } else {
+            Err(Errno(EINVAL))
+        }
+    }
+}
+
+unsafe fn ioctl_inner(fd: c_int, request: c_ulong, out: *mut c_void) -> Result<c_int> {
+    match request {
+        FIONBIO => {
+            let mut flags = Sys::fcntl(fd, fcntl::F_GETFL, 0)?;
+            flags = if unsafe { *(out as *mut c_int) } == 0 {
+                flags & !fcntl::O_NONBLOCK
+            } else {
+                flags | fcntl::O_NONBLOCK
+            };
+            Sys::fcntl(fd, fcntl::F_SETFL, flags as c_ulonglong)?;
+        }
+        TCGETS => {
+            let termios = unsafe { &mut *(out as *mut termios::termios) };
+            dup_read(fd, "termios", termios)?;
+        }
+        // TODO: give these different behaviors
+        TCSETS | TCSETSW | TCSETSF => {
+            let termios = unsafe { &*(out as *const termios::termios) };
+            dup_write(fd, "termios", termios)?;
+        }
+        TCFLSH => {
+            let queue = out as c_int;
+            dup_write(fd, "flush", &queue)?;
+        }
+        TIOCSCTTY => {
+            todo_skip!(0, "ioctl TIOCSCTTY");
+        }
+        TIOCGPGRP => {
+            let pgrp = unsafe { &mut *(out as *mut pid_t) };
+            dup_read(fd, "pgrp", pgrp)?;
+        }
+        TIOCSPGRP => {
+            let pgrp = unsafe { &*(out as *const pid_t) };
+            dup_write(fd, "pgrp", pgrp)?;
+        }
+        TIOCGWINSZ => {
+            let winsize = unsafe { &mut *(out as *mut winsize) };
+            dup_read(fd, "winsize", winsize)?;
+        }
+        TIOCSWINSZ => {
+            let winsize = unsafe { &*(out as *const winsize) };
+            dup_write(fd, "winsize", winsize)?;
+        }
+        TIOCGPTLCK => {
+            todo_skip!(0, "ioctl TIOCGPTLCK");
+        }
+        TIOCSPTLCK => {
+            todo_skip!(0, "ioctl TIOCSPTLCK");
+        }
+        TCSBRK => {
+            todo_skip!(0, "ioctl TCSBRK");
+        }
+        TCXONC => {
+            todo_skip!(0, "ioctl TCXONC");
+        }
+        SIOCATMARK => {
+            todo_skip!(0, "ioctl SIOCATMARK");
+        }
+        _ => {
+            // See https://docs.kernel.org/userspace-api/ioctl/ioctl-decoding.html for details
+            let dir = (request >> 30) & 0b11;
+            let size = ((request >> 16) & 0x3FFF) as usize;
+            let name = (((request >> 8) & 0xFF) as u8) as char;
+            let func = (request & 0xFF) as u8;
+            match name {
+                'd' => {
+                    let buf = match dir {
+                        0b10 => IoctlBuffer::Read(out, size),
+                        0b01 => IoctlBuffer::Write(out, size),
+                        0b11 => IoctlBuffer::ReadWrite(out, size),
+                        _ => IoctlBuffer::None,
+                    };
+                    return unsafe { drm::ioctl(fd, func, buf) };
+                }
+                _ => {
+                    return Err(Errno(EINVAL));
+                }
+            }
+        }
+    }
+    Ok(0)
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ioctl(fd: c_int, request: c_ulong, out: *mut c_void) -> c_int {
+    unsafe { ioctl_inner(fd, request, out) }.or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/sys_mman/cbindgen.toml b/recipes/core/relibc/src/header/sys_mman/cbindgen.toml
new file mode 100644
index 0000000000..63f6299c7e
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_mman/cbindgen.toml
@@ -0,0 +1,21 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_mman.h.html
+#
+# Spec quotations relating to includes:
+# - "The <sys/mman.h> header shall define the mode_t, off_t, and size_t types as described in <sys/types.h>."
+# - "The <sys/mman.h> header shall define the following symbolic constants as described in <fcntl.h>"
+# - "Inclusion of the <sys/mman.h> header may make visible all symbols from the <fcntl.h> header."
+sys_includes = ["sys/types.h", "fcntl.h"]
+include_guard = "_RELIBC_SYS_MMAN_H"
+after_includes = """
+
+#define MAP_FAILED ((void *) -1)
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+# make size_t actually size_t instead of uintptr_t (which would require stdint.h)
+usize_is_size_t = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_mman/linux.rs b/recipes/core/relibc/src/header/sys_mman/linux.rs
new file mode 100644
index 0000000000..5fc27ce4d7
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_mman/linux.rs
@@ -0,0 +1,17 @@
+use crate::platform::types::c_int;
+
+pub const PROT_READ: c_int = 0x0001;
+pub const PROT_WRITE: c_int = 0x0002;
+pub const PROT_EXEC: c_int = 0x0004;
+pub const PROT_NONE: c_int = 0x0000;
+
+pub const MAP_FIXED: c_int = 0x0010;
+pub const MAP_FIXED_NOREPLACE: c_int = 0x100000;
+pub const MAP_POPULATE: c_int = 0x008000;
+pub const MAP_HUGETLB: c_int = 0x40000;
+pub const MAP_NORESERVE: c_int = 0x4000;
+
+pub const MADV_HUGEPAGE: c_int = 14;
+pub const MADV_NOHUGEPAGE: c_int = 15;
+pub const MADV_DONTDUMP: c_int = 16;
+pub const MADV_DODUMP: c_int = 17;
diff --git a/recipes/core/relibc/src/header/sys_mman/mod.rs b/recipes/core/relibc/src/header/sys_mman/mod.rs
new file mode 100644
index 0000000000..0930c9660c
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_mman/mod.rs
@@ -0,0 +1,195 @@
+//! `sys/mman.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_mman.h.html>.
+
+use crate::{
+    c_str::{CStr, CString},
+    error::{Errno, ResultExt},
+    header::{fcntl, unistd},
+    platform::{
+        ERRNO, Pal, Sys,
+        types::{c_char, c_int, c_void, mode_t, off_t, size_t},
+    },
+};
+
+pub use self::sys::*;
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+pub mod sys;
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+pub mod sys;
+
+pub const MADV_NORMAL: c_int = 0;
+pub const MADV_RANDOM: c_int = 1;
+pub const MADV_SEQUENTIAL: c_int = 2;
+pub const MADV_WILLNEED: c_int = 3;
+pub const MADV_DONTNEED: c_int = 4;
+
+pub const MAP_SHARED: c_int = 0x0001;
+pub const MAP_PRIVATE: c_int = 0x0002;
+pub const MAP_TYPE: c_int = 0x000F;
+pub const MAP_ANON: c_int = 0x0020;
+pub const MAP_ANONYMOUS: c_int = MAP_ANON;
+pub const MAP_STACK: c_int = 0x20000;
+/// cbindgen:ignore
+pub const MAP_FAILED: *mut c_void = usize::wrapping_neg(1) as *mut c_void;
+
+pub const MREMAP_MAYMOVE: c_int = 1;
+
+pub const MS_ASYNC: c_int = 0x0001;
+pub const MS_INVALIDATE: c_int = 0x0002;
+pub const MS_SYNC: c_int = 0x0004;
+
+pub const MCL_CURRENT: c_int = 1;
+pub const MCL_FUTURE: c_int = 2;
+
+pub const POSIX_MADV_NORMAL: c_int = 0;
+pub const POSIX_MADV_RANDOM: c_int = 1;
+pub const POSIX_MADV_SEQUENTIAL: c_int = 2;
+pub const POSIX_MADV_WILLNEED: c_int = 3;
+pub const POSIX_MADV_WONTNEED: c_int = 4;
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man2/madvise.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn madvise(addr: *mut c_void, len: size_t, flags: c_int) -> c_int {
+    unsafe { Sys::madvise(addr, len, flags) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mlock.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mlock(addr: *const c_void, len: size_t) -> c_int {
+    unsafe { Sys::mlock(addr, len) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mlockall.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mlockall(flags: c_int) -> c_int {
+    unsafe { Sys::mlockall(flags) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mmap.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mmap(
+    addr: *mut c_void,
+    len: size_t,
+    prot: c_int,
+    flags: c_int,
+    fildes: c_int,
+    off: off_t,
+) -> *mut c_void {
+    match unsafe { Sys::mmap(addr, len, prot, flags, fildes, off) } {
+        Ok(ptr) => ptr,
+        Err(Errno(errno)) => {
+            ERRNO.set(errno);
+            MAP_FAILED
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mprotect.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mprotect(addr: *mut c_void, len: size_t, prot: c_int) -> c_int {
+    unsafe { Sys::mprotect(addr, len, prot) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man2/mremap.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mremap(
+    old_address: *mut c_void,
+    old_size: size_t,
+    new_size: size_t,
+    flags: c_int,
+    mut __valist: ...
+) -> *mut c_void {
+    let new_address = unsafe { __valist.arg::<*mut c_void>() };
+    match unsafe { Sys::mremap(old_address, old_size, new_size, flags, new_address) } {
+        Ok(ptr) => ptr,
+        Err(Errno(errno)) => {
+            ERRNO.set(errno);
+            MAP_FAILED
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/msync.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn msync(addr: *mut c_void, len: size_t, flags: c_int) -> c_int {
+    unsafe { Sys::msync(addr, len, flags) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mlock.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn munlock(addr: *const c_void, len: size_t) -> c_int {
+    unsafe { Sys::munlock(addr, len) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mlockall.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn munlockall() -> c_int {
+    unsafe { Sys::munlockall() }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/munmap.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn munmap(addr: *mut c_void, len: size_t) -> c_int {
+    unsafe { Sys::munmap(addr, len) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+#[cfg(target_os = "linux")]
+static SHM_PATH: &[u8] = b"/dev/shm/";
+
+#[cfg(target_os = "redox")]
+static SHM_PATH: &[u8] = b"/scheme/shm/";
+
+unsafe fn shm_path(name: *const c_char) -> CString {
+    let name_c = unsafe { CStr::from_ptr(name) };
+
+    let mut path = SHM_PATH.to_vec();
+
+    let mut skip_slash = true;
+    for &b in name_c.to_bytes() {
+        if skip_slash {
+            if b == b'/' {
+                continue;
+            } else {
+                skip_slash = false;
+            }
+        }
+        path.push(b);
+    }
+
+    unsafe { CString::from_vec_unchecked(path) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/shm_open.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn shm_open(name: *const c_char, oflag: c_int, mode: mode_t) -> c_int {
+    let path = unsafe { shm_path(name) };
+    unsafe { fcntl::open(path.as_ptr(), oflag, mode) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/shm_unlink.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn shm_unlink(name: *const c_char) -> c_int {
+    let path = unsafe { shm_path(name) };
+    unsafe { unistd::unlink(path.as_ptr()) }
+}
diff --git a/recipes/core/relibc/src/header/sys_mman/redox.rs b/recipes/core/relibc/src/header/sys_mman/redox.rs
new file mode 100644
index 0000000000..ea0ee2215d
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_mman/redox.rs
@@ -0,0 +1,14 @@
+use crate::platform::types::c_int;
+
+pub const PROT_NONE: c_int = 0x0000;
+pub const PROT_EXEC: c_int = 0x0001;
+pub const PROT_WRITE: c_int = 0x0002;
+pub const PROT_READ: c_int = 0x0004;
+
+pub const MAP_FIXED: c_int = 0x0004;
+pub const MAP_FIXED_NOREPLACE: c_int = 0x000C;
+pub const MAP_POPULATE: c_int = 0x0001F;
+pub const MAP_HUGETLB: c_int = 0x2E;
+
+pub const MADV_DONTDUMP: c_int = 5;
+pub const MADV_DODUMP: c_int = 6;
diff --git a/recipes/core/relibc/src/header/sys_procfs/cbindgen.toml b/recipes/core/relibc/src/header/sys_procfs/cbindgen.toml
new file mode 100644
index 0000000000..9328ff99d3
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_procfs/cbindgen.toml
@@ -0,0 +1,7 @@
+sys_includes = ["sys/user.h"]
+include_guard = "_SYS_PROCFS_H"
+language = "C"
+style = "Tag"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_procfs/mod.rs b/recipes/core/relibc/src/header/sys_procfs/mod.rs
new file mode 100644
index 0000000000..b1534b33f2
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_procfs/mod.rs
@@ -0,0 +1,77 @@
+#[cfg(target_arch = "aarch64")]
+use crate::header::arch_aarch64_user::{elf_fpregset_t, elf_gregset_t};
+#[cfg(target_arch = "riscv64")]
+use crate::header::arch_riscv64_user::{elf_fpregset_t, elf_gregset_t};
+#[cfg(target_arch = "x86_64")]
+use crate::header::arch_x64_user::{elf_fpregset_t, elf_gregset_t};
+use crate::platform::types::{
+    c_char, c_int, c_long, c_short, c_uint, c_ulong, c_void, pid_t, size_t,
+};
+
+pub const ELF_PRARGSZ: size_t = 80;
+
+#[repr(C)]
+pub struct elf_siginfo {
+    pub si_signo: c_int,
+    pub si_code: c_int,
+    pub si_errno: c_int,
+}
+
+#[repr(C)]
+pub struct time {
+    pub tv_sec: c_long,
+    pub tv_usec: c_long,
+}
+
+#[repr(C)]
+pub struct elf_prstatus {
+    pub pr_info: elf_siginfo,
+    pub pr_cursig: c_short,
+    pub pr_sigpend: c_ulong,
+    pub pr_sighold: c_ulong,
+    pub pr_pid: pid_t,
+    pub pr_ppid: pid_t,
+    pub pr_pgrp: pid_t,
+    pub pr_sid: pid_t,
+    pub pr_utime: time,
+    pub pr_stime: time,
+    pub pr_cutime: time,
+    pub pr_cstime: time,
+    pub pr_reg: elf_gregset_t,
+    pub pr_fpvalid: c_int,
+}
+
+#[repr(C)]
+pub struct elf_prpsinfo {
+    pub pr_state: c_char,
+    pub pr_sname: c_char,
+    pub pr_zomb: c_char,
+    pub pr_nice: c_char,
+    pub pr_flag: c_uint,
+    pub pr_uid: c_uint,
+    pub pr_gid: c_uint,
+    pub pr_pid: c_int,
+    pub pr_ppid: c_int,
+    pub pr_pgrp: c_int,
+    pub pr_sid: c_int,
+    pub pr_fname: [c_char; 16],
+    pub pr_psargs: [c_char; ELF_PRARGSZ],
+}
+
+pub type psaddr_t = *mut c_void;
+pub type prgregset_t = *mut elf_gregset_t;
+pub type prfpregset_t = elf_fpregset_t;
+pub type lwpid_t = pid_t;
+pub type prstatus_t = elf_prstatus;
+pub type prpsinfo_t = elf_prpsinfo;
+
+#[unsafe(no_mangle)]
+pub extern "C" fn _cbindgen_export_procfs(
+    a: psaddr_t,
+    b: prgregset_t,
+    c: prfpregset_t,
+    d: lwpid_t,
+    e: prstatus_t,
+    f: prpsinfo_t,
+) {
+}
diff --git a/recipes/core/relibc/src/header/sys_ptrace/cbindgen.toml b/recipes/core/relibc/src/header/sys_ptrace/cbindgen.toml
new file mode 100644
index 0000000000..3ecacd0534
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_ptrace/cbindgen.toml
@@ -0,0 +1,7 @@
+sys_includes = []
+include_guard = "_SYS_PTRACE_H"
+language = "C"
+style = "Tag"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_ptrace/mod.rs b/recipes/core/relibc/src/header/sys_ptrace/mod.rs
new file mode 100644
index 0000000000..772182d9cc
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_ptrace/mod.rs
@@ -0,0 +1,35 @@
+//! `sys/ptrace.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man2/ptrace.2.html>.
+
+use crate::{
+    error::ResultExt,
+    platform::{PalPtrace, Sys, types::c_int},
+};
+
+pub const PTRACE_TRACEME: c_int = 0;
+pub const PTRACE_PEEKTEXT: c_int = 1;
+pub const PTRACE_PEEKDATA: c_int = 2;
+pub const PTRACE_POKETEXT: c_int = 4;
+pub const PTRACE_POKEDATA: c_int = 5;
+pub const PTRACE_CONT: c_int = 7;
+pub const PTRACE_KILL: c_int = 8;
+pub const PTRACE_SINGLESTEP: c_int = 9;
+pub const PTRACE_GETREGS: c_int = 12;
+pub const PTRACE_SETREGS: c_int = 13;
+pub const PTRACE_GETFPREGS: c_int = 14;
+pub const PTRACE_SETFPREGS: c_int = 15;
+pub const PTRACE_ATTACH: c_int = 16;
+pub const PTRACE_DETACH: c_int = 17;
+pub const PTRACE_SYSCALL: c_int = 24;
+pub const PTRACE_SYSEMU: c_int = 31;
+pub const PTRACE_SYSEMU_SINGLESTEP: c_int = 32;
+
+// Can't use "params: ..." syntax, because... guess what? Cbingen again :(
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man2/ptrace.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ptrace(request: c_int, mut __valist: ...) -> c_int {
+    // Musl also just grabs the arguments from the varargs...
+    unsafe { Sys::ptrace(request, __valist.arg(), __valist.arg(), __valist.arg()) }
+        .or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/sys_random/cbindgen.toml b/recipes/core/relibc/src/header/sys_random/cbindgen.toml
new file mode 100644
index 0000000000..d83dd8b5eb
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_random/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = ["sys/types.h"]
+include_guard = "_SYS_RANDOM_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_random/mod.rs b/recipes/core/relibc/src/header/sys_random/mod.rs
new file mode 100644
index 0000000000..57040d469a
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_random/mod.rs
@@ -0,0 +1,29 @@
+//! `sys/random.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man2/getrandom.2.html>.
+
+use core::slice;
+
+use crate::{
+    error::ResultExt,
+    platform::{
+        Pal, Sys,
+        types::{c_uint, c_void, size_t, ssize_t},
+    },
+};
+
+/// See <https://www.man7.org/linux/man-pages/man2/getrandom.2.html>.
+pub const GRND_NONBLOCK: c_uint = 1;
+/// See <https://www.man7.org/linux/man-pages/man2/getrandom.2.html>.
+pub const GRND_RANDOM: c_uint = 2;
+
+/// See <https://www.man7.org/linux/man-pages/man2/getrandom.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t {
+    Sys::getrandom(
+        unsafe { slice::from_raw_parts_mut(buf.cast::<u8>(), buflen) },
+        flags,
+    )
+    .map(|read| read as ssize_t)
+    .or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/sys_resource/cbindgen.toml b/recipes/core/relibc/src/header/sys_resource/cbindgen.toml
new file mode 100644
index 0000000000..42e748a803
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_resource/cbindgen.toml
@@ -0,0 +1,19 @@
+sys_includes = ["sys/types.h", "stdint.h", "sys/time.h"]
+include_guard = "_RELIBC_SYS_RESOURCE_H"
+after_includes = """
+
+#define RUSAGE_SELF 0
+#define RUSAGE_CHILDREN (-1)
+#define RUSAGE_BOTH (-2)
+#define RUSAGE_THREAD 1
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"timeval" = "struct timeval"
diff --git a/recipes/core/relibc/src/header/sys_resource/mod.rs b/recipes/core/relibc/src/header/sys_resource/mod.rs
new file mode 100644
index 0000000000..9166007a50
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_resource/mod.rs
@@ -0,0 +1,116 @@
+//! `sys/resource.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_resource.h.html>.
+
+use crate::{
+    error::ResultExt,
+    header::sys_select::timeval,
+    out::Out,
+    platform::{
+        Pal, Sys,
+        types::{c_int, c_long, id_t},
+    },
+};
+
+// Exported from cbindgen
+// const RUSAGE_SELF: c_int = 0;
+// const RUSAGE_CHILDREN: c_int = -1;
+// const RUSAGE_BOTH: c_int = -2;
+// const RUSAGE_THREAD: c_int = 1;
+
+pub const RLIM_INFINITY: u64 = 0xFFFF_FFFF_FFFF_FFFF;
+pub const RLIM_SAVED_CUR: u64 = RLIM_INFINITY;
+pub const RLIM_SAVED_MAX: u64 = RLIM_INFINITY;
+
+pub const RLIMIT_CPU: c_int = 0;
+pub const RLIMIT_FSIZE: c_int = 1;
+pub const RLIMIT_DATA: c_int = 2;
+pub const RLIMIT_STACK: c_int = 3;
+pub const RLIMIT_CORE: c_int = 4;
+pub const RLIMIT_RSS: c_int = 5;
+pub const RLIMIT_NPROC: c_int = 6;
+pub const RLIMIT_NOFILE: c_int = 7;
+pub const RLIMIT_MEMLOCK: c_int = 8;
+pub const RLIMIT_AS: c_int = 9;
+pub const RLIMIT_LOCKS: c_int = 10;
+pub const RLIMIT_SIGPENDING: c_int = 11;
+pub const RLIMIT_MSGQUEUE: c_int = 12;
+pub const RLIMIT_NICE: c_int = 13;
+pub const RLIMIT_RTPRIO: c_int = 14;
+pub const RLIMIT_NLIMITS: c_int = 15;
+
+pub type rlim_t = u64;
+
+#[repr(C)]
+pub struct rlimit {
+    pub rlim_cur: rlim_t,
+    pub rlim_max: rlim_t,
+}
+
+#[repr(C)]
+pub struct rusage {
+    pub ru_utime: timeval,
+    pub ru_stime: timeval,
+    pub ru_maxrss: c_long,
+    pub ru_ixrss: c_long,
+    pub ru_idrss: c_long,
+    pub ru_isrss: c_long,
+    pub ru_minflt: c_long,
+    pub ru_majflt: c_long,
+    pub ru_nswap: c_long,
+    pub ru_inblock: c_long,
+    pub ru_oublock: c_long,
+    pub ru_msgsnd: c_long,
+    pub ru_msgrcv: c_long,
+    pub ru_nsignals: c_long,
+    pub ru_nvcsw: c_long,
+    pub ru_nivcsw: c_long,
+}
+
+pub const PRIO_PROCESS: c_int = 0;
+pub const PRIO_PGRP: c_int = 1;
+pub const PRIO_USER: c_int = 2;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getpriority.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getpriority(which: c_int, who: id_t) -> c_int {
+    let r = Sys::getpriority(which, who).or_minus_one_errno();
+    if r < 0 {
+        return r;
+    }
+    20 - r
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setpriority.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setpriority(which: c_int, who: id_t, nice: c_int) -> c_int {
+    Sys::setpriority(which, who, nice)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getrlimit.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getrlimit(resource: c_int, rlp: *mut rlimit) -> c_int {
+    let rlp = unsafe { Out::nonnull(rlp) };
+
+    Sys::getrlimit(resource, rlp)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setrlimit.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setrlimit(resource: c_int, rlp: *const rlimit) -> c_int {
+    unsafe { Sys::setrlimit(resource, rlp) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getrusage.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getrusage(who: c_int, r_usage: *mut rusage) -> c_int {
+    Sys::getrusage(who, unsafe { Out::nonnull(r_usage) })
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/sys_select/cbindgen.toml b/recipes/core/relibc/src/header/sys_select/cbindgen.toml
new file mode 100644
index 0000000000..36bfa1fcab
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_select/cbindgen.toml
@@ -0,0 +1,33 @@
+sys_includes = ["time.h", "signal.h"]
+after_includes = """
+// from musl license MIT {
+#define FD_SETSIZE 1024
+
+typedef unsigned long fd_mask;
+
+typedef struct {
+    unsigned long fds_bits[FD_SETSIZE / 8 / sizeof(long)];
+} fd_set;
+
+#define FD_ZERO(s) do { int __i; unsigned long *__b=(s)->fds_bits; for(__i=sizeof (fd_set)/sizeof (long); __i; __i--) *__b++=0; } while(0)
+#define FD_SET(d, s)   ((s)->fds_bits[(d)/(8*sizeof(long))] |= (1UL<<((d)%(8*sizeof(long)))))
+#define FD_CLR(d, s)   ((s)->fds_bits[(d)/(8*sizeof(long))] &= ~(1UL<<((d)%(8*sizeof(long)))))
+#define FD_ISSET(d, s) !!((s)->fds_bits[(d)/(8*sizeof(long))] & (1UL<<((d)%(8*sizeof(long)))))
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define NFDBITS (8*(int)sizeof(long))
+#endif
+// } from musl license MIT
+"""
+include_guard = "_SYS_SELECT_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export]
+# fd_set is also defined in C (above) because cbindgen is incompatible with mem::size_of
+exclude = ["FD_SETSIZE", "fd_set"]
diff --git a/recipes/core/relibc/src/header/sys_select/mod.rs b/recipes/core/relibc/src/header/sys_select/mod.rs
new file mode 100644
index 0000000000..45e7a2381b
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_select/mod.rs
@@ -0,0 +1,228 @@
+//! `sys/select.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_select.h.html>.
+
+use core::mem;
+
+use cbitset::BitSet;
+
+use crate::{
+    fs::File,
+    header::{
+        errno,
+        sys_epoll::{
+            EPOLL_CLOEXEC, EPOLL_CTL_ADD, EPOLLERR, EPOLLIN, EPOLLOUT, epoll_create1, epoll_ctl,
+            epoll_data, epoll_event, epoll_wait,
+        },
+    },
+    platform::{
+        self,
+        types::{c_int, suseconds_t, time_t},
+    },
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_select.h.html>.
+///
+/// Note that the `timeval` struct was specified for
+/// [`sys/time.h`](crate::header::sys_time) in the Open Group Base
+/// Specifications Issue 7 and prior, see
+/// <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_time.h.html>.
+#[repr(C)]
+#[derive(Default)]
+pub struct timeval {
+    pub tv_sec: time_t,
+    pub tv_usec: suseconds_t,
+}
+
+// fd_set is also defined in C because cbindgen is incompatible with mem::size_of booo
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_select.h.html>.
+pub const FD_SETSIZE: usize = 1024;
+type FdBitSet = BitSet<[u64; FD_SETSIZE / (8 * mem::size_of::<u64>())]>;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_select.h.html>.
+#[repr(C)]
+pub struct fd_set {
+    pub fds_bits: FdBitSet,
+}
+
+#[allow(clippy::needless_update)]
+pub fn select_epoll(
+    nfds: c_int,
+    readfds: Option<&mut fd_set>,
+    writefds: Option<&mut fd_set>,
+    exceptfds: Option<&mut fd_set>,
+    timeout: Option<&mut timeval>,
+) -> c_int {
+    if nfds < 0 || nfds > FD_SETSIZE as i32 {
+        platform::ERRNO.set(errno::EINVAL);
+        return -1;
+    };
+
+    let ep = {
+        let epfd = epoll_create1(EPOLL_CLOEXEC);
+        if epfd < 0 {
+            return -1;
+        }
+        File::new(epfd)
+    };
+
+    let mut read_bitset: Option<&mut FdBitSet> = readfds.map(|fd_set| &mut fd_set.fds_bits);
+    let mut write_bitset: Option<&mut FdBitSet> = writefds.map(|fd_set| &mut fd_set.fds_bits);
+    let mut except_bitset: Option<&mut FdBitSet> = exceptfds.map(|fd_set| &mut fd_set.fds_bits);
+
+    // Keep track of the number of file descriptors that do not support epoll
+    let mut not_epoll = 0;
+    for fd in 0..nfds {
+        let mut events = 0;
+
+        if let Some(ref fd_set) = read_bitset
+            && fd_set.contains(fd as usize)
+        {
+            events |= EPOLLIN;
+        }
+
+        if let Some(ref fd_set) = write_bitset
+            && fd_set.contains(fd as usize)
+        {
+            events |= EPOLLOUT;
+        }
+
+        if let Some(ref fd_set) = except_bitset
+            && fd_set.contains(fd as usize)
+        {
+            events |= EPOLLERR;
+        }
+
+        if events > 0 {
+            let mut event = epoll_event {
+                events,
+                data: epoll_data { fd },
+                ..Default::default() // clippy lint, _pad field on redox but not linux
+            };
+            if unsafe { epoll_ctl(*ep, EPOLL_CTL_ADD, fd, &raw mut event) } < 0 {
+                if platform::ERRNO.get() == errno::EPERM {
+                    not_epoll += 1;
+                } else {
+                    return -1;
+                }
+            } else {
+                if let Some(ref mut fd_set) = read_bitset
+                    && fd_set.contains(fd as usize)
+                {
+                    fd_set.remove(fd as usize);
+                }
+
+                if let Some(ref mut fd_set) = write_bitset
+                    && fd_set.contains(fd as usize)
+                {
+                    fd_set.remove(fd as usize);
+                }
+
+                if let Some(ref mut fd_set) = except_bitset
+                    && fd_set.contains(fd as usize)
+                {
+                    fd_set.remove(fd as usize);
+                }
+            }
+        }
+    }
+
+    let mut events: [epoll_event; 32] = unsafe { mem::zeroed() };
+    let epoll_timeout = if not_epoll > 0 {
+        // Do not wait if any non-epoll file descriptors were found
+        0
+    } else {
+        match timeout {
+            Some(timeout) => {
+                let sec_ms = (timeout.tv_sec as c_int).checked_mul(1000);
+                let usec_ms = (timeout.tv_usec as c_int) / 1000;
+                match sec_ms.and_then(|s| s.checked_add(usec_ms)) {
+                    Some(s) => s as c_int,
+                    None => c_int::MAX,
+                }
+            }
+            None => -1,
+        }
+    };
+    let res = unsafe {
+        epoll_wait(
+            *ep,
+            events.as_mut_ptr(),
+            events.len() as c_int,
+            epoll_timeout,
+        )
+    };
+    if res < 0 {
+        return -1;
+    }
+
+    let mut count = not_epoll;
+    for event in events.iter().take(res as usize) {
+        let fd = unsafe { event.data.fd };
+        // TODO: Error status when fd does not match?
+        if fd >= 0 && fd < FD_SETSIZE as c_int {
+            if event.events & EPOLLIN > 0
+                && let Some(ref mut fd_set) = read_bitset
+            {
+                fd_set.insert(fd as usize);
+                count += 1;
+            }
+            if event.events & EPOLLOUT > 0
+                && let Some(ref mut fd_set) = write_bitset
+            {
+                fd_set.insert(fd as usize);
+                count += 1;
+            }
+            if event.events & EPOLLERR > 0
+                && let Some(ref mut fd_set) = except_bitset
+            {
+                fd_set.insert(fd as usize);
+                count += 1;
+            }
+        }
+    }
+    count
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pselect.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn select(
+    nfds: c_int,
+    readfds: *mut fd_set,
+    writefds: *mut fd_set,
+    exceptfds: *mut fd_set,
+    timeout: *mut timeval,
+) -> c_int {
+    trace_expr!(
+        select_epoll(
+            nfds,
+            if readfds.is_null() {
+                None
+            } else {
+                Some(unsafe { &mut *readfds })
+            },
+            if writefds.is_null() {
+                None
+            } else {
+                Some(unsafe { &mut *writefds })
+            },
+            if exceptfds.is_null() {
+                None
+            } else {
+                Some(unsafe { &mut *exceptfds })
+            },
+            if timeout.is_null() {
+                None
+            } else {
+                Some(unsafe { &mut *timeout })
+            }
+        ),
+        "select({}, {:p}, {:p}, {:p}, {:p})",
+        nfds,
+        readfds,
+        writefds,
+        exceptfds,
+        timeout
+    )
+}
diff --git a/recipes/core/relibc/src/header/sys_socket/cbindgen.toml b/recipes/core/relibc/src/header/sys_socket/cbindgen.toml
new file mode 100644
index 0000000000..6372c60a0f
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_socket/cbindgen.toml
@@ -0,0 +1,45 @@
+sys_includes = ["stddef.h", "stdint.h", "sys/types.h"]
+include_guard = "_RELIBC_SYS_SOCKET_H"
+after_includes = """
+#include <bits/iovec.h> // for iovec from sys/uio.h
+#include <bits/safamily-t.h> // for sa_family_t
+#include <bits/socklen-t.h> // for socklen_t
+"""
+trailer = """
+#ifndef _RELIBC_BITS_SYS_SOCKET_H
+#define _RELIBC_BITS_SYS_SOCKET_H
+
+struct sockaddr_storage {
+    sa_family_t ss_family;
+    char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
+    unsigned long __ss_align;
+};
+
+// These definitions were taken from musl, license MIT {
+#define __CMSG_LEN(cmsg) (((cmsg)->cmsg_len + sizeof(long) - 1) & ~(long)(sizeof(long) - 1))
+#define __CMSG_NEXT(cmsg) ((unsigned char *)(cmsg) + __CMSG_LEN(cmsg))
+#define __MHDR_END(mhdr) ((unsigned char *)(mhdr)->msg_control + (mhdr)->msg_controllen)
+
+#define CMSG_DATA(cmsg) ((unsigned char *) (((struct cmsghdr *)(cmsg)) + 1))
+#define CMSG_NXTHDR(mhdr, cmsg) ((cmsg)->cmsg_len < sizeof (struct cmsghdr) || \
+    __CMSG_LEN(cmsg) + sizeof(struct cmsghdr) >= __MHDR_END(mhdr) - (unsigned char *)(cmsg) \
+    ? 0 : (struct cmsghdr *)__CMSG_NEXT(cmsg))
+#define CMSG_FIRSTHDR(mhdr) ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0)
+
+#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) & (size_t) ~(sizeof (size_t) - 1))
+#define CMSG_SPACE(len) (CMSG_ALIGN (len) + CMSG_ALIGN (sizeof (struct cmsghdr)))
+#define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
+// } from musl, license MIT
+
+#endif // _RELIBC_BITS_SYS_SOCKET_H
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"iovec" = "struct iovec"
diff --git a/recipes/core/relibc/src/header/sys_socket/constants.rs b/recipes/core/relibc/src/header/sys_socket/constants.rs
new file mode 100644
index 0000000000..ec42889bf5
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_socket/constants.rs
@@ -0,0 +1,77 @@
+use crate::platform::types::c_int;
+
+pub const SOCK_STREAM: c_int = 1;
+pub const SOCK_DGRAM: c_int = 2;
+pub const SOCK_RAW: c_int = 3;
+pub const SOCK_NONBLOCK: c_int = 0o4_000;
+pub const SOCK_CLOEXEC: c_int = 0o2_000_000;
+
+// Other constants
+pub const SOCK_RDM: c_int = 4;
+pub const SOCK_SEQPACKET: c_int = 5;
+
+pub const SOL_SOCKET: c_int = 1;
+
+pub const SO_DEBUG: c_int = 1;
+pub const SO_REUSEADDR: c_int = 2;
+pub const SO_TYPE: c_int = 3;
+pub const SO_ERROR: c_int = 4;
+pub const SO_DONTROUTE: c_int = 5;
+pub const SO_BROADCAST: c_int = 6;
+pub const SO_SNDBUF: c_int = 7;
+pub const SO_RCVBUF: c_int = 8;
+pub const SO_KEEPALIVE: c_int = 9;
+pub const SO_OOBINLINE: c_int = 10;
+pub const SO_NO_CHECK: c_int = 11;
+pub const SO_PRIORITY: c_int = 12;
+pub const SO_LINGER: c_int = 13;
+pub const SO_BSDCOMPAT: c_int = 14;
+pub const SO_REUSEPORT: c_int = 15;
+pub const SO_PASSCRED: c_int = 16;
+pub const SO_PEERCRED: c_int = 17;
+pub const SO_RCVLOWAT: c_int = 18;
+pub const SO_SNDLOWAT: c_int = 19;
+pub const SO_RCVTIMEO: c_int = 20;
+pub const SO_SNDTIMEO: c_int = 21;
+pub const SO_ACCEPTCONN: c_int = 30;
+pub const SO_PEERSEC: c_int = 31;
+pub const SO_SNDBUFFORCE: c_int = 32;
+pub const SO_RCVBUFFORCE: c_int = 33;
+pub const SO_PROTOCOL: c_int = 38;
+pub const SO_DOMAIN: c_int = 39;
+
+pub const SOMAXCONN: c_int = 128;
+
+pub const MSG_CTRUNC: c_int = 8;
+pub const MSG_DONTROUTE: c_int = 4;
+pub const MSG_EOR: c_int = 128;
+pub const MSG_OOB: c_int = 1;
+pub const MSG_PEEK: c_int = 2;
+pub const MSG_TRUNC: c_int = 32;
+pub const MSG_DONTWAIT: c_int = 64;
+pub const MSG_WAITALL: c_int = 256;
+pub const MSG_CMSG_CLOEXEC: c_int = 0x40000000;
+
+pub const IP_ADD_SOURCE_MEMBERSHIP: c_int = 70;
+pub const IP_DROP_SOURCE_MEMBERSHIP: c_int = 71;
+pub const MCAST_JOIN_SOURCE_GROUP: c_int = 46;
+pub const MCAST_LEAVE_SOURCE_GROUP: c_int = 47;
+
+pub const AF_INET: c_int = 2;
+pub const AF_INET6: c_int = 10;
+pub const AF_LOCAL: c_int = AF_UNIX;
+pub const AF_UNIX: c_int = 1;
+pub const AF_UNSPEC: c_int = 0;
+
+pub const PF_INET: c_int = 2;
+pub const PF_INET6: c_int = 10;
+pub const PF_LOCAL: c_int = PF_UNIX;
+pub const PF_UNIX: c_int = 1;
+pub const PF_UNSPEC: c_int = 0;
+
+pub const SHUT_RD: c_int = 0;
+pub const SHUT_RDWR: c_int = 2;
+pub const SHUT_WR: c_int = 1;
+
+pub const SCM_RIGHTS: c_int = 1;
+pub const SCM_CREDENTIALS: c_int = 2;
diff --git a/recipes/core/relibc/src/header/sys_socket/mod.rs b/recipes/core/relibc/src/header/sys_socket/mod.rs
new file mode 100644
index 0000000000..1c0c6d7493
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_socket/mod.rs
@@ -0,0 +1,445 @@
+//! `sys/socket.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+
+use core::{mem, ptr};
+
+use crate::{
+    error::ResultExt,
+    header::{bits_iovec::iovec, bits_safamily_t::sa_family_t, bits_socklen_t::socklen_t},
+    platform::{
+        PalSocket, Sys,
+        types::{
+            c_char, c_int, c_long, c_uchar, c_uint, c_void, gid_t, pid_t, size_t, ssize_t, uid_t,
+        },
+    },
+};
+
+pub mod constants;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+#[repr(C)]
+#[derive(Default, CheckVsLibcCrate)]
+pub struct linger {
+    pub l_onoff: c_int,
+    pub l_linger: c_int,
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn _cbindgen_export_linger(linger: linger) {}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+#[repr(C)]
+#[derive(Debug, CheckVsLibcCrate)]
+pub struct msghdr {
+    pub msg_name: *mut c_void,
+    pub msg_namelen: socklen_t,
+    pub msg_iov: *mut iovec,
+    pub msg_iovlen: size_t,
+    pub msg_control: *mut c_void,
+    pub msg_controllen: size_t,
+    pub msg_flags: c_int,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+#[repr(C)]
+#[derive(Debug, CheckVsLibcCrate)]
+pub struct cmsghdr {
+    pub cmsg_len: size_t,
+    pub cmsg_level: c_int,
+    pub cmsg_type: c_int,
+}
+
+#[repr(C)]
+#[derive(Clone, Debug)]
+// FIXME: CheckVsLibcCrate
+pub struct ucred {
+    pub pid: pid_t,
+    pub uid: uid_t,
+    pub gid: gid_t,
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn _cbindgen_export_cmsghdr(cmsghdr: cmsghdr) {}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn _cbindgen_export_ucred(ucred: ucred) {}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+#[repr(C)]
+#[derive(Default, CheckVsLibcCrate)]
+pub struct sockaddr {
+    pub sa_family: sa_family_t,
+    pub sa_data: [c_char; 14],
+}
+
+// Max size of [`sockaddr_storage`]
+/// cbindgen:ignore
+const _SS_MAXSIZE: usize = 128;
+// Align to pointer width
+/// cbindgen:ignore
+const _SS_PADDING: usize = _SS_MAXSIZE - mem::size_of::<sa_family_t>() - mem::size_of::<usize>();
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+/// Opaque storage large enough to hold any protocol specific address structure.
+///
+/// ## Implementation notes
+/// * The total size of this struct is 128 bytes which is based off of `musl` and `glibc`
+/// * The underscore fields are implementation specific details for padding that may change
+/// * [`usize`] is used because it's the width of a pointer for a given platform
+/// * The order of the fields is important because the bytes in the padding will be cast to and
+///   from protocol structs in C
+#[repr(C)]
+//#[derive(CheckVsLibcCrate)] FIXME: can't ignore private fields yet
+/// cbindgen:ignore
+pub struct sockaddr_storage {
+    pub ss_family: sa_family_t,
+    __ss_pad2: [u8; _SS_PADDING],
+    __ss_align: usize,
+}
+
+// These must match C macros in sys_socket/cbindgen.toml {
+/// cbindgen:ignore
+pub unsafe extern "C" fn __CMSG_LEN(cmsg: *const cmsghdr) -> ssize_t {
+    ((unsafe { (*cmsg).cmsg_len as size_t } + mem::size_of::<c_long>() - 1)
+        & !(mem::size_of::<c_long>() - 1)) as ssize_t
+}
+
+/// cbindgen:ignore
+pub unsafe extern "C" fn __CMSG_NEXT(cmsg: *const cmsghdr) -> *mut c_uchar {
+    unsafe { (cmsg as *mut c_uchar).offset(__CMSG_LEN(cmsg)) }
+}
+
+/// cbindgen:ignore
+pub unsafe extern "C" fn __MHDR_END(mhdr: *const msghdr) -> *mut c_uchar {
+    unsafe { ((*mhdr).msg_control.cast::<c_uchar>()).add((*mhdr).msg_controllen) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn CMSG_DATA(cmsg: *const cmsghdr) -> *mut c_uchar {
+    unsafe { (cmsg as *mut c_uchar).add(CMSG_ALIGN(mem::size_of::<cmsghdr>())) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn CMSG_NXTHDR(mhdr: *const msghdr, cmsg: *const cmsghdr) -> *mut cmsghdr {
+    if cmsg.is_null() {
+        return unsafe { CMSG_FIRSTHDR(mhdr) };
+    };
+
+    unsafe {
+        let next =
+            cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len) + CMSG_ALIGN(mem::size_of::<cmsghdr>());
+        let max = (*mhdr).msg_control as usize + (*mhdr).msg_controllen;
+        if next > max {
+            ptr::null_mut::<cmsghdr>()
+        } else {
+            (cmsg as usize + CMSG_ALIGN((*cmsg).cmsg_len)) as *mut cmsghdr
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn CMSG_FIRSTHDR(mhdr: *const msghdr) -> *mut cmsghdr {
+    unsafe {
+        if (*mhdr).msg_controllen >= mem::size_of::<cmsghdr>() {
+            (*mhdr).msg_control.cast::<cmsghdr>()
+        } else {
+            ptr::null_mut::<cmsghdr>()
+        }
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn CMSG_ALIGN(len: size_t) -> size_t {
+    (len + mem::size_of::<size_t>() - 1) & !(mem::size_of::<size_t>() - 1)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn CMSG_SPACE(len: c_uint) -> c_uint {
+    (unsafe { CMSG_ALIGN(len as size_t) } + unsafe { CMSG_ALIGN(mem::size_of::<cmsghdr>()) })
+        as c_uint
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_socket.h.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn CMSG_LEN(length: c_uint) -> c_uint {
+    (unsafe { CMSG_ALIGN(mem::size_of::<cmsghdr>()) } + length as usize) as c_uint
+}
+// } These must match C macros in sys_socket/cbindgen.toml
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/accept.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn accept(
+    socket: c_int,
+    address: *mut sockaddr,
+    address_len: *mut socklen_t,
+) -> c_int {
+    trace_expr!(
+        unsafe { Sys::accept(socket, address, address_len) }.or_minus_one_errno(),
+        "accept({}, {:p}, {:p})",
+        socket,
+        address,
+        address_len
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/bind.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn bind(
+    socket: c_int,
+    address: *const sockaddr,
+    address_len: socklen_t,
+) -> c_int {
+    trace_expr!(
+        unsafe { Sys::bind(socket, address, address_len) }
+            .map(|()| 0)
+            .or_minus_one_errno(),
+        "bind({}, {:p}, {})",
+        socket,
+        address,
+        address_len
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/connect.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn connect(
+    socket: c_int,
+    address: *const sockaddr,
+    address_len: socklen_t,
+) -> c_int {
+    trace_expr!(
+        unsafe { Sys::connect(socket, address, address_len) }.or_minus_one_errno(),
+        "connect({}, {:p}, {})",
+        socket,
+        address,
+        address_len
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getpeername.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getpeername(
+    socket: c_int,
+    address: *mut sockaddr,
+    address_len: *mut socklen_t,
+) -> c_int {
+    trace_expr!(
+        unsafe { Sys::getpeername(socket, address, address_len) }
+            .map(|()| 0)
+            .or_minus_one_errno(),
+        "getpeername({}, {:p}, {:p})",
+        socket,
+        address,
+        address_len
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getsockname.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getsockname(
+    socket: c_int,
+    address: *mut sockaddr,
+    address_len: *mut socklen_t,
+) -> c_int {
+    trace_expr!(
+        unsafe { Sys::getsockname(socket, address, address_len) }
+            .map(|()| 0)
+            .or_minus_one_errno(),
+        "getsockname({}, {:p}, {:p})",
+        socket,
+        address,
+        address_len
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getsockopt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getsockopt(
+    socket: c_int,
+    level: c_int,
+    option_name: c_int,
+    option_value: *mut c_void,
+    option_len: *mut socklen_t,
+) -> c_int {
+    trace_expr!(
+        unsafe { Sys::getsockopt(socket, level, option_name, option_value, option_len) }
+            .map(|()| 0)
+            .or_minus_one_errno(),
+        "getsockopt({}, {}, {}, {:p}, {:p})",
+        socket,
+        level,
+        option_name,
+        option_value,
+        option_len
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/listen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn listen(socket: c_int, backlog: c_int) -> c_int {
+    Sys::listen(socket, backlog)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/recv.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn recv(
+    socket: c_int,
+    buffer: *mut c_void,
+    length: size_t,
+    flags: c_int,
+) -> ssize_t {
+    unsafe {
+        recvfrom(
+            socket,
+            buffer,
+            length,
+            flags,
+            ptr::null_mut(),
+            ptr::null_mut(),
+        )
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/recvfrom.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn recvfrom(
+    socket: c_int,
+    buffer: *mut c_void,
+    length: size_t,
+    flags: c_int,
+    address: *mut sockaddr,
+    address_len: *mut socklen_t,
+) -> ssize_t {
+    trace_expr!(
+        unsafe { Sys::recvfrom(socket, buffer, length, flags, address, address_len) }
+            .map(|r| r as ssize_t)
+            .or_minus_one_errno(),
+        "recvfrom({}, {:p}, {}, {:#x}, {:p}, {:p})",
+        socket,
+        buffer,
+        length,
+        flags,
+        address,
+        address_len
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/recvmsg.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn recvmsg(socket: c_int, msg: *mut msghdr, flags: c_int) -> ssize_t {
+    unsafe { Sys::recvmsg(socket, msg, flags) }
+        .map(|r| r as ssize_t)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/send.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn send(
+    socket: c_int,
+    message: *const c_void,
+    length: size_t,
+    flags: c_int,
+) -> ssize_t {
+    unsafe { sendto(socket, message, length, flags, ptr::null(), 0) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sendmsg.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sendmsg(socket: c_int, msg: *const msghdr, flags: c_int) -> ssize_t {
+    unsafe { Sys::sendmsg(socket, msg, flags) }
+        .map(|w| w as ssize_t)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sendto.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sendto(
+    socket: c_int,
+    message: *const c_void,
+    length: size_t,
+    flags: c_int,
+    dest_addr: *const sockaddr,
+    dest_len: socklen_t,
+) -> ssize_t {
+    trace_expr!(
+        unsafe { Sys::sendto(socket, message, length, flags, dest_addr, dest_len) }
+            .map(|w| w as ssize_t)
+            .or_minus_one_errno(),
+        "sendto({}, {:p}, {}, {:#x}, {:p}, {})",
+        socket,
+        message,
+        length,
+        flags,
+        dest_addr,
+        dest_len
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setsockopt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setsockopt(
+    socket: c_int,
+    level: c_int,
+    option_name: c_int,
+    option_value: *const c_void,
+    option_len: socklen_t,
+) -> c_int {
+    trace_expr!(
+        unsafe { Sys::setsockopt(socket, level, option_name, option_value, option_len) }
+            .map(|()| 0)
+            .or_minus_one_errno(),
+        "setsockopt({}, {}, {}, {:p}, {})",
+        socket,
+        level,
+        option_name,
+        option_value,
+        option_len
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/shutdown.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn shutdown(socket: c_int, how: c_int) -> c_int {
+    Sys::shutdown(socket, how).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/socket.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn socket(domain: c_int, kind: c_int, protocol: c_int) -> c_int {
+    trace_expr!(
+        unsafe { Sys::socket(domain, kind, protocol) }.or_minus_one_errno(),
+        "socket({}, {}, {})",
+        domain,
+        kind,
+        protocol,
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/socketpair.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn socketpair(
+    domain: c_int,
+    kind: c_int,
+    protocol: c_int,
+    sv: *mut c_int,
+) -> c_int {
+    trace_expr!(
+        Sys::socketpair(domain, kind, protocol, unsafe {
+            &mut *sv.cast::<[c_int; 2]>()
+        })
+        .map(|()| 0)
+        .or_minus_one_errno(),
+        "socketpair({}, {}, {}, {:p})",
+        domain,
+        kind,
+        protocol,
+        sv
+    )
+}
diff --git a/recipes/core/relibc/src/header/sys_stat/cbindgen.toml b/recipes/core/relibc/src/header/sys_stat/cbindgen.toml
new file mode 100644
index 0000000000..a922349e9f
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_stat/cbindgen.toml
@@ -0,0 +1,33 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_stat.h.html
+#
+# Spec quotations relating to includes:
+# - "The <sys/stat.h> header shall define the blkcnt_t, blksize_t, dev_t, ino_t, mode_t, nlink_t, uid_t, gid_t, off_t, and time_t types as described in <sys/types.h>."
+# - "The <sys/stat.h> header shall define the timespec structure as described in <time.h>. Times shall be given in seconds since the Epoch."
+# - "Inclusion of the <sys/stat.h> header may make visible all symbols from the <time.h> header."
+sys_includes = ["sys/types.h"]
+include_guard = "_SYS_STAT_H"
+after_includes = """
+#include <bits/timespec.h> // for timespec
+
+#define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
+#define S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)
+#define S_ISBLK(mode)  (((mode) & S_IFMT) == S_IFBLK)
+#define S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
+#define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO)
+#define S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
+#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
+
+#define st_atime st_atim.tv_sec
+#define st_mtime st_mtim.tv_sec
+#define st_ctime st_ctim.tv_sec
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"timespec" = "struct timespec"
diff --git a/recipes/core/relibc/src/header/sys_stat/mod.rs b/recipes/core/relibc/src/header/sys_stat/mod.rs
new file mode 100644
index 0000000000..0975a20dec
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_stat/mod.rs
@@ -0,0 +1,242 @@
+//! `sys/stat.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_stat.h.html>.
+
+use crate::{
+    c_str::CStr,
+    error::ResultExt,
+    header::{
+        bits_timespec::timespec,
+        fcntl::{O_NOFOLLOW, O_PATH},
+    },
+    out::Out,
+    platform::{
+        Pal, Sys,
+        types::{
+            blkcnt_t, blksize_t, c_char, c_int, c_long, dev_t, gid_t, ino_t, mode_t, nlink_t,
+            off_t, uid_t,
+        },
+    },
+};
+
+pub const S_IFMT: c_int = 0o0_170_000;
+
+pub const S_IFDIR: c_int = 0o040_000;
+pub const S_IFCHR: c_int = 0o020_000;
+pub const S_IFBLK: c_int = 0o060_000;
+pub const S_IFREG: c_int = 0o100_000;
+pub const S_IFIFO: c_int = 0o010_000;
+pub const S_IFLNK: c_int = 0o120_000;
+pub const S_IFSOCK: c_int = 0o140_000;
+
+pub const S_IRWXU: c_int = 0o0_700;
+pub const S_IRUSR: c_int = 0o0_400;
+pub const S_IWUSR: c_int = 0o0_200;
+pub const S_IXUSR: c_int = 0o0_100;
+
+// Defined for compatibility
+pub const S_IREAD: c_int = S_IRUSR;
+pub const S_IWRITE: c_int = S_IWUSR;
+pub const S_IEXEC: c_int = S_IXUSR;
+
+pub const S_IRWXG: c_int = 0o0_070;
+pub const S_IRGRP: c_int = 0o0_040;
+pub const S_IWGRP: c_int = 0o0_020;
+pub const S_IXGRP: c_int = 0o0_010;
+
+pub const S_IRWXO: c_int = 0o0_007;
+pub const S_IROTH: c_int = 0o0_004;
+pub const S_IWOTH: c_int = 0o0_002;
+pub const S_IXOTH: c_int = 0o0_001;
+pub const S_ISUID: c_int = 0o4_000;
+pub const S_ISGID: c_int = 0o2_000;
+pub const S_ISVTX: c_int = 0o1_000;
+
+pub const UTIME_NOW: c_long = (1 << 30) - 1;
+pub const UTIME_OMIT: c_long = (1 << 30) - 2;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_stat.h.html>.
+#[repr(C)]
+#[derive(Default)]
+pub struct stat {
+    pub st_dev: dev_t,
+    pub st_ino: ino_t,
+    pub st_nlink: nlink_t,
+    pub st_mode: mode_t,
+    pub st_uid: uid_t,
+    pub st_gid: gid_t,
+    pub st_rdev: dev_t,
+    pub st_size: off_t,
+    pub st_blksize: blksize_t,
+    pub st_blocks: blkcnt_t,
+
+    pub st_atim: timespec,
+    pub st_mtim: timespec,
+    pub st_ctim: timespec,
+
+    // Compared to glibc, our struct is for some reason 24 bytes too small.
+    // Accessing atime works, so clearly the struct isn't incorrect...
+    // This works.
+    pub _pad: [c_char; 24],
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/chmod.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn chmod(path: *const c_char, mode: mode_t) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::chmod(path, mode).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fchmod.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn fchmod(fildes: c_int, mode: mode_t) -> c_int {
+    Sys::fchmod(fildes, mode).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fchmodat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fchmodat(
+    dirfd: c_int,
+    path: *const c_char,
+    mode: mode_t,
+    flags: c_int,
+) -> c_int {
+    let path = unsafe { CStr::from_nullable_ptr(path) };
+    Sys::fchmodat(dirfd, path, mode, flags)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fstat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fstat(fildes: c_int, buf: *mut stat) -> c_int {
+    let buf = unsafe { Out::nonnull(buf) };
+    Sys::fstat(fildes, buf).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fstatat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fstatat(
+    fildes: c_int,
+    path: *const c_char,
+    buf: *mut stat,
+    flags: c_int,
+) -> c_int {
+    let path = unsafe { CStr::from_nullable_ptr(path) };
+    let buf = unsafe { Out::nonnull(buf) };
+    Sys::fstatat(fildes, path, buf, flags)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn __fxstat(_ver: c_int, fildes: c_int, buf: *mut stat) -> c_int {
+    unsafe { fstat(fildes, buf) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/futimens.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn futimens(fd: c_int, times: *const timespec) -> c_int {
+    unsafe { Sys::futimens(fd, times) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lstat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn lstat(path: *const c_char, buf: *mut stat) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    let buf = unsafe { Out::nonnull(buf) };
+
+    // TODO: Rustify
+    let fd = Sys::open(path, O_PATH | O_NOFOLLOW, 0).or_minus_one_errno();
+    if fd < 0 {
+        return -1;
+    }
+
+    // TODO: Rustify
+    let res = Sys::fstat(fd, buf).map(|()| 0).or_minus_one_errno();
+
+    if let Ok(()) = Sys::close(fd) {}; // TODO handle error
+
+    res
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkdirat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mkdirat(dirfd: c_int, path: *const c_char, mode: mode_t) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::mkdirat(dirfd, path, mode)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkdir.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mkdir(path: *const c_char, mode: mode_t) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::mkdir(path, mode).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkfifoat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mkfifoat(dirfd: c_int, path: *const c_char, mode: mode_t) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::mkfifoat(dirfd, path, mode)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkfifo.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mkfifo(path: *const c_char, mode: mode_t) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::mkfifo(path, mode).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mknod.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mknod(path: *const c_char, mode: mode_t, dev: dev_t) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::mknod(path, mode, dev).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mknodat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mknodat(
+    dirfd: c_int,
+    path: *const c_char,
+    mode: mode_t,
+    dev: dev_t,
+) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::mknodat(dirfd, path, mode, dev)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/stat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn stat(file: *const c_char, buf: *mut stat) -> c_int {
+    let file = unsafe { CStr::from_ptr(file) };
+    let buf = unsafe { Out::nonnull(buf) };
+
+    // TODO: Rustify
+    let fd = Sys::open(file, O_PATH, 0).or_minus_one_errno();
+    if fd < 0 {
+        return -1;
+    }
+
+    // TODO: Rustify
+    let res = Sys::fstat(fd, buf).map(|()| 0).or_minus_one_errno();
+
+    if let Ok(()) = Sys::close(fd) {}; // TODO handle error
+
+    res
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/umask.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn umask(mask: mode_t) -> mode_t {
+    Sys::umask(mask)
+}
diff --git a/recipes/core/relibc/src/header/sys_statvfs/cbindgen.toml b/recipes/core/relibc/src/header/sys_statvfs/cbindgen.toml
new file mode 100644
index 0000000000..7d75072153
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_statvfs/cbindgen.toml
@@ -0,0 +1,13 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_statvfs.h.html
+#
+# Spec quotations relating to includes:
+# - "The <sys/statvfs.h> header shall define the fsblkcnt_t and fsfilcnt_t types as described in <sys/types.h>."
+sys_includes = ["sys/types.h"]
+include_guard = "_SYS_STATVFS_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_statvfs/mod.rs b/recipes/core/relibc/src/header/sys_statvfs/mod.rs
new file mode 100644
index 0000000000..866768b885
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_statvfs/mod.rs
@@ -0,0 +1,58 @@
+//! `sys_statvfs.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_statvfs.h.html>.
+
+use crate::{
+    c_str::CStr,
+    error::ResultExt,
+    header::fcntl::O_PATH,
+    out::Out,
+    platform::{
+        Pal, Sys,
+        types::{c_char, c_int, c_ulong, fsblkcnt_t, fsfilcnt_t},
+    },
+};
+
+//pub const ST_RDONLY
+//pub const ST_NOSUID
+
+#[repr(C)]
+#[derive(Default)]
+pub struct statvfs {
+    pub f_bsize: c_ulong,
+    pub f_frsize: c_ulong,
+    pub f_blocks: fsblkcnt_t,
+    pub f_bfree: fsblkcnt_t,
+    pub f_bavail: fsblkcnt_t,
+    pub f_files: fsfilcnt_t,
+    pub f_ffree: fsfilcnt_t,
+    pub f_favail: fsfilcnt_t,
+    pub f_fsid: c_ulong,
+    pub f_flag: c_ulong,
+    pub f_namemax: c_ulong,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fstatvfs.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fstatvfs(fildes: c_int, buf: *mut statvfs) -> c_int {
+    let buf = unsafe { Out::nonnull(buf) };
+    Sys::fstatvfs(fildes, buf).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fstatvfs.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn statvfs(file: *const c_char, buf: *mut statvfs) -> c_int {
+    let file = unsafe { CStr::from_ptr(file) };
+    let buf = unsafe { Out::nonnull(buf) };
+    // TODO: Rustify
+    let fd = Sys::open(file, O_PATH, 0).or_minus_one_errno();
+    if fd < 0 {
+        return -1;
+    }
+
+    let res = Sys::fstatvfs(fd, buf).map(|()| 0).or_minus_one_errno();
+
+    if let Ok(()) = Sys::close(fd) {}; // TODO handle error
+
+    res
+}
diff --git a/recipes/core/relibc/src/header/sys_syscall/aarch64.rs b/recipes/core/relibc/src/header/sys_syscall/aarch64.rs
new file mode 100644
index 0000000000..369a4b045a
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_syscall/aarch64.rs
@@ -0,0 +1,303 @@
+// Adapted from sc crate: https://github.com/japaric/syscall.rs/blob/master/src/platform/linux-aarch64/nr.rs
+// const ([A-Z_\d]+): -> const __NR_\L$1:
+
+pub const __NR_accept: usize = 202;
+pub const __NR_accept4: usize = 242;
+pub const __NR_acct: usize = 89;
+pub const __NR_add_key: usize = 217;
+pub const __NR_adjtimex: usize = 171;
+pub const __NR_arch_specific_syscall: usize = 244;
+pub const __NR_bind: usize = 200;
+pub const __NR_bpf: usize = 280;
+pub const __NR_brk: usize = 214;
+pub const __NR_capget: usize = 90;
+pub const __NR_capset: usize = 91;
+pub const __NR_chdir: usize = 49;
+pub const __NR_chroot: usize = 51;
+pub const __NR_clock_adjtime: usize = 266;
+pub const __NR_clock_getres: usize = 114;
+pub const __NR_clock_gettime: usize = 113;
+pub const __NR_clock_nanosleep: usize = 115;
+pub const __NR_clock_settime: usize = 112;
+pub const __NR_clone: usize = 220;
+pub const __NR_clone3: usize = 435;
+pub const __NR_close: usize = 57;
+pub const __NR_close_range: usize = 436;
+pub const __NR_connect: usize = 203;
+pub const __NR_copy_file_range: usize = 285;
+pub const __NR_delete_module: usize = 106;
+pub const __NR_dup: usize = 23;
+pub const __NR_dup3: usize = 24;
+pub const __NR_epoll_create1: usize = 20;
+pub const __NR_epoll_ctl: usize = 21;
+pub const __NR_epoll_pwait: usize = 22;
+pub const __NR_epoll_pwait2: usize = 441;
+pub const __NR_eventfd2: usize = 19;
+pub const __NR_execve: usize = 221;
+pub const __NR_execveat: usize = 281;
+pub const __NR_exit: usize = 93;
+pub const __NR_exit_group: usize = 94;
+pub const __NR_faccessat: usize = 48;
+pub const __NR_faccessat2: usize = 439;
+pub const __NR_fadvise64: usize = 223;
+pub const __NR_fallocate: usize = 47;
+pub const __NR_fanotify_init: usize = 262;
+pub const __NR_fanotify_mark: usize = 263;
+pub const __NR_fchdir: usize = 50;
+pub const __NR_fchmod: usize = 52;
+pub const __NR_fchmodat: usize = 53;
+pub const __NR_fchown: usize = 55;
+pub const __NR_fchownat: usize = 54;
+pub const __NR_fcntl: usize = 25;
+pub const __NR_fdatasync: usize = 83;
+pub const __NR_fgetxattr: usize = 10;
+pub const __NR_finit_module: usize = 273;
+pub const __NR_flistxattr: usize = 13;
+pub const __NR_flock: usize = 32;
+pub const __NR_fremovexattr: usize = 16;
+pub const __NR_fsconfig: usize = 431;
+pub const __NR_fsetxattr: usize = 7;
+pub const __NR_fsmount: usize = 432;
+pub const __NR_fsopen: usize = 430;
+pub const __NR_fspick: usize = 433;
+pub const __NR_fstat: usize = 80;
+pub const __NR_fstatfs: usize = 44;
+pub const __NR_fsync: usize = 82;
+pub const __NR_ftruncate: usize = 46;
+pub const __NR_futex: usize = 98;
+pub const __NR_get_mempolicy: usize = 236;
+pub const __NR_get_robust_list: usize = 100;
+pub const __NR_getcpu: usize = 168;
+pub const __NR_getcwd: usize = 17;
+pub const __NR_getdents64: usize = 61;
+pub const __NR_getegid: usize = 177;
+pub const __NR_geteuid: usize = 175;
+pub const __NR_getgid: usize = 176;
+pub const __NR_getgroups: usize = 158;
+pub const __NR_getitimer: usize = 102;
+pub const __NR_getpeername: usize = 205;
+pub const __NR_getpgid: usize = 155;
+pub const __NR_getpid: usize = 172;
+pub const __NR_getppid: usize = 173;
+pub const __NR_getpriority: usize = 141;
+pub const __NR_getrandom: usize = 278;
+pub const __NR_getresgid: usize = 150;
+pub const __NR_getresuid: usize = 148;
+pub const __NR_getrlimit: usize = 163;
+pub const __NR_getrusage: usize = 165;
+pub const __NR_getsid: usize = 156;
+pub const __NR_getsockname: usize = 204;
+pub const __NR_getsockopt: usize = 209;
+pub const __NR_gettid: usize = 178;
+pub const __NR_gettimeofday: usize = 169;
+pub const __NR_getuid: usize = 174;
+pub const __NR_getxattr: usize = 8;
+pub const __NR_init_module: usize = 105;
+pub const __NR_inotify_add_watch: usize = 27;
+pub const __NR_inotify_init1: usize = 26;
+pub const __NR_inotify_rm_watch: usize = 28;
+pub const __NR_io_cancel: usize = 3;
+pub const __NR_io_destroy: usize = 1;
+pub const __NR_io_getevents: usize = 4;
+pub const __NR_io_pgetevents: usize = 292;
+pub const __NR_io_setup: usize = 0;
+pub const __NR_io_submit: usize = 2;
+pub const __NR_io_uring_enter: usize = 426;
+pub const __NR_io_uring_register: usize = 427;
+pub const __NR_io_uring_setup: usize = 425;
+pub const __NR_ioctl: usize = 29;
+pub const __NR_ioprio_get: usize = 31;
+pub const __NR_ioprio_set: usize = 30;
+pub const __NR_kcmp: usize = 272;
+pub const __NR_kexec_file_load: usize = 294;
+pub const __NR_kexec_load: usize = 104;
+pub const __NR_keyctl: usize = 219;
+pub const __NR_kill: usize = 129;
+pub const __NR_lgetxattr: usize = 9;
+pub const __NR_linkat: usize = 37;
+pub const __NR_listen: usize = 201;
+pub const __NR_listxattr: usize = 11;
+pub const __NR_llistxattr: usize = 12;
+pub const __NR_lookup_dcookie: usize = 18;
+pub const __NR_lremovexattr: usize = 15;
+pub const __NR_lseek: usize = 62;
+pub const __NR_lsetxattr: usize = 6;
+pub const __NR_madvise: usize = 233;
+pub const __NR_mbind: usize = 235;
+pub const __NR_membarrier: usize = 283;
+pub const __NR_memfd_create: usize = 279;
+pub const __NR_migrate_pages: usize = 238;
+pub const __NR_mincore: usize = 232;
+pub const __NR_mkdirat: usize = 34;
+pub const __NR_mknodat: usize = 33;
+pub const __NR_mlock: usize = 228;
+pub const __NR_mlock2: usize = 284;
+pub const __NR_mlockall: usize = 230;
+pub const __NR_mmap: usize = 222;
+pub const __NR_mount: usize = 40;
+pub const __NR_mount_setattr: usize = 442;
+pub const __NR_move_mount: usize = 429;
+pub const __NR_move_pages: usize = 239;
+pub const __NR_mprotect: usize = 226;
+pub const __NR_mq_getsetattr: usize = 185;
+pub const __NR_mq_notify: usize = 184;
+pub const __NR_mq_open: usize = 180;
+pub const __NR_mq_timedreceive: usize = 183;
+pub const __NR_mq_timedsend: usize = 182;
+pub const __NR_mq_unlink: usize = 181;
+pub const __NR_mremap: usize = 216;
+pub const __NR_msgctl: usize = 187;
+pub const __NR_msgget: usize = 186;
+pub const __NR_msgrcv: usize = 188;
+pub const __NR_msgsnd: usize = 189;
+pub const __NR_msync: usize = 227;
+pub const __NR_munlock: usize = 229;
+pub const __NR_munlockall: usize = 231;
+pub const __NR_munmap: usize = 215;
+pub const __NR_name_to_handle_at: usize = 264;
+pub const __NR_nanosleep: usize = 101;
+pub const __NR_newfstatat: usize = 79;
+pub const __NR_nfsservctl: usize = 42;
+pub const __NR_open_by_handle_at: usize = 265;
+pub const __NR_open_tree: usize = 428;
+pub const __NR_openat: usize = 56;
+pub const __NR_openat2: usize = 437;
+pub const __NR_perf_event_open: usize = 241;
+pub const __NR_personality: usize = 92;
+pub const __NR_pidfd_getfd: usize = 438;
+pub const __NR_pidfd_open: usize = 434;
+pub const __NR_pidfd_send_signal: usize = 424;
+pub const __NR_pipe2: usize = 59;
+pub const __NR_pivot_root: usize = 41;
+pub const __NR_pkey_alloc: usize = 289;
+pub const __NR_pkey_free: usize = 290;
+pub const __NR_pkey_mprotect: usize = 288;
+pub const __NR_ppoll: usize = 73;
+pub const __NR_prctl: usize = 167;
+pub const __NR_pread64: usize = 67;
+pub const __NR_preadv: usize = 69;
+pub const __NR_preadv2: usize = 286;
+pub const __NR_prlimit64: usize = 261;
+pub const __NR_process_madvise: usize = 440;
+pub const __NR_process_vm_readv: usize = 270;
+pub const __NR_process_vm_writev: usize = 271;
+pub const __NR_pselect6: usize = 72;
+pub const __NR_ptrace: usize = 117;
+pub const __NR_pwrite64: usize = 68;
+pub const __NR_pwritev: usize = 70;
+pub const __NR_pwritev2: usize = 287;
+pub const __NR_quotactl: usize = 60;
+pub const __NR_read: usize = 63;
+pub const __NR_readahead: usize = 213;
+pub const __NR_readlinkat: usize = 78;
+pub const __NR_readv: usize = 65;
+pub const __NR_reboot: usize = 142;
+pub const __NR_recvfrom: usize = 207;
+pub const __NR_recvmmsg: usize = 243;
+pub const __NR_recvmsg: usize = 212;
+pub const __NR_remap_file_pages: usize = 234;
+pub const __NR_removexattr: usize = 14;
+pub const __NR_renameat: usize = 38;
+pub const __NR_renameat2: usize = 276;
+pub const __NR_request_key: usize = 218;
+pub const __NR_restart_syscall: usize = 128;
+pub const __NR_rseq: usize = 293;
+pub const __NR_rt_sigaction: usize = 134;
+pub const __NR_rt_sigpending: usize = 136;
+pub const __NR_rt_sigprocmask: usize = 135;
+pub const __NR_rt_sigqueueinfo: usize = 138;
+pub const __NR_rt_sigreturn: usize = 139;
+pub const __NR_rt_sigsuspend: usize = 133;
+pub const __NR_rt_sigtimedwait: usize = 137;
+pub const __NR_rt_tgsigqueueinfo: usize = 240;
+pub const __NR_sched_get_priority_max: usize = 125;
+pub const __NR_sched_get_priority_min: usize = 126;
+pub const __NR_sched_getaffinity: usize = 123;
+pub const __NR_sched_getattr: usize = 275;
+pub const __NR_sched_getparam: usize = 121;
+pub const __NR_sched_getscheduler: usize = 120;
+pub const __NR_sched_rr_get_interval: usize = 127;
+pub const __NR_sched_setaffinity: usize = 122;
+pub const __NR_sched_setattr: usize = 274;
+pub const __NR_sched_setparam: usize = 118;
+pub const __NR_sched_setscheduler: usize = 119;
+pub const __NR_sched_yield: usize = 124;
+pub const __NR_seccomp: usize = 277;
+pub const __NR_semctl: usize = 191;
+pub const __NR_semget: usize = 190;
+pub const __NR_semop: usize = 193;
+pub const __NR_semtimedop: usize = 192;
+pub const __NR_sendfile: usize = 71;
+pub const __NR_sendmmsg: usize = 269;
+pub const __NR_sendmsg: usize = 211;
+pub const __NR_sendto: usize = 206;
+pub const __NR_set_mempolicy: usize = 237;
+pub const __NR_set_robust_list: usize = 99;
+pub const __NR_set_tid_address: usize = 96;
+pub const __NR_setdomainname: usize = 162;
+pub const __NR_setfsgid: usize = 152;
+pub const __NR_setfsuid: usize = 151;
+pub const __NR_setgid: usize = 144;
+pub const __NR_setgroups: usize = 159;
+pub const __NR_sethostname: usize = 161;
+pub const __NR_setitimer: usize = 103;
+pub const __NR_setns: usize = 268;
+pub const __NR_setpgid: usize = 154;
+pub const __NR_setpriority: usize = 140;
+pub const __NR_setregid: usize = 143;
+pub const __NR_setresgid: usize = 149;
+pub const __NR_setresuid: usize = 147;
+pub const __NR_setreuid: usize = 145;
+pub const __NR_setrlimit: usize = 164;
+pub const __NR_setsid: usize = 157;
+pub const __NR_setsockopt: usize = 208;
+pub const __NR_settimeofday: usize = 170;
+pub const __NR_setuid: usize = 146;
+pub const __NR_setxattr: usize = 5;
+pub const __NR_shmat: usize = 196;
+pub const __NR_shmctl: usize = 195;
+pub const __NR_shmdt: usize = 197;
+pub const __NR_shmget: usize = 194;
+pub const __NR_shutdown: usize = 210;
+pub const __NR_sigaltstack: usize = 132;
+pub const __NR_signalfd4: usize = 74;
+pub const __NR_socket: usize = 198;
+pub const __NR_socketpair: usize = 199;
+pub const __NR_splice: usize = 76;
+pub const __NR_statfs: usize = 43;
+pub const __NR_statx: usize = 291;
+pub const __NR_swapoff: usize = 225;
+pub const __NR_swapon: usize = 224;
+pub const __NR_symlinkat: usize = 36;
+pub const __NR_sync: usize = 81;
+pub const __NR_sync_file_range: usize = 84;
+pub const __NR_syncfs: usize = 267;
+pub const __NR_syscalls: usize = 443;
+pub const __NR_sysinfo: usize = 179;
+pub const __NR_syslog: usize = 116;
+pub const __NR_tee: usize = 77;
+pub const __NR_tgkill: usize = 131;
+pub const __NR_timer_create: usize = 107;
+pub const __NR_timer_delete: usize = 111;
+pub const __NR_timer_getoverrun: usize = 109;
+pub const __NR_timer_gettime: usize = 108;
+pub const __NR_timer_settime: usize = 110;
+pub const __NR_timerfd_create: usize = 85;
+pub const __NR_timerfd_gettime: usize = 87;
+pub const __NR_timerfd_settime: usize = 86;
+pub const __NR_times: usize = 153;
+pub const __NR_tkill: usize = 130;
+pub const __NR_truncate: usize = 45;
+pub const __NR_umask: usize = 166;
+pub const __NR_umount2: usize = 39;
+pub const __NR_uname: usize = 160;
+pub const __NR_unlinkat: usize = 35;
+pub const __NR_unshare: usize = 97;
+pub const __NR_userfaultfd: usize = 282;
+pub const __NR_utimensat: usize = 88;
+pub const __NR_vhangup: usize = 58;
+pub const __NR_vmsplice: usize = 75;
+pub const __NR_wait4: usize = 260;
+pub const __NR_waitid: usize = 95;
+pub const __NR_write: usize = 64;
+pub const __NR_writev: usize = 66;
diff --git a/recipes/core/relibc/src/header/sys_syscall/cbindgen.toml b/recipes/core/relibc/src/header/sys_syscall/cbindgen.toml
new file mode 100644
index 0000000000..6976288d42
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_syscall/cbindgen.toml
@@ -0,0 +1,8 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_statvfs.h.html
+#
+# Spec quotations relating to includes:
+# - "The <sys/statvfs.h> header shall define the fsblkcnt_t and fsfilcnt_t types as described in <sys/types.h>."
+sys_includes = ["sys/types.h"]
+include_guard = "_SYS_SYSCALL_H"
+language = "C"
+no_includes = true
diff --git a/recipes/core/relibc/src/header/sys_syscall/mod.rs b/recipes/core/relibc/src/header/sys_syscall/mod.rs
new file mode 100644
index 0000000000..cb8c1350e7
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_syscall/mod.rs
@@ -0,0 +1,5 @@
+// copied from sc crate
+#[cfg(all(target_os = "linux", target_arch = "aarch64"))]
+pub mod aarch64;
+#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
+pub mod x86_64;
diff --git a/recipes/core/relibc/src/header/sys_syscall/x86_64.rs b/recipes/core/relibc/src/header/sys_syscall/x86_64.rs
new file mode 100644
index 0000000000..d5fd94ae8a
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_syscall/x86_64.rs
@@ -0,0 +1,356 @@
+// Adapted from sc crate: https://github.com/japaric/syscall.rs/blob/master/src/platform/linux-x86_64/nr.rs
+// const ([A-Z_\d]+): -> const __NR_\L$1:
+
+pub const __NR_accept: usize = 43;
+pub const __NR_accept4: usize = 288;
+pub const __NR_access: usize = 21;
+pub const __NR_acct: usize = 163;
+pub const __NR_add_key: usize = 248;
+pub const __NR_adjtimex: usize = 159;
+pub const __NR_afs_syscall: usize = 183;
+pub const __NR_alarm: usize = 37;
+pub const __NR_arch_prctl: usize = 158;
+pub const __NR_bind: usize = 49;
+pub const __NR_bpf: usize = 321;
+pub const __NR_brk: usize = 12;
+pub const __NR_capget: usize = 125;
+pub const __NR_capset: usize = 126;
+pub const __NR_chdir: usize = 80;
+pub const __NR_chmod: usize = 90;
+pub const __NR_chown: usize = 92;
+pub const __NR_chroot: usize = 161;
+pub const __NR_clock_adjtime: usize = 305;
+pub const __NR_clock_getres: usize = 229;
+pub const __NR_clock_gettime: usize = 228;
+pub const __NR_clock_nanosleep: usize = 230;
+pub const __NR_clock_settime: usize = 227;
+pub const __NR_clone: usize = 56;
+pub const __NR_clone3: usize = 435;
+pub const __NR_close: usize = 3;
+pub const __NR_close_range: usize = 436;
+pub const __NR_connect: usize = 42;
+pub const __NR_copy_file_range: usize = 326;
+pub const __NR_creat: usize = 85;
+pub const __NR_create_module: usize = 174;
+pub const __NR_delete_module: usize = 176;
+pub const __NR_dup: usize = 32;
+pub const __NR_dup2: usize = 33;
+pub const __NR_dup3: usize = 292;
+pub const __NR_epoll_create: usize = 213;
+pub const __NR_epoll_create1: usize = 291;
+pub const __NR_epoll_ctl: usize = 233;
+pub const __NR_epoll_ctl_old: usize = 214;
+pub const __NR_epoll_pwait: usize = 281;
+pub const __NR_epoll_pwait2: usize = 441;
+pub const __NR_epoll_wait: usize = 232;
+pub const __NR_epoll_wait_old: usize = 215;
+pub const __NR_eventfd: usize = 284;
+pub const __NR_eventfd2: usize = 290;
+pub const __NR_execve: usize = 59;
+pub const __NR_execveat: usize = 322;
+pub const __NR_exit: usize = 60;
+pub const __NR_exit_group: usize = 231;
+pub const __NR_faccessat: usize = 269;
+pub const __NR_faccessat2: usize = 439;
+pub const __NR_fadvise64: usize = 221;
+pub const __NR_fallocate: usize = 285;
+pub const __NR_fanotify_init: usize = 300;
+pub const __NR_fanotify_mark: usize = 301;
+pub const __NR_fchdir: usize = 81;
+pub const __NR_fchmod: usize = 91;
+pub const __NR_fchmodat: usize = 268;
+pub const __NR_fchown: usize = 93;
+pub const __NR_fchownat: usize = 260;
+pub const __NR_fcntl: usize = 72;
+pub const __NR_fdatasync: usize = 75;
+pub const __NR_fgetxattr: usize = 193;
+pub const __NR_finit_module: usize = 313;
+pub const __NR_flistxattr: usize = 196;
+pub const __NR_flock: usize = 73;
+pub const __NR_fork: usize = 57;
+pub const __NR_fremovexattr: usize = 199;
+pub const __NR_fsconfig: usize = 431;
+pub const __NR_fsetxattr: usize = 190;
+pub const __NR_fsmount: usize = 432;
+pub const __NR_fsopen: usize = 430;
+pub const __NR_fspick: usize = 433;
+pub const __NR_fstat: usize = 5;
+pub const __NR_fstatfs: usize = 138;
+pub const __NR_fsync: usize = 74;
+pub const __NR_ftruncate: usize = 77;
+pub const __NR_futex: usize = 202;
+pub const __NR_futimesat: usize = 261;
+pub const __NR_get_kernel_syms: usize = 177;
+pub const __NR_get_mempolicy: usize = 239;
+pub const __NR_get_robust_list: usize = 274;
+pub const __NR_get_thread_area: usize = 211;
+pub const __NR_getcpu: usize = 309;
+pub const __NR_getcwd: usize = 79;
+pub const __NR_getdents: usize = 78;
+pub const __NR_getdents64: usize = 217;
+pub const __NR_getegid: usize = 108;
+pub const __NR_geteuid: usize = 107;
+pub const __NR_getgid: usize = 104;
+pub const __NR_getgroups: usize = 115;
+pub const __NR_getitimer: usize = 36;
+pub const __NR_getpeername: usize = 52;
+pub const __NR_getpgid: usize = 121;
+pub const __NR_getpgrp: usize = 111;
+pub const __NR_getpid: usize = 39;
+pub const __NR_getpmsg: usize = 181;
+pub const __NR_getppid: usize = 110;
+pub const __NR_getpriority: usize = 140;
+pub const __NR_getrandom: usize = 318;
+pub const __NR_getresgid: usize = 120;
+pub const __NR_getresuid: usize = 118;
+pub const __NR_getrlimit: usize = 97;
+pub const __NR_getrusage: usize = 98;
+pub const __NR_getsid: usize = 124;
+pub const __NR_getsockname: usize = 51;
+pub const __NR_getsockopt: usize = 55;
+pub const __NR_gettid: usize = 186;
+pub const __NR_gettimeofday: usize = 96;
+pub const __NR_getuid: usize = 102;
+pub const __NR_getxattr: usize = 191;
+pub const __NR_init_module: usize = 175;
+pub const __NR_inotify_add_watch: usize = 254;
+pub const __NR_inotify_init: usize = 253;
+pub const __NR_inotify_init1: usize = 294;
+pub const __NR_inotify_rm_watch: usize = 255;
+pub const __NR_io_cancel: usize = 210;
+pub const __NR_io_destroy: usize = 207;
+pub const __NR_io_getevents: usize = 208;
+pub const __NR_io_pgetevents: usize = 333;
+pub const __NR_io_setup: usize = 206;
+pub const __NR_io_submit: usize = 209;
+pub const __NR_io_uring_enter: usize = 426;
+pub const __NR_io_uring_register: usize = 427;
+pub const __NR_io_uring_setup: usize = 425;
+pub const __NR_ioctl: usize = 16;
+pub const __NR_ioperm: usize = 173;
+pub const __NR_iopl: usize = 172;
+pub const __NR_ioprio_get: usize = 252;
+pub const __NR_ioprio_set: usize = 251;
+pub const __NR_kcmp: usize = 312;
+pub const __NR_kexec_file_load: usize = 320;
+pub const __NR_kexec_load: usize = 246;
+pub const __NR_keyctl: usize = 250;
+pub const __NR_kill: usize = 62;
+pub const __NR_lchown: usize = 94;
+pub const __NR_lgetxattr: usize = 192;
+pub const __NR_link: usize = 86;
+pub const __NR_linkat: usize = 265;
+pub const __NR_listen: usize = 50;
+pub const __NR_listxattr: usize = 194;
+pub const __NR_llistxattr: usize = 195;
+pub const __NR_lookup_dcookie: usize = 212;
+pub const __NR_lremovexattr: usize = 198;
+pub const __NR_lseek: usize = 8;
+pub const __NR_lsetxattr: usize = 189;
+pub const __NR_lstat: usize = 6;
+pub const __NR_madvise: usize = 28;
+pub const __NR_mbind: usize = 237;
+pub const __NR_membarrier: usize = 324;
+pub const __NR_memfd_create: usize = 319;
+pub const __NR_migrate_pages: usize = 256;
+pub const __NR_mincore: usize = 27;
+pub const __NR_mkdir: usize = 83;
+pub const __NR_mkdirat: usize = 258;
+pub const __NR_mknod: usize = 133;
+pub const __NR_mknodat: usize = 259;
+pub const __NR_mlock: usize = 149;
+pub const __NR_mlock2: usize = 325;
+pub const __NR_mlockall: usize = 151;
+pub const __NR_mmap: usize = 9;
+pub const __NR_modify_ldt: usize = 154;
+pub const __NR_mount: usize = 165;
+pub const __NR_mount_setattr: usize = 442;
+pub const __NR_move_mount: usize = 429;
+pub const __NR_move_pages: usize = 279;
+pub const __NR_mprotect: usize = 10;
+pub const __NR_mq_getsetattr: usize = 245;
+pub const __NR_mq_notify: usize = 244;
+pub const __NR_mq_open: usize = 240;
+pub const __NR_mq_timedreceive: usize = 243;
+pub const __NR_mq_timedsend: usize = 242;
+pub const __NR_mq_unlink: usize = 241;
+pub const __NR_mremap: usize = 25;
+pub const __NR_msgctl: usize = 71;
+pub const __NR_msgget: usize = 68;
+pub const __NR_msgrcv: usize = 70;
+pub const __NR_msgsnd: usize = 69;
+pub const __NR_msync: usize = 26;
+pub const __NR_munlock: usize = 150;
+pub const __NR_munlockall: usize = 152;
+pub const __NR_munmap: usize = 11;
+pub const __NR_name_to_handle_at: usize = 303;
+pub const __NR_nanosleep: usize = 35;
+pub const __NR_newfstatat: usize = 262;
+pub const __NR_nfsservctl: usize = 180;
+pub const __NR_open: usize = 2;
+pub const __NR_open_by_handle_at: usize = 304;
+pub const __NR_open_tree: usize = 428;
+pub const __NR_openat: usize = 257;
+pub const __NR_openat2: usize = 437;
+pub const __NR_pause: usize = 34;
+pub const __NR_perf_event_open: usize = 298;
+pub const __NR_personality: usize = 135;
+pub const __NR_pidfd_getfd: usize = 438;
+pub const __NR_pidfd_open: usize = 434;
+pub const __NR_pidfd_send_signal: usize = 424;
+pub const __NR_pipe: usize = 22;
+pub const __NR_pipe2: usize = 293;
+pub const __NR_pivot_root: usize = 155;
+pub const __NR_pkey_alloc: usize = 330;
+pub const __NR_pkey_free: usize = 331;
+pub const __NR_pkey_mprotect: usize = 329;
+pub const __NR_poll: usize = 7;
+pub const __NR_ppoll: usize = 271;
+pub const __NR_prctl: usize = 157;
+pub const __NR_pread64: usize = 17;
+pub const __NR_preadv: usize = 295;
+pub const __NR_preadv2: usize = 327;
+pub const __NR_prlimit64: usize = 302;
+pub const __NR_process_madvise: usize = 440;
+pub const __NR_process_vm_readv: usize = 310;
+pub const __NR_process_vm_writev: usize = 311;
+pub const __NR_pselect6: usize = 270;
+pub const __NR_ptrace: usize = 101;
+pub const __NR_putpmsg: usize = 182;
+pub const __NR_pwrite64: usize = 18;
+pub const __NR_pwritev: usize = 296;
+pub const __NR_pwritev2: usize = 328;
+pub const __NR_query_module: usize = 178;
+pub const __NR_quotactl: usize = 179;
+pub const __NR_read: usize = 0;
+pub const __NR_readahead: usize = 187;
+pub const __NR_readlink: usize = 89;
+pub const __NR_readlinkat: usize = 267;
+pub const __NR_readv: usize = 19;
+pub const __NR_reboot: usize = 169;
+pub const __NR_recvfrom: usize = 45;
+pub const __NR_recvmmsg: usize = 299;
+pub const __NR_recvmsg: usize = 47;
+pub const __NR_remap_file_pages: usize = 216;
+pub const __NR_removexattr: usize = 197;
+pub const __NR_rename: usize = 82;
+pub const __NR_renameat: usize = 264;
+pub const __NR_renameat2: usize = 316;
+pub const __NR_request_key: usize = 249;
+pub const __NR_restart_syscall: usize = 219;
+pub const __NR_rmdir: usize = 84;
+pub const __NR_rseq: usize = 334;
+pub const __NR_rt_sigaction: usize = 13;
+pub const __NR_rt_sigpending: usize = 127;
+pub const __NR_rt_sigprocmask: usize = 14;
+pub const __NR_rt_sigqueueinfo: usize = 129;
+pub const __NR_rt_sigreturn: usize = 15;
+pub const __NR_rt_sigsuspend: usize = 130;
+pub const __NR_rt_sigtimedwait: usize = 128;
+pub const __NR_rt_tgsigqueueinfo: usize = 297;
+pub const __NR_sched_get_priority_max: usize = 146;
+pub const __NR_sched_get_priority_min: usize = 147;
+pub const __NR_sched_getaffinity: usize = 204;
+pub const __NR_sched_getattr: usize = 315;
+pub const __NR_sched_getparam: usize = 143;
+pub const __NR_sched_getscheduler: usize = 145;
+pub const __NR_sched_rr_get_interval: usize = 148;
+pub const __NR_sched_setaffinity: usize = 203;
+pub const __NR_sched_setattr: usize = 314;
+pub const __NR_sched_setparam: usize = 142;
+pub const __NR_sched_setscheduler: usize = 144;
+pub const __NR_sched_yield: usize = 24;
+pub const __NR_seccomp: usize = 317;
+pub const __NR_security: usize = 185;
+pub const __NR_select: usize = 23;
+pub const __NR_semctl: usize = 66;
+pub const __NR_semget: usize = 64;
+pub const __NR_semop: usize = 65;
+pub const __NR_semtimedop: usize = 220;
+pub const __NR_sendfile: usize = 40;
+pub const __NR_sendmmsg: usize = 307;
+pub const __NR_sendmsg: usize = 46;
+pub const __NR_sendto: usize = 44;
+pub const __NR_set_mempolicy: usize = 238;
+pub const __NR_set_robust_list: usize = 273;
+pub const __NR_set_thread_area: usize = 205;
+pub const __NR_set_tid_address: usize = 218;
+pub const __NR_setdomainname: usize = 171;
+pub const __NR_setfsgid: usize = 123;
+pub const __NR_setfsuid: usize = 122;
+pub const __NR_setgid: usize = 106;
+pub const __NR_setgroups: usize = 116;
+pub const __NR_sethostname: usize = 170;
+pub const __NR_setitimer: usize = 38;
+pub const __NR_setns: usize = 308;
+pub const __NR_setpgid: usize = 109;
+pub const __NR_setpriority: usize = 141;
+pub const __NR_setregid: usize = 114;
+pub const __NR_setresgid: usize = 119;
+pub const __NR_setresuid: usize = 117;
+pub const __NR_setreuid: usize = 113;
+pub const __NR_setrlimit: usize = 160;
+pub const __NR_setsid: usize = 112;
+pub const __NR_setsockopt: usize = 54;
+pub const __NR_settimeofday: usize = 164;
+pub const __NR_setuid: usize = 105;
+pub const __NR_setxattr: usize = 188;
+pub const __NR_shmat: usize = 30;
+pub const __NR_shmctl: usize = 31;
+pub const __NR_shmdt: usize = 67;
+pub const __NR_shmget: usize = 29;
+pub const __NR_shutdown: usize = 48;
+pub const __NR_sigaltstack: usize = 131;
+pub const __NR_signalfd: usize = 282;
+pub const __NR_signalfd4: usize = 289;
+pub const __NR_socket: usize = 41;
+pub const __NR_socketpair: usize = 53;
+pub const __NR_splice: usize = 275;
+pub const __NR_stat: usize = 4;
+pub const __NR_statfs: usize = 137;
+pub const __NR_statx: usize = 332;
+pub const __NR_swapoff: usize = 168;
+pub const __NR_swapon: usize = 167;
+pub const __NR_symlink: usize = 88;
+pub const __NR_symlinkat: usize = 266;
+pub const __NR_sync: usize = 162;
+pub const __NR_sync_file_range: usize = 277;
+pub const __NR_syncfs: usize = 306;
+pub const __NR_sysfs: usize = 139;
+pub const __NR_sysinfo: usize = 99;
+pub const __NR_syslog: usize = 103;
+pub const __NR_tee: usize = 276;
+pub const __NR_tgkill: usize = 234;
+pub const __NR_time: usize = 201;
+pub const __NR_timer_create: usize = 222;
+pub const __NR_timer_delete: usize = 226;
+pub const __NR_timer_getoverrun: usize = 225;
+pub const __NR_timer_gettime: usize = 224;
+pub const __NR_timer_settime: usize = 223;
+pub const __NR_timerfd_create: usize = 283;
+pub const __NR_timerfd_gettime: usize = 287;
+pub const __NR_timerfd_settime: usize = 286;
+pub const __NR_times: usize = 100;
+pub const __NR_tkill: usize = 200;
+pub const __NR_truncate: usize = 76;
+pub const __NR_tuxcall: usize = 184;
+pub const __NR_umask: usize = 95;
+pub const __NR_umount2: usize = 166;
+pub const __NR_uname: usize = 63;
+pub const __NR_unlink: usize = 87;
+pub const __NR_unlinkat: usize = 263;
+pub const __NR_unshare: usize = 272;
+pub const __NR_uselib: usize = 134;
+pub const __NR_userfaultfd: usize = 323;
+pub const __NR_ustat: usize = 136;
+pub const __NR_utime: usize = 132;
+pub const __NR_utimensat: usize = 280;
+pub const __NR_utimes: usize = 235;
+pub const __NR_vfork: usize = 58;
+pub const __NR_vhangup: usize = 153;
+pub const __NR_vmsplice: usize = 278;
+pub const __NR_vserver: usize = 236;
+pub const __NR_wait4: usize = 61;
+pub const __NR_waitid: usize = 247;
+pub const __NR_write: usize = 1;
+pub const __NR_writev: usize = 20;
diff --git a/recipes/core/relibc/src/header/sys_syslog/cbindgen.toml b/recipes/core/relibc/src/header/sys_syslog/cbindgen.toml
new file mode 100644
index 0000000000..9f62d1a556
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_syslog/cbindgen.toml
@@ -0,0 +1,11 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/syslog.h.html
+#
+# There are no spec quotations relating to includes
+include_guard = "_RELIBC_SYS_SYSLOG_H"
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_syslog/linux.rs b/recipes/core/relibc/src/header/sys_syslog/linux.rs
new file mode 100644
index 0000000000..6c4731d2c2
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_syslog/linux.rs
@@ -0,0 +1,74 @@
+use crate::{
+    error::{Errno, Result},
+    fs::File,
+    header::{
+        sys_socket::{
+            connect,
+            constants::{AF_UNIX, SOCK_CLOEXEC, SOCK_DGRAM},
+            sockaddr, socket,
+        },
+        sys_un::sockaddr_un,
+        unistd::close,
+    },
+    io::BufWriter,
+    platform::ERRNO,
+};
+
+use super::logger::LogSink;
+
+/// Unix Domain Socket connected to /dev/log.
+pub struct LogFile(BufWriter<File>);
+
+impl LogSink for LogFile {
+    type Sink = BufWriter<File>;
+
+    fn open() -> Result<Self>
+    where
+        Self: Sized,
+    {
+        let log_addr = {
+            let path = c"/dev/log";
+            let mut sockaddr: sockaddr_un = unsafe { core::mem::zeroed() };
+            sockaddr.sun_family = AF_UNIX as _;
+            unsafe {
+                core::ptr::copy_nonoverlapping(
+                    path.as_ptr(),
+                    sockaddr.sun_path.as_mut_ptr(),
+                    path.count_bytes(),
+                )
+            };
+            path
+        };
+        let log_fd = {
+            let result = unsafe { socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0) };
+            if result > 0 {
+                Ok(result)
+            } else {
+                Err(Errno(ERRNO.get()))
+            }
+        }?;
+
+        // SAFETY:
+        // * connect handles invalid descriptors.
+        // * log_addr is a sockaddr_un so the size is correct.
+        if unsafe {
+            connect(
+                log_fd,
+                (&raw const log_addr).cast::<sockaddr>(),
+                size_of::<sockaddr_un>() as u32,
+            ) < 0
+        } {
+            // In case close sets ERRNO.
+            let e = ERRNO.get();
+            close(log_fd);
+            return Err(Errno(e));
+        }
+
+        Ok(Self(BufWriter::new(File::new(log_fd))))
+    }
+
+    #[inline(always)]
+    fn writer(&mut self) -> &mut Self::Sink {
+        &mut self.0
+    }
+}
diff --git a/recipes/core/relibc/src/header/sys_syslog/logger.rs b/recipes/core/relibc/src/header/sys_syslog/logger.rs
new file mode 100644
index 0000000000..9a9f09c0be
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_syslog/logger.rs
@@ -0,0 +1,274 @@
+use alloc::{borrow::ToOwned, string::String};
+use core::{ffi::VaList, ptr::null_mut};
+
+use crate::{
+    c_str::CStr,
+    error::Result,
+    header::{
+        stdio::{fprintf, printf::printf, stderr},
+        time::time,
+        unistd::getpid,
+    },
+    io::Write,
+    platform::{
+        self,
+        types::{c_char, c_int},
+    },
+    sync::Mutex,
+};
+
+use bitflags::bitflags;
+use chrono::{DateTime, Utc};
+
+use super::{
+    LOG_ALERT, LOG_AUTH, LOG_AUTHPRIV, LOG_CONS, LOG_CRIT, LOG_CRON, LOG_DAEMON, LOG_DEBUG,
+    LOG_EMERG, LOG_ERR, LOG_FTP, LOG_INFO, LOG_KERN, LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2,
+    LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, LOG_MASK,
+    LOG_NDELAY, LOG_NEWS, LOG_NOTICE, LOG_NOWAIT, LOG_ODELAY, LOG_PERROR, LOG_PID, LOG_SYSLOG,
+    LOG_UPTO, LOG_USER, LOG_UUCP, LOG_WARNING, sys::LogFile,
+};
+
+pub(super) static LOGGER: Mutex<LogParams<LogFile>> = Mutex::new(LogParams::new(None));
+
+pub(super) struct LogParams<L: LogSink> {
+    /// Identity prepended to each log message. POSIX does not specific what to do when it's empty,
+    /// but the program name is a common default.
+    ident: String,
+    pub opt: Config,
+    pub mask: Priority,
+    writer: Option<L>,
+}
+
+impl<L: LogSink> LogParams<L> {
+    pub const fn new(writer: Option<L>) -> Self {
+        LogParams {
+            ident: String::new(),
+            opt: Config::DelayOpen,
+            mask: Priority::from_bits_truncate(Priority::User.bits() | Priority::UpToDebug.bits()),
+            writer,
+        }
+    }
+
+    pub fn write_log(&mut self, priority: Priority, message: CStr<'_>, ap: VaList) {
+        if message.is_empty() {
+            return;
+        }
+        if self.ident.is_empty() {
+            self.set_identity(None);
+        }
+
+        let epoch = unsafe { time(null_mut()) };
+        let currtime: DateTime<Utc> = DateTime::from_timestamp(epoch, 0).unwrap_or_default();
+        let currtime_s = currtime.format("%b %e %T %Y");
+        let pid = self.opt.contains(Config::Pid).then(|| getpid());
+
+        // journald from systemd rewrites log messages from syslog into its own style. We'll
+        // still use the same style as other libc even though it's implementation specific.
+        let mut buffer = if let Some(pid) = pid {
+            format!(
+                "<{}>{} {}{}: ",
+                priority.bits(),
+                currtime_s,
+                self.ident,
+                pid
+            )
+            .into_bytes()
+        } else {
+            format!("<{}>{} {}: ", priority.bits(), currtime_s, self.ident).into_bytes()
+        };
+        let prefix = buffer.len();
+
+        // SAFETY:
+        // * Assumes caller passed in a valid C string; printf should handle that invariant.
+        // * `buffer` grows to fit the formatted string.
+        unsafe { printf(&mut buffer, message, ap) };
+        buffer.extend(b"\n\0");
+
+        if self.maybe_open_logger().is_ok()
+            && self
+                .writer
+                .as_mut()
+                .map(|w| w.writer().write_all(&buffer).is_err())
+                .unwrap_or(true)
+        {
+            // Try reopening the log file once and retrying as musl does.
+            if !self
+                .open_logger()
+                .is_ok()
+                .then(|| {
+                    self.writer
+                        .as_mut()
+                        .map(|w| w.writer().write_all(&buffer).is_ok())
+                        .unwrap_or_default()
+                })
+                .unwrap_or_default()
+                && self.opt.contains(Config::Console)
+            {
+                // TODO: Log error to /dev/console & Redox equivalent
+            }
+        }
+        if self.opt.contains(Config::PError) {
+            // SAFETY:
+            // * `ident` is a valid byte string that is NUL terminated when set.
+            // * `buffer` is a valid byte string that is NUL terminated above.
+            unsafe {
+                // musl and glibc only print the message rather than the prefix + message to stderr
+                fprintf(
+                    stderr,
+                    c"%s: %s".as_ptr(),
+                    self.ident.as_ptr().cast::<c_char>(),
+                    buffer[prefix..].as_ptr().cast::<c_char>(),
+                );
+            }
+        }
+    }
+
+    /// Set or clear log identity from a C string.
+    ///
+    /// Null or empty identities are valid as it just resets the global ident.
+    pub fn set_identity_cstr(&mut self, ident: Option<CStr<'_>>) {
+        let ident = ident
+            .and_then(|ident| (!ident.is_empty()).then(|| ident.to_str().ok()))
+            .flatten();
+        self.set_identity(ident);
+    }
+
+    /// Set or clear log identity.
+    ///
+    /// The log identity is prepended to each message. If unset, the program name will be used as a
+    /// default.
+    pub fn set_identity(&mut self, ident: Option<&str>) {
+        self.ident = ident
+            .and_then(|ident| {
+                let ident = ident.bytes().chain([0]).collect();
+                // SAFETY: Already validated
+                Some(unsafe { String::from_utf8_unchecked(ident) })
+            })
+            .unwrap_or_else(|| {
+                unsafe { CStr::from_nullable_ptr(platform::program_invocation_short_name) }
+                    .and_then(|name| {
+                        let name = name.to_str().ok()?.bytes().chain([0]).collect();
+                        // SAFETY: Validated above
+                        Some(unsafe { String::from_utf8_unchecked(name) })
+                    })
+                    .unwrap_or_else(|| "\0".to_owned())
+            });
+    }
+
+    /// Open the internal [`LogFile`] if it's not open.
+    pub fn maybe_open_logger(&mut self) -> Result<()> {
+        if self.writer.is_none() {
+            self.open_logger()
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Open or reopen the internal [`LogFile`].
+    pub fn open_logger(&mut self) -> Result<()> {
+        L::open().map(|file| {
+            self.writer.replace(file);
+        })
+    }
+
+    /// Close the open writer to the system logger (optional).
+    pub fn close(&mut self) {
+        self.writer.take();
+    }
+}
+
+/// Operating system specific log handling.
+pub(super) trait LogSink {
+    type Sink: Write;
+
+    fn open() -> Result<Self>
+    where
+        Self: Sized;
+
+    fn writer(&mut self) -> &mut Self::Sink;
+}
+
+bitflags! {
+    #[derive(Clone, Copy)]
+    pub struct Config: c_int {
+        const Pid = LOG_PID;
+        const Console = LOG_CONS;
+        const DelayOpen = LOG_ODELAY;
+        const NoDelay = LOG_NDELAY;
+        const NoWait = LOG_NOWAIT;
+        const PError = LOG_PERROR;
+    }
+}
+
+bitflags! {
+    /// Packed Facility-Priority bit field.
+    #[derive(Clone, Copy)]
+    pub struct Priority: c_int {
+        const Emerg = LOG_EMERG;
+        const Alert = LOG_ALERT;
+        const Crit = LOG_CRIT;
+        const Err = LOG_ERR;
+        const Warn = LOG_WARNING;
+        const Notice = LOG_NOTICE;
+        const Info = LOG_INFO;
+        const Debug = LOG_DEBUG;
+
+        const UpToEmerg = LOG_UPTO(LOG_EMERG);
+        const UpToAlert = LOG_UPTO(LOG_ALERT);
+        const UpToCrit = LOG_UPTO(LOG_CRIT);
+        const UpToErr = LOG_UPTO(LOG_ERR);
+        const UpToWarn = LOG_UPTO(LOG_WARNING);
+        const UpToNotice = LOG_UPTO(LOG_NOTICE);
+        const UpToInfo = LOG_UPTO(LOG_INFO);
+        const UpToDebug = LOG_UPTO(LOG_DEBUG);
+
+        const Kern = LOG_KERN;
+        const User = LOG_USER;
+        const Mail = LOG_MAIL;
+        const Daemon = LOG_DAEMON;
+        const Auth = LOG_AUTH;
+        const Syslog = LOG_SYSLOG;
+        const Printer = LOG_LPR;
+        const News = LOG_NEWS;
+        const UUCP = LOG_UUCP;
+        const CRON = LOG_CRON;
+        const AuthPriv = LOG_AUTHPRIV;
+        const FTP = LOG_FTP;
+        const Local0 = LOG_LOCAL0;
+        const Local1 = LOG_LOCAL1;
+        const Local2 = LOG_LOCAL2;
+        const Local3 = LOG_LOCAL3;
+        const Local4 = LOG_LOCAL4;
+        const Local5 = LOG_LOCAL5;
+        const Local6 = LOG_LOCAL6;
+        const Local7 = LOG_LOCAL7;
+
+        // Internal constants for extracting facility or priority from a packed bitfield.
+        const FacilityMask = 0x3ff;
+        const PriorityMask = !Self::FacilityMask.bits();
+    }
+}
+
+impl Priority {
+    /// Keep facility but replace severity mask.
+    pub fn with_mask(self, mask: c_int) -> Option<Self> {
+        // Fail on invalid bits and drop invalid facility bits.
+        let mask = Self::from_bits(mask)? & Self::FacilityMask;
+        let facility = self & Self::PriorityMask;
+        Some(mask | facility)
+    }
+
+    /// Keep mask but replace facility.
+    pub fn with_facility(self, facility: c_int) -> Option<Self> {
+        // Fail on invalid bits and drop invalid priority bits.
+        let facility = Self::from_bits(facility)? & Self::PriorityMask;
+        let mask = self & Self::FacilityMask;
+        Some(mask | facility)
+    }
+
+    /// Returns if a message of `priority` should be retained by this mask.
+    pub fn should_log(self, priority: Self) -> bool {
+        (self & Self::FacilityMask)
+            .contains(Priority::from_bits_truncate(LOG_MASK(priority.bits())))
+    }
+}
diff --git a/recipes/core/relibc/src/header/sys_syslog/mod.rs b/recipes/core/relibc/src/header/sys_syslog/mod.rs
new file mode 100644
index 0000000000..9aea6ed58a
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_syslog/mod.rs
@@ -0,0 +1,146 @@
+//! `syslog.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/syslog.h.html>.
+
+// Exported as both syslog.h and sys/syslog.h.
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+pub mod sys;
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+pub mod sys;
+
+pub mod logger;
+
+use core::ffi::VaList;
+
+use crate::{
+    c_str::CStr,
+    platform::types::{c_char, c_int},
+};
+use logger::{LOGGER, Priority};
+
+/// Record the caller's PID in log messages.
+pub const LOG_PID: c_int = 0x01;
+/// Write to /dev/console if [`syslog`] fails.
+pub const LOG_CONS: c_int = 0x02;
+/// Open the log on the first call to [`syslog`] rather than opening it early.
+/// This is the default behavior and setting or unsetting this option does nothing.
+pub const LOG_ODELAY: c_int = 0x04;
+/// Open the log file immediately.
+pub const LOG_NDELAY: c_int = 0x08;
+pub const LOG_NOWAIT: c_int = 0x10;
+/// Print log message to stderr as well as the log.
+pub const LOG_PERROR: c_int = 0x20;
+
+pub const LOG_KERN: c_int = 0 << 3;
+pub const LOG_USER: c_int = 1 << 3;
+pub const LOG_MAIL: c_int = 2 << 3;
+pub const LOG_DAEMON: c_int = 3 << 3;
+pub const LOG_AUTH: c_int = 4 << 3;
+pub const LOG_SYSLOG: c_int = 5 << 3;
+pub const LOG_LPR: c_int = 6 << 3;
+pub const LOG_NEWS: c_int = 7 << 3;
+pub const LOG_UUCP: c_int = 8 << 3;
+pub const LOG_CRON: c_int = 9 << 3;
+pub const LOG_AUTHPRIV: c_int = 10 << 3;
+pub const LOG_FTP: c_int = 11 << 3;
+
+pub const LOG_LOCAL0: c_int = 16 << 3;
+pub const LOG_LOCAL1: c_int = 17 << 3;
+pub const LOG_LOCAL2: c_int = 18 << 3;
+pub const LOG_LOCAL3: c_int = 19 << 3;
+pub const LOG_LOCAL4: c_int = 20 << 3;
+pub const LOG_LOCAL5: c_int = 21 << 3;
+pub const LOG_LOCAL6: c_int = 22 << 3;
+pub const LOG_LOCAL7: c_int = 23 << 3;
+pub const LOG_NFACILITIES: c_int = 24;
+
+// Priorities
+pub const LOG_EMERG: c_int = 0;
+pub const LOG_ALERT: c_int = 1;
+pub const LOG_CRIT: c_int = 2;
+pub const LOG_ERR: c_int = 3;
+pub const LOG_WARNING: c_int = 4;
+pub const LOG_NOTICE: c_int = 5;
+pub const LOG_INFO: c_int = 6;
+pub const LOG_DEBUG: c_int = 7;
+
+/// Create a mask that includes all levels up to a certain priority.
+#[unsafe(no_mangle)]
+pub const extern "C" fn LOG_UPTO(p: c_int) -> c_int {
+    (1 << (p + 1)) - 1
+}
+
+/// Create a mask that enables a single priority.
+#[unsafe(no_mangle)]
+pub const extern "C" fn LOG_MASK(p: c_int) -> c_int {
+    1 << p
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/closelog.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setlogmask(mask: c_int) -> c_int {
+    let mut params = LOGGER.lock();
+    let old = params.mask.bits();
+    if mask != 0
+        && let Some(mask) = params.mask.with_mask(mask)
+    {
+        params.mask = mask;
+    }
+    old
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/closelog.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn openlog(ident: *const c_char, opt: c_int, facility: c_int) {
+    let ident = unsafe { CStr::from_nullable_ptr(ident) };
+    let conf = logger::Config::from_bits_truncate(opt);
+
+    let mut params = LOGGER.lock();
+    params.set_identity_cstr(ident);
+    params.opt = conf;
+    params.mask = params.mask.with_facility(facility).unwrap_or(
+        params
+            .mask
+            .with_facility(Priority::User.bits())
+            .expect("`User` is a valid syslog facility"),
+    );
+
+    // Ensure log is ready to write now instead of checking on the first message.
+    if conf.contains(logger::Config::NoDelay)
+        && let Ok(()) = params.open_logger()
+    {}; // TODO handle error
+}
+
+/// See <https://www.man7.org/linux/man-pages/man3/vsyslog.3.html>.
+///
+/// Non-POSIX, 4.3BSD-Reno.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vsyslog(priority: c_int, message: *const c_char, ap: VaList) {
+    let Some(message) = (unsafe { CStr::from_nullable_ptr(message) }) else {
+        return;
+    };
+    let Some(priority) = Priority::from_bits(priority) else {
+        return;
+    };
+
+    let mut logger = LOGGER.lock();
+    if logger.mask.should_log(priority) {
+        logger.write_log(priority, message, ap);
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/closelog.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn syslog(priority: c_int, message: *const c_char, mut __valist: ...) {
+    unsafe { vsyslog(priority, message, __valist.as_va_list()) };
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/closelog.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn closelog() {
+    LOGGER.lock().close();
+}
diff --git a/recipes/core/relibc/src/header/sys_syslog/redox.rs b/recipes/core/relibc/src/header/sys_syslog/redox.rs
new file mode 100644
index 0000000000..c396224e6a
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_syslog/redox.rs
@@ -0,0 +1,20 @@
+use crate::{error::Result, fs::File, header::fcntl, io::BufWriter};
+
+use super::logger::LogSink;
+
+/// Write logs to Redox's log scheme.
+pub struct LogFile(BufWriter<File>);
+
+impl LogSink for LogFile {
+    type Sink = BufWriter<File>;
+
+    #[inline(always)]
+    fn open() -> Result<Self> {
+        File::open(c"/scheme/log".into(), fcntl::O_WRONLY).map(|file| Self(BufWriter::new(file)))
+    }
+
+    #[inline(always)]
+    fn writer(&mut self) -> &mut Self::Sink {
+        &mut self.0
+    }
+}
diff --git a/recipes/core/relibc/src/header/sys_time/cbindgen.toml b/recipes/core/relibc/src/header/sys_time/cbindgen.toml
new file mode 100644
index 0000000000..9e28d70f11
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_time/cbindgen.toml
@@ -0,0 +1,36 @@
+# sys/types.h brings in features.h (needed for #[deprecated] annotations)
+sys_includes = ["sys/types.h", "sys/select.h"]
+include_guard = "_SYS_TIME_H"
+language = "C"
+after_includes = """
+#include <bits/timespec.h> // for timespec
+
+#define timeradd(x,y,res) (void) (\
+        (res)->tv_sec = (x)->tv_sec + (y)->tv_sec + (((x)->tv_usec + (y)->tv_usec) / 1000000), \
+        (res)->tv_usec = ((x)->tv_usec + (y)->tv_usec) % 1000000 \
+    )
+#define timersub(x,y,res) (void) ( \
+        (res)->tv_sec = (x)->tv_sec - (y)->tv_sec, \
+        (res)->tv_usec = ((x)->tv_usec - (y)->tv_usec), \
+        ((res)->tv_usec < 0) && ((res)->tv_sec -= 1, (res)->tv_usec += 1000000) \
+    )
+#define timerclear(t) (void) ( \
+        (t)->tv_sec = 0, \
+        (t)->tv_usec = 0 \
+    )
+#define timerisset(t) ((t)->tv_sec || (t)->tv_usec)
+#define timercmp(x,y,op) ((x)->tv_sec == (y)->tv_sec ? \
+    (x)->tv_usec op (y)->tv_usec \
+    : \
+    (x)->tv_sec op (y)->tv_sec)
+"""
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"timespec" = "struct timespec"
+"timeval" = "struct timeval"
diff --git a/recipes/core/relibc/src/header/sys_time/mod.rs b/recipes/core/relibc/src/header/sys_time/mod.rs
new file mode 100644
index 0000000000..43b27324a9
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_time/mod.rs
@@ -0,0 +1,145 @@
+//! `sys/time.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_time.h.html>.
+//!
+//! Note that since the Open Group Base Specifications Issue 8, the
+//! [`timeval`] struct has been moved to
+//! the [`sys/select.h`](crate::header::sys_select) header.
+
+use crate::{
+    c_str::CStr,
+    error::ResultExt,
+    header::{bits_timespec::timespec, sys_select::timeval},
+    out::Out,
+    platform::{
+        Pal, PalSignal, Sys,
+        types::{c_char, c_int, c_long},
+    },
+};
+use core::ptr::null;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_time.h.html>.
+///
+/// # Deprecation
+/// The `ITIMER_REAL` symbolic constant was marked obsolescent in the Open
+/// Group Base Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+pub const ITIMER_REAL: c_int = 0;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_time.h.html>.
+///
+/// # Deprecation
+/// The `ITIMER_VIRTUAL` symbolic constant was marked obsolescent in the Open
+/// Group Base Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+pub const ITIMER_VIRTUAL: c_int = 1;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_time.h.html>.
+///
+/// # Deprecation
+/// The `ITIMER_PROF` symbolic constant was marked obsolescent in the Open
+/// Group Base Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+pub const ITIMER_PROF: c_int = 2;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_time.h.html>.
+///
+/// # Deprecation
+/// The `itimerval` struct was marked obsolescent in the Open Group Base
+/// Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+#[repr(C)]
+#[derive(Default)]
+pub struct itimerval {
+    pub it_interval: timeval,
+    pub it_value: timeval,
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man2/gettimeofday.2.html>.
+#[repr(C)]
+#[derive(Default)]
+pub struct timezone {
+    pub tz_minuteswest: c_int,
+    pub tz_dsttime: c_int,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getitimer.html>.
+///
+/// # Deprecation
+/// The `getitimer()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+#[allow(deprecated)]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getitimer(which: c_int, value: *mut itimerval) -> c_int {
+    Sys::getitimer(which, unsafe { &mut *value })
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/gettimeofday.html>.
+///
+/// See also <https://www.man7.org/linux/man-pages/man2/gettimeofday.2.html>
+/// for further details on the `tzp` argument.
+///
+/// # Deprecation
+/// The `gettimeofday()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn gettimeofday(tp: *mut timeval, tzp: *mut timezone) -> c_int {
+    Sys::gettimeofday(unsafe { Out::nonnull(tp) }, unsafe { Out::nullable(tzp) })
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+// `select()` declared in `sys/select.h`, as specified in modern POSIX
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getitimer.html>.
+///
+/// # Deprecation
+/// The `setitimer()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+#[allow(deprecated)]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn setitimer(
+    which: c_int,
+    value: *const itimerval,
+    ovalue: *mut itimerval,
+) -> c_int {
+    // TODO setitimer is unimplemented on Redox
+    Sys::setitimer(which, unsafe { &*value }, unsafe { ovalue.as_mut() })
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/utimes.html>.
+///
+/// # Deprecation
+/// The `utimes()` function was marked legacy in the Open Group Base
+/// Specifications Issue 6, and then unmarked in Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn utimes(path: *const c_char, times: *const timeval) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    // Nullptr is valid here, it means "use current time"
+    let times_spec = if times.is_null() {
+        null()
+    } else {
+        [
+            timespec {
+                tv_sec: unsafe { (*times.offset(0)).tv_sec },
+                tv_nsec: c_long::from(unsafe { (*times.offset(0)).tv_usec }) * 1000,
+            },
+            timespec {
+                tv_sec: unsafe { (*times.offset(1)).tv_sec },
+                tv_nsec: c_long::from(unsafe { (*times.offset(1)).tv_usec }) * 1000,
+            },
+        ]
+        .as_ptr()
+    };
+    unsafe { Sys::utimens(path, times_spec) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/sys_timeb/cbindgen.toml b/recipes/core/relibc/src/header/sys_timeb/cbindgen.toml
new file mode 100644
index 0000000000..95e95fd8fb
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_timeb/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = ["sys/types.h"]
+include_guard = "_SYS_TIMEB_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_timeb/mod.rs b/recipes/core/relibc/src/header/sys_timeb/mod.rs
new file mode 100644
index 0000000000..8935f5b474
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_timeb/mod.rs
@@ -0,0 +1,64 @@
+//! `sys/timeb.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/timeb.h.html>.
+//!
+//! # Deprecation
+//! The `ftime()` function was marked as legacy in the Open Group Base
+//! Specifications Issue 6, and the entire `sys/timeb.h` header was removed in
+//! Issue 7.
+
+use core::ptr::NonNull;
+
+#[allow(deprecated)]
+use crate::header::sys_time::gettimeofday;
+use crate::{
+    header::{sys_select::timeval, sys_time::timezone},
+    platform::types::{c_int, c_short, c_ushort, time_t},
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/timeb.h.html>.
+#[deprecated]
+#[repr(C)]
+#[derive(Default)]
+pub struct timeb {
+    pub time: time_t,
+    pub millitm: c_ushort,
+    pub timezone: c_short,
+    pub dstflag: c_short,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/ftime.html>.
+///
+/// # Safety
+/// The caller must ensure that `tp` is convertible to a `&mut
+/// MaybeUninit<timeb>`.
+#[deprecated]
+#[allow(deprecated)]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ftime(tp: *mut timeb) -> c_int {
+    // SAFETY: the caller is required to ensure that the pointer is valid.
+    let tp_maybe_uninit = unsafe { NonNull::new_unchecked(tp).as_uninit_mut() };
+
+    let mut tv = timeval::default();
+    let mut tz = timezone::default();
+
+    // SAFETY: tv and tz are created above, and thus will coerce to valid
+    // pointers.
+    if unsafe {
+        #[allow(deprecated)]
+        gettimeofday(&raw mut tv, &raw mut tz)
+    } < 0
+    {
+        return -1;
+    }
+
+    #[allow(deprecated)]
+    tp_maybe_uninit.write(timeb {
+        time: tv.tv_sec,
+        millitm: (tv.tv_usec / 1000) as c_ushort,
+        timezone: tz.tz_minuteswest as c_short,
+        dstflag: tz.tz_dsttime as c_short,
+    });
+
+    0
+}
diff --git a/recipes/core/relibc/src/header/sys_times/cbindgen.toml b/recipes/core/relibc/src/header/sys_times/cbindgen.toml
new file mode 100644
index 0000000000..fe95544def
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_times/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = ["sys/types.h"]
+include_guard = "_SYS_TIMES_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_times/mod.rs b/recipes/core/relibc/src/header/sys_times/mod.rs
new file mode 100644
index 0000000000..8149f352bf
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_times/mod.rs
@@ -0,0 +1,21 @@
+//! `sys/times.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_times.h.html>.
+
+use crate::platform;
+use platform::{Pal, Sys, types::clock_t};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_times.h.html>.
+#[repr(C)]
+pub struct tms {
+    tms_utime: clock_t,
+    tms_stime: clock_t,
+    tms_cutime: clock_t,
+    tms_cstime: clock_t,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/times.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn times(out: *mut tms) -> clock_t {
+    Sys::times(out)
+}
diff --git a/recipes/core/relibc/src/header/sys_types/cbindgen.toml b/recipes/core/relibc/src/header/sys_types/cbindgen.toml
new file mode 100644
index 0000000000..f0a2d8c655
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_types/cbindgen.toml
@@ -0,0 +1,24 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_types.h.html
+#
+# There are no spec quotations relating to includes
+#
+# - sys/types_internal.h are fundamental C types (which includes stddef.h)
+# - bits/pthread.h is separate for convenience
+# - features.h saves importing separately for any header that imports sys/types.h
+#
+# no default C includes - they cause recursive dependencies and do weird stuff
+no_includes = true
+sys_includes = [
+    # Import most necessary, internal types first
+    "sys/types/internal.h",
+
+    "bits/pthread.h",
+    "features.h",
+]
+
+include_guard = "_SYS_TYPES_H"
+language = "C"
+style = "Tag"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_types/mod.rs b/recipes/core/relibc/src/header/sys_types/mod.rs
new file mode 100644
index 0000000000..601f262aac
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_types/mod.rs
@@ -0,0 +1,8 @@
+//! `sys/types.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_types.h.html>.
+//!
+//! Note that the `useconds_t` type provided in the `sys/types.h` header was
+//! removed in the Open Group Base Specifications Issue 7, see
+//! <https://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/types.h.html>
+//! for the old specification.
diff --git a/recipes/core/relibc/src/header/sys_types_internal/cbindgen.toml b/recipes/core/relibc/src/header/sys_types_internal/cbindgen.toml
new file mode 100644
index 0000000000..9bf86018ec
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_types_internal/cbindgen.toml
@@ -0,0 +1,45 @@
+sys_includes = ["stddef.h"]
+# TODO: figure out how to export void* type
+after_includes = """
+
+typedef void* timer_t;
+"""
+include_guard = "_RELIBC_SYS_TYPES_INTERNAL_H"
+language = "C"
+style = "Type"
+no_includes = true
+
+[export]
+include = [
+  "blksize_t",
+  "dev_t",
+  "ino_t",
+  "reclen_t",
+  "gid_t",
+  "uid_t",
+  "mode_t",
+  "nlink_t",
+  "off_t",
+  "pid_t",
+  "id_t",
+  "ssize_t",
+  "time_t",
+  "useconds_t",
+  "suseconds_t",
+  "clock_t",
+  "clockid_t",
+  "blkcnt_t",
+  "fsblkcnt_t",
+  "fsfilcnt_t",
+  "u_char",
+  "uchar",
+  "u_short",
+  "ushort",
+  "u_int",
+  "uint",
+  "u_long",
+  "ulong",
+  "quad_t",
+  "u_quad_t",
+  "caddr_t"
+]
diff --git a/recipes/core/relibc/src/header/sys_types_internal/mod.rs b/recipes/core/relibc/src/header/sys_types_internal/mod.rs
new file mode 100644
index 0000000000..4c4cde7e9d
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_types_internal/mod.rs
@@ -0,0 +1,74 @@
+//! `sys/types.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_types.h.html>.
+//!
+//! Note that the `useconds_t` type provided in the `sys/types.h` header was
+//! removed in the Open Group Base Specifications Issue 7, see
+//! <https://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/types.h.html>
+//! for the old specification.
+
+use crate::platform::types::{
+    c_char, c_int, c_long, c_longlong, c_uchar, c_uint, c_ulong, c_ulonglong, c_ushort,
+};
+
+/// Used for block sizes.
+pub type blksize_t = c_long;
+/// Used for device IDs.
+pub type dev_t = c_ulonglong;
+/// Used for serial numbers.
+pub type ino_t = c_ulonglong;
+/// Used for directory entry lengths.
+pub type reclen_t = c_ushort;
+/// Used for group IDs.
+pub type gid_t = c_int;
+/// Used for user IDs.
+pub type uid_t = c_int;
+/// Used for some file attributes.
+pub type mode_t = c_int;
+/// Used for link counts.
+pub type nlink_t = c_ulong;
+/// Used for file sizes.
+pub type off_t = c_longlong;
+/// Used for process IDs and process group IDs.
+pub type pid_t = c_int;
+/// Used as a general identifier; can be used to contain at least a pid_t, uid_t, or gid_t.
+pub type id_t = c_uint;
+/// Used for a count of bytes or an error indication.
+pub type ssize_t = c_long;
+/// Used for time in seconds.
+pub type time_t = c_longlong;
+pub type useconds_t = c_uint;
+
+#[cfg(target_os = "linux")]
+/// Used for time in microseconds.
+pub type suseconds_t = c_long;
+#[cfg(not(target_os = "linux"))]
+/// Used for time in microseconds.
+pub type suseconds_t = c_int;
+
+/// Used for system times in clock ticks or CLOCKS_PER_SEC.
+pub type clock_t = c_long;
+/// Used for clock ID type in the clock and timer functions.
+pub type clockid_t = c_int;
+
+// timer_t in cbindgen after_includes (how to export void* type?)
+
+/// Used for file block counts.
+pub type blkcnt_t = c_longlong;
+
+/// Used for file system block counts.
+pub type fsblkcnt_t = c_ulong;
+/// Used for file system file counts.
+pub type fsfilcnt_t = c_ulong;
+
+pub type u_char = c_uchar;
+pub type uchar = c_uchar;
+pub type u_short = c_ushort;
+pub type ushort = c_ushort;
+pub type u_int = c_uint;
+pub type uint = c_uint;
+pub type u_long = c_ulong;
+pub type ulong = c_ulong;
+pub type quad_t = c_longlong;
+pub type u_quad_t = c_ulonglong;
+pub type caddr_t = *mut c_char;
diff --git a/recipes/core/relibc/src/header/sys_uio/cbindgen.toml b/recipes/core/relibc/src/header/sys_uio/cbindgen.toml
new file mode 100644
index 0000000000..f24e59d38a
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_uio/cbindgen.toml
@@ -0,0 +1,18 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_uio.h.html
+#
+# Spec quotations relating to includes:
+# - "The <sys/uio.h> header shall define the ssize_t and size_t types as described in <sys/types.h>."
+#
+# bits/iovec.h brings in sys/types.h
+sys_includes = ["bits/iovec.h"]
+include_guard = "_RELIBC_SYS_UIO_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"iovec" = "struct iovec"
diff --git a/recipes/core/relibc/src/header/sys_uio/mod.rs b/recipes/core/relibc/src/header/sys_uio/mod.rs
new file mode 100644
index 0000000000..1e3976ae76
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_uio/mod.rs
@@ -0,0 +1,92 @@
+//! `sys/uio.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_uio.h.html>.
+
+use core::slice;
+
+use crate::{
+    header::{
+        bits_iovec::{gather, iovec, scatter},
+        errno, unistd,
+    },
+    platform::{
+        self,
+        types::{c_int, c_void, off_t, ssize_t},
+    },
+};
+
+pub const IOV_MAX: c_int = 1024;
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man2/readv.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn preadv(
+    fd: c_int,
+    iov: *const iovec,
+    iovcnt: c_int,
+    offset: off_t,
+) -> ssize_t {
+    if !(0..=IOV_MAX).contains(&iovcnt) {
+        platform::ERRNO.set(errno::EINVAL);
+        return -1;
+    }
+
+    let iovs = unsafe { slice::from_raw_parts(iov, iovcnt as usize) };
+    let mut vec = unsafe { gather(iovs) };
+
+    let ret = unsafe { unistd::pread(fd, vec.as_mut_ptr().cast::<c_void>(), vec.len(), offset) };
+
+    unsafe { scatter(iovs, vec) };
+
+    ret
+}
+
+/// Non-POSIX, see <https://man7.org/linux/man-pages/man2/readv.2.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pwritev(
+    fd: c_int,
+    iov: *const iovec,
+    iovcnt: c_int,
+    offset: off_t,
+) -> ssize_t {
+    if !(0..=IOV_MAX).contains(&iovcnt) {
+        platform::ERRNO.set(errno::EINVAL);
+        return -1;
+    }
+
+    let iovs = unsafe { slice::from_raw_parts(iov, iovcnt as usize) };
+    let vec = unsafe { gather(iovs) };
+
+    unsafe { unistd::pwrite(fd, vec.as_ptr().cast::<c_void>(), vec.len(), offset) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/readv.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn readv(fd: c_int, iov: *const iovec, iovcnt: c_int) -> ssize_t {
+    if !(0..=IOV_MAX).contains(&iovcnt) {
+        platform::ERRNO.set(errno::EINVAL);
+        return -1;
+    }
+
+    let iovs = unsafe { slice::from_raw_parts(iov, iovcnt as usize) };
+    let mut vec = unsafe { gather(iovs) };
+
+    let ret = unsafe { unistd::read(fd, vec.as_mut_ptr().cast::<c_void>(), vec.len()) };
+
+    unsafe { scatter(iovs, vec) };
+
+    ret
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/writev.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn writev(fd: c_int, iov: *const iovec, iovcnt: c_int) -> ssize_t {
+    if !(0..=IOV_MAX).contains(&iovcnt) {
+        platform::ERRNO.set(errno::EINVAL);
+        return -1;
+    }
+
+    let iovs = unsafe { slice::from_raw_parts(iov, iovcnt as usize) };
+    let vec = unsafe { gather(iovs) };
+
+    unsafe { unistd::write(fd, vec.as_ptr().cast::<c_void>(), vec.len()) }
+}
diff --git a/recipes/core/relibc/src/header/sys_un/cbindgen.toml b/recipes/core/relibc/src/header/sys_un/cbindgen.toml
new file mode 100644
index 0000000000..d5ebca0687
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_un/cbindgen.toml
@@ -0,0 +1,19 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_un.h.html
+#
+# Spec quotations relating to includes:
+# - "The <sys/un.h> header shall define the sa_family_t type as described in <sys/socket.h>."
+sys_includes = []
+after_includes = """
+#include <bits/safamily-t.h> // for sa_family_t from sys/socket.h
+"""
+include_guard = "_RELIBC_SYS_UN_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[export]
+include = ["sockaddr_un"]
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_un/mod.rs b/recipes/core/relibc/src/header/sys_un/mod.rs
new file mode 100644
index 0000000000..2a5ab35a3f
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_un/mod.rs
@@ -0,0 +1,21 @@
+//! `sys/un.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_un.h.html>.
+
+use crate::{header::bits_safamily_t::sa_family_t, platform::types::c_char};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_un.h.html>.
+#[repr(C)]
+pub struct sockaddr_un {
+    pub sun_family: sa_family_t,
+    pub sun_path: [c_char; 108],
+}
+
+impl sockaddr_un {
+    pub fn path_offset(&self) -> usize {
+        let base = core::ptr::from_ref(self) as usize;
+        let path = &raw const self.sun_path as usize;
+        log::trace!("base: {:#X}, path: {:#X}", base, path);
+        path - base
+    }
+}
diff --git a/recipes/core/relibc/src/header/sys_utsname/cbindgen.toml b/recipes/core/relibc/src/header/sys_utsname/cbindgen.toml
new file mode 100644
index 0000000000..484e2d0c52
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_utsname/cbindgen.toml
@@ -0,0 +1,11 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_utsname.h.html
+#
+# There are no spec quotations relating to includes
+include_guard = "_SYS_UTSNAME_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_utsname/mod.rs b/recipes/core/relibc/src/header/sys_utsname/mod.rs
new file mode 100644
index 0000000000..49653883e1
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_utsname/mod.rs
@@ -0,0 +1,34 @@
+//! `sys/utsname.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_utsname.h.html>.
+
+use crate::{
+    error::ResultExt,
+    out::Out,
+    platform::{
+        Pal, Sys,
+        types::{c_char, c_int},
+    },
+};
+
+pub const UTSLENGTH: usize = 65;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_utsname.h.html>.
+#[repr(C)]
+#[derive(Clone, Debug, OutProject)]
+pub struct utsname {
+    pub sysname: [c_char; UTSLENGTH],
+    pub nodename: [c_char; UTSLENGTH],
+    pub release: [c_char; UTSLENGTH],
+    pub version: [c_char; UTSLENGTH],
+    pub machine: [c_char; UTSLENGTH],
+    pub domainname: [c_char; UTSLENGTH],
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/uname.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn uname(uts: *mut utsname) -> c_int {
+    Sys::uname(unsafe { Out::nonnull(uts) })
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/sys_wait/cbindgen.toml b/recipes/core/relibc/src/header/sys_wait/cbindgen.toml
new file mode 100644
index 0000000000..fc45e7bbc8
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_wait/cbindgen.toml
@@ -0,0 +1,20 @@
+sys_includes = ["sys/types.h", "sys/resource.h"]
+include_guard = "_RELIBC_SYS_WAIT_H"
+after_includes = """
+
+#define WEXITSTATUS(s) (((s) >> 8) & 0xff)
+#define WTERMSIG(s) ((s) & 0x7f)
+#define WSTOPSIG(s) WEXITSTATUS(s)
+#define WCOREDUMP(s) (((s) & 0x80) != 0)
+#define WIFEXITED(s) (((s) & 0x7f) == 0)
+#define WIFSTOPPED(s) (((s) & 0xff) == 0x7f)
+#define WIFSIGNALED(s) (((((s) & 0x7f) + 1U) & 0x7f) >= 2) // Ends with 1111111 or 10000000
+#define WIFCONTINUED(s) ((s) == 0xffff)
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/sys_wait/mod.rs b/recipes/core/relibc/src/header/sys_wait/mod.rs
new file mode 100644
index 0000000000..11f4bf2c64
--- /dev/null
+++ b/recipes/core/relibc/src/header/sys_wait/mod.rs
@@ -0,0 +1,51 @@
+//! `sys/wait.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_wait.h.html>.
+
+use crate::{
+    error::ResultExt,
+    out::Out,
+    platform::{
+        Pal, Sys,
+        types::{c_int, pid_t},
+    },
+};
+
+pub const WNOHANG: c_int = 1;
+pub const WUNTRACED: c_int = 2;
+
+pub const WSTOPPED: c_int = 2;
+pub const WEXITED: c_int = 4;
+pub const WCONTINUED: c_int = 8;
+pub const WNOWAIT: c_int = 0x0100_0000;
+
+pub const __WNOTHREAD: c_int = 0x2000_0000;
+pub const __WALL: c_int = 0x4000_0000;
+#[allow(overflowing_literals)]
+pub const __WCLONE: c_int = 0x8000_0000;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wait.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wait(stat_loc: *mut c_int) -> pid_t {
+    unsafe { waitpid(!0, stat_loc, 0) }
+}
+
+/*
+ * TODO: implement idtype_t, id_t, and siginfo_t
+ *
+ * #[unsafe(no_mangle)]
+ * pub unsafe extern "C" fn waitid(
+ *     idtype: idtype_t,
+ *     id: id_t,
+ *     infop: siginfo_t,
+ *     options: c_int
+ *  ) -> c_int {
+ *      unimplemented!();
+ *  }
+ */
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/waitpid.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn waitpid(pid: pid_t, stat_loc: *mut c_int, options: c_int) -> pid_t {
+    Sys::waitpid(pid, unsafe { Out::nullable(stat_loc) }, options).or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/tar/cbindgen.toml b/recipes/core/relibc/src/header/tar/cbindgen.toml
new file mode 100644
index 0000000000..7a96512046
--- /dev/null
+++ b/recipes/core/relibc/src/header/tar/cbindgen.toml
@@ -0,0 +1,11 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/tar.h.html
+#
+# There are no spec quotations relating to includes
+include_guard = "_TAR_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/tar/mod.rs b/recipes/core/relibc/src/header/tar/mod.rs
new file mode 100644
index 0000000000..4b575f3e87
--- /dev/null
+++ b/recipes/core/relibc/src/header/tar/mod.rs
@@ -0,0 +1,148 @@
+//! `tar.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/tar.h.html>.
+
+use core::slice;
+
+/// Block size for tar archives (512 bytes).
+pub const BLOCKSIZE: usize = 512;
+
+/// Default record size for tar archives (10KB, consisting of 20 blocks).
+pub const RECORDSIZE: usize = BLOCKSIZE * 20; // 10KB (default for tar archives)
+
+/// Field lengths in tar headers
+pub const NAME_SIZE: usize = 100; // File name
+pub const MODE_SIZE: usize = 8; // File mode
+pub const UID_SIZE: usize = 8; // Owner's numeric user ID
+pub const GID_SIZE: usize = 8; // Group's numeric user ID
+pub const SIZE_SIZE: usize = 12; // File size in bytes
+pub const MTIME_SIZE: usize = 12; // Modification time
+pub const CHKSUM_SIZE: usize = 8; // Checksum
+pub const LINKNAME_SIZE: usize = 100; // Name of linked file
+pub const MAGIC_SIZE: usize = 6; // Magic string size
+pub const VERSION_SIZE: usize = 2; // Version string size
+pub const UNAME_SIZE: usize = 32; // Owner user name
+pub const GNAME_SIZE: usize = 32; // Owner group name
+pub const DEVMAJOR_SIZE: usize = 8; // Major device number
+pub const DEVMINOR_SIZE: usize = 8; // Minor device number
+pub const PREFIX_SIZE: usize = 155; // Prefix for file name
+pub const HEADER_SIZE: usize = 512; // Total header size
+
+/// Bits used in the mode field - value in octal
+pub const TSUID: u16 = 0o4000; // Set user ID on execution
+pub const TSGID: u16 = 0o2000; // Set group ID on execution
+pub const TSVTX: u16 = 0o1000; // Sticky bit
+pub const TUREAD: u16 = 0o0400; // Read permission, owner
+pub const TUWRITE: u16 = 0o0200; // Write permission, owner
+pub const TUEXEC: u16 = 0o0100; // Execute/search permission, owner
+pub const TGREAD: u16 = 0o0040; // Read permission, group
+pub const TGWRITE: u16 = 0o0020; // Write permission, group
+pub const TGEXEC: u16 = 0o0010; // Execute/search permission, group
+pub const TOREAD: u16 = 0o0004; // Read permission, others
+pub const TOWRITE: u16 = 0o0002; // Write permission, others
+pub const TOEXEC: u16 = 0o0001; // Execute/search permission, others
+
+/// Values used in typeflag field
+pub const REGTYPE: u8 = b'0'; // Regular file
+pub const AREGTYPE: u8 = b'\0'; // Regular file (old format)
+pub const LNKTYPE: u8 = b'1'; // Link
+pub const SYMTYPE: u8 = b'2'; // Symbolic link
+pub const CHRTYPE: u8 = b'3'; // Character special
+pub const BLKTYPE: u8 = b'4'; // Block special
+pub const DIRTYPE: u8 = b'5'; // Directory
+pub const FIFOTYPE: u8 = b'6'; // FIFO special
+pub const CONTTYPE: u8 = b'7'; // Contiguous file
+
+/// tar format magic and version
+pub const TMAGIC: &str = "ustar"; // Magic string : ustar and a null
+pub const TMAGLEN: usize = 6; // Length of the magic string
+pub const TVERSION: &str = "00"; // Version string
+pub const TVERSLEN: usize = 2; // Length of the version string
+
+/// Reserved for future standards
+pub const XHDRTYPE: u8 = b'x'; // Extended header referring to the next file in the archive
+pub const XGLTYPE: u8 = b'g'; // Global extended header
+
+// Reserved values for GNU tar extensions
+// pub const GNUTYPE_DUMPDIR: u8 = b'D'; // Directory dump
+// pub const GNUTYPE_MULTIVOL: u8 = b'M'; // Multi-volume file
+// pub const GNUTYPE_LONGNAME: u8 = b'L'; // Long file name
+// pub const GNUTYPE_LONGLINK: u8 = b'K'; // Long link name
+// pub const GNUTYPE_SPARSE: u8 = b'S'; // Sparse file
+
+/// Represents a tar archive header following the POSIX ustar format.
+///
+/// The header contains metadata about a file in a tar archive, including
+/// its name, size, permissions, and other attributes. All text fields are
+/// null-terminated.
+#[repr(C)]
+#[derive(Debug, Clone, Copy)]
+pub struct TarHeader {
+    // Byte offset - usage
+    pub name: [u8; NAME_SIZE],         // 0   - File name
+    pub mode: [u8; MODE_SIZE],         // 100 - Permissions
+    pub uid: [u8; UID_SIZE],           // 108 - User ID
+    pub gid: [u8; GID_SIZE],           // 116 - Group ID
+    pub size: [u8; SIZE_SIZE],         // 124 - File size in bytes
+    pub mtime: [u8; MTIME_SIZE],       // 136 - Modification time
+    pub chksum: [u8; CHKSUM_SIZE],     // 148 - Header checksum
+    pub typeflag: u8,                  // 156 - File type
+    pub linkname: [u8; LINKNAME_SIZE], // 157 - Linked file name
+    pub magic: [u8; MAGIC_SIZE],       // 257 - UStar magic
+    pub version: [u8; VERSION_SIZE],   // 263 - UStar version
+    pub uname: [u8; UNAME_SIZE],       // 265 - Owner user name
+    pub gname: [u8; GNAME_SIZE],       // 297 - Owner group name
+    pub devmajor: [u8; DEVMAJOR_SIZE], // 329 - Major device number
+    pub devminor: [u8; DEVMINOR_SIZE], // 337 - Minor device number
+    pub prefix: [u8; PREFIX_SIZE],     // 345 - Prefix for file name
+    pub padding: [u8; 12],             // 500 - Padding to make 512 bytes
+}
+
+impl Default for TarHeader {
+    fn default() -> Self {
+        let mut header = Self {
+            name: [0; NAME_SIZE],
+            mode: [0; MODE_SIZE],
+            uid: [0; UID_SIZE],
+            gid: [0; GID_SIZE],
+            size: [0; SIZE_SIZE],
+            mtime: [0; MTIME_SIZE],
+            chksum: [0; CHKSUM_SIZE],
+            typeflag: AREGTYPE,
+            linkname: [0; LINKNAME_SIZE],
+            magic: [0; MAGIC_SIZE],
+            version: [0; VERSION_SIZE],
+            uname: [0; UNAME_SIZE],
+            gname: [0; GNAME_SIZE],
+            devmajor: [0; DEVMAJOR_SIZE],
+            devminor: [0; DEVMINOR_SIZE],
+            prefix: [0; PREFIX_SIZE],
+            padding: [0; 12],
+        };
+
+        // Set default magic ("ustar") and version ("00")
+        let magic_bytes = TMAGIC.as_bytes(); // "ustar"
+        header.magic[..magic_bytes.len()].copy_from_slice(magic_bytes);
+        // tar specification often expects "ustar\0"
+        if MAGIC_SIZE >= 6 && TMAGIC.len() < MAGIC_SIZE {
+            header.magic[TMAGIC.len()] = 0;
+        }
+
+        let version_bytes = TVERSION.as_bytes(); // "00"
+        header.version[..version_bytes.len()].copy_from_slice(version_bytes);
+
+        header
+    }
+}
+
+impl TarHeader {
+    /// Calculates the checksum of the tar header as required by the specification.
+    /// Before computing, the checksum field is treated as if it contained all spaces (0x20).
+    pub fn calculate_checksum(&self) -> usize {
+        let mut header_copy = *self;
+        header_copy.chksum.fill(b' ');
+        let bytes =
+            unsafe { slice::from_raw_parts((&raw const header_copy).cast::<u8>(), HEADER_SIZE) };
+        bytes.iter().map(|&b| b as usize).sum()
+    }
+}
diff --git a/recipes/core/relibc/src/header/termios/cbindgen.toml b/recipes/core/relibc/src/header/termios/cbindgen.toml
new file mode 100644
index 0000000000..85d08f0d90
--- /dev/null
+++ b/recipes/core/relibc/src/header/termios/cbindgen.toml
@@ -0,0 +1,16 @@
+# POSIX header spec: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/termios.h.html
+#
+# Spec quotations relating to includes:
+# - "The <termios.h> header shall define the pid_t type as described in <sys/types.h>."
+sys_includes = ["sys/types.h"]
+include_guard = "_RELIBC_TERMIOS_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"winsize" = "struct winsize"
diff --git a/recipes/core/relibc/src/header/termios/linux.rs b/recipes/core/relibc/src/header/termios/linux.rs
new file mode 100644
index 0000000000..2659af5e65
--- /dev/null
+++ b/recipes/core/relibc/src/header/termios/linux.rs
@@ -0,0 +1,117 @@
+/* c_cc { */
+pub const VINTR: usize = 0;
+pub const VQUIT: usize = 1;
+pub const VERASE: usize = 2;
+pub const VKILL: usize = 3;
+pub const VEOF: usize = 4;
+pub const VTIME: usize = 5;
+pub const VMIN: usize = 6;
+pub const VSWTC: usize = 7;
+pub const VSTART: usize = 8;
+pub const VSTOP: usize = 9;
+pub const VSUSP: usize = 10;
+pub const VEOL: usize = 11;
+pub const VREPRINT: usize = 12;
+pub const VDISCARD: usize = 13;
+pub const VWERASE: usize = 14;
+pub const VLNEXT: usize = 15;
+pub const VEOL2: usize = 16;
+pub const NCCS: usize = 32;
+/* } c_cc */
+
+/* c_iflag { */
+pub const IGNBRK: usize = 0o000_001;
+pub const BRKINT: usize = 0o000_002;
+pub const IGNPAR: usize = 0o000_004;
+pub const PARMRK: usize = 0o000_010;
+pub const INPCK: usize = 0o000_020;
+pub const ISTRIP: usize = 0o000_040;
+pub const INLCR: usize = 0o000_100;
+pub const IGNCR: usize = 0o000_200;
+pub const ICRNL: usize = 0o000_400;
+pub const IUCLC: usize = 0o001_000;
+pub const IXON: usize = 0o002_000;
+pub const IXANY: usize = 0o004_000;
+pub const IXOFF: usize = 0o010_000;
+pub const IMAXBEL: usize = 0o020_000;
+pub const IUTF8: usize = 0o040_000;
+/* } c_iflag */
+
+/* c_oflag { */
+pub const OPOST: usize = 0o000_001;
+pub const OLCUC: usize = 0o000_002;
+pub const ONLCR: usize = 0o000_004;
+pub const OCRNL: usize = 0o000_010;
+pub const ONOCR: usize = 0o000_020;
+pub const ONLRET: usize = 0o000_040;
+pub const OFILL: usize = 0o000_100;
+pub const OFDEL: usize = 0o000_200;
+
+pub const VTDLY: usize = 0o040_000;
+pub const VT0: usize = 0o000_000;
+pub const VT1: usize = 0o040_000;
+/* } c_oflag */
+
+/* c_cflag { */
+pub const B0: usize = 0o000_000;
+pub const B50: usize = 0o000_001;
+pub const B75: usize = 0o000_002;
+pub const B110: usize = 0o000_003;
+pub const B134: usize = 0o000_004;
+pub const B150: usize = 0o000_005;
+pub const B200: usize = 0o000_006;
+pub const B300: usize = 0o000_007;
+pub const B600: usize = 0o000_010;
+pub const B1200: usize = 0o000_011;
+pub const B1800: usize = 0o000_012;
+pub const B2400: usize = 0o000_013;
+pub const B4800: usize = 0o000_014;
+pub const B9600: usize = 0o000_015;
+pub const B19200: usize = 0o000_016;
+pub const B38400: usize = 0o000_017;
+
+pub const B57600: usize = 0o010_001;
+pub const B115200: usize = 0o010_002;
+pub const B230400: usize = 0o010_003;
+pub const B460800: usize = 0o010_004;
+pub const B500000: usize = 0o010_005;
+pub const B576000: usize = 0o010_006;
+pub const B921600: usize = 0o010_007;
+pub const B1000000: usize = 0o010_010;
+pub const B1152000: usize = 0o010_011;
+pub const B1500000: usize = 0o010_012;
+pub const B2000000: usize = 0o010_013;
+pub const B2500000: usize = 0o010_014;
+pub const B3000000: usize = 0o010_015;
+pub const B3500000: usize = 0o010_016;
+pub const B4000000: usize = 0o010_017;
+
+pub const CSIZE: usize = 0o000_060;
+pub const CS5: usize = 0o000_000;
+pub const CS6: usize = 0o000_020;
+pub const CS7: usize = 0o000_040;
+pub const CS8: usize = 0o000_060;
+
+pub const CSTOPB: usize = 0o000_100;
+pub const CREAD: usize = 0o000_200;
+pub const PARENB: usize = 0o000_400;
+pub const PARODD: usize = 0o001_000;
+pub const HUPCL: usize = 0o002_000;
+pub const CLOCAL: usize = 0o004_000;
+/* } c_clfag */
+
+/* c_lflag { */
+pub const ISIG: usize = 0o000_001;
+pub const ICANON: usize = 0o000_002;
+pub const ECHO: usize = 0o000_010;
+pub const ECHOE: usize = 0o000_020;
+pub const ECHOK: usize = 0o000_040;
+pub const ECHONL: usize = 0o000_100;
+pub const NOFLSH: usize = 0o000_200;
+pub const TOSTOP: usize = 0o000_400;
+pub const IEXTEN: usize = 0o100_000;
+/* } c_lflag */
+
+// POSIX extensions
+/// Sentinel value to disable a control char.
+pub const _POSIX_VDISABLE: u8 = 0;
diff --git a/recipes/core/relibc/src/header/termios/mod.rs b/recipes/core/relibc/src/header/termios/mod.rs
new file mode 100644
index 0000000000..5bd8de3318
--- /dev/null
+++ b/recipes/core/relibc/src/header/termios/mod.rs
@@ -0,0 +1,248 @@
+//! `termios.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/termios.h.html>.
+
+use crate::{
+    header::{
+        errno,
+        sys_ioctl::{self, winsize},
+    },
+    platform::{
+        self,
+        types::{c_int, c_uchar, c_uint, c_ulong, c_void, pid_t},
+    },
+};
+
+pub use self::sys::*;
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+pub mod sys;
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+pub mod sys;
+
+pub type cc_t = c_uchar;
+pub type speed_t = c_uint;
+pub type tcflag_t = c_uint;
+
+pub const TCOOFF: c_int = 0;
+pub const TCOON: c_int = 1;
+pub const TCIOFF: c_int = 2;
+pub const TCION: c_int = 3;
+
+pub const TCIFLUSH: c_int = 0;
+pub const TCOFLUSH: c_int = 1;
+pub const TCIOFLUSH: c_int = 2;
+
+pub const TCSANOW: c_int = 0;
+pub const TCSADRAIN: c_int = 1;
+pub const TCSAFLUSH: c_int = 2;
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cbindgen_export_winsize(winsize: winsize) {}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/termios.h.html>.
+#[cfg(target_os = "linux")]
+#[repr(C)]
+#[derive(Default, Clone)]
+pub struct termios {
+    pub c_iflag: tcflag_t,
+    pub c_oflag: tcflag_t,
+    pub c_cflag: tcflag_t,
+    pub c_lflag: tcflag_t,
+    pub c_line: cc_t,
+    pub c_cc: [cc_t; NCCS],
+    pub __c_ispeed: speed_t,
+    pub __c_ospeed: speed_t,
+}
+
+// Must match structure in redox_termios
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/termios.h.html>.
+#[cfg(target_os = "redox")]
+#[repr(C)]
+#[derive(Default, Clone)]
+pub struct termios {
+    pub c_iflag: tcflag_t,
+    pub c_oflag: tcflag_t,
+    pub c_cflag: tcflag_t,
+    pub c_lflag: tcflag_t,
+    pub c_cc: [cc_t; NCCS],
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcgetattr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tcgetattr(fd: c_int, out: *mut termios) -> c_int {
+    unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TCGETS, out.cast::<c_void>()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcsetattr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tcsetattr(fd: c_int, act: c_int, value: *const termios) -> c_int {
+    if !(0..=2).contains(&act) {
+        platform::ERRNO.set(errno::EINVAL);
+        return -1;
+    }
+    // This is safe because ioctl shouldn't modify the value
+    unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TCSETS + act as c_ulong, value as *mut c_void) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcgetsid.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tcgetsid(fd: c_int) -> pid_t {
+    let mut sid = 0;
+    if unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TIOCGSID, (&raw mut sid).cast::<c_void>()) } < 0 {
+        return -1;
+    }
+    sid
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cfgetispeed.html>.
+#[cfg(target_os = "linux")]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfgetispeed(termios_p: *const termios) -> speed_t {
+    unsafe { (*termios_p).__c_ispeed }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cfgetispeed.html>.
+#[cfg(target_os = "redox")]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfgetispeed(termios_p: *const termios) -> speed_t {
+    //TODO
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cfgetospeed.html>.
+#[cfg(target_os = "linux")]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfgetospeed(termios_p: *const termios) -> speed_t {
+    unsafe { (*termios_p).__c_ospeed }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cfgetospeed.html>.
+#[cfg(target_os = "redox")]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfgetospeed(termios_p: *const termios) -> speed_t {
+    //TODO
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cfsetispeed.html>.
+#[cfg(target_os = "linux")]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfsetispeed(termios_p: *mut termios, speed: speed_t) -> c_int {
+    match speed as usize {
+        B0..=B38400 | B57600..=B4000000 => {
+            unsafe { (*termios_p).__c_ispeed = speed };
+            0
+        }
+        _ => {
+            platform::ERRNO.set(errno::EINVAL);
+            -1
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cfsetispeed.html>.
+#[cfg(target_os = "redox")]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfsetispeed(termios_p: *mut termios, speed: speed_t) -> c_int {
+    //TODO
+    platform::ERRNO.set(errno::EINVAL);
+    -1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cfsetospeed.html>.
+#[cfg(target_os = "linux")]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfsetospeed(termios_p: *mut termios, speed: speed_t) -> c_int {
+    match speed as usize {
+        B0..=B38400 | B57600..=B4000000 => {
+            unsafe { (*termios_p).__c_ospeed = speed };
+            0
+        }
+        _ => {
+            platform::ERRNO.set(errno::EINVAL);
+            -1
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/cfsetospeed.html>.
+#[cfg(target_os = "redox")]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfsetospeed(termios_p: *mut termios, speed: speed_t) -> c_int {
+    //TODO
+    platform::ERRNO.set(errno::EINVAL);
+    -1
+}
+
+/// Non-POSIX, 4.4 BSD extension
+///
+/// See <https://www.man7.org/linux/man-pages/man3/cfsetispeed.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfsetspeed(termios_p: *mut termios, speed: speed_t) -> c_int {
+    let r = unsafe { cfsetispeed(termios_p, speed) };
+    if r < 0 {
+        return r;
+    }
+    unsafe { cfsetospeed(termios_p, speed) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcflush.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tcflush(fd: c_int, queue: c_int) -> c_int {
+    unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TCFLSH, queue as *mut c_void) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcdrain.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tcdrain(fd: c_int) -> c_int {
+    unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TCSBRK, core::ptr::dangling_mut()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcsendbreak.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tcsendbreak(fd: c_int, _dur: c_int) -> c_int {
+    // non-zero duration is ignored by musl due to it being
+    // implementation-defined. we do the same.
+    unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TCSBRK, core::ptr::null_mut()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcgetwinsize.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tcgetwinsize(fd: c_int, sws: *mut winsize) -> c_int {
+    unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TIOCGWINSZ, sws.cast()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcsetwinsize.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tcsetwinsize(fd: c_int, sws: *const winsize) -> c_int {
+    unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TIOCSWINSZ, sws.cast_mut().cast()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcflow.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tcflow(fd: c_int, action: c_int) -> c_int {
+    // non-zero duration is ignored by musl due to it being
+    // implementation-defined. we do the same.
+    unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TCXONC, action as *mut _) }
+}
+
+/// Non-POSIX, BSD extension
+///
+/// See <https://www.man7.org/linux/man-pages/man3/cfmakeraw.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn cfmakeraw(termios_p: *mut termios) {
+    unsafe {
+        (*termios_p).c_iflag &=
+            !(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON) as u32;
+        (*termios_p).c_oflag &= !OPOST as u32;
+        (*termios_p).c_lflag &= !(ECHO | ECHONL | ICANON | ISIG | IEXTEN) as u32;
+        (*termios_p).c_cflag &= !(CSIZE | PARENB) as u32;
+        (*termios_p).c_cflag |= CS8 as u32;
+        (*termios_p).c_cc[VMIN] = 1;
+        (*termios_p).c_cc[VTIME] = 0;
+    }
+}
diff --git a/recipes/core/relibc/src/header/termios/redox.rs b/recipes/core/relibc/src/header/termios/redox.rs
new file mode 100644
index 0000000000..526e59aa51
--- /dev/null
+++ b/recipes/core/relibc/src/header/termios/redox.rs
@@ -0,0 +1,111 @@
+/* c_cc { */
+pub const VEOF: usize = 0;
+pub const VEOL: usize = 1;
+pub const VEOL2: usize = 2;
+pub const VERASE: usize = 3;
+pub const VWERASE: usize = 4;
+pub const VKILL: usize = 5;
+pub const VREPRINT: usize = 6;
+pub const VSWTC: usize = 7;
+pub const VINTR: usize = 8;
+pub const VQUIT: usize = 9;
+pub const VSUSP: usize = 10;
+pub const VSTART: usize = 12;
+pub const VSTOP: usize = 13;
+pub const VLNEXT: usize = 14;
+pub const VDISCARD: usize = 15;
+pub const VMIN: usize = 16;
+pub const VTIME: usize = 17;
+pub const NCCS: usize = 32;
+/* } c_cc */
+
+/* c_iflag { */
+pub const IGNBRK: usize = 0o000_001;
+pub const BRKINT: usize = 0o000_002;
+pub const IGNPAR: usize = 0o000_004;
+pub const PARMRK: usize = 0o000_010;
+pub const INPCK: usize = 0o000_020;
+pub const ISTRIP: usize = 0o000_040;
+pub const INLCR: usize = 0o000_100;
+pub const IGNCR: usize = 0o000_200;
+pub const ICRNL: usize = 0o000_400;
+pub const IXON: usize = 0o001_000;
+pub const IXOFF: usize = 0o002_000;
+pub const IXANY: usize = 0o004_000;
+/* } c_iflag */
+
+/* c_oflag { */
+pub const OPOST: usize = 0o000_001;
+pub const ONLCR: usize = 0o000_002;
+pub const OLCUC: usize = 0o000_004;
+pub const OCRNL: usize = 0o000_010;
+pub const ONOCR: usize = 0o000_020;
+pub const ONLRET: usize = 0o000_040;
+pub const OFILL: usize = 0o0000_100;
+pub const OFDEL: usize = 0o0000_200;
+/* } c_oflag */
+
+/* c_cflag { */
+pub const B0: usize = 0o000_000;
+pub const B50: usize = 0o000_001;
+pub const B75: usize = 0o000_002;
+pub const B110: usize = 0o000_003;
+pub const B134: usize = 0o000_004;
+pub const B150: usize = 0o000_005;
+pub const B200: usize = 0o000_006;
+pub const B300: usize = 0o000_007;
+pub const B600: usize = 0o000_010;
+pub const B1200: usize = 0o000_011;
+pub const B1800: usize = 0o000_012;
+pub const B2400: usize = 0o000_013;
+pub const B4800: usize = 0o000_014;
+pub const B9600: usize = 0o000_015;
+pub const B19200: usize = 0o000_016;
+pub const B38400: usize = 0o000_017;
+
+pub const B57600: usize = 0o0_020;
+pub const B115200: usize = 0o0_021;
+pub const B230400: usize = 0o0_022;
+pub const B460800: usize = 0o0_023;
+pub const B500000: usize = 0o0_024;
+pub const B576000: usize = 0o0_025;
+pub const B921600: usize = 0o0_026;
+pub const B1000000: usize = 0o0_027;
+pub const B1152000: usize = 0o0_030;
+pub const B1500000: usize = 0o0_031;
+pub const B2000000: usize = 0o0_032;
+pub const B2500000: usize = 0o0_033;
+pub const B3000000: usize = 0o0_034;
+pub const B3500000: usize = 0o0_035;
+pub const B4000000: usize = 0o0_036;
+
+pub const CSIZE: usize = 0o001_400;
+pub const CS5: usize = 0o000_000;
+pub const CS6: usize = 0o000_400;
+pub const CS7: usize = 0o001_000;
+pub const CS8: usize = 0o001_400;
+
+pub const CSTOPB: usize = 0o002_000;
+pub const CREAD: usize = 0o004_000;
+pub const PARENB: usize = 0o010_000;
+pub const PARODD: usize = 0o020_000;
+pub const HUPCL: usize = 0o040_000;
+
+pub const CLOCAL: usize = 0o0100000;
+/* } c_clfag */
+
+/* c_lflag { */
+pub const ISIG: usize = 0x0000_0080;
+pub const ICANON: usize = 0x0000_0100;
+pub const ECHO: usize = 0x0000_0008;
+pub const ECHOE: usize = 0x0000_0002;
+pub const ECHOK: usize = 0x0000_0004;
+pub const ECHONL: usize = 0x0000_0010;
+pub const NOFLSH: usize = 0x8000_0000;
+pub const TOSTOP: usize = 0x0040_0000;
+pub const IEXTEN: usize = 0x0000_0400;
+/* } c_lflag */
+
+// POSIX extensions
+/// Sentinel value to disable a control char.
+pub const _POSIX_VDISABLE: u8 = 0;
diff --git a/recipes/core/relibc/src/header/time/cbindgen.toml b/recipes/core/relibc/src/header/time/cbindgen.toml
new file mode 100644
index 0000000000..d2476bd3b3
--- /dev/null
+++ b/recipes/core/relibc/src/header/time/cbindgen.toml
@@ -0,0 +1,17 @@
+sys_includes = ["sys/types.h", "stdint.h", "stddef.h", "features.h"]
+include_guard = "_RELIBC_TIME_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+after_includes = """
+#include <bits/timespec.h> // for timespec
+struct sigevent;
+"""
+
+[enum]
+prefix_with_name = true
+
+[export.rename]
+"timespec" = "struct timespec"
+"sigevent" = "struct sigevent"
diff --git a/recipes/core/relibc/src/header/time/constants.rs b/recipes/core/relibc/src/header/time/constants.rs
new file mode 100644
index 0000000000..2b3d3ba645
--- /dev/null
+++ b/recipes/core/relibc/src/header/time/constants.rs
@@ -0,0 +1,33 @@
+use crate::platform::types::{c_char, c_int, c_long, clockid_t};
+
+#[cfg(target_os = "linux")]
+#[path = "linux.rs"]
+pub mod sys;
+
+#[cfg(target_os = "redox")]
+#[path = "redox.rs"]
+pub mod sys;
+
+pub use self::sys::*;
+
+pub(crate) const UTC: *const c_char = c"UTC".as_ptr().cast();
+
+pub(crate) const DAY_NAMES: [&str; 7] = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+pub(crate) const MON_NAMES: [&str; 12] = [
+    "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+];
+
+pub const CLOCK_PROCESS_CPUTIME_ID: clockid_t = 2;
+// Can't be time_t because cbindgen UGH
+pub const CLOCKS_PER_SEC: c_long = 1_000_000;
+
+pub const TIMER_ABSTIME: c_int = 1;
+
+// Constants for timespec_get and timespec_getres which are C23 analogues to
+// clock_gettime/getres.
+// The values are offset by one for simplicity since zero represents an error.
+
+/// `TIME_UTC` returns the time since the Unix epoch.
+pub const TIME_UTC: c_int = CLOCK_REALTIME + 1;
+/// `TIME_MONOTONIC` returns the time from the monotonically increasing clock.
+pub const TIME_MONOTONIC: c_int = CLOCK_MONOTONIC + 1;
diff --git a/recipes/core/relibc/src/header/time/linux.rs b/recipes/core/relibc/src/header/time/linux.rs
new file mode 100644
index 0000000000..c3d67cfd8c
--- /dev/null
+++ b/recipes/core/relibc/src/header/time/linux.rs
@@ -0,0 +1,12 @@
+use crate::platform::types::c_int;
+
+pub const CLOCK_REALTIME: c_int = 0;
+pub const CLOCK_MONOTONIC: c_int = 1;
+pub const CLOCK_THREAD_CPUTIME_ID: c_int = 3;
+pub const CLOCK_MONOTONIC_RAW: c_int = 4;
+pub const CLOCK_REALTIME_COARSE: c_int = 5;
+pub const CLOCK_MONOTONIC_COARSE: c_int = 6;
+pub const CLOCK_BOOTTIME: c_int = 7;
+pub const CLOCK_REALTIME_ALARM: c_int = 8;
+pub const CLOCK_BOOTTIME_ALARM: c_int = 9;
+pub const CLOCK_TAI: c_int = 11;
diff --git a/recipes/core/relibc/src/header/time/mod.rs b/recipes/core/relibc/src/header/time/mod.rs
new file mode 100644
index 0000000000..1a432bf304
--- /dev/null
+++ b/recipes/core/relibc/src/header/time/mod.rs
@@ -0,0 +1,907 @@
+//! `time.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/time.h.html>.
+
+use crate::{
+    c_str::{CStr, CString},
+    error::{Errno, ResultExt},
+    header::{
+        bits_timespec::timespec,
+        errno::{EFAULT, ENOMEM, EOVERFLOW, ETIMEDOUT},
+        signal::sigevent,
+        stdlib::getenv,
+        unistd::readlink,
+    },
+    out::Out,
+    platform::{
+        self, Pal, Sys,
+        types::{
+            c_char, c_double, c_int, c_long, clock_t, clockid_t, pid_t, size_t, time_t, timer_t,
+        },
+    },
+    raw_cell::RawCell,
+    sync::{Mutex, MutexGuard},
+};
+use alloc::collections::BTreeSet;
+use chrono::{
+    DateTime, Datelike, FixedOffset, NaiveDate, NaiveDateTime, Offset, TimeZone, Timelike, Utc,
+    offset::MappedLocalTime,
+};
+use chrono_tz::{OffsetComponents, OffsetName, Tz};
+use core::{cell::OnceCell, convert::TryFrom, mem, ptr};
+
+pub use self::constants::*;
+
+pub mod constants;
+
+mod strftime;
+mod strptime;
+pub use strptime::strptime;
+
+const YEARS_PER_ERA: time_t = 400;
+const DAYS_PER_ERA: time_t = 146097;
+const SECS_PER_DAY: time_t = 24 * 60 * 60;
+pub(crate) const NANOSECONDS: c_long = 1_000_000_000;
+const UTC_STR: &core::ffi::CStr = c"UTC";
+
+#[cfg(target_os = "redox")]
+impl<'a> From<&'a timespec> for syscall::TimeSpec {
+    fn from(tp: &timespec) -> Self {
+        Self {
+            tv_sec: tp.tv_sec as _,
+            tv_nsec: tp.tv_nsec as _,
+        }
+    }
+}
+
+/// timer_t internal data, ABI unstable
+#[repr(C)]
+#[derive(Clone)]
+#[cfg(target_os = "redox")]
+pub(crate) struct timer_internal_t {
+    pub clockid: clockid_t,
+    pub timerfd: usize,
+    pub eventfd: usize,
+    pub evp: sigevent,
+    pub thread: platform::types::pthread_t,
+    pub caller_thread: crate::pthread::OsTid,
+    // relibc handles it_interval, not the kernel
+    pub next_wake_time: itimerspec,
+    // When non-zero, timer_routine delivers SIGALRM via kill(process_pid, sig)
+    // instead of rlct_kill (thread-specific). Used by alarm().
+    pub process_pid: platform::types::pid_t,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/time.h.html>.
+#[repr(C)]
+pub struct tm {
+    pub tm_sec: c_int,          // 0 - 60
+    pub tm_min: c_int,          // 0 - 59
+    pub tm_hour: c_int,         // 0 - 23
+    pub tm_mday: c_int,         // 1 - 31
+    pub tm_mon: c_int,          // 0 - 11
+    pub tm_year: c_int,         // years since 1900
+    pub tm_wday: c_int,         // 0 - 6 (Sunday - Saturday)
+    pub tm_yday: c_int,         // 0 - 365
+    pub tm_isdst: c_int,        // >0 if DST, 0 if not, <0 if unknown
+    pub tm_gmtoff: c_long,      // offset from UTC in seconds
+    pub tm_zone: *const c_char, // timezone abbreviation
+}
+
+unsafe impl Sync for tm {}
+
+// The C Standard says that localtime and gmtime return the same pointer.
+static GMTIME_LOCALTIME_RETURN_TM: RawCell<tm> = RawCell::new(blank_tm());
+
+// The C Standard says that ctime and asctime return the same pointer.
+static mut ASCTIME: [c_char; 26] = [0; 26];
+
+#[repr(transparent)]
+pub struct TzName([*mut c_char; 2]);
+
+unsafe impl Sync for TzName {}
+
+// Name storage for the `tm_zone` field.
+static TIMEZONE_NAMES: Mutex<OnceCell<BTreeSet<CString>>> = Mutex::new(OnceCell::new());
+
+// relibc functions should hold `TIMEZONE_LOCK` when accessing `daylight`,
+// `timezone`, and `tzname`. However, it cannot guard those variables against
+// user access (see `tzset()` specs for details).
+static TIMEZONE_LOCK: Mutex<(Option<CString>, Option<CString>)> = Mutex::new((None, None));
+
+// Should only be accessed by relibc when `TIMEZONE_LOCK` is held
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tzset.html>.
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut daylight: c_int = 0;
+
+// Should only be accessed by relibc when `TIMEZONE_LOCK` is held
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tzset.html>.
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut timezone: c_long = 0;
+
+// Should only be accessed by relibc when `TIMEZONE_LOCK` is held
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tzset.html>.
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut tzname: TzName = TzName([ptr::null_mut(); 2]);
+
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut getdate_err: c_int = 0;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/time.h.html>.
+#[repr(C)]
+#[derive(Clone, Default)]
+pub struct itimerspec {
+    pub it_interval: timespec,
+    pub it_value: timespec,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/asctime.html>.
+///
+/// # Deprecation
+/// The `asctime()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn asctime(timeptr: *const tm) -> *mut c_char {
+    unsafe {
+        #[allow(deprecated)]
+        asctime_r(timeptr, (&raw mut ASCTIME).cast())
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/asctime.html>.
+///
+/// # Deprecation
+/// The `asctime_r()` was marked obsolescent in the Open Group Base
+/// Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn asctime_r(tm: *const tm, buf: *mut c_char) -> *mut c_char {
+    let tm_sec = unsafe { (*tm).tm_sec };
+    let tm_min = unsafe { (*tm).tm_min };
+    let tm_hour = unsafe { (*tm).tm_hour };
+    let tm_mday = unsafe { (*tm).tm_mday };
+    let tm_mon = unsafe { (*tm).tm_mon };
+    let tm_year = unsafe { (*tm).tm_year };
+    let tm_wday = unsafe { (*tm).tm_wday };
+
+    /* Panic when we run into undefined behavior.
+     *
+     * POSIX says (since issue 7) that asctime()/asctime_r() cause UB
+     * when the tm member values would cause out-of-bounds array access
+     * or overflow the output buffer. This contrasts with ISO C11+,
+     * which specifies UB for any tm members being outside their normal
+     * ranges. While POSIX explicitly defers to the C standard in case
+     * of contradictions, the assertions below follow the interpretation
+     * that POSIX simply defines some of C's undefined behavior, rather
+     * than conflict with the ISO standard.
+     *
+     * Note that C's "%.2d" formatting, unlike Rust's "{:02}"
+     * formatting, does not count a minus sign against the two digits to
+     * print, meaning that we must reject all negative values for
+     * seconds, minutes and hours. However, C's "%3d" (for day-of-month)
+     * is similar to Rust's "{:3}".
+     *
+     * To avoid year overflow problems (in Rust, where numeric overflow
+     * is considered an error), we subtract 1900 from the endpoints,
+     * rather than adding to the tm_year value. POSIX' requirement that
+     * tm_year be at most {INT_MAX}-1990 is satisfied for all legal
+     * values of {INT_MAX} through the max-4-digit requirement on the
+     * year.
+     *
+     * The tm_mon and tm_wday fields are used for array access and thus
+     * will already cause a panic in Rust code when out of range.
+     * However, using the assertions below allows a consistent error
+     * message for all fields. */
+    const OUT_OF_RANGE_MESSAGE: &str = "tm member out of range";
+
+    assert!((0..=99).contains(&tm_sec), "{OUT_OF_RANGE_MESSAGE}");
+    assert!((0..=99).contains(&tm_min), "{OUT_OF_RANGE_MESSAGE}");
+    assert!((0..=99).contains(&tm_hour), "{OUT_OF_RANGE_MESSAGE}");
+    assert!((-99..=999).contains(&tm_mday), "{OUT_OF_RANGE_MESSAGE}");
+    assert!((0..=11).contains(&tm_mon), "{OUT_OF_RANGE_MESSAGE}");
+    assert!(
+        (-999 - 1900..=9999 - 1900).contains(&tm_year),
+        "{OUT_OF_RANGE_MESSAGE}"
+    );
+    assert!((0..=6).contains(&tm_wday), "{OUT_OF_RANGE_MESSAGE}");
+
+    // At this point, we can safely use the values as given.
+    let write_result = core::fmt::write(
+        // buf may be either `*mut u8` or `*mut i8`
+        &mut platform::UnsafeStringWriter(buf.cast()),
+        format_args!(
+            "{:.3} {:.3}{:3} {:02}:{:02}:{:02} {}\n",
+            DAY_NAMES[usize::try_from(tm_wday).unwrap()],
+            MON_NAMES[usize::try_from(tm_mon).unwrap()],
+            tm_mday,
+            tm_hour,
+            tm_min,
+            tm_sec,
+            1900 + tm_year
+        ),
+    );
+    match write_result {
+        Ok(_) => buf,
+        Err(_) => {
+            /* asctime()/asctime_r() or the equivalent sprintf() call
+             * have no defined errno setting */
+            ptr::null_mut()
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/clock.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn clock() -> clock_t {
+    let mut ts = mem::MaybeUninit::<timespec>::uninit();
+
+    if unsafe { clock_gettime(CLOCK_PROCESS_CPUTIME_ID, ts.as_mut_ptr()) } != 0 {
+        return -1;
+    }
+    let ts = unsafe { ts.assume_init() };
+
+    let clocks =
+        ts.tv_sec * CLOCKS_PER_SEC as i64 + (ts.tv_nsec / (1_000_000_000 / CLOCKS_PER_SEC)) as i64;
+    clock_t::try_from(clocks).unwrap_or(-1)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/clock_getcpuclockid.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn clock_getcpuclockid(pid: pid_t, clock_id: *mut clockid_t) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/clock_getres.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn clock_getres(clock_id: clockid_t, res: *mut timespec) -> c_int {
+    Sys::clock_getres(clock_id, unsafe { Out::nullable(res) })
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/clock_getres.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn clock_gettime(clock_id: clockid_t, tp: *mut timespec) -> c_int {
+    Sys::clock_gettime(clock_id, unsafe { Out::nonnull(tp) })
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/clock_nanosleep.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn clock_nanosleep(
+    clock_id: clockid_t,
+    flags: c_int,
+    rqtp: *const timespec,
+    rmtp: *mut timespec,
+) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/clock_getres.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn clock_settime(clock_id: clockid_t, tp: *const timespec) -> c_int {
+    unsafe { Sys::clock_settime(clock_id, tp) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ctime.html>.
+///
+/// # Deprecation
+/// The `ctime()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ctime(clock: *const time_t) -> *mut c_char {
+    unsafe {
+        #[allow(deprecated)]
+        asctime(localtime(clock))
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/ctime.html>.
+///
+/// # Deprecation
+/// The `ctime_r()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ctime_r(clock: *const time_t, buf: *mut c_char) -> *mut c_char {
+    // Using MaybeUninit<tm> seems to cause a panic during the build process
+    let mut tm1 = blank_tm();
+    unsafe { localtime_r(clock, &raw mut tm1) };
+    unsafe {
+        #[allow(deprecated)]
+        asctime_r(&raw const tm1, buf)
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/difftime.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn difftime(time1: time_t, time0: time_t) -> c_double {
+    (time1 - time0) as _
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getdate.html>.
+// #[unsafe(no_mangle)]
+pub unsafe extern "C" fn getdate(string: *const c_char) -> *const tm {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/gmtime.html>.
+///
+/// # Safety
+/// The caller is required to ensure that:
+/// * `timer` is a valid pointer
+/// * the function has exclusive access to the static `tm` structure it
+///   returns. This includes avoiding simultaneous calls to this function as
+///   well as to [`localtime()`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn gmtime(timer: *const time_t) -> *mut tm {
+    // SAFETY: the caller is required to uphold the safety requirements for
+    // `gmtime_r()` in addition to exclusive access to
+    // `GMTIME_LOCALTIME_RETURN_TM`.
+    unsafe { gmtime_r(timer, GMTIME_LOCALTIME_RETURN_TM.as_mut_ptr()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/gmtime.html>.
+///
+/// # Safety
+/// The caller is required to ensure that:
+/// * `timer` is a valid pointer
+/// * `result` is convertible to an [`Out<tm>`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn gmtime_r(timer: *const time_t, result: *mut tm) -> *mut tm {
+    // SAFETY: the caller is required to ensure that `timer` is a valid pointer.
+    let timer_val = unsafe { *timer };
+
+    // SAFETY: the caller is required to ensure that `result` is convertible
+    // to an `Out<tm>`.
+    let result_out = unsafe { Out::nonnull(result) };
+
+    let _ = get_localtime(timer_val, result_out);
+    result
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/localtime.html>.
+///
+/// # Safety
+/// The caller is required to ensure that:
+/// * `timer` is a valid pointer
+/// * the function has exclusive access to the static `tm` structure it
+///   returns. This implies avoiding simultaneous calls to this function as
+///   well as to [`gmtime()`]
+/// * the variables [`daylight`], [`timezone`] and [`tzname`] are not accessed
+///   by user code for the duration of the call.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn localtime(timer: *const time_t) -> *mut tm {
+    // SAFETY: the caller is required to uphold the safety requirements for
+    // `localtime_r()` in addition to exclusive access to
+    // `GMTIME_LOCALTIME_RETURN_TM`.
+    unsafe { localtime_r(timer, GMTIME_LOCALTIME_RETURN_TM.as_mut_ptr()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/localtime.html>.
+///
+/// # Safety
+/// The caller is required to ensure that:
+/// * `timer` is a valid pointer
+/// * `result` is convertible to an [`Out<tm>`]
+/// * the variables [`daylight`], [`timezone`] and [`tzname`] are not accessed
+///   by user code for the duration of the call.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn localtime_r(timer: *const time_t, result: *mut tm) -> *mut tm {
+    // SAFETY: the caller is required to ensure that `timer` is a valid pointer.
+    let timer_val = unsafe { *timer };
+
+    // SAFETY: the caller is required to ensure that `result` is convertible
+    // to an `Out<tm>`.
+    let result_out = unsafe { Out::nonnull(result) };
+
+    let mut lock = TIMEZONE_LOCK.lock();
+
+    // SAFETY: the caller is required to ensure that `daylight`, `timezone`
+    // and `tzname` are not accessed by user code.
+    unsafe { clear_timezone(&mut lock) };
+    if let (Some(std_time), dst_time) = get_localtime(timer_val, result_out) {
+        // SAFETY: the caller is required to ensure that `daylight`,
+        // `timezone` and `tzname` are not accessed by user code.
+        unsafe { set_timezone(&mut lock, &std_time, dst_time) };
+    }
+    result
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mktime.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mktime(timeptr: *mut tm) -> time_t {
+    let mut lock = TIMEZONE_LOCK.lock();
+    unsafe { clear_timezone(&mut lock) };
+
+    let year = unsafe { (*timeptr).tm_year } + 1900;
+    let month = (unsafe { (*timeptr).tm_mon } + 1) as _;
+    let day = unsafe { (*timeptr).tm_mday } as _;
+    let hour = unsafe { (*timeptr).tm_hour } as _;
+    let minute = unsafe { (*timeptr).tm_min } as _;
+    let second = unsafe { (*timeptr).tm_sec } as _;
+
+    let naive_local = match NaiveDate::from_ymd_opt(year, month, day)
+        .and_then(|date| date.and_hms_opt(hour, minute, second))
+    {
+        Some(datetime) => datetime,
+        None => {
+            platform::ERRNO.set(EOVERFLOW);
+            return -1;
+        }
+    };
+
+    let offset = get_offset(unsafe { (*timeptr).tm_gmtoff }).unwrap();
+    let tz = time_zone();
+    // Create DateTime<FixedOffset>
+    let datetime = match offset.from_local_datetime(&naive_local) {
+        MappedLocalTime::Single(datetime) => datetime,
+        _ => {
+            platform::ERRNO.set(EOVERFLOW);
+            return -1;
+        }
+    };
+
+    // Convert to UTC and get timestamp
+    let tz_datetime = datetime.with_timezone(&tz);
+    let timestamp = tz_datetime.timestamp();
+
+    unsafe { ptr::write(timeptr, datetime_to_tm(&tz_datetime)) };
+
+    // Convert UTC time to local time
+    let (std_time, dst_time) = match tz.timestamp_opt(timestamp, 0) {
+        MappedLocalTime::Single(t) => (t, None),
+        // This variant contains the two possible results, in the order (earliest, latest).
+        MappedLocalTime::Ambiguous(t1, t2) => (t2, Some(t1)),
+        MappedLocalTime::None => return timestamp,
+    };
+    {
+        unsafe { set_timezone(&mut lock, &std_time, dst_time) };
+    }
+
+    timestamp
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/nanosleep.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn nanosleep(rqtp: *const timespec, rmtp: *mut timespec) -> c_int {
+    unsafe { Sys::nanosleep(rqtp, rmtp) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strftime.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strftime(
+    s: *mut c_char,
+    maxsize: size_t,
+    format: *const c_char,
+    timeptr: *const tm,
+) -> size_t {
+    let ret = unsafe {
+        strftime::strftime(
+            &mut platform::StringWriter(s.cast::<u8>(), maxsize),
+            format,
+            timeptr,
+        )
+    };
+    if ret < maxsize { ret } else { 0 }
+}
+
+// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strftime.html>.
+// TODO: needs locale_t
+// #[unsafe(no_mangle)]
+/*pub extern "C" fn strftime_l(s: *mut char, maxsize: size_t, format: *const c_char, timeptr: *const tm, locale: locale_t) -> size_t {
+    unimplemented!();
+}*/
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/time.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn time(tloc: *mut time_t) -> time_t {
+    let mut ts = timespec::default();
+    if Sys::clock_gettime(CLOCK_REALTIME, Out::from_mut(&mut ts)).is_ok() {}; // TODO what to do if Err?
+    if !tloc.is_null() {
+        unsafe { *tloc = ts.tv_sec }
+    };
+    ts.tv_sec
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/timegm.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn timegm(tm: *mut tm) -> time_t {
+    let tm_val = unsafe { &mut *tm };
+    let dt = match convert_tm_generic(&Utc, tm_val) {
+        Some(dt) => dt,
+        None => return -1,
+    };
+
+    unsafe {
+        (*tm).tm_wday = dt.weekday().num_days_from_sunday() as _;
+        (*tm).tm_yday = dt.ordinal0() as _; // day of year starting at 0
+        (*tm).tm_isdst = 0; // UTC does not use DST
+        (*tm).tm_gmtoff = 0; // UTC offset is zero
+        (*tm).tm_zone = UTC_STR.as_ptr().cast::<c_char>();
+    }
+
+    dt.timestamp()
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/timegm.3.html>.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn timelocal(tm: *mut tm) -> time_t {
+    let tm_val = unsafe { &mut *tm };
+    let tz = time_zone();
+    let dt = match convert_tm_generic(&tz, tm_val) {
+        Some(dt) => dt,
+        None => return -1,
+    };
+
+    let tz_name = CString::new(tz.name()).unwrap();
+    unsafe {
+        (*tm).tm_wday = dt.weekday().num_days_from_sunday() as _;
+        (*tm).tm_yday = dt.ordinal0() as _; // day of year starting at 0
+        (*tm).tm_isdst = dt.offset().dst_offset().num_hours() as _;
+        (*tm).tm_gmtoff = dt.offset().fix().local_minus_utc().into();
+        (*tm).tm_zone = tz_name.into_raw().cast();
+    }
+
+    dt.timestamp()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_create.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn timer_create(
+    clock_id: clockid_t,
+    evp: *mut sigevent,
+    timerid: *mut timer_t,
+) -> c_int {
+    if evp.is_null() || timerid.is_null() {
+        return Err(Errno(EFAULT)).or_minus_one_errno();
+    }
+    let (evp, timerid) = unsafe { (&*evp, Out::nonnull(timerid)) };
+    Sys::timer_create(clock_id, evp, timerid)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_delete.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn timer_delete(timerid: timer_t) -> c_int {
+    if timerid.is_null() {
+        return Err(Errno(EFAULT)).or_minus_one_errno();
+    }
+    Sys::timer_delete(timerid).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_getoverrun.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn timer_getoverrun(timerid: timer_t) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_getoverrun.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn timer_gettime(timerid: timer_t, value: *mut itimerspec) -> c_int {
+    if timerid.is_null() || value.is_null() {
+        return Err(Errno(EFAULT)).or_minus_one_errno();
+    }
+    let value = unsafe { Out::nonnull(value) };
+    Sys::timer_gettime(timerid, value)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timer_getoverrun.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn timer_settime(
+    timerid: timer_t,
+    flags: c_int,
+    value: *const itimerspec,
+    ovalue: *mut itimerspec,
+) -> c_int {
+    if timerid.is_null() || value.is_null() {
+        return Err(Errno(EFAULT)).or_minus_one_errno();
+    }
+    let (value, ovalue) = unsafe { (&*value, Out::nullable(ovalue)) };
+    Sys::timer_settime(timerid, flags, value, ovalue)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// ISO C equivalent to [`Sys::clock_gettime`].
+///
+/// The main differences are that this function:
+/// * returns `0` on error and `base` on success
+/// * only mandates TIME_UTC as a base
+///
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/timespec_get.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn timespec_get(tp: *mut timespec, base: c_int) -> c_int {
+    let tp = unsafe { Out::nonnull(tp) };
+    Sys::clock_gettime(base - 1, tp).map(|()| base).unwrap_or(0)
+}
+
+/// ISO C equivalent to [`Sys::clock_getres`].
+///
+/// The main differences are that this function:
+/// * returns `0` on error and `base` on success
+/// * only mandates TIME_UTC as a base
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn timespec_getres(res: *mut timespec, base: c_int) -> c_int {
+    let res = unsafe { Out::nullable(res) };
+    Sys::clock_getres(base - 1, res).map(|()| base).unwrap_or(0)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tzset.html>.
+///
+/// # Safety
+/// The caller must ensure that [`daylight`], [`timezone`] and [`tzname`] are
+/// not accessed by user code for the duration of the call.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn tzset() {
+    let mut lock = TIMEZONE_LOCK.lock();
+    // SAFETY: the caller is required to ensure that `daylight`, `timezone`
+    // and `tzname` are not accessed by user code.
+    unsafe { clear_timezone(&mut lock) };
+
+    let tz = time_zone();
+    let datetime = now();
+    let (std_time, dst_time) = match tz.from_local_datetime(&datetime) {
+        MappedLocalTime::Single(t) => (t, None),
+        // This variant contains the two possible results, in the order (earliest, latest).
+        MappedLocalTime::Ambiguous(t1, t2) => (t2, Some(t1)),
+        MappedLocalTime::None => return,
+    };
+
+    // SAFETY: the caller is required to ensure that `daylight`, `timezone`
+    // and `tzname` are not accessed by user code.
+    unsafe { set_timezone(&mut lock, &std_time, dst_time) }
+}
+
+fn convert_tm_generic<Tz: TimeZone>(tz: &Tz, tm_val: &tm) -> Option<DateTime<Tz>> {
+    // Adjust fields: tm_year is years since 1900; tm_mon is 0-indexed.
+    let year = tm_val.tm_year + 1900;
+    let month = tm_val.tm_mon + 1; // convert to 1-indexed
+    let day = tm_val.tm_mday;
+    let hour = tm_val.tm_hour;
+    let minute = tm_val.tm_min;
+    let second = tm_val.tm_sec;
+
+    match tz.with_ymd_and_hms(
+        year,
+        month as u32,
+        day as u32,
+        hour as u32,
+        minute as u32,
+        second as u32,
+    ) {
+        MappedLocalTime::Single(dt) => Some(dt),
+        MappedLocalTime::Ambiguous(dt1, _dt2) => Some(dt1), // choose the earliest value
+        _ => None,
+    }
+}
+
+/// # Safety
+/// The caller must ensure that `daylight`, `timezone` and `tzname` are not
+/// accessed by user code for the duration of the call (relibc functions are
+/// required to hold `TIMEZONE_LOCK` when accessing these).
+unsafe fn clear_timezone(guard: &mut MutexGuard<'_, (Option<CString>, Option<CString>)>) {
+    guard.0 = None;
+    guard.1 = None;
+
+    // SAFETY: the caller is required to ensure access exclusively for the
+    // holder of `TIMEZONE_LOCK`.
+    let daylight_mut = unsafe { &mut *(&raw mut daylight) };
+    // SAFETY: the caller is required to ensure access exclusively for the
+    // holder of `TIMEZONE_LOCK`.
+    let timezone_mut = unsafe { &mut *(&raw mut timezone) };
+    // SAFETY: the caller is required to ensure access exclusively for the
+    // holder of `TIMEZONE_LOCK`.
+    let tzname_mut = unsafe { &mut *(&raw mut tzname) };
+
+    (*tzname_mut).0[0] = ptr::null_mut();
+    (*tzname_mut).0[1] = ptr::null_mut();
+    *timezone_mut = 0;
+    *daylight_mut = 0;
+}
+
+#[inline(always)]
+fn get_system_time_zone<'a>() -> Option<&'a str> {
+    // Resolve the symlink for localtime
+    const BSIZE: size_t = 100;
+    let mut buffer: [u8; BSIZE] = [0; BSIZE];
+
+    #[cfg(not(target_os = "redox"))]
+    let (localtime, prefix) = (c"/etc/localtime", "/usr/share/zoneinfo/");
+
+    #[cfg(target_os = "redox")]
+    let (localtime, prefix) = (c"/etc/localtime", "/usr/share/zoneinfo/");
+
+    if unsafe { readlink(localtime.as_ptr().cast(), buffer.as_mut_ptr().cast(), BSIZE) } == -1 {
+        return None;
+    }
+
+    let path = unsafe { CStr::from_ptr(buffer.as_mut_ptr().cast()) };
+
+    if let Ok(tz_name) = path.to_str()
+        && let Some(stripped) = tz_name.strip_prefix(prefix)
+    {
+        return Some(stripped);
+    }
+
+    None
+}
+
+fn get_current_time_zone<'a>() -> &'a str {
+    // Check the `TZ` environment variable
+    let tz_env = unsafe { getenv(c"TZ".as_ptr().cast()) };
+    if !tz_env.is_null()
+        && let Ok(tz) = unsafe { CStr::from_ptr(tz_env) }.to_str()
+    {
+        return tz;
+    }
+
+    // Fallback to the system's default time zone
+    if let Some(tz) = get_system_time_zone() {
+        return tz;
+    }
+
+    // If all else fails, use UTC
+    "UTC"
+}
+
+#[inline(always)]
+fn time_zone() -> Tz {
+    get_current_time_zone().parse().unwrap_or(Tz::UTC)
+}
+
+#[inline(always)]
+fn now() -> NaiveDateTime {
+    let mut now = timespec::default();
+    if Sys::clock_gettime(CLOCK_REALTIME, Out::from_mut(&mut now)).is_ok() {}; // TODO what to do if Err?
+    DateTime::from_timestamp(now.tv_sec, now.tv_nsec as _)
+        .unwrap_or_default()
+        .naive_local()
+}
+
+#[inline(always)]
+fn get_localtime(
+    timer: time_t,
+    mut result: Out<tm>,
+) -> (Option<DateTime<Tz>>, Option<DateTime<Tz>>) {
+    let tz = time_zone();
+
+    // Convert UTC time to local time
+    let (std_time, dst_time) = match tz.timestamp_opt(timer, 0) {
+        MappedLocalTime::Single(t) => (Some(t), None),
+        // This variant contains the two possible results, in the order (earliest, latest).
+        MappedLocalTime::Ambiguous(t1, t2) => (Some(t2), Some(t1)),
+        MappedLocalTime::None => return (None, None),
+    };
+
+    let localtime = datetime_to_tm(&std_time.unwrap());
+    result.write(localtime);
+    (std_time, dst_time)
+}
+
+fn datetime_to_tm(local_time: &DateTime<Tz>) -> tm {
+    let tz = local_time.timezone().name();
+    let tz = tz.strip_prefix("Etc/").unwrap_or(tz);
+
+    let mut t = blank_tm();
+    // Populate the `tm` structure
+    t.tm_sec = local_time.second() as _;
+    t.tm_min = local_time.minute() as _;
+    t.tm_hour = local_time.hour() as _;
+    t.tm_mday = local_time.day() as _;
+    t.tm_mon = local_time.month0() as _; // 0-based month
+    t.tm_year = (local_time.year() - 1900) as _; // Years since 1900
+    t.tm_wday = local_time.weekday().num_days_from_sunday() as _;
+    t.tm_yday = local_time.ordinal0() as _; // 0-based day of year
+
+    let offset = local_time.offset();
+    t.tm_isdst = offset.dst_offset().num_hours() as _;
+    // Get the UTC offset in seconds
+    t.tm_gmtoff = offset.fix().local_minus_utc().into();
+
+    let tm_zone = {
+        let mut timezone_names = TIMEZONE_NAMES.lock();
+        timezone_names.get_or_init(BTreeSet::new);
+        let cstr = CString::new(tz).unwrap();
+        timezone_names.get_mut().unwrap().insert(cstr.clone());
+        timezone_names.get().unwrap().get(&cstr).unwrap().as_ptr()
+    };
+
+    t.tm_zone = tm_zone.cast();
+    t
+}
+
+/// # Safety
+/// The caller must ensure that `daylight`, `timezone` and `tzname` are not
+/// accessed by user code for the duration of the call (relibc functions are
+/// required to hold `TIMEZONE_LOCK` when accessing these).
+unsafe fn set_timezone(
+    guard: &mut MutexGuard<'_, (Option<CString>, Option<CString>)>,
+    std: &DateTime<Tz>,
+    dst: Option<DateTime<Tz>>,
+) {
+    // SAFETY: the caller is required to ensure access exclusively for the
+    // holder of `TIMEZONE_LOCK`.
+    let daylight_mut = unsafe { &mut *(&raw mut daylight) };
+    // SAFETY: the caller is required to ensure access exclusively for the
+    // holder of `TIMEZONE_LOCK`.
+    let timezone_mut = unsafe { &mut *(&raw mut timezone) };
+    // SAFETY: the caller is required to ensure access exclusively for the
+    // holder of `TIMEZONE_LOCK`.
+    let tzname_mut = unsafe { &mut *(&raw mut tzname) };
+
+    let ut_offset = std.offset();
+
+    guard.0 = Some(CString::new(ut_offset.abbreviation().expect("Wrong timezone")).unwrap());
+    tzname_mut.0[0] = guard.0.as_ref().unwrap().as_ptr().cast_mut();
+
+    match dst {
+        Some(dst) => {
+            guard.1 =
+                Some(CString::new(dst.offset().abbreviation().expect("Wrong timezone")).unwrap());
+            tzname_mut.0[1] = guard.1.as_ref().unwrap().as_ptr().cast_mut();
+            *daylight_mut = 1;
+        }
+        None => {
+            guard.1 = None;
+            tzname_mut.0[1] = guard.0.as_ref().unwrap().as_ptr().cast_mut();
+            *daylight_mut = 0;
+        }
+    }
+
+    *timezone_mut = -c_long::from(ut_offset.fix().local_minus_utc());
+}
+
+#[inline(always)]
+pub const fn get_offset(off: c_long) -> Option<FixedOffset> {
+    if off < 0 {
+        FixedOffset::west_opt(off as _)
+    } else {
+        FixedOffset::east_opt(off as _)
+    }
+}
+
+const fn blank_tm() -> tm {
+    tm {
+        tm_year: 0,
+        tm_mon: 0,
+        tm_mday: 0,
+        tm_hour: 0,
+        tm_min: 0,
+        tm_sec: 0,
+        tm_wday: 0,
+        tm_yday: 0,
+        tm_isdst: -1,
+        tm_gmtoff: 0,
+        tm_zone: ptr::null_mut(),
+    }
+}
+
+pub(crate) fn timespec_realtime_to_monotonic(abstime: timespec) -> Result<timespec, Errno> {
+    let mut realtime = timespec::default();
+    unsafe { clock_gettime(CLOCK_REALTIME, &raw mut realtime) };
+    let mut monotonic = timespec::default();
+    unsafe { clock_gettime(CLOCK_MONOTONIC, &raw mut monotonic) };
+    let Some(delta) = timespec::subtract(abstime, realtime) else {
+        return Err(Errno(ETIMEDOUT));
+    };
+    let Some(relative) = timespec::add(monotonic, delta) else {
+        return Err(Errno(ENOMEM));
+    };
+    Ok(relative)
+}
diff --git a/recipes/core/relibc/src/header/time/redox.rs b/recipes/core/relibc/src/header/time/redox.rs
new file mode 100644
index 0000000000..b19d228a7b
--- /dev/null
+++ b/recipes/core/relibc/src/header/time/redox.rs
@@ -0,0 +1,4 @@
+use crate::platform::types::c_int;
+
+pub const CLOCK_REALTIME: c_int = 1;
+pub const CLOCK_MONOTONIC: c_int = 4;
diff --git a/recipes/core/relibc/src/header/time/strftime.rs b/recipes/core/relibc/src/header/time/strftime.rs
new file mode 100644
index 0000000000..49ab8e48fc
--- /dev/null
+++ b/recipes/core/relibc/src/header/time/strftime.rs
@@ -0,0 +1,304 @@
+// `strftime` implementation.
+//
+// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strftime.html>.
+
+use alloc::string::String;
+
+use super::tm;
+use crate::{
+    c_str::CStr,
+    platform::{
+        self, WriteByte,
+        types::{c_char, c_int, size_t},
+    },
+};
+
+// We use the langinfo constants
+use crate::header::langinfo::{
+    ABDAY_1,
+    ABMON_1,
+    AM_STR,
+    DAY_1,
+    MON_1,
+    PM_STR,
+    // TODO : other constants if needed
+    nl_item,
+    nl_langinfo,
+};
+
+/// A helper that calls `nl_langinfo(item)` and converts the returned pointer
+/// into a `&str`. If it fails or is null, returns an empty string "".
+unsafe fn langinfo_to_str(item: nl_item) -> &'static str {
+    use core::ffi::CStr;
+
+    let ptr = unsafe { nl_langinfo(item) };
+    if ptr.is_null() {
+        return "";
+    }
+    unsafe { CStr::from_ptr(ptr) }.to_str().unwrap_or_default()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strftime.html>.
+///
+/// Formats time data according to the given `format` string.
+///
+/// Use `langinfo` for locale-based day/month names,
+/// but still hard-codes other aspects of the "C" locale (like numeric/date
+/// formats) and ignores `%E` / `%O` variations.
+pub unsafe fn strftime<W: WriteByte>(w: &mut W, format: *const c_char, t: *const tm) -> size_t {
+    /// Helper that actually parses the format string and writes output.
+    pub unsafe fn inner_strftime<W: WriteByte>(
+        w: &mut W,
+        mut format: *const c_char,
+        t: *const tm,
+    ) -> bool {
+        macro_rules! w {
+            (byte $b:expr) => {{
+                if w.write_u8($b).is_err() {
+                    return false;
+                }
+            }};
+            (char $chr:expr) => {{
+                if w.write_char($chr).is_err() {
+                    return false;
+                }
+            }};
+            (recurse $fmt:expr) => {{
+                let mut tmp = String::with_capacity($fmt.len() + 1);
+                tmp.push_str($fmt);
+                tmp.push('\0');
+
+                if unsafe { !inner_strftime(w, tmp.as_ptr() as *mut c_char, t) } {
+                    return false;
+                }
+            }};
+            ($str:expr) => {{
+                if w.write_str($str).is_err() {
+                    return false;
+                }
+            }};
+            ($fmt:expr, $($args:expr),+) => {{
+                // Could use write!() if we didn't need the exact count
+                if write!(w, $fmt, $($args),+).is_err() {
+                    return false;
+                }
+            }};
+        }
+
+        while unsafe { *format } != 0 {
+            // If the character isn't '%', just copy it out.
+            if unsafe { *format } as u8 != b'%' {
+                w!(byte unsafe { *format } as u8);
+                format = unsafe { format.offset(1) };
+                continue;
+            }
+
+            // Skip '%'
+            format = unsafe { format.offset(1) };
+
+            // POSIX says '%E' and '%O' can modify numeric formats for locales,
+            // but we ignore them in this minimal "C" locale approach.
+            if unsafe { *format } as u8 == b'E' || unsafe { *format } as u8 == b'O' {
+                format = unsafe { format.offset(1) };
+            }
+
+            match unsafe { *format } as u8 {
+                // Literal '%'
+                b'%' => w!(byte b'%'),
+
+                // Newline and tab expansions
+                b'n' => w!(byte b'\n'),
+                b't' => w!(byte b'\t'),
+
+                // Abbreviated weekday name: %a
+                b'a' => {
+                    // `ABDAY_1 + tm_wday` is the correct langinfo ID for abbreviated weekdays
+                    let s = unsafe { langinfo_to_str(ABDAY_1 + (*t).tm_wday) };
+                    w!(s);
+                }
+
+                // Full weekday name: %A
+                b'A' => {
+                    // `DAY_1 + tm_wday` is the correct langinfo ID for full weekdays
+                    let s = unsafe { langinfo_to_str(DAY_1 + (*t).tm_wday) };
+                    w!(s);
+                }
+
+                // Abbreviated month name: %b or %h
+                b'b' | b'h' => {
+                    let s = unsafe { langinfo_to_str(ABMON_1 + (*t).tm_mon) };
+                    w!(s);
+                }
+
+                // Full month name: %B
+                b'B' => {
+                    let s = unsafe { langinfo_to_str(MON_1 + (*t).tm_mon) };
+                    w!(s);
+                }
+
+                // Century: %C
+                b'C' => {
+                    let mut year = unsafe { (*t).tm_year } / 100;
+                    if unsafe { (*t).tm_year } % 100 != 0 {
+                        year += 1;
+                    }
+                    w!("{:02}", year + 19);
+                }
+
+                // Day of month: %d
+                b'd' => w!("{:02}", unsafe { (*t).tm_mday }),
+
+                // %D => same as %m/%d/%y
+                b'D' => w!(recurse "%m/%d/%y"),
+
+                // Day of month, space-padded: %e
+                b'e' => w!("{:2}", unsafe { (*t).tm_mday }),
+
+                // ISO 8601 date: %F => %Y-%m-%d
+                b'F' => w!(recurse "%Y-%m-%d"),
+
+                // Hour (00-23): %H
+                b'H' => w!("{:02}", unsafe { (*t).tm_hour }),
+
+                // Hour (01-12): %I
+                b'I' => w!("{:02}", (unsafe { (*t).tm_hour } + 12 - 1) % 12 + 1),
+
+                // Day of year: %j
+                b'j' => w!("{:03}", unsafe { (*t).tm_yday } + 1),
+
+                // etc.
+                b'k' => w!("{:2}", unsafe { (*t).tm_hour }),
+                b'l' => w!("{:2}", (unsafe { (*t).tm_hour } + 12 - 1) % 12 + 1),
+                b'm' => w!("{:02}", unsafe { (*t).tm_mon } + 1),
+                b'M' => w!("{:02}", unsafe { (*t).tm_min }),
+
+                // AM/PM (uppercase): %p
+                b'p' => {
+                    // Get "AM" / "PM" from langinfo
+                    if unsafe { (*t).tm_hour } < 12 {
+                        w!(unsafe { langinfo_to_str(AM_STR) });
+                    } else {
+                        w!(unsafe { langinfo_to_str(PM_STR) });
+                    }
+                }
+
+                // am/pm (lowercase): %P
+                b'P' => {
+                    // Convert the AM_STR / PM_STR to lowercase
+                    if unsafe { (*t).tm_hour } < 12 {
+                        let am = unsafe { langinfo_to_str(AM_STR) }.to_ascii_lowercase();
+                        w!(&am);
+                    } else {
+                        let pm = unsafe { langinfo_to_str(PM_STR) }.to_ascii_lowercase();
+                        w!(&pm);
+                    }
+                }
+
+                // 12-hour clock with seconds + AM/PM: %r => %I:%M:%S %p
+                b'r' => w!(recurse "%I:%M:%S %p"),
+
+                // 24-hour clock without seconds: %R => %H:%M
+                b'R' => w!(recurse "%H:%M"),
+
+                // Seconds since the Epoch: %s => calls mktime() to convert tm to time_t
+                b's' => w!("{}", unsafe { super::mktime(t.cast_mut()) }),
+
+                // Seconds (00-60): %S (unchanged)
+                b'S' => w!("{:02}", unsafe { (*t).tm_sec }),
+
+                // 24-hour clock with seconds: %T => %H:%M:%S
+                b'T' => w!(recurse "%H:%M:%S"),
+
+                // Weekday (1-7, Monday=1): %u
+                b'u' => w!("{}", (unsafe { (*t).tm_wday } + 7 - 1) % 7 + 1),
+
+                // Sunday-based week of year: %U
+                b'U' => w!(
+                    "{}",
+                    (unsafe { (*t).tm_yday } + 7 - unsafe { (*t).tm_wday }) / 7
+                ),
+
+                // ISO-8601 week of year
+                b'V' => w!("{}", week_of_year(unsafe { &*t })),
+
+                // Weekday (0-6, Sunday=0): %w
+                b'w' => w!("{}", unsafe { (*t).tm_wday }),
+
+                // Monday-based week of year: %W
+                b'W' => w!(
+                    "{}",
+                    (unsafe { (*t).tm_yday } + 7 - (unsafe { (*t).tm_wday } + 6) % 7) / 7
+                ),
+
+                // Last two digits of year: %y
+                b'y' => w!("{:02}", unsafe { (*t).tm_year } % 100),
+
+                // Full year: %Y
+                b'Y' => w!("{}", unsafe { (*t).tm_year } + 1900),
+
+                // Timezone offset: %z
+                b'z' => {
+                    let offset = unsafe { (*t).tm_gmtoff };
+                    let (sign, offset) = if offset < 0 {
+                        ('-', -offset)
+                    } else {
+                        ('+', offset)
+                    };
+                    let mins = offset.div_euclid(60);
+                    let min = mins.rem_euclid(60);
+                    let hour = mins.div_euclid(60);
+                    w!("{}{:02}{:02}", sign, hour, min)
+                }
+
+                // Timezone name: %Z
+                b'Z' => w!(
+                    "{}",
+                    unsafe { CStr::from_ptr((*t).tm_zone) }.to_str().unwrap()
+                ),
+
+                // Date+time+TZ: %+
+                b'+' => w!(recurse "%a %b %d %T %Z %Y"),
+
+                // Unrecognized format specifier => fail
+                _ => return false,
+            }
+
+            // Move past the format specifier
+            format = unsafe { format.offset(1) };
+        }
+        true
+    }
+
+    // Wrap the writer in a CountingWriter to return how many bytes were written.
+    let mut cw = platform::CountingWriter::new(w);
+    if unsafe { !inner_strftime(&mut cw, format, t) } {
+        return 0;
+    }
+    cw.written
+}
+
+/// Calculate number of weeks in a year as defined by ISO 8601
+///
+/// ## Source
+/// https://en.wikipedia.org/wiki/ISO_week_date
+fn weeks_per_year(year: c_int) -> c_int {
+    let year = f64::from(year);
+    let p_y = (year + (year / 4.) - (year / 100.) + (year / 400.)) as c_int % 7;
+    if p_y == 4 { 53 } else { 52 }
+}
+
+/// Calculate the week of the year accounting for leap weeks (ISO 8601)
+///
+/// ## Source
+/// https://en.wikipedia.org/wiki/ISO_week_date
+fn week_of_year(time: &tm) -> c_int {
+    let week = (10 + time.tm_yday - time.tm_wday) / 7;
+
+    if week <= 1 {
+        weeks_per_year(time.tm_year - 1)
+    } else if week > weeks_per_year(time.tm_year) {
+        1
+    } else {
+        week
+    }
+}
diff --git a/recipes/core/relibc/src/header/time/strptime.rs b/recipes/core/relibc/src/header/time/strptime.rs
new file mode 100644
index 0000000000..f49c5b54b6
--- /dev/null
+++ b/recipes/core/relibc/src/header/time/strptime.rs
@@ -0,0 +1,593 @@
+// `strptime` implementation.
+//
+// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strptime.html>.
+
+use crate::header::time::tm;
+use alloc::string::String;
+use core::{
+    ffi::{CStr, c_char, c_int, c_void},
+    ptr,
+    ptr::NonNull,
+    str,
+};
+
+/// For convenience, we define some helper constants for the C-locale.
+const SHORT_DAYS: [&str; 7] = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+const LONG_DAYS: [&str; 7] = [
+    "Sunday",
+    "Monday",
+    "Tuesday",
+    "Wednesday",
+    "Thursday",
+    "Friday",
+    "Saturday",
+];
+const SHORT_MONTHS: [&str; 12] = [
+    "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+];
+const LONG_MONTHS: [&str; 12] = [
+    "January",
+    "February",
+    "March",
+    "April",
+    "May",
+    "June",
+    "July",
+    "August",
+    "September",
+    "October",
+    "November",
+    "December",
+];
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/strptime.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn strptime(
+    buf: *const c_char,
+    format: *const c_char,
+    tm: *mut tm,
+) -> *mut c_char {
+    // Validate inputs
+    let buf_ptr = if let Some(ptr) = NonNull::new(buf.cast::<c_void>().cast_mut()) {
+        ptr
+    } else {
+        return ptr::null_mut();
+    };
+    //
+    let fmt_ptr = if let Some(ptr) = NonNull::new(format.cast::<c_void>().cast_mut()) {
+        ptr
+    } else {
+        return ptr::null_mut();
+    };
+
+    let tm_ptr = if let Some(ptr) = NonNull::new(tm) {
+        ptr
+    } else {
+        return ptr::null_mut();
+    };
+
+    // Convert raw pointers into slices/strings.
+    let input_str = unsafe {
+        if buf.is_null() {
+            return ptr::null_mut();
+        }
+        match CStr::from_ptr(buf).to_str() {
+            Ok(s) => s,
+            Err(_) => return ptr::null_mut(), // Not a valid UTF-8
+        }
+    };
+
+    let fmt_str = unsafe {
+        if format.is_null() {
+            return ptr::null_mut();
+        }
+        match CStr::from_ptr(format).to_str() {
+            Ok(s) => s,
+            Err(_) => return ptr::null_mut(), // Not a valid UTF-8
+        }
+    };
+
+    // We parse the format specifiers in a loop
+    let mut fmt_chars = fmt_str.chars().peekable();
+    let mut index_in_input = 0;
+
+    while let Some(fc) = fmt_chars.next() {
+        if fc != '%' {
+            // If it's a normal character, we expect it to match exactly in input
+            if input_str.len() <= index_in_input {
+                return ptr::null_mut(); // input ended too soon
+            }
+            let in_char = input_str.as_bytes()[index_in_input] as char;
+            if in_char != fc {
+                // mismatch
+                return ptr::null_mut();
+            }
+            index_in_input += 1;
+            continue;
+        }
+
+        // If we see '%', read the next character
+        let Some(spec) = fmt_chars.next() else {
+            // format string ended abruptly after '%'
+            return ptr::null_mut();
+        };
+
+        // POSIX says `%E` or `%O` are modified specifiers for locale.
+        // We will skip them if they appear (like strftime does) and read the next char.
+        let final_spec = if spec == 'E' || spec == 'O' {
+            match fmt_chars.next() {
+                Some(ch) => ch,
+                None => return ptr::null_mut(),
+            }
+        } else {
+            spec
+        };
+
+        // Handle known specifiers
+        match final_spec {
+            // Whitespace: %n or %t
+            'n' | 't' => {
+                // Skip over any whitespace in the input
+                while index_in_input < input_str.len()
+                    && input_str.as_bytes()[index_in_input].is_ascii_whitespace()
+                {
+                    index_in_input += 1;
+                }
+            }
+
+            // Literal % => "%%"
+            '%' => {
+                if index_in_input >= input_str.len()
+                    || input_str.as_bytes()[index_in_input] as char != '%'
+                {
+                    return ptr::null_mut();
+                }
+                index_in_input += 1;
+            }
+
+            // Day of Month: %d / %e
+            'd' | 'e' => {
+                // parse a 2-digit day (with or without leading zero)
+                let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
+                    Some(v) => v,
+                    None => return ptr::null_mut(),
+                };
+                unsafe {
+                    (*tm).tm_mday = val as c_int;
+                    // Day of month is limited to [1,31] according to the standard
+                    if (*tm).tm_mday < 1 || (*tm).tm_mday > 31 {
+                        return ptr::null_mut();
+                    }
+                }
+                index_in_input += len;
+            }
+
+            // Month: %m
+            'm' => {
+                // parse a 2-digit month
+                let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
+                    Some(v) => v,
+                    None => return ptr::null_mut(),
+                };
+                // tm_mon is 0-based (0 = Jan, 1 = Feb,...)
+                unsafe {
+                    (*tm).tm_mon = (val as c_int) - 1;
+                    if (*tm).tm_mon < 0 || (*tm).tm_mon > 11 {
+                        return ptr::null_mut();
+                    }
+                }
+                index_in_input += len;
+            }
+
+            // Year without century: %y
+            'y' => {
+                // parse a 2-digit year
+                let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
+                    Some(v) => v,
+                    None => return ptr::null_mut(),
+                };
+                // According to POSIX, %y in strptime is [00,99], and the "year" is 1900..1999 for [00..99],
+                // but the standard says: "values in [69..99] refer to 1969..1999, [00..68] => 2000..2068"
+                let fullyear = if val >= 69 { val + 1900 } else { val + 2000 };
+                unsafe {
+                    (*tm).tm_year = (fullyear - 1900) as c_int;
+                }
+                index_in_input += len;
+            }
+
+            // Year with century: %Y
+            'Y' => {
+                // parse up to 4-digit (or more) year
+                // We allow more than 4 digits if needed
+                let (val, len) = match parse_int(&input_str[index_in_input..], 4, true) {
+                    Some(v) => v,
+                    None => return ptr::null_mut(),
+                };
+                unsafe {
+                    (*tm).tm_year = (val as c_int) - 1900;
+                }
+                index_in_input += len;
+            }
+
+            // Hour (00..23): %H
+            'H' => {
+                let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
+                    Some(v) => v,
+                    None => return ptr::null_mut(),
+                };
+                if val > 23 {
+                    return ptr::null_mut();
+                }
+                unsafe {
+                    (*tm).tm_hour = val as c_int;
+                }
+                index_in_input += len;
+            }
+
+            // Hour (01..12): %I
+            'I' => {
+                let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
+                    Some(v) => v,
+                    None => return ptr::null_mut(),
+                };
+                if !(1..=12).contains(&val) {
+                    return ptr::null_mut();
+                }
+                unsafe {
+                    (*tm).tm_hour = val as c_int;
+                }
+                // We’ll interpret AM/PM with %p if it appears later
+                index_in_input += len;
+            }
+
+            // Minute (00..59): %M
+            'M' => {
+                let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
+                    Some(v) => v,
+                    None => return ptr::null_mut(),
+                };
+                if val > 59 {
+                    return ptr::null_mut();
+                }
+                unsafe {
+                    (*tm).tm_min = val as c_int;
+                }
+                index_in_input += len;
+            }
+
+            // Seconds (00..60): %S
+            'S' => {
+                let (val, len) = match parse_int(&input_str[index_in_input..], 2, false) {
+                    Some(v) => v,
+                    None => return ptr::null_mut(),
+                };
+                if val > 60 {
+                    return ptr::null_mut();
+                }
+                unsafe {
+                    (*tm).tm_sec = val as c_int;
+                }
+                index_in_input += len;
+            }
+
+            // AM/PM: %p
+            'p' => {
+                // Parse either "AM" or "PM" (no case-sensitive)
+                // We'll read up to 2 or 3 letters from input ("AM", "PM")
+                let leftover = &input_str[index_in_input..];
+                let parsed_len = match parse_am_pm(leftover) {
+                    Some((is_pm, used)) => {
+                        if unsafe { (*tm).tm_hour } == 12 {
+                            // 12 AM => 00:xx, 12 PM => 12:xx
+                            unsafe {
+                                (*tm).tm_hour = if is_pm { 12 } else { 0 };
+                            }
+                        } else {
+                            // 1..11 AM => 1..11, 1..11 PM => 13..23
+                            if is_pm {
+                                unsafe {
+                                    (*tm).tm_hour += 12;
+                                }
+                            }
+                        }
+                        used
+                    }
+                    None => return ptr::null_mut(),
+                };
+                index_in_input += parsed_len;
+            }
+
+            // Weekday Name: %a/%A
+            'a' => {
+                // Abbreviated day name (Sun..Sat)
+                let leftover = &input_str[index_in_input..];
+                let parsed_len = match parse_weekday(leftover, true) {
+                    Some((wday, used)) => {
+                        unsafe {
+                            (*tm).tm_wday = wday as c_int;
+                        }
+                        used
+                    }
+                    None => return ptr::null_mut(),
+                };
+                index_in_input += parsed_len;
+            }
+            'A' => {
+                // Full day name (Sunday..Saturday)
+                let leftover = &input_str[index_in_input..];
+                let parsed_len = match parse_weekday(leftover, false) {
+                    Some((wday, used)) => {
+                        unsafe {
+                            (*tm).tm_wday = wday as c_int;
+                        }
+                        used
+                    }
+                    None => return ptr::null_mut(),
+                };
+                index_in_input += parsed_len;
+            }
+
+            // Month Name: %b/%B/%h
+            'b' | 'h' => {
+                // Abbreviated month name
+                let leftover = &input_str[index_in_input..];
+                let parsed_len = match parse_month(leftover, true) {
+                    Some((mon, used)) => {
+                        unsafe {
+                            (*tm).tm_mon = mon as c_int;
+                        }
+                        used
+                    }
+                    None => return ptr::null_mut(),
+                };
+                index_in_input += parsed_len;
+            }
+            'B' => {
+                // Full month name
+                let leftover = &input_str[index_in_input..];
+                let parsed_len = match parse_month(leftover, false) {
+                    Some((mon, used)) => {
+                        unsafe {
+                            (*tm).tm_mon = mon as c_int;
+                        }
+                        used
+                    }
+                    None => return ptr::null_mut(),
+                };
+                index_in_input += parsed_len;
+            }
+
+            // Day of year: %j
+            'j' => {
+                // parse 3-digit day of year [001..366]
+                let (val, len) = match parse_int(&input_str[index_in_input..], 3, false) {
+                    Some(v) => v,
+                    None => return ptr::null_mut(),
+                };
+                if !(1..=366).contains(&val) {
+                    return ptr::null_mut();
+                }
+                // store in tm_yday
+                unsafe {
+                    (*tm).tm_yday = (val - 1) as c_int;
+                }
+                index_in_input += len;
+            }
+
+            // Date shortcuts: %D, %F, etc.
+            'D' => {
+                // Equivalent to "%m/%d/%y"
+                // We can do a mini strptime recursion or manually parse
+                // For simplicity, we'll do it inline here
+                let subfmt = "%m/%d/%y";
+                let used =
+                    match unsafe { apply_subformat(&input_str[index_in_input..], subfmt, tm) } {
+                        Some(v) => v,
+                        None => return ptr::null_mut(),
+                    };
+                index_in_input += used;
+            }
+            'F' => {
+                // Equivalent to "%Y-%m-%d"
+                let subfmt = "%Y-%m-%d";
+                let used =
+                    match unsafe { apply_subformat(&input_str[index_in_input..], subfmt, tm) } {
+                        Some(v) => v,
+                        None => return ptr::null_mut(),
+                    };
+                index_in_input += used;
+            }
+            'T' => {
+                // Equivalent to %H:%M:%S
+                let subfmt = "%H:%M:%S";
+                let used =
+                    match unsafe { apply_subformat(&input_str[index_in_input..], subfmt, tm) } {
+                        Some(v) => v,
+                        None => return ptr::null_mut(),
+                    };
+                index_in_input += used;
+            }
+
+            // TODO : not implemented: %x, %X, %c, %r, %R, etc.
+            // Hint : if you want to implement these, do similarly to %D / %F (or parse manually)
+            'x' | 'X' | 'c' | 'r' | 'R' => {
+                // Return NULL if we don’t want to accept them :
+                return ptr::null_mut();
+            }
+
+            // Timezone: %Z or %z
+            'Z' | 'z' => {
+                // Full/abbrev time zone name or numeric offset
+                // Implementation omitted. Real support is quite complicated.
+                return ptr::null_mut();
+            }
+
+            _ => {
+                // We do not recognize this specifier
+                return ptr::null_mut();
+            }
+        }
+    }
+
+    // If we got here, parsing was successful. Return pointer to the
+    // next unparsed character in `buf`.
+    let ret_ptr = unsafe { buf.add(index_in_input) };
+    ret_ptr.cast_mut()
+}
+
+// Helper / Parsing Logic
+
+/// Parse an integer from the beginning of `input_str`.
+///
+/// - `width` is the maximum number of digits to parse
+/// - `allow_variable_width` indicates if we can parse fewer digits
+///   (e.g., `%Y` can have more than 4 digits, but also might parse "2023" or "12345").
+fn parse_int(input: &str, width: usize, allow_variable: bool) -> Option<(i32, usize)> {
+    let mut val = 0i32;
+    let chars = input.chars();
+    let mut count = 0;
+
+    for c in chars {
+        if !c.is_ascii_digit() {
+            break;
+        }
+
+        // Check for integer overflow
+        val = val
+            .checked_mul(10)?
+            .checked_add(i32::from(c as u8 - b'0'))?;
+
+        count += 1;
+        if count == width && !allow_variable {
+            break;
+        }
+    }
+
+    if count == 0 { None } else { Some((val, count)) }
+}
+
+/// Handle AM/PM. Returns (is_pm, length_consumed).
+/// Accepts "AM", "am", "PM", "pm" case-insensitively.
+fn parse_am_pm(s: &str) -> Option<(bool, usize)> {
+    let trimmed = s.trim_start();
+    // Amount of whitespace skipped; can be 0
+    let diff = s.len() - trimmed.len();
+    let s = trimmed.get(0..2)?;
+
+    if s.eq_ignore_ascii_case("AM") {
+        return Some((false, diff + 2));
+    }
+    if s.eq_ignore_ascii_case("PM") {
+        return Some((true, diff + 2));
+    }
+    None
+}
+
+/// Parse a weekday name from `s`.
+/// - if `abbrev == true`, match short forms: "Mont".."Sun"
+/// - otherwise, match "Monday".."Sunday"
+///
+/// Return (weekday_index, length_consumed).
+fn parse_weekday(s: &str, abbrev: bool) -> Option<(usize, usize)> {
+    let list = if abbrev { &SHORT_DAYS } else { &LONG_DAYS };
+    for (i, name) in list.iter().enumerate() {
+        if s.len() >= name.len()
+            && s.get(0..name.len())
+                .is_some_and(|sub| sub.eq_ignore_ascii_case(name))
+        {
+            return Some((i, name.len()));
+        }
+    }
+    None
+}
+
+/// Parse a month name from `s`.
+/// - If `abbrev == true`, match short forms: "Jan".."Dec"
+/// - Otherwise, match "January".."December"
+///
+/// Return (month_index, length_consumed).
+fn parse_month(s: &str, abbrev: bool) -> Option<(usize, usize)> {
+    let list = if abbrev { &SHORT_MONTHS } else { &LONG_MONTHS };
+    for (i, name) in list.iter().enumerate() {
+        if s.len() >= name.len()
+            && s.get(0..name.len())
+                .is_some_and(|sub| sub.eq_ignore_ascii_case(name))
+        {
+            return Some((i, name.len()));
+        }
+    }
+    None
+}
+
+/// Apply a small subformat (like "%m/%d/%y" or "%Y-%m-%d") to `input`.
+/// Return how many characters of `input` were consumed or None on error.
+unsafe fn apply_subformat(input: &str, subfmt: &str, tm: *mut tm) -> Option<usize> {
+    // We'll do a temporary strptime call on a substring.
+    // Then we see how many chars it consumed. If that call fails, we return None.
+    // Otherwise, we return the count.
+
+    // Convert `input` to a null-terminated buffer temporarily
+    let mut tmpbuf = String::with_capacity(input.len() + 1);
+    tmpbuf.push_str(input);
+    tmpbuf.push('\0');
+
+    let mut tmpfmt = String::with_capacity(subfmt.len() + 1);
+    tmpfmt.push_str(subfmt);
+    tmpfmt.push('\0');
+
+    // We need a copy of the tm, so if partial parse fails, we don't override.
+    let old_tm = unsafe { ptr::read(tm) }; // backup
+
+    let consumed_ptr = unsafe {
+        strptime(
+            tmpbuf.as_ptr().cast::<c_char>(),
+            tmpfmt.as_ptr().cast::<c_char>(),
+            tm,
+        )
+    };
+
+    if consumed_ptr.is_null() {
+        // revert
+        unsafe {
+            *tm = old_tm;
+        }
+        return None;
+    }
+
+    // consumed_ptr - tmpbuf.as_ptr() => # of bytes consumed
+    let diff = (consumed_ptr as usize) - (tmpbuf.as_ptr() as usize);
+    Some(diff)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::parse_am_pm;
+
+    #[test]
+    fn am_pm_parser_works() {
+        let am = "am";
+        let am_expected = Some((false, 2));
+        assert_eq!(am_expected, parse_am_pm(am));
+
+        let pm = "pm";
+        let pm_expected = Some((true, 2));
+        assert_eq!(pm_expected, parse_am_pm(pm));
+
+        let am_caps = "AM";
+        assert_eq!(am_expected, parse_am_pm(am_caps));
+
+        let pm_caps = "PM";
+        assert_eq!(pm_expected, parse_am_pm(pm_caps));
+
+        let am_weird = "aM";
+        assert_eq!(am_expected, parse_am_pm(am_weird));
+
+        let am_prefix = "        \tam";
+        let am_prefix_expected = Some((false, 11));
+        assert_eq!(am_prefix_expected, parse_am_pm(am_prefix));
+
+        let pm_spaces = "        pm        ";
+        let pm_spaces_expected = Some((true, 10));
+        assert_eq!(pm_spaces_expected, parse_am_pm(pm_spaces));
+    }
+}
diff --git a/recipes/core/relibc/src/header/unistd/brk.rs b/recipes/core/relibc/src/header/unistd/brk.rs
new file mode 100644
index 0000000000..65d6544171
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/brk.rs
@@ -0,0 +1,58 @@
+use core::ptr;
+
+use crate::{
+    error::ResultExtPtrMut,
+    header::errno::ENOMEM,
+    platform::{
+        self, Pal, Sys,
+        types::{c_int, c_void, intptr_t},
+    },
+};
+
+static mut BRK: *mut c_void = ptr::null_mut();
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/brk.html>.
+///
+/// # Deprecation
+/// The `brk()` function was marked legacy in the System Interface & Headers
+/// Issue 5, and removed in Issue 6.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn brk(addr: *mut c_void) -> c_int {
+    unsafe { BRK = Sys::brk(addr).or_errno_null_mut() };
+
+    if unsafe { BRK } < addr {
+        platform::ERRNO.set(ENOMEM);
+        return -1;
+    }
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/brk.html>.
+///
+/// # Deprecation
+/// The `sbrk()` function was marked legacy in the System Interface & Headers
+/// Issue 5, and removed in Issue 6.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sbrk(incr: intptr_t) -> *mut c_void {
+    if unsafe { BRK }.is_null() {
+        unsafe { BRK = Sys::brk(ptr::null_mut()).or_errno_null_mut() };
+    }
+
+    let old_brk = unsafe { BRK };
+
+    if incr != 0 {
+        let addr = unsafe { old_brk.offset(incr) };
+
+        unsafe { BRK = Sys::brk(addr).or_errno_null_mut() };
+
+        if unsafe { BRK } < addr {
+            platform::ERRNO.set(ENOMEM);
+            return -1isize as *mut c_void;
+        }
+    }
+
+    old_brk.cast::<c_void>()
+}
diff --git a/recipes/core/relibc/src/header/unistd/cbindgen.toml b/recipes/core/relibc/src/header/unistd/cbindgen.toml
new file mode 100644
index 0000000000..fea8401227
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/cbindgen.toml
@@ -0,0 +1,25 @@
+sys_includes = ["stddef.h", "stdint.h", "sys/types.h", "features.h", "fcntl.h"]
+include_guard = "_RELIBC_UNISTD_H"
+trailer = """
+#define _POSIX_VERSION 200809L
+#define _POSIX_BARRIERS 202405L
+#define _POSIX_MONOTONIC_CLOCK 200112L
+#define _POSIX_REALTIME_SIGNALS 202405L
+#define _POSIX_SEMAPHORES 200112L
+#define _POSIX_SHELL 1
+#define _POSIX_SHARED_MEMORY_OBJECTS 200112L
+#define _POSIX_THREADS 202405L
+#define _POSIX_THREAD_ATTR_STACKADDR 202405L
+#define _POSIX_THREAD_ATTR_STACKSIZE 202405L
+#define _POSIX_TIMEOUTS 202405L
+#define _POSIX_TIMERS 202405L
+#define _XOPEN_SHM 1
+#define _XOPEN_VERSION 700L
+"""
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/unistd/getopt.rs b/recipes/core/relibc/src/header/unistd/getopt.rs
new file mode 100644
index 0000000000..5240e429fa
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/getopt.rs
@@ -0,0 +1,40 @@
+//! `getopt` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getopt.html>.
+
+use core::ptr;
+
+use crate::{
+    header::getopt,
+    platform::types::{c_char, c_int},
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getopt.html>.
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut optarg: *mut c_char = ptr::null_mut();
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getopt.html>.
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut opterr: c_int = 1;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getopt.html>.
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut optind: c_int = 1;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getopt.html>.
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut optopt: c_int = -1;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getopt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getopt(
+    argc: c_int,
+    argv: *const *mut c_char,
+    optstring: *const c_char,
+) -> c_int {
+    unsafe { getopt::getopt_long(argc, argv, optstring, ptr::null(), ptr::null_mut()) }
+}
diff --git a/recipes/core/relibc/src/header/unistd/getpass.rs b/recipes/core/relibc/src/header/unistd/getpass.rs
new file mode 100644
index 0000000000..8d7a55431b
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/getpass.rs
@@ -0,0 +1,71 @@
+use core::ptr;
+
+use crate::{
+    c_str::CStr,
+    fs::File,
+    header::{
+        fcntl::{O_CLOEXEC, O_RDWR},
+        limits::PASS_MAX,
+        termios,
+    },
+    io::{self, Read, Write},
+    raw_cell::RawCell,
+};
+
+use crate::platform::types::c_char;
+
+fn getpass_rs(prompt: CStr, passbuff: &mut [u8]) -> Result<*mut c_char, io::Error> {
+    let mut f = File::open(c"/dev/tty".into(), O_RDWR | O_CLOEXEC)?;
+
+    let mut term = termios::termios::default();
+
+    unsafe {
+        termios::tcgetattr(f.fd, &raw mut term);
+    }
+
+    let old_term = term.clone();
+
+    term.c_iflag &= !(termios::IGNCR | termios::INLCR) as u32;
+    term.c_iflag |= termios::ICRNL as u32;
+    term.c_lflag &= !(termios::ECHO | termios::ISIG) as u32;
+    term.c_lflag |= termios::ICANON as u32;
+
+    unsafe {
+        termios::tcsetattr(f.fd, termios::TCSAFLUSH, &raw const term);
+    }
+
+    f.write(prompt.to_bytes())?;
+    f.flush()?;
+
+    let mut len = f.read(passbuff)?;
+
+    if len > 0 && passbuff[len - 1] == b'\n' || passbuff.len() == len {
+        len -= 1;
+    }
+
+    passbuff[len] = 0;
+
+    unsafe {
+        termios::tcsetattr(f.fd, termios::TCSAFLUSH, &raw const old_term);
+    }
+
+    f.write(b"\n")?;
+    f.flush()?;
+
+    Ok(passbuff.as_mut_ptr().cast::<c_char>())
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/getpass.html>.
+///
+/// # Deprecation
+/// The `getpass()` function was marked legacy in the Open Group System
+/// Interface & Headers Issue 5, and removed in Issue 6.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getpass(prompt: *const c_char) -> *mut c_char {
+    static PASSBUFF: RawCell<[u8; PASS_MAX]> = RawCell::new([0; PASS_MAX]);
+
+    unsafe {
+        getpass_rs(CStr::from_ptr(prompt), &mut *PASSBUFF.as_mut_ptr()).unwrap_or(ptr::null_mut())
+    }
+}
diff --git a/recipes/core/relibc/src/header/unistd/mod.rs b/recipes/core/relibc/src/header/unistd/mod.rs
new file mode 100644
index 0000000000..573d69ad93
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/mod.rs
@@ -0,0 +1,1280 @@
+//! `unistd.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/unistd.h.html>.
+
+use core::{
+    convert::TryFrom,
+    ffi::VaListImpl,
+    mem::{self, MaybeUninit},
+    ptr, slice,
+};
+
+#[allow(deprecated)]
+use crate::platform::types::useconds_t;
+use crate::{
+    c_str::CStr,
+    error::{Errno, ResultExt},
+    header::{
+        bits_timespec::timespec,
+        crypt::{crypt_data, crypt_r},
+        errno::{self, ENAMETOOLONG},
+        fcntl, limits,
+        stdlib::getenv,
+        sys_ioctl, sys_resource,
+        sys_select::timeval,
+        sys_time, sys_utsname, termios,
+    },
+    out::Out,
+    platform::{
+        self, ERRNO, Pal, PalSignal, Sys,
+        types::{
+            c_char, c_int, c_long, c_short, c_uint, c_ulonglong, c_void, gid_t, off_t, pid_t,
+            size_t, ssize_t, suseconds_t, time_t, uid_t,
+        },
+    },
+};
+
+pub use self::{brk::*, getopt::*, pathconf::*, sysconf::*};
+pub use crate::header::pthread::fork_hooks;
+
+// Inclusion of ctermid() prototype marked as obsolescent since Issue 7, cf.
+// <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/unistd.h.html>.
+// cuserid() marked legacy in Issue 5.
+#[deprecated]
+pub use crate::header::stdio::ctermid;
+#[allow(deprecated)]
+pub use crate::header::stdio::cuserid;
+
+use super::{
+    errno::{E2BIG, EINVAL, ENOMEM},
+    stdio::snprintf,
+};
+
+use crate::header::signal::{sigprocmask, sigset_t, sigsuspend};
+
+mod brk;
+mod getopt;
+mod getpass;
+mod pathconf;
+#[cfg(target_os = "linux")]
+pub mod syscall;
+mod sysconf;
+
+pub const F_OK: c_int = 0;
+pub const R_OK: c_int = 4;
+pub const W_OK: c_int = 2;
+pub const X_OK: c_int = 1;
+
+pub const SEEK_SET: c_int = 0;
+pub const SEEK_CUR: c_int = 1;
+pub const SEEK_END: c_int = 2;
+
+pub const F_ULOCK: c_int = 0;
+pub const F_LOCK: c_int = 1;
+pub const F_TLOCK: c_int = 2;
+pub const F_TEST: c_int = 3;
+
+pub const STDIN_FILENO: c_int = 0;
+pub const STDOUT_FILENO: c_int = 1;
+pub const STDERR_FILENO: c_int = 2;
+
+pub const L_cuserid: usize = 9;
+
+// confstr constants
+// These are copied from Rust's libc and match musl as well.
+pub const _CS_PATH: c_int = 0;
+pub const _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS: c_int = 1;
+pub const _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS: c_int = 4;
+pub const _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS: c_int = 5;
+pub const _CS_POSIX_V6_ILP32_OFF32_CFLAGS: c_int = 1116;
+pub const _CS_POSIX_V6_ILP32_OFF32_LDFLAGS: c_int = 1117;
+pub const _CS_POSIX_V6_ILP32_OFF32_LIBS: c_int = 1118;
+pub const _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS: c_int = 1119;
+pub const _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS: c_int = 1120;
+pub const _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS: c_int = 1121;
+pub const _CS_POSIX_V6_ILP32_OFFBIG_LIBS: c_int = 1122;
+pub const _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS: c_int = 1123;
+pub const _CS_POSIX_V6_LP64_OFF64_CFLAGS: c_int = 1124;
+pub const _CS_POSIX_V6_LP64_OFF64_LDFLAGS: c_int = 1125;
+pub const _CS_POSIX_V6_LP64_OFF64_LIBS: c_int = 1126;
+pub const _CS_POSIX_V6_LP64_OFF64_LINTFLAGS: c_int = 1127;
+pub const _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS: c_int = 1128;
+pub const _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS: c_int = 1129;
+pub const _CS_POSIX_V6_LPBIG_OFFBIG_LIBS: c_int = 1130;
+pub const _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS: c_int = 1131;
+pub const _CS_POSIX_V7_ILP32_OFF32_CFLAGS: c_int = 1132;
+pub const _CS_POSIX_V7_ILP32_OFF32_LDFLAGS: c_int = 1133;
+pub const _CS_POSIX_V7_ILP32_OFF32_LIBS: c_int = 1134;
+pub const _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS: c_int = 1135;
+pub const _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS: c_int = 1136;
+pub const _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS: c_int = 1137;
+pub const _CS_POSIX_V7_ILP32_OFFBIG_LIBS: c_int = 1138;
+pub const _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS: c_int = 1139;
+pub const _CS_POSIX_V7_LP64_OFF64_CFLAGS: c_int = 1140;
+pub const _CS_POSIX_V7_LP64_OFF64_LDFLAGS: c_int = 1141;
+pub const _CS_POSIX_V7_LP64_OFF64_LIBS: c_int = 1142;
+pub const _CS_POSIX_V7_LP64_OFF64_LINTFLAGS: c_int = 1143;
+pub const _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS: c_int = 1144;
+pub const _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS: c_int = 1145;
+pub const _CS_POSIX_V7_LPBIG_OFFBIG_LIBS: c_int = 1146;
+pub const _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS: c_int = 1147;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fork.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn _Fork() -> pid_t {
+    unsafe { Sys::fork() }.or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/_Exit.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn _exit(status: c_int) -> ! {
+    Sys::exit(status)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/access.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn access(path: *const c_char, mode: c_int) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::access(path, mode).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/faccessat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn faccessat(
+    fd: c_int,
+    path: *const c_char,
+    mode: c_int,
+    flags: c_int,
+) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::faccessat(fd, path, mode, flags)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/alarm.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn alarm(seconds: c_uint) -> c_uint {
+    Sys::alarm(seconds)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/chdir.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn chdir(path: *const c_char) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::chdir(path).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/chown.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn chown(path: *const c_char, owner: uid_t, group: gid_t) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::chown(path, owner, group)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/chroot.html>.
+///
+/// # Deprecation
+/// The `chroot()` function was marked legacy in the System Interface & Headers
+/// Issue 5, and removed in Issue 6.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn chroot(path: *const c_char) -> c_int {
+    // TODO: Implement
+    platform::ERRNO.set(crate::header::errno::EPERM);
+
+    -1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/close.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn close(fildes: c_int) -> c_int {
+    Sys::close(fildes).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/confstr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn confstr(name: c_int, buf: *mut c_char, len: size_t) -> size_t {
+    // confstr returns the number of bytes required to hold the string INCLUDING the NUL
+    // terminator. This is different from other C functions hence the + 1.
+    match name {
+        _CS_PATH => {
+            let posix2_path = c"/usr/bin";
+            unsafe { snprintf(buf, len, c"%s".as_ptr(), posix2_path.as_ptr()) + 1 }
+                .try_into()
+                .unwrap_or_default()
+        }
+        _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS
+        | _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS
+        | _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS
+        | _CS_POSIX_V6_LP64_OFF64_LIBS..=_CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS => 1,
+        _ => {
+            platform::ERRNO.set(errno::EINVAL);
+            0
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/crypt.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn crypt(key: *const c_char, salt: *const c_char) -> *mut c_char {
+    let mut data = crypt_data::new();
+    unsafe { crypt_r(key, salt, &raw mut data) }
+}
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/daemon.3.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn daemon(nochdir: c_int, noclose: c_int) -> c_int {
+    if nochdir == 0 && Sys::chdir(c"/".into()).map(|()| 0).or_minus_one_errno() < 0 {
+        return -1;
+    }
+
+    if noclose == 0 {
+        let fd = Sys::open(c"/dev/null".into(), fcntl::O_RDWR, 0).or_minus_one_errno();
+        if fd < 0 {
+            return -1;
+        }
+        if dup2(fd, 0) < 0 || dup2(fd, 1) < 0 || dup2(fd, 2) < 0 {
+            close(fd);
+            return -1;
+        }
+        if fd > 2 {
+            close(fd);
+        }
+    }
+
+    match unsafe { fork() } {
+        0 => {}
+        -1 => return -1,
+        _ => _exit(0),
+    }
+
+    if setsid() < 0 {
+        return -1;
+    }
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dup.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn dup(fildes: c_int) -> c_int {
+    Sys::dup(fildes).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dup.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn dup2(fildes: c_int, fildes2: c_int) -> c_int {
+    Sys::dup2(fildes, fildes2).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/dup.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn dup3(fildes: c_int, fildes2: c_int, flag: c_int) -> c_int {
+    unimplemented!();
+}
+
+// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/encrypt.html>.
+//
+// # Deprecation
+// The `encrypt()` function was marked obsolescent in the Open Group Base Specifications Issue 8.
+//#[deprecated]
+// #[unsafe(no_mangle)]
+//pub extern "C" fn encrypt(block: [c_char; 64], edflag: c_int) {
+//    unimplemented!();
+//}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exec.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn execl(
+    path: *const c_char,
+    arg0: *const c_char,
+    mut __valist: ...
+) -> c_int {
+    unsafe {
+        with_argv(__valist, arg0, |args, _remaining_va| {
+            execv(path, args.as_ptr().cast())
+        })
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exec.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn execle(
+    path: *const c_char,
+    arg0: *const c_char,
+    mut __valist: ...
+) -> c_int {
+    unsafe {
+        with_argv(__valist, arg0, |args, mut remaining_va| {
+            let envp = remaining_va.arg::<*const *mut c_char>();
+            execve(path, args.as_ptr().cast(), envp)
+        })
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exec.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn execlp(
+    file: *const c_char,
+    arg0: *const c_char,
+    mut __valist: ...
+) -> c_int {
+    unsafe {
+        with_argv(__valist, arg0, |args, _remaining_va| {
+            execvp(file, args.as_ptr().cast())
+        })
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exec.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn execv(path: *const c_char, argv: *const *mut c_char) -> c_int {
+    unsafe { execve(path, argv, platform::environ) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exec.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn execve(
+    path: *const c_char,
+    argv: *const *mut c_char,
+    envp: *const *mut c_char,
+) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    unsafe { Sys::execve(path, argv, envp) }
+        .map(|()| unreachable!())
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fexecve.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fexecve(
+    fd: c_int,
+    argv: *const *mut c_char,
+    envp: *const *mut c_char,
+) -> c_int {
+    unsafe { Sys::fexecve(fd, argv, envp) }
+        .map(|()| unreachable!())
+        .or_minus_one_errno()
+}
+
+const PATH_SEPARATOR: u8 = b':';
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/exec.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn execvp(file: *const c_char, argv: *const *mut c_char) -> c_int {
+    let file = unsafe { CStr::from_ptr(file) };
+
+    if file.to_bytes().contains(&b'/')
+        || (cfg!(target_os = "redox") && file.to_bytes().contains(&b':'))
+    {
+        unsafe { execv(file.as_ptr(), argv) }
+    } else {
+        let mut error = errno::ENOENT;
+
+        let path_env = unsafe { getenv(c"PATH".as_ptr()) };
+        if !path_env.is_null() {
+            let path_env = unsafe { CStr::from_ptr(path_env) };
+            for path in path_env.to_bytes().split(|&b| b == PATH_SEPARATOR) {
+                let file = file.to_bytes();
+                let length = file.len() + path.len() + 2;
+                let mut program = alloc::vec::Vec::with_capacity(length);
+                program.extend_from_slice(path);
+                program.push(b'/');
+                program.extend_from_slice(file);
+                program.push(b'\0');
+
+                let program_c = CStr::from_bytes_with_nul(&program).unwrap();
+                unsafe { execv(program_c.as_ptr(), argv) };
+
+                match platform::ERRNO.get() {
+                    errno::ENOENT => (),
+                    other => error = other,
+                }
+            }
+        }
+
+        platform::ERRNO.set(error);
+        -1
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fchdir.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn fchdir(fildes: c_int) -> c_int {
+    Sys::fchdir(fildes).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fchown.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn fchown(fildes: c_int, owner: uid_t, group: gid_t) -> c_int {
+    Sys::fchown(fildes, owner, group)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fchownat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fchownat(
+    fd: c_int,
+    path: *const c_char,
+    owner: uid_t,
+    group: gid_t,
+    flags: c_int,
+) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::fchownat(fd, path, owner, group, flags)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fdatasync.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn fdatasync(fildes: c_int) -> c_int {
+    Sys::fdatasync(fildes).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fork.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fork() -> pid_t {
+    for prepare in unsafe { &fork_hooks[0] } {
+        prepare();
+    }
+    let pid = unsafe { Sys::fork() }.or_minus_one_errno();
+    if pid == 0 {
+        for child in unsafe { &fork_hooks[2] } {
+            child();
+        }
+    } else if pid != -1 {
+        for parent in unsafe { &fork_hooks[1] } {
+            parent();
+        }
+    }
+    pid
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fsync.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn fsync(fildes: c_int) -> c_int {
+    Sys::fsync(fildes).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ftruncate.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ftruncate(fildes: c_int, length: off_t) -> c_int {
+    Sys::ftruncate(fildes, length)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getcwd.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getcwd(mut buf: *mut c_char, mut size: size_t) -> *mut c_char {
+    let alloc = buf.is_null();
+    let mut stack_buf = [0; limits::PATH_MAX];
+    if alloc {
+        buf = stack_buf.as_mut_ptr();
+        size = stack_buf.len();
+    }
+
+    let ret = match Sys::getcwd(unsafe { Out::from_raw_parts(buf.cast(), size) }) {
+        Ok(()) => buf,
+        Err(Errno(errno)) => {
+            ERRNO.set(errno);
+            return ptr::null_mut();
+        }
+    };
+
+    if alloc {
+        let len = stack_buf
+            .iter()
+            .position(|b| *b == 0)
+            .expect("no nul-byte in getcwd string")
+            + 1;
+        let heap_buf = unsafe { platform::alloc(len).cast::<c_char>() };
+        for (i, inner) in stack_buf.iter().enumerate().take(len) {
+            unsafe {
+                *heap_buf.add(i) = *inner;
+            }
+        }
+        heap_buf
+    } else {
+        ret
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/getdtablesize.html>.
+///
+/// # Deprecation
+/// The `getdtablesize()` function was marked legacy in the System Interface &
+/// Headers Issue 5, and removed in Issue 6.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub extern "C" fn getdtablesize() -> c_int {
+    let mut lim = mem::MaybeUninit::<sys_resource::rlimit>::uninit();
+    let r = unsafe {
+        sys_resource::getrlimit(
+            sys_resource::RLIMIT_NOFILE as c_int,
+            lim.as_mut_ptr().cast::<sys_resource::rlimit>(),
+        )
+    };
+    if r == 0 {
+        let cur = unsafe { lim.assume_init() }.rlim_cur;
+        match cur {
+            c if c < i32::MAX as u64 => c as i32,
+            _ => i32::MAX,
+        };
+    }
+    -1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getegid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getegid() -> gid_t {
+    Sys::getegid()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getentropy.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn getentropy(buffer: *mut c_void, length: size_t) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/geteuid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn geteuid() -> uid_t {
+    Sys::geteuid()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getgid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getgid() -> gid_t {
+    Sys::getgid()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getgroups.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getgroups(size: c_int, list: *mut gid_t) -> c_int {
+    (|| {
+        let size = usize::try_from(size)
+            // fails for negative size, but EINVAL required if size != 0 && size < actual size,
+            // where the actual number of entries in the group list is obviously nonnegative
+            .map_err(|_| Errno(EINVAL))?;
+
+        let list = unsafe { Out::from_raw_parts(list, size) };
+
+        Sys::getgroups(list)
+    })()
+    .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/gethostid.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn gethostid() -> c_long {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/gethostname.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn gethostname(mut name: *mut c_char, mut len: size_t) -> c_int {
+    let mut uts = mem::MaybeUninit::<sys_utsname::utsname>::uninit();
+    // TODO
+    let err = Sys::uname(Out::from_uninit_mut(&mut uts))
+        .map(|()| 0)
+        .or_minus_one_errno();
+    if err < 0 {
+        return err;
+    }
+    for c in unsafe { uts.assume_init() }.nodename.iter() {
+        if len == 0 {
+            break;
+        }
+        len -= 1;
+
+        unsafe { *name = *c };
+
+        if unsafe { *name } == 0 {
+            // We do want to copy the zero also, so we check this after the copying.
+            break;
+        }
+
+        name = unsafe { name.offset(1) };
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getlogin.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getlogin() -> *mut c_char {
+    const LOGIN_LEN: usize = limits::LOGIN_NAME_MAX as usize;
+    static mut LOGIN: [c_char; LOGIN_LEN] = [0; LOGIN_LEN];
+    if getlogin_r((&raw mut LOGIN).cast(), LOGIN_LEN) == 0 {
+        (&raw mut LOGIN).cast()
+    } else {
+        ptr::null_mut()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getlogin.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getlogin_r(name: *mut c_char, namesize: size_t) -> c_int {
+    //TODO: Determine correct getlogin result on Redox
+    platform::ERRNO.set(errno::ENOENT);
+    -1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/7908799/xsh/getpagesize.html>.
+///
+/// # Deprecation
+/// The `getpagesize()` function was marked legacy in the System Interface &
+/// Headers Issue 5, and removed in Issue 6.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub extern "C" fn getpagesize() -> c_int {
+    // Panic if we can't uphold the required behavior (no errors are specified for this function)
+    Sys::getpagesize()
+        .try_into()
+        .expect("page size not representable as type `int`")
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getpgid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getpgid(pid: pid_t) -> pid_t {
+    Sys::getpgid(pid).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getpgrp.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getpgrp() -> pid_t {
+    Sys::getpgid(Sys::getpid()).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getpid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getpid() -> pid_t {
+    Sys::getpid()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getppid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getppid() -> pid_t {
+    Sys::getppid()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getresgid.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getresgid(rgid: *mut gid_t, egid: *mut gid_t, sgid: *mut gid_t) -> c_int {
+    Sys::getresgid(
+        unsafe { Out::nullable(rgid) },
+        unsafe { Out::nullable(egid) },
+        unsafe { Out::nullable(sgid) },
+    )
+    .map(|()| 0)
+    .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getresuid.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getresuid(ruid: *mut uid_t, euid: *mut uid_t, suid: *mut uid_t) -> c_int {
+    Sys::getresuid(
+        unsafe { Out::nullable(ruid) },
+        unsafe { Out::nullable(euid) },
+        unsafe { Out::nullable(suid) },
+    )
+    .map(|()| 0)
+    .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getsid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getsid(pid: pid_t) -> pid_t {
+    Sys::getsid(pid).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getuid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn getuid() -> uid_t {
+    Sys::getuid()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/getwd.html>.
+///
+/// # Deprecation
+/// The `getwd()` function was marked legacy in the Open Group Base
+/// Specifications Issue 6, and removed in Issue 7.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getwd(path_name: *mut c_char) -> *mut c_char {
+    unsafe { getcwd(path_name, limits::PATH_MAX) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/isatty.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn isatty(fd: c_int) -> c_int {
+    let mut t = termios::termios::default();
+    if unsafe { termios::tcgetattr(fd, &raw mut t) == 0 } {
+        1
+    } else {
+        0
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lchown.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn lchown(path: *const c_char, owner: uid_t, group: gid_t) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::lchown(path, owner, group)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/link.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn link(path1: *const c_char, path2: *const c_char) -> c_int {
+    let path1 = unsafe { CStr::from_ptr(path1) };
+    let path2 = unsafe { CStr::from_ptr(path2) };
+    Sys::link(path1, path2).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/linkat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn linkat(
+    fd1: c_int,
+    path1: *const c_char,
+    fd2: c_int,
+    path2: *const c_char,
+    flags: c_int,
+) -> c_int {
+    let path1 = unsafe { CStr::from_ptr(path1) };
+    let path2 = unsafe { CStr::from_ptr(path2) };
+    Sys::linkat(fd1, path1, fd2, path2, flags)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lockf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn lockf(fildes: c_int, function: c_int, size: off_t) -> c_int {
+    let mut fl = fcntl::flock {
+        l_type: fcntl::F_WRLCK as c_short,
+        l_whence: SEEK_CUR as c_short,
+        l_start: 0,
+        l_len: size,
+        l_pid: -1,
+    };
+
+    match function {
+        fcntl::F_TEST => {
+            fl.l_type = fcntl::F_RDLCK as c_short;
+            if unsafe { fcntl::fcntl(fildes, fcntl::F_GETLK, &raw mut fl as c_ulonglong) } < 0 {
+                return -1;
+            }
+            if fl.l_type == fcntl::F_UNLCK as c_short || fl.l_pid == getpid() {
+                return 0;
+            }
+            platform::ERRNO.set(errno::EACCES);
+            -1
+        }
+        fcntl::F_ULOCK => {
+            fl.l_type = fcntl::F_UNLCK as c_short;
+            unsafe { fcntl::fcntl(fildes, fcntl::F_SETLK, &raw mut fl as c_ulonglong) }
+        }
+        fcntl::F_TLOCK => unsafe {
+            fcntl::fcntl(fildes, fcntl::F_SETLK, &raw mut fl as c_ulonglong)
+        },
+        fcntl::F_LOCK => unsafe {
+            fcntl::fcntl(fildes, fcntl::F_SETLKW, &raw mut fl as c_ulonglong)
+        },
+        _ => {
+            platform::ERRNO.set(errno::EINVAL);
+            -1
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/lseek.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn lseek(fildes: c_int, offset: off_t, whence: c_int) -> off_t {
+    Sys::lseek(fildes, offset, whence).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/nice.html>.
+// #[unsafe(no_mangle)]
+pub extern "C" fn nice(incr: c_int) -> c_int {
+    unimplemented!();
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pause.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pause() -> c_int {
+    let mut pset = mem::MaybeUninit::<sigset_t>::uninit();
+    unsafe { sigprocmask(0, ptr::null_mut(), pset.as_mut_ptr()) };
+    let set = unsafe { pset.assume_init() };
+    unsafe { sigsuspend(&raw const set) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pipe.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pipe(fildes: *mut c_int) -> c_int {
+    unsafe { pipe2(fildes, 0) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/pipe.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pipe2(fildes: *mut c_int, flags: c_int) -> c_int {
+    Sys::pipe2(unsafe { Out::nonnull(fildes.cast::<[c_int; 2]>()) }, flags)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/posix_close.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn posix_close(fildes: c_int, flag: c_int) -> c_int {
+    // Since we do not define `POSIX_CLOSE_RESTART`, this function is
+    // equivalent to `close`. In the future when we move file descriptors
+    // to userspace, it would only make sense to define `POSIX_CLOSE_RESTART`
+    // if `close` is not atomic.
+    close(fildes)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/read.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pread(
+    fildes: c_int,
+    buf: *mut c_void,
+    nbyte: size_t,
+    offset: off_t,
+) -> ssize_t {
+    Sys::pread(
+        fildes,
+        unsafe { slice::from_raw_parts_mut(buf.cast::<u8>(), nbyte) },
+        offset,
+    )
+    .map(|read| read as ssize_t)
+    .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/write.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn pwrite(
+    fildes: c_int,
+    buf: *const c_void,
+    nbyte: size_t,
+    offset: off_t,
+) -> ssize_t {
+    Sys::pwrite(
+        fildes,
+        unsafe { slice::from_raw_parts(buf.cast::<u8>(), nbyte) },
+        offset,
+    )
+    .map(|read| read as ssize_t)
+    .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/read.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn read(fildes: c_int, buf: *mut c_void, nbyte: size_t) -> ssize_t {
+    let buf = unsafe { slice::from_raw_parts_mut(buf.cast::<u8>(), nbyte) };
+    trace_expr!(
+        Sys::read(fildes, buf)
+            .map(|read| read as ssize_t)
+            .or_minus_one_errno(),
+        "read({}, {:p}, {})",
+        fildes,
+        buf,
+        nbyte
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/readlink.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn readlink(
+    path: *const c_char,
+    buf: *mut c_char,
+    bufsize: size_t,
+) -> ssize_t {
+    let path = unsafe { CStr::from_ptr(path) };
+    let buf = unsafe { slice::from_raw_parts_mut(buf.cast::<u8>(), bufsize) };
+    Sys::readlink(path, buf)
+        .map(|read| read as ssize_t)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/readlinkat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn readlinkat(
+    dirfd: c_int,
+    pathname: *const c_char,
+    buf: *mut c_char,
+    len: size_t,
+) -> ssize_t {
+    let pathname = unsafe { CStr::from_ptr(pathname) };
+    let buf = unsafe { slice::from_raw_parts_mut(buf.cast(), len) };
+    Sys::readlinkat(dirfd, pathname, buf)
+        .map(|read| {
+            read.try_into()
+                .map_err(|_| Errno(ENAMETOOLONG))
+                .or_minus_one_errno()
+        })
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/rmdir.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn rmdir(path: *const c_char) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::rmdir(path).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setegid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setegid(gid: gid_t) -> c_int {
+    Sys::setresgid(-1, gid, -1).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/seteuid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn seteuid(uid: uid_t) -> c_int {
+    Sys::setresuid(-1, uid, -1).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setgid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setgid(gid: gid_t) -> c_int {
+    Sys::setresgid(gid, gid, -1)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setpgid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setpgid(pid: pid_t, pgid: pid_t) -> c_int {
+    Sys::setpgid(pid, pgid).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/setpgrp.html>.
+///
+/// # Deprecation
+/// The `setpgrp()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 7, and removed in Issue 8.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub extern "C" fn setpgrp() -> pid_t {
+    setpgid(0, 0)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setregid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setregid(rgid: gid_t, egid: gid_t) -> c_int {
+    Sys::setresgid(rgid, egid, -1)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setresgid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setresgid(rgid: gid_t, egid: gid_t, sgid: gid_t) -> c_int {
+    Sys::setresgid(rgid, egid, sgid)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setresuid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setresuid(ruid: uid_t, euid: uid_t, suid: uid_t) -> c_int {
+    Sys::setresuid(ruid, euid, suid)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setreuid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setreuid(ruid: uid_t, euid: uid_t) -> c_int {
+    Sys::setresuid(ruid, euid, -1)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setsid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setsid() -> pid_t {
+    Sys::setsid().or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/setuid.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn setuid(uid: uid_t) -> c_int {
+    Sys::setresuid(uid, uid, -1)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sleep.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn sleep(seconds: c_uint) -> c_uint {
+    let rqtp = timespec {
+        tv_sec: time_t::from(seconds),
+        tv_nsec: 0,
+    };
+    let mut rmtp = timespec {
+        tv_sec: 0,
+        tv_nsec: 0,
+    };
+
+    // If sleep() returns because the requested time has elapsed, the value returned shall be 0.
+    // If sleep() returns due to delivery of a signal, the return value shall be the "unslept" amount
+    // (the requested time minus the time actually slept) in seconds.
+    match unsafe { Sys::nanosleep(&raw const rqtp, &raw mut rmtp) } {
+        Err(Errno(EINTR)) => rmtp.tv_sec as c_uint,
+        r => 0,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/swab.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn swab(src: *const c_void, dest: *mut c_void, nbytes: ssize_t) {
+    if nbytes <= 0 {
+        return;
+    }
+    let number_of_swaps = nbytes / 2;
+    let mut offset = 0;
+    for _ in 0..number_of_swaps {
+        unsafe {
+            src.offset(offset).copy_to(dest.offset(offset + 1), 1);
+            src.offset(offset + 1).copy_to(dest.offset(offset), 1);
+        }
+        offset += 2;
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/symlink.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn symlink(path1: *const c_char, path2: *const c_char) -> c_int {
+    let path1 = unsafe { CStr::from_ptr(path1) };
+    let path2 = unsafe { CStr::from_ptr(path2) };
+    Sys::symlink(path1, path2).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/symlinkat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn symlinkat(path1: *const c_char, fd: c_int, path2: *const c_char) -> c_int {
+    let path1 = unsafe { CStr::from_ptr(path1) };
+    let path2 = unsafe { CStr::from_ptr(path2) };
+    Sys::symlinkat(path1, fd, path2)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sync.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn sync() {
+    if let Ok(()) = Sys::sync() {}; // TODO handle error
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcgetpgrp.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn tcgetpgrp(fd: c_int) -> pid_t {
+    let mut pgrp = 0;
+    if unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TIOCGPGRP, (&raw mut pgrp).cast()) } < 0 {
+        return -1;
+    }
+    pgrp
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/tcsetpgrp.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn tcsetpgrp(fd: c_int, pgrp: pid_t) -> c_int {
+    if unsafe { sys_ioctl::ioctl(fd, sys_ioctl::TIOCSPGRP, &raw const pgrp as _) } < 0 {
+        return -1;
+    }
+    pgrp
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/truncate.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn truncate(path: *const c_char, length: off_t) -> c_int {
+    let file = unsafe { CStr::from_ptr(path) };
+    // TODO: Rustify
+    let fd = Sys::open(file, fcntl::O_WRONLY, 0).or_minus_one_errno();
+    if fd < 0 {
+        return -1;
+    }
+
+    let res = ftruncate(fd, length);
+
+    if let Ok(()) = Sys::close(fd) {}; // TODO handle error
+
+    res
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ttyname.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ttyname(fildes: c_int) -> *mut c_char {
+    const TTYNAME_LEN: usize = 4096;
+    static mut TTYNAME: [c_char; TTYNAME_LEN] = [0; TTYNAME_LEN];
+    if ttyname_r(fildes, (&raw mut TTYNAME).cast(), TTYNAME_LEN) == 0 {
+        (&raw mut TTYNAME).cast()
+    } else {
+        ptr::null_mut()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ttyname.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn ttyname_r(fildes: c_int, name: *mut c_char, namesize: size_t) -> c_int {
+    let name = unsafe { slice::from_raw_parts_mut(name.cast::<u8>(), namesize) };
+    if name.is_empty() {
+        return errno::ERANGE;
+    }
+
+    let len = Sys::fpath(fildes, &mut name[..namesize - 1])
+        .map(|read| read as ssize_t)
+        .or_minus_one_errno();
+    if len < 0 {
+        return -platform::ERRNO.get();
+    }
+    name[len as usize] = 0;
+
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/ualarm.html>.
+///
+/// # Deprecation
+/// The `ualarm()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 6, and removed in Issue 7.
+#[deprecated]
+#[allow(deprecated)]
+#[unsafe(no_mangle)]
+pub extern "C" fn ualarm(usecs: useconds_t, interval: useconds_t) -> useconds_t {
+    // TODO setitimer is unimplemented on Redox and obsolete
+    let mut timer = sys_time::itimerval {
+        it_value: timeval {
+            tv_sec: 0,
+            tv_usec: usecs as suseconds_t,
+        },
+        it_interval: timeval {
+            tv_sec: 0,
+            tv_usec: interval as suseconds_t,
+        },
+    };
+    let errno_backup = platform::ERRNO.get();
+    let ret =
+        if unsafe { sys_time::setitimer(sys_time::ITIMER_REAL, &raw const timer, &raw mut timer) }
+            < 0
+        {
+            0
+        } else {
+            timer.it_value.tv_sec as useconds_t * 1_000_000 + timer.it_value.tv_usec as useconds_t
+        };
+    platform::ERRNO.set(errno_backup);
+
+    ret
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/unlink.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn unlink(path: *const c_char) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::unlink(path).map(|()| 0).or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/unlinkat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn unlinkat(fd: c_int, path: *const c_char, flags: c_int) -> c_int {
+    let path = unsafe { CStr::from_ptr(path) };
+    Sys::unlinkat(fd, path, flags)
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/usleep.html>.
+///
+/// # Deprecation
+/// The `usleep()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 6, and removed in Issue 7.
+#[deprecated]
+#[allow(deprecated)]
+#[unsafe(no_mangle)]
+pub extern "C" fn usleep(useconds: useconds_t) -> c_int {
+    #[cfg(not(target_arch = "x86"))]
+    let tv_nsec = c_long::from((useconds % 1_000_000) * 1000);
+    #[cfg(target_arch = "x86")]
+    let tv_nsec = ((useconds % 1_000_000) * 1000) as c_long;
+    let rqtp = timespec {
+        tv_sec: time_t::from(useconds / 1_000_000),
+        tv_nsec,
+    };
+    let rmtp = ptr::null_mut();
+    unsafe { Sys::nanosleep(&raw const rqtp, rmtp) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009695399/functions/vfork.html>.
+///
+/// # Deprecation
+/// The `vfork()` function was marked obsolescent in the Open Group Base
+/// Specifications Issue 6, and removed in Issue 7.
+#[deprecated]
+// #[unsafe(no_mangle)]
+pub extern "C" fn vfork() -> pid_t {
+    unimplemented!();
+}
+
+unsafe fn with_argv(
+    mut va: VaListImpl,
+    arg0: *const c_char,
+    f: impl FnOnce(&[*const c_char], VaListImpl) -> c_int,
+) -> c_int {
+    let argc = 1 + unsafe {
+        va.with_copy(|mut copy| {
+            core::iter::from_fn(|| Some(copy.arg::<*const c_char>()))
+                .position(|p| p.is_null())
+                .unwrap()
+        })
+    };
+
+    let mut stack: [MaybeUninit<*const c_char>; 32] = [MaybeUninit::uninit(); 32];
+
+    let out = if argc < 32 {
+        stack.as_mut_slice()
+    } else if argc < 4096 {
+        // TODO: Use ARG_MAX, not this hardcoded constant
+        let ptr =
+            unsafe { crate::header::stdlib::malloc((argc + 1) * mem::size_of::<*const c_char>()) };
+        if ptr.is_null() {
+            platform::ERRNO.set(ENOMEM);
+            return -1;
+        }
+        unsafe { slice::from_raw_parts_mut(ptr.cast::<MaybeUninit<*const c_char>>(), argc + 1) }
+    } else {
+        platform::ERRNO.set(E2BIG);
+        return -1;
+    };
+    out[0].write(arg0);
+
+    for inner in out.iter_mut().take(argc).skip(1) {
+        (*inner).write(unsafe { va.arg::<*const c_char>() });
+    }
+    out[argc].write(core::ptr::null());
+    // NULL
+    unsafe { va.arg::<*const c_char>() };
+
+    f(unsafe { (&*out).assume_init_ref() }, va);
+
+    // f only returns if it fails
+    if argc >= 32 {
+        unsafe { crate::header::stdlib::free(out.as_mut_ptr().cast()) };
+    }
+    -1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/write.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn write(fildes: c_int, buf: *const c_void, nbyte: size_t) -> ssize_t {
+    let buf = unsafe { slice::from_raw_parts(buf.cast::<u8>(), nbyte) };
+    Sys::write(fildes, buf)
+        .map(|bytes| bytes as ssize_t)
+        .or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/unistd/pathconf.rs b/recipes/core/relibc/src/header/unistd/pathconf.rs
new file mode 100644
index 0000000000..74a90cead7
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/pathconf.rs
@@ -0,0 +1,80 @@
+use crate::{
+    header::{
+        errno,
+        limits::{
+            FILESIZEBITS, LINK_MAX, MAX_CANON, MAX_INPUT, NAME_MAX, PATH_MAX, PIPE_BUF,
+            POSIX_ALLOC_SIZE_MIN, SYMLINK_MAX,
+        },
+        termios::_POSIX_VDISABLE,
+    },
+    platform::{
+        self,
+        types::{c_char, c_int, c_long},
+    },
+};
+
+pub const _PC_LINK_MAX: c_int = 0;
+pub const _PC_MAX_CANON: c_int = 1;
+pub const _PC_MAX_INPUT: c_int = 2;
+pub const _PC_NAME_MAX: c_int = 3;
+pub const _PC_PATH_MAX: c_int = 4;
+pub const _PC_PIPE_BUF: c_int = 5;
+pub const _PC_CHOWN_RESTRICTED: c_int = 6;
+pub const _PC_NO_TRUNC: c_int = 7;
+/// Check if file (terminal) supports disabling control chars (CC)
+pub const _PC_VDISABLE: c_int = 8;
+pub const _PC_SYNC_IO: c_int = 9;
+pub const _PC_ASYNC_IO: c_int = 10;
+pub const _PC_PRIO_IO: c_int = 11;
+pub const _PC_SOCK_MAXBUF: c_int = 12;
+pub const _PC_FILESIZEBITS: c_int = 13;
+pub const _PC_REC_INCR_XFER_SIZE: c_int = 14;
+pub const _PC_REC_MAX_XFER_SIZE: c_int = 15;
+pub const _PC_REC_MIN_XFER_SIZE: c_int = 16;
+pub const _PC_REC_XFER_ALIGN: c_int = 17;
+pub const _PC_ALLOC_SIZE_MIN: c_int = 18;
+pub const _PC_SYMLINK_MAX: c_int = 19;
+pub const _PC_2_SYMLINKS: c_int = 20;
+
+fn pc(name: c_int) -> c_long {
+    // Settings from musl, some adjusted
+    match name {
+        _PC_LINK_MAX => LINK_MAX.try_into().unwrap_or(-1),
+        _PC_MAX_CANON => MAX_CANON.try_into().unwrap_or(-1),
+        _PC_MAX_INPUT => MAX_INPUT.try_into().unwrap_or(-1),
+        _PC_NAME_MAX => NAME_MAX.try_into().unwrap_or(-1),
+        _PC_PATH_MAX => PATH_MAX.try_into().unwrap_or(-1),
+        _PC_PIPE_BUF => PIPE_BUF.try_into().unwrap_or(-1),
+        _PC_CHOWN_RESTRICTED => 1,
+        _PC_NO_TRUNC => 1,
+        _PC_VDISABLE => _POSIX_VDISABLE.into(),
+        _PC_SYNC_IO => 1,
+        _PC_ASYNC_IO => -1,
+        _PC_PRIO_IO => -1,
+        _PC_SOCK_MAXBUF => -1,
+        _PC_FILESIZEBITS => FILESIZEBITS.into(),
+        _PC_REC_INCR_XFER_SIZE => -1,
+        _PC_REC_MAX_XFER_SIZE => -1,
+        _PC_REC_MIN_XFER_SIZE => 4096,
+        _PC_REC_XFER_ALIGN => 4096,
+        _PC_ALLOC_SIZE_MIN => POSIX_ALLOC_SIZE_MIN.try_into().unwrap_or(-1),
+        _PC_SYMLINK_MAX => SYMLINK_MAX.try_into().unwrap_or(-1),
+        _PC_2_SYMLINKS => 1,
+        _ => {
+            platform::ERRNO.set(errno::EINVAL);
+            -1
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fpathconf.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn fpathconf(_fildes: c_int, name: c_int) -> c_long {
+    pc(name)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fpathconf.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn pathconf(_path: *const c_char, name: c_int) -> c_long {
+    pc(name)
+}
diff --git a/recipes/core/relibc/src/header/unistd/syscall.rs b/recipes/core/relibc/src/header/unistd/syscall.rs
new file mode 100644
index 0000000000..d9d00218bf
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/syscall.rs
@@ -0,0 +1,14 @@
+use crate::platform::types::c_long;
+
+/// Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/getopt.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn syscall(sysno: c_long, mut args: ...) -> c_long {
+    let a1 = unsafe { args.arg::<usize>() };
+    let a2 = unsafe { args.arg::<usize>() };
+    let a3 = unsafe { args.arg::<usize>() };
+    let a4 = unsafe { args.arg::<usize>() };
+    let a5 = unsafe { args.arg::<usize>() };
+    let a6 = unsafe { args.arg::<usize>() };
+
+    (unsafe { sc::syscall6(sysno as usize, a1, a2, a3, a4, a5, a6) }) as c_long
+}
diff --git a/recipes/core/relibc/src/header/unistd/sysconf.rs b/recipes/core/relibc/src/header/unistd/sysconf.rs
new file mode 100644
index 0000000000..dd61586ff5
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/sysconf.rs
@@ -0,0 +1,18 @@
+/// sysconf.h: <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sysconf.html>.
+
+#[cfg(target_os = "redox")]
+#[path = "sysconf/redox.rs"]
+mod sys;
+
+#[cfg(target_os = "linux")]
+#[path = "sysconf/linux.rs"]
+mod sys;
+
+pub use sys::*;
+
+use core::ffi::{c_int, c_long};
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn sysconf(name: c_int) -> c_long {
+    sysconf_impl(name)
+}
diff --git a/recipes/core/relibc/src/header/unistd/sysconf/linux.rs b/recipes/core/relibc/src/header/unistd/sysconf/linux.rs
new file mode 100644
index 0000000000..2ec17eaf96
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/sysconf/linux.rs
@@ -0,0 +1,368 @@
+/// Linux sysconf implementation.
+/// Constants borrowed from musl.
+use core::{
+    ffi::{c_int, c_long},
+    mem::size_of,
+};
+
+use crate::{
+    header::{errno, limits::*, signal},
+    platform,
+};
+
+pub const _XOPEN_IOV_MAX: c_long = 16;
+pub const _XOPEN_NAME_MAX: c_long = 255;
+pub const _XOPEN_PATH_MAX: c_long = 1024;
+
+pub const _SC_ARG_MAX: c_int = 0;
+pub const _SC_CHILD_MAX: c_int = 1;
+pub const _SC_CLK_TCK: c_int = 2;
+pub const _SC_NGROUPS_MAX: c_int = 3;
+pub const _SC_OPEN_MAX: c_int = 4;
+pub const _SC_STREAM_MAX: c_int = 5;
+pub const _SC_TZNAME_MAX: c_int = 6;
+pub const _SC_JOB_CONTROL: c_int = 7;
+pub const _SC_SAVED_IDS: c_int = 8;
+pub const _SC_REALTIME_SIGNALS: c_int = 9;
+pub const _SC_PRIORITY_SCHEDULING: c_int = 10;
+pub const _SC_TIMERS: c_int = 11;
+pub const _SC_ASYNCHRONOUS_IO: c_int = 12;
+pub const _SC_PRIORITIZED_IO: c_int = 13;
+pub const _SC_SYNCHRONIZED_IO: c_int = 14;
+pub const _SC_FSYNC: c_int = 15;
+pub const _SC_MAPPED_FILES: c_int = 16;
+pub const _SC_MEMLOCK: c_int = 17;
+pub const _SC_MEMLOCK_RANGE: c_int = 18;
+pub const _SC_MEMORY_PROTECTION: c_int = 19;
+pub const _SC_MESSAGE_PASSING: c_int = 20;
+pub const _SC_SEMAPHORES: c_int = 21;
+pub const _SC_SHARED_MEMORY_OBJECTS: c_int = 22;
+pub const _SC_AIO_LISTIO_MAX: c_int = 23;
+pub const _SC_AIO_MAX: c_int = 24;
+pub const _SC_AIO_PRIO_DELTA_MAX: c_int = 25;
+pub const _SC_DELAYTIMER_MAX: c_int = 26;
+pub const _SC_MQ_OPEN_MAX: c_int = 27;
+pub const _SC_MQ_PRIO_MAX: c_int = 28;
+pub const _SC_VERSION: c_int = 29;
+pub const _SC_PAGE_SIZE: c_int = 30;
+pub const _SC_PAGESIZE: c_int = 30;
+pub const _SC_RTSIG_MAX: c_int = 31;
+pub const _SC_SEM_NSEMS_MAX: c_int = 32;
+pub const _SC_SEM_VALUE_MAX: c_int = 33;
+pub const _SC_SIGQUEUE_MAX: c_int = 34;
+pub const _SC_TIMER_MAX: c_int = 35;
+pub const _SC_BC_BASE_MAX: c_int = 36;
+pub const _SC_BC_DIM_MAX: c_int = 37;
+pub const _SC_BC_SCALE_MAX: c_int = 38;
+pub const _SC_BC_STRING_MAX: c_int = 39;
+pub const _SC_COLL_WEIGHTS_MAX: c_int = 40;
+pub const _SC_EXPR_NEST_MAX: c_int = 42;
+pub const _SC_LINE_MAX: c_int = 43;
+pub const _SC_RE_DUP_MAX: c_int = 44;
+pub const _SC_2_VERSION: c_int = 46;
+pub const _SC_2_C_BIND: c_int = 47;
+pub const _SC_2_C_DEV: c_int = 48;
+pub const _SC_2_FORT_DEV: c_int = 49;
+pub const _SC_2_FORT_RUN: c_int = 50;
+pub const _SC_2_SW_DEV: c_int = 51;
+pub const _SC_2_LOCALEDEF: c_int = 52;
+pub const _SC_UIO_MAXIOV: c_int = 60;
+pub const _SC_IOV_MAX: c_int = 60;
+pub const _SC_THREADS: c_int = 67;
+pub const _SC_THREAD_SAFE_FUNCTIONS: c_int = 68;
+pub const _SC_GETGR_R_SIZE_MAX: c_int = 69;
+pub const _SC_GETPW_R_SIZE_MAX: c_int = 70;
+pub const _SC_LOGIN_NAME_MAX: c_int = 71;
+pub const _SC_TTY_NAME_MAX: c_int = 72;
+pub const _SC_THREAD_DESTRUCTOR_ITERATIONS: c_int = 73;
+pub const _SC_THREAD_KEYS_MAX: c_int = 74;
+pub const _SC_THREAD_STACK_MIN: c_int = 75;
+pub const _SC_THREAD_THREADS_MAX: c_int = 76;
+pub const _SC_THREAD_ATTR_STACKADDR: c_int = 77;
+pub const _SC_THREAD_ATTR_STACKSIZE: c_int = 78;
+pub const _SC_THREAD_PRIORITY_SCHEDULING: c_int = 79;
+pub const _SC_THREAD_PRIO_INHERIT: c_int = 80;
+pub const _SC_THREAD_PRIO_PROTECT: c_int = 81;
+pub const _SC_THREAD_PROCESS_SHARED: c_int = 82;
+pub const _SC_NPROCESSORS_CONF: c_int = 83;
+pub const _SC_NPROCESSORS_ONLN: c_int = 84;
+pub const _SC_PHYS_PAGES: c_int = 85;
+pub const _SC_AVPHYS_PAGES: c_int = 86;
+pub const _SC_ATEXIT_MAX: c_int = 87;
+pub const _SC_PASS_MAX: c_int = 88;
+pub const _SC_XOPEN_VERSION: c_int = 89;
+pub const _SC_XOPEN_XCU_VERSION: c_int = 90;
+pub const _SC_XOPEN_UNIX: c_int = 91;
+pub const _SC_XOPEN_CRYPT: c_int = 92;
+pub const _SC_XOPEN_ENH_I18N: c_int = 93;
+pub const _SC_XOPEN_SHM: c_int = 94;
+pub const _SC_2_CHAR_TERM: c_int = 95;
+pub const _SC_2_UPE: c_int = 97;
+pub const _SC_XOPEN_XPG2: c_int = 98;
+pub const _SC_XOPEN_XPG3: c_int = 99;
+pub const _SC_XOPEN_XPG4: c_int = 100;
+pub const _SC_NZERO: c_int = 109;
+pub const _SC_XBS5_ILP32_OFF32: c_int = 125;
+pub const _SC_XBS5_ILP32_OFFBIG: c_int = 126;
+pub const _SC_XBS5_LP64_OFF64: c_int = 127;
+pub const _SC_XBS5_LPBIG_OFFBIG: c_int = 128;
+pub const _SC_XOPEN_LEGACY: c_int = 129;
+pub const _SC_XOPEN_REALTIME: c_int = 130;
+pub const _SC_XOPEN_REALTIME_THREADS: c_int = 131;
+pub const _SC_ADVISORY_INFO: c_int = 132;
+pub const _SC_BARRIERS: c_int = 133;
+pub const _SC_CLOCK_SELECTION: c_int = 137;
+pub const _SC_CPUTIME: c_int = 138;
+pub const _SC_THREAD_CPUTIME: c_int = 139;
+pub const _SC_MONOTONIC_CLOCK: c_int = 149;
+pub const _SC_READER_WRITER_LOCKS: c_int = 153;
+pub const _SC_SPIN_LOCKS: c_int = 154;
+pub const _SC_REGEXP: c_int = 155;
+pub const _SC_SHELL: c_int = 157;
+pub const _SC_SPAWN: c_int = 159;
+pub const _SC_SPORADIC_SERVER: c_int = 160;
+pub const _SC_THREAD_SPORADIC_SERVER: c_int = 161;
+pub const _SC_TIMEOUTS: c_int = 164;
+pub const _SC_TYPED_MEMORY_OBJECTS: c_int = 165;
+pub const _SC_2_PBS: c_int = 168;
+pub const _SC_2_PBS_ACCOUNTING: c_int = 169;
+pub const _SC_2_PBS_LOCATE: c_int = 170;
+pub const _SC_2_PBS_MESSAGE: c_int = 171;
+pub const _SC_2_PBS_TRACK: c_int = 172;
+pub const _SC_SYMLOOP_MAX: c_int = 173;
+pub const _SC_STREAMS: c_int = 174;
+pub const _SC_2_PBS_CHECKPOINT: c_int = 175;
+pub const _SC_V6_ILP32_OFF32: c_int = 176;
+pub const _SC_V6_ILP32_OFFBIG: c_int = 177;
+pub const _SC_V6_LP64_OFF64: c_int = 178;
+pub const _SC_V6_LPBIG_OFFBIG: c_int = 179;
+pub const _SC_HOST_NAME_MAX: c_int = 180;
+pub const _SC_TRACE: c_int = 181;
+pub const _SC_TRACE_EVENT_FILTER: c_int = 182;
+pub const _SC_TRACE_INHERIT: c_int = 183;
+pub const _SC_TRACE_LOG: c_int = 184;
+
+pub const _SC_IPV6: c_int = 235;
+pub const _SC_RAW_SOCKETS: c_int = 236;
+pub const _SC_V7_ILP32_OFF32: c_int = 237;
+pub const _SC_V7_ILP32_OFFBIG: c_int = 238;
+pub const _SC_V7_LP64_OFF64: c_int = 239;
+pub const _SC_V7_LPBIG_OFFBIG: c_int = 240;
+pub const _SC_SS_REPL_MAX: c_int = 241;
+pub const _SC_TRACE_EVENT_NAME_MAX: c_int = 242;
+pub const _SC_TRACE_NAME_MAX: c_int = 243;
+pub const _SC_TRACE_SYS_MAX: c_int = 244;
+pub const _SC_TRACE_USER_EVENT_MAX: c_int = 245;
+pub const _SC_XOPEN_STREAMS: c_int = 246;
+pub const _SC_THREAD_ROBUST_PRIO_INHERIT: c_int = 247;
+pub const _SC_THREAD_ROBUST_PRIO_PROTECT: c_int = 248;
+pub const _SC_MINSIGSTKSZ: c_int = 249;
+pub const _SC_SIGSTKSZ: c_int = 250;
+
+// Defined in unistd.h but we defined it in C
+const _POSIX_VERSION: c_long = 200809;
+const _XOPEN_VERSION: c_long = 700;
+
+pub(super) fn sysconf_impl(name: c_int) -> c_long {
+    // Values from musl which we can assume is correct.
+    match name {
+        _SC_CLK_TCK => 100,
+        // TODO: getrlimit
+        _SC_CHILD_MAX => -1,
+        _SC_NGROUPS_MAX => NGROUPS_MAX as c_long,
+        // TODO: getrlimit
+        _SC_OPEN_MAX => -1,
+        _SC_STREAM_MAX => -1,
+        // TODO: limits.h
+        _SC_TZNAME_MAX => -1,
+        _SC_JOB_CONTROL => 1,
+        _SC_SAVED_IDS => 1,
+        _SC_REALTIME_SIGNALS => _POSIX_VERSION,
+        _SC_PRIORITY_SCHEDULING => -1,
+        _SC_TIMERS => _POSIX_VERSION,
+        _SC_ASYNCHRONOUS_IO => _POSIX_VERSION,
+        _SC_PRIORITIZED_IO => -1,
+        _SC_SYNCHRONIZED_IO => -1,
+        _SC_FSYNC => _POSIX_VERSION,
+        _SC_MAPPED_FILES => _POSIX_VERSION,
+        _SC_MEMLOCK => _POSIX_VERSION,
+        _SC_MEMLOCK_RANGE => _POSIX_VERSION,
+        _SC_MEMORY_PROTECTION => _POSIX_VERSION,
+        _SC_MESSAGE_PASSING => _POSIX_VERSION,
+        _SC_SEMAPHORES => _POSIX_VERSION,
+        _SC_SHARED_MEMORY_OBJECTS => _POSIX_VERSION,
+        _SC_AIO_LISTIO_MAX => -1,
+        _SC_AIO_MAX => -1,
+        _SC_AIO_PRIO_DELTA_MAX => 0,
+        // TODO: limits.h?
+        _SC_DELAYTIMER_MAX => -1,
+        _SC_MQ_OPEN_MAX => -1,
+        // TODO: limits.h?
+        _SC_MQ_PRIO_MAX => -1,
+        _SC_VERSION => _POSIX_VERSION,
+        _SC_PAGE_SIZE => PAGE_SIZE.try_into().unwrap_or(-1),
+        _SC_RTSIG_MAX => (signal::SIGRTMAX - signal::SIGRTMIN)
+            .try_into()
+            .unwrap_or(-1),
+        // TODO: limits.h
+        _SC_SEM_NSEMS_MAX => -1,
+        // TODO: limits.h
+        _SC_SEM_VALUE_MAX => -1,
+        _SC_SIGQUEUE_MAX => -1,
+        _SC_TIMER_MAX => -1,
+        _SC_BC_BASE_MAX => BC_BASE_MAX,
+        _SC_BC_DIM_MAX => BC_DIM_MAX,
+        _SC_BC_SCALE_MAX => BC_SCALE_MAX,
+        _SC_BC_STRING_MAX => BC_STRING_MAX,
+        _SC_COLL_WEIGHTS_MAX => COLL_WEIGHTS_MAX,
+        _SC_EXPR_NEST_MAX => EXPR_NEST_MAX,
+        _SC_LINE_MAX => LINE_MAX,
+        _SC_RE_DUP_MAX => RE_DUP_MAX,
+        _SC_2_VERSION => _POSIX_VERSION,
+        _SC_2_C_BIND => _POSIX_VERSION,
+        _SC_2_C_DEV => -1,
+        _SC_2_FORT_DEV => -1,
+        _SC_2_FORT_RUN => -1,
+        _SC_2_SW_DEV => -1,
+        _SC_2_LOCALEDEF => -1,
+        _SC_IOV_MAX => _XOPEN_IOV_MAX,
+        _SC_THREADS => _POSIX_VERSION,
+        _SC_THREAD_SAFE_FUNCTIONS => _POSIX_VERSION,
+        _SC_GETGR_R_SIZE_MAX => -1,
+        _SC_GETPW_R_SIZE_MAX => -1,
+        _SC_LOGIN_NAME_MAX => 256,
+        // TODO: limits.h
+        _SC_TTY_NAME_MAX => -1,
+        // TODO: limits.h
+        _SC_THREAD_DESTRUCTOR_ITERATIONS => -1,
+        // TODO: limits.h
+        _SC_THREAD_KEYS_MAX => -1,
+        // TODO: limits.h
+        _SC_THREAD_STACK_MIN => -1,
+        _SC_THREAD_THREADS_MAX => -1,
+        _SC_THREAD_ATTR_STACKADDR => _POSIX_VERSION,
+        _SC_THREAD_ATTR_STACKSIZE => _POSIX_VERSION,
+        _SC_THREAD_PRIORITY_SCHEDULING => _POSIX_VERSION,
+        _SC_THREAD_PRIO_INHERIT => -1,
+        _SC_THREAD_PRIO_PROTECT => -1,
+        _SC_THREAD_PROCESS_SHARED => _POSIX_VERSION,
+        // TODO: Use getaffinity syscall on Linux
+        _SC_NPROCESSORS_CONF => -1,
+        _SC_NPROCESSORS_ONLN => -1,
+        // TODO: sysinfo
+        _SC_PHYS_PAGES => -1,
+        _SC_AVPHYS_PAGES => -1,
+        _SC_ATEXIT_MAX => -1,
+        _SC_PASS_MAX => -1,
+        _SC_XOPEN_VERSION => _XOPEN_VERSION,
+        _SC_XOPEN_XCU_VERSION => _XOPEN_VERSION,
+        _SC_XOPEN_UNIX => 1,
+        _SC_XOPEN_CRYPT => -1,
+        _SC_XOPEN_ENH_I18N => 1,
+        _SC_XOPEN_SHM => 1,
+        _SC_2_CHAR_TERM => -1,
+        _SC_2_UPE => -1,
+        _SC_XOPEN_XPG2 => -1,
+        _SC_XOPEN_XPG3 => -1,
+        _SC_XOPEN_XPG4 => -1,
+        // TODO: ?
+        _SC_NZERO => -1,
+        _SC_XBS5_ILP32_OFF32 => -1,
+        _SC_XBS5_ILP32_OFFBIG => {
+            if size_of::<c_long>() == 4 {
+                1
+            } else {
+                -1
+            }
+        }
+        _SC_XBS5_LP64_OFF64 => {
+            if size_of::<c_long>() == 8 {
+                1
+            } else {
+                -1
+            }
+        }
+        _SC_XBS5_LPBIG_OFFBIG => -1,
+        _SC_XOPEN_LEGACY => -1,
+        _SC_XOPEN_REALTIME => -1,
+        _SC_XOPEN_REALTIME_THREADS => -1,
+        _SC_ADVISORY_INFO => _POSIX_VERSION,
+        _SC_BARRIERS => _POSIX_VERSION,
+        _SC_CLOCK_SELECTION => _POSIX_VERSION,
+        _SC_CPUTIME => _POSIX_VERSION,
+        _SC_THREAD_CPUTIME => _POSIX_VERSION,
+        _SC_MONOTONIC_CLOCK => _POSIX_VERSION,
+        _SC_READER_WRITER_LOCKS => _POSIX_VERSION,
+        _SC_SPIN_LOCKS => _POSIX_VERSION,
+        _SC_REGEXP => 1,
+        _SC_SHELL => 1,
+        _SC_SPAWN => _POSIX_VERSION,
+        _SC_SPORADIC_SERVER => -1,
+        _SC_THREAD_SPORADIC_SERVER => -1,
+        _SC_TIMEOUTS => _POSIX_VERSION,
+        _SC_TYPED_MEMORY_OBJECTS => -1,
+        _SC_2_PBS => -1,
+        _SC_2_PBS_ACCOUNTING => -1,
+        _SC_2_PBS_LOCATE => -1,
+        _SC_2_PBS_MESSAGE => -1,
+        _SC_2_PBS_TRACK => -1,
+        // TODO: SYMLOOP_MAX in paths.h
+        _SC_SYMLOOP_MAX => -1,
+        _SC_STREAMS => 0,
+        _SC_2_PBS_CHECKPOINT => -1,
+        _SC_V6_ILP32_OFF32 => -1,
+        _SC_V6_ILP32_OFFBIG => {
+            if size_of::<c_long>() == 4 {
+                1
+            } else {
+                -1
+            }
+        }
+        _SC_V6_LP64_OFF64 => {
+            if size_of::<c_long>() == 8 {
+                1
+            } else {
+                -1
+            }
+        }
+        _SC_V6_LPBIG_OFFBIG => -1,
+        _SC_HOST_NAME_MAX => HOST_NAME_MAX.try_into().unwrap_or(-1),
+        _SC_TRACE => -1,
+        _SC_TRACE_EVENT_FILTER => -1,
+        _SC_TRACE_INHERIT => -1,
+        _SC_TRACE_LOG => -1,
+        _SC_IPV6 => _POSIX_VERSION,
+        _SC_RAW_SOCKETS => _POSIX_VERSION,
+        _SC_V7_ILP32_OFF32 => -1,
+        _SC_V7_ILP32_OFFBIG => {
+            if size_of::<c_long>() == 4 {
+                1
+            } else {
+                -1
+            }
+        }
+        _SC_V7_LP64_OFF64 => {
+            if size_of::<c_long>() == 8 {
+                1
+            } else {
+                -1
+            }
+        }
+        _SC_V7_LPBIG_OFFBIG => -1,
+        _SC_SS_REPL_MAX => -1,
+        _SC_TRACE_EVENT_NAME_MAX => -1,
+        _SC_TRACE_NAME_MAX => -1,
+        _SC_TRACE_SYS_MAX => -1,
+        _SC_TRACE_USER_EVENT_MAX => -1,
+        _SC_XOPEN_STREAMS => 0,
+        _SC_THREAD_ROBUST_PRIO_INHERIT => -1,
+        _SC_THREAD_ROBUST_PRIO_PROTECT => -1,
+        // TODO: Working getauxval
+        _SC_MINSIGSTKSZ => -1,
+        _SC_SIGSTKSZ => -1,
+        _ => {
+            platform::ERRNO.set(errno::EINVAL);
+            -1
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/header/unistd/sysconf/redox.rs b/recipes/core/relibc/src/header/unistd/sysconf/redox.rs
new file mode 100644
index 0000000000..97ee81aaf6
--- /dev/null
+++ b/recipes/core/relibc/src/header/unistd/sysconf/redox.rs
@@ -0,0 +1,130 @@
+use core::convert::TryInto;
+
+use alloc::string::String;
+
+use crate::{
+    error::Errno,
+    fs::File,
+    header::{errno, fcntl, limits, sys_statvfs},
+    io::Read,
+    out::Out,
+    platform::{
+        self, Pal, Sys,
+        types::{c_int, c_long},
+    },
+};
+
+// POSIX.1 {
+pub const _SC_ARG_MAX: c_int = 0;
+pub const _SC_CHILD_MAX: c_int = 1;
+pub const _SC_CLK_TCK: c_int = 2;
+pub const _SC_NGROUPS_MAX: c_int = 3;
+pub const _SC_OPEN_MAX: c_int = 4;
+pub const _SC_STREAM_MAX: c_int = 5;
+pub const _SC_TZNAME_MAX: c_int = 6;
+// ...
+pub const _SC_TIMERS: c_int = 11;
+// ...
+pub const _SC_SHARED_MEMORY_OBJECTS: c_int = 22;
+// ...
+pub const _SC_VERSION: c_int = 29;
+pub const _SC_PAGESIZE: c_int = 30;
+pub const _SC_PAGE_SIZE: c_int = 30;
+// ...
+pub const _SC_RE_DUP_MAX: c_int = 44;
+
+pub const _SC_NPROCESSORS_CONF: c_int = 57;
+pub const _SC_NPROCESSORS_ONLN: c_int = 58;
+pub const _SC_PHYS_PAGES: c_int = 59;
+pub const _SC_AVPHYS_PAGES: c_int = 60;
+
+// ...
+pub const _SC_THREADS: c_int = 67;
+pub const _SC_GETGR_R_SIZE_MAX: c_int = 69;
+pub const _SC_GETPW_R_SIZE_MAX: c_int = 70;
+pub const _SC_LOGIN_NAME_MAX: c_int = 71;
+pub const _SC_TTY_NAME_MAX: c_int = 72;
+// ...
+pub const _SC_THREAD_ATTR_STACKADDR: c_int = 77;
+pub const _SC_THREAD_ATTR_STACKSIZE: c_int = 78;
+// ...
+pub const _SC_MONOTONIC_CLOCK: c_int = 149;
+pub const _SC_SEMAPHORES: c_int = 21;
+// ...
+pub const _SC_BARRIERS: c_int = 133;
+// ...
+pub const _SC_SHELL: c_int = 157;
+// ...
+pub const _SC_TIMEOUTS: c_int = 164;
+// ...
+pub const _SC_SYMLOOP_MAX: c_int = 173;
+// ...
+pub const _SC_HOST_NAME_MAX: c_int = 180;
+// ...
+pub const _SC_SIGQUEUE_MAX: c_int = 190;
+pub const _SC_REALTIME_SIGNALS: c_int = 191;
+// } POSIX.1
+
+pub(super) fn sysconf_impl(name: c_int) -> c_long {
+    //TODO: Real values
+    match name {
+        _SC_ARG_MAX => 4096,
+        _SC_CHILD_MAX => 65536,
+        _SC_CLK_TCK => 100,
+        _SC_NGROUPS_MAX => limits::NGROUPS_MAX as c_long,
+        _SC_OPEN_MAX => 1024,
+        _SC_STREAM_MAX => 16,
+        _SC_TZNAME_MAX => -1,
+        _SC_VERSION => 200809,
+        _SC_PAGESIZE => Sys::getpagesize().try_into().unwrap_or(-1),
+        _SC_RE_DUP_MAX => 32767,
+        _SC_GETGR_R_SIZE_MAX => -1,
+        _SC_GETPW_R_SIZE_MAX => -1,
+        _SC_LOGIN_NAME_MAX => 256,
+        _SC_TTY_NAME_MAX => 32,
+        _SC_MONOTONIC_CLOCK => 200112,
+        _SC_SEMAPHORES => 200112,
+        _SC_BARRIERS => 202405,
+        _SC_SHELL => 1,
+        _SC_SHARED_MEMORY_OBJECTS => 200112,
+        _SC_THREADS => 202405,
+        _SC_THREAD_ATTR_STACKADDR => 202405,
+        _SC_THREAD_ATTR_STACKSIZE => 202405,
+        _SC_TIMEOUTS => 202405,
+        _SC_TIMERS => 202405,
+        _SC_SYMLOOP_MAX => -1,
+        _SC_HOST_NAME_MAX => limits::HOST_NAME_MAX.try_into().unwrap_or(-1),
+        _SC_NPROCESSORS_CONF => get_cpu_count().unwrap_or(None).unwrap_or(1),
+        _SC_NPROCESSORS_ONLN => get_cpu_count().unwrap_or(None).unwrap_or(1),
+        _SC_PHYS_PAGES => get_mem_stat().map(|s| s.f_blocks as c_long).unwrap_or(-1),
+        _SC_AVPHYS_PAGES => get_mem_stat().map(|s| s.f_bfree as c_long).unwrap_or(-1),
+        _SC_SIGQUEUE_MAX => 32,
+        _SC_REALTIME_SIGNALS => 202405,
+        _ => {
+            platform::ERRNO.set(errno::EINVAL);
+            -1
+        }
+    }
+}
+
+pub fn get_cpu_count() -> Result<Option<c_long>, Errno> {
+    let mut string = String::new();
+    let mut file = File::open(c"/scheme/sys/cpu".into(), fcntl::O_RDONLY)?;
+    file.read_to_string(&mut string)
+        .map_err(|_| Errno(errno::EIO).sync())?;
+
+    Ok(string
+        .lines()
+        .find(|line| line.starts_with("CPUs:"))
+        .and_then(|line| line.split(':').nth(1))
+        .and_then(|num_str| num_str.trim().parse::<c_long>().ok()))
+}
+
+pub fn get_mem_stat() -> Result<sys_statvfs::statvfs, Errno> {
+    let fd = Sys::open(c"/scheme/memory".into(), fcntl::O_PATH, 0)?;
+    let mut buf = sys_statvfs::statvfs::default();
+    let res = Sys::fstatvfs(fd, Out::from_mut(&mut buf));
+    if let Ok(()) = Sys::close(fd) {}; // TODO handle error
+    let _ = res?;
+    return Ok(buf);
+}
diff --git a/recipes/core/relibc/src/header/utime/cbindgen.toml b/recipes/core/relibc/src/header/utime/cbindgen.toml
new file mode 100644
index 0000000000..722d677d06
--- /dev/null
+++ b/recipes/core/relibc/src/header/utime/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = ["sys/types.h", "features.h"]
+include_guard = "_RELIBC_UTIME_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/utime/mod.rs b/recipes/core/relibc/src/header/utime/mod.rs
new file mode 100644
index 0000000000..88e10e1062
--- /dev/null
+++ b/recipes/core/relibc/src/header/utime/mod.rs
@@ -0,0 +1,47 @@
+//! `utime.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/utime.h.html>.
+//!
+//! The `utime.h` header was marked obsolescent in the Open Group Base
+//! Specifications Issue 7, and removed in Issue 8.
+
+use crate::{
+    c_str::CStr,
+    error::ResultExt,
+    header::bits_timespec::timespec,
+    platform::{
+        Pal, Sys,
+        types::{c_char, c_int, time_t},
+    },
+};
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/utime.h.html>.
+#[deprecated]
+#[repr(C)]
+#[derive(Clone)]
+pub struct utimbuf {
+    pub actime: time_t,
+    pub modtime: time_t,
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/utime.html>.
+#[deprecated]
+#[allow(deprecated)]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn utime(filename: *const c_char, times: *const utimbuf) -> c_int {
+    let filename_cstr = unsafe { CStr::from_ptr(filename) };
+    let times_ref = unsafe { &*times };
+    let times_spec = [
+        timespec {
+            tv_sec: times_ref.actime,
+            tv_nsec: 0,
+        },
+        timespec {
+            tv_sec: times_ref.modtime,
+            tv_nsec: 0,
+        },
+    ];
+    unsafe { Sys::utimens(filename_cstr, times_spec.as_ptr()) }
+        .map(|()| 0)
+        .or_minus_one_errno()
+}
diff --git a/recipes/core/relibc/src/header/utmp/cbindgen.toml b/recipes/core/relibc/src/header/utmp/cbindgen.toml
new file mode 100644
index 0000000000..386681d572
--- /dev/null
+++ b/recipes/core/relibc/src/header/utmp/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = []
+include_guard = "_RELIBC_UTMP_H"
+language = "C"
+style = "Tag"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/utmp/mod.rs b/recipes/core/relibc/src/header/utmp/mod.rs
new file mode 100644
index 0000000000..8512050b29
--- /dev/null
+++ b/recipes/core/relibc/src/header/utmp/mod.rs
@@ -0,0 +1,40 @@
+//! `utmp.h` implementation.
+//!
+//! Non-POSIX, see <https://www.man7.org/linux/man-pages/man3/openpty.3.html>.
+
+use crate::{
+    header::{sys_ioctl, unistd},
+    platform::types::{c_int, c_void},
+};
+
+/// See <https://www.man7.org/linux/man-pages/man3/openpty.3.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn login_tty(fd: c_int) -> c_int {
+    // Create a new session
+    unistd::setsid();
+
+    // Set controlling terminal
+    let mut arg: c_int = 0;
+    if unsafe {
+        sys_ioctl::ioctl(
+            fd,
+            sys_ioctl::TIOCSCTTY,
+            core::ptr::from_mut::<c_int>(&mut arg).cast::<c_void>(),
+        )
+    } != 0
+    {
+        return -1;
+    }
+
+    // Overwrite stdio
+    unistd::dup2(fd, 0);
+    unistd::dup2(fd, 1);
+    unistd::dup2(fd, 2);
+
+    // Close if needed
+    if fd > 2 {
+        unistd::close(fd);
+    }
+
+    0
+}
diff --git a/recipes/core/relibc/src/header/wchar/cbindgen.toml b/recipes/core/relibc/src/header/wchar/cbindgen.toml
new file mode 100644
index 0000000000..a31881baad
--- /dev/null
+++ b/recipes/core/relibc/src/header/wchar/cbindgen.toml
@@ -0,0 +1,45 @@
+sys_includes = [
+    "stdio.h",
+    "time.h",
+    "features.h",
+]
+after_includes = """
+// int32_t, uint32_t, WCHAR_MIN, WCHAR_MAX
+#include <stdint.h>
+
+#ifndef _WCHAR_T
+#define _WCHAR_T
+#ifndef __cplusplus
+    #ifndef __WCHAR_TYPE__
+        #define __WCHAR_TYPE__ int32_t
+    #endif
+    typedef __WCHAR_TYPE__ wchar_t;
+#endif // __cplusplus
+#endif // _WCHAR_T
+
+#ifndef _WINT_T
+#define _WINT_T
+    #ifndef __WINT_TYPE__
+        #define __WINT_TYPE__ uint32_t
+    #endif
+    typedef __WINT_TYPE__ wint_t;
+#endif // _WINT_T
+
+// NULL, size_t, must come after wchar_t and wint_t
+#define __need_size_t
+#define __need_NULL
+#include <stddef.h>
+
+#define WEOF (0xffffffffu)
+"""
+include_guard = "_RELIBC_WCHAR_H"
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[export.rename]
+"tm" = "struct tm"
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/wchar/mod.rs b/recipes/core/relibc/src/header/wchar/mod.rs
new file mode 100644
index 0000000000..fa4ff454f3
--- /dev/null
+++ b/recipes/core/relibc/src/header/wchar/mod.rs
@@ -0,0 +1,1095 @@
+//! `wchar.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/wchar.h.html>.
+
+use core::{char, ffi::VaList as va_list, mem, ptr, slice};
+
+use crate::{
+    c_str::{WStr, Wide},
+    header::{
+        ctype::isspace,
+        errno::{EILSEQ, ENOMEM, ERANGE},
+        stdio::*,
+        stdlib::{MB_CUR_MAX, MB_LEN_MAX, malloc},
+        string,
+        time::*,
+        wchar::reader::Reader,
+        wctype::*,
+    },
+    iter::{NulTerminated, NulTerminatedInclusive},
+    platform::{
+        self, ERRNO,
+        types::{
+            c_char, c_double, c_int, c_long, c_longlong, c_uchar, c_ulong, c_ulonglong, c_void,
+            size_t, wchar_t, wint_t,
+        },
+    },
+};
+
+mod utf8;
+mod wprintf;
+mod wscanf;
+
+pub use utf8::get_char_encoded_length;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/wchar.h.html>.
+#[repr(C)]
+#[derive(Clone, Copy)]
+pub struct mbstate_t;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/btowc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn btowc(c: c_int) -> wint_t {
+    //Check for EOF
+    if c == EOF {
+        return WEOF;
+    }
+
+    let uc = c as u8;
+    let c = uc as c_char;
+    let mut ps: mbstate_t = mbstate_t;
+    let mut wc: wchar_t = 0;
+    let saved_errno = platform::ERRNO.get();
+    let status = unsafe { mbrtowc(&raw mut wc, ptr::from_ref::<c_char>(&c), 1, &raw mut ps) };
+    if status == usize::MAX || status == usize::MAX - 1 {
+        platform::ERRNO.set(saved_errno);
+        return WEOF;
+    }
+    wc as wint_t
+}
+
+// not in POSIX.
+pub unsafe fn fgetwc_unlocked(stream: *mut FILE) -> wint_t {
+    // TODO: Process locale
+    let mut buf: [c_uchar; MB_CUR_MAX as usize] = [0; MB_CUR_MAX as usize];
+    let mut encoded_length = 0;
+    let mut bytes_read = 0;
+    let mut wc: wchar_t = 0;
+
+    loop {
+        unsafe {
+            let ret = getc_unlocked(stream);
+            if ret == EOF {
+                return WEOF;
+            }
+            *buf.as_mut_ptr().add(bytes_read) = ret as c_uchar;
+        }
+
+        bytes_read += 1;
+
+        if bytes_read == 1 {
+            encoded_length = if let Some(el) = get_char_encoded_length(buf[0]) {
+                el
+            } else {
+                unsafe {
+                    (*stream).flags |= F_ERR;
+                }
+                ERRNO.set(EILSEQ);
+                return WEOF;
+            };
+        }
+
+        if bytes_read >= encoded_length {
+            break;
+        }
+    }
+
+    unsafe {
+        mbrtowc(
+            &raw mut wc,
+            buf.as_ptr().cast::<c_char>(),
+            encoded_length,
+            ptr::null_mut(),
+        )
+    };
+
+    wc as wint_t
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fgetwc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fgetwc(stream: *mut FILE) -> wint_t {
+    let mut stream = unsafe { (*stream).lock() };
+    unsafe { fgetwc_unlocked(&raw mut *stream) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fgetws.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fgetws(ws: *mut wchar_t, n: c_int, stream: *mut FILE) -> *mut wchar_t {
+    let mut i = 0;
+    let mut stream = unsafe { (*stream).lock() };
+    while ((i + 1) as c_int) < n {
+        let wc = unsafe { fgetwc_unlocked(&raw mut *stream) };
+        if wc == WEOF {
+            break;
+        }
+        unsafe { *ws.add(i) = wc as wchar_t };
+        i += 1;
+        if wc as wchar_t == '\n' as wchar_t {
+            break;
+        }
+    }
+    // NUL-terminate result
+    unsafe { *ws.add(i) = 0 };
+    if i == 0 || unsafe { ferror(&raw mut *stream) != 0 } {
+        core::ptr::null_mut()
+    } else {
+        ws
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fputwc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fputwc(wc: wchar_t, stream: *mut FILE) -> wint_t {
+    //Convert wchar_t to multibytes first
+    static mut INTERNAL: mbstate_t = mbstate_t;
+    let mut bytes: [c_char; MB_CUR_MAX as usize] = [0; MB_CUR_MAX as usize];
+
+    let amount = unsafe { wcrtomb(bytes.as_mut_ptr(), wc, &raw mut INTERNAL) };
+
+    for b in bytes.iter().take(amount) {
+        unsafe { fputc(c_int::from(*b), &raw mut *stream) };
+    }
+
+    wc as wint_t
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fputws.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fputws(ws: *const wchar_t, stream: *mut FILE) -> c_int {
+    let mut i = 0;
+    loop {
+        let wc = unsafe { *ws.add(i) };
+        if wc == 0 {
+            return 0;
+        }
+        if unsafe { fputwc(wc, stream) } == WEOF {
+            return -1;
+        }
+        i += 1;
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fwide.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fwide(stream: *mut FILE, mode: c_int) -> c_int {
+    unsafe { (*stream).try_set_orientation(mode) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fwscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fwscanf(
+    stream: *mut FILE,
+    format: *const wchar_t,
+    mut __valist: ...
+) -> c_int {
+    unsafe { vfwscanf(stream, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getwc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getwc(stream: *mut FILE) -> wint_t {
+    unsafe { fgetwc(stream) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/getwchar.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn getwchar() -> wint_t {
+    unsafe { fgetwc(stdin) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mbsinit.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mbsinit(ps: *const mbstate_t) -> c_int {
+    //Add a check for the state maybe
+    if ps.is_null() { 1 } else { 0 }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mbrlen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mbrlen(s: *const c_char, n: size_t, ps: *mut mbstate_t) -> size_t {
+    static mut INTERNAL: mbstate_t = mbstate_t;
+    unsafe { mbrtowc(ptr::null_mut(), s, n, &raw mut INTERNAL) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mbrtowc.html>.
+///
+/// Only works for UTF8 at the moment.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mbrtowc(
+    pwc: *mut wchar_t,
+    s: *const c_char,
+    n: size_t,
+    ps: *mut mbstate_t,
+) -> size_t {
+    static mut INTERNAL: mbstate_t = mbstate_t;
+
+    if ps.is_null() {
+        let ps = &raw mut INTERNAL;
+    }
+    if s.is_null() {
+        let xs: [c_char; 1] = [0];
+        unsafe { utf8::mbrtowc(pwc, ptr::from_ref::<c_char>(&xs[0]), 1, ps) }
+    } else {
+        unsafe { utf8::mbrtowc(pwc, s, n, ps) }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mbsnrtowcs.html>.
+///
+/// Convert a multibyte string to a wide string with a limited amount of bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mbsnrtowcs(
+    dst_ptr: *mut wchar_t,
+    src_ptr: *mut *const c_char,
+    src_len: size_t,
+    dst_len: size_t,
+    ps: *mut mbstate_t,
+) -> size_t {
+    static mut INTERNAL: mbstate_t = mbstate_t;
+
+    if ps.is_null() {
+        let ps = &raw mut INTERNAL;
+    }
+
+    let mut src = unsafe { *src_ptr };
+
+    let mut dst_offset: usize = 0;
+    let mut src_offset: usize = 0;
+
+    while (dst_ptr.is_null() || dst_offset < dst_len) && src_offset < src_len {
+        let ps_copy = unsafe { *ps };
+        let mut wc: wchar_t = 0;
+        let amount = unsafe { mbrtowc(&raw mut wc, src.add(src_offset), src_len - src_offset, ps) };
+
+        // Stop in the event a decoding error occured.
+        if amount == -1isize as usize {
+            unsafe { *src_ptr = src.add(src_offset) };
+            return 1isize as usize;
+        }
+
+        // Stop decoding early in the event we encountered a partial character.
+        if amount == -2isize as usize {
+            unsafe { *ps = ps_copy };
+            break;
+        }
+
+        // Store the decoded wide character in the destination buffer.
+        if !dst_ptr.is_null() {
+            unsafe { *dst_ptr.add(dst_offset) = wc };
+        }
+
+        // Stop decoding after decoding a null character and return a NULL
+        // source pointer to the caller, not including the null character in the
+        // number of characters stored in the destination buffer.
+        if wc == 0 {
+            src = ptr::null();
+            src_offset = 0;
+            break;
+        }
+
+        dst_offset += 1;
+        src_offset += amount;
+    }
+
+    unsafe { *src_ptr = src.add(src_offset) };
+    dst_offset
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/mbsrtowcs.html>.
+///
+/// Convert a multibyte string to a wide string.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn mbsrtowcs(
+    dst: *mut wchar_t,
+    src: *mut *const c_char,
+    len: size_t,
+    ps: *mut mbstate_t,
+) -> size_t {
+    unsafe { mbsnrtowcs(dst, src, size_t::MAX, len, ps) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/putwc.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn putwc(wc: wchar_t, stream: *mut FILE) -> wint_t {
+    unsafe { fputwc(wc, &raw mut *stream) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/putwchar.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn putwchar(wc: wchar_t) -> wint_t {
+    unsafe { fputwc(wc, &raw mut *stdout) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vswscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vswscanf(
+    s: *const wchar_t,
+    format: *const wchar_t,
+    __valist: va_list,
+) -> c_int {
+    unsafe {
+        let format = WStr::from_ptr(format);
+        let s = WStr::from_ptr(s);
+        wscanf::scanf(s.into(), format.into(), __valist)
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fwscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn swscanf(
+    s: *const wchar_t,
+    format: *const wchar_t,
+    mut __valist: ...
+) -> c_int {
+    unsafe { vswscanf(s, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/ungetwc.html>.
+///
+/// Push wide character `wc` back onto `stream` so it'll be read next
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn ungetwc(wc: wint_t, stream: &mut FILE) -> wint_t {
+    if wc == WEOF {
+        return wc;
+    }
+    static mut INTERNAL: mbstate_t = mbstate_t;
+    let mut bytes: [c_char; MB_CUR_MAX as usize] = [0; MB_CUR_MAX as usize];
+
+    let amount = unsafe { wcrtomb(bytes.as_mut_ptr(), wc as wchar_t, &raw mut INTERNAL) };
+    if amount == usize::MAX {
+        return WEOF;
+    }
+
+    /*
+    We might have unget multiple bytes for a single wchar, eg, `ç` is [195, 167].
+    We need to unget them in reversed, so they are pused as [..., 167, 195, ...]
+    When we do fgetwc, we pop from the Vec, getting the write order of bytes [195, 167].
+    If we called ungetc in the non-reversed order, we would get [167, 195]
+    */
+    for i in 0..amount {
+        unsafe { ungetc(c_int::from(bytes[amount - 1 - i]), &raw mut *stream) };
+    }
+
+    wc
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfwprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vfwprintf(
+    stream: *mut FILE,
+    format: *const wchar_t,
+    arg: va_list,
+) -> c_int {
+    let mut stream = unsafe { (*stream).lock() };
+    if (*stream).try_set_wide_orientation_unlocked().is_err() {
+        return -1;
+    }
+
+    unsafe { wprintf::wprintf(&mut *stream, WStr::from_ptr(format), arg) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fwprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn fwprintf(
+    stream: *mut FILE,
+    format: *const wchar_t,
+    mut __valist: ...
+) -> c_int {
+    unsafe { vfwprintf(stream, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfwprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vwprintf(format: *const wchar_t, arg: va_list) -> c_int {
+    unsafe { vfwprintf(&raw mut *stdout, format, arg) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fwprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wprintf(format: *const wchar_t, mut __valist: ...) -> c_int {
+    unsafe { vfwprintf(&raw mut *stdout, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfwprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vswprintf(
+    s: *mut wchar_t,
+    n: size_t,
+    format: *const wchar_t,
+    arg: va_list,
+) -> c_int {
+    //TODO: implement vswprintf. This is not as simple as wprintf, since the output is not UTF-8
+    // but instead is a wchar array.
+    todo_skip!(0, "vswprintf not implemented");
+    -1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/fwprintf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn swprintf(
+    s: *mut wchar_t,
+    n: size_t,
+    format: *const wchar_t,
+    mut __valist: ...
+) -> c_int {
+    unsafe { vswprintf(s, n, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcpcpy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcpcpy(d: *mut wchar_t, s: *const wchar_t) -> *mut wchar_t {
+    unsafe { (wcscpy(d, s)).add(wcslen(s)) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcpncpy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcpncpy(d: *mut wchar_t, s: *const wchar_t, n: size_t) -> *mut wchar_t {
+    unsafe { (wcsncpy(d, s, n)).add(wcsnlen(s, n)) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcrtomb.html>.
+///
+/// widechar to multibyte.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcrtomb(s: *mut c_char, wc: wchar_t, ps: *mut mbstate_t) -> size_t {
+    let mut buffer: [c_char; MB_CUR_MAX as usize] = [0; MB_CUR_MAX as usize];
+    let (s_cpy, wc_cpy) = if s.is_null() {
+        (buffer.as_mut_ptr(), 0)
+    } else {
+        (s, wc)
+    };
+
+    unsafe { utf8::wcrtomb(s_cpy, wc_cpy, ps) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsdup.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsdup(s: *const wchar_t) -> *mut wchar_t {
+    let l = unsafe { wcslen(s) };
+
+    let d = unsafe { malloc((l + 1) * mem::size_of::<wchar_t>()) }.cast::<wchar_t>();
+
+    if d.is_null() {
+        ERRNO.set(ENOMEM);
+        return ptr::null_mut();
+    }
+
+    unsafe { wmemcpy(d, s, l + 1) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsrtombs.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsrtombs(
+    s: *mut c_char,
+    ws: *mut *const wchar_t,
+    n: size_t,
+    mut st: *mut mbstate_t,
+) -> size_t {
+    let mut mbs = mbstate_t {};
+    if st.is_null() {
+        st = &raw mut mbs;
+    }
+    unsafe { wcsnrtombs(s, ws, size_t::MAX, n, st) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcscat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcscat(ws1: *mut wchar_t, ws2: *const wchar_t) -> *mut wchar_t {
+    unsafe { wcsncat(ws1, ws2, usize::MAX) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcschr.html>.
+///
+/// # Safety
+/// The caller is required to ensure that `ws` is a valid pointer to a buffer
+/// containing at least one nul value. The pointed-to buffer must not be
+/// modified for the duration of the call.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcschr(ws: *const wchar_t, wc: wchar_t) -> *mut wchar_t {
+    // We iterate over non-mut references and thus need to coerce the
+    // resulting reference via a *const pointer before we can get our *mut.
+    // SAFETY: the caller is required to ensure that ws points to a valid
+    // nul-terminated buffer.
+    let ptr: *const wchar_t =
+        match unsafe { NulTerminatedInclusive::new(ws) }.find(|&&wsc| wsc == wc) {
+            Some(wsc_ref) => wsc_ref,
+            None => ptr::null(),
+        };
+    ptr.cast_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcscmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcscmp(ws1: *const wchar_t, ws2: *const wchar_t) -> c_int {
+    unsafe { wcsncmp(ws1, ws2, usize::MAX) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcscoll.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcscoll(ws1: *const wchar_t, ws2: *const wchar_t) -> c_int {
+    //TODO: locale comparison
+    unsafe { wcscmp(ws1, ws2) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcscpy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcscpy(ws1: *mut wchar_t, ws2: *const wchar_t) -> *mut wchar_t {
+    let mut i = 0;
+    loop {
+        let wc = unsafe { *ws2.add(i) };
+        unsafe { *ws1.add(i) = wc };
+        i += 1;
+        if wc == 0 {
+            return ws1;
+        }
+    }
+}
+
+unsafe fn inner_wcsspn(mut wcs: *const wchar_t, set: *const wchar_t, reject: bool) -> size_t {
+    let mut count = 0;
+    while unsafe { *wcs } != 0 && unsafe { wcschr(set, *wcs).is_null() } == reject {
+        wcs = unsafe { wcs.add(1) };
+        count += 1;
+    }
+    count
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcscspn.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcscspn(wcs: *const wchar_t, set: *const wchar_t) -> size_t {
+    unsafe { inner_wcsspn(wcs, set, true) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsftime.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn wcsftime(
+    wcs: *mut wchar_t,
+    maxsize: size_t,
+    format: *const wchar_t,
+    timptr: *const tm,
+) -> size_t {
+    todo_skip!(0, "wcsftime is not implemented");
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcslen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcslen(ws: *const wchar_t) -> size_t {
+    unsafe { NulTerminated::new(ws).unwrap() }.count()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsncat.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsncat(
+    ws1: *mut wchar_t,
+    ws2: *const wchar_t,
+    n: size_t,
+) -> *mut wchar_t {
+    let len = unsafe { wcslen(ws1) };
+    let dest = unsafe { ws1.add(len) };
+    let mut i = 0;
+    while i < n {
+        let wc = unsafe { *ws2.add(i) };
+        if wc == 0 {
+            break;
+        }
+        unsafe { *dest.add(i) = wc };
+        i += 1;
+    }
+    unsafe { *dest.add(i) = 0 };
+    ws1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsncmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsncmp(ws1: *const wchar_t, ws2: *const wchar_t, n: size_t) -> c_int {
+    for i in 0..n {
+        let wc1 = unsafe { *ws1.add(i) };
+        let wc2 = unsafe { *ws2.add(i) };
+        if wc1 != wc2 {
+            return wc1 - wc2;
+        } else if wc1 == 0 {
+            break;
+        }
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsncpy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsncpy(
+    ws1: *mut wchar_t,
+    ws2: *const wchar_t,
+    n: size_t,
+) -> *mut wchar_t {
+    let mut i = 0;
+    while i < n {
+        let wc = unsafe { *ws2.add(i) };
+        unsafe { *ws1.add(i) = wc };
+        i += 1;
+        if wc == 0 {
+            break;
+        }
+    }
+    while i < n {
+        unsafe { *ws1.add(i) = 0 };
+        i += 1;
+    }
+    ws1
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsnlen.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsnlen(mut s: *const wchar_t, maxlen: size_t) -> size_t {
+    let mut len = 0;
+
+    while len < maxlen {
+        if unsafe { *s } == 0 {
+            break;
+        }
+
+        len += 1;
+        s = unsafe { s.offset(1) };
+    }
+
+    len
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsnrtombs.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsnrtombs(
+    mut dest: *mut c_char,
+    src: *mut *const wchar_t,
+    nwc: size_t,
+    len: size_t,
+    mut ps: *mut mbstate_t,
+) -> size_t {
+    let mut written = 0;
+    let mut read = 0;
+    let mut buf: [c_char; MB_LEN_MAX as usize] = [0; MB_LEN_MAX as usize];
+    let mut mbs = mbstate_t {};
+
+    if ps.is_null() {
+        ps = &raw mut mbs;
+    }
+
+    while read < nwc {
+        buf.fill(0);
+
+        let ret = unsafe { wcrtomb(buf.as_mut_ptr(), **src, ps) };
+
+        if ret == size_t::MAX {
+            ERRNO.set(EILSEQ);
+            return size_t::MAX;
+        }
+
+        if !dest.is_null() && len < written + ret {
+            return written;
+        }
+
+        if !dest.is_null() {
+            unsafe { ptr::copy_nonoverlapping(buf.as_ptr(), dest, ret) };
+            dest = unsafe { dest.add(ret) };
+        }
+
+        if unsafe { **src } == '\0' as wchar_t {
+            unsafe { *src = ptr::null() };
+            return written;
+        }
+
+        unsafe { *src = (*src).add(1) };
+        read += 1;
+        written += ret;
+    }
+    written
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcspbrk.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcspbrk(mut wcs: *const wchar_t, set: *const wchar_t) -> *mut wchar_t {
+    wcs = unsafe { wcs.add(wcscspn(wcs, set)) };
+    if unsafe { *wcs } == 0 {
+        ptr::null_mut()
+    } else {
+        // Once again, C wants us to transmute a const pointer to a
+        // mutable one...
+        wcs.cast_mut()
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsrchr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsrchr(ws1: *const wchar_t, wc: wchar_t) -> *mut wchar_t {
+    let mut last_matching_wc = ptr::null::<wchar_t>();
+    let mut i = 0;
+
+    while unsafe { *ws1.add(i) } != 0 {
+        if unsafe { *ws1.add(i) } == wc {
+            last_matching_wc = unsafe { ws1.add(i) };
+        }
+        i += 1;
+    }
+
+    last_matching_wc.cast_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsspn.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsspn(wcs: *const wchar_t, set: *const wchar_t) -> size_t {
+    unsafe { inner_wcsspn(wcs, set, false) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsstr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsstr(ws1: *const wchar_t, ws2: *const wchar_t) -> *mut wchar_t {
+    // Get length of ws2, not including null terminator
+    let ws2_len = unsafe { wcslen(ws2) };
+
+    // The standard says that we must return ws1 if ws2 has length 0
+    if ws2_len == 0 {
+        ws1.cast_mut()
+    } else {
+        let ws1_len = unsafe { wcslen(ws1) };
+
+        // Construct slices without null terminator
+        let ws1_slice = unsafe { slice::from_raw_parts(ws1, ws1_len) };
+        let ws2_slice = unsafe { slice::from_raw_parts(ws2, ws2_len) };
+
+        /* Sliding ws2-sized window iterator on ws1. The iterator
+         * returns None if ws2 is longer than ws1. */
+        let mut ws1_windows = ws1_slice.windows(ws2_len);
+
+        /* Find the first offset into ws1 where the window is equal to
+         * the ws2 contents. Return null pointer if no match is found. */
+        match ws1_windows.position(|ws1_window| ws1_window == ws2_slice) {
+            Some(pos) => unsafe { ws1.add(pos).cast_mut() },
+            None => ptr::null_mut(),
+        }
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcstod.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcstod(mut ptr: *const wchar_t, end: *mut *mut wchar_t) -> c_double {
+    const RADIX: u32 = 10;
+
+    skipws!(ptr);
+    let negative = unsafe { *ptr } == '-' as wchar_t;
+    if negative {
+        ptr = unsafe { ptr.add(1) };
+    }
+
+    let mut result: c_double = 0.0;
+    while let Some(digit) = char::from_u32(unsafe { *ptr } as _).and_then(|c| c.to_digit(RADIX)) {
+        result *= 10.0;
+        if negative {
+            result -= c_double::from(digit);
+        } else {
+            result += c_double::from(digit);
+        }
+        ptr = unsafe { ptr.add(1) };
+    }
+    if unsafe { *ptr } == '.' as wchar_t {
+        ptr = unsafe { ptr.add(1) };
+
+        let mut scale = 1.0;
+        while let Some(digit) = char::from_u32(unsafe { *ptr } as _).and_then(|c| c.to_digit(RADIX))
+        {
+            scale /= 10.0;
+            if negative {
+                result -= c_double::from(digit) * scale;
+            } else {
+                result += c_double::from(digit) * scale;
+            }
+            ptr = unsafe { ptr.add(1) };
+        }
+    }
+    if !end.is_null() {
+        unsafe { *end = ptr.cast_mut() };
+    }
+    result
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcstok.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcstok(
+    mut wcs: *mut wchar_t,
+    delim: *const wchar_t,
+    state: *mut *mut wchar_t,
+) -> *mut wchar_t {
+    // Choose starting position
+    if wcs.is_null() {
+        if (unsafe { *state }).is_null() {
+            // There was no next token
+            return ptr::null_mut();
+        }
+        wcs = unsafe { *state };
+    }
+
+    // Advance past any delimiters
+    wcs = unsafe { wcs.add(wcsspn(wcs, delim)) };
+
+    // Check end
+    if unsafe { *wcs } == 0 {
+        unsafe { *state = ptr::null_mut() };
+        return ptr::null_mut();
+    }
+
+    // Advance *to* any delimiters
+    let end = unsafe { wcspbrk(wcs, delim) };
+    if end.is_null() {
+        unsafe { *state = ptr::null_mut() };
+    } else {
+        unsafe { *end = 0 };
+        unsafe { *state = end.add(1) };
+    }
+    wcs
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcstol.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcstol(
+    mut ptr: *const wchar_t,
+    end: *mut *mut wchar_t,
+    base: c_int,
+) -> c_long {
+    skipws!(ptr);
+    let result = strto_impl!(c_long, ptr, base);
+    if !end.is_null() {
+        unsafe { *end = ptr.cast_mut() };
+    }
+    result
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcstoll.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcstoll(
+    mut ptr: *const wchar_t,
+    end: *mut *mut wchar_t,
+    base: c_int,
+) -> c_longlong {
+    skipws!(ptr);
+    let result = strto_impl!(c_longlong, ptr, base);
+    if !end.is_null() {
+        unsafe { *end = ptr.cast_mut() };
+    }
+    result
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcstoul.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcstoul(
+    mut ptr: *const wchar_t,
+    end: *mut *mut wchar_t,
+    base: c_int,
+) -> c_ulong {
+    skipws!(ptr);
+    let result = strtou_impl!(c_ulong, ptr, base);
+    if !end.is_null() {
+        unsafe { *end = ptr.cast_mut() };
+    }
+    result
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcstoull.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcstoull(
+    mut ptr: *const wchar_t,
+    end: *mut *mut wchar_t,
+    base: c_int,
+) -> c_ulonglong {
+    skipws!(ptr);
+    let result = strtou_impl!(c_ulonglong, ptr, base);
+    if !end.is_null() {
+        unsafe { *end = ptr.cast_mut() };
+    }
+    result
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/009604499/functions/wcswcs.html>.
+///
+/// Marked legacy in issue 6.
+/// Encouraged to use `wcsstr` instead, which this implementation simply forwards to.
+#[deprecated]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcswcs(ws1: *const wchar_t, ws2: *const wchar_t) -> *mut wchar_t {
+    unsafe { wcsstr(ws1, ws2) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcswidth.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcswidth(pwcs: *const wchar_t, n: size_t) -> c_int {
+    let mut total_width = 0;
+    for i in 0..n {
+        let wc_width = wcwidth(unsafe { *pwcs.add(i) });
+        if wc_width < 0 {
+            return -1;
+        }
+        total_width += wc_width;
+    }
+    total_width
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsxfrm.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn wcsxfrm(ws1: *mut wchar_t, ws2: *const wchar_t, n: size_t) -> size_t {
+    todo_skip!(0, "wcsxfrm is not implemented");
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wctob.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn wctob(c: wint_t) -> c_int {
+    if c <= 0x7F { c as c_int } else { EOF }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcwidth.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn wcwidth(wc: wchar_t) -> c_int {
+    match char::from_u32(wc as u32) {
+        Some(c) => match unicode_width::UnicodeWidthChar::width(c) {
+            Some(width) => width as c_int,
+            None => -1,
+        },
+        None => -1,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wmemchr.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wmemchr(ws: *const wchar_t, wc: wchar_t, n: size_t) -> *mut wchar_t {
+    for i in 0..n {
+        if unsafe { *ws.add(i) } == wc {
+            return unsafe { ws.add(i) }.cast_mut();
+        }
+    }
+    ptr::null_mut()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wmemcmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wmemcmp(ws1: *const wchar_t, ws2: *const wchar_t, n: size_t) -> c_int {
+    for i in 0..n {
+        let wc1 = unsafe { *ws1.add(i) };
+        let wc2 = unsafe { *ws2.add(i) };
+        if wc1 != wc2 {
+            return wc1 - wc2;
+        }
+    }
+    0
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wmemcpy.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wmemcpy(
+    ws1: *mut wchar_t,
+    ws2: *const wchar_t,
+    n: size_t,
+) -> *mut wchar_t {
+    (unsafe {
+        string::memcpy(
+            ws1.cast::<c_void>(),
+            ws2.cast::<c_void>(),
+            n * mem::size_of::<wchar_t>(),
+        )
+    })
+    .cast::<wchar_t>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wmemmove.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wmemmove(
+    ws1: *mut wchar_t,
+    ws2: *const wchar_t,
+    n: size_t,
+) -> *mut wchar_t {
+    (unsafe {
+        string::memmove(
+            ws1.cast::<c_void>(),
+            ws2.cast::<c_void>(),
+            n * mem::size_of::<wchar_t>(),
+        )
+    })
+    .cast::<wchar_t>()
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wmemset.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wmemset(ws: *mut wchar_t, wc: wchar_t, n: size_t) -> *mut wchar_t {
+    for i in 0..n {
+        unsafe { *ws.add(i) = wc };
+    }
+    ws
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vfwscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vfwscanf(
+    stream: *mut FILE,
+    format: *const wchar_t,
+    __valist: va_list,
+) -> c_int {
+    let mut file = unsafe { (*stream).lock() };
+    if file.try_set_byte_orientation_unlocked().is_err() {
+        return -1;
+    }
+
+    let f: &mut FILE = &mut file;
+    let reader: Reader<Wide> = f.into();
+
+    unsafe {
+        let format = WStr::from_ptr(format);
+        wscanf::scanf(reader, format.into(), __valist)
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/vwscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn vwscanf(format: *const wchar_t, __valist: va_list) -> c_int {
+    unsafe { vfwscanf(stdin, format, __valist) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wscanf.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wscanf(format: *const wchar_t, mut __valist: ...) -> c_int {
+    unsafe { vfwscanf(stdin, format, __valist.as_va_list()) }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcscasecmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcscasecmp(mut s1: *const wchar_t, mut s2: *const wchar_t) -> c_int {
+    unsafe {
+        while *s1 != 0 && *s2 != 0 {
+            if towlower(*s1 as wint_t) != towlower(*s2 as wint_t) {
+                break;
+            }
+            s1 = s1.add(1);
+            s2 = s2.add(1);
+        }
+        let result = towlower(*s1 as wint_t).wrapping_sub(towlower(*s2 as wint_t));
+        result as c_int
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wcsncasecmp.html>.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wcsncasecmp(
+    mut s1: *const wchar_t,
+    mut s2: *const wchar_t,
+    n: size_t,
+) -> c_int {
+    if n == 0 {
+        return 0;
+    }
+    unsafe {
+        for _ in 0..n {
+            if *s1 == 0 || *s2 == 0 || towlower(*s1 as wint_t) != towlower(*s2 as wint_t) {
+                return towlower(*s1 as wint_t).wrapping_sub(towlower(*s2 as wint_t)) as c_int;
+            }
+            s1 = s1.add(1);
+            s2 = s2.add(1);
+        }
+        0
+    }
+}
diff --git a/recipes/core/relibc/src/header/wchar/utf8.rs b/recipes/core/relibc/src/header/wchar/utf8.rs
new file mode 100644
index 0000000000..dc0da1f94a
--- /dev/null
+++ b/recipes/core/relibc/src/header/wchar/utf8.rs
@@ -0,0 +1,107 @@
+//UTF implementation parts for wchar.h.
+//Partially ported from the Sortix libc
+
+use core::{char, slice, str};
+
+use crate::{
+    header::errno,
+    platform::{
+        self,
+        types::{c_char, wchar_t},
+    },
+};
+
+use super::mbstate_t;
+
+// Based on
+// https://github.com/rust-lang/rust/blob/f24ce9b/library/core/src/str/validations.rs#L232-L257,
+// because apparently somebody removed the `pub use` statement from `core::str`.
+
+// https://tools.ietf.org/html/rfc3629
+static UTF8_CHAR_WIDTH: [u8; 256] = [
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, // 0x1F
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, // 0x3F
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, // 0x5F
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, // 0x7F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, // 0x9F
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, // 0xBF
+    0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, // 0xDF
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEF
+    4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xFF
+];
+
+// Given a first byte, determines how many bytes are in this UTF-8 character.
+#[inline]
+fn utf8_char_width(b: u8) -> usize {
+    UTF8_CHAR_WIDTH[usize::from(b)].into()
+}
+
+//It's guaranteed that we don't have any nullpointers here
+pub unsafe fn mbrtowc(pwc: *mut wchar_t, s: *const c_char, n: usize, ps: *mut mbstate_t) -> usize {
+    let size = utf8_char_width(unsafe { *s } as u8);
+    if size > n {
+        platform::ERRNO.set(errno::EILSEQ);
+        return -2isize as usize;
+    }
+    if size == 0 {
+        platform::ERRNO.set(errno::EILSEQ);
+        return -1isize as usize;
+    }
+
+    let slice = unsafe { slice::from_raw_parts(s.cast::<u8>(), size) };
+    let decoded = str::from_utf8(slice);
+    if decoded.is_err() {
+        platform::ERRNO.set(errno::EILSEQ);
+        return -1isize as usize;
+    }
+
+    let wc = decoded.unwrap();
+
+    let result: wchar_t = wc.chars().next().unwrap() as wchar_t;
+
+    if !pwc.is_null() {
+        unsafe { *pwc = result };
+    }
+
+    if result != 0 { size } else { 0 }
+}
+
+//It's guaranteed that we don't have any nullpointers here
+pub unsafe fn wcrtomb(s: *mut c_char, wc: wchar_t, ps: *mut mbstate_t) -> usize {
+    let dc = char::from_u32(wc as u32);
+
+    if dc.is_none() {
+        platform::ERRNO.set(errno::EILSEQ);
+        return -1isize as usize;
+    }
+
+    let c = dc.unwrap();
+    let size = c.len_utf8();
+    let slice = unsafe { slice::from_raw_parts_mut(s.cast::<u8>(), size) };
+
+    c.encode_utf8(slice);
+
+    size
+}
+
+/// Gets the encoded length of a character. It is used to recognize wide characters
+pub fn get_char_encoded_length(first_byte: u8) -> Option<usize> {
+    if first_byte >> 7 == 0 {
+        Some(1)
+    } else if first_byte >> 5 == 6 {
+        Some(2)
+    } else if first_byte >> 4 == 0xe {
+        Some(3)
+    } else if first_byte >> 3 == 0x1e {
+        Some(4)
+    } else {
+        None
+    }
+}
diff --git a/recipes/core/relibc/src/header/wchar/wprintf.rs b/recipes/core/relibc/src/header/wchar/wprintf.rs
new file mode 100644
index 0000000000..6a951a8dae
--- /dev/null
+++ b/recipes/core/relibc/src/header/wchar/wprintf.rs
@@ -0,0 +1,12 @@
+// TODO: reuse more code with the thin printf impl
+use crate::{
+    c_str::{self, WStr},
+    header::stdio::printf::inner_printf,
+    io::Write,
+    platform::types::c_int,
+};
+use core::ffi::VaList;
+
+pub unsafe fn wprintf(w: impl Write, format: WStr, ap: VaList) -> c_int {
+    unsafe { inner_printf::<c_str::Wide>(w, format, ap).unwrap_or(-1) }
+}
diff --git a/recipes/core/relibc/src/header/wchar/wscanf.rs b/recipes/core/relibc/src/header/wchar/wscanf.rs
new file mode 100644
index 0000000000..e7797ed1b4
--- /dev/null
+++ b/recipes/core/relibc/src/header/wchar/wscanf.rs
@@ -0,0 +1,13 @@
+use crate::{
+    c_str::{self, WStr},
+    header::stdio::{reader::Reader, scanf::inner_scanf},
+    platform::types::c_int,
+};
+use core::ffi::VaList as va_list;
+
+pub unsafe fn scanf(r: Reader<'_, c_str::Wide>, format: WStr, ap: va_list) -> c_int {
+    match unsafe { inner_scanf::<c_str::Wide>(r, format.into(), ap) } {
+        Ok(n) => n,
+        Err(n) => n,
+    }
+}
diff --git a/recipes/core/relibc/src/header/wctype/alpha.rs b/recipes/core/relibc/src/header/wctype/alpha.rs
new file mode 100644
index 0000000000..02c398b0e3
--- /dev/null
+++ b/recipes/core/relibc/src/header/wctype/alpha.rs
@@ -0,0 +1,193 @@
+// From musl src/ctype/alpha.h
+// Licensed under the MIT license
+// Copyright 2005-2020 Rich Felker, et al.
+
+use crate::platform::types::c_uchar;
+
+pub fn is(wc: usize) -> c_uchar {
+    if wc < 0x20000 {
+        return (table[(table[wc >> 8] as usize) * 32 + ((wc & 255) >> 3)] >> (wc & 7)) & 1;
+    }
+    if wc < 0x2fffe {
+        return 1;
+    }
+    0
+}
+
+const table: [c_uchar; 3904] = [
+    18, 17, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 17, 34, 35, 36, 17, 37, 38,
+    39, 40, 41, 42, 43, 44, 17, 45, 46, 47, 16, 16, 48, 16, 16, 16, 16, 16, 16, 16, 49, 50, 51, 16,
+    52, 53, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+    17, 17, 17, 17, 17, 54, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 55, 17, 17, 17, 17, 56, 17, 57, 58,
+    59, 60, 61, 62, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 63,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 64, 65, 17, 66, 67, 68, 69, 70, 71, 72, 73, 74, 17, 75,
+    76, 77, 78, 79, 80, 81, 16, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 16, 94, 95, 96, 16,
+    17, 17, 17, 97, 98, 99, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 100, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 101, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 17, 17, 102, 103, 16, 16, 104, 105, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 106, 17, 17, 107, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 17, 108, 109, 16, 16, 16, 16, 16, 16, 16, 16, 16, 110, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 111, 112, 113, 114, 16, 16,
+    16, 16, 16, 16, 16, 16, 115, 116, 117, 16, 16, 16, 16, 16, 118, 119, 16, 16, 16, 16, 120, 16,
+    16, 121, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 254, 255, 255, 7, 254, 255, 255, 7,
+    0, 0, 0, 0, 0, 4, 32, 4, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 195,
+    255, 3, 0, 31, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 223, 188, 64, 215, 255,
+    255, 251, 255, 255, 255, 255, 255, 255, 255, 255, 255, 191, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 3, 252, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 255, 255, 255, 127, 2,
+    255, 255, 255, 255, 255, 1, 0, 0, 0, 0, 255, 191, 182, 0, 255, 255, 255, 135, 7, 0, 0, 0, 255,
+    7, 255, 255, 255, 255, 255, 255, 255, 254, 255, 195, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 239, 31, 254, 225, 255, 159, 0, 0, 255, 255, 255, 255, 255, 255, 0, 224,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 3, 0, 255, 255, 255, 255, 255, 7,
+    48, 4, 255, 255, 255, 252, 255, 31, 0, 0, 255, 255, 255, 1, 255, 7, 0, 0, 0, 0, 0, 0, 255, 255,
+    223, 63, 0, 0, 240, 255, 248, 3, 255, 255, 255, 255, 255, 255, 255, 255, 255, 239, 255, 223,
+    225, 255, 207, 255, 254, 255, 239, 159, 249, 255, 255, 253, 197, 227, 159, 89, 128, 176, 207,
+    255, 3, 16, 238, 135, 249, 255, 255, 253, 109, 195, 135, 25, 2, 94, 192, 255, 63, 0, 238, 191,
+    251, 255, 255, 253, 237, 227, 191, 27, 1, 0, 207, 255, 0, 30, 238, 159, 249, 255, 255, 253,
+    237, 227, 159, 25, 192, 176, 207, 255, 2, 0, 236, 199, 61, 214, 24, 199, 255, 195, 199, 29,
+    129, 0, 192, 255, 0, 0, 239, 223, 253, 255, 255, 253, 255, 227, 223, 29, 96, 7, 207, 255, 0, 0,
+    239, 223, 253, 255, 255, 253, 239, 227, 223, 29, 96, 64, 207, 255, 6, 0, 239, 223, 253, 255,
+    255, 255, 255, 231, 223, 93, 240, 128, 207, 255, 0, 252, 236, 255, 127, 252, 255, 255, 251, 47,
+    127, 128, 95, 255, 192, 255, 12, 0, 254, 255, 255, 255, 255, 127, 255, 7, 63, 32, 255, 3, 0, 0,
+    0, 0, 214, 247, 255, 255, 175, 255, 255, 59, 95, 32, 255, 243, 0, 0, 0, 0, 1, 0, 0, 0, 255, 3,
+    0, 0, 255, 254, 255, 255, 255, 31, 254, 255, 3, 255, 255, 254, 255, 255, 255, 31, 0, 0, 0, 0,
+    0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 127, 249, 255, 3, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 63, 255, 255, 255, 255, 191, 32, 255, 255, 255, 255, 255, 247, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 61, 127, 61, 255, 255, 255, 255, 255, 61, 255, 255, 255, 255, 61, 127,
+    61, 255, 127, 255, 255, 255, 255, 255, 255, 255, 61, 255, 255, 255, 255, 255, 255, 255, 255, 7,
+    0, 0, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 63, 63, 254, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 159, 255, 255, 254, 255, 255, 7, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 199, 255, 1, 255, 223, 15, 0, 255, 255, 15, 0, 255, 255, 15, 0, 255, 223, 13, 0, 255,
+    255, 255, 255, 255, 255, 207, 255, 255, 1, 128, 16, 255, 3, 0, 0, 0, 0, 255, 3, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 1, 255, 255, 255, 255, 255, 7, 255, 255, 255, 255, 255,
+    255, 255, 255, 63, 0, 255, 255, 255, 127, 255, 15, 255, 1, 192, 255, 255, 255, 255, 63, 31, 0,
+    255, 255, 255, 255, 255, 15, 255, 255, 255, 3, 255, 3, 0, 0, 0, 0, 255, 255, 255, 15, 255, 255,
+    255, 255, 255, 255, 255, 127, 254, 255, 31, 0, 255, 3, 255, 3, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 255, 255, 255, 255, 255, 255, 239, 255, 239, 15, 255, 3, 0, 0, 0, 0, 255, 255, 255, 255,
+    255, 243, 255, 255, 255, 255, 255, 255, 191, 255, 3, 0, 255, 255, 255, 255, 255, 255, 127, 0,
+    255, 227, 255, 255, 255, 255, 255, 63, 255, 1, 255, 255, 255, 255, 255, 231, 0, 0, 0, 0, 0,
+    222, 111, 4, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 128, 255, 31, 0, 255, 255, 63, 63, 255,
+    255, 255, 255, 63, 63, 255, 170, 255, 255, 255, 63, 255, 255, 255, 255, 255, 255, 223, 95, 220,
+    31, 207, 15, 255, 31, 220, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 128, 0, 0, 255, 31,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 132, 252, 47, 62, 80, 189, 255, 243, 224, 67, 0, 0, 255,
+    255, 255, 255, 255, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 255, 255, 255, 255, 255, 255, 3, 0, 0, 255, 255, 255,
+    255, 255, 127, 255, 255, 255, 255, 255, 127, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 31, 120, 12, 0, 255, 255, 255, 255, 191, 32, 255, 255, 255, 255,
+    255, 255, 255, 128, 0, 0, 255, 255, 127, 0, 127, 127, 127, 127, 127, 127, 127, 127, 255, 255,
+    255, 255, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 224, 0, 0, 0, 254, 3, 62, 31, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    127, 224, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 247, 224, 255, 255, 255, 255,
+    255, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 127, 0, 0, 255, 255, 255, 7, 0, 0,
+    0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 31, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 63, 255, 31, 255,
+    255, 255, 15, 0, 0, 255, 255, 255, 255, 255, 127, 240, 143, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 128, 255, 252, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 249, 255, 255, 255, 255, 255, 255, 124, 0, 0, 0, 0, 0, 128, 255,
+    191, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 255, 15, 0, 255, 255, 255, 255, 255,
+    255, 255, 255, 47, 0, 255, 3, 0, 0, 252, 232, 255, 255, 255, 255, 255, 7, 255, 255, 255, 255,
+    7, 0, 255, 255, 255, 31, 255, 255, 255, 255, 255, 255, 247, 255, 0, 128, 255, 3, 255, 255, 255,
+    127, 255, 255, 255, 255, 255, 255, 127, 0, 255, 63, 255, 3, 255, 255, 127, 252, 255, 255, 255,
+    255, 255, 255, 255, 127, 5, 0, 0, 56, 255, 255, 60, 0, 126, 126, 126, 0, 127, 127, 255, 255,
+    255, 255, 255, 247, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 7, 255, 3, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 15, 0, 255, 255, 127, 248, 255, 255, 255, 255, 255, 15, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 63, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 3, 0, 0, 0, 0, 127, 0, 248, 224, 255, 253, 127, 95, 219, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 3, 0, 0, 0, 248, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 63, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 252,
+    255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 255, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    223, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 31, 0, 0,
+    255, 3, 254, 255, 255, 7, 254, 255, 255, 7, 192, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 127, 252, 252, 252, 28, 0, 0, 0, 0, 255, 239, 255, 255, 127, 255, 255, 183, 255, 63, 255,
+    63, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 7,
+    0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 31, 255, 255,
+    255, 255, 255, 255, 1, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 224, 255, 255, 255, 7, 255, 255,
+    255, 255, 255, 7, 255, 255, 255, 63, 255, 255, 255, 255, 15, 255, 62, 0, 0, 0, 0, 0, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 63, 255,
+    3, 255, 255, 255, 255, 15, 255, 255, 255, 255, 15, 255, 255, 255, 255, 255, 0, 255, 255, 255,
+    255, 255, 255, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255,
+    255, 255, 127, 0, 255, 255, 63, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 63, 253, 255, 255, 255, 255, 191, 145, 255, 255, 63, 0, 255, 255, 127, 0, 255, 255, 255,
+    127, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 55, 0, 255, 255, 63, 0, 255, 255, 255, 3, 0, 0, 0, 0, 0,
+    0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 192, 0, 0, 0, 0, 0, 0, 0, 0, 111, 240, 239, 254,
+    255, 255, 63, 0, 0, 0, 0, 0, 255, 255, 255, 31, 255, 255, 255, 31, 0, 0, 0, 0, 255, 254, 255,
+    255, 31, 0, 0, 0, 255, 255, 255, 255, 255, 255, 63, 0, 255, 255, 63, 0, 255, 255, 7, 0, 255,
+    255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 1,
+    0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 7, 0, 255, 255, 255, 255, 255, 255, 7, 0, 255,
+    255, 255, 255, 255, 0, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 255, 255, 255, 31, 128, 0, 255, 255, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 255, 255, 127, 0, 255, 255, 255, 255, 255, 255, 255, 255, 63, 0, 0, 0, 192, 255, 0,
+    0, 252, 255, 255, 255, 255, 255, 255, 1, 0, 0, 255, 255, 255, 1, 255, 3, 255, 255, 255, 255,
+    255, 255, 199, 255, 112, 0, 255, 255, 255, 255, 71, 0, 255, 255, 255, 255, 255, 255, 255, 255,
+    30, 0, 255, 23, 0, 0, 0, 0, 255, 255, 251, 255, 255, 255, 159, 64, 0, 0, 0, 0, 0, 0, 0, 0, 127,
+    189, 255, 191, 255, 1, 255, 255, 255, 255, 255, 255, 255, 1, 255, 3, 239, 159, 249, 255, 255,
+    253, 237, 227, 159, 25, 129, 224, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    255, 255, 255, 255, 255, 255, 255, 255, 187, 7, 255, 131, 0, 0, 0, 0, 255, 255, 255, 255, 255,
+    255, 255, 255, 179, 0, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
+    255, 255, 255, 255, 255, 63, 127, 0, 0, 0, 63, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255,
+    127, 17, 0, 255, 3, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 63, 1, 255, 3, 0, 0, 0, 0, 0, 0,
+    255, 255, 255, 231, 255, 7, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 3, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 255, 252, 255, 255, 255, 255, 255, 252, 26, 0, 0, 0, 255, 255, 255, 255, 255, 255,
+    231, 127, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 32, 0, 0, 0, 0, 255, 255, 255,
+    255, 255, 255, 255, 1, 255, 253, 255, 255, 255, 255, 127, 127, 1, 0, 255, 3, 0, 0, 252, 255,
+    255, 255, 252, 255, 255, 254, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 251, 255, 255, 255, 255,
+    127, 180, 203, 0, 255, 3, 191, 253, 255, 255, 255, 127, 123, 1, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
+    255, 127, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 127, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 127,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255,
+    255, 255, 1, 255, 255, 255, 127, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 63,
+    0, 0, 255, 255, 255, 255, 255, 255, 0, 0, 15, 0, 255, 3, 248, 255, 255, 224, 255, 255, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255,
+    255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 135, 255, 255, 255, 255, 255, 255, 255, 128, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0,
+    0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 7, 0, 255, 255, 255, 127, 0, 0, 0, 0, 0, 0, 7, 0, 240, 0, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 15, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 7, 255, 31, 255, 1, 255, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 223, 255, 255, 255, 255, 255, 255, 255, 255, 223,
+    100, 222, 255, 235, 239, 255, 255, 255, 255, 255, 255, 255, 191, 231, 223, 223, 255, 255, 255,
+    123, 95, 252, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 63, 255, 255, 255, 253, 255, 255, 247, 255, 255, 255, 247,
+    255, 255, 223, 255, 255, 255, 223, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 253, 255,
+    255, 255, 253, 255, 255, 247, 207, 255, 255, 255, 255, 255, 255, 127, 255, 255, 249, 219, 7, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255,
+    255, 31, 128, 63, 255, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255,
+    15, 255, 3, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 31, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255,
+    255, 255, 143, 8, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 255,
+    255, 255, 150, 254, 247, 10, 132, 234, 150, 170, 150, 247, 247, 94, 255, 251, 255, 15, 238,
+    251, 255, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 3, 255, 255, 255, 3,
+    255, 255, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+];
diff --git a/recipes/core/relibc/src/header/wctype/casecmp.rs b/recipes/core/relibc/src/header/wctype/casecmp.rs
new file mode 100644
index 0000000000..4c25080911
--- /dev/null
+++ b/recipes/core/relibc/src/header/wctype/casecmp.rs
@@ -0,0 +1,414 @@
+// From musl src/ctype/casemap.h
+// Licensed under the MIT license
+// Copyright 2005-2020 Rich Felker, et al.
+
+use crate::platform::types::{c_int, c_uchar, c_uint, wint_t};
+
+const tab: [c_uchar; 2666] = [
+    7, 8, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 13, 6, 6, 14, 6, 6, 6, 6, 6, 6, 6, 6, 15,
+    16, 17, 18, 6, 19, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 20, 21, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 22, 23, 6, 6, 6, 24, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 25, 6, 6, 6, 6, 26, 6, 6, 6, 6, 6, 6, 6, 27, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    28, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 29, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 30, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 43, 43, 43,
+    43, 43, 43, 43, 43, 1, 0, 84, 86, 86, 86, 86, 86, 86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 43, 43, 43, 43, 43, 43, 43, 7, 43, 43, 91, 86, 86, 86, 86,
+    86, 86, 86, 74, 86, 86, 5, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 36,
+    80, 121, 49, 80, 49, 80, 49, 56, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80,
+    78, 49, 2, 78, 13, 13, 78, 3, 78, 0, 36, 110, 0, 78, 49, 38, 110, 81, 78, 36, 80, 78, 57, 20,
+    129, 27, 29, 29, 83, 49, 80, 49, 80, 13, 49, 80, 49, 80, 49, 80, 27, 83, 36, 80, 49, 2, 92,
+    123, 92, 123, 92, 123, 92, 123, 92, 123, 20, 121, 92, 123, 92, 123, 92, 45, 43, 73, 3, 72, 3,
+    120, 92, 123, 20, 0, 150, 10, 1, 43, 40, 6, 6, 0, 42, 6, 42, 42, 43, 7, 187, 181, 43, 30, 0,
+    43, 7, 43, 43, 43, 1, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 1, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 205, 70, 205, 43, 0, 37, 43, 7, 1, 6, 1, 85, 86, 86, 86, 86, 86, 85, 86, 86, 2,
+    36, 129, 129, 129, 129, 129, 21, 129, 129, 129, 0, 0, 43, 0, 178, 209, 178, 209, 178, 209, 178,
+    209, 0, 0, 205, 204, 1, 0, 215, 215, 215, 215, 215, 131, 129, 129, 129, 129, 129, 129, 129,
+    129, 129, 129, 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, 28, 0, 0, 0, 0, 0, 49, 80, 49,
+    80, 49, 80, 49, 80, 49, 80, 49, 2, 0, 0, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49,
+    80, 49, 80, 49, 80, 78, 49, 80, 49, 80, 78, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49,
+    80, 49, 2, 135, 166, 135, 166, 135, 166, 135, 166, 135, 166, 135, 166, 135, 166, 135, 166, 42,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 0, 0, 0, 84, 86, 86, 86, 86, 86, 86, 86, 86,
+    86, 86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 84, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 12, 0, 12, 42, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 42, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 86, 86, 108, 129, 21, 0, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 7, 108, 3, 65, 43, 43, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+    86, 86, 86, 86, 44, 86, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 108, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 37, 6,
+    37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37,
+    6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 86, 122, 158, 38, 6, 37,
+    6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6,
+    37, 6, 1, 43, 43, 79, 86, 86, 44, 43, 127, 86, 86, 57, 43, 43, 85, 86, 86, 43, 43, 79, 86, 86,
+    44, 43, 127, 86, 86, 129, 55, 117, 91, 123, 92, 43, 43, 79, 86, 86, 2, 172, 4, 0, 0, 57, 43,
+    43, 85, 86, 86, 43, 43, 79, 86, 86, 44, 43, 43, 86, 86, 50, 19, 129, 87, 0, 111, 129, 126, 201,
+    215, 126, 45, 129, 129, 14, 126, 57, 127, 111, 87, 0, 129, 129, 126, 21, 0, 126, 3, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 43, 36, 43, 151, 43, 43, 43, 43, 43, 43, 43, 43, 43, 42,
+    43, 43, 43, 43, 43, 86, 86, 86, 86, 86, 128, 129, 129, 129, 129, 57, 187, 42, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 1, 129, 129, 129, 129, 129, 129, 129, 129, 129,
+    129, 129, 129, 129, 129, 129, 201, 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
+    172, 172, 172, 208, 13, 0, 78, 49, 2, 180, 193, 193, 215, 215, 36, 80, 49, 80, 49, 80, 49, 80,
+    49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80,
+    49, 80, 215, 215, 83, 193, 71, 212, 215, 215, 215, 5, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 7, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 78, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 13, 0, 0, 0, 0, 0, 36, 80,
+    49, 80, 49, 80, 49, 80, 49, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 121, 92,
+    123, 92, 123, 79, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123,
+    92, 123, 92, 45, 43, 43, 121, 20, 92, 123, 92, 45, 121, 42, 92, 39, 92, 123, 92, 123, 92, 123,
+    164, 0, 10, 180, 92, 123, 92, 123, 79, 3, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 7,
+    0, 72, 86, 86, 86, 86, 86, 86, 86, 86, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 85, 86, 86, 86, 86, 86, 86,
+    86, 86, 86, 86, 86, 86, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 0, 86, 86, 86,
+    86, 86, 86, 86, 86, 86, 86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 0, 0, 0, 0, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+    86, 86, 86, 86, 86, 86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+    86, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+    14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 85, 86, 86,
+    86, 86, 86, 86, 86, 86, 86, 86, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+];
+
+const rules: [c_int; 240] = [
+    0x0, 0x2001, -0x2000, 0x1dbf00, 0x2e700, 0x7900, 0x2402, 0x101, -0x100, 0x0, 0x201, -0x200,
+    -0xc6ff, -0xe800, -0x78ff, -0x12c00, 0xc300, 0xd201, 0xce01, 0xcd01, 0x4f01, 0xca01, 0xcb01,
+    0xcf01, 0x6100, 0xd301, 0xd101, 0xa300, 0xd501, 0x8200, 0xd601, 0xda01, 0xd901, 0xdb01, 0x3800,
+    0x3, -0x4f00, -0x60ff, -0x37ff, 0x242802, 0x0, 0x101, -0x100, -0xcd00, -0xda00, -0x81ff,
+    0x2a2b01, -0xa2ff, 0x2a2801, 0x2a3f00, -0xc2ff, 0x4501, 0x4701, 0x2a1f00, 0x2a1c00, 0x2a1e00,
+    -0xd200, -0xce00, -0xca00, -0xcb00, 0xa54f00, 0xa54b00, -0xcf00, 0xa52800, 0xa54400, -0xd100,
+    -0xd300, 0x29f700, 0xa54100, 0x29fd00, -0xd500, -0xd600, 0x29e700, 0xa54300, 0xa52a00, -0x4500,
+    -0xd900, -0x4700, -0xdb00, 0xa51500, 0xa51200, 0x4c2402, 0x0, 0x2001, -0x2000, 0x101, -0x100,
+    0x5400, 0x7401, 0x2601, 0x2501, 0x4001, 0x3f01, -0x2600, -0x2500, -0x1f00, -0x4000, -0x3f00,
+    0x801, -0x3e00, -0x3900, -0x2f00, -0x3600, -0x800, -0x5600, -0x5000, 0x700, -0x7400, -0x3bff,
+    -0x6000, -0x6ff, 0x701a02, 0x101, -0x100, 0x2001, -0x2000, 0x5001, 0xf01, -0xf00, 0x0, 0x3001,
+    -0x3000, 0x101, -0x100, 0x0, 0xbc000, 0x1c6001, 0x0, 0x97d001, 0x801, -0x800, 0x8a0502, 0x0,
+    -0xbbfff, -0x186200, 0x89c200, -0x182500, -0x186e00, -0x186d00, -0x186400, -0x186300,
+    -0x185c00, 0x0, 0x8a3800, 0x8a0400, 0xee600, 0x101, -0x100, 0x0, -0x3b00, -0x1dbeff, 0x8f1d02,
+    0x800, -0x7ff, 0x0, 0x5600, -0x55ff, 0x4a00, 0x6400, 0x8000, 0x7000, 0x7e00, 0x900, -0x49ff,
+    -0x8ff, -0x1c2500, -0x63ff, -0x6fff, -0x7fff, -0x7dff, 0xac0502, 0x0, 0x1001, -0x1000, 0x1c01,
+    0x101, -0x1d5cff, -0x20beff, -0x2045ff, -0x1c00, 0xb10b02, 0x101, -0x100, 0x3001, -0x3000, 0x0,
+    -0x29f6ff, -0xee5ff, -0x29e6ff, -0x2a2b00, -0x2a2800, -0x2a1bff, -0x29fcff, -0x2a1eff,
+    -0x2a1dff, -0x2a3eff, 0x0, -0x1c6000, 0x0, 0x101, -0x100, 0xbc0c02, 0x0, 0x101, -0x100,
+    -0xa543ff, 0x3a001, -0x8a03ff, -0xa527ff, 0x3000, -0xa54eff, -0xa54aff, -0xa540ff, -0xa511ff,
+    -0xa529ff, -0xa514ff, -0x2fff, -0xa542ff, -0x8a37ff, 0x0, -0x97d000, -0x3a000, 0x0, 0x2001,
+    -0x2000, 0x0, 0x2801, -0x2800, 0x0, 0x4001, -0x4000, 0x0, 0x2001, -0x2000, 0x0, 0x2001,
+    -0x2000, 0x0, 0x2201, -0x2200,
+];
+
+const rulebases: [c_uchar; 512] = [
+    0, 6, 39, 81, 111, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, 0, 0, 127, 0, 0, 0, 0, 0, 0, 0, 0,
+    131, 142, 146, 151, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, 196, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 198, 201, 0, 0, 0, 219, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 0, 0, 0, 0, 225, 0, 0, 0, 0, 0, 0, 0, 228, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 231, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 234, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 237, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+];
+
+const exceptions: [[c_uchar; 2]; 200] = [
+    [48, 12],
+    [49, 13],
+    [120, 14],
+    [127, 15],
+    [128, 16],
+    [129, 17],
+    [134, 18],
+    [137, 19],
+    [138, 19],
+    [142, 20],
+    [143, 21],
+    [144, 22],
+    [147, 19],
+    [148, 23],
+    [149, 24],
+    [150, 25],
+    [151, 26],
+    [154, 27],
+    [156, 25],
+    [157, 28],
+    [158, 29],
+    [159, 30],
+    [166, 31],
+    [169, 31],
+    [174, 31],
+    [177, 32],
+    [178, 32],
+    [183, 33],
+    [191, 34],
+    [197, 35],
+    [200, 35],
+    [203, 35],
+    [221, 36],
+    [242, 35],
+    [246, 37],
+    [247, 38],
+    [32, 45],
+    [58, 46],
+    [61, 47],
+    [62, 48],
+    [63, 49],
+    [64, 49],
+    [67, 50],
+    [68, 51],
+    [69, 52],
+    [80, 53],
+    [81, 54],
+    [82, 55],
+    [83, 56],
+    [84, 57],
+    [89, 58],
+    [91, 59],
+    [92, 60],
+    [97, 61],
+    [99, 62],
+    [101, 63],
+    [102, 64],
+    [104, 65],
+    [105, 66],
+    [106, 64],
+    [107, 67],
+    [108, 68],
+    [111, 66],
+    [113, 69],
+    [114, 70],
+    [117, 71],
+    [125, 72],
+    [130, 73],
+    [135, 74],
+    [137, 75],
+    [138, 76],
+    [139, 76],
+    [140, 77],
+    [146, 78],
+    [157, 79],
+    [158, 80],
+    [69, 87],
+    [123, 29],
+    [124, 29],
+    [125, 29],
+    [127, 88],
+    [134, 89],
+    [136, 90],
+    [137, 90],
+    [138, 90],
+    [140, 91],
+    [142, 92],
+    [143, 92],
+    [172, 93],
+    [173, 94],
+    [174, 94],
+    [175, 94],
+    [194, 95],
+    [204, 96],
+    [205, 97],
+    [206, 97],
+    [207, 98],
+    [208, 99],
+    [209, 100],
+    [213, 101],
+    [214, 102],
+    [215, 103],
+    [240, 104],
+    [241, 105],
+    [242, 106],
+    [243, 107],
+    [244, 108],
+    [245, 109],
+    [249, 110],
+    [253, 45],
+    [254, 45],
+    [255, 45],
+    [80, 105],
+    [81, 105],
+    [82, 105],
+    [83, 105],
+    [84, 105],
+    [85, 105],
+    [86, 105],
+    [87, 105],
+    [88, 105],
+    [89, 105],
+    [90, 105],
+    [91, 105],
+    [92, 105],
+    [93, 105],
+    [94, 105],
+    [95, 105],
+    [130, 0],
+    [131, 0],
+    [132, 0],
+    [133, 0],
+    [134, 0],
+    [135, 0],
+    [136, 0],
+    [137, 0],
+    [192, 117],
+    [207, 118],
+    [128, 137],
+    [129, 138],
+    [130, 139],
+    [133, 140],
+    [134, 141],
+    [112, 157],
+    [113, 157],
+    [118, 158],
+    [119, 158],
+    [120, 159],
+    [121, 159],
+    [122, 160],
+    [123, 160],
+    [124, 161],
+    [125, 161],
+    [179, 162],
+    [186, 163],
+    [187, 163],
+    [188, 164],
+    [190, 165],
+    [195, 162],
+    [204, 164],
+    [218, 166],
+    [219, 166],
+    [229, 106],
+    [234, 167],
+    [235, 167],
+    [236, 110],
+    [243, 162],
+    [248, 168],
+    [249, 168],
+    [250, 169],
+    [251, 169],
+    [252, 164],
+    [38, 176],
+    [42, 177],
+    [43, 178],
+    [78, 179],
+    [132, 8],
+    [98, 186],
+    [99, 187],
+    [100, 188],
+    [101, 189],
+    [102, 190],
+    [109, 191],
+    [110, 192],
+    [111, 193],
+    [112, 194],
+    [126, 195],
+    [127, 195],
+    [125, 207],
+    [141, 208],
+    [148, 209],
+    [171, 210],
+    [172, 211],
+    [173, 212],
+    [176, 213],
+    [177, 214],
+    [178, 215],
+    [196, 216],
+    [197, 217],
+    [198, 218],
+];
+
+pub fn casemap(mut c: u32, dir: i32) -> wint_t {
+    if c >= 0x20000 {
+        return c;
+    }
+    let c0 = c;
+    let b = c >> 8;
+    c &= 255;
+    let x = c / 3;
+    let y = c % 3;
+    /* lookup entry in two-level base-6 table */
+    let mut v: c_uint = c_uint::from(tab[(u32::from(tab[b as usize]) * 86 + x) as usize]);
+    let mt: [c_uint; 3] = [2048, 342, 57];
+    v = ((v * mt[y as usize]) >> 11) % 6;
+
+    /* use the bit vector out of the tables as an index into
+     * a block-specific set of rules and decode the rule into
+     * a type and a case-mapping delta. */
+    let mut r: c_int = rules[(c_uint::from(rulebases[b as usize]) + v) as usize];
+    let mut rt: c_uint = (r & 255) as c_uint;
+    let mut rd: c_int = r >> 8;
+
+    /* rules 0/1 are simple lower/upper case with a delta.
+     * apply according to desired mapping direction. */
+    if rt < 2 {
+        let tmp = -((rt ^ dir as c_uint) as c_int) as c_uint;
+        return c0.wrapping_add(rd as c_uint & tmp);
+    }
+
+    /* binary search. endpoints of the binary search for
+     * this block are stored in the rule delta field. */
+    let mut xn: c_uint = (rd & 0xff) as c_uint;
+    let mut xb: c_uint = rd as c_uint >> 8;
+    while xn != 0 {
+        let attempt: c_uint = c_uint::from(exceptions[(xb + xn / 2) as usize][0]);
+        if attempt == c {
+            r = rules[exceptions[(xb + xn / 2) as usize][1] as usize];
+            rt = r as c_uint & 255;
+            rd = r >> 8;
+            if rt < 2 {
+                let tmp = -((rt ^ dir as c_uint) as c_int) as c_uint;
+                return c0.wrapping_add(rd as c_uint & tmp);
+            }
+            /* Hard-coded for the four exceptional titlecase */
+            if dir == 0 {
+                return c0 + 1;
+            } else {
+                return c0 - 1;
+            }
+        } else if attempt > c {
+            xn /= 2;
+        } else {
+            xb += xn / 2;
+            xn -= xn / 2;
+        }
+    }
+    c0
+}
diff --git a/recipes/core/relibc/src/header/wctype/cbindgen.toml b/recipes/core/relibc/src/header/wctype/cbindgen.toml
new file mode 100644
index 0000000000..bd9cdd85a4
--- /dev/null
+++ b/recipes/core/relibc/src/header/wctype/cbindgen.toml
@@ -0,0 +1,9 @@
+sys_includes = ["wchar.h" ]
+include_guard = "_RELIBC_WCTYPE_H"
+language = "C"
+style = "Type"
+no_includes = true
+cpp_compat = true
+
+[enum]
+prefix_with_name = true
diff --git a/recipes/core/relibc/src/header/wctype/mod.rs b/recipes/core/relibc/src/header/wctype/mod.rs
new file mode 100644
index 0000000000..f9aac7454b
--- /dev/null
+++ b/recipes/core/relibc/src/header/wctype/mod.rs
@@ -0,0 +1,232 @@
+//! `wctype.h` implementation.
+//!
+//! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/wctype.h.html>.
+
+// TODO: *_l functions
+
+use self::casecmp::casemap;
+use crate::{
+    c_str::CStr,
+    header::ctype,
+    platform::types::{c_char, c_int, wint_t},
+};
+
+mod alpha;
+mod casecmp;
+mod punct;
+
+pub type wctype_t = u32;
+pub type wctrans_t = *const i32;
+
+pub const WEOF: wint_t = 0xFFFF_FFFFu32;
+
+pub const WCTYPE_ALNUM: wctype_t = 1;
+pub const WCTYPE_ALPHA: wctype_t = 2;
+pub const WCTYPE_BLANK: wctype_t = 3;
+pub const WCTYPE_CNTRL: wctype_t = 4;
+pub const WCTYPE_DIGIT: wctype_t = 5;
+pub const WCTYPE_GRAPH: wctype_t = 6;
+pub const WCTYPE_LOWER: wctype_t = 7;
+pub const WCTYPE_PRINT: wctype_t = 8;
+pub const WCTYPE_PUNCT: wctype_t = 9;
+pub const WCTYPE_SPACE: wctype_t = 10;
+pub const WCTYPE_UPPER: wctype_t = 11;
+pub const WCTYPE_XDIGIT: wctype_t = 12;
+
+const WCTRANSUP: wctrans_t = 1 as wctrans_t;
+const WCTRANSLW: wctrans_t = 2 as wctrans_t;
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswalnum.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswalnum(wc: wint_t) -> c_int {
+    c_int::from(iswdigit(wc) != 0 || iswalpha(wc) != 0)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswalpha.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswalpha(wc: wint_t) -> c_int {
+    c_int::from(alpha::is(wc as usize))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswblank.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswblank(wc: wint_t) -> c_int {
+    ctype::isblank(wc as c_int)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswcntrl.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswcntrl(wc: wint_t) -> c_int {
+    c_int::from(
+        wc < 32
+            || wc.wrapping_sub(0x7f) < 33
+            || wc.wrapping_sub(0x2028) < 2
+            || wc.wrapping_sub(0xfff9) < 3,
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswctype.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswctype(wc: wint_t, desc: wctype_t) -> c_int {
+    match desc {
+        WCTYPE_ALNUM => iswalnum(wc),
+        WCTYPE_ALPHA => iswalpha(wc),
+        WCTYPE_BLANK => iswblank(wc),
+        WCTYPE_CNTRL => iswcntrl(wc),
+        WCTYPE_DIGIT => iswdigit(wc),
+        WCTYPE_GRAPH => iswgraph(wc),
+        WCTYPE_LOWER => iswlower(wc),
+        WCTYPE_PRINT => iswprint(wc),
+        WCTYPE_PUNCT => iswpunct(wc),
+        WCTYPE_SPACE => iswspace(wc),
+        WCTYPE_UPPER => iswupper(wc),
+        WCTYPE_XDIGIT => iswxdigit(wc),
+        _ => 0,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswdigit.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswdigit(wc: wint_t) -> c_int {
+    c_int::from(wc.wrapping_sub('0' as wint_t) < 10)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswgraph.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswgraph(wc: wint_t) -> c_int {
+    c_int::from(iswspace(wc) == 0 && iswprint(wc) != 0)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswlower.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswlower(wc: wint_t) -> c_int {
+    c_int::from(towupper(wc) != wc)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswprint.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswprint(wc: wint_t) -> c_int {
+    if wc < 0xff {
+        c_int::from(((wc + 1) & 0x7f) >= 0x21)
+    } else if wc < 0x2028
+        || wc.wrapping_sub(0x202a) < 0xd800 - 0x202a
+        || wc.wrapping_sub(0xe000) < 0xfff9 - 0xe000
+    {
+        1
+    } else if wc.wrapping_sub(0xfffc) > 0x10ffff - 0xfffc || (wc & 0xfffe) == 0xfffe {
+        0
+    } else {
+        1
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswpunct.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswpunct(wc: wint_t) -> c_int {
+    c_int::from(punct::is(wc as usize))
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswspace.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswspace(wc: wint_t) -> c_int {
+    c_int::from(
+        [
+            ' ' as wint_t,
+            '\t' as wint_t,
+            '\n' as wint_t,
+            '\r' as wint_t,
+            11,
+            12,
+            0x0085,
+            0x2000,
+            0x2001,
+            0x2002,
+            0x2003,
+            0x2004,
+            0x2005,
+            0x2006,
+            0x2008,
+            0x2009,
+            0x200a,
+            0x2028,
+            0x2029,
+            0x205f,
+            0x3000,
+        ]
+        .contains(&wc),
+    )
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswupper.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswupper(wc: wint_t) -> c_int {
+    c_int::from(towlower(wc) != wc)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/iswxdigit.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn iswxdigit(wc: wint_t) -> c_int {
+    c_int::from(wc.wrapping_sub('0' as wint_t) < 10 || (wc | 32).wrapping_sub('a' as wint_t) < 6)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/towctrans.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn towctrans(wc: wint_t, trans: wctrans_t) -> wint_t {
+    match trans {
+        WCTRANSUP => towupper(wc),
+        WCTRANSLW => towlower(wc),
+        _ => wc,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/towlower.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn towlower(wc: wint_t) -> wint_t {
+    casemap(wc, 0)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/towupper.html>.
+#[unsafe(no_mangle)]
+pub extern "C" fn towupper(wc: wint_t) -> wint_t {
+    casemap(wc, 1)
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wctrans.html>.
+///
+/// # Safety
+/// The caller must ensure that `class` is convertible to a slice reference, up
+/// to and including a terminating nul.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wctrans(class: *const c_char) -> wctrans_t {
+    let class_cstr = unsafe { CStr::from_ptr(class) };
+    match class_cstr.to_bytes() {
+        b"toupper" => WCTRANSUP,
+        b"tolower" => WCTRANSLW,
+        _ => 0 as wctrans_t,
+    }
+}
+
+/// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/wctype.html>.
+///
+/// # Safety
+/// The caller must ensure that `name` is convertible to a slice reference, up
+/// to and including a terminating nul.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn wctype(name: *const c_char) -> wctype_t {
+    let name_cstr = unsafe { CStr::from_ptr(name) };
+    match name_cstr.to_bytes() {
+        b"alnum" => WCTYPE_ALNUM,
+        b"alpha" => WCTYPE_ALPHA,
+        b"blank" => WCTYPE_BLANK,
+        b"cntrl" => WCTYPE_CNTRL,
+        b"digit" => WCTYPE_DIGIT,
+        b"graph" => WCTYPE_GRAPH,
+        b"lower" => WCTYPE_LOWER,
+        b"print" => WCTYPE_PRINT,
+        b"punct" => WCTYPE_PUNCT,
+        b"space" => WCTYPE_SPACE,
+        b"upper" => WCTYPE_UPPER,
+        b"xdigit" => WCTYPE_XDIGIT,
+        _ => 0,
+    }
+}
diff --git a/recipes/core/relibc/src/header/wctype/punct.rs b/recipes/core/relibc/src/header/wctype/punct.rs
new file mode 100644
index 0000000000..2bfb1fc65a
--- /dev/null
+++ b/recipes/core/relibc/src/header/wctype/punct.rs
@@ -0,0 +1,166 @@
+// From musl src/ctype/punct.h
+// Licensed under the MIT license
+// Copyright 2005-2020 Rich Felker, et al.
+
+use crate::platform::types::c_uchar;
+
+pub fn is(wc: usize) -> c_uchar {
+    if wc < 0x20000 {
+        return (table[(table[wc >> 8] as usize) * 32 + ((wc & 255) >> 3)] >> (wc & 7)) & 1;
+    }
+    0
+}
+
+const table: [c_uchar; 4000] = [
+    18, 16, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 16, 16, 34, 35, 16, 36, 37,
+    38, 39, 40, 41, 42, 43, 16, 44, 45, 46, 17, 17, 47, 17, 17, 17, 17, 17, 17, 48, 49, 50, 51, 52,
+    53, 54, 55, 17, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 56, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 57, 16, 58, 59,
+    60, 61, 62, 63, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 64, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 65, 16, 16, 66, 16, 67, 68, 69, 16, 70, 71, 72, 16, 73, 16, 16,
+    74, 75, 76, 77, 78, 16, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 16, 92, 93, 94, 95,
+    16, 16, 16, 16, 96, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 97, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 98, 99, 16, 16, 100, 101, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 102, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 103, 104, 105, 106, 16, 16, 107, 108, 17, 17, 109, 16,
+    16, 16, 16, 16, 16, 110, 111, 16, 16, 16, 16, 16, 112, 113, 16, 16, 114, 115, 116, 16, 117,
+    118, 119, 17, 17, 17, 120, 121, 122, 123, 124, 16, 16, 16, 16, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 254, 255, 0, 252, 1, 0, 0, 248, 1, 0, 0,
+    120, 0, 0, 0, 0, 255, 251, 223, 251, 0, 0, 128, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, 252, 255, 224, 175, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 223, 255, 255, 255, 255, 255, 32, 64, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 3, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 0, 0, 0, 0, 0, 230, 254, 255, 255,
+    255, 0, 64, 73, 0, 0, 0, 0, 0, 24, 0, 255, 255, 0, 216, 0, 0, 0, 0, 0, 0, 0, 1, 0, 60, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 224, 1, 30, 0, 96, 255, 191, 0, 0, 0, 0, 0, 0, 255, 7, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 207, 227, 0, 0, 0, 3, 0, 32, 255, 127, 0,
+    0, 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 7, 252, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    16, 0, 32, 30, 0, 48, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 32, 0, 0, 0, 0, 252, 111, 0, 0, 0,
+    0, 0, 0, 0, 16, 0, 32, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 32, 0, 0, 0, 0, 3, 224,
+    0, 0, 0, 0, 0, 0, 0, 16, 0, 32, 0, 0, 0, 0, 253, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0,
+    255, 7, 16, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 128, 255, 16, 0, 0, 0, 0, 0, 0, 16, 0, 32,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 160, 0, 127, 0, 0, 255, 3, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 4, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 128, 0, 128, 192, 223, 0, 12, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 4, 0, 31, 0, 0, 0, 0, 0, 0, 254, 255, 255, 255, 0, 252, 255, 255, 0, 0, 0, 0, 0, 0,
+    0, 0, 252, 0, 0, 0, 0, 0, 0, 192, 255, 223, 255, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 6, 0,
+    252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 224, 255, 255, 255, 31, 0, 0, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, 0, 0, 1, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0,
+    16, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 254, 127, 47, 0, 0,
+    255, 3, 255, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    196, 255, 255, 255, 255, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 224, 159, 0, 0, 0, 0, 127,
+    63, 255, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 16, 0, 0, 252, 255, 255, 255,
+    31, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 64, 0, 12, 240, 0, 0, 0, 0, 0, 0, 128, 248, 0, 0, 0,
+    0, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 255, 255, 255, 33, 144, 3, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 127, 0, 224, 251, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 160, 3, 224, 0, 224, 0, 224,
+    0, 96, 128, 248, 255, 255, 255, 252, 255, 255, 255, 255, 255, 127, 223, 255, 241, 127, 255,
+    127, 0, 0, 255, 255, 255, 255, 0, 0, 255, 255, 255, 255, 1, 0, 123, 3, 208, 193, 175, 66, 0,
+    12, 31, 188, 255, 255, 0, 0, 0, 0, 0, 14, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 127, 0, 0, 0, 255, 7, 0, 0, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 63, 0, 0, 0, 0, 0, 0, 252, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 207, 255, 255, 255, 63, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 224, 135, 3, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 128, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 127, 255, 255, 255, 255,
+    0, 0, 0, 0, 0, 0, 255, 255, 255, 251, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 15, 0,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 63, 0, 0, 0, 255, 15, 30, 255, 255, 255, 1, 252, 193, 224,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 15, 0, 0, 0, 255,
+    255, 255, 127, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 127, 0, 0, 0, 0, 0, 0, 192,
+    0, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 15, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 255, 0, 255, 255, 127, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 15, 255, 3, 0, 0, 0, 0, 0, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    16, 192, 0, 0, 255, 255, 3, 23, 0, 0, 0, 0, 0, 248, 0, 0, 0, 0, 8, 128, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 8, 0, 255, 63, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 0, 0, 128, 3, 0,
+    0, 0, 0, 0, 0, 0, 128, 2, 0, 0, 192, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 255, 255, 255, 3, 255, 255,
+    255, 255, 255, 255, 247, 255, 127, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128,
+    254, 255, 0, 252, 1, 0, 0, 248, 1, 0, 0, 248, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    127, 127, 0, 48, 135, 255, 255, 255, 255, 255, 143, 255, 0, 0, 0, 0, 0, 0, 224, 255, 255, 127,
+    255, 15, 1, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 15, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 128, 255, 0, 0, 128, 255, 0, 0, 0, 0, 128, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 0, 0,
+    192, 143, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 255, 255, 252, 255,
+    255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 135, 255, 1, 255, 1, 0, 0, 0, 224, 0, 0, 0, 224, 0, 0,
+    0, 0, 0, 1, 0, 0, 96, 248, 127, 0, 0, 0, 0, 0, 0, 0, 0, 254, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0,
+    0, 30, 0, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255,
+    255, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 127, 0, 0, 0, 192, 255,
+    255, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    192, 63, 252, 255, 63, 0, 0, 128, 3, 0, 0, 0, 0, 0, 0, 254, 3, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 24, 0, 15, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 225, 63, 0, 232, 254, 255,
+    31, 0, 0, 0, 0, 0, 0, 0, 96, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
+    6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 32, 0, 0, 192, 31, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 248, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 76,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128,
+    255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 14, 0, 0, 0, 255, 31, 0, 0, 0, 0, 0, 0,
+    0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 128, 255, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 223, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 62, 0, 0,
+    252, 255, 31, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 1, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 3, 128, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 255, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63,
+    0, 0, 0, 0, 0, 0, 0, 255, 255, 48, 0, 0, 248, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 7, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 15, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 63, 0, 255, 255,
+    255, 255, 127, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 1, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 63, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 15, 0, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 127, 0, 255, 255, 255, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 8, 0, 0, 0,
+    8, 0, 0, 32, 0, 0, 0, 32, 0, 0, 128, 0, 0, 0, 128, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 8, 0, 0, 0, 0,
+    0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    15, 0, 248, 254, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 0, 0, 128, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    112, 7, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 254, 255, 255, 255, 255, 255, 255, 255, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    254, 255, 255, 255, 255, 255, 255, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 3, 0, 255, 255, 255, 255, 255, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 15, 0, 255, 127, 254, 255, 254, 255, 254, 255, 255, 255, 63, 0, 255, 31, 255, 255,
+    255, 255, 0, 0, 0, 252, 0, 0, 0, 28, 0, 0, 0, 252, 255, 255, 255, 31, 0, 0, 0, 0, 0, 0, 192,
+    255, 255, 255, 7, 0, 255, 255, 255, 255, 255, 15, 255, 1, 3, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 63, 0, 255, 31, 255, 7, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 15, 0, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 1, 255, 15, 0, 0, 255, 15, 255, 255, 255, 255, 255, 255,
+    255, 0, 255, 3, 255, 255, 255, 255, 255, 0, 255, 255, 255, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    255, 239, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 123, 252, 255, 255, 255,
+    255, 231, 199, 255, 255, 255, 231, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 15, 0, 255, 63, 15, 7, 7, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+];
diff --git a/recipes/core/relibc/src/io/buffered.rs b/recipes/core/relibc/src/io/buffered.rs
new file mode 100644
index 0000000000..a25273185c
--- /dev/null
+++ b/recipes/core/relibc/src/io/buffered.rs
@@ -0,0 +1,1123 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Buffering wrappers for I/O traits
+
+use core::{cmp, fmt};
+
+use crate::io::{
+    self, DEFAULT_BUF_SIZE, Error, ErrorKind, Initializer, SeekFrom, Write, prelude::*,
+};
+
+/// The `BufReader` struct adds buffering to any reader.
+///
+/// It can be excessively inefficient to work directly with a [`Read`] instance.
+/// For example, every call to [`read`][`TcpStream::read`] on [`TcpStream`]
+/// results in a system call. A `BufReader` performs large, infrequent reads on
+/// the underlying [`Read`] and maintains an in-memory buffer of the results.
+///
+/// `BufReader` can improve the speed of programs that make *small* and
+/// *repeated* read calls to the same file or network socket.  It does not
+/// help when reading very large amounts at once, or reading just one or a few
+/// times.  It also provides no advantage when reading from a source that is
+/// already in memory, like a `Vec<u8>`.
+///
+/// [`Read`]: ../../std/io/trait.Read.html
+/// [`TcpStream::read`]: ../../std/net/struct.TcpStream.html#method.read
+/// [`TcpStream`]: ../../std/net/struct.TcpStream.html
+///
+/// # Examples
+///
+/// ```no_run
+/// use std::io::prelude::*;
+/// use std::io::BufReader;
+/// use std::fs::File;
+///
+/// fn main() -> std::io::Result<()> {
+///     let f = File::open("log.txt")?;
+///     let mut reader = BufReader::new(f);
+///
+///     let mut line = String::new();
+///     let len = reader.read_line(&mut line)?;
+///     println!("First line is {} bytes long", len);
+///     Ok(())
+/// }
+/// ```
+pub struct BufReader<R> {
+    inner: R,
+    buf: Box<[u8]>,
+    pos: usize,
+    cap: usize,
+}
+
+impl<R: Read> BufReader<R> {
+    /// Creates a new `BufReader` with a default buffer capacity. The default is currently 8 KB,
+    /// but may change in the future.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::BufReader;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let f = File::open("log.txt")?;
+    ///     let reader = BufReader::new(f);
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn new(inner: R) -> BufReader<R> {
+        BufReader::with_capacity(DEFAULT_BUF_SIZE, inner)
+    }
+
+    /// Creates a new `BufReader` with the specified buffer capacity.
+    ///
+    /// # Examples
+    ///
+    /// Creating a buffer with ten bytes of capacity:
+    ///
+    /// ```no_run
+    /// use std::io::BufReader;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let f = File::open("log.txt")?;
+    ///     let reader = BufReader::with_capacity(10, f);
+    ///     Ok(())
+    /// }
+    /// ```
+    #[allow(clippy::uninit_vec)] // buffer initialized after set_len
+    pub fn with_capacity(cap: usize, inner: R) -> BufReader<R> {
+        unsafe {
+            let mut buffer = Vec::with_capacity(cap);
+            buffer.set_len(cap);
+            inner.initializer().initialize(&mut buffer);
+            BufReader {
+                inner,
+                buf: buffer.into_boxed_slice(),
+                pos: 0,
+                cap: 0,
+            }
+        }
+    }
+
+    /// Gets a reference to the underlying reader.
+    ///
+    /// It is inadvisable to directly read from the underlying reader.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::BufReader;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let f1 = File::open("log.txt")?;
+    ///     let reader = BufReader::new(f1);
+    ///
+    ///     let f2 = reader.get_ref();
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn get_ref(&self) -> &R {
+        &self.inner
+    }
+}
+
+impl<R: Seek> BufReader<R> {
+    /// Seeks relative to the current position. If the new position lies within the buffer,
+    /// the buffer will not be flushed, allowing for more efficient seeks.
+    /// This method does not return the location of the underlying reader, so the caller
+    /// must track this information themselves if it is required.
+    pub fn seek_relative(&mut self, offset: i64) -> io::Result<()> {
+        let pos = self.pos as u64;
+        if offset < 0 {
+            if let Some(new_pos) = pos.checked_sub((-offset) as u64) {
+                self.pos = new_pos as usize;
+                return Ok(());
+            }
+        } else if let Some(new_pos) = pos.checked_add(offset as u64)
+            && new_pos <= self.cap as u64
+        {
+            self.pos = new_pos as usize;
+            return Ok(());
+        }
+        self.seek(SeekFrom::Current(offset)).map(|_| ())
+    }
+}
+
+impl<R: Read> Read for BufReader<R> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        // If we don't have any buffered data and we're doing a massive read
+        // (larger than our internal buffer), bypass our internal buffer
+        // entirely.
+        if self.pos == self.cap && buf.len() >= self.buf.len() {
+            return self.inner.read(buf);
+        }
+        let nread = {
+            let mut rem = self.fill_buf()?;
+            rem.read(buf)?
+        };
+        self.consume(nread);
+        Ok(nread)
+    }
+
+    // we can't skip unconditionally because of the large buffer case in read.
+    unsafe fn initializer(&self) -> Initializer {
+        unsafe { self.inner.initializer() }
+    }
+}
+
+impl<R: Read> BufRead for BufReader<R> {
+    fn fill_buf(&mut self) -> io::Result<&[u8]> {
+        // If we've reached the end of our internal buffer then we need to fetch
+        // some more data from the underlying reader.
+        // Branch using `>=` instead of the more correct `==`
+        // to tell the compiler that the pos..cap slice is always valid.
+        if self.pos >= self.cap {
+            debug_assert!(self.pos == self.cap);
+            self.cap = self.inner.read(&mut self.buf)?;
+            self.pos = 0;
+        }
+        Ok(&self.buf[self.pos..self.cap])
+    }
+
+    fn consume(&mut self, amt: usize) {
+        self.pos = cmp::min(self.pos + amt, self.cap);
+    }
+}
+
+impl<R: Seek> Seek for BufReader<R> {
+    /// Seek to an offset, in bytes, in the underlying reader.
+    ///
+    /// The position used for seeking with `SeekFrom::Current(_)` is the
+    /// position the underlying reader would be at if the `BufReader` had no
+    /// internal buffer.
+    ///
+    /// Seeking always discards the internal buffer, even if the seek position
+    /// would otherwise fall within it. This guarantees that calling
+    /// `.into_inner()` immediately after a seek yields the underlying reader
+    /// at the same position.
+    ///
+    /// To seek without discarding the internal buffer, use [`seek_relative`](crate::io::BufReader::seek_relative).
+    ///
+    /// See [`std::io::Seek`](https://doc.rust-lang.org/std/io/trait.Seek.html) for more details.
+    ///
+    /// Note: In the edge case where you're seeking with `SeekFrom::Current(n)`
+    /// where `n` minus the internal buffer length overflows an `i64`, two
+    /// seeks will be performed instead of one. If the second seek returns
+    /// `Err`, the underlying reader will be left at the same position it would
+    /// have if you called `seek` with `SeekFrom::Current(0)`.
+    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
+        let result: u64;
+        if let SeekFrom::Current(n) = pos {
+            let remainder = (self.cap - self.pos) as i64;
+            // it should be safe to assume that remainder fits within an i64 as the alternative
+            // means we managed to allocate 8 exbibytes and that's absurd.
+            // But it's not out of the realm of possibility for some weird underlying reader to
+            // support seeking by i64::min_value() so we need to handle underflow when subtracting
+            // remainder.
+            if let Some(offset) = n.checked_sub(remainder) {
+                result = self.inner.seek(SeekFrom::Current(offset))?;
+            } else {
+                // seek backwards by our remainder, and then by the offset
+                self.inner.seek(SeekFrom::Current(-remainder))?;
+                self.pos = self.cap; // empty the buffer
+                result = self.inner.seek(SeekFrom::Current(n))?;
+            }
+        } else {
+            // Seeking with Start/End doesn't care about our buffer length.
+            result = self.inner.seek(pos)?;
+        }
+        self.pos = self.cap; // empty the buffer
+        Ok(result)
+    }
+}
+
+/// Wraps a writer and buffers its output.
+///
+/// It can be excessively inefficient to work directly with something that
+/// implements [`Write`]. For example, every call to
+/// [`write`][`Tcpstream::write`] on [`TcpStream`] results in a system call. A
+/// `BufWriter` keeps an in-memory buffer of data and writes it to an underlying
+/// writer in large, infrequent batches.
+///
+/// `BufWriter` can improve the speed of programs that make *small* and
+/// *repeated* write calls to the same file or network socket.  It does not
+/// help when writing very large amounts at once, or writing just one or a few
+/// times.  It also provides no advantage when writing to a destination that is
+/// in memory, like a `Vec<u8>`.
+///
+/// When the `BufWriter` is dropped, the contents of its buffer will be written
+/// out. However, any errors that happen in the process of flushing the buffer
+/// when the writer is dropped will be ignored. Code that wishes to handle such
+/// errors must manually call [`flush`] before the writer is dropped.
+///
+/// # Examples
+///
+/// Let's write the numbers one through ten to a [`TcpStream`]:
+///
+/// ```no_run
+/// use std::io::prelude::*;
+/// use std::net::TcpStream;
+///
+/// let mut stream = TcpStream::connect("127.0.0.1:34254").unwrap();
+///
+/// for i in 0..10 {
+///     stream.write(&[i+1]).unwrap();
+/// }
+/// ```
+///
+/// Because we're not buffering, we write each one in turn, incurring the
+/// overhead of a system call per byte written. We can fix this with a
+/// `BufWriter`:
+///
+/// ```no_run
+/// use std::io::prelude::*;
+/// use std::io::BufWriter;
+/// use std::net::TcpStream;
+///
+/// let mut stream = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());
+///
+/// for i in 0..10 {
+///     stream.write(&[i+1]).unwrap();
+/// }
+/// ```
+///
+/// By wrapping the stream with a `BufWriter`, these ten writes are all grouped
+/// together by the buffer, and will all be written out in one system call when
+/// the `stream` is dropped.
+///
+/// [`Write`]: ../../std/io/trait.Write.html
+/// [`Tcpstream::write`]: ../../std/net/struct.TcpStream.html#method.write
+/// [`TcpStream`]: ../../std/net/struct.TcpStream.html
+/// [`flush`]: #method.flush
+pub struct BufWriter<W: Write> {
+    inner: Option<W>,
+    pub buf: Vec<u8>,
+    // #30888: If the inner writer panics in a call to write, we don't want to
+    // write the buffered data a second time in BufWriter's destructor. This
+    // flag tells the Drop impl if it should skip the flush.
+    panicked: bool,
+}
+
+/// An error returned by `into_inner` which combines an error that
+/// happened while writing out the buffer, and the buffered writer object
+/// which may be used to recover from the condition.
+///
+/// # Examples
+///
+/// ```no_run
+/// use std::io::BufWriter;
+/// use std::net::TcpStream;
+///
+/// let mut stream = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());
+///
+/// // do stuff with the stream
+///
+/// // we want to get our `TcpStream` back, so let's try:
+///
+/// let stream = match stream.into_inner() {
+///     Ok(s) => s,
+///     Err(e) => {
+///         // Here, e is an IntoInnerError
+///         panic!("An error occurred");
+///     }
+/// };
+/// ```
+#[derive(Debug)]
+pub struct IntoInnerError<W>(W, Error);
+
+impl<W: Write> BufWriter<W> {
+    /// Creates a new `BufWriter` with a default buffer capacity. The default is currently 8 KB,
+    /// but may change in the future.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::BufWriter;
+    /// use std::net::TcpStream;
+    ///
+    /// let mut buffer = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());
+    /// ```
+    pub fn new(inner: W) -> BufWriter<W> {
+        BufWriter::with_capacity(DEFAULT_BUF_SIZE, inner)
+    }
+
+    /// Creates a new `BufWriter` with the specified buffer capacity.
+    ///
+    /// # Examples
+    ///
+    /// Creating a buffer with a buffer of a hundred bytes.
+    ///
+    /// ```no_run
+    /// use std::io::BufWriter;
+    /// use std::net::TcpStream;
+    ///
+    /// let stream = TcpStream::connect("127.0.0.1:34254").unwrap();
+    /// let mut buffer = BufWriter::with_capacity(100, stream);
+    /// ```
+    pub fn with_capacity(cap: usize, inner: W) -> BufWriter<W> {
+        BufWriter {
+            inner: Some(inner),
+            buf: Vec::with_capacity(cap),
+            panicked: false,
+        }
+    }
+
+    /// Gets a reference to the underlying writer.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::BufWriter;
+    /// use std::net::TcpStream;
+    ///
+    /// let mut buffer = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());
+    ///
+    /// // we can use reference just like buffer
+    /// let reference = buffer.get_ref();
+    /// ```
+    pub fn get_ref(&self) -> &W {
+        self.inner.as_ref().unwrap()
+    }
+
+    fn flush_buf(&mut self) -> io::Result<()> {
+        let mut written = 0;
+        let len = self.buf.len();
+        let mut ret = Ok(());
+        while written < len {
+            self.panicked = true;
+            let r = self.inner.as_mut().unwrap().write(&self.buf[written..]);
+            self.panicked = false;
+
+            match r {
+                Ok(0) => {
+                    ret = Err(Error::new(
+                        ErrorKind::WriteZero,
+                        "failed to write the buffered data",
+                    ));
+                    break;
+                }
+                Ok(n) => written += n,
+                Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
+                Err(e) => {
+                    ret = Err(e);
+                    break;
+                }
+            }
+        }
+        if written > 0 {
+            self.buf.drain(..written);
+        }
+        ret
+    }
+
+    /// Gets a mutable reference to the underlying writer.
+    ///
+    /// It is inadvisable to directly write to the underlying writer.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::BufWriter;
+    /// use std::net::TcpStream;
+    ///
+    /// let mut buffer = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());
+    ///
+    /// // we can use reference just like buffer
+    /// let reference = buffer.get_mut();
+    /// ```
+    pub fn get_mut(&mut self) -> &mut W {
+        self.inner.as_mut().unwrap()
+    }
+
+    /// Unwraps this `BufWriter`, returning the underlying writer.
+    ///
+    /// The buffer is written out before returning the writer.
+    ///
+    /// # Errors
+    ///
+    /// An `Err` will be returned if an error occurs while flushing the buffer.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::BufWriter;
+    /// use std::net::TcpStream;
+    ///
+    /// let mut buffer = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());
+    ///
+    /// // unwrap the TcpStream and flush the buffer
+    /// let stream = buffer.into_inner().unwrap();
+    /// ```
+    pub fn into_inner(mut self) -> Result<W, IntoInnerError<BufWriter<W>>> {
+        match self.flush_buf() {
+            Err(e) => Err(IntoInnerError(self, e)),
+            Ok(()) => Ok(self.inner.take().unwrap()),
+        }
+    }
+}
+
+impl<W: Write> Write for BufWriter<W> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        if self.buf.len() + buf.len() > self.buf.capacity() {
+            self.flush_buf()?;
+        }
+        if buf.len() >= self.buf.capacity() {
+            self.panicked = true;
+            let r = self.inner.as_mut().unwrap().write(buf);
+            self.panicked = false;
+            r
+        } else {
+            Write::write(&mut self.buf, buf)
+        }
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        self.flush_buf().and_then(|()| self.get_mut().flush())
+    }
+}
+
+impl<W: Write> fmt::Debug for BufWriter<W>
+where
+    W: fmt::Debug,
+{
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        fmt.debug_struct("BufWriter")
+            .field("writer", &self.inner.as_ref().unwrap())
+            .field(
+                "buffer",
+                &format_args!("{}/{}", self.buf.len(), self.buf.capacity()),
+            )
+            .finish()
+    }
+}
+
+impl<W: Write + Seek> Seek for BufWriter<W> {
+    /// Seek to the offset, in bytes, in the underlying writer.
+    ///
+    /// Seeking always writes out the internal buffer before seeking.
+    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
+        self.flush_buf().and_then(|_| self.get_mut().seek(pos))
+    }
+}
+
+/// Wraps a writer and buffers output to it, flushing whenever a newline
+/// (`0x0a`, `'\n'`) is detected.
+///
+/// The [`BufWriter`][bufwriter] struct wraps a writer and buffers its output.
+/// But it only does this batched write when it goes out of scope, or when the
+/// internal buffer is full. Sometimes, you'd prefer to write each line as it's
+/// completed, rather than the entire buffer at once. Enter `LineWriter`. It
+/// does exactly that.
+///
+/// Like [`BufWriter`], a `LineWriter`’s buffer will also be flushed when the
+/// `LineWriter` goes out of scope or when its internal buffer is full.
+///
+/// [bufwriter]: struct.BufWriter.html
+///
+/// If there's still a partial line in the buffer when the `LineWriter` is
+/// dropped, it will flush those contents.
+///
+/// # Examples
+///
+/// We can use `LineWriter` to write one line at a time, significantly
+/// reducing the number of actual writes to the file.
+///
+/// ```no_run
+/// use std::fs::{self, File};
+/// use std::io::prelude::*;
+/// use std::io::LineWriter;
+///
+/// fn main() -> std::io::Result<()> {
+///     let road_not_taken = b"I shall be telling this with a sigh
+/// Somewhere ages and ages hence:
+/// Two roads diverged in a wood, and I -
+/// I took the one less traveled by,
+/// And that has made all the difference.";
+///
+///     let file = File::create("poem.txt")?;
+///     let mut file = LineWriter::new(file);
+///
+///     file.write_all(b"I shall be telling this with a sigh")?;
+///
+///     // No bytes are written until a newline is encountered (or
+///     // the internal buffer is filled).
+///     assert_eq!(fs::read_to_string("poem.txt")?, "");
+///     file.write_all(b"\n")?;
+///     assert_eq!(
+///         fs::read_to_string("poem.txt")?,
+///         "I shall be telling this with a sigh\n",
+///     );
+///
+///     // Write the rest of the poem.
+///     file.write_all(b"Somewhere ages and ages hence:
+/// Two roads diverged in a wood, and I -
+/// I took the one less traveled by,
+/// And that has made all the difference.")?;
+///
+///     // The last line of the poem doesn't end in a newline, so
+///     // we have to flush or drop the `LineWriter` to finish
+///     // writing.
+///     file.flush()?;
+///
+///     // Confirm the whole poem was written.
+///     assert_eq!(fs::read("poem.txt")?, &road_not_taken[..]);
+///     Ok(())
+/// }
+/// ```
+pub struct LineWriter<W: Write> {
+    pub inner: BufWriter<W>,
+    need_flush: bool,
+}
+
+impl<W: Write> LineWriter<W> {
+    /// Creates a new `LineWriter`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::fs::File;
+    /// use std::io::LineWriter;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let file = File::create("poem.txt")?;
+    ///     let file = LineWriter::new(file);
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn new(inner: W) -> LineWriter<W> {
+        // Lines typically aren't that long, don't use a giant buffer
+        LineWriter::with_capacity(1024, inner)
+    }
+
+    /// Creates a new `LineWriter` with a specified capacity for the internal
+    /// buffer.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::fs::File;
+    /// use std::io::LineWriter;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let file = File::create("poem.txt")?;
+    ///     let file = LineWriter::with_capacity(100, file);
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn with_capacity(cap: usize, inner: W) -> LineWriter<W> {
+        LineWriter {
+            inner: BufWriter::with_capacity(cap, inner),
+            need_flush: false,
+        }
+    }
+
+    /// Gets a reference to the underlying writer.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::fs::File;
+    /// use std::io::LineWriter;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let file = File::create("poem.txt")?;
+    ///     let file = LineWriter::new(file);
+    ///
+    ///     let reference = file.get_ref();
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn get_ref(&self) -> &W {
+        self.inner.get_ref()
+    }
+
+    /// Gets a mutable reference to the underlying writer.
+    ///
+    /// Caution must be taken when calling methods on the mutable reference
+    /// returned as extra writes could corrupt the output stream.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::fs::File;
+    /// use std::io::LineWriter;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let file = File::create("poem.txt")?;
+    ///     let mut file = LineWriter::new(file);
+    ///
+    ///     // we can use reference just like file
+    ///     let reference = file.get_mut();
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn get_mut(&mut self) -> &mut W {
+        self.inner.get_mut()
+    }
+}
+
+impl<W: Write> Write for LineWriter<W> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        if self.need_flush {
+            self.flush()?;
+        }
+
+        // Find the last newline character in the buffer provided. If found then
+        // we're going to write all the data up to that point and then flush,
+        // otherwise we just write the whole block to the underlying writer.
+        let i = match memchr::memrchr(b'\n', buf) {
+            Some(i) => i,
+            None => return self.inner.write(buf),
+        };
+
+        // Ok, we're going to write a partial amount of the data given first
+        // followed by flushing the newline. After we've successfully written
+        // some data then we *must* report that we wrote that data, so future
+        // errors are ignored. We set our internal `need_flush` flag, though, in
+        // case flushing fails and we need to try it first next time.
+        let n = self.inner.write(&buf[..i + 1])?;
+        self.need_flush = true;
+        if self.flush().is_err() || n != i + 1 {
+            return Ok(n);
+        }
+
+        // At this point we successfully wrote `i + 1` bytes and flushed it out,
+        // meaning that the entire line is now flushed out on the screen. While
+        // we can attempt to finish writing the rest of the data provided.
+        // Remember though that we ignore errors here as we've successfully
+        // written data, so we need to report that.
+        match self.inner.write(&buf[i + 1..]) {
+            Ok(i) => Ok(n + i),
+            Err(_) => Ok(n),
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner.flush()?;
+        self.need_flush = false;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use alloc::string::String;
+
+    use crate::io::{self, BufReader, BufWriter, LineWriter, SeekFrom, prelude::*};
+    use test;
+    // use crate::sync::atomic::{AtomicUsize, Ordering};
+
+    /// A dummy reader intended at testing short-reads propagation.
+    pub struct ShortReader {
+        lengths: Vec<usize>,
+    }
+
+    impl Read for ShortReader {
+        fn read(&mut self, _: &mut [u8]) -> io::Result<usize> {
+            if self.lengths.is_empty() {
+                Ok(0)
+            } else {
+                Ok(self.lengths.remove(0))
+            }
+        }
+    }
+
+    #[test]
+    fn test_buffered_reader() {
+        let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+        let mut reader = BufReader::with_capacity(2, inner);
+
+        let mut buf = [0, 0, 0];
+        let nread = reader.read(&mut buf);
+        assert_eq!(nread.unwrap(), 3);
+        let b: &[_] = &[5, 6, 7];
+        assert_eq!(buf, b);
+
+        let mut buf = [0, 0];
+        let nread = reader.read(&mut buf);
+        assert_eq!(nread.unwrap(), 2);
+        let b: &[_] = &[0, 1];
+        assert_eq!(buf, b);
+
+        let mut buf = [0];
+        let nread = reader.read(&mut buf);
+        assert_eq!(nread.unwrap(), 1);
+        let b: &[_] = &[2];
+        assert_eq!(buf, b);
+
+        let mut buf = [0, 0, 0];
+        let nread = reader.read(&mut buf);
+        assert_eq!(nread.unwrap(), 1);
+        let b: &[_] = &[3, 0, 0];
+        assert_eq!(buf, b);
+
+        let nread = reader.read(&mut buf);
+        assert_eq!(nread.unwrap(), 1);
+        let b: &[_] = &[4, 0, 0];
+        assert_eq!(buf, b);
+
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+    }
+
+    #[test]
+    fn test_buffered_reader_seek() {
+        let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+        let mut reader = BufReader::with_capacity(2, io::Cursor::new(inner));
+
+        assert_eq!(reader.seek(SeekFrom::Start(3)).ok(), Some(3));
+        assert_eq!(reader.fill_buf().ok(), Some(&[0, 1][..]));
+        assert_eq!(reader.seek(SeekFrom::Current(0)).ok(), Some(3));
+        assert_eq!(reader.fill_buf().ok(), Some(&[0, 1][..]));
+        assert_eq!(reader.seek(SeekFrom::Current(1)).ok(), Some(4));
+        assert_eq!(reader.fill_buf().ok(), Some(&[1, 2][..]));
+        reader.consume(1);
+        assert_eq!(reader.seek(SeekFrom::Current(-2)).ok(), Some(3));
+    }
+
+    #[test]
+    fn test_buffered_reader_seek_relative() {
+        let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
+        let mut reader = BufReader::with_capacity(2, io::Cursor::new(inner));
+
+        assert!(reader.seek_relative(3).is_ok());
+        assert_eq!(reader.fill_buf().ok(), Some(&[0, 1][..]));
+        assert!(reader.seek_relative(0).is_ok());
+        assert_eq!(reader.fill_buf().ok(), Some(&[0, 1][..]));
+        assert!(reader.seek_relative(1).is_ok());
+        assert_eq!(reader.fill_buf().ok(), Some(&[1][..]));
+        assert!(reader.seek_relative(-1).is_ok());
+        assert_eq!(reader.fill_buf().ok(), Some(&[0, 1][..]));
+        assert!(reader.seek_relative(2).is_ok());
+        assert_eq!(reader.fill_buf().ok(), Some(&[2, 3][..]));
+    }
+
+    #[test]
+    fn test_buffered_reader_seek_underflow() {
+        // gimmick reader that yields its position modulo 256 for each byte
+        struct PositionReader {
+            pos: u64,
+        }
+        impl Read for PositionReader {
+            fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+                let len = buf.len();
+                for x in buf {
+                    *x = self.pos as u8;
+                    self.pos = self.pos.wrapping_add(1);
+                }
+                Ok(len)
+            }
+        }
+        impl Seek for PositionReader {
+            fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
+                match pos {
+                    SeekFrom::Start(n) => {
+                        self.pos = n;
+                    }
+                    SeekFrom::Current(n) => {
+                        self.pos = self.pos.wrapping_add(n as u64);
+                    }
+                    SeekFrom::End(n) => {
+                        self.pos = u64::max_value().wrapping_add(n as u64);
+                    }
+                }
+                Ok(self.pos)
+            }
+        }
+
+        let mut reader = BufReader::with_capacity(5, PositionReader { pos: 0 });
+        assert_eq!(reader.fill_buf().ok(), Some(&[0, 1, 2, 3, 4][..]));
+        assert_eq!(
+            reader.seek(SeekFrom::End(-5)).ok(),
+            Some(u64::max_value() - 5)
+        );
+        assert_eq!(reader.fill_buf().ok().map(|s| s.len()), Some(5));
+        // the following seek will require two underlying seeks
+        let expected = 9223372036854775802;
+        assert_eq!(
+            reader.seek(SeekFrom::Current(i64::min_value())).ok(),
+            Some(expected)
+        );
+        assert_eq!(reader.fill_buf().ok().map(|s| s.len()), Some(5));
+        // seeking to 0 should empty the buffer.
+        assert_eq!(reader.seek(SeekFrom::Current(0)).ok(), Some(expected));
+        assert_eq!(reader.get_ref().pos, expected);
+    }
+
+    #[test]
+    fn test_buffered_writer() {
+        let inner = Vec::new();
+        let mut writer = BufWriter::with_capacity(2, inner);
+
+        writer.write(&[0, 1]).unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1]);
+
+        writer.write(&[2]).unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1]);
+
+        writer.write(&[3]).unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1]);
+
+        writer.flush().unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1, 2, 3]);
+
+        writer.write(&[4]).unwrap();
+        writer.write(&[5]).unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1, 2, 3]);
+
+        writer.write(&[6]).unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5]);
+
+        writer.write(&[7, 8]).unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8]);
+
+        writer.write(&[9, 10, 11]).unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+
+        writer.flush().unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+    }
+
+    #[test]
+    fn test_buffered_writer_inner_flushes() {
+        let mut w = BufWriter::with_capacity(3, Vec::new());
+        w.write(&[0, 1]).unwrap();
+        assert_eq!(*w.get_ref(), []);
+        let w = w.into_inner().unwrap();
+        assert_eq!(w, [0, 1]);
+    }
+
+    #[test]
+    fn test_buffered_writer_seek() {
+        let mut w = BufWriter::with_capacity(3, io::Cursor::new(Vec::new()));
+        w.write_all(&[0, 1, 2, 3, 4, 5]).unwrap();
+        w.write_all(&[6, 7]).unwrap();
+        assert_eq!(w.seek(SeekFrom::Current(0)).ok(), Some(8));
+        assert_eq!(&w.get_ref().get_ref()[..], &[0, 1, 2, 3, 4, 5, 6, 7][..]);
+        assert_eq!(w.seek(SeekFrom::Start(2)).ok(), Some(2));
+        w.write_all(&[8, 9]).unwrap();
+        assert_eq!(
+            &w.into_inner().unwrap().into_inner()[..],
+            &[0, 1, 8, 9, 4, 5, 6, 7]
+        );
+    }
+
+    #[test]
+    fn test_read_until() {
+        let inner: &[u8] = &[0, 1, 2, 1, 0];
+        let mut reader = BufReader::with_capacity(2, inner);
+        let mut v = Vec::new();
+        reader.read_until(0, &mut v).unwrap();
+        assert_eq!(v, [0]);
+        v.truncate(0);
+        reader.read_until(2, &mut v).unwrap();
+        assert_eq!(v, [1, 2]);
+        v.truncate(0);
+        reader.read_until(1, &mut v).unwrap();
+        assert_eq!(v, [1]);
+        v.truncate(0);
+        reader.read_until(8, &mut v).unwrap();
+        assert_eq!(v, [0]);
+        v.truncate(0);
+        reader.read_until(9, &mut v).unwrap();
+        assert_eq!(v, []);
+    }
+
+    #[test]
+    fn test_line_buffer_fail_flush() {
+        // Issue #32085
+        struct FailFlushWriter<'a>(&'a mut Vec<u8>);
+
+        impl<'a> Write for FailFlushWriter<'a> {
+            fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+                self.0.extend_from_slice(buf);
+                Ok(buf.len())
+            }
+            fn flush(&mut self) -> io::Result<()> {
+                Err(io::Error::new(io::ErrorKind::Other, "flush failed"))
+            }
+        }
+
+        let mut buf = Vec::new();
+        {
+            let mut writer = LineWriter::new(FailFlushWriter(&mut buf));
+            let to_write = b"abc\ndef";
+            if let Ok(written) = writer.write(to_write) {
+                assert!(written < to_write.len(), "didn't flush on new line");
+                // PASS
+                return;
+            }
+        }
+        assert!(buf.is_empty(), "write returned an error but wrote data");
+    }
+
+    #[test]
+    fn test_line_buffer() {
+        let mut writer = LineWriter::new(Vec::new());
+        writer.write(&[0]).unwrap();
+        assert_eq!(*writer.get_ref(), []);
+        writer.write(&[1]).unwrap();
+        assert_eq!(*writer.get_ref(), []);
+        writer.flush().unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1]);
+        writer.write(&[0, b'\n', 1, b'\n', 2]).unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1, 0, b'\n', 1, b'\n']);
+        writer.flush().unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1, 0, b'\n', 1, b'\n', 2]);
+        writer.write(&[3, b'\n']).unwrap();
+        assert_eq!(*writer.get_ref(), [0, 1, 0, b'\n', 1, b'\n', 2, 3, b'\n']);
+    }
+
+    #[test]
+    fn test_read_line() {
+        let in_buf: &[u8] = b"a\nb\nc";
+        let mut reader = BufReader::with_capacity(2, in_buf);
+        let mut s = String::new();
+        reader.read_line(&mut s).unwrap();
+        assert_eq!(s, "a\n");
+        s.truncate(0);
+        reader.read_line(&mut s).unwrap();
+        assert_eq!(s, "b\n");
+        s.truncate(0);
+        reader.read_line(&mut s).unwrap();
+        assert_eq!(s, "c");
+        s.truncate(0);
+        reader.read_line(&mut s).unwrap();
+        assert_eq!(s, "");
+    }
+
+    // #[test]
+    // fn test_lines() {
+    //     let in_buf: &[u8] = b"a\nb\nc";
+    //     let reader = BufReader::with_capacity(2, in_buf);
+    //     let mut it = reader.lines();
+    //     assert_eq!(it.next().unwrap().unwrap(), "a".to_string());
+    //     assert_eq!(it.next().unwrap().unwrap(), "b".to_string());
+    //     assert_eq!(it.next().unwrap().unwrap(), "c".to_string());
+    //     assert!(it.next().is_none());
+    // }
+
+    #[test]
+    fn test_short_reads() {
+        let inner = ShortReader {
+            lengths: vec![0, 1, 2, 0, 1, 0],
+        };
+        let mut reader = BufReader::new(inner);
+        let mut buf = [0, 0];
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+        assert_eq!(reader.read(&mut buf).unwrap(), 1);
+        assert_eq!(reader.read(&mut buf).unwrap(), 2);
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+        assert_eq!(reader.read(&mut buf).unwrap(), 1);
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+    }
+
+    #[test]
+    #[should_panic]
+    fn dont_panic_in_drop_on_panicked_flush() {
+        struct FailFlushWriter;
+
+        impl Write for FailFlushWriter {
+            fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+                Ok(buf.len())
+            }
+            fn flush(&mut self) -> io::Result<()> {
+                Err(io::Error::last_os_error())
+            }
+        }
+
+        let writer = FailFlushWriter;
+        let _writer = BufWriter::new(writer);
+
+        // If writer panics *again* due to the flush error then the process will
+        // abort.
+        panic!();
+    }
+
+    // #[test]
+    // #[cfg_attr(target_os = "emscripten", ignore)]
+    // fn panic_in_write_doesnt_flush_in_drop() {
+    //     static WRITES: AtomicUsize = AtomicUsize::new(0);
+
+    //     struct PanicWriter;
+
+    //     impl Write for PanicWriter {
+    //         fn write(&mut self, _: &[u8]) -> io::Result<usize> {
+    //             WRITES.fetch_add(1, Ordering::SeqCst);
+    //             panic!();
+    //         }
+    //         fn flush(&mut self) -> io::Result<()> { Ok(()) }
+    //     }
+
+    //     thread::spawn(|| {
+    //         let mut writer = BufWriter::new(PanicWriter);
+    //         let _ = writer.write(b"hello world");
+    //         let _ = writer.flush();
+    //     }).join().unwrap_err();
+
+    //     assert_eq!(WRITES.load(Ordering::SeqCst), 1);
+    // }
+
+    // #[bench]
+    // fn bench_buffered_reader(b: &mut test::Bencher) {
+    //     b.iter(|| {
+    //         BufReader::new(io::empty())
+    //     });
+    // }
+
+    // #[bench]
+    // fn bench_buffered_writer(b: &mut test::Bencher) {
+    //     b.iter(|| {
+    //         BufWriter::new(io::sink())
+    //     });
+    // }
+
+    struct AcceptOneThenFail {
+        written: bool,
+        flushed: bool,
+    }
+
+    impl Write for AcceptOneThenFail {
+        fn write(&mut self, data: &[u8]) -> io::Result<usize> {
+            if !self.written {
+                assert_eq!(data, b"a\nb\n");
+                self.written = true;
+                Ok(data.len())
+            } else {
+                Err(io::Error::new(io::ErrorKind::NotFound, "test"))
+            }
+        }
+
+        fn flush(&mut self) -> io::Result<()> {
+            assert!(self.written);
+            assert!(!self.flushed);
+            self.flushed = true;
+            Err(io::Error::new(io::ErrorKind::Other, "test"))
+        }
+    }
+
+    #[test]
+    fn erroneous_flush_retried() {
+        let a = AcceptOneThenFail {
+            written: false,
+            flushed: false,
+        };
+
+        let mut l = LineWriter::new(a);
+        assert_eq!(l.write(b"a\nb\na").unwrap(), 4);
+        assert!(l.get_ref().written);
+        assert!(l.get_ref().flushed);
+        l.get_mut().flushed = false;
+
+        assert_eq!(l.write(b"a").unwrap_err().kind(), io::ErrorKind::Other)
+    }
+}
diff --git a/recipes/core/relibc/src/io/cursor.rs b/recipes/core/relibc/src/io/cursor.rs
new file mode 100644
index 0000000000..fd5500137c
--- /dev/null
+++ b/recipes/core/relibc/src/io/cursor.rs
@@ -0,0 +1,724 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use core::cmp;
+
+use crate::io::{self, Error, ErrorKind, Initializer, SeekFrom, prelude::*};
+
+/// A `Cursor` wraps an in-memory buffer and provides it with a
+/// [`Seek`] implementation.
+///
+/// `Cursor`s are used with in-memory buffers, anything implementing
+/// `AsRef<[u8]>`, to allow them to implement [`Read`] and/or [`Write`],
+/// allowing these buffers to be used anywhere you might use a reader or writer
+/// that does actual I/O.
+///
+/// The standard library implements some I/O traits on various types which
+/// are commonly used as a buffer, like `Cursor<`[`Vec`]`<u8>>` and
+/// `Cursor<`[`&[u8]`][bytes]`>`.
+///
+/// # Examples
+///
+/// We may want to write bytes to a [`File`] in our production
+/// code, but use an in-memory buffer in our tests. We can do this with
+/// `Cursor`:
+///
+/// [`Seek`]: trait.Seek.html
+/// [`Read`]: ../../std/io/trait.Read.html
+/// [`Write`]: ../../std/io/trait.Write.html
+/// [`Vec`]: ../../std/vec/struct.Vec.html
+/// [bytes]: ../../std/primitive.slice.html
+/// [`File`]: ../fs/struct.File.html
+///
+/// ```no_run
+/// use std::io::prelude::*;
+/// use std::io::{self, SeekFrom};
+/// use std::fs::File;
+///
+/// // a library function we've written
+/// fn write_ten_bytes_at_end<W: Write + Seek>(writer: &mut W) -> io::Result<()> {
+///     writer.seek(SeekFrom::End(-10))?;
+///
+///     for i in 0..10 {
+///         writer.write(&[i])?;
+///     }
+///
+///     // all went well
+///     Ok(())
+/// }
+///
+/// # fn foo() -> io::Result<()> {
+/// // Here's some code that uses this library function.
+/// //
+/// // We might want to use a BufReader here for efficiency, but let's
+/// // keep this example focused.
+/// let mut file = File::create("foo.txt")?;
+///
+/// write_ten_bytes_at_end(&mut file)?;
+/// # Ok(())
+/// # }
+///
+/// // now let's write a test
+/// #[test]
+/// fn test_writes_bytes() {
+///     // setting up a real File is much slower than an in-memory buffer,
+///     // let's use a cursor instead
+///     use std::io::Cursor;
+///     let mut buff = Cursor::new(vec![0; 15]);
+///
+///     write_ten_bytes_at_end(&mut buff).unwrap();
+///
+///     assert_eq!(&buff.get_ref()[5..15], &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
+/// }
+/// ```
+#[derive(Clone, Debug)]
+pub struct Cursor<T> {
+    inner: T,
+    pos: u64,
+}
+
+impl<T> Cursor<T> {
+    /// Creates a new cursor wrapping the provided underlying in-memory buffer.
+    ///
+    /// Cursor initial position is `0` even if underlying buffer (e.g. `Vec`)
+    /// is not empty. So writing to cursor starts with overwriting `Vec`
+    /// content, not with appending to it.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::io::Cursor;
+    ///
+    /// let buff = Cursor::new(Vec::new());
+    /// # fn force_inference(_: &Cursor<Vec<u8>>) {}
+    /// # force_inference(&buff);
+    /// ```
+    pub fn new(inner: T) -> Cursor<T> {
+        Cursor { pos: 0, inner }
+    }
+
+    /// Consumes this cursor, returning the underlying value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::io::Cursor;
+    ///
+    /// let buff = Cursor::new(Vec::new());
+    /// # fn force_inference(_: &Cursor<Vec<u8>>) {}
+    /// # force_inference(&buff);
+    ///
+    /// let vec = buff.into_inner();
+    /// ```
+    pub fn into_inner(self) -> T {
+        self.inner
+    }
+
+    /// Gets a reference to the underlying value in this cursor.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::io::Cursor;
+    ///
+    /// let buff = Cursor::new(Vec::new());
+    /// # fn force_inference(_: &Cursor<Vec<u8>>) {}
+    /// # force_inference(&buff);
+    ///
+    /// let reference = buff.get_ref();
+    /// ```
+    pub fn get_ref(&self) -> &T {
+        &self.inner
+    }
+
+    /// Gets a mutable reference to the underlying value in this cursor.
+    ///
+    /// Care should be taken to avoid modifying the internal I/O state of the
+    /// underlying value as it may corrupt this cursor's position.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::io::Cursor;
+    ///
+    /// let mut buff = Cursor::new(Vec::new());
+    /// # fn force_inference(_: &Cursor<Vec<u8>>) {}
+    /// # force_inference(&buff);
+    ///
+    /// let reference = buff.get_mut();
+    /// ```
+    pub fn get_mut(&mut self) -> &mut T {
+        &mut self.inner
+    }
+
+    /// Returns the current position of this cursor.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::io::Cursor;
+    /// use std::io::prelude::*;
+    /// use std::io::SeekFrom;
+    ///
+    /// let mut buff = Cursor::new(vec![1, 2, 3, 4, 5]);
+    ///
+    /// assert_eq!(buff.position(), 0);
+    ///
+    /// buff.seek(SeekFrom::Current(2)).unwrap();
+    /// assert_eq!(buff.position(), 2);
+    ///
+    /// buff.seek(SeekFrom::Current(-1)).unwrap();
+    /// assert_eq!(buff.position(), 1);
+    /// ```
+    pub fn position(&self) -> u64 {
+        self.pos
+    }
+
+    /// Sets the position of this cursor.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::io::Cursor;
+    ///
+    /// let mut buff = Cursor::new(vec![1, 2, 3, 4, 5]);
+    ///
+    /// assert_eq!(buff.position(), 0);
+    ///
+    /// buff.set_position(2);
+    /// assert_eq!(buff.position(), 2);
+    ///
+    /// buff.set_position(4);
+    /// assert_eq!(buff.position(), 4);
+    /// ```
+    pub fn set_position(&mut self, pos: u64) {
+        self.pos = pos;
+    }
+}
+
+impl<T> io::Seek for Cursor<T>
+where
+    T: AsRef<[u8]>,
+{
+    fn seek(&mut self, style: SeekFrom) -> io::Result<u64> {
+        let (base_pos, offset) = match style {
+            SeekFrom::Start(n) => {
+                self.pos = n;
+                return Ok(n);
+            }
+            SeekFrom::End(n) => (self.inner.as_ref().len() as u64, n),
+            SeekFrom::Current(n) => (self.pos, n),
+        };
+        let new_pos = if offset >= 0 {
+            base_pos.checked_add(offset as u64)
+        } else {
+            base_pos.checked_sub((offset.wrapping_neg()) as u64)
+        };
+        match new_pos {
+            Some(n) => {
+                self.pos = n;
+                Ok(self.pos)
+            }
+            None => Err(Error::new(
+                ErrorKind::InvalidInput,
+                "invalid seek to a negative or overflowing position",
+            )),
+        }
+    }
+}
+
+impl<T> Read for Cursor<T>
+where
+    T: AsRef<[u8]>,
+{
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let n = Read::read(&mut self.get_buf()?, buf)?;
+        self.pos += n as u64;
+        Ok(n)
+    }
+
+    fn read_exact(&mut self, buf: &mut [u8]) -> io::Result<()> {
+        let n = buf.len();
+        Read::read_exact(&mut self.get_buf()?, buf)?;
+        self.pos += n as u64;
+        Ok(())
+    }
+
+    #[inline]
+    unsafe fn initializer(&self) -> Initializer {
+        unsafe { Initializer::nop() }
+    }
+}
+
+impl<T> Cursor<T>
+where
+    T: AsRef<[u8]>,
+{
+    fn get_buf(&mut self) -> io::Result<&[u8]> {
+        let amt = cmp::min(self.pos, self.inner.as_ref().len() as u64);
+        Ok(&self.inner.as_ref()[(amt as usize)..])
+    }
+}
+
+impl<T> BufRead for Cursor<T>
+where
+    T: AsRef<[u8]>,
+{
+    fn fill_buf(&mut self) -> io::Result<&[u8]> {
+        self.get_buf()
+    }
+    fn consume(&mut self, amt: usize) {
+        self.pos += amt as u64;
+    }
+}
+
+// Non-resizing write implementation
+fn slice_write(pos_mut: &mut u64, slice: &mut [u8], buf: &[u8]) -> io::Result<usize> {
+    let pos = cmp::min(*pos_mut, slice.len() as u64);
+    let amt = (&mut slice[(pos as usize)..]).write(buf)?;
+    *pos_mut += amt as u64;
+    Ok(amt)
+}
+
+// Resizing write implementation
+fn vec_write(pos_mut: &mut u64, vec: &mut Vec<u8>, buf: &[u8]) -> io::Result<usize> {
+    let pos: usize = (*pos_mut).try_into().map_err(|_| {
+        Error::new(
+            ErrorKind::InvalidInput,
+            "cursor position exceeds maximum possible vector length",
+        )
+    })?;
+    // Make sure the internal buffer is as least as big as where we
+    // currently are
+    let len = vec.len();
+    if len < pos {
+        // use `resize` so that the zero filling is as efficient as possible
+        vec.resize(pos, 0);
+    }
+    // Figure out what bytes will be used to overwrite what's currently
+    // there (left), and what will be appended on the end (right)
+    {
+        let space = vec.len() - pos;
+        let (left, right) = buf.split_at(cmp::min(space, buf.len()));
+        vec[pos..pos + left.len()].copy_from_slice(left);
+        vec.extend_from_slice(right);
+    }
+
+    // Bump us forward
+    *pos_mut = (pos + buf.len()) as u64;
+    Ok(buf.len())
+}
+
+impl Write for Cursor<&mut [u8]> {
+    #[inline]
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        slice_write(&mut self.pos, self.inner, buf)
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl Write for Cursor<&mut Vec<u8>> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        vec_write(&mut self.pos, self.inner, buf)
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl Write for Cursor<Vec<u8>> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        vec_write(&mut self.pos, &mut self.inner, buf)
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+impl Write for Cursor<::alloc::boxed::Box<[u8]>> {
+    #[inline]
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        slice_write(&mut self.pos, &mut self.inner, buf)
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::io::{Cursor, SeekFrom, prelude::*};
+
+    #[test]
+    fn test_vec_writer() {
+        let mut writer = Vec::new();
+        assert_eq!(writer.write(&[0]).unwrap(), 1);
+        assert_eq!(writer.write(&[1, 2, 3]).unwrap(), 3);
+        assert_eq!(writer.write(&[4, 5, 6, 7]).unwrap(), 4);
+        let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7];
+        assert_eq!(writer, b);
+    }
+
+    #[test]
+    fn test_mem_writer() {
+        let mut writer = Cursor::new(Vec::new());
+        assert_eq!(writer.write(&[0]).unwrap(), 1);
+        assert_eq!(writer.write(&[1, 2, 3]).unwrap(), 3);
+        assert_eq!(writer.write(&[4, 5, 6, 7]).unwrap(), 4);
+        let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7];
+        assert_eq!(&writer.get_ref()[..], b);
+    }
+
+    #[test]
+    fn test_mem_mut_writer() {
+        let mut vec = Vec::new();
+        let mut writer = Cursor::new(&mut vec);
+        assert_eq!(writer.write(&[0]).unwrap(), 1);
+        assert_eq!(writer.write(&[1, 2, 3]).unwrap(), 3);
+        assert_eq!(writer.write(&[4, 5, 6, 7]).unwrap(), 4);
+        let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7];
+        assert_eq!(&writer.get_ref()[..], b);
+    }
+
+    #[test]
+    fn test_box_slice_writer() {
+        let mut writer = Cursor::new(vec![0u8; 9].into_boxed_slice());
+        assert_eq!(writer.position(), 0);
+        assert_eq!(writer.write(&[0]).unwrap(), 1);
+        assert_eq!(writer.position(), 1);
+        assert_eq!(writer.write(&[1, 2, 3]).unwrap(), 3);
+        assert_eq!(writer.write(&[4, 5, 6, 7]).unwrap(), 4);
+        assert_eq!(writer.position(), 8);
+        assert_eq!(writer.write(&[]).unwrap(), 0);
+        assert_eq!(writer.position(), 8);
+
+        assert_eq!(writer.write(&[8, 9]).unwrap(), 1);
+        assert_eq!(writer.write(&[10]).unwrap(), 0);
+        let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7, 8];
+        assert_eq!(&**writer.get_ref(), b);
+    }
+
+    #[test]
+    fn test_buf_writer() {
+        let mut buf = [0 as u8; 9];
+        {
+            let mut writer = Cursor::new(&mut buf[..]);
+            assert_eq!(writer.position(), 0);
+            assert_eq!(writer.write(&[0]).unwrap(), 1);
+            assert_eq!(writer.position(), 1);
+            assert_eq!(writer.write(&[1, 2, 3]).unwrap(), 3);
+            assert_eq!(writer.write(&[4, 5, 6, 7]).unwrap(), 4);
+            assert_eq!(writer.position(), 8);
+            assert_eq!(writer.write(&[]).unwrap(), 0);
+            assert_eq!(writer.position(), 8);
+
+            assert_eq!(writer.write(&[8, 9]).unwrap(), 1);
+            assert_eq!(writer.write(&[10]).unwrap(), 0);
+        }
+        let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7, 8];
+        assert_eq!(buf, b);
+    }
+
+    #[test]
+    fn test_buf_writer_seek() {
+        let mut buf = [0 as u8; 8];
+        {
+            let mut writer = Cursor::new(&mut buf[..]);
+            assert_eq!(writer.position(), 0);
+            assert_eq!(writer.write(&[1]).unwrap(), 1);
+            assert_eq!(writer.position(), 1);
+
+            assert_eq!(writer.seek(SeekFrom::Start(2)).unwrap(), 2);
+            assert_eq!(writer.position(), 2);
+            assert_eq!(writer.write(&[2]).unwrap(), 1);
+            assert_eq!(writer.position(), 3);
+
+            assert_eq!(writer.seek(SeekFrom::Current(-2)).unwrap(), 1);
+            assert_eq!(writer.position(), 1);
+            assert_eq!(writer.write(&[3]).unwrap(), 1);
+            assert_eq!(writer.position(), 2);
+
+            assert_eq!(writer.seek(SeekFrom::End(-1)).unwrap(), 7);
+            assert_eq!(writer.position(), 7);
+            assert_eq!(writer.write(&[4]).unwrap(), 1);
+            assert_eq!(writer.position(), 8);
+        }
+        let b: &[_] = &[1, 3, 2, 0, 0, 0, 0, 4];
+        assert_eq!(buf, b);
+    }
+
+    #[test]
+    fn test_buf_writer_error() {
+        let mut buf = [0 as u8; 2];
+        let mut writer = Cursor::new(&mut buf[..]);
+        assert_eq!(writer.write(&[0]).unwrap(), 1);
+        assert_eq!(writer.write(&[0, 0]).unwrap(), 1);
+        assert_eq!(writer.write(&[0, 0]).unwrap(), 0);
+    }
+
+    #[test]
+    fn test_mem_reader() {
+        let mut reader = Cursor::new(vec![0, 1, 2, 3, 4, 5, 6, 7]);
+        let mut buf = [];
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+        assert_eq!(reader.position(), 0);
+        let mut buf = [0];
+        assert_eq!(reader.read(&mut buf).unwrap(), 1);
+        assert_eq!(reader.position(), 1);
+        let b: &[_] = &[0];
+        assert_eq!(buf, b);
+        let mut buf = [0; 4];
+        assert_eq!(reader.read(&mut buf).unwrap(), 4);
+        assert_eq!(reader.position(), 5);
+        let b: &[_] = &[1, 2, 3, 4];
+        assert_eq!(buf, b);
+        assert_eq!(reader.read(&mut buf).unwrap(), 3);
+        let b: &[_] = &[5, 6, 7];
+        assert_eq!(&buf[..3], b);
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+    }
+
+    #[test]
+    fn test_boxed_slice_reader() {
+        let mut reader = Cursor::new(vec![0, 1, 2, 3, 4, 5, 6, 7].into_boxed_slice());
+        let mut buf = [];
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+        assert_eq!(reader.position(), 0);
+        let mut buf = [0];
+        assert_eq!(reader.read(&mut buf).unwrap(), 1);
+        assert_eq!(reader.position(), 1);
+        let b: &[_] = &[0];
+        assert_eq!(buf, b);
+        let mut buf = [0; 4];
+        assert_eq!(reader.read(&mut buf).unwrap(), 4);
+        assert_eq!(reader.position(), 5);
+        let b: &[_] = &[1, 2, 3, 4];
+        assert_eq!(buf, b);
+        assert_eq!(reader.read(&mut buf).unwrap(), 3);
+        let b: &[_] = &[5, 6, 7];
+        assert_eq!(&buf[..3], b);
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+    }
+
+    #[test]
+    fn read_to_end() {
+        let mut reader = Cursor::new(vec![0, 1, 2, 3, 4, 5, 6, 7]);
+        let mut v = Vec::new();
+        reader.read_to_end(&mut v).unwrap();
+        assert_eq!(v, [0, 1, 2, 3, 4, 5, 6, 7]);
+    }
+
+    #[test]
+    fn test_slice_reader() {
+        let in_buf = vec![0, 1, 2, 3, 4, 5, 6, 7];
+        let reader = &mut &in_buf[..];
+        let mut buf = [];
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+        let mut buf = [0];
+        assert_eq!(reader.read(&mut buf).unwrap(), 1);
+        assert_eq!(reader.len(), 7);
+        let b: &[_] = &[0];
+        assert_eq!(&buf[..], b);
+        let mut buf = [0; 4];
+        assert_eq!(reader.read(&mut buf).unwrap(), 4);
+        assert_eq!(reader.len(), 3);
+        let b: &[_] = &[1, 2, 3, 4];
+        assert_eq!(&buf[..], b);
+        assert_eq!(reader.read(&mut buf).unwrap(), 3);
+        let b: &[_] = &[5, 6, 7];
+        assert_eq!(&buf[..3], b);
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+    }
+
+    #[test]
+    fn test_read_exact() {
+        let in_buf = vec![0, 1, 2, 3, 4, 5, 6, 7];
+        let reader = &mut &in_buf[..];
+        let mut buf = [];
+        assert!(reader.read_exact(&mut buf).is_ok());
+        let mut buf = [8];
+        assert!(reader.read_exact(&mut buf).is_ok());
+        assert_eq!(buf[0], 0);
+        assert_eq!(reader.len(), 7);
+        let mut buf = [0, 0, 0, 0, 0, 0, 0];
+        assert!(reader.read_exact(&mut buf).is_ok());
+        assert_eq!(buf, [1, 2, 3, 4, 5, 6, 7]);
+        assert_eq!(reader.len(), 0);
+        let mut buf = [0];
+        assert!(reader.read_exact(&mut buf).is_err());
+    }
+
+    #[test]
+    fn test_buf_reader() {
+        let in_buf = vec![0, 1, 2, 3, 4, 5, 6, 7];
+        let mut reader = Cursor::new(&in_buf[..]);
+        let mut buf = [];
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+        assert_eq!(reader.position(), 0);
+        let mut buf = [0];
+        assert_eq!(reader.read(&mut buf).unwrap(), 1);
+        assert_eq!(reader.position(), 1);
+        let b: &[_] = &[0];
+        assert_eq!(buf, b);
+        let mut buf = [0; 4];
+        assert_eq!(reader.read(&mut buf).unwrap(), 4);
+        assert_eq!(reader.position(), 5);
+        let b: &[_] = &[1, 2, 3, 4];
+        assert_eq!(buf, b);
+        assert_eq!(reader.read(&mut buf).unwrap(), 3);
+        let b: &[_] = &[5, 6, 7];
+        assert_eq!(&buf[..3], b);
+        assert_eq!(reader.read(&mut buf).unwrap(), 0);
+    }
+
+    #[test]
+    fn seek_past_end() {
+        let buf = [0xff];
+        let mut r = Cursor::new(&buf[..]);
+        assert_eq!(r.seek(SeekFrom::Start(10)).unwrap(), 10);
+        assert_eq!(r.read(&mut [0]).unwrap(), 0);
+
+        let mut r = Cursor::new(vec![10]);
+        assert_eq!(r.seek(SeekFrom::Start(10)).unwrap(), 10);
+        assert_eq!(r.read(&mut [0]).unwrap(), 0);
+
+        let mut buf = [0];
+        let mut r = Cursor::new(&mut buf[..]);
+        assert_eq!(r.seek(SeekFrom::Start(10)).unwrap(), 10);
+        assert_eq!(r.write(&[3]).unwrap(), 0);
+
+        let mut r = Cursor::new(vec![10].into_boxed_slice());
+        assert_eq!(r.seek(SeekFrom::Start(10)).unwrap(), 10);
+        assert_eq!(r.write(&[3]).unwrap(), 0);
+    }
+
+    #[test]
+    fn seek_past_i64() {
+        let buf = [0xff];
+        let mut r = Cursor::new(&buf[..]);
+        assert_eq!(r.seek(SeekFrom::Start(6)).unwrap(), 6);
+        assert_eq!(
+            r.seek(SeekFrom::Current(0x7ffffffffffffff0)).unwrap(),
+            0x7ffffffffffffff6
+        );
+        assert_eq!(r.seek(SeekFrom::Current(0x10)).unwrap(), 0x8000000000000006);
+        assert_eq!(r.seek(SeekFrom::Current(0)).unwrap(), 0x8000000000000006);
+        assert!(r.seek(SeekFrom::Current(0x7ffffffffffffffd)).is_err());
+        assert_eq!(r.seek(SeekFrom::Current(-0x8000000000000000)).unwrap(), 6);
+
+        let mut r = Cursor::new(vec![10]);
+        assert_eq!(r.seek(SeekFrom::Start(6)).unwrap(), 6);
+        assert_eq!(
+            r.seek(SeekFrom::Current(0x7ffffffffffffff0)).unwrap(),
+            0x7ffffffffffffff6
+        );
+        assert_eq!(r.seek(SeekFrom::Current(0x10)).unwrap(), 0x8000000000000006);
+        assert_eq!(r.seek(SeekFrom::Current(0)).unwrap(), 0x8000000000000006);
+        assert!(r.seek(SeekFrom::Current(0x7ffffffffffffffd)).is_err());
+        assert_eq!(r.seek(SeekFrom::Current(-0x8000000000000000)).unwrap(), 6);
+
+        let mut buf = [0];
+        let mut r = Cursor::new(&mut buf[..]);
+        assert_eq!(r.seek(SeekFrom::Start(6)).unwrap(), 6);
+        assert_eq!(
+            r.seek(SeekFrom::Current(0x7ffffffffffffff0)).unwrap(),
+            0x7ffffffffffffff6
+        );
+        assert_eq!(r.seek(SeekFrom::Current(0x10)).unwrap(), 0x8000000000000006);
+        assert_eq!(r.seek(SeekFrom::Current(0)).unwrap(), 0x8000000000000006);
+        assert!(r.seek(SeekFrom::Current(0x7ffffffffffffffd)).is_err());
+        assert_eq!(r.seek(SeekFrom::Current(-0x8000000000000000)).unwrap(), 6);
+
+        let mut r = Cursor::new(vec![10].into_boxed_slice());
+        assert_eq!(r.seek(SeekFrom::Start(6)).unwrap(), 6);
+        assert_eq!(
+            r.seek(SeekFrom::Current(0x7ffffffffffffff0)).unwrap(),
+            0x7ffffffffffffff6
+        );
+        assert_eq!(r.seek(SeekFrom::Current(0x10)).unwrap(), 0x8000000000000006);
+        assert_eq!(r.seek(SeekFrom::Current(0)).unwrap(), 0x8000000000000006);
+        assert!(r.seek(SeekFrom::Current(0x7ffffffffffffffd)).is_err());
+        assert_eq!(r.seek(SeekFrom::Current(-0x8000000000000000)).unwrap(), 6);
+    }
+
+    #[test]
+    fn seek_before_0() {
+        let buf = [0xff];
+        let mut r = Cursor::new(&buf[..]);
+        assert!(r.seek(SeekFrom::End(-2)).is_err());
+
+        let mut r = Cursor::new(vec![10]);
+        assert!(r.seek(SeekFrom::End(-2)).is_err());
+
+        let mut buf = [0];
+        let mut r = Cursor::new(&mut buf[..]);
+        assert!(r.seek(SeekFrom::End(-2)).is_err());
+
+        let mut r = Cursor::new(vec![10].into_boxed_slice());
+        assert!(r.seek(SeekFrom::End(-2)).is_err());
+    }
+
+    #[test]
+    fn test_seekable_mem_writer() {
+        let mut writer = Cursor::new(Vec::<u8>::new());
+        assert_eq!(writer.position(), 0);
+        assert_eq!(writer.write(&[0]).unwrap(), 1);
+        assert_eq!(writer.position(), 1);
+        assert_eq!(writer.write(&[1, 2, 3]).unwrap(), 3);
+        assert_eq!(writer.write(&[4, 5, 6, 7]).unwrap(), 4);
+        assert_eq!(writer.position(), 8);
+        let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7];
+        assert_eq!(&writer.get_ref()[..], b);
+
+        assert_eq!(writer.seek(SeekFrom::Start(0)).unwrap(), 0);
+        assert_eq!(writer.position(), 0);
+        assert_eq!(writer.write(&[3, 4]).unwrap(), 2);
+        let b: &[_] = &[3, 4, 2, 3, 4, 5, 6, 7];
+        assert_eq!(&writer.get_ref()[..], b);
+
+        assert_eq!(writer.seek(SeekFrom::Current(1)).unwrap(), 3);
+        assert_eq!(writer.write(&[0, 1]).unwrap(), 2);
+        let b: &[_] = &[3, 4, 2, 0, 1, 5, 6, 7];
+        assert_eq!(&writer.get_ref()[..], b);
+
+        assert_eq!(writer.seek(SeekFrom::End(-1)).unwrap(), 7);
+        assert_eq!(writer.write(&[1, 2]).unwrap(), 2);
+        let b: &[_] = &[3, 4, 2, 0, 1, 5, 6, 1, 2];
+        assert_eq!(&writer.get_ref()[..], b);
+
+        assert_eq!(writer.seek(SeekFrom::End(1)).unwrap(), 10);
+        assert_eq!(writer.write(&[1]).unwrap(), 1);
+        let b: &[_] = &[3, 4, 2, 0, 1, 5, 6, 1, 2, 0, 1];
+        assert_eq!(&writer.get_ref()[..], b);
+    }
+
+    #[test]
+    fn vec_seek_past_end() {
+        let mut r = Cursor::new(Vec::new());
+        assert_eq!(r.seek(SeekFrom::Start(10)).unwrap(), 10);
+        assert_eq!(r.write(&[3]).unwrap(), 1);
+    }
+
+    #[test]
+    fn vec_seek_before_0() {
+        let mut r = Cursor::new(Vec::new());
+        assert!(r.seek(SeekFrom::End(-2)).is_err());
+    }
+
+    #[test]
+    #[cfg(target_pointer_width = "32")]
+    fn vec_seek_and_write_past_usize_max() {
+        let mut c = Cursor::new(Vec::new());
+        c.set_position(<usize>::max_value() as u64 + 1);
+        assert!(c.write_all(&[1, 2, 3]).is_err());
+    }
+}
diff --git a/recipes/core/relibc/src/io/error.rs b/recipes/core/relibc/src/io/error.rs
new file mode 100644
index 0000000000..203f628a88
--- /dev/null
+++ b/recipes/core/relibc/src/io/error.rs
@@ -0,0 +1,313 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use alloc::{boxed::Box, string::String};
+use core::{fmt, result, str};
+
+use crate::platform::types::c_int;
+
+/// A specialized [`Result`](../result/enum.Result.html) type for I/O
+/// operations.
+///
+/// This type is broadly used across [`std::io`] for any operation which may
+/// produce an error.
+///
+/// This typedef is generally used to avoid writing out [`io::Error`] directly and
+/// is otherwise a direct mapping to [`Result`].
+///
+/// While usual Rust style is to import types directly, aliases of [`Result`]
+/// often are not, to make it easier to distinguish between them. [`Result`] is
+/// generally assumed to be [`std::result::Result`][`Result`], and so users of this alias
+/// will generally use `io::Result` instead of shadowing the prelude's import
+/// of [`std::result::Result`][`Result`].
+///
+/// [`std::io`]: ../io/index.html
+/// [`io::Error`]: ../io/struct.Error.html
+/// [`Result`]: ../result/enum.Result.html
+///
+/// # Examples
+///
+/// A convenience function that bubbles an `io::Result` to its caller:
+///
+/// ```
+/// use std::io;
+///
+/// fn get_string() -> io::Result<String> {
+///     let mut buffer = String::new();
+///
+///     io::stdin().read_line(&mut buffer)?;
+///
+///     Ok(buffer)
+/// }
+/// ```
+pub type Result<T> = result::Result<T, Error>;
+
+/// The error type for I/O operations of the [`Read`], [`Write`], [`Seek`], and
+/// associated traits.
+///
+/// Errors mostly originate from the underlying OS, but custom instances of
+/// `Error` can be created with crafted error messages and a particular value of
+/// [`ErrorKind`].
+///
+/// [`Read`]: ../io/trait.Read.html
+/// [`Write`]: ../io/trait.Write.html
+/// [`Seek`]: ../io/trait.Seek.html
+/// [`ErrorKind`]: enum.ErrorKind.html
+pub struct Error {
+    repr: Repr,
+}
+
+// TODO?
+impl Error {
+    pub fn raw_os_error(&self) -> Option<c_int> {
+        if let Repr::Os(os) = self.repr {
+            Some(os)
+        } else {
+            None
+        }
+    }
+}
+
+impl fmt::Debug for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Debug::fmt(&self.repr, f)
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match self.repr {
+            Repr::Os(code) => {
+                write!(fmt, "os error {}", code)
+            }
+            Repr::Custom(ref c) => c.error.fmt(fmt),
+            Repr::Simple(kind) => write!(fmt, "{}", kind.as_str()),
+        }
+    }
+}
+
+impl Error {
+    /// Creates a new I/O error from a known kind of error as well as an
+    /// arbitrary error payload.
+    ///
+    /// This function is used to generically create I/O errors which do not
+    /// originate from the OS itself. The `error` argument is an arbitrary
+    /// payload which will be contained in this `Error`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::io::{Error, ErrorKind};
+    ///
+    /// // errors can be created from strings
+    /// let custom_error = Error::new(ErrorKind::Other, "oh no!");
+    ///
+    /// // errors can also be created from other errors
+    /// let custom_error2 = Error::new(ErrorKind::Interrupted, custom_error);
+    /// ```
+    pub fn new<E>(kind: ErrorKind, error: E) -> Error
+    where
+        E: Into<String>,
+    {
+        Self::_new(kind, error.into())
+    }
+
+    fn _new(kind: ErrorKind, error: String) -> Error {
+        Error {
+            repr: Repr::Custom(Box::new(Custom { kind, error })),
+        }
+    }
+
+    /// Creates a new instance of an `Error` from a particular OS error code.
+    ///
+    /// # Examples
+    ///
+    /// On Linux:
+    ///
+    /// ```
+    /// # if cfg!(target_os = "linux") {
+    /// use std::io;
+    ///
+    /// let error = io::Error::from_raw_os_error(22);
+    /// assert_eq!(error.kind(), io::ErrorKind::InvalidInput);
+    /// # }
+    /// ```
+    ///
+    /// On Windows:
+    ///
+    /// ```
+    /// # if cfg!(windows) {
+    /// use std::io;
+    ///
+    /// let error = io::Error::from_raw_os_error(10022);
+    /// assert_eq!(error.kind(), io::ErrorKind::InvalidInput);
+    /// # }
+    /// ```
+    pub fn from_raw_os_error(code: i32) -> Error {
+        Error {
+            repr: Repr::Os(code),
+        }
+    }
+
+    /// Returns the corresponding `ErrorKind` for this error.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::io::{Error, ErrorKind};
+    ///
+    /// fn print_error(err: Error) {
+    ///     println!("{:?}", err.kind());
+    /// }
+    ///
+    /// fn main() {
+    ///     // Will print "No inner error".
+    ///     print_error(Error::last_os_error());
+    ///     // Will print "Inner error: ...".
+    ///     print_error(Error::new(ErrorKind::AddrInUse, "oh no!"));
+    /// }
+    /// ```
+    pub fn kind(&self) -> ErrorKind {
+        match self.repr {
+            Repr::Os(_code) => ErrorKind::Other,
+            Repr::Custom(ref c) => c.kind,
+            Repr::Simple(kind) => kind,
+        }
+    }
+
+    pub fn last_os_error() -> Error {
+        let errno = crate::platform::ERRNO.get();
+        Error::from_raw_os_error(errno)
+    }
+}
+
+enum Repr {
+    Os(i32),
+    Simple(ErrorKind),
+    Custom(Box<Custom>),
+}
+
+impl fmt::Debug for Repr {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            Repr::Os(code) => fmt.debug_struct("Os").field("code", &code).finish(),
+            Repr::Custom(ref c) => fmt::Debug::fmt(&c, fmt),
+            Repr::Simple(kind) => fmt.debug_tuple("Kind").field(&kind).finish(),
+        }
+    }
+}
+
+#[derive(Debug)]
+struct Custom {
+    kind: ErrorKind,
+    error: String,
+}
+
+/// A list specifying general categories of I/O error.
+///
+/// This list is intended to grow over time and it is not recommended to
+/// exhaustively match against it.
+///
+/// It is used with the [`io::Error`] type.
+///
+/// [`io::Error`]: struct.Error.html
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[non_exhaustive]
+pub enum ErrorKind {
+    /// An entity was not found, often a file.
+    NotFound,
+    /// The operation lacked the necessary privileges to complete.
+    PermissionDenied,
+    /// The connection was refused by the remote server.
+    ConnectionRefused,
+    /// The connection was reset by the remote server.
+    ConnectionReset,
+    /// The connection was aborted (terminated) by the remote server.
+    ConnectionAborted,
+    /// The network operation failed because it was not connected yet.
+    NotConnected,
+    /// A socket address could not be bound because the address is already in
+    /// use elsewhere.
+    AddrInUse,
+    /// A nonexistent interface was requested or the requested address was not
+    /// local.
+    AddrNotAvailable,
+    /// The operation failed because a pipe was closed.
+    BrokenPipe,
+    /// An entity already exists, often a file.
+    AlreadyExists,
+    /// The operation needs to block to complete, but the blocking operation was
+    /// requested to not occur.
+    WouldBlock,
+    /// A parameter was incorrect.
+    InvalidInput,
+    /// Data not valid for the operation were encountered.
+    ///
+    /// Unlike [`InvalidInput`], this typically means that the operation
+    /// parameters were valid, however the error was caused by malformed
+    /// input data.
+    ///
+    /// For example, a function that reads a file into a string will error with
+    /// `InvalidData` if the file's contents are not valid UTF-8.
+    ///
+    /// [`InvalidInput`]: #variant.InvalidInput
+    InvalidData,
+    /// The I/O operation's timeout expired, causing it to be canceled.
+    TimedOut,
+    /// An error returned when an operation could not be completed because a
+    /// call to [`write`] returned [`Ok(0)`].
+    ///
+    /// This typically means that an operation could only succeed if it wrote a
+    /// particular number of bytes but only a smaller number of bytes could be
+    /// written.
+    ///
+    /// [`write`]: ../../std/io/trait.Write.html#tymethod.write
+    /// [`Ok(0)`]: ../../std/io/type.Result.html
+    WriteZero,
+    /// This operation was interrupted.
+    ///
+    /// Interrupted operations can typically be retried.
+    Interrupted,
+    /// Any I/O error not part of this list.
+    Other,
+
+    /// An error returned when an operation could not be completed because an
+    /// "end of file" was reached prematurely.
+    ///
+    /// This typically means that an operation could only succeed if it read a
+    /// particular number of bytes but only a smaller number of bytes could be
+    /// read.
+    UnexpectedEof,
+}
+
+impl ErrorKind {
+    fn as_str(&self) -> &'static str {
+        match *self {
+            ErrorKind::NotFound => "entity not found",
+            ErrorKind::PermissionDenied => "permission denied",
+            ErrorKind::ConnectionRefused => "connection refused",
+            ErrorKind::ConnectionReset => "connection reset",
+            ErrorKind::ConnectionAborted => "connection aborted",
+            ErrorKind::NotConnected => "not connected",
+            ErrorKind::AddrInUse => "address in use",
+            ErrorKind::AddrNotAvailable => "address not available",
+            ErrorKind::BrokenPipe => "broken pipe",
+            ErrorKind::AlreadyExists => "entity already exists",
+            ErrorKind::WouldBlock => "operation would block",
+            ErrorKind::InvalidInput => "invalid input parameter",
+            ErrorKind::InvalidData => "invalid data",
+            ErrorKind::TimedOut => "timed out",
+            ErrorKind::WriteZero => "write zero",
+            ErrorKind::Interrupted => "operation interrupted",
+            ErrorKind::Other => "other os error",
+            ErrorKind::UnexpectedEof => "unexpected end of file",
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/io/impls.rs b/recipes/core/relibc/src/io/impls.rs
new file mode 100644
index 0000000000..8b74284081
--- /dev/null
+++ b/recipes/core/relibc/src/io/impls.rs
@@ -0,0 +1,298 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use alloc::string::String;
+use core::{cmp, fmt, mem};
+
+use crate::io::{self, Error, ErrorKind, Initializer, Seek, SeekFrom, Write, prelude::*};
+
+impl<R: Read + ?Sized> Read for &mut R {
+    #[inline]
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        (**self).read(buf)
+    }
+
+    #[inline]
+    unsafe fn initializer(&self) -> Initializer {
+        unsafe { (**self).initializer() }
+    }
+
+    #[inline]
+    fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
+        (**self).read_to_end(buf)
+    }
+
+    #[inline]
+    fn read_to_string(&mut self, buf: &mut String) -> io::Result<usize> {
+        (**self).read_to_string(buf)
+    }
+
+    #[inline]
+    fn read_exact(&mut self, buf: &mut [u8]) -> io::Result<()> {
+        (**self).read_exact(buf)
+    }
+}
+
+impl<W: Write + ?Sized> Write for &mut W {
+    #[inline]
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        (**self).write(buf)
+    }
+
+    #[inline]
+    fn flush(&mut self) -> io::Result<()> {
+        (**self).flush()
+    }
+
+    #[inline]
+    fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
+        (**self).write_all(buf)
+    }
+
+    #[inline]
+    fn write_fmt(&mut self, fmt: fmt::Arguments) -> io::Result<()> {
+        (**self).write_fmt(fmt)
+    }
+}
+impl<S: Seek + ?Sized> Seek for &mut S {
+    #[inline]
+    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
+        (**self).seek(pos)
+    }
+}
+
+impl<B: BufRead + ?Sized> BufRead for &mut B {
+    #[inline]
+    fn fill_buf(&mut self) -> io::Result<&[u8]> {
+        (**self).fill_buf()
+    }
+
+    #[inline]
+    fn consume(&mut self, amt: usize) {
+        (**self).consume(amt)
+    }
+
+    #[inline]
+    fn read_until(&mut self, byte: u8, buf: &mut Vec<u8>) -> io::Result<usize> {
+        (**self).read_until(byte, buf)
+    }
+
+    #[inline]
+    fn read_line(&mut self, buf: &mut String) -> io::Result<usize> {
+        (**self).read_line(buf)
+    }
+}
+
+impl<R: Read + ?Sized> Read for Box<R> {
+    #[inline]
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        (**self).read(buf)
+    }
+
+    #[inline]
+    unsafe fn initializer(&self) -> Initializer {
+        unsafe { (**self).initializer() }
+    }
+
+    #[inline]
+    fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
+        (**self).read_to_end(buf)
+    }
+
+    #[inline]
+    fn read_to_string(&mut self, buf: &mut String) -> io::Result<usize> {
+        (**self).read_to_string(buf)
+    }
+
+    #[inline]
+    fn read_exact(&mut self, buf: &mut [u8]) -> io::Result<()> {
+        (**self).read_exact(buf)
+    }
+}
+
+impl<W: Write + ?Sized> Write for Box<W> {
+    #[inline]
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        (**self).write(buf)
+    }
+
+    #[inline]
+    fn flush(&mut self) -> io::Result<()> {
+        (**self).flush()
+    }
+
+    #[inline]
+    fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
+        (**self).write_all(buf)
+    }
+
+    #[inline]
+    fn write_fmt(&mut self, fmt: fmt::Arguments) -> io::Result<()> {
+        (**self).write_fmt(fmt)
+    }
+}
+
+impl<S: Seek + ?Sized> Seek for Box<S> {
+    #[inline]
+    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
+        (**self).seek(pos)
+    }
+}
+
+impl<B: BufRead + ?Sized> BufRead for Box<B> {
+    #[inline]
+    fn fill_buf(&mut self) -> io::Result<&[u8]> {
+        (**self).fill_buf()
+    }
+
+    #[inline]
+    fn consume(&mut self, amt: usize) {
+        (**self).consume(amt)
+    }
+
+    #[inline]
+    fn read_until(&mut self, byte: u8, buf: &mut Vec<u8>) -> io::Result<usize> {
+        (**self).read_until(byte, buf)
+    }
+
+    #[inline]
+    fn read_line(&mut self, buf: &mut String) -> io::Result<usize> {
+        (**self).read_line(buf)
+    }
+}
+
+// =============================================================================
+// In-memory buffer implementations
+
+/// Read is implemented for `&[u8]` by copying from the slice.
+///
+/// Note that reading updates the slice to point to the yet unread part.
+/// The slice will be empty when EOF is reached.
+impl Read for &[u8] {
+    #[inline]
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let amt = cmp::min(buf.len(), self.len());
+        let (a, b) = self.split_at(amt);
+
+        // First check if the amount of bytes we want to read is small:
+        // `copy_from_slice` will generally expand to a call to `memcpy`, and
+        // for a single byte the overhead is significant.
+        if amt == 1 {
+            buf[0] = a[0];
+        } else {
+            buf[..amt].copy_from_slice(a);
+        }
+
+        *self = b;
+        Ok(amt)
+    }
+
+    #[inline]
+    unsafe fn initializer(&self) -> Initializer {
+        unsafe { Initializer::nop() }
+    }
+
+    #[inline]
+    fn read_exact(&mut self, buf: &mut [u8]) -> io::Result<()> {
+        if buf.len() > self.len() {
+            return Err(Error::new(
+                ErrorKind::UnexpectedEof,
+                "failed to fill whole buffer",
+            ));
+        }
+        let (a, b) = self.split_at(buf.len());
+
+        // First check if the amount of bytes we want to read is small:
+        // `copy_from_slice` will generally expand to a call to `memcpy`, and
+        // for a single byte the overhead is significant.
+        if buf.len() == 1 {
+            buf[0] = a[0];
+        } else {
+            buf.copy_from_slice(a);
+        }
+
+        *self = b;
+        Ok(())
+    }
+
+    #[inline]
+    fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
+        buf.extend_from_slice(self);
+        let len = self.len();
+        *self = &self[len..];
+        Ok(len)
+    }
+}
+
+impl BufRead for &[u8] {
+    #[inline]
+    fn fill_buf(&mut self) -> io::Result<&[u8]> {
+        Ok(*self)
+    }
+
+    #[inline]
+    fn consume(&mut self, amt: usize) {
+        *self = &self[amt..];
+    }
+}
+
+/// Write is implemented for `&mut [u8]` by copying into the slice, overwriting
+/// its data.
+///
+/// Note that writing updates the slice to point to the yet unwritten part.
+/// The slice will be empty when it has been completely overwritten.
+impl Write for &mut [u8] {
+    #[inline]
+    fn write(&mut self, data: &[u8]) -> io::Result<usize> {
+        let amt = cmp::min(data.len(), self.len());
+        let (a, b) = mem::take(self).split_at_mut(amt);
+        a.copy_from_slice(&data[..amt]);
+        *self = b;
+        Ok(amt)
+    }
+
+    #[inline]
+    fn write_all(&mut self, data: &[u8]) -> io::Result<()> {
+        if self.write(data)? == data.len() {
+            Ok(())
+        } else {
+            Err(Error::new(
+                ErrorKind::WriteZero,
+                "failed to write whole buffer",
+            ))
+        }
+    }
+
+    #[inline]
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+/// Write is implemented for `Vec<u8>` by appending to the vector.
+/// The vector will grow as needed.
+impl Write for Vec<u8> {
+    #[inline]
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.extend_from_slice(buf);
+        Ok(buf.len())
+    }
+
+    #[inline]
+    fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
+        self.extend_from_slice(buf);
+        Ok(())
+    }
+
+    #[inline]
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
diff --git a/recipes/core/relibc/src/io/mod.rs b/recipes/core/relibc/src/io/mod.rs
new file mode 100644
index 0000000000..d4f09e1d2d
--- /dev/null
+++ b/recipes/core/relibc/src/io/mod.rs
@@ -0,0 +1,2266 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Traits, helpers, and type definitions for core I/O functionality.
+//!
+//! The `std::io` module contains a number of common things you'll need
+//! when doing input and output. The most core part of this module is
+//! the [`Read`] and [`Write`] traits, which provide the
+//! most general interface for reading and writing input and output.
+//!
+//! # Read and Write
+//!
+//! Because they are traits, [`Read`] and [`Write`] are implemented by a number
+//! of other types, and you can implement them for your types too. As such,
+//! you'll see a few different types of I/O throughout the documentation in
+//! this module: [`File`]s, [`TcpStream`]s, and sometimes even [`Vec<T>`]s. For
+//! example, [`Read`] adds a [`read`][`Read::read`] method, which we can use on
+//! [`File`]s:
+//!
+//! ```no_run
+//! use std::io;
+//! use std::io::prelude::*;
+//! use std::fs::File;
+//!
+//! fn main() -> io::Result<()> {
+//!     let mut f = File::open("foo.txt")?;
+//!     let mut buffer = [0; 10];
+//!
+//!     // read up to 10 bytes
+//!     f.read(&mut buffer)?;
+//!
+//!     println!("The bytes: {:?}", buffer);
+//!     Ok(())
+//! }
+//! ```
+//!
+//! [`Read`] and [`Write`] are so important, implementors of the two traits have a
+//! nickname: readers and writers. So you'll sometimes see 'a reader' instead
+//! of 'a type that implements the [`Read`] trait'. Much easier!
+//!
+//! ## Seek and BufRead
+//!
+//! Beyond that, there are two important traits that are provided: [`Seek`]
+//! and [`BufRead`]. Both of these build on top of a reader to control
+//! how the reading happens. [`Seek`] lets you control where the next byte is
+//! coming from:
+//!
+//! ```no_run
+//! use std::io;
+//! use std::io::prelude::*;
+//! use std::io::SeekFrom;
+//! use std::fs::File;
+//!
+//! fn main() -> io::Result<()> {
+//!     let mut f = File::open("foo.txt")?;
+//!     let mut buffer = [0; 10];
+//!
+//!     // skip to the last 10 bytes of the file
+//!     f.seek(SeekFrom::End(-10))?;
+//!
+//!     // read up to 10 bytes
+//!     f.read(&mut buffer)?;
+//!
+//!     println!("The bytes: {:?}", buffer);
+//!     Ok(())
+//! }
+//! ```
+//!
+//! [`BufRead`] uses an internal buffer to provide a number of other ways to read, but
+//! to show it off, we'll need to talk about buffers in general. Keep reading!
+//!
+//! ## BufReader and BufWriter
+//!
+//! Byte-based interfaces are unwieldy and can be inefficient, as we'd need to be
+//! making near-constant calls to the operating system. To help with this,
+//! `std::io` comes with two structs, [`BufReader`] and [`BufWriter`], which wrap
+//! readers and writers. The wrapper uses a buffer, reducing the number of
+//! calls and providing nicer methods for accessing exactly what you want.
+//!
+//! For example, [`BufReader`] works with the [`BufRead`] trait to add extra
+//! methods to any reader:
+//!
+//! ```no_run
+//! use std::io;
+//! use std::io::prelude::*;
+//! use std::io::BufReader;
+//! use std::fs::File;
+//!
+//! fn main() -> io::Result<()> {
+//!     let f = File::open("foo.txt")?;
+//!     let mut reader = BufReader::new(f);
+//!     let mut buffer = String::new();
+//!
+//!     // read a line into buffer
+//!     reader.read_line(&mut buffer)?;
+//!
+//!     println!("{}", buffer);
+//!     Ok(())
+//! }
+//! ```
+//!
+//! [`BufWriter`] doesn't add any new ways of writing; it just buffers every call
+//! to [`write`][`Write::write`]:
+//!
+//! ```no_run
+//! use std::io;
+//! use std::io::prelude::*;
+//! use std::io::BufWriter;
+//! use std::fs::File;
+//!
+//! fn main() -> io::Result<()> {
+//!     let f = File::create("foo.txt")?;
+//!     {
+//!         let mut writer = BufWriter::new(f);
+//!
+//!         // write a byte to the buffer
+//!         writer.write(&[42])?;
+//!
+//!     } // the buffer is flushed once writer goes out of scope
+//!
+//!     Ok(())
+//! }
+//! ```
+//!
+//! ## Standard input and output
+//!
+//! A very common source of input is standard input:
+//!
+//! ```no_run
+//! use std::io;
+//!
+//! fn main() -> io::Result<()> {
+//!     let mut input = String::new();
+//!
+//!     io::stdin().read_line(&mut input)?;
+//!
+//!     println!("You typed: {}", input.trim());
+//!     Ok(())
+//! }
+//! ```
+//!
+//! Note that you cannot use the [`?` operator] in functions that do not return
+//! a [`Result<T, E>`][`Result`]. Instead, you can call [`.unwrap()`]
+//! or `match` on the return value to catch any possible errors:
+//!
+//! ```no_run
+//! use std::io;
+//!
+//! let mut input = String::new();
+//!
+//! io::stdin().read_line(&mut input).unwrap();
+//! ```
+//!
+//! And a very common source of output is standard output:
+//!
+//! ```no_run
+//! use std::io;
+//! use std::io::prelude::*;
+//!
+//! fn main() -> io::Result<()> {
+//!     io::stdout().write(&[42])?;
+//!     Ok(())
+//! }
+//! ```
+//!
+//! Of course, using [`io::stdout`] directly is less common than something like
+//! [`println!`].
+//!
+//! ## Iterator types
+//!
+//! A large number of the structures provided by `std::io` are for various
+//! ways of iterating over I/O. For example, [`Lines`] is used to split over
+//! lines:
+//!
+//! ```no_run
+//! use std::io;
+//! use std::io::prelude::*;
+//! use std::io::BufReader;
+//! use std::fs::File;
+//!
+//! fn main() -> io::Result<()> {
+//!     let f = File::open("foo.txt")?;
+//!     let reader = BufReader::new(f);
+//!
+//!     for line in reader.lines() {
+//!         println!("{}", line?);
+//!     }
+//!     Ok(())
+//! }
+//! ```
+//!
+//! ## Functions
+//!
+//! There are a number of [functions][functions-list] that offer access to various
+//! features. For example, we can use three of these functions to copy everything
+//! from standard input to standard output:
+//!
+//! ```no_run
+//! use std::io;
+//!
+//! fn main() -> io::Result<()> {
+//!     io::copy(&mut io::stdin(), &mut io::stdout())?;
+//!     Ok(())
+//! }
+//! ```
+//!
+//! [functions-list]: #functions-1
+//!
+//! ## io::Result
+//!
+//! Last, but certainly not least, is [`io::Result`]. This type is used
+//! as the return type of many `std::io` functions that can cause an error, and
+//! can be returned from your own functions as well. Many of the examples in this
+//! module use the [`?` operator]:
+//!
+//! ```
+//! use std::io;
+//!
+//! fn read_input() -> io::Result<()> {
+//!     let mut input = String::new();
+//!
+//!     io::stdin().read_line(&mut input)?;
+//!
+//!     println!("You typed: {}", input.trim());
+//!
+//!     Ok(())
+//! }
+//! ```
+//!
+//! The return type of `read_input()`, [`io::Result<()>`][`io::Result`], is a very
+//! common type for functions which don't have a 'real' return value, but do want to
+//! return errors if they happen. In this case, the only purpose of this function is
+//! to read the line and print it, so we use `()`.
+//!
+//! ## Platform-specific behavior
+//!
+//! Many I/O functions throughout the standard library are documented to indicate
+//! what various library or syscalls they are delegated to. This is done to help
+//! applications both understand what's happening under the hood as well as investigate
+//! any possibly unclear semantics. Note, however, that this is informative, not a binding
+//! contract. The implementation of many of these functions are subject to change over
+//! time and may call fewer or more syscalls/library functions.
+//!
+//! [`Read`]: trait.Read.html
+//! [`Write`]: trait.Write.html
+//! [`Seek`]: trait.Seek.html
+//! [`BufRead`]: trait.BufRead.html
+//! [`File`]: ../fs/struct.File.html
+//! [`TcpStream`]: ../net/struct.TcpStream.html
+//! [`Vec<T>`]: ../vec/struct.Vec.html
+//! [`BufReader`]: struct.BufReader.html
+//! [`BufWriter`]: struct.BufWriter.html
+//! [`Write::write`]: trait.Write.html#tymethod.write
+//! [`io::stdout`]: fn.stdout.html
+//! [`println!`]: ../macro.println.html
+//! [`Lines`]: struct.Lines.html
+//! [`io::Result`]: type.Result.html
+//! [`?` operator]: ../../book/first-edition/syntax-index.html
+//! [`Read::read`]: trait.Read.html#tymethod.read
+//! [`Result`]: ../result/enum.Result.html
+//! [`.unwrap()`]: ../result/enum.Result.html#method.unwrap
+
+pub mod buffered;
+pub mod cursor;
+pub mod error;
+mod impls;
+pub mod prelude;
+
+use crate::out::Out;
+
+pub use self::{buffered::*, cursor::*, error::*};
+
+use self::prelude::*;
+
+use alloc::string::String;
+use core::{cmp, fmt, ptr, str};
+
+const DEFAULT_BUF_SIZE: usize = 8 * 1024;
+
+#[inline]
+pub fn last_os_error() -> Error {
+    Error::last_os_error()
+}
+
+struct Guard<'a> {
+    buf: &'a mut Vec<u8>,
+    len: usize,
+}
+
+impl<'a> Drop for Guard<'a> {
+    fn drop(&mut self) {
+        unsafe {
+            self.buf.set_len(self.len);
+        }
+    }
+}
+
+// A few methods below (read_to_string, read_line) will append data into a
+// `String` buffer, but we need to be pretty careful when doing this. The
+// implementation will just call `.as_mut_vec()` and then delegate to a
+// byte-oriented reading method, but we must ensure that when returning we never
+// leave `buf` in a state such that it contains invalid UTF-8 in its bounds.
+//
+// To this end, we use an RAII guard (to protect against panics) which updates
+// the length of the string when it is dropped. This guard initially truncates
+// the string to the prior length and only after we've validated that the
+// new contents are valid UTF-8 do we allow it to set a longer length.
+//
+// The unsafety in this function is twofold:
+//
+// 1. We're looking at the raw bytes of `buf`, so we take on the burden of UTF-8
+//    checks.
+// 2. We're passing a raw buffer to the function `f`, and it is expected that
+//    the function only *appends* bytes to the buffer. We'll get undefined
+//    behavior if existing bytes are overwritten to have non-UTF-8 data.
+fn append_to_string<F>(buf: &mut String, f: F) -> Result<usize>
+where
+    F: FnOnce(&mut Vec<u8>) -> Result<usize>,
+{
+    unsafe {
+        let mut g = Guard {
+            len: buf.len(),
+            buf: buf.as_mut_vec(),
+        };
+        let ret = f(g.buf);
+        if str::from_utf8(&g.buf[g.len..]).is_err() {
+            ret.and_then(|_| {
+                Err(Error::new(
+                    ErrorKind::InvalidData,
+                    "stream did not contain valid UTF-8",
+                ))
+            })
+        } else {
+            g.len = g.buf.len();
+            ret
+        }
+    }
+}
+
+// This uses an adaptive system to extend the vector when it fills. We want to
+// avoid paying to allocate and zero a huge chunk of memory if the reader only
+// has 4 bytes while still making large reads if the reader does have a ton
+// of data to return. Simply tacking on an extra DEFAULT_BUF_SIZE space every
+// time is 4,500 times (!) slower than a default reservation size of 32 if the
+// reader has a very small amount of data to return.
+//
+// Because we're extending the buffer with uninitialized data for trusted
+// readers, we need to make sure to truncate that if any of this panics.
+fn read_to_end<R: Read + ?Sized>(r: &mut R, buf: &mut Vec<u8>) -> Result<usize> {
+    read_to_end_with_reservation(r, buf, 32)
+}
+
+fn read_to_end_with_reservation<R: Read + ?Sized>(
+    r: &mut R,
+    buf: &mut Vec<u8>,
+    reservation_size: usize,
+) -> Result<usize> {
+    let start_len = buf.len();
+    let mut g = Guard {
+        len: buf.len(),
+        buf,
+    };
+    let ret;
+    loop {
+        if g.len == g.buf.len() {
+            unsafe {
+                g.buf.reserve(reservation_size);
+                let capacity = g.buf.capacity();
+                g.buf.set_len(capacity);
+                r.initializer().initialize(&mut g.buf[g.len..]);
+            }
+        }
+
+        match r.read(&mut g.buf[g.len..]) {
+            Ok(0) => {
+                ret = Ok(g.len - start_len);
+                break;
+            }
+            Ok(n) => g.len += n,
+            Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
+            Err(e) => {
+                ret = Err(e);
+                break;
+            }
+        }
+    }
+
+    ret
+}
+
+fn read_until<R: BufRead + ?Sized>(r: &mut R, delim: u8, buf: &mut Vec<u8>) -> Result<usize> {
+    let mut read = 0;
+    loop {
+        let (done, used) = {
+            let available = match r.fill_buf() {
+                Ok(n) => n,
+                Err(ref e) if e.kind() == ErrorKind::Interrupted => continue,
+                Err(e) => return Err(e),
+            };
+            match memchr::memchr(delim, available) {
+                Some(i) => {
+                    buf.extend_from_slice(&available[..i + 1]);
+                    (true, i + 1)
+                }
+                None => {
+                    buf.extend_from_slice(available);
+                    (false, available.len())
+                }
+            }
+        };
+        r.consume(used);
+        read += used;
+        if done || used == 0 {
+            return Ok(read);
+        }
+    }
+}
+
+/// The `Read` trait allows for reading bytes from a source.
+///
+/// Implementors of the `Read` trait are called 'readers'.
+///
+/// Readers are defined by one required method, [`read()`]. Each call to [`read()`]
+/// will attempt to pull bytes from this source into a provided buffer. A
+/// number of other methods are implemented in terms of [`read()`], giving
+/// implementors a number of ways to read bytes while only needing to implement
+/// a single method.
+///
+/// Readers are intended to be composable with one another. Many implementors
+/// throughout [`std::io`] take and provide types which implement the `Read`
+/// trait.
+///
+/// Please note that each call to [`read()`] may involve a system call, and
+/// therefore, using something that implements [`BufRead`], such as
+/// [`BufReader`], will be more efficient.
+///
+/// # Examples
+///
+/// [`File`]s implement `Read`:
+///
+/// ```no_run
+/// use std::io;
+/// use std::io::prelude::*;
+/// use std::fs::File;
+///
+/// fn main() -> io::Result<()> {
+///     let mut f = File::open("foo.txt")?;
+///     let mut buffer = [0; 10];
+///
+///     // read up to 10 bytes
+///     f.read(&mut buffer)?;
+///
+///     let mut buffer = vec![0; 10];
+///     // read the whole file
+///     f.read_to_end(&mut buffer)?;
+///
+///     // read into a String, so that you don't need to do the conversion.
+///     let mut buffer = String::new();
+///     f.read_to_string(&mut buffer)?;
+///
+///     // and more! See the other methods for more details.
+///     Ok(())
+/// }
+/// ```
+///
+/// Read from [`&str`] because [`&[u8]`][slice] implements `Read`:
+///
+/// ```no_run
+/// # use std::io;
+/// use std::io::prelude::*;
+///
+/// fn main() -> io::Result<()> {
+///     let mut b = "This string will be read".as_bytes();
+///     let mut buffer = [0; 10];
+///
+///     // read up to 10 bytes
+///     b.read(&mut buffer)?;
+///
+///     // etc... it works exactly as a File does!
+///     Ok(())
+/// }
+/// ```
+///
+/// [`read()`]: trait.Read.html#tymethod.read
+/// [`std::io`]: ../../std/io/index.html
+/// [`File`]: ../fs/struct.File.html
+/// [`BufRead`]: trait.BufRead.html
+/// [`BufReader`]: struct.BufReader.html
+/// [`&str`]: ../../std/primitive.str.html
+/// [slice]: ../../std/primitive.slice.html
+pub trait Read {
+    /// Pull some bytes from this source into the specified buffer, returning
+    /// how many bytes were read.
+    ///
+    /// This function does not provide any guarantees about whether it blocks
+    /// waiting for data, but if an object needs to block for a read but cannot
+    /// it will typically signal this via an [`Err`] return value.
+    ///
+    /// If the return value of this method is [`Ok(n)`], then it must be
+    /// guaranteed that `0 <= n <= buf.len()`. A nonzero `n` value indicates
+    /// that the buffer `buf` has been filled in with `n` bytes of data from this
+    /// source. If `n` is `0`, then it can indicate one of two scenarios:
+    ///
+    /// 1. This reader has reached its "end of file" and will likely no longer
+    ///    be able to produce bytes. Note that this does not mean that the
+    ///    reader will *always* no longer be able to produce bytes.
+    /// 2. The buffer specified was 0 bytes in length.
+    ///
+    /// No guarantees are provided about the contents of `buf` when this
+    /// function is called, implementations cannot rely on any property of the
+    /// contents of `buf` being true. It is recommended that implementations
+    /// only write data to `buf` instead of reading its contents.
+    ///
+    /// # Errors
+    ///
+    /// If this function encounters any form of I/O or other error, an error
+    /// variant will be returned. If an error is returned then it must be
+    /// guaranteed that no bytes were read.
+    ///
+    /// An error of the [`ErrorKind::Interrupted`] kind is non-fatal and the read
+    /// operation should be retried if there is nothing else to do.
+    ///
+    /// # Examples
+    ///
+    /// [`File`]s implement `Read`:
+    ///
+    /// [`Err`]: ../../std/result/enum.Result.html#variant.Err
+    /// [`Ok(n)`]: ../../std/result/enum.Result.html#variant.Ok
+    /// [`ErrorKind::Interrupted`]: ../../std/io/enum.ErrorKind.html#variant.Interrupted
+    /// [`File`]: ../fs/struct.File.html
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut f = File::open("foo.txt")?;
+    ///     let mut buffer = [0; 10];
+    ///
+    ///     // read up to 10 bytes
+    ///     f.read(&mut buffer[..])?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn read(&mut self, buf: &mut [u8]) -> Result<usize>;
+
+    fn read_out(&mut self, mut out: Out<[u8]>) -> Result<usize> {
+        // XXX: Technically incorrect but hopefully not UB
+        let slice: &mut [u8] = unsafe { &mut *out.as_mut_ptr() };
+        self.read(slice)
+    }
+
+    /// Determines if this `Read`er can work with buffers of uninitialized
+    /// memory.
+    ///
+    /// The default implementation returns an initializer which will zero
+    /// buffers.
+    ///
+    /// If a `Read`er guarantees that it can work properly with uninitialized
+    /// memory, it should call [`Initializer::nop()`]. See the documentation for
+    /// [`Initializer`] for details.
+    ///
+    /// The behavior of this method must be independent of the state of the
+    /// `Read`er - the method only takes `&self` so that it can be used through
+    /// trait objects.
+    ///
+    /// # Safety
+    ///
+    /// This method is unsafe because a `Read`er could otherwise return a
+    /// non-zeroing `Initializer` from another `Read` type without an `unsafe`
+    /// block.
+    ///
+    /// [`Initializer::nop()`]: ../../std/io/struct.Initializer.html#method.nop
+    /// [`Initializer`]: ../../std/io/struct.Initializer.html
+    #[inline]
+    unsafe fn initializer(&self) -> Initializer {
+        Initializer::zeroing()
+    }
+
+    /// Read all bytes until EOF in this source, placing them into `buf`.
+    ///
+    /// All bytes read from this source will be appended to the specified buffer
+    /// `buf`. This function will continuously call [`read()`] to append more data to
+    /// `buf` until [`read()`] returns either [`Ok(0)`] or an error of
+    /// non-[`ErrorKind::Interrupted`] kind.
+    ///
+    /// If successful, this function will return the total number of bytes read.
+    ///
+    /// # Errors
+    ///
+    /// If this function encounters an error of the kind
+    /// [`ErrorKind::Interrupted`] then the error is ignored and the operation
+    /// will continue.
+    ///
+    /// If any other read error is encountered then this function immediately
+    /// returns. Any bytes which have already been read will be appended to
+    /// `buf`.
+    ///
+    /// # Examples
+    ///
+    /// [`File`]s implement `Read`:
+    ///
+    /// [`read()`]: trait.Read.html#tymethod.read
+    /// [`Ok(0)`]: ../../std/result/enum.Result.html#variant.Ok
+    /// [`ErrorKind::Interrupted`]: ../../std/io/enum.ErrorKind.html#variant.Interrupted
+    /// [`File`]: ../fs/struct.File.html
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut f = File::open("foo.txt")?;
+    ///     let mut buffer = Vec::new();
+    ///
+    ///     // read the whole file
+    ///     f.read_to_end(&mut buffer)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// (See also the [`std::fs::read`] convenience function for reading from a
+    /// file.)
+    ///
+    /// [`std::fs::read`]: ../fs/fn.read.html
+    fn read_to_end(&mut self, buf: &mut Vec<u8>) -> Result<usize> {
+        read_to_end(self, buf)
+    }
+
+    /// Read all bytes until EOF in this source, appending them to `buf`.
+    ///
+    /// If successful, this function returns the number of bytes which were read
+    /// and appended to `buf`.
+    ///
+    /// # Errors
+    ///
+    /// If the data in this stream is *not* valid UTF-8 then an error is
+    /// returned and `buf` is unchanged.
+    ///
+    /// See [`read_to_end`][readtoend] for other error semantics.
+    ///
+    /// [readtoend]: #method.read_to_end
+    ///
+    /// # Examples
+    ///
+    /// [`File`][file]s implement `Read`:
+    ///
+    /// [file]: ../fs/struct.File.html
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut f = File::open("foo.txt")?;
+    ///     let mut buffer = String::new();
+    ///
+    ///     f.read_to_string(&mut buffer)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    ///
+    /// (See also the [`std::fs::read_to_string`] convenience function for
+    /// reading from a file.)
+    ///
+    /// [`std::fs::read_to_string`]: ../fs/fn.read_to_string.html
+    fn read_to_string(&mut self, buf: &mut String) -> Result<usize> {
+        // Note that we do *not* call `.read_to_end()` here. We are passing
+        // `&mut Vec<u8>` (the raw contents of `buf`) into the `read_to_end`
+        // method to fill it up. An arbitrary implementation could overwrite the
+        // entire contents of the vector, not just append to it (which is what
+        // we are expecting).
+        //
+        // To prevent extraneously checking the UTF-8-ness of the entire buffer
+        // we pass it to our hardcoded `read_to_end` implementation which we
+        // know is guaranteed to only read data into the end of the buffer.
+        append_to_string(buf, |b| read_to_end(self, b))
+    }
+
+    /// Read the exact number of bytes required to fill `buf`.
+    ///
+    /// This function reads as many bytes as necessary to completely fill the
+    /// specified buffer `buf`.
+    ///
+    /// No guarantees are provided about the contents of `buf` when this
+    /// function is called, implementations cannot rely on any property of the
+    /// contents of `buf` being true. It is recommended that implementations
+    /// only write data to `buf` instead of reading its contents.
+    ///
+    /// # Errors
+    ///
+    /// If this function encounters an error of the kind
+    /// [`ErrorKind::Interrupted`] then the error is ignored and the operation
+    /// will continue.
+    ///
+    /// If this function encounters an "end of file" before completely filling
+    /// the buffer, it returns an error of the kind [`ErrorKind::UnexpectedEof`].
+    /// The contents of `buf` are unspecified in this case.
+    ///
+    /// If any other read error is encountered then this function immediately
+    /// returns. The contents of `buf` are unspecified in this case.
+    ///
+    /// If this function returns an error, it is unspecified how many bytes it
+    /// has read, but it will never read more than would be necessary to
+    /// completely fill the buffer.
+    ///
+    /// # Examples
+    ///
+    /// [`File`]s implement `Read`:
+    ///
+    /// [`File`]: ../fs/struct.File.html
+    /// [`ErrorKind::Interrupted`]: ../../std/io/enum.ErrorKind.html#variant.Interrupted
+    /// [`ErrorKind::UnexpectedEof`]: ../../std/io/enum.ErrorKind.html#variant.UnexpectedEof
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut f = File::open("foo.txt")?;
+    ///     let mut buffer = [0; 10];
+    ///
+    ///     // read exactly 10 bytes
+    ///     f.read_exact(&mut buffer)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn read_exact(&mut self, mut buf: &mut [u8]) -> Result<()> {
+        while !buf.is_empty() {
+            match self.read(buf) {
+                Ok(0) => break,
+                Ok(n) => {
+                    let tmp = buf;
+                    buf = &mut tmp[n..];
+                }
+                Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
+                Err(e) => return Err(e),
+            }
+        }
+        if !buf.is_empty() {
+            Err(Error::new(
+                ErrorKind::UnexpectedEof,
+                "failed to fill whole buffer",
+            ))
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Creates a "by reference" adaptor for this instance of `Read`.
+    ///
+    /// The returned adaptor also implements `Read` and will simply borrow this
+    /// current reader.
+    ///
+    /// # Examples
+    ///
+    /// [`File`][file]s implement `Read`:
+    ///
+    /// [file]: ../fs/struct.File.html
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::Read;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut f = File::open("foo.txt")?;
+    ///     let mut buffer = Vec::new();
+    ///     let mut other_buffer = Vec::new();
+    ///
+    ///     {
+    ///         let reference = f.by_ref();
+    ///
+    ///         // read at most 5 bytes
+    ///         reference.take(5).read_to_end(&mut buffer)?;
+    ///
+    ///     } // drop our &mut reference so we can use f again
+    ///
+    ///     // original file still usable, read the rest
+    ///     f.read_to_end(&mut other_buffer)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn by_ref(&mut self) -> &mut Self
+    where
+        Self: Sized,
+    {
+        self
+    }
+
+    /// Transforms this `Read` instance to an [`Iterator`] over its bytes.
+    ///
+    /// The returned type implements [`Iterator`] where the `Item` is
+    /// [`Result`]`<`[`u8`]`, `[`io::Error`]`>`.
+    /// The yielded item is [`Ok`] if a byte was successfully read and [`Err`]
+    /// otherwise. EOF is mapped to returning [`None`] from this iterator.
+    ///
+    /// # Examples
+    ///
+    /// [`File`][file]s implement `Read`:
+    ///
+    /// [file]: ../fs/struct.File.html
+    /// [`Iterator`]: ../../std/iter/trait.Iterator.html
+    /// [`Result`]: ../../std/result/enum.Result.html
+    /// [`io::Error`]: ../../std/io/struct.Error.html
+    /// [`u8`]: ../../std/primitive.u8.html
+    /// [`Ok`]: ../../std/result/enum.Result.html#variant.Ok
+    /// [`Err`]: ../../std/result/enum.Result.html#variant.Err
+    /// [`None`]: ../../std/option/enum.Option.html#variant.None
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut f = File::open("foo.txt")?;
+    ///
+    ///     for byte in f.bytes() {
+    ///         println!("{}", byte.unwrap());
+    ///     }
+    ///     Ok(())
+    /// }
+    /// ```
+    fn bytes(self) -> Bytes<Self>
+    where
+        Self: Sized,
+    {
+        Bytes { inner: self }
+    }
+
+    /// Creates an adaptor which will chain this stream with another.
+    ///
+    /// The returned `Read` instance will first read all bytes from this object
+    /// until EOF is encountered. Afterwards the output is equivalent to the
+    /// output of `next`.
+    ///
+    /// # Examples
+    ///
+    /// [`File`][file]s implement `Read`:
+    ///
+    /// [file]: ../fs/struct.File.html
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut f1 = File::open("foo.txt")?;
+    ///     let mut f2 = File::open("bar.txt")?;
+    ///
+    ///     let mut handle = f1.chain(f2);
+    ///     let mut buffer = String::new();
+    ///
+    ///     // read the value into a String. We could use any Read method here,
+    ///     // this is just one example.
+    ///     handle.read_to_string(&mut buffer)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn chain<R: Read>(self, next: R) -> Chain<Self, R>
+    where
+        Self: Sized,
+    {
+        Chain {
+            first: self,
+            second: next,
+            done_first: false,
+        }
+    }
+
+    /// Creates an adaptor which will read at most `limit` bytes from it.
+    ///
+    /// This function returns a new instance of `Read` which will read at most
+    /// `limit` bytes, after which it will always return EOF ([`Ok(0)`]). Any
+    /// read errors will not count towards the number of bytes read and future
+    /// calls to [`read()`] may succeed.
+    ///
+    /// # Examples
+    ///
+    /// [`File`]s implement `Read`:
+    ///
+    /// [`File`]: ../fs/struct.File.html
+    /// [`Ok(0)`]: ../../std/result/enum.Result.html#variant.Ok
+    /// [`read()`]: trait.Read.html#tymethod.read
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut f = File::open("foo.txt")?;
+    ///     let mut buffer = [0; 5];
+    ///
+    ///     // read at most five bytes
+    ///     let mut handle = f.take(5);
+    ///
+    ///     handle.read(&mut buffer)?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn take(self, limit: u64) -> Take<Self>
+    where
+        Self: Sized,
+    {
+        Take { inner: self, limit }
+    }
+}
+
+fn read_one_byte(reader: &mut dyn Read) -> Option<Result<u8>> {
+    let mut buf = [0];
+    loop {
+        return match reader.read(&mut buf) {
+            Ok(0) => None,
+            Ok(..) => Some(Ok(buf[0])),
+            Err(ref e) if e.kind() == ErrorKind::Interrupted => continue,
+            Err(e) => Some(Err(e)),
+        };
+    }
+}
+
+/// A `BufRead` is a type of `Read`er which has an internal buffer, allowing it
+/// to perform extra ways of reading.
+///
+/// For example, reading line-by-line is inefficient without using a buffer, so
+/// if you want to read by line, you'll need `BufRead`, which includes a
+/// [`read_line`] method as well as a [`lines`] iterator.
+///
+/// # Examples
+///
+/// A locked standard input implements `BufRead`:
+///
+/// ```no_run
+/// use std::io;
+/// use std::io::prelude::*;
+///
+/// let stdin = io::stdin();
+/// for line in stdin.lock().lines() {
+///     println!("{}", line.unwrap());
+/// }
+/// ```
+///
+/// If you have something that implements [`Read`], you can use the [`BufReader`
+/// type][`BufReader`] to turn it into a `BufRead`.
+///
+/// For example, [`File`] implements [`Read`], but not `BufRead`.
+/// [`BufReader`] to the rescue!
+///
+/// [`BufReader`]: struct.BufReader.html
+/// [`File`]: ../fs/struct.File.html
+/// [`read_line`]: #method.read_line
+/// [`lines`]: #method.lines
+/// [`Read`]: trait.Read.html
+///
+/// ```no_run
+/// use std::io::{self, BufReader};
+/// use std::io::prelude::*;
+/// use std::fs::File;
+///
+/// fn main() -> io::Result<()> {
+///     let f = File::open("foo.txt")?;
+///     let f = BufReader::new(f);
+///
+///     for line in f.lines() {
+///         println!("{}", line.unwrap());
+///     }
+///
+///     Ok(())
+/// }
+/// ```
+///
+pub trait BufRead: Read {
+    /// Returns the contents of the internal buffer, filling it with more data
+    /// from the inner reader if it is empty.
+    ///
+    /// This function is a lower-level call. It needs to be paired with the
+    /// [`consume`] method to function properly. When calling this
+    /// method, none of the contents will be "read" in the sense that later
+    /// calling `read` may return the same contents. As such, [`consume`] must
+    /// be called with the number of bytes that are consumed from this buffer to
+    /// ensure that the bytes are never returned twice.
+    ///
+    /// [`consume`]: #tymethod.consume
+    ///
+    /// An empty buffer returned indicates that the stream has reached EOF.
+    ///
+    /// # Errors
+    ///
+    /// This function will return an I/O error if the underlying reader was
+    /// read, but returned an error.
+    ///
+    /// # Examples
+    ///
+    /// A locked standard input implements `BufRead`:
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    ///
+    /// let stdin = io::stdin();
+    /// let mut stdin = stdin.lock();
+    ///
+    /// // we can't have two `&mut` references to `stdin`, so use a block
+    /// // to end the borrow early.
+    /// let length = {
+    ///     let buffer = stdin.fill_buf().unwrap();
+    ///
+    ///     // work with buffer
+    ///     println!("{:?}", buffer);
+    ///
+    ///     buffer.len()
+    /// };
+    ///
+    /// // ensure the bytes we worked with aren't returned again later
+    /// stdin.consume(length);
+    /// ```
+    fn fill_buf(&mut self) -> Result<&[u8]>;
+
+    /// Tells this buffer that `amt` bytes have been consumed from the buffer,
+    /// so they should no longer be returned in calls to `read`.
+    ///
+    /// This function is a lower-level call. It needs to be paired with the
+    /// [`fill_buf`] method to function properly. This function does
+    /// not perform any I/O, it simply informs this object that some amount of
+    /// its buffer, returned from [`fill_buf`], has been consumed and should
+    /// no longer be returned. As such, this function may do odd things if
+    /// [`fill_buf`] isn't called before calling it.
+    ///
+    /// The `amt` must be `<=` the number of bytes in the buffer returned by
+    /// [`fill_buf`].
+    ///
+    /// # Examples
+    ///
+    /// Since `consume()` is meant to be used with [`fill_buf`],
+    /// that method's example includes an example of `consume()`.
+    ///
+    /// [`fill_buf`]: #tymethod.fill_buf
+    fn consume(&mut self, amt: usize);
+
+    /// Read all bytes into `buf` until the delimiter `byte` or EOF is reached.
+    ///
+    /// This function will read bytes from the underlying stream until the
+    /// delimiter or EOF is found. Once found, all bytes up to, and including,
+    /// the delimiter (if found) will be appended to `buf`.
+    ///
+    /// If successful, this function will return the total number of bytes read.
+    ///
+    /// # Errors
+    ///
+    /// This function will ignore all instances of [`ErrorKind::Interrupted`] and
+    /// will otherwise return any errors returned by [`fill_buf`].
+    ///
+    /// If an I/O error is encountered then all bytes read so far will be
+    /// present in `buf` and its length will have been adjusted appropriately.
+    ///
+    /// [`fill_buf`]: #tymethod.fill_buf
+    /// [`ErrorKind::Interrupted`]: enum.ErrorKind.html#variant.Interrupted
+    ///
+    /// # Examples
+    ///
+    /// [`std::io::Cursor`][`Cursor`] is a type that implements `BufRead`. In
+    /// this example, we use [`Cursor`] to read all the bytes in a byte slice
+    /// in hyphen delimited segments:
+    ///
+    /// [`Cursor`]: struct.Cursor.html
+    ///
+    /// ```
+    /// use std::io::{self, BufRead};
+    ///
+    /// let mut cursor = io::Cursor::new(b"lorem-ipsum");
+    /// let mut buf = vec![];
+    ///
+    /// // cursor is at 'l'
+    /// let num_bytes = cursor.read_until(b'-', &mut buf)
+    ///     .expect("reading from cursor won't fail");
+    /// assert_eq!(num_bytes, 6);
+    /// assert_eq!(buf, b"lorem-");
+    /// buf.clear();
+    ///
+    /// // cursor is at 'i'
+    /// let num_bytes = cursor.read_until(b'-', &mut buf)
+    ///     .expect("reading from cursor won't fail");
+    /// assert_eq!(num_bytes, 5);
+    /// assert_eq!(buf, b"ipsum");
+    /// buf.clear();
+    ///
+    /// // cursor is at EOF
+    /// let num_bytes = cursor.read_until(b'-', &mut buf)
+    ///     .expect("reading from cursor won't fail");
+    /// assert_eq!(num_bytes, 0);
+    /// assert_eq!(buf, b"");
+    /// ```
+    fn read_until(&mut self, byte: u8, buf: &mut Vec<u8>) -> Result<usize> {
+        read_until(self, byte, buf)
+    }
+
+    /// Read all bytes until a newline (the 0xA byte) is reached, and append
+    /// them to the provided buffer.
+    ///
+    /// This function will read bytes from the underlying stream until the
+    /// newline delimiter (the 0xA byte) or EOF is found. Once found, all bytes
+    /// up to, and including, the delimiter (if found) will be appended to
+    /// `buf`.
+    ///
+    /// If successful, this function will return the total number of bytes read.
+    ///
+    /// An empty buffer returned indicates that the stream has reached EOF.
+    ///
+    /// # Errors
+    ///
+    /// This function has the same error semantics as [`read_until`] and will
+    /// also return an error if the read bytes are not valid UTF-8. If an I/O
+    /// error is encountered then `buf` may contain some bytes already read in
+    /// the event that all data read so far was valid UTF-8.
+    ///
+    /// [`read_until`]: #method.read_until
+    ///
+    /// # Examples
+    ///
+    /// [`std::io::Cursor`][`Cursor`] is a type that implements `BufRead`. In
+    /// this example, we use [`Cursor`] to read all the lines in a byte slice:
+    ///
+    /// [`Cursor`]: struct.Cursor.html
+    ///
+    /// ```
+    /// use std::io::{self, BufRead};
+    ///
+    /// let mut cursor = io::Cursor::new(b"foo\nbar");
+    /// let mut buf = String::new();
+    ///
+    /// // cursor is at 'f'
+    /// let num_bytes = cursor.read_line(&mut buf)
+    ///     .expect("reading from cursor won't fail");
+    /// assert_eq!(num_bytes, 4);
+    /// assert_eq!(buf, "foo\n");
+    /// buf.clear();
+    ///
+    /// // cursor is at 'b'
+    /// let num_bytes = cursor.read_line(&mut buf)
+    ///     .expect("reading from cursor won't fail");
+    /// assert_eq!(num_bytes, 3);
+    /// assert_eq!(buf, "bar");
+    /// buf.clear();
+    ///
+    /// // cursor is at EOF
+    /// let num_bytes = cursor.read_line(&mut buf)
+    ///     .expect("reading from cursor won't fail");
+    /// assert_eq!(num_bytes, 0);
+    /// assert_eq!(buf, "");
+    /// ```
+    fn read_line(&mut self, buf: &mut String) -> Result<usize> {
+        // Note that we are not calling the `.read_until` method here, but
+        // rather our hardcoded implementation. For more details as to why, see
+        // the comments in `read_to_end`.
+        append_to_string(buf, |b| read_until(self, b'\n', b))
+    }
+
+    /// Returns an iterator over the contents of this reader split on the byte
+    /// `byte`.
+    ///
+    /// The iterator returned from this function will return instances of
+    /// [`io::Result`]`<`[`Vec<u8>`]`>`. Each vector returned will *not* have
+    /// the delimiter byte at the end.
+    ///
+    /// This function will yield errors whenever [`read_until`] would have
+    /// also yielded an error.
+    ///
+    /// [`io::Result`]: type.Result.html
+    /// [`Vec<u8>`]: ../vec/struct.Vec.html
+    /// [`read_until`]: #method.read_until
+    ///
+    /// # Examples
+    ///
+    /// [`std::io::Cursor`][`Cursor`] is a type that implements `BufRead`. In
+    /// this example, we use [`Cursor`] to iterate over all hyphen delimited
+    /// segments in a byte slice
+    ///
+    /// [`Cursor`]: struct.Cursor.html
+    ///
+    /// ```
+    /// use std::io::{self, BufRead};
+    ///
+    /// let cursor = io::Cursor::new(b"lorem-ipsum-dolor");
+    ///
+    /// let mut split_iter = cursor.split(b'-').map(|l| l.unwrap());
+    /// assert_eq!(split_iter.next(), Some(b"lorem".to_vec()));
+    /// assert_eq!(split_iter.next(), Some(b"ipsum".to_vec()));
+    /// assert_eq!(split_iter.next(), Some(b"dolor".to_vec()));
+    /// assert_eq!(split_iter.next(), None);
+    /// ```
+    fn split(self, byte: u8) -> Split<Self>
+    where
+        Self: Sized,
+    {
+        Split {
+            buf: self,
+            delim: byte,
+        }
+    }
+
+    /// Returns an iterator over the lines of this reader.
+    ///
+    /// The iterator returned from this function will yield instances of
+    /// [`io::Result`]`<`[`String`]`>`. Each string returned will *not* have a newline
+    /// byte (the 0xA byte) or CRLF (0xD, 0xA bytes) at the end.
+    ///
+    /// [`io::Result`]: type.Result.html
+    /// [`String`]: ../string/struct.String.html
+    ///
+    /// # Examples
+    ///
+    /// [`std::io::Cursor`][`Cursor`] is a type that implements `BufRead`. In
+    /// this example, we use [`Cursor`] to iterate over all the lines in a byte
+    /// slice.
+    ///
+    /// [`Cursor`]: struct.Cursor.html
+    ///
+    /// ```
+    /// use std::io::{self, BufRead};
+    ///
+    /// let cursor = io::Cursor::new(b"lorem\nipsum\r\ndolor");
+    ///
+    /// let mut lines_iter = cursor.lines().map(|l| l.unwrap());
+    /// assert_eq!(lines_iter.next(), Some(String::from("lorem")));
+    /// assert_eq!(lines_iter.next(), Some(String::from("ipsum")));
+    /// assert_eq!(lines_iter.next(), Some(String::from("dolor")));
+    /// assert_eq!(lines_iter.next(), None);
+    /// ```
+    ///
+    /// # Errors
+    ///
+    /// Each line of the iterator has the same error semantics as [`BufRead::read_line`].
+    ///
+    /// [`BufRead::read_line`]: trait.BufRead.html#method.read_line
+    fn lines(self) -> Lines<Self>
+    where
+        Self: Sized,
+    {
+        Lines { buf: self }
+    }
+}
+
+/// A type used to conditionally initialize buffers passed to `Read` methods.
+#[derive(Debug)]
+pub struct Initializer(bool);
+
+impl Initializer {
+    /// Returns a new `Initializer` which will zero out buffers.
+    #[inline]
+    pub fn zeroing() -> Initializer {
+        Initializer(true)
+    }
+
+    /// Returns a new `Initializer` which will not zero out buffers.
+    ///
+    /// # Safety
+    ///
+    /// This may only be called by `Read`ers which guarantee that they will not
+    /// read from buffers passed to `Read` methods, and that the return value of
+    /// the method accurately reflects the number of bytes that have been
+    /// written to the head of the buffer.
+    #[inline]
+    pub unsafe fn nop() -> Initializer {
+        Initializer(false)
+    }
+
+    /// Indicates if a buffer should be initialized.
+    #[inline]
+    pub fn should_initialize(&self) -> bool {
+        self.0
+    }
+
+    /// Initializes a buffer if necessary.
+    #[inline]
+    pub fn initialize(&self, buf: &mut [u8]) {
+        if self.should_initialize() {
+            unsafe { ptr::write_bytes(buf.as_mut_ptr(), 0, buf.len()) }
+        }
+    }
+}
+
+/// Adaptor to chain together two readers.
+///
+/// This struct is generally created by calling [`chain`] on a reader.
+/// Please see the documentation of [`chain`] for more details.
+///
+/// [`chain`]: trait.Read.html#method.chain
+pub struct Chain<T, U> {
+    first: T,
+    second: U,
+    done_first: bool,
+}
+
+impl<T, U> Chain<T, U> {
+    /// Consumes the `Chain`, returning the wrapped readers.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut foo_file = File::open("foo.txt")?;
+    ///     let mut bar_file = File::open("bar.txt")?;
+    ///
+    ///     let chain = foo_file.chain(bar_file);
+    ///     let (foo_file, bar_file) = chain.into_inner();
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn into_inner(self) -> (T, U) {
+        (self.first, self.second)
+    }
+
+    /// Gets references to the underlying readers in this `Chain`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut foo_file = File::open("foo.txt")?;
+    ///     let mut bar_file = File::open("bar.txt")?;
+    ///
+    ///     let chain = foo_file.chain(bar_file);
+    ///     let (foo_file, bar_file) = chain.get_ref();
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn get_ref(&self) -> (&T, &U) {
+        (&self.first, &self.second)
+    }
+
+    /// Gets mutable references to the underlying readers in this `Chain`.
+    ///
+    /// Care should be taken to avoid modifying the internal I/O state of the
+    /// underlying readers as doing so may corrupt the internal state of this
+    /// `Chain`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut foo_file = File::open("foo.txt")?;
+    ///     let mut bar_file = File::open("bar.txt")?;
+    ///
+    ///     let mut chain = foo_file.chain(bar_file);
+    ///     let (foo_file, bar_file) = chain.get_mut();
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn get_mut(&mut self) -> (&mut T, &mut U) {
+        (&mut self.first, &mut self.second)
+    }
+}
+
+impl<T: Read, U: Read> Read for Chain<T, U> {
+    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
+        if !self.done_first {
+            match self.first.read(buf)? {
+                0 if !buf.is_empty() => {
+                    self.done_first = true;
+                }
+                n => return Ok(n),
+            }
+        }
+        self.second.read(buf)
+    }
+
+    unsafe fn initializer(&self) -> Initializer {
+        let initializer = unsafe { self.first.initializer() };
+        if initializer.should_initialize() {
+            initializer
+        } else {
+            unsafe { self.second.initializer() }
+        }
+    }
+}
+
+impl<T: BufRead, U: BufRead> BufRead for Chain<T, U> {
+    fn fill_buf(&mut self) -> Result<&[u8]> {
+        if !self.done_first {
+            match self.first.fill_buf()? {
+                [] => {
+                    self.done_first = true;
+                }
+                buf => return Ok(buf),
+            }
+        }
+        self.second.fill_buf()
+    }
+
+    fn consume(&mut self, amt: usize) {
+        if !self.done_first {
+            self.first.consume(amt)
+        } else {
+            self.second.consume(amt)
+        }
+    }
+}
+
+/// Reader adaptor which limits the bytes read from an underlying reader.
+///
+/// This struct is generally created by calling [`take`] on a reader.
+/// Please see the documentation of [`take`] for more details.
+///
+/// [`take`]: trait.Read.html#method.take
+#[derive(Debug)]
+pub struct Take<T> {
+    inner: T,
+    limit: u64,
+}
+
+impl<T> Take<T> {
+    /// Returns the number of bytes that can be read before this instance will
+    /// return EOF.
+    ///
+    /// # Note
+    ///
+    /// This instance may reach `EOF` after reading fewer bytes than indicated by
+    /// this method if the underlying [`Read`] instance reaches EOF.
+    ///
+    /// [`Read`]: ../../std/io/trait.Read.html
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let f = File::open("foo.txt")?;
+    ///
+    ///     // read at most five bytes
+    ///     let handle = f.take(5);
+    ///
+    ///     println!("limit: {}", handle.limit());
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn limit(&self) -> u64 {
+        self.limit
+    }
+
+    /// Sets the number of bytes that can be read before this instance will
+    /// return EOF. This is the same as constructing a new `Take` instance, so
+    /// the amount of bytes read and the previous limit value don't matter when
+    /// calling this method.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let f = File::open("foo.txt")?;
+    ///
+    ///     // read at most five bytes
+    ///     let mut handle = f.take(5);
+    ///     handle.set_limit(10);
+    ///
+    ///     assert_eq!(handle.limit(), 10);
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn set_limit(&mut self, limit: u64) {
+        self.limit = limit;
+    }
+
+    /// Consumes the `Take`, returning the wrapped reader.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut file = File::open("foo.txt")?;
+    ///
+    ///     let mut buffer = [0; 5];
+    ///     let mut handle = file.take(5);
+    ///     handle.read(&mut buffer)?;
+    ///
+    ///     let file = handle.into_inner();
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn into_inner(self) -> T {
+        self.inner
+    }
+
+    /// Gets a reference to the underlying reader.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut file = File::open("foo.txt")?;
+    ///
+    ///     let mut buffer = [0; 5];
+    ///     let mut handle = file.take(5);
+    ///     handle.read(&mut buffer)?;
+    ///
+    ///     let file = handle.get_ref();
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn get_ref(&self) -> &T {
+        &self.inner
+    }
+
+    /// Gets a mutable reference to the underlying reader.
+    ///
+    /// Care should be taken to avoid modifying the internal I/O state of the
+    /// underlying reader as doing so may corrupt the internal limit of this
+    /// `Take`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io;
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> io::Result<()> {
+    ///     let mut file = File::open("foo.txt")?;
+    ///
+    ///     let mut buffer = [0; 5];
+    ///     let mut handle = file.take(5);
+    ///     handle.read(&mut buffer)?;
+    ///
+    ///     let file = handle.get_mut();
+    ///     Ok(())
+    /// }
+    /// ```
+    pub fn get_mut(&mut self) -> &mut T {
+        &mut self.inner
+    }
+}
+
+impl<T: Read> Read for Take<T> {
+    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
+        // Don't call into inner reader at all at EOF because it may still block
+        if self.limit == 0 {
+            return Ok(0);
+        }
+
+        let max = cmp::min(buf.len() as u64, self.limit) as usize;
+        let n = self.inner.read(&mut buf[..max])?;
+        self.limit -= n as u64;
+        Ok(n)
+    }
+
+    unsafe fn initializer(&self) -> Initializer {
+        unsafe { self.inner.initializer() }
+    }
+
+    fn read_to_end(&mut self, buf: &mut Vec<u8>) -> Result<usize> {
+        let reservation_size = cmp::min(self.limit, 32) as usize;
+
+        read_to_end_with_reservation(self, buf, reservation_size)
+    }
+}
+
+impl<T: BufRead> BufRead for Take<T> {
+    fn fill_buf(&mut self) -> Result<&[u8]> {
+        // Don't call into inner reader at all at EOF because it may still block
+        if self.limit == 0 {
+            return Ok(&[]);
+        }
+
+        let buf = self.inner.fill_buf()?;
+        let cap = cmp::min(buf.len() as u64, self.limit) as usize;
+        Ok(&buf[..cap])
+    }
+
+    fn consume(&mut self, amt: usize) {
+        // Don't let callers reset the limit by passing an overlarge value
+        let amt = cmp::min(amt as u64, self.limit) as usize;
+        self.limit -= amt as u64;
+        self.inner.consume(amt);
+    }
+}
+
+/// A trait for objects which are byte-oriented sinks.
+///
+/// Implementors of the `Write` trait are sometimes called 'writers'.
+///
+/// Writers are defined by two required methods, [`write`] and [`flush`]:
+///
+/// * The [`write`] method will attempt to write some data into the object,
+///   returning how many bytes were successfully written.
+///
+/// * The [`flush`] method is useful for adaptors and explicit buffers
+///   themselves for ensuring that all buffered data has been pushed out to the
+///   'true sink'.
+///
+/// Writers are intended to be composable with one another. Many implementors
+/// throughout [`std::io`] take and provide types which implement the `Write`
+/// trait.
+///
+/// [`write`]: #tymethod.write
+/// [`flush`]: #tymethod.flush
+/// [`std::io`]: index.html
+///
+/// # Examples
+///
+/// ```no_run
+/// use std::io::prelude::*;
+/// use std::fs::File;
+///
+/// fn main() -> std::io::Result<()> {
+///     let mut buffer = File::create("foo.txt")?;
+///
+///     buffer.write(b"some bytes")?;
+///     Ok(())
+/// }
+/// ```
+pub trait Write {
+    /// Write a buffer into this object, returning how many bytes were written.
+    ///
+    /// This function will attempt to write the entire contents of `buf`, but
+    /// the entire write may not succeed, or the write may also generate an
+    /// error. A call to `write` represents *at most one* attempt to write to
+    /// any wrapped object.
+    ///
+    /// Calls to `write` are not guaranteed to block waiting for data to be
+    /// written, and a write which would otherwise block can be indicated through
+    /// an [`Err`] variant.
+    ///
+    /// If the return value is [`Ok(n)`] then it must be guaranteed that
+    /// `0 <= n <= buf.len()`. A return value of `0` typically means that the
+    /// underlying object is no longer able to accept bytes and will likely not
+    /// be able to in the future as well, or that the buffer provided is empty.
+    ///
+    /// # Errors
+    ///
+    /// Each call to `write` may generate an I/O error indicating that the
+    /// operation could not be completed. If an error is returned then no bytes
+    /// in the buffer were written to this writer.
+    ///
+    /// It is **not** considered an error if the entire buffer could not be
+    /// written to this writer.
+    ///
+    /// An error of the [`ErrorKind::Interrupted`] kind is non-fatal and the
+    /// write operation should be retried if there is nothing else to do.
+    ///
+    /// [`Err`]: ../../std/result/enum.Result.html#variant.Err
+    /// [`Ok(n)`]:  ../../std/result/enum.Result.html#variant.Ok
+    /// [`ErrorKind::Interrupted`]: ../../std/io/enum.ErrorKind.html#variant.Interrupted
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let mut buffer = File::create("foo.txt")?;
+    ///
+    ///     // Writes some prefix of the byte string, not necessarily all of it.
+    ///     buffer.write(b"some bytes")?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn write(&mut self, buf: &[u8]) -> Result<usize>;
+
+    /// Flush this output stream, ensuring that all intermediately buffered
+    /// contents reach their destination.
+    ///
+    /// # Errors
+    ///
+    /// It is considered an error if not all bytes could be written due to
+    /// I/O errors or EOF being reached.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::prelude::*;
+    /// use std::io::BufWriter;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let mut buffer = BufWriter::new(File::create("foo.txt")?);
+    ///
+    ///     buffer.write(b"some bytes")?;
+    ///     buffer.flush()?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn flush(&mut self) -> Result<()>;
+
+    /// Attempts to write an entire buffer into this write.
+    ///
+    /// This method will continuously call [`write`] until there is no more data
+    /// to be written or an error of non-[`ErrorKind::Interrupted`] kind is
+    /// returned. This method will not return until the entire buffer has been
+    /// successfully written or such an error occurs. The first error that is
+    /// not of [`ErrorKind::Interrupted`] kind generated from this method will be
+    /// returned.
+    ///
+    /// # Errors
+    ///
+    /// This function will return the first error of
+    /// non-[`ErrorKind::Interrupted`] kind that [`write`] returns.
+    ///
+    /// [`ErrorKind::Interrupted`]: ../../std/io/enum.ErrorKind.html#variant.Interrupted
+    /// [`write`]: #tymethod.write
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let mut buffer = File::create("foo.txt")?;
+    ///
+    ///     buffer.write_all(b"some bytes")?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn write_all(&mut self, mut buf: &[u8]) -> Result<()> {
+        while !buf.is_empty() {
+            match self.write(buf) {
+                Ok(0) => {
+                    return Err(Error::new(
+                        ErrorKind::WriteZero,
+                        "failed to write whole buffer",
+                    ));
+                }
+                Ok(n) => buf = &buf[n..],
+                Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(())
+    }
+
+    /// Writes a formatted string into this writer, returning any error
+    /// encountered.
+    ///
+    /// This method is primarily used to interface with the
+    /// [`format_args!`][formatargs] macro, but it is rare that this should
+    /// explicitly be called. The [`write!`][write] macro should be favored to
+    /// invoke this method instead.
+    ///
+    /// [formatargs]: ../macro.format_args.html
+    /// [write]: ../macro.write.html
+    ///
+    /// This function internally uses the [`write_all`][writeall] method on
+    /// this trait and hence will continuously write data so long as no errors
+    /// are received. This also means that partial writes are not indicated in
+    /// this signature.
+    ///
+    /// [writeall]: #method.write_all
+    ///
+    /// # Errors
+    ///
+    /// This function will return any I/O error reported while formatting.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::prelude::*;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let mut buffer = File::create("foo.txt")?;
+    ///
+    ///     // this call
+    ///     write!(buffer, "{:.*}", 2, 1.234567)?;
+    ///     // turns into this:
+    ///     buffer.write_fmt(format_args!("{:.*}", 2, 1.234567))?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<()> {
+        // Create a shim which translates a Write to a fmt::Write and saves
+        // off I/O errors. instead of discarding them
+        struct Adaptor<'a, T: ?Sized + 'a> {
+            inner: &'a mut T,
+            error: Result<()>,
+        }
+
+        impl<'a, T: Write + ?Sized> fmt::Write for Adaptor<'a, T> {
+            fn write_str(&mut self, s: &str) -> fmt::Result {
+                match self.inner.write_all(s.as_bytes()) {
+                    Ok(()) => Ok(()),
+                    Err(e) => {
+                        self.error = Err(e);
+                        Err(fmt::Error)
+                    }
+                }
+            }
+        }
+
+        let mut output = Adaptor {
+            inner: self,
+            error: Ok(()),
+        };
+        match fmt::write(&mut output, fmt) {
+            Ok(()) => Ok(()),
+            Err(..) => {
+                // check if the error came from the underlying `Write` or not
+                if output.error.is_err() {
+                    output.error
+                } else {
+                    Err(Error::new(ErrorKind::Other, "formatter error"))
+                }
+            }
+        }
+    }
+
+    /// Creates a "by reference" adaptor for this instance of `Write`.
+    ///
+    /// The returned adaptor also implements `Write` and will simply borrow this
+    /// current writer.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::io::Write;
+    /// use std::fs::File;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let mut buffer = File::create("foo.txt")?;
+    ///
+    ///     let reference = buffer.by_ref();
+    ///
+    ///     // we can use reference just like our original buffer
+    ///     reference.write_all(b"some bytes")?;
+    ///     Ok(())
+    /// }
+    /// ```
+    fn by_ref(&mut self) -> &mut Self
+    where
+        Self: Sized,
+    {
+        self
+    }
+}
+
+/// The `Seek` trait provides a cursor which can be moved within a stream of
+/// bytes.
+///
+/// The stream typically has a fixed size, allowing seeking relative to either
+/// end or the current offset.
+///
+/// # Examples
+///
+/// [`File`][file]s implement `Seek`:
+///
+/// [file]: ../fs/struct.File.html
+///
+/// ```no_run
+/// use std::io;
+/// use std::io::prelude::*;
+/// use std::fs::File;
+/// use std::io::SeekFrom;
+///
+/// fn main() -> io::Result<()> {
+///     let mut f = File::open("foo.txt")?;
+///
+///     // move the cursor 42 bytes from the start of the file
+///     f.seek(SeekFrom::Start(42))?;
+///     Ok(())
+/// }
+/// ```
+pub trait Seek {
+    /// Seek to an offset, in bytes, in a stream.
+    ///
+    /// A seek beyond the end of a stream is allowed, but behavior is defined
+    /// by the implementation.
+    ///
+    /// If the seek operation completed successfully,
+    /// this method returns the new position from the start of the stream.
+    /// That position can be used later with [`SeekFrom::Start`].
+    ///
+    /// # Errors
+    ///
+    /// Seeking to a negative offset is considered an error.
+    ///
+    /// [`SeekFrom::Start`]: enum.SeekFrom.html#variant.Start
+    fn seek(&mut self, pos: SeekFrom) -> Result<u64>;
+}
+
+/// Enumeration of possible methods to seek within an I/O object.
+///
+/// It is used by the [`Seek`] trait.
+///
+/// [`Seek`]: trait.Seek.html
+#[derive(Copy, PartialEq, Eq, Clone, Debug)]
+pub enum SeekFrom {
+    /// Set the offset to the provided number of bytes.
+    Start(u64),
+
+    /// Set the offset to the size of this object plus the specified number of
+    /// bytes.
+    ///
+    /// It is possible to seek beyond the end of an object, but it's an error to
+    /// seek before byte 0.
+    End(i64),
+
+    /// Set the offset to the current position plus the specified number of
+    /// bytes.
+    ///
+    /// It is possible to seek beyond the end of an object, but it's an error to
+    /// seek before byte 0.
+    Current(i64),
+}
+
+/// An iterator over `u8` values of a reader.
+///
+/// This struct is generally created by calling [`bytes`] on a reader.
+/// Please see the documentation of [`bytes`] for more details.
+///
+/// [`bytes`]: trait.Read.html#method.bytes
+#[derive(Debug)]
+pub struct Bytes<R> {
+    inner: R,
+}
+
+impl<R: Read> Iterator for Bytes<R> {
+    type Item = Result<u8>;
+
+    fn next(&mut self) -> Option<Result<u8>> {
+        read_one_byte(&mut self.inner)
+    }
+}
+
+/// An iterator over the contents of an instance of `BufRead` split on a
+/// particular byte.
+///
+/// This struct is generally created by calling [`split`][split] on a
+/// `BufRead`. Please see the documentation of `split()` for more details.
+///
+/// [split]: trait.BufRead.html#method.split
+#[derive(Debug)]
+pub struct Split<B> {
+    buf: B,
+    delim: u8,
+}
+
+impl<B: BufRead> Iterator for Split<B> {
+    type Item = Result<Vec<u8>>;
+
+    fn next(&mut self) -> Option<Result<Vec<u8>>> {
+        let mut buf = Vec::new();
+        match self.buf.read_until(self.delim, &mut buf) {
+            Ok(0) => None,
+            Ok(_n) => {
+                if buf[buf.len() - 1] == self.delim {
+                    buf.pop();
+                }
+                Some(Ok(buf))
+            }
+            Err(e) => Some(Err(e)),
+        }
+    }
+}
+
+/// An iterator over the lines of an instance of `BufRead`.
+///
+/// This struct is generally created by calling [`lines`][lines] on a
+/// `BufRead`. Please see the documentation of `lines()` for more details.
+///
+/// [lines]: trait.BufRead.html#method.lines
+#[derive(Debug)]
+pub struct Lines<B> {
+    buf: B,
+}
+
+impl<B: BufRead> Iterator for Lines<B> {
+    type Item = Result<String>;
+
+    fn next(&mut self) -> Option<Result<String>> {
+        let mut buf = String::new();
+        match self.buf.read_line(&mut buf) {
+            Ok(0) => None,
+            Ok(_n) => {
+                if buf.ends_with("\n") {
+                    buf.pop();
+                    if buf.ends_with("\r") {
+                        buf.pop();
+                    }
+                }
+                Some(Ok(buf))
+            }
+            Err(e) => Some(Err(e)),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use alloc::string::String;
+
+    use crate::io::{self, cursor::Cursor, prelude::*};
+
+    #[test]
+    #[cfg_attr(target_os = "emscripten", ignore)]
+    fn read_until() {
+        let mut buf = Cursor::new(&b"12"[..]);
+        let mut v = Vec::new();
+        assert_eq!(buf.read_until(b'3', &mut v).unwrap(), 2);
+        assert_eq!(v, b"12");
+
+        let mut buf = Cursor::new(&b"1233"[..]);
+        let mut v = Vec::new();
+        assert_eq!(buf.read_until(b'3', &mut v).unwrap(), 3);
+        assert_eq!(v, b"123");
+        v.truncate(0);
+        assert_eq!(buf.read_until(b'3', &mut v).unwrap(), 1);
+        assert_eq!(v, b"3");
+        v.truncate(0);
+        assert_eq!(buf.read_until(b'3', &mut v).unwrap(), 0);
+        assert_eq!(v, []);
+    }
+
+    #[test]
+    fn split() {
+        let buf = Cursor::new(&b"12"[..]);
+        let mut s = buf.split(b'3');
+        assert_eq!(s.next().unwrap().unwrap(), vec![b'1', b'2']);
+        assert!(s.next().is_none());
+
+        let buf = Cursor::new(&b"1233"[..]);
+        let mut s = buf.split(b'3');
+        assert_eq!(s.next().unwrap().unwrap(), vec![b'1', b'2']);
+        assert_eq!(s.next().unwrap().unwrap(), vec![]);
+        assert!(s.next().is_none());
+    }
+
+    #[test]
+    fn read_line() {
+        let mut buf = Cursor::new(&b"12"[..]);
+        let mut v = String::new();
+        assert_eq!(buf.read_line(&mut v).unwrap(), 2);
+        assert_eq!(v, "12");
+
+        let mut buf = Cursor::new(&b"12\n\n"[..]);
+        let mut v = String::new();
+        assert_eq!(buf.read_line(&mut v).unwrap(), 3);
+        assert_eq!(v, "12\n");
+        v.truncate(0);
+        assert_eq!(buf.read_line(&mut v).unwrap(), 1);
+        assert_eq!(v, "\n");
+        v.truncate(0);
+        assert_eq!(buf.read_line(&mut v).unwrap(), 0);
+        assert_eq!(v, "");
+    }
+
+    // #[test]
+    // fn lines() {
+    //     let buf = Cursor::new(&b"12\r"[..]);
+    //     let mut s = buf.lines();
+    //     assert_eq!(s.next().unwrap().unwrap(), "12\r".to_string());
+    //     assert!(s.next().is_none());
+
+    //     let buf = Cursor::new(&b"12\r\n\n"[..]);
+    //     let mut s = buf.lines();
+    //     assert_eq!(s.next().unwrap().unwrap(), "12".to_string());
+    //     assert_eq!(s.next().unwrap().unwrap(), "".to_string());
+    //     assert!(s.next().is_none());
+    // }
+
+    #[test]
+    fn read_to_end() {
+        let mut c = Cursor::new(&b""[..]);
+        let mut v = Vec::new();
+        assert_eq!(c.read_to_end(&mut v).unwrap(), 0);
+        assert_eq!(v, []);
+
+        let mut c = Cursor::new(&b"1"[..]);
+        let mut v = Vec::new();
+        assert_eq!(c.read_to_end(&mut v).unwrap(), 1);
+        assert_eq!(v, b"1");
+
+        let cap = 1024 * 1024;
+        let data = (0..cap).map(|i| (i / 3) as u8).collect::<Vec<_>>();
+        let mut v = Vec::new();
+        let (a, b) = data.split_at(data.len() / 2);
+        assert_eq!(Cursor::new(a).read_to_end(&mut v).unwrap(), a.len());
+        assert_eq!(Cursor::new(b).read_to_end(&mut v).unwrap(), b.len());
+        assert_eq!(v, data);
+    }
+
+    #[test]
+    fn read_to_string() {
+        let mut c = Cursor::new(&b""[..]);
+        let mut v = String::new();
+        assert_eq!(c.read_to_string(&mut v).unwrap(), 0);
+        assert_eq!(v, "");
+
+        let mut c = Cursor::new(&b"1"[..]);
+        let mut v = String::new();
+        assert_eq!(c.read_to_string(&mut v).unwrap(), 1);
+        assert_eq!(v, "1");
+
+        let mut c = Cursor::new(&b"\xff"[..]);
+        let mut v = String::new();
+        assert!(c.read_to_string(&mut v).is_err());
+    }
+
+    #[test]
+    fn read_exact() {
+        let mut buf = [0; 4];
+
+        let mut c = Cursor::new(&b""[..]);
+        assert_eq!(
+            c.read_exact(&mut buf).unwrap_err().kind(),
+            io::ErrorKind::UnexpectedEof
+        );
+
+        let mut c = Cursor::new(&b"123"[..]).chain(Cursor::new(&b"456789"[..]));
+        c.read_exact(&mut buf).unwrap();
+        assert_eq!(&buf, b"1234");
+        c.read_exact(&mut buf).unwrap();
+        assert_eq!(&buf, b"5678");
+        assert_eq!(
+            c.read_exact(&mut buf).unwrap_err().kind(),
+            io::ErrorKind::UnexpectedEof
+        );
+    }
+
+    #[test]
+    fn read_exact_slice() {
+        let mut buf = [0; 4];
+
+        let mut c = &b""[..];
+        assert_eq!(
+            c.read_exact(&mut buf).unwrap_err().kind(),
+            io::ErrorKind::UnexpectedEof
+        );
+
+        let mut c = &b"123"[..];
+        assert_eq!(
+            c.read_exact(&mut buf).unwrap_err().kind(),
+            io::ErrorKind::UnexpectedEof
+        );
+        // make sure the optimized (early returning) method is being used
+        assert_eq!(&buf, &[0; 4]);
+
+        let mut c = &b"1234"[..];
+        c.read_exact(&mut buf).unwrap();
+        assert_eq!(&buf, b"1234");
+
+        let mut c = &b"56789"[..];
+        c.read_exact(&mut buf).unwrap();
+        assert_eq!(&buf, b"5678");
+        assert_eq!(c, b"9");
+    }
+
+    #[test]
+    fn take_eof() {
+        struct R;
+
+        impl Read for R {
+            fn read(&mut self, _: &mut [u8]) -> io::Result<usize> {
+                Err(io::Error::new(io::ErrorKind::Other, ""))
+            }
+        }
+        impl BufRead for R {
+            fn fill_buf(&mut self) -> io::Result<&[u8]> {
+                Err(io::Error::new(io::ErrorKind::Other, ""))
+            }
+            fn consume(&mut self, _amt: usize) {}
+        }
+
+        let mut buf = [0; 1];
+        assert_eq!(0, R.take(0).read(&mut buf).unwrap());
+        assert_eq!(b"", R.take(0).fill_buf().unwrap());
+    }
+
+    fn cmp_bufread<Br1: BufRead, Br2: BufRead>(mut br1: Br1, mut br2: Br2, exp: &[u8]) {
+        let mut cat = Vec::new();
+        loop {
+            let consume = {
+                let buf1 = br1.fill_buf().unwrap();
+                let buf2 = br2.fill_buf().unwrap();
+                let minlen = if buf1.len() < buf2.len() {
+                    buf1.len()
+                } else {
+                    buf2.len()
+                };
+                assert_eq!(buf1[..minlen], buf2[..minlen]);
+                cat.extend_from_slice(&buf1[..minlen]);
+                minlen
+            };
+            if consume == 0 {
+                break;
+            }
+            br1.consume(consume);
+            br2.consume(consume);
+        }
+        assert_eq!(br1.fill_buf().unwrap().len(), 0);
+        assert_eq!(br2.fill_buf().unwrap().len(), 0);
+        assert_eq!(&cat[..], &exp[..])
+    }
+
+    #[test]
+    fn chain_bufread() {
+        let testdata = b"ABCDEFGHIJKL";
+        let chain1 = (&testdata[..3])
+            .chain(&testdata[3..6])
+            .chain(&testdata[6..9])
+            .chain(&testdata[9..]);
+        let chain2 = (&testdata[..4])
+            .chain(&testdata[4..8])
+            .chain(&testdata[8..]);
+        cmp_bufread(chain1, chain2, &testdata[..]);
+    }
+
+    #[test]
+    fn chain_zero_length_read_is_not_eof() {
+        let a = b"A";
+        let b = b"B";
+        let mut s = String::new();
+        let mut chain = (&a[..]).chain(&b[..]);
+        chain.read(&mut []).unwrap();
+        chain.read_to_string(&mut s).unwrap();
+        assert_eq!("AB", s);
+    }
+
+    // #[bench]
+    // #[cfg_attr(target_os = "emscripten", ignore)]
+    // fn bench_read_to_end(b: &mut test::Bencher) {
+    //     b.iter(|| {
+    //         let mut lr = repeat(1).take(10000000);
+    //         let mut vec = Vec::with_capacity(1024);
+    //         super::read_to_end(&mut lr, &mut vec)
+    //     });
+    // }
+}
diff --git a/recipes/core/relibc/src/io/prelude.rs b/recipes/core/relibc/src/io/prelude.rs
new file mode 100644
index 0000000000..d0240613dd
--- /dev/null
+++ b/recipes/core/relibc/src/io/prelude.rs
@@ -0,0 +1,23 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! The I/O Prelude
+//!
+//! The purpose of this module is to alleviate imports of many common I/O traits
+//! by adding a glob import to the top of I/O heavy modules:
+//!
+//! ```
+//! # #![allow(unused_imports)]
+//! use std::io::prelude::*;
+//! ```
+
+pub use super::{BufRead, Read, Seek, Write};
+
+pub use alloc::{boxed::Box, vec::Vec};
diff --git a/recipes/core/relibc/src/iter.rs b/recipes/core/relibc/src/iter.rs
new file mode 100644
index 0000000000..369d2dadc8
--- /dev/null
+++ b/recipes/core/relibc/src/iter.rs
@@ -0,0 +1,206 @@
+//! Utilities to help use Rust iterators on C strings.
+
+use core::{
+    iter::{FusedIterator, Iterator},
+    marker::PhantomData,
+    mem::MaybeUninit,
+    ptr::NonNull,
+};
+
+use crate::platform::types::*;
+
+/// A minimal alternative to the `Zero` trait from num-traits, for use in
+/// `NulTerminated`.
+///
+/// May be replaced with the one from num-traits at a later time if so
+/// desired.
+pub unsafe trait Zero {
+    fn is_zero(&self) -> bool;
+}
+
+unsafe impl Zero for c_char {
+    fn is_zero(&self) -> bool {
+        self == &0
+    }
+}
+
+unsafe impl Zero for wchar_t {
+    fn is_zero(&self) -> bool {
+        self == &0
+    }
+}
+
+/// An iterator over a nul-terminated buffer.
+///
+/// This is intended to allow safe, ergonomic iteration over C-style byte and
+/// wide strings without first having to read through the string and construct
+/// a slice. Assuming the safety requirements are upheld when constructing the
+/// iterator, it allows for string iteration in safe Rust.
+pub struct NulTerminated<'a, T: Zero> {
+    ptr: NonNull<T>,
+    phantom: PhantomData<&'a T>,
+}
+
+impl<'a, T: Zero> Iterator for NulTerminated<'a, T> {
+    type Item = &'a T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        // SAFETY: the caller is required to ensure a valid pointer to a
+        // 0-terminated buffer is provided, and the zero-check below ensures
+        // that iteration and pointer increments will stop in time.
+        let val_ref = unsafe { self.ptr.as_ref() };
+        if val_ref.is_zero() {
+            None
+        } else {
+            // SAFETY: the caller is required to provide a 0-terminated
+            // buffer, and this point will only be reached if the next element
+            // is at most the terminating 0.
+            self.ptr = unsafe { self.ptr.add(1) };
+            Some(val_ref)
+        }
+    }
+}
+
+impl<'a, T: Zero> NulTerminated<'a, T> {
+    /// Constructs a new iterator, starting at `ptr`, yielding elements of
+    /// type `&T` up to (but not including) the terminating nul.
+    ///
+    /// The iterator returns `None` after the terminating nul has been
+    /// encountered.
+    ///
+    /// # Safety
+    /// The provided pointer must be a valid pointer to a buffer of contiguous
+    /// elements of type `T`, and the value 0 must be present within the
+    /// buffer at or after `ptr` (not necessarily at the end). The buffer must
+    /// not be written to for the lifetime of the iterator.
+    pub unsafe fn new(ptr: *const T) -> Option<Self> {
+        Some(NulTerminated {
+            // NonNull can only wrap only *mut pointers...
+            ptr: NonNull::new(ptr.cast_mut())?,
+            phantom: PhantomData,
+        })
+    }
+}
+
+// Once the terminating nul has been encountered, the pointer will not advance
+// further and the iterator will thus keep returning None.
+impl<'a, T: Zero> FusedIterator for NulTerminated<'a, T> {}
+
+/// An iterator over a nul-terminated buffer, including the terminating nul.
+///
+/// Similar to [`NulTerminated`], but includes the terminating nul.
+pub struct NulTerminatedInclusive<'a, T: Zero> {
+    ptr_opt: Option<NonNull<T>>,
+    phantom: PhantomData<&'a T>,
+}
+
+impl<'a, T: Zero> Iterator for NulTerminatedInclusive<'a, T> {
+    type Item = &'a T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(old_ptr) = self.ptr_opt {
+            // SAFETY: the caller is required to ensure a valid pointer to a
+            // 0-terminated buffer is provided, and the zero-check below
+            // ensures that iteration and pointer increments will stop in
+            // time.
+            let val_ref = unsafe { old_ptr.as_ref() };
+            self.ptr_opt = if val_ref.is_zero() {
+                None
+            } else {
+                // SAFETY: if a terminating nul value has been encountered,
+                // this will not be called
+                Some(unsafe { old_ptr.add(1) })
+            };
+            Some(val_ref)
+        } else {
+            None
+        }
+    }
+}
+
+impl<'a, T: Zero> NulTerminatedInclusive<'a, T> {
+    /// Constructs a new iterator, starting at `ptr`, yielding elements of
+    /// type `&T` up to and including the terminating nul.
+    ///
+    /// The iterator returns `None` after the terminating nul has been
+    /// encountered.
+    ///
+    /// # Safety
+    /// The provided pointer must be a valid pointer to a buffer of contiguous
+    /// elements of type `T`, and the value 0 must be present within the
+    /// buffer at or after `ptr` (not necessarily at the end). The buffer must
+    /// not be written to for the lifetime of the iterator.
+    pub unsafe fn new(ptr: *const T) -> Self {
+        NulTerminatedInclusive {
+            // NonNull can only wrap only *mut pointers...
+            ptr_opt: NonNull::new(ptr.cast_mut()),
+            phantom: PhantomData,
+        }
+    }
+}
+
+// Once the terminating nul has been encountered, the internal Option will be
+// set to None, ensuring that we will keep returning None.
+impl<'a, T: Zero> FusedIterator for NulTerminatedInclusive<'a, T> {}
+
+/// A zipped iterator mapping an input iterator to an "out" pointer.
+///
+/// This is intended to allow safe, iterative writing to an "out pointer".
+/// Special care needs to be taken to avoid creating references past the end
+/// of the output buffer, thus the output is zipped with an "input" iterator
+/// to ensure up-front control of the range of memory on which we create
+/// references.
+pub struct SrcDstPtrIter<'a, I: Iterator, U: Copy> {
+    src_iter: I,
+    dst_ptr: *mut U,
+    phantom: PhantomData<&'a mut U>,
+}
+
+impl<'a, I: Iterator, U: Copy> Iterator for SrcDstPtrIter<'a, I, U> {
+    type Item = (I::Item, &'a mut MaybeUninit<U>);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(src_item) = self.src_iter.next() {
+            let old_dst_ptr = self.dst_ptr;
+
+            // SAFETY: due to the caller requirements on `I` upon
+            // construction, the new pointer here may be either valid to turn
+            // into a reference or "one past the end". The latter is okay as
+            // long as it is only represented as a raw pointer.
+            self.dst_ptr = unsafe { self.dst_ptr.add(1) };
+
+            // SAFETY: self.dst_ptr may point "one past the end", but the
+            // caller is required upon construction to ensure that `I` does
+            // not over-iterate, and thus old_dst_ptr is always okay to
+            // dereference.
+            let out_mut_ref = unsafe { old_dst_ptr.as_uninit_mut() }.unwrap();
+
+            Some((src_item, out_mut_ref))
+        } else {
+            None
+        }
+    }
+}
+
+impl<'a, I: Iterator, U: Copy> SrcDstPtrIter<'a, I, U> {
+    /// Constructs a new iterator of "zipped" input and output.
+    ///
+    /// The caller must provide an "input" iterator `I` and an "out pointer"
+    /// `ptr`. Assuming `I` has item type `T`, the new iterator will have
+    /// `type Item = (T, &mut MaybeUninit<U>)`.
+    ///
+    /// # Safety
+    /// `ptr` must be a valid pointer to a writable buffer of contiguous (but
+    /// possibly uninitialized) elements of type `U`. The caller must ensure
+    /// that `I` does not return `Some` any more times than there are elements
+    /// in the output buffer. The caller must ensure that the iterator has
+    /// exclusive access to that buffer for the entire lifetime of the
+    /// iterator.
+    pub unsafe fn new(iter: I, ptr: *mut U) -> Self {
+        SrcDstPtrIter {
+            src_iter: iter,
+            dst_ptr: ptr,
+            phantom: PhantomData,
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/ld_so/access.rs b/recipes/core/relibc/src/ld_so/access.rs
new file mode 100644
index 0000000000..267e9e897f
--- /dev/null
+++ b/recipes/core/relibc/src/ld_so/access.rs
@@ -0,0 +1,10 @@
+use crate::{
+    c_str::{CStr, CString},
+    error::Errno,
+    platform::{Pal, Sys, types::*},
+};
+
+pub fn accessible(path: &str, mode: c_int) -> Result<(), Errno> {
+    let path_c = CString::new(path.as_bytes()).unwrap();
+    unsafe { Sys::access(CStr::from_ptr(path_c.as_ptr()), mode) }
+}
diff --git a/recipes/core/relibc/src/ld_so/callbacks.rs b/recipes/core/relibc/src/ld_so/callbacks.rs
new file mode 100644
index 0000000000..5b322ef440
--- /dev/null
+++ b/recipes/core/relibc/src/ld_so/callbacks.rs
@@ -0,0 +1,39 @@
+use super::linker::{Linker, ObjectHandle, Resolve, Result, ScopeKind};
+use crate::platform::types::c_void;
+use alloc::boxed::Box;
+
+pub struct LinkerCallbacks {
+    pub unload: Box<dyn Fn(&mut Linker, ObjectHandle)>,
+    pub load_library:
+        Box<dyn Fn(&mut Linker, Option<&str>, Resolve, ScopeKind, bool) -> Result<ObjectHandle>>,
+    pub get_sym: Box<dyn Fn(&Linker, Option<ObjectHandle>, &str) -> Option<*mut c_void>>,
+}
+
+impl LinkerCallbacks {
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> LinkerCallbacks {
+        LinkerCallbacks {
+            unload: Box::new(unload),
+            load_library: Box::new(load_library),
+            get_sym: Box::new(get_sym),
+        }
+    }
+}
+
+fn unload(linker: &mut Linker, handle: ObjectHandle) {
+    linker.unload(handle)
+}
+
+fn load_library(
+    linker: &mut Linker,
+    name: Option<&str>,
+    resolve: Resolve,
+    scope: ScopeKind,
+    noload: bool,
+) -> Result<ObjectHandle> {
+    linker.load_library(name, resolve, scope, noload)
+}
+
+fn get_sym(linker: &Linker, handle: Option<ObjectHandle>, name: &str) -> Option<*mut c_void> {
+    linker.get_sym(handle, name)
+}
diff --git a/recipes/core/relibc/src/ld_so/debug.rs b/recipes/core/relibc/src/ld_so/debug.rs
new file mode 100644
index 0000000000..784fb339e3
--- /dev/null
+++ b/recipes/core/relibc/src/ld_so/debug.rs
@@ -0,0 +1,138 @@
+use crate::{c_str::CString, platform::types::*};
+use alloc::boxed::Box;
+use core::ptr;
+
+#[repr(C)]
+pub enum RTLDState {
+    /// Mapping change is complete.
+    RtConsistent,
+    /// Beginning to add a new object.
+    RtAdd,
+    /// Beginning to remove an object mapping.
+    RtDelete,
+}
+
+/// Data structure for sharing debugging information from the
+/// run-time dynamic linker for loaded ELF shared objects.
+#[repr(C)]
+pub struct RTLDDebug {
+    /// Version number for this protocol.
+    r_version: i32,
+    /// Head of the chain of loaded objects.
+    r_map: *mut LinkMap,
+    //struct link_map *r_map;
+    /// This is the address of a function internal to the run-time linker,
+    /// that will always be called when the linker begins to map in a
+    /// library or unmap it, and again when the mapping change is complete.
+    /// The debugger can set a breakpoint at this address if it wants to
+    /// notice shared object mapping changes.
+    pub r_brk: extern "C" fn(),
+
+    /// This state value describes the mapping change taking place when
+    /// the `r_brk' address is called.
+    pub state: RTLDState,
+
+    ///  Base address the linker is loaded at.
+    pub r_ldbase: usize,
+}
+
+impl RTLDDebug {
+    const NEW: Self = RTLDDebug {
+        r_version: 1,
+        r_map: ptr::null_mut::<LinkMap>(),
+        r_brk: _dl_debug_state,
+        state: RTLDState::RtConsistent,
+        r_ldbase: 0,
+    };
+
+    pub fn insert(&mut self, l_addr: usize, name: &str, l_ld: usize) {
+        if self.r_map.is_null() {
+            self.r_map = LinkMap::new_with_args(l_addr, name, l_ld);
+        } else {
+            unsafe { (*self.r_map).add_object(l_addr, name, l_ld) };
+        }
+    }
+    pub fn insert_first(&mut self, l_addr: usize, name: &str, l_ld: usize) {
+        if self.r_map.is_null() {
+            self.r_map = LinkMap::new_with_args(l_addr, name, l_ld);
+        } else {
+            let tmp = self.r_map;
+            self.r_map = LinkMap::new_with_args(l_addr, name, l_ld);
+            unsafe { (*self.r_map).link(&mut *tmp) };
+        }
+    }
+}
+
+/// SAFETY: safe as long as caller wraps the instance in a mutex,
+/// or similar structure that guarantees exclusive mutable access.
+/// Separate instances must not contain pointers to the same LinkMap instance.
+unsafe impl Send for RTLDDebug {}
+/// SAFETY: safe as long as caller wraps the instance in a mutex,
+/// or similar structure that guarantees exclusive mutable access.
+/// Separate instances must not contain pointers to the same LinkMap instance.
+unsafe impl Sync for RTLDDebug {}
+
+#[repr(C)]
+struct LinkMap {
+    /* These members are part of the protocol with the debugger.
+    This is the same format used in SVR4.  */
+    /// Difference between the address in the ELF
+    /// file and the addresses in memory.
+    l_addr: usize,
+    /// Absolute file name object was found in.
+    l_name: *const c_char,
+    /// Dynamic section of the shared object.
+    l_ld: usize,
+    l_next: *mut LinkMap,
+    l_prev: *mut LinkMap,
+}
+
+impl LinkMap {
+    fn new() -> *mut Self {
+        let map = Box::new(LinkMap {
+            l_addr: 0,
+            l_name: ptr::null(),
+            l_ld: 0,
+            l_next: ptr::null_mut(),
+            l_prev: ptr::null_mut(),
+        });
+        Box::into_raw(map)
+    }
+    fn link(&mut self, map: &mut LinkMap) {
+        map.l_prev = ptr::from_mut::<LinkMap>(self);
+        self.l_next = ptr::from_mut::<LinkMap>(map);
+    }
+    fn new_with_args(l_addr: usize, name: &str, l_ld: usize) -> *mut Self {
+        let map = LinkMap::new();
+        unsafe {
+            (*map).l_addr = l_addr;
+            (*map).l_ld = l_ld;
+            let c_name = CString::new(name).unwrap();
+            (*map).l_name = c_name.into_raw().cast_const();
+        }
+        map
+    }
+
+    fn add_object(&mut self, l_addr: usize, name: &str, l_ld: usize) {
+        let node = LinkMap::new_with_args(l_addr, name, l_ld);
+        let mut last = self;
+        while !last.l_next.is_null() {
+            last = unsafe { last.l_next.as_mut() }.unwrap();
+        }
+        unsafe {
+            (*node).l_prev = last;
+            last.l_next = node;
+        }
+    }
+}
+
+/*
+ * Gdb may be looking for this fuction with that exact name and set
+ * break point there
+ */
+#[linkage = "weak"]
+#[unsafe(no_mangle)]
+pub extern "C" fn _dl_debug_state() {}
+
+#[unsafe(no_mangle)]
+pub static _r_debug: spin::Mutex<RTLDDebug> = spin::Mutex::new(RTLDDebug::NEW);
diff --git a/recipes/core/relibc/src/ld_so/dso.rs b/recipes/core/relibc/src/ld_so/dso.rs
new file mode 100644
index 0000000000..afb4c7c1e6
--- /dev/null
+++ b/recipes/core/relibc/src/ld_so/dso.rs
@@ -0,0 +1,1310 @@
+//! See:
+//! * <https://refspecs.linuxfoundation.org/elf/elf.pdf>
+//! * <https://www.akkadia.org/drepper/dsohowto.pdf>
+
+use object::{
+    NativeEndian, Object, StringTable, SymbolIndex, elf,
+    read::elf::{
+        Dyn as _, GnuHashTable, HashTable as SysVHashTable, ProgramHeader as _, Rel as _,
+        Rela as _, Sym as _, Version, VersionTable,
+    },
+};
+
+#[cfg(any(target_arch = "aarch64", target_arch = "x86_64"))]
+use super::tcb::Tcb;
+use super::{
+    debug::{_r_debug, RTLDDebug},
+    linker::{__plt_resolve_trampoline, GLOBAL_SCOPE, Resolve, Scope, Symbol},
+    tcb::Master,
+};
+use crate::{
+    header::{dl_tls::__tls_get_addr, sys_mman},
+    platform::{Pal, Sys, types::c_void},
+};
+use alloc::{
+    boxed::Box,
+    string::{String, ToString},
+    sync::Arc,
+    vec::Vec,
+};
+#[cfg(any(target_arch = "aarch64", target_arch = "x86_64"))]
+use core::mem::offset_of;
+use core::{
+    ffi::c_char,
+    mem::size_of,
+    ptr::{self, NonNull},
+    slice,
+    sync::atomic::{AtomicBool, Ordering},
+};
+
+pub const CHAR_BITS: usize = c_char::BITS as usize;
+pub type Relr = usize;
+
+#[cfg(target_pointer_width = "32")]
+mod shim {
+    use object::{NativeEndian, elf::*, read::elf::ElfFile32};
+    pub type Dyn = Dyn32<NativeEndian>;
+    pub type Rel = Rel32<NativeEndian>;
+    pub type Rela = Rela32<NativeEndian>;
+    pub type Sym = Sym32<NativeEndian>;
+    pub type FileHeader = FileHeader32<NativeEndian>;
+    pub type ProgramHeader = ProgramHeader32<NativeEndian>;
+    pub type ElfFile<'a> = ElfFile32<'a, NativeEndian>;
+}
+
+#[cfg(target_pointer_width = "64")]
+mod shim {
+    use object::{NativeEndian, elf::*, read::elf::ElfFile64};
+    pub type Dyn = Dyn64<NativeEndian>;
+    pub type Rel = Rel64<NativeEndian>;
+    pub type Rela = Rela64<NativeEndian>;
+    pub type Sym = Sym64<NativeEndian>;
+    pub type FileHeader = FileHeader64<NativeEndian>;
+    pub type ProgramHeader = ProgramHeader64<NativeEndian>;
+    pub type ElfFile<'a> = ElfFile64<'a, NativeEndian>;
+}
+
+pub use shim::*;
+
+// TODO: missing from the `object` crate
+pub const DT_RELRSZ: u32 = 35;
+pub const DT_RELR: u32 = 36;
+pub const DT_RELRENT: u32 = 37;
+
+/// Undefined Symbol Index
+pub const STN_UNDEF: SymbolIndex = SymbolIndex(0);
+
+enum HashTable<'a> {
+    Gnu(GnuHashTable<'a, FileHeader>),
+    Sysv(SysVHashTable<'a, FileHeader>),
+}
+
+impl<'a> HashTable<'a> {
+    /// Use the hash table to find the symbol table entry with the given name, hash, and version.
+    #[inline]
+    pub fn find(
+        &self,
+        name: &str,
+        version: Option<&Version<'_>>,
+        symbols: &'a [Sym],
+        strings: StringTable<'a>,
+        versions: &VersionTable<'a, FileHeader>,
+    ) -> Option<(SymbolIndex, &'a Sym)> {
+        let name = name.as_bytes();
+
+        match self {
+            Self::Gnu(hash_table) => {
+                let hash = elf::gnu_hash(name);
+                hash_table.find(
+                    NativeEndian,
+                    name,
+                    hash,
+                    version,
+                    symbols,
+                    strings,
+                    versions,
+                )
+            }
+
+            Self::Sysv(hash_table) => {
+                let hash = elf::hash(name);
+                hash_table.find(
+                    NativeEndian,
+                    name,
+                    hash,
+                    version,
+                    symbols,
+                    strings,
+                    versions,
+                )
+            }
+        }
+    }
+
+    fn symbol_table_length(&self) -> usize {
+        match self {
+            Self::Gnu(hash_table) => hash_table
+                .symbol_table_length(NativeEndian)
+                .expect("empty GNU symbol hash table")
+                as usize,
+            Self::Sysv(hash_table) => hash_table.symbol_table_length() as usize,
+        }
+    }
+}
+
+type InitFn = unsafe extern "C" fn();
+
+pub(super) struct Dynamic<'data> {
+    runpath: Option<String>,
+    got: Option<NonNull<usize>>,
+    needed: Vec<&'data str>,
+    pub(super) jmprel: usize,
+    hash_table: HashTable<'data>,
+    pub(super) dynstrtab: StringTable<'data>,
+    soname: Option<&'data str>,
+    init_array: &'data [unsafe extern "C" fn()],
+    fini_array: &'data [unsafe extern "C" fn()],
+    rela: &'data [Rela],
+    relr: &'data [Relr],
+    rel: &'data [Rel],
+    symbols: &'data [Sym],
+    explicit_addend: bool,
+    pltrelsz: usize,
+}
+
+impl<'data> Dynamic<'data> {
+    pub fn symbol(&self, index: SymbolIndex) -> Option<&'data Sym> {
+        // Symbol table entry for index 0 is reserved.
+        assert!(index != SymbolIndex(0));
+        self.symbols.get(index.0)
+    }
+
+    fn symbol_name(&self, index: SymbolIndex) -> Option<&'data str> {
+        let sym = self.symbol(index)?;
+        let name = sym.name(NativeEndian, self.dynstrtab).ok()?;
+        Some(core::str::from_utf8(name).expect("non UTF-8 ELF symbol name"))
+    }
+
+    fn static_relocations(&self) -> impl Iterator<Item = Relocation> + '_ {
+        self.rela
+            .iter()
+            .map(Relocation::from)
+            .chain(self.rel.iter().map(Relocation::from))
+    }
+}
+
+unsafe impl Send for Dynamic<'_> {}
+unsafe impl Sync for Dynamic<'_> {}
+
+#[derive(Debug)]
+pub(super) struct Relocation {
+    pub(super) offset: usize,
+    pub(super) addend: Option<usize>,
+    pub(super) sym: SymbolIndex,
+    pub(super) kind: RelocationKind,
+}
+
+#[cfg(target_pointer_width = "32")]
+impl From<&Rela> for Relocation {
+    fn from(reloc: &Rela) -> Self {
+        Self {
+            offset: reloc.r_offset(NativeEndian) as usize,
+            addend: Some(reloc.r_addend(NativeEndian) as usize),
+            sym: SymbolIndex(reloc.r_sym(NativeEndian) as usize),
+            kind: RelocationKind::new(reloc.r_type(NativeEndian)),
+        }
+    }
+}
+
+#[cfg(target_pointer_width = "64")]
+impl From<&Rela> for Relocation {
+    fn from(reloc: &Rela) -> Self {
+        let is_mips64el = cfg!(all(target_arch = "mips64", target_endian = "little"));
+        Self {
+            offset: reloc.r_offset(NativeEndian) as usize,
+            addend: Some(reloc.r_addend(NativeEndian) as usize),
+            sym: SymbolIndex(reloc.r_sym(NativeEndian, is_mips64el) as usize),
+            kind: RelocationKind::new(reloc.r_type(NativeEndian, is_mips64el)),
+        }
+    }
+}
+
+impl From<&Rel> for Relocation {
+    fn from(reloc: &Rel) -> Self {
+        Self {
+            offset: reloc.r_offset(NativeEndian) as usize,
+            addend: None,
+            sym: SymbolIndex(reloc.r_sym(NativeEndian) as usize),
+            kind: RelocationKind::new(reloc.r_type(NativeEndian)),
+        }
+    }
+}
+
+// This is matched up to REL_* constants used by musl for ease of comparison
+#[allow(dead_code)]
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum RelocationKind {
+    COPY,
+    DTPMOD,
+    DTPOFF,
+    GOT,
+    IRELATIVE,
+    OFFSET,
+    PLT,
+    RELATIVE,
+    SYMBOLIC,
+    TLSDESC,
+    TPOFF,
+    UNKNOWN(u32),
+}
+
+impl RelocationKind {
+    #[cfg(target_arch = "aarch64")]
+    pub fn new(kind: u32) -> Self {
+        //WARNING: Only use R_AARCH64_* constants here!
+        match kind {
+            elf::R_AARCH64_COPY => Self::COPY,
+            elf::R_AARCH64_TLS_DTPMOD => Self::DTPMOD,
+            elf::R_AARCH64_TLS_DTPREL => Self::DTPOFF,
+            elf::R_AARCH64_GLOB_DAT => Self::GOT,
+            elf::R_AARCH64_IRELATIVE => Self::IRELATIVE,
+            elf::R_AARCH64_JUMP_SLOT => Self::PLT,
+            elf::R_AARCH64_RELATIVE => Self::RELATIVE,
+            elf::R_AARCH64_ABS64 => Self::SYMBOLIC,
+            elf::R_AARCH64_TLSDESC => Self::TLSDESC,
+            elf::R_AARCH64_TLS_TPREL => Self::TPOFF,
+            _ => Self::UNKNOWN(kind),
+        }
+    }
+
+    #[cfg(target_arch = "riscv64")]
+    pub fn new(kind: u32) -> Self {
+        //WARNING: Only use R_RISCV_* constants here!
+        match kind {
+            elf::R_RISCV_COPY => Self::COPY,
+            elf::R_RISCV_TLS_DTPMOD64 => Self::DTPMOD,
+            elf::R_RISCV_TLS_DTPREL64 => Self::DTPOFF,
+            elf::R_RISCV_IRELATIVE => Self::IRELATIVE,
+            elf::R_RISCV_JUMP_SLOT => Self::PLT,
+            elf::R_RISCV_RELATIVE => Self::RELATIVE,
+            elf::R_RISCV_64 => Self::SYMBOLIC,
+            //TODO: not defined, should be 12: elf::R_RISCV_TLSDESC => Self::TLSDESC,
+            elf::R_RISCV_TLS_TPREL64 => Self::TPOFF,
+            _ => Self::UNKNOWN(kind),
+        }
+    }
+
+    #[cfg(target_arch = "x86")]
+    pub fn new(kind: u32) -> Self {
+        //WARNING: Only use R_386_* constants here!
+        match kind {
+            elf::R_386_COPY => Self::COPY,
+            elf::R_386_TLS_DTPMOD32 => Self::DTPMOD,
+            elf::R_386_TLS_DTPOFF32 => Self::DTPOFF,
+            elf::R_386_GLOB_DAT => Self::GOT,
+            elf::R_386_IRELATIVE => Self::IRELATIVE,
+            elf::R_386_JMP_SLOT => Self::PLT,
+            elf::R_386_PC32 => Self::OFFSET,
+            elf::R_386_RELATIVE => Self::RELATIVE,
+            elf::R_386_32 => Self::SYMBOLIC,
+            elf::R_386_TLS_DESC => Self::TLSDESC,
+            elf::R_386_TLS_TPOFF => Self::TPOFF,
+            _ => Self::UNKNOWN(kind),
+        }
+    }
+
+    #[cfg(target_arch = "x86_64")]
+    pub fn new(kind: u32) -> Self {
+        //WARNING: Only use R_X86_64_* constants here!
+        match kind {
+            elf::R_X86_64_COPY => Self::COPY,
+            elf::R_X86_64_DTPMOD64 => Self::DTPMOD,
+            elf::R_X86_64_DTPOFF64 => Self::DTPOFF,
+            elf::R_X86_64_GLOB_DAT => Self::GOT,
+            elf::R_X86_64_IRELATIVE => Self::IRELATIVE,
+            elf::R_X86_64_JUMP_SLOT => Self::PLT,
+            elf::R_X86_64_RELATIVE => Self::RELATIVE,
+            elf::R_X86_64_64 => Self::SYMBOLIC,
+            elf::R_X86_64_TLSDESC => Self::TLSDESC,
+            elf::R_X86_64_TPOFF64 => Self::TPOFF,
+            _ => Self::UNKNOWN(kind),
+        }
+    }
+}
+
+#[derive(Debug, PartialEq)]
+#[repr(u8)]
+pub enum SymbolBinding {
+    /// Global symbols are visible to all object files being combined. One
+    /// file's definition of a global symbol will satisfy another file's
+    /// undefined reference to the same global symbol.
+    Global = elf::STB_GLOBAL,
+    /// Weak symbols resemble global symbols, but their definitions have lower
+    /// precedence.
+    Weak = elf::STB_WEAK,
+}
+
+impl SymbolBinding {
+    #[inline]
+    pub fn is_global(&self) -> bool {
+        matches!(self, Self::Global)
+    }
+}
+
+/// Use to represent a library as well as all the symbols that is loaded withen it.
+pub struct DSO {
+    pub name: String,
+    pub id: usize,
+    pub dlopened: bool,
+    pub entry_point: usize,
+    /// Loaded library in-memory data
+    pub mmap: &'static [u8],
+    pub tls_module_id: usize,
+    pub tls_offset: usize,
+
+    pub(super) dynamic: Dynamic<'static>,
+
+    pub scope: spin::Once<Scope>,
+    /// Position Independent Executable.
+    pub pie: bool,
+
+    /// Whether this DSO *and* its dependencies have been successfully loaded.
+    is_ready: AtomicBool,
+}
+
+impl DSO {
+    pub fn new(
+        path: &str,
+        data: &[u8],
+        base_addr: Option<usize>,
+        dlopened: bool,
+        id: usize,
+        tls_module_id: usize,
+        tls_offset: usize,
+    ) -> Result<(DSO, Option<Master>, Vec<ProgramHeader>), String> {
+        let elf = ElfFile::parse(data).map_err(|err| err.to_string())?;
+        let (mmap, tcb_master, dynamic) =
+            DSO::mmap_and_copy(path, &elf, data, base_addr, tls_offset)?;
+
+        let name = match dynamic.soname {
+            Some(soname) => soname.to_string(),
+            _ => basename(path),
+        };
+        let tls_offset = match tcb_master {
+            Some(ref master) => master.offset,
+            _ => 0,
+        };
+        let entry_point = if is_pie_enabled(&elf) {
+            mmap.as_ptr() as usize + elf.entry() as usize
+        } else {
+            elf.entry() as usize
+        };
+
+        let dso = DSO {
+            name,
+            id,
+            dlopened,
+            entry_point,
+            mmap,
+            tls_module_id: if tcb_master.is_some() {
+                tls_module_id
+            } else {
+                0
+            },
+            tls_offset,
+
+            pie: is_pie_enabled(&elf),
+            dynamic,
+            scope: spin::Once::new(),
+            is_ready: AtomicBool::new(false),
+        };
+
+        Ok((dso, tcb_master, elf.elf_program_headers().to_vec()))
+    }
+
+    #[inline]
+    pub fn mark_ready(&self) {
+        self.is_ready.store(true, Ordering::SeqCst);
+    }
+
+    #[inline]
+    pub fn scope(&self) -> &Scope {
+        self.scope.get().expect("scope not initialized")
+    }
+
+    /// Global Offset Table
+    #[inline]
+    pub fn got(&self) -> Option<NonNull<usize>> {
+        self.dynamic.got
+    }
+
+    #[inline]
+    pub fn runpath(&self) -> Option<&String> {
+        self.dynamic.runpath.as_ref()
+    }
+
+    #[inline]
+    pub fn dependencies(&self) -> &[&str] {
+        &self.dynamic.needed
+    }
+
+    pub fn get_sym<'a>(&self, name: &'a str) -> Option<(Symbol<'a>, SymbolBinding)> {
+        let (_, sym) = self.dynamic.hash_table.find(
+            name,
+            None,
+            self.dynamic.symbols,
+            self.dynamic.dynstrtab,
+            &VersionTable::default(),
+        )?;
+
+        if sym.st_shndx(NativeEndian) == elf::SHN_UNDEF {
+            return None;
+        }
+
+        Some((
+            Symbol {
+                name,
+                base: if self.pie {
+                    self.mmap.as_ptr() as usize
+                } else {
+                    0
+                },
+                value: sym.st_value(NativeEndian) as usize,
+                size: sym.st_size(NativeEndian) as usize,
+                sym_type: sym.st_type(),
+            },
+            // TODO(andypython): move this into [`Symbol`]
+            match sym.st_bind() {
+                elf::STB_GLOBAL => SymbolBinding::Global,
+                elf::STB_WEAK => SymbolBinding::Weak,
+                bind => unreachable!("get_sym bind {bind}"),
+            },
+        ))
+    }
+
+    pub fn run_init(&self) {
+        for f in self.dynamic.init_array {
+            unsafe { f() }
+        }
+    }
+
+    pub fn run_fini(&self) {
+        for f in self.dynamic.fini_array.iter().rev() {
+            unsafe { f() }
+        }
+    }
+
+    fn mmap_and_copy<'a>(
+        path: &str,
+        elf: &ElfFile<'a>,
+        data: &'a [u8],
+        base_addr: Option<usize>,
+        tls_offset: usize,
+    ) -> Result<(&'static [u8], Option<Master>, Dynamic<'static>), String> {
+        let endian = elf.endian();
+        log::trace!("# {}", path);
+        // data for struct LinkMap
+        let mut l_ld = 0;
+        // Calculate virtual memory bounds
+        let bounds = {
+            let mut bounds_opt: Option<(usize, usize)> = None;
+            for ph in elf.elf_program_headers() {
+                let voff = ph.p_vaddr(endian) % ph.p_align(endian);
+                let vaddr = (ph.p_vaddr(endian) - voff) as usize;
+                let vsize = ((ph.p_memsz(endian) + voff) as usize)
+                    .next_multiple_of(ph.p_align(endian) as usize);
+
+                match ph.p_type(endian) {
+                    elf::PT_DYNAMIC => {
+                        l_ld = ph.p_vaddr(endian);
+                    }
+                    elf::PT_LOAD => {
+                        log::trace!("  load {:#x}, {:#x}: {:x?}", vaddr, vsize, ph);
+                        if let Some(ref mut bounds) = bounds_opt {
+                            if vaddr < bounds.0 {
+                                bounds.0 = vaddr;
+                            }
+                            if vaddr + vsize > bounds.1 {
+                                bounds.1 = vaddr + vsize;
+                            }
+                        } else {
+                            bounds_opt = Some((vaddr, vaddr + vsize));
+                        }
+                    }
+                    _ => (),
+                }
+            }
+            bounds_opt.ok_or_else(|| "Unable to find PT_LOAD section".to_string())?
+        };
+        log::trace!("  bounds {:#x}, {:#x}", bounds.0, bounds.1);
+        // Allocate memory
+        let mmap = unsafe {
+            if let Some(addr) = base_addr {
+                let size = if is_pie_enabled(elf) {
+                    bounds.1
+                } else {
+                    bounds.1 - bounds.0
+                };
+                _r_debug
+                    .lock()
+                    .insert_first(addr + bounds.0, path, addr + l_ld as usize);
+                slice::from_raw_parts_mut((addr + bounds.0) as *mut u8, size)
+            } else {
+                let (start, end) = bounds;
+                let size = end - start;
+                let mut flags = sys_mman::MAP_ANONYMOUS | sys_mman::MAP_PRIVATE;
+                if start != 0 {
+                    flags |= sys_mman::MAP_FIXED_NOREPLACE;
+                }
+                log::trace!("  mmap({:#x}, {:x}, {:x})", start, size, flags);
+                let ptr = Sys::mmap(
+                    start as *mut c_void,
+                    size,
+                    //TODO: Make it possible to not specify PROT_EXEC on Redox
+                    sys_mman::PROT_READ | sys_mman::PROT_WRITE,
+                    flags,
+                    -1,
+                    0,
+                )
+                .map_err(|e| format!("failed to map {}. errno: {}", path, e.0))?;
+
+                if !(start as *mut c_void).is_null() {
+                    assert_eq!(
+                        ptr, start as *mut c_void,
+                        "mmap must always map on the destination we requested"
+                    );
+                }
+                log::trace!("    = {:p}", ptr);
+                _r_debug
+                    .lock()
+                    .insert(ptr as usize, path, ptr as usize + l_ld as usize);
+                slice::from_raw_parts_mut(ptr.cast::<u8>(), size)
+            }
+        };
+
+        let skip_load_segment_copy = base_addr.is_some();
+        let mut tcb_master = None;
+
+        // Copy data
+        let mut dynamic = None;
+        for ph in elf.elf_program_headers() {
+            match ph.p_type(endian) {
+                elf::PT_LOAD => {
+                    if skip_load_segment_copy {
+                        continue;
+                    }
+                    let obj_data = {
+                        let (offset, size) = ph.file_range(endian);
+                        let offset = offset as usize;
+                        let range = offset..(offset + size as usize);
+                        match data.get(range.clone()) {
+                            Some(some) => some,
+                            None => return Err(format!("failed to read {:x?}", range)),
+                        }
+                    };
+
+                    let mmap_data = {
+                        let range = if is_pie_enabled(elf) {
+                            let addr = ph.p_vaddr(endian) as usize;
+                            addr..addr + obj_data.len()
+                        } else {
+                            let addr = ph.p_vaddr(endian) as usize - mmap.as_ptr() as usize;
+                            addr..addr + obj_data.len()
+                        };
+                        match mmap.get_mut(range.clone()) {
+                            Some(some) => some,
+                            None => {
+                                return Err(format!("failed to write {:x?}", range));
+                            }
+                        }
+                    };
+                    let _voff = ph.p_vaddr(endian) % ph.p_align(endian);
+                    let _vsize = ((ph.p_memsz(endian) + _voff) as usize)
+                        .next_multiple_of(ph.p_align(endian) as usize);
+                    log::trace!(
+                        "  copy {:#x}, {:#x}: {:#x}, {:#x}",
+                        ph.p_vaddr(endian) - _voff,
+                        _vsize,
+                        _voff,
+                        obj_data.len()
+                    );
+                    mmap_data.copy_from_slice(obj_data);
+                }
+                elf::PT_TLS => {
+                    let ptr = unsafe {
+                        if is_pie_enabled(elf) {
+                            mmap.as_ptr().add(ph.p_vaddr(endian) as usize)
+                        } else {
+                            ph.p_vaddr(endian) as *const u8
+                        }
+                    };
+                    tcb_master = Some(Master {
+                        ptr,
+                        image_size: ph.p_filesz(endian) as usize,
+                        segment_size: ph.p_memsz(endian) as usize,
+                        offset: tls_offset + ph.p_memsz(endian) as usize,
+                    });
+                    log::trace!("  tcb master {:x?}", tcb_master);
+                }
+
+                elf::PT_DYNAMIC => {
+                    let entries = ph
+                        .dynamic(endian, data)
+                        .map_err(|err| err.to_string())?
+                        .ok_or_else(|| "Unable to parse PT_DYNAMIC section".to_string())?;
+                    dynamic = Some((ph, entries));
+                }
+                _ => (),
+            }
+        }
+
+        let dynamic = dynamic.ok_or_else(|| "Unable to find PT_DYNAMIC section".to_string())?;
+
+        let (parsed_dynamic, debug) = Self::parse_dynamic(path, mmap, is_pie_enabled(elf), dynamic)
+            .map_err(|e| e.to_string())?;
+
+        if let Some(i) = debug {
+            // FIXME: cleanup
+            let (ph, _) = dynamic;
+            let vaddr = ph.p_vaddr(endian) as usize;
+            let bytes: [u8; size_of::<Dyn>() / 2] =
+                ((&raw const _r_debug).cast::<*const RTLDDebug>() as usize).to_ne_bytes();
+            let start = if is_pie_enabled(elf) {
+                vaddr + i * size_of::<Dyn>() + size_of::<Dyn>() / 2
+            } else {
+                vaddr + i * size_of::<Dyn>() + size_of::<Dyn>() / 2
+                    - mmap.as_ptr().cast_mut() as usize
+            };
+            unsafe {
+                ptr::copy_nonoverlapping(
+                    bytes.as_ptr(),
+                    mmap.as_ptr().cast_mut().add(start),
+                    bytes.len(),
+                );
+            }
+        }
+
+        Ok((mmap, tcb_master, parsed_dynamic))
+    }
+
+    fn parse_dynamic<'a>(
+        path: &str,
+        mmap: &'a [u8],
+        is_pie: bool,
+        (_, entries): (&ProgramHeader, &[Dyn]),
+    ) -> object::Result<(Dynamic<'a>, Option<usize>)> {
+        let mut runpath = None;
+        let mut got = None;
+        let mut needed = vec![];
+        let mut jmprel = None;
+        let mut soname = None;
+        let mut hash_table = None;
+        let mut explicit_addend = None;
+        let mut pltrelsz = None;
+        let mut debug = None;
+        let mut symtab_ptr = None;
+        let (mut rel_ptr, mut rel_len) = (None, None);
+        let (mut relr_ptr, mut relr_len) = (None, None);
+        let (mut strtab_offset, mut strtab_size) = (None, None);
+        let (mut init_array_ptr, mut init_array_len) = (None, None);
+        let (mut fini_array_ptr, mut fini_array_len) = (None, None);
+        let (mut rela_offset, mut rela_len) = (None, None);
+
+        for (i, entry) in entries.iter().enumerate() {
+            let val = entry.d_val(NativeEndian);
+            let relative_idx = val as usize - if is_pie { 0 } else { mmap.as_ptr() as usize };
+            let ptr = (val as usize + if is_pie { mmap.as_ptr() as usize } else { 0 }) as *const u8;
+            let tag = entry.d_tag(NativeEndian) as u32;
+
+            match tag {
+                elf::DT_DEBUG => debug = Some(i),
+
+                // {Gnu,SysV}HashTable::parse()
+                //
+                // > The header does not contain a length field, and so all of
+                // > `data` will be used as the hash table values. It does not
+                // > matter if this is longer than needed...
+                elf::DT_GNU_HASH => {
+                    let value = GnuHashTable::parse(NativeEndian, &mmap[relative_idx..])?;
+                    hash_table = Some(HashTable::Gnu(value));
+                }
+
+                // XXX: Both GNU_HASH and HASH may be present, we give priority
+                // to GNU_HASH as it is significantly faster.
+                elf::DT_HASH if hash_table.is_none() => {
+                    let value = SysVHashTable::parse(NativeEndian, &mmap[relative_idx..])?;
+                    hash_table = Some(HashTable::Sysv(value));
+                }
+
+                elf::DT_PLTGOT => {
+                    got = Some(NonNull::new(ptr as *mut usize).expect("DT_PLTGOT is NULL"));
+                }
+
+                elf::DT_NEEDED => needed.push(entry),
+                elf::DT_JMPREL => jmprel = Some(ptr as usize),
+                elf::DT_RUNPATH => runpath = Some(entry), // FIXME(andypython): rpath
+                elf::DT_STRTAB => strtab_offset = Some(relative_idx),
+                elf::DT_STRSZ => strtab_size = Some(val),
+                elf::DT_SONAME => soname = Some(entry),
+
+                elf::DT_RELA => rela_offset = Some(ptr.cast::<Rela>()),
+                elf::DT_RELASZ => rela_len = Some(val as usize / size_of::<Rela>()),
+                elf::DT_RELAENT => {
+                    assert_eq!(val, size_of::<Rela>() as _)
+                }
+
+                elf::DT_REL => rel_ptr = Some(ptr.cast::<Rel>()),
+                elf::DT_RELSZ => rel_len = Some(val as usize / size_of::<Rel>()),
+                elf::DT_RELENT => {
+                    assert_eq!(val, size_of::<Rel>() as _)
+                }
+
+                DT_RELR => relr_ptr = Some(ptr.cast::<Relr>()),
+                DT_RELRSZ => relr_len = Some(val as usize / size_of::<Relr>()),
+                DT_RELRENT => {
+                    assert_eq!(val, size_of::<Relr>() as _)
+                }
+
+                elf::DT_PLTREL => {
+                    let val = val as u32;
+                    if val == elf::DT_RELA {
+                        explicit_addend = Some(true);
+                    } else {
+                        assert_eq!(val, elf::DT_REL);
+                        explicit_addend = Some(false);
+                    }
+                }
+                elf::DT_PLTRELSZ => pltrelsz = Some(val as usize),
+
+                elf::DT_INIT_ARRAY if val != 0 => init_array_ptr = Some(ptr.cast::<InitFn>()),
+                elf::DT_INIT_ARRAYSZ => init_array_len = Some(val as usize / size_of::<InitFn>()),
+
+                elf::DT_FINI_ARRAY if val != 0 => fini_array_ptr = Some(ptr.cast::<InitFn>()),
+                elf::DT_FINI_ARRAYSZ => fini_array_len = Some(val as usize / size_of::<InitFn>()),
+
+                elf::DT_SYMTAB => symtab_ptr = Some(ptr.cast::<Sym>()),
+                elf::DT_SYMENT => {
+                    assert_eq!(val as usize, size_of::<Sym>());
+                }
+
+                _ => {}
+            }
+        }
+
+        let strtab_offset = strtab_offset.expect("mandatory DT_STRTAB not present");
+        let strtab_size = strtab_size.expect("mandatory DT_STRSZ not present");
+
+        let dynstrtab = StringTable::new(
+            &*mmap,
+            strtab_offset as u64,
+            strtab_offset as u64 + strtab_size as u64,
+        );
+
+        let get_str = |entry: &Dyn| {
+            entry
+                .string(NativeEndian, dynstrtab)
+                .map(|bytes| core::str::from_utf8(bytes).expect("non utf-8 elf symbol name"))
+        };
+
+        unsafe fn get_array<'a, T>(ptr: Option<*const T>, len: Option<usize>) -> &'a [T] {
+            if let Some(ptr) = ptr {
+                let len = len.expect("dynamic entry was present without it's corresponding size");
+                unsafe { core::slice::from_raw_parts(ptr, len) }
+            } else {
+                assert!(len.is_none());
+                &[]
+            }
+        }
+
+        let needed = needed
+            .into_iter()
+            .map(get_str)
+            .collect::<object::Result<Vec<_>>>()?;
+
+        let base = dirname(path);
+
+        let runpath = runpath
+            .map(get_str)
+            .transpose()?
+            .map(|value| value.replace("$ORIGIN", &base));
+
+        let soname = soname.map(get_str).transpose()?;
+
+        let jmprel = jmprel.unwrap_or_default();
+        let hash_table = hash_table.expect("either DT_GNU_HASH and/or DT_HASH mut be present");
+
+        let init_array = unsafe { get_array(init_array_ptr, init_array_len) };
+        let fini_array = unsafe { get_array(fini_array_ptr, fini_array_len) };
+        let rela = unsafe { get_array(rela_offset, rela_len) };
+        let relr = unsafe { get_array(relr_ptr, relr_len) };
+        let rel = unsafe { get_array(rel_ptr, rel_len) };
+
+        Ok((
+            Dynamic {
+                symbols: unsafe { get_array(symtab_ptr, Some(hash_table.symbol_table_length())) },
+                runpath,
+                got,
+                needed,
+                jmprel,
+                soname,
+                hash_table,
+                dynstrtab,
+                init_array,
+                fini_array,
+                rela,
+                rel,
+                relr,
+                explicit_addend: explicit_addend.unwrap_or_default(),
+                pltrelsz: pltrelsz.unwrap_or_default(),
+            },
+            debug,
+        ))
+    }
+
+    /// `TLSDESC` relocation being an extension to the original TLS ABI spec can
+    /// be present in either `.rela.plt` (handled in [`Self::static_relocate`])
+    /// or `.rela.dyn` (handled in [`Self::lazy_relocate`]) due to the lack of a
+    /// standard unfortunately.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `reloc.kind` is not `RelocationKind::TLSDESC`.
+    fn do_tlsdesc_reloc(&self, reloc: Relocation, ptr: *mut usize, global_scope: &Scope) {
+        assert!(reloc.kind == RelocationKind::TLSDESC);
+        let (sym, tls_module_id, tls_offset) = if reloc.sym != SymbolIndex(0) {
+            let sym_name = self.dynamic.symbol_name(reloc.sym).unwrap();
+            let (sym, _, obj) = resolve_sym(sym_name, &[global_scope, self.scope()]).unwrap();
+            (sym.value, obj.tls_module_id, obj.tls_offset)
+        } else {
+            (0, self.tls_module_id, self.tls_offset)
+        };
+
+        let resolver = unsafe { &mut *ptr };
+        let descriptor = unsafe { &mut *ptr.add(1) };
+
+        if self.dlopened {
+            #[cfg(not(any(target_arch = "x86_64", target_arch = "aarch64")))]
+            {
+                unimplemented!("`TLSDESC` relocations are not yet implemented for riscv64 and x86");
+            }
+
+            let mut tls_index = crate::header::dl_tls::dl_tls_index {
+                ti_module: tls_module_id,
+                ti_offset: reloc.addend.unwrap_or_default(),
+            };
+
+            // Ensure the DTV entry is initialised.
+            unsafe { __tls_get_addr(&raw mut tls_index) };
+
+            *resolver = __tlsdesc_dynamic as *const () as usize;
+            *descriptor = Box::into_raw(Box::new(TlsDescriptor {
+                module_id: tls_module_id - 1,
+                addend: sym + reloc.addend.unwrap_or_default(),
+            })) as usize;
+        } else {
+            *resolver = __tlsdesc_static as *const () as usize;
+            *descriptor = sym + tls_offset + reloc.addend.unwrap_or_default();
+        }
+    }
+
+    fn static_relocate(&self, global_scope: &Scope, reloc: Relocation) -> object::Result<()> {
+        let b = self.mmap.as_ptr() as usize;
+
+        let (sym, my_sym) = if reloc.sym != STN_UNDEF {
+            let name = self.dynamic.symbol_name(reloc.sym).unwrap();
+
+            let lookup_scopes = [global_scope, self.scope()];
+            let sym = if matches!(reloc.kind, RelocationKind::COPY) {
+                lookup_scopes
+                    .iter()
+                    .find_map(|scope| scope._get_sym(name, 1))
+            } else {
+                resolve_sym(name, &lookup_scopes)
+            }
+            .map(|(sym, _, obj)| (sym, obj));
+
+            (sym, self.dynamic.symbol(reloc.sym))
+        } else {
+            (None, None)
+        };
+
+        let (s, tls_obj) = sym
+            .as_ref()
+            .map(|(sym, obj)| (sym.as_ptr() as usize, obj.as_ref()))
+            // (1) According to the System V gABI (Chapter 4, "Relocation"): if
+            // the symbol index (`reloc.sym`) is undefined, the symbol value
+            // (`s`) is defined as 0.
+            //
+            // (2) According to Drepper's ELF Handling For Thread-Local Storage
+            // (Section 4.2, "Local Dynamic TLS Model"): a relocation with
+            // undefined symbol index implies a reference to the current module
+            // itself. Hence we resolve the object to `self`.
+            .unwrap_or((0, self));
+
+        let ptr = if self.pie {
+            (b + reloc.offset) as *mut u8
+        } else {
+            reloc.offset as *mut u8
+        };
+        let p = ptr as usize;
+        let a = match reloc.addend {
+            Some(some) => some,
+            None => match reloc.kind {
+                RelocationKind::COPY | RelocationKind::GOT | RelocationKind::PLT => 0,
+                _ => unsafe { *ptr.cast::<usize>() },
+            },
+        };
+
+        // TODO: support different sizes?
+        let set_usize = |value| unsafe {
+            *ptr.cast::<usize>() = value;
+        };
+
+        match reloc.kind {
+            RelocationKind::DTPMOD => set_usize(tls_obj.tls_module_id),
+            // TODO: Subtract DTP_OFFSET, which is 0x800 on riscv64, 0 on x86?
+            RelocationKind::DTPOFF => {
+                if reloc.sym.0 > 0 {
+                    let (sym, _) = sym
+                        .as_ref()
+                        .expect("RelocationKind::DTPOFF called without valid symbol");
+                    set_usize(sym.value + a);
+                } else {
+                    set_usize(a);
+                }
+            }
+            RelocationKind::GOT => set_usize(s),
+            RelocationKind::OFFSET => set_usize((s + a).wrapping_sub(p)),
+            RelocationKind::RELATIVE => set_usize(b + a),
+            RelocationKind::SYMBOLIC => set_usize(s + a),
+            RelocationKind::TPOFF => {
+                assert!(
+                    !tls_obj.dlopened,
+                    "The {{local/initial}}-exec access model is used for symbol '{}' in '{}', which requires a static TLS block. However, the definition in '{}' resides in the dynamic TLS block because the object was loaded via dlopen(2).",
+                    reloc.sym, self.name, tls_obj.name
+                );
+                if reloc.sym.0 > 0 {
+                    let (sym, _) = sym
+                        .as_ref()
+                        .expect("RelocationKind::TPOFF called without valid symbol");
+                    set_usize((sym.value + a).wrapping_sub(tls_obj.tls_offset));
+                } else {
+                    set_usize(a.wrapping_sub(tls_obj.tls_offset));
+                }
+            }
+            RelocationKind::IRELATIVE => unsafe {
+                let f: unsafe extern "C" fn() -> usize = core::mem::transmute(b + a);
+                set_usize(f());
+            },
+            RelocationKind::COPY => unsafe {
+                let (sym, obj) = sym
+                    .as_ref()
+                    .expect("RelocationKind::COPY called without valid symbol");
+                let my_sym = my_sym.expect("RelocationKind::COPY called without valid symbol");
+                assert!(
+                    sym.size == my_sym.st_size(NativeEndian) as usize,
+                    "RelocationKind::COPY failed: I was trying to use the symbol {} from {} for {} but they had different sizes. Please consider relinking.",
+                    sym.name,
+                    obj.name,
+                    self.name
+                );
+                // SAFETY: Both the source and destination have the same size.
+                ptr::copy_nonoverlapping(sym.as_ptr() as *const u8, ptr, sym.size);
+            },
+            RelocationKind::TLSDESC => {
+                self.do_tlsdesc_reloc(reloc, ptr.cast::<usize>(), global_scope)
+            }
+            _ => unimplemented!("relocation type {:?}", reloc.kind),
+        }
+
+        Ok(())
+    }
+
+    fn lazy_relocate(&self, global_scope: &Scope, resolve: Resolve) -> object::Result<()> {
+        let Some(got) = self.got() else {
+            assert_eq!(self.dynamic.jmprel, 0);
+            return Ok(());
+        };
+
+        let object_base_addr = self.mmap.as_ptr() as usize;
+        let jmprel = self.dynamic.jmprel;
+        let pltrelsz = self.dynamic.pltrelsz;
+
+        unsafe {
+            got.add(1).write(core::ptr::addr_of!(*self) as usize);
+            got.add(2)
+                .write(__plt_resolve_trampoline as *const () as usize);
+        }
+
+        let relsz = if self.dynamic.explicit_addend {
+            size_of::<Rela>()
+        } else {
+            size_of::<Rel>()
+        };
+
+        for addr in (jmprel..(jmprel + pltrelsz)).step_by(relsz) {
+            let reloc: Relocation = if self.dynamic.explicit_addend {
+                unsafe { &*(addr as *const Rela) }.into()
+            } else {
+                unsafe { &*(addr as *const Rel) }.into()
+            };
+
+            let ptr = if self.pie {
+                (object_base_addr + reloc.offset) as *mut usize
+            } else {
+                reloc.offset as *mut usize
+            };
+
+            match (reloc.kind, resolve) {
+                (RelocationKind::PLT, Resolve::Lazy) if self.pie => unsafe {
+                    *ptr += object_base_addr;
+                },
+
+                (RelocationKind::PLT, Resolve::Lazy) => {
+                    // NOP.
+                }
+
+                (RelocationKind::PLT, Resolve::Now) => {
+                    let name = self.dynamic.symbol_name(reloc.sym).unwrap();
+
+                    let resolved = resolve_sym(name, &[global_scope, self.scope()])
+                        .map(|(sym, _, _)| sym.as_ptr() as usize)
+                        .unwrap_or_else(|| {
+                            panic!(
+                                "unresolved symbol: {name} for soname {:?}",
+                                self.dynamic.soname
+                            )
+                        });
+
+                    unsafe {
+                        *ptr = resolved + reloc.addend.unwrap_or(0);
+                    }
+                }
+
+                (RelocationKind::TLSDESC, Resolve::Now) => {
+                    self.do_tlsdesc_reloc(reloc, ptr, global_scope);
+                }
+                (RelocationKind::TLSDESC, Resolve::Lazy) => {
+                    unreachable!("TLSDESC cannot be lazily resolved")
+                }
+
+                _ => {
+                    unimplemented!(
+                        "relocation type {:?} with resolve {:?}",
+                        reloc.kind,
+                        resolve
+                    )
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn relocate(&self, ph: &[ProgramHeader], resolve: Resolve) -> object::Result<()> {
+        let global_scope = GLOBAL_SCOPE.read();
+        let base = self.mmap.as_ptr();
+
+        unsafe {
+            apply_relr(base, self.dynamic.relr);
+        }
+
+        self.dynamic
+            .static_relocations()
+            .try_for_each(|reloc| self.static_relocate(&global_scope, reloc))?;
+
+        self.lazy_relocate(&global_scope, resolve)?;
+
+        // Protect pages
+        for ph in ph
+            .iter()
+            .filter(|ph| ph.p_type(NativeEndian) == elf::PT_LOAD)
+        {
+            let voff = ph.p_vaddr(NativeEndian) % ph.p_align(NativeEndian);
+            let vaddr = (ph.p_vaddr(NativeEndian) - voff) as usize;
+            let vsize = ((ph.p_memsz(NativeEndian) + voff) as usize)
+                .next_multiple_of(ph.p_align(NativeEndian) as usize);
+
+            let mut prot = 0;
+            if ph.p_flags(NativeEndian) & elf::PF_R == elf::PF_R {
+                prot |= sys_mman::PROT_READ;
+            }
+
+            // W ^ X. If it is executable, do not allow it to be writable, even if requested
+            if ph.p_flags(NativeEndian) & elf::PF_X == elf::PF_X {
+                prot |= sys_mman::PROT_EXEC;
+            } else if ph.p_flags(NativeEndian) & elf::PF_W == elf::PF_W {
+                prot |= sys_mman::PROT_WRITE;
+            }
+
+            unsafe {
+                let ptr = if self.pie {
+                    self.mmap.as_ptr().add(vaddr)
+                } else {
+                    vaddr as *const u8
+                };
+                log::trace!("  prot {:#x}, {:#x}: {:p}, {:#x}", vaddr, vsize, ptr, prot);
+                Sys::mprotect(ptr as *mut c_void, vsize, prot).expect("[ld.so]: mprotect failed");
+            }
+        }
+
+        Ok(())
+    }
+}
+
+impl Drop for DSO {
+    fn drop(&mut self) {
+        if self.is_ready.load(Ordering::SeqCst) {
+            // `run_fini` should not be called if we are being prematurely
+            // dropped (e.g. failed to satisfy dependencies).
+            self.run_fini();
+        }
+        unsafe { Sys::munmap(self.mmap.as_ptr() as *mut c_void, self.mmap.len()).unwrap() };
+    }
+}
+
+fn is_pie_enabled(elf: &ElfFile) -> bool {
+    elf.elf_header().e_type.get(elf.endian()) == elf::ET_DYN
+}
+
+fn basename(path: &str) -> String {
+    path.split("/").last().unwrap_or(path).to_string()
+}
+
+fn dirname(path: &str) -> String {
+    let mut parts: Vec<&str> = path.split("/").collect();
+    parts.truncate(parts.len() - 1);
+    parts.join("/")
+}
+
+pub fn resolve_sym<'a>(
+    name: &'a str,
+    scopes: &[&'a Scope],
+) -> Option<(Symbol<'a>, SymbolBinding, Arc<DSO>)> {
+    scopes.iter().find_map(|scope| scope.get_sym(name))
+}
+
+#[repr(C)]
+struct TlsDescriptor {
+    module_id: usize,
+    addend: usize,
+}
+
+#[cfg(target_arch = "x86_64")]
+#[unsafe(naked)]
+unsafe extern "C" fn __tlsdesc_static() {
+    core::arch::naked_asm!("mov rax, [rax + 8]", "ret")
+}
+
+#[cfg(target_arch = "x86")]
+#[unsafe(naked)]
+unsafe extern "C" fn __tlsdesc_static() {
+    core::arch::naked_asm!("mov eax, [eax + 4]", "ret")
+}
+
+#[cfg(target_arch = "aarch64")]
+#[unsafe(naked)]
+unsafe extern "C" fn __tlsdesc_static() {
+    core::arch::naked_asm!("ldr x0, [x0, #8]", "ret")
+}
+
+#[cfg(target_arch = "riscv64")]
+#[unsafe(naked)]
+unsafe extern "C" fn __tlsdesc_static() {
+    core::arch::naked_asm!("ld a0, 8(a0)", "ret");
+}
+
+unsafe extern "C" {
+    fn __tlsdesc_dynamic();
+}
+
+#[cfg(target_arch = "x86_64")]
+core::arch::global_asm!(
+    "
+.global __tlsdesc_dynamic
+.hidden __tlsdesc_dynamic
+__tlsdesc_dynamic:
+    push rbx
+    push rcx
+
+    mov rax, [rax + 8] // TLS descriptor
+    mov rbx, [rax + {TLS_DESCRIPTOR_MODULE_ID_OFF}] // tls_descriptor.module_id
+    mov rcx, [rax + {TLS_DESCRIPTOR_ADDEND_OFF}] // tls_descriptor.addend
+    mov rax, qword ptr fs:[{DTV_PTR_OFF}] // tcb.dtv_ptr
+
+    // tcb.dtv_ptr[tls_descriptor.module_id] + tls_descriptor.addend
+    mov rax, [rax + rbx * 8]
+    add rax, rcx
+    sub rax, qword ptr fs:[{TCB_SELF_PTR_OFF}]
+
+    pop rcx
+    pop rbx
+
+    ret
+",
+    TLS_DESCRIPTOR_MODULE_ID_OFF = const offset_of!(TlsDescriptor, module_id),
+    TLS_DESCRIPTOR_ADDEND_OFF = const offset_of!(TlsDescriptor, addend),
+    DTV_PTR_OFF = const offset_of!(Tcb, dtv_ptr),
+    TCB_SELF_PTR_OFF = const offset_of!(Tcb, generic.tcb_ptr),
+);
+
+#[cfg(target_arch = "x86")]
+core::arch::global_asm!(
+    "
+.global __tlsdesc_dynamic
+.hidden __tlsdesc_dynamic
+__tlsdesc_dynamic:
+    ud2
+"
+);
+
+#[cfg(target_arch = "aarch64")]
+core::arch::global_asm!(
+    "
+.global __tlsdesc_dynamic
+.hidden __tlsdesc_dynamic
+__tlsdesc_dynamic:
+    stp x1, x2, [sp, #-16]!
+
+    ldr x0, [x0, #8] // TLS descriptor
+
+    // x0 := tls_descriptor.module_id
+    // x1 := tls_descriptor.addend
+    ldp x0, x1, [x0]
+
+    mrs x2, tpidr_el0 // ABI ptr
+    ldr x2, [x2] // TCB ptr
+
+    sub x1, x1, x2 // tls_descriptor.addend -= tcb
+
+    ldr x2, [x2, {DTV_PTR_OFF}] // tcb.dtv_ptr
+    ldr x2, [x2, x0, lsl #3] // tcb.dtv_ptr[tls_descriptor.module_id]
+    add x0, x2, x1 // tcb.dtv_ptr[tls_descriptor.module_id] + tls_descriptor.addend
+
+    ldp x1, x2, [sp], #16
+    ret
+",
+    DTV_PTR_OFF = const offset_of!(Tcb, dtv_ptr),
+);
+
+#[cfg(target_arch = "riscv64")]
+core::arch::global_asm!(
+    "
+.global __tlsdesc_dynamic
+.hidden __tlsdesc_dynamic
+__tlsdesc_dynamic:
+    unimp
+"
+);
+
+/// Applies [`DT_RELR`] relative relocations.
+pub unsafe fn apply_relr(base: *const u8, relr: &[Relr]) {
+    let mut addr = ptr::null_mut();
+    for &entry in relr {
+        if entry & 1 == 0 {
+            // An even entry sets up `addr` for subsequent odd entries.
+            unsafe {
+                addr = base.add(entry) as *mut usize;
+                *addr += base as usize;
+                addr = addr.add(1);
+            }
+        } else {
+            // An odd entry indicates a bitmap describing at maximum 63
+            // (for 64-bit) or 31 (for 32-bit) locations following `addr`.
+            // Odd entries can be chained.
+            let mut entry = entry >> 1;
+            let mut i = 0;
+            while entry != 0 {
+                if entry & 1 != 0 {
+                    unsafe {
+                        *addr.add(i) += base as usize;
+                    }
+                }
+                entry >>= 1;
+                i += 1;
+            }
+
+            addr = unsafe { addr.add(CHAR_BITS * size_of::<Relr>() - 1) };
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/ld_so/linker.rs b/recipes/core/relibc/src/ld_so/linker.rs
new file mode 100644
index 0000000000..4a01b0d9b1
--- /dev/null
+++ b/recipes/core/relibc/src/ld_so/linker.rs
@@ -0,0 +1,1229 @@
+use alloc::{
+    collections::BTreeMap,
+    rc::Rc,
+    string::{String, ToString},
+    sync::{Arc, Weak},
+    vec::Vec,
+};
+use object::elf;
+#[cfg(not(target_arch = "x86"))]
+use object::{
+    NativeEndian,
+    read::elf::{Rela as _, Sym},
+};
+
+use core::{
+    cell::RefCell,
+    ptr::{self, NonNull},
+};
+
+use crate::{
+    ALLOCATOR,
+    c_str::{CStr, CString},
+    error::Errno,
+    header::{
+        dl_tls::{__tls_get_addr, dl_tls_index},
+        fcntl, sys_mman,
+        unistd::F_OK,
+    },
+    ld_so::dso::SymbolBinding,
+    out::Out,
+    platform::{
+        Pal, Sys,
+        types::{c_int, c_void},
+    },
+    sync::rwlock::RwLock,
+};
+
+#[cfg(feature = "ld_so_cache")]
+use crate::header::sys_stat::stat;
+
+#[cfg(not(target_arch = "x86"))]
+use crate::{ld_so::dso::resolve_sym, platform::types::c_uint};
+
+#[cfg(not(target_arch = "x86"))]
+use super::dso::Rela;
+use super::{
+    PATH_SEP,
+    access::accessible,
+    callbacks::LinkerCallbacks,
+    debug::{_dl_debug_state, _r_debug, RTLDState},
+    dso::{DSO, ProgramHeader},
+    tcb::{Master, Tcb},
+};
+
+#[derive(Debug, Copy, Clone)]
+pub enum DlError {
+    /// Failed to locate the requested DSO.
+    NotFound,
+    /// The DSO is malformed somehow.
+    Malformed,
+    /// Invalid DSO handle.
+    InvalidHandle,
+    /// Out of memory.
+    Oom,
+}
+
+impl DlError {
+    /// Returns a human-readable, null-terminated C string describing the error.
+    pub const fn repr(&self) -> &'static core::ffi::CStr {
+        match self {
+            DlError::NotFound => {
+                c"Failed to locate the requested DSO. Set `LD_DEBUG=all` for more information."
+            }
+
+            DlError::Malformed => {
+                c"The DSO is malformed somehow. Set `LD_DEBUG=all` for more information."
+            }
+
+            DlError::InvalidHandle => {
+                c"Invalid DSO handle. Set `LD_DEBUG=all` for more information."
+            }
+
+            DlError::Oom => c"Out of memory.",
+        }
+    }
+}
+
+pub type Result<T> = core::result::Result<T, DlError>;
+
+pub(super) static GLOBAL_SCOPE: RwLock<Scope> = RwLock::new(Scope::global());
+
+struct MmapFile {
+    fd: i32,
+    ptr: *mut c_void,
+    size: usize,
+}
+
+impl MmapFile {
+    fn open(path: CStr, oflag: c_int) -> core::result::Result<Self, Errno> {
+        let fd = Sys::open(path, oflag, 0 /* mode */)?;
+        let mut stat = crate::header::sys_stat::stat::default();
+        Sys::fstat(fd, Out::from_mut(&mut stat))?;
+
+        Self::from_fd(fd, stat.st_size as usize)
+    }
+
+    fn from_fd(fd: i32, size: usize) -> core::result::Result<Self, Errno> {
+        let ptr = unsafe {
+            Sys::mmap(
+                ptr::null_mut(),
+                size,
+                sys_mman::PROT_READ,
+                sys_mman::MAP_PRIVATE,
+                fd,
+                0,
+            )
+        }?;
+
+        Ok(Self { fd, ptr, size })
+    }
+
+    fn anonymous(size: usize) -> core::result::Result<Self, Errno> {
+        let ptr = unsafe {
+            Sys::mmap(
+                ptr::null_mut(),
+                size,
+                sys_mman::PROT_READ | sys_mman::PROT_WRITE,
+                sys_mman::MAP_PRIVATE | sys_mman::MAP_ANONYMOUS,
+                -1,
+                0,
+            )
+        }?;
+
+        Ok(Self { fd: -1, ptr, size })
+    }
+
+    fn data(&self) -> &[u8] {
+        unsafe { core::slice::from_raw_parts(self.ptr.cast::<u8>(), self.size) }
+    }
+
+    fn as_mut_slice(&self) -> &mut [u8] {
+        unsafe { core::slice::from_raw_parts_mut(self.ptr.cast::<u8>(), self.size) }
+    }
+}
+
+impl Drop for MmapFile {
+    fn drop(&mut self) {
+        unsafe {
+            Sys::munmap(self.ptr, self.size).unwrap();
+            if self.fd != -1 {
+                Sys::close(self.fd).unwrap();
+            }
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Symbol<'a> {
+    pub name: &'a str,
+    pub value: usize,
+    pub base: usize,
+    pub size: usize,
+    pub sym_type: u8,
+}
+
+impl Symbol<'_> {
+    pub fn as_ptr(&self) -> *mut c_void {
+        (self.base + self.value) as *mut c_void
+    }
+}
+
+#[derive(Debug, Default, Copy, Clone, PartialEq)]
+pub enum Resolve {
+    /// Resolve all undefined symbols immediately.
+    #[cfg_attr(not(target_arch = "x86_64"), default)]
+    Now,
+    /// Perform lazy binding (i.e. symbols will be resolved when they are first
+    /// used).
+    #[cfg_attr(target_arch = "x86_64", default)]
+    Lazy,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum ScopeKind {
+    Global,
+    Local,
+}
+
+pub enum Scope {
+    /// The global scope initially contains the main program and all of its
+    /// dependencies. Additional objects will be added to this scope via
+    /// `dlopen(2)` if the `RTLD_GLOBAL` flag is set.
+    Global { objs: Vec<Weak<DSO>> },
+    Local {
+        owner: Option<Weak<DSO>>,
+        objs: Vec<Arc<DSO>>,
+    },
+}
+
+impl Scope {
+    #[inline]
+    const fn global() -> Self {
+        Self::Global { objs: Vec::new() }
+    }
+
+    #[inline]
+    const fn local() -> Self {
+        Self::Local {
+            owner: None,
+            objs: Vec::new(),
+        }
+    }
+
+    fn set_owner(&mut self, obj: Weak<DSO>) {
+        match self {
+            Self::Global { .. } => panic!("attempted to set global scope owner"),
+            Self::Local { owner, .. } => {
+                assert!(owner.is_none(), "attempted to change local scope owner");
+                *owner = Some(obj);
+            }
+        }
+    }
+
+    fn add(&mut self, target: &Arc<DSO>) {
+        match self {
+            Self::Global { objs } => {
+                let target = Arc::downgrade(target);
+                for obj in objs.iter() {
+                    if Weak::ptr_eq(obj, &target) {
+                        return;
+                    }
+                }
+
+                objs.push(target);
+            }
+
+            Self::Local { objs, .. } => {
+                for obj in objs.iter() {
+                    if Arc::ptr_eq(obj, target) {
+                        return;
+                    }
+                }
+
+                objs.push(target.clone());
+            }
+        }
+    }
+
+    pub(super) fn get_sym<'a>(
+        &self,
+        name: &'a str,
+    ) -> Option<(Symbol<'a>, SymbolBinding, Arc<DSO>)> {
+        self._get_sym(name, 0)
+    }
+
+    pub(super) fn _get_sym<'a>(
+        &self,
+        name: &'a str,
+        skip: usize,
+    ) -> Option<(Symbol<'a>, SymbolBinding, Arc<DSO>)> {
+        let mut res = None;
+
+        let get_sym = |obj: Arc<DSO>| {
+            if let Some((sym, binding)) = obj.get_sym(name) {
+                if binding.is_global() {
+                    return Some((sym, binding, obj.clone()));
+                }
+
+                res = Some((sym, binding, obj.clone()));
+            }
+
+            None
+        };
+
+        match self {
+            Self::Global { objs } => objs
+                .iter()
+                .skip(skip)
+                .map(|o| o.upgrade().unwrap())
+                .find_map(get_sym),
+            Self::Local { owner, objs } => {
+                let owner = owner
+                    .as_ref()
+                    .expect("local scope without owner")
+                    .upgrade()
+                    .expect("local scope owner was dropped");
+
+                core::iter::once(owner)
+                    .chain(objs.iter().cloned())
+                    .skip(skip)
+                    .find_map(get_sym)
+            }
+        }
+        .or(res)
+    }
+
+    fn copy_into(&self, other: &mut Self) {
+        match (self, other) {
+            (Self::Local { owner, objs }, Self::Global { objs: other_objs }) => {
+                // FIXME: may have duplicates
+                let owner = owner.as_ref().expect("local scope without owner");
+                other_objs.push(owner.clone());
+                other_objs.extend(objs.iter().map(Arc::downgrade));
+            }
+
+            _ => unreachable!(),
+        }
+    }
+
+    fn debug(&self) {
+        match self {
+            Self::Global { objs } => {
+                println!(
+                    "[@global] {:?}",
+                    objs.iter()
+                        .map(|x| x.upgrade().unwrap().name.clone())
+                        .collect::<Vec<_>>()
+                );
+            }
+
+            Self::Local { owner, objs } => {
+                let owner = owner.as_ref().unwrap().upgrade().unwrap();
+                println!(
+                    "[{}] {:?}",
+                    owner.name,
+                    objs.iter().map(|x| x.name.clone()).collect::<Vec<_>>()
+                )
+            }
+        }
+    }
+}
+
+// Used by dlfcn.h
+//
+// We need this as the handle must be created and destroyed with the dynamic
+// linker's allocator.
+pub struct ObjectHandle(*const DSO);
+
+impl ObjectHandle {
+    #[inline]
+    fn new(obj: Arc<DSO>) -> Self {
+        Self(Arc::into_raw(obj))
+    }
+
+    #[inline]
+    fn into_inner(self) -> Arc<DSO> {
+        unsafe { Arc::from_raw(self.0) }
+    }
+
+    #[inline]
+    pub fn as_ptr(&self) -> *const c_void {
+        self.0.cast()
+    }
+
+    #[inline]
+    pub fn from_ptr(ptr: *const c_void) -> Option<Self> {
+        NonNull::new(ptr as *mut DSO).map(|ptr| Self(ptr.as_ptr()))
+    }
+}
+
+impl AsRef<DSO> for ObjectHandle {
+    #[inline]
+    fn as_ref(&self) -> &DSO {
+        unsafe { &*self.0 }
+    }
+}
+
+bitflags::bitflags! {
+    #[derive(Debug, Default)]
+    pub struct DebugFlags: u32 {
+        /// Display what objects and where they are being loaded.
+        const LOAD = 1 << 1;
+        /// Display library search paths.
+        const SEARCH = 1 << 2;
+        /// Display scope information.
+        const SCOPES = 1 << 3;
+    }
+}
+
+#[derive(Default)]
+pub struct Config {
+    pub debug_flags: DebugFlags,
+    library_path: Option<String>,
+    /// Resolve symbols at program startup.
+    bind_now: bool,
+}
+
+impl Config {
+    pub fn from_env(env: &BTreeMap<String, String>) -> Self {
+        let debug_flags = env
+            .get("LD_DEBUG")
+            .map(|value| {
+                let mut flags = DebugFlags::empty();
+                for opt in value.split(',') {
+                    flags |= match opt {
+                        "load" => DebugFlags::LOAD,
+                        "search" => DebugFlags::SEARCH,
+                        "scopes" => DebugFlags::SCOPES,
+                        "all" => DebugFlags::all(),
+                        _ => {
+                            eprintln!("[ld.so]: unknown debug flag '{}'", opt);
+                            DebugFlags::empty()
+                        }
+                    };
+                }
+
+                flags
+            })
+            .unwrap_or(DebugFlags::empty());
+
+        Self {
+            debug_flags,
+            library_path: env.get("LD_LIBRARY_PATH").cloned(),
+            bind_now: env
+                .get("LD_BIND_NOW")
+                .map(|value| !value.is_empty())
+                .unwrap_or_default(),
+        }
+    }
+}
+
+pub struct Linker {
+    config: Config,
+
+    next_object_id: usize,
+    next_tls_module_id: usize,
+    tls_size: usize,
+    objects: BTreeMap<usize, Arc<DSO>>,
+    name_to_object_id_map: BTreeMap<String, usize>,
+    pub cbs: Rc<RefCell<LinkerCallbacks>>,
+}
+
+const ROOT_ID: usize = 1;
+
+impl Linker {
+    pub fn new(config: Config) -> Self {
+        Self {
+            config,
+            next_object_id: ROOT_ID,
+            next_tls_module_id: 1,
+            tls_size: 0,
+            objects: BTreeMap::new(),
+            name_to_object_id_map: BTreeMap::new(),
+            cbs: Rc::new(RefCell::new(LinkerCallbacks::new())),
+        }
+    }
+
+    pub fn load_program(&mut self, path: &str, base_addr: Option<usize>) -> Result<usize> {
+        let dso = self.load_object(
+            path,
+            &None,
+            base_addr,
+            false,
+            if self.config.bind_now {
+                Resolve::Now
+            } else {
+                Resolve::default()
+            },
+            ScopeKind::Global,
+        )?;
+        Ok(dso.entry_point)
+    }
+
+    pub fn load_library(
+        &mut self,
+        name: Option<&str>,
+        resolve: Resolve,
+        scope: ScopeKind,
+        noload: bool,
+    ) -> Result<ObjectHandle> {
+        log::trace!(
+            "[ld.so] load_library(name={:?}, resolve={:#?}, scope={:#?}, noload={})",
+            name,
+            resolve,
+            scope,
+            noload
+        );
+
+        if noload && resolve == Resolve::Now {
+            // Do not perform lazy binding anymore.
+            // * Check if loaded with Resolve::Now and if so, early return.
+            // * If not, resolve all symbols now.
+            todo!("resolve symbols now!");
+        }
+
+        match name {
+            Some(name) => {
+                if let Some(id) = self.name_to_object_id_map.get(name) {
+                    let obj = self.objects.get(id).unwrap();
+
+                    // We may be upgrading the object from a local scope to the
+                    // global scope.
+                    if scope == ScopeKind::Global {
+                        if self.config.debug_flags.contains(DebugFlags::SCOPES) {
+                            eprintln!("[ld.so]: moving {} into the global scope", obj.name);
+                        }
+
+                        {
+                            let mut global_scope = GLOBAL_SCOPE.write();
+                            obj.scope().copy_into(&mut global_scope);
+                        }
+                        self.scope_debug();
+                    }
+
+                    Ok(ObjectHandle::new(obj.clone()))
+                } else if !noload {
+                    let parent_runpath = &self
+                        .objects
+                        .get(&ROOT_ID)
+                        .and_then(|parent| parent.runpath().map(|path| path.to_string()));
+
+                    Ok(ObjectHandle::new(self.load_object(
+                        name,
+                        parent_runpath,
+                        None,
+                        true,
+                        if self.config.bind_now {
+                            Resolve::Now
+                        } else {
+                            resolve
+                        },
+                        scope,
+                    )?))
+                } else {
+                    // FIXME: LoadError?
+                    // Err(Error::Malformed(format!(
+                    //     "object '{}' has not yet been loaded",
+                    //     name
+                    // )))
+                    Ok(ObjectHandle(ptr::null()))
+                }
+            }
+
+            None => match self.objects.get(&ROOT_ID) {
+                Some(obj) => Ok(ObjectHandle::new(obj.clone())),
+                None => Err(DlError::NotFound),
+            },
+        }
+    }
+
+    pub fn get_sym(&self, handle: Option<ObjectHandle>, name: &str) -> Option<*mut c_void> {
+        let guard;
+
+        if let Some(handle) = handle.as_ref() {
+            handle.as_ref().scope()
+        } else {
+            guard = GLOBAL_SCOPE.read();
+            &guard
+        }
+        .get_sym(name)
+        .map(|(symbol, _, obj)| {
+            if symbol.sym_type != elf::STT_TLS {
+                symbol.as_ptr()
+            } else {
+                let mut tls_index = dl_tls_index {
+                    ti_module: obj.tls_module_id,
+                    ti_offset: symbol.value,
+                };
+
+                unsafe { __tls_get_addr(&raw mut tls_index) }
+            }
+        })
+    }
+
+    pub fn unload(&mut self, handle: ObjectHandle) {
+        let obj = handle.into_inner();
+        if !obj.dlopened {
+            return;
+        }
+
+        log::trace!(
+            "[ld.so] unloading {} (sc={}, wc={})",
+            obj.name,
+            Arc::strong_count(&obj),
+            Arc::weak_count(&obj)
+        );
+
+        // One for the reference we have and the other for the one in the
+        // objects map.
+        if Arc::strong_count(&obj) == 2 {
+            // Remove from the global scope.
+            match *GLOBAL_SCOPE.write() {
+                Scope::Global { ref mut objs } => {
+                    objs.retain(|o| !Weak::ptr_eq(o, &Arc::downgrade(&obj)));
+                }
+
+                _ => unreachable!(),
+            }
+
+            let _ = self.objects.remove(&obj.id).unwrap();
+            for dep in obj.dependencies() {
+                if let Some(name) = self.name_to_object_id_map.get(*dep)
+                    && let Some(object_name) = self.objects.get(name)
+                {
+                    self.unload(ObjectHandle::new(object_name.clone()));
+                }
+            }
+            self.name_to_object_id_map.remove(&obj.name);
+            assert!(Arc::strong_count(&obj) == 1);
+            drop(obj);
+        }
+
+        // obj is dropped here.
+    }
+
+    pub fn fini(&self) {
+        for obj in self.objects.values() {
+            obj.run_fini();
+        }
+    }
+
+    fn load_object(
+        &mut self,
+        path: &str,
+        runpath: &Option<String>,
+        base_addr: Option<usize>,
+        dlopened: bool,
+        resolve: Resolve,
+        scope: ScopeKind,
+    ) -> Result<Arc<DSO>> {
+        let resolve = if cfg!(target_arch = "x86_64") {
+            resolve
+        } else {
+            // Lazy binding is not currently supported on non-x86_64 architectures.
+            Resolve::Now
+        };
+
+        _r_debug.lock().state = RTLDState::RtAdd;
+        _dl_debug_state();
+
+        let mut new_objects = Vec::new();
+        let mut objects_data = Vec::new();
+        let mut tcb_masters = Vec::new();
+        let loaded_dso = self.load_objects_recursive(
+            path,
+            runpath,
+            base_addr,
+            dlopened,
+            &mut new_objects,
+            &mut objects_data,
+            &mut tcb_masters,
+            None,
+            scope,
+        )?;
+
+        for (i, obj) in new_objects.iter().enumerate() {
+            obj.relocate(&objects_data[i], resolve).unwrap();
+        }
+
+        unsafe {
+            if !dlopened {
+                #[cfg(target_os = "redox")]
+                let (tcb, old_tcb, thr_fd) = {
+                    use redox_rt::signal::tmp_disable_signals;
+
+                    let old_tcb = Tcb::current().expect("failed to get bootstrap TCB");
+                    let thr_fd = (&mut *old_tcb.os_specific.thr_fd.get())
+                        .take()
+                        .expect("no thread FD present");
+                    let new_tcb = Tcb::new(self.tls_size)?; // This actually allocates TCB, TLS and ABI page.
+
+                    // Stash
+                    let new_tls_end = new_tcb.generic.tls_end;
+                    let new_tls_len = new_tcb.generic.tls_len;
+                    let new_tcb_ptr = new_tcb.generic.tcb_ptr;
+                    let new_tcb_len = new_tcb.generic.tcb_len;
+
+                    // Unmap just the TCB page.
+                    Sys::munmap(new_tcb as *mut Tcb as *mut c_void, syscall::PAGE_SIZE).unwrap();
+
+                    let new_addr = ptr::addr_of!(*new_tcb) as usize;
+
+                    assert_eq!(
+                        syscall::syscall5(
+                            syscall::SYS_MREMAP,
+                            old_tcb as *mut Tcb as usize,
+                            syscall::PAGE_SIZE,
+                            new_addr,
+                            syscall::PAGE_SIZE,
+                            (syscall::MremapFlags::FIXED | syscall::MremapFlags::KEEP_OLD).bits()
+                                | (syscall::MapFlags::PROT_READ | syscall::MapFlags::PROT_WRITE)
+                                    .bits(),
+                        )
+                        .expect("mremap: failed to alias TCB"),
+                        new_addr,
+                    );
+                    // XXX: New TCB is now at the same physical address as the old TCB.
+
+                    let _guard = tmp_disable_signals();
+                    // Restore
+                    new_tcb.generic.tls_end = new_tls_end;
+                    new_tcb.generic.tls_len = new_tls_len;
+                    new_tcb.generic.tcb_ptr = new_tcb_ptr;
+                    new_tcb.generic.tcb_len = new_tcb_len;
+
+                    drop(_guard);
+                    (new_tcb, old_tcb as *mut Tcb as *mut c_void, thr_fd)
+                };
+
+                #[cfg(not(target_os = "redox"))]
+                let tcb = Tcb::new(self.tls_size)?;
+
+                // We are now loading the main program or its dependencies. The TLS for all initially
+                // loaded objects reside in the static TLS block. Depending on the architecture, the
+                // static TLS block is either placed before the TP or after the TP.
+                //
+                // Setup the DTVs.
+                tcb.setup_dtv(tcb_masters.len());
+
+                for obj in new_objects.iter() {
+                    if obj.tls_module_id == 0 {
+                        // No TLS for this object.
+                        continue;
+                    }
+
+                    let dtv_idx = obj.tls_module_id - 1;
+
+                    if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
+                        // Below the TP
+                        tcb.dtv_mut()[dtv_idx] = tcb.tls_end.sub(obj.tls_offset);
+                    } else {
+                        // FIMXE(andypython): Make it above the TP
+                        //
+                        // tcb.dtv_mut().unwrap()[obj.tls_module_id - 1] =
+                        //     tcb_ptr.add(1).cast::<u8>().add(obj.tls_offset);
+                        //
+                        // FIXME(andypython): https://gitlab.redox-os.org/redox-os/relibc/-/merge_requests/570#note_35788
+                        let tls_start = tcb.tls_end.sub(tcb.tls_len);
+                        tcb.dtv_mut()[dtv_idx] = tls_start.add(obj.tls_offset);
+                    }
+                }
+
+                tcb.append_masters(tcb_masters);
+                // Copy the master data into the static TLS block.
+                tcb.copy_masters().map_err(|_| DlError::Malformed)?;
+                tcb.activate(
+                    #[cfg(target_os = "redox")]
+                    Some(thr_fd),
+                );
+                tcb.mspace = ALLOCATOR.get();
+
+                #[cfg(target_os = "redox")]
+                {
+                    // Unmap the old TCB.
+                    Sys::munmap(old_tcb, syscall::PAGE_SIZE).unwrap();
+                }
+            } else {
+                let tcb = Tcb::current().expect("failed to get current tcb");
+
+                // TLS variables for dlopen'ed objects are lazily allocated in `__tls_get_addr`.
+                tcb.append_masters(tcb_masters);
+            }
+        }
+
+        for obj in new_objects.into_iter() {
+            obj.mark_ready();
+            self.run_init(&obj);
+            self.register_object(obj);
+        }
+
+        _r_debug.lock().state = RTLDState::RtConsistent;
+        _dl_debug_state();
+
+        Ok(loaded_dso)
+    }
+
+    fn register_object(&mut self, obj: Arc<DSO>) {
+        self.name_to_object_id_map.insert(obj.name.clone(), obj.id);
+        self.objects.insert(obj.id, obj);
+    }
+
+    /// Loads the specified object and all of its dependencies.
+    ///
+    /// `new_objects` contains any new objects that were loaded. Order is
+    /// reverse of how the scope is populated.
+    ///
+    /// The scope is populated such that the loaded objects are in breadth-first
+    /// order. This means that first the requested object is added to the scope,
+    /// and then its dependencies are added in the order of their respective
+    /// `DT_NEEDED` entries in the requested object. This is done recursively
+    /// until all dependencies have been loaded.
+    ///
+    /// If a dependency has already been loaded, it is *not* added to the scope
+    /// nor to `new_objects`.
+    #[allow(clippy::too_many_arguments)]
+    fn load_objects_recursive(
+        &mut self,
+        name: &str,
+        parent_runpath: &Option<String>,
+        base_addr: Option<usize>,
+        dlopened: bool,
+        new_objects: &mut Vec<Arc<DSO>>,
+        objects_data: &mut Vec<Vec<ProgramHeader>>,
+        tcb_masters: &mut Vec<Master>,
+        // Scope of the object that caused this object to be loaded.
+        dependent_scope: Option<&mut Scope>,
+        scope_kind: ScopeKind,
+    ) -> Result<Arc<DSO>> {
+        // fixme: double lookup slow
+        if let Some(id) = self.name_to_object_id_map.get(name) {
+            if let Some(obj) = self.objects.get(id) {
+                if let Some(scope) = dependent_scope {
+                    match scope_kind {
+                        ScopeKind::Local => scope.add(obj),
+                        ScopeKind::Global => GLOBAL_SCOPE.write().add(obj),
+                    }
+                } else if scope_kind == ScopeKind::Global {
+                    GLOBAL_SCOPE.write().add(obj);
+                }
+                return Ok(obj.clone());
+            }
+        } else if let Some(obj) = new_objects.iter().find(|o| o.name == name) {
+            if let Some(scope) = dependent_scope {
+                match scope_kind {
+                    ScopeKind::Local => scope.add(obj),
+                    ScopeKind::Global => GLOBAL_SCOPE.write().add(obj),
+                }
+            } else if scope_kind == ScopeKind::Global {
+                GLOBAL_SCOPE.write().add(obj);
+            }
+            return Ok(obj.clone());
+        }
+
+        let debug = self.config.debug_flags.contains(DebugFlags::LOAD);
+
+        let path = self.search_object(name, parent_runpath)?;
+        let file = self.read_file(&path)?;
+        let data = file.data();
+        let (obj, tcb_master, elf) = DSO::new(
+            &path,
+            data,
+            base_addr,
+            dlopened,
+            self.next_object_id,
+            self.next_tls_module_id,
+            // Ensure TLS is aligned to 16 bytes for SSE
+            self.tls_size.next_multiple_of(16),
+        )
+        .map_err(|err| {
+            if debug {
+                eprintln!("[ld.so]: failed to load '{}': {}", name, err)
+            }
+
+            DlError::Malformed
+        })?;
+
+        if debug {
+            eprintln!(
+                "[ld.so]: loading object: {} at {:#x}:{:#x} (pie: {})",
+                name,
+                obj.mmap.as_ptr() as usize,
+                obj.mmap.as_ptr() as usize + obj.mmap.len(),
+                obj.pie,
+            );
+        }
+
+        self.next_object_id += 1;
+
+        if let Some(master) = tcb_master {
+            if !dlopened {
+                self.tls_size = master.offset; // => aligned ph.p_memsz
+            }
+
+            tcb_masters.push(master);
+            self.next_tls_module_id += 1;
+        }
+
+        let runpath = obj.runpath().map(|rpath| rpath.to_string());
+        let dependencies = obj
+            .dependencies()
+            .iter()
+            .map(|dep| dep.to_string())
+            .collect::<Vec<_>>();
+
+        let obj = Arc::new(obj);
+        let mut scope = Scope::local();
+
+        if let Some(dependent_scope) = dependent_scope {
+            match scope_kind {
+                ScopeKind::Local => dependent_scope.add(&obj),
+                ScopeKind::Global => GLOBAL_SCOPE.write().add(&obj),
+            }
+        } else if let ScopeKind::Global = scope_kind {
+            GLOBAL_SCOPE.write().add(&obj);
+        }
+
+        for dep_name in dependencies.iter() {
+            self.load_objects_recursive(
+                dep_name,
+                &runpath,
+                None,
+                dlopened,
+                new_objects,
+                objects_data,
+                tcb_masters,
+                Some(&mut scope),
+                scope_kind,
+            )?;
+        }
+
+        objects_data.push(elf);
+        new_objects.push(obj.clone());
+
+        scope.set_owner(Arc::downgrade(&obj));
+        obj.scope.call_once(|| scope);
+
+        Ok(obj)
+    }
+
+    fn search_object(&self, name: &str, parent_runpath: &Option<String>) -> Result<String> {
+        let debug = self.config.debug_flags.contains(DebugFlags::SEARCH);
+        if debug {
+            eprintln!("[ld.so]: looking for '{}'", name);
+        }
+
+        let mut full_path = name.to_string();
+        if accessible(&full_path, F_OK).is_ok() {
+            if debug {
+                eprintln!("[ld.so]: found at '{}'!", full_path);
+            }
+            return Ok(full_path);
+        } else {
+            let mut search_paths = Vec::new();
+            if let Some(runpath) = parent_runpath {
+                search_paths.extend(runpath.split(PATH_SEP));
+            }
+            if let Some(ld_path) = self.config.library_path.as_ref() {
+                search_paths.extend(ld_path.split(PATH_SEP));
+            }
+            search_paths.push("/lib");
+            for part in search_paths.iter() {
+                full_path = format!("{}/{}", part, name);
+                if debug {
+                    eprintln!("[ld.so]: trying path '{}'", full_path);
+                }
+                if accessible(&full_path, F_OK).is_ok() {
+                    if debug {
+                        eprintln!("[ld.so]: found at '{}'!", full_path);
+                    }
+                    return Ok(full_path);
+                }
+            }
+        }
+
+        if debug {
+            eprintln!("[ld.so]: failed to locate '{}'", name);
+        }
+
+        Err(DlError::NotFound)
+    }
+
+    fn read_file(&self, path: &str) -> Result<MmapFile> {
+        let debug = self.config.debug_flags.contains(DebugFlags::SEARCH);
+
+        let path_c = CString::new(path).map_err(|err| {
+            if debug {
+                eprintln!("[ld.so]: invalid path '{}': {}", path, err)
+            }
+
+            DlError::NotFound
+        })?;
+
+        // TODO: Caches may silently fail within multiple users (try to leverage capabilities?)
+        // TODO: No way to specify weak cache or pruning the cache manually
+
+        #[cfg(feature = "ld_so_cache")]
+        let file = {
+            let mut mtime_sec = 0;
+            let mut mtime_nsec = 0;
+            let mut source_size = 0;
+
+            let src_fd = Sys::open(CStr::borrow(&path_c), fcntl::O_RDONLY | fcntl::O_CLOEXEC, 0)
+                .map_err(|err| {
+                    if debug {
+                        eprintln!("[ld.so]: failed to open '{}': {}", path, err)
+                    }
+                    DlError::NotFound
+                })?;
+            let mut st = stat::default();
+            if Sys::fstat(src_fd, Out::from_mut(&mut st)).is_ok() {
+                mtime_sec = st.st_mtim.tv_sec;
+                mtime_nsec = st.st_mtim.tv_nsec;
+                source_size = st.st_size as usize;
+            }
+
+            let shm_path_str = format!(
+                "/scheme/shm/ld.so.cache.{}.{}.{}\0",
+                path.replace('/', "_"),
+                mtime_sec,
+                mtime_nsec
+            );
+            let shm_path = unsafe { CStr::from_bytes_with_nul_unchecked(shm_path_str.as_bytes()) };
+
+            let mut shm_exists = false;
+
+            if let Ok(shm_fd) = Sys::open(shm_path, fcntl::O_RDONLY, 0) {
+                let mut shm_stat = stat::default();
+                if Sys::fstat(shm_fd, Out::from_mut(&mut shm_stat)).is_ok() {
+                    shm_exists = true;
+                    if shm_stat.st_size > 0 {
+                        if let Ok(mmap_file) = MmapFile::anonymous(source_size) {
+                            let mut offset = 0;
+                            let buf = mmap_file.as_mut_slice();
+                            while offset < source_size {
+                                match Sys::read(shm_fd, &mut buf[offset..]) {
+                                    Ok(0) | Err(_) => break,
+                                    Ok(n) => offset += n,
+                                }
+                            }
+                            let _ = Sys::close(shm_fd);
+                            return Ok(mmap_file);
+                        }
+                        let _ = Sys::close(shm_fd);
+                    }
+                }
+                let _ = Sys::close(shm_fd);
+            }
+
+            let file = MmapFile::from_fd(src_fd, source_size).map_err(|err| {
+                if debug {
+                    eprintln!("[ld.so]: failed to map '{}': {}", path, err)
+                }
+                DlError::NotFound
+            })?;
+
+            if !shm_exists {
+                let _ = Sys::open(shm_path, fcntl::O_CREAT | fcntl::O_RDWR, 0o600).map(Sys::close);
+            } else if let Ok(shm_fd) = Sys::open(shm_path, fcntl::O_RDWR, 0o600) {
+                let _ = Sys::ftruncate(shm_fd, source_size as i64);
+                let _ = Sys::write(shm_fd, file.data());
+                let _ = Sys::close(shm_fd);
+            }
+
+            file
+        };
+        #[cfg(not(feature = "ld_so_cache"))]
+        let file = {
+            let flags = fcntl::O_RDONLY | fcntl::O_CLOEXEC;
+            MmapFile::open(CStr::borrow(&path_c), flags).map_err(|err| {
+                if debug {
+                    eprintln!("[ld.so]: failed to open '{}': {}", path, err)
+                }
+
+                DlError::NotFound
+            })?
+        };
+
+        Ok(file)
+    }
+
+    fn run_init(&self, obj: &DSO) {
+        use crate::platform::{self, types::*};
+
+        if let Some((symbol, SymbolBinding::Global)) = obj.get_sym("__relibc_init_environ") {
+            unsafe {
+                symbol
+                    .as_ptr()
+                    .cast::<*mut *mut c_char>()
+                    .write(platform::environ);
+            }
+        }
+
+        obj.run_init();
+    }
+
+    fn scope_debug(&self) {
+        if self.config.debug_flags.contains(DebugFlags::SCOPES) {
+            println!("[ld.so]: =========== SCOPES ==========");
+            GLOBAL_SCOPE.read().debug();
+            for obj in self.objects.values() {
+                obj.scope().debug();
+            }
+            println!("[ld.so]: ==============================");
+        }
+    }
+}
+
+// GOT[1] = object_id
+// GOT[2] = __plt_resolve_trampoline
+//
+// The stubs in .plt will push the relocation index and the object pointer onto
+// the stack and jump to [`__plt_resolve_trampoline`]. The trampoline will then
+// call this function to resolve the symbol and update the respective GOT entry.
+// The trampoline will then jump to the resolved symbol.
+//
+// FIXME(andypython): 32-bit
+#[cfg(target_pointer_width = "64")]
+extern "C" fn __plt_resolve_inner(obj: *const DSO, relocation_index: c_uint) -> *mut c_void {
+    let obj = unsafe { &*obj };
+    let obj_base = obj.mmap.as_ptr() as usize;
+    let jmprel = obj.dynamic.jmprel;
+
+    let rela = unsafe { &*(jmprel as *const Rela).add(relocation_index as usize) };
+    assert_eq!(rela.r_type(NativeEndian, false), elf::R_X86_64_JUMP_SLOT);
+
+    let sym = obj
+        .dynamic
+        .symbol(rela.symbol(NativeEndian, false).unwrap())
+        .expect("symbol not found");
+    assert_ne!(sym.st_name(NativeEndian), 0);
+
+    let name = core::str::from_utf8(
+        obj.dynamic
+            .dynstrtab
+            .get(sym.st_name(NativeEndian))
+            .unwrap(),
+    )
+    .expect("non utf8 symbol name");
+
+    let resolved = resolve_sym(name, &[&GLOBAL_SCOPE.read(), obj.scope()])
+        .map(|(sym, _, _)| sym)
+        .unwrap_or_else(|| panic!("symbol '{name}' not found"))
+        .as_ptr();
+
+    let ptr = if obj.pie {
+        (obj_base as u64 + rela.r_offset(NativeEndian)) as *mut u64
+    } else {
+        rela.r_offset(NativeEndian) as *mut u64
+    };
+    #[cfg(feature = "trace_tls")]
+    log::trace!("@plt: {} -> *mut {:p}", name, ptr);
+
+    unsafe { *ptr = resolved as u64 }
+    resolved
+}
+
+unsafe extern "C" {
+    pub(super) fn __plt_resolve_trampoline() -> usize;
+}
+
+#[cfg(target_arch = "x86_64")]
+core::arch::global_asm!(
+    "
+.global __plt_resolve_trampoline
+.hidden __plt_resolve_trampoline
+__plt_resolve_trampoline:
+    push    rsi
+    push    rdi
+ 
+    mov     rdi, qword ptr [rsp + 0x10]
+    mov     rsi, qword ptr [rsp + 0x18]
+
+    // stash the floating point argument registers
+    sub     rsp, 128
+    movdqu  [rsp + 0x00], xmm0
+    movdqu  [rsp + 0x10], xmm1
+    movdqu  [rsp + 0x20], xmm2
+    movdqu  [rsp + 0x30], xmm3
+    movdqu  [rsp + 0x40], xmm4
+    movdqu  [rsp + 0x50], xmm5
+    movdqu  [rsp + 0x60], xmm6
+    movdqu  [rsp + 0x70], xmm7
+
+    push   rax
+    push   rcx
+    push   rdx
+    push   r8
+    push   r9
+    push   r10
+
+    push   rbp
+    mov    rbp, rsp
+    and    rsp, 0xfffffffffffffff0
+    call   {__plt_resolve_inner}
+    mov    r11, rax
+    mov    rsp, rbp
+    pop    rbp
+
+    pop    r10
+    pop    r9
+    pop    r8
+    pop    rdx
+    pop    rcx
+    pop    rax
+
+    movdqu  xmm7, [rsp + 0x70]
+    movdqu  xmm6, [rsp + 0x60]
+    movdqu  xmm5, [rsp + 0x50]
+    movdqu  xmm4, [rsp + 0x40]
+    movdqu  xmm3, [rsp + 0x30]
+    movdqu  xmm2, [rsp + 0x20]
+    movdqu  xmm1, [rsp + 0x10]
+    movdqu  xmm0, [rsp + 0x00]
+    add     rsp, 128
+
+    pop    rdi
+    pop    rsi
+
+    add    rsp, 0x10
+    jmp    r11
+
+    ud2
+.size __plt_resolve_trampoline, . - __plt_resolve_trampoline
+",
+    __plt_resolve_inner = sym __plt_resolve_inner
+);
+
+#[cfg(target_arch = "x86")]
+core::arch::global_asm!(
+    "
+.global __plt_resolve_trampoline
+.hidden __plt_resolve_trampoline
+__plt_resolve_trampoline:
+    ud2
+.size __plt_resolve_trampoline, . - __plt_resolve_trampoline
+    "
+);
+
+#[cfg(target_arch = "aarch64")]
+core::arch::global_asm!(
+    "
+.global __plt_resolve_trampoline
+.hidden __plt_resolve_trampoline
+__plt_resolve_trampoline:
+    udf #0
+.size __plt_resolve_trampoline, . - __plt_resolve_trampoline
+    "
+);
+
+#[cfg(target_arch = "riscv64")]
+core::arch::global_asm!(
+    "
+.global __plt_resolve_trampoline
+.hidden __plt_resolve_trampoline
+__plt_resolve_trampoline:
+    unimp
+.size __plt_resolve_trampoline, . - __plt_resolve_trampoline
+    "
+);
diff --git a/recipes/core/relibc/src/ld_so/mod.rs b/recipes/core/relibc/src/ld_so/mod.rs
new file mode 100644
index 0000000000..3cdc0edfe6
--- /dev/null
+++ b/recipes/core/relibc/src/ld_so/mod.rs
@@ -0,0 +1,212 @@
+//! Dynamic loading and linking.
+
+// FIXME(andypython): remove this when #![allow(warnings, unused_variables)] is
+// dropped from src/lib.rs.
+#![warn(warnings, unused_variables)]
+
+use core::{mem, ptr};
+use object::{
+    Endianness,
+    elf::{self, ProgramHeader32, ProgramHeader64},
+    read::elf::ProgramHeader,
+};
+
+use self::tcb::{Master, Tcb};
+use crate::{
+    header::sys_auxv::{AT_NULL, AT_PHDR, AT_PHENT, AT_PHNUM},
+    platform::{Pal, Sys},
+    start::Stack,
+};
+
+pub const PATH_SEP: char = ':';
+
+mod access;
+pub mod callbacks;
+pub mod debug;
+mod dso;
+pub mod linker;
+pub mod start;
+pub mod tcb;
+
+pub use generic_rt::{ExpectTlsFree, panic_notls};
+
+static mut STATIC_TCB_MASTER: Master = Master {
+    ptr: ptr::null_mut(),
+    image_size: 0,
+    segment_size: 0,
+    offset: 0,
+};
+
+#[inline(never)]
+pub fn static_init(
+    sp: &'static Stack,
+    #[cfg(target_os = "redox")] thr_fd: redox_rt::proc::FdGuardUpper,
+) {
+    const SIZEOF_PHDR64: usize = mem::size_of::<ProgramHeader64<Endianness>>();
+    const SIZEOF_PHDR32: usize = mem::size_of::<ProgramHeader32<Endianness>>();
+
+    let mut phdr_opt = None;
+    let mut phent_opt = None;
+    let mut phnum_opt = None;
+
+    let mut auxv = sp.auxv();
+    loop {
+        let (kind, value) = unsafe { *auxv };
+        if kind == AT_NULL {
+            break;
+        }
+
+        match kind {
+            AT_PHDR => phdr_opt = Some(value),
+            AT_PHENT => phent_opt = Some(value),
+            AT_PHNUM => phnum_opt = Some(value),
+            _ => (),
+        }
+
+        auxv = unsafe { auxv.add(1) };
+    }
+
+    let phdr = phdr_opt.expect_notls("failed to find AT_PHDR");
+    let phent = phent_opt.expect_notls("failed to find AT_PHENT");
+    let phnum = phnum_opt.expect_notls("failed to find AT_PHNUM");
+
+    for i in 0..phnum {
+        let ph_addr = phdr + phent * i;
+        let endian = Endianness::default();
+        let (p_align, p_filesz, p_memsz, p_type, p_vaddr) = match phent {
+            SIZEOF_PHDR64 => unsafe {
+                let ph = &*(ph_addr as *const ProgramHeader64<Endianness>);
+                (
+                    ph.p_align(endian) as usize,
+                    ph.p_filesz(endian) as usize,
+                    ph.p_memsz(endian) as usize,
+                    ph.p_type(endian),
+                    ph.p_vaddr(endian) as usize,
+                )
+            },
+
+            SIZEOF_PHDR32 => unsafe {
+                let ph = &*(ph_addr as *const ProgramHeader32<Endianness>);
+                (
+                    ph.p_align(endian) as usize,
+                    ph.p_filesz(endian) as usize,
+                    ph.p_memsz(endian) as usize,
+                    ph.p_type(endian),
+                    ph.p_vaddr(endian) as usize,
+                )
+            },
+            _ => panic_notls(format_args!("unknown AT_PHENT size {}", phent)),
+        };
+
+        let page_size = Sys::getpagesize();
+        let voff = p_vaddr % page_size;
+        // let vaddr = ph.p_vaddr as usize - voff;
+        let vsize = (p_memsz + voff).div_ceil(page_size) * page_size;
+
+        if p_type == elf::PT_TLS {
+            let valign = if p_align > 0 {
+                p_memsz.div_ceil(p_align) * p_align
+            } else {
+                p_memsz
+            };
+
+            unsafe {
+                STATIC_TCB_MASTER.ptr = p_vaddr as *const u8;
+                STATIC_TCB_MASTER.image_size = p_filesz;
+                STATIC_TCB_MASTER.offset = valign;
+
+                let tcb = Tcb::new(vsize).expect_notls("failed to allocate TCB");
+                tcb.masters_ptr = ptr::addr_of_mut!(STATIC_TCB_MASTER);
+                tcb.masters_len = mem::size_of::<Master>();
+                tcb.copy_masters()
+                    .expect_notls("failed to copy TLS master data");
+                tcb.activate(
+                    #[cfg(target_os = "redox")]
+                    Some(thr_fd),
+                );
+            }
+
+            //TODO: Warning on multiple TLS sections?
+            return;
+        }
+    }
+}
+
+#[cfg(any(target_os = "linux", target_os = "redox"))]
+pub unsafe fn init(
+    sp: &'static Stack,
+    #[cfg(target_os = "redox")] thr_fd: redox_rt::proc::FdGuardUpper,
+) {
+    let tp: usize;
+
+    #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
+    {
+        const ARCH_GET_FS: usize = 0x1003;
+        let mut val = 0usize;
+        syscall!(ARCH_PRCTL, ARCH_GET_FS, &raw mut val);
+        tp = val;
+    }
+    #[cfg(target_arch = "aarch64")]
+    unsafe {
+        core::arch::asm!(
+            "mrs {}, tpidr_el0",
+            out(reg) tp,
+        );
+    }
+    #[cfg(all(target_os = "redox", target_arch = "x86"))]
+    {
+        let mut env = syscall::EnvRegisters::default();
+
+        {
+            let file = thr_fd
+                .dup(b"regs/env")
+                .expect_notls("failed to open handle for process registers");
+
+            file.read(&mut env).expect_notls("failed to read gsbase");
+        }
+
+        tp = env.gsbase as usize;
+    }
+    #[cfg(all(target_os = "redox", target_arch = "x86_64"))]
+    {
+        let mut env = syscall::EnvRegisters::default();
+
+        {
+            let file = thr_fd
+                .dup(b"regs/env")
+                .expect_notls("failed to open handle for process registers");
+
+            file.read(&mut env).expect_notls("failed to read fsbase");
+        }
+
+        tp = env.fsbase as usize;
+    }
+    #[cfg(all(target_os = "redox", target_arch = "riscv64"))]
+    unsafe {
+        core::arch::asm!(
+            "mv {}, tp",
+            out(reg) tp,
+        );
+    }
+
+    if tp == 0 {
+        static_init(
+            sp,
+            #[cfg(target_os = "redox")]
+            thr_fd,
+        );
+    } else {
+        // The thread fd must already be present in the already existing TCB. Don't close it.
+        #[cfg(target_os = "redox")]
+        core::mem::forget(thr_fd);
+    }
+}
+
+pub unsafe fn fini() {
+    if let Some(tcb) = unsafe { Tcb::current() }
+        && !tcb.linker_ptr.is_null()
+    {
+        let linker = unsafe { (*tcb.linker_ptr).lock() };
+        linker.fini();
+    }
+}
diff --git a/recipes/core/relibc/src/ld_so/start.rs b/recipes/core/relibc/src/ld_so/start.rs
new file mode 100644
index 0000000000..f20778e2ab
--- /dev/null
+++ b/recipes/core/relibc/src/ld_so/start.rs
@@ -0,0 +1,440 @@
+// Start code adapted from https://gitlab.redox-os.org/redox-os/relibc/blob/master/src/start.rs
+
+use core::slice;
+
+use alloc::{
+    borrow::ToOwned,
+    boxed::Box,
+    collections::BTreeMap,
+    string::{String, ToString},
+    vec::Vec,
+};
+use object::{
+    NativeEndian,
+    elf::{self, PT_DYNAMIC, PT_PHDR},
+    read::elf::{Dyn as _, ProgramHeader as _},
+};
+
+use crate::{
+    c_str::CStr,
+    header::{
+        elf::{AT_BASE, AT_ENTRY, AT_PHDR, AT_PHENT, AT_PHNUM},
+        unistd,
+    },
+    ld_so::{
+        dso::{
+            DT_RELR, DT_RELRENT, DT_RELRSZ, Dyn, ProgramHeader, Rel, Rela, Relocation,
+            RelocationKind, Relr, apply_relr,
+        },
+        linker::DebugFlags,
+    },
+    platform::{auxv_iter, get_auxvs, types::c_char},
+    start::Stack,
+    sync::mutex::Mutex,
+};
+
+use super::{
+    PATH_SEP,
+    access::accessible,
+    debug::_r_debug,
+    linker::{Config, Linker},
+    tcb::Tcb,
+};
+
+use generic_rt::ExpectTlsFree;
+
+#[cfg(target_pointer_width = "32")]
+pub const SIZEOF_EHDR: usize = 52;
+
+#[cfg(target_pointer_width = "64")]
+pub const SIZEOF_EHDR: usize = 64;
+
+unsafe fn get_argv(mut ptr: *const usize) -> (Vec<String>, *const usize) {
+    //traverse the stack and collect argument vector
+    let mut argv = Vec::new();
+    while unsafe { *ptr != 0 } {
+        let arg = unsafe { *ptr };
+        match unsafe { CStr::from_ptr(arg as *const c_char).to_str() } {
+            Ok(arg_str) => argv.push(arg_str.to_owned()),
+            _ => {
+                eprintln!("ld.so: failed to parse argv[{}]", argv.len());
+                unistd::_exit(1);
+            }
+        }
+        ptr = unsafe { ptr.add(1) };
+    }
+
+    (argv, ptr)
+}
+
+unsafe fn get_env(mut ptr: *const usize) -> (BTreeMap<String, String>, *const usize) {
+    //traverse the stack and collect argument environment variables
+    let mut envs = BTreeMap::new();
+    while unsafe { *ptr != 0 } {
+        let env = unsafe { *ptr };
+        if let Ok(arg_str) = unsafe { CStr::from_ptr(env as *const c_char).to_str() } {
+            let mut parts = arg_str.splitn(2, '=');
+            if let Some(key) = parts.next()
+                && let Some(value) = parts.next()
+            {
+                envs.insert(key.to_owned(), value.to_owned());
+            }
+        }
+        ptr = unsafe { ptr.add(1) };
+    }
+
+    (envs, ptr)
+}
+
+#[allow(unsafe_op_in_unsafe_fn)]
+unsafe fn adjust_stack(sp: &'static mut Stack) {
+    let mut argv = sp.argv() as *mut usize;
+
+    // Move arguments
+    loop {
+        let next_argv = argv.add(1);
+        let arg = *next_argv;
+        *argv = arg;
+        argv = next_argv;
+        if arg == 0 {
+            break;
+        }
+    }
+
+    // Move environment
+    loop {
+        let next_argv = argv.add(1);
+        let arg = *next_argv;
+        *argv = arg;
+        argv = next_argv;
+        if arg == 0 {
+            break;
+        }
+    }
+
+    // Move auxiliary vectors
+    loop {
+        let next_argv = argv.add(1);
+        let kind = *next_argv;
+        *argv = kind;
+        argv = next_argv;
+        let next_argv = argv.add(1);
+        let value = *next_argv;
+        *argv = value;
+        argv = next_argv;
+        if kind == 0 {
+            break;
+        }
+    }
+    sp.argc -= 1;
+}
+
+fn resolve_path_name(
+    name_or_path: &str,
+    envs: &BTreeMap<String, String>,
+) -> Option<(String, String)> {
+    if accessible(name_or_path, unistd::F_OK).is_ok() {
+        return Some((
+            name_or_path.to_string(),
+            name_or_path
+                .split("/")
+                .collect::<Vec<&str>>()
+                .last()
+                .unwrap()
+                .to_string(),
+        ));
+    }
+    if name_or_path.split("/").collect::<Vec<&str>>().len() != 1 {
+        return None;
+    }
+
+    let env_path = envs.get("PATH")?;
+    for part in env_path.split(PATH_SEP) {
+        let path = if part.is_empty() {
+            format!("./{}", name_or_path)
+        } else {
+            format!("{}/{}", part, name_or_path)
+        };
+        if accessible(&path, unistd::F_OK).is_ok() {
+            return Some((path.to_string(), name_or_path.to_string()));
+        }
+    }
+    None
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn relibc_ld_so_start(
+    sp: &'static mut Stack,
+    ld_entry: usize,
+    dynamic: *const Dyn,
+) -> usize {
+    // Relocate ourselves.
+    //
+    // This function is very delicate as it must **not** contain relocations itself. References to
+    // external symbols **cannot** be made until `stage2()` so, this function might not be very
+    // elegant.
+    //
+    // At this stage the TCB is not setup either so `expect_notls` must be used instead of `expect`
+    // and `unwrap`.
+    let mut at_phdr = None;
+    let mut at_phnum = None;
+    let mut at_phent = None;
+    let mut at_base = None;
+    let mut at_entry = None;
+    for [kind, value] in unsafe { auxv_iter(sp.auxv().cast::<usize>()) } {
+        match kind {
+            AT_PHDR => at_phdr = Some(value as *const ProgramHeader),
+            AT_PHNUM => at_phnum = Some(value),
+            AT_PHENT => at_phent = Some(value),
+            AT_BASE => at_base = Some(value),
+            AT_ENTRY => at_entry = Some(value),
+            _ => {}
+        }
+    }
+
+    let at_phdr = at_phdr.expect_notls("`AT_PHDR` must be present");
+    let at_phnum = at_phnum.expect_notls("`AT_PHNUM` must be present if `AT_PHDR` is");
+    let at_phent = at_phent.expect_notls("`AT_PHENT` must be present if `AT_PHDR` is");
+    assert!(!at_phdr.is_null() && at_phnum != 0 && at_phent == size_of::<ProgramHeader>());
+    let phdrs = unsafe { slice::from_raw_parts(at_phdr, at_phnum) };
+
+    let at_entry = at_entry.expect_notls("`AT_ENTRY` must be present");
+    let at_base = at_base.unwrap_or_default();
+
+    let self_base = if at_base != 0 {
+        at_base
+    } else {
+        let ph = phdrs
+            .iter()
+            .find(|ph| ph.p_type(NativeEndian) == PT_DYNAMIC)
+            .unwrap();
+        unsafe { dynamic.byte_sub(ph.p_vaddr(NativeEndian) as usize) as usize }
+    };
+
+    let is_manual = at_entry == ld_entry; // Whether the dynamic linker was invoked as a command.
+
+    let mut i = dynamic;
+    let mut rela_ptr = None;
+    let mut rela_len = None;
+    let mut relr_ptr = None;
+    let mut relr_len = None;
+    let mut rel_ptr = None;
+    let mut rel_len = None;
+    loop {
+        let entry = unsafe { &*i };
+        let val = entry.d_val(NativeEndian);
+        let ptr = val as *const u8;
+        match entry.d_tag(NativeEndian) as u32 {
+            elf::DT_NULL => break,
+            elf::DT_RELA => rela_ptr = Some(ptr.cast::<Rela>()),
+            elf::DT_RELASZ => rela_len = Some(val as usize / size_of::<Rela>()),
+            elf::DT_RELAENT => {
+                assert_eq!(val as usize, size_of::<Rela>(),);
+            }
+            elf::DT_REL => rel_ptr = Some(ptr.cast::<Rel>()),
+            elf::DT_RELSZ => rel_len = Some(val as usize / size_of::<Rel>()),
+            elf::DT_RELENT => {
+                assert_eq!(val as usize, size_of::<Rel>());
+            }
+            DT_RELR => relr_ptr = Some(ptr.cast::<Relr>()),
+            DT_RELRSZ => relr_len = Some(val as usize / size_of::<Relr>()),
+            DT_RELRENT => {
+                assert_eq!(val as usize, size_of::<Relr>());
+            }
+            _ => {}
+        }
+        i = unsafe { i.add(1) };
+    }
+
+    unsafe fn get_array<'a, T>(
+        ptr: Option<*const T>,
+        len: Option<usize>,
+        base_addr: usize,
+    ) -> &'a [T] {
+        if let Some(ptr) = ptr {
+            let len = len.expect_notls("dynamic entry was present without it's corresponding size");
+            unsafe { core::slice::from_raw_parts(ptr.byte_add(base_addr), len) }
+        } else {
+            &[]
+        }
+    }
+
+    fn do_relocs<'a, T>(relocs: &'a [T], self_base: usize)
+    where
+        Relocation: From<&'a T>,
+    {
+        for reloc in relocs {
+            let reloc: Relocation = reloc.into();
+            let ptr = (reloc.offset + self_base) as *mut usize;
+            if reloc.kind == RelocationKind::RELATIVE {
+                unsafe { *ptr = self_base + reloc.addend.unwrap_or_default() };
+            }
+        }
+    }
+
+    let rela = unsafe { get_array::<Rela>(rela_ptr, rela_len, self_base) };
+    let rel = unsafe { get_array::<Rel>(rel_ptr, rel_len, self_base) };
+    do_relocs(rela, self_base);
+    do_relocs(rel, self_base);
+
+    unsafe {
+        let relr = get_array(relr_ptr, relr_len, self_base);
+        apply_relr(self_base as *const u8, relr);
+    }
+
+    let mut base_addr = None;
+    if !is_manual {
+        // if we are not running in manual mode, then the main
+        // program is already loaded by the kernel and we want
+        // to use it. on redox, we treat it the same.
+        for ph in phdrs.iter() {
+            if ph.p_type(NativeEndian) == PT_PHDR {
+                assert!(base_addr.is_none(), "`PT_PHDR` cannot occur more than once");
+                base_addr = Some(unsafe {
+                    phdrs
+                        .as_ptr()
+                        .cast::<u8>()
+                        .sub(ph.p_vaddr(NativeEndian) as usize)
+                } as usize);
+            }
+        }
+    }
+
+    stage2(sp, self_base, is_manual, base_addr)
+}
+
+fn stage2(
+    sp: &'static mut Stack,
+    self_base: usize,
+    is_manual: bool,
+    base_addr: Option<usize>,
+) -> usize {
+    // Setup TCB for ourselves.
+    unsafe {
+        #[cfg(target_os = "redox")]
+        let auxv = sp.auxv().cast();
+        #[cfg(target_os = "redox")]
+        let thr_fd = crate::platform::get_auxv_raw(auxv, redox_rt::auxv_defs::AT_REDOX_THR_FD)
+            .expect_notls("no thread fd present");
+
+        let tcb = Tcb::new(0).expect_notls("[ld.so]: failed to allocate bootstrap TCB");
+        tcb.activate(
+            #[cfg(target_os = "redox")]
+            Some(
+                redox_rt::proc::FdGuard::new(thr_fd)
+                    .to_upper()
+                    .expect_notls("failed to move thread fd to upper table"),
+            ),
+        );
+        #[cfg(target_os = "redox")]
+        {
+            let proc_fd =
+                crate::platform::get_auxv_raw(auxv, redox_rt::auxv_defs::AT_REDOX_PROC_FD)
+                    .expect_notls("no proc fd present");
+
+            let ns_fd = crate::platform::get_auxv_raw(auxv, redox_rt::auxv_defs::AT_REDOX_NS_FD)
+                .filter(|&fd| fd != usize::MAX)
+                .map(|fd| {
+                    redox_rt::proc::FdGuard::new(fd)
+                        .to_upper()
+                        .expect_notls("failed to move ns fd to upper table")
+                });
+
+            redox_rt::initialize(
+                redox_rt::proc::FdGuard::new(proc_fd)
+                    .to_upper()
+                    .expect_notls("failed to move proc fd to upper table"),
+                ns_fd,
+            );
+            redox_rt::signal::setup_sighandler(&tcb.os_specific, true);
+        }
+    }
+
+    // We get the arguments, the environment, and the auxilary vector
+    let (argv, envs, auxv) = unsafe {
+        let argv_start = sp.argv() as *mut usize;
+        let (argv, argv_end) = get_argv(argv_start);
+        let (envs, envs_end) = get_env(argv_end.add(1));
+        let auxv = get_auxvs(envs_end.add(1));
+        (argv, envs, auxv)
+    };
+
+    unsafe {
+        crate::platform::OUR_ENVIRON.unsafe_set(
+            envs.iter()
+                .map(|(k, v)| {
+                    let mut var = Vec::with_capacity(k.len() + v.len() + 2);
+                    var.extend(k.as_bytes());
+                    var.push(b'=');
+                    var.extend(v.as_bytes());
+                    var.push(b'\0');
+                    let mut var = var.into_boxed_slice();
+                    let ptr = var.as_mut_ptr();
+                    core::mem::forget(var);
+                    ptr.cast()
+                })
+                .chain(core::iter::once(core::ptr::null_mut()))
+                .collect::<Vec<_>>(),
+        );
+
+        crate::platform::environ = crate::platform::OUR_ENVIRON.unsafe_mut().as_mut_ptr();
+    }
+
+    // we might need global lock for this kind of stuff
+    _r_debug.lock().r_ldbase = self_base;
+
+    let name_or_path = if is_manual {
+        // ld.so is run directly by user and not via execve() or similar systemcall
+        println!("argv: {:#?}", argv);
+        println!("envs: {:#?}", envs);
+        println!("auxv: {:#x?}", auxv);
+
+        if sp.argc < 2 {
+            eprintln!("ld.so [executable] [arguments...]");
+            unistd::_exit(1);
+        }
+        unsafe { adjust_stack(sp) };
+        argv[1].to_string()
+    } else {
+        argv[0].to_string()
+    };
+
+    // TODO: Fix memory leak, although minimal.
+    #[cfg(target_os = "redox")]
+    unsafe {
+        crate::platform::init_inner(auxv);
+    }
+
+    let (path, _name) = match resolve_path_name(&name_or_path, &envs) {
+        Some((p, n)) => (p, n),
+        None => {
+            eprintln!("[ld.so]: failed to locate '{name_or_path}'");
+            unistd::_exit(1);
+        }
+    };
+
+    let config = Config::from_env(&envs);
+    if config.debug_flags.contains(DebugFlags::LOAD) {
+        println!("[ld.so]: relocated self at {self_base:#x}!");
+        if let Some(base_addr) = base_addr {
+            println!("[ld.so]: executable has been already loaded at {base_addr:#x?}");
+        }
+    }
+
+    let mut linker = Linker::new(config);
+    let entry = match linker.load_program(&path, base_addr) {
+        Ok(entry) => entry,
+        Err(err) => {
+            eprintln!("[ld.so]: failed to link '{path}': {err:?}");
+            eprintln!("[ld.so]: enable debug output with `LD_DEBUG=all` for more information");
+            unistd::_exit(1);
+        }
+    };
+    if let Some(tcb) = unsafe { Tcb::current() } {
+        tcb.linker_ptr = Box::into_raw(Box::new(Mutex::new(linker)));
+    }
+    if is_manual {
+        eprintln!("[ld.so]: entry '{path}': {entry:#x}");
+    }
+    entry
+}
diff --git a/recipes/core/relibc/src/ld_so/tcb.rs b/recipes/core/relibc/src/ld_so/tcb.rs
new file mode 100644
index 0000000000..2f90ad8cb6
--- /dev/null
+++ b/recipes/core/relibc/src/ld_so/tcb.rs
@@ -0,0 +1,386 @@
+use alloc::vec::Vec;
+use core::{
+    cell::UnsafeCell,
+    mem,
+    ops::{Deref, DerefMut},
+    ptr, slice,
+    sync::atomic::AtomicBool,
+};
+use generic_rt::GenericTcb;
+
+use crate::{
+    header::sys_mman,
+    ld_so::linker::Linker,
+    platform::{Dlmalloc, Pal, Sys},
+    pthread::{OsTid, Pthread},
+    sync::{mutex::Mutex, waitval::Waitval},
+};
+
+use super::linker::DlError;
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct Master {
+    /// Pointer to initial data
+    pub ptr: *const u8,
+    /// Length of initial data in bytes
+    pub image_size: usize,
+    pub segment_size: usize,
+    /// Offset in TLS to copy initial data to
+    pub offset: usize,
+}
+
+impl Master {
+    /// The initial data for this TLS region
+    pub unsafe fn data(&self) -> &'static [u8] {
+        unsafe { slice::from_raw_parts(self.ptr, self.image_size) }
+    }
+}
+
+#[cfg(target_os = "linux")]
+pub type OsSpecific = ();
+
+#[cfg(target_os = "redox")]
+pub type OsSpecific = redox_rt::signal::RtSigarea;
+
+#[derive(Debug)]
+#[repr(C)]
+// FIXME: Only return &Tcb, and use interior mutability, since it contains the Pthread struct
+pub struct Tcb {
+    pub generic: GenericTcb<OsSpecific>,
+    /// Pointer to a list of initial TLS data
+    pub masters_ptr: *mut Master,
+    /// Size of the masters list in bytes (multiple of `mem::size_of::<Master>()`)
+    pub masters_len: usize,
+    /// Index of last copied Master
+    pub num_copied_masters: usize,
+    /// Pointer to dynamic linker
+    pub linker_ptr: *const Mutex<Linker>,
+    /// pointer to rust memory allocator structure
+    pub mspace: *const Mutex<Dlmalloc>,
+    /// Underlying pthread_t struct, pthread_self() returns &self.pthread
+    pub pthread: Pthread,
+
+    // Dynamic TLS Vector
+    pub dtv_ptr: *mut *mut u8,
+    // Number of DTV entries.
+    pub dtv_len: usize,
+}
+
+#[cfg(target_os = "redox")]
+const _: () = {
+    if mem::size_of::<Tcb>() > syscall::PAGE_SIZE {
+        panic!("too large TCB!");
+    }
+};
+
+impl Tcb {
+    /// Create a new TCB
+    ///
+    /// `size` is the size of the TLS in bytes.
+    #[allow(unsafe_op_in_unsafe_fn)]
+    pub unsafe fn new(size: usize) -> Result<&'static mut Self, DlError> {
+        let page_size = Sys::getpagesize();
+        let (_abi_page, tls, tcb_page) = Self::os_new(size.next_multiple_of(page_size))?;
+
+        let tcb_ptr = tcb_page.as_mut_ptr().cast::<Self>();
+        ptr::write(
+            tcb_ptr,
+            Self {
+                generic: GenericTcb {
+                    tls_end: tls.as_mut_ptr().add(tls.len()),
+                    tls_len: tls.len(),
+                    tcb_ptr: tcb_ptr.cast(),
+                    tcb_len: tcb_page.len(),
+                    os_specific: OsSpecific::default(),
+                },
+                masters_ptr: ptr::null_mut(),
+                masters_len: 0,
+                num_copied_masters: 0,
+                linker_ptr: ptr::null(),
+                mspace: ptr::null(),
+                pthread: Pthread {
+                    waitval: Waitval::new(),
+                    flags: Default::default(),
+                    has_enabled_cancelation: AtomicBool::new(false),
+                    has_queued_cancelation: AtomicBool::new(false),
+                    stack_base: core::ptr::null_mut(),
+                    stack_size: 0,
+                    os_tid: UnsafeCell::new(OsTid::default()),
+                },
+
+                dtv_ptr: ptr::null_mut(),
+                dtv_len: 0,
+            },
+        );
+
+        Ok(&mut *tcb_ptr)
+    }
+
+    /// Get the current TCB
+    pub unsafe fn current() -> Option<&'static mut Self> {
+        unsafe { Some(&mut *GenericTcb::<OsSpecific>::current_ptr()?.cast()) }
+    }
+
+    /// A slice for all of the TLS data
+    pub unsafe fn tls(&self) -> Option<&'static mut [u8]> {
+        if self.tls_end.is_null() || self.tls_len == 0 {
+            None
+        } else {
+            unsafe {
+                let tls_start = self.tls_end.sub(self.tls_len);
+                Some(slice::from_raw_parts_mut(tls_start, self.tls_len))
+            }
+        }
+    }
+
+    /// The initial images for TLS
+    pub fn masters(&self) -> Option<&'static mut [Master]> {
+        if self.masters_ptr.is_null() || self.masters_len == 0 {
+            None
+        } else {
+            Some(unsafe {
+                slice::from_raw_parts_mut(
+                    self.masters_ptr,
+                    self.masters_len / mem::size_of::<Master>(),
+                )
+            })
+        }
+    }
+
+    /// Copy data from masters
+    pub unsafe fn copy_masters(&mut self) -> Result<(), DlError> {
+        //TODO: Complain if masters or tls exist without the other
+        if let Some(tls) = unsafe { self.tls() }
+            && let Some(masters) = self.masters()
+        {
+            for master in masters
+                .iter()
+                .skip(self.num_copied_masters)
+                .filter(|master| master.image_size != 0)
+            {
+                let range = if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
+                    // x86{_64} TLS layout is backwards
+                    self.tls_len - master.offset..self.tls_len - master.offset + master.image_size
+                } else {
+                    master.offset..master.offset + master.image_size
+                };
+                if let Some(tls_data) = tls.get_mut(range) {
+                    let data = unsafe { master.data() };
+                    #[cfg(feature = "trace_tls")]
+                    log::trace!(
+                        "tls master: {:p}, {:#x}: {:p}, {:#x}",
+                        data.as_ptr(),
+                        data.len(),
+                        tls_data.as_mut_ptr(),
+                        tls_data.len()
+                    );
+                    tls_data.copy_from_slice(data);
+                } else {
+                    return Err(DlError::Malformed);
+                }
+            }
+            self.num_copied_masters = masters.len();
+        }
+
+        Ok(())
+    }
+
+    /// The initial images for TLS
+    pub unsafe fn append_masters(&mut self, mut new_masters: Vec<Master>) {
+        if self.masters_ptr.is_null() {
+            self.masters_ptr = new_masters.as_mut_ptr();
+            self.masters_len = new_masters.len() * mem::size_of::<Master>();
+            mem::forget(new_masters);
+        } else {
+            // XXX: [`Vec::from_raw_parts`] cannot be used here as the masters were originally
+            // allocated by the ld.so allocator and that would violate that function's invariants.
+            let mut masters = self.masters().unwrap().to_vec();
+            masters.extend(new_masters);
+
+            self.masters_ptr = masters.as_mut_ptr();
+            self.masters_len = masters.len() * mem::size_of::<Master>();
+            mem::forget(masters);
+        }
+    }
+
+    /// Activate TLS
+    pub unsafe fn activate(
+        &mut self,
+        #[cfg(target_os = "redox")] thr_fd: Option<redox_rt::proc::FdGuardUpper>,
+    ) {
+        unsafe {
+            Self::os_arch_activate(
+                &self.os_specific,
+                self.tls_end as usize,
+                self.tls_len,
+                #[cfg(target_os = "redox")]
+                thr_fd,
+            )
+        };
+    }
+
+    pub fn setup_dtv(&mut self, n: usize) {
+        if self.dtv_ptr.is_null() {
+            let mut dtv = vec![ptr::null_mut(); n];
+
+            if let Some(masters) = self.masters() {
+                for (i, master) in masters.iter().enumerate() {
+                    let tls = unsafe { self.tls().unwrap() };
+                    let offset = if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
+                        // x86{_64} TLS layout is backwards
+                        self.tls_len - master.offset
+                    } else {
+                        master.offset
+                    };
+
+                    dtv[i] = unsafe { tls.as_mut_ptr().add(offset) };
+                }
+            }
+
+            let (ptr, len, _) = dtv.into_raw_parts();
+
+            self.dtv_ptr = ptr;
+            self.dtv_len = len;
+        } else {
+            // Resize DTV.
+            //
+            // XXX: [`Vec::from_raw_parts`] cannot be used here as the DTV was originally allocated
+            // by the ld.so allocator and that would violate that function's invariants.
+            let mut dtv = self.dtv_mut().to_vec();
+            dtv.resize(n, ptr::null_mut());
+
+            let (ptr, len, _) = dtv.into_raw_parts();
+            self.dtv_ptr = ptr;
+            self.dtv_len = len;
+        }
+    }
+
+    pub fn dtv_mut(&mut self) -> &'static mut [*mut u8] {
+        if self.dtv_len != 0 {
+            unsafe { slice::from_raw_parts_mut(self.dtv_ptr, self.dtv_len) }
+        } else {
+            &mut []
+        }
+    }
+
+    /// Mapping with correct flags for TCB and TLS
+    #[allow(unsafe_op_in_unsafe_fn)]
+    unsafe fn map(size: usize) -> Result<&'static mut [u8], DlError> {
+        let ptr = Sys::mmap(
+            ptr::null_mut(),
+            size,
+            sys_mman::PROT_READ | sys_mman::PROT_WRITE,
+            sys_mman::MAP_ANONYMOUS | sys_mman::MAP_PRIVATE,
+            -1,
+            0,
+        )
+        .map_err(|_| DlError::Oom)?;
+
+        ptr::write_bytes(ptr.cast::<u8>(), 0, size);
+        Ok(slice::from_raw_parts_mut(ptr.cast::<u8>(), size))
+    }
+
+    /// OS specific code to create a new TLS and TCB - Linux and Redox
+    ///
+    /// Memory layout:
+    ///
+    /// ```text
+    /// 0          page_size                   size       (size + page_size * 2)
+    /// |----------|---------------------------|----------|
+    /// +++++++++++++++++++++++++++++++++++++++++++++++++++
+    /// | ABI Page | TLS                       | TCB Page |
+    /// +++++++++++++++++++++++++++++++++++++++++++++++++++
+    ///     ^ $tp (aarch64)                    ^ $tp (x86_64)
+    /// ```
+    ///
+    /// `$tp` refers to the architecture specific thread pointer.
+    ///
+    /// **Note**: On x86{_64}, the TLS layout is backwards (i.e. the first byte of the TLS is at
+    /// the end of the TLS region).
+    ///
+    /// ABI page layout for aarch64:
+    /// ```text
+    /// 0                     4096
+    /// +---------------------+
+    /// | ABI Page            |
+    /// +---------------------+
+    ///                     ^
+    ///                     |
+    ///                     +-------> (page_size - 16): pointer to the start of the TCB page
+    /// ```
+    ///
+    /// ABI page layout for riscv64:
+    ///
+    /// ```text
+    /// 0                     4096
+    /// +---------------------+
+    /// | ABI Page            |
+    /// +---------------------+
+    ///                      ^
+    ///                      |
+    ///                      +-------> (page_size - 8): pointer to the start of the TCB page
+    /// ```
+    ///
+    /// For x86_64, the ABI page is not used.
+    #[cfg(any(target_os = "linux", target_os = "redox"))]
+    unsafe fn os_new(
+        size: usize,
+    ) -> Result<(&'static mut [u8], &'static mut [u8], &'static mut [u8]), DlError> {
+        let page_size = Sys::getpagesize();
+        let abi_tls_tcb = unsafe { Self::map(page_size + size + page_size)? };
+        let (abi, tls_tcb) = abi_tls_tcb.split_at_mut(page_size);
+        let (tls, tcb) = tls_tcb.split_at_mut(size);
+        Ok((abi, tls, tcb))
+    }
+
+    /// OS and architecture specific code to activate TLS - Linux x86_64
+    #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
+    unsafe fn os_arch_activate(_os: &(), tls_end: usize, _tls_len: usize) {
+        const ARCH_SET_FS: usize = 0x1002;
+        unsafe {
+            syscall!(ARCH_PRCTL, ARCH_SET_FS, tls_end);
+        }
+    }
+
+    #[cfg(all(target_os = "linux", target_arch = "aarch64"))]
+    unsafe fn os_arch_activate(_os: &(), tls_end: usize, tls_len: usize) {
+        // Uses ABI page
+        let abi_ptr = tls_end - tls_len - 16;
+        unsafe {
+            core::ptr::write(abi_ptr as *mut usize, tls_end);
+            core::arch::asm!(
+                "msr tpidr_el0, {}",
+                in(reg) abi_ptr,
+            );
+        }
+    }
+
+    #[cfg(target_os = "redox")]
+    unsafe fn os_arch_activate(
+        os: &OsSpecific,
+        tls_end: usize,
+        tls_len: usize,
+        thr_fd: Option<redox_rt::proc::FdGuardUpper>,
+    ) {
+        unsafe {
+            if let Some(thr_fd) = thr_fd {
+                os.thr_fd.get().write(Some(thr_fd));
+            }
+            redox_rt::tcb_activate(os, tls_end, tls_len)
+        }
+    }
+}
+
+impl Deref for Tcb {
+    type Target = GenericTcb<OsSpecific>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.generic
+    }
+}
+impl DerefMut for Tcb {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.generic
+    }
+}
diff --git a/recipes/core/relibc/src/lib.rs b/recipes/core/relibc/src/lib.rs
new file mode 100644
index 0000000000..ea853da6e4
--- /dev/null
+++ b/recipes/core/relibc/src/lib.rs
@@ -0,0 +1,117 @@
+//! POSIX C library, implemented in Rust.
+//!
+//! This crate exists to provide a standard libc as its public API. This is
+//! largely provided by automatically generated bindings to the functions and
+//! data structures in the [`header`] module.
+//!
+//! Currently, Linux and Redox syscall backends are supported.
+
+#![no_std]
+#![feature(alloc_error_handler)]
+#![feature(allocator_api)]
+#![feature(c_variadic)]
+#![feature(core_intrinsics)]
+#![feature(macro_derive)]
+#![feature(maybe_uninit_slice)]
+#![feature(lang_items)]
+#![feature(linkage)]
+#![feature(pointer_is_aligned_to)]
+#![feature(ptr_as_uninit)]
+#![feature(slice_ptr_get)]
+#![feature(stmt_expr_attributes)]
+#![feature(sync_unsafe_cell)]
+#![feature(thread_local)]
+#![feature(vec_into_raw_parts)]
+#![feature(negative_impls)]
+
+#[macro_use]
+extern crate alloc;
+extern crate cbitset;
+extern crate memchr;
+extern crate posix_regex;
+extern crate rand;
+
+#[cfg(target_os = "linux")]
+#[macro_use]
+extern crate sc;
+
+#[cfg(target_os = "redox")]
+extern crate syscall;
+
+#[macro_use]
+mod macros;
+pub mod c_str;
+pub mod c_vec;
+pub mod cxa;
+pub mod db;
+pub mod error;
+pub mod fs;
+pub mod header;
+pub mod io;
+pub mod iter;
+pub mod ld_so;
+pub mod out;
+pub mod platform;
+pub mod pthread;
+pub mod raw_cell;
+pub mod start;
+pub mod sync;
+
+use crate::platform::{Allocator, NEWALLOCATOR};
+
+#[global_allocator]
+static ALLOCATOR: Allocator = NEWALLOCATOR;
+
+#[unsafe(no_mangle)]
+pub extern "C" fn relibc_panic(pi: &::core::panic::PanicInfo) -> ! {
+    use core::fmt::Write;
+
+    let mut w = platform::FileWriter::new(2);
+    let _ = w.write_fmt(format_args!("RELIBC PANIC: {}\n", pi));
+
+    core::intrinsics::abort();
+}
+
+#[cfg(not(test))]
+#[panic_handler]
+#[linkage = "weak"]
+pub fn rust_begin_unwind(pi: &::core::panic::PanicInfo) -> ! {
+    relibc_panic(pi)
+}
+
+#[cfg(not(test))]
+#[lang = "eh_personality"]
+#[linkage = "weak"]
+pub extern "C" fn rust_eh_personality() {}
+
+#[cfg(not(test))]
+#[alloc_error_handler]
+#[linkage = "weak"]
+#[allow(improper_ctypes_definitions)]
+#[unsafe(no_mangle)]
+pub extern "C" fn rust_oom(layout: ::core::alloc::Layout) -> ! {
+    // Layout not FFI-safe?
+    use core::fmt::Write;
+
+    let mut w = platform::FileWriter::new(2);
+    let _ = w.write_fmt(format_args!(
+        "RELIBC OOM: {} bytes aligned to {} bytes\n",
+        layout.size(),
+        layout.align()
+    ));
+
+    core::intrinsics::abort();
+}
+
+#[cfg(not(test))]
+#[allow(non_snake_case)]
+#[linkage = "weak"]
+#[unsafe(no_mangle)]
+pub extern "C" fn _Unwind_Resume() -> ! {
+    use core::fmt::Write;
+
+    let mut w = platform::FileWriter::new(2);
+    let _ = w.write_str("_Unwind_Resume\n");
+
+    core::intrinsics::abort();
+}
diff --git a/recipes/core/relibc/src/macros.rs b/recipes/core/relibc/src/macros.rs
new file mode 100644
index 0000000000..72b4e414db
--- /dev/null
+++ b/recipes/core/relibc/src/macros.rs
@@ -0,0 +1,585 @@
+/// Print to stdout
+#[macro_export]
+macro_rules! print {
+    ($($arg:tt)*) => {{
+        use core::fmt::Write;
+        let _ = $crate::platform::FileWriter::new(1).write_fmt(format_args!($($arg)*));
+    }};
+}
+
+/// Print with new line to stdout.
+/// Deprecated, consider using log::info instead
+#[macro_export]
+macro_rules! println {
+    () => {
+        $crate::print!("\n")
+    };
+    ($($arg:tt)*) => {
+        $crate::print!("{}\n", format_args!($($arg)*))
+    };
+}
+
+/// Print to stderr
+#[macro_export]
+macro_rules! eprint {
+    ($($arg:tt)*) => {{
+        use core::fmt::Write;
+        let _ = $crate::platform::FileWriter::new(2).write_fmt(format_args!($($arg)*));
+    }};
+}
+
+/// Print with new line to stderr.
+/// Deprecated, consider using log::info instead
+#[macro_export]
+macro_rules! eprintln {
+    () => {
+        $crate::eprint!("\n")
+    };
+    ($($arg:tt)*) => {
+        $crate::eprint!("{}\n", format_args!($($arg)*))
+    };
+}
+
+pub const ISSUE_URL: &str = "https://gitlab.redox-os.org/redox-os/relibc/-/issues/";
+
+// Skippable todo!(issue, fmt)
+#[macro_export]
+macro_rules! todo_skip {
+    ($issue:expr, $($arg:tt)*) => {
+        if $issue != 0 {
+            log::info!("TODO ({}{}): {}", $crate::macros::ISSUE_URL, $issue, format_args!($($arg)*))
+        } else {
+            log::info!("TODO: {}", format_args!($($arg)*))
+        }
+    };
+}
+
+// Recoverable error todo!(issue, fmt, err)
+#[macro_export]
+macro_rules! todo_error {
+    ($issue:expr, $err:expr, $($arg:tt)*) => {
+        if $issue != 0 {
+            log::error!("TODO ({}{}): {}: {}", $crate::macros::ISSUE_URL, $issue, format_args!($($arg)*), $err)
+        } else {
+            log::error!("TODO: {}: {:?}", format_args!($($arg)*), $err)
+        }
+    };
+}
+
+// Unrecoverable error todo!(issue, fmt)
+#[macro_export]
+macro_rules! todo_panic {
+    ($issue:expr, $($arg:tt)*) => {
+        if $issue != 0 {
+            todo!("{} ({}{})", format_args!($($arg)*), $crate::macros::ISSUE_URL, $issue)
+        } else {
+            todo!("{}", format_args!($($arg)*))
+        }
+    };
+}
+
+#[macro_export]
+#[cfg(feature = "no_trace")]
+macro_rules! trace_expr {
+    ($expr:expr, $($arg:tt)*) => {
+        $expr
+    };
+}
+
+#[macro_export]
+#[cfg(not(feature = "no_trace"))]
+macro_rules! trace_expr {
+    ($expr:expr, $($arg:tt)*) => ({
+        use $crate::header::errno::STR_ERROR;
+        use $crate::platform;
+
+        log::trace!("{}", format_args!($($arg)*));
+
+        let trace_old_errno = platform::ERRNO.get();
+        platform::ERRNO.set(0);
+
+        let ret = $expr;
+
+        let trace_errno = platform::ERRNO.get() as isize;
+        if trace_errno == 0 {
+            platform::ERRNO.set(trace_old_errno);
+        }
+
+        let trace_strerror = if trace_errno >= 0 && trace_errno < STR_ERROR.len() as isize {
+            STR_ERROR[trace_errno as usize]
+        } else {
+            "Unknown error"
+        };
+
+        log::trace!("{} = {} ({}, {})", format_args!($($arg)*), ret, trace_errno, trace_strerror);
+
+        ret
+    });
+}
+
+#[macro_export]
+macro_rules! skipws {
+    ($ptr:expr) => {
+        while isspace(unsafe { *$ptr }) != 0 {
+            $ptr = unsafe { $ptr.add(1) };
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! strtou_impl {
+    ($type:ident, $ptr:expr, $base:expr) => {
+        strtou_impl!($type, $ptr, $base, false)
+    };
+    ($type:ident, $ptr:expr, $base:expr, $negative:expr) => {{
+        let mut base = $base;
+
+        if (base == 16 || base == 0)
+            && unsafe { *$ptr } == '0' as wchar_t
+            && (unsafe { *$ptr.add(1) } == 'x' as wchar_t
+                || unsafe { *$ptr.add(1) } == 'X' as wchar_t)
+        {
+            $ptr = unsafe { $ptr.add(2) };
+            base = 16;
+        }
+
+        if base == 0 {
+            base = if unsafe { *$ptr } == '0' as wchar_t {
+                8
+            } else {
+                10
+            };
+        };
+
+        let mut result: $type = 0;
+        while let Some(digit) =
+            char::from_u32(unsafe { *$ptr } as u32).and_then(|c| c.to_digit(base as u32))
+        {
+            let new = result.checked_mul(base as $type).and_then(|result| {
+                if $negative {
+                    #[cfg(target_arch = "x86")]
+                    {
+                        result.checked_sub(
+                            $type::try_from(digit).expect("single digit never overflows"),
+                        )
+                    }
+                    #[cfg(not(target_arch = "x86"))]
+                    {
+                        result.checked_sub($type::from(digit))
+                    }
+                } else {
+                    #[cfg(target_arch = "x86")]
+                    {
+                        result.checked_add(
+                            $type::try_from(digit).expect("single digit never overflows"),
+                        )
+                    }
+                    #[cfg(not(target_arch = "x86"))]
+                    {
+                        result.checked_add($type::from(digit))
+                    }
+                }
+            });
+            result = match new {
+                Some(new) => new,
+                None => {
+                    platform::ERRNO.set(ERANGE);
+                    return !0;
+                }
+            };
+
+            $ptr = unsafe { $ptr.add(1) };
+        }
+        result
+    }};
+}
+
+#[macro_export]
+macro_rules! strto_impl {
+    // this variant is used by inttypes and stdlib
+    (
+        $rettype:ty, $signed:expr, $maxval:expr, $minval:expr, $s:ident, $endptr:ident, $base:ident
+    ) => {{
+        // ensure these are constants
+        const CHECK_SIGN: bool = $signed;
+        const MAX_VAL: $rettype = $maxval;
+        const MIN_VAL: $rettype = $minval;
+
+        let set_endptr = |idx: isize| {
+            if !$endptr.is_null() {
+                // This is stupid, but apparently strto* functions want
+                // const input but mut output, yet the man page says
+                // "stores the address of the first invalid character in *endptr"
+                // so obviously it doesn't want us to clone it.
+                unsafe {
+                    *$endptr = $s.offset(idx).cast_mut();
+                }
+            }
+        };
+
+        let invalid_input = || {
+            platform::ERRNO.set(EINVAL);
+            set_endptr(0);
+        };
+
+        // only valid bases are 2 through 36
+        if $base != 0 && !(2..=36).contains(&$base) {
+            invalid_input();
+            return 0;
+        }
+
+        let mut idx = 0;
+
+        // skip any whitespace at the beginning of the string
+        while ctype::isspace(c_int::from(unsafe { *$s.offset(idx) })) != 0 {
+            idx += 1;
+        }
+
+        // check for +/-
+        let positive = match is_positive(unsafe { *$s.offset(idx) }) {
+            Some((pos, i)) => {
+                idx += i;
+                pos
+            }
+            None => {
+                invalid_input();
+                return 0;
+            }
+        };
+
+        // convert the string to a number
+        let num_str = unsafe { $s.offset(idx) };
+        let res = match $base {
+            0 => unsafe { detect_base(num_str) }.and_then(|($base, i)| {
+                idx += i;
+                unsafe { convert_integer(num_str.offset(i), $base) }
+            }),
+            8 => unsafe { convert_octal(num_str) },
+            16 => unsafe { convert_hex(num_str) },
+            _ => unsafe { convert_integer(num_str, $base) },
+        };
+
+        // check for error parsing octal/hex prefix
+        // also check to ensure a number was indeed parsed
+        let (num, i, overflow) = match res {
+            Some(res) => res,
+            None => {
+                invalid_input();
+                return 0;
+            }
+        };
+        idx += i;
+
+        let overflow = if CHECK_SIGN {
+            overflow || (num as c_long).is_negative()
+        } else {
+            overflow
+        };
+        // account for the sign
+        let num = num as $rettype;
+        let num = if overflow {
+            platform::ERRNO.set(ERANGE);
+            if CHECK_SIGN {
+                if positive { MAX_VAL } else { MIN_VAL }
+            } else {
+                MAX_VAL
+            }
+        } else {
+            if positive {
+                num
+            } else {
+                // not using -num to keep the compiler happy
+                num.overflowing_neg().0
+            }
+        };
+
+        set_endptr(idx);
+
+        num
+    }};
+    // this variant is used by wchar (also wcstoimax and wcstoumax from inttypes)
+    ($type:ident, $ptr:expr, $base:expr) => {{
+        let negative = unsafe { *$ptr } == '-' as wchar_t;
+        if negative {
+            $ptr = unsafe { $ptr.add(1) };
+        }
+        strtou_impl!($type, $ptr, $base, negative)
+    }};
+}
+
+#[macro_export]
+macro_rules! strto_float_impl {
+    ($type:ident, $s:expr, $endptr:expr) => {{
+        let mut s = $s;
+        let endptr = $endptr;
+
+        while ctype::isspace(c_int::from(unsafe{*s})) != 0 {
+            s = unsafe{ s.offset(1)};
+        }
+
+        let mut result: $type = 0.0;
+        let mut exponent: Option<$type> = None;
+        let mut radix = 10;
+
+        let result_sign = match unsafe{*s} as u8 {
+            b'-' => {
+                s = unsafe{s.offset(1)};
+                -1.0
+            }
+            b'+' => {
+                s = unsafe{s.offset(1)};
+                1.0
+            }
+            _ => 1.0,
+        };
+
+        let rust_s = unsafe{CStr::from_ptr(s)}.to_string_lossy();
+
+        // detect NaN, Inf
+        if rust_s.to_lowercase().starts_with("inf") {
+            result = $type::INFINITY;
+            s = unsafe{s.offset(3)};
+        } else if rust_s.to_lowercase().starts_with("nan") {
+            // we cannot signal negative NaN in LLVM backed languages
+            // https://github.com/rust-lang/rust/issues/73328 , https://github.com/rust-lang/rust/issues/81261
+            result = $type::NAN;
+            s = unsafe{s.offset(3)};
+        } else {
+            if unsafe{*s} as u8 == b'0' && unsafe{*s.offset(1)} as u8 == b'x' {
+                s = unsafe{s.offset(2)};
+                radix = 16;
+            }
+
+            while let Some(digit) = (unsafe{*s} as u8 as char).to_digit(radix) {
+                result *= radix as $type;
+                result += digit as $type;
+                s = unsafe{s.offset(1)};
+            }
+
+            if unsafe{*s} as u8 == b'.' {
+                s = unsafe{s.offset(1)};
+
+                let mut i = 1.0;
+                while let Some(digit) = (unsafe{*s} as u8 as char).to_digit(radix) {
+                    i *= radix as $type;
+                    result += digit as $type / i;
+                    s = unsafe{s.offset(1)};
+                }
+            }
+
+            let s_before_exponent = s;
+
+            exponent = match (unsafe{*s} as u8, radix) {
+                (b'e' | b'E', 10) | (b'p' | b'P', 16) => {
+                    s = unsafe{s.offset(1)};
+
+                    let is_exponent_positive = match unsafe{*s} as u8 {
+                        b'-' => {
+                            s = unsafe{s.offset(1)};
+                            false
+                        }
+                        b'+' => {
+                            s = unsafe{s.offset(1)};
+                            true
+                        }
+                        _ => true,
+                    };
+
+                    // Exponent digits are always in base 10.
+                    if (unsafe{*s} as u8 as char).is_digit(10) {
+                        let mut exponent_value = 0;
+
+                        while let Some(digit) = (unsafe{*s} as u8 as char).to_digit(10) {
+                            exponent_value *= 10;
+                            exponent_value += digit;
+                            s = unsafe{s.offset(1)};
+                        }
+
+                        let exponent_base = match radix {
+                            10 => 10u128,
+                            16 => 2u128,
+                            _ => unreachable!(),
+                        };
+
+                        if is_exponent_positive {
+                            Some(exponent_base.pow(exponent_value) as $type)
+                        } else {
+                            Some(1.0 / (exponent_base.pow(exponent_value) as $type))
+                        }
+                    } else {
+                        // Exponent had no valid digits after 'e'/'p' and '+'/'-', rollback
+                        s = s_before_exponent;
+                        None
+                    }
+                }
+                _ => None,
+            };
+        }
+
+        if !endptr.is_null() {
+            // This is stupid, but apparently strto* functions want
+            // const input but mut output, yet the man page says
+            // "stores the address of the first invalid character in *endptr"
+            // so obviously it doesn't want us to clone it.
+            unsafe{*endptr = s.cast_mut()};
+        }
+
+        if let Some(exponent) = exponent {
+            result_sign * result * exponent
+        } else {
+            result_sign * result
+        }
+    }};
+}
+
+/// Project an `Out<struct X { field: Type }>` to `struct X { field: Out<Type> }`.
+///
+/// It is allowed to include only a subset of the struct's fields. The struct must implement
+/// `OutProject`.
+#[macro_export]
+macro_rules! out_project {
+    {
+        let $struct:ty { $($field:ident : $fieldty:ty),*$(,)? } = $src:ident;
+    } => {
+        // Verify $src actually has type Out<$struct>. Also verify it implements `OutProject`. This
+        // excludes
+        //
+        // - the case where $src is Out<&Struct>, where it would be very UB to just construct a
+        // writable reference to $src.$field, or a smart pointer
+        // - the case where there are unaligned fields where it would be UB to call ptr::write to
+        // them (requiring packed structs)
+        {
+            fn ensure_type<U: $crate::out::OutProject>(_t: &$crate::out::Out<U>) {}
+            ensure_type::<$struct>(&$src);
+        }
+        // Verify there are no duplicate struct fields. This is not strictly necessary as Out lacks
+        // the noalias requirement, but forbidding the same field to occur multiple times would
+        // allow both cases. The compiler will reject any struct that reuses the same identifier.
+        const _: () = {
+            $(
+                if ::core::mem::offset_of!($struct, $field) % ::core::mem::align_of::<$fieldty>() != 0 {
+                    panic!(concat!("unaligned field ", stringify!($field), " of struct ", stringify!($struct), "."));
+                }
+            )*
+            struct S {
+                $(
+                    $field: $fieldty
+                ),*
+            }
+        };
+
+        // Finally, create an Out<$fieldty> for each field.
+        $(
+            // getting the pointer to $field is safe
+            let $field = unsafe { &raw mut (*$crate::out::Out::<_>::as_mut_ptr(&mut $src)).$field };
+        )*
+        $(
+            let mut $field: $crate::out::Out<$fieldty> = unsafe {
+                // SAFETY: the only guarantee is that the pointer is valid and writable for the
+                // duration of 'b where $src: Out<'b, T>. But if so, and T is a struct, that
+                // must also be true for all the struct fields.
+                $crate::out::Out::with_lifetime_of(
+                    $crate::out::Out::nonnull($field),
+                    &$src,
+                )
+            };
+        )*
+    }
+}
+#[macro_export]
+macro_rules! OutProject {
+    derive() { $(#[$($attrs:meta),*])* $v:vis struct $name:ident {
+        $(
+            $(#[$($fa:meta),*])* $fv:vis $field:ident : $type:ty
+        ),*$(,)?
+    } } => {
+        // SAFETY: As simple as it is, OutProject is valid for any struct, and the pattern we have
+        // matched above ensures $name is one.
+        unsafe impl $crate::out::OutProject for $name {}
+    }
+}
+#[macro_export]
+#[cfg(not(feature = "check_against_libc_crate"))]
+macro_rules! CheckVsLibcCrate {
+    derive() { $(#[$($attrs:meta),*])* $v:vis struct $name:ident {
+        $(
+            $(#[$($fa:meta),*])* $fv:vis $field:ident : $type:ty
+        ),*$(,)?
+    } } => {
+    }
+}
+
+// TODO: probably exists nice nightly features that allow conflicting impls. Then we wouldn't need
+// much of this redundant code just to say A == B -> B == A and say A == B -> *mut A == *mut B.
+pub trait LibcTypeEquals<A, B> {}
+//impl<A, B> LibcTypeEquals<A, B> for () {}
+impl<A, B> LibcTypeEquals<*mut A, *mut B> for () where (): LibcTypeEquals<A, B> {}
+impl<A, B> LibcTypeEquals<*const A, *const B> for () where (): LibcTypeEquals<A, B> {}
+impl<A, B, const N: usize> LibcTypeEquals<[A; N], [B; N]> for () where (): LibcTypeEquals<A, B> {}
+macro_rules! for_primitive_int(
+    ($i:ident) => {
+        impl LibcTypeEquals<$i, $i> for () {}
+    }
+);
+for_primitive_int!(u8);
+for_primitive_int!(u16);
+for_primitive_int!(u32);
+for_primitive_int!(u64);
+for_primitive_int!(u128);
+for_primitive_int!(usize);
+for_primitive_int!(i8);
+for_primitive_int!(i16);
+for_primitive_int!(i32);
+for_primitive_int!(i64);
+for_primitive_int!(i128);
+for_primitive_int!(isize);
+impl LibcTypeEquals<crate::platform::types::c_void, crate::platform::types::c_void> for () {}
+#[cfg(feature = "check_against_libc_crate")]
+impl LibcTypeEquals<__libc_only_for_layout_checks::c_void, crate::platform::types::c_void> for () {}
+#[cfg(feature = "check_against_libc_crate")]
+impl LibcTypeEquals<crate::platform::types::c_void, __libc_only_for_layout_checks::c_void> for () {}
+
+//impl LibcTypeEquals<__libc_only_for_layout_checks::c_void>
+
+/// Derive macro which checks that structs here are defined the same as in the libc crate. Perhaps
+/// not sufficiently rigorous to soundly cast between the types, but should catch most mistakes.
+#[macro_export]
+#[cfg(feature = "check_against_libc_crate")]
+macro_rules! CheckVsLibcCrate {
+    // XXX: not sure we can have the name be different from libc::$name without parameters to the
+    // derive macro
+    derive() { $(#[$($attrs:meta),*])* $v:vis struct $name:ident {
+        $(
+            $(#[$($fa:meta),*])* $fv:vis $field:ident : $type:ty
+        ),*$(,)?
+    } } => {
+        // TODO: check repr(C)? probably possible to match on $attrs
+        #[allow(dead_code)]
+        const _: () = {
+            if ::core::mem::size_of::<$name>() != ::core::mem::size_of::<::__libc_only_for_layout_checks::$name>() {
+                panic!("struct size mismatch");
+            }
+            if ::core::mem::align_of::<$name>() != ::core::mem::align_of::<::__libc_only_for_layout_checks::$name>() {
+                panic!("struct alignment mismatch");
+            }
+            $(
+                if ::core::mem::offset_of!($name, $field) != ::core::mem::offset_of!(__libc_only_for_layout_checks::$name, $field) {
+                    panic!("struct field offset mismatch");
+                }
+            )*
+        };
+        $(
+            // check all field types are equivalent
+            #[allow(dead_code)]
+            const _: () = {
+                fn ensure_ty<A, B>(a: A, b: B) where (): $crate::macros::LibcTypeEquals::<A, B> {}
+                fn for_libc(a: $name, b: __libc_only_for_layout_checks::$name) {
+                    let a: $type = panic!("never called");
+                    ensure_ty(a, b.$field);
+                }
+            };
+        )*
+        impl $crate::macros::LibcTypeEquals<$name, __libc_only_for_layout_checks::$name> for () {}
+        impl $crate::macros::LibcTypeEquals<__libc_only_for_layout_checks::$name, $name> for () {}
+    }
+}
diff --git a/recipes/core/relibc/src/out.rs b/recipes/core/relibc/src/out.rs
new file mode 100644
index 0000000000..5729a82b64
--- /dev/null
+++ b/recipes/core/relibc/src/out.rs
@@ -0,0 +1,231 @@
+//! Wrapper for the "out pointer" pattern.
+//!
+//! This is functionally equivalent to `&Cell<MaybeUninit<T>>` except the only allowed operation is
+//! to write a `T`. Using `MaybeUninit` directly would not have been equally general; a
+//! `&mut MaybeUninit<T>` could never then be created from a `&mut T` and passed to safe code,
+//! which can safely replace it with `MaybeUninit::uninit` and make the existence of `&mut T` UB.
+//!
+//! As for the "`&Cell<...>`", this is to be slightly weaker than Rust's normally strict
+//! requirement that `&mut` references are never aliased, which can typically not be assumed when
+//! getting pointers from C.
+
+use core::{cell::UnsafeCell, fmt, marker::PhantomData, mem::MaybeUninit, ptr::NonNull};
+
+/// Wrapper for write-only "out pointers" that are safe to write to
+// TODO: We may want to change this to &mut MaybeUninit, or have a generic parameter deciding
+// whether it should be noalias or not
+#[derive(Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct Out<'a, T: ?Sized> {
+    ptr: NonNull<T>,
+    _marker: PhantomData<&'a UnsafeCell<T>>,
+}
+impl<'a, T: ?Sized> Out<'a, T> {
+    /// # Safety
+    ///
+    /// - pointer must either be NULL, or be valid for the duration of lifetime `'a`
+    #[inline]
+    pub unsafe fn nullable(ptr: *mut T) -> Option<Self> {
+        Some(Self {
+            ptr: NonNull::new(ptr)?,
+            _marker: PhantomData,
+        })
+    }
+    /// # Safety
+    ///
+    /// - pointer must be valid for the duration of lifetime `'a`
+    #[inline]
+    pub unsafe fn nonnull(ptr: *mut T) -> Self {
+        if cfg!(debug_assertions) {
+            assert!(!ptr.is_null());
+        }
+        Self {
+            ptr: unsafe { NonNull::new_unchecked(ptr) },
+            _marker: PhantomData,
+        }
+    }
+    #[inline]
+    pub fn from_mut(r: &'a mut T) -> Self {
+        // SAFETY:
+        //
+        // - `r` will obviously have the same lifetime as Self
+        // - a Rust reference is obviously valid as a pointer, and the lifetime is tied to that of
+        // this struct
+        unsafe { Self::nonnull(r) }
+    }
+    #[inline]
+    pub fn as_mut_ptr(&mut self) -> *mut T {
+        self.ptr.as_ptr()
+    }
+}
+impl<'a, T> Out<'a, T> {
+    #[inline]
+    pub fn from_uninit_mut(r: &'a mut MaybeUninit<T>) -> Self {
+        // SAFETY:
+        //
+        // Same as for from_mut. It's fine if *r is uninitialized, as this wrapper only allows
+        // writes.
+        unsafe { Self::nonnull(r.as_mut_ptr()) }
+    }
+    #[inline]
+    pub fn write(&mut self, t: T) {
+        unsafe {
+            self.ptr.as_ptr().write(t);
+        }
+    }
+}
+impl<'a, T, const N: usize> Out<'a, [T; N]> {
+    #[inline]
+    pub fn as_slice_mut<'b>(&'b mut self) -> Out<'b, [T]> {
+        unsafe {
+            let ptr: *mut [T; N] = self.as_mut_ptr();
+            Out::from_raw_parts(ptr.cast::<T>(), N)
+        }
+    }
+}
+impl<'a, T> Out<'a, [T]> {
+    /// # Safety
+    ///
+    /// If `len > 0`, `ptr` be valid for `len` elements of `T`, during lifetime `'a`.
+    pub unsafe fn from_raw_parts(ptr: *mut T, len: usize) -> Self {
+        // Empty slices must be non-NULL in Rust, but C typically does not force this for
+        // pointer-length pairs.
+        let ptr = if len == 0 {
+            core::ptr::dangling_mut::<T>()
+        } else {
+            ptr
+        };
+        unsafe { Self::nonnull(core::ptr::slice_from_raw_parts_mut(ptr, len)) }
+    }
+    pub fn len(&self) -> usize {
+        self.ptr.as_ptr().len()
+    }
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+    // TODO: Maybe strengthen lifetimes?
+    #[inline]
+    pub fn split_at_checked<'b>(&'b mut self, n: usize) -> Option<[Out<'b, [T]>; 2]> {
+        let l = self.ptr.len();
+        if n > l {
+            return None;
+        }
+        Some([
+            Out {
+                ptr: unsafe {
+                    NonNull::new_unchecked(core::ptr::slice_from_raw_parts_mut(
+                        self.ptr.as_mut_ptr(),
+                        n,
+                    ))
+                },
+                _marker: PhantomData,
+            },
+            Out {
+                ptr: unsafe {
+                    NonNull::new_unchecked(core::ptr::slice_from_raw_parts_mut(
+                        self.ptr.as_mut_ptr().add(n),
+                        l - n,
+                    ))
+                },
+                _marker: PhantomData,
+            },
+        ])
+    }
+    #[inline]
+    pub fn copy_from_slice(&mut self, src: &[T])
+    where
+        T: Copy,
+    {
+        assert_eq!(
+            self.ptr.len(),
+            src.len(),
+            "Out::copy_from_slice size mismatch"
+        );
+        unsafe {
+            // SAFETY:
+            //
+            // - we have already know from the existence of self that the slice is a valid writable
+            // pointer
+            // - src is similarly also a valid readable pointer of the same type
+            // - because of `T: Copy`, it is valid to copy bytes directly
+            // - although self.ptr may alias, src must not alias with any writable pointer, and the
+            // Copy bound ensures T cannot have interior mutability since `UnsafeCell: !Copy`
+            self.ptr
+                .as_mut_ptr()
+                .copy_from_nonoverlapping(src.as_ptr(), src.len());
+        }
+    }
+    pub fn copy_common_length_from_slice(&mut self, src: &[T]) -> usize
+    where
+        T: Copy,
+    {
+        let l = src.len().min(self.len());
+        self.split_at_checked(l).unwrap()[0].copy_from_slice(&src[..l]);
+        l
+    }
+    // TODO: better API, impl RangeBounds, also fn get(usize) -> Out<T>
+    pub fn subslice<'b>(&'b mut self, start: usize, end: usize) -> Out<'b, [T]> {
+        assert!(start <= end);
+        assert!(end <= self.len());
+        unsafe { Self::from_raw_parts(self.as_mut_ptr().as_mut_ptr().add(start), end - start) }
+    }
+    pub fn index<'b>(&'b mut self, i: usize) -> Out<'b, T> {
+        assert!(i <= self.len());
+        unsafe { Out::nonnull(self.as_mut_ptr().as_mut_ptr().add(i)) }
+    }
+}
+// TODO: use bytemuck
+impl<T: plain::Plain> Out<'_, [T]> {
+    pub fn zero(&mut self) {
+        let l = self.ptr.len();
+        unsafe {
+            // SAFETY:
+            // - already know the pointer is valid up to its length
+            // - the Plain trait ensures zero is a valid bit pattern
+            self.ptr.as_mut_ptr().write_bytes(0, l)
+        }
+    }
+    #[inline]
+    pub fn cast_slice_to<'b, U>(mut self) -> Out<'b, [U]>
+    where
+        T: CastSlice<U>,
+    {
+        assert_eq!(self.as_mut_ptr().as_mut_ptr() as usize % align_of::<U>(), 0);
+
+        let byte_length = self.as_mut_ptr().len() * size_of::<T>();
+
+        unsafe {
+            Out::from_raw_parts(
+                self.as_mut_ptr().as_mut_ptr().cast(),
+                byte_length / size_of::<U>(),
+            )
+        }
+    }
+}
+// TODO: use bytemuck
+pub unsafe trait CastSlice<U> {}
+unsafe impl CastSlice<i8> for u8 {}
+unsafe impl CastSlice<u8> for i8 {}
+unsafe impl CastSlice<u8> for u8 {}
+unsafe impl CastSlice<i8> for i8 {}
+
+impl<T: ?Sized> fmt::Pointer for Out<'_, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:p}", self.ptr)
+    }
+}
+impl<T: ?Sized> fmt::Debug for Out<'_, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "[Out: {:p}]", self.ptr)
+    }
+}
+/// Marker trait for types where it is sound to turn `Out<struct { ... }>` into `struct { ...:
+/// Out<...> }` by simply referencing fields. This is safe for any struct but must not be
+/// implemented for `Deref` types so that `Out<&struct { ... }>` is never projected in a way that
+/// adds mutability.
+pub unsafe trait OutProject {}
+
+impl<'a, T: ?Sized> Out<'a, T> {
+    pub unsafe fn with_lifetime_of<'b, U: ?Sized>(mut self, u: &'b U) -> Out<'b, T> {
+        unsafe { Out::nonnull(self.as_mut_ptr()) }
+    }
+}
diff --git a/recipes/core/relibc/src/platform/allocator/mod.rs b/recipes/core/relibc/src/platform/allocator/mod.rs
new file mode 100644
index 0000000000..acdb643787
--- /dev/null
+++ b/recipes/core/relibc/src/platform/allocator/mod.rs
@@ -0,0 +1,121 @@
+use core::{
+    alloc::{GlobalAlloc, Layout},
+    cell::SyncUnsafeCell,
+    cmp,
+    mem::align_of,
+    ptr::{self, copy_nonoverlapping, write_bytes},
+    sync::atomic::{AtomicPtr, Ordering},
+};
+
+mod sys;
+use super::types::*;
+use crate::{ALLOCATOR, sync::Mutex};
+use dlmalloc::DlmallocCApi;
+
+pub type Dlmalloc = DlmallocCApi<sys::System>;
+
+#[allow(clippy::declare_interior_mutable_const)]
+pub const NEWALLOCATOR: Allocator = Allocator::new();
+
+pub struct Allocator {
+    inner: SyncUnsafeCell<Mutex<Dlmalloc>>,
+    pub ptr: AtomicPtr<Mutex<Dlmalloc>>,
+}
+
+impl Allocator {
+    #[allow(clippy::new_without_default)]
+    pub const fn new() -> Self {
+        Allocator {
+            inner: SyncUnsafeCell::new(Mutex::new(Dlmalloc::new(sys::System::new()))),
+            ptr: AtomicPtr::new(ptr::null_mut()),
+        }
+    }
+
+    pub fn get(&self) -> *const Mutex<Dlmalloc> {
+        let ptr = self.ptr.load(Ordering::Acquire);
+        if !ptr.is_null() {
+            return ptr;
+        }
+
+        self.inner.get()
+    }
+
+    pub fn set(&self, mspace: *const Mutex<Dlmalloc>) {
+        self.ptr.store(mspace.cast_mut(), Ordering::Release);
+    }
+}
+
+unsafe impl GlobalAlloc for Allocator {
+    #[inline]
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        if layout.align() <= align_of::<max_align_t>() {
+            unsafe { (*self.get()).lock().malloc(layout.size()) }
+        } else {
+            unsafe { (*self.get()).lock().memalign(layout.align(), layout.size()) }
+        }
+    }
+
+    #[inline]
+    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+        unsafe { (*self.get()).lock().free(ptr) }
+    }
+
+    #[inline]
+    unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
+        let ptr = unsafe { self.alloc(layout) };
+        if !ptr.is_null() && unsafe { (*self.get()).lock().calloc_must_clear(ptr) } {
+            unsafe { write_bytes(ptr, 0, layout.size()) };
+        }
+        ptr
+    }
+
+    #[inline]
+    unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
+        if layout.align() <= align_of::<max_align_t>() {
+            unsafe { (*self.get()).lock().realloc(ptr, new_size) }
+        } else {
+            let new =
+                unsafe { self.alloc(Layout::from_size_align_unchecked(new_size, layout.align())) };
+            let old_size = layout.size();
+
+            if !new.is_null() {
+                let size = cmp::min(old_size, new_size);
+                unsafe { copy_nonoverlapping(ptr, new, size) };
+            }
+
+            unsafe { (*self.get()).lock().free(ptr) };
+
+            new
+        }
+    }
+}
+
+pub unsafe fn alloc(size: size_t) -> *mut c_void {
+    unsafe { (*ALLOCATOR.get()).lock().malloc(size) }.cast()
+}
+
+pub unsafe fn alloc_align(size: size_t, alignment: size_t) -> *mut c_void {
+    unsafe { (*ALLOCATOR.get()).lock().memalign(alignment, size) }.cast()
+}
+
+pub unsafe fn realloc(ptr: *mut c_void, size: size_t) -> *mut c_void {
+    if ptr.is_null() {
+        unsafe { (*ALLOCATOR.get()).lock().malloc(size) }.cast()
+    } else {
+        unsafe { (*ALLOCATOR.get()).lock().realloc(ptr.cast(), size) }.cast()
+    }
+}
+
+pub unsafe fn free(ptr: *mut c_void) {
+    if ptr.is_null() {
+        return;
+    }
+    unsafe { (*ALLOCATOR.get()).lock().free(ptr.cast()) }
+}
+
+pub unsafe fn alloc_usable_size(ptr: *mut c_void) -> size_t {
+    if ptr.is_null() {
+        return 0;
+    }
+    unsafe { (*ALLOCATOR.get()).lock().usable_size(ptr.cast()) }
+}
diff --git a/recipes/core/relibc/src/platform/allocator/sys.rs b/recipes/core/relibc/src/platform/allocator/sys.rs
new file mode 100644
index 0000000000..401910d59b
--- /dev/null
+++ b/recipes/core/relibc/src/platform/allocator/sys.rs
@@ -0,0 +1,129 @@
+use crate::{
+    header::{
+        pthread::pthread_atfork,
+        sys_mman::{self, MREMAP_MAYMOVE},
+    },
+    platform::{Pal, Sys},
+    sync::Mutex,
+};
+use core::ptr;
+
+use dlmalloc::Allocator;
+
+/// System setting for Redox/Linux
+pub struct System {
+    _priv: (),
+}
+
+impl System {
+    pub const fn new() -> System {
+        System { _priv: () }
+    }
+}
+
+static LOCK: Mutex<()> = Mutex::new(());
+
+unsafe impl Allocator for System {
+    fn alloc(&self, size: usize) -> (*mut u8, usize, u32) {
+        let Ok(addr) = (unsafe {
+            Sys::mmap(
+                ptr::null_mut(),
+                size,
+                sys_mman::PROT_WRITE | sys_mman::PROT_READ,
+                sys_mman::MAP_ANON | sys_mman::MAP_PRIVATE,
+                -1,
+                0,
+            )
+        }) else {
+            return (ptr::null_mut(), 0, 0);
+        };
+        (addr.cast::<u8>(), size, 0)
+    }
+
+    fn remap(&self, ptr: *mut u8, oldsize: usize, newsize: usize, can_move: bool) -> *mut u8 {
+        let flags = if can_move { MREMAP_MAYMOVE } else { 0 };
+        let Ok(ptr) =
+            (unsafe { Sys::mremap(ptr.cast(), oldsize, newsize, flags, ptr::null_mut()) })
+        else {
+            return ptr::null_mut();
+        };
+        ptr.cast::<u8>()
+    }
+
+    fn free_part(&self, ptr: *mut u8, oldsize: usize, newsize: usize) -> bool {
+        unsafe {
+            if Sys::mremap(ptr.cast(), oldsize, newsize, 0, ptr::null_mut()).is_ok() {
+                return true;
+            }
+            Sys::munmap(ptr.add(newsize).cast(), oldsize - newsize).is_ok()
+        }
+    }
+
+    fn free(&self, ptr: *mut u8, size: usize) -> bool {
+        unsafe { Sys::munmap(ptr.cast(), size).is_ok() }
+    }
+
+    fn can_release_part(&self, _flags: u32) -> bool {
+        true
+    }
+
+    fn allocates_zeros(&self) -> bool {
+        true
+    }
+
+    fn page_size(&self) -> usize {
+        4096
+    }
+}
+
+pub fn acquire_global_lock() {
+    unsafe {
+        // SAFETY: No data inside
+        LOCK.manual_lock();
+    }
+}
+
+pub(super) fn release_global_lock() {
+    unsafe {
+        // SAFETY: No data inside
+        LOCK.manual_unlock();
+    }
+}
+
+/// Allows the allocator to remain unsable in the child process,
+/// after a call to `fork(2)`
+///
+/// # Safety
+///
+/// if used, this function must be called,
+/// before any allocations are made with the global allocator.
+pub unsafe fn enable_alloc_after_fork() {
+    // atfork must only be called once, to avoid a deadlock,
+    // where the handler attempts to acquire the global lock twice
+    static mut FORK_PROTECTED: bool = false;
+
+    extern "C" fn _acquire_global_lock() {
+        acquire_global_lock()
+    }
+
+    extern "C" fn _release_global_lock() {
+        release_global_lock()
+    }
+
+    acquire_global_lock();
+    // if a process forks,
+    // it will acquire the lock before any other thread,
+    // protecting it from deadlock,
+    // due to the child being created with only the calling thread.
+    unsafe {
+        if !FORK_PROTECTED {
+            pthread_atfork(
+                Some(_acquire_global_lock),
+                Some(_release_global_lock),
+                Some(_release_global_lock),
+            );
+            FORK_PROTECTED = true;
+        }
+    }
+    release_global_lock();
+}
diff --git a/recipes/core/relibc/src/platform/auxv_defs.rs b/recipes/core/relibc/src/platform/auxv_defs.rs
new file mode 100644
index 0000000000..748800aa44
--- /dev/null
+++ b/recipes/core/relibc/src/platform/auxv_defs.rs
@@ -0,0 +1,60 @@
+pub const AT_NULL: usize = 0; /* End of vector */
+pub const AT_IGNORE: usize = 1; /* Entry should be ignored */
+pub const AT_EXECFD: usize = 2; /* File descriptor of program */
+pub const AT_PHDR: usize = 3; /* Program headers for program */
+pub const AT_PHENT: usize = 4; /* Size of program header entry */
+pub const AT_PHNUM: usize = 5; /* Number of program headers */
+pub const AT_PAGESZ: usize = 6; /* System page size */
+pub const AT_BASE: usize = 7; /* Base address of interpreter */
+pub const AT_FLAGS: usize = 8; /* Flags */
+pub const AT_ENTRY: usize = 9; /* Entry point of program */
+pub const AT_NOTELF: usize = 10; /* Program is not ELF */
+pub const AT_UID: usize = 11; /* Real uid */
+pub const AT_EUID: usize = 12; /* Effective uid */
+pub const AT_GID: usize = 13; /* Real gid */
+pub const AT_EGID: usize = 14; /* Effective gid */
+pub const AT_CLKTCK: usize = 17; /* Frequency of times() */
+pub const AT_PLATFORM: usize = 15; /* String identifying platform.  */
+pub const AT_HWCAP: usize = 16; /* Machine-dependent hints about */
+pub const AT_FPUCW: usize = 18; /* Used FPU control word.  */
+pub const AT_DCACHEBSIZE: usize = 19; /* Data cache block size.  */
+pub const AT_ICACHEBSIZE: usize = 20; /* Instruction cache block size.  */
+pub const AT_UCACHEBSIZE: usize = 21; /* Unified cache block size.  */
+pub const AT_IGNOREPPC: usize = 22; /* Entry should be ignored.  */
+pub const AT_BASE_PLATFORM: usize = 24; /* String identifying real platforms.*/
+pub const AT_RANDOM: usize = 25; /* Address of 16 random bytes.  */
+pub const AT_HWCAP2: usize = 26; /* More machine-dependent hints about*/
+pub const AT_EXECFN: usize = 31; /* Filename of executable.  */
+
+// TODO: Downgrade aux vectors to getauxval constants on Redox, and use a regular struct for
+// passing important runtime info between exec (or posix_spawn in the future) calls.
+
+#[cfg(target_os = "redox")]
+// XXX: The name AT_CWD is already used in openat... for a completely different purpose.
+pub const AT_REDOX_INITIAL_CWD_PTR: usize = 32;
+#[cfg(target_os = "redox")]
+pub const AT_REDOX_INITIAL_CWD_LEN: usize = 33;
+
+#[cfg(target_os = "redox")]
+pub const AT_REDOX_INHERITED_SIGIGNMASK: usize = 34;
+#[cfg(all(target_os = "redox", target_pointer_width = "32"))]
+pub const AT_REDOX_INHERITED_SIGIGNMASK_HI: usize = 35;
+#[cfg(target_os = "redox")]
+pub const AT_REDOX_INHERITED_SIGPROCMASK: usize = 36;
+#[cfg(all(target_os = "redox", target_pointer_width = "32"))]
+pub const AT_REDOX_INHERITED_SIGPROCMASK_HI: usize = 37;
+
+#[cfg(target_os = "redox")]
+pub const AT_REDOX_UMASK: usize = 40;
+
+#[cfg(target_os = "redox")]
+pub const AT_REDOX_PROC_FD: usize = 41;
+
+#[cfg(target_os = "redox")]
+pub const AT_REDOX_THR_FD: usize = 42;
+
+#[cfg(target_os = "redox")]
+pub const AT_REDOX_NS_FD: usize = 43;
+
+#[cfg(target_os = "redox")]
+pub const AT_REDOX_CWD_FD: usize = 44;
diff --git a/recipes/core/relibc/src/platform/linux/epoll.rs b/recipes/core/relibc/src/platform/linux/epoll.rs
new file mode 100644
index 0000000000..a42eaeaf96
--- /dev/null
+++ b/recipes/core/relibc/src/platform/linux/epoll.rs
@@ -0,0 +1,42 @@
+use core::mem;
+
+use super::{Sys, e_raw};
+use crate::{
+    error::Result,
+    header::{signal::sigset_t, sys_epoll::epoll_event},
+    platform::{PalEpoll, types::*},
+};
+
+impl PalEpoll for Sys {
+    fn epoll_create1(flags: c_int) -> Result<c_int> {
+        Ok(unsafe { e_raw(syscall!(EPOLL_CREATE1, flags))? as c_int })
+    }
+
+    unsafe fn epoll_ctl(epfd: c_int, op: c_int, fd: c_int, event: *mut epoll_event) -> Result<()> {
+        unsafe {
+            e_raw(syscall!(EPOLL_CTL, epfd, op, fd, event))?;
+        }
+        Ok(())
+    }
+
+    unsafe fn epoll_pwait(
+        epfd: c_int,
+        events: *mut epoll_event,
+        maxevents: c_int,
+        timeout: c_int,
+        sigmask: *const sigset_t,
+    ) -> Result<usize> {
+        let sigsetsize: size_t = mem::size_of::<sigset_t>();
+        unsafe {
+            e_raw(syscall!(
+                EPOLL_PWAIT,
+                epfd,
+                events,
+                maxevents,
+                timeout,
+                sigmask,
+                sigsetsize
+            ))
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/platform/linux/mod.rs b/recipes/core/relibc/src/platform/linux/mod.rs
new file mode 100644
index 0000000000..995df1b2d3
--- /dev/null
+++ b/recipes/core/relibc/src/platform/linux/mod.rs
@@ -0,0 +1,859 @@
+#[cfg(target_arch = "x86_64")]
+use core::arch::asm;
+
+use super::{Pal, types::*};
+use crate::{
+    c_str::CStr,
+    error::{Errno, Result},
+    header::{
+        bits_timespec::timespec,
+        dirent::dirent,
+        errno::{EINVAL, EIO},
+        fcntl::{AT_EMPTY_PATH, AT_FDCWD, AT_REMOVEDIR},
+        signal::{SIGCHLD, sigevent},
+        sys_resource::{rlimit, rusage},
+        sys_select::timeval,
+        sys_stat::{S_IFIFO, stat},
+        sys_statvfs::statvfs,
+        sys_time::timezone,
+        sys_utsname::utsname,
+        time::itimerspec,
+        unistd::{SEEK_CUR, SEEK_SET},
+    },
+    ld_so::tcb::OsSpecific,
+    out::Out,
+};
+use core::{num::NonZeroU64, ptr};
+// use header::sys_times::tms;
+
+mod epoll;
+mod ptrace;
+mod signal;
+mod socket;
+
+const SYS_CLONE: usize = 56;
+const CLONE_VM: usize = 0x0100;
+const CLONE_FS: usize = 0x0200;
+const CLONE_FILES: usize = 0x0400;
+const CLONE_SIGHAND: usize = 0x0800;
+const CLONE_THREAD: usize = 0x00010000;
+
+#[repr(C)]
+#[derive(Default)]
+struct linux_statfs {
+    f_type: c_long,       /* type of file system (see below) */
+    f_bsize: c_long,      /* optimal transfer block size */
+    f_blocks: fsblkcnt_t, /* total data blocks in file system */
+    f_bfree: fsblkcnt_t,  /* free blocks in fs */
+    f_bavail: fsblkcnt_t, /* free blocks available to unprivileged user */
+    f_files: fsfilcnt_t,  /* total file nodes in file system */
+    f_ffree: fsfilcnt_t,  /* free file nodes in fs */
+    f_fsid: c_long,       /* file system id */
+    f_namelen: c_long,    /* maximum length of filenames */
+    f_frsize: c_long,     /* fragment size (since Linux 2.6) */
+    f_flags: c_long,
+    f_spare: [c_long; 4],
+}
+
+// TODO
+const ERRNO_MAX: usize = 4095;
+
+pub fn e_raw(sys: usize) -> Result<usize> {
+    if sys > ERRNO_MAX.wrapping_neg() {
+        Err(Errno(sys.wrapping_neg() as _))
+    } else {
+        Ok(sys)
+    }
+}
+
+/// Linux syscall implementation of [`Pal`].
+pub struct Sys;
+
+impl Sys {
+    pub unsafe fn ioctl(fd: c_int, request: c_ulong, out: *mut c_void) -> Result<c_int> {
+        // TODO: Somehow support varargs to syscall??
+        Ok(e_raw(syscall!(IOCTL, fd, request, out))? as c_int)
+    }
+
+    // fn times(out: *mut tms) -> clock_t {
+    //     unsafe { syscall!(TIMES, out) as clock_t }
+    // }
+}
+
+impl Pal for Sys {
+    fn faccessat(fd: c_int, path: CStr, amode: c_int, flags: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(FACCESSAT, fd, path.as_ptr(), amode, flags) }).map(|_| ())
+    }
+
+    unsafe fn brk(addr: *mut c_void) -> Result<*mut c_void> {
+        Ok(e_raw(unsafe { syscall!(BRK, addr) })? as *mut c_void)
+    }
+
+    fn chdir(path: CStr) -> Result<()> {
+        e_raw(unsafe { syscall!(CHDIR, path.as_ptr()) }).map(|_| ())
+    }
+
+    fn fchownat(fildes: c_int, path: CStr, owner: uid_t, group: gid_t, flags: c_int) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                FCHOWNAT,
+                fildes,
+                path.as_ptr(),
+                owner as u32,
+                group as u32,
+                flags
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn clock_getres(clk_id: clockid_t, res: Option<Out<timespec>>) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                CLOCK_GETRES,
+                clk_id,
+                res.map_or(core::ptr::null_mut(), |mut p| p.as_mut_ptr())
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn clock_gettime(clk_id: clockid_t, mut tp: Out<timespec>) -> Result<()> {
+        e_raw(unsafe { syscall!(CLOCK_GETTIME, clk_id, tp.as_mut_ptr()) }).map(|_| ())
+    }
+
+    unsafe fn clock_settime(clk_id: clockid_t, tp: *const timespec) -> Result<()> {
+        e_raw(syscall!(CLOCK_SETTIME, clk_id, tp)).map(|_| ())
+    }
+
+    fn close(fildes: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(CLOSE, fildes) }).map(|_| ())
+    }
+
+    fn dup(fildes: c_int) -> Result<c_int> {
+        e_raw(unsafe { syscall!(DUP, fildes) }).map(|f| f as c_int)
+    }
+
+    fn dup2(fildes: c_int, fildes2: c_int) -> Result<c_int> {
+        e_raw(unsafe { syscall!(DUP3, fildes, fildes2, 0) }).map(|f| f as c_int)
+    }
+
+    unsafe fn execve(path: CStr, argv: *const *mut c_char, envp: *const *mut c_char) -> Result<()> {
+        e_raw(syscall!(EXECVE, path.as_ptr(), argv, envp))?;
+        unreachable!()
+    }
+    unsafe fn fexecve(
+        fildes: c_int,
+        argv: *const *mut c_char,
+        envp: *const *mut c_char,
+    ) -> Result<()> {
+        let empty = b"\0";
+        let empty_ptr = empty.as_ptr().cast::<c_char>();
+        e_raw(syscall!(
+            EXECVEAT,
+            fildes,
+            empty_ptr,
+            argv,
+            envp,
+            AT_EMPTY_PATH
+        ))?;
+        unreachable!()
+    }
+
+    fn exit(status: c_int) -> ! {
+        unsafe {
+            syscall!(EXIT, status);
+        }
+        loop {}
+    }
+    unsafe fn exit_thread(_stack_base: *mut (), _stack_size: usize) -> ! {
+        // TODO
+        Self::exit(0)
+    }
+
+    fn fchdir(fildes: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(FCHDIR, fildes) }).map(|_| ())
+    }
+
+    fn fchmod(fildes: c_int, mode: mode_t) -> Result<()> {
+        e_raw(unsafe { syscall!(FCHMOD, fildes, mode) }).map(|_| ())
+    }
+
+    fn fchmodat(dirfd: c_int, path: Option<CStr>, mode: mode_t, flags: c_int) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                FCHMODAT,
+                dirfd,
+                path.map_or(core::ptr::null(), |p| p.as_ptr()),
+                mode,
+                flags
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn fchown(fildes: c_int, owner: uid_t, group: gid_t) -> Result<()> {
+        e_raw(unsafe { syscall!(FCHOWN, fildes, owner, group) }).map(|_| ())
+    }
+
+    fn fdatasync(fildes: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(FDATASYNC, fildes) }).map(|_| ())
+    }
+
+    fn flock(fd: c_int, operation: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(FLOCK, fd, operation) }).map(|_| ())
+    }
+
+    fn fstat(fildes: c_int, mut buf: Out<stat>) -> Result<()> {
+        let empty = b"\0";
+        let empty_ptr = empty.as_ptr().cast::<c_char>();
+        e_raw(unsafe {
+            syscall!(
+                NEWFSTATAT,
+                fildes,
+                empty_ptr,
+                buf.as_mut_ptr(),
+                AT_EMPTY_PATH
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn fstatat(fildes: c_int, path: Option<CStr>, mut buf: Out<stat>, flags: c_int) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                NEWFSTATAT,
+                fildes,
+                path.map_or(core::ptr::null(), |s| s.as_ptr()),
+                buf.as_mut_ptr(),
+                flags
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn fstatvfs(fildes: c_int, mut buf: Out<statvfs>) -> Result<()> {
+        let buf = buf.as_mut_ptr();
+
+        let mut kbuf = linux_statfs::default();
+        let kbuf_ptr = &raw mut kbuf;
+        e_raw(unsafe { syscall!(FSTATFS, fildes, kbuf_ptr) })?;
+
+        if !buf.is_null() {
+            unsafe {
+                (*buf).f_bsize = kbuf.f_bsize as c_ulong;
+                (*buf).f_frsize = if kbuf.f_frsize != 0 {
+                    kbuf.f_frsize
+                } else {
+                    kbuf.f_bsize
+                } as c_ulong;
+                (*buf).f_blocks = kbuf.f_blocks;
+                (*buf).f_bfree = kbuf.f_bfree;
+                (*buf).f_bavail = kbuf.f_bavail;
+                (*buf).f_files = kbuf.f_files;
+                (*buf).f_ffree = kbuf.f_ffree;
+                (*buf).f_favail = kbuf.f_ffree;
+                (*buf).f_fsid = kbuf.f_fsid as c_ulong;
+                (*buf).f_flag = kbuf.f_flags as c_ulong;
+                (*buf).f_namemax = kbuf.f_namelen as c_ulong;
+            }
+        }
+        Ok(())
+    }
+
+    fn fcntl(fildes: c_int, cmd: c_int, arg: c_ulonglong) -> Result<c_int> {
+        Ok(e_raw(unsafe { syscall!(FCNTL, fildes, cmd, arg) })? as c_int)
+    }
+
+    unsafe fn fork() -> Result<pid_t> {
+        Ok(e_raw(unsafe { syscall!(CLONE, SIGCHLD, 0, 0, 0, 0) })? as pid_t)
+    }
+
+    fn fpath(fildes: c_int, out: &mut [u8]) -> Result<usize> {
+        let proc_path = format!("/proc/self/fd/{}\0", fildes).into_bytes();
+        Self::readlink(CStr::from_bytes_with_nul(&proc_path).unwrap(), out)
+    }
+
+    fn fsync(fildes: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(FSYNC, fildes) }).map(|_| ())
+    }
+
+    fn ftruncate(fildes: c_int, length: off_t) -> Result<()> {
+        e_raw(unsafe { syscall!(FTRUNCATE, fildes, length) }).map(|_| ())
+    }
+
+    #[inline]
+    unsafe fn futex_wait(addr: *mut u32, val: u32, deadline: Option<&timespec>) -> Result<()> {
+        let deadline = deadline.map_or(0, |d| ptr::from_ref(d) as usize);
+        e_raw(unsafe {
+            syscall!(
+                FUTEX, addr,       // uaddr
+                9,          // futex_op: FUTEX_WAIT_BITSET
+                val,        // val
+                deadline,   // timeout: deadline
+                0,          // uaddr2/val2: 0/NULL
+                0xffffffff  // val3: FUTEX_BITSET_MATCH_ANY
+            )
+        })
+        .map(|_| ())
+    }
+    #[inline]
+    unsafe fn futex_wake(addr: *mut u32, num: u32) -> Result<u32> {
+        e_raw(unsafe {
+            syscall!(FUTEX, addr, 1 /* FUTEX_WAKE */, num)
+        })
+        .map(|n| n as u32)
+    }
+
+    unsafe fn futimens(fd: c_int, times: *const timespec) -> Result<()> {
+        e_raw(unsafe { syscall!(UTIMENSAT, fd, ptr::null::<c_char>(), times, 0) }).map(|_| ())
+    }
+
+    unsafe fn utimens(path: CStr, times: *const timespec) -> Result<()> {
+        e_raw(unsafe { syscall!(UTIMENSAT, AT_FDCWD, path.as_ptr(), times, 0) }).map(|_| ())
+    }
+
+    fn getcwd(mut buf: Out<[u8]>) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                GETCWD,
+                buf.as_mut_ptr().as_mut_ptr(),
+                buf.as_mut_ptr().len()
+            )
+        })?;
+        Ok(())
+    }
+
+    fn getdents(fd: c_int, buf: &mut [u8], _off: u64) -> Result<usize> {
+        e_raw(unsafe { syscall!(GETDENTS64, fd, buf.as_mut_ptr(), buf.len()) })
+    }
+    fn dir_seek(fd: c_int, off: u64) -> Result<()> {
+        e_raw(unsafe { syscall!(LSEEK, fd, off, SEEK_SET) })?;
+        Ok(())
+    }
+    unsafe fn dent_reclen_offset(this_dent: &[u8], offset: usize) -> Option<(u16, u64)> {
+        let dent = this_dent.as_ptr().cast::<dirent>();
+        Some((unsafe { (*dent).d_reclen }, unsafe { (*dent).d_off } as u64))
+    }
+
+    fn getegid() -> gid_t {
+        // Always successful
+        unsafe { syscall!(GETEGID) as gid_t }
+    }
+
+    fn geteuid() -> uid_t {
+        // Always successful
+        unsafe { syscall!(GETEUID) as uid_t }
+    }
+
+    fn getgid() -> gid_t {
+        // Always successful
+        unsafe { syscall!(GETGID) as gid_t }
+    }
+
+    fn getgroups(mut list: Out<[gid_t]>) -> Result<c_int> {
+        Ok(e_raw(unsafe {
+            syscall!(
+                GETGROUPS,
+                list.len() as c_int,
+                list.as_mut_ptr().as_mut_ptr()
+            )
+        })? as c_int)
+    }
+
+    fn getpagesize() -> usize {
+        4096
+    }
+
+    fn getpgid(pid: pid_t) -> Result<pid_t> {
+        Ok(e_raw(unsafe { syscall!(GETPGID, pid) })? as pid_t)
+    }
+
+    fn getpid() -> pid_t {
+        // Always successful
+        unsafe { syscall!(GETPID) as pid_t }
+    }
+
+    fn getppid() -> pid_t {
+        // Always successful
+        unsafe { syscall!(GETPPID) as pid_t }
+    }
+
+    fn getpriority(which: c_int, who: id_t) -> Result<c_int> {
+        Ok(e_raw(unsafe { syscall!(GETPRIORITY, which, who) })? as c_int)
+    }
+
+    fn getrandom(buf: &mut [u8], flags: c_uint) -> Result<usize> {
+        e_raw(unsafe { syscall!(GETRANDOM, buf.as_mut_ptr(), buf.len(), flags) })
+    }
+
+    fn getrlimit(resource: c_int, mut rlim: Out<rlimit>) -> Result<()> {
+        e_raw(unsafe { syscall!(GETRLIMIT, resource, rlim.as_mut_ptr()) }).map(|_| ())
+    }
+
+    fn getresgid(
+        rgid: Option<Out<gid_t>>,
+        egid: Option<Out<gid_t>>,
+        sgid: Option<Out<gid_t>>,
+    ) -> Result<()> {
+        unsafe {
+            e_raw(syscall!(
+                GETRESGID,
+                rgid.map_or(0, |mut r| r.as_mut_ptr() as usize),
+                egid.map_or(0, |mut r| r.as_mut_ptr() as usize),
+                sgid.map_or(0, |mut r| r.as_mut_ptr() as usize)
+            ))
+            .map(|_| ())
+        }
+    }
+    fn getresuid(
+        ruid: Option<Out<uid_t>>,
+        euid: Option<Out<uid_t>>,
+        suid: Option<Out<uid_t>>,
+    ) -> Result<()> {
+        unsafe {
+            e_raw(syscall!(
+                GETRESUID,
+                ruid.map_or(0, |mut r| r.as_mut_ptr() as usize),
+                euid.map_or(0, |mut r| r.as_mut_ptr() as usize),
+                suid.map_or(0, |mut r| r.as_mut_ptr() as usize)
+            ))
+            .map(|_| ())
+        }
+    }
+
+    unsafe fn setrlimit(resource: c_int, rlimit: *const rlimit) -> Result<()> {
+        e_raw(syscall!(SETRLIMIT, resource, rlimit)).map(|_| ())
+    }
+
+    fn getrusage(who: c_int, mut r_usage: Out<rusage>) -> Result<()> {
+        e_raw(unsafe { syscall!(GETRUSAGE, who, r_usage.as_mut_ptr()) })?;
+        Ok(())
+    }
+
+    fn getsid(pid: pid_t) -> Result<pid_t> {
+        Ok(e_raw(unsafe { syscall!(GETSID, pid) })? as pid_t)
+    }
+
+    fn gettid() -> pid_t {
+        // Always successful
+        unsafe { syscall!(GETTID) as pid_t }
+    }
+
+    fn gettimeofday(mut tp: Out<timeval>, tzp: Option<Out<timezone>>) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                GETTIMEOFDAY,
+                tp.as_mut_ptr(),
+                tzp.map_or(0, |mut p| p.as_mut_ptr() as usize)
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn getuid() -> uid_t {
+        unsafe { syscall!(GETUID) as uid_t }
+    }
+
+    #[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
+    fn lchown(path: CStr, owner: uid_t, group: gid_t) -> Result<()> {
+        e_raw(unsafe { syscall!(LCHOWN, path.as_ptr(), owner, group) }).map(|_| ())
+    }
+
+    #[cfg(target_arch = "aarch64")]
+    fn lchown(path: CStr, owner: uid_t, group: gid_t) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                FCHOWNAT,
+                AT_FDCWD,
+                path.as_ptr(),
+                owner as u32,
+                group as u32,
+                crate::header::fcntl::AT_SYMLINK_NOFOLLOW
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn linkat(fd1: c_int, path1: CStr, fd2: c_int, path2: CStr, flags: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(LINKAT, fd1, path1.as_ptr(), fd2, path2.as_ptr(), flags) })
+            .map(|_| ())
+    }
+
+    fn lseek(fildes: c_int, offset: off_t, whence: c_int) -> Result<off_t> {
+        e_raw(unsafe { syscall!(LSEEK, fildes, offset, whence) }).map(|o| o as off_t)
+    }
+
+    fn mkdirat(dir_fildes: c_int, path: CStr, mode: mode_t) -> Result<()> {
+        e_raw(unsafe { syscall!(MKDIRAT, dir_fildes, path.as_ptr(), mode) }).map(|_| ())
+    }
+
+    fn mknodat(dir_fildes: c_int, path: CStr, mode: mode_t, dev: dev_t) -> Result<()> {
+        // Note: dev_t is c_long (i64) and __kernel_dev_t is u32; So we need to cast it
+        //       and check for overflow
+        let k_dev: c_uint = dev as c_uint;
+        if dev_t::from(k_dev) != dev {
+            return Err(Errno(EINVAL));
+        }
+
+        e_raw(unsafe { syscall!(MKNODAT, dir_fildes, path.as_ptr(), mode, k_dev) }).map(|_| ())
+    }
+
+    fn mkfifoat(dir_fd: c_int, path: CStr, mode: mode_t) -> Result<()> {
+        Sys::mknodat(dir_fd, path, mode | S_IFIFO, 0)
+    }
+
+    fn mkfifo(path: CStr, mode: mode_t) -> Result<()> {
+        Sys::mknod(path, mode | S_IFIFO, 0)
+    }
+
+    unsafe fn mlock(addr: *const c_void, len: usize) -> Result<()> {
+        e_raw(unsafe { syscall!(MLOCK, addr, len) }).map(|_| ())
+    }
+
+    unsafe fn mlockall(flags: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(MLOCKALL, flags) }).map(|_| ())
+    }
+
+    unsafe fn mmap(
+        addr: *mut c_void,
+        len: usize,
+        prot: c_int,
+        flags: c_int,
+        fildes: c_int,
+        off: off_t,
+    ) -> Result<*mut c_void> {
+        Ok(e_raw(syscall!(MMAP, addr, len, prot, flags, fildes, off))? as *mut c_void)
+    }
+
+    unsafe fn mremap(
+        addr: *mut c_void,
+        len: usize,
+        new_len: usize,
+        flags: c_int,
+        args: *mut c_void,
+    ) -> Result<*mut c_void> {
+        Ok(e_raw(syscall!(MREMAP, addr, len, new_len, flags, args))? as *mut c_void)
+    }
+
+    unsafe fn mprotect(addr: *mut c_void, len: usize, prot: c_int) -> Result<()> {
+        e_raw(syscall!(MPROTECT, addr, len, prot)).map(|_| ())
+    }
+
+    unsafe fn msync(addr: *mut c_void, len: usize, flags: c_int) -> Result<()> {
+        e_raw(syscall!(MSYNC, addr, len, flags)).map(|_| ())
+    }
+
+    unsafe fn munlock(addr: *const c_void, len: usize) -> Result<()> {
+        e_raw(syscall!(MUNLOCK, addr, len)).map(|_| ())
+    }
+
+    unsafe fn munlockall() -> Result<()> {
+        e_raw(unsafe { syscall!(MUNLOCKALL) }).map(|_| ())
+    }
+
+    unsafe fn munmap(addr: *mut c_void, len: usize) -> Result<()> {
+        e_raw(syscall!(MUNMAP, addr, len)).map(|_| ())
+    }
+
+    unsafe fn madvise(addr: *mut c_void, len: usize, flags: c_int) -> Result<()> {
+        e_raw(syscall!(MADVISE, addr, len, flags)).map(|_| ())
+    }
+
+    unsafe fn nanosleep(rqtp: *const timespec, rmtp: *mut timespec) -> Result<()> {
+        e_raw(unsafe { syscall!(NANOSLEEP, rqtp, rmtp) }).map(|_| ())
+    }
+
+    fn open(path: CStr, oflag: c_int, mode: mode_t) -> Result<c_int> {
+        e_raw(unsafe { syscall!(OPENAT, AT_FDCWD, path.as_ptr(), oflag, mode) })
+            .map(|fd| fd as c_int)
+    }
+
+    fn openat(dirfd: c_int, path: CStr, oflag: c_int, mode: mode_t) -> Result<c_int> {
+        e_raw(unsafe { syscall!(OPENAT, dirfd, path.as_ptr(), oflag, mode) }).map(|fd| fd as c_int)
+    }
+
+    fn pipe2(mut fildes: Out<[c_int; 2]>, flags: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(PIPE2, fildes.as_mut_ptr(), flags) }).map(|_| ())
+    }
+
+    fn posix_fallocate(fd: c_int, offset: u64, length: NonZeroU64) -> Result<()> {
+        let length = length.get();
+        e_raw(unsafe { syscall!(FALLOCATE, fd, 0, offset, length) }).map(|_| ())
+    }
+
+    fn posix_getdents(fildes: c_int, buf: &mut [u8]) -> Result<usize> {
+        let current_offset = Self::lseek(fildes, 0, SEEK_CUR)? as u64;
+        let bytes_read = Self::getdents(fildes, buf, current_offset)?;
+        if bytes_read == 0 {
+            return Ok(0);
+        }
+        let mut bytes_processed = 0;
+        let mut next_offset = current_offset;
+
+        while bytes_processed < bytes_read {
+            let remaining_slice = &buf[bytes_processed..];
+            let (reclen, opaque_next) =
+                unsafe { Self::dent_reclen_offset(remaining_slice, bytes_processed) }
+                    .ok_or(Errno(EIO))?;
+            if reclen == 0 {
+                return Err(Errno(EIO));
+            }
+
+            bytes_processed += reclen as usize;
+            next_offset = opaque_next;
+        }
+
+        Self::lseek(fildes, next_offset as off_t, SEEK_SET)?;
+        Ok(bytes_read)
+    }
+
+    #[cfg(target_arch = "x86_64")]
+    unsafe fn rlct_clone(
+        stack: *mut usize,
+        _os_specific: &mut OsSpecific,
+    ) -> Result<crate::pthread::OsTid> {
+        let flags = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD;
+        let pid;
+        unsafe {
+            asm!("
+                # Call clone syscall
+                syscall
+
+                # Check if child or parent
+                test rax, rax
+                jnz 2f
+
+                # Load registers
+                pop rax
+                pop rdi
+                pop rsi
+                pop rdx
+                pop rcx
+                pop r8
+                pop r9
+
+                # Call entry point
+                call rax
+
+                # Exit
+                mov rax, 60
+                xor rdi, rdi
+                syscall
+
+                # Invalid instruction on failure to exit
+                ud2
+
+                # Return PID if parent
+                2:
+                ",
+                inout("rax") SYS_CLONE => pid,
+                inout("rdi") flags => _,
+                inout("rsi") stack => _,
+                inout("rdx") 0 => _,
+                inout("r10") 0 => _,
+                inout("r8") 0 => _,
+                //TODO: out("rbx") _,
+                out("rcx") _,
+                out("r9") _,
+                out("r11") _,
+                out("r12") _,
+                out("r13") _,
+                out("r14") _,
+                out("r15") _,
+            );
+        }
+        let tid = e_raw(pid)?;
+
+        Ok(crate::pthread::OsTid { thread_id: tid })
+    }
+
+    #[cfg(target_arch = "aarch64")]
+    unsafe fn rlct_clone(
+        stack: *mut usize,
+        _os_specific: &mut OsSpecific,
+    ) -> Result<crate::pthread::OsTid> {
+        todo!("rlct_clone not implemented for aarch64 yet")
+    }
+
+    unsafe fn rlct_kill(os_tid: crate::pthread::OsTid, signal: usize) -> Result<()> {
+        let tgid = Self::getpid();
+        e_raw(unsafe { syscall!(TGKILL, tgid, os_tid.thread_id, signal) }).map(|_| ())
+    }
+
+    fn current_os_tid() -> crate::pthread::OsTid {
+        crate::pthread::OsTid {
+            thread_id: unsafe { syscall!(GETTID) },
+        }
+    }
+
+    fn read(fildes: c_int, buf: &mut [u8]) -> Result<usize> {
+        e_raw(unsafe { syscall!(READ, fildes, buf.as_mut_ptr(), buf.len()) })
+    }
+    fn pread(fildes: c_int, buf: &mut [u8], off: off_t) -> Result<usize> {
+        e_raw(unsafe { syscall!(PREAD64, fildes, buf.as_mut_ptr(), buf.len(), off) })
+    }
+
+    fn readlinkat(dirfd: c_int, pathname: CStr, out: &mut [u8]) -> Result<usize> {
+        e_raw(unsafe {
+            syscall!(
+                READLINKAT,
+                dirfd,
+                pathname.as_ptr(),
+                out.as_mut_ptr(),
+                out.len()
+            )
+        })
+    }
+
+    fn renameat(old_dir: c_int, old_path: CStr, new_dir: c_int, new_path: CStr) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                RENAMEAT,
+                old_dir,
+                old_path.as_ptr(),
+                new_dir,
+                new_path.as_ptr()
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn renameat2(
+        old_dir: c_int,
+        old_path: CStr,
+        new_dir: c_int,
+        new_path: CStr,
+        flags: c_uint,
+    ) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                RENAMEAT2,
+                old_dir,
+                old_path.as_ptr(),
+                new_dir,
+                new_path.as_ptr(),
+                flags
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn rmdir(path: CStr) -> Result<()> {
+        e_raw(unsafe { syscall!(UNLINKAT, AT_FDCWD, path.as_ptr(), AT_REMOVEDIR) }).map(|_| ())
+    }
+
+    fn sched_yield() -> Result<()> {
+        e_raw(unsafe { syscall!(SCHED_YIELD) }).map(|_| ())
+    }
+
+    unsafe fn setgroups(size: size_t, list: *const gid_t) -> Result<()> {
+        e_raw(unsafe { syscall!(SETGROUPS, size, list) }).map(|_| ())
+    }
+
+    fn setpgid(pid: pid_t, pgid: pid_t) -> Result<()> {
+        e_raw(unsafe { syscall!(SETPGID, pid, pgid) }).map(|_| ())
+    }
+
+    fn setpriority(which: c_int, who: id_t, prio: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(SETPRIORITY, which, who, prio) }).map(|_| ())
+    }
+
+    fn setresgid(rgid: gid_t, egid: gid_t, sgid: gid_t) -> Result<()> {
+        e_raw(unsafe { syscall!(SETRESGID, rgid, egid, sgid) }).map(|_| ())
+    }
+
+    fn setresuid(ruid: uid_t, euid: uid_t, suid: uid_t) -> Result<()> {
+        e_raw(unsafe { syscall!(SETRESUID, ruid, euid, suid) }).map(|_| ())
+    }
+
+    fn setsid() -> Result<c_int> {
+        e_raw(unsafe { syscall!(SETSID) }).map(|s| s as c_int)
+    }
+
+    fn symlinkat(path1: CStr, fd: c_int, path2: CStr) -> Result<()> {
+        e_raw(unsafe { syscall!(SYMLINKAT, path1.as_ptr(), fd, path2.as_ptr()) }).map(|_| ())
+    }
+
+    fn sync() -> Result<()> {
+        e_raw(unsafe { syscall!(SYNC) }).map(|_| ())
+    }
+
+    fn timer_create(clock_id: clockid_t, evp: &sigevent, mut timerid: Out<timer_t>) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                TIMER_CREATE,
+                clock_id,
+                ptr::addr_of!(evp),
+                timerid.as_mut_ptr()
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn timer_delete(timerid: timer_t) -> Result<()> {
+        e_raw(unsafe { syscall!(TIMER_DELETE, timerid) }).map(|_| ())
+    }
+
+    fn timer_gettime(timerid: timer_t, mut value: Out<itimerspec>) -> Result<()> {
+        e_raw(unsafe { syscall!(TIMER_GETTIME, timerid, value.as_mut_ptr()) }).map(|_| ())
+    }
+
+    fn timer_settime(
+        timerid: timer_t,
+        flags: c_int,
+        value: &itimerspec,
+        ovalue: Option<Out<itimerspec>>,
+    ) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                TIMER_SETTIME,
+                timerid,
+                flags,
+                ptr::addr_of!(value),
+                match ovalue {
+                    None => ptr::null_mut(),
+                    Some(mut o) => o.as_mut_ptr(),
+                }
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn umask(mask: mode_t) -> mode_t {
+        unsafe { syscall!(UMASK, mask) as mode_t }
+    }
+
+    fn uname(mut utsname: Out<utsname>) -> Result<()> {
+        e_raw(unsafe { syscall!(UNAME, utsname.as_mut_ptr(), 0) }).map(|_| ())
+    }
+
+    fn unlinkat(fd: c_int, path: CStr, flags: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(UNLINKAT, fd, path.as_ptr(), flags) }).map(|_| ())
+    }
+
+    fn waitpid(pid: pid_t, stat_loc: Option<Out<c_int>>, options: c_int) -> Result<pid_t> {
+        e_raw(unsafe {
+            syscall!(
+                WAIT4,
+                pid,
+                stat_loc.map_or(core::ptr::null_mut(), |mut o| o.as_mut_ptr()),
+                options,
+                0
+            )
+        })
+        .map(|p| p as pid_t)
+    }
+
+    fn write(fildes: c_int, buf: &[u8]) -> Result<usize> {
+        e_raw(unsafe { syscall!(WRITE, fildes, buf.as_ptr(), buf.len()) })
+    }
+    fn pwrite(fildes: c_int, buf: &[u8], off: off_t) -> Result<usize> {
+        e_raw(unsafe { syscall!(PWRITE64, fildes, buf.as_ptr(), buf.len(), off) })
+    }
+
+    fn verify() -> bool {
+        // GETPID on Linux is 39, which does not exist on Redox
+        e_raw(unsafe { sc::syscall5(sc::nr::GETPID, !0, !0, !0, !0, !0) }).is_ok()
+    }
+}
diff --git a/recipes/core/relibc/src/platform/linux/ptrace.rs b/recipes/core/relibc/src/platform/linux/ptrace.rs
new file mode 100644
index 0000000000..8301ea303b
--- /dev/null
+++ b/recipes/core/relibc/src/platform/linux/ptrace.rs
@@ -0,0 +1,16 @@
+use super::{
+    super::{PalPtrace, types::*},
+    Sys, e_raw,
+};
+use crate::error::Result;
+
+impl PalPtrace for Sys {
+    unsafe fn ptrace(
+        request: c_int,
+        pid: pid_t,
+        addr: *mut c_void,
+        data: *mut c_void,
+    ) -> Result<c_int> {
+        Ok(unsafe { e_raw(syscall!(PTRACE, request, pid, addr, data))? as c_int })
+    }
+}
diff --git a/recipes/core/relibc/src/platform/linux/signal.rs b/recipes/core/relibc/src/platform/linux/signal.rs
new file mode 100644
index 0000000000..3f511b6323
--- /dev/null
+++ b/recipes/core/relibc/src/platform/linux/signal.rs
@@ -0,0 +1,204 @@
+use core::{
+    mem,
+    ptr::{self, addr_of},
+};
+
+use super::{
+    super::{
+        PalSignal,
+        types::{c_int, c_uint, pid_t},
+    },
+    Sys, e_raw,
+};
+#[allow(deprecated)]
+use crate::header::sys_time::itimerval;
+use crate::{
+    error::{Errno, Result},
+    header::{
+        bits_timespec::timespec,
+        signal::{
+            SA_RESTORER, SI_QUEUE, SIGALRM, SIGEV_SIGNAL, sigaction, sigevent, siginfo_t, sigset_t,
+            sigval, stack_t,
+        },
+        time,
+    },
+    out::Out,
+    platform::{self, Pal, types::timer_t},
+};
+
+impl PalSignal for Sys {
+    #[allow(deprecated)]
+    fn getitimer(which: c_int, out: &mut itimerval) -> Result<()> {
+        unsafe {
+            e_raw(syscall!(GETITIMER, which, ptr::from_mut(out)))?;
+        }
+        Ok(())
+    }
+
+    fn kill(pid: pid_t, sig: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(KILL, pid, sig) })?;
+        Ok(())
+    }
+    fn sigqueue(pid: pid_t, sig: c_int, val: sigval) -> Result<()> {
+        let info = siginfo_t {
+            si_addr: core::ptr::null_mut(),
+            si_code: SI_QUEUE,
+            si_errno: 0,
+            si_pid: 0, // TODO: GETPID?
+            si_signo: sig,
+            si_status: 0,
+            si_uid: 0, // TODO: GETUID?
+            si_value: val,
+        };
+        e_raw(unsafe { syscall!(RT_SIGQUEUEINFO, pid, sig, addr_of!(info)) }).map(|_| ())
+    }
+
+    fn killpg(pgrp: pid_t, sig: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(KILL, -(pgrp as isize) as pid_t, sig) })?;
+        Ok(())
+    }
+
+    fn raise(sig: c_int) -> Result<()> {
+        let tid = e_raw(unsafe { syscall!(GETTID) })? as pid_t;
+        e_raw(unsafe { syscall!(TKILL, tid, sig) })?;
+        Ok(())
+    }
+
+    #[allow(deprecated)]
+    fn setitimer(which: c_int, new: &itimerval, old: Option<&mut itimerval>) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                SETITIMER,
+                which,
+                ptr::from_ref(new),
+                old.map_or_else(ptr::null_mut, ptr::from_mut)
+            )
+        })?;
+        Ok(())
+    }
+
+    /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/alarm.html>.
+    fn alarm(seconds: c_uint) -> c_uint {
+        let mut signal_event = sigevent {
+            sigev_value: sigval { sival_int: 0 },
+            sigev_signo: SIGALRM as c_int,
+            sigev_notify: SIGEV_SIGNAL,
+            sigev_notify_attributes: ptr::null_mut(),
+            sigev_notify_function: None,
+        };
+        let mut timerid: timer_t = Default::default();
+        let timer = unsafe {
+            time::timer_create(
+                time::CLOCK_REALTIME,
+                ptr::from_mut(&mut signal_event),
+                ptr::from_mut(&mut timerid),
+            )
+        };
+        let value = time::itimerspec {
+            it_value: timespec {
+                tv_sec: i64::from(seconds),
+                tv_nsec: 0,
+            },
+            it_interval: timespec {
+                tv_sec: 0,
+                tv_nsec: 0,
+            },
+        };
+        let mut ovalue = Default::default();
+
+        let errno_backup = platform::ERRNO.get();
+        if Sys::timer_settime(timerid, 0, &value, Some(Out::from_mut(&mut ovalue))).is_err() {
+            platform::ERRNO.set(errno_backup);
+            0
+        } else {
+            ovalue.it_value.tv_sec as c_uint + if ovalue.it_value.tv_nsec > 0 { 1 } else { 0 }
+        }
+    }
+
+    fn sigaction(
+        sig: c_int,
+        act: Option<&sigaction>,
+        oact: Option<&mut sigaction>,
+    ) -> Result<(), Errno> {
+        unsafe extern "C" {
+            fn __restore_rt();
+        }
+        let act = act.map(|act| {
+            let mut act_clone = act.clone();
+            act_clone.sa_flags |= SA_RESTORER as c_int;
+            act_clone.sa_restorer = Some(__restore_rt);
+            act_clone
+        });
+        e_raw(unsafe {
+            syscall!(
+                RT_SIGACTION,
+                sig,
+                act.as_ref().map_or_else(ptr::null, ptr::from_ref),
+                oact.map_or_else(ptr::null_mut, ptr::from_mut),
+                mem::size_of::<sigset_t>()
+            )
+        })
+        .map(|_| ())
+    }
+
+    unsafe fn sigaltstack(ss: Option<&stack_t>, old_ss: Option<&mut stack_t>) -> Result<()> {
+        e_raw(syscall!(
+            SIGALTSTACK,
+            ss.map_or_else(ptr::null, ptr::from_ref),
+            old_ss.map_or_else(ptr::null_mut, ptr::from_mut)
+        ))
+        .map(|_| ())
+    }
+
+    fn sigpending(set: &mut sigset_t) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                RT_SIGPENDING,
+                ptr::from_mut::<sigset_t>(set) as usize,
+                mem::size_of::<sigset_t>()
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn sigprocmask(how: c_int, set: Option<&sigset_t>, oset: Option<&mut sigset_t>) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                RT_SIGPROCMASK,
+                how,
+                set.map_or_else(ptr::null, ptr::from_ref),
+                oset.map_or_else(ptr::null_mut, ptr::from_mut),
+                mem::size_of::<sigset_t>()
+            )
+        })
+        .map(|_| ())
+    }
+
+    fn sigsuspend(mask: &sigset_t) -> Errno {
+        unsafe {
+            e_raw(syscall!(
+                RT_SIGSUSPEND,
+                ptr::from_ref::<sigset_t>(mask),
+                size_of::<sigset_t>()
+            ))
+            .expect_err("must fail")
+        }
+    }
+
+    fn sigtimedwait(
+        set: &sigset_t,
+        sig: Option<&mut siginfo_t>,
+        tp: Option<&timespec>,
+    ) -> Result<c_int> {
+        unsafe {
+            e_raw(syscall!(
+                RT_SIGTIMEDWAIT,
+                ptr::from_ref(set),
+                sig.map_or_else(ptr::null_mut, ptr::from_mut),
+                tp.map_or_else(ptr::null, ptr::from_ref),
+                size_of::<sigset_t>()
+            ))
+            .map(|s| s as c_int)
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/platform/linux/socket.rs b/recipes/core/relibc/src/platform/linux/socket.rs
new file mode 100644
index 0000000000..47aef77141
--- /dev/null
+++ b/recipes/core/relibc/src/platform/linux/socket.rs
@@ -0,0 +1,152 @@
+use super::{Sys, e_raw};
+use crate::{
+    error::Result,
+    header::{
+        bits_socklen_t::socklen_t,
+        sys_socket::{msghdr, sockaddr},
+    },
+    platform::{
+        PalSocket,
+        types::{c_int, c_void, size_t},
+    },
+};
+
+impl PalSocket for Sys {
+    unsafe fn accept(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<c_int> {
+        Ok(e_raw(syscall!(ACCEPT, socket, address, address_len))? as c_int)
+    }
+
+    unsafe fn bind(socket: c_int, address: *const sockaddr, address_len: socklen_t) -> Result<()> {
+        e_raw(syscall!(BIND, socket, address, address_len))?;
+        Ok(())
+    }
+
+    unsafe fn connect(
+        socket: c_int,
+        address: *const sockaddr,
+        address_len: socklen_t,
+    ) -> Result<c_int> {
+        Ok(e_raw(syscall!(CONNECT, socket, address, address_len))? as c_int)
+    }
+
+    unsafe fn getpeername(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<()> {
+        e_raw(syscall!(GETPEERNAME, socket, address, address_len))?;
+        Ok(())
+    }
+
+    unsafe fn getsockname(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<()> {
+        e_raw(syscall!(GETSOCKNAME, socket, address, address_len))?;
+        Ok(())
+    }
+
+    unsafe fn getsockopt(
+        socket: c_int,
+        level: c_int,
+        option_name: c_int,
+        option_value: *mut c_void,
+        option_len: *mut socklen_t,
+    ) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                GETSOCKOPT,
+                socket,
+                level,
+                option_name,
+                option_value,
+                option_len
+            )
+        })?;
+        Ok(())
+    }
+
+    fn listen(socket: c_int, backlog: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(LISTEN, socket, backlog) })?;
+        Ok(())
+    }
+
+    unsafe fn recvfrom(
+        socket: c_int,
+        buf: *mut c_void,
+        len: size_t,
+        flags: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<usize> {
+        e_raw(syscall!(
+            RECVFROM,
+            socket,
+            buf,
+            len,
+            flags,
+            address,
+            address_len
+        ))
+    }
+
+    unsafe fn recvmsg(socket: c_int, msg: *mut msghdr, flags: c_int) -> Result<usize> {
+        e_raw(syscall!(RECVMSG, socket, msg, flags))
+    }
+
+    unsafe fn sendmsg(socket: c_int, msg: *const msghdr, flags: c_int) -> Result<usize> {
+        e_raw(syscall!(SENDMSG, socket, msg, flags))
+    }
+
+    unsafe fn sendto(
+        socket: c_int,
+        buf: *const c_void,
+        len: size_t,
+        flags: c_int,
+        dest_addr: *const sockaddr,
+        dest_len: socklen_t,
+    ) -> Result<usize> {
+        e_raw(syscall!(
+            SENDTO, socket, buf, len, flags, dest_addr, dest_len
+        ))
+    }
+
+    unsafe fn setsockopt(
+        socket: c_int,
+        level: c_int,
+        option_name: c_int,
+        option_value: *const c_void,
+        option_len: socklen_t,
+    ) -> Result<()> {
+        e_raw(unsafe {
+            syscall!(
+                SETSOCKOPT,
+                socket,
+                level,
+                option_name,
+                option_value,
+                option_len
+            )
+        })?;
+        Ok(())
+    }
+
+    fn shutdown(socket: c_int, how: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(SHUTDOWN, socket, how) })?;
+        Ok(())
+    }
+
+    unsafe fn socket(domain: c_int, kind: c_int, protocol: c_int) -> Result<c_int> {
+        Ok(e_raw(syscall!(SOCKET, domain, kind, protocol))? as c_int)
+    }
+
+    fn socketpair(domain: c_int, kind: c_int, protocol: c_int, sv: &mut [c_int; 2]) -> Result<()> {
+        e_raw(unsafe { syscall!(SOCKETPAIR, domain, kind, protocol, sv.as_mut_ptr()) })?;
+        Ok(())
+    }
+}
diff --git a/recipes/core/relibc/src/platform/logger.rs b/recipes/core/relibc/src/platform/logger.rs
new file mode 100644
index 0000000000..bdf4dce188
--- /dev/null
+++ b/recipes/core/relibc/src/platform/logger.rs
@@ -0,0 +1,293 @@
+use core::{fmt, str::FromStr};
+
+use crate::{c_str::CStr, io::prelude::*, sync::Mutex};
+
+use alloc::string::{String, ToString};
+use log::{Metadata, Record};
+
+const DEFAULT_LOG_LEVEL: log::LevelFilter = log::LevelFilter::Info;
+
+pub unsafe fn init() {
+    let mut logger = RedoxLogger::new();
+    let log_env = c"RELIBC_LOG_LEVEL".as_ptr();
+    #[cfg(feature = "no_trace")]
+    let mut trace_warn = false;
+    unsafe {
+        if let Some(env) = CStr::from_nullable_ptr(crate::header::stdlib::getenv(log_env))
+            && let Ok(level) = log::LevelFilter::from_str(env.to_str().unwrap_or(""))
+        {
+            #[cfg(feature = "no_trace")]
+            if level == log::LevelFilter::Trace {
+                trace_warn = true;
+            }
+
+            logger = logger.with_output(OutputBuilder::stderr().with_filter(level).build());
+        }
+        if let Some(name) = CStr::from_nullable_ptr(crate::platform::program_invocation_short_name)
+        {
+            logger = logger.with_process_name(name.to_str().unwrap_or("").to_string());
+        }
+    }
+    if logger.enable().is_err() {
+        log::error!("Logger already initialized");
+    }
+
+    #[cfg(feature = "no_trace")]
+    if trace_warn {
+        log::warn!(
+            "The 'no_trace' feature is enabled but RELIBC_LOG_LEVEL=TRACE, there will be no trace logs"
+        );
+    }
+}
+
+/// Copied from redox_log crate with some modifications, in future we might use it instead?
+/// An output that will be logged to. The two major outputs for most Redox system programs are
+/// usually the log file, and the global stdout.
+pub struct Output {
+    // the actual endpoint to write to.
+    endpoint: Mutex<Box<dyn fmt::Write + Send + 'static>>,
+
+    // useful for devices like BufWrite or BufRead. You don't want the log file to never but
+    // written until the program exists.
+    flush_on_newline: bool,
+
+    // specifies the maximum log level possible
+    filter: log::LevelFilter,
+}
+
+impl fmt::Debug for Output {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("Output")
+            .field("endpoint", &"opaque")
+            .field("flush_on_newline", &self.flush_on_newline)
+            .field("filter", &self.filter)
+            .finish()
+    }
+}
+
+impl Default for Output {
+    fn default() -> Self {
+        // Uses default level of max_level_in_use == None  a.k.a LogLevel::Info
+        OutputBuilder::stderr().build()
+    }
+}
+
+pub struct OutputBuilder {
+    endpoint: Box<dyn fmt::Write + Send + 'static>,
+    flush_on_newline: Option<bool>,
+    filter: Option<log::LevelFilter>,
+    ansi: Option<bool>,
+}
+impl OutputBuilder {
+    /*
+    pub fn in_redox_logging_scheme<A, B, C>(
+        category: A,
+        subcategory: B,
+        logfile: C,
+    ) -> Result<Self, io::Error>
+    where
+        A: AsRef<OsStr>,
+        B: AsRef<OsStr>,
+        C: AsRef<OsStr>,
+    {
+        if !cfg!(target_os = "redox") {
+            return Ok(Self::with_endpoint(Vec::new()));
+        }
+
+        let mut path = PathBuf::from("/scheme/logging/");
+        path.push(category.as_ref());
+        path.push(subcategory.as_ref());
+        path.push(logfile.as_ref());
+        path.set_extension("log");
+
+        if let Some(parent) = path.parent() {
+            if !parent.exists() {
+                fs::create_dir_all(parent)?;
+            }
+        }
+
+        Ok(Self::with_endpoint(BufWriter::new(File::create(
+            path,
+            fcntl::O_CREAT | fcntl::O_CLOEXEC,
+            0,
+        )?)))
+    }
+         */
+    pub fn stdout() -> Self {
+        Self::with_endpoint(crate::platform::FileWriter::new(1))
+    }
+    pub fn stderr() -> Self {
+        Self::with_endpoint(crate::platform::FileWriter::new(2))
+    }
+
+    pub fn with_endpoint<T>(endpoint: T) -> Self
+    where
+        T: fmt::Write + Send + 'static,
+    {
+        Self::with_dyn_endpoint(Box::new(endpoint))
+    }
+    pub fn with_dyn_endpoint(endpoint: Box<dyn fmt::Write + Send + 'static>) -> Self {
+        Self {
+            endpoint,
+            flush_on_newline: None,
+            filter: None,
+            ansi: None,
+        }
+    }
+    pub fn flush_on_newline(mut self, flush: bool) -> Self {
+        self.flush_on_newline = Some(flush);
+        self
+    }
+    pub fn with_filter(mut self, filter: log::LevelFilter) -> Self {
+        self.filter = Some(filter);
+        self
+    }
+    pub fn build(self) -> Output {
+        Output {
+            endpoint: Mutex::new(self.endpoint),
+            filter: self.filter.unwrap_or(DEFAULT_LOG_LEVEL),
+            flush_on_newline: self.flush_on_newline.unwrap_or(true),
+        }
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct RedoxLogger {
+    output: Output,
+    min_filter: Option<log::LevelFilter>,
+    max_filter: Option<log::LevelFilter>,
+    max_level_in_use: Option<log::LevelFilter>,
+    min_level_in_use: Option<log::LevelFilter>,
+    process_name: Option<String>,
+}
+
+impl RedoxLogger {
+    pub fn new() -> Self {
+        Self::default()
+    }
+    fn adjust_output_level(
+        max_filter: Option<log::LevelFilter>,
+        min_filter: Option<log::LevelFilter>,
+        max_in_use: &mut Option<log::LevelFilter>,
+        min_in_use: &mut Option<log::LevelFilter>,
+        output: &mut Output,
+    ) {
+        if let Some(max) = max_filter {
+            output.filter = core::cmp::max(output.filter, max);
+        }
+        if let Some(min) = min_filter {
+            output.filter = core::cmp::min(output.filter, min);
+        }
+        match max_in_use {
+            &mut Some(ref mut max) => *max = core::cmp::max(output.filter, *max),
+            max @ &mut None => *max = Some(output.filter),
+        }
+        match min_in_use {
+            &mut Some(ref mut min) => *min = core::cmp::min(output.filter, *min),
+            min @ &mut None => *min = Some(output.filter),
+        }
+    }
+    pub fn with_output(mut self, mut output: Output) -> Self {
+        Self::adjust_output_level(
+            self.max_filter,
+            self.min_filter,
+            &mut self.max_level_in_use,
+            &mut self.min_level_in_use,
+            &mut output,
+        );
+        self.output = output;
+        self
+    }
+    pub fn with_min_level_override(mut self, min: log::LevelFilter) -> Self {
+        self.min_filter = Some(min);
+        let output = &mut self.output;
+        Self::adjust_output_level(
+            self.max_filter,
+            self.min_filter,
+            &mut self.max_level_in_use,
+            &mut self.min_level_in_use,
+            output,
+        );
+        self
+    }
+    pub fn with_max_level_override(mut self, max: log::LevelFilter) -> Self {
+        self.max_filter = Some(max);
+        let output = &mut self.output;
+        Self::adjust_output_level(
+            self.max_filter,
+            self.min_filter,
+            &mut self.max_level_in_use,
+            &mut self.min_level_in_use,
+            output,
+        );
+        self
+    }
+    pub fn with_process_name(mut self, name: String) -> Self {
+        self.process_name = Some(name);
+        self
+    }
+    pub fn enable(self) -> Result<&'static Self, log::SetLoggerError> {
+        let leak = Box::leak(Box::new(self));
+        log::set_logger(leak)?;
+        if let Some(max) = leak.max_level_in_use {
+            log::set_max_level(max);
+        } else {
+            log::set_max_level(DEFAULT_LOG_LEVEL);
+        }
+        Ok(leak)
+    }
+    fn write_record<W: fmt::Write + ?Sized>(
+        record: &Record,
+        process_name: Option<&str>,
+        writer: &mut W,
+    ) -> fmt::Result {
+        let target = record.module_path().unwrap_or(record.target());
+        let level = record.level();
+        let message = record.args();
+
+        let show_lines = true;
+        let line_number = if show_lines { record.line() } else { None };
+
+        let process_name = process_name.unwrap_or("");
+        let line = &LineFmt(line_number);
+        writeln!(writer, "[{process_name}@{target}{line} {level}] {message}",)
+    }
+}
+
+impl log::Log for RedoxLogger {
+    fn enabled(&self, metadata: &Metadata) -> bool {
+        self.max_level_in_use
+            .map(|min| metadata.level() >= min)
+            .unwrap_or(false)
+            && self
+                .min_level_in_use
+                .map(|max| metadata.level() <= max)
+                .unwrap_or(false)
+    }
+    fn log(&self, record: &Record) {
+        let output = &self.output;
+        if record.metadata().level() <= output.filter {
+            let mut endpoint_guard = output.endpoint.lock();
+
+            let _ = Self::write_record(
+                record,
+                self.process_name.as_deref(),
+                endpoint_guard.as_mut(),
+            );
+        }
+    }
+    fn flush(&self) {
+        // no-op
+    }
+}
+
+struct LineFmt(Option<u32>);
+impl fmt::Display for LineFmt {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        if let Some(line) = self.0 {
+            write!(f, ":{line}")
+        } else {
+            write!(f, "")
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/platform/mod.rs b/recipes/core/relibc/src/platform/mod.rs
new file mode 100644
index 0000000000..d3a10b92a5
--- /dev/null
+++ b/recipes/core/relibc/src/platform/mod.rs
@@ -0,0 +1,421 @@
+//! Platform abstractions and environment.
+
+use crate::{
+    error::{Errno, ResultExt},
+    io::{self, Read, Write},
+    raw_cell::RawCell,
+};
+use alloc::{boxed::Box, vec::Vec};
+use core::{cell::Cell, fmt, ptr};
+
+pub use self::allocator::*;
+
+mod allocator;
+
+pub mod logger;
+
+pub use self::pal::{Pal, PalEpoll, PalPtrace, PalSignal, PalSocket};
+
+mod pal;
+
+pub use self::sys::Sys;
+
+#[cfg(target_os = "linux")]
+#[path = "linux/mod.rs"]
+pub(crate) mod sys;
+
+#[cfg(target_os = "redox")]
+#[path = "redox/mod.rs"]
+pub(crate) mod sys;
+
+pub use self::rlb::{Line, RawLineBuffer};
+pub mod rlb;
+
+#[cfg(target_os = "linux")]
+pub mod auxv_defs;
+
+#[cfg(target_os = "redox")]
+pub use redox_rt::auxv_defs;
+
+use self::types::*;
+pub mod types;
+
+/// The global `errno` variable used internally in relibc.
+#[thread_local]
+pub static ERRNO: Cell<c_int> = Cell::new(0);
+
+/// The `argv` argument available to a program's `main` function.
+#[allow(non_upper_case_globals)]
+pub static mut argv: *mut *mut c_char = ptr::null_mut();
+#[allow(non_upper_case_globals)]
+pub static inner_argv: RawCell<Vec<*mut c_char>> = RawCell::new(Vec::new());
+#[allow(non_upper_case_globals)]
+pub static mut program_invocation_name: *mut c_char = ptr::null_mut();
+#[allow(non_upper_case_globals)]
+pub static mut program_invocation_short_name: *mut c_char = ptr::null_mut();
+
+#[allow(non_upper_case_globals)]
+#[unsafe(no_mangle)]
+pub static mut environ: *mut *mut c_char = ptr::null_mut();
+
+pub static OUR_ENVIRON: RawCell<Vec<*mut c_char>> = RawCell::new(Vec::new());
+
+pub fn environ_iter() -> impl Iterator<Item = *mut c_char> + 'static {
+    unsafe {
+        let mut ptrs = environ;
+
+        core::iter::from_fn(move || {
+            if ptrs.is_null() {
+                None
+            } else {
+                let ptr = ptrs.read();
+                if ptr.is_null() {
+                    None
+                } else {
+                    ptrs = ptrs.add(1);
+                    Some(ptr)
+                }
+            }
+        })
+    }
+}
+
+pub trait WriteByte: fmt::Write {
+    fn write_u8(&mut self, byte: u8) -> fmt::Result;
+}
+
+impl<W: WriteByte> WriteByte for &mut W {
+    fn write_u8(&mut self, byte: u8) -> fmt::Result {
+        (**self).write_u8(byte)
+    }
+}
+
+/// An implementation of [`core::fmt::Write`] for a file descriptor.
+pub struct FileWriter(pub c_int, Option<Errno>);
+
+impl FileWriter {
+    pub fn new(fd: c_int) -> Self {
+        Self(fd, None)
+    }
+
+    pub fn write(&mut self, buf: &[u8]) -> fmt::Result {
+        let _ = Sys::write(self.0, buf).map_err(|err| {
+            self.1 = Some(err);
+            fmt::Error
+        })?;
+        Ok(())
+    }
+}
+
+impl fmt::Write for FileWriter {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        if let Ok(()) = self.write(s.as_bytes()) {}; // TODO handle error
+        Ok(())
+    }
+}
+
+impl WriteByte for FileWriter {
+    fn write_u8(&mut self, byte: u8) -> fmt::Result {
+        if let Ok(()) = self.write(&[byte]) {}; // TODO handle error
+        Ok(())
+    }
+}
+
+/// An implementation of [`Read`] for a file descriptor.
+pub struct FileReader(pub c_int);
+
+impl FileReader {
+    // TODO: This is a bad interface. Rustify
+    pub fn read(&mut self, buf: &mut [u8]) -> isize {
+        Sys::read(self.0, buf)
+            .map(|u| u as isize)
+            .or_minus_one_errno()
+    }
+}
+
+impl Read for FileReader {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let i = Sys::read(self.0, buf)
+            .map(|u| u as isize)
+            .or_minus_one_errno(); // TODO
+        if i >= 0 {
+            Ok(i as usize)
+        } else {
+            Err(io::Error::from_raw_os_error(-i as i32))
+        }
+    }
+}
+
+/// An implementation of [`Write`]/[`core::fmt::Write`] for a byte array.
+pub struct StringWriter(pub *mut u8, pub usize);
+impl Write for StringWriter {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        if self.1 > 1 {
+            let copy_size = buf.len().min(self.1 - 1);
+            unsafe {
+                ptr::copy_nonoverlapping(buf.as_ptr(), self.0, copy_size);
+                self.1 -= copy_size;
+
+                self.0 = self.0.add(copy_size);
+                *self.0 = 0;
+            }
+        }
+
+        // Pretend the entire slice was written. This is because many functions
+        // (like snprintf) expects a return value that reflects how many bytes
+        // *would have* been written. So keeping track of this information is
+        // good, and then if we want the *actual* written size we can just go
+        // `cmp::min(written, maxlen)`.
+        Ok(buf.len())
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+impl fmt::Write for StringWriter {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        // can't fail
+        self.write(s.as_bytes()).unwrap();
+        Ok(())
+    }
+}
+impl WriteByte for StringWriter {
+    fn write_u8(&mut self, byte: u8) -> fmt::Result {
+        // can't fail
+        self.write(&[byte]).unwrap();
+        Ok(())
+    }
+}
+
+/// An implementation of [`Write`]/[`core::fmt::Write`] for a byte array,
+/// without buffer overflow protection.
+pub struct UnsafeStringWriter(pub *mut u8);
+impl Write for UnsafeStringWriter {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        unsafe {
+            ptr::copy_nonoverlapping(buf.as_ptr(), self.0, buf.len());
+            self.0 = self.0.add(buf.len());
+            *self.0 = b'\0';
+        }
+        Ok(buf.len())
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+impl fmt::Write for UnsafeStringWriter {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        // can't fail
+        self.write(s.as_bytes()).unwrap();
+        Ok(())
+    }
+}
+impl WriteByte for UnsafeStringWriter {
+    fn write_u8(&mut self, byte: u8) -> fmt::Result {
+        // can't fail
+        self.write(&[byte]).unwrap();
+        Ok(())
+    }
+}
+
+/// An implementation of [`Read`] for a byte array, without buffer over-read
+/// protection.
+pub struct UnsafeStringReader(pub *const u8);
+impl Read for UnsafeStringReader {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        unsafe {
+            for (i, inner) in buf.iter_mut().enumerate() {
+                if *self.0 == 0 {
+                    return Ok(i);
+                }
+
+                *inner = *self.0;
+                self.0 = self.0.offset(1);
+            }
+            Ok(buf.len())
+        }
+    }
+}
+
+/// A wrapper that keeps track of the number of bytes written with the
+/// underlying writer `T`.
+pub struct CountingWriter<T> {
+    pub inner: T,
+    pub written: usize,
+}
+impl<T> CountingWriter<T> {
+    pub fn new(writer: T) -> Self {
+        Self {
+            inner: writer,
+            written: 0,
+        }
+    }
+}
+impl<T: fmt::Write> fmt::Write for CountingWriter<T> {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        self.written += s.len();
+        self.inner.write_str(s)
+    }
+}
+impl<T: WriteByte> WriteByte for CountingWriter<T> {
+    fn write_u8(&mut self, byte: u8) -> fmt::Result {
+        self.written += 1;
+        self.inner.write_u8(byte)
+    }
+}
+impl<T: Write> Write for CountingWriter<T> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        let res = self.inner.write(buf);
+        if let Ok(written) = res {
+            self.written += written;
+        }
+        res
+    }
+    fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
+        match self.inner.write_all(buf) {
+            Ok(()) => (),
+            Err(ref err) if err.kind() == io::ErrorKind::WriteZero => (),
+            Err(err) => return Err(err),
+        }
+        self.written += buf.len();
+        Ok(())
+    }
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner.flush()
+    }
+}
+
+// TODO: Set a global variable once get_auxvs is called, and then implement getauxval based on
+// get_auxv.
+
+#[cold]
+pub unsafe fn auxv_iter<'a>(ptr: *const usize) -> impl Iterator<Item = [usize; 2]> + 'a {
+    struct St(*const usize);
+    impl Iterator for St {
+        type Item = [usize; 2];
+
+        fn next(&mut self) -> Option<Self::Item> {
+            unsafe {
+                if *self.0 == self::auxv_defs::AT_NULL {
+                    return None;
+                }
+                let kind = *self.0;
+                let value = *self.0.add(1);
+                self.0 = self.0.add(2);
+
+                Some([kind, value])
+            }
+        }
+    }
+    St(ptr)
+}
+
+#[cold]
+pub unsafe fn get_auxvs(ptr: *const usize) -> Box<[[usize; 2]]> {
+    //traverse the stack and collect argument environment variables
+    let mut auxvs = unsafe { auxv_iter(ptr) }.collect::<Vec<_>>();
+
+    auxvs.sort_unstable_by_key(|[kind, _]| *kind);
+    auxvs.into_boxed_slice()
+}
+// TODO: Find an auxv replacement for Redox's execv protocol
+#[cold]
+pub unsafe fn get_auxv_raw(ptr: *const usize, requested_kind: usize) -> Option<usize> {
+    unsafe { auxv_iter(ptr) }
+        .find_map(|[kind, value]| Some(value).filter(|_| kind == requested_kind))
+}
+pub fn get_auxv(auxvs: &[[usize; 2]], key: usize) -> Option<usize> {
+    auxvs
+        .binary_search_by_key(&key, |[entry_key, _]| *entry_key)
+        .ok()
+        .map(|idx| auxvs[idx][1])
+}
+
+#[cold]
+#[cfg(target_os = "redox")]
+// SAFETY: Must only be called when only one thread exists.
+pub unsafe fn init(auxvs: Box<[[usize; 2]]>) {
+    use self::auxv_defs::*;
+    use redox_rt::proc::FdGuard;
+
+    let Some(proc_fd) = get_auxv(&auxvs, AT_REDOX_PROC_FD) else {
+        panic!("Missing proc and thread fd!");
+    };
+    let Some(ns_fd) = get_auxv(&auxvs, AT_REDOX_NS_FD) else {
+        panic!("Missing namespace fd!");
+    };
+    unsafe {
+        redox_rt::initialize(
+            FdGuard::new(proc_fd).to_upper().unwrap(),
+            if ns_fd == usize::MAX {
+                None
+            } else {
+                Some(FdGuard::new(ns_fd).to_upper().unwrap())
+            },
+        );
+        init_inner(auxvs)
+    }
+}
+#[cold]
+#[cfg(target_os = "redox")]
+pub unsafe fn init_inner(auxvs: Box<[[usize; 2]]>) {
+    use self::auxv_defs::*;
+    use crate::header::sys_stat::S_ISVTX;
+    use redox_rt::proc::FdGuard;
+    use syscall::MODE_PERM;
+
+    // TODO: Is it safe to assume setup_sighandler has been called at this point?
+    redox_rt::sys::this_proc_call(
+        &mut [],
+        syscall::CallFlags::empty(),
+        &[redox_protocols::protocol::ProcCall::SyncSigPctl as u64],
+    )
+    .expect("failed to sync signal pctl");
+
+    if let (Some(cwd_ptr), Some(cwd_len), Some(cwd_fd)) = (
+        get_auxv(&auxvs, AT_REDOX_INITIAL_CWD_PTR),
+        get_auxv(&auxvs, AT_REDOX_INITIAL_CWD_LEN),
+        get_auxv(&auxvs, AT_REDOX_CWD_FD),
+    ) {
+        let cwd_bytes: &'static [u8] =
+            unsafe { core::slice::from_raw_parts(cwd_ptr as *const u8, cwd_len) };
+        if let (Ok(cwd_path), Some(cwd_fd)) = (
+            core::str::from_utf8(cwd_bytes),
+            (cwd_fd != usize::MAX).then(|| {
+                FdGuard::new(cwd_fd)
+                    .to_upper()
+                    .expect("failed to move cwd fd to upper table")
+            }),
+        ) {
+            self::sys::path::set_cwd_manual(cwd_path.into(), cwd_fd);
+        }
+    }
+
+    let mut inherited_sigignmask = 0_u64;
+    if let Some(mask) = get_auxv(&auxvs, AT_REDOX_INHERITED_SIGIGNMASK) {
+        inherited_sigignmask |= mask as u64;
+    }
+    #[cfg(target_pointer_width = "32")]
+    if let Some(mask) = get_auxv(&auxvs, AT_REDOX_INHERITED_SIGIGNMASK_HI) {
+        inherited_sigignmask |= (mask as u64) << 32;
+    }
+    redox_rt::signal::apply_inherited_sigignmask(inherited_sigignmask);
+
+    let mut inherited_sigprocmask = 0_u64;
+
+    if let Some(mask) = get_auxv(&auxvs, AT_REDOX_INHERITED_SIGPROCMASK) {
+        inherited_sigprocmask |= mask as u64;
+    }
+    #[cfg(target_pointer_width = "32")]
+    if let Some(mask) = get_auxv(&auxvs, AT_REDOX_INHERITED_SIGPROCMASK_HI) {
+        inherited_sigprocmask |= (mask as u64) << 32;
+    }
+    redox_rt::signal::set_sigmask(Some(inherited_sigprocmask), None).unwrap();
+
+    if let Some(umask) = get_auxv(&auxvs, AT_REDOX_UMASK) {
+        let _ =
+            redox_rt::sys::swap_umask((umask as u32) & u32::from(MODE_PERM) & !(S_ISVTX as u32));
+    }
+}
+#[cfg(not(target_os = "redox"))]
+pub unsafe fn init(auxvs: Box<[[usize; 2]]>) {}
diff --git a/recipes/core/relibc/src/platform/pal/epoll.rs b/recipes/core/relibc/src/platform/pal/epoll.rs
new file mode 100644
index 0000000000..c7d00f21b8
--- /dev/null
+++ b/recipes/core/relibc/src/platform/pal/epoll.rs
@@ -0,0 +1,23 @@
+use crate::{
+    error::Result,
+    header::{signal::sigset_t, sys_epoll::epoll_event},
+    platform::{Pal, types::c_int},
+};
+
+/// Platform abstraction for `epoll` functionality.
+pub trait PalEpoll: Pal {
+    /// Platform implementation of [`epoll_create1()`](crate::header::sys_epoll::epoll_create1) from [`sys/epoll.h`](crate::header::sys_epoll).
+    fn epoll_create1(flags: c_int) -> Result<c_int>;
+
+    /// Platform implementation of [`epoll_ctl()`](crate::header::sys_epoll::epoll_ctl) from [`sys/epoll.h`](crate::header::sys_epoll).
+    unsafe fn epoll_ctl(epfd: c_int, op: c_int, fd: c_int, event: *mut epoll_event) -> Result<()>;
+
+    /// Platform implementation of [`epoll_pwait()`](crate::header::sys_epoll::epoll_pwait) from [`sys/epoll.h`](crate::header::sys_epoll).
+    unsafe fn epoll_pwait(
+        epfd: c_int,
+        events: *mut epoll_event,
+        maxevents: c_int,
+        timeout: c_int,
+        sigmask: *const sigset_t,
+    ) -> Result<usize>;
+}
diff --git a/recipes/core/relibc/src/platform/pal/mod.rs b/recipes/core/relibc/src/platform/pal/mod.rs
new file mode 100644
index 0000000000..ad31680e0b
--- /dev/null
+++ b/recipes/core/relibc/src/platform/pal/mod.rs
@@ -0,0 +1,459 @@
+use core::num::NonZeroU64;
+
+use super::types::*;
+use crate::{
+    c_str::CStr,
+    error::{Errno, Result},
+    header::{
+        bits_timespec::timespec,
+        fcntl::{AT_EMPTY_PATH, AT_FDCWD},
+        signal::sigevent,
+        sys_resource::{rlimit, rusage},
+        sys_select::timeval,
+        sys_stat::stat,
+        sys_statvfs::statvfs,
+        sys_time::timezone,
+        sys_utsname::utsname,
+        time::itimerspec,
+    },
+    ld_so::tcb::OsSpecific,
+    out::Out,
+    pthread,
+};
+
+pub use self::epoll::PalEpoll;
+mod epoll;
+
+pub use self::ptrace::PalPtrace;
+mod ptrace;
+
+pub use self::signal::PalSignal;
+mod signal;
+
+pub use self::socket::PalSocket;
+mod socket;
+
+/// Platform abstraction layer, a platform-agnostic abstraction over syscalls.
+pub trait Pal {
+    /// Platform implementation of [`access()`](crate::header::unistd::access) from [`unistd.h`](crate::header::unistd).
+    fn access(path: CStr, mode: c_int) -> Result<()> {
+        Self::faccessat(AT_FDCWD, path, mode, 0)
+    }
+
+    /// Platform implementation of [`faccessat()`](crate::header::unistd::faccessat) from [`unistd.h`](crate::header::unistd).
+    fn faccessat(fd: c_int, path: CStr, amode: c_int, flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`brk()`](crate::header::unistd::brk) from [`unistd.h`](crate::header::unistd).
+    unsafe fn brk(addr: *mut c_void) -> Result<*mut c_void>;
+
+    /// Platform implementation of [`chdir()`](crate::header::unistd::chdir) from [`unistd.h`](crate::header::unistd).
+    fn chdir(path: CStr) -> Result<()>;
+
+    /// Platform implementation of [`chmod()`](crate::header::sys_stat::chmod) from [`sys/stat.h`](crate::header::sys_stat).
+    fn chmod(path: CStr, mode: mode_t) -> Result<()> {
+        Self::fchmodat(AT_FDCWD, Some(path), mode, 0)
+    }
+
+    /// Platform implementation of [`chown()`](crate::header::unistd::chown) from [`unistd.h`](crate::header::unistd).
+    fn chown(path: CStr, owner: uid_t, group: gid_t) -> Result<()> {
+        Self::fchownat(AT_FDCWD, path, owner, group, 0)
+    }
+
+    /// Platform implementation of [`clock_getres()`](crate::header::time::clock_getres) from [`time.h`](crate::header::time).
+    fn clock_getres(clk_id: clockid_t, tp: Option<Out<timespec>>) -> Result<()>;
+
+    // TODO: maybe remove tp and change signature to -> Result<timespec>?
+    /// Platform implementation of [`clock_gettime()`](crate::header::time::clock_gettime) from [`time.h`](crate::header::time).
+    fn clock_gettime(clk_id: clockid_t, tp: Out<timespec>) -> Result<()>;
+
+    /// Platform implementation of [`clock_settime()`](crate::header::time::clock_settime) from [`time.h`](crate::header::time).
+    unsafe fn clock_settime(clk_id: clockid_t, tp: *const timespec) -> Result<()>;
+
+    /// Platform implementation of [`close()`](crate::header::unistd::close) from [`unistd.h`](crate::header::unistd).
+    fn close(fildes: c_int) -> Result<()>;
+
+    /// Platform implementation of [`dup()`](crate::header::unistd::dup) from [`unistd.h`](crate::header::unistd).
+    fn dup(fildes: c_int) -> Result<c_int>;
+
+    /// Platform implementation of [`dup2()`](crate::header::unistd::dup2) from [`unistd.h`](crate::header::unistd).
+    fn dup2(fildes: c_int, fildes2: c_int) -> Result<c_int>;
+
+    /// Platform implementation of [`execve()`](crate::header::unistd::execve) from [`unistd.h`](crate::header::unistd).
+    unsafe fn execve(path: CStr, argv: *const *mut c_char, envp: *const *mut c_char) -> Result<()>;
+
+    /// Platform implementation of [`fexecve()`](crate::header::unistd::fexecve) from [`unistd.h`](crate::header::unistd).
+    unsafe fn fexecve(
+        fildes: c_int,
+        argv: *const *mut c_char,
+        envp: *const *mut c_char,
+    ) -> Result<()>;
+
+    /// Platform implementation of [`_Exit()`](crate::header::stdlib::_Exit) from [`stdlib.h`](crate::header::stdlib) (or the equivalent [`_exit()`](crate::header::unistd::_exit) from [`unistd.h`](crate::header::unistd)).
+    fn exit(status: c_int) -> !;
+
+    unsafe fn exit_thread(stack_base: *mut (), stack_size: usize) -> !;
+
+    /// Platform implementation of [`fchdir()`](crate::header::unistd::fchdir) from [`unistd.h`](crate::header::unistd).
+    fn fchdir(fildes: c_int) -> Result<()>;
+
+    /// Platform implementation of [`fchmod()`](crate::header::sys_stat::fchmod) from [`sys/stat.h`](crate::header::sys_stat).
+    fn fchmod(fildes: c_int, mode: mode_t) -> Result<()> {
+        Self::fchmodat(fildes, Some(c"".into()), mode, AT_EMPTY_PATH)
+    }
+
+    /// Platform implementation of [`fchmodat()`](crate::header::sys_stat::fchmodat) from [`sys/stat.h`](crate::header::sys_stat).
+    fn fchmodat(dirfd: c_int, path: Option<CStr>, mode: mode_t, flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`fchown()`](crate::header::unistd::fchown) from [`unistd.h`](crate::header::unistd).
+    fn fchown(fildes: c_int, owner: uid_t, group: gid_t) -> Result<()> {
+        Self::fchownat(fildes, c"".into(), owner, group, AT_EMPTY_PATH)
+    }
+
+    /// Platform implementation of [`fchownat()`](crate::header::unistd::fchownat) from [`unistd.h`](crate::header::unistd).
+    fn fchownat(fildes: c_int, path: CStr, owner: uid_t, group: gid_t, flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`fdatasync()`](crate::header::unistd::fdatasync) from [`unistd.h`](crate::header::unistd).
+    fn fdatasync(fildes: c_int) -> Result<()>;
+
+    /// Platform implementation of [`flock()`](crate::header::sys_file::flock) from [`sys/file.h`](crate::header::sys_file).
+    fn flock(fd: c_int, operation: c_int) -> Result<()>;
+
+    /// Platform implementation of [`fstat()`](crate::header::sys_stat::fstat) from [`sys/stat.h`](crate::header::sys_stat).
+    fn fstat(fildes: c_int, buf: Out<stat>) -> Result<()> {
+        Self::fstatat(fildes, Some(c"".into()), buf, 0)
+    }
+
+    /// Platform implementation of [`fstatat()`](crate::header::sys_stat::fstatat) from [`sys/stat.h`](crate::header::sys_stat).
+    fn fstatat(fildes: c_int, path: Option<CStr>, buf: Out<stat>, flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`fstatvfs()`](crate::header::sys_statvfs::fstatvfs) from [`sys/statvfs.h`](crate::header::sys_statvfs).
+    fn fstatvfs(fildes: c_int, buf: Out<statvfs>) -> Result<()>;
+
+    /// Platform implementation of [`fcntl()`](crate::header::fcntl::fcntl) from [`fcntl.h`](crate::header::fcntl).
+    fn fcntl(fildes: c_int, cmd: c_int, arg: c_ulonglong) -> Result<c_int>;
+
+    /// Platform implementation of [`_Fork()`](crate::header::unistd::_Fork) from [`unistd.h`](crate::header::unistd).
+    unsafe fn fork() -> Result<pid_t>;
+
+    fn fpath(fildes: c_int, out: &mut [u8]) -> Result<usize>;
+
+    /// Platform implementation of [`fsync()`](crate::header::unistd::fsync) from [`unistd.h`](crate::header::unistd).
+    fn fsync(fildes: c_int) -> Result<()>;
+
+    /// Platform implementation of [`ftruncate()`](crate::header::unistd::ftruncate) from [`unistd.h`](crate::header::unistd).
+    fn ftruncate(fildes: c_int, length: off_t) -> Result<()>;
+
+    unsafe fn futex_wait(addr: *mut u32, val: u32, deadline: Option<&timespec>) -> Result<()>;
+
+    unsafe fn futex_wake(addr: *mut u32, num: u32) -> Result<u32>;
+
+    /// Platform implementation of [`futimens()`](crate::header::sys_stat::futimens) from [`sys/stat.h`](crate::header::sys_stat).
+    unsafe fn futimens(fd: c_int, times: *const timespec) -> Result<()>;
+
+    /// Platform implementation of `utimens()` (TODO) from [`sys/stat.h`](crate::header::sys_stat).
+    unsafe fn utimens(path: CStr, times: *const timespec) -> Result<()>;
+
+    /// Platform implementation of [`getcwd()`](crate::header::unistd::getcwd) from [`unistd.h`](crate::header::unistd).
+    fn getcwd(buf: Out<[u8]>) -> Result<()>;
+
+    fn getdents(fd: c_int, buf: &mut [u8], opaque_offset: u64) -> Result<usize>;
+
+    fn dir_seek(fd: c_int, opaque_offset: u64) -> Result<()>;
+
+    // SAFETY: This_dent must satisfy platform-specific size and alignment constraints. On Linux,
+    // this means the buffer came from a valid getdents64 invocation, whereas on Redox, every
+    // possible this_dent slice is safe (and will be validated).
+    unsafe fn dent_reclen_offset(this_dent: &[u8], offset: usize) -> Option<(u16, u64)>;
+
+    // Always successful
+    /// Platform implementation of [`getegid()`](crate::header::unistd::getegid) from [`unistd.h`](crate::header::unistd).
+    fn getegid() -> gid_t;
+
+    // Always successful
+    /// Platform implementation of [`geteuid()`](crate::header::unistd::geteuid) from [`unistd.h`](crate::header::unistd).
+    fn geteuid() -> uid_t;
+
+    // Always successful
+    /// Platform implementation of [`getgid()`](crate::header::unistd::getgid) from [`unistd.h`](crate::header::unistd).
+    fn getgid() -> gid_t;
+
+    /// Platform implementation of [`getgroups()`](crate::header::unistd::getgroups) from [`unistd.h`](crate::header::unistd).
+    fn getgroups(list: Out<[gid_t]>) -> Result<c_int>;
+
+    /* Note that this is distinct from the legacy POSIX function
+     * getpagesize(), which returns a c_int. On some Linux platforms,
+     * page size may be determined through a syscall ("getpagesize"). */
+    fn getpagesize() -> usize;
+
+    /// Platform implementation of [`getpgid()`](crate::header::unistd::getpgid) from [`unistd.h`](crate::header::unistd).
+    fn getpgid(pid: pid_t) -> Result<pid_t>;
+
+    // Always successful
+    /// Platform implementation of [`getpid()`](crate::header::unistd::getpid) from [`unistd.h`](crate::header::unistd).
+    fn getpid() -> pid_t;
+
+    // Always successful
+    /// Platform implementation of [`getppid()`](crate::header::unistd::getppid) from [`unistd.h`](crate::header::unistd).
+    fn getppid() -> pid_t;
+
+    /// Platform implementation of [`getpriority()`](crate::header::sys_resource::getpriority) from [`sys/resource.h`](crate::header::sys_resource).
+    fn getpriority(which: c_int, who: id_t) -> Result<c_int>;
+
+    /// Platform implementation of [`getrandom()`](crate::header::sys_random::getrandom) from [`sys/random.h`](crate::header::sys_random).
+    fn getrandom(buf: &mut [u8], flags: c_uint) -> Result<usize>;
+
+    /// Platform implementation of [`getresgid()`](crate::header::unistd::getresgid) from [`unistd.h`](crate::header::unistd).
+    fn getresgid(
+        rgid: Option<Out<gid_t>>,
+        egid: Option<Out<gid_t>>,
+        sgid: Option<Out<gid_t>>,
+    ) -> Result<()>;
+
+    /// Platform implementation of [`getresuid()`](crate::header::unistd::getresuid) from [`unistd.h`](crate::header::unistd).
+    fn getresuid(
+        ruid: Option<Out<uid_t>>,
+        euid: Option<Out<uid_t>>,
+        suid: Option<Out<uid_t>>,
+    ) -> Result<()>;
+
+    /// Platform implementation of [`getrlimit()`](crate::header::sys_resource::getrlimit) from [`sys/resource.h`](crate::header::sys_resource).
+    fn getrlimit(resource: c_int, rlim: Out<rlimit>) -> Result<()>;
+
+    /// Platform implementation of [`setrlimit()`](crate::header::sys_resource::setrlimit) from [`sys/resource.h`](crate::header::sys_resource).
+    unsafe fn setrlimit(resource: c_int, rlim: *const rlimit) -> Result<()>;
+
+    /// Platform implementation of [`getrusage()`](crate::header::sys_resource::getrusage) from [`sys/resource.h`](crate::header::sys_resource).
+    fn getrusage(who: c_int, r_usage: Out<rusage>) -> Result<()>;
+
+    /// Platform implementation of [`getsid()`](crate::header::unistd::getsid) from [`unistd.h`](crate::header::unistd).
+    fn getsid(pid: pid_t) -> Result<pid_t>;
+
+    // Always successful
+    /// Platform implementation of `gettid()` (TODO) from [`unistd.h`](crate::header::unistd).
+    fn gettid() -> pid_t;
+
+    /// Platform implementation of [`gettimeofday()`](crate::header::sys_time::gettimeofday) from [`sys/time.h`](crate::header::sys_time).
+    fn gettimeofday(tp: Out<timeval>, tzp: Option<Out<timezone>>) -> Result<()>;
+
+    /// Platform implementation of [`getuid()`](crate::header::unistd::getuid) from [`unistd.h`](crate::header::unistd).
+    fn getuid() -> uid_t;
+
+    /// Platform implementation of [`lchown()`](crate::header::unistd::lchown) from [`unistd.h`](crate::header::unistd).
+    fn lchown(path: CStr, owner: uid_t, group: gid_t) -> Result<()>;
+
+    /// Platform implementation of [`link()`](crate::header::unistd::link) from [`unistd.h`](crate::header::unistd).
+    fn link(path1: CStr, path2: CStr) -> Result<()> {
+        Self::linkat(AT_FDCWD, path1, AT_FDCWD, path2, 0)
+    }
+
+    /// Platform implementation of [`linkat()`](crate::header::unistd::linkat) from [`unistd.h`](crate::header::unistd).
+    fn linkat(fd1: c_int, oldpath: CStr, fd2: c_int, newpath: CStr, flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`lseek()`](crate::header::unistd::lseek) from [`unistd.h`](crate::header::unistd).
+    fn lseek(fildes: c_int, offset: off_t, whence: c_int) -> Result<off_t>;
+
+    /// Platform implementation of [`mkdirat()`](crate::header::sys_stat::mkdirat) from [`sys/stat.h`](crate::header::sys_stat).
+    fn mkdirat(fildes: c_int, path: CStr, mode: mode_t) -> Result<()>;
+
+    /// Platform implementation of [`mkdir()`](crate::header::sys_stat::mkdir) from [`sys/stat.h`](crate::header::sys_stat).
+    fn mkdir(path: CStr, mode: mode_t) -> Result<()> {
+        Self::mkdirat(AT_FDCWD, path, mode)
+    }
+
+    /// Platform implementation of [`mkfifoat()`](crate::header::sys_stat::mkfifoat) from [`sys/stat.h`](crate::header::sys_stat).
+    fn mkfifoat(dir_fd: c_int, path: CStr, mode: mode_t) -> Result<()>;
+
+    /// Platform implementation of [`mkfifo()`](crate::header::sys_stat::mkfifo) from [`sys/stat.h`](crate::header::sys_stat).
+    fn mkfifo(path: CStr, mode: mode_t) -> Result<()> {
+        Self::mkfifoat(AT_FDCWD, path, mode)
+    }
+
+    /// Platform implementation of [`mknodat()`](crate::header::sys_stat::mknodat) from [`sys/stat.h`](crate::header::sys_stat).
+    fn mknodat(fildes: c_int, path: CStr, mode: mode_t, dev: dev_t) -> Result<()>;
+
+    /// Platform implementation of [`mknod()`](crate::header::sys_stat::mknod) from [`sys/stat.h`](crate::header::sys_stat).
+    fn mknod(path: CStr, mode: mode_t, dev: dev_t) -> Result<()> {
+        Self::mknodat(AT_FDCWD, path, mode, dev)
+    }
+
+    /// Platform implementation of [`mlock()`](crate::header::sys_mman::mlock) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn mlock(addr: *const c_void, len: usize) -> Result<()>;
+
+    /// Platform implementation of [`mlockall()`](crate::header::sys_mman::mlockall) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn mlockall(flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`mmap()`](crate::header::sys_mman::mmap) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn mmap(
+        addr: *mut c_void,
+        len: usize,
+        prot: c_int,
+        flags: c_int,
+        fildes: c_int,
+        off: off_t,
+    ) -> Result<*mut c_void>;
+
+    /// Platform implementation of [`mremap()`](crate::header::sys_mman::mremap) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn mremap(
+        addr: *mut c_void,
+        len: usize,
+        new_len: usize,
+        flags: c_int,
+        args: *mut c_void,
+    ) -> Result<*mut c_void>;
+
+    /// Platform implementation of [`mprotect()`](crate::header::sys_mman::mprotect) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn mprotect(addr: *mut c_void, len: usize, prot: c_int) -> Result<()>;
+
+    /// Platform implementation of [`msync()`](crate::header::sys_mman::msync) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn msync(addr: *mut c_void, len: usize, flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`munlock()`](crate::header::sys_mman::munlock) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn munlock(addr: *const c_void, len: usize) -> Result<()>;
+
+    /// Platform implementation of [`madvise()`](crate::header::sys_mman::madvise) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn madvise(addr: *mut c_void, len: usize, flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`munlockall()`](crate::header::sys_mman::munlockall) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn munlockall() -> Result<()>;
+
+    /// Platform implementation of [`munmap()`](crate::header::sys_mman::munmap) from [`sys/mman.h`](crate::header::sys_mman).
+    unsafe fn munmap(addr: *mut c_void, len: usize) -> Result<()>;
+
+    /// Platform implementation of [`nanosleep()`](crate::header::time::nanosleep) from [`time.h`](crate::header::time).
+    unsafe fn nanosleep(rqtp: *const timespec, rmtp: *mut timespec) -> Result<()>;
+
+    /// Platform implementation of [`open()`](crate::header::fcntl::open) from [`fcntl.h`](crate::header::fcntl).
+    fn open(path: CStr, oflag: c_int, mode: mode_t) -> Result<c_int>;
+
+    /// Platform implementation of `openat()` (TODO) from [`fcntl.h`](crate::header::fcntl).
+    fn openat(dirfd: c_int, path: CStr, oflag: c_int, mode: mode_t) -> Result<c_int>;
+
+    /// Platform implementation of [`pipe2()`](crate::header::unistd::pipe2) from [`unistd.h`](crate::header::unistd).
+    fn pipe2(fildes: Out<[c_int; 2]>, flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`posix_fallocate()`](crate::header::fcntl::posix_fallocate) from [`fcntl.h`](crate::header::fcntl).
+    fn posix_fallocate(fd: c_int, offset: u64, length: NonZeroU64) -> Result<()>;
+
+    /// Platform implementation of [`posix_getdents()`](crate::header::dirent::posix_getdents) from [`dirent.h`](crate::header::dirent).
+    fn posix_getdents(fildes: c_int, buf: &mut [u8]) -> Result<usize>;
+
+    unsafe fn rlct_clone(
+        stack: *mut usize,
+        os_specific: &mut OsSpecific,
+    ) -> Result<pthread::OsTid, Errno>;
+
+    unsafe fn rlct_kill(os_tid: pthread::OsTid, signal: usize) -> Result<()>;
+
+    fn current_os_tid() -> pthread::OsTid;
+
+    /// Platform implementation of [`read()`](crate::header::unistd::read) from [`unistd.h`](crate::header::unistd).
+    fn read(fildes: c_int, buf: &mut [u8]) -> Result<usize>;
+
+    /// Platform implementation of [`pread()`](crate::header::unistd::pread) from [`unistd.h`](crate::header::unistd).
+    fn pread(fildes: c_int, buf: &mut [u8], offset: off_t) -> Result<usize>;
+
+    /// Platform implementation of [`readlink()`](crate::header::unistd::readlink) from [`unistd.h`](crate::header::unistd).
+    fn readlink(pathname: CStr, out: &mut [u8]) -> Result<usize> {
+        Self::readlinkat(AT_FDCWD, pathname, out)
+    }
+
+    /// Platform implementation of [`readlinkat()`](crate::header::unistd::readlinkat) from [`unistd.h`](crate::header::unistd).
+    fn readlinkat(dirfd: c_int, pathname: CStr, out: &mut [u8]) -> Result<usize>;
+
+    /// Platform implementation of [`rename()`](crate::header::stdio::rename) from [`stdio.h`](crate::header::stdio).
+    fn rename(old: CStr, new: CStr) -> Result<()> {
+        Self::renameat(AT_FDCWD, old, AT_FDCWD, new)
+    }
+
+    /// Platform implementation of [`renameat()`](crate::header::stdio::renameat) from [`stdio.h`](crate::header::stdio).
+    fn renameat(old_dir: c_int, old_path: CStr, new_dir: c_int, new_path: CStr) -> Result<()> {
+        Self::renameat2(old_dir, old_path, new_dir, new_path, 0)
+    }
+
+    /// Platform implementation of [`renameat2()`](crate::header::stdio::renameat2) from [`stdio.h`](crate::header::stdio).
+    fn renameat2(
+        old_dir: c_int,
+        old_path: CStr,
+        new_dir: c_int,
+        new_path: CStr,
+        flags: c_uint,
+    ) -> Result<()>;
+
+    /// Platform implementation of [`rmdir()`](crate::header::unistd::rmdir) from [`unistd.h`](crate::header::unistd).
+    fn rmdir(path: CStr) -> Result<()>;
+
+    /// Platform implementation of [`sched_yield()`](crate::header::sched::sched_yield) from [`sched.h`](crate::header::sched).
+    fn sched_yield() -> Result<()>;
+
+    /// Platform implementation of [`setgroups()`](crate::header::grp::setgroups) from [`grp.h`](crate::header::grp).
+    unsafe fn setgroups(size: size_t, list: *const gid_t) -> Result<()>;
+
+    /// Platform implementation of [`setpgid()`](crate::header::unistd::setpgid) from [`unistd.h`](crate::header::unistd).
+    fn setpgid(pid: pid_t, pgid: pid_t) -> Result<()>;
+
+    /// Platform implementation of [`setpriority()`](crate::header::sys_resource::setpriority) from [`sys/resource.h`](crate::header::sys_resource).
+    fn setpriority(which: c_int, who: id_t, prio: c_int) -> Result<()>;
+
+    /// Platform implementation of [`setresgid()`](crate::header::unistd::setresgid) from [`unistd.h`](crate::header::unistd).
+    fn setresgid(rgid: gid_t, egid: gid_t, sgid: gid_t) -> Result<()>;
+
+    /// Platform implementation of [`setresuid()`](crate::header::unistd::setresuid) from [`unistd.h`](crate::header::unistd).
+    fn setresuid(ruid: uid_t, euid: uid_t, suid: uid_t) -> Result<()>;
+
+    /// Platform implementation of [`setsid()`](crate::header::unistd::setsid) from [`unistd.h`](crate::header::unistd).
+    fn setsid() -> Result<c_int>;
+
+    /// Platform implementation of [`symlink()`](crate::header::unistd::symlink) from [`unistd.h`](crate::header::unistd).
+    fn symlink(path1: CStr, path2: CStr) -> Result<()> {
+        Self::symlinkat(path1, AT_FDCWD, path2)
+    }
+
+    /// Platform implementation of [`symlinkat()`](crate::header::unistd::symlinkat) from [`unistd.h`](crate::header::unistd).
+    fn symlinkat(path1: CStr, fd: c_int, path2: CStr) -> Result<()>;
+
+    /// Platform implementation of [`sync()`](crate::header::unistd::sync) from [`unistd.h`](crate::header::unistd).
+    fn sync() -> Result<()>;
+
+    /// Platform implementation of [`timer_create()`](crate::header::time::timer_create) from [`time.h`](crate::header::time).
+    fn timer_create(clock_id: clockid_t, evp: &sigevent, timerid: Out<timer_t>) -> Result<()>;
+
+    /// Platform implementation of [`timer_delete()`](crate::header::time::timer_delete) from [`time.h`](crate::header::time).
+    fn timer_delete(timerid: timer_t) -> Result<()>;
+
+    /// Platform implementation of [`timer_gettime()`](crate::header::time::timer_gettime) from [`time.h`](crate::header::time).
+    fn timer_gettime(timerid: timer_t, value: Out<itimerspec>) -> Result<()>;
+
+    /// Platform implementation of [`timer_settime()`](crate::header::time::timer_settime) from [`time.h`](crate::header::time).
+    fn timer_settime(
+        timerid: timer_t,
+        flags: c_int,
+        value: &itimerspec,
+        ovalue: Option<Out<itimerspec>>,
+    ) -> Result<()>;
+
+    // Always successful
+    /// Platform implementation of [`umask()`](crate::header::sys_stat::umask) from [`sys/stat.h`](crate::header::sys_stat).
+    fn umask(mask: mode_t) -> mode_t;
+
+    /// Platform implementation of [`uname()`](crate::header::sys_utsname::uname) from [`sys/utsname.h`](crate::header::sys_utsname).
+    fn uname(utsname: Out<utsname>) -> Result<()>;
+
+    /// Platform implementation of [`unlink()`](crate::header::unistd::unlink) from [`unistd.h`](crate::header::unistd).
+    fn unlink(path: CStr) -> Result<()> {
+        Self::unlinkat(AT_FDCWD, path, 0)
+    }
+
+    /// Platform implementation of [`unlinkat()`](crate::header::unistd::unlinkat) from [`unistd.h`](crate::header::unistd).
+    fn unlinkat(fd: c_int, path: CStr, flags: c_int) -> Result<()>;
+
+    /// Platform implementation of [`waitpid()`](crate::header::sys_wait::waitpid) from [`sys/wait.h`](crate::header::sys_wait).
+    fn waitpid(pid: pid_t, stat_loc: Option<Out<c_int>>, options: c_int) -> Result<pid_t>;
+
+    /// Platform implementation of [`write()`](crate::header::unistd::write) from [`unistd.h`](crate::header::unistd).
+    fn write(fildes: c_int, buf: &[u8]) -> Result<usize>;
+
+    /// Platform implementation of [`pwrite()`](crate::header::unistd::pwrite) from [`unistd.h`](crate::header::unistd).
+    fn pwrite(fildes: c_int, buf: &[u8], offset: off_t) -> Result<usize>;
+
+    fn verify() -> bool;
+}
diff --git a/recipes/core/relibc/src/platform/pal/ptrace.rs b/recipes/core/relibc/src/platform/pal/ptrace.rs
new file mode 100644
index 0000000000..d174435c7d
--- /dev/null
+++ b/recipes/core/relibc/src/platform/pal/ptrace.rs
@@ -0,0 +1,15 @@
+use crate::{
+    error::Result,
+    platform::{Pal, types::*},
+};
+
+/// Platform abstraction for `ptrace` functionality.
+pub trait PalPtrace: Pal {
+    /// Platform implementation of [`ptrace()`](crate::header::sys_ptrace::ptrace) from [`sys/ptrace.h`](crate::header::sys_ptrace).
+    unsafe fn ptrace(
+        request: c_int,
+        pid: pid_t,
+        addr: *mut c_void,
+        data: *mut c_void,
+    ) -> Result<c_int>;
+}
diff --git a/recipes/core/relibc/src/platform/pal/signal.rs b/recipes/core/relibc/src/platform/pal/signal.rs
new file mode 100644
index 0000000000..94b3a3ae58
--- /dev/null
+++ b/recipes/core/relibc/src/platform/pal/signal.rs
@@ -0,0 +1,61 @@
+use super::super::{
+    Pal,
+    types::{c_int, c_uint, pid_t},
+};
+#[allow(deprecated)]
+use crate::header::sys_time::itimerval;
+use crate::{
+    error::{Errno, Result},
+    header::{
+        bits_timespec::timespec,
+        signal::{sigaction, siginfo_t, sigset_t, sigval, stack_t},
+    },
+};
+
+/// Platform abstraction of signal-related functionality.
+pub trait PalSignal: Pal {
+    /// Platform implementation of [`getitimer()`](crate::header::sys_time::getitimer) from [`sys/time.h`](crate::header::sys_time).
+    #[allow(deprecated)]
+    fn getitimer(which: c_int, out: &mut itimerval) -> Result<()>;
+
+    /// Platform implementation of [`kill()`](crate::header::signal::kill) from [`signal.h`](crate::header::signal).
+    fn kill(pid: pid_t, sig: c_int) -> Result<()>;
+
+    /// Platform implementation of [`sigqueue()`](crate::header::signal::sigqueue) from [`signal.h`](crate::header::signal).
+    fn sigqueue(pid: pid_t, sig: c_int, val: sigval) -> Result<()>;
+
+    /// Platform implementation of [`killpg()`](crate::header::signal::killpg) from [`signal.h`](crate::header::signal).
+    fn killpg(pgrp: pid_t, sig: c_int) -> Result<()>;
+
+    /// Platform implementation of [`raise()`](crate::header::signal::raise) from [`signal.h`](crate::header::signal).
+    fn raise(sig: c_int) -> Result<()>;
+
+    /// Platform implementation of [`setitimer()`](crate::header::sys_time::setitimer) from [`sys/time.h`](crate::header::sys_time).
+    #[allow(deprecated)]
+    fn setitimer(which: c_int, new: &itimerval, old: Option<&mut itimerval>) -> Result<()>;
+
+    /// Platform implementation of [`alarm()`](crate::header::unistd::alarm) from [`unistd.h`](crate::header::unistd).
+    fn alarm(seconds: c_uint) -> c_uint;
+
+    /// Platform implementation of [`sigaction()`](crate::header::signal::sigaction()) from [`signal.h`](crate::header::signal).
+    fn sigaction(sig: c_int, act: Option<&sigaction>, oact: Option<&mut sigaction>) -> Result<()>;
+
+    /// Platform implementation of [`sigaltstack()`](crate::header::signal::sigaltstack()) from [`signal.h`](crate::header::signal).
+    unsafe fn sigaltstack(ss: Option<&stack_t>, old_ss: Option<&mut stack_t>) -> Result<()>;
+
+    /// Platform implementation of [`sigpending()`](crate::header::signal::sigpending) from [`signal.h`](crate::header::signal).
+    fn sigpending(set: &mut sigset_t) -> Result<()>;
+
+    /// Platform implementation of [`sigprocmask()`](crate::header::signal::sigprocmask) from [`signal.h`](crate::header::signal).
+    fn sigprocmask(how: c_int, set: Option<&sigset_t>, oset: Option<&mut sigset_t>) -> Result<()>;
+
+    /// Platform implementation of [`sigsuspend()`](crate::header::signal::sigsuspend) from [`signal.h`](crate::header::signal).
+    fn sigsuspend(mask: &sigset_t) -> Errno; // always fails
+
+    /// Platform implementation of [`sigtimedwait()`](crate::header::signal::sigtimedwait) from [`signal.h`](crate::header::signal).
+    fn sigtimedwait(
+        set: &sigset_t,
+        sig: Option<&mut siginfo_t>,
+        tp: Option<&timespec>,
+    ) -> Result<c_int>;
+}
diff --git a/recipes/core/relibc/src/platform/pal/socket.rs b/recipes/core/relibc/src/platform/pal/socket.rs
new file mode 100644
index 0000000000..9d2c29ffbb
--- /dev/null
+++ b/recipes/core/relibc/src/platform/pal/socket.rs
@@ -0,0 +1,101 @@
+use crate::{
+    error::Result,
+    header::{
+        bits_socklen_t::socklen_t,
+        sys_socket::{msghdr, sockaddr},
+    },
+    platform::{
+        Pal,
+        types::{c_int, c_void, size_t},
+    },
+};
+
+/// Platform abstraction of socket functionality.
+pub trait PalSocket: Pal {
+    /// Platform implementation of [`accept()`](crate::header::sys_socket::accept) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn accept(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<c_int>;
+
+    /// Platform implementation of [`bind()`](crate::header::sys_socket::bind) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn bind(socket: c_int, address: *const sockaddr, address_len: socklen_t) -> Result<()>;
+
+    /// Platform implementation of [`connect()`](crate::header::sys_socket::connect) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn connect(
+        socket: c_int,
+        address: *const sockaddr,
+        address_len: socklen_t,
+    ) -> Result<c_int>;
+
+    /// Platform implementation of [`getpeername()`](crate::header::sys_socket::getpeername) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn getpeername(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<()>;
+
+    /// Platform implementation of [`getsockname()`](crate::header::sys_socket::getsockname) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn getsockname(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<()>;
+
+    /// Platform implementation of [`getsockopt()`](crate::header::sys_socket::getsockopt) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn getsockopt(
+        socket: c_int,
+        level: c_int,
+        option_name: c_int,
+        option_value: *mut c_void,
+        option_len: *mut socklen_t,
+    ) -> Result<()>;
+
+    /// Platform implementation of [`listen()`](crate::header::sys_socket::listen) from [`sys/socket.h`](crate::header::sys_socket).
+    fn listen(socket: c_int, backlog: c_int) -> Result<()>;
+
+    /// Platform implementation of [`recvfrom()`](crate::header::sys_socket::recvfrom) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn recvfrom(
+        socket: c_int,
+        buf: *mut c_void,
+        len: size_t,
+        flags: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<usize>;
+
+    /// Platform implementation of [`recvmsg()`](crate::header::sys_socket::recvmsg) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn recvmsg(socket: c_int, msg: *mut msghdr, flags: c_int) -> Result<usize>;
+
+    /// Platform implementation of [`sendmsg()`](crate::header::sys_socket::sendmsg) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn sendmsg(socket: c_int, msg: *const msghdr, flags: c_int) -> Result<usize>;
+
+    /// Platform implementation of [`sendto()`](crate::header::sys_socket::sendto) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn sendto(
+        socket: c_int,
+        buf: *const c_void,
+        len: size_t,
+        flags: c_int,
+        dest_addr: *const sockaddr,
+        dest_len: socklen_t,
+    ) -> Result<usize>;
+
+    /// Platform implementation of [`setsockopt()`](crate::header::sys_socket::setsockopt) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn setsockopt(
+        socket: c_int,
+        level: c_int,
+        option_name: c_int,
+        option_value: *const c_void,
+        option_len: socklen_t,
+    ) -> Result<()>;
+
+    /// Platform implementation of [`shutdown()`](crate::header::sys_socket::shutdown) from [`sys/socket.h`](crate::header::sys_socket).
+    fn shutdown(socket: c_int, how: c_int) -> Result<()>;
+
+    /// Platform implementation of [`socket()`](crate::header::sys_socket::socket) from [`sys/socket.h`](crate::header::sys_socket).
+    unsafe fn socket(domain: c_int, kind: c_int, protocol: c_int) -> Result<c_int>;
+
+    /// Platform implementation of [`socketpair()`](crate::header::sys_socket::socketpair) from [`sys/socket.h`](crate::header::sys_socket).
+    fn socketpair(domain: c_int, kind: c_int, protocol: c_int, sv: &mut [c_int; 2]) -> Result<()>;
+}
diff --git a/recipes/core/relibc/src/platform/redox/epoll.rs b/recipes/core/relibc/src/platform/redox/epoll.rs
new file mode 100644
index 0000000000..b73660d697
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/epoll.rs
@@ -0,0 +1,176 @@
+use super::{
+    super::{Pal, PalEpoll, types::*},
+    Sys,
+};
+
+use crate::{
+    error::Errno,
+    fs::File,
+    header::{errno::*, fcntl::*, signal::sigset_t, sys_epoll::*},
+    io::prelude::*,
+};
+use core::{mem, slice};
+use syscall::{
+    data::{Event, TimeSpec},
+    flag::EVENT_READ,
+};
+
+fn epoll_to_event_flags(epoll: c_uint) -> syscall::EventFlags {
+    let mut event_flags = syscall::EventFlags::empty();
+
+    if epoll & EPOLLIN != 0 {
+        event_flags |= syscall::EventFlags::EVENT_READ;
+    }
+
+    if epoll & EPOLLOUT != 0 {
+        event_flags |= syscall::EventFlags::EVENT_WRITE;
+    }
+
+    /*TODO: support more EPOLL flags  */
+    let unsupported = !(EPOLLIN | EPOLLOUT);
+    if epoll & unsupported != 0 {
+        log::trace!("epoll unsupported flags 0x{:X}", epoll & unsupported);
+    }
+
+    event_flags
+}
+
+fn event_flags_to_epoll(flags: syscall::EventFlags) -> c_uint {
+    let mut epoll = 0;
+
+    if flags.contains(syscall::EventFlags::EVENT_READ) {
+        epoll |= EPOLLIN;
+    }
+
+    if flags.contains(syscall::EventFlags::EVENT_WRITE) {
+        epoll |= EPOLLOUT;
+    }
+
+    epoll
+}
+
+impl PalEpoll for Sys {
+    fn epoll_create1(flags: c_int) -> Result<c_int, Errno> {
+        Sys::open(c"/scheme/event".into(), O_RDWR | flags, 0)
+    }
+
+    unsafe fn epoll_ctl(
+        epfd: c_int,
+        op: c_int,
+        fd: c_int,
+        event: *mut epoll_event,
+    ) -> Result<(), Errno> {
+        match op {
+            EPOLL_CTL_ADD | EPOLL_CTL_MOD => {
+                Sys::write(
+                    epfd,
+                    &Event {
+                        id: fd as usize,
+                        flags: unsafe { epoll_to_event_flags((*event).events) },
+                        // NOTE: Danger when using something smaller than 64-bit
+                        // systems. If this is needed, use a box or something
+                        data: unsafe { (*event).data.u64 as usize },
+                    },
+                )?;
+            }
+            EPOLL_CTL_DEL => {
+                Sys::write(
+                    epfd,
+                    &Event {
+                        id: fd as usize,
+                        flags: syscall::EventFlags::empty(),
+                        //TODO: Is data required?
+                        data: 0,
+                    },
+                )?;
+            }
+            _ => return Err(Errno(EINVAL)),
+        }
+        Ok(())
+    }
+
+    unsafe fn epoll_pwait(
+        epfd: c_int,
+        events: *mut epoll_event,
+        maxevents: c_int,
+        timeout: c_int,
+        sigset: *const sigset_t,
+    ) -> Result<usize, Errno> {
+        assert_eq!(mem::size_of::<epoll_event>(), mem::size_of::<Event>());
+
+        if maxevents <= 0 {
+            return Err(Errno(EINVAL));
+        }
+
+        let timer_opt = if timeout != -1 {
+            let mut timer = File::open(c"/scheme/time/4".into(), O_RDWR)?;
+            Sys::write(
+                epfd,
+                &Event {
+                    id: timer.fd as usize,
+                    flags: EVENT_READ,
+                    data: 0,
+                },
+            )?;
+
+            let mut time = TimeSpec::default();
+            let _ = timer
+                .read(&mut time)
+                .map_err(|err| Errno(err.raw_os_error().unwrap_or(EIO)))?;
+            time.tv_sec += (timeout as i64) / 1000;
+            time.tv_nsec += (timeout % 1000) * 1000000;
+            let _ = timer
+                .write(&time)
+                .map_err(|err| Errno(err.raw_os_error().unwrap_or(EIO)))?;
+
+            Some(timer)
+        } else {
+            None
+        };
+
+        let callback = || {
+            let res = syscall::read(epfd as usize, unsafe {
+                slice::from_raw_parts_mut(
+                    events as *mut u8,
+                    maxevents as usize * mem::size_of::<syscall::Event>(),
+                )
+            });
+            res
+        };
+
+        let bytes_read = if sigset.is_null() {
+            callback()
+        } else {
+            // Allowset is inverse of sigset mask
+            let allowset = !unsafe { *sigset };
+            redox_rt::signal::callback_or_signal_async(allowset, callback)
+        }?;
+
+        let read = bytes_read as usize / mem::size_of::<syscall::Event>();
+
+        let mut count = 0;
+        for i in 0..read {
+            unsafe {
+                let event_ptr = events.add(i);
+                let target_ptr = events.add(count);
+                let event = *(event_ptr as *mut Event);
+                if let Some(ref timer) = timer_opt {
+                    if event.id as c_int == timer.fd {
+                        // Do not count timer event
+                        continue;
+                    }
+                }
+                *target_ptr = epoll_event {
+                    events: event_flags_to_epoll(event.flags),
+                    data: epoll_data {
+                        u64: event.data as u64,
+                    },
+                    ..Default::default()
+                };
+                count += 1;
+            }
+        }
+
+        Ok(count)
+    }
+}
diff --git a/recipes/core/relibc/src/platform/redox/event.rs b/recipes/core/relibc/src/platform/redox/event.rs
new file mode 100644
index 0000000000..5d77de41cf
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/event.rs
@@ -0,0 +1,82 @@
+use core::mem::size_of;
+
+use crate::header::{
+    bits_timespec::timespec,
+    fcntl::{O_CLOEXEC, O_CREAT, O_RDWR},
+    signal::sigset_t,
+};
+
+use super::libredox::RawResult;
+
+use syscall::{EINVAL, Error, Result};
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_event_queue_create_v1(flags: u32) -> RawResult {
+    Error::mux((|| {
+        if flags != 0 {
+            return Err(Error::new(EINVAL));
+        }
+        Ok(super::libredox::open("/scheme/event", O_CLOEXEC | O_CREAT | O_RDWR, 0o700)? as usize)
+    })())
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_event_queue_get_events_v1(
+    queue: usize,
+    buf: *mut event::raw::RawEventV1,
+    buf_count: usize,
+    flags: u32,
+    _timeout: *const timespec,
+    _sigset: *const sigset_t,
+) -> RawResult {
+    Error::mux((|| -> Result<usize> {
+        if flags != 0 || buf_count == 0 {
+            return Err(Error::new(EINVAL));
+        }
+        let mut event = syscall::Event::default();
+        let res = syscall::read(queue, &mut event)?;
+        assert_eq!(
+            res,
+            size_of::<syscall::Event>(),
+            "EOF not yet defined for event queue reads"
+        );
+        unsafe {
+            buf.write(event::raw::RawEventV1 {
+                fd: event.id,
+                flags: event::raw::EventFlags::from(event.flags).bits(),
+                user_data: event.data,
+            })
+        };
+
+        Ok(1)
+    })())
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_event_queue_ctl_v1(
+    queue: usize,
+    fd: usize,
+    flags: u32,
+    user_data: usize,
+) -> RawResult {
+    Error::mux((|| -> Result<usize> {
+        let res = syscall::write(
+            queue,
+            &syscall::Event {
+                id: fd,
+                flags: event::raw::EventFlags::from_bits(flags)
+                    .ok_or(Error::new(EINVAL))?
+                    .into(),
+                data: user_data,
+            },
+        )?;
+        assert_eq!(
+            res,
+            size_of::<syscall::Event>(),
+            "EOF not yet defined for event queue writes"
+        );
+        Ok(0)
+    })())
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_event_queue_destroy_v1(queue: usize) -> RawResult {
+    Error::mux(syscall::close(queue))
+}
diff --git a/recipes/core/relibc/src/platform/redox/exec.rs b/recipes/core/relibc/src/platform/redox/exec.rs
new file mode 100644
index 0000000000..3590413c62
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/exec.rs
@@ -0,0 +1,614 @@
+use core::{
+    convert::Infallible,
+    num::{NonZeroU64, NonZeroUsize},
+};
+
+use crate::{
+    c_str::{CStr, CString},
+    fs::File,
+    header::{limits::PATH_MAX, string::strlen},
+    io::{BufReader, SeekFrom, prelude::*},
+    platform::types::*,
+};
+
+use redox_rt::{
+    RtTcb,
+    proc::{ExtraInfo, FdGuard, FdGuardUpper, FexecResult, InterpOverride},
+    sys::Resugid,
+};
+use syscall::{data::Stat, error::*, flag::*};
+
+fn fexec_impl(
+    exec_file: FdGuardUpper,
+    path: &[u8],
+    args: &[&[u8]],
+    envs: &[&[u8]],
+    extrainfo: &ExtraInfo,
+    interp_override: Option<InterpOverride>,
+) -> Result<Infallible> {
+    let FexecResult::Interp {
+        path,
+        interp_override: new_interp_override,
+    } = redox_rt::proc::fexec_impl(
+        exec_file,
+        &RtTcb::current().thread_fd(),
+        redox_rt::current_proc_fd(),
+        path,
+        args,
+        envs,
+        extrainfo,
+        interp_override,
+    )?;
+
+    // According to elf(5), PT_INTERP requires that the interpreter path be
+    // null-terminated. Violating this should therefore give the "format error" ENOEXEC.
+    let path_cstr = CStr::from_bytes_with_nul(&path).map_err(|_| Error::new(ENOEXEC))?;
+
+    return execve(
+        Executable::AtPath(path_cstr),
+        ArgEnv::Parsed { args, envs },
+        Some(new_interp_override),
+    );
+}
+
+pub enum ArgEnv<'a> {
+    C {
+        argv: *const *mut c_char,
+        envp: *const *mut c_char,
+    },
+    Parsed {
+        args: &'a [&'a [u8]],
+        envs: &'a [&'a [u8]],
+    },
+}
+
+pub enum Executable<'a> {
+    AtPath(CStr<'a>),
+    InFd { file: File, arg0: &'a [u8] },
+}
+
+pub fn execve(
+    exec: Executable<'_>,
+    arg_env: ArgEnv,
+    interp_override: Option<InterpOverride>,
+) -> Result<Infallible> {
+    // NOTE: We must omit O_CLOEXEC and close manually, otherwise it will be closed before we
+    // have even read it!
+    let (mut image_file, stat, arg0) = match exec {
+        Executable::AtPath(path) => {
+            let Ok(src_fd) = File::open(path, O_RDONLY as c_int) else {
+                return Err(Error::new(ENOENT));
+            };
+
+            let mut src_stat = Stat::default();
+            redox_rt::sys::fstat(*src_fd as usize, &mut src_stat)?;
+
+            #[cfg(feature = "ld_so_cache")]
+            let src_fd = {
+                let mtime_sec = src_stat.st_mtime;
+                let mtime_nsec = src_stat.st_mtime_nsec;
+
+                let safe_path = path.to_str().unwrap_or("").replace('/', "_");
+                let shm_path_owned = format!(
+                    "/scheme/shm/ld.so.cache.{}.{}.{}\0",
+                    safe_path, mtime_sec, mtime_nsec
+                );
+                let shm_path =
+                    unsafe { CStr::from_bytes_with_nul_unchecked(shm_path_owned.as_bytes()) };
+
+                let mut file_opt = None;
+                if let Ok(shm_fd) = File::open(shm_path, O_RDONLY as c_int) {
+                    if let Ok(shm_stat) = shm_fd.fstat()
+                        && shm_stat.st_size > 0
+                    {
+                        file_opt = Some(shm_fd);
+                    }
+                }
+                file_opt.unwrap_or(src_fd)
+            };
+
+            (src_fd, src_stat, path.to_bytes())
+        }
+        Executable::InFd { file, arg0 } => {
+            let mut stat = Stat::default();
+            redox_rt::sys::fstat(*file as usize, &mut stat)?;
+            (file, stat, arg0)
+        }
+    };
+
+    // With execve now being implemented in userspace, we need to check ourselves that this
+    // file is actually executable. While checking for read permission is unnecessary as the
+    // scheme will not allow us to read otherwise, the execute bit is completely unenforced.
+    //
+    // But we do (currently) have the permission to mmap executable memory and fill it with any
+    // program, even marked non-executable, so really the best we can do is check that nothing is
+    // executed by accident.
+    //
+    // TODO: At some point we might have capabilities limiting the ability to allocate
+    // executable memory.
+
+    let Resugid { ruid, rgid, .. } = redox_rt::sys::posix_getresugid();
+
+    let mode = if ruid == stat.st_uid {
+        (stat.st_mode >> 3 * 2) & 0o7
+    } else if rgid == stat.st_gid {
+        (stat.st_mode >> 3 * 1) & 0o7
+    } else {
+        stat.st_mode & 0o7
+    };
+
+    if mode & 0o1 == 0o0 {
+        return Err(Error::new(EPERM));
+    }
+
+    let cwd: Box<[u8]> = super::path::clone_cwd().unwrap_or_default().into();
+
+    // Path to interpreter binary and args if found
+    let (interpreter_path, interpreter_args) = { parse_interpreter(&mut image_file)? };
+
+    // Total number of arguments which includes the interpreter if interpreted and its args
+    let mut len = 0;
+    if interpreter_path.is_some() {
+        len = 1;
+        if interpreter_args.is_some() {
+            len = 2;
+        }
+    }
+
+    // Count arguments for `exec` which is different from the interpreter's args
+    //
+    // When there's an interpreter, we skip the original `argv[0]` and replace it with the script
+    // path (`arg0`).
+    match arg_env {
+        ArgEnv::C { argv, .. } => unsafe {
+            let mut count = 0;
+            let ptr = if interpreter_path.is_some() && !(*argv).is_null() {
+                argv.add(1)
+            } else {
+                argv
+            };
+
+            while !(*ptr.add(count)).is_null() {
+                count += 1;
+            }
+            len += count;
+        },
+        ArgEnv::Parsed { args, .. } => {
+            let skip = if interpreter_path.is_some() { 1 } else { 0 };
+            len += args.len().saturating_sub(skip);
+        }
+    }
+    let mut args: Vec<&[u8]> = Vec::with_capacity(len);
+
+    if let Some(interpreter) = &interpreter_path {
+        image_file = File::open(CStr::borrow(&interpreter), O_RDONLY as c_int)
+            .map_err(|_| Error::new(ENOENT))?;
+
+        // Push interpreter to arguments
+        args.push(interpreter.as_bytes());
+
+        // Push interpreter args, if any, to our main arguments
+        if let Some(args_ref) = interpreter_args.as_ref() {
+            args.push(args_ref.as_bytes());
+        }
+    } else {
+        image_file
+            .seek(SeekFrom::Start(0))
+            .map_err(|_| Error::new(EIO))?;
+    }
+
+    let (args, envs): (Vec<_>, Vec<_>) = match arg_env {
+        ArgEnv::C { mut argv, mut envp } => unsafe {
+            // Arguments
+            if interpreter_path.is_some() {
+                args.push(arg0);
+                if !(*argv).is_null() {
+                    argv = argv.add(1);
+                }
+            }
+
+            while !argv.read().is_null() {
+                let arg = argv.read();
+
+                let len = strlen(arg);
+                args.push(core::slice::from_raw_parts(arg as *const u8, len));
+                argv = argv.add(1);
+            }
+
+            // Environment variables
+            let mut len = 0;
+            while !envp.add(len).read().is_null() {
+                len += 1;
+            }
+
+            let mut envs: Vec<&[u8]> = Vec::with_capacity(len);
+            while !envp.read().is_null() {
+                let env = envp.read();
+
+                let len = strlen(env);
+                envs.push(core::slice::from_raw_parts(env as *const u8, len));
+                envp = envp.add(1);
+            }
+            (args, envs)
+        },
+        ArgEnv::Parsed {
+            args: new_args,
+            envs,
+        } => {
+            if interpreter_path.is_some() {
+                args.push(arg0);
+                args.extend(new_args.iter().skip(1));
+            } else {
+                args.extend(new_args);
+            }
+            (args, Vec::from(envs))
+        }
+    };
+
+    // TODO: Convert image_file to FdGuard earlier?
+    let exec_fd_guard = FdGuard::new(image_file.fd as usize).to_upper().unwrap();
+    core::mem::forget(image_file);
+
+    let sigprocmask = redox_rt::signal::get_sigmask().unwrap();
+
+    let extrainfo = ExtraInfo {
+        cwd: Some(&cwd),
+        sigignmask: redox_rt::signal::get_sigignmask_to_inherit(),
+        sigprocmask,
+        umask: redox_rt::sys::get_umask(),
+        thr_fd: RtTcb::current().thread_fd().as_raw_fd(),
+        proc_fd: redox_rt::current_proc_fd().as_raw_fd(),
+        ns_fd: redox_rt::current_namespace_fd().ok(),
+        cwd_fd: super::path::current_dir()
+            .ok()
+            .map(|fd| fd.as_ref().unwrap().fd.as_raw_fd()),
+    };
+
+    fexec_impl(
+        exec_fd_guard,
+        arg0,
+        &args,
+        &envs,
+        &extrainfo,
+        interp_override,
+    )
+}
+
+// Parse the interpreter and its args if `reader` starts with a shebang (#!).
+//
+// # Return
+// * Path to the interpreter and its args, if any
+// * `None` if no shebang
+// * An error if parsing failed
+//
+// # Errors
+// * E2BIG: The full path of the shebang is greater than [`PATH_MAX`]
+// * ENOEXEC: Invalid shebang line, such as a line of all whitespace
+// * EIO: Failure reading from `reader`
+fn parse_interpreter<R>(image_file: &mut R) -> Result<(Option<CString>, Option<CString>)>
+where
+    R: Read + Seek,
+{
+    // Read shebang (for example #!/bin/sh)
+    let mut read = 0;
+    let mut shebang = [0; 2];
+
+    while read < 2 {
+        match image_file
+            .read(&mut shebang)
+            .map_err(|_| Error::new(ENOEXEC))?
+        {
+            0 => break,
+            i => read += i,
+        }
+    }
+    if shebang != *b"#!" {
+        return Ok((None, None));
+    }
+
+    // BufReader is created after parsing the shebang because it doesn't make sense to buffer
+    // bytes to read two bytes especially if `image_file` is NOT a script.
+    let mut reader_ = BufReader::new(image_file);
+    let reader = &mut reader_;
+
+    // Skip prepended whitespace for interpreter
+    // Ex: #! /usr/bin/python
+    let pos = reader
+        .bytes()
+        .position(|byte| byte.ok().is_some_and(|byte| !byte.is_ascii_whitespace()))
+        .and_then(|pos| (pos + 2).try_into().ok())
+        // Fail if all whitespace or empty
+        .ok_or_else(|| Error::new(ENOEXEC))?;
+    // We read the non-whitespace character which sets reader position one past it.
+    // Seeking back to that position is essentially free since reads are buffered and it's
+    // unlikely that there was enough whitespace that we performed multiple reads.
+    reader
+        .seek(SeekFrom::Start(pos))
+        .map_err(|_| Error::new(EIO))?;
+
+    // Scan the first line once for the mandatory interpreter and optional args.
+    // This is nicer than using `read_until` or `read_line` because it avoids having to scan the
+    // data twice to check if there are args.
+    let mut interp_offset = None;
+    let mut args_offset = None;
+    for (i, byte) in reader.bytes().enumerate() {
+        let byte = byte.map_err(|_| Error::new(EIO))?;
+
+        match (byte, interp_offset, args_offset) {
+            // No args; only interpreter
+            (b'\n', None, None) => {
+                interp_offset = NonZeroUsize::new(i);
+                break;
+            }
+            // Interpreter found, so we're scanning for where the args ends
+            (b'\n', Some(_), None) => {
+                args_offset = NonZeroUsize::new(i);
+                break;
+            }
+            // Found args so interpreter ends at `i`
+            (b' ', None, None) => {
+                interp_offset = NonZeroUsize::new(i);
+            }
+            _ => {}
+        }
+    }
+
+    // Interpreter is mandatory since we found #! earlier
+    let Some(interp_offset) = interp_offset.map(NonZeroUsize::get) else {
+        return Err(Error::new(ENOEXEC));
+    };
+    // We need u64s and usizes; converting them now is easier
+    let Ok(interp_offset_u64) = interp_offset.try_into() else {
+        return Err(Error::new(E2BIG));
+    };
+    let args_offset_u64: Option<NonZeroU64> = args_offset
+        .map(|offset| offset.try_into())
+        .transpose()
+        .map_err(|_| Error::new(E2BIG))?;
+
+    // Spec: full length of the shebang can't exceed max path length
+    let shebang_len = pos
+        .checked_add(interp_offset_u64)
+        .and_then(|len| len.checked_add(args_offset_u64.map(NonZeroU64::get).unwrap_or_default()))
+        .ok_or_else(|| Error::new(E2BIG))?;
+    // PATH_MAX is a small number that fits into u64 so `as` is okay
+    if shebang_len > PATH_MAX as u64 {
+        return Err(Error::new(E2BIG));
+    }
+
+    // Rewind to the beginning of the interpreter.
+    // As above, this is essentially free because the internal buf size is several times larger
+    // than PATH_MAX by default, and our shebang_len < PATH_MAX as checked above.
+    reader
+        .seek(SeekFrom::Start(pos))
+        .map_err(|_| Error::new(E2BIG))?;
+
+    let mut interpreter = Vec::with_capacity(interp_offset);
+    reader
+        .take(interp_offset_u64)
+        .read_to_end(&mut interpreter)
+        .map_err(|_| Error::new(EIO))?;
+
+    // Read args, but treat as an opaque block to pass to the interpreter.
+    // Linux and FreeBSD both pass the args as is to the interpreter whereas macOS splits
+    // the args similar to `/usr/bin/env -S`.
+    // POSIX leaves the behavior up to the implementation.
+    // It's simpler to rely on env because well behaved, portable scripts will use
+    // it to ensure correct operation on Linux/FreeBSD.
+    // Splitting args ourselves gains little while reinventing env -S
+    let interpreter_args = if let (Some(offset), Some(offset_u64)) = (
+        args_offset.map(NonZeroUsize::get),
+        args_offset_u64.map(NonZeroU64::get),
+    ) {
+        let len = offset - interp_offset;
+        let len_u64 = offset_u64 - interp_offset_u64;
+        let mut args = Vec::with_capacity(len);
+
+        reader
+            .take(len_u64)
+            .read_to_end(&mut args)
+            .map_err(|_| Error::new(E2BIG))?;
+
+        // Eat '\n'
+        reader.consume(1);
+
+        let mut arg_start = 0;
+        while arg_start < args.len() && (args[arg_start] == b' ' || args[arg_start] == b'\t') {
+            arg_start += 1;
+        }
+
+        if arg_start < args.len() {
+            let args = CString::new(&args[arg_start..]).map_err(|_| Error::new(ENOEXEC))?;
+            Some(args)
+        } else {
+            None
+        }
+    } else {
+        None
+    };
+
+    let interpreter = CString::new(interpreter).map_err(|_| Error::new(ENOEXEC))?;
+    Ok((Some(interpreter), interpreter_args))
+}
+
+#[cfg(test)]
+mod tests {
+    use std::io::Cursor;
+
+    use super::parse_interpreter;
+
+    // Shebangs without a script attached
+    const NO_FRILLS: &str = "#!/bin/sh\n";
+    const NO_FRILLS_EXPECTED: &str = "/bin/sh";
+
+    const SPACE_B4_INTERP: &str = "#! /bin/sh\n";
+    const SPACE_B4_INTERP_EXPECTED: &str = "/bin/sh";
+
+    const NO_FRILLS_ENV: &str = "#!/usr/bin/env sh\n";
+    const NO_FRILLS_ENV_EXPECTED: &str = "/usr/bin/env";
+    const NO_FRILLS_ENV_EXPECTED_ARGS: &str = "sh";
+
+    const SPACE_B4_ENV: &str = "#! /usr/bin/env sh\n";
+    const SPACE_B4_EXPECTED: &str = NO_FRILLS_ENV_EXPECTED;
+    const SPACE_B4_EXPECTED_ARGS: &str = NO_FRILLS_ENV_EXPECTED_ARGS;
+
+    const MULT_SPACES_B4: &str = "#!                        /usr/bin/env sh\n";
+    const MULT_SPACES_B4_EXPECTED: &str = NO_FRILLS_ENV_EXPECTED;
+    const MULT_SPACES_B4_EXPECTED_ARGS: &str = NO_FRILLS_ENV_EXPECTED_ARGS;
+
+    // Shebangs with a script attached
+    // These test that the parser doesn't run off the first line
+    const NO_FRILLS_W_SCRIPT: &str = r#"#!/bin/sh
+    echo "Hello from Redox""#;
+    const NO_FRILLS_W_SCRIPT_EXPECTED: &str = NO_FRILLS_EXPECTED;
+
+    const SPACE_B4_INTERP_W_SCRIPT: &str = r#"#! /bin/sh
+    echo "Doctor Eigenvalue""#;
+    const SPACE_B4_INTERP_W_SCRIPT_EXPECTED: &str = NO_FRILLS_EXPECTED;
+
+    const MULT_ARGUMENTS: &str = r#"#! /usr/bin/env -S python -OO
+    assert False
+    print("This totally works")
+    "#;
+    const MULT_ARGUMENTS_EXPECTED: &str = NO_FRILLS_ENV_EXPECTED;
+    const MULT_ARGUMENTS_EXPECTED_ARGS: &str = "-S python -OO";
+
+    // No hashbang conditions
+    const NO_SHEBANG: &str = "/bin/sh";
+    const EMPTY: &str = "";
+
+    // Error conditions
+    const SHEBANG_NO_INTERP: &str = "#!";
+    const SHEBANG_NO_INTERP_SPACE: &str = "#! ";
+    const SHEBANG_NO_INTERP_SCRIPT: &str = "#!\necho ${PATH}";
+
+    fn success(input: &str, expected_interp: &str, expected_args: Option<&str>) {
+        let mut reader = Cursor::new(input);
+        let (actual_interp, actual_args) = parse_interpreter(&mut reader)
+            .unwrap_or_else(|e| panic!("Shebang ({input}) should parse\n\t{e}"));
+
+        let actual_interp = actual_interp
+            .expect("Expected an interpreter")
+            .into_string()
+            .expect("Interpreter is ASCII (valid UTF-8)");
+        assert_eq!(expected_interp, actual_interp);
+
+        if let Some(expected_args) = expected_args {
+            let actual_args = actual_args
+                .expect("Expected arguments to interpreter")
+                .into_string()
+                .expect("Args string is ASCII (valid UTF-8)");
+            assert_eq!(expected_args, actual_args);
+        }
+    }
+
+    #[test]
+    fn parse_interpreter_without_space() {
+        success(NO_FRILLS, NO_FRILLS_EXPECTED, None);
+    }
+
+    #[test]
+    fn parse_interpreter_with_space() {
+        success(SPACE_B4_INTERP, SPACE_B4_INTERP_EXPECTED, None);
+    }
+
+    #[test]
+    fn parse_interpreter_with_arg() {
+        success(
+            NO_FRILLS_ENV,
+            NO_FRILLS_ENV_EXPECTED,
+            Some(NO_FRILLS_ENV_EXPECTED_ARGS),
+        );
+    }
+
+    #[test]
+    fn parse_interpreter_with_arg_and_space() {
+        success(
+            SPACE_B4_ENV,
+            SPACE_B4_EXPECTED,
+            Some(SPACE_B4_EXPECTED_ARGS),
+        );
+    }
+
+    #[test]
+    fn parse_interpreter_with_multiple_spaces() {
+        success(
+            MULT_SPACES_B4,
+            MULT_SPACES_B4_EXPECTED,
+            Some(MULT_SPACES_B4_EXPECTED_ARGS),
+        );
+    }
+
+    #[test]
+    fn parse_interpreter_with_script() {
+        success(NO_FRILLS_W_SCRIPT, NO_FRILLS_W_SCRIPT_EXPECTED, None);
+    }
+
+    #[test]
+    fn parse_interpreter_with_script_and_space() {
+        success(
+            SPACE_B4_INTERP_W_SCRIPT,
+            SPACE_B4_INTERP_W_SCRIPT_EXPECTED,
+            None,
+        );
+    }
+
+    #[test]
+    fn parse_interpreter_with_script_args_space() {
+        success(
+            MULT_ARGUMENTS,
+            MULT_ARGUMENTS_EXPECTED,
+            Some(MULT_ARGUMENTS_EXPECTED_ARGS),
+        );
+    }
+
+    #[test]
+    fn parse_interpreter_no_shebang() {
+        let mut reader = Cursor::new(NO_SHEBANG);
+        let (interpreter, args) =
+            parse_interpreter(&mut reader).expect("Shouldn't fail if file doesn't have a shebang");
+
+        assert!(
+            interpreter.is_none(),
+            "Interpreter should be `None` if shebang isn't present"
+        );
+        assert!(
+            args.is_none(),
+            "Args should be empty without an interpreter."
+        );
+    }
+
+    #[test]
+    fn parse_interpreter_empty() {
+        let mut reader = Cursor::new(EMPTY);
+        let (interpreter, args) =
+            parse_interpreter(&mut reader).expect("Shouldn't fail if file doesn't have a shebang");
+
+        assert!(
+            interpreter.is_none(),
+            "Interpreter should be `None` for empty image"
+        );
+        assert!(args.is_none(), "Args should be empty for empty image");
+    }
+
+    #[test]
+    fn parse_interpreter_no_interpreter_fail() {
+        let mut reader = Cursor::new(SHEBANG_NO_INTERP);
+        parse_interpreter(&mut reader)
+            .expect_err("A hashbang without an interpreter should return an error");
+    }
+
+    #[test]
+    fn parse_interpreter_no_interpreter_space_fail() {
+        let mut reader = Cursor::new(SHEBANG_NO_INTERP_SPACE);
+        parse_interpreter(&mut reader)
+            .expect_err("A hashbang without an interpreter should return an error");
+    }
+
+    #[test]
+    fn parse_interpreter_no_interpreter_script_fail() {
+        let mut reader = Cursor::new(SHEBANG_NO_INTERP_SCRIPT);
+        parse_interpreter(&mut reader)
+            .expect_err("A hashbang without an interpreter should return an error");
+    }
+}
diff --git a/recipes/core/relibc/src/platform/redox/extra.rs b/recipes/core/relibc/src/platform/redox/extra.rs
new file mode 100644
index 0000000000..1e3138ed44
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/extra.rs
@@ -0,0 +1,38 @@
+use core::slice;
+
+use crate::{
+    error::{Errno, ResultExt},
+    platform::types::*,
+};
+use syscall::{F_SETFD, F_SETFL, O_RDONLY, O_WRONLY, error::*};
+
+pub use redox_rt::proc::FdGuard;
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_fpath(fd: c_int, buf: *mut c_void, count: size_t) -> ssize_t {
+    syscall::fpath(fd as usize, unsafe {
+        slice::from_raw_parts_mut(buf as *mut u8, count)
+    })
+    .map_err(Errno::from)
+    .map(|l| l as ssize_t)
+    .or_minus_one_errno()
+}
+
+pub fn pipe2(flags: usize) -> syscall::error::Result<[c_int; 2]> {
+    let read_flags = flags | O_RDONLY;
+    let write_flags = flags | O_WRONLY;
+    let read_fd = FdGuard::open("/scheme/pipe", read_flags)?;
+    let write_fd = read_fd.dup(b"write")?;
+    write_fd.fcntl(F_SETFL, write_flags)?;
+    write_fd.fcntl(F_SETFD, write_flags)?;
+
+    let fds = [
+        c_int::try_from(read_fd.as_raw_fd()).map_err(|_| Error::new(EMFILE))?,
+        c_int::try_from(write_fd.as_raw_fd()).map_err(|_| Error::new(EMFILE))?,
+    ];
+
+    read_fd.take();
+    write_fd.take();
+
+    Ok(fds)
+}
diff --git a/recipes/core/relibc/src/platform/redox/libcscheme.rs b/recipes/core/relibc/src/platform/redox/libcscheme.rs
new file mode 100644
index 0000000000..a089606055
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/libcscheme.rs
@@ -0,0 +1,52 @@
+use crate::{c_str::CStr, header::stdlib::getenv, platform::types::*};
+use core::ptr;
+use syscall::{EIO, ENOENT, Error, Result, flag::*};
+
+pub const LIBC_SCHEME: &'static str = "libc:";
+
+const ENV_MAX_LEN: i32 = i32::MAX;
+
+macro_rules! env_str {
+    ($lit:expr) => {
+        #[allow(unused_unsafe)]
+        {
+            let val_bytes = unsafe { getenv(concat!($lit, "\0").as_ptr() as *const c_char) };
+            if val_bytes != ptr::null_mut() {
+                if let Ok(val_str) = unsafe { CStr::from_ptr(val_bytes) }.to_str() {
+                    Some(val_str)
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        }
+    };
+}
+
+pub fn open(path: &str, flags: usize) -> Result<usize> {
+    assert!(path.starts_with(LIBC_SCHEME));
+
+    if flags & O_SYMLINK != 0 {
+        return Err(Error::new(ENOENT));
+    }
+
+    let basename = match path.strip_prefix(LIBC_SCHEME) {
+        Some(path) => path.trim_matches('/'),
+        _ => return Err(Error::new(EIO)),
+    };
+
+    // Linux seems to allow you to read from or write to any of /dev/{stdin,stderr,stdout}
+    match basename {
+        "stderr" => syscall::dup(2, &[]),
+        "stdin" => syscall::dup(0, &[]),
+        "stdout" => syscall::dup(1, &[]),
+        "tty" => {
+            if let Some(tty) = env_str!("TTY") {
+                return redox_rt::sys::open(tty, flags);
+            }
+            Err(Error::new(ENOENT))
+        }
+        _ => Err(Error::new(ENOENT)),
+    }
+}
diff --git a/recipes/core/relibc/src/platform/redox/libredox.rs b/recipes/core/relibc/src/platform/redox/libredox.rs
new file mode 100644
index 0000000000..2aad40861f
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/libredox.rs
@@ -0,0 +1,634 @@
+use core::{mem, slice, str};
+
+use alloc::vec::Vec;
+use ioslice::IoSlice;
+use redox_protocols::protocol::{ProcKillTarget, SocketCall, WaitFlags};
+use redox_rt::sys::{WaitpidTarget, posix_read, posix_write, std_fs_call_ro, std_fs_call_wo};
+use syscall::{
+    EMFILE, ENAMETOOLONG, ENOSYS, EOPNOTSUPP, Error, Result, StdFsCallKind,
+    data::StdFsCallMeta,
+    dirent::{DirentHeader, DirentKind},
+};
+
+use crate::{
+    header::{
+        bits_iovec::iovec, bits_timespec::timespec, errno::EINVAL, signal::sigaction,
+        sys_stat::UTIME_NOW,
+    },
+    out::Out,
+    platform::{PalSignal, pal::Pal, types::*},
+};
+
+use super::Sys;
+
+pub type RawResult = usize;
+
+pub fn open(path: &str, oflag: c_int, mode: mode_t) -> Result<usize> {
+    let usize_fd = super::path::open(
+        path,
+        ((oflag as usize) & 0xFFFF_0000) | ((mode as usize) & 0xFFFF),
+    )?;
+
+    c_int::try_from(usize_fd)
+        .map_err(|_| {
+            let _ = syscall::close(usize_fd);
+            Error::new(EMFILE)
+        })
+        .map(|f| f as usize)
+}
+
+pub fn openat(dirfd: c_int, path: &str, oflag: c_int, mode: mode_t) -> Result<usize> {
+    let usize_fd = super::path::openat(
+        dirfd,
+        path,
+        ((oflag as usize) & 0xFFFF_0000) | ((mode as usize) & 0xFFFF),
+    )?;
+
+    c_int::try_from(usize_fd)
+        .map_err(|_| {
+            let _ = syscall::close(usize_fd);
+            Error::new(EMFILE)
+        })
+        .map(|f| f as usize)
+}
+pub fn fchmod(fd: usize, new_mode: u16) -> Result<()> {
+    std_fs_call_wo(
+        fd,
+        &[],
+        &StdFsCallMeta::new(StdFsCallKind::Fchmod, new_mode as u64, 0),
+    )?;
+    Ok(())
+}
+pub fn fchown(fd: usize, new_uid: u32, new_gid: u32) -> Result<()> {
+    /* std_fs_call
+    Error::mux(std_fs_call_wo(
+        fd,
+        &[],
+        &StdFsCallMeta::new(
+            StdFsCallKind::Fchmod,
+            (new_uid as u64) | ((new_gid as u64) << 32),
+            0,
+        ),
+    ))
+    */
+    syscall::fchown(fd, new_uid, new_gid)?;
+    Ok(())
+}
+pub fn getdents(fd: usize, buf: &mut [u8], opaque: u64) -> Result<usize> {
+    //println!("GETDENTS {} into ({:p}+{})", fd, buf.as_ptr(), buf.len());
+
+    const HEADER_SIZE: usize = mem::size_of::<DirentHeader>();
+
+    // Use syscall if it exists.
+    match std_fs_call_ro(
+        fd,
+        buf,
+        &StdFsCallMeta::new(StdFsCallKind::Getdents, opaque, HEADER_SIZE as u64),
+    ) {
+        Err(Error {
+            errno: EOPNOTSUPP | ENOSYS,
+        }) => (),
+        other => {
+            //println!("REAL GETDENTS {:?}", other);
+            return Ok(other?);
+        }
+    }
+
+    // Otherwise, for legacy schemes, assume the buffer is pre-arranged (all schemes do this in
+    // practice), and just read the name. If multiple names appear, pretend it didn't happen
+    // and just use the first entry.
+
+    let (header, name) = buf.split_at_mut(mem::size_of::<DirentHeader>());
+
+    let bytes_read = Sys::pread(fd as c_int, name, opaque as i64)? as usize;
+    if bytes_read == 0 {
+        return Ok(0);
+    }
+
+    let (name_len, advance) = match name[..bytes_read].iter().position(|c| *c == b'\n') {
+        Some(idx) => (idx, idx + 1),
+
+        // Insufficient space for NUL byte, or entire entry was not read. Indicate we need a
+        // larger buffer.
+        None if bytes_read == name.len() => return Err(Error::new(EINVAL)),
+
+        None => (bytes_read, name.len()),
+    };
+    name[name_len] = b'\0';
+
+    let record_len = u16::try_from(mem::size_of::<DirentHeader>() + name_len + 1)
+        .map_err(|_| Error::new(ENAMETOOLONG))?;
+    header.copy_from_slice(&DirentHeader {
+        inode: 0,
+        next_opaque_id: opaque + advance as u64,
+        record_len,
+        kind: DirentKind::Unspecified as u8,
+    });
+    //println!("EMULATED GETDENTS");
+
+    Ok(record_len.into())
+}
+pub unsafe fn fstat(fd: usize, buf: *mut crate::header::sys_stat::stat) -> Result<()> {
+    let mut redox_buf: syscall::Stat = Default::default();
+    redox_rt::sys::fstat(fd, &mut redox_buf)?;
+
+    if let Some(buf) = unsafe { buf.as_mut() } {
+        buf.st_dev = redox_buf.st_dev as dev_t;
+        buf.st_ino = redox_buf.st_ino as ino_t;
+        buf.st_nlink = redox_buf.st_nlink as nlink_t;
+        buf.st_mode = redox_buf.st_mode as mode_t;
+        buf.st_uid = redox_buf.st_uid as uid_t;
+        buf.st_gid = redox_buf.st_gid as gid_t;
+        // TODO st_rdev
+        buf.st_rdev = 0;
+        buf.st_size = redox_buf.st_size as off_t;
+        buf.st_blksize = redox_buf.st_blksize as blksize_t;
+        buf.st_blocks = redox_buf.st_blocks as blkcnt_t;
+        buf.st_atim = timespec {
+            tv_sec: redox_buf.st_atime as time_t,
+            tv_nsec: redox_buf.st_atime_nsec as c_long,
+        };
+        buf.st_mtim = timespec {
+            tv_sec: redox_buf.st_mtime as time_t,
+            tv_nsec: redox_buf.st_mtime_nsec as c_long,
+        };
+        buf.st_ctim = timespec {
+            tv_sec: redox_buf.st_ctime as time_t,
+            tv_nsec: redox_buf.st_ctime_nsec as c_long,
+        };
+    }
+    Ok(())
+}
+pub unsafe fn fstatvfs(fd: usize, buf: *mut crate::header::sys_statvfs::statvfs) -> Result<()> {
+    let mut kbuf: syscall::StatVfs = Default::default();
+    std_fs_call_ro(
+        fd,
+        &mut kbuf,
+        &StdFsCallMeta::new(StdFsCallKind::Fstatvfs, 0, 0),
+    )?;
+
+    if !buf.is_null() {
+        unsafe {
+            (*buf).f_bsize = kbuf.f_bsize as c_ulong;
+            (*buf).f_frsize = kbuf.f_bsize as c_ulong;
+            (*buf).f_blocks = kbuf.f_blocks as c_ulong;
+            (*buf).f_bfree = kbuf.f_bfree as c_ulong;
+            (*buf).f_bavail = kbuf.f_bavail as c_ulong;
+            //TODO
+            (*buf).f_files = 0;
+            (*buf).f_ffree = 0;
+            (*buf).f_favail = 0;
+            (*buf).f_fsid = 0;
+            (*buf).f_flag = 0;
+            (*buf).f_namemax = 0;
+        }
+    }
+    Ok(())
+}
+pub fn fsync(fd: usize) -> Result<()> {
+    std_fs_call_wo(fd, &[], &StdFsCallMeta::new(StdFsCallKind::Fsync, 0, 0))?;
+    Ok(())
+}
+pub fn ftruncate(fd: usize, len: usize) -> Result<()> {
+    std_fs_call_wo(
+        fd,
+        &[],
+        &StdFsCallMeta::new(StdFsCallKind::Ftruncate, len as u64, 0),
+    )?;
+    Ok(())
+}
+pub unsafe fn futimens(fd: usize, times: *const timespec) -> Result<()> {
+    let times = if times.is_null() {
+        // null means set to current time using special UTIME_NOW value (tv_sec is ignored in that case)
+        [
+            syscall::TimeSpec {
+                tv_sec: 0,
+                tv_nsec: UTIME_NOW as c_int,
+            },
+            syscall::TimeSpec {
+                tv_sec: 0,
+                tv_nsec: UTIME_NOW as c_int,
+            },
+        ]
+    } else {
+        unsafe { times.cast::<[timespec; 2]>().read() }.map(|ts| syscall::TimeSpec::from(&ts))
+    };
+    let redox_buf = unsafe {
+        slice::from_raw_parts(
+            times.as_ptr() as *const u8,
+            times.len() * mem::size_of::<syscall::TimeSpec>(),
+        )
+    };
+    std_fs_call_wo(
+        fd,
+        redox_buf,
+        &StdFsCallMeta::new(StdFsCallKind::Futimens, 0, 0),
+    )?;
+    Ok(())
+}
+pub fn clock_gettime(clock: usize, mut tp: Out<timespec>) -> Result<()> {
+    let mut redox_tp = syscall::TimeSpec::default();
+    syscall::clock_gettime(clock as usize, &mut redox_tp)?;
+    tp.write(timespec {
+        tv_sec: redox_tp.tv_sec as time_t,
+        tv_nsec: redox_tp.tv_nsec as c_long,
+    });
+    Ok(())
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_open_v1(
+    path_base: *const u8,
+    path_len: usize,
+    flags: u32,
+    mode: u16,
+) -> RawResult {
+    Error::mux(open(
+        unsafe { str::from_utf8_unchecked(slice::from_raw_parts(path_base, path_len)) },
+        flags as c_int,
+        mode as mode_t,
+    ))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_openat_v1(
+    fd: usize,
+    path_base: *const u8,
+    path_len: usize,
+    flags: u32,
+    fcntl_flags: u32,
+) -> RawResult {
+    Error::mux(syscall::openat(
+        fd,
+        unsafe { str::from_utf8_unchecked(slice::from_raw_parts(path_base, path_len)) },
+        flags as usize,
+        fcntl_flags as usize,
+    ))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_dup_v1(fd: usize, buf: *const u8, len: usize) -> RawResult {
+    Error::mux(syscall::dup(fd, unsafe {
+        core::slice::from_raw_parts(buf, len)
+    }))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_dup2_v1(
+    old_fd: usize,
+    new_fd: usize,
+    buf: *const u8,
+    len: usize,
+) -> RawResult {
+    Error::mux(syscall::dup2(old_fd, new_fd, unsafe {
+        core::slice::from_raw_parts(buf, len)
+    }))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_read_v1(fd: usize, dst_base: *mut u8, dst_len: usize) -> RawResult {
+    Error::mux(posix_read(fd, unsafe {
+        slice::from_raw_parts_mut(dst_base, dst_len)
+    }))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_write_v1(
+    fd: usize,
+    src_base: *const u8,
+    src_len: usize,
+) -> RawResult {
+    Error::mux(posix_write(fd, unsafe {
+        slice::from_raw_parts(src_base, src_len)
+    }))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_fchmod_v1(fd: usize, new_mode: u16) -> RawResult {
+    Error::mux(fchmod(fd, new_mode).map(|()| 0))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_fchown_v1(fd: usize, new_uid: u32, new_gid: u32) -> RawResult {
+    Error::mux(fchown(fd, new_uid, new_gid).map(|()| 0))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_getdents_v0(
+    fd: usize,
+    buf: *mut u8,
+    buf_len: usize,
+    opaque: u64,
+) -> RawResult {
+    Error::mux(
+        Sys::getdents(
+            fd as c_int,
+            unsafe { slice::from_raw_parts_mut(buf, buf_len) },
+            opaque,
+        )
+        .map_err(Into::into),
+    )
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_fstat_v1(
+    fd: usize,
+    stat: *mut crate::header::sys_stat::stat,
+) -> RawResult {
+    Error::mux(unsafe { fstat(fd, stat) }.map(|()| 0))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_fstatvfs_v1(
+    fd: usize,
+    stat: *mut crate::header::sys_statvfs::statvfs,
+) -> RawResult {
+    Error::mux(unsafe { fstatvfs(fd, stat) }.map(|()| 0))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_fsync_v1(fd: usize) -> RawResult {
+    Error::mux(fsync(fd).map(|()| 0))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_fdatasync_v1(fd: usize) -> RawResult {
+    // TODO
+    Error::mux(fsync(fd).map(|()| 0))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_ftruncate_v0(fd: usize, len: usize) -> RawResult {
+    Error::mux(ftruncate(fd, len).map(|()| 0))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_futimens_v1(fd: usize, times: *const timespec) -> RawResult {
+    Error::mux(unsafe { futimens(fd, times) }.map(|()| 0))
+}
+/* TODO: Support unlinkat
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_unlinkat_v0(
+    fd: usize,
+    path_base: *const u8,
+    path_len: usize,
+    flags: u32,
+) -> RawResult {
+    Error::mux(std_fs_call_wo(
+        fd,
+        unsafe { slice::from_raw_parts(path_base, path_len) },
+        &StdFsCallMeta::new(StdFsCallKind::Unlinkat, flags as u64, 0),
+    ))
+}
+*/
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_fpath_v1(fd: usize, dst_base: *mut u8, dst_len: usize) -> RawResult {
+    Error::mux(syscall::fpath(fd, unsafe {
+        core::slice::from_raw_parts_mut(dst_base, dst_len)
+    }))
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_close_v1(fd: usize) -> RawResult {
+    Error::mux(syscall::close(fd))
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_get_pid_v1() -> RawResult {
+    redox_rt::sys::posix_getpid() as _
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_get_euid_v1() -> RawResult {
+    redox_rt::sys::posix_getresugid().euid as _
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_get_ruid_v1() -> RawResult {
+    redox_rt::sys::posix_getresugid().ruid as _
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_get_egid_v1() -> RawResult {
+    redox_rt::sys::posix_getresugid().egid as _
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_get_rgid_v1() -> RawResult {
+    redox_rt::sys::posix_getresugid().rgid as _
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_get_ens_v0() -> RawResult {
+    Error::mux(redox_rt::sys::getens())
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_get_ns_v0() -> RawResult {
+    Error::mux(redox_rt::sys::getns())
+}
+#[allow(improper_ctypes_definitions)]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_get_proc_credentials_v1(
+    cap_fd: usize,
+    target_pid: usize,
+    buf: &mut [u8], // not FFI safe
+) -> RawResult {
+    Error::mux(redox_rt::sys::get_proc_credentials(cap_fd, target_pid, buf))
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_setrens_v1(rns: usize, ens: usize) -> RawResult {
+    let _ = if ens == 0 {
+        let null_namespace: [IoSlice; 2] = [IoSlice::new(b"memory"), IoSlice::new(b"pipe")];
+        match redox_rt::sys::mkns(&null_namespace) {
+            Ok(new_ns_fd) => redox_rt::sys::setns(new_ns_fd.take()),
+            Err(e) => return Error::mux(Err(e)),
+        }
+    } else {
+        redox_rt::sys::setns(ens)
+    };
+    0
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_waitpid_v1(pid: usize, status: *mut i32, options: u32) -> RawResult {
+    let mut sts = 0_usize;
+    let res = Error::mux(redox_rt::sys::sys_waitpid(
+        WaitpidTarget::from_posix_arg(pid as isize),
+        &mut sts,
+        WaitFlags::from_bits_truncate(options as usize),
+    ));
+    unsafe { status.write(sts as i32) };
+    res
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_kill_v1(pid: usize, signal: u32) -> RawResult {
+    Error::mux(
+        redox_rt::sys::posix_kill(ProcKillTarget::from_raw(pid), signal as usize).map(|()| 0),
+    )
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_sigaction_v1(
+    signal: u32,
+    new: *const sigaction,
+    old: *mut sigaction,
+) -> RawResult {
+    Error::mux(
+        Sys::sigaction(signal as c_int, unsafe { new.as_ref() }, unsafe {
+            old.as_mut()
+        })
+        .map(|()| 0)
+        .map_err(Into::into),
+    )
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_sigprocmask_v1(
+    how: u32,
+    new: *const u64,
+    old: *mut u64,
+) -> RawResult {
+    Error::mux(
+        Sys::sigprocmask(how as c_int, unsafe { new.as_ref() }, unsafe {
+            old.as_mut()
+        })
+        .map(|()| 0)
+        .map_err(Into::into),
+    )
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_mmap_v1(
+    addr: *mut (),
+    unaligned_len: usize,
+    prot: u32,
+    flags: u32,
+    fd: usize,
+    offset: u64,
+) -> RawResult {
+    Error::mux(unsafe {
+        syscall::fmap(
+            fd,
+            &syscall::Map {
+                address: addr as usize,
+                offset: offset as usize,
+                size: unaligned_len,
+                flags: syscall::MapFlags::from_bits_truncate(
+                    ((prot << 16) | (flags & 0xffff)) as usize,
+                ),
+            },
+        )
+    })
+}
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_munmap_v1(addr: *mut (), unaligned_len: usize) -> RawResult {
+    Error::mux(unsafe { syscall::funmap(addr as usize, unaligned_len) })
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_clock_gettime_v1(clock: usize, ts: *mut timespec) -> RawResult {
+    Error::mux(clock_gettime(clock, unsafe { Out::nonnull(ts) }).map(|()| 0))
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_strerror_v1(
+    buf: *mut u8,
+    buflen: *mut usize,
+    error: u32,
+) -> RawResult {
+    let dst = unsafe { core::slice::from_raw_parts_mut(buf, buflen.read()) };
+
+    Error::mux((|| {
+        // TODO: Merge syscall::error::STR_ERROR into crate::header::error::?
+
+        let src = syscall::error::STR_ERROR
+            .get(error as usize)
+            .ok_or(Error::new(EINVAL))?;
+
+        // This API ensures that the returned buffer is proper UTF-8. Thus, it returns both the
+        // copied length and the actual length.
+
+        unsafe { buflen.write(src.len()) };
+
+        let raw_len = core::cmp::min(dst.len(), src.len());
+        let len = match core::str::from_utf8(&src.as_bytes()[..raw_len]) {
+            Ok(_valid) => raw_len,
+            Err(error) => error.valid_up_to(),
+        };
+
+        dst[..len].copy_from_slice(&src.as_bytes()[..len]);
+        Ok(len)
+    })())
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_mkns_v1(
+    names: *const iovec,
+    num_names: usize,
+    flags: u32,
+) -> RawResult {
+    Error::mux((|| {
+        if flags != 0 {
+            return Err(Error::new(EINVAL));
+        }
+        let raw_iovecs = unsafe { slice::from_raw_parts(names, num_names) };
+        let names_ioslice: Vec<IoSlice> = raw_iovecs
+            .iter()
+            .map(|iov| {
+                IoSlice::new(unsafe {
+                    slice::from_raw_parts(iov.iov_base as *const u8, iov.iov_len)
+                })
+            })
+            .collect();
+        redox_rt::sys::mkns(&names_ioslice).map(|fd| fd.take())
+    })())
+}
+
+// ABI-UNSTABLE
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_cur_procfd_v0() -> usize {
+    redox_rt::current_proc_fd().as_raw_fd()
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_cur_thrfd_v0() -> usize {
+    redox_rt::RtTcb::current().thread_fd().as_raw_fd()
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_sys_call_v0(
+    fd: usize,
+    payload: *mut u8,
+    payload_len: usize,
+    flags: usize,
+    metadata: *const u64,
+    metadata_len: usize,
+) -> RawResult {
+    Error::mux(redox_rt::sys::sys_call(
+        fd,
+        unsafe { slice::from_raw_parts_mut(payload, payload_len) },
+        syscall::CallFlags::from_bits_retain(flags),
+        unsafe { slice::from_raw_parts(metadata, metadata_len) },
+    ))
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_get_socket_token_v0(
+    fd: usize,
+    payload: *mut u8,
+    payload_len: usize,
+) -> RawResult {
+    let metadata = [SocketCall::GetToken as u64];
+    Error::mux(redox_rt::sys::sys_call_ro(
+        fd,
+        unsafe { slice::from_raw_parts_mut(payload, payload_len) },
+        syscall::CallFlags::empty(),
+        &metadata,
+    ))
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_setns_v0(fd: usize) -> RawResult {
+    match redox_rt::sys::setns(fd) {
+        Some(guard) => guard.take(),
+        None => usize::MAX,
+    }
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn redox_register_scheme_to_ns_v0(
+    ns_fd: usize,
+    name_base: *const u8,
+    name_len: usize,
+    cap_fd: usize,
+) -> RawResult {
+    Error::mux(
+        redox_rt::sys::register_scheme_to_ns(
+            ns_fd,
+            unsafe { str::from_utf8_unchecked(slice::from_raw_parts(name_base, name_len)) },
+            cap_fd,
+        )
+        .map(|()| 0),
+    )
+}
diff --git a/recipes/core/relibc/src/platform/redox/mod.rs b/recipes/core/relibc/src/platform/redox/mod.rs
new file mode 100644
index 0000000000..752339a711
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/mod.rs
@@ -0,0 +1,1681 @@
+use core::{
+    convert::TryFrom,
+    mem::{self, size_of},
+    num::NonZeroU64,
+    ptr, slice, str,
+};
+use object::bytes_of_slice_mut;
+use redox_protocols::protocol::{WaitFlags, wifstopped};
+use redox_rt::{
+    RtTcb,
+    sys::{Resugid, WaitpidTarget},
+};
+use syscall::{
+    self, EILSEQ, ESRCH, Error, MODE_PERM, StdFsCallKind, StdFsCallMeta,
+    data::{Map, TimeSpec as redox_timespec},
+    dirent::DirentHeader,
+};
+
+use self::{
+    exec::Executable,
+    path::{FileLock, canonicalize, openat2, openat2_path},
+};
+use super::{Pal, Read, types::*};
+use crate::{
+    c_str::{CStr, CString},
+    error::{Errno, Result},
+    fs::File,
+    header::{
+        bits_timespec::timespec,
+        errno::{
+            EBADF, EBADFD, EEXIST, EFAULT, EFBIG, EINTR, EINVAL, EIO, ENAMETOOLONG, ENOENT, ENOMEM,
+            ENOSYS, EOPNOTSUPP, EPERM,
+        },
+        fcntl::{
+            self, AT_EACCESS, AT_EMPTY_PATH, AT_FDCWD, AT_REMOVEDIR, AT_SYMLINK_FOLLOW,
+            AT_SYMLINK_NOFOLLOW, F_GETLK, F_OFD_GETLK, F_OFD_SETLK, F_RDLCK, F_SETLK, F_SETLKW,
+            F_UNLCK, F_WRLCK, flock,
+        },
+        limits,
+        pthread::{pthread_cancel, pthread_create},
+        signal::{NSIG, SIGEV_NONE, SIGEV_SIGNAL, SIGEV_THREAD, SIGRTMIN, sigevent},
+        stdio::RENAME_NOREPLACE,
+        sys_file,
+        sys_mman::{MAP_ANONYMOUS, PROT_READ, PROT_WRITE},
+        sys_random,
+        sys_resource::{RLIM_INFINITY, rlimit, rusage},
+        sys_select::timeval,
+        sys_stat::{S_ISVTX, stat},
+        sys_statvfs::statvfs,
+        sys_time::timezone,
+        sys_utsname::{UTSLENGTH, utsname},
+        time::{TIMER_ABSTIME, itimerspec, timer_internal_t},
+        unistd::{F_OK, R_OK, SEEK_CUR, SEEK_SET, W_OK, X_OK},
+    },
+    io::{self, BufReader, prelude::*},
+    ld_so::tcb::OsSpecific,
+    out::Out,
+    platform::sys::timer::{timer_routine, timer_update_wake_time},
+    sync::rwlock::RwLock,
+};
+
+pub use redox_rt::proc::FdGuard;
+
+mod epoll;
+mod event;
+mod exec;
+mod extra;
+mod libcscheme;
+mod libredox;
+pub(crate) mod path;
+mod ptrace;
+pub(crate) mod signal;
+mod socket;
+mod timer;
+
+static mut BRK_CUR: *mut c_void = ptr::null_mut();
+static mut BRK_END: *mut c_void = ptr::null_mut();
+
+const PAGE_SIZE: usize = 4096;
+fn round_up_to_page_size(val: usize) -> Option<usize> {
+    val.checked_add(PAGE_SIZE)
+        .map(|val| (val - 1) / PAGE_SIZE * PAGE_SIZE)
+}
+
+fn cvt_uid(id: c_int) -> Result<Option<u32>> {
+    if id == -1 {
+        return Ok(None);
+    }
+    Ok(Some(id.try_into().map_err(|_| Errno(EINVAL))?))
+}
+
+macro_rules! path_from_c_str {
+    ($c_str:expr) => {{
+        match $c_str.to_str() {
+            Ok(ok) => ok,
+            Err(err) => {
+                ERRNO.set(EINVAL);
+                return -1;
+            }
+        }
+    }};
+}
+
+static CLONE_LOCK: RwLock<()> = RwLock::new(());
+
+/// Redox syscall implementation of [`Pal`].
+pub struct Sys;
+
+impl Pal for Sys {
+    fn access(path: CStr, mode: c_int) -> Result<()> {
+        Sys::faccessat(AT_FDCWD, path, mode, 0)
+    }
+
+    fn faccessat(fd: c_int, path: CStr, mode: c_int, flags: c_int) -> Result<()> {
+        let fd = FdGuard::new(Sys::openat(fd, path, fcntl::O_PATH | fcntl::O_CLOEXEC, 0)? as usize);
+
+        if (flags & !(AT_EACCESS)) != 0 {
+            return Err(Errno(EINVAL));
+        }
+
+        if mode == F_OK {
+            return Ok(());
+        }
+
+        let mut stat = syscall::Stat::default();
+
+        fd.fstat(&mut stat)?;
+
+        let Resugid {
+            ruid,
+            rgid,
+            euid,
+            egid,
+            ..
+        } = redox_rt::sys::posix_getresugid();
+        let (uid, gid) = if (flags & AT_EACCESS) == AT_EACCESS {
+            (euid, egid)
+        } else {
+            (ruid, rgid)
+        };
+
+        let perms = (if stat.st_uid == uid {
+            stat.st_mode >> (3 * 2)
+        } else if stat.st_gid == gid {
+            stat.st_mode >> (3 * 1)
+        } else {
+            stat.st_mode
+        }) & 0o7;
+        if (mode & R_OK == R_OK && perms & 0o4 != 0o4)
+            || (mode & W_OK == W_OK && perms & 0o2 != 0o2)
+            || (mode & X_OK == X_OK && perms & 0o1 != 0o1)
+        {
+            return Err(Errno(EINVAL));
+        }
+
+        Ok(())
+    }
+
+    unsafe fn brk(addr: *mut c_void) -> Result<*mut c_void> {
+        // On first invocation, allocate a buffer for brk
+        if unsafe { BRK_CUR }.is_null() {
+            // 4 megabytes of RAM ought to be enough for anybody
+            const BRK_MAX_SIZE: usize = 4 * 1024 * 1024;
+
+            let allocated = unsafe {
+                Self::mmap(
+                    ptr::null_mut(),
+                    BRK_MAX_SIZE,
+                    PROT_READ | PROT_WRITE,
+                    MAP_ANONYMOUS,
+                    0,
+                    0,
+                )
+            }?;
+
+            unsafe {
+                BRK_CUR = allocated;
+                BRK_END = (allocated as *mut u8).add(BRK_MAX_SIZE) as *mut c_void
+            };
+        }
+
+        if addr.is_null() {
+            // Lookup what previous brk() invocations have set the address to
+            Ok(unsafe { BRK_CUR })
+        } else if unsafe { BRK_CUR } <= addr && addr < unsafe { BRK_END } {
+            // It's inside buffer, return
+            unsafe { BRK_CUR = addr };
+            Ok(addr)
+        } else {
+            // It was outside of valid range
+            Err(Errno(ENOMEM))
+        }
+    }
+
+    fn chdir(path: CStr) -> Result<()> {
+        let path = path.to_str().map_err(|_| Errno(EINVAL))?;
+        path::chdir(path)?;
+        Ok(())
+    }
+
+    fn chmod(path: CStr, mode: mode_t) -> Result<()> {
+        let file = File::open(path, fcntl::O_PATH | fcntl::O_CLOEXEC)?;
+        Self::fchmod(*file, mode)
+    }
+
+    fn chown(path: CStr, owner: uid_t, group: gid_t) -> Result<()> {
+        let file = File::open(path, fcntl::O_PATH | fcntl::O_CLOEXEC)?;
+        Self::fchown(*file, owner, group)
+    }
+
+    fn clock_getres(clk_id: clockid_t, res: Option<Out<timespec>>) -> Result<()> {
+        let path = format!("/scheme/time/{clk_id}/getres");
+        let timerfd = FdGuard::open(&path, syscall::O_RDONLY)?;
+        let mut redox_res = timespec::default();
+        let buffer = unsafe {
+            slice::from_raw_parts_mut(
+                &mut redox_res as *mut _ as *mut u8,
+                mem::size_of::<timespec>(),
+            )
+        };
+
+        let bytes_read = redox_rt::sys::posix_read(timerfd.as_raw_fd(), buffer)?;
+
+        if bytes_read < mem::size_of::<timespec>() {
+            return Err(Errno(EIO));
+        }
+
+        if let Some(mut res) = res {
+            res.write(redox_res);
+        }
+
+        Ok(())
+    }
+
+    fn clock_gettime(clk_id: clockid_t, tp: Out<timespec>) -> Result<()> {
+        libredox::clock_gettime(clk_id as usize, tp)?;
+        Ok(())
+    }
+
+    unsafe fn clock_settime(clk_id: clockid_t, tp: *const timespec) -> Result<()> {
+        todo_skip!(0, "clock_settime({}, {:p}): not implemented", clk_id, tp);
+        Err(Errno(ENOSYS))
+    }
+
+    fn close(fd: c_int) -> Result<()> {
+        syscall::close(fd as usize)?;
+        Ok(())
+    }
+
+    fn dup(fd: c_int) -> Result<c_int> {
+        Ok(syscall::dup(fd as usize, &[])? as c_int)
+    }
+
+    fn dup2(fd1: c_int, fd2: c_int) -> Result<c_int> {
+        Ok(syscall::dup2(fd1 as usize, fd2 as usize, &[])? as c_int)
+    }
+
+    fn exit(status: c_int) -> ! {
+        let _ = redox_rt::sys::posix_exit(status);
+        loop {}
+    }
+
+    unsafe fn execve(path: CStr, argv: *const *mut c_char, envp: *const *mut c_char) -> Result<()> {
+        self::exec::execve(
+            Executable::AtPath(path),
+            self::exec::ArgEnv::C { argv, envp },
+            None,
+        )?;
+        unreachable!()
+    }
+    unsafe fn fexecve(
+        fildes: c_int,
+        argv: *const *mut c_char,
+        envp: *const *mut c_char,
+    ) -> Result<()> {
+        self::exec::execve(
+            Executable::InFd {
+                file: File::new(fildes),
+                arg0: unsafe { CStr::from_ptr(argv.read()) }.to_bytes(),
+            },
+            self::exec::ArgEnv::C { argv, envp },
+            None,
+        )?;
+        unreachable!()
+    }
+
+    fn fchdir(fd: c_int) -> Result<()> {
+        path::fchdir(fd)?;
+        Ok(())
+    }
+
+    fn fchmod(fd: c_int, mode: mode_t) -> Result<()> {
+        libredox::fchmod(fd as usize, mode as u16)?;
+        Ok(())
+    }
+
+    fn fchmodat(dirfd: c_int, path: Option<CStr>, mode: mode_t, flags: c_int) -> Result<()> {
+        const MASK: c_int = !(fcntl::AT_SYMLINK_NOFOLLOW | fcntl::AT_EMPTY_PATH);
+        if MASK & flags != 0 {
+            return Err(Errno(EINVAL));
+        }
+        let mut path = path
+            .and_then(|cs| str::from_utf8(cs.to_bytes()).ok())
+            .ok_or(Errno(ENOENT))?;
+
+        if path.is_empty() {
+            if flags & AT_EMPTY_PATH == AT_EMPTY_PATH {
+                if dirfd == AT_FDCWD {
+                    path = ".";
+                } else {
+                    return Sys::fchmod(dirfd, mode);
+                }
+            } else {
+                // If the path is empty but `AT_EMPTY_PATH` is **not** set, bail out.
+                return Err(Errno(ENOENT));
+            }
+        }
+
+        let file = openat2(dirfd, path, flags, 0)?;
+        libredox::fchmod(*file as usize, mode as u16)?;
+        Ok(())
+    }
+
+    fn fchown(fd: c_int, owner: uid_t, group: gid_t) -> Result<()> {
+        libredox::fchown(fd as usize, owner as u32, group as u32)?;
+        Ok(())
+    }
+
+    fn fchownat(fildes: c_int, path: CStr, owner: uid_t, group: gid_t, flags: c_int) -> Result<()> {
+        const MASK: c_int = !(fcntl::AT_SYMLINK_NOFOLLOW | fcntl::AT_EMPTY_PATH);
+        if MASK & flags != 0 {
+            return Err(Errno(EINVAL));
+        }
+        let path = path.to_str().map_err(|_| Errno(EINVAL))?;
+        let file = openat2(fildes, path, flags, 0)?;
+        libredox::fchown(
+            *file as usize,
+            owner.try_into().map_err(|_| Errno(EINVAL))?,
+            group.try_into().map_err(|_| Errno(EINVAL))?,
+        )?;
+        Ok(())
+    }
+
+    fn fcntl(fd: c_int, cmd: c_int, args: c_ulonglong) -> Result<c_int> {
+        match cmd {
+            F_SETLK | F_OFD_SETLK => {
+                let is_ofd = cmd == F_OFD_SETLK;
+                let flock = unsafe { &mut *(args as *mut flock) };
+
+                let (start, len) = Self::relative_to_absolute_foffset(
+                    fd as usize,
+                    flock.l_whence,
+                    flock.l_start,
+                    flock.l_len,
+                )?;
+
+                let start = start as u64 | if is_ofd { 1 << 63 } else { 0 };
+                let len = len as u64;
+
+                match flock.l_type as i32 {
+                    F_UNLCK => {
+                        let meta = StdFsCallMeta::new(StdFsCallKind::Unlock, start, len);
+                        syscall::std_fs_call(fd as usize, &mut [], &meta)?;
+                        return Ok(0);
+                    }
+
+                    F_RDLCK | F_WRLCK => {
+                        let meta = StdFsCallMeta::new(
+                            StdFsCallKind::Lock,
+                            start,
+                            len | if flock.l_type as i32 == F_WRLCK {
+                                1 << 63
+                            } else {
+                                0
+                            },
+                        );
+                        syscall::std_fs_call(fd as usize, &mut [], &meta)?;
+                        return Ok(0);
+                    }
+
+                    _ => return Err(Errno(EINVAL)),
+                };
+            }
+
+            F_GETLK | F_OFD_GETLK => {
+                let is_ofd = cmd == F_OFD_GETLK;
+                let flock = unsafe { &mut *(args as *mut flock) };
+
+                if is_ofd && flock.l_pid != 0 {
+                    log::warn!("POSIX requires `l_pid` to be 0 on input for `F_OFD_GETLK`");
+                    return Err(Errno(EINVAL));
+                }
+
+                let (start, len) = Self::relative_to_absolute_foffset(
+                    fd as usize,
+                    flock.l_whence,
+                    flock.l_start,
+                    flock.l_len,
+                )?;
+
+                let mut start = start as u64;
+                if is_ofd {
+                    start |= 1 << 63;
+                }
+
+                let mut len = len as u64;
+                if flock.l_type as i32 == F_WRLCK {
+                    len |= 1 << 63;
+                }
+
+                let meta = StdFsCallMeta::new(StdFsCallKind::GetLock, 0, 0);
+                let payload = &mut [start, len];
+                // `pid` if traditional POSIX otherwise 0
+                let val =
+                    match syscall::std_fs_call(fd as usize, bytes_of_slice_mut(payload), &meta) {
+                        // According to POSIX Issue 8:
+                        // > If no lock is found that would prevent this lock from being created, then
+                        // > the structure shall be left unchanged except for the lock type in `l_type`
+                        // > which shall be set to F_UNLCK.
+                        Err(err) if err.errno == ESRCH => {
+                            flock.l_type = F_UNLCK as i16;
+                            return Ok(0);
+                        }
+
+                        Ok(val) => val,
+                        Err(err) => return Err(Errno(err.errno)),
+                    };
+
+                debug_assert_ne!(payload[0] & (1 << 63), 1 << 63);
+
+                if is_ofd {
+                    flock.l_pid = -1;
+                } else {
+                    flock.l_pid = val as i32;
+                }
+
+                let len = payload[1] & !(1 << 63);
+                if payload[1] & (1 << 63) == (1 << 63) {
+                    flock.l_type = F_WRLCK as i16;
+                } else {
+                    flock.l_type = F_RDLCK as i16;
+                }
+
+                flock.l_whence = SEEK_SET as _;
+                flock.l_start = start as i64;
+                flock.l_len = len as i64;
+                return Ok(0);
+            }
+
+            F_SETLKW => log::warn!("F_SETLKW: not yet implemented"),
+
+            _ => {}
+        }
+
+        Ok(syscall::fcntl(fd as usize, cmd as usize, args as usize)? as c_int)
+    }
+
+    fn fdatasync(fd: c_int) -> Result<()> {
+        // TODO: "Needs" syscall update
+        syscall::fsync(fd as usize)?;
+        Ok(())
+    }
+
+    fn flock(_fd: c_int, _operation: c_int) -> Result<()> {
+        // TODO: Redox does not have file locking yet
+        Ok(())
+    }
+
+    unsafe fn fork() -> Result<pid_t> {
+        // TODO: Find way to avoid lock.
+        let _guard = CLONE_LOCK.write();
+
+        Ok(redox_rt::proc::fork_impl(&redox_rt::proc::ForkArgs::Managed)? as pid_t)
+    }
+
+    fn fstat(fildes: c_int, mut buf: Out<stat>) -> Result<()> {
+        unsafe {
+            libredox::fstat(fildes as usize, buf.as_mut_ptr())?;
+        }
+        Ok(())
+    }
+
+    fn fstatat(dirfd: c_int, path: Option<CStr>, buf: Out<stat>, flags: c_int) -> Result<()> {
+        // `path` should be non-null.
+        let path = path.ok_or(Errno(EFAULT))?;
+        let mut path = str::from_utf8(path.to_bytes()).ok().ok_or(Errno(EILSEQ))?;
+
+        if path.is_empty() {
+            if flags & AT_EMPTY_PATH == AT_EMPTY_PATH {
+                if dirfd == AT_FDCWD {
+                    path = ".";
+                } else {
+                    return Sys::fstat(dirfd, buf);
+                }
+            } else {
+                // If the path is empty but `AT_EMPTY_PATH` is **not** set, bail out.
+                return Err(Errno(ENOENT));
+            }
+        }
+
+        // Use `O_PATH` to obtain a file descriptor without actually *opening* the file. This
+        // bypasses permission checks and avoids cases where opening a file is blocking operation
+        // (e.g., FIFOs). This gives a file descriptor where fstat(2) can be performed (and some
+        // other meta operations) but nothing else (e.g. read/write).
+        //
+        // `O_CLOEXEC` is used to avoid leaking file descriptors to child processes on exec(2).
+        //
+        // FIXME: Ideally we would want the file descriptor to not leak on fork(2) too because
+        // fstatat(2) should not have side effects. However, Redox does not currently support that,
+        // so we use `CLOEXEC` as a compromise.
+        // FIXME: Should we handle AT_* flags here or in openat2?
+        let mut open_flags = fcntl::O_PATH | fcntl::O_CLOEXEC;
+        if flags & AT_SYMLINK_NOFOLLOW == AT_SYMLINK_NOFOLLOW {
+            open_flags |= fcntl::O_SYMLINK | fcntl::O_NOFOLLOW;
+        }
+
+        let file = openat2(dirfd, path, 0, open_flags)?;
+        // Close the file descriptor after fstat(2) regardless of success or failure.
+        let fstat_res = Sys::fstat(*file, buf);
+        let close_res = syscall::close(file.fd as usize);
+        if let Err(err) = fstat_res {
+            return Err(err);
+        }
+        close_res?;
+        fstat_res
+    }
+
+    fn fstatvfs(fildes: c_int, mut buf: Out<statvfs>) -> Result<()> {
+        unsafe {
+            libredox::fstatvfs(fildes as usize, buf.as_mut_ptr())?;
+        }
+        Ok(())
+    }
+
+    fn fsync(fd: c_int) -> Result<()> {
+        libredox::fsync(fd as usize)?;
+        Ok(())
+    }
+
+    fn ftruncate(fd: c_int, len: off_t) -> Result<()> {
+        libredox::ftruncate(fd as usize, len as usize)?;
+        Ok(())
+    }
+
+    #[inline]
+    unsafe fn futex_wait(addr: *mut u32, val: u32, deadline: Option<&timespec>) -> Result<()> {
+        let deadline = deadline.map(|d| syscall::TimeSpec {
+            tv_sec: d.tv_sec,
+            tv_nsec: d.tv_nsec as i32,
+        });
+        (unsafe { redox_rt::sys::sys_futex_wait(addr, val, deadline.as_ref()) })?;
+        Ok(())
+    }
+    #[inline]
+    unsafe fn futex_wake(addr: *mut u32, num: u32) -> Result<u32> {
+        Ok(unsafe { redox_rt::sys::sys_futex_wake(addr, num) }?)
+    }
+
+    unsafe fn futimens(fd: c_int, times: *const timespec) -> Result<()> {
+        (unsafe { libredox::futimens(fd as usize, times) })?;
+        Ok(())
+    }
+
+    unsafe fn utimens(path: CStr, times: *const timespec) -> Result<()> {
+        let file = File::open(path, fcntl::O_PATH | fcntl::O_CLOEXEC)?;
+        unsafe { Self::futimens(*file, times) }
+    }
+
+    fn getcwd(buf: Out<[u8]>) -> Result<()> {
+        path::getcwd(buf)?;
+        Ok(())
+    }
+
+    fn getdents(fd: c_int, buf: &mut [u8], opaque: u64) -> Result<usize> {
+        Ok(libredox::getdents(fd as usize, buf, opaque)?)
+    }
+
+    fn dir_seek(_fd: c_int, _off: u64) -> Result<()> {
+        // Redox getdents takes an explicit (opaque) offset, so this is a no-op.
+        Ok(())
+    }
+    // NOTE: fn is unsafe, but this just means we can assume more things. impl is safe
+    unsafe fn dent_reclen_offset(this_dent: &[u8], offset: usize) -> Option<(u16, u64)> {
+        let mut header = DirentHeader::default();
+        header.copy_from_slice(&this_dent.get(..size_of::<DirentHeader>())?);
+
+        // If scheme does not send a NUL byte, this shouldn't be able to cause UB for the caller.
+        if this_dent.get(usize::from(header.record_len) - 1) != Some(&b'\0') {
+            return None;
+        }
+
+        Some((header.record_len, header.next_opaque_id))
+    }
+
+    fn getegid() -> gid_t {
+        redox_rt::sys::posix_getresugid().egid as gid_t
+    }
+
+    fn geteuid() -> uid_t {
+        redox_rt::sys::posix_getresugid().euid as uid_t
+    }
+
+    fn getgid() -> gid_t {
+        redox_rt::sys::posix_getresugid().rgid as gid_t
+    }
+
+    fn getgroups(mut list: Out<[gid_t]>) -> Result<c_int> {
+        // FIXME: this operation doesn't scale when group/passwd file grows
+
+        let uid = Self::geteuid();
+        let pwd = crate::header::pwd::getpwuid(uid);
+
+        if pwd.is_null() {
+            return Err(Errno(ENOENT));
+        }
+
+        let username = unsafe { CStr::from_ptr((*pwd).pw_name) };
+        let username = username.to_bytes_with_nul();
+        let mut count = 0;
+
+        unsafe {
+            use crate::header::grp;
+            grp::setgrent();
+
+            while let Some(grp) = grp::getgrent().as_ref() {
+                let mut i = 0;
+                let mut found = false;
+
+                while !(*grp.gr_mem.offset(i)).is_null() {
+                    let member = CStr::from_ptr(*grp.gr_mem.offset(i));
+                    if member.to_bytes_with_nul() == username {
+                        found = true;
+                        break;
+                    }
+                    i += 1;
+                }
+
+                if found {
+                    if !list.is_empty() && (count as usize) < list.len() {
+                        list.index(count).write(grp.gr_gid);
+                    }
+                    count += 1;
+                }
+            }
+            grp::endgrent();
+        }
+
+        if !list.is_empty() && (count as usize) > list.len() {
+            return Err(Errno(EINVAL));
+        }
+
+        Ok(count as i32)
+    }
+
+    fn getpagesize() -> usize {
+        PAGE_SIZE
+    }
+
+    fn getpgid(pid: pid_t) -> Result<pid_t> {
+        Ok(redox_rt::sys::posix_getpgid(pid as usize)? as pid_t)
+    }
+
+    fn getpid() -> pid_t {
+        redox_rt::sys::posix_getpid() as pid_t
+    }
+
+    fn getppid() -> pid_t {
+        redox_rt::sys::posix_getppid() as pid_t
+    }
+
+    fn getpriority(which: c_int, who: id_t) -> Result<c_int> {
+        match redox_rt::sys::posix_getpriority(which, who as u32) {
+            Ok(kernel_prio) => {
+                let posix_prio = (kernel_prio as i32 * -1) + 40 as i32;
+                Ok(posix_prio)
+            }
+            Err(e) => Err(Errno(e.errno)),
+        }
+    }
+
+    fn getrandom(buf: &mut [u8], flags: c_uint) -> Result<usize> {
+        let path = if flags & sys_random::GRND_RANDOM != 0 {
+            //TODO: /dev/random equivalent
+            "/scheme/rand"
+        } else {
+            "/scheme/rand"
+        };
+
+        let mut open_flags = syscall::O_RDONLY | syscall::O_CLOEXEC;
+        if flags & sys_random::GRND_NONBLOCK != 0 {
+            open_flags |= syscall::O_NONBLOCK;
+        }
+
+        //TODO: store fd internally
+        let fd = FdGuard::open(path, open_flags)?;
+        Ok(fd.read(buf)?)
+    }
+
+    fn getresgid(
+        rgid_out: Option<Out<gid_t>>,
+        egid_out: Option<Out<gid_t>>,
+        sgid_out: Option<Out<gid_t>>,
+    ) -> Result<()> {
+        let Resugid {
+            rgid, egid, sgid, ..
+        } = redox_rt::sys::posix_getresugid();
+        if let Some(mut rgid_out) = rgid_out {
+            rgid_out.write(rgid as _);
+        }
+        if let Some(mut egid_out) = egid_out {
+            egid_out.write(egid as _);
+        }
+        if let Some(mut sgid_out) = sgid_out {
+            sgid_out.write(sgid as _);
+        }
+        Ok(())
+    }
+    fn getresuid(
+        ruid_out: Option<Out<uid_t>>,
+        euid_out: Option<Out<uid_t>>,
+        suid_out: Option<Out<uid_t>>,
+    ) -> Result<()> {
+        let Resugid {
+            ruid, euid, suid, ..
+        } = redox_rt::sys::posix_getresugid();
+        if let Some(mut ruid_out) = ruid_out {
+            ruid_out.write(ruid as _);
+        }
+        if let Some(mut euid_out) = euid_out {
+            euid_out.write(euid as _);
+        }
+        if let Some(mut suid_out) = suid_out {
+            suid_out.write(suid as _);
+        }
+        Ok(())
+    }
+
+    fn getrlimit(resource: c_int, mut rlim: Out<rlimit>) -> Result<()> {
+        todo_skip!(0, "getrlimit({}, {:p}): not implemented", resource, rlim);
+        rlim.write(rlimit {
+            rlim_cur: RLIM_INFINITY,
+            rlim_max: RLIM_INFINITY,
+        });
+        Ok(())
+    }
+
+    unsafe fn setrlimit(resource: c_int, rlim: *const rlimit) -> Result<()> {
+        todo_skip!(0, "setrlimit({}, {:p}): not implemented", resource, rlim);
+        Err(Errno(EPERM))
+    }
+
+    fn getrusage(who: c_int, r_usage: Out<rusage>) -> Result<()> {
+        todo_skip!(0, "getrusage({}, {:p}): not implemented", who, r_usage);
+        Ok(())
+    }
+
+    fn getsid(pid: pid_t) -> Result<pid_t> {
+        Ok(redox_rt::sys::posix_getsid(pid as usize)? as _)
+    }
+
+    fn gettid() -> pid_t {
+        // This is used by pthread mutexes for reentrant checks and must be nonzero
+        // and unique for each thread in the same process (but not cross-process)
+        let thread_fd = Self::current_os_tid().thread_fd;
+        (thread_fd & !syscall::UPPER_FDTBL_TAG)
+            .checked_add(1)
+            .unwrap()
+            .try_into()
+            .unwrap()
+    }
+
+    fn gettimeofday(mut tp: Out<timeval>, tzp: Option<Out<timezone>>) -> Result<()> {
+        let mut redox_tp = redox_timespec::default();
+        syscall::clock_gettime(syscall::CLOCK_REALTIME, &mut redox_tp)?;
+        tp.write(timeval {
+            tv_sec: redox_tp.tv_sec as time_t,
+            tv_usec: (redox_tp.tv_nsec / 1000) as suseconds_t,
+        });
+
+        if let Some(mut tzp) = tzp {
+            tzp.write(timezone {
+                tz_minuteswest: 0,
+                tz_dsttime: 0,
+            });
+        }
+        Ok(())
+    }
+
+    fn getuid() -> uid_t {
+        redox_rt::sys::posix_getresugid().ruid as uid_t
+    }
+
+    fn lchown(path: CStr, owner: uid_t, group: gid_t) -> Result<()> {
+        // TODO: Is it correct for regular chown to use O_PATH? On Linux the meaning of that flag
+        // is to forbid file operations, including fchown.
+
+        // unlike chown, never follow symbolic links
+        let file = File::open(path, fcntl::O_CLOEXEC | fcntl::O_NOFOLLOW)?;
+        Self::fchown(*file, owner, group)
+    }
+
+    fn linkat(fd1: c_int, oldpath: CStr, fd2: c_int, newpath: CStr, flags: c_int) -> Result<()> {
+        // make sure the flags passed are valid.
+        // valid states: AT_SYMLINK_FOLLOW, or 0.
+        if (flags & !(AT_SYMLINK_FOLLOW)) != 0 {
+            return Err(Errno(EINVAL));
+        }
+        let newpath = newpath.to_str().map_err(|_| Errno(EINVAL))?;
+
+        // By default, we don't follow the symlink if there is one.
+        // We only follow it if AT_SYMLINK_FOLLOW is passed in flags.
+        // We represent this by setting O_NOFOLLOW by default, and clearing it
+        // if AT_SYMLINK_FOLLOW is present.
+        let mut oflags = fcntl::O_PATH | fcntl::O_CLOEXEC | fcntl::O_NOFOLLOW;
+        if (flags & AT_SYMLINK_FOLLOW) == AT_SYMLINK_FOLLOW {
+            oflags &= !fcntl::O_NOFOLLOW;
+        }
+
+        let file = File::openat(fd1, oldpath, oflags)?;
+        let newpath = openat2_path(fd2, newpath, 0)?;
+        syscall::flink(*file as usize, newpath)?;
+        Ok(())
+    }
+
+    fn lseek(fd: c_int, offset: off_t, whence: c_int) -> Result<off_t> {
+        Ok(syscall::lseek(fd as usize, offset as isize, whence as usize)? as off_t)
+    }
+
+    fn mkdirat(dir_fd: c_int, path_name: CStr, mode: mode_t) -> Result<()> {
+        File::createat(
+            dir_fd,
+            path_name,
+            fcntl::O_DIRECTORY | fcntl::O_EXCL | fcntl::O_CLOEXEC,
+            0o777,
+        )?;
+        Ok(())
+    }
+
+    fn mkfifoat(dir_fd: c_int, path_name: CStr, mode: mode_t) -> Result<()> {
+        Sys::mknodat(
+            dir_fd,
+            path_name,
+            syscall::MODE_FIFO as mode_t | (mode & 0o777),
+            0,
+        )
+    }
+
+    fn mknodat(dir_fd: c_int, path_name: CStr, mode: mode_t, dev: dev_t) -> Result<()> {
+        File::createat(dir_fd, path_name, fcntl::O_CREAT | fcntl::O_CLOEXEC, mode)?;
+        Ok(())
+    }
+
+    unsafe fn mlock(addr: *const c_void, len: usize) -> Result<()> {
+        // Redox never swaps
+        Ok(())
+    }
+
+    unsafe fn mlockall(flags: c_int) -> Result<()> {
+        // Redox never swaps
+        Ok(())
+    }
+
+    unsafe fn mmap(
+        addr: *mut c_void,
+        len: usize,
+        prot: c_int,
+        flags: c_int,
+        fildes: c_int,
+        off: off_t,
+    ) -> Result<*mut c_void> {
+        // 0 is invalid per spec
+        if len == 0 {
+            return Err(Errno(EINVAL));
+        }
+        let Some(size) = round_up_to_page_size(len) else {
+            return Err(Errno(ENOMEM));
+        };
+
+        let map = Map {
+            offset: off as usize,
+            size,
+            flags: syscall::MapFlags::from_bits_truncate(
+                ((prot as usize) << 16) | ((flags as usize) & 0xFFFF),
+            ),
+            address: addr as usize,
+        };
+
+        Ok(if flags & MAP_ANONYMOUS == MAP_ANONYMOUS {
+            (unsafe { syscall::fmap(!0, &map) })?
+        } else {
+            (unsafe { syscall::fmap(fildes as usize, &map) })?
+        } as *mut c_void)
+    }
+
+    unsafe fn mremap(
+        addr: *mut c_void,
+        len: usize,
+        new_len: usize,
+        flags: c_int,
+        args: *mut c_void,
+    ) -> Result<*mut c_void> {
+        Err(Errno(ENOSYS))
+    }
+
+    unsafe fn mprotect(addr: *mut c_void, len: usize, prot: c_int) -> Result<()> {
+        let Some(len) = round_up_to_page_size(len) else {
+            return Err(Errno(ENOMEM));
+        };
+        let Some(prot) = syscall::MapFlags::from_bits((prot as usize) << 16) else {
+            return Err(Errno(EINVAL));
+        };
+        (unsafe { syscall::mprotect(addr as usize, len, prot) })?;
+        Ok(())
+    }
+
+    unsafe fn msync(addr: *mut c_void, len: usize, flags: c_int) -> Result<()> {
+        todo_skip!(
+            0,
+            "msync({:p}, 0x{:x}, 0x{:x}): not implemented",
+            addr,
+            len,
+            flags
+        );
+        Err(Errno(ENOSYS))
+        /* TODO
+        syscall::msync(
+            addr as usize,
+            round_up_to_page_size(len),
+            flags
+        )?;
+        */
+    }
+
+    unsafe fn munlock(addr: *const c_void, len: usize) -> Result<()> {
+        // Redox never swaps
+        Ok(())
+    }
+
+    unsafe fn munlockall() -> Result<()> {
+        // Redox never swaps
+        Ok(())
+    }
+
+    unsafe fn munmap(addr: *mut c_void, len: usize) -> Result<()> {
+        // 0 is invalid per spec
+        if len == 0 {
+            return Err(Errno(EINVAL));
+        }
+        let Some(len) = round_up_to_page_size(len) else {
+            return Err(Errno(ENOMEM));
+        };
+        (unsafe { syscall::funmap(addr as usize, len) })?;
+        Ok(())
+    }
+
+    unsafe fn madvise(addr: *mut c_void, len: usize, flags: c_int) -> Result<()> {
+        todo_skip!(
+            0,
+            "madvise({:p}, 0x{:x}, 0x{:x}): not implemented",
+            addr,
+            len,
+            flags
+        );
+        Err(Errno(ENOSYS))
+    }
+
+    unsafe fn nanosleep(rqtp: *const timespec, rmtp: *mut timespec) -> Result<()> {
+        let redox_rqtp = unsafe { redox_timespec::from(&*rqtp) };
+        let mut redox_rmtp: redox_timespec;
+        if rmtp.is_null() {
+            redox_rmtp = redox_timespec::default();
+        } else {
+            redox_rmtp = unsafe { redox_timespec::from(&*rmtp) };
+        }
+        match redox_rt::sys::posix_nanosleep(&redox_rqtp, &mut redox_rmtp) {
+            Ok(_) => Ok(()),
+            Err(Error { errno: EINTR }) => {
+                unsafe {
+                    if !rmtp.is_null() {
+                        (*rmtp).tv_sec = redox_rmtp.tv_sec as time_t;
+                        (*rmtp).tv_nsec = redox_rmtp.tv_nsec as c_long;
+                    }
+                };
+                Err(Errno(EINTR))
+            }
+            Err(Error { errno: e }) => Err(Errno(e)),
+        }
+    }
+
+    fn open(path: CStr, oflag: c_int, mode: mode_t) -> Result<c_int> {
+        let path = path.to_str().map_err(|_| Errno(EINVAL))?;
+
+        // POSIX states that umask should affect the following:
+        //
+        // open, openat, creat, mkdir, mkdirat,
+        // mkfifo, mkfifoat, mknod, mknodat,
+        // mq_open, and sem_open,
+        //
+        // all of which (the ones that exist thus far) currently call this function.
+        let effective_mode = mode & !(redox_rt::sys::get_umask() as mode_t);
+
+        Ok(libredox::open(path, oflag, effective_mode)? as c_int)
+    }
+
+    fn openat(dirfd: c_int, path: CStr, oflag: c_int, mode: mode_t) -> Result<c_int> {
+        let path = path.to_str().map_err(|_| Errno(EINVAL))?;
+
+        // POSIX states that umask should affect the following:
+        //
+        // open, openat, creat, mkdir, mkdirat,
+        // mkfifo, mkfifoat, mknod, mknodat,
+        // mq_open, and sem_open,
+        //
+        // all of which (the ones that exist thus far) currently call this function.
+        let effective_mode = mode & !(redox_rt::sys::get_umask() as mode_t);
+
+        Ok(libredox::openat(dirfd, path, oflag, effective_mode)? as c_int)
+    }
+
+    fn pipe2(mut fds: Out<[c_int; 2]>, flags: c_int) -> Result<()> {
+        fds.write(extra::pipe2(flags as usize)?);
+        Ok(())
+    }
+
+    fn posix_fallocate(fd: c_int, offset: u64, length: NonZeroU64) -> Result<()> {
+        // Redox doesn't actually have flock yet but presumably the file will need to be locked to
+        // avoid accidentally truncating it if the length changes.
+        let _guard = FileLock::lock(fd, sys_file::LOCK_EX)?;
+
+        // posix_fallocate is less nuanced than the Linux syscall fallocate.
+        // If the byte range is already allocated, posix_fallocate doesn't do any extra work.
+        // If the byte range is unallocated; free, uninitialized bytes are reserved.
+        // posix_fallocate does not shrink files.
+        //
+        // The main purpose of it is to ensure subsequent writes to a byte range don't fail.
+        let length = length.get();
+        let total_offset = offset.checked_add(length).ok_or(Errno(EFBIG))?;
+
+        let mut stat: stat = unsafe { mem::zeroed() };
+        unsafe { libredox::fstat(fd as usize, &mut stat)? };
+        let st_size = stat.st_size as u64;
+        // The difference between total_offset and the file size is the number of bytes to
+        // allocate. So, if it's negative then the file is already large enough and we don't
+        // need to do any extra work.
+        if let Some(total_len) = total_offset
+            .checked_sub(st_size)
+            .and_then(|diff| st_size.checked_add(diff))
+        {
+            let total_len: usize = total_len.try_into().map_err(|_| Errno(EFBIG))?;
+            libredox::ftruncate(fd as usize, total_len)?;
+        }
+
+        Ok(())
+    }
+
+    fn posix_getdents(fildes: c_int, buf: &mut [u8]) -> Result<usize> {
+        let current_offset = Self::lseek(fildes, 0, SEEK_CUR)? as u64;
+        let bytes_read = Self::getdents(fildes, buf, current_offset)?;
+        if bytes_read == 0 {
+            return Ok(0);
+        }
+        let mut bytes_processed = 0;
+        let mut next_offset = current_offset;
+
+        while bytes_processed < bytes_read {
+            let remaining_slice = &buf[bytes_processed..];
+            let (reclen, opaque_next) =
+                unsafe { Self::dent_reclen_offset(remaining_slice, bytes_processed) }
+                    .ok_or(Errno(EIO))?;
+            if reclen == 0 {
+                return Err(Errno(EIO));
+            }
+
+            bytes_processed += reclen as usize;
+            next_offset = opaque_next;
+        }
+
+        Self::lseek(fildes, next_offset as off_t, SEEK_SET)?;
+        Ok(bytes_read)
+    }
+
+    unsafe fn rlct_clone(
+        stack: *mut usize,
+        os_specific: &mut OsSpecific,
+    ) -> Result<crate::pthread::OsTid> {
+        let _guard = CLONE_LOCK.read();
+        let res = unsafe { redox_rt::thread::rlct_clone_impl(stack, os_specific) };
+
+        res.map(|thread_fd| crate::pthread::OsTid { thread_fd })
+            .map_err(|error| Errno(error.errno))
+    }
+
+    unsafe fn rlct_kill(os_tid: crate::pthread::OsTid, signal: usize) -> Result<()> {
+        redox_rt::sys::posix_kill_thread(os_tid.thread_fd, signal as u32)?;
+        Ok(())
+    }
+    fn current_os_tid() -> crate::pthread::OsTid {
+        crate::pthread::OsTid {
+            thread_fd: RtTcb::current().thread_fd().as_raw_fd(),
+        }
+    }
+
+    fn read(fd: c_int, buf: &mut [u8]) -> Result<usize> {
+        let fd = usize::try_from(fd).map_err(|_| Errno(EBADF))?;
+        Ok(redox_rt::sys::posix_read(fd, buf)?)
+    }
+
+    fn pread(fd: c_int, buf: &mut [u8], offset: off_t) -> Result<usize> {
+        unsafe {
+            Ok(syscall::syscall5(
+                syscall::SYS_READ2,
+                fd as usize,
+                buf.as_mut_ptr() as usize,
+                buf.len(),
+                offset as usize,
+                !0,
+            )?)
+        }
+    }
+
+    fn fpath(fildes: c_int, out: &mut [u8]) -> Result<usize> {
+        // Since this is used by realpath, it converts from the old format to the new one for
+        // compatibility reasons
+        let mut buf = [0; limits::PATH_MAX];
+        let count = syscall::fpath(fildes as usize, &mut buf)?;
+
+        let redox_path = str::from_utf8(&buf[..count])
+            .ok()
+            .and_then(|x| redox_path::RedoxPath::from_absolute(x))
+            .ok_or(Errno(EINVAL))?;
+
+        let (scheme, reference) = redox_path.as_parts().ok_or(Errno(EINVAL))?;
+
+        let mut cursor = io::Cursor::new(out);
+        let res = match scheme.as_ref() {
+            "file" => write!(cursor, "/{}", reference.as_ref().trim_start_matches('/')),
+            _ => write!(
+                cursor,
+                "/scheme/{}/{}",
+                scheme.as_ref(),
+                reference.as_ref().trim_start_matches('/')
+            ),
+        };
+        match res {
+            Ok(()) => Ok(cursor.position() as usize),
+            Err(_err) => Err(Errno(ENAMETOOLONG)),
+        }
+    }
+
+    fn readlinkat(dirfd: c_int, path: CStr, out: &mut [u8]) -> Result<usize> {
+        let path = str::from_utf8(path.to_bytes()).map_err(|_| Errno(ENOENT))?;
+        let file = openat2(
+            dirfd,
+            path,
+            0,
+            fcntl::O_RDONLY | fcntl::O_SYMLINK | fcntl::O_CLOEXEC,
+        )?;
+        Sys::read(*file, out)
+    }
+
+    fn rename(oldpath: CStr, newpath: CStr) -> Result<()> {
+        let newpath = newpath.to_str().map_err(|_| Errno(EINVAL))?;
+        let newpath = canonicalize(newpath).map_err(|_| Errno(EINVAL))?;
+
+        let file = File::open(
+            oldpath,
+            fcntl::O_NOFOLLOW | fcntl::O_PATH | fcntl::O_CLOEXEC,
+        )?;
+        syscall::frename(*file as usize, newpath)?;
+        Ok(())
+    }
+
+    fn renameat(old_dir: c_int, old_path: CStr, new_dir: c_int, new_path: CStr) -> Result<()> {
+        Sys::renameat2(old_dir, old_path, new_dir, new_path, 0)
+    }
+
+    fn renameat2(
+        old_dir: c_int,
+        old_path: CStr,
+        new_dir: c_int,
+        new_path: CStr,
+        flags: c_uint,
+    ) -> Result<()> {
+        const MASK: c_uint = !RENAME_NOREPLACE;
+        if MASK & flags != 0 {
+            return Err(Errno(EOPNOTSUPP));
+        }
+
+        let new_path = new_path.to_str().map_err(|_| Errno(EINVAL))?;
+        // Fail if the target exists with RENAME_NOREPLACE.
+        if flags & RENAME_NOREPLACE != 0
+            && let Ok(fd) =
+                libredox::openat(new_dir, &new_path, fcntl::O_PATH | fcntl::O_CLOEXEC, 0)
+                    .map(FdGuard::new)
+        {
+            return Err(Errno(EEXIST));
+        }
+
+        let old_path = old_path.to_str().map_err(|_| Errno(EINVAL))?;
+        // oflags are the same as Sys::rename above.
+        let source = openat2(old_dir, old_path, 0, fcntl::O_NOFOLLOW | fcntl::O_PATH)?;
+
+        let target = openat2_path(new_dir, new_path, 0)?;
+        // I'm avoiding Sys::rename to avoid reallocating a CString from a String.
+        syscall::frename(*source as usize, target)
+            .map(|_| ())
+            .map_err(Into::into)
+    }
+
+    fn rmdir(path: CStr) -> Result<()> {
+        let path = path.to_str().map_err(|_| Errno(EINVAL))?;
+        let canon = canonicalize(path)?;
+        redox_rt::sys::unlink(&canon, fcntl::AT_REMOVEDIR as usize)?;
+        Ok(())
+    }
+
+    fn sched_yield() -> Result<()> {
+        syscall::sched_yield()?;
+        Ok(())
+    }
+
+    unsafe fn setgroups(size: size_t, list: *const gid_t) -> Result<()> {
+        // TODO
+        todo_skip!(0, "setgroups({}, {:p}): not implemented", size, list);
+        Err(Errno(ENOSYS))
+    }
+
+    fn setpgid(pid: pid_t, pgid: pid_t) -> Result<()> {
+        redox_rt::sys::posix_setpgid(pid as usize, pgid as usize)?;
+        Ok(())
+    }
+
+    fn setpriority(which: c_int, who: id_t, prio: c_int) -> Result<()> {
+        let clamped_prio = prio.clamp(-20, 19);
+        let kernel_prio = (20 + clamped_prio) as u32;
+
+        match redox_rt::sys::posix_setpriority(which, who as u32, kernel_prio) {
+            Ok(_) => Ok(()),
+            Err(e) => Err(Errno(e.errno)),
+        }
+    }
+
+    fn setsid() -> Result<c_int> {
+        Ok(redox_rt::sys::posix_setsid()? as c_int)
+    }
+
+    fn setresgid(rgid: gid_t, egid: gid_t, sgid: gid_t) -> Result<()> {
+        redox_rt::sys::posix_setresugid(&Resugid {
+            ruid: None,
+            euid: None,
+            suid: None,
+            rgid: cvt_uid(rgid)?,
+            egid: cvt_uid(egid)?,
+            sgid: cvt_uid(sgid)?,
+        })?;
+        Ok(())
+    }
+
+    fn setresuid(ruid: uid_t, euid: uid_t, suid: uid_t) -> Result<()> {
+        redox_rt::sys::posix_setresugid(&Resugid {
+            ruid: cvt_uid(ruid)?,
+            euid: cvt_uid(euid)?,
+            suid: cvt_uid(suid)?,
+            rgid: None,
+            egid: None,
+            sgid: None,
+        })?;
+        Ok(())
+    }
+
+    fn symlink(path1: CStr, path2: CStr) -> Result<()> {
+        Sys::symlinkat(path1, AT_FDCWD, path2)
+    }
+
+    fn symlinkat(path1: CStr, fd: c_int, path2: CStr) -> Result<()> {
+        let mut file = File::createat(
+            fd,
+            path2,
+            fcntl::O_WRONLY | fcntl::O_SYMLINK | fcntl::O_CLOEXEC,
+            0o777,
+        )?;
+
+        file.write(path1.to_bytes())
+            .map_err(|err| Errno(err.raw_os_error().unwrap_or(EIO)))?;
+
+        Ok(())
+    }
+
+    fn sync() -> Result<()> {
+        Ok(())
+    }
+
+    fn timer_create(clock_id: clockid_t, evp: &sigevent, mut timerid: Out<timer_t>) -> Result<()> {
+        if evp.sigev_notify == SIGEV_THREAD {
+            if evp.sigev_notify_function.is_none() {
+                return Err(Errno(EINVAL));
+            }
+        } else if evp.sigev_notify == SIGEV_SIGNAL {
+            const n_sig: i32 = NSIG as i32;
+            const rt_min: i32 = SIGRTMIN as i32;
+            const rt_max: i32 = SIGRTMIN as i32;
+            match evp.sigev_signo {
+                0..n_sig => {}
+                rt_min..=rt_max => {}
+                _ => {
+                    return Err(Errno(EINVAL));
+                }
+            }
+        }
+
+        let path = format!("/scheme/time/{clock_id}");
+        let timerfd = FdGuard::open(&path, syscall::O_RDWR)?;
+        let eventfd = FdGuard::new(Error::demux(unsafe {
+            event::redox_event_queue_create_v1(0)
+        })?);
+        let caller_thread = Self::current_os_tid();
+
+        let timer_buf = unsafe {
+            let timer_buf = Self::mmap(
+                ptr::null_mut(),
+                size_of::<timer_internal_t>(),
+                PROT_READ | PROT_WRITE,
+                MAP_ANONYMOUS,
+                0,
+                0,
+            )?;
+
+            let timer_ptr = timer_buf as *mut timer_internal_t;
+            let timer_st = &mut *timer_ptr;
+
+            timer_st.clockid = clock_id;
+            timer_st.timerfd = timerfd.take();
+            timer_st.eventfd = eventfd.take();
+            timer_st.evp = (*evp).clone();
+            timer_st.next_wake_time = itimerspec::default();
+            timer_st.thread = ptr::null_mut();
+            timer_st.caller_thread = caller_thread;
+            timer_st.process_pid = 0;
+            timer_buf
+        };
+
+        timerid.write(timer_buf);
+
+        Ok(())
+    }
+
+    fn timer_delete(timerid: timer_t) -> Result<()> {
+        unsafe {
+            let timer_st = &mut *(timerid as *mut timer_internal_t);
+            let _ = syscall::close(timer_st.timerfd);
+            let _ = syscall::close(timer_st.eventfd);
+            if !timer_st.thread.is_null() {
+                let _ = pthread_cancel(timer_st.thread);
+            }
+            Self::munmap(timerid, size_of::<timer_internal_t>())?;
+        }
+
+        Ok(())
+    }
+
+    fn timer_gettime(timerid: timer_t, mut value: Out<itimerspec>) -> Result<()> {
+        let timer_st = unsafe { &mut *(timerid as *mut timer_internal_t) };
+        let mut now = timespec::default();
+        Self::clock_gettime(timer_st.clockid, Out::from_mut(&mut now))?;
+
+        if timer_st.evp.sigev_notify == SIGEV_NONE {
+            if timespec::subtract(timer_st.next_wake_time.it_value.clone(), now.clone()).is_none() {
+                // error here means the timer is disarmed
+                let _ = timer_update_wake_time(timer_st);
+            }
+        }
+
+        value.write(if timer_st.next_wake_time.it_value.is_default() {
+            // disarmed
+            itimerspec::default()
+        } else {
+            itimerspec {
+                it_interval: timer_st.next_wake_time.it_interval.clone(),
+                it_value: timespec::subtract(timer_st.next_wake_time.it_value.clone(), now)
+                    .unwrap_or_default(),
+            }
+        });
+
+        Ok(())
+    }
+
+    fn timer_settime(
+        timerid: timer_t,
+        flags: c_int,
+        value: &itimerspec,
+        ovalue: Option<Out<itimerspec>>,
+    ) -> Result<()> {
+        let timer_st = unsafe { &mut *(timerid as *mut timer_internal_t) };
+
+        if let Some(ovalue) = ovalue {
+            Self::timer_gettime(timerid, ovalue)?;
+        }
+
+        let mut now = timespec::default();
+        Self::clock_gettime(timer_st.clockid, Out::from_mut(&mut now))?;
+
+        //FIXME: make these atomic?
+        timer_st.next_wake_time = {
+            let mut val = value.clone();
+            if flags & TIMER_ABSTIME == 0 {
+                val.it_value = timespec::add(now, val.it_value).ok_or(Errno(EINVAL))?;
+            }
+            val
+        };
+
+        Error::demux(unsafe {
+            event::redox_event_queue_ctl_v1(timer_st.eventfd, timer_st.timerfd, 1, 0)
+        })?;
+
+        let buf_to_write = unsafe {
+            slice::from_raw_parts(
+                &timer_st.next_wake_time.it_value as *const _ as *const u8,
+                mem::size_of::<timespec>(),
+            )
+        };
+
+        let bytes_written = redox_rt::sys::posix_write(timer_st.timerfd, buf_to_write)?;
+
+        if bytes_written < mem::size_of::<timespec>() {
+            return Err(Errno(EIO));
+        }
+
+        if timer_st.thread.is_null() {
+            timer_st.thread = match timer_st.evp.sigev_notify {
+                SIGEV_THREAD | SIGEV_SIGNAL => {
+                    let mut tid = pthread_t::default();
+                    let result = unsafe {
+                        pthread_create(
+                            &mut tid as *mut _,
+                            ptr::null(),
+                            timer_routine,
+                            timerid as *mut c_void,
+                        )
+                    };
+                    if result != 0 {
+                        return Err(Errno(result));
+                    }
+                    tid
+                }
+                SIGEV_NONE => ptr::null_mut(),
+                _ => {
+                    return Err(Errno(EINVAL));
+                }
+            };
+        }
+
+        Ok(())
+    }
+
+    fn umask(mask: mode_t) -> mode_t {
+        let new_effective_mask = mask & mode_t::from(MODE_PERM) & !S_ISVTX;
+        (redox_rt::sys::swap_umask(new_effective_mask as u32) as mode_t) & !S_ISVTX
+    }
+
+    fn uname(mut utsname: Out<utsname>) -> Result<(), Errno> {
+        fn gethostname(mut name: Out<[u8]>) -> io::Result<()> {
+            if name.is_empty() {
+                return Ok(());
+            }
+
+            let mut file = File::open(c"/etc/hostname".into(), fcntl::O_RDONLY | fcntl::O_CLOEXEC)?;
+
+            let mut read = 0;
+            let name_len = name.len();
+            loop {
+                match file.read_out(name.subslice(read, name_len - 1))? {
+                    0 => break,
+                    n => read += n,
+                }
+            }
+            name.index(read).write(0);
+            Ok(())
+        }
+        out_project! {
+            let utsname {
+                nodename: [c_char; UTSLENGTH],
+                sysname: [c_char; UTSLENGTH],
+                release: [c_char; UTSLENGTH],
+                machine: [c_char; UTSLENGTH],
+                version: [c_char; UTSLENGTH],
+                domainname: [c_char; UTSLENGTH],
+            } = utsname;
+        }
+
+        match gethostname(nodename.as_slice_mut().cast_slice_to::<u8>()) {
+            Ok(_) => (),
+            Err(_) => return Err(Errno(EIO)),
+        }
+
+        let file_path = c"/scheme/sys/uname".into();
+        let mut file = match File::open(file_path, fcntl::O_RDONLY | fcntl::O_CLOEXEC) {
+            Ok(ok) => ok,
+            Err(_) => return Err(Errno(EIO)),
+        };
+        let mut lines = BufReader::new(&mut file).lines();
+
+        let mut read_line = |mut dst: Out<[u8]>| {
+            // TODO: set nul byte without allocating CString
+            let line = match lines.next() {
+                Some(Ok(l)) => CString::new(l).map_err(|_| Errno(EIO))?,
+                None | Some(Err(_)) => return Err(Errno(EIO)),
+            };
+
+            let line_slice: &[u8] = line.as_bytes_with_nul();
+            if line_slice.len() > UTSLENGTH {
+                return Err(Errno(EIO));
+            }
+
+            dst.copy_common_length_from_slice(line_slice);
+            Ok(())
+        };
+
+        // The file format is currently as follows:
+        // <sysname>\n e.g. "Redox"
+        // <release>\n e.g. "0.9.0"
+        // <machine>\n e.g. "x86_64"
+        // <version>\n e.g. "yyyy-mm-ddThh:mm:ssZ"
+
+        // A future file format might add the domainname.
+
+        // nodename is handled above with /etc/hostname, and the domainname is
+        // currently zeroed out.
+
+        read_line(sysname.as_slice_mut().cast_slice_to::<u8>())?;
+        read_line(release.as_slice_mut().cast_slice_to::<u8>())?;
+        read_line(machine.as_slice_mut().cast_slice_to::<u8>())?;
+        read_line(version.as_slice_mut().cast_slice_to::<u8>())?;
+
+        // Redox doesn't provide domainname in uname scheme
+        //read_line(domainname.as_slice_mut().cast_slice_to::<u8>())?;
+        domainname.as_slice_mut().zero();
+
+        Ok(())
+    }
+
+    fn unlink(path: CStr) -> Result<()> {
+        let path = path.to_str().map_err(|_| Errno(EINVAL))?;
+        let canon = canonicalize(path)?;
+        redox_rt::sys::unlink(&canon, 0)?;
+        Ok(())
+    }
+
+    fn unlinkat(fd: c_int, path: CStr, flags: c_int) -> Result<()> {
+        if (flags & !AT_REMOVEDIR) != 0 {
+            return Err(Errno(EINVAL));
+        }
+        let path = path.to_str().map_err(|_| Errno(EINVAL))?;
+        let path = openat2_path(fd, path, 0)?;
+        let canon = canonicalize(&path)?;
+        redox_rt::sys::unlink(&canon, flags.try_into().map_err(|_| Errno(EINVAL))?)?;
+        Ok(())
+    }
+
+    fn waitpid(pid: pid_t, stat_loc: Option<Out<'_, c_int>>, options: c_int) -> Result<pid_t> {
+        let res = None;
+        let mut status = 0;
+
+        let options = usize::try_from(options)
+            .ok()
+            .and_then(WaitFlags::from_bits)
+            .ok_or(Errno(EINVAL))?;
+
+        let inner = |status: &mut usize, flags| {
+            redox_rt::sys::sys_waitpid(WaitpidTarget::from_posix_arg(pid as isize), status, flags)
+        };
+
+        // First, allow ptrace to handle waitpid
+        // TODO: Handle special PIDs here (such as -1)
+        let state = ptrace::init_state();
+        // TODO: Fix ptrace deadlock seen during openposixtestsuite signals tests
+        // let mut sessions = state.sessions.lock();
+        // if let Ok(session) = ptrace::get_session(&mut sessions, pid) {
+        //     if !options.contains(WaitFlags::WNOHANG) {
+        //         let mut _event = PtraceEvent::default();
+        //         let _ = (&mut &session.tracer).read(&mut _event);
+
+        //         res = Some(inner(
+        //             &mut status,
+        //             options | WaitFlags::WNOHANG | WaitFlags::WUNTRACED,
+        //         ));
+        //         if res == Some(Ok(0)) {
+        //             // WNOHANG, just pretend ptrace SIGSTOP:ped this
+        //             status = (redox_rt::protocol::SIGSTOP << 8) | 0x7f;
+        //             assert!(wifstopped(status));
+        //             assert_eq!(wstopsig(status), redox_rt::protocol::SIGSTOP);
+        //             res = Some(Ok(pid as usize));
+        //         }
+        //     }
+        // }
+
+        // If ptrace didn't impact this waitpid, proceed *almost* as
+        // normal: We still need to add WUNTRACED, but we only return
+        // it if (and only if) a ptrace traceme was activated during
+        // the wait.
+        let res = res.unwrap_or_else(|| {
+            loop {
+                let res = inner(&mut status, options | WaitFlags::WUNTRACED);
+
+                // TODO: Also handle special PIDs here
+                if !wifstopped(status)
+                    || options.contains(WaitFlags::WUNTRACED)
+                    || ptrace::is_traceme(pid)
+                {
+                    break res;
+                }
+            }
+        });
+
+        // If stat_loc is non-null, set that and the return
+        if let Some(mut stat_loc) = stat_loc {
+            stat_loc.write(status as c_int);
+        }
+
+        Ok(res? as pid_t)
+    }
+
+    fn write(fd: c_int, buf: &[u8]) -> Result<usize> {
+        let fd = usize::try_from(fd).map_err(|_| Errno(EBADFD))?;
+        Ok(redox_rt::sys::posix_write(fd, buf)?)
+    }
+    fn pwrite(fd: c_int, buf: &[u8], offset: off_t) -> Result<usize> {
+        unsafe {
+            Ok(syscall::syscall5(
+                syscall::SYS_WRITE2,
+                fd as usize,
+                buf.as_ptr() as usize,
+                buf.len(),
+                offset as usize,
+                !0,
+            )?)
+        }
+    }
+
+    fn verify() -> bool {
+        // YIELD on Redox is 20, which is SYS_ARCH_PRCTL on Linux
+        (unsafe { syscall::syscall5(syscall::number::SYS_YIELD, !0, !0, !0, !0, !0) }).is_ok()
+    }
+
+    unsafe fn exit_thread(stack_base: *mut (), stack_size: usize) -> ! {
+        unsafe { redox_rt::thread::exit_this_thread(stack_base, stack_size) }
+    }
+}
+
+impl Sys {
+    fn relative_to_absolute_foffset(
+        fd: usize,
+        whence: c_short,
+        start: off_t,
+        len: off_t,
+    ) -> Result<(off_t, off_t)> {
+        // let file_off = Self::lseek(fd, 0, SEEK_SET)?;
+        match whence as i32 {
+            SEEK_SET => {
+                let (start, len) = if len < 0 {
+                    (start + len, -len)
+                } else {
+                    (start, len)
+                };
+
+                if start < 0 {
+                    return Err(Errno(EINVAL));
+                }
+
+                assert!(len >= 0);
+                Ok((start, len))
+            }
+            // FIXME: andypython: SEEK_CUR, SEEK_END
+            c => {
+                log::warn!(
+                    "Sys::relative_to_absolute_foffset: whence={whence} not yet implemented"
+                );
+                Ok((0, 0))
+            }
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/platform/redox/path.rs b/recipes/core/relibc/src/platform/redox/path.rs
new file mode 100644
index 0000000000..4d4ae48358
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/path.rs
@@ -0,0 +1,522 @@
+use alloc::{
+    boxed::Box,
+    collections::btree_set::BTreeSet,
+    ffi::CString,
+    string::{String, ToString},
+    vec::Vec,
+};
+use core::{ffi::c_int, str};
+use redox_rt::{proc::FdGuardUpper, signal::tmp_disable_signals};
+use syscall::{data::Stat, error::*, flag::*};
+
+use super::{FdGuard, Pal, Sys, libcscheme};
+use crate::{
+    error::Errno,
+    fs::File,
+    header::{fcntl, limits, sys_file},
+    out::Out,
+    sync::rwlock::{ReadGuard, RwLock},
+};
+
+pub use redox_path::{RedoxPath, canonicalize_using_cwd};
+
+pub fn normalize_path<'a>(path: &'a str) -> Option<(bool, String)> {
+    let absolute = match RedoxPath::from_absolute(path) {
+        Some(absolute) => absolute,
+        None => return Some((true, partially_canonical(path)?)),
+    };
+    let canonical = absolute.canonical()?;
+    Some((false, canonical.to_string()))
+}
+
+pub fn normalize_scheme_rooted_path<'a>(path: &'a str) -> Option<(bool, String)> {
+    let absolute = match RedoxPath::from_absolute(path) {
+        Some(absolute) => absolute,
+        None => return Some((true, partially_canonical(path)?)),
+    };
+    let canonical = absolute.canonical()?;
+    Some((false, scheme_rooted_path(&canonical.to_string()).ok()?))
+}
+
+fn partially_canonical(path: &str) -> Option<String> {
+    let mut stack = Vec::new();
+    let mut paths_to_check = BTreeSet::new();
+    let mut up_counts = 0;
+
+    for part in path.split('/') {
+        if part.is_empty() || part == "." {
+            continue;
+        } else if part == ".." {
+            if let Some(part) = stack.pop() {
+                paths_to_check.insert(
+                    core::iter::repeat("..")
+                        .take(up_counts)
+                        .chain(stack.clone())
+                        .chain(core::iter::once(part))
+                        .collect::<Vec<_>>()
+                        .join("/"),
+                );
+            } else {
+                up_counts += 1;
+            }
+        } else {
+            stack.push(part);
+        }
+    }
+
+    for path in paths_to_check {
+        let _ = current_dir()
+            .ok()?
+            .as_ref()
+            .unwrap()
+            .fd
+            .openat(&path, O_STAT, 0)
+            .ok()?;
+    }
+
+    Some(
+        core::iter::repeat("..")
+            .take(up_counts)
+            .chain(stack)
+            .collect::<Vec<_>>()
+            .join("/"),
+    )
+}
+
+// POSIX states chdir is both thread-safe and signal-safe. Thus we need to synchronize access to CWD, but at the
+// same time forbid signal handlers from running in the meantime, to avoid reentrant deadlock.
+pub fn chdir(path: &str) -> Result<()> {
+    let _siglock = tmp_disable_signals();
+    let mut cwd_guard = CWD.write();
+    let (is_relative, path) = normalize_path(path).ok_or(Error::new(ENOENT))?;
+    if is_relative {
+        let fd = cwd_guard
+            .as_ref()
+            .unwrap()
+            .fd
+            .openat(&path, O_STAT, 0)?
+            .to_upper()
+            .unwrap();
+        let mut stat = Stat::default();
+        if fd.fstat(&mut stat).is_err() || (stat.st_mode & MODE_TYPE) != MODE_DIR {
+            return Err(Error::new(ENOTDIR));
+        }
+
+        let canon = canonicalize_using_cwd(cwd_guard.as_ref().map(|c| c.path.as_ref()), &path)
+            .ok_or(Error::new(ENOENT))?;
+        *cwd_guard = Some(Cwd {
+            path: canon.into_boxed_str(),
+            fd,
+        });
+    } else {
+        let canon_with_scheme = scheme_rooted_path(&path)?;
+
+        let fd = FdGuard::open(&canon_with_scheme, O_STAT)?
+            .to_upper()
+            .unwrap();
+        let mut stat = Stat::default();
+        if fd.fstat(&mut stat).is_err() || (stat.st_mode & MODE_TYPE) != MODE_DIR {
+            return Err(Error::new(ENOTDIR));
+        }
+
+        *cwd_guard = Some(Cwd {
+            path: path.into_boxed_str(),
+            fd,
+        });
+    }
+
+    Ok(())
+}
+
+pub fn fchdir(fd: c_int) -> Result<()> {
+    let mut buf = [0_u8; limits::PATH_MAX];
+    let res = Sys::fpath(fd, &mut buf)?;
+
+    let path = core::str::from_utf8(&buf[..res])
+        .map_err(|_| Errno(EINVAL))?
+        .to_string();
+    let fd = FdGuard::new(syscall::fcntl(
+        fd as usize,
+        syscall::F_DUPFD,
+        syscall::UPPER_FDTBL_TAG,
+    )?)
+    .to_upper()
+    .unwrap();
+    set_cwd_manual(path.into_boxed_str(), fd);
+    Ok(())
+}
+
+// getcwd is similarly both thread-safe and signal-safe.
+pub fn getcwd(mut buf: Out<[u8]>) -> Result<usize> {
+    let _siglock = tmp_disable_signals();
+    let guard = CWD.read();
+    let cwd = guard.as_ref().ok_or(Error::new(ENOENT))?;
+    let path_bytes = cwd.path.as_bytes();
+
+    let [mut before, mut after] = buf
+        .split_at_checked(path_bytes.len())
+        .ok_or(Error::new(ERANGE))?;
+
+    before.copy_from_slice(path_bytes);
+    after.zero();
+
+    Ok(path_bytes.len())
+}
+
+// Get Cwd object
+pub fn current_dir() -> Result<ReadGuard<'static, Option<Cwd>>> {
+    let _siglock = tmp_disable_signals();
+    let guard = CWD.read();
+
+    if guard.as_ref().is_none() {
+        return Err(Error::new(ENOENT));
+    }
+
+    Ok(guard)
+}
+
+fn scheme_rooted_path(path: &str) -> Result<String> {
+    let standard_scheme = path == "/scheme" || path.starts_with("/scheme/");
+    let legacy_scheme = path
+        .split("/")
+        .next()
+        .map(|c| c.contains(":"))
+        .unwrap_or(false);
+
+    Ok(if standard_scheme || legacy_scheme {
+        path.to_string()
+    } else {
+        let mut result = format!("/scheme/file{}", path);
+
+        // Trim trailing / to keep path canonical.
+        if result.as_bytes().last() == Some(&b'/') {
+            result.pop();
+        }
+
+        result
+    })
+}
+
+// TODO: How much of this logic should be in redox-path?
+fn canonicalize_with_cwd_internal(cwd: Option<&str>, path: &str) -> Result<String> {
+    let path = canonicalize_using_cwd(cwd, path).ok_or(Error::new(ENOENT))?;
+    scheme_rooted_path(&path)
+}
+
+pub fn canonicalize(path: &str) -> Result<String> {
+    let _siglock = tmp_disable_signals();
+    let cwd_guard = CWD.read();
+    canonicalize_with_cwd_internal(cwd_guard.as_ref().map(|c| c.path.as_ref()), path)
+}
+
+pub struct Cwd {
+    pub path: Box<str>,
+    pub fd: FdGuardUpper,
+}
+
+// TODO: arraystring?
+static CWD: RwLock<Option<Cwd>> = RwLock::new(None);
+
+pub fn set_cwd_manual(path: Box<str>, fd: FdGuardUpper) {
+    let _siglock = tmp_disable_signals();
+    *CWD.write() = Some(Cwd { path, fd });
+}
+
+pub fn clone_cwd() -> Option<Box<str>> {
+    let _siglock = tmp_disable_signals();
+    CWD.read().as_ref().map(|cwd| cwd.path.clone())
+}
+
+fn open_absolute(path: &str, flags: usize) -> Result<usize> {
+    if path.starts_with(libcscheme::LIBC_SCHEME) {
+        libcscheme::open(path, flags)
+    } else {
+        redox_rt::sys::open(path, flags)
+    }
+}
+
+fn link_target(fd: FdGuard) -> Result<String> {
+    let mut resolve_buf = [0_u8; limits::PATH_MAX];
+    let count = fd.read(&mut resolve_buf)?;
+    if count == resolve_buf.len() {
+        // TODO: make resolve_buf PATH_MAX + 1 bytes?
+        return Err(Error::new(ENAMETOOLONG));
+    }
+    // If the symbolic link path is non-UTF8, it cannot be opened, and is thus
+    // considered a "dangling symbolic link".
+    core::str::from_utf8(&resolve_buf[..count])
+        .map_err(|_| Error::new(ENOENT))
+        .map(|s| s.to_string())
+}
+
+fn read_link_content(path: &str, is_relative: bool) -> Result<String> {
+    let resolve_flags = O_CLOEXEC | O_SYMLINK | O_RDONLY;
+
+    let fd = if is_relative {
+        current_dir()?
+            .as_ref()
+            .unwrap()
+            .fd
+            .openat(path, resolve_flags, 0)?
+    } else {
+        FdGuard::open(path, resolve_flags)?
+    };
+
+    link_target(fd)
+}
+
+fn calc_next_abs_path(current_abs: &str, link_target: &str) -> Result<String> {
+    let parent = get_parent_path(current_abs).ok_or(Error::new(ENOENT))?;
+
+    canonicalize_using_cwd(Some(&parent), link_target).ok_or(Error::new(ENOENT))
+}
+
+fn resolve_sym_links(mut current_path_string: String, flags: usize) -> Result<usize> {
+    // TODO: SYMLOOP_MAX
+    const MAX_LEVEL: usize = 64;
+    // Sym reolve loop
+    for _ in 0..(MAX_LEVEL - 1) {
+        match open_absolute(&current_path_string, flags) {
+            Ok(fd) => return Ok(fd),
+            Err(e) if e == Error::new(EXDEV) => {
+                let link_target = read_link_content(&current_path_string, false)?;
+
+                current_path_string = calc_next_abs_path(&current_path_string, &link_target)?;
+            }
+            Err(e) => return Err(e),
+        }
+    }
+
+    Err(Error::new(ELOOP))
+}
+
+// TODO: Move to redox-rt, or maybe part of it?
+pub fn openat(dirfd: c_int, path: &str, flags: usize) -> Result<usize> {
+    if path.is_empty() && flags as i32 & fcntl::AT_EMPTY_PATH != fcntl::AT_EMPTY_PATH {
+        return Err(Error::new(ENOENT));
+    }
+
+    let (is_relative, path_to_open) = normalize_path(path).ok_or(Error::new(ENOENT))?;
+
+    if !is_relative {
+        return open(path, flags);
+    }
+
+    let _siglock = tmp_disable_signals();
+    let fcntl_flags = flags & syscall::O_FCNTL_MASK;
+    // First try
+    let initial_res = if dirfd == fcntl::AT_FDCWD {
+        current_dir()?
+            .as_ref()
+            .unwrap()
+            .fd
+            .openat(&path_to_open, flags, fcntl_flags)
+            .map(|fd: FdGuard| fd.take())
+    } else {
+        redox_rt::sys::openat(dirfd as usize, &path_to_open, flags, fcntl_flags)
+    };
+
+    let current_path_string = match initial_res {
+        Ok(fd) => return Ok(fd),
+        Err(e) if e == Error::new(EXDEV) => {
+            let resolve_flags = O_CLOEXEC | O_SYMLINK | O_RDONLY;
+
+            let fd = if dirfd == fcntl::AT_FDCWD {
+                current_dir()?
+                    .as_ref()
+                    .unwrap()
+                    .fd
+                    .openat(path, resolve_flags, 0)?
+            } else {
+                redox_rt::sys::openat(dirfd as usize, &path_to_open, flags, fcntl_flags)
+                    .map(FdGuard::new)?
+            };
+
+            let link_target = link_target(fd)?;
+
+            let current_abs = openat2_path(dirfd, path, 0)?;
+            calc_next_abs_path(&current_abs, &link_target)?
+        }
+        Err(e) => return Err(e),
+    };
+
+    resolve_sym_links(current_path_string, flags)
+}
+
+// TODO: Move to redox-rt, or maybe part of it?
+pub fn open(path: &str, flags: usize) -> Result<usize> {
+    let _siglock = tmp_disable_signals();
+    if path == "" {
+        return Err(Error::new(ENOENT));
+    }
+
+    let (is_relative, canon) = normalize_scheme_rooted_path(path).ok_or(Error::new(ENOENT))?;
+
+    // First try
+    let initial_res = if is_relative {
+        let fcntl_flags = flags & syscall::O_FCNTL_MASK;
+        current_dir()?
+            .as_ref()
+            .unwrap()
+            .fd
+            .openat(&canon, flags, fcntl_flags)
+            .map(|fd: FdGuard| fd.take())
+    } else {
+        open_absolute(&canon, flags)
+    };
+
+    let current_path_string = match initial_res {
+        Ok(fd) => return Ok(fd),
+        Err(e) if e == Error::new(EXDEV) => {
+            let link_target = read_link_content(&canon, is_relative)?;
+
+            let cwd_guard = CWD.read();
+            let current_abs =
+                canonicalize_using_cwd(cwd_guard.as_ref().map(|c| c.path.as_ref()), &canon)
+                    .ok_or(Error::new(ENOENT))?;
+
+            calc_next_abs_path(&current_abs, &link_target)?
+        }
+        Err(e) => return Err(e),
+    };
+
+    // Sym reolve loop
+    resolve_sym_links(current_path_string, flags)
+}
+
+fn get_parent_path(path: &str) -> Option<String> {
+    let path = path.strip_suffix('/').unwrap_or(path);
+    fn parent_opt(path: &str) -> Option<&str> {
+        path.rfind('/').map(|index| {
+            if index == 0 {
+                // Path is something like "/file.txt" or the root "/".
+                // The parent is the root directory "/".
+                "/"
+            } else {
+                // Path is something like "/a/b/c.txt".
+                // Take the slice from the beginning up to the last '/'.
+                &path[..index]
+            }
+        })
+    }
+    match RedoxPath::from_absolute(path) {
+        Some(path) => {
+            let (scheme, reference) = path.as_parts()?;
+            let parent_ref = parent_opt(reference.as_ref()).unwrap_or("");
+            Some(format!("/scheme/{}/{}", scheme.as_ref(), parent_ref))
+        }
+        None => parent_opt(path).map(String::from),
+    }
+}
+
+pub fn dir_path_and_fd_path(socket_path: &str) -> Result<(String, String)> {
+    let _siglock = tmp_disable_signals();
+    let cwd_guard = CWD.read();
+    let cwd_path = cwd_guard.as_ref().map(|c| c.path.as_ref());
+
+    let full_path = canonicalize_with_cwd_internal(cwd_path, socket_path)?;
+
+    let redox_path = RedoxPath::from_absolute(&full_path).ok_or(Error::new(EINVAL))?;
+    let (_, ref_path) = redox_path.as_parts().ok_or(Error::new(EINVAL))?;
+    if ref_path.as_ref().is_empty() {
+        return Err(Error::new(EINVAL));
+    }
+    if redox_path.is_default_scheme() {
+        let dir_to_open = get_parent_path(&full_path).ok_or(Error::new(EINVAL))?;
+        Ok((dir_to_open, ref_path.as_ref().to_string()))
+    } else {
+        let full_path = canonicalize_with_cwd_internal(cwd_path, ref_path.as_ref())?;
+        let redox_path = RedoxPath::from_absolute(&full_path).ok_or(Error::new(EINVAL))?;
+        let (_, path) = redox_path.as_parts().ok_or(Error::new(EINVAL))?;
+        let dir_to_open = get_parent_path(&full_path).ok_or(Error::new(EINVAL))?;
+        Ok((dir_to_open, path.as_ref().to_string()))
+    }
+}
+
+pub struct FileLock(c_int);
+
+impl FileLock {
+    pub fn lock(fd: c_int, op: c_int) -> Result<Self> {
+        if op & sys_file::LOCK_SH | sys_file::LOCK_EX == 0 {
+            return Err(Error::new(EINVAL));
+        }
+
+        Sys::flock(fd, op)?;
+        Ok(Self(fd))
+    }
+
+    pub fn unlock(self) -> Result<()> {
+        Sys::flock(self.0, sys_file::LOCK_UN).map_err(Into::into)
+    }
+}
+
+impl Drop for FileLock {
+    fn drop(&mut self) {
+        let fd = self.0;
+        self.0 = -1;
+        let _ = Sys::flock(self.0, sys_file::LOCK_UN);
+    }
+}
+/// Resolve `path` under `dirfd`.
+///
+/// See [`openat2`] for more information.
+pub(super) fn openat2_path(dirfd: c_int, path: &str, at_flags: c_int) -> Result<String, Errno> {
+    // Ideally, the function calling this fn would check AT_EMPTY_PATH and just call fstat or
+    // whatever with the fd.
+    if path.is_empty() && at_flags & fcntl::AT_EMPTY_PATH != fcntl::AT_EMPTY_PATH {
+        return Err(Errno(ENOENT));
+    }
+
+    // Absolute paths are passed without processing unless RESOLVE_BENEATH is used.
+    // canonicalize_using_cwd checks that path is absolute so a third branch that does so here
+    // isn't needed.
+    if dirfd == fcntl::AT_FDCWD {
+        // The special constant AT_FDCWD indicates that we should use the cwd.
+        let cwd_guard = CWD.read();
+        canonicalize_using_cwd(cwd_guard.as_ref().map(|c| c.path.as_ref()), path)
+            .ok_or(Errno(EBADF))
+    } else {
+        let mut buf = [0; limits::PATH_MAX];
+        let len = Sys::fpath(dirfd, &mut buf)?;
+        // SAFETY: fpath checks then copies valid UTF8.
+        let dir = unsafe { str::from_utf8_unchecked(&buf[..len]) };
+
+        canonicalize_using_cwd(Some(dir), path).ok_or(Errno(EBADF))
+    }
+}
+
+/// Canonicalize and open `path` with respect to `dirfd`.
+///
+/// This unexported openat2 is similar to the Linux syscall but with a different interface. The
+/// naming is mostly for convenience - it's not a drop in replacement for openat2.
+///
+/// # Arguments
+/// * `dirfd` is a directory descriptor to which `path` is resolved.
+/// * `path` is a relative or absolute path. Relative paths are resolved in relation to `dirfd`
+/// while absolute paths skip `dirfd`.
+/// * `at_flags` constrains how `path` is resolved.
+/// * `oflags` are flags that are passed to open.
+///
+/// # Constants
+/// `at_flags`:
+/// * AT_EMPTY_PATH returns the path at `dirfd` itself if `path` is empty. If `path` is not
+/// empty, it's resolved w.r.t `dirfd` like normal.
+///
+/// `dirfd`:
+/// `AT_FDCWD` is a special constant for `dirfd` that resolves `path` under the current working
+/// directory.
+pub(super) fn openat2(
+    dirfd: c_int,
+    path: &str,
+    at_flags: c_int,
+    oflags: c_int,
+) -> Result<File, Errno> {
+    // Translate at flags into open flags; openat will do this on its own most likely.
+    let oflags = if at_flags & fcntl::AT_SYMLINK_NOFOLLOW == fcntl::AT_SYMLINK_NOFOLLOW {
+        fcntl::O_CLOEXEC | fcntl::O_NOFOLLOW | fcntl::O_PATH | fcntl::O_SYMLINK | oflags
+    } else {
+        fcntl::O_CLOEXEC | oflags
+    };
+    let c_path = CString::new(path).map_err(|_| Errno(EINVAL))?;
+    File::openat(dirfd, c_path.as_c_str().into(), oflags)
+}
diff --git a/recipes/core/relibc/src/platform/redox/ptrace.rs b/recipes/core/relibc/src/platform/redox/ptrace.rs
new file mode 100644
index 0000000000..eef280d46b
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/ptrace.rs
@@ -0,0 +1,290 @@
+//! Note: This module is not going to be clean. We're not going to be
+//! able to follow the specs 100%. Linux ptrace is very, very,
+//! different to Redox. Many people agree that Linux ptrace is bad, so
+//! we are NOT going to bend our API for the sake of
+//! compatibility. So, this module will be a hellhole.
+
+use super::super::{ERRNO, PalPtrace, Sys, types::*};
+#[cfg(target_arch = "x86_64")]
+use super::super::{Pal, PalSignal};
+#[cfg(target_arch = "x86_64")]
+use crate::header::arch_x64_user::user_regs_struct;
+use crate::{
+    c_str::{CStr, CString},
+    error::Errno,
+    fs::File,
+    header::{
+        errno::{self as errnoh, EIO},
+        fcntl,
+    },
+    io,
+    raw_cell::RawCell,
+    sync::Mutex,
+};
+#[cfg(target_arch = "x86_64")]
+use crate::{
+    header::{signal, sys_ptrace},
+    io::prelude::*,
+};
+
+use alloc::collections::{BTreeMap, btree_map::Entry};
+#[cfg(target_arch = "x86_64")]
+use core::mem;
+#[cfg(target_arch = "x86_64")]
+use syscall;
+
+pub struct Session {
+    pub first: bool,
+    pub fpregs: File,
+    pub mem: File,
+    pub regs: File,
+    pub tracer: File,
+}
+pub struct State {
+    pub sessions: Mutex<BTreeMap<pid_t, Session>>,
+}
+impl State {
+    fn new() -> Self {
+        Self {
+            sessions: Mutex::new(BTreeMap::new()),
+        }
+    }
+}
+
+#[thread_local]
+static STATE: RawCell<Option<State>> = RawCell::new(None);
+
+pub fn init_state() -> &'static State {
+    // Safe due to STATE being thread_local (TODO: is it though?)
+    unsafe {
+        if STATE.unsafe_ref().is_none() {
+            STATE.unsafe_set(Some(State::new()));
+        }
+        let state_ptr = STATE.unsafe_ref().as_ref().unwrap() as *const State;
+        &*state_ptr
+    }
+}
+pub fn is_traceme(pid: pid_t) -> bool {
+    // Skip special PIDs (<=0)
+    if pid <= 0 {
+        return false;
+    }
+    File::open(
+        CStr::borrow(&CString::new(format!("/scheme/chan/ptrace-relibc/{}/traceme", pid)).unwrap()),
+        fcntl::O_PATH,
+    )
+    .is_ok()
+}
+pub fn get_session(
+    sessions: &mut BTreeMap<pid_t, Session>,
+    pid: pid_t,
+) -> io::Result<&mut Session> {
+    const NEW_FLAGS: c_int = fcntl::O_RDWR | fcntl::O_CLOEXEC;
+
+    match sessions.entry(pid) {
+        Entry::Vacant(entry) => {
+            if is_traceme(pid) {
+                Ok(entry.insert(Session {
+                    first: true,
+                    tracer: File::open(
+                        CStr::borrow(&CString::new(format!("/scheme/proc/{}/trace", pid)).unwrap()),
+                        NEW_FLAGS,
+                    )?,
+                    mem: File::open(
+                        CStr::borrow(&CString::new(format!("/scheme/proc/{}/mem", pid)).unwrap()),
+                        NEW_FLAGS,
+                    )?,
+                    regs: File::open(
+                        CStr::borrow(
+                            &CString::new(format!("/scheme/proc/{}/regs/int", pid)).unwrap(),
+                        ),
+                        NEW_FLAGS,
+                    )?,
+                    fpregs: File::open(
+                        CStr::borrow(
+                            &CString::new(format!("/scheme/proc/{}/regs/float", pid)).unwrap(),
+                        ),
+                        NEW_FLAGS,
+                    )?,
+                }))
+            } else {
+                ERRNO.set(errnoh::ESRCH);
+                Err(io::last_os_error())
+            }
+        }
+        Entry::Occupied(entry) => Ok(entry.into_mut()),
+    }
+}
+
+#[cfg(target_arch = "aarch64")]
+unsafe fn inner_ptrace(
+    request: c_int,
+    pid: pid_t,
+    addr: *mut c_void,
+    data: *mut c_void,
+) -> io::Result<c_int> {
+    //TODO: aarch64
+    unimplemented!("inner_ptrace not implemented on aarch64");
+}
+
+#[cfg(target_arch = "x86")]
+unsafe fn inner_ptrace(
+    request: c_int,
+    pid: pid_t,
+    addr: *mut c_void,
+    data: *mut c_void,
+) -> io::Result<c_int> {
+    //TODO: x86
+    unimplemented!("inner_ptrace not implemented on x86");
+}
+
+#[cfg(target_arch = "x86_64")]
+unsafe fn inner_ptrace(
+    request: c_int,
+    pid: pid_t,
+    addr: *mut c_void,
+    data: *mut c_void,
+) -> io::Result<c_int> {
+    let state = init_state();
+
+    if request == sys_ptrace::PTRACE_TRACEME {
+        // Mark this child as traced, parent will check for this marker file
+        let pid = Sys::getpid();
+        mem::forget(File::open(
+            CStr::borrow(
+                &CString::new(format!("/scheme/chan/ptrace-relibc/{}/traceme", pid)).unwrap(),
+            ),
+            fcntl::O_CREAT | fcntl::O_PATH | fcntl::O_EXCL,
+        )?);
+        return Ok(0);
+    }
+
+    let mut sessions = state.sessions.lock();
+    let session = get_session(&mut sessions, pid)?;
+
+    match request {
+        sys_ptrace::PTRACE_CONT
+        | sys_ptrace::PTRACE_SINGLESTEP
+        | sys_ptrace::PTRACE_SYSCALL
+        | sys_ptrace::PTRACE_SYSEMU
+        | sys_ptrace::PTRACE_SYSEMU_SINGLESTEP => {
+            if let Ok(()) = Sys::kill(pid, signal::SIGCONT as _) {}; // TODO handle error
+
+            // TODO: Translate errors
+            let syscall = syscall::PTRACE_STOP_PRE_SYSCALL | syscall::PTRACE_STOP_POST_SYSCALL;
+            (&mut &session.tracer).write(&match request {
+                sys_ptrace::PTRACE_CONT => syscall::PtraceFlags::empty(),
+                sys_ptrace::PTRACE_SINGLESTEP => syscall::PTRACE_STOP_SINGLESTEP,
+                // Skip the first post-syscall when connected
+                sys_ptrace::PTRACE_SYSCALL if session.first => syscall::PTRACE_STOP_PRE_SYSCALL,
+                sys_ptrace::PTRACE_SYSCALL => syscall,
+                // Skip the first post-syscall when connected
+                sys_ptrace::PTRACE_SYSEMU if session.first => {
+                    syscall::PTRACE_FLAG_IGNORE | syscall::PTRACE_STOP_PRE_SYSCALL
+                }
+                sys_ptrace::PTRACE_SYSEMU => syscall::PTRACE_FLAG_IGNORE | syscall,
+                sys_ptrace::PTRACE_SYSEMU_SINGLESTEP => {
+                    syscall::PTRACE_FLAG_IGNORE | syscall::PTRACE_STOP_SINGLESTEP
+                }
+                _ => unreachable!("unhandled ptrace request type {}", request),
+            })?;
+
+            session.first = false;
+            Ok(0)
+        }
+        sys_ptrace::PTRACE_GETREGS => {
+            let c_regs = unsafe { &mut *(data as *mut user_regs_struct) };
+            let mut redox_regs = syscall::IntRegisters::default();
+            (&mut &session.regs).read(&mut redox_regs)?;
+            *c_regs = user_regs_struct {
+                r15: redox_regs.r15 as _,
+                r14: redox_regs.r14 as _,
+                r13: redox_regs.r13 as _,
+                r12: redox_regs.r12 as _,
+                rbp: redox_regs.rbp as _,
+                rbx: redox_regs.rbx as _,
+                r11: redox_regs.r11 as _,
+                r10: redox_regs.r10 as _,
+                r9: redox_regs.r9 as _,
+                r8: redox_regs.r8 as _,
+                rax: redox_regs.rax as _,
+                rcx: redox_regs.rcx as _,
+                rdx: redox_regs.rdx as _,
+                rsi: redox_regs.rsi as _,
+                rdi: redox_regs.rdi as _,
+                orig_rax: redox_regs.rax as _, // redox_regs.orig_rax as _,
+                rip: redox_regs.rip as _,
+                cs: redox_regs.cs as _,
+                eflags: redox_regs.rflags as _,
+                rsp: redox_regs.rsp as _,
+                ss: redox_regs.ss as _,
+                fs_base: 0, // fs_base: redox_regs.fs_base as _,
+                gs_base: 0, // gs_base: redox_regs.gs_base as _,
+                ds: 0,      // ds: redox_regs.ds as _,
+                es: 0,      // es: redox_regs.es as _,
+                fs: 0,      // fs: redox_regs.fs as _,
+                gs: 0,      // gs: redox_regs.gs as _,
+            };
+            Ok(0)
+        }
+        sys_ptrace::PTRACE_SETREGS => {
+            let c_regs = unsafe { &*(data as *mut user_regs_struct) };
+            let redox_regs = syscall::IntRegisters {
+                r15: c_regs.r15 as _,
+                r14: c_regs.r14 as _,
+                r13: c_regs.r13 as _,
+                r12: c_regs.r12 as _,
+                rbp: c_regs.rbp as _,
+                rbx: c_regs.rbx as _,
+                r11: c_regs.r11 as _,
+                r10: c_regs.r10 as _,
+                r9: c_regs.r9 as _,
+                r8: c_regs.r8 as _,
+                rax: c_regs.orig_rax as _, // c_regs.rax as _,
+                rcx: c_regs.rcx as _,
+                rdx: c_regs.rdx as _,
+                rsi: c_regs.rsi as _,
+                rdi: c_regs.rdi as _,
+                // orig_rax: c_regs.orig_rax as _,
+                rip: c_regs.rip as _,
+                cs: c_regs.cs as _,
+                rflags: c_regs.eflags as _,
+                rsp: c_regs.rsp as _,
+                ss: c_regs.ss as _,
+                // fs_base: c_regs.fs_base as _,
+                // gs_base: c_regs.gs_base as _,
+                // ds: c_regs.ds as _,
+                // es: c_regs.es as _,
+                // fs: c_regs.fs as _,
+                // gs: c_regs.gs as _,
+            };
+            (&mut &session.regs).write(&redox_regs)?;
+            Ok(0)
+        }
+        _ => unimplemented!(),
+    }
+}
+
+#[cfg(target_arch = "riscv64")]
+fn inner_ptrace(
+    request: c_int,
+    pid: pid_t,
+    addr: *mut c_void,
+    data: *mut c_void,
+) -> io::Result<c_int> {
+    //TODO: riscv64
+    unimplemented!("inner_ptrace not implemented on riscv64");
+}
+
+impl PalPtrace for Sys {
+    #[allow(unused_unsafe)] // keeping inner unsafe fails x86_64, removing fails riscv cross-build
+    unsafe fn ptrace(
+        request: c_int,
+        pid: pid_t,
+        addr: *mut c_void,
+        data: *mut c_void,
+    ) -> Result<c_int, Errno> {
+        unsafe { inner_ptrace(request, pid, addr, data) }
+            .map_err(|err| Errno(err.raw_os_error().unwrap_or(EIO)))
+    }
+}
diff --git a/recipes/core/relibc/src/platform/redox/signal.rs b/recipes/core/relibc/src/platform/redox/signal.rs
new file mode 100644
index 0000000000..7987528708
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/signal.rs
@@ -0,0 +1,362 @@
+use super::{
+    super::{Pal, PalSignal, types::*},
+    Sys,
+};
+#[allow(deprecated)]
+use crate::header::sys_time::{ITIMER_REAL, itimerval};
+use crate::{
+    error::{Errno, Result},
+    header::{
+        bits_timespec::timespec,
+        errno::{EINVAL, ENOSYS},
+        signal::{
+            SIG_BLOCK, SIG_DFL, SIG_IGN, SIG_SETMASK, SIG_UNBLOCK, SIGALRM, SIGEV_SIGNAL,
+            SS_DISABLE, SS_ONSTACK, sigaction, sigevent, siginfo_t, sigset_t, sigval, stack_t,
+            ucontext_t,
+        },
+        time::{itimerspec, timer_internal_t},
+    },
+    out::Out,
+    sync::Mutex,
+};
+use core::mem::offset_of;
+use redox_protocols::protocol::ProcKillTarget;
+use redox_rt::signal::{
+    PosixStackt, SigStack, Sigaction, SigactionFlags, SigactionKind, Sigaltstack, SignalHandler,
+};
+
+/// Wrapper for timer_t that implements Send (the timer_t pointer is a process-
+/// wide mmap'd allocation that outlives any single thread).
+struct AlarmTimer(timer_t);
+// SAFETY: The timer_t pointer refers to an mmap'd timer_internal_t that is
+// only accessed under the ALARM_TIMER mutex lock.
+unsafe impl Send for AlarmTimer {}
+
+/// Process-global singleton timer used by alarm(). Protected by a mutex to
+/// ensure only one alarm is active at a time (POSIX requirement).
+static ALARM_TIMER: Mutex<Option<AlarmTimer>> = Mutex::new(None);
+
+const _: () = {
+    #[track_caller]
+    const fn assert_eq(a: usize, b: usize) {
+        if a != b {
+            panic!("compile-time struct verification failed");
+        }
+    }
+    assert_eq(offset_of!(ucontext_t, uc_link), offset_of!(SigStack, link));
+    assert_eq(
+        offset_of!(ucontext_t, uc_stack),
+        offset_of!(SigStack, old_stack),
+    );
+    assert_eq(
+        offset_of!(ucontext_t, uc_sigmask),
+        offset_of!(SigStack, old_mask),
+    );
+    assert_eq(
+        offset_of!(ucontext_t, uc_mcontext),
+        offset_of!(SigStack, regs),
+    );
+};
+
+impl PalSignal for Sys {
+    #[allow(deprecated)]
+    fn getitimer(which: c_int, out: &mut itimerval) -> Result<()> {
+        let path = match which {
+            ITIMER_REAL => "/scheme/itimer/1",
+            _ => return Err(Errno(EINVAL)),
+        };
+        // TODO: implement setitimer
+        // let fd = FdGuard::new(redox_rt::sys::open(path, syscall::O_RDONLY | syscall::O_CLOEXEC)?);
+        // let count = syscall::read(*fd, &mut spec)?;
+
+        let spec = syscall::ITimerSpec::default();
+        out.it_interval.tv_sec = spec.it_interval.tv_sec as time_t;
+        out.it_interval.tv_usec = spec.it_interval.tv_nsec / 1000;
+        out.it_value.tv_sec = spec.it_value.tv_sec as time_t;
+        out.it_value.tv_usec = spec.it_value.tv_nsec / 1000;
+
+        Ok(())
+    }
+
+    fn kill(pid: pid_t, sig: c_int) -> Result<()> {
+        redox_rt::sys::posix_kill(ProcKillTarget::from_raw(pid as usize), sig as usize)?;
+        Ok(())
+    }
+    fn sigqueue(pid: pid_t, sig: c_int, val: sigval) -> Result<()> {
+        Ok(redox_rt::sys::posix_sigqueue(
+            pid as usize,
+            sig as usize,
+            unsafe { val.sival_ptr } as usize,
+        )?)
+    }
+
+    fn killpg(pgrp: pid_t, sig: c_int) -> Result<()> {
+        if pgrp == 1 {
+            return Err(Errno(EINVAL));
+        }
+        Self::kill(-pgrp, sig)
+    }
+
+    fn raise(sig: c_int) -> Result<()> {
+        // TODO: Bypass kernel?
+        unsafe { Self::rlct_kill(Self::current_os_tid(), sig as _) }
+    }
+
+    #[allow(deprecated)]
+    fn setitimer(which: c_int, _new: &itimerval, old: Option<&mut itimerval>) -> Result<()> {
+        // TODO: setitimer is no longer part of POSIX and should not be implemented in Redox
+        // Change the platform-independent implementation to use POSIX timers.
+        // For Redox, the timer should probably use "/scheme/time"
+        todo_skip!(0, "setitimer not implemented");
+        Err(Errno(ENOSYS))
+    }
+
+    fn sigaction(
+        sig: c_int,
+        c_act: Option<&sigaction>,
+        c_oact: Option<&mut sigaction>,
+    ) -> Result<(), Errno> {
+        let sig = u8::try_from(sig).map_err(|_| syscall::Error::new(syscall::EINVAL))?;
+
+        let new_action = c_act.map(|c_act| {
+            let handler = c_act.sa_handler.map_or(0, |f| f as usize);
+
+            let kind = if handler == SIG_DFL {
+                SigactionKind::Default
+            } else if handler == SIG_IGN {
+                SigactionKind::Ignore
+            } else {
+                SigactionKind::Handled {
+                    handler: if c_act.sa_flags & crate::header::signal::SA_SIGINFO as c_int != 0 {
+                        SignalHandler {
+                            sigaction: unsafe { core::mem::transmute(c_act.sa_handler) },
+                        }
+                    } else {
+                        SignalHandler {
+                            handler: c_act.sa_handler,
+                        }
+                    },
+                }
+            };
+
+            Sigaction {
+                kind,
+                mask: c_act.sa_mask,
+                flags: SigactionFlags::from_bits_retain(c_act.sa_flags as u32),
+            }
+        });
+        let mut old_action = c_oact.as_ref().map(|_| Sigaction::default());
+
+        redox_rt::signal::sigaction(sig, new_action.as_ref(), old_action.as_mut())?;
+
+        if let (Some(c_oact), Some(old_action)) = (c_oact, old_action) {
+            *c_oact = match old_action.kind {
+                SigactionKind::Ignore => sigaction {
+                    sa_handler: unsafe { core::mem::transmute(SIG_IGN) },
+                    sa_flags: 0,
+                    sa_restorer: None,
+                    sa_mask: 0,
+                },
+                SigactionKind::Default => sigaction {
+                    sa_handler: unsafe { core::mem::transmute(SIG_DFL) },
+                    sa_flags: 0,
+                    sa_restorer: None,
+                    sa_mask: 0,
+                },
+                SigactionKind::Handled { handler } => sigaction {
+                    sa_handler: if old_action.flags.contains(SigactionFlags::SIGINFO) {
+                        unsafe { core::mem::transmute(handler.sigaction) }
+                    } else {
+                        unsafe { handler.handler }
+                    },
+                    sa_restorer: None,
+                    sa_flags: old_action.flags.bits() as c_int,
+                    sa_mask: old_action.mask,
+                },
+            };
+        }
+        Ok(())
+    }
+
+    unsafe fn sigaltstack(
+        new_c: Option<&stack_t>,
+        old_c: Option<&mut stack_t>,
+    ) -> Result<(), Errno> {
+        let new = new_c
+            .map(|c_stack| {
+                let flags = usize::try_from(c_stack.ss_flags).map_err(|_| Errno(EINVAL))?;
+                if flags != flags & (SS_DISABLE | SS_ONSTACK) {
+                    return Err(Errno(EINVAL));
+                }
+
+                Ok(if flags & SS_DISABLE == SS_DISABLE {
+                    Sigaltstack::Disabled
+                } else {
+                    Sigaltstack::Enabled {
+                        onstack: false,
+                        base: c_stack.ss_sp.cast(),
+                        size: c_stack.ss_size,
+                    }
+                })
+            })
+            .transpose()?;
+
+        let mut old = old_c.as_ref().map(|_| Sigaltstack::default());
+        (unsafe { redox_rt::signal::sigaltstack(new.as_ref(), old.as_mut()) })?;
+
+        if let (Some(old_c_stack), Some(old)) = (old_c, old) {
+            let c_stack = PosixStackt::from(old);
+            *old_c_stack = stack_t {
+                ss_sp: c_stack.sp.cast(),
+                ss_size: c_stack.size,
+                ss_flags: c_stack.flags,
+            };
+        }
+        Ok(())
+    }
+
+    fn sigpending(set: &mut sigset_t) -> Result<(), Errno> {
+        *set = redox_rt::signal::currently_pending_blocked();
+        Ok(())
+    }
+
+    fn sigprocmask(
+        how: c_int,
+        set: Option<&sigset_t>,
+        oset: Option<&mut sigset_t>,
+    ) -> Result<(), Errno> {
+        match how {
+            _ if set.is_none() => {
+                if let Some(oset) = oset {
+                    *oset = redox_rt::signal::get_sigmask()?;
+                }
+            }
+            SIG_SETMASK => redox_rt::signal::set_sigmask(set.copied(), oset)?,
+            SIG_BLOCK => redox_rt::signal::or_sigmask(set.copied(), oset)?,
+            SIG_UNBLOCK => redox_rt::signal::andn_sigmask(set.copied(), oset)?,
+
+            _ => return Err(Errno(EINVAL)),
+        }
+        Ok(())
+    }
+
+    fn sigsuspend(mask: &sigset_t) -> Errno {
+        match redox_rt::signal::await_signal_async(!*mask) {
+            Ok(_) => unreachable!(),
+            Err(err) => err.into(),
+        }
+    }
+
+    fn sigtimedwait(
+        set: &sigset_t,
+        info_out: Option<&mut siginfo_t>,
+        timeout: Option<&timespec>,
+    ) -> Result<c_int, Errno> {
+        // TODO: deadline-based API
+        let timeout = timeout.map(|timeout| syscall::TimeSpec {
+            tv_sec: timeout.tv_sec,
+            tv_nsec: timeout.tv_nsec as _,
+        });
+        let info = redox_rt::signal::await_signal_sync(*set, timeout.as_ref())?.into();
+        if let Some(out) = info_out {
+            *out = info;
+        }
+        Ok(info.si_signo)
+    }
+
+    /// Thread-based alarm() that Recycles the existing POSIX timer machinery
+    /// (timerfd + eventfd + pthread) with process-level signal delivery.
+    ///
+    /// Internally works with a timespec to allow sub-second timers in the
+    /// future (e.g. ualarm) as i've been asked, though the public API only exposes whole seconds.
+    fn alarm(seconds: c_uint) -> c_uint {
+        alarm_timespec(timespec {
+            tv_sec: seconds as time_t,
+            tv_nsec: 0,
+        })
+    }
+}
+
+/// Internal helper that arms/disarms the process-global alarm timer.
+/// Accepts a full timespec so sub-second timers (ualarm) can reuse this later.
+/// Returns the number of seconds remaining on the previous alarm (rounded up),
+/// or 0 if there was no previous alarm.
+///
+/// TODO: This implementation does not survive `exec()`. POSIX requires that a
+/// pending alarm be preserved across exec (the timer continues counting down
+/// in the new process image as i understand).
+fn alarm_timespec(duration: timespec) -> c_uint {
+    let mut guard = ALARM_TIMER.lock();
+
+    // Determine remaining time on any existing alarm
+    let remaining = if let Some(ref alarm) = *guard {
+        let mut cur = itimerspec::default();
+        if Sys::timer_gettime(alarm.0, Out::from_mut(&mut cur)).is_ok() {
+            let secs = cur.it_value.tv_sec as c_uint;
+            if cur.it_value.tv_nsec > 0 {
+                secs + 1 // POSIX: round up
+            } else {
+                secs
+            }
+        } else {
+            0
+        }
+    } else {
+        0
+    };
+
+    let disarm = duration.tv_sec == 0 && duration.tv_nsec == 0;
+
+    if disarm {
+        // alarm(0): cancel any pending alarm
+        if let Some(ref alarm) = *guard {
+            let zero = itimerspec::default();
+            let _ = Sys::timer_settime(alarm.0, 0, &zero, None);
+        }
+        return remaining;
+    }
+
+    // Lazily create the singleton timer if it doesn't exist yet
+    if guard.is_none() {
+        let evp = sigevent {
+            sigev_value: sigval {
+                sival_ptr: core::ptr::null_mut(),
+            },
+            sigev_signo: SIGALRM as c_int,
+            sigev_notify: SIGEV_SIGNAL,
+            sigev_notify_function: None,
+            sigev_notify_attributes: core::ptr::null_mut(),
+        };
+
+        let mut timer_id: timer_t = core::ptr::null_mut();
+        if Sys::timer_create(
+            crate::header::time::CLOCK_REALTIME,
+            &evp,
+            Out::from_mut(&mut timer_id),
+        )
+        .is_err()
+        {
+            return remaining;
+        }
+
+        // Enable process-wide signal delivery instead of thread-specific
+        let timer_st = unsafe { &mut *(timer_id as *mut timer_internal_t) };
+        timer_st.process_pid = Sys::getpid();
+
+        *guard = Some(AlarmTimer(timer_id));
+    }
+
+    let timer_id = guard
+        .as_ref()
+        .expect("alarm timer must exist after lazy init")
+        .0;
+
+    // Arm the timer as a one-shot (no interval)
+    let spec = itimerspec {
+        it_value: duration,
+        it_interval: timespec::default(),
+    };
+    let _ = Sys::timer_settime(timer_id, 0, &spec, None);
+
+    remaining
+}
diff --git a/recipes/core/relibc/src/platform/redox/socket.rs b/recipes/core/relibc/src/platform/redox/socket.rs
new file mode 100644
index 0000000000..d223c36f5a
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/socket.rs
@@ -0,0 +1,1187 @@
+use alloc::vec::Vec;
+use core::{cmp, mem, ptr, slice, str};
+use redox_protocols::protocol::{FsCall, SocketCall};
+use redox_rt::proc::FdGuard;
+use syscall::{self, flag::*};
+
+use super::{
+    super::{Pal, PalSocket, types::*},
+    Sys,
+    path::dir_path_and_fd_path,
+};
+use crate::{
+    error::{Errno, Result},
+    header::{
+        arpa_inet::inet_aton,
+        bits_iovec::iovec,
+        bits_safamily_t::sa_family_t,
+        bits_socklen_t::socklen_t,
+        errno::{
+            EAFNOSUPPORT, EDOM, EFAULT, EINVAL, EMSGSIZE, ENOMEM, ENOSYS, ENOTSOCK, EOPNOTSUPP,
+            EPROTONOSUPPORT,
+        },
+        netinet_in::{in_addr, in_port_t, sockaddr_in},
+        string::strnlen,
+        sys_select::timeval,
+        sys_socket::{
+            CMSG_ALIGN, CMSG_DATA, CMSG_FIRSTHDR, CMSG_LEN, CMSG_NXTHDR, CMSG_SPACE, cmsghdr,
+            constants::*, msghdr, sockaddr, ucred,
+        },
+        sys_un::sockaddr_un,
+    },
+};
+
+unsafe fn bind_or_connect(
+    op: SocketCall,
+    socket: c_int,
+    address: *const sockaddr,
+    address_len: socklen_t,
+) -> Result<usize, Errno> {
+    if (address_len as usize) < mem::size_of::<sa_family_t>() {
+        return Err(Errno(EINVAL));
+    }
+
+    let path = match unsafe { (*address).sa_family } as c_int {
+        AF_INET => {
+            if (address_len as usize) != mem::size_of::<sockaddr_in>() {
+                return Err(Errno(EINVAL));
+            }
+
+            let data = unsafe { &*(address as *const sockaddr_in) };
+            let addr = unsafe {
+                slice::from_raw_parts(
+                    &data.sin_addr.s_addr as *const _ as *const u8,
+                    mem::size_of_val(&data.sin_addr.s_addr),
+                )
+            };
+            let port = in_port_t::from_be(data.sin_port);
+
+            match op {
+                SocketCall::Bind => {
+                    format!("/{}.{}.{}.{}:{}", addr[0], addr[1], addr[2], addr[3], port)
+                }
+                SocketCall::Connect => {
+                    format!("{}.{}.{}.{}:{}", addr[0], addr[1], addr[2], addr[3], port)
+                }
+                _ => unreachable!(),
+            }
+        }
+        AF_UNIX => {
+            log::warn!("bind/connect with AF_UNIX were replaced with SYS_CALL.");
+            return Err(Errno(EAFNOSUPPORT));
+        }
+        AF_UNSPEC => match op {
+            SocketCall::Bind => {
+                // Bind is not a valid socket call for AF_UNSPEC
+                return Err(Errno(EAFNOSUPPORT));
+            }
+            SocketCall::Connect => {
+                // When a connect is made using AF_UNSPEC TCP and UDP need to disconnect from the default peer
+                format!("disconnect")
+            }
+            _ => unreachable!(),
+        },
+        _ => return Err(Errno(EAFNOSUPPORT)),
+    };
+    let fd = syscall::dup(socket as usize, path.as_bytes())?;
+    Ok(fd)
+}
+
+pub unsafe fn bind_or_connect_into(
+    op: SocketCall,
+    socket: c_int,
+    address: *const sockaddr,
+    address_len: socklen_t,
+) -> Result<c_int, Errno> {
+    // Duplicate the socket, and then duplicate the copy back to the original fd
+    let fd = FdGuard::new(unsafe { bind_or_connect(op, socket, address, address_len) }?);
+    syscall::dup2(fd.as_raw_fd(), socket as usize, &[])?;
+    Ok(0)
+}
+
+unsafe fn inner_af_unix(buf: &[u8], address: *mut sockaddr, address_len: *mut socklen_t) {
+    let data = unsafe { &mut *(address as *mut sockaddr_un) };
+
+    data.sun_family = AF_UNIX as c_ushort;
+
+    let path = unsafe {
+        slice::from_raw_parts_mut(&mut data.sun_path as *mut _ as *mut u8, data.sun_path.len())
+    };
+
+    let len = cmp::min(path.len(), buf.len());
+    path[..len].copy_from_slice(&buf[..len]);
+    if len < path.len() {
+        path[len] = 0;
+    }
+
+    unsafe { *address_len = len as socklen_t };
+}
+
+unsafe fn inner_af_inet(
+    local: bool,
+    buf: &[u8],
+    address: *mut sockaddr,
+    address_len: *mut socklen_t,
+) {
+    let mut parts = buf.split(|c| *c == b'/');
+    if local {
+        // Skip the remote part
+        parts.next();
+    }
+    let mut unparsed_addr = Vec::from(parts.next().expect("missing address"));
+
+    let sep = memchr::memchr(b':', &unparsed_addr).expect("missing port");
+    let (raw_addr, rest) = unparsed_addr.split_at_mut(sep);
+    let (colon, raw_port) = rest.split_at_mut(1);
+    let port = str::from_utf8(raw_port)
+        .expect("non-utf8 port")
+        .parse()
+        .expect("invalid port");
+
+    // Make address be followed by a NUL-byte
+    colon[0] = b'\0';
+
+    log::trace!("address: {:?}, port: {:?}", str::from_utf8(&raw_addr), port);
+
+    let mut addr = in_addr::default();
+    assert_eq!(
+        unsafe { inet_aton(raw_addr.as_ptr() as *mut c_char, &mut addr) },
+        1,
+        "inet_aton might be broken, failed to parse netstack address"
+    );
+
+    let ret = sockaddr_in {
+        sin_family: AF_INET as sa_family_t,
+        sin_port: in_port_t::to_be(port),
+        sin_addr: addr,
+
+        ..sockaddr_in::default()
+    };
+    let len = cmp::min(unsafe { *address_len } as usize, mem::size_of_val(&ret));
+
+    unsafe {
+        ptr::copy_nonoverlapping(&ret as *const _ as *const u8, address as *mut u8, len);
+        *address_len = len as socklen_t;
+    }
+}
+
+unsafe fn inner_get_name_inner(
+    local: bool,
+    address: *mut sockaddr,
+    address_len: *mut socklen_t,
+    buf: &[u8],
+) -> Result<()> {
+    if buf.starts_with(b"tcp:") || buf.starts_with(b"udp:") {
+        unsafe { inner_af_inet(local, &buf[4..], address, address_len) };
+    } else if buf.starts_with(b"/scheme/tcp/") || buf.starts_with(b"/scheme/udp/") {
+        unsafe { inner_af_inet(local, &buf[12..], address, address_len) };
+    } else if buf.starts_with(b"chan:") {
+        unsafe { inner_af_unix(&buf[5..], address, address_len) };
+    } else if buf.starts_with(b"/scheme/chan/") {
+        unsafe { inner_af_unix(&buf[13..], address, address_len) };
+    } else if buf.starts_with(b"/scheme/uds_stream/") {
+        unsafe { inner_af_unix(&buf[19..], address, address_len) };
+    } else if buf.starts_with(b"/scheme/uds_dgram/") {
+        unsafe { inner_af_unix(&buf[18..], address, address_len) };
+    } else {
+        // Socket doesn't belong to any scheme
+        log::trace!(
+            "socket {:?} doesn't match either tcp, udp or chan schemes",
+            str::from_utf8(buf)
+        );
+        return Err(Errno(ENOTSOCK));
+    }
+    Ok(())
+}
+
+fn socket_domain_type(socket: c_int) -> Result<(c_int, c_int)> {
+    let mut buf = [0; 256];
+    let len = syscall::fpath(socket as usize, &mut buf)?;
+    Ok(
+        if buf.starts_with(b"tcp:") || buf.starts_with(b"/scheme/tcp/") {
+            (AF_INET, SOCK_STREAM)
+        } else if buf.starts_with(b"udp:") || buf.starts_with(b"/scheme/udp/") {
+            (AF_INET, SOCK_DGRAM)
+        } else if buf.starts_with(b"/scheme/uds_stream/") {
+            (AF_UNIX, SOCK_STREAM)
+        } else if buf.starts_with(b"/scheme/uds_dgram/") {
+            (AF_UNIX, SOCK_DGRAM)
+        } else {
+            return Err(Errno(ENOTSOCK));
+        },
+    )
+}
+
+fn socket_kind(mut kind: c_int) -> (c_int, usize) {
+    let mut flags = O_RDWR;
+    if kind & SOCK_NONBLOCK == SOCK_NONBLOCK {
+        kind &= !SOCK_NONBLOCK;
+        flags |= O_NONBLOCK;
+    }
+    if kind & SOCK_CLOEXEC == SOCK_CLOEXEC {
+        kind &= !SOCK_CLOEXEC;
+        flags |= O_CLOEXEC;
+    }
+    (kind, flags)
+}
+
+unsafe fn serialize_payload_to_stream(
+    msg_stream: &mut Vec<u8>,
+    iovs: &[iovec],
+    whole_iov_size: usize,
+) -> Result<usize> {
+    msg_stream.extend_from_slice(&whole_iov_size.to_le_bytes());
+
+    for iov in iovs {
+        if iov.iov_len > 0 {
+            if iov.iov_base.is_null() {
+                return Err(Errno(EFAULT));
+            }
+            let source_slice: &[u8] =
+                unsafe { slice::from_raw_parts(iov.iov_base as *const u8, iov.iov_len) };
+            msg_stream.extend_from_slice(source_slice);
+        }
+    }
+    Ok(whole_iov_size)
+}
+
+unsafe fn serialize_ancillary_data_to_stream(
+    msg: *const msghdr,
+    mhdr: &msghdr,
+    socket: c_int,
+    msg_stream: &mut Vec<u8>,
+) -> Result<()> {
+    if mhdr.msg_control.is_null() {
+        return Err(Errno(EINVAL));
+    }
+
+    let mut cmsg: *mut cmsghdr = unsafe { CMSG_FIRSTHDR(msg) };
+    let mut cmsg_count = 0;
+    while !cmsg.is_null() {
+        cmsg_count += 1;
+        let current_cmsg = unsafe { &*cmsg };
+        let min_cmsg_len = unsafe { CMSG_ALIGN(mem::size_of::<cmsghdr>()) };
+        if current_cmsg.cmsg_len < min_cmsg_len {
+            return Err(Errno(EINVAL));
+        }
+
+        // cmsg entry format: [level(i32)][type(i32)][data_len(usize)][data]
+        msg_stream.extend_from_slice(&current_cmsg.cmsg_level.to_le_bytes());
+        msg_stream.extend_from_slice(&current_cmsg.cmsg_type.to_le_bytes());
+
+        match (current_cmsg.cmsg_level, current_cmsg.cmsg_type) {
+            (SOL_SOCKET, SCM_RIGHTS) => {
+                let data_len = current_cmsg.cmsg_len - min_cmsg_len;
+                if data_len % mem::size_of::<c_int>() != 0 {
+                    return Err(Errno(EINVAL));
+                }
+                let fd_count = data_len / mem::size_of::<c_int>();
+
+                if fd_count > 0 {
+                    let fds_ptr = unsafe { CMSG_DATA(cmsg) } as *const c_int;
+                    let c_fds = unsafe { slice::from_raw_parts(fds_ptr, fd_count) };
+                    let fds_usize: Vec<usize> = c_fds.iter().map(|&fd| fd as usize).collect();
+                    let fds_slice = unsafe {
+                        slice::from_raw_parts(
+                            fds_usize.as_ptr() as *const u8,
+                            fds_usize.len() * mem::size_of::<usize>(),
+                        )
+                    };
+                    redox_rt::sys::sys_call_wo(socket as usize, &fds_slice, CallFlags::FD, &[])?;
+                }
+
+                // Serialize to ancillary_data_stream.
+                // Our intermediate format: data_len is size of fd_count (usize), data is fd_count (usize)
+                let data_for_stream_len = mem::size_of::<usize>();
+                let data_for_stream_payload = (fd_count as usize).to_le_bytes();
+
+                msg_stream.extend_from_slice(&(data_for_stream_len as usize).to_le_bytes());
+                msg_stream.extend_from_slice(&data_for_stream_payload);
+            }
+            (SOL_SOCKET, SCM_CREDENTIALS) => {
+                // Our intermediate format: data_len is 0, no data payload
+                let data_for_stream_len = 0usize;
+                msg_stream.extend_from_slice(&(data_for_stream_len as usize).to_le_bytes());
+            }
+            _ => {
+                return Err(Errno(EOPNOTSUPP));
+            }
+        }
+        cmsg = unsafe { CMSG_NXTHDR(msg, cmsg) };
+    }
+    Ok(())
+}
+
+unsafe fn deserialize_name_from_stream(
+    mhdr: &mut msghdr,
+    msg_stream: &[u8],
+    cursor: &mut usize,
+) -> Result<()> {
+    // Read name_len from stream
+    let name_len_in_stream = read_num::<usize>(&msg_stream[*cursor..])?;
+    let name_len = cmp::min(name_len_in_stream, mhdr.msg_namelen as usize);
+    *cursor += mem::size_of::<usize>();
+
+    if name_len > 0 {
+        if *cursor + name_len > msg_stream.len() {
+            return Err(Errno(EMSGSIZE));
+        }
+        if !mhdr.msg_name.is_null() && mhdr.msg_namelen > 0 {
+            let name_buffer = &msg_stream[*cursor..*cursor + name_len_in_stream];
+            (unsafe {
+                inner_get_name_inner(
+                    false,
+                    mhdr.msg_name as *mut sockaddr,
+                    &mut mhdr.msg_namelen,
+                    name_buffer,
+                )
+            })?;
+        }
+        *cursor += name_len_in_stream;
+    } else {
+        // If name_len is 0, set msg_namelen to 0
+        mhdr.msg_namelen = 0;
+    }
+    Ok(())
+}
+
+unsafe fn deserialize_payload_from_stream(
+    mhdr: &mut msghdr,
+    msg_stream: &[u8],
+    iovs: &[iovec],
+    whole_iov_size: usize,
+    cursor: &mut usize,
+    test: u8,
+) -> Result<usize> {
+    let full_payload_len_from_scheme = read_num::<usize>(&msg_stream[*cursor..])?;
+    *cursor += mem::size_of::<usize>();
+    // Determine actual payload data available in the stream
+    let payload_len_to_read = cmp::min(full_payload_len_from_scheme, whole_iov_size);
+    let payload_data_from_stream = &msg_stream[*cursor..*cursor + payload_len_to_read];
+    *cursor += payload_len_to_read;
+
+    let mut total_bytes_written: usize = 0;
+    if !iovs.is_empty() && payload_len_to_read > 0 {
+        let mut source_bytes_consumed: usize = 0;
+        for iov in iovs {
+            if iov.iov_len == 0 {
+                continue;
+            }
+            if iov.iov_base.is_null() {
+                return Err(Errno(EFAULT));
+            }
+
+            let source_bytes_remaining = payload_data_from_stream
+                .len()
+                .saturating_sub(source_bytes_consumed);
+            if source_bytes_remaining == 0 {
+                break;
+            }
+
+            let bytes_to_write = cmp::min(iov.iov_len, source_bytes_remaining);
+            if bytes_to_write > 0 {
+                let dest_slice: &mut [u8] =
+                    unsafe { slice::from_raw_parts_mut(iov.iov_base as *mut u8, iov.iov_len) };
+
+                let source_sub_slice = &payload_data_from_stream
+                    [source_bytes_consumed..source_bytes_consumed + bytes_to_write];
+                dest_slice[..bytes_to_write].copy_from_slice(source_sub_slice);
+                total_bytes_written += bytes_to_write;
+                source_bytes_consumed += bytes_to_write;
+            }
+        }
+    }
+
+    if full_payload_len_from_scheme > whole_iov_size {
+        mhdr.msg_flags |= MSG_TRUNC;
+    }
+
+    Ok(total_bytes_written)
+}
+
+unsafe fn deserialize_ancillary_data_from_stream(
+    mhdr: &mut msghdr,
+    socket: c_int,
+    msg_stream: &[u8],
+    cursor: &mut usize,
+    cmsg_space_provided: usize,
+    flags: c_int,
+) -> Result<()> {
+    let mut current_cmsg_ptr_in_user_buf = if !mhdr.msg_control.is_null() && cmsg_space_provided > 0
+    {
+        unsafe { CMSG_FIRSTHDR(mhdr) }
+    } else {
+        ptr::null_mut()
+    };
+    let mut remaining_user_cmsg_buf_len = cmsg_space_provided;
+    let mut total_csmg_bytes_written_to_user_buf: usize = 0;
+
+    while *cursor < msg_stream.len() {
+        const CMSG_HEADER_LEN_IN_STREAM: usize =
+            mem::size_of::<c_int>() * 2 + mem::size_of::<usize>();
+        if *cursor + CMSG_HEADER_LEN_IN_STREAM > msg_stream.len() {
+            if msg_stream[*cursor..].iter().any(|&b| b != 0) {
+                mhdr.msg_flags |= MSG_CTRUNC;
+            }
+            break;
+        }
+
+        // cmsg entry format: [level(i32)][type(i32)][data_len(usize)][data]
+        let cmsg_level = read_num::<c_int>(&msg_stream[*cursor..])?;
+        *cursor += mem::size_of::<c_int>();
+        let cmsg_type = read_num::<c_int>(&msg_stream[*cursor..])?;
+        *cursor += mem::size_of::<c_int>();
+        let cmsg_data_len_in_stream = read_num::<usize>(&msg_stream[*cursor..])?;
+        *cursor += mem::size_of::<usize>();
+
+        if *cursor + cmsg_data_len_in_stream > msg_stream.len() {
+            mhdr.msg_flags |= MSG_CTRUNC;
+            break;
+        }
+
+        let cmsg_data_from_stream = &msg_stream[*cursor..*cursor + cmsg_data_len_in_stream];
+        *cursor += cmsg_data_len_in_stream;
+
+        let mut temp_posix_cmsg_data_buf: Vec<u8> = Vec::new();
+
+        let actual_posix_cmsg_data_len = match (cmsg_level, cmsg_type) {
+            (SOL_SOCKET, SCM_RIGHTS) => {
+                if cmsg_data_len_in_stream != mem::size_of::<usize>() {
+                    return Err(Errno(EINVAL));
+                }
+                let fd_count = read_num::<usize>(&cmsg_data_from_stream)?;
+
+                let mut fds_usize = vec![0usize; fd_count];
+
+                let fds_bytes = unsafe {
+                    slice::from_raw_parts_mut(
+                        fds_usize.as_mut_ptr() as *mut u8,
+                        fds_usize.len() * mem::size_of::<usize>(),
+                    )
+                };
+
+                let mut call_flags = CallFlags::FD;
+                if flags & MSG_CMSG_CLOEXEC == MSG_CMSG_CLOEXEC {
+                    call_flags |= CallFlags::FD_CLOEXEC;
+                }
+
+                redox_rt::sys::sys_call_ro(socket as usize, fds_bytes, call_flags, &[])?;
+
+                for fd in fds_usize {
+                    temp_posix_cmsg_data_buf.extend_from_slice(&(fd as c_int).to_le_bytes());
+                }
+                temp_posix_cmsg_data_buf.len()
+            }
+            (SOL_SOCKET, SCM_CREDENTIALS) => {
+                if cmsg_data_len_in_stream
+                    != mem::size_of::<pid_t>() + mem::size_of::<uid_t>() + mem::size_of::<gid_t>()
+                {
+                    return Err(Errno(EINVAL));
+                }
+
+                let pid = read_num::<pid_t>(&cmsg_data_from_stream)?;
+                let uid_offset = mem::size_of::<pid_t>();
+                let uid = read_num::<uid_t>(&cmsg_data_from_stream[uid_offset..])?;
+                let gid_offset = uid_offset + mem::size_of::<uid_t>();
+                let gid = read_num::<gid_t>(&cmsg_data_from_stream[gid_offset..])?;
+                let cred = ucred { pid, uid, gid };
+
+                temp_posix_cmsg_data_buf.extend_from_slice(unsafe {
+                    slice::from_raw_parts(
+                        &cred as *const ucred as *const u8,
+                        mem::size_of::<ucred>(),
+                    )
+                });
+                temp_posix_cmsg_data_buf.len()
+            }
+            _ => {
+                return Err(Errno(EINVAL));
+            }
+        };
+
+        let space_needed_for_posix_cmsg =
+            unsafe { CMSG_SPACE(actual_posix_cmsg_data_len as u32) } as usize;
+
+        if !current_cmsg_ptr_in_user_buf.is_null()
+            && remaining_user_cmsg_buf_len >= space_needed_for_posix_cmsg
+        {
+            let cmsg_ref = unsafe { &mut *current_cmsg_ptr_in_user_buf };
+            cmsg_ref.cmsg_len = unsafe { CMSG_LEN(actual_posix_cmsg_data_len as u32) } as usize;
+            cmsg_ref.cmsg_level = cmsg_level;
+            cmsg_ref.cmsg_type = cmsg_type;
+
+            let data_ptr_in_user_cmsg = unsafe { CMSG_DATA(cmsg_ref) };
+            unsafe {
+                ptr::copy_nonoverlapping(
+                    temp_posix_cmsg_data_buf.as_ptr(),
+                    data_ptr_in_user_cmsg as *mut u8,
+                    actual_posix_cmsg_data_len,
+                )
+            };
+
+            let aligned_len_written = unsafe { CMSG_ALIGN(cmsg_ref.cmsg_len) };
+            total_csmg_bytes_written_to_user_buf += aligned_len_written;
+            remaining_user_cmsg_buf_len -= aligned_len_written;
+            current_cmsg_ptr_in_user_buf =
+                unsafe { CMSG_NXTHDR(mhdr, current_cmsg_ptr_in_user_buf) };
+        } else {
+            mhdr.msg_flags |= MSG_CTRUNC;
+            break;
+        }
+    }
+    mhdr.msg_controllen = total_csmg_bytes_written_to_user_buf;
+    Ok(())
+}
+
+impl PalSocket for Sys {
+    unsafe fn accept(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<c_int> {
+        let stream = syscall::dup(socket as usize, b"listen")?;
+        if address != ptr::null_mut() && address_len != ptr::null_mut() {
+            if let Err(err) = unsafe { Self::getpeername(stream as c_int, address, address_len) } {
+                let _ = syscall::close(stream);
+                return Err(err);
+            }
+        }
+        Ok(stream as c_int)
+    }
+
+    unsafe fn bind(socket: c_int, address: *const sockaddr, address_len: socklen_t) -> Result<()> {
+        match unsafe { (*address).sa_family } as c_int {
+            AF_INET => {
+                (unsafe { bind_or_connect_into(SocketCall::Bind, socket, address, address_len) })?;
+            }
+            AF_UNIX => {
+                let data = unsafe { &*(address as *const sockaddr_un) };
+
+                // NOTE: It's UB to access data in given address that exceeds
+                // the given address length.
+
+                let maxlen = cmp::min(
+                    // Max path length of the full-sized struct
+                    data.sun_path.len(),
+                    // Length inferred from given addrlen
+                    address_len as usize - data.path_offset(),
+                );
+                let len = cmp::min(
+                    // The maximum length of the address
+                    maxlen,
+                    // The first NUL byte, if any
+                    unsafe { strnlen(&data.sun_path as *const _, maxlen as size_t) },
+                );
+
+                let addr =
+                    unsafe { slice::from_raw_parts(&data.sun_path as *const _ as *const u8, len) };
+                let path = format!("{}", str::from_utf8(addr).unwrap());
+                log::trace!("bind(): path: {:?}", path);
+
+                let (dir_path, fd_path) = dir_path_and_fd_path(&path)?;
+
+                redox_rt::sys::sys_call_wo(
+                    socket as usize,
+                    fd_path.as_bytes(),
+                    CallFlags::empty(),
+                    &[SocketCall::Bind as u64],
+                )?;
+
+                let fs_bind_result = (|| -> Result<()> {
+                    let dirfd = FdGuard::open(
+                        &dir_path,
+                        syscall::O_RDONLY | syscall::O_DIRECTORY | syscall::O_CLOEXEC,
+                    )?;
+                    let fd_to_send = FdGuard::new(syscall::dup(socket as usize, &[])?);
+                    syscall::sendfd(dirfd.as_raw_fd(), fd_to_send.as_raw_fd(), 0, 0)?;
+                    Ok(())
+                })();
+
+                if let Err(original_error) = fs_bind_result {
+                    if let Err(unbind_error) = redox_rt::sys::sys_call_wo(
+                        socket as usize,
+                        &[],
+                        CallFlags::empty(),
+                        &[SocketCall::Unbind as u64],
+                    ) {
+                        todo_error!(
+                            0,
+                            unbind_error,
+                            "bind: CRITICAL: failed to unbind socket after a failed transaction"
+                        );
+                    }
+
+                    return Err(original_error);
+                }
+            }
+            _ => {
+                return Err(Errno(EAFNOSUPPORT));
+            }
+        };
+
+        Ok(())
+    }
+
+    unsafe fn connect(
+        socket: c_int,
+        address: *const sockaddr,
+        address_len: socklen_t,
+    ) -> Result<c_int> {
+        match unsafe { (*address).sa_family } as c_int {
+            AF_INET => unsafe {
+                bind_or_connect_into(SocketCall::Connect, socket, address, address_len)
+            },
+            AF_UNIX => {
+                let data = unsafe { &*(address as *const sockaddr_un) };
+
+                // NOTE: It's UB to access data in given address that exceeds
+                // the given address length.
+
+                let maxlen = cmp::min(
+                    // Max path length of the full-sized struct
+                    data.sun_path.len(),
+                    // Length inferred from given addrlen
+                    address_len as usize - data.path_offset(),
+                );
+                let len = cmp::min(
+                    // The maximum length of the address
+                    maxlen,
+                    // The first NUL byte, if any
+                    unsafe { strnlen(&data.sun_path as *const _, maxlen as size_t) },
+                );
+
+                let addr =
+                    unsafe { slice::from_raw_parts(&data.sun_path as *const _ as *const u8, len) };
+                let path = format!("{}", str::from_utf8(addr).unwrap());
+                log::trace!("connect(): path: {:?}", path);
+
+                let (_, fd_path) = dir_path_and_fd_path(&path)?;
+
+                let target_path = format!("/{fd_path}");
+                let socket_file_fd = FdGuard::open(&target_path, syscall::O_RDWR)?;
+
+                const TOKEN_BUF_SIZE: usize = 16;
+
+                let mut token_buf = [0u8; TOKEN_BUF_SIZE];
+
+                redox_rt::sys::sys_call_ro(
+                    socket_file_fd.as_raw_fd(),
+                    &mut token_buf,
+                    CallFlags::empty(),
+                    &[FsCall::Connect as u64],
+                )?;
+
+                redox_rt::sys::sys_call_wo(
+                    socket as usize,
+                    &token_buf,
+                    CallFlags::empty(),
+                    &[SocketCall::Connect as u64],
+                )?;
+                Result::<c_int, Errno>::Ok(0)
+            }
+            AF_UNSPEC => unsafe {
+                bind_or_connect_into(SocketCall::Connect, socket, address, address_len)
+            },
+            _ => Err(Errno(EAFNOSUPPORT)),
+        }
+    }
+
+    unsafe fn getpeername(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<()> {
+        let mut buf = [0; 256];
+        let len = redox_rt::sys::sys_call_ro(
+            socket as usize,
+            &mut buf,
+            CallFlags::empty(),
+            &[SocketCall::GetPeerName as u64],
+        )?;
+
+        unsafe { inner_get_name_inner(false, address, address_len, &buf[..len]) }
+    }
+
+    unsafe fn getsockname(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<()> {
+        let mut buf = [0; 256];
+        let len = syscall::fpath(socket as usize, &mut buf)?;
+
+        unsafe { inner_get_name_inner(true, address, address_len, &buf[..len]) }
+    }
+
+    unsafe fn getsockopt(
+        socket: c_int,
+        level: c_int,
+        option_name: c_int,
+        option_value: *mut c_void,
+        option_len_ptr: *mut socklen_t,
+    ) -> Result<()> {
+        if option_len_ptr.is_null() {
+            return Err(Errno(EFAULT));
+        }
+        let option_len = (unsafe { *option_len_ptr }) as usize;
+
+        let option_c_int = || -> Result<&mut c_int> {
+            if option_value.is_null() {
+                return Err(Errno(EFAULT));
+            }
+
+            if option_len < mem::size_of::<c_int>() {
+                return Err(Errno(EINVAL));
+            }
+
+            Ok(unsafe { &mut *(option_value as *mut c_int) })
+        };
+
+        match level {
+            SOL_SOCKET => match option_name {
+                SO_DOMAIN => {
+                    let option = option_c_int()?;
+                    *option = socket_domain_type(socket)?.0;
+                    unsafe { *option_len_ptr = mem::size_of::<c_int>() as socklen_t };
+                    return Ok(());
+                }
+                SO_ERROR => {
+                    let option = option_c_int()?;
+                    //TODO: Socket nonblock connection error
+                    *option = 0;
+                    unsafe { *option_len_ptr = mem::size_of::<c_int>() as socklen_t };
+                    return Ok(());
+                }
+                SO_TYPE => {
+                    let option = option_c_int()?;
+                    *option = socket_domain_type(socket)?.1;
+                    unsafe { *option_len_ptr = mem::size_of::<c_int>() as socklen_t };
+                    return Ok(());
+                }
+                _ => {
+                    let metadata = [SocketCall::GetSockOpt as u64, option_name as u64];
+                    let payload =
+                        unsafe { slice::from_raw_parts_mut(option_value as *mut u8, option_len) };
+                    let call_flags = CallFlags::empty();
+                    unsafe {
+                        *option_len_ptr = redox_rt::sys::sys_call_ro(
+                            socket as usize,
+                            payload,
+                            CallFlags::empty(),
+                            &metadata,
+                        )? as socklen_t;
+                    }
+                    return Ok(());
+                }
+            },
+            _ => (),
+        }
+
+        todo_skip!(
+            0,
+            "getsockopt({}, {}, {}, {:p}, {:p})",
+            socket,
+            level,
+            option_name,
+            option_value,
+            option_len_ptr
+        );
+        Err(Errno(ENOSYS))
+    }
+
+    fn listen(socket: c_int, backlog: c_int) -> Result<()> {
+        // Redox has no need to listen
+        Ok(())
+    }
+
+    unsafe fn recvfrom(
+        socket: c_int,
+        buf: *mut c_void,
+        len: size_t,
+        flags: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<usize> {
+        if address.is_null() && flags == 0 {
+            Self::read(socket, unsafe {
+                slice::from_raw_parts_mut(buf as *mut u8, len)
+            })
+        } else {
+            // Convert to recvmsg
+            let mut iov = iovec {
+                iov_base: buf,
+                iov_len: len,
+            };
+            let mut msg = msghdr {
+                msg_name: address as *mut c_void,
+                msg_namelen: if !address_len.is_null() {
+                    unsafe { *address_len }
+                } else {
+                    0
+                },
+                msg_iov: &mut iov,
+                msg_iovlen: 1,
+                msg_control: ptr::null_mut(),
+                msg_controllen: 0,
+                msg_flags: 0,
+            };
+            let count = unsafe { Self::recvmsg(socket, &mut msg, flags) }?;
+            if !address_len.is_null() {
+                unsafe { *address_len = msg.msg_namelen };
+            }
+            return Ok(count);
+        }
+    }
+
+    unsafe fn recvmsg(socket: c_int, msg: *mut msghdr, flags: c_int) -> Result<usize> {
+        if msg.is_null() {
+            return Err(Errno(EINVAL));
+        }
+        let mut mhdr = unsafe { &mut *msg };
+        let iovs_slice: &[iovec] = if mhdr.msg_iov.is_null() || mhdr.msg_iovlen == 0 {
+            &[]
+        } else {
+            unsafe { slice::from_raw_parts(mhdr.msg_iov, mhdr.msg_iovlen as usize) }
+        };
+        let whole_iov_size: usize = iovs_slice.iter().map(|iov| iov.iov_len).sum();
+
+        let mut msg_stream: Vec<u8> = Vec::new();
+
+        // Prepare space for the message stream.
+        // [name_len(usize)][name_buffer]
+        // [payload_len(usize)][payload_data_buffer]
+        // [ancillary_stream_buffer]
+        let expected_stream_size = {
+            64                             //reserve extra space for the scheme path
+            + mem::size_of::<usize>()      // name_len
+            + mhdr.msg_namelen as usize    // name_buffer
+            + mem::size_of::<usize>()      // payload_len
+            + whole_iov_size               // payload_data_buffer
+            + mem::size_of::<usize>()      // control_len
+            + mhdr.msg_controllen as usize // ancillary_stream_buffer
+        };
+        msg_stream
+            .try_reserve_exact(expected_stream_size)
+            .map_err(|_| Errno(ENOMEM))?;
+        msg_stream.resize(expected_stream_size, 0);
+
+        // Write the information about the msghdr
+        let mut cursor: usize = 0;
+        msg_stream[cursor..cursor + mem::size_of::<usize>()]
+            .copy_from_slice(&(mhdr.msg_namelen as usize).to_le_bytes());
+        cursor += mem::size_of::<usize>();
+        msg_stream[cursor..cursor + mem::size_of::<usize>()]
+            .copy_from_slice(&(whole_iov_size).to_le_bytes());
+        cursor += mem::size_of::<usize>();
+        msg_stream[cursor..cursor + mem::size_of::<usize>()]
+            .copy_from_slice(&(mhdr.msg_controllen as usize).to_le_bytes());
+
+        // Read the message stream.
+        let metadata = [SocketCall::RecvMsg as u64, flags as u64];
+        let call_flags = CallFlags::empty();
+        let actual_read_len =
+            redox_rt::sys::sys_call_rw(socket as usize, &mut msg_stream, call_flags, &metadata)?;
+        msg_stream.truncate(actual_read_len);
+
+        cursor = 0;
+        let cmsg_space_provided_by_user = mhdr.msg_controllen;
+        mhdr.msg_flags = 0;
+
+        // Read sender name.
+        (unsafe { deserialize_name_from_stream(&mut mhdr, &msg_stream, &mut cursor) })?;
+
+        // Read payload data.
+        let actual_payload_bytes_written_to_iov = unsafe {
+            deserialize_payload_from_stream(
+                &mut mhdr,
+                &msg_stream,
+                iovs_slice,
+                whole_iov_size,
+                &mut cursor,
+                0u8,
+            )
+        }?;
+
+        // Reconstruct the ancillary data in the user-provided buffer.
+        let has_cmsg_buffer = !mhdr.msg_control.is_null() && cmsg_space_provided_by_user > 0;
+        let has_ancillary_data = cursor < msg_stream.len();
+        if has_cmsg_buffer && has_ancillary_data {
+            (unsafe {
+                deserialize_ancillary_data_from_stream(
+                    mhdr,
+                    socket,
+                    &msg_stream,
+                    &mut cursor,
+                    cmsg_space_provided_by_user as usize,
+                    flags,
+                )
+            })?;
+        } else {
+            mhdr.msg_controllen = 0; // No ancillary data
+        }
+        Ok(actual_payload_bytes_written_to_iov)
+    }
+
+    unsafe fn sendmsg(socket: c_int, msg: *const msghdr, flags: c_int) -> Result<usize> {
+        if msg.is_null() {
+            return Err(Errno(EINVAL));
+        }
+        let mhdr = unsafe { &*msg };
+
+        // Reserve space for the message stream.
+        // [payload_len(usize)][payload_data_buffer]
+        // [ancillary_stream_buffer]
+        let iovs_slice: &[iovec] = if mhdr.msg_iov.is_null() || mhdr.msg_iovlen == 0 {
+            &[]
+        } else {
+            unsafe { slice::from_raw_parts(mhdr.msg_iov, mhdr.msg_iovlen as usize) }
+        };
+
+        let mut msg_stream: Vec<u8> = Vec::new();
+        let whole_iov_size: usize = iovs_slice.iter().map(|iov| iov.iov_len).sum();
+        msg_stream
+            .try_reserve_exact(
+                mem::size_of::<usize>()     // payload_len
+            + whole_iov_size                // payload_data_buffer
+            + mhdr.msg_controllen as usize, // ancillary_stream_buffer
+            )
+            .map_err(|_| Errno(ENOMEM))?;
+
+        // Write the message to the msg_stream.
+        let mut actual_payload_bytes_serialized = 0;
+        if !mhdr.msg_iov.is_null() && mhdr.msg_iovlen > 0 {
+            actual_payload_bytes_serialized = unsafe {
+                serialize_payload_to_stream(&mut msg_stream, &iovs_slice, whole_iov_size)
+            }?;
+        }
+        // Process Control Messages from msghdr and serialize them.
+        if mhdr.msg_controllen > 0 {
+            (unsafe { serialize_ancillary_data_to_stream(msg, mhdr, socket, &mut msg_stream) })?;
+        }
+
+        // Send the message stream.
+        let metadata = [SocketCall::SendMsg as u64, flags as u64];
+        let call_flags = CallFlags::empty();
+        let written = redox_rt::sys::sys_call_rw(
+            socket as usize,
+            msg_stream.as_mut_slice(),
+            call_flags,
+            &metadata,
+        )?;
+
+        Ok(actual_payload_bytes_serialized)
+    }
+
+    unsafe fn sendto(
+        socket: c_int,
+        buf: *const c_void,
+        len: size_t,
+        flags: c_int,
+        dest_addr: *const sockaddr,
+        dest_len: socklen_t,
+    ) -> Result<usize> {
+        if flags != 0 {
+            // Convert to sendmsg
+            let mut iov = iovec {
+                iov_base: buf as *mut c_void,
+                iov_len: len,
+            };
+            let msg = msghdr {
+                msg_name: dest_addr as *mut c_void,
+                msg_namelen: dest_len,
+                msg_iov: &mut iov,
+                msg_iovlen: 1,
+                msg_control: ptr::null_mut(),
+                msg_controllen: 0,
+                msg_flags: 0,
+            };
+            return unsafe { Self::sendmsg(socket, &msg, flags) };
+        }
+        if dest_addr == ptr::null() || dest_len == 0 {
+            Self::write(socket, unsafe {
+                slice::from_raw_parts(buf as *const u8, len)
+            })
+        } else {
+            let fd = FdGuard::new(unsafe {
+                bind_or_connect(SocketCall::Connect, socket, dest_addr, dest_len)
+            }?);
+            Self::write(fd.as_c_fd().unwrap(), unsafe {
+                slice::from_raw_parts(buf as *const u8, len)
+            })
+        }
+    }
+
+    unsafe fn setsockopt(
+        socket: c_int,
+        level: c_int,
+        option_name: c_int,
+        option_value: *const c_void,
+        option_len: socklen_t,
+    ) -> Result<()> {
+        let set_timeout = |timeout_name: &[u8]| -> Result<()> {
+            if option_value.is_null() {
+                return Err(Errno(EFAULT));
+            }
+
+            if (option_len as usize) < mem::size_of::<timeval>() {
+                return Err(Errno(EINVAL));
+            }
+
+            let timeval = unsafe { &*(option_value as *const timeval) };
+
+            let fd = FdGuard::new(syscall::dup(socket as usize, timeout_name)?);
+
+            let Some(tv_nsec) = timeval.tv_usec.checked_mul(1000) else {
+                return Err(Errno(EDOM));
+            };
+
+            let timespec = syscall::TimeSpec {
+                tv_sec: timeval.tv_sec as i64,
+                tv_nsec,
+            };
+
+            Self::write(fd.as_c_fd().unwrap(), &timespec)?;
+            Ok(())
+        };
+
+        match level {
+            SOL_SOCKET => match option_name {
+                SO_RCVTIMEO => return set_timeout(b"read_timeout"),
+                SO_SNDTIMEO => return set_timeout(b"write_timeout"),
+                _ => {
+                    let metadata = [SocketCall::SetSockOpt as u64, option_name as u64];
+                    let payload = unsafe {
+                        slice::from_raw_parts_mut(option_value as *mut u8, option_len as usize)
+                    };
+                    let call_flags = CallFlags::empty();
+                    redox_rt::sys::sys_call_rw(
+                        socket as usize,
+                        payload,
+                        CallFlags::empty(),
+                        &metadata,
+                    )?;
+                    return Ok(());
+                }
+            },
+            _ => (),
+        }
+
+        todo_skip!(
+            0,
+            "setsockopt({}, {}, {}, {:p}, {}) - unknown option",
+            socket,
+            level,
+            option_name,
+            option_value,
+            option_len
+        );
+        Ok(())
+    }
+
+    fn shutdown(socket: c_int, how: c_int) -> Result<()> {
+        let metadata = [SocketCall::Shutdown as u64, how as u64];
+        redox_rt::sys::sys_call_wo(socket as usize, &[], CallFlags::empty(), &metadata)?;
+        Ok(())
+    }
+
+    unsafe fn socket(domain: c_int, kind: c_int, protocol: c_int) -> Result<c_int> {
+        if domain != AF_INET && domain != AF_UNIX {
+            return Err(Errno(EAFNOSUPPORT));
+        }
+        // if protocol != 0 {
+        //     ERRNO.set(syscall::EPROTONOSUPPORT);
+        //     return -1;
+        // }
+
+        let (kind, flags) = socket_kind(kind);
+
+        // The tcp: and udp: schemes allow using no path,
+        // and later specifying one using `dup`.
+        Ok(match (domain, kind) {
+            (AF_INET, SOCK_STREAM) => redox_rt::sys::open("/scheme/tcp", flags)? as c_int,
+            (AF_INET, SOCK_DGRAM) => redox_rt::sys::open("/scheme/udp", flags)? as c_int,
+            (AF_UNIX, SOCK_STREAM) => {
+                redox_rt::sys::open("/scheme/uds_stream", flags | O_CREAT)? as c_int
+            }
+            (AF_UNIX, SOCK_DGRAM) => {
+                redox_rt::sys::open("/scheme/uds_dgram", flags | O_CREAT)? as c_int
+            }
+            _ => return Err(Errno(EPROTONOSUPPORT)),
+        })
+    }
+
+    fn socketpair(domain: c_int, kind: c_int, protocol: c_int, sv: &mut [c_int; 2]) -> Result<()> {
+        let (kind, flags) = socket_kind(kind);
+
+        match (domain, kind) {
+            (AF_UNIX, SOCK_STREAM) => {
+                let listener = FdGuard::open("/scheme/uds_stream", flags | O_CREAT)?;
+
+                // For now, uds_stream: lets connects be instant, and instead blocks
+                // on any I/O performed. So we don't need to mark this as
+                // nonblocking.
+
+                let fd0 = listener.dup(b"connect")?;
+                let fd1 = listener.dup(b"listen")?;
+
+                sv[0] = fd0.take() as c_int;
+                sv[1] = fd1.take() as c_int;
+                Ok(())
+            }
+            (AF_UNIX, SOCK_DGRAM) => {
+                let listener = FdGuard::open("/scheme/uds_dgram", flags | O_CREAT)?;
+
+                // For now, uds_dgram: lets connects be instant, and instead blocks
+                // on any I/O performed. So we don't need to mark this as
+                // nonblocking.
+
+                let fd0 = listener.dup(b"connect")?;
+
+                sv[0] = fd0.take() as c_int;
+                sv[1] = listener.take() as c_int;
+                Ok(())
+            }
+            _ => {
+                todo_skip!(
+                    0,
+                    "socketpair({}, {}, {}, {:p})",
+                    domain,
+                    kind,
+                    protocol,
+                    sv.as_mut_ptr()
+                );
+                Err(Errno(EPROTONOSUPPORT))
+            }
+        }
+    }
+}
+
+fn read_num<T>(buffer: &[u8]) -> Result<T>
+where
+    T: NumFromBytes,
+{
+    T::from_le_bytes_slice(buffer)
+}
+trait NumFromBytes: Sized {
+    fn from_le_bytes_slice(buffer: &[u8]) -> Result<Self>;
+}
+impl NumFromBytes for i32 {
+    fn from_le_bytes_slice(buffer: &[u8]) -> Result<Self> {
+        Ok(i32::from_le_bytes(
+            buffer
+                .get(..mem::size_of::<i32>())
+                .and_then(|slice| slice.try_into().ok())
+                .ok_or_else(|| Errno(EFAULT))?,
+        ))
+    }
+}
+impl NumFromBytes for usize {
+    fn from_le_bytes_slice(buffer: &[u8]) -> Result<Self> {
+        Ok(usize::from_le_bytes(
+            buffer
+                .get(..mem::size_of::<usize>())
+                .and_then(|slice| slice.try_into().ok())
+                .ok_or_else(|| Errno(EFAULT))?,
+        ))
+    }
+}
diff --git a/recipes/core/relibc/src/platform/redox/timer.rs b/recipes/core/relibc/src/platform/redox/timer.rs
new file mode 100644
index 0000000000..4ca03d67fd
--- /dev/null
+++ b/recipes/core/relibc/src/platform/redox/timer.rs
@@ -0,0 +1,103 @@
+use syscall::Error;
+
+use crate::{
+    error::{Errno, Result},
+    header::{
+        bits_timespec::timespec,
+        errno::EIO,
+        signal::{SIGEV_SIGNAL, SIGEV_THREAD},
+        time::timer_internal_t,
+    },
+    out::Out,
+    platform::{Pal, Sys, sys::event, types::c_void},
+};
+use core::{
+    mem::{MaybeUninit, size_of},
+    ptr, slice,
+};
+
+pub extern "C" fn timer_routine(arg: *mut c_void) -> *mut c_void {
+    let timer_st = unsafe { &mut *(arg as *mut timer_internal_t) };
+
+    loop {
+        let mut buf = MaybeUninit::uninit();
+        let res = Error::demux(unsafe {
+            event::redox_event_queue_get_events_v1(
+                timer_st.eventfd,
+                buf.as_mut_ptr(),
+                1,
+                0,
+                core::ptr::null(),
+                core::ptr::null(),
+            )
+        });
+        if let Ok(res) = res {
+            assert_eq!(res, 1, "EOF is not yet well defined for event queues");
+        } else {
+            break;
+        }
+
+        if timer_st.evp.sigev_notify == SIGEV_THREAD {
+            if let Some(fun) = timer_st.evp.sigev_notify_function {
+                fun(timer_st.evp.sigev_value);
+            }
+        } else if timer_st.evp.sigev_notify == SIGEV_SIGNAL {
+            // TODO: This will deliver signal to process, which is required for alarm()
+            //       Until it can bypass the exec() boundary, do not uncomment this code
+            // if timer_st.process_pid != 0 && Sys::kill(timer_st.process_pid, timer_st.evp.sigev_signo).is_err() { break; } else
+            if unsafe { Sys::rlct_kill(timer_st.caller_thread, timer_st.evp.sigev_signo as _) }
+                .is_err()
+            {
+                break;
+            }
+        }
+
+        if timer_next_event(timer_st).is_err() {
+            break;
+        }
+    }
+
+    timer_st.thread = ptr::null_mut();
+    ptr::null_mut()
+}
+
+fn timer_next_event(timer_st: &mut timer_internal_t) -> Result<()> {
+    timer_update_wake_time(timer_st)?;
+    let buf_to_write = unsafe {
+        Error::demux(event::redox_event_queue_ctl_v1(
+            timer_st.eventfd,
+            timer_st.timerfd,
+            1,
+            0,
+        ))?;
+
+        slice::from_raw_parts(
+            &timer_st.next_wake_time.it_value as *const _ as *const u8,
+            size_of::<timespec>(),
+        )
+    };
+    let bytes_written = redox_rt::sys::posix_write(timer_st.timerfd, buf_to_write)?;
+    if bytes_written < size_of::<timespec>() {
+        return Err(Errno(EIO));
+    }
+    Ok(())
+}
+
+pub(crate) fn timer_update_wake_time(timer_st: &mut timer_internal_t) -> Result<()> {
+    timer_st.next_wake_time.it_value = if timer_st.next_wake_time.it_interval.is_default() {
+        timespec::default()
+    } else {
+        let mut now = timespec::default();
+        Sys::clock_gettime(timer_st.clockid, Out::from_mut(&mut now))?;
+        let next_time = match timespec::add(now, timer_st.next_wake_time.it_interval.clone()) {
+            Some(a) => a,
+            None => timespec::default(),
+        };
+
+        next_time
+    };
+    if timer_st.next_wake_time.it_value.is_default() {
+        return Err(Errno(0));
+    }
+    Ok(())
+}
diff --git a/recipes/core/relibc/src/platform/rlb.rs b/recipes/core/relibc/src/platform/rlb.rs
new file mode 100644
index 0000000000..6ceb9d6bf4
--- /dev/null
+++ b/recipes/core/relibc/src/platform/rlb.rs
@@ -0,0 +1,106 @@
+use alloc::vec::Vec;
+
+use crate::platform::{Pal, Sys, types::*};
+
+use crate::{
+    error::ResultExt,
+    header::unistd::{SEEK_SET, lseek},
+};
+/// Implements an `Iterator` which returns on either newline or EOF.
+#[derive(Clone)]
+pub struct RawLineBuffer {
+    pub fd: c_int,
+    buf: Vec<u8>,
+    newline: Option<usize>,
+    read: usize,
+}
+
+#[derive(PartialEq)]
+pub enum Line<'a> {
+    Error,
+    EOF,
+    Some(&'a [u8]),
+}
+
+impl RawLineBuffer {
+    pub const fn new(fd: c_int) -> Self {
+        Self {
+            fd,
+            buf: Vec::new(),
+            newline: None,
+            read: 0,
+        }
+    }
+
+    // Can't use iterators because we want to return a reference.
+    // See https://stackoverflow.com/a/30422716/5069285
+    #[allow(clippy::should_implement_trait)]
+    pub fn next(&mut self) -> Line<'_> {
+        // Remove last line
+        if let Some(newline) = self.newline {
+            self.buf.drain(..=newline);
+        }
+
+        loop {
+            // Exit if newline was read already
+            self.newline = self.buf.iter().position(|b| *b == b'\n');
+
+            if self.newline.is_some() {
+                break;
+            }
+
+            let len = self.buf.len();
+
+            if len >= self.buf.capacity() {
+                self.buf.reserve(1024);
+            }
+
+            // Create buffer of what's left in the vector, uninitialized memory
+            unsafe {
+                let capacity = self.buf.capacity();
+                self.buf.set_len(capacity);
+            }
+
+            let read = Sys::read(self.fd, &mut self.buf[len..])
+                .map(|u| u as isize)
+                .or_minus_one_errno();
+
+            let read_usize = read.max(0) as usize;
+
+            // Remove all uninitialized memory that wasn't read
+            unsafe {
+                self.buf.set_len(len + read_usize);
+            }
+
+            self.read += read_usize;
+
+            if read == 0 {
+                return if self.buf.is_empty() {
+                    Line::EOF
+                } else {
+                    Line::Some(&self.buf)
+                };
+            }
+            if read < 0 {
+                return Line::Error;
+            }
+        }
+
+        let newline = self.newline.unwrap(); // safe because it doesn't break the loop otherwise
+        Line::Some(&self.buf[..newline])
+    }
+
+    /// Return the byte position of the start of the line
+    pub fn line_pos(&self) -> usize {
+        self.read - self.buf.len()
+    }
+
+    /// Seek to a byte position in the file
+    pub fn seek(&mut self, pos: usize) -> off_t {
+        let ret = lseek(self.fd, pos as off_t, SEEK_SET);
+        if ret != !0 {
+            self.read = pos;
+        }
+        ret
+    }
+}
diff --git a/recipes/core/relibc/src/platform/types.rs b/recipes/core/relibc/src/platform/types.rs
new file mode 100644
index 0000000000..3d14bb29a1
--- /dev/null
+++ b/recipes/core/relibc/src/platform/types.rs
@@ -0,0 +1,161 @@
+//! C data types for this platform.
+
+// Use repr(u8) as LLVM expects `void*` to be the same as `i8*` to help enable
+// more optimization opportunities around it recognizing things like
+// malloc/free.
+/// The `void` type in C.
+#[repr(u8)]
+pub enum c_void {
+    // Two dummy variants so the #[repr] attribute can be used.
+    #[doc(hidden)]
+    __variant1,
+    #[doc(hidden)]
+    __variant2,
+}
+
+/// The `int8_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type int8_t = i8;
+/// The `int16_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type int16_t = i16;
+/// The `int32_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type int32_t = i32;
+/// The `int64_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type int64_t = i64;
+/// The `uint8_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type uint8_t = u8;
+/// The `uint16_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type uint16_t = u16;
+/// The `uint32_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type uint32_t = u32;
+/// The `uint64_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type uint64_t = u64;
+
+/// The `signed char` type in C.
+pub type c_schar = i8;
+/// The `unsigned char` type in C.
+pub type c_uchar = u8;
+/// The `short` type in C.
+pub type c_short = i16;
+/// The `unsigned short` type in C.
+pub type c_ushort = u16;
+/// The `int` type in C.
+pub type c_int = i32;
+/// The `unsigned int` type in C.
+pub type c_uint = u32;
+/// The `float` type in C.
+pub type c_float = f32;
+/// The `double` type in C.
+pub type c_double = f64;
+/// The `long long` type in C.
+pub type c_longlong = i64;
+/// The `unsigned long long` type in C.
+pub type c_ulonglong = u64;
+/// The `intmax_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type intmax_t = i64;
+/// The `uintmax_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type uintmax_t = u64;
+
+/// The `size_t` type provided in `stddef.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stddef.h.html>.
+pub type size_t = usize;
+/// The `ptrdiff_t` type provided in `stddef.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stddef.h.html>.
+pub type ptrdiff_t = isize;
+/// The `intptr_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type intptr_t = isize;
+/// The `uintptr_t` type provided in `stdint.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stdint.h.html>.
+pub type uintptr_t = usize;
+/// The `ssize_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type ssize_t = isize;
+
+/// The `char` type in C.
+pub type c_char = core::ffi::c_char;
+/// The `long` type in C.
+#[cfg(target_pointer_width = "32")]
+pub type c_long = i32;
+/// The `unsigned long` type in C.
+#[cfg(target_pointer_width = "32")]
+pub type c_ulong = u32;
+/// The `long` type in C.
+#[cfg(target_pointer_width = "64")]
+pub type c_long = i64;
+/// The `unsigned long` type in C.
+#[cfg(target_pointer_width = "64")]
+pub type c_ulong = u64;
+
+/// The `wchar_t` type provided in `stddef.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stddef.h.html>.
+pub type wchar_t = i32;
+/// The `wint_t` type provided in [`wchar.h`](crate::header::wchar).
+pub type wint_t = u32;
+
+/// The `regoff_t` type provided in [`regex.h`](crate::header::regex).
+pub type regoff_t = size_t;
+/// The `off_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type off_t = c_longlong;
+/// The `mode_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type mode_t = c_int;
+/// The `time_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type time_t = c_longlong;
+/// The `pid_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type pid_t = c_int;
+/// The `id_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type id_t = c_uint;
+/// The `gid_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type gid_t = c_int;
+/// The `uid_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type uid_t = c_int;
+/// The `dev_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type dev_t = c_ulonglong;
+/// The `ino_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type ino_t = c_ulonglong;
+/// The `reclen_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type reclen_t = c_ushort;
+/// The `nlink_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type nlink_t = c_ulong;
+/// The `blksize_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type blksize_t = c_long;
+/// The `blkcnt_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type blkcnt_t = c_longlong;
+
+/// The `fsblkcnt_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type fsblkcnt_t = c_ulong;
+/// The `fsfilcnt_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type fsfilcnt_t = c_ulong;
+
+/// The `useconds_t` type provided in [`sys/types.h`](crate::header::sys_types) prior to Issue 7.
+#[deprecated]
+pub type useconds_t = c_uint;
+/// The `suseconds_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[cfg(target_os = "linux")]
+pub type suseconds_t = c_long;
+// TODO: Should we break this to c_long as well? This also breaks timeval as well
+//       but it will be consistent with timespec.tv_nsec (note that syscall already uses c_int)
+/// The `suseconds_t` type provided in [`sys/types.h`](crate::header::sys_types).
+#[cfg(not(target_os = "linux"))]
+pub type suseconds_t = c_int;
+
+/// The `clock_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type clock_t = c_long;
+/// The `clockid_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type clockid_t = c_int;
+/// The `timer_t` type provided in [`sys/types.h`](crate::header::sys_types).
+pub type timer_t = *mut c_void;
+
+// A C long double is 96 bit in x86, 128 bit in other 64-bit targets
+// However, both in x86 and x86_64 is actually f80 padded which rust has no underlying support,
+//     while aarch64 (and possibly riscv64) support full f128 type but behind a feature gate.
+// Until rust supporting them, relibc will lose precision to get them working, plus:
+//     All read operation to this type must be converted from "relibc_ldtod".
+//     All write operation to this type must be converted with "relibc_dtold".
+/// The `long double` type in C.
+#[cfg(target_pointer_width = "64")]
+pub type c_longdouble = u128;
+/// The `long double` type in C.
+#[cfg(target_pointer_width = "32")]
+pub type c_longdouble = [u32; 3];
+
+pub use crate::header::bits_pthread::*;
+
+/// The `max_align_t` type provided in `stddef.h`, see <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/stddef.h.html>.
+#[repr(C, align(16))]
+pub struct max_align_t {
+    _priv: [f64; 4],
+}
diff --git a/recipes/core/relibc/src/pthread/mod.rs b/recipes/core/relibc/src/pthread/mod.rs
new file mode 100644
index 0000000000..8243a48079
--- /dev/null
+++ b/recipes/core/relibc/src/pthread/mod.rs
@@ -0,0 +1,440 @@
+//! Relibc Threads, or RLCT.
+
+use core::{
+    cell::UnsafeCell,
+    ptr,
+    sync::atomic::{AtomicBool, AtomicUsize, Ordering},
+};
+
+use alloc::collections::BTreeMap;
+
+use crate::{
+    error::Errno,
+    header::{errno::*, pthread as header, sched::sched_param, sys_mman},
+    ld_so::{ExpectTlsFree, tcb::Tcb},
+    platform::{Pal, Sys, types::*},
+};
+
+use crate::sync::{Mutex, waitval::Waitval};
+
+/// Called only by the main thread, as part of relibc_start.
+#[allow(unused_mut)]
+pub unsafe fn init() {
+    let mut thread = Pthread {
+        waitval: Waitval::new(),
+        has_enabled_cancelation: AtomicBool::new(false),
+        has_queued_cancelation: AtomicBool::new(false),
+        flags: PthreadFlags::empty().bits().into(),
+
+        //index: FIRST_THREAD_IDX,
+
+        // TODO: set these values on Linux as well
+        stack_base: ptr::null_mut(),
+        stack_size: 0,
+
+        os_tid: UnsafeCell::new(Sys::current_os_tid()),
+    };
+
+    #[cfg(target_os = "redox")]
+    {
+        //TODO: what is the best way to get these values?
+        use redox_rt::arch::{STACK_SIZE, STACK_TOP};
+        thread.stack_base = (STACK_TOP - STACK_SIZE) as *mut c_void;
+        thread.stack_size = STACK_SIZE;
+    }
+
+    unsafe { Tcb::current() }
+        .expect_notls("no TCB present for main thread")
+        .pthread = thread;
+}
+
+//static NEXT_INDEX: AtomicU32 = AtomicU32::new(FIRST_THREAD_IDX + 1);
+//const FIRST_THREAD_IDX: usize = 1;
+
+pub unsafe fn terminate_from_main_thread() {
+    for (_, tcb) in OS_TID_TO_PTHREAD.lock().iter() {
+        let _ = unsafe { cancel(&(*tcb.0).pthread) };
+    }
+}
+
+bitflags::bitflags! {
+    pub struct PthreadFlags: usize {
+        const DETACHED = 1;
+    }
+}
+
+#[derive(Debug)]
+pub struct Pthread {
+    pub(crate) waitval: Waitval<Retval>,
+    pub(crate) has_queued_cancelation: AtomicBool,
+    pub(crate) has_enabled_cancelation: AtomicBool,
+    pub(crate) flags: AtomicUsize,
+
+    pub(crate) stack_base: *mut c_void,
+    pub(crate) stack_size: usize,
+
+    pub os_tid: UnsafeCell<OsTid>,
+}
+
+#[derive(Clone, Copy, Debug, Default, Ord, Eq, PartialOrd, PartialEq)]
+pub struct OsTid {
+    #[cfg(target_os = "redox")]
+    pub thread_fd: usize,
+    #[cfg(target_os = "linux")]
+    pub thread_id: usize,
+}
+
+unsafe impl Send for Pthread {}
+unsafe impl Sync for Pthread {}
+
+#[derive(Clone, Copy, Debug)]
+pub struct Retval(pub *mut c_void);
+
+struct MmapGuard {
+    page_start: *mut c_void,
+    mmap_size: usize,
+}
+impl Drop for MmapGuard {
+    fn drop(&mut self) {
+        unsafe {
+            let _ = Sys::munmap(self.page_start, self.mmap_size);
+        }
+    }
+}
+
+#[allow(unused_mut)]
+pub(crate) unsafe fn create(
+    attrs: Option<&header::RlctAttr>,
+    start_routine: extern "C" fn(arg: *mut c_void) -> *mut c_void,
+    arg: *mut c_void,
+) -> Result<pthread_t, Errno> {
+    let attrs = attrs.cloned().unwrap_or_default();
+
+    let mut current_sigmask = 0_u64;
+    #[cfg(target_os = "redox")]
+    {
+        current_sigmask =
+            redox_rt::signal::get_sigmask().expect("failed to obtain sigprocmask for caller");
+    }
+
+    // Create a locked mutex, unlocked by the thread after it has started.
+    let synchronization_mutex = unsafe { Mutex::locked(current_sigmask) };
+    let synchronization_mutex = &synchronization_mutex;
+
+    let stack_size = attrs.stacksize.next_multiple_of(Sys::getpagesize());
+
+    let stack_base = if attrs.stack != 0 {
+        attrs.stack as *mut c_void
+    } else {
+        let ret = unsafe {
+            sys_mman::mmap(
+                core::ptr::null_mut(),
+                stack_size,
+                sys_mman::PROT_READ | sys_mman::PROT_WRITE,
+                sys_mman::MAP_PRIVATE | sys_mman::MAP_ANONYMOUS,
+                -1,
+                0,
+            )
+        };
+        if ret as isize == -1 {
+            // "Insufficient resources"
+            return Err(Errno(EAGAIN));
+        }
+        ret
+    };
+
+    let mut flags = PthreadFlags::empty();
+    match i32::from(attrs.detachstate) {
+        header::PTHREAD_CREATE_DETACHED => flags |= PthreadFlags::DETACHED,
+        header::PTHREAD_CREATE_JOINABLE => (),
+
+        other => unreachable!("unknown detachstate {}", other),
+    }
+
+    let stack_raii = MmapGuard {
+        page_start: stack_base,
+        mmap_size: stack_size,
+    };
+
+    let current_tcb = unsafe { Tcb::current() }.expect("no TCB!");
+    let new_tcb = unsafe { Tcb::new(current_tcb.tls_len) }.map_err(|_| Errno(ENOMEM))?;
+    new_tcb.pthread.flags = flags.bits().into();
+    new_tcb.pthread.stack_base = stack_base;
+    new_tcb.pthread.stack_size = stack_size;
+
+    new_tcb.masters_ptr = current_tcb.masters_ptr;
+    new_tcb.masters_len = current_tcb.masters_len;
+    new_tcb.linker_ptr = current_tcb.linker_ptr;
+    new_tcb.mspace = current_tcb.mspace;
+
+    let stack_end = unsafe { stack_base.add(stack_size) };
+    let mut stack = stack_end.cast::<usize>();
+    {
+        let mut push = |value: usize| {
+            stack = unsafe { stack.sub(1) };
+            unsafe { stack.write(value) };
+        };
+
+        if cfg!(target_arch = "aarch64") {
+            // Aarch64 requires the stack to be 16 byte aligned after
+            // the call instruction, unlike x86 which requires it to be
+            // aligned before the call instruction. As such push an
+            // extra word on the stack to align the stack to 16 bytes.
+            push(0);
+        }
+        push(0);
+        push(0);
+        push(ptr::from_ref(synchronization_mutex) as usize);
+        push(ptr::from_mut(new_tcb) as usize);
+
+        push(arg as usize);
+        push(start_routine as usize);
+
+        push(new_thread_shim as *const () as usize);
+    }
+
+    let Ok(os_tid) = (unsafe { Sys::rlct_clone(stack, &mut new_tcb.os_specific) }) else {
+        return Err(Errno(EAGAIN));
+    };
+    core::mem::forget(stack_raii);
+
+    let _ = synchronization_mutex.lock();
+
+    OS_TID_TO_PTHREAD
+        .lock()
+        .insert(os_tid, ForceSendSync(new_tcb));
+
+    Ok(&raw const new_tcb.pthread as *mut _)
+}
+
+/// A shim to wrap thread entry points in logic to set up TLS, for example
+unsafe extern "C" fn new_thread_shim(
+    entry_point: unsafe extern "C" fn(*mut c_void) -> *mut c_void,
+    arg: *mut c_void,
+    tcb: *mut Tcb,
+    synchronization_mutex: *const Mutex<u64>,
+) -> ! {
+    let tcb = unsafe { tcb.as_mut() }.expect_notls("non-null TLS is required");
+
+    #[cfg(not(target_os = "redox"))]
+    {
+        unsafe { tcb.activate() };
+    }
+    #[cfg(target_os = "redox")]
+    {
+        // `thr_fd` in `tcb` is set by [`Sys::rlct_clone`] *before* jumping to
+        // the entry point of the new thread.
+        unsafe {
+            tcb.activate(None);
+        }
+        redox_rt::signal::setup_sighandler(&tcb.os_specific, false);
+    }
+
+    let procmask = unsafe { (&*synchronization_mutex).as_ptr().read() };
+
+    unsafe { tcb.copy_masters() }.unwrap();
+
+    unsafe { (*tcb).pthread.os_tid.get().write(Sys::current_os_tid()) };
+
+    unsafe { (&*synchronization_mutex).manual_unlock() };
+
+    #[cfg(target_os = "redox")]
+    {
+        redox_rt::signal::set_sigmask(Some(procmask), None)
+            .expect("failed to set procmask in child thread");
+    }
+
+    let retval = unsafe { entry_point(arg) };
+
+    unsafe { exit_current_thread(Retval(retval)) }
+}
+pub unsafe fn join(thread: &Pthread) -> Result<Retval, Errno> {
+    // We don't have to return EDEADLK, but unlike e.g. pthread_t lifetime checking, it's a
+    // relatively easy check.
+    if core::ptr::eq(
+        thread,
+        current_thread().expect("current thread not present"),
+    ) {
+        return Err(Errno(EDEADLK));
+    }
+
+    // Waitval starts locked, and is unlocked when the thread finishes.
+    let retval = *thread.waitval.wait();
+
+    // We have now awaited the thread and received its return value. POSIX states that the
+    // pthread_t of this thread, will no longer be valid. In practice, we can thus deallocate the
+    // thread state.
+
+    unsafe { dealloc_thread(thread) };
+
+    Ok(retval)
+}
+
+pub unsafe fn detach(thread: &Pthread) -> Result<(), Errno> {
+    thread
+        .flags
+        .fetch_or(PthreadFlags::DETACHED.bits(), Ordering::AcqRel);
+    Ok(())
+}
+
+pub fn current_thread() -> Option<&'static Pthread> {
+    unsafe { Tcb::current().map(|p| &p.pthread) }
+}
+
+pub unsafe fn testcancel() {
+    let this_thread = current_thread().expect("current thread not present");
+
+    if this_thread.has_queued_cancelation.load(Ordering::Acquire)
+        && this_thread.has_enabled_cancelation.load(Ordering::Acquire)
+    {
+        unsafe { cancel_current_thread() };
+    }
+}
+
+pub unsafe fn exit_current_thread(retval: Retval) -> ! {
+    // Run pthread_cleanup_push/pthread_cleanup_pop destructors.
+    unsafe { header::run_destructor_stack() };
+
+    unsafe { header::tls::run_all_destructors() };
+
+    let this = current_thread().expect("failed to obtain current thread when exiting");
+    let stack_base = this.stack_base;
+    let stack_size = this.stack_size;
+
+    if this.flags.load(Ordering::Acquire) & PthreadFlags::DETACHED.bits() != 0 {
+        // When detached, the thread state no longer makes any sense, and can immediately be
+        // deallocated.
+        unsafe { dealloc_thread(this) };
+    } else {
+        // When joinable, the return value should be made available to other threads.
+        unsafe { this.waitval.post(retval) };
+    }
+
+    unsafe { Sys::exit_thread(stack_base.cast(), stack_size) }
+}
+
+unsafe fn dealloc_thread(thread: &Pthread) {
+    // TODO: How should this be handled on Linux?
+    unsafe {
+        OS_TID_TO_PTHREAD.lock().remove(&thread.os_tid.get().read());
+    }
+}
+pub const SIGRT_RLCT_CANCEL: usize = 33;
+pub const SIGRT_RLCT_TIMER: usize = 34;
+
+unsafe extern "C" fn cancel_sighandler(_: c_int) {
+    unsafe { cancel_current_thread() };
+}
+unsafe fn cancel_current_thread() {
+    // Terminate the thread
+    unsafe { exit_current_thread(Retval(header::PTHREAD_CANCELED)) };
+}
+
+pub unsafe fn cancel(thread: &Pthread) -> Result<(), Errno> {
+    // TODO: What order should these atomic bools be accessed in?
+    thread.has_queued_cancelation.store(true, Ordering::Release);
+
+    if thread.has_enabled_cancelation.load(Ordering::Acquire) {
+        (unsafe { Sys::rlct_kill(thread.os_tid.get().read(), SIGRT_RLCT_CANCEL) })?;
+    }
+
+    Ok(())
+}
+
+pub fn set_sched_param(
+    _thread: &Pthread,
+    _policy: c_int,
+    _param: &sched_param,
+) -> Result<(), Errno> {
+    // TODO
+    Ok(())
+}
+pub fn set_sched_priority(_thread: &Pthread, _prio: c_int) -> Result<(), Errno> {
+    // TODO
+    Ok(())
+}
+pub fn set_cancel_state(state: c_int) -> Result<c_int, Errno> {
+    let this_thread = current_thread().expect("current thread not present");
+
+    let was_cancelable = match state {
+        header::PTHREAD_CANCEL_ENABLE => {
+            let old = this_thread
+                .has_enabled_cancelation
+                .swap(true, Ordering::Release);
+
+            if this_thread.has_queued_cancelation.load(Ordering::Acquire) {
+                unsafe {
+                    cancel_current_thread();
+                }
+            }
+            old
+        }
+        header::PTHREAD_CANCEL_DISABLE => this_thread
+            .has_enabled_cancelation
+            .swap(false, Ordering::Release),
+
+        _ => return Err(Errno(EINVAL)),
+    };
+
+    Ok(match was_cancelable {
+        true => header::PTHREAD_CANCEL_ENABLE,
+        false => header::PTHREAD_CANCEL_DISABLE,
+    })
+}
+pub fn set_cancel_type(ty: c_int) -> Result<c_int, Errno> {
+    let this_thread = current_thread().expect("current thread not present");
+
+    // TODO
+    match ty {
+        header::PTHREAD_CANCEL_DEFERRED => (),
+        header::PTHREAD_CANCEL_ASYNCHRONOUS => (),
+
+        _ => return Err(Errno(EINVAL)),
+    }
+    Ok(header::PTHREAD_CANCEL_DEFERRED)
+}
+pub fn get_cpu_clkid(thread: &Pthread) -> Result<clockid_t, Errno> {
+    // TODO
+    Err(Errno(ENOENT))
+}
+pub fn get_sched_param(thread: &Pthread) -> Result<(clockid_t, sched_param), Errno> {
+    todo!()
+}
+
+// TODO: Hash map?
+// TODO: RwLock to improve perf?
+static OS_TID_TO_PTHREAD: Mutex<BTreeMap<OsTid, ForceSendSync<*mut Tcb>>> =
+    Mutex::new(BTreeMap::new());
+
+#[derive(Clone, Copy)]
+struct ForceSendSync<T>(T);
+unsafe impl<T> Send for ForceSendSync<T> {}
+unsafe impl<T> Sync for ForceSendSync<T> {}
+
+/*pub(crate) fn current_thread_index() -> u32 {
+    current_thread().expect("current thread not present").index
+}*/
+
+#[derive(Clone, Copy, Default, Debug)]
+pub enum Pshared {
+    #[default]
+    Private,
+
+    Shared,
+}
+impl Pshared {
+    pub const fn from_raw(raw: c_int) -> Option<Self> {
+        Some(match raw {
+            header::PTHREAD_PROCESS_PRIVATE => Self::Private,
+            header::PTHREAD_PROCESS_SHARED => Self::Shared,
+
+            _ => return None,
+        })
+    }
+    pub const fn raw(self) -> c_int {
+        match self {
+            Self::Private => header::PTHREAD_PROCESS_PRIVATE,
+            Self::Shared => header::PTHREAD_PROCESS_SHARED,
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/raw_cell.rs b/recipes/core/relibc/src/raw_cell.rs
new file mode 100644
index 0000000000..998fccdca0
--- /dev/null
+++ b/recipes/core/relibc/src/raw_cell.rs
@@ -0,0 +1,50 @@
+use core::cell::UnsafeCell;
+
+/// Wrapper over `UnsafeCell` that can directly be used in statics, where all modifications require
+/// unsafe.
+#[repr(transparent)]
+pub struct RawCell<T> {
+    inner: UnsafeCell<T>,
+}
+impl<T> RawCell<T> {
+    #[inline]
+    pub const fn new(t: T) -> Self {
+        Self {
+            inner: UnsafeCell::new(t),
+        }
+    }
+    #[inline]
+    pub fn as_mut_ptr(&self) -> *mut T {
+        self.inner.get()
+    }
+    #[inline]
+    pub fn get_mut(&mut self) -> &mut T {
+        self.inner.get_mut()
+    }
+    #[inline]
+    pub fn into_inner(self) -> T {
+        self.inner.into_inner()
+    }
+    #[inline]
+    pub unsafe fn unsafe_ref(&self) -> &T {
+        unsafe { &*self.inner.get() }
+    }
+    #[inline]
+    pub unsafe fn unsafe_set(&self, t: T) {
+        unsafe { *self.inner.get() = t };
+    }
+    #[inline]
+    pub unsafe fn unsafe_mut(&self) -> &mut T {
+        unsafe { &mut *self.inner.get() }
+    }
+}
+
+// SAFETY: Sync requires that no safe interface be allowed to act on &self in a way that is
+// undefined behavior when accessed concurrently. The interface above only allows get, set, and
+// as_mut_ptr, where the former two that access memory are unsafe anyway.
+unsafe impl<T> Sync for RawCell<T> {}
+
+const _: () = {
+    // Check that RawCell works for non-Sync types.
+    static X: RawCell<*mut ()> = RawCell::new(core::ptr::null_mut());
+};
diff --git a/recipes/core/relibc/src/start.rs b/recipes/core/relibc/src/start.rs
new file mode 100644
index 0000000000..e79cf75325
--- /dev/null
+++ b/recipes/core/relibc/src/start.rs
@@ -0,0 +1,267 @@
+//! Startup code.
+
+use alloc::{boxed::Box, vec::Vec};
+use core::{intrinsics, ptr};
+
+#[cfg(target_os = "redox")]
+use generic_rt::ExpectTlsFree;
+
+use crate::{
+    ALLOCATOR,
+    header::{libgen, stdio, stdlib},
+    ld_so::{self, linker::Linker},
+    platform::{self, Pal, Sys, get_auxvs, types::*},
+    sync::mutex::Mutex,
+};
+
+#[repr(C)]
+pub struct Stack {
+    pub argc: isize,
+    pub argv0: *const c_char,
+}
+
+impl Stack {
+    pub fn argv(&self) -> *const *const c_char {
+        ptr::from_ref(&self.argv0)
+    }
+
+    pub fn envp(&self) -> *const *const c_char {
+        unsafe { self.argv().offset(self.argc + 1) }
+    }
+
+    pub fn auxv(&self) -> *const (usize, usize) {
+        unsafe {
+            let mut envp = self.envp();
+            while !(*envp).is_null() {
+                envp = envp.add(1);
+            }
+            envp.add(1).cast::<(usize, usize)>()
+        }
+    }
+}
+
+unsafe fn copy_string_array(array: *const *const c_char, len: usize) -> Vec<*mut c_char> {
+    use crate::header::string::strlen;
+
+    let mut vec = Vec::with_capacity(len + 1);
+    let mut lengths = Vec::with_capacity(len);
+    let mut size = 0;
+    for i in 0..len {
+        let item = unsafe { *array.add(i) };
+        lengths.push(unsafe { strlen(item) } + 1);
+        size += lengths[i];
+    }
+
+    // Programs unfortunately rely on the strings being contiguous in memory. For example:
+    // https://github.com/libuv/libuv/blob/12d0dd48e3c6baf1e2f0d9f85f11f0ef58285d6f/src/unix/proctitle.c#L87
+    let mut offset = 0;
+    let buf = unsafe { platform::alloc(size).cast::<c_char>() };
+
+    for i in 0..len {
+        let dest_buf = unsafe { buf.add(offset) };
+        let item = unsafe { *array.add(i) };
+        let len = lengths[i];
+
+        unsafe {
+            ptr::copy_nonoverlapping(item, dest_buf, len);
+        }
+
+        vec.push(dest_buf);
+        offset += len;
+    }
+    vec.push(ptr::null_mut());
+    vec
+}
+
+// Since Redox and Linux are so similar, it is easy to accidentally run a binary from one on the
+// other. This will test that the current system is compatible with the current binary
+#[unsafe(no_mangle)]
+pub unsafe fn relibc_verify_host() {
+    if !Sys::verify() {
+        intrinsics::abort();
+    }
+}
+#[unsafe(link_section = ".init_array")]
+#[used]
+static INIT_ARRAY: [extern "C" fn(); 1] = [init_array];
+
+static mut init_complete: bool = false;
+
+#[used]
+#[unsafe(no_mangle)]
+static mut __relibc_init_environ: *mut *mut c_char = ptr::null_mut();
+
+fn alloc_init() {
+    unsafe {
+        if init_complete {
+            return;
+        }
+    }
+    unsafe {
+        if let Some(tcb) = ld_so::tcb::Tcb::current()
+            && !tcb.mspace.is_null()
+        {
+            ALLOCATOR.set(tcb.mspace);
+        }
+    }
+}
+
+extern "C" fn init_array() {
+    // The thing is that we cannot guarantee if
+    // init_array runs first or if relibc_start runs first
+    // Still whoever gets to run first must initialize rust
+    // memory allocator before doing anything else.
+
+    unsafe {
+        if init_complete {
+            return;
+        }
+    }
+
+    alloc_init();
+    io_init();
+
+    unsafe {
+        if platform::environ.is_null() {
+            platform::environ = __relibc_init_environ;
+        }
+    }
+
+    unsafe {
+        crate::pthread::init();
+        init_complete = true
+    }
+}
+
+fn io_init() {
+    unsafe {
+        // Initialize stdin/stdout/stderr.
+        // TODO: const fn initialization of FILE
+        stdio::stdin = stdio::default_stdin().get();
+        stdio::stdout = stdio::default_stdout().get();
+        stdio::stderr = stdio::default_stderr().get();
+    }
+}
+
+#[inline(never)]
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn relibc_start_v1(
+    sp: &'static Stack,
+    main: unsafe extern "C" fn(
+        argc: isize,
+        argv: *mut *mut c_char,
+        envp: *mut *mut c_char,
+    ) -> c_int,
+) -> ! {
+    unsafe extern "C" {
+        static __preinit_array_start: extern "C" fn();
+        static __preinit_array_end: extern "C" fn();
+        static __init_array_start: extern "C" fn();
+        static __init_array_end: extern "C" fn();
+
+        fn _init();
+    }
+
+    // Ensure correct host system before executing more system calls
+    unsafe { relibc_verify_host() };
+
+    #[cfg(target_os = "redox")]
+    let thr_fd = redox_rt::proc::FdGuard::new(
+        unsafe {
+            crate::platform::get_auxv_raw(sp.auxv().cast(), redox_rt::auxv_defs::AT_REDOX_THR_FD)
+        }
+        .expect_notls("no thread fd present"),
+    )
+    .to_upper()
+    .expect_notls("failed to move thread fd to upper table");
+
+    // Initialize TLS, if necessary
+    unsafe {
+        ld_so::init(
+            sp,
+            #[cfg(target_os = "redox")]
+            thr_fd,
+        )
+    };
+
+    // Set up the right allocator...
+    // if any memory rust based memory allocation happen before this step .. we are doomed.
+    alloc_init();
+
+    if let Some(tcb) = unsafe { ld_so::tcb::Tcb::current() } {
+        // Update TCB mspace
+        if tcb.mspace.is_null() {
+            tcb.mspace = ALLOCATOR.get();
+        }
+
+        // Set linker pointer if necessary
+        if tcb.linker_ptr.is_null() {
+            //TODO: get ld path
+            let linker = Linker::new(ld_so::linker::Config::default());
+            //TODO: load root object
+            tcb.linker_ptr = Box::into_raw(Box::new(Mutex::new(linker)));
+        }
+        #[cfg(target_os = "redox")]
+        redox_rt::signal::setup_sighandler(&tcb.os_specific, true);
+    }
+
+    // Set up argc and argv
+    let argc = sp.argc;
+    let argv = sp.argv();
+    unsafe { platform::inner_argv.unsafe_set(copy_string_array(argv, argc as usize)) };
+    unsafe { platform::argv = platform::inner_argv.unsafe_mut().as_mut_ptr() };
+    // Special code for program_invocation_name and program_invocation_short_name
+    if let Some(arg) = unsafe { platform::inner_argv.unsafe_ref() }.first() {
+        unsafe { platform::program_invocation_name = *arg };
+        unsafe { platform::program_invocation_short_name = libgen::basename(*arg) };
+    }
+    // We check for NULL here since ld.so might already have initialized it for us, and we don't
+    // want to overwrite it if constructors in .init_array of dependency libraries have called
+    // setenv.
+    if unsafe { platform::environ }.is_null() {
+        // Set up envp
+        let envp = sp.envp();
+        let mut len = 0;
+        while !(unsafe { *envp.add(len) }).is_null() {
+            len += 1;
+        }
+        unsafe { platform::OUR_ENVIRON.unsafe_set(copy_string_array(envp, len)) };
+        unsafe { platform::environ = platform::OUR_ENVIRON.unsafe_mut().as_mut_ptr() };
+    }
+
+    let auxvs = unsafe { get_auxvs(sp.auxv().cast()) };
+    unsafe { crate::platform::init(auxvs) };
+    init_array();
+    unsafe { crate::platform::logger::init() };
+
+    // Run preinit array
+    {
+        let mut f = unsafe { &__preinit_array_start } as *const _;
+        #[allow(clippy::op_ref)]
+        while f < &raw const __preinit_array_end {
+            (unsafe { *f })();
+            f = unsafe { f.offset(1) };
+        }
+    }
+
+    // Call init section
+    #[cfg(not(target_arch = "riscv64"))] // risc-v uses arrays exclusively
+    {
+        unsafe { _init() };
+    }
+
+    // Run init array
+    {
+        let mut f = unsafe { &__init_array_start } as *const _;
+        #[allow(clippy::op_ref)]
+        while f < &raw const __init_array_end {
+            (unsafe { *f })();
+            f = unsafe { f.offset(1) };
+        }
+    }
+
+    // not argv or envp, because programs like bash try to modify this *const* pointer :|
+    unsafe { stdlib::exit(main(argc, platform::argv, platform::environ)) };
+
+    unreachable!();
+}
diff --git a/recipes/core/relibc/src/sync/barrier.rs b/recipes/core/relibc/src/sync/barrier.rs
new file mode 100644
index 0000000000..6204a235ef
--- /dev/null
+++ b/recipes/core/relibc/src/sync/barrier.rs
@@ -0,0 +1,85 @@
+use core::num::NonZeroU32;
+
+pub struct Barrier {
+    original_count: NonZeroU32,
+    // 4
+    lock: crate::sync::Mutex<Inner>,
+    // 16
+    cvar: crate::header::pthread::RlctCond,
+    // 24
+}
+#[derive(Debug)]
+struct Inner {
+    count: u32,
+    // TODO: Overflows might be problematic... 64-bit?
+    gen_id: u32,
+}
+
+pub enum WaitResult {
+    Waited,
+    NotifiedAll,
+}
+
+impl Barrier {
+    pub fn new(count: NonZeroU32) -> Self {
+        Self {
+            original_count: count,
+            lock: crate::sync::Mutex::new(Inner {
+                count: 0,
+                gen_id: 0,
+            }),
+            cvar: crate::header::pthread::RlctCond::new(),
+        }
+    }
+    pub fn wait(&self) -> WaitResult {
+        let mut guard = self.lock.lock();
+        let gen_id = guard.gen_id;
+
+        guard.count += 1;
+
+        if guard.count == self.original_count.get() {
+            guard.gen_id = guard.gen_id.wrapping_add(1);
+            guard.count = 0;
+            if let Ok(()) = self.cvar.broadcast() {}; // TODO handle error
+
+            drop(guard);
+
+            WaitResult::NotifiedAll
+        } else {
+            while guard.gen_id == gen_id {
+                guard = self.cvar.wait_inner_typedmutex(guard);
+            }
+
+            WaitResult::Waited
+        }
+        /*
+        let mut guard = self.lock.lock();
+        let Inner { count, gen_id } = *guard;
+
+        let last = self.original_count.get() - 1;
+
+        if count == last {
+            eprintln!("last {:?}", *guard);
+            guard.gen_id = guard.gen_id.wrapping_add(1);
+            guard.count = 0;
+
+            drop(guard);
+
+            self.cvar.broadcast();
+
+            WaitResult::NotifiedAll
+        } else {
+            guard.count += 1;
+
+            while guard.count != last && guard.gen_id == gen_id {
+                eprintln!("before {:?}", *guard);
+                guard = self.cvar.wait_inner_typedmutex(guard);
+                eprintln!("after {:?}", *guard);
+            }
+
+            WaitResult::Waited
+        }
+        */
+    }
+}
+static LOCK: crate::sync::Mutex<()> = crate::sync::Mutex::new(());
diff --git a/recipes/core/relibc/src/sync/barrier.rs.unused b/recipes/core/relibc/src/sync/barrier.rs.unused
new file mode 100644
index 0000000000..c07c9d3ca3
--- /dev/null
+++ b/recipes/core/relibc/src/sync/barrier.rs.unused
@@ -0,0 +1,91 @@
+use core::cmp;
+use core::num::NonZeroU32;
+use core::sync::atomic::{AtomicU32 as AtomicUint, Ordering};
+
+pub struct Barrier {
+    waited_count: AtomicUint,
+    notified_count: AtomicUint,
+    cycles_count: AtomicUint,
+    original_count: NonZeroU32,
+}
+
+pub enum WaitResult {
+    Waited,
+    NotifiedAll,
+}
+
+impl Barrier {
+    pub fn new(count: NonZeroU32) -> Self {
+        Self {
+            waited_count: AtomicUint::new(0),
+            notified_count: AtomicUint::new(0),
+            cycles_count: AtomicUint::new(0),
+            original_count: count,
+        }
+    }
+    pub fn wait(&self) -> WaitResult {
+        // The barrier wait operation can be divided into two parts: (1) incrementing the wait count where
+        // N-1 waiters wait and one notifies the rest, and (2) notifying all threads that have been
+        // waiting.
+        let original_count = self.original_count.get();
+        let mut new = self.waited_count.fetch_add(1, Ordering::Acquire) + 1;
+        let original_cycle_count = self.cycles_count.load(Ordering::Acquire);
+
+        loop {
+            let result = match Ord::cmp(&new, &original_count) {
+                cmp::Ordering::Less => {
+                    // new < original_count, i.e. we were one of the threads that incremented the
+                    // counter, and will return without SERIAL_THREAD later, but need to continue
+                    // waiting for the last waiter to notify the others.
+
+                    loop {
+                        let count = self.waited_count.load(Ordering::Acquire);
+
+                        if count >= original_count { break }
+
+                        let _ = crate::sync::futex_wait(&self.waited_count, count, None);
+                    }
+
+                    WaitResult::Waited
+                }
+                cmp::Ordering::Equal => {
+                    // new == original_count, i.e. we were the one thread doing the last increment, and we
+                    // will be responsible for waking up all other waiters.
+
+                    crate::sync::futex_wake(&self.waited_count, original_count as i32 - 1);
+
+                    WaitResult::NotifiedAll
+                }
+                cmp::Ordering::Greater => {
+                    let mut next_cycle_count;
+
+                    loop {
+                        next_cycle_count = self.cycles_count.load(Ordering::Acquire);
+
+                        if next_cycle_count != original_cycle_count {
+                            break;
+                        }
+
+                        crate::sync::futex_wait(&self.cycles_count, next_cycle_count, None);
+                    }
+                    let difference = next_cycle_count.wrapping_sub(original_cycle_count);
+
+                    new = new.saturating_sub(difference * original_cycle_count);
+                    continue;
+                }
+            };
+
+            if self.notified_count.fetch_add(1, Ordering::AcqRel) + 1 == original_count {
+                self.notified_count.store(0, Ordering::Relaxed);
+                // Cycle count can be incremented nonatomically here, as this branch can only be
+                // reached once until waited_count is decremented again.
+                self.cycles_count.store(self.cycles_count.load(Ordering::Acquire).wrapping_add(1), Ordering::Release);
+
+                let _ = self.waited_count.fetch_sub(original_count, Ordering::Relaxed);
+
+                let _ = crate::sync::futex_wake(&self.cycles_count, i32::MAX);
+            }
+            return result;
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/sync/cond.rs b/recipes/core/relibc/src/sync/cond.rs
new file mode 100644
index 0000000000..19f9868a19
--- /dev/null
+++ b/recipes/core/relibc/src/sync/cond.rs
@@ -0,0 +1,134 @@
+// Used design from https://www.remlab.net/op/futex-condvar.shtml
+
+use crate::{
+    error::Errno,
+    header::{
+        bits_timespec::timespec,
+        errno::{EINVAL, ETIMEDOUT},
+        pthread::*,
+        time::{CLOCK_MONOTONIC, CLOCK_REALTIME, timespec_realtime_to_monotonic},
+    },
+    platform::types::clockid_t,
+};
+
+use core::sync::atomic::{AtomicU32 as AtomicUint, Ordering};
+
+#[derive(Clone, Copy)]
+pub struct CondAttr {
+    pub clock: clockid_t,
+    pub pshared: i32,
+}
+
+impl Default for CondAttr {
+    fn default() -> Self {
+        Self {
+            // defaults according to POSIX
+            clock: CLOCK_REALTIME,            // for timedwait
+            pshared: PTHREAD_PROCESS_PRIVATE, // TODO
+        }
+    }
+}
+
+pub struct Cond {
+    cur: AtomicUint,
+    prev: AtomicUint,
+}
+
+type Result<T, E = Errno> = core::result::Result<T, E>;
+
+impl Default for Cond {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Cond {
+    pub fn new() -> Self {
+        Self {
+            cur: AtomicUint::new(0),
+            prev: AtomicUint::new(0),
+        }
+    }
+    fn wake(&self, count: i32) -> Result<(), Errno> {
+        // This is formally correct as long as we don't have more than u32::MAX threads.
+        let prev = self.prev.load(Ordering::Relaxed);
+        self.cur.store(prev.wrapping_add(1), Ordering::Relaxed);
+
+        crate::sync::futex_wake(&self.cur, count);
+        Ok(())
+    }
+    pub fn broadcast(&self) -> Result<(), Errno> {
+        self.wake(i32::MAX)
+    }
+    pub fn signal(&self) -> Result<(), Errno> {
+        self.broadcast()
+        //self.wake(1)
+    }
+    pub fn clockwait(
+        &self,
+        mutex: &RlctMutex,
+        timeout: &timespec,
+        clock_id: clockid_t,
+    ) -> Result<(), Errno> {
+        let relative = match clock_id {
+            // FUTEX expect monotonic clock
+            CLOCK_MONOTONIC => timeout.clone(),
+            CLOCK_REALTIME => timespec_realtime_to_monotonic(timeout.clone())?,
+            _ => return Err(Errno(EINVAL)),
+        };
+
+        self.wait_inner(mutex, Some(&relative))
+    }
+    pub fn timedwait(&self, mutex: &RlctMutex, timeout: &timespec) -> Result<(), Errno> {
+        // TODO: The clock can be other than CLOCK_REALTIME depends on CondAttr
+        self.clockwait(mutex, timeout, CLOCK_REALTIME)
+    }
+    fn wait_inner(&self, mutex: &RlctMutex, timeout: Option<&timespec>) -> Result<(), Errno> {
+        self.wait_inner_generic(|| mutex.unlock(), || mutex.lock(), timeout)
+    }
+    pub fn wait_inner_typedmutex<'lock, T>(
+        &self,
+        guard: crate::sync::MutexGuard<'lock, T>,
+    ) -> crate::sync::MutexGuard<'lock, T> {
+        let mut newguard = None;
+        let lock = guard.mutex;
+        self.wait_inner_generic(
+            move || {
+                drop(guard);
+                Ok(())
+            },
+            || {
+                newguard = Some(lock.lock());
+                Ok(())
+            },
+            None,
+        )
+        .unwrap();
+        newguard.unwrap()
+    }
+    // TODO: FUTEX_REQUEUE
+    fn wait_inner_generic(
+        &self,
+        unlock: impl FnOnce() -> Result<()>,
+        lock: impl FnOnce() -> Result<()>,
+        deadline: Option<&timespec>,
+    ) -> Result<(), Errno> {
+        // TODO: Error checking for certain types (i.e. robust and errorcheck) of mutexes, e.g. if the
+        // mutex is not locked.
+        let current = self.cur.load(Ordering::Relaxed);
+        self.prev.store(current, Ordering::Relaxed);
+
+        unlock()?;
+        let futex_r = crate::sync::futex_wait(&self.cur, current, deadline);
+        lock()?;
+
+        match futex_r {
+            super::FutexWaitResult::Waited => Ok(()),
+            super::FutexWaitResult::Stale => Ok(()),
+            super::FutexWaitResult::TimedOut => Err(Errno(ETIMEDOUT)),
+        }
+    }
+    pub fn wait(&self, mutex: &RlctMutex) -> Result<(), Errno> {
+        self.wait_inner(mutex, None)
+    }
+}
diff --git a/recipes/core/relibc/src/sync/mod.rs b/recipes/core/relibc/src/sync/mod.rs
new file mode 100644
index 0000000000..9edda90ece
--- /dev/null
+++ b/recipes/core/relibc/src/sync/mod.rs
@@ -0,0 +1,247 @@
+//! Synchronization primitives.
+
+pub mod barrier;
+pub mod cond;
+// TODO: Merge with pthread_mutex
+pub mod mutex;
+
+pub mod once;
+pub mod pthread_mutex;
+pub mod rwlock;
+pub mod semaphore;
+pub mod waitval;
+
+pub use self::{
+    mutex::{Mutex, MutexGuard},
+    once::Once,
+    semaphore::Semaphore,
+};
+
+use crate::{
+    error::Errno,
+    header::{
+        bits_timespec::timespec,
+        errno::{EAGAIN, EINTR, ETIMEDOUT},
+    },
+    out::Out,
+    platform::{Pal, Sys, types::c_int},
+};
+use core::{
+    hint,
+    mem::MaybeUninit,
+    ops::Deref,
+    ptr,
+    sync::atomic::{AtomicI32, AtomicI32 as AtomicInt, AtomicU32},
+};
+
+const FUTEX_WAIT: c_int = 0;
+const FUTEX_WAKE: c_int = 1;
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum AttemptStatus {
+    Desired,
+    Waiting,
+    Other,
+}
+
+pub trait FutexTy {
+    fn conv(self) -> u32;
+}
+pub trait FutexAtomicTy {
+    type Ty: FutexTy;
+
+    fn ptr(&self) -> *mut Self::Ty;
+}
+impl FutexTy for u32 {
+    fn conv(self) -> u32 {
+        self
+    }
+}
+impl FutexTy for i32 {
+    fn conv(self) -> u32 {
+        self as u32
+    }
+}
+impl FutexAtomicTy for AtomicU32 {
+    type Ty = u32;
+
+    fn ptr(&self) -> *mut u32 {
+        // TODO: Change when Redox's toolchain is updated. This is not about targets, but compiler
+        // versions!
+        /*
+
+        #[cfg(target_os = "redox")]
+        return AtomicU32::as_ptr(self);
+
+        #[cfg(target_os = "linux")]
+        return AtomicU32::as_mut_ptr(self);
+
+        */
+
+        // AtomicU32::as_mut_ptr internally calls UnsafeCell::get, which itself simply does (&self
+        // as *const Self as *mut Self).
+        ptr::from_ref::<AtomicU32>(self) as *mut u32
+    }
+}
+impl FutexAtomicTy for AtomicI32 {
+    type Ty = i32;
+
+    fn ptr(&self) -> *mut i32 {
+        // TODO
+        /*#[cfg(target_os = "redox")]
+        return AtomicI32::as_ptr(self);
+
+        #[cfg(target_os = "linux")]
+        return AtomicI32::as_mut_ptr(self);*/
+
+        ptr::from_ref::<AtomicI32>(self) as *mut i32
+    }
+}
+
+pub unsafe fn futex_wake_ptr(ptr: *mut impl FutexTy, n: i32) -> usize {
+    // TODO: unwrap_unchecked?
+    unsafe { Sys::futex_wake(ptr.cast(), n as u32) }.unwrap() as usize
+}
+pub unsafe fn futex_wait_ptr<T: FutexTy>(
+    ptr: *mut T,
+    value: T,
+    deadline_opt: Option<&timespec>,
+) -> FutexWaitResult {
+    match unsafe { Sys::futex_wait(ptr.cast(), value.conv(), deadline_opt) } {
+        Ok(()) | Err(Errno(EINTR)) => FutexWaitResult::Waited,
+        Err(Errno(EAGAIN)) => FutexWaitResult::Stale,
+        Err(Errno(ETIMEDOUT)) if deadline_opt.is_some() => FutexWaitResult::TimedOut,
+        Err(err) => {
+            todo_error!(0, err, "futex failed");
+            FutexWaitResult::Waited
+        }
+    }
+}
+pub fn futex_wake(atomic: &impl FutexAtomicTy, n: i32) -> usize {
+    unsafe { futex_wake_ptr(atomic.ptr(), n) }
+}
+pub fn futex_wait<T: FutexAtomicTy>(
+    atomic: &T,
+    value: T::Ty,
+    deadline_opt: Option<&timespec>,
+) -> FutexWaitResult {
+    unsafe { futex_wait_ptr(atomic.ptr(), value, deadline_opt) }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum FutexWaitResult {
+    Waited, // possibly spurious
+    Stale,  // outdated value
+    TimedOut,
+}
+
+pub fn rttime() -> timespec {
+    unsafe {
+        let mut time = MaybeUninit::uninit();
+
+        if let Ok(()) = Sys::clock_gettime(
+            crate::header::time::CLOCK_REALTIME,
+            Out::from_uninit_mut(&mut time),
+        ) {}; // TODO handle error
+
+        time.assume_init()
+    }
+}
+
+pub fn wait_until_generic<F1, F2>(word: &AtomicInt, attempt: F1, mark_long: F2, long: c_int)
+where
+    F1: Fn(&AtomicInt) -> AttemptStatus,
+    F2: Fn(&AtomicInt) -> AttemptStatus,
+{
+    // First, try spinning for really short durations
+    for _ in 0..999 {
+        hint::spin_loop();
+        if attempt(word) == AttemptStatus::Desired {
+            return;
+        }
+    }
+
+    // One last attempt, to initiate "previous"
+    let mut previous = attempt(word);
+
+    // Ok, that seems to take quite some time. Let's go into a
+    // longer, more patient, wait.
+    loop {
+        if previous == AttemptStatus::Desired {
+            return;
+        }
+
+        if
+        // If we or somebody else already initiated a long
+        // wait, OR
+        previous == AttemptStatus::Waiting ||
+            // Otherwise, unless our attempt to initiate a long
+            // wait informed us that we might be done waiting
+            mark_long(word) != AttemptStatus::Desired
+        {
+            futex_wait(word, long, None);
+        }
+
+        previous = attempt(word);
+    }
+}
+
+/// Convenient wrapper around the "futex" system call for
+/// synchronization implementations
+#[repr(C)]
+pub(crate) struct AtomicLock {
+    pub(crate) atomic: AtomicInt,
+}
+impl AtomicLock {
+    pub const fn new(value: c_int) -> Self {
+        Self {
+            atomic: AtomicInt::new(value),
+        }
+    }
+    pub fn notify_one(&self) {
+        futex_wake(&self.atomic, 1);
+    }
+    pub fn notify_all(&self) {
+        futex_wake(&self.atomic, i32::MAX);
+    }
+    pub fn wait_if(&self, value: c_int, timeout_opt: Option<&timespec>) {
+        self.wait_if_raw(value, timeout_opt);
+    }
+    pub fn wait_if_raw(&self, value: c_int, timeout_opt: Option<&timespec>) -> FutexWaitResult {
+        futex_wait(&self.atomic, value, timeout_opt)
+    }
+
+    /// A general way to efficiently wait for what might be a long time, using two closures:
+    ///
+    /// - `attempt` = Attempt to modify the atomic value to any
+    ///   desired state.
+    /// - `mark_long` = Attempt to modify the atomic value to sign
+    ///   that it want's to get notified when waiting is done.
+    ///
+    /// Both of these closures are allowed to spuriously give a
+    /// non-success return value, they are used only as optimization
+    /// hints. However, what counts as a "desired value" may differ
+    /// per closure. Therefore, `mark_long` can notify a value as
+    /// "desired" in order to get `attempt` retried immediately.
+    ///
+    /// The `long` parameter is the only one which actually cares
+    /// about the specific value of your atomics. This is needed
+    /// because it needs to pass this to the futex system call in
+    /// order to avoid race conditions where the atomic could be
+    /// modified to the desired value before the call is complete and
+    /// we receive the wakeup notification.
+    pub fn wait_until<F1, F2>(&self, attempt: F1, mark_long: F2, long: c_int)
+    where
+        F1: Fn(&AtomicInt) -> AttemptStatus,
+        F2: Fn(&AtomicInt) -> AttemptStatus,
+    {
+        wait_until_generic(&self.atomic, attempt, mark_long, long)
+    }
+}
+impl Deref for AtomicLock {
+    type Target = AtomicInt;
+
+    fn deref(&self) -> &Self::Target {
+        &self.atomic
+    }
+}
diff --git a/recipes/core/relibc/src/sync/mutex.rs b/recipes/core/relibc/src/sync/mutex.rs
new file mode 100644
index 0000000000..fc8cda2892
--- /dev/null
+++ b/recipes/core/relibc/src/sync/mutex.rs
@@ -0,0 +1,142 @@
+use super::{AtomicLock, AttemptStatus};
+use crate::platform::types::c_int;
+use core::{
+    cell::UnsafeCell,
+    ops::{Deref, DerefMut},
+    sync::atomic::{AtomicI32 as AtomicInt, Ordering},
+};
+
+pub(crate) const UNLOCKED: c_int = 0;
+pub(crate) const LOCKED: c_int = 1;
+pub(crate) const WAITING: c_int = 2;
+
+pub struct Mutex<T> {
+    pub(crate) lock: AtomicLock,
+    content: UnsafeCell<T>,
+}
+unsafe impl<T: Send> Send for Mutex<T> {}
+unsafe impl<T: Send> Sync for Mutex<T> {}
+
+pub(crate) unsafe fn manual_try_lock_generic(word: &AtomicInt) -> bool {
+    word.compare_exchange(UNLOCKED, LOCKED, Ordering::Acquire, Ordering::Relaxed)
+        .is_ok()
+}
+pub(crate) unsafe fn manual_lock_generic(word: &AtomicInt) {
+    crate::sync::wait_until_generic(
+        word,
+        |lock| {
+            lock.compare_exchange_weak(UNLOCKED, LOCKED, Ordering::Acquire, Ordering::Relaxed)
+                .map(|_| AttemptStatus::Desired)
+                .unwrap_or_else(|e| match e {
+                    WAITING => AttemptStatus::Waiting,
+                    _ => AttemptStatus::Other,
+                })
+        },
+        |lock| match lock
+            // TODO: Ordering
+            .compare_exchange_weak(LOCKED, WAITING, Ordering::SeqCst, Ordering::SeqCst)
+            .unwrap_or_else(|e| e)
+        {
+            UNLOCKED => AttemptStatus::Desired,
+            WAITING => AttemptStatus::Waiting,
+            _ => AttemptStatus::Other,
+        },
+        WAITING,
+    );
+}
+pub(crate) unsafe fn manual_unlock_generic(word: &AtomicInt) {
+    if word.swap(UNLOCKED, Ordering::Release) == WAITING {
+        crate::sync::futex_wake(word, i32::MAX);
+    }
+}
+
+impl<T> Mutex<T> {
+    /// Create a new mutex
+    pub const fn new(content: T) -> Self {
+        Self {
+            lock: AtomicLock::new(UNLOCKED),
+            content: UnsafeCell::new(content),
+        }
+    }
+    /// Create a new mutex that is already locked. This is a more
+    /// efficient way to do the following:
+    /// ```rust
+    /// let mut mutex = Mutex::new(());
+    /// mutex.manual_lock();
+    /// ```
+    pub unsafe fn locked(content: T) -> Self {
+        Self {
+            lock: AtomicLock::new(LOCKED),
+            content: UnsafeCell::new(content),
+        }
+    }
+
+    /// Tries to lock the mutex, fails if it's already locked. Manual means
+    /// it's up to you to unlock it after mutex. Returns the last atomic value
+    /// on failure. You should probably not worry about this, it's used for
+    /// internal optimizations.
+    pub unsafe fn manual_try_lock(&self) -> Result<&mut T, c_int> {
+        if unsafe { manual_try_lock_generic(&self.lock) } {
+            Ok(unsafe { &mut *self.content.get() })
+        } else {
+            Err(0)
+        }
+    }
+    /// Lock the mutex, returning the inner content. After doing this, it's
+    /// your responsibility to unlock it after usage. Mostly useful for FFI:
+    /// Prefer normal .lock() where possible.
+    pub unsafe fn manual_lock(&self) -> &mut T {
+        unsafe { manual_lock_generic(&self.lock) };
+        unsafe { &mut *self.content.get() }
+    }
+    /// Unlock the mutex, if it's locked.
+    pub unsafe fn manual_unlock(&self) {
+        unsafe { manual_unlock_generic(&self.lock) }
+    }
+    pub fn as_ptr(&self) -> *mut T {
+        self.content.get()
+    }
+
+    /// Tries to lock the mutex and returns a guard that automatically unlocks
+    /// the mutex when it falls out of scope.
+    pub fn try_lock(&self) -> Option<MutexGuard<'_, T>> {
+        unsafe {
+            self.manual_try_lock().ok().map(|content| MutexGuard {
+                mutex: self,
+                content,
+            })
+        }
+    }
+    /// Locks the mutex and returns a guard that automatically unlocks the
+    /// mutex when it falls out of scope.
+    pub fn lock(&self) -> MutexGuard<'_, T> {
+        MutexGuard {
+            mutex: self,
+            content: unsafe { self.manual_lock() },
+        }
+    }
+}
+
+pub struct MutexGuard<'a, T: 'a> {
+    pub(crate) mutex: &'a Mutex<T>,
+    content: &'a mut T,
+}
+impl<'a, T> Deref for MutexGuard<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        self.content
+    }
+}
+impl<'a, T> DerefMut for MutexGuard<'a, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.content
+    }
+}
+impl<'a, T> Drop for MutexGuard<'a, T> {
+    fn drop(&mut self) {
+        unsafe {
+            self.mutex.manual_unlock();
+        }
+    }
+}
diff --git a/recipes/core/relibc/src/sync/once.rs b/recipes/core/relibc/src/sync/once.rs
new file mode 100644
index 0000000000..293ab84cb9
--- /dev/null
+++ b/recipes/core/relibc/src/sync/once.rs
@@ -0,0 +1,124 @@
+use super::AttemptStatus;
+use crate::platform::types::*;
+use core::{
+    cell::UnsafeCell,
+    mem::MaybeUninit,
+    sync::atomic::{AtomicI32 as AtomicInt, Ordering},
+};
+
+const UNINITIALIZED: c_int = 0;
+const INITIALIZING: c_int = 1;
+const WAITING: c_int = 2;
+const INITIALIZED: c_int = 3;
+
+pub struct Once<T> {
+    status: AtomicInt,
+    data: UnsafeCell<MaybeUninit<T>>,
+}
+
+// SAFETY:
+//
+// Sending a Once is the same as sending a (wrapped) T.
+unsafe impl<T: Send> Send for Once<T> {}
+
+// SAFETY:
+//
+// For Once to be shared between threads without being unsound, only call_once needs to be safe, at
+// the moment.
+//
+// Send requirement: the thread that gets to run the initializer function, will put a T in the cell
+// which can then be accessed by other threads, thus T needs to be send.
+//
+// Sync requirement: after call_once has been called, it returns the value via &T, which naturally
+// forces T to be Sync.
+unsafe impl<T: Send + Sync> Sync for Once<T> {}
+
+impl<T> Once<T> {
+    pub const fn new() -> Self {
+        Self {
+            status: AtomicInt::new(UNINITIALIZED),
+            data: UnsafeCell::new(MaybeUninit::uninit()),
+        }
+    }
+    pub fn call_once(&self, constructor: impl FnOnce() -> T) -> &T {
+        match self.status.compare_exchange(
+            UNINITIALIZED,
+            INITIALIZING,
+            // SAFETY: Success ordering: if the CAS succeeds, we technically need no
+            // synchronization besides the Release store to INITIALIZED, and Acquire here forbids
+            // possible loads in f() to be re-ordered before this CAS. One could argue whether or
+            // not that is reasonable, but the main point is that the success ordering must be at
+            // least as strong as the failure ordering.
+            Ordering::Acquire,
+            // SAFETY: Failure ordering: if the CAS fails, and status was INITIALIZING | WAITING,
+            // then Relaxed is sufficient, as it will have to be Acquire-loaded again later. If
+            // INITIALIZED is encountered however, it will nonatomically read the value in the
+            // Cell, which necessitates Acquire.
+            Ordering::Acquire, // TODO: On archs where this matters, use Relaxed and core::sync::atomic::fence?
+        ) {
+            Ok(_must_be_uninit) => {
+                // We now have exclusive access to the cell, let's initiate things!
+                unsafe { self.data.get().cast::<T>().write(constructor()) };
+
+                // Mark the data as initialized
+                if self.status.swap(INITIALIZED, Ordering::Release) == WAITING {
+                    // At least one thread is waiting on this to finish
+                    crate::sync::futex_wake(&self.status, i32::MAX);
+                }
+            }
+            Err(INITIALIZING) | Err(WAITING) => crate::sync::wait_until_generic(
+                &self.status,
+                // SAFETY: An Acquire load is necessary for the nonatomic store by the thread
+                // running the constructor, to become visible.
+                |status| match status.load(Ordering::Acquire) {
+                    WAITING => AttemptStatus::Waiting,
+                    INITIALIZED => AttemptStatus::Desired,
+                    _ => AttemptStatus::Other,
+                },
+                // SAFETY: Double-Acquire is necessary here as well, because if the CAS fails and
+                // it was INITIALIZED, the nonatomic write by the constructor thread, must be
+                // visible.
+                |status| match status
+                    .compare_exchange_weak(
+                        INITIALIZING,
+                        WAITING,
+                        Ordering::Acquire,
+                        Ordering::Acquire,
+                    )
+                    .unwrap_or_else(|e| e)
+                {
+                    WAITING => AttemptStatus::Waiting,
+                    INITIALIZED => AttemptStatus::Desired,
+                    _ => AttemptStatus::Other,
+                },
+                WAITING,
+            ),
+            Err(INITIALIZED) => (),
+
+            // TODO: Only for debug builds?
+            Err(_) => unreachable!("invalid state for Once<T>"),
+        }
+
+        // At this point the data must be initialized!
+        unsafe { (&*self.data.get()).assume_init_ref() }
+    }
+}
+impl<T> Default for Once<T> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+// TODO: Drop doesn't work well in const fn, instead use a wrapper for relibc Rust code that adds
+// Drop, and don't use that wrapper when writing the header file impls.
+/*
+impl<T> Drop for Once<T> {
+    fn drop(&mut self) {
+        unsafe {
+            if *self.status.get_mut() == INITIALIZED {
+                // SAFETY: It must be initialized, because of the above condition.
+                self.data.get_mut().assume_init_drop();
+            }
+        }
+    }
+}
+*/
diff --git a/recipes/core/relibc/src/sync/pthread_mutex.rs b/recipes/core/relibc/src/sync/pthread_mutex.rs
new file mode 100644
index 0000000000..29bad634ae
--- /dev/null
+++ b/recipes/core/relibc/src/sync/pthread_mutex.rs
@@ -0,0 +1,259 @@
+use core::{
+    cell::Cell,
+    sync::atomic::{AtomicU32 as AtomicUint, Ordering},
+};
+
+use crate::{
+    error::Errno,
+    header::{bits_timespec::timespec, errno::*, pthread::*},
+};
+
+use crate::platform::{Pal, Sys, types::c_int};
+
+use super::FutexWaitResult;
+
+pub struct RlctMutex {
+    // Actual locking word.
+    inner: AtomicUint,
+    recursive_count: AtomicUint,
+
+    ty: Ty,
+    robust: bool,
+}
+
+const STATE_UNLOCKED: u32 = 0;
+const WAITING_BIT: u32 = 1 << 31;
+const INDEX_MASK: u32 = !WAITING_BIT;
+
+// TODO: Lower limit is probably better.
+const RECURSIVE_COUNT_MAX_INCLUSIVE: u32 = u32::MAX;
+// TODO: How many spins should we do before it becomes more time-economical to enter kernel mode
+// via futexes?
+const SPIN_COUNT: usize = 0;
+
+impl RlctMutex {
+    pub(crate) fn new(attr: &RlctMutexAttr) -> Result<Self, Errno> {
+        let RlctMutexAttr {
+            prioceiling,
+            protocol,
+            pshared: _,
+            robust,
+            ty,
+        } = *attr;
+
+        Ok(Self {
+            inner: AtomicUint::new(STATE_UNLOCKED),
+            recursive_count: AtomicUint::new(0),
+            robust: match robust {
+                PTHREAD_MUTEX_STALLED => false,
+                PTHREAD_MUTEX_ROBUST => true,
+
+                _ => return Err(Errno(EINVAL)),
+            },
+            ty: match ty {
+                PTHREAD_MUTEX_DEFAULT => Ty::Def,
+                PTHREAD_MUTEX_ERRORCHECK => Ty::Errck,
+                PTHREAD_MUTEX_RECURSIVE => Ty::Recursive,
+                PTHREAD_MUTEX_NORMAL => Ty::Normal,
+
+                _ => return Err(Errno(EINVAL)),
+            },
+        })
+    }
+    pub fn prioceiling(&self) -> Result<c_int, Errno> {
+        todo_skip!(0, "pthread_getprioceiling: not implemented");
+        Ok(0)
+    }
+    pub fn replace_prioceiling(&self, _: c_int) -> Result<c_int, Errno> {
+        todo_skip!(0, "pthread_setprioceiling: not implemented");
+        Ok(0)
+    }
+    pub fn make_consistent(&self) -> Result<(), Errno> {
+        todo_skip!(0, "pthread robust mutexes: not implemented");
+        Ok(())
+    }
+    fn lock_inner(&self, deadline: Option<&timespec>) -> Result<(), Errno> {
+        let this_thread = os_tid_invalid_after_fork();
+
+        //let mut spins_left = SPIN_COUNT;
+
+        loop {
+            let result = self.inner.compare_exchange_weak(
+                STATE_UNLOCKED,
+                this_thread,
+                Ordering::Acquire,
+                Ordering::Relaxed,
+            );
+
+            match result {
+                // CAS succeeded
+                Ok(_) => {
+                    if self.ty == Ty::Recursive {
+                        self.increment_recursive_count()?;
+                    }
+                    return Ok(());
+                }
+                // CAS failed, but the mutex was recursive and we already own the lock.
+                Err(thread) if thread & INDEX_MASK == this_thread && self.ty == Ty::Recursive => {
+                    self.increment_recursive_count()?;
+                    return Ok(());
+                }
+                // CAS failed, but the mutex was error-checking and we already own the lock.
+                Err(thread) if thread & INDEX_MASK == this_thread && self.ty == Ty::Errck => {
+                    return Err(Errno(EAGAIN));
+                }
+                // CAS spuriously failed, simply retry the CAS. TODO: Use core::hint::spin_loop()?
+                Err(thread) if thread & INDEX_MASK == 0 => {
+                    continue;
+                }
+                // CAS failed because some other thread owned the lock. We must now wait.
+                Err(thread) => {
+                    /*if spins_left > 0 {
+                        // TODO: Faster to spin trying to load the flag, compared to CAS?
+                        spins_left -= 1;
+                        core::hint::spin_loop();
+                        continue;
+                    }
+
+                    spins_left = SPIN_COUNT;
+
+                    let inner = self.inner.fetch_or(WAITING_BIT, Ordering::Relaxed);
+
+                    if inner == STATE_UNLOCKED {
+                        continue;
+                    }*/
+
+                    // If the mutex is not robust, simply futex_wait until unblocked.
+                    //crate::sync::futex_wait(&self.inner, inner | WAITING_BIT, None);
+                    if crate::sync::futex_wait(&self.inner, thread, deadline)
+                        == FutexWaitResult::TimedOut
+                    {
+                        return Err(Errno(ETIMEDOUT));
+                    }
+                }
+            }
+        }
+    }
+    pub fn lock(&self) -> Result<(), Errno> {
+        self.lock_inner(None)
+    }
+    pub fn lock_with_timeout(&self, deadline: &timespec) -> Result<(), Errno> {
+        self.lock_inner(Some(deadline))
+    }
+    fn increment_recursive_count(&self) -> Result<(), Errno> {
+        // We don't have to worry about asynchronous signals here, since pthread_mutex_trylock
+        // is not async-signal-safe.
+        //
+        // TODO: Maybe just use Cell? Send/Sync doesn't matter much anyway, and will be
+        // protected by the lock itself anyway.
+
+        let prev_recursive_count = self.recursive_count.load(Ordering::Relaxed);
+
+        if prev_recursive_count == RECURSIVE_COUNT_MAX_INCLUSIVE {
+            return Err(Errno(EAGAIN));
+        }
+
+        self.recursive_count
+            .store(prev_recursive_count + 1, Ordering::Relaxed);
+
+        Ok(())
+    }
+    pub fn try_lock(&self) -> Result<(), Errno> {
+        let this_thread = os_tid_invalid_after_fork();
+
+        // TODO: If recursive, omitting CAS may be faster if it is already owned by this thread.
+        let result = self.inner.compare_exchange(
+            STATE_UNLOCKED,
+            this_thread,
+            Ordering::Acquire,
+            Ordering::Relaxed,
+        );
+
+        if self.ty == Ty::Recursive {
+            match result {
+                Err(index) if index & INDEX_MASK != this_thread => return Err(Errno(EBUSY)),
+                _ => (),
+            }
+
+            self.increment_recursive_count()?;
+
+            return Ok(());
+        }
+
+        match result {
+            Ok(_) => Ok(()),
+            Err(index) if index & INDEX_MASK == this_thread && self.ty == Ty::Errck => {
+                Err(Errno(EDEADLK))
+            }
+            Err(_) => Err(Errno(EBUSY)),
+        }
+    }
+    // Safe because we are not protecting any data.
+    pub fn unlock(&self) -> Result<(), Errno> {
+        if self.robust || matches!(self.ty, Ty::Recursive | Ty::Errck) {
+            if self.inner.load(Ordering::Relaxed) & INDEX_MASK != os_tid_invalid_after_fork() {
+                return Err(Errno(EPERM));
+            }
+
+            // TODO: Is this fence correct?
+            core::sync::atomic::fence(Ordering::Acquire);
+        }
+
+        if self.ty == Ty::Recursive {
+            let next = self.recursive_count.load(Ordering::Relaxed) - 1;
+            self.recursive_count.store(next, Ordering::Relaxed);
+
+            if next > 0 {
+                return Ok(());
+            }
+        }
+
+        self.inner.store(STATE_UNLOCKED, Ordering::Release);
+        crate::sync::futex_wake(&self.inner, i32::MAX);
+        /*let was_waiting = self.inner.swap(STATE_UNLOCKED, Ordering::Release) & WAITING_BIT != 0;
+
+        if was_waiting {
+            let _ = crate::sync::futex_wake(&self.inner, 1);
+        }*/
+
+        Ok(())
+    }
+}
+
+#[repr(u8)]
+#[derive(PartialEq)]
+enum Ty {
+    // The only difference between PTHREAD_MUTEX_NORMAL and PTHREAD_MUTEX_DEFAULT appears to be
+    // that "normal" mutexes deadlock if locked multiple times on the same thread, whereas
+    // "default" mutexes are UB in that case. So we can treat them as being the same type.
+    Normal,
+    Def,
+
+    Errck,
+    Recursive,
+}
+
+// Children after fork can only call async-signal-safe functions until they exec.
+#[thread_local]
+static CACHED_OS_TID_INVALID_AFTER_FORK: Cell<u32> = Cell::new(0);
+
+// Assumes TIDs are unique between processes, which I only know is true for Redox.
+fn os_tid_invalid_after_fork() -> u32 {
+    // TODO: Coordinate better if using shared == PTHREAD_PROCESS_SHARED, with up to 2^32 separate
+    // threads within possibly distinct processes, using the mutex. OS thread IDs on Redox are
+    // pointer-sized, but relibc and POSIX uses int everywhere.
+
+    let value = CACHED_OS_TID_INVALID_AFTER_FORK.get();
+
+    if value == 0 {
+        let tid = Sys::gettid();
+
+        assert_ne!(tid, -1, "failed to obtain current thread ID");
+
+        CACHED_OS_TID_INVALID_AFTER_FORK.set(tid as u32);
+
+        tid as u32
+    } else {
+        value
+    }
+}
diff --git a/recipes/core/relibc/src/sync/reentrant_mutex.rs b/recipes/core/relibc/src/sync/reentrant_mutex.rs
new file mode 100644
index 0000000000..43e60772d0
--- /dev/null
+++ b/recipes/core/relibc/src/sync/reentrant_mutex.rs
@@ -0,0 +1,27 @@
+use super::{AtomicLock, AttemptStatus};
+
+const WAITING_BIT: u32 = 1 << 31;
+const UNLOCKED: u32 = 0;
+// We now have 2^32 - 1 possible thread ID values
+
+pub struct ReentrantMutex<T> {
+    lock: AtomicLock,
+    content: UnsafeCell<T>,
+}
+unsafe impl<T: Send> Send for ReentrantMutex {}
+unsafe impl<T: Send> Sync for ReentrantMutex {}
+
+impl<T> ReentrantMutex<T> {
+    pub const fn new(context: T) -> Self {
+        Self {
+            lock: AtomicLock::new(UNLOCKED),
+            content: UnsafeCell::new(content),
+        }
+    }
+}
+pub struct ReentrantMutexGuard<'a, T: 'a> {
+    mutex: &'a ReentrantMutex<T>,
+    content: &'a T,
+}
+impl<'a, T> Deref for MutexGuard {
+}
diff --git a/recipes/core/relibc/src/sync/rwlock.rs b/recipes/core/relibc/src/sync/rwlock.rs
new file mode 100644
index 0000000000..c93fe05dc9
--- /dev/null
+++ b/recipes/core/relibc/src/sync/rwlock.rs
@@ -0,0 +1,318 @@
+use core::{
+    cell::UnsafeCell,
+    fmt, ops,
+    sync::atomic::{AtomicU32, Ordering},
+};
+
+use crate::{
+    error::{Errno, Result},
+    header::{
+        bits_timespec::timespec,
+        errno::{EINVAL, ETIMEDOUT},
+        time::{CLOCK_MONOTONIC, CLOCK_REALTIME, timespec_realtime_to_monotonic},
+    },
+    platform::types::clockid_t,
+    pthread::Pshared,
+};
+
+pub struct InnerRwLock {
+    state: AtomicU32,
+}
+// PTHREAD_RWLOCK_INITIALIZER is defined as "all zeroes".
+
+const WAITING_WR: u32 = 1 << (u32::BITS - 1);
+const COUNT_MASK: u32 = WAITING_WR - 1;
+const EXCLUSIVE: u32 = COUNT_MASK;
+
+// TODO: Optimize for short waits and long waits, using AtomicLock::wait_until, but still
+// supporting timeouts.
+// TODO: Add futex ops that use bitmasks.
+
+impl InnerRwLock {
+    pub const fn new(_pshared: Pshared) -> Self {
+        Self {
+            state: AtomicU32::new(0),
+        }
+    }
+    fn translate_timeout(deadline: Option<(&timespec, i32)>) -> Result<Option<timespec>, Errno> {
+        let relative = match deadline {
+            // FUTEX expect monotonic clock
+            Some((abstime, CLOCK_MONOTONIC)) => Some(abstime.clone()),
+            Some((abstime, CLOCK_REALTIME)) => {
+                Some(timespec_realtime_to_monotonic(abstime.clone())?)
+            }
+            None => None,
+            _ => {
+                return Err(Errno(EINVAL));
+            }
+        };
+        Ok(relative)
+    }
+    pub fn acquire_write_lock(
+        &self,
+        deadline: Option<(&timespec, clockid_t)>,
+    ) -> Result<(), Errno> {
+        let relative = Self::translate_timeout(deadline)?;
+        let mut waiting_wr = self.state.load(Ordering::Relaxed) & WAITING_WR;
+
+        loop {
+            match self.state.compare_exchange_weak(
+                waiting_wr,
+                EXCLUSIVE,
+                Ordering::Acquire,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => break,
+                Err(actual) => {
+                    let expected = actual;
+                    let expected = if actual & COUNT_MASK != EXCLUSIVE {
+                        // Set the exclusive bit, but only if we're waiting for readers, to avoid
+                        // reader starvation by overprioritizing write locks.
+                        self.state.fetch_or(WAITING_WR, Ordering::Relaxed);
+
+                        actual | WAITING_WR
+                    } else {
+                        actual
+                    };
+                    waiting_wr = expected & WAITING_WR;
+
+                    if actual & COUNT_MASK > 0 {
+                        match crate::sync::futex_wait(&self.state, expected, relative.as_ref()) {
+                            super::FutexWaitResult::TimedOut => return Err(Errno(ETIMEDOUT)),
+                            _ => {}
+                        }
+                    } else {
+                        // We must avoid blocking indefinitely in our `futex_wait()`, in this case
+                        // where it's possible that `self.state == expected` but our futex might
+                        // never be woken again, because it's possible that all other threads
+                        // already did their `futex_wake()` before we would've done our
+                        // `futex_wait()`.
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+    pub fn acquire_read_lock(&self, deadline: Option<(&timespec, clockid_t)>) -> Result<(), Errno> {
+        let relative = Self::translate_timeout(deadline)?;
+        while let Err(old) = self.try_acquire_read_lock() {
+            match crate::sync::futex_wait(&self.state, old, relative.as_ref()) {
+                super::FutexWaitResult::TimedOut => return Err(Errno(ETIMEDOUT)),
+                _ => {}
+            }
+        }
+
+        Ok(())
+    }
+    pub fn try_acquire_read_lock(&self) -> Result<(), u32> {
+        let mut cached = self.state.load(Ordering::Acquire);
+
+        loop {
+            let waiting_wr = cached & WAITING_WR;
+            let old = if cached & COUNT_MASK == EXCLUSIVE {
+                0
+            } else {
+                cached & COUNT_MASK
+            };
+            let new = old + 1;
+
+            // TODO: Return with error code instead?
+            assert_ne!(
+                new & COUNT_MASK,
+                EXCLUSIVE,
+                "maximum number of rwlock readers reached"
+            );
+
+            match self.state.compare_exchange_weak(
+                (old & COUNT_MASK) | waiting_wr,
+                new | waiting_wr,
+                Ordering::Acquire,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => return Ok(()),
+
+                Err(value) if value & COUNT_MASK == EXCLUSIVE => return Err(value),
+                Err(value) => {
+                    cached = value;
+                    // TODO: SCHED_YIELD?
+                    core::hint::spin_loop();
+                }
+            }
+        }
+    }
+    pub fn try_acquire_write_lock(&self) -> Result<(), u32> {
+        let mut waiting_wr = self.state.load(Ordering::Relaxed) & WAITING_WR;
+
+        loop {
+            match self.state.compare_exchange_weak(
+                waiting_wr,
+                EXCLUSIVE,
+                Ordering::Acquire,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => return Ok(()),
+                Err(actual) if actual & COUNT_MASK > 0 => return Err(actual),
+                Err(can_retry) => {
+                    waiting_wr = can_retry & WAITING_WR;
+
+                    core::hint::spin_loop();
+                    continue;
+                }
+            }
+        }
+    }
+
+    pub fn unlock(&self) {
+        let state = self.state.load(Ordering::Relaxed);
+
+        if state & COUNT_MASK == EXCLUSIVE {
+            // Unlocking a write lock.
+
+            // This discards the writer-waiting bit, in order to ensure some level of fairness
+            // between read and write locks.
+            self.state.store(0, Ordering::Release);
+
+            let _ = crate::sync::futex_wake(&self.state, i32::MAX);
+        } else {
+            // Unlocking a read lock. Subtract one from the reader count, but preserve the
+            // WAITING_WR bit.
+
+            if self.state.fetch_sub(1, Ordering::Release) & COUNT_MASK == 1 {
+                let _ = crate::sync::futex_wake(&self.state, i32::MAX);
+            }
+        }
+    }
+}
+
+pub struct RwLock<T: ?Sized> {
+    inner: InnerRwLock,
+    data: UnsafeCell<T>,
+}
+
+unsafe impl<T: ?Sized + Send> Send for RwLock<T> {}
+unsafe impl<T: ?Sized + Send + Sync> Sync for RwLock<T> {}
+
+impl<T> RwLock<T> {
+    pub const fn new(val: T) -> Self {
+        Self {
+            inner: InnerRwLock::new(Pshared::Private),
+            data: UnsafeCell::new(val),
+        }
+    }
+}
+
+impl<T: ?Sized> RwLock<T> {
+    pub fn read(&self) -> ReadGuard<'_, T> {
+        let _ = self.inner.acquire_read_lock(None);
+        unsafe { ReadGuard::new(self) }
+    }
+
+    pub fn write(&self) -> WriteGuard<'_, T> {
+        let _ = self.inner.acquire_write_lock(None);
+        unsafe { WriteGuard::new(self) }
+    }
+
+    pub fn try_read(&self) -> Option<ReadGuard<'_, T>> {
+        if self.inner.try_acquire_read_lock().is_ok() {
+            Some(unsafe { ReadGuard::new(self) })
+        } else {
+            None
+        }
+    }
+
+    pub fn try_write(&self) -> Option<WriteGuard<'_, T>> {
+        if self.inner.try_acquire_write_lock().is_ok() {
+            Some(unsafe { WriteGuard::new(self) })
+        } else {
+            None
+        }
+    }
+}
+
+pub struct ReadGuard<'a, T: ?Sized + 'a> {
+    lock: &'a RwLock<T>,
+}
+
+impl<T: ?Sized> !Send for ReadGuard<'_, T> {}
+unsafe impl<T: ?Sized + Sync> Sync for ReadGuard<'_, T> {}
+
+impl<'a, T: ?Sized> ReadGuard<'a, T> {
+    unsafe fn new(lock: &'a RwLock<T>) -> Self {
+        Self { lock }
+    }
+}
+
+impl<'a, T: ?Sized> ops::Deref for ReadGuard<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        // SAFETY: We have shared reference to the data.
+        unsafe { &*self.lock.data.get() }
+    }
+}
+
+impl<'a, T: ?Sized> Drop for ReadGuard<'a, T> {
+    fn drop(&mut self) {
+        self.lock.inner.unlock();
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Debug> fmt::Debug for ReadGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Display> fmt::Display for ReadGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&**self, f)
+    }
+}
+
+pub struct WriteGuard<'a, T: ?Sized + 'a> {
+    lock: &'a RwLock<T>,
+}
+
+impl<T: ?Sized> !Send for WriteGuard<'_, T> {}
+unsafe impl<T: ?Sized + Sync> Sync for WriteGuard<'_, T> {}
+
+impl<'a, T: ?Sized> WriteGuard<'a, T> {
+    unsafe fn new(lock: &'a RwLock<T>) -> Self {
+        Self { lock }
+    }
+}
+
+impl<'a, T: ?Sized> ops::Deref for WriteGuard<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        // SAFETY: We have exclusive reference to the data.
+        unsafe { &*self.lock.data.get() }
+    }
+}
+
+impl<'a, T: ?Sized> ops::DerefMut for WriteGuard<'a, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        // SAFETY: We have exclusive reference to the data.
+        unsafe { &mut *self.lock.data.get() }
+    }
+}
+
+impl<'a, T: ?Sized> Drop for WriteGuard<'a, T> {
+    fn drop(&mut self) {
+        self.lock.inner.unlock();
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Debug> fmt::Debug for WriteGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Display> fmt::Display for WriteGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&**self, f)
+    }
+}
diff --git a/recipes/core/relibc/src/sync/semaphore.rs b/recipes/core/relibc/src/sync/semaphore.rs
new file mode 100644
index 0000000000..ce1496188a
--- /dev/null
+++ b/recipes/core/relibc/src/sync/semaphore.rs
@@ -0,0 +1,85 @@
+// From https://www.remlab.net/op/futex-misc.shtml
+//TODO: improve implementation
+
+use crate::{
+    header::{
+        bits_timespec::timespec,
+        time::{CLOCK_MONOTONIC, CLOCK_REALTIME, timespec_realtime_to_monotonic},
+    },
+    platform::types::{c_uint, clockid_t},
+};
+
+use core::sync::atomic::{AtomicU32, Ordering};
+
+pub struct Semaphore {
+    count: AtomicU32,
+}
+
+impl Semaphore {
+    pub const fn new(value: c_uint) -> Self {
+        Self {
+            count: AtomicU32::new(value),
+        }
+    }
+
+    // TODO: Acquire-Release ordering?
+
+    pub fn post(&self, count: c_uint) {
+        self.count.fetch_add(count, Ordering::SeqCst);
+        // TODO: notify one?
+        crate::sync::futex_wake(&self.count, i32::MAX);
+    }
+
+    pub fn try_wait(&self) -> u32 {
+        loop {
+            let value = self.count.load(Ordering::SeqCst);
+
+            if value == 0 {
+                return 0;
+            }
+
+            match self.count.compare_exchange_weak(
+                value,
+                value - 1,
+                Ordering::SeqCst,
+                Ordering::SeqCst,
+            ) {
+                Ok(_) => {
+                    // Acquired
+                    return value;
+                }
+                Err(_) => (),
+            }
+            // Try again (as long as value > 0)
+        }
+    }
+
+    pub fn wait(&self, timeout_opt: Option<&timespec>, clock_id: clockid_t) -> Result<(), ()> {
+        loop {
+            let value = self.try_wait();
+
+            if value == 0 {
+                return Ok(());
+            }
+
+            if let Some(timeout) = timeout_opt {
+                let relative = match clock_id {
+                    // FUTEX expect monotonic clock
+                    CLOCK_MONOTONIC => timeout.clone(),
+                    CLOCK_REALTIME => match timespec_realtime_to_monotonic(timeout.clone()) {
+                        Ok(relative) => relative,
+                        Err(_) => return Err(()),
+                    },
+                    _ => return Err(()),
+                };
+                crate::sync::futex_wait(&self.count, value, Some(&relative));
+            } else {
+                // Use futex to wait for the next change, without a timeout
+                crate::sync::futex_wait(&self.count, value, None);
+            }
+        }
+    }
+    pub fn value(&self) -> c_uint {
+        self.count.load(Ordering::SeqCst)
+    }
+}
diff --git a/recipes/core/relibc/src/sync/waitval.rs b/recipes/core/relibc/src/sync/waitval.rs
new file mode 100644
index 0000000000..bb6cc1b6ba
--- /dev/null
+++ b/recipes/core/relibc/src/sync/waitval.rs
@@ -0,0 +1,42 @@
+use core::{
+    cell::UnsafeCell,
+    mem::MaybeUninit,
+    sync::atomic::{AtomicU32 as AtomicUint, Ordering},
+};
+
+/// An unsafe "one thread to one thread" synchronization primitive. Used for and modeled after
+/// pthread_join only, at the moment.
+#[derive(Debug)]
+pub struct Waitval<T> {
+    state: AtomicUint,
+    value: UnsafeCell<MaybeUninit<T>>,
+}
+
+unsafe impl<T: Send + Sync> Send for Waitval<T> {}
+unsafe impl<T: Send + Sync> Sync for Waitval<T> {}
+
+impl<T> Waitval<T> {
+    #[allow(clippy::new_without_default)]
+    pub const fn new() -> Self {
+        Self {
+            state: AtomicUint::new(0),
+            value: UnsafeCell::new(MaybeUninit::uninit()),
+        }
+    }
+
+    // SAFETY: Caller must ensure both (1) that the value has not yet been initialized, and (2)
+    // that this is never run by more than one thread simultaneously.
+    pub unsafe fn post(&self, value: T) {
+        unsafe { self.value.get().write(MaybeUninit::new(value)) };
+        self.state.store(1, Ordering::Release);
+        crate::sync::futex_wake(&self.state, i32::MAX);
+    }
+
+    pub fn wait(&self) -> &T {
+        while self.state.load(Ordering::Acquire) == 0 {
+            crate::sync::futex_wait(&self.state, 0, None);
+        }
+
+        unsafe { (*self.value.get()).assume_init_ref() }
+    }
+}
diff --git a/recipes/core/relibc/stripcore.sh b/recipes/core/relibc/stripcore.sh
new file mode 100755
index 0000000000..e711ea6409
--- /dev/null
+++ b/recipes/core/relibc/stripcore.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# This script exists as a workaround for https://github.com/rust-lang/rust/issues/142119
+
+set -e
+
+target=$1
+
+if [ -z "$target" ]; then
+    echo "Usage:\n\t./stripcore.sh TARGET"
+    exit 1
+fi
+
+for sym in cbrtf ceilf copysignf fabsf fdimf floorf fmaf fmaxf fminf fmodf rintf roundf sqrtf truncf \
+            cbrt ceil copysign fabs fdim floor fmax fmin fmod rint round sqrt trunc; do \
+    "$OBJCOPY" --globalize-symbol=$sym --strip-symbol=$sym "$target"; \
+done
diff --git a/recipes/core/relibc/tests/.gitignore b/recipes/core/relibc/tests/.gitignore
new file mode 100644
index 0000000000..f7f5661096
--- /dev/null
+++ b/recipes/core/relibc/tests/.gitignore
@@ -0,0 +1,4 @@
+/build_*/
+/bins_*/
+/gen/
+/*.out
diff --git a/recipes/core/relibc/tests/Cargo.toml b/recipes/core/relibc/tests/Cargo.toml
new file mode 100644
index 0000000000..c50afb5f99
--- /dev/null
+++ b/recipes/core/relibc/tests/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "relibc-tests"
+version = "0.1.0"
+authors = ["Jeremy Soller <jeremy@system76.com>"]
+edition = "2024"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/recipes/core/relibc/tests/Makefile b/recipes/core/relibc/tests/Makefile
new file mode 100644
index 0000000000..98fbc6a0bd
--- /dev/null
+++ b/recipes/core/relibc/tests/Makefile
@@ -0,0 +1,183 @@
+include ../config.mk
+
+IS_REDOX?=0
+IS_STATIC?=0
+BUILD?=./build_$(TARGET)
+
+include ./Makefile.tests.mk
+
+CARGO_TEST?=cargo
+TEST_RUNNER?=
+
+.PHONY: all clean run expected verify
+
+all: build
+
+clean:
+	rm -rf $(BUILD)/bins_* $(BUILD)/gen $(BUILD)/target
+
+build: $(BUILD)/bins_verify/relibc-tests $(BINS) $(EXPECT_BINS) $(EXPECT_INPUT_BINS) support_build
+
+support_build: $(BUILD)/expected \
+	$(BUILD)/Makefile \
+	$(BUILD)/Makefile.tests.mk \
+	$(BUILD)/example_dir \
+	$(BUILD)/select.c \
+	$(BUILD)/stdlib/realpath.c \
+	$(BUILD)/stdio/fread.in \
+	$(BUILD)/stdio/fscanf_offby1.c \
+	$(BUILD)/stdio/fscanf.c \
+	$(BUILD)/stdio/stdio.in \
+	$(BUILD)/stdio/getline.in \
+	$(BUILD)/stdio/ungetc_ftell.c \
+	$(BUILD)/sys_stat/stat.c \
+	$(BUILD)/unistd/link.c \
+	$(BUILD)/wchar/fgetwc.in \
+	$(BUILD)/wchar/ungetwc.in
+
+run: build
+	$(MAKE) run -C $(BUILD)
+
+run-once: $(BUILD)/bins_verify/relibc-tests $(BUILD)/$(TESTBIN) support_build
+	$(MAKE) run-once -C $(BUILD) TESTBIN=$(TESTBIN)
+
+$(BUILD)/bins_verify/relibc-tests: src/main.rs
+	mkdir -p $(BUILD)/bins_verify
+	$(CARGO_TEST) build --release --bin relibc-tests --artifact-dir $(BUILD)/bins_verify --target-dir $(BUILD)/target -Z unstable-options
+	rm -rf $(BUILD)/target
+
+$(BUILD)/Makefile: Makefile.run.mk
+	cp -a $< "$@"
+
+$(BUILD)/Makefile.tests.mk: Makefile.tests.mk
+	cp -a $< "$@"
+
+$(BUILD)/expected: expected
+	rm -rf "$@"
+	cp -a "$<" $(BUILD)/
+
+$(BUILD)/example_dir: example_dir
+	rm -rf "$@"
+	cp -a "$<" $(BUILD)/
+
+$(BUILD)/%.in: %.in
+	@mkdir -p "$$(dirname "$@")"
+	cp "$*.in" "$@"
+
+$(BUILD)/%.c: %.c
+	@mkdir -p "$$(dirname "$@")"
+	cp "$*.c" "$@"
+
+FLAGS=\
+	-std=c11 \
+	-fno-builtin \
+	-fno-stack-protector \
+	-Wall \
+	-Wextra \
+	-Werror \
+	-Wno-deprecated-declarations \
+	-pedantic \
+	-g \
+	-I .
+
+STATIC_FLAGS=\
+	-static
+
+DYNAMIC_FLAGS=\
+	-Wl,--enable-new-dtags \
+	-Wl,-export-dynamic
+
+SYSROOT?=$(abspath ../sysroot/$(TARGET)/)
+SYSROOT_TARGET?=$(SYSROOT)
+
+$(SYSROOT):
+	$(MAKE) -C .. sysroot
+
+NATIVE_LIBC?=0
+ifeq ($(NATIVE_LIBC),0)
+FLAGS+=\
+	-nostdinc \
+	-nostdlib \
+	-isystem $(SYSROOT)/include \
+	$(SYSROOT)/lib/crt0.o \
+	$(SYSROOT)/lib/crti.o \
+	$(SYSROOT)/lib/crtn.o
+
+ifeq ($(TARGET),aarch64-unknown-redox)
+FLAGS+=-mno-outline-atomics
+endif
+
+STATIC_FLAGS+=\
+	$(SYSROOT)/lib/libc.a
+
+ifeq ($(IS_REDOX),0)
+DYNAMIC_FLAGS+=\
+	-Wl,-dynamic-linker=$(SYSROOT_TARGET)/$(LD_SO_PATH) \
+	-Wl,-rpath=$(SYSROOT_TARGET)/lib:\$$ORIGIN \
+	-L $(SYSROOT)/lib \
+	-lc \
+	-fpic
+else
+# TODO: Make -dynamic-linker works
+DYNAMIC_FLAGS+=\
+	-Wl,-rpath=$(SYSROOT_TARGET)/lib:\$$ORIGIN \
+	-L $(SYSROOT)/lib \
+	-lc \
+	-fpic
+endif
+
+DEPS=../sysroot/$(TARGET)
+
+else # ifeq ($(NATIVE_LIBC),1)
+DYNAMIC_FLAGS+=\
+	-Wl,-rpath=\$$ORIGIN
+ifeq ($(IS_REDOX),0)
+# glibc
+FLAGS+=\
+	-D_POSIX_C_SOURCE=200809L \
+	-D_DEFAULT_SOURCE \
+	-D_XOPEN_SOURCE=700 \
+	-D_GNU_SOURCE \
+	-lcrypt \
+	-lm
+else
+# hosted redox, no extra options needed
+endif
+endif
+
+$(BUILD)/bins_static/%: %.c $(DEPS)
+	mkdir -p "$$(dirname "$@")"
+	@$(CC) "$<" -o "$@" $(FLAGS) $(STATIC_FLAGS)
+
+$(BUILD)/bins_expect_input/%: %.c %.exp $(DEPS)
+	mkdir -p "$$(dirname "$@")"
+	@$(CC) "$<" -o "$@" $(FLAGS) $(STATIC_FLAGS)
+	cp "$*.exp" $(addsuffix .exp,"$@")
+
+$(BUILD)/bins_dynamic/%.so: %.c $(DEPS)
+	mkdir -p "$$(dirname "$@")"
+	@$(CC) "$<" -o "$@" -shared -fpic $(FLAGS) $(DYNAMIC_FLAGS)
+
+# foobar depends on foo
+$(BUILD)/bins_dynamic/libfoobar.so: libfoobar.c $(BUILD)/bins_dynamic/libfoo.so $(DEPS)
+	mkdir -p "$$(dirname "$@")"
+	@$(CC) "$<" -o "$@" -shared -fpic $(FLAGS) $(DYNAMIC_FLAGS) -L $(BUILD)/bins_dynamic -lfoo
+
+$(BUILD)/bins_dynamic/dlfcn: dlfcn.c $(BUILD)/bins_dynamic/sharedlib.so $(DEPS)
+	mkdir -p "$$(dirname "$@")"
+	@$(CC) "$<" -o "$@" $(FLAGS) $(DYNAMIC_FLAGS)
+
+$(BUILD)/bins_dynamic/dlopen_scopes: dlopen_scopes.c $(BUILD)/bins_dynamic/libfoobar.so $(BUILD)/bins_dynamic/libfoo.so $(DEPS)
+	mkdir -p "$$(dirname "$@")"
+	@$(CC) "$<" -o "$@" $(FLAGS) $(DYNAMIC_FLAGS)
+
+$(BUILD)/bins_dynamic/%: %.c $(DEPS)
+	mkdir -p "$$(dirname "$@")"
+	@$(CC) "$<" -o "$@" $(FLAGS) $(DYNAMIC_FLAGS)
+
+$(BUILD)/gen/includes: includes.c $(DEPS)
+	rm -rf $@.tmp $@
+	mkdir -p $@.tmp
+	@$(CC) "$<" -H $(FLAGS) $(DYNAMIC_FLAGS) 2> $@.tmp/graph.txt
+	sed -i 's|$(SYSROOT)/include/||g' $@.tmp/graph.txt
+	mv $@.tmp $@
diff --git a/recipes/core/relibc/tests/Makefile.run.mk b/recipes/core/relibc/tests/Makefile.run.mk
new file mode 100644
index 0000000000..31e93b92e4
--- /dev/null
+++ b/recipes/core/relibc/tests/Makefile.run.mk
@@ -0,0 +1,33 @@
+BUILD?=.
+ifeq ($(shell uname),Redox)
+IS_REDOX=1
+else
+IS_REDOX=0
+endif
+
+include ./Makefile.tests.mk
+
+CARGO_TEST?=cargo
+TEST_RUNNER?=
+
+.PHONY: all clean run run-once
+
+all: run
+
+clean:
+	rm -rf $(BUILD)/gen
+
+run: $(BUILD)/bins_verify/relibc-tests $(BINS) $(EXPECT_BINS) $(EXPECT_INPUT_BINS)
+	@echo "\033[1;36;49mRunning tests\033[0m"
+	$(TEST_RUNNER) $< $(patsubst %,-s%,$(BINS)) $(EXPECT_BINS)
+	for exp in $(EXPECT_INPUT_BINS); \
+	do \
+		echo "# expect $$(readlink -e $${exp}.exp) $$(readlink -e $${exp}) #"; \
+		expect "$$(readlink -e $${exp}.exp)" "$$(readlink -e $${exp})" test args || exit $$?; \
+	done
+
+run-once: $(BUILD)/bins_verify/relibc-tests $(BUILD)/$(TESTBIN)
+	@echo "\033[1;36;49mRunning single test $(TESTBIN) $*\033[0m"
+	@if [ -f "expected/$(TESTBIN).stdout" ]; then \
+		$(TEST_RUNNER) $< $(BUILD)/$(TESTBIN); \
+	else $(TEST_RUNNER) $< -s$(BUILD)/$(TESTBIN); fi
diff --git a/recipes/core/relibc/tests/Makefile.tests.mk b/recipes/core/relibc/tests/Makefile.tests.mk
new file mode 100644
index 0000000000..7ace459d3a
--- /dev/null
+++ b/recipes/core/relibc/tests/Makefile.tests.mk
@@ -0,0 +1,357 @@
+
+# If compiling for Redox, IS_REDOX must be 1
+ifeq ($(IS_REDOX),1)
+FAILING_TESTS=
+else
+# Wrong modified time
+FAILING_TESTS := futimens
+# Crash, mmap issue
+FAILING_TESTS += malloc/usable_size
+# Not a FIFO
+FAILING_TESTS += mkfifo
+# Waitpid had EINTR
+FAILING_TESTS += sigchld
+# not triggering ERANGE 
+FAILING_TESTS += stdlib/ptsname
+# Hang
+FAILING_TESTS += sys_epoll/epollet
+# Kernel hit todo!
+FAILING_TESTS += sys_mman/fmap
+# Hang
+FAILING_TESTS += sys_socket/unixpeername
+# Task failed successfully?
+FAILING_TESTS += signals/pthread_kill-child
+# Got EBADF
+FAILING_TESTS += unistd/isatty
+# Got EINVAL
+FAILING_TESTS += unistd/link
+# Signal kept unmasked
+FAILING_TESTS += sigqueue
+# Unwrap hit, written as TODO
+FAILING_TESTS += pthread/customstack
+# Returning garbage values
+FAILING_TESTS += sys_resource/getrusage
+# No times.h header
+#FAILING_TESTS += time/times
+# Outdated test
+#FAILING_TESTS += netdb/netdb
+
+endif
+
+# Binaries that should generate the same output every time
+EXPECT_NAMES=\
+	alloca \
+	arpainet \
+	assert \
+	ctype \
+	crypt/blowfish \
+	crypt/md5 \
+	crypt/pbkdf2 \
+	crypt/scrypt \
+	crypt/sha256 \
+	crypt/sha512 \
+	dirent/fdopendir \
+	dirent/scandir \
+	endian \
+	err \
+	errno \
+	error \
+	fcntl/create \
+	fcntl/fcntl \
+	fcntl/open \
+	fcntl/posix_fallocate \
+	features \
+	fnmatch \
+	glob \
+	iso646 \
+	libgen \
+	locale/duplocale \
+	locale/newlocale \
+	locale/setlocale \
+	math \
+	regex \
+	select \
+	setjmp \
+	sigaction \
+	sigaltstack \
+	signal \
+	stdio/all \
+	stdio/buffer \
+	stdio/dprintf \
+	stdio/fgets \
+	stdio/fputs \
+	stdio/fread \
+	stdio/freopen \
+	stdio/fseek \
+	stdio/fwrite \
+	stdio/getc_unget \
+  	stdio/getline \
+	stdio/mutex \
+	stdio/popen \
+	stdio/printf \
+	stdio/putc_unlocked \
+	stdio/rename \
+	stdio/renameat \
+	stdio/scanf \
+	stdio/setvbuf \
+	stdio/sprintf \
+	stdio/printf_space_pad \
+	stdio/ungetc_ftell \
+	stdio/ungetc_multiple \
+	stdio/fscanf_offby1 \
+	stdio/fscanf \
+	stdio/printf_neg_pad \
+	stdlib/a64l \
+	stdlib/alloc \
+	stdlib/atof \
+	stdlib/atoi \
+	stdlib/div \
+	stdlib/getsubopt \
+	stdlib/mkostemps \
+	stdlib/qsort \
+	stdlib/rand \
+	stdlib/rand48 \
+	stdlib/random \
+	stdlib/strtod \
+	stdlib/strtol \
+	stdlib/strtoul \
+	stdlib/system \
+	string/mem \
+	string/memcpy \
+	string/memmem \
+	string/strcat \
+	string/strchr \
+	string/strchrnul \
+	string/strcpy \
+	string/strcspn \
+	string/strlen \
+	string/strncmp \
+	string/strpbrk \
+	string/strrchr \
+	string/strspn \
+	string/strstr \
+	string/strtok \
+	string/strtok_r \
+	string/strsep \
+	string/strsignal \
+	string/stpcpy \
+	string/stpncpy \
+	strings \
+	sys_socket/recv \
+	sys_socket/recvfrom \
+	sys_socket/unixrecv \
+	sys_socket/unixrecvfrom \
+	sys_socket/unixsocketpair \
+	sys_stat/chmod \
+	sys_stat/lstat \
+	sys_stat/fstatat \
+	sys_syslog/syslog \
+	time/asctime \
+	time/constants \
+	time/gmtime \
+	time/localtime \
+	time/localtime_r \
+	time/macros \
+	time/mktime \
+	time/strftime \
+	time/strptime \
+	time/time \
+	time/timegm \
+	time/tzset \
+	unistd/access \
+	unistd/alarm \
+	unistd/constants \
+	unistd/confstr \
+	unistd/dup \
+	unistd/exec \
+	unistd/fchdir \
+	unistd/fork \
+	unistd/fsync \
+	unistd/ftruncate \
+	unistd/getopt \
+	unistd/getopt_long \
+	unistd/pipe \
+	unistd/readlinkat \
+	unistd/rmdir \
+	unistd/sleep \
+	unistd/swab \
+	unistd/write \
+	wchar/fgetwc \
+	wchar/fwide \
+	wchar/mbrtowc \
+	wchar/mbsrtowcs \
+	wchar/printf-on-wchars \
+	wchar/putwchar \
+	wchar/wscanf \
+	wchar/ungetwc \
+	wchar/wprintf \
+	wchar/wcrtomb \
+	wchar/wcpcpy \
+	wchar/wcpncpy \
+	wchar/wcschr \
+	wchar/wcscspn \
+	wchar/wcsdup \
+	wchar/wcsrchr \
+	wchar/wcsrtombs \
+	wchar/wcsstr \
+	wchar/wcstod \
+	wchar/wcstok \
+	wchar/wcstol \
+	wchar/wcstoimax \
+	wchar/wcstoumax \
+	wchar/wcscasecmp \
+	wchar/wcsncasecmp \
+	wchar/wcsnlen \
+	wchar/wcsnrtombs \
+	wchar/wcswidth \
+	wctype/towlower \
+	wctype/towupper \
+	mknod \
+	mknodat
+
+# Binaries that may generate varied output
+VARIED_NAMES=\
+	dirent/main \
+	dirent/posix_getdents \
+	includes \
+	kill-waitpid \
+	limits \
+	net/if \
+	netdb/getaddrinfo \
+	netdb/getaddrinfo_null \
+	pthread/timedwait \
+	pty/forkpty \
+	psignal \
+	pwd \
+	sa_restart \
+	signals/kill-self \
+	signals/kill0-self \
+	signals/kill-invalid \
+	signals/kill-permission \
+	signals/killpg-esrch \
+	signals/killpg-invalid \
+	signals/killpg0-self \
+	signals/kill-group \
+	signals/kill-child \
+	signals/killpg-child \
+	signals/killpg-self \
+	signals/pthread_kill-invalid \
+	signals/pthread_kill-self \
+	signals/pthread_kill0-self \
+	signals/raise-compliance \
+	signals/sigismember-invalid \
+	signals/sigismember-valid \
+	signals/sigaddset-add \
+	signals/sigdelset-delete \
+	signals/signal-h \
+	signals/signal-h-2 \
+	signals/signal-handle_return \
+	signals/signal-handler \
+	signals/signal-handler2 \
+	signals/signal-ignore \
+	signals/signal-invalid \
+	signals/signal-uncatchable \
+	signals/sigprocmask-3 \
+	signals/sigprocmask-4 \
+	signals/sigprocmask-5 \
+	signals/sigprocmask-6 \
+	signals/sigprocmask-7 \
+	signals/sigprocmask-8 \
+	signals/sigprocmask-9 \
+	signals/sigprocmask-10 \
+	signals/sigprocmask-11 \
+	signals/sigpause-invalid \
+	signals/sigpause-revert \
+	signals/sigpause-suspend \
+	signals/sigprocmask-blocksingle \
+	signals/sigrelse-1 \
+	signals/sigrelse-2 \
+	signals/sigrelse-3 \
+	signals/sigset-1 \
+	signals/sigset-10 \
+	signals/sigset-2 \
+	signals/sigset-3 \
+	signals/sigset-4 \
+	signals/sigset-5 \
+	signals/sigset-9 \
+	stdio/ctermid \
+	stdio/tempnam \
+	stdio/tmpnam \
+	stdlib/bsearch \
+	stdlib/mktemp \
+	stdlib/realpath \
+	sys_epoll/epoll \
+	sys_mman/mmap \
+	sys_resource/constants \
+	sys_socket/getpeername \
+	sys_stat/stat \
+	sys_statvfs/statvfs \
+	sys_utsname/uname \
+	time/gettimeofday \
+	unistd/chdir \
+	unistd/getcwd \
+	unistd/gethostname \
+	unistd/getid \
+	unistd/getpagesize \
+	unistd/pathconf \
+	unistd/setid \
+	unistd/sysconf \
+	pthread/main \
+	pthread/cleanup \
+	pthread/exit \
+	pthread/extjoin \
+	pthread/once \
+	pthread/barrier \
+	pthread/rwlock_trylock \
+	pthread/rwlock_randtest \
+	pthread/mutex_recursive \
+	pthread/timeout \
+	pthread/tls \
+	grp/getgrouplist \
+	grp/getgroups \
+	grp/getgrgid_r \
+	grp/getgrnam_r \
+	grp/gr_iter \
+	waitpid \
+	waitpid_multiple \
+	$(FAILING_TESTS)
+
+
+# Tests that only working with when ld.so exist
+DYNAMIC_ONLY_EXPECT_NAMES=\
+	dlfcn \
+	dlopen_scopes
+
+# Tests that may produce different result when ld.so absent
+STATIC_CHECK_EXPECT_NAMES=\
+	args \
+	constructor \
+	destructor \
+	stdlib/env \
+	unistd/brk \
+	tls
+
+# Tests run with `expect` (require a .c file and an .exp file
+# that takes the produced binary as the first argument)
+EXPECT_INPUT_NAMES=\
+	unistd/getpass
+
+# TODO: Dynamic linking doesn't work with NATIVE_LIBC=0
+ifeq ($(IS_STATIC),1)
+BINS+=$(patsubst %,$(BUILD)/bins_static/%,$(VARIED_NAMES))
+EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_static/%,$(EXPECT_NAMES))
+EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_static/%,$(STATIC_CHECK_EXPECT_NAMES))
+ifeq ($(IS_REDOX),0)
+EXPECT_INPUT_BINS=$(patsubst %,$(BUILD)/bins_expect_input/%,$(EXPECT_INPUT_NAMES))
+endif
+else
+BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(VARIED_NAMES))
+EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_static/%,$(STATIC_CHECK_EXPECT_NAMES))
+EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(EXPECT_NAMES))
+EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(STATIC_CHECK_EXPECT_NAMES))
+EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(DYNAMIC_ONLY_EXPECT_NAMES))
+ifeq ($(IS_REDOX),0)
+# TODO: redoxer does not have "expect" binary
+EXPECT_INPUT_BINS=$(patsubst %,$(BUILD)/bins_expect_input/%,$(EXPECT_INPUT_NAMES))
+endif
+endif
diff --git a/recipes/core/relibc/tests/alloca.c b/recipes/core/relibc/tests/alloca.c
new file mode 100644
index 0000000000..0e4a2d4902
--- /dev/null
+++ b/recipes/core/relibc/tests/alloca.c
@@ -0,0 +1,14 @@
+#include <alloca.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char *str = (char *) alloca(17);
+
+    memset(str, 'A', 16);
+    str[16] = '\0';
+
+    printf("%s\n", str);
+}
diff --git a/recipes/core/relibc/tests/args.c b/recipes/core/relibc/tests/args.c
new file mode 100644
index 0000000000..9095e3a451
--- /dev/null
+++ b/recipes/core/relibc/tests/args.c
@@ -0,0 +1,12 @@
+#include <string.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(int argc, char *argv[]) {
+    for(int i = 1; i < argc; i++) {
+        write(STDOUT_FILENO, argv[i], strlen(argv[i]));
+        write(STDOUT_FILENO, " ", 1);
+    }
+    write(STDOUT_FILENO, "\n", 1);
+}
diff --git a/recipes/core/relibc/tests/arpainet.c b/recipes/core/relibc/tests/arpainet.c
new file mode 100644
index 0000000000..4b9f4a4067
--- /dev/null
+++ b/recipes/core/relibc/tests/arpainet.c
@@ -0,0 +1,25 @@
+#include <arpa/inet.h>
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    uint32_t hl = 0xBADFACED;
+    uint32_t nl = htonl(hl);
+    assert(nl == 0xEDACDFBA);
+    hl = ntohl(nl);
+    assert(hl == 0xBADFACED);
+
+    uint16_t hs = 0xDEAD;
+    uint16_t ns = htons(hs);
+    assert(ns == 0xADDE);
+    hs = ntohs(ns);
+    assert(hs == 0xDEAD);
+
+    const char* addr_str = "8.8.4.4";
+    struct in_addr* addr = malloc(sizeof addr);
+    inet_aton(addr_str, addr);
+    assert(strcmp(inet_ntoa(*addr), addr_str) == 0);
+}
diff --git a/recipes/core/relibc/tests/assert.c b/recipes/core/relibc/tests/assert.c
new file mode 100644
index 0000000000..6049a38e17
--- /dev/null
+++ b/recipes/core/relibc/tests/assert.c
@@ -0,0 +1,19 @@
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    assert(1 == 1);
+    assert(1 + 1 == 2);
+    puts("yay!");
+
+    if (assert(0 == 0), 1) {
+        puts("groovy!");
+    }
+
+    //This fails, but I can't test it because that'd
+    //make the test fail lol
+    //assert(42 == 1337);
+}
diff --git a/recipes/core/relibc/tests/constructor.c b/recipes/core/relibc/tests/constructor.c
new file mode 100644
index 0000000000..ddde65029f
--- /dev/null
+++ b/recipes/core/relibc/tests/constructor.c
@@ -0,0 +1,22 @@
+#include <stdio.h>
+#include "test_helpers.h"
+
+__attribute__((constructor))
+void constructor_no_priority(void) {
+    puts("constructor (no priority)");
+}
+
+#define TEST(__priority)                           \
+    __attribute__((constructor(__priority)))       \
+    void constructor_priority_##__priority(void) { \
+        puts("constructor ("#__priority")");       \
+    }
+
+TEST(101)
+TEST(102)
+TEST(103)
+TEST(104)
+
+int main(void) {
+    puts("main");
+}
diff --git a/recipes/core/relibc/tests/crypt/blowfish.c b/recipes/core/relibc/tests/crypt/blowfish.c
new file mode 100644
index 0000000000..0a5b62e34b
--- /dev/null
+++ b/recipes/core/relibc/tests/crypt/blowfish.c
@@ -0,0 +1,26 @@
+#include <assert.h>
+#include <crypt.h>
+#include <string.h>
+#include <unistd.h>
+
+int main()
+{
+    char *expected_output = "$2y$12$CJr4uRfziaGp4CWIBk0fB.I2tCOHYe3pomaWbC53/92p";
+    char *result = crypt("correctbatteryhorsestapler", "$2y$12$L6Bc/AlTQHyd9liGgGEZyO");
+    assert(strcmp(result, expected_output) == 0);
+
+    // Invalid salt for Blowfish
+    result = crypt("correctbatteryhorsestapler", "$2t$12$L6Bc/AlTQHyd9liGgGEZyO");
+    assert(result == NULL);
+    
+    expected_output = "$2a$4$IAwt7hxuME3DekssMMTWU.xnJub2Xn45xK/oP.wWt3UC"; 
+    result = crypt("password", "$2a$04$UuTkLRZZ6QofpDOlMz32Mu");
+    assert(strcmp(result, expected_output) == 0);
+    
+    // Invalid salt for Blowfish
+    result = "$2b$10$testtesttesttes";
+    result = crypt("correctbatteryhorsestapler", "$2y$12$L6Bc/AlTQHyd9liGgGEZyO");
+    assert(result != NULL);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/crypt/md5.c b/recipes/core/relibc/tests/crypt/md5.c
new file mode 100644
index 0000000000..4251d70f9d
--- /dev/null
+++ b/recipes/core/relibc/tests/crypt/md5.c
@@ -0,0 +1,38 @@
+/* Copyright (C) 1991-2024 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <crypt.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+int main () {
+    const char salt[] = "$1$saltstring";
+    char *cp;
+    int result = 0;
+
+    cp = crypt ("Hello world!", salt);
+
+    /* MD5 is disabled in FIPS mode.  */
+    if (cp) {
+        result |= strcmp ("$1$saltstri$YMyguxXMBpd2TEZ.vS/3q1", cp);
+        if (!result)
+            printf("Success!\n");
+    }
+
+    return result;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/crypt/pbkdf2.c b/recipes/core/relibc/tests/crypt/pbkdf2.c
new file mode 100644
index 0000000000..f3e9a3cfbc
--- /dev/null
+++ b/recipes/core/relibc/tests/crypt/pbkdf2.c
@@ -0,0 +1,25 @@
+#include <assert.h>
+#include <crypt.h>
+#include <string.h>
+#include <unistd.h>
+
+int main()
+{
+    char *expected_output = "$8$3e8$salt$ZyTZgT5Pyp4CKdom6q6zHg0QrrAQO4ptWYCpWz4gu16";
+    char *result = crypt("pleaseletmein", "$8$3e8$salt");
+    assert(strcmp(result, expected_output) == 0);
+
+    // No salt
+    result = crypt("pleaseletmein", "$8$3e8$");
+    assert(result != NULL);
+    
+    // Invalid encoded number for rounds
+    result = crypt("pleaseletmein", "$8$$salt");
+    assert(result == NULL);
+    
+    // Invalid encoded number for rounds
+    result = crypt("pleaseletmein", "$8$.$salt");
+    assert(result == NULL);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/crypt/scrypt.c b/recipes/core/relibc/tests/crypt/scrypt.c
new file mode 100644
index 0000000000..d6f70778ce
--- /dev/null
+++ b/recipes/core/relibc/tests/crypt/scrypt.c
@@ -0,0 +1,25 @@
+#include <assert.h>
+#include <crypt.h>
+#include <string.h>
+#include <unistd.h>
+
+int main()
+{
+    char *expected_output = "$7$C6..../....$SodiumChloride$aAM7wxp7ayfEF.ZLedy2490m85oOR228oZTB7jPbmdG";
+    char *result = crypt("pleaseletmein", "$7$C6..../....SodiumChloride");
+    assert(strcmp(result, expected_output) == 0);
+
+    // No salt
+    result = crypt("pleaseletmein", "$7$C6..../....");
+    assert(result != NULL);
+    
+    // Invalid encoded number for r
+    result = crypt("pleaseletmein", "$7$C6.../....SodiumChloride");
+    assert(result == NULL);
+    
+    // Invalid encoded number for p
+    result = crypt("pleaseletmein", "$7$C6..../...SodiumChloride");
+    assert(result == NULL);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/crypt/sha256.c b/recipes/core/relibc/tests/crypt/sha256.c
new file mode 100644
index 0000000000..6e9c3ffa47
--- /dev/null
+++ b/recipes/core/relibc/tests/crypt/sha256.c
@@ -0,0 +1,67 @@
+/* Copyright (C) 1991-2024 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <crypt.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static const struct
+{
+  const char *salt;
+  const char *input;
+  const char *expected;
+} tests[] =
+{
+  { "$5$saltstring", "Hello world!",
+    "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5" },
+  { "$5$rounds=10000$saltstringsaltstring", "Hello world!",
+    "$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2."
+    "opqey6IcA" },
+  { "$5$rounds=5000$toolongsaltstring", "This is just a test",
+    "$5$rounds=5000$toolongsaltstrin$Un/5jzAHMgOGZ5.mWJpuVolil07guHPvOW8"
+    "mGRcvxa5" },
+  { "$5$rounds=1400$anotherlongsaltstring",
+    "a very much longer text to encrypt.  This one even stretches over more"
+    "than one line.",
+    "$5$rounds=1400$anotherlongsalts$Rx.j8H.h8HjEDGomFU8bDkXm3XIUnzyxf12"
+    "oP84Bnq1" },
+  { "$5$rounds=77777$short",
+    "we have a short salt string but not a short password",
+    "$5$rounds=77777$short$JiO1O3ZpDAxGJeaDIuqCoEFysAe1mZNJRs3pw0KQRd/" },
+  { "$5$rounds=123456$asaltof16chars..", "a short string",
+    "$5$rounds=123456$asaltof16chars..$gP3VQ/6X7UUEW3HkBn2w1/Ptq2jxPyzV/"
+    "cZKmF/wJvD" },
+  { "$5$rounds=10$roundstoolow", "the minimum number is still observed",
+    "$5$rounds=1000$roundstoolow$yfvwcWrQ8l/K0DAWyuPMDNHpIVlTQebY9l/gL97"
+    "2bIC" },
+};
+
+const int ntests = sizeof(tests) / sizeof(tests[0]);
+
+int main (void) {
+  int result = 0;
+
+  for (int i = 0; i < ntests; ++i){
+      char *cp = crypt (tests[i].input, tests[i].salt);
+      if (strcmp (cp, tests[i].expected) != 0) {
+        printf ("test %d: expected \"%s\", got \"%s\"\n", i, tests[i].expected, cp);
+        result = 1;
+      }
+  }
+  return result;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/crypt/sha512.c b/recipes/core/relibc/tests/crypt/sha512.c
new file mode 100644
index 0000000000..efab1e3162
--- /dev/null
+++ b/recipes/core/relibc/tests/crypt/sha512.c
@@ -0,0 +1,72 @@
+/* Copyright (C) 1991-2024 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <crypt.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static const struct
+{
+  const char *salt;
+  const char *input;
+  const char *expected;
+} tests[] =
+{
+  { "$6$saltstring", "Hello world!",
+    "$6$saltstring$svn8UoSVapNtMuq1ukKS4tPQd8iKwSMHWjl/O817G3uBnIFNjnQJu"
+    "esI68u4OTLiBFdcbYEdFCoEOfaS35inz1" },
+  { "$6$rounds=10000$saltstringsaltstring", "Hello world!",
+    "$6$rounds=10000$saltstringsaltst$OW1/O6BYHV6BcXZu8QVeXbDWra3Oeqh0sb"
+    "HbbMCVNSnCM/UrjmM0Dp8vOuZeHBy/YTBmSK6H9qs/y3RnOaw5v." },
+  { "$6$rounds=5000$toolongsaltstring", "This is just a test",
+    "$6$rounds=5000$toolongsaltstrin$lQ8jolhgVRVhY4b5pZKaysCLi0QBxGoNeKQ"
+    "zQ3glMhwllF7oGDZxUhx1yxdYcz/e1JSbq3y6JMxxl8audkUEm0" },
+  { "$6$rounds=1400$anotherlongsaltstring",
+    "a very much longer text to encrypt.  This one even stretches over more"
+    "than one line.",
+    "$6$rounds=1400$anotherlongsalts$POfYwTEok97VWcjxIiSOjiykti.o/pQs.wP"
+    "vMxQ6Fm7I6IoYN3CmLs66x9t0oSwbtEW7o7UmJEiDwGqd8p4ur1" },
+  { "$6$rounds=77777$short",
+    "we have a short salt string but not a short password",
+    "$6$rounds=77777$short$WuQyW2YR.hBNpjjRhpYD/ifIw05xdfeEyQoMxIXbkvr0g"
+    "ge1a1x3yRULJ5CCaUeOxFmtlcGZelFl5CxtgfiAc0" },
+  { "$6$rounds=123456$asaltof16chars..", "a short string",
+    "$6$rounds=123456$asaltof16chars..$BtCwjqMJGx5hrJhZywWvt0RLE8uZ4oPwc"
+    "elCjmw2kSYu.Ec6ycULevoBK25fs2xXgMNrCzIMVcgEJAstJeonj1" },
+  { "$6$rounds=10$roundstoolow", "the minimum number is still observed",
+    "$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1x"
+    "hLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX." },
+};
+
+const int ntests = sizeof(tests) / sizeof(tests[0]);
+
+int main(void) {
+  int result = 0;
+  int i;
+
+  for (i = 0; i < ntests; ++i) {
+    char * cp = crypt(tests[i].input, tests[i].salt);
+
+    if (strcmp(cp, tests[i].expected) != 0) {
+      printf("test %d: expected \"%s\", got \"%s\"\n", i, tests[i].expected, cp);
+      result = 1;
+    }
+  }
+
+  return result;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/ctype.c b/recipes/core/relibc/tests/ctype.c
new file mode 100644
index 0000000000..0f6aa1d1bc
--- /dev/null
+++ b/recipes/core/relibc/tests/ctype.c
@@ -0,0 +1,334 @@
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+struct test_case {
+    int c;
+    int isalnum;
+    int isalpha;
+    int isascii;
+    int isblank;
+    int iscntrl;
+    int isdigit;
+    int isgraph;
+    int islower;
+    int isprint;
+    int ispunct;
+    int isspace;
+    int isupper;
+    int isxdigit;
+    int toascii;
+    int tolower;
+    int toupper;
+} test_cases[] = {
+    //      a  a  a  b  c  d  g  l  p  p  s  u  x     t     t     t
+    //      l  l  s  l  n  i  r  o  r  u  p  p  d     o     o     o
+    //      n  p  c  a  t  g  a  w  i  n  a  p  i     a     l     u
+    //      u  h  i  n  r  i  p  e  n  c  c  e  g     s     o     p
+    //      m  a  i  k  l  t  h  r  t  t  e  r  i     c     w     p
+    { 0x00, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x00, 0x00, 0x00 },
+    { 0x01, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01 },
+    { 0x02, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x02, 0x02, 0x02 },
+    { 0x03, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x03, 0x03, 0x03 },
+    { 0x04, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x04, 0x04, 0x04 },
+    { 0x05, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x05, 0x05, 0x05 },
+    { 0x06, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x06, 0x06, 0x06 },
+    { 0x07, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x07, 0x07, 0x07 },
+    { 0x08, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0x08, 0x08 },
+    { 0x09, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0x09, 0x09, 0x09 },
+    { 0x0A, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0x0A, 0x0A, 0x0A },
+    { 0x0B, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0x0B, 0x0B, 0x0B },
+    { 0x0C, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0x0C, 0x0C, 0x0C },
+    { 0x0D, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0x0D, 0x0D, 0x0D },
+    { 0x0E, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x0E, 0x0E, 0x0E },
+    { 0x0F, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x0F, 0x0F, 0x0F },
+    { 0x10, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0x10, 0x10 },
+    { 0x11, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x11, 0x11, 0x11 },
+    { 0x12, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x12, 0x12, 0x12 },
+    { 0x13, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x13, 0x13, 0x13 },
+    { 0x14, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x14, 0x14, 0x14 },
+    { 0x15, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x15, 0x15, 0x15 },
+    { 0x16, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x16, 0x16, 0x16 },
+    { 0x17, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x17, 0x17, 0x17 },
+    { 0x18, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x18, 0x18, 0x18 },
+    { 0x19, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x19, 0x19, 0x19 },
+    { 0x1A, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x1A, 0x1A, 0x1A },
+    { 0x1B, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x1B, 0x1B, 0x1B },
+    { 0x1C, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x1C, 0x1C, 0x1C },
+    { 0x1D, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x1D, 0x1D, 0x1D },
+    { 0x1E, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x1E, 0x1E, 0x1E },
+    { 0x1F, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x1F, 0x1F, 0x1F },
+    {  ' ', 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0,  ' ',  ' ',  ' ' },
+    {  '!', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '!',  '!',  '!' },
+    {  '"', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '"',  '"',  '"' },
+    {  '#', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '#',  '#',  '#' },
+    {  '$', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '$',  '$',  '$' },
+    {  '%', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '%',  '%',  '%' },
+    {  '&', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '&',  '&',  '&' },
+    { '\'', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, '\'', '\'', '\'' },
+    {  '(', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '(',  '(',  '(' },
+    {  ')', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  ')',  ')',  ')' },
+    {  '*', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '*',  '*',  '*' },
+    {  '+', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '+',  '+',  '+' },
+    {  ',', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  ',',  ',',  ',' },
+    {  '-', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '-',  '-',  '-' },
+    {  '.', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '.',  '.',  '.' },
+    {  '/', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '/',  '/',  '/' },
+    {  '0', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '0',  '0',  '0' },
+    {  '1', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '1',  '1',  '1' },
+    {  '2', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '2',  '2',  '2' },
+    {  '3', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '3',  '3',  '3' },
+    {  '4', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '4',  '4',  '4' },
+    {  '5', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '5',  '5',  '5' },
+    {  '6', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '6',  '6',  '6' },
+    {  '7', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '7',  '7',  '7' },
+    {  '8', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '8',  '8',  '8' },
+    {  '9', 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1,  '9',  '9',  '9' },
+    {  ':', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  ':',  ':',  ':' },
+    {  ';', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  ';',  ';',  ';' },
+    {  '<', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '<',  '<',  '<' },
+    {  '=', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '=',  '=',  '=' },
+    {  '>', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '>',  '>',  '>' },
+    {  '?', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '?',  '?',  '?' },
+    {  '@', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '@',  '@',  '@' },
+    {  'A', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1,  'A',  'a',  'A' },
+    {  'B', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1,  'B',  'b',  'B' },
+    {  'C', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1,  'C',  'c',  'C' },
+    {  'D', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1,  'D',  'd',  'D' },
+    {  'E', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1,  'E',  'e',  'E' },
+    {  'F', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1,  'F',  'f',  'F' },
+    {  'G', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'G',  'g',  'G' },
+    {  'H', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'H',  'h',  'H' },
+    {  'I', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'I',  'i',  'I' },
+    {  'J', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'J',  'j',  'J' },
+    {  'K', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'K',  'k',  'K' },
+    {  'L', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'L',  'l',  'L' },
+    {  'M', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'M',  'm',  'M' },
+    {  'N', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'N',  'n',  'N' },
+    {  'O', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'O',  'o',  'O' },
+    {  'P', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'P',  'p',  'P' },
+    {  'Q', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'Q',  'q',  'Q' },
+    {  'R', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'R',  'r',  'R' },
+    {  'S', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'S',  's',  'S' },
+    {  'T', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'T',  't',  'T' },
+    {  'U', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'U',  'u',  'U' },
+    {  'V', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'V',  'v',  'V' },
+    {  'W', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'W',  'w',  'W' },
+    {  'X', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'X',  'x',  'X' },
+    {  'Y', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'Y',  'y',  'Y' },
+    {  'Z', 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0,  'Z',  'z',  'Z' },
+    {  '[', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '[',  '[',  '[' },
+    { '\\', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, '\\', '\\', '\\' },
+    {  ']', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  ']',  ']',  ']' },
+    {  '^', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '^',  '^',  '^' },
+    {  '_', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '_',  '_',  '_' },
+    {  '`', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '`',  '`',  '`' },
+    {  'a', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1,  'a',  'a',  'A' },
+    {  'b', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1,  'b',  'b',  'B' },
+    {  'c', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1,  'c',  'c',  'C' },
+    {  'd', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1,  'd',  'd',  'D' },
+    {  'e', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1,  'e',  'e',  'E' },
+    {  'f', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1,  'f',  'f',  'F' },
+    {  'g', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'g',  'g',  'G' },
+    {  'h', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'h',  'h',  'H' },
+    {  'i', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'i',  'i',  'I' },
+    {  'j', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'j',  'j',  'J' },
+    {  'k', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'k',  'k',  'K' },
+    {  'l', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'l',  'l',  'L' },
+    {  'm', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'm',  'm',  'M' },
+    {  'n', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'n',  'n',  'N' },
+    {  'o', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'o',  'o',  'O' },
+    {  'p', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'p',  'p',  'P' },
+    {  'q', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'q',  'q',  'Q' },
+    {  'r', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'r',  'r',  'R' },
+    {  's', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  's',  's',  'S' },
+    {  't', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  't',  't',  'T' },
+    {  'u', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'u',  'u',  'U' },
+    {  'v', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'v',  'v',  'V' },
+    {  'w', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'w',  'w',  'W' },
+    {  'x', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'x',  'x',  'X' },
+    {  'y', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'y',  'y',  'Y' },
+    {  'z', 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,  'z',  'z',  'Z' },
+    {  '{', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '{',  '{',  '{' },
+    {  '|', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '|',  '|',  '|' },
+    {  '}', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '}',  '}',  '}' },
+    {  '~', 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0,  '~',  '~',  '~' },
+    { 0x7F, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0x7F, 0x7F, 0x7F },
+    { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x00, 0x80, 0x80 },
+    { 0x81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0x81, 0x81 },
+    { 0x82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x02, 0x82, 0x82 },
+    { 0x83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x03, 0x83, 0x83 },
+    { 0x84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x04, 0x84, 0x84 },
+    { 0x85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x05, 0x85, 0x85 },
+    { 0x86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x06, 0x86, 0x86 },
+    { 0x87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x07, 0x87, 0x87 },
+    { 0x88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0x88, 0x88 },
+    { 0x89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x09, 0x89, 0x89 },
+    { 0x8A, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0A, 0x8A, 0x8A },
+    { 0x8B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0B, 0x8B, 0x8B },
+    { 0x8C, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0C, 0x8C, 0x8C },
+    { 0x8D, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0D, 0x8D, 0x8D },
+    { 0x8E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0E, 0x8E, 0x8E },
+    { 0x8F, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0F, 0x8F, 0x8F },
+    { 0x90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0x90, 0x90 },
+    { 0x91, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x11, 0x91, 0x91 },
+    { 0x92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x12, 0x92, 0x92 },
+    { 0x93, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x13, 0x93, 0x93 },
+    { 0x94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x14, 0x94, 0x94 },
+    { 0x95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x15, 0x95, 0x95 },
+    { 0x96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x16, 0x96, 0x96 },
+    { 0x97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x17, 0x97, 0x97 },
+    { 0x98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x18, 0x98, 0x98 },
+    { 0x99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x19, 0x99, 0x99 },
+    { 0x9A, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1A, 0x9A, 0x9A },
+    { 0x9B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1B, 0x9B, 0x9B },
+    { 0x9C, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1C, 0x9C, 0x9C },
+    { 0x9D, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1D, 0x9D, 0x9D },
+    { 0x9E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1E, 0x9E, 0x9E },
+    { 0x9F, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1F, 0x9F, 0x9F },
+    { 0xA0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  ' ', 0xA0, 0xA0 },
+    { 0xA1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '!', 0xA1, 0xA1 },
+    { 0xA2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '"', 0xA2, 0xA2 },
+    { 0xA3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '#', 0xA3, 0xA3 },
+    { 0xA4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '$', 0xA4, 0xA4 },
+    { 0xA5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '%', 0xA5, 0xA5 },
+    { 0xA6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '&', 0xA6, 0xA6 },
+    { 0xA7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '\'', 0xA7, 0xA7 },
+    { 0xA8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '(', 0xA8, 0xA8 },
+    { 0xA9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  ')', 0xA9, 0xA9 },
+    { 0xAA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '*', 0xAA, 0xAA },
+    { 0xAB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '+', 0xAB, 0xAB },
+    { 0xAC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  ',', 0xAC, 0xAC },
+    { 0xAD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '-', 0xAD, 0xAD },
+    { 0xAE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '.', 0xAE, 0xAE },
+    { 0xAF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '/', 0xAF, 0xAF },
+    { 0xB0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '0', 0xB0, 0xB0 },
+    { 0xB1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '1', 0xB1, 0xB1 },
+    { 0xB2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '2', 0xB2, 0xB2 },
+    { 0xB3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '3', 0xB3, 0xB3 },
+    { 0xB4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '4', 0xB4, 0xB4 },
+    { 0xB5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '5', 0xB5, 0xB5 },
+    { 0xB6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '6', 0xB6, 0xB6 },
+    { 0xB7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '7', 0xB7, 0xB7 },
+    { 0xB8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '8', 0xB8, 0xB8 },
+    { 0xB9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '9', 0xB9, 0xB9 },
+    { 0xBA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  ':', 0xBA, 0xBA },
+    { 0xBB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  ';', 0xBB, 0xBB },
+    { 0xBC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '<', 0xBC, 0xBC },
+    { 0xBD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '=', 0xBD, 0xBD },
+    { 0xBE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '>', 0xBE, 0xBE },
+    { 0xBF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '?', 0xBF, 0xBF },
+    { 0xC0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '@', 0xC0, 0xC0 },
+    { 0xC1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'A', 0xC1, 0xC1 },
+    { 0xC2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'B', 0xC2, 0xC2 },
+    { 0xC3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'C', 0xC3, 0xC3 },
+    { 0xC4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'D', 0xC4, 0xC4 },
+    { 0xC5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'E', 0xC5, 0xC5 },
+    { 0xC6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'F', 0xC6, 0xC6 },
+    { 0xC7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'G', 0xC7, 0xC7 },
+    { 0xC8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'H', 0xC8, 0xC8 },
+    { 0xC9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'I', 0xC9, 0xC9 },
+    { 0xCA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'J', 0xCA, 0xCA },
+    { 0xCB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'K', 0xCB, 0xCB },
+    { 0xCC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'L', 0xCC, 0xCC },
+    { 0xCD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'M', 0xCD, 0xCD },
+    { 0xCE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'N', 0xCE, 0xCE },
+    { 0xCF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'O', 0xCF, 0xCF },
+    { 0xD0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'P', 0xD0, 0xD0 },
+    { 0xD1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'Q', 0xD1, 0xD1 },
+    { 0xD2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'R', 0xD2, 0xD2 },
+    { 0xD3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'S', 0xD3, 0xD3 },
+    { 0xD4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'T', 0xD4, 0xD4 },
+    { 0xD5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'U', 0xD5, 0xD5 },
+    { 0xD6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'V', 0xD6, 0xD6 },
+    { 0xD7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'W', 0xD7, 0xD7 },
+    { 0xD8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'X', 0xD8, 0xD8 },
+    { 0xD9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'Y', 0xD9, 0xD9 },
+    { 0xDA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'Z', 0xDA, 0xDA },
+    { 0xDB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '[', 0xDB, 0xDB },
+    { 0xDC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '\\', 0xDC, 0xDC },
+    { 0xDD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  ']', 0xDD, 0xDD },
+    { 0xDE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '^', 0xDE, 0xDE },
+    { 0xDF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '_', 0xDF, 0xDF },
+    { 0xE0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '`', 0xE0, 0xE0 },
+    { 0xE1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'a', 0xE1, 0xE1 },
+    { 0xE2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'b', 0xE2, 0xE2 },
+    { 0xE3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'c', 0xE3, 0xE3 },
+    { 0xE4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'd', 0xE4, 0xE4 },
+    { 0xE5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'e', 0xE5, 0xE5 },
+    { 0xE6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'f', 0xE6, 0xE6 },
+    { 0xE7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'g', 0xE7, 0xE7 },
+    { 0xE8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'h', 0xE8, 0xE8 },
+    { 0xE9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'i', 0xE9, 0xE9 },
+    { 0xEA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'j', 0xEA, 0xEA },
+    { 0xEB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'k', 0xEB, 0xEB },
+    { 0xEC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'l', 0xEC, 0xEC },
+    { 0xED, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'm', 0xED, 0xED },
+    { 0xEE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'n', 0xEE, 0xEE },
+    { 0xEF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'o', 0xEF, 0xEF },
+    { 0xF0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'p', 0xF0, 0xF0 },
+    { 0xF1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'q', 0xF1, 0xF1 },
+    { 0xF2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'r', 0xF2, 0xF2 },
+    { 0xF3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  's', 0xF3, 0xF3 },
+    { 0xF4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  't', 0xF4, 0xF4 },
+    { 0xF5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'u', 0xF5, 0xF5 },
+    { 0xF6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'v', 0xF6, 0xF6 },
+    { 0xF7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'w', 0xF7, 0xF7 },
+    { 0xF8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'x', 0xF8, 0xF8 },
+    { 0xF9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'y', 0xF9, 0xF9 },
+    { 0xFA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'z', 0xFA, 0xFA },
+    { 0xFB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '{', 0xFB, 0xFB },
+    { 0xFC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '|', 0xFC, 0xFC },
+    { 0xFD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '}', 0xFD, 0xFD },
+    { 0xFE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  '~', 0xFE, 0xFE },
+    { 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x7F, 0xFF, 0xFF },
+    // SUSv2 states that these functions should also accept EOF.
+    { EOF,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x7F,  EOF,  EOF }
+};
+
+size_t num_test_cases = sizeof(test_cases) / sizeof(struct test_case);
+
+#define CHECK_TEST(tc, fn, retval) \
+    do { \
+        if (fn(tc.c) != tc.fn) { \
+            retval = EXIT_FAILURE; \
+            printf("Unexpected result: " #fn "('%c') != %d // Char value: %d\n", tc.c, tc.fn, tc.c); \
+        } \
+    } while (0)
+
+int main(void) {
+    int retval = EXIT_SUCCESS;
+
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    for(size_t i = 0; i < num_test_cases; ++i) {
+        struct test_case tc = test_cases[i];
+        CHECK_TEST(tc, isalnum, retval);
+        CHECK_TEST(tc, isalpha, retval);
+        CHECK_TEST(tc, isascii, retval);
+        CHECK_TEST(tc, isblank, retval);
+        CHECK_TEST(tc, iscntrl, retval);
+        CHECK_TEST(tc, isdigit, retval);
+        CHECK_TEST(tc, isgraph, retval);
+        CHECK_TEST(tc, islower, retval);
+        CHECK_TEST(tc, isprint, retval);
+        CHECK_TEST(tc, ispunct, retval);
+        CHECK_TEST(tc, isspace, retval);
+        CHECK_TEST(tc, isupper, retval);
+        CHECK_TEST(tc, isxdigit, retval);
+        CHECK_TEST(tc, toascii, retval);
+        CHECK_TEST(tc, tolower, retval);
+        CHECK_TEST(tc, toupper, retval);
+    }
+    #pragma GCC diagnostic pop
+
+    if (retval == EXIT_SUCCESS) {
+        printf("Success: %d\n", retval);
+    } else {
+        printf("Failure: %d\n", retval);
+    }
+
+    return retval;
+}
diff --git a/recipes/core/relibc/tests/destructor.c b/recipes/core/relibc/tests/destructor.c
new file mode 100644
index 0000000000..234cf2ed42
--- /dev/null
+++ b/recipes/core/relibc/tests/destructor.c
@@ -0,0 +1,22 @@
+#include <stdio.h>
+#include "test_helpers.h"
+
+__attribute__((destructor))
+void destructor_no_priority(void) {
+    puts("destructor (no priority)");
+}
+
+#define TEST(__priority)                          \
+    __attribute__((destructor(__priority)))       \
+    void destructor_priority_##__priority(void) { \
+        puts("destructor ("#__priority")");       \
+    }
+
+TEST(101)
+TEST(102)
+TEST(103)
+TEST(104)
+
+int main(void) {
+    puts("main");
+}
diff --git a/recipes/core/relibc/tests/dirent/fdopendir.c b/recipes/core/relibc/tests/dirent/fdopendir.c
new file mode 100644
index 0000000000..268dda2283
--- /dev/null
+++ b/recipes/core/relibc/tests/dirent/fdopendir.c
@@ -0,0 +1,156 @@
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+
+__attribute__((nonnull))
+static bool check_dot(struct dirent* dirent) {
+    const char* dots[2] = {
+        ".",
+        ".."
+    };
+
+    for (size_t i = 0; i < 2; i++) {
+        if (strcmp(dots[i], dirent->d_name) == 0) {
+            return true;
+        }        
+    }
+
+    return false;
+}
+
+int main(void) {
+    int status = EXIT_FAILURE;
+
+    char template[] = "/tmp/fdotest.XXXXXX";
+    if (!mkdtemp(template)) {
+        perror("mkdtemp");
+        goto bye;
+    }
+
+    const char* movies[] = {
+        "big_lebowski",
+        "blade_runner",
+        "grand_budapest_hotel",
+        "taxi_driver"
+    };
+    const size_t movies_len = sizeof(movies)/sizeof(char*);
+    char paths[sizeof(movies)/sizeof(char*)][PATH_MAX] = {0};
+    for (size_t i = 0; i < movies_len; ++i) {
+        // Concat the path
+        const size_t len = sizeof(template) - 1;
+        char buf[PATH_MAX] = {0};
+        memcpy(buf, template, len);
+        buf[len] = '/';
+
+        memcpy(&buf[len + 1], movies[i], strlen(movies[i]));
+        memcpy(paths[i], buf, PATH_MAX);
+
+        // And now create the file
+        int fd = open(buf, O_CREAT);
+        if (fd == -1) {
+            perror("open");
+            goto rmfiles;
+        }
+        close(fd);
+    }
+
+    // FIXME: Redox requires read perms for the dir while Linux/BSD don't.
+    int dir = open(template, O_DIRECTORY | O_RDONLY);
+    if (dir == -1) {
+        perror("open");
+        goto rmfiles;
+    }
+
+    DIR* iter = fdopendir(dir);
+    if (!iter) {
+        perror("fdopendir");
+        goto closedirfd;
+    }
+
+    for (size_t i = 0; i < movies_len; ++i) {
+        errno = 0;
+
+        struct dirent* dirent = readdir(iter);
+        if (!dirent) {
+            if (errno) {
+                perror("readdir");
+            }
+            fprintf(
+                stderr,
+                "Expected entry #%lu but directory stream is complete\n",
+                i
+            );
+
+            goto closediriter;
+        }
+
+        // Skip . and ..
+        if (check_dot(dirent)) {
+            continue;
+        }
+
+        // Check that the entry matches one of the names.
+        // readdir's order is indeterministic and looping over the names
+        // is simpler than qsort for a test.
+        for (size_t j = 0; j < movies_len; ++j) {
+            if (strcmp(movies[j], dirent->d_name) == 0) {
+                goto continue_outer;
+            }
+        }
+
+        fprintf(
+            stderr,
+            "Unexpected entry: %s\n",
+            dirent->d_name
+        );
+        goto closediriter;
+
+    continue_outer:
+        continue;
+    }
+
+// fdclosedir is a BSD extension
+#ifndef __GLIBC__
+    // fdclosedir returns ownership of the original fd.
+    int returned_fd = fdclosedir(iter);
+    // Internally, both closedir and fdclosedir consume the boxed DIR.
+    iter = NULL;
+    if (returned_fd != dir) {
+        fputs("fdclosedir returned the wrong descriptor\n", stderr);
+        goto closedirfd;
+    }
+
+    // Check that the file descriptor is still valid.
+    struct stat stat = {0};
+    if (fstatat(returned_fd, "", &stat, AT_EMPTY_PATH) == -1) {
+        perror("fstatat");
+        fputs("fdclosedir shouldn't have closed the fd\n", stderr);
+        goto closedirfd;
+    }
+#endif
+
+    status = EXIT_SUCCESS;
+closediriter:
+    if (iter) {
+        closedir(iter);
+    }
+closedirfd:
+    close(dir);
+rmfiles:
+    for (size_t i = 0; i < movies_len; ++i) {
+        if (strnlen(paths[i], PATH_MAX) > 4) {
+            unlink(paths[i]);
+        }
+    }
+    rmdir(template);
+bye:
+    return status;
+}
diff --git a/recipes/core/relibc/tests/dirent/main.c b/recipes/core/relibc/tests/dirent/main.c
new file mode 100644
index 0000000000..b524ed1e98
--- /dev/null
+++ b/recipes/core/relibc/tests/dirent/main.c
@@ -0,0 +1,43 @@
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    printf("%lu\n", sizeof(struct dirent));
+
+    DIR* dir = opendir("example_dir/");
+    ERROR_IF(opendir, dir, == NULL);
+
+    struct dirent* entry;
+
+    //int tell = 0;
+
+    for (char counter = 0; (entry = readdir(dir)); counter += 1) {
+        puts(entry->d_name);
+
+        //if (counter == 4) {
+        //    tell = telldir(dir);
+        //}
+    }
+
+    puts("--- Testing rewind ---");
+    rewinddir(dir);
+    entry = readdir(dir);
+    assert(entry != NULL);
+    puts(entry->d_name);
+
+    // puts("--- Testing seek ---");
+    // // Why this doesn't cause it to actually go to the 4th element is beyond
+    // // me, but glibc acts the same way.
+    // seekdir(dir, tell);
+    // entry = readdir(dir);
+    // puts(entry->d_name);
+
+    int c = closedir(dir);
+    ERROR_IF(closedir, c, == -1);
+    UNEXP_IF(closedir, c, != 0);
+}
diff --git a/recipes/core/relibc/tests/dirent/posix_getdents.c b/recipes/core/relibc/tests/dirent/posix_getdents.c
new file mode 100644
index 0000000000..ee62be96ff
--- /dev/null
+++ b/recipes/core/relibc/tests/dirent/posix_getdents.c
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include "test_helpers.h"
+
+#define BUFFER_SIZE 4096
+
+#ifndef __GLIBC__
+void read_and_print_directory(int fd) {
+    char buffer[BUFFER_SIZE];
+    long nread;
+    long bpos;
+    struct posix_dent *d;
+
+    for (;;) {
+        nread = posix_getdents(fd, buffer, BUFFER_SIZE, 0);
+        ERROR_IF(posix_getdents, nread, == -1);
+        UNEXP_IF(posix_getdents, nread, < 0);
+
+        if (nread == 0) {
+            break;
+        }
+
+        for (bpos = 0; bpos < nread;) {
+            d = (struct posix_dent *) (buffer + bpos);
+            printf("  ino = %-10lu  name = %s\n", (unsigned long)d->d_ino, d->d_name);
+            bpos += d->d_reclen;
+        }
+    }
+}
+
+int main(void) {
+    int fd = open("example_dir/", O_RDONLY | O_DIRECTORY);
+    ERROR_IF(open, fd, == -1);
+    read_and_print_directory(fd);
+
+    off_t seek_result = lseek(fd, 0, SEEK_SET);
+    ERROR_IF(lseek, seek_result, == -1);
+    read_and_print_directory(fd);
+
+    close(fd);
+}
+#else
+
+int main(void) {
+    // glibc doesn't support posix_getdents & O_DIRECTORY
+}
+#endif
diff --git a/recipes/core/relibc/tests/dirent/scandir.c b/recipes/core/relibc/tests/dirent/scandir.c
new file mode 100644
index 0000000000..c530abe48f
--- /dev/null
+++ b/recipes/core/relibc/tests/dirent/scandir.c
@@ -0,0 +1,31 @@
+#include <dirent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int filter(const struct dirent* dirent) {
+    return strstr(dirent->d_name, "3") == NULL;
+}
+
+int main(void) {
+    struct dirent** array;
+
+    int len = scandir("example_dir/", &array, filter, alphasort);
+    ERROR_IF(scandir, len, == -1);
+    UNEXP_IF(scandir, len, < 0);
+
+    for(int i = 0; i < len; i += 1) {
+        // TODO: Redox does not yet provide . or .. - so filter them out
+        // in order to make output match on all systems
+        if (
+            strcmp(array[i]->d_name, ".") != 0 &&
+            strcmp(array[i]->d_name, "..") != 0
+        ) {
+            puts(array[i]->d_name);
+        }
+        free(array[i]);
+    }
+    free(array);
+}
diff --git a/recipes/core/relibc/tests/dlfcn.c b/recipes/core/relibc/tests/dlfcn.c
new file mode 100644
index 0000000000..ed81a7e0e5
--- /dev/null
+++ b/recipes/core/relibc/tests/dlfcn.c
@@ -0,0 +1,122 @@
+#include <assert.h>
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define SHARED_LIB "sharedlib.so"
+
+int add(int a, int b) { return a + b; }
+
+void test_dlopen_null() {
+    void *handle = dlopen(NULL, RTLD_LAZY);
+    if (!handle) {
+        printf("dlopen(NULL) failed: %s\n", dlerror());
+        exit(1);
+    }
+
+    int (*f)(int, int);
+    *(void **)(&f) = dlsym(handle, "add");
+
+    if (!f) {
+        printf("dlsym(handle, add) failed: %s\n", dlerror());
+        exit(2);
+    }
+    int a = 22;
+    int b = 33;
+    printf("add(%d, %d) = %d\n", a, b, f(a, b));
+    dlclose(handle);
+}
+
+void test_dlopen_libc() {
+    void *handle = dlopen("libc.so.6", RTLD_LAZY);
+    if (!handle) {
+        printf("dlopen(libc.so.6) failed\n");
+        exit(1);
+    }
+
+    int (*f)(const char *);
+    *(void **)(&f) = dlsym(handle, "puts");
+
+    if (!f) {
+        printf("dlsym(handle, puts) failed\n");
+        exit(2);
+    }
+    f("puts from dlopened libc");
+    dlclose(handle);
+}
+
+void test_dlsym_function() {
+    void *handle = dlopen(SHARED_LIB, RTLD_LAZY);
+    if (!handle) {
+        printf("dlopen(sharedlib.so) failed\n");
+        exit(1);
+    }
+
+    void (*f)();
+    *(void **)(&f) = dlsym(handle, "print");
+
+    if (!f) {
+        printf("dlsym(handle, print) failed\n");
+        exit(2);
+    }
+    f();
+    dlclose(handle);
+}
+
+void test_dlsym_global_var() {
+    void *handle = dlopen(SHARED_LIB, RTLD_LAZY);
+    if (!handle) {
+        printf("dlopen(sharedlib.so) failed\n");
+        exit(1);
+    }
+    int *global_var = dlsym(handle, "global_var");
+    if (!global_var) {
+        printf("dlsym(handle, global_var) failed\n");
+        exit(2);
+    }
+    printf("main: global_var == %d\n", *global_var);
+    dlclose(handle);
+}
+
+void test_dlsym_tls_var() {
+    void *handle = dlopen(SHARED_LIB, RTLD_LAZY);
+    if (!handle) {
+        printf("dlopen(sharedlib.so) failed\n");
+        exit(1);
+    }
+    int *tls_var = dlsym(handle, "tls_var");
+    if (!tls_var) {
+        printf("dlsym(handle, tls_var) failed\n");
+        exit(2);
+    }
+    printf("main: tls_var == %d\n", *tls_var);
+    dlclose(handle);
+}
+
+void test_dlunload(void) {
+    void *handle = dlopen(SHARED_LIB, RTLD_LAZY | RTLD_LOCAL);
+    void *handle2 = dlopen(SHARED_LIB, RTLD_LAZY | RTLD_LOCAL);
+    assert(handle == handle2 && handle);
+    assert(!dlclose(handle));
+    void *handle3 = dlopen(SHARED_LIB, RTLD_LAZY | RTLD_NOLOAD);
+    assert(handle3 == handle2);
+    assert(!dlclose(handle3));
+    assert(!dlclose(handle2));
+    void *handle4 = dlopen(SHARED_LIB, RTLD_LAZY | RTLD_NOLOAD);
+    assert(handle4 == NULL);
+
+    void *handle5 = dlopen(SHARED_LIB, RTLD_LAZY | RTLD_GLOBAL);
+    assert(handle5);
+    assert(!dlclose(handle5));
+    void *handle6 = dlopen(SHARED_LIB, RTLD_LAZY | RTLD_NOLOAD);
+    assert(handle6 == NULL);
+}
+
+int main() {
+    test_dlopen_null();
+    test_dlopen_libc();
+    test_dlsym_function();
+    test_dlsym_global_var();
+    test_dlsym_tls_var();
+    test_dlunload();
+}
diff --git a/recipes/core/relibc/tests/dlopen_scopes.c b/recipes/core/relibc/tests/dlopen_scopes.c
new file mode 100644
index 0000000000..3d8de7d74c
--- /dev/null
+++ b/recipes/core/relibc/tests/dlopen_scopes.c
@@ -0,0 +1,38 @@
+#include <assert.h>
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main(void) {
+    void *handle = dlopen("libfoobar.so", RTLD_LAZY | RTLD_LOCAL);
+    if (!handle) {
+        printf("dlopen(libfoobar.so): %s\n", dlerror());
+        return EXIT_FAILURE;
+    }
+
+    assert(dlsym(handle, "BAR") != NULL);
+    assert(dlsym(handle, "FOO") != NULL);
+    // not in the global scope
+    assert(dlsym(RTLD_DEFAULT, "BAR") == NULL);
+    assert(dlsym(RTLD_DEFAULT, "FOO") == NULL);
+
+    void *self = dlopen(NULL, RTLD_LAZY | RTLD_LOCAL);
+    if (!self) {
+        printf("dlopen(NULL): %s\n", dlerror());
+        return EXIT_FAILURE;
+    }
+
+    assert(dlsym(self, "FOO") == NULL);
+    assert(dlsym(self, "BAR") == NULL);
+
+    assert(dlclose(self) == 0);
+
+    // Promote the library to the global scope.
+    assert(dlopen("libfoobar.so", /* RTLD_NOLOAD |*/ RTLD_NOW | RTLD_GLOBAL));
+
+    assert(dlsym(RTLD_DEFAULT, "FOO") != NULL);
+    assert(dlsym(RTLD_DEFAULT, "BAR") != NULL);
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/endian.c b/recipes/core/relibc/tests/endian.c
new file mode 100644
index 0000000000..2eeb7cdab0
--- /dev/null
+++ b/recipes/core/relibc/tests/endian.c
@@ -0,0 +1,75 @@
+#include <assert.h>
+#include <endian.h>
+#include <stdint.h>
+
+#include "test_helpers.h"
+
+void to_be(uintmax_t in, uint8_t *out, size_t size) {
+    for (size_t i = 0; i < size; i++) {
+        out[i] = (in >> 8*(size - 1 - i)) & 0xff;
+    }
+}
+
+void to_le(uintmax_t in, uint8_t *out, size_t size) {
+    for (size_t i = 0; i < size; i++) {
+        out[i] = (in >> 8*i) & 0xff;
+    }
+}
+
+int main() {
+    uint16_t zero_u16 = 0;
+    assert(be16toh(zero_u16) == zero_u16);
+    assert(htobe16(zero_u16) == zero_u16);
+    assert(htole16(zero_u16) == zero_u16);
+    assert(le16toh(zero_u16) == zero_u16);
+
+    uint16_t u16_ne = 0x0123;
+    uint16_t u16_be, u16_le;
+    to_be(u16_ne, (uint8_t *)&u16_be, sizeof(uint16_t));
+    to_le(u16_ne, (uint8_t *)&u16_le, sizeof(uint16_t));
+    assert(be16toh(u16_be) == u16_ne);
+    assert(htobe16(u16_ne) == u16_be);
+    assert(htole16(u16_ne) == u16_le);
+    assert(le16toh(u16_le) == u16_ne);
+
+    uint32_t zero_u32 = 0;
+    assert(be32toh(zero_u32) == zero_u32);
+    assert(htobe32(zero_u32) == zero_u32);
+    assert(htole32(zero_u32) == zero_u32);
+    assert(le32toh(zero_u32) == zero_u32);
+
+    uint32_t u32_ne = 0x01234567;
+    uint32_t u32_be, u32_le;
+    to_be(u32_ne, (uint8_t *)&u32_be, sizeof(uint32_t));
+    to_le(u32_ne, (uint8_t *)&u32_le, sizeof(uint32_t));
+    assert(be32toh(u32_be) == u32_ne);
+    assert(htobe32(u32_ne) == u32_be);
+    assert(htole32(u32_ne) == u32_le);
+    assert(le32toh(u32_le) == u32_ne);
+
+    uint64_t zero_u64 = 0;
+    assert(be64toh(zero_u64) == zero_u64);
+    assert(htobe64(zero_u64) == zero_u64);
+    assert(htole64(zero_u64) == zero_u64);
+    assert(le64toh(zero_u64) == zero_u64);
+
+    uint64_t u64_ne = 0x0123456789ABCDEF;
+    uint64_t u64_be, u64_le;
+    to_be(u64_ne, (uint8_t *)&u64_be, sizeof(uint64_t));
+    to_le(u64_ne, (uint8_t *)&u64_le, sizeof(uint64_t));
+    assert(be64toh(u64_be) == u64_ne);
+    assert(htobe64(u64_ne) == u64_be);
+    assert(htole64(u64_ne) == u64_le);
+    assert(le64toh(u64_le) == u64_ne);
+
+    /* Test that the BYTE_ORDER, LITTLE_ENDIAN and BIG_ENDIAN macros are available */
+    /* It is in principle possible to have further endiannesses, like PDP_ENDIAN */
+    if (u64_ne == u64_le) {
+        assert(BYTE_ORDER == LITTLE_ENDIAN);
+        assert(BYTE_ORDER != BIG_ENDIAN);
+    }
+    if (u64_ne == u64_be) {
+        assert(BYTE_ORDER == BIG_ENDIAN);
+        assert(BYTE_ORDER != LITTLE_ENDIAN);
+    }
+}
diff --git a/recipes/core/relibc/tests/err.c b/recipes/core/relibc/tests/err.c
new file mode 100644
index 0000000000..eda95d1743
--- /dev/null
+++ b/recipes/core/relibc/tests/err.c
@@ -0,0 +1,61 @@
+#include <err.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+// does not compile with glibc
+#ifndef __GLIBC__
+
+__attribute__((nonnull(2)))
+static void vwarn_test(int code, const char* fmt, ...) {
+    va_list ap;
+    va_start(ap, fmt);
+    vwarnc(code, fmt, ap);
+    va_end(ap);
+}
+
+static void log_to_stdout(void) {
+    err_set_file(stdout);
+    warnc(ENOENT, "Dang it, Bobby.");
+    err_set_file(NULL);
+}
+
+void user_callback(int code) {
+    printf("Exiting due to error code: %d\n", code);
+}
+
+int main(void) {
+    err_set_exit(user_callback);
+
+    // Set errno to a known value for verifiable messages
+    // (Also, "Owner died" is just too funny not to use)
+    errno = EOWNERDEAD;
+
+    warn("Ran out of coffee");
+    warnx("%s pulled out your ethernet cable", "Cat");
+    warnc(EACCES, "Eat %d cookies", 42);
+
+    vwarn_test(EBADE, "Potato, %s", "krumpli");
+
+    // Set the sink to stdout then back to stderr
+    log_to_stdout();
+    warnc(EPERM,
+          "I'm sorry, Dave. I'm afraid I can't do that."
+    );
+
+    // As long as one err function works they should all work since
+    // two functions handle everything internally.
+    errc(EXIT_SUCCESS, EUSERS, "Bye. It's crowded.");
+
+
+    // Unreachable
+    puts("err did not exit");
+    return EXIT_FAILURE;
+}
+
+#else
+int main(void) {
+    exit(0);
+}
+#endif
diff --git a/recipes/core/relibc/tests/errno.c b/recipes/core/relibc/tests/errno.c
new file mode 100644
index 0000000000..29c7df5265
--- /dev/null
+++ b/recipes/core/relibc/tests/errno.c
@@ -0,0 +1,680 @@
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "test_helpers.h"
+
+int main(int argc, char **argv) {
+    // Recent POSIX requires E2BIG, EACCESS etc. to be available as macros
+#ifdef E2BIG
+    puts("E2BIG macro available");
+#else
+    puts("E2BIG macro missing");
+#endif /* E2BIG */
+#ifdef EACCES
+    puts("EACCES macro available");
+#else
+    puts("EACCES macro missing");
+#endif /* EACCES */
+#ifdef EADDRINUSE
+    puts("EADDRINUSE macro available");
+#else
+    puts("EADDRINUSE macro missing");
+#endif /* EADDRINUSE */
+#ifdef EADDRNOTAVAIL
+    puts("EADDRNOTAVAIL macro available");
+#else
+    puts("EADDRNOTAVAIL macro missing");
+#endif /* EADDRNOTAVAIL */
+#ifdef EADV
+    puts("EADV macro available");
+#else
+    puts("EADV macro missing");
+#endif /* EADV */
+#ifdef EAFNOSUPPORT
+    puts("EAFNOSUPPORT macro available");
+#else
+    puts("EAFNOSUPPORT macro missing");
+#endif /* EAFNOSUPPORT */
+#ifdef EAGAIN
+    puts("EAGAIN macro available");
+#else
+    puts("EAGAIN macro missing");
+#endif /* EAGAIN */
+#ifdef EALREADY
+    puts("EALREADY macro available");
+#else
+    puts("EALREADY macro missing");
+#endif /* EALREADY */
+#ifdef EBADE
+    puts("EBADE macro available");
+#else
+    puts("EBADE macro missing");
+#endif /* EBADE */
+#ifdef EBADF
+    puts("EBADF macro available");
+#else
+    puts("EBADF macro missing");
+#endif /* EBADF */
+#ifdef EBADFD
+    puts("EBADFD macro available");
+#else
+    puts("EBADFD macro missing");
+#endif /* EBADFD */
+#ifdef EBADMSG
+    puts("EBADMSG macro available");
+#else
+    puts("EBADMSG macro missing");
+#endif /* EBADMSG */
+#ifdef EBADR
+    puts("EBADR macro available");
+#else
+    puts("EBADR macro missing");
+#endif /* EBADR */
+#ifdef EBADRQC
+    puts("EBADRQC macro available");
+#else
+    puts("EBADRQC macro missing");
+#endif /* EBADRQC */
+#ifdef EBADSLT
+    puts("EBADSLT macro available");
+#else
+    puts("EBADSLT macro missing");
+#endif /* EBADSLT */
+#ifdef EBFONT
+    puts("EBFONT macro available");
+#else
+    puts("EBFONT macro missing");
+#endif /* EBFONT */
+#ifdef EBUSY
+    puts("EBUSY macro available");
+#else
+    puts("EBUSY macro missing");
+#endif /* EBUSY */
+#ifdef ECANCELED
+    puts("ECANCELED macro available");
+#else
+    puts("ECANCELED macro missing");
+#endif /* ECANCELED */
+#ifdef ECHILD
+    puts("ECHILD macro available");
+#else
+    puts("ECHILD macro missing");
+#endif /* ECHILD */
+#ifdef ECHRNG
+    puts("ECHRNG macro available");
+#else
+    puts("ECHRNG macro missing");
+#endif /* ECHRNG */
+#ifdef ECOMM
+    puts("ECOMM macro available");
+#else
+    puts("ECOMM macro missing");
+#endif /* ECOMM */
+#ifdef ECONNABORTED
+    puts("ECONNABORTED macro available");
+#else
+    puts("ECONNABORTED macro missing");
+#endif /* ECONNABORTED */
+#ifdef ECONNREFUSED
+    puts("ECONNREFUSED macro available");
+#else
+    puts("ECONNREFUSED macro missing");
+#endif /* ECONNREFUSED */
+#ifdef ECONNRESET
+    puts("ECONNRESET macro available");
+#else
+    puts("ECONNRESET macro missing");
+#endif /* ECONNRESET */
+#ifdef EDEADLK
+    puts("EDEADLK macro available");
+#else
+    puts("EDEADLK macro missing");
+#endif /* EDEADLK */
+#ifdef EDEADLOCK
+    puts("EDEADLOCK macro available");
+#else
+    puts("EDEADLOCK macro missing");
+#endif /* EDEADLOCK */
+#ifdef EDESTADDRREQ
+    puts("EDESTADDRREQ macro available");
+#else
+    puts("EDESTADDRREQ macro missing");
+#endif /* EDESTADDRREQ */
+#ifdef EDOM
+    puts("EDOM macro available");
+#else
+    puts("EDOM macro missing");
+#endif /* EDOM */
+#ifdef EDOTDOT
+    puts("EDOTDOT macro available");
+#else
+    puts("EDOTDOT macro missing");
+#endif /* EDOTDOT */
+#ifdef EDQUOT
+    puts("EDQUOT macro available");
+#else
+    puts("EDQUOT macro missing");
+#endif /* EDQUOT */
+#ifdef EEXIST
+    puts("EEXIST macro available");
+#else
+    puts("EEXIST macro missing");
+#endif /* EEXIST */
+#ifdef EFAULT
+    puts("EFAULT macro available");
+#else
+    puts("EFAULT macro missing");
+#endif /* EFAULT */
+#ifdef EFBIG
+    puts("EFBIG macro available");
+#else
+    puts("EFBIG macro missing");
+#endif /* EFBIG */
+#ifdef EHOSTDOWN
+    puts("EHOSTDOWN macro available");
+#else
+    puts("EHOSTDOWN macro missing");
+#endif /* EHOSTDOWN */
+#ifdef EHOSTUNREACH
+    puts("EHOSTUNREACH macro available");
+#else
+    puts("EHOSTUNREACH macro missing");
+#endif /* EHOSTUNREACH */
+#ifdef EIDRM
+    puts("EIDRM macro available");
+#else
+    puts("EIDRM macro missing");
+#endif /* EIDRM */
+#ifdef EILSEQ
+    puts("EILSEQ macro available");
+#else
+    puts("EILSEQ macro missing");
+#endif /* EILSEQ */
+#ifdef EINPROGRESS
+    puts("EINPROGRESS macro available");
+#else
+    puts("EINPROGRESS macro missing");
+#endif /* EINPROGRESS */
+#ifdef EINTR
+    puts("EINTR macro available");
+#else
+    puts("EINTR macro missing");
+#endif /* EINTR */
+#ifdef EINVAL
+    puts("EINVAL macro available");
+#else
+    puts("EINVAL macro missing");
+#endif /* EINVAL */
+#ifdef EIO
+    puts("EIO macro available");
+#else
+    puts("EIO macro missing");
+#endif /* EIO */
+#ifdef EISCONN
+    puts("EISCONN macro available");
+#else
+    puts("EISCONN macro missing");
+#endif /* EISCONN */
+#ifdef EISDIR
+    puts("EISDIR macro available");
+#else
+    puts("EISDIR macro missing");
+#endif /* EISDIR */
+#ifdef EISNAM
+    puts("EISNAM macro available");
+#else
+    puts("EISNAM macro missing");
+#endif /* EISNAM */
+#ifdef EKEYEXPIRED
+    puts("EKEYEXPIRED macro available");
+#else
+    puts("EKEYEXPIRED macro missing");
+#endif /* EKEYEXPIRED */
+#ifdef EKEYREJECTED
+    puts("EKEYREJECTED macro available");
+#else
+    puts("EKEYREJECTED macro missing");
+#endif /* EKEYREJECTED */
+#ifdef EKEYREVOKED
+    puts("EKEYREVOKED macro available");
+#else
+    puts("EKEYREVOKED macro missing");
+#endif /* EKEYREVOKED */
+#ifdef EL2HLT
+    puts("EL2HLT macro available");
+#else
+    puts("EL2HLT macro missing");
+#endif /* EL2HLT */
+#ifdef EL2NSYNC
+    puts("EL2NSYNC macro available");
+#else
+    puts("EL2NSYNC macro missing");
+#endif /* EL2NSYNC */
+#ifdef EL3HLT
+    puts("EL3HLT macro available");
+#else
+    puts("EL3HLT macro missing");
+#endif /* EL3HLT */
+#ifdef EL3RST
+    puts("EL3RST macro available");
+#else
+    puts("EL3RST macro missing");
+#endif /* EL3RST */
+#ifdef ELIBACC
+    puts("ELIBACC macro available");
+#else
+    puts("ELIBACC macro missing");
+#endif /* ELIBACC */
+#ifdef ELIBBAD
+    puts("ELIBBAD macro available");
+#else
+    puts("ELIBBAD macro missing");
+#endif /* ELIBBAD */
+#ifdef ELIBEXEC
+    puts("ELIBEXEC macro available");
+#else
+    puts("ELIBEXEC macro missing");
+#endif /* ELIBEXEC */
+#ifdef ELIBMAX
+    puts("ELIBMAX macro available");
+#else
+    puts("ELIBMAX macro missing");
+#endif /* ELIBMAX */
+#ifdef ELIBSCN
+    puts("ELIBSCN macro available");
+#else
+    puts("ELIBSCN macro missing");
+#endif /* ELIBSCN */
+#ifdef ELNRNG
+    puts("ELNRNG macro available");
+#else
+    puts("ELNRNG macro missing");
+#endif /* ELNRNG */
+#ifdef ELOOP
+    puts("ELOOP macro available");
+#else
+    puts("ELOOP macro missing");
+#endif /* ELOOP */
+#ifdef EMEDIUMTYPE
+    puts("EMEDIUMTYPE macro available");
+#else
+    puts("EMEDIUMTYPE macro missing");
+#endif /* EMEDIUMTYPE */
+#ifdef EMFILE
+    puts("EMFILE macro available");
+#else
+    puts("EMFILE macro missing");
+#endif /* EMFILE */
+#ifdef EMLINK
+    puts("EMLINK macro available");
+#else
+    puts("EMLINK macro missing");
+#endif /* EMLINK */
+#ifdef EMSGSIZE
+    puts("EMSGSIZE macro available");
+#else
+    puts("EMSGSIZE macro missing");
+#endif /* EMSGSIZE */
+#ifdef EMULTIHOP
+    puts("EMULTIHOP macro available");
+#else
+    puts("EMULTIHOP macro missing");
+#endif /* EMULTIHOP */
+#ifdef ENAMETOOLONG
+    puts("ENAMETOOLONG macro available");
+#else
+    puts("ENAMETOOLONG macro missing");
+#endif /* ENAMETOOLONG */
+#ifdef ENAVAIL
+    puts("ENAVAIL macro available");
+#else
+    puts("ENAVAIL macro missing");
+#endif /* ENAVAIL */
+#ifdef ENETDOWN
+    puts("ENETDOWN macro available");
+#else
+    puts("ENETDOWN macro missing");
+#endif /* ENETDOWN */
+#ifdef ENETRESET
+    puts("ENETRESET macro available");
+#else
+    puts("ENETRESET macro missing");
+#endif /* ENETRESET */
+#ifdef ENETUNREACH
+    puts("ENETUNREACH macro available");
+#else
+    puts("ENETUNREACH macro missing");
+#endif /* ENETUNREACH */
+#ifdef ENFILE
+    puts("ENFILE macro available");
+#else
+    puts("ENFILE macro missing");
+#endif /* ENFILE */
+#ifdef ENOANO
+    puts("ENOANO macro available");
+#else
+    puts("ENOANO macro missing");
+#endif /* ENOANO */
+#ifdef ENOBUFS
+    puts("ENOBUFS macro available");
+#else
+    puts("ENOBUFS macro missing");
+#endif /* ENOBUFS */
+#ifdef ENOCSI
+    puts("ENOCSI macro available");
+#else
+    puts("ENOCSI macro missing");
+#endif /* ENOCSI */
+#ifdef ENODATA
+    puts("ENODATA macro available");
+#else
+    puts("ENODATA macro missing");
+#endif /* ENODATA */
+#ifdef ENODEV
+    puts("ENODEV macro available");
+#else
+    puts("ENODEV macro missing");
+#endif /* ENODEV */
+#ifdef ENOENT
+    puts("ENOENT macro available");
+#else
+    puts("ENOENT macro missing");
+#endif /* ENOENT */
+#ifdef ENOEXEC
+    puts("ENOEXEC macro available");
+#else
+    puts("ENOEXEC macro missing");
+#endif /* ENOEXEC */
+#ifdef ENOKEY
+    puts("ENOKEY macro available");
+#else
+    puts("ENOKEY macro missing");
+#endif /* ENOKEY */
+#ifdef ENOLCK
+    puts("ENOLCK macro available");
+#else
+    puts("ENOLCK macro missing");
+#endif /* ENOLCK */
+#ifdef ENOLINK
+    puts("ENOLINK macro available");
+#else
+    puts("ENOLINK macro missing");
+#endif /* ENOLINK */
+#ifdef ENOMEDIUM
+    puts("ENOMEDIUM macro available");
+#else
+    puts("ENOMEDIUM macro missing");
+#endif /* ENOMEDIUM */
+#ifdef ENOMEM
+    puts("ENOMEM macro available");
+#else
+    puts("ENOMEM macro missing");
+#endif /* ENOMEM */
+#ifdef ENOMSG
+    puts("ENOMSG macro available");
+#else
+    puts("ENOMSG macro missing");
+#endif /* ENOMSG */
+#ifdef ENONET
+    puts("ENONET macro available");
+#else
+    puts("ENONET macro missing");
+#endif /* ENONET */
+#ifdef ENOPKG
+    puts("ENOPKG macro available");
+#else
+    puts("ENOPKG macro missing");
+#endif /* ENOPKG */
+#ifdef ENOPROTOOPT
+    puts("ENOPROTOOPT macro available");
+#else
+    puts("ENOPROTOOPT macro missing");
+#endif /* ENOPROTOOPT */
+#ifdef ENOSPC
+    puts("ENOSPC macro available");
+#else
+    puts("ENOSPC macro missing");
+#endif /* ENOSPC */
+#ifdef ENOSR
+    puts("ENOSR macro available");
+#else
+    puts("ENOSR macro missing");
+#endif /* ENOSR */
+#ifdef ENOSTR
+    puts("ENOSTR macro available");
+#else
+    puts("ENOSTR macro missing");
+#endif /* ENOSTR */
+#ifdef ENOSYS
+    puts("ENOSYS macro available");
+#else
+    puts("ENOSYS macro missing");
+#endif /* ENOSYS */
+#ifdef ENOTBLK
+    puts("ENOTBLK macro available");
+#else
+    puts("ENOTBLK macro missing");
+#endif /* ENOTBLK */
+#ifdef ENOTCONN
+    puts("ENOTCONN macro available");
+#else
+    puts("ENOTCONN macro missing");
+#endif /* ENOTCONN */
+#ifdef ENOTDIR
+    puts("ENOTDIR macro available");
+#else
+    puts("ENOTDIR macro missing");
+#endif /* ENOTDIR */
+#ifdef ENOTEMPTY
+    puts("ENOTEMPTY macro available");
+#else
+    puts("ENOTEMPTY macro missing");
+#endif /* ENOTEMPTY */
+#ifdef ENOTNAM
+    puts("ENOTNAM macro available");
+#else
+    puts("ENOTNAM macro missing");
+#endif /* ENOTNAM */
+#ifdef ENOTRECOVERABLE
+    puts("ENOTRECOVERABLE macro available");
+#else
+    puts("ENOTRECOVERABLE macro missing");
+#endif /* ENOTRECOVERABLE */
+#ifdef ENOTSOCK
+    puts("ENOTSOCK macro available");
+#else
+    puts("ENOTSOCK macro missing");
+#endif /* ENOTSOCK */
+#ifdef ENOTSUP
+    puts("ENOTSUP macro available");
+#else
+    puts("ENOTSUP macro missing");
+#endif /* ENOTSUP */
+#ifdef ENOTTY
+    puts("ENOTTY macro available");
+#else
+    puts("ENOTTY macro missing");
+#endif /* ENOTTY */
+#ifdef ENOTUNIQ
+    puts("ENOTUNIQ macro available");
+#else
+    puts("ENOTUNIQ macro missing");
+#endif /* ENOTUNIQ */
+#ifdef ENXIO
+    puts("ENXIO macro available");
+#else
+    puts("ENXIO macro missing");
+#endif /* ENXIO */
+#ifdef EOPNOTSUPP
+    puts("EOPNOTSUPP macro available");
+#else
+    puts("EOPNOTSUPP macro missing");
+#endif /* EOPNOTSUPP */
+#ifdef EOVERFLOW
+    puts("EOVERFLOW macro available");
+#else
+    puts("EOVERFLOW macro missing");
+#endif /* EOVERFLOW */
+#ifdef EOWNERDEAD
+    puts("EOWNERDEAD macro available");
+#else
+    puts("EOWNERDEAD macro missing");
+#endif /* EOWNERDEAD */
+#ifdef EPERM
+    puts("EPERM macro available");
+#else
+    puts("EPERM macro missing");
+#endif /* EPERM */
+#ifdef EPFNOSUPPORT
+    puts("EPFNOSUPPORT macro available");
+#else
+    puts("EPFNOSUPPORT macro missing");
+#endif /* EPFNOSUPPORT */
+#ifdef EPIPE
+    puts("EPIPE macro available");
+#else
+    puts("EPIPE macro missing");
+#endif /* EPIPE */
+#ifdef EPROTO
+    puts("EPROTO macro available");
+#else
+    puts("EPROTO macro missing");
+#endif /* EPROTO */
+#ifdef EPROTONOSUPPORT
+    puts("EPROTONOSUPPORT macro available");
+#else
+    puts("EPROTONOSUPPORT macro missing");
+#endif /* EPROTONOSUPPORT */
+#ifdef EPROTOTYPE
+    puts("EPROTOTYPE macro available");
+#else
+    puts("EPROTOTYPE macro missing");
+#endif /* EPROTOTYPE */
+#ifdef ERANGE
+    puts("ERANGE macro available");
+#else
+    puts("ERANGE macro missing");
+#endif /* ERANGE */
+#ifdef EREMCHG
+    puts("EREMCHG macro available");
+#else
+    puts("EREMCHG macro missing");
+#endif /* EREMCHG */
+#ifdef EREMOTE
+    puts("EREMOTE macro available");
+#else
+    puts("EREMOTE macro missing");
+#endif /* EREMOTE */
+#ifdef EREMOTEIO
+    puts("EREMOTEIO macro available");
+#else
+    puts("EREMOTEIO macro missing");
+#endif /* EREMOTEIO */
+#ifdef ERESTART
+    puts("ERESTART macro available");
+#else
+    puts("ERESTART macro missing");
+#endif /* ERESTART */
+#ifdef EROFS
+    puts("EROFS macro available");
+#else
+    puts("EROFS macro missing");
+#endif /* EROFS */
+#ifdef ESHUTDOWN
+    puts("ESHUTDOWN macro available");
+#else
+    puts("ESHUTDOWN macro missing");
+#endif /* ESHUTDOWN */
+#ifdef ESOCKTNOSUPPORT
+    puts("ESOCKTNOSUPPORT macro available");
+#else
+    puts("ESOCKTNOSUPPORT macro missing");
+#endif /* ESOCKTNOSUPPORT */
+#ifdef ESPIPE
+    puts("ESPIPE macro available");
+#else
+    puts("ESPIPE macro missing");
+#endif /* ESPIPE */
+#ifdef ESRCH
+    puts("ESRCH macro available");
+#else
+    puts("ESRCH macro missing");
+#endif /* ESRCH */
+#ifdef ESRMNT
+    puts("ESRMNT macro available");
+#else
+    puts("ESRMNT macro missing");
+#endif /* ESRMNT */
+#ifdef ESTALE
+    puts("ESTALE macro available");
+#else
+    puts("ESTALE macro missing");
+#endif /* ESTALE */
+#ifdef ESTRPIPE
+    puts("ESTRPIPE macro available");
+#else
+    puts("ESTRPIPE macro missing");
+#endif /* ESTRPIPE */
+#ifdef ETIME
+    puts("ETIME macro available");
+#else
+    puts("ETIME macro missing");
+#endif /* ETIME */
+#ifdef ETIMEDOUT
+    puts("ETIMEDOUT macro available");
+#else
+    puts("ETIMEDOUT macro missing");
+#endif /* ETIMEDOUT */
+#ifdef ETOOMANYREFS
+    puts("ETOOMANYREFS macro available");
+#else
+    puts("ETOOMANYREFS macro missing");
+#endif /* ETOOMANYREFS */
+#ifdef ETXTBSY
+    puts("ETXTBSY macro available");
+#else
+    puts("ETXTBSY macro missing");
+#endif /* ETXTBSY */
+#ifdef EUCLEAN
+    puts("EUCLEAN macro available");
+#else
+    puts("EUCLEAN macro missing");
+#endif /* EUCLEAN */
+#ifdef EUNATCH
+    puts("EUNATCH macro available");
+#else
+    puts("EUNATCH macro missing");
+#endif /* EUNATCH */
+#ifdef EUSERS
+    puts("EUSERS macro available");
+#else
+    puts("EUSERS macro missing");
+#endif /* EUSERS */
+#ifdef EWOULDBLOCK
+    puts("EWOULDBLOCK macro available");
+#else
+    puts("EWOULDBLOCK macro missing");
+#endif /* EWOULDBLOCK */
+#ifdef EXDEV
+    puts("EXDEV macro available");
+#else
+    puts("EXDEV macro missing");
+#endif /* EXDEV */
+#ifdef EXFULL
+    puts("EXFULL macro available");
+#else
+    puts("EXFULL macro missing");
+#endif /* EXFULL */
+
+    assert(argc > 0);
+
+    puts(program_invocation_short_name);
+
+    argv[0] = "changed to argv[0]";
+    program_invocation_name = "changed to program_invocation_name";
+    program_invocation_short_name = "changed to program_invocation_short_name";
+
+    puts(argv[0]);
+    puts(program_invocation_name);
+    puts(program_invocation_short_name);
+}
diff --git a/recipes/core/relibc/tests/error.c b/recipes/core/relibc/tests/error.c
new file mode 100644
index 0000000000..61ba98f7f3
--- /dev/null
+++ b/recipes/core/relibc/tests/error.c
@@ -0,0 +1,60 @@
+#include <err.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+// does not compile with glibc
+#ifndef __GLIBC__
+int main(void) {
+    chdir("nonexistent");
+    int err = errno;
+
+    printf("errno: %d = %s\n", err, strerror(errno));
+    perror("perror");
+
+    char buf1[256] = {0};
+    int ret1 = strerror_r(err, buf1, 256);
+    printf("errno: %d = %s, return: %d\n", err, buf1, ret1);
+
+    char buf2[3] = {0};
+    int ret2 = strerror_r(err, buf2, 3);
+    printf("errno: %d = %s, return: %d\n", err, buf2, ret2);
+
+    char buf3[256] = {0};
+    int ret3 = strerror_r(err, buf3, 0);
+    printf("errno: %d = %s, return: %d\n", err, buf3, ret3);
+
+    // Test that the statically allocated buffer doesn't overflow
+    for (int code = EPERM; code < ENOTRECOVERABLE; ++code) {
+        const char* message = strerror(code);
+        if (!message) {
+            errx(EXIT_FAILURE,
+                 "Expected message for error code: %d",
+                 code
+            );
+        }
+    }
+
+    const char* actual_error = strerror(INT_MAX);
+    char expected_error[256] = {0};
+    sprintf(expected_error, "Unknown error %d", INT_MAX);
+    if (strncmp(expected_error, actual_error, 25) != 0) {
+        errx(EXIT_FAILURE,
+             "Expected: %s\nGot: %s",
+             expected_error, actual_error
+        );
+    }
+
+    return EXIT_SUCCESS;
+}
+
+#else
+int main(void) {
+    exit(0);
+}
+#endif
diff --git a/recipes/core/relibc/tests/example_dir/1-never-gonna-give-you-up b/recipes/core/relibc/tests/example_dir/1-never-gonna-give-you-up
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/example_dir/2-never-gonna-let-you-down b/recipes/core/relibc/tests/example_dir/2-never-gonna-let-you-down
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/example_dir/3-never-gonna-run-around b/recipes/core/relibc/tests/example_dir/3-never-gonna-run-around
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/example_dir/4-and-desert-you b/recipes/core/relibc/tests/example_dir/4-and-desert-you
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/example_dir/5-never-gonna-make-you-cry b/recipes/core/relibc/tests/example_dir/5-never-gonna-make-you-cry
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/example_dir/6-never-gonna-say-goodbye b/recipes/core/relibc/tests/example_dir/6-never-gonna-say-goodbye
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/example_dir/7-never-gonna-tell-a-lie b/recipes/core/relibc/tests/example_dir/7-never-gonna-tell-a-lie
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/example_dir/8-and-hurt-you b/recipes/core/relibc/tests/example_dir/8-and-hurt-you
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/alloca.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/alloca.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/alloca.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/alloca.stdout
new file mode 100644
index 0000000000..d0a7d827f2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/alloca.stdout
@@ -0,0 +1 @@
+AAAAAAAAAAAAAAAA
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/args.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/args.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/args.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/args.stdout
new file mode 100644
index 0000000000..deefb2f3da
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/args.stdout
@@ -0,0 +1 @@
+test args 
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/arpainet.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/arpainet.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/arpainet.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/arpainet.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/assert.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/assert.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/assert.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/assert.stdout
new file mode 100644
index 0000000000..028678d987
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/assert.stdout
@@ -0,0 +1,2 @@
+yay!
+groovy!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/constructor.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/constructor.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/constructor.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/constructor.stdout
new file mode 100644
index 0000000000..14e23d4cbb
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/constructor.stdout
@@ -0,0 +1,6 @@
+constructor (101)
+constructor (102)
+constructor (103)
+constructor (104)
+constructor (no priority)
+main
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/blowfish.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/blowfish.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/blowfish.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/blowfish.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/md5.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/md5.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/md5.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/md5.stdout
new file mode 100644
index 0000000000..f985b46aff
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/md5.stdout
@@ -0,0 +1 @@
+Success!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/pbkdf2.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/pbkdf2.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/pbkdf2.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/pbkdf2.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/scrypt.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/scrypt.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/scrypt.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/scrypt.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/sha256.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/sha256.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/sha256.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/sha256.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/sha512.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/sha512.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/crypt/sha512.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/crypt/sha512.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/ctype.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/ctype.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/ctype.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/ctype.stdout
new file mode 100644
index 0000000000..e83b1e5f11
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/ctype.stdout
@@ -0,0 +1 @@
+Success: 0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/destructor.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/destructor.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/destructor.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/destructor.stdout
new file mode 100644
index 0000000000..1da7c29706
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/destructor.stdout
@@ -0,0 +1,6 @@
+main
+destructor (no priority)
+destructor (104)
+destructor (103)
+destructor (102)
+destructor (101)
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/dirent/fdopendir.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/dirent/fdopendir.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/dirent/fdopendir.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/dirent/fdopendir.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/dirent/scandir.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/dirent/scandir.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/dirent/scandir.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/dirent/scandir.stdout
new file mode 100644
index 0000000000..4820bea846
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/dirent/scandir.stdout
@@ -0,0 +1,7 @@
+1-never-gonna-give-you-up
+2-never-gonna-let-you-down
+4-and-desert-you
+5-never-gonna-make-you-cry
+6-never-gonna-say-goodbye
+7-never-gonna-tell-a-lie
+8-and-hurt-you
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/dlfcn.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/dlfcn.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/dlfcn.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/dlfcn.stdout
new file mode 100644
index 0000000000..5b51826bea
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/dlfcn.stdout
@@ -0,0 +1,6 @@
+add(22, 33) = 55
+puts from dlopened libc
+sharedlib: global_var == 42
+sharedlib: tls_var == 21
+main: global_var == 42
+main: tls_var == 21
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/dlopen_scopes.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/dlopen_scopes.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/dlopen_scopes.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/dlopen_scopes.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/err.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/err.stderr
new file mode 100644
index 0000000000..b79d9c196f
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/err.stderr
@@ -0,0 +1,6 @@
+err: Ran out of coffee: Owner died
+err: Cat pulled out your ethernet cable
+err: Eat 42 cookies: Permission denied
+err: Potato, krumpli: Invalid exchange
+err: I'm sorry, Dave. I'm afraid I can't do that.: Operation not permitted
+err: Bye. It's crowded.: Too many users
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/err.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/err.stdout
new file mode 100644
index 0000000000..8ef72cb5bc
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/err.stdout
@@ -0,0 +1,2 @@
+err: Dang it, Bobby.: No such file or directory
+Exiting due to error code: 87
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/errno.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/errno.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/errno.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/errno.stdout
new file mode 100644
index 0000000000..58419805ea
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/errno.stdout
@@ -0,0 +1,136 @@
+E2BIG macro available
+EACCES macro available
+EADDRINUSE macro available
+EADDRNOTAVAIL macro available
+EADV macro available
+EAFNOSUPPORT macro available
+EAGAIN macro available
+EALREADY macro available
+EBADE macro available
+EBADF macro available
+EBADFD macro available
+EBADMSG macro available
+EBADR macro available
+EBADRQC macro available
+EBADSLT macro available
+EBFONT macro available
+EBUSY macro available
+ECANCELED macro available
+ECHILD macro available
+ECHRNG macro available
+ECOMM macro available
+ECONNABORTED macro available
+ECONNREFUSED macro available
+ECONNRESET macro available
+EDEADLK macro available
+EDEADLOCK macro available
+EDESTADDRREQ macro available
+EDOM macro available
+EDOTDOT macro available
+EDQUOT macro available
+EEXIST macro available
+EFAULT macro available
+EFBIG macro available
+EHOSTDOWN macro available
+EHOSTUNREACH macro available
+EIDRM macro available
+EILSEQ macro available
+EINPROGRESS macro available
+EINTR macro available
+EINVAL macro available
+EIO macro available
+EISCONN macro available
+EISDIR macro available
+EISNAM macro available
+EKEYEXPIRED macro available
+EKEYREJECTED macro available
+EKEYREVOKED macro available
+EL2HLT macro available
+EL2NSYNC macro available
+EL3HLT macro available
+EL3RST macro available
+ELIBACC macro available
+ELIBBAD macro available
+ELIBEXEC macro available
+ELIBMAX macro available
+ELIBSCN macro available
+ELNRNG macro available
+ELOOP macro available
+EMEDIUMTYPE macro available
+EMFILE macro available
+EMLINK macro available
+EMSGSIZE macro available
+EMULTIHOP macro available
+ENAMETOOLONG macro available
+ENAVAIL macro available
+ENETDOWN macro available
+ENETRESET macro available
+ENETUNREACH macro available
+ENFILE macro available
+ENOANO macro available
+ENOBUFS macro available
+ENOCSI macro available
+ENODATA macro available
+ENODEV macro available
+ENOENT macro available
+ENOEXEC macro available
+ENOKEY macro available
+ENOLCK macro available
+ENOLINK macro available
+ENOMEDIUM macro available
+ENOMEM macro available
+ENOMSG macro available
+ENONET macro available
+ENOPKG macro available
+ENOPROTOOPT macro available
+ENOSPC macro available
+ENOSR macro available
+ENOSTR macro available
+ENOSYS macro available
+ENOTBLK macro available
+ENOTCONN macro available
+ENOTDIR macro available
+ENOTEMPTY macro available
+ENOTNAM macro available
+ENOTRECOVERABLE macro available
+ENOTSOCK macro available
+ENOTSUP macro available
+ENOTTY macro available
+ENOTUNIQ macro available
+ENXIO macro available
+EOPNOTSUPP macro available
+EOVERFLOW macro available
+EOWNERDEAD macro available
+EPERM macro available
+EPFNOSUPPORT macro available
+EPIPE macro available
+EPROTO macro available
+EPROTONOSUPPORT macro available
+EPROTOTYPE macro available
+ERANGE macro available
+EREMCHG macro available
+EREMOTE macro available
+EREMOTEIO macro available
+ERESTART macro available
+EROFS macro available
+ESHUTDOWN macro available
+ESOCKTNOSUPPORT macro available
+ESPIPE macro available
+ESRCH macro available
+ESRMNT macro available
+ESTALE macro available
+ESTRPIPE macro available
+ETIME macro available
+ETIMEDOUT macro available
+ETOOMANYREFS macro available
+ETXTBSY macro available
+EUCLEAN macro available
+EUNATCH macro available
+EUSERS macro available
+EWOULDBLOCK macro available
+EXDEV macro available
+EXFULL macro available
+errno
+changed to argv[0]
+changed to program_invocation_name
+changed to program_invocation_short_name
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/error.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/error.stderr
new file mode 100644
index 0000000000..4eb19d82f3
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/error.stderr
@@ -0,0 +1 @@
+perror: No such file or directory
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/error.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/error.stdout
new file mode 100644
index 0000000000..4e744d1bfb
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/error.stdout
@@ -0,0 +1,4 @@
+errno: 2 = No such file or directory
+errno: 2 = No such file or directory, return: 0
+errno: 2 = No, return: 34
+errno: 2 = , return: 34
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/create.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/create.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/create.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/create.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/fcntl.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/fcntl.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/fcntl.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/fcntl.stdout
new file mode 100644
index 0000000000..4fb8e07602
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/fcntl.stdout
@@ -0,0 +1 @@
+duped fd is 1 greater than the original fd
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/open.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/open.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/open.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/open.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/posix_fallocate.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/posix_fallocate.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/posix_fallocate.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/fcntl/posix_fallocate.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fnmatch.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/fnmatch.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/fnmatch.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/fnmatch.stdout
new file mode 100644
index 0000000000..48ba8aef2e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/fnmatch.stdout
@@ -0,0 +1,32 @@
+Should succeed:
+"*World" matches "Hello World"
+"*World" matches "World"
+"Hello*" matches "Hello World"
+"H[ae]llo?World" matches "Hallo+World"
+"H[ae]llo?World" matches "Hello_World"
+"[0-9][!a]" matches "1b"
+"/a/*/d" matches "/a/b/c/d"
+"/a/*/d" matches "/a/bc/d"
+"*hello" matches ".hello"
+"/*hello" matches "/.hello"
+"[a!][a!]" matches "!a"
+"[\]]" matches "]"
+"[\\]" matches "\"
+"hello[/+]world" matches "hello/world"
+"hello world" matches "HELLO WORLD"
+
+Should fail:
+"*World" doesn't match "Hello Potato"
+"*World" doesn't match "Potato"
+"H[ae]llo?World" doesn't match "Hillo+World"
+"H[ae]llo?World" doesn't match "Hello__World"
+"[0-9][!a]" doesn't match "ab"
+"[0-9][!a]" doesn't match "2a"
+"/a/*/d" doesn't match "/a/b/c/d"
+"/a/*/d" doesn't match "/a/bc/d/"
+"*hello" doesn't match ".hello"
+"/*hello" doesn't match "/.hello"
+"[a!][a!]" doesn't match "ab"
+"hello[/+]world" doesn't match "hello/world"
+"hello world" doesn't match "HELLO WORLD"
+"********************a" doesn't match "xxxxxxxxxxxxxxxxxxxxb"
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/futimens.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/futimens.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/futimens.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/futimens.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/iso646.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/iso646.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/iso646.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/iso646.stdout
new file mode 100644
index 0000000000..5f8a399fe8
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/iso646.stdout
@@ -0,0 +1,33 @@
+0 and 0: 0
+1 and 0: 0
+0 and 1: 0
+1 and 1: 1
+0 and_eq 0: 0
+1 and_eq 0: 0
+0 and_eq 1: 0
+1 and_eq 1: 1
+a bitand b: 8
+a bitor b: 14
+compl a: 245
+not 0: 1
+not 1: 0
+0 not_eq 0: 0
+1 not_eq 0: 1
+0 not_eq 1: 0
+1 not_eq 1: 1
+0 or 0: 0
+1 or 0: 1
+0 or 1: 1
+1 or 1: 1
+0 or_eq 0: 0
+1 or_eq 0: 1
+0 or_eq 1: 1
+1 or_eq 1: 1
+0 xor 0: 0
+1 xor 0: 1
+0 xor 1: 1
+1 xor 1: 0
+0 xor_eq 0: 0
+1 xor_eq 0: 1
+0 xor_eq 1: 1
+1 xor_eq 1: 0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/libgen.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/libgen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/libgen.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/libgen.stdout
new file mode 100644
index 0000000000..6e32d2008d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/libgen.stdout
@@ -0,0 +1,21 @@
+dirname("") == "."
+basename("") == "."
+dirname(".") == "."
+basename(".") == "."
+dirname("..") == "."
+basename("..") == ".."
+dirname("/") == "/"
+basename("/") == "/"
+dirname("///") == "/"
+basename("///") == "/"
+dirname("//usr//lib//") == "//usr"
+basename("//usr//lib//") == "lib"
+dirname("/usr") == "/"
+basename("/usr") == "usr"
+dirname("/usr/") == "/"
+basename("/usr/") == "usr"
+dirname("/usr/lib") == "/usr"
+basename("/usr/lib") == "lib"
+dirname(NULL) == "."
+basename(NULL) == "."
+Success: 0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/locale/duplocale.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/locale/duplocale.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/locale/duplocale.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/locale/duplocale.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/locale/newlocale.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/locale/newlocale.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/locale/newlocale.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/locale/newlocale.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/locale/setlocale.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/locale/setlocale.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/locale/setlocale.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/locale/setlocale.stdout
new file mode 100644
index 0000000000..5d516f2e6d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/locale/setlocale.stdout
@@ -0,0 +1 @@
+success!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/malloc/usable_size.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/malloc/usable_size.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/malloc/usable_size.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/malloc/usable_size.stdout
new file mode 100644
index 0000000000..4188b67b66
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/malloc/usable_size.stdout
@@ -0,0 +1,2 @@
+malloc: 27 bytes
+malloc_usable_size: 48 bytes
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/math.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/math.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/math.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/math.stdout
new file mode 100644
index 0000000000..8654177967
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/math.stdout
@@ -0,0 +1 @@
+cos(3.140000) = -0.999999
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/mkfifo.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/mkfifo.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/mkfifo.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/mkfifo.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/mknod.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/mknod.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/mknod.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/mknod.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/mknodat.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/mknodat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/mknodat.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/mknodat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/netdb/getaddrinfo.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/netdb/getaddrinfo.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/netdb/getaddrinfo.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/netdb/getaddrinfo.stdout
new file mode 100644
index 0000000000..6bc12bb59b
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/netdb/getaddrinfo.stdout
@@ -0,0 +1 @@
+IPv4 address: 23.21.162.66 (www.redox-os.org)
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/ptrace.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/ptrace.stderr
new file mode 100644
index 0000000000..289c82a876
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/ptrace.stderr
@@ -0,0 +1,4 @@
+This is printed to STDOUT.
+Or, at least, that's what I thought.
+But all write(...) syscalls are actually redirected to STDERR by the tracer.
+Big surprise, right!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/ptrace.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/ptrace.stdout
new file mode 100644
index 0000000000..824e89accd
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/ptrace.stdout
@@ -0,0 +1,5 @@
+Set regs
+Set regs
+Set regs
+Set regs
+Child exited with status 0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/pty/forkpty.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/pty/forkpty.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/pty/forkpty.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/pty/forkpty.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/regex.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/regex.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/regex.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/regex.stdout
new file mode 100644
index 0000000000..07caf6fc01
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/regex.stdout
@@ -0,0 +1,3 @@
+Matching group: 25 - 36
+Matching group: 31 - 36
+Matching group: -1 - -1
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/select.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/select.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/select.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/select.stdout
new file mode 100644
index 0000000000..a4a5b784a2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/select.stdout
@@ -0,0 +1,8 @@
+Testing select on file
+Is set before? 1
+Amount of things ready: 1
+Is set after? 1
+Testing select on pipe
+Is set before? 1
+Amount of things ready: 1
+Is set after? 1
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/setjmp.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/setjmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/setjmp.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/setjmp.stdout
new file mode 100644
index 0000000000..c7e6bcddd8
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/setjmp.stdout
@@ -0,0 +1,2 @@
+jumping...
+hi from jump
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sigaction.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/sigaction.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sigaction.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sigaction.stdout
new file mode 100644
index 0000000000..8a6d2448ef
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sigaction.stdout
@@ -0,0 +1,5 @@
+Raising...
+Signal handler1 called!
+Raising...
+Signal handler2 called!
+Raised.
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sigaltstack.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/sigaltstack.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sigaltstack.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sigaltstack.stdout
new file mode 100644
index 0000000000..be1dfac342
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sigaltstack.stdout
@@ -0,0 +1,101 @@
+SIGUSR2 handler00
+SIGUSR2 handler01
+SIGUSR2 handler02
+SIGUSR2 handler03
+SIGUSR2 handler04
+SIGUSR2 handler05
+SIGUSR2 handler06
+SIGUSR2 handler07
+SIGUSR2 handler08
+SIGUSR2 handler09
+SIGUSR2 handler10
+SIGUSR2 handler11
+SIGUSR2 handler12
+SIGUSR2 handler13
+SIGUSR2 handler14
+SIGUSR2 handler15
+SIGUSR2 handler16
+SIGUSR2 handler17
+SIGUSR2 handler18
+SIGUSR2 handler19
+SIGUSR2 handler20
+SIGUSR2 handler21
+SIGUSR2 handler22
+SIGUSR2 handler23
+SIGUSR2 handler24
+SIGUSR2 handler25
+SIGUSR2 handler26
+SIGUSR2 handler27
+SIGUSR2 handler28
+SIGUSR2 handler29
+SIGUSR2 handler30
+SIGUSR2 handler31
+SIGUSR2 handler32
+SIGUSR2 handler33
+SIGUSR2 handler34
+SIGUSR2 handler35
+SIGUSR2 handler36
+SIGUSR2 handler37
+SIGUSR2 handler38
+SIGUSR2 handler39
+SIGUSR2 handler40
+SIGUSR2 handler41
+SIGUSR2 handler42
+SIGUSR2 handler43
+SIGUSR2 handler44
+SIGUSR2 handler45
+SIGUSR2 handler46
+SIGUSR2 handler47
+SIGUSR2 handler48
+SIGUSR2 handler49
+SIGUSR2 handler50
+SIGUSR2 handler51
+SIGUSR2 handler52
+SIGUSR2 handler53
+SIGUSR2 handler54
+SIGUSR2 handler55
+SIGUSR2 handler56
+SIGUSR2 handler57
+SIGUSR2 handler58
+SIGUSR2 handler59
+SIGUSR2 handler60
+SIGUSR2 handler61
+SIGUSR2 handler62
+SIGUSR2 handler63
+SIGUSR2 handler64
+SIGUSR2 handler65
+SIGUSR2 handler66
+SIGUSR2 handler67
+SIGUSR2 handler68
+SIGUSR2 handler69
+SIGUSR2 handler70
+SIGUSR2 handler71
+SIGUSR2 handler72
+SIGUSR2 handler73
+SIGUSR2 handler74
+SIGUSR2 handler75
+SIGUSR2 handler76
+SIGUSR2 handler77
+SIGUSR2 handler78
+SIGUSR2 handler79
+SIGUSR2 handler80
+SIGUSR2 handler81
+SIGUSR2 handler82
+SIGUSR2 handler83
+SIGUSR2 handler84
+SIGUSR2 handler85
+SIGUSR2 handler86
+SIGUSR2 handler87
+SIGUSR2 handler88
+SIGUSR2 handler89
+SIGUSR2 handler90
+SIGUSR2 handler91
+SIGUSR2 handler92
+SIGUSR2 handler93
+SIGUSR2 handler94
+SIGUSR2 handler95
+SIGUSR2 handler96
+SIGUSR2 handler97
+SIGUSR2 handler98
+SIGUSR2 handler99
+SIGUSR2 handler00
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/signal.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/signal.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/signal.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/signal.stdout
new file mode 100644
index 0000000000..7d184e34c8
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/signal.stdout
@@ -0,0 +1,3 @@
+Raising...
+Signal handler called!
+Raised.
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sigsetjmp.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/sigsetjmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sigsetjmp.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sigsetjmp.stdout
new file mode 100644
index 0000000000..eb99a60c8e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sigsetjmp.stdout
@@ -0,0 +1,2 @@
+Starting jump...
+Jump done.
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/all.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/all.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/all.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/all.stdout
new file mode 100644
index 0000000000..92881132c2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/all.stdout
@@ -0,0 +1,4 @@
+H
+Jello World!
+
+Hello
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/buffer.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/buffer.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/buffer.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/buffer.stdout
new file mode 100644
index 0000000000..4b124bc7c0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/buffer.stdout
@@ -0,0 +1,5 @@
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTest
+Hello
+World
+It works
+No buffering issues here
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/dprintf.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/dprintf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/dprintf.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/dprintf.stdout
new file mode 100644
index 0000000000..e12bc872a0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/dprintf.stdout
@@ -0,0 +1,2 @@
+Hello, world
+a
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fgets.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fgets.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fgets.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fgets.stdout
new file mode 100644
index 0000000000..a856e2de52
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fgets.stdout
@@ -0,0 +1,31 @@
+Hello World!
+
+Line 2
+
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
+hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
+qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
+uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
+vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
+zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
+EOF
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fputs.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fputs.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fputs.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fputs.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fread.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fread.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fread.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fread.stdout
new file mode 100644
index 0000000000..f3fbf213be
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fread.stdout
@@ -0,0 +1,32 @@
+1
+22
+333
+4444
+55555
+666666
+7777777
+88888888
+999999999
+AAAAAAAAAA
+BBBBBBBBBBB
+CCCCCCCCCCCC
+DDDDDDDDDDDDD
+EEEEEEEEEEEEEE
+FFFFFFFFFFFFFFF
+0000000000000000
+11111111111111111
+222222222222222222
+3333333333333333333
+44444444444444444444
+555555555555555555555
+6666666666666666666666
+77777777777777777777777
+888888888888888888888888
+9999999999999999999999999
+AAAAAAAAAAAAAAAAAAAAAAAAAA
+BBBBBBBBBBBBBBBBBBBBBBBBBBB
+CCCCCCCCCCCCCCCCCCCCCCCCCCCC
+DDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+00000000000000000000000000000000
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/freopen.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/freopen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/freopen.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/freopen.stdout
new file mode 100644
index 0000000000..1dd338fd1a
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/freopen.stdout
@@ -0,0 +1,3 @@
+Hello
+0
+0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf.stdout
new file mode 100644
index 0000000000..73f11e68cf
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf.stdout
@@ -0,0 +1,14 @@
+1 2 3 9
+9
+16
+35
+48
+92
+109
+152
+201
+241
+276
+293
+299
+301
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf_offby1.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf_offby1.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf_offby1.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf_offby1.stdout
new file mode 100644
index 0000000000..daf724a9e5
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fscanf_offby1.stdout
@@ -0,0 +1 @@
+1234, 7, 32
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fseek.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fseek.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fseek.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fseek.stdout
new file mode 100644
index 0000000000..b6163b2663
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fseek.stdout
@@ -0,0 +1,2 @@
+Line 2
+ftello: 21
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fwrite.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fwrite.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fwrite.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/fwrite.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getc_unget.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getc_unget.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getc_unget.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getc_unget.stdout
new file mode 100644
index 0000000000..f01a3f968d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getc_unget.stdout
@@ -0,0 +1 @@
+Worked!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getline.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getline.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getline.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getline.stdout
new file mode 100644
index 0000000000..ba753ef6b2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/getline.stdout
@@ -0,0 +1,41 @@
+  1: getline(NULL, NULL, stream)
+     => 22 (Invalid argument) - EINVAL
+  2: getline(NULL, &n, stream)
+     => 22 (Invalid argument) - EINVAL
+  3: getline(&lineptr, NULL, stream)
+     => 22 (Invalid argument) - EINVAL
+  4: getline(NULL, NULL, NULL)
+     => 22 (Invalid argument) - EINVAL
+  5: getline(&lineptr, NULL, NULL)
+     => 22 (Invalid argument) - EINVAL
+  6: getline(NULL, &n, NULL)
+     => 22 (Invalid argument) - EINVAL
+  7: getline(&lineptr, &n, NULL)
+     => 22 (Invalid argument) - EINVAL
+  8: getdelim(&lineptr, &n, 25600, stream)
+     => 22 (Invalid argument) - EINVAL
+
+  1: status = 27, strlen = 27, feof = 0, ferror = 0
+     |>Space: the final frontier.
+  2: status = 1, strlen = 1, feof = 0, ferror = 0
+     |>
+  3: status = 50, strlen = 50, feof = 0, ferror = 0
+     |>These are the voyages of the starship Enterprise.
+  4: status = 24, strlen = 24, feof = 0, ferror = 0
+     |>Its continuing mission:
+  5: status = 33, strlen = 33, feof = 0, ferror = 0
+     |>- to explore strange new worlds;
+  6: status = 46, strlen = 46, feof = 0, ferror = 0
+     |>- to seek out new life and new civilizations;
+  7: status = 45, strlen = 45, feof = 0, ferror = 0
+     |>- to boldly go where no one has gone before!
+
+overread 1, status = -1, feof = 1, ferror = 0
+|~- to boldly go where no one has gone before!
+
+overread 2, status = -1, feof = 1, ferror = 0
+|~- to boldly go where no one has gone before!
+
+overread 3, status = -1, feof = 1, ferror = 0
+|~- to boldly go where no one has gone before!
+
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/mutex.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/mutex.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/mutex.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/mutex.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/popen.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/popen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/popen.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/popen.stdout
new file mode 100644
index 0000000000..05f7216cbe
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/popen.stdout
@@ -0,0 +1,8 @@
+Line 1: 1-never-gonna-give-you-up
+Line 2: 2-never-gonna-let-you-down
+Line 3: 3-never-gonna-run-around
+Line 4: 4-and-desert-you
+Line 5: 5-never-gonna-make-you-cry
+Line 6: 6-never-gonna-say-goodbye
+Line 7: 7-never-gonna-tell-a-lie
+Line 8: 8-and-hurt-you
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf.stdout
new file mode 100644
index 0000000000..a13543aeb2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf.stdout
@@ -0,0 +1,78 @@
+percent: %
+string: String
+char: c
+char: �
+int: -16
+uint: 32
+hex: beef
+HEX: C0FFEE
+string: end
+%n returned 51, total len of write: 94
+
+Padding madness:
+ 001   +2
+   c
+ 0x00000ff
+ 001
+0 0x1
+ 1
+(00123) (  123)
+(-0123) ( -123)
+(             )
+0xabcdef
+(nil)
+
+Positional madness:
+4 3 2
+00002
+|Fiz     |Buz     |     Fiz|     Tot|
+int:          5 double: 0.100000 0.200000 0.300000 0.400000
+-1717986918 0.100000
+-1717986918 0.200000
+
+Float madness:
+        1.234568e+02
+        1.000000E-05
+          123.456789
+            0.000010
+       -1.234568e+02
+-00000001.234568e+02
+%.5g: -123.46
+%.5f: -123.45679
+%.5e: -1.23457e+02
+%.*g: -1.2e+02
+%.*f: -123.46
+%.*e: -1.23e+02
+%.*2$g: -123.46
+%.*2$f: -123.45679
+%.*2$e: -1.23457e+02
+100000
+1e+06
+1.000000e+06
+0.0001
+1E-05
+1.000000E-05
+001234.56
+001234.56
+
+Non-finite float madness:
+%e: inf -inf nan -nan
+%E: INF -INF NAN -NAN
+%f: inf -inf nan -nan
+%F: INF -INF NAN -NAN
+%g: inf -inf nan -nan
+%G: INF -INF NAN -NAN
+Things that have been buggy
++05
+Testing asprintf...
+printed: test string, value: 11
+printed: test string 2, value: 13
+printed: test string 2, value: 13
+
+%m: Owner died
+
+C23:
+Binary %b: 100
+Binary %b alternate: 0b100
+Binary %B: 100
+Binary %B alternate: 0B100
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_neg_pad.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_neg_pad.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_neg_pad.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_neg_pad.stdout
new file mode 100644
index 0000000000..f573a2b6d2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_neg_pad.stdout
@@ -0,0 +1,2 @@
+A    BCC/
+AB    CC/
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_space_pad.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_space_pad.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_space_pad.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_space_pad.stdout
new file mode 100644
index 0000000000..8e9107f351
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/printf_space_pad.stdout
@@ -0,0 +1 @@
+A  B
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/putc_unlocked.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/putc_unlocked.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/putc_unlocked.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/putc_unlocked.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/rename.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/rename.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/rename.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/rename.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/renameat.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/renameat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/renameat.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/renameat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/scanf.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/scanf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/scanf.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/scanf.stdout
new file mode 100644
index 0000000000..dca295ccb5
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/scanf.stdout
@@ -0,0 +1,16 @@
+2, { sa: 12, ia: 345, ib: 0, ic: 0, fa: 0.000000, da: 0.000000, ptr: (nil), char: a, string1: , string2: , string3: , string4:  }
+3, { sa: 12, ia: 18, ib: 837, ic: 8, fa: 0.000000, da: 0.000000, ptr: (nil), char: a, string1: , string2: , string3: , string4:  }
+2, { sa: 12, ia: 18, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: (nil), char: a, string1: , string2: , string3: , string4:  }
+1, { sa: 12, ia: 18, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: a, string1: , string2: , string3: , string4:  }
+1, { sa: 12, ia: 18, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: a, string1: Hello, string2: , string3: , string4:  }
+1, { sa: 12, ia: 15, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: a, string1: Hello, string2: , string3: , string4:  }
+2, { sa: 12, ia: 15, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: elllo, string2: , string3: , string4:  }
+1, { sa: 12, ia: 0, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: elllo, string2: , string3: , string4:  }
+0, { sa: 12, ia: 0, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: elllo, string2: , string3: , string4:  }
+2, { sa: 12, ia: 42, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: world, string2: , string3: , string4:  }
+2, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: world, string2: planet, string3: , string4:  }
+4, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: e, string2: o, string3: l, string4: d }
+4, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: a, string2: e, string3: f, string4: dddddd }
+4, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: a, string2: e, string3: f, string4: dddddd }
+1, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: testbbbb, string2: e, string3: f, string4: dddddd }
+3 "https" "//" "redox-os.org" ""
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/setvbuf.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/setvbuf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/setvbuf.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/setvbuf.stdout
new file mode 100644
index 0000000000..ebda98d01a
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/setvbuf.stdout
@@ -0,0 +1,4 @@
+H
+Hello World!
+
+Hello
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/sprintf.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/sprintf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/sprintf.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/sprintf.stdout
new file mode 100644
index 0000000000..4c76b1a825
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/sprintf.stdout
@@ -0,0 +1 @@
+This stri
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_ftell.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_ftell.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_ftell.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_ftell.stdout
new file mode 100644
index 0000000000..e36f413519
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_ftell.stdout
@@ -0,0 +1,28 @@
+#, 0
+i, 1
+n, 2
+h, -9
+e, -8
+l, -7
+l, -6
+o, -5
+ , -4
+w, -3
+o, -2
+r, -1
+l, 0
+d, 1
+
+, 2
+c, 3
+l, 4
+u, 5
+d, 6
+e, 7
+ , 8
+<, 9
+s, 10
+t, 11
+d, 12
+i, 13
+o, 14
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_multiple.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_multiple.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_multiple.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_multiple.stdout
new file mode 100644
index 0000000000..3b18e512db
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdio/ungetc_multiple.stdout
@@ -0,0 +1 @@
+hello world
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/a64l.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/a64l.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/a64l.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/a64l.stdout
new file mode 100644
index 0000000000..d22f10d973
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/a64l.stdout
@@ -0,0 +1,42 @@
+Correct a64l: azAZ9. = 194301926
+Correct a64l: azA = 53222
+l64a(0): 
+l64a(1): /
+l64a(2): 0
+l64a(11): 9
+l64a(12): A
+l64a(37): Z
+l64a(38): a
+l64a(63): z
+l64a(64): ./
+l64a(65): //
+l64a(4095): zz
+l64a(4096): ../
+l64a(262143): zzz
+l64a(262144): .../
+l64a(16777215): zzzz
+l64a(16777216): ..../
+l64a(1073741823): zzzzz
+l64a(1073741824): ...../
+l64a(2147483647): zzzzz/
+a64l(l64a(0)): 0
+a64l(l64a(1)): 1
+a64l(l64a(2)): 2
+a64l(l64a(11)): 11
+a64l(l64a(12)): 12
+a64l(l64a(37)): 37
+a64l(l64a(38)): 38
+a64l(l64a(63)): 63
+a64l(l64a(64)): 64
+a64l(l64a(65)): 65
+a64l(l64a(4095)): 4095
+a64l(l64a(4096)): 4096
+a64l(l64a(262143)): 262143
+a64l(l64a(262144)): 262144
+a64l(l64a(16777215)): 16777215
+a64l(l64a(16777216)): 16777216
+a64l(l64a(1073741823)): 1073741823
+a64l(l64a(1073741824)): 1073741824
+a64l(l64a(2147483647)): 2147483647
+l64a(x) (lower 32 bits of x are 1985229328): E61Jq/
+a64l(l64a(x)) (lower 32 bits of x are 1985229328): 1985229328
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/alloc.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/alloc.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/alloc.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/alloc.stdout
new file mode 100644
index 0000000000..d5bc92dc00
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/alloc.stdout
@@ -0,0 +1,30 @@
+malloc (size 0): (OK)
+malloc: pointer: (not NULL), error value: 0 = Success
+malloc (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+calloc (size 0): (OK)
+calloc: pointer: (not NULL), error value: 0 = Success
+calloc (overflowing): pointer: (nil), error value: 12 = Out of memory
+realloc (size 0): (OK)
+realloc: pointer: (not NULL), error value: 0 = Success
+realloc (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+reallocarray: pointer: (not NULL), error value: 0 = Success
+reallocarray (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+memalign (size 0): (OK)
+memalign: pointer: (alignment OK), error value: 0 = Success
+memalign (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+memalign (alignment 0): pointer: (nil), error value: 22 = Invalid argument
+memalign (alignment 3): pointer: (nil), error value: 22 = Invalid argument
+aligned_alloc (size % alignment == 0): pointer: (alignment OK), error value: 0 = Success
+aligned_alloc (size % alignment != 0): pointer: (nil), error value: 22 = Invalid argument
+valloc (size 0): (OK)
+valloc: pointer: (alignment OK), error value: 0 = Success
+valloc (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+posix_memalign: pointer: (alignment OK), error value: 0 = Success
+posix_memalign (alignment 0): pointer: (nil), error value: 22 = Invalid argument
+posix_memalign (non-power-of-two multiple of sizeof(void *)): pointer: (nil), error value: 22 = Invalid argument
+posix_memalign (size 0): (OK)
+posix_memalign (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+pvalloc (size 0): (OK)
+pvalloc: pointer: (alignment OK), error value: 0 = Success
+pvalloc (2 pages): pointer: (alignment OK), error value: 0 = Success
+pvalloc (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atof.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atof.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atof.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atof.stdout
new file mode 100644
index 0000000000..3227d85385
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atof.stdout
@@ -0,0 +1,2 @@
+-3.140000
+inf
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atoi.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atoi.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atoi.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atoi.stdout
new file mode 100644
index 0000000000..d90e37ccea
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/atoi.stdout
@@ -0,0 +1,6 @@
+-42
+555
+1234567890
+-42
+555
+1234567890
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/div.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/div.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/div.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/div.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/env.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/env.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/env.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/env.stdout
new file mode 100644
index 0000000000..a0596ab55e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/env.stdout
@@ -0,0 +1,8 @@
+It's working!!
+Updates accordingly.
+in place
+TEST=in place
+Value overwritten and not in place because it's really long
+TEST=in place
+Value overwritten and not in place because it's really long
+Value deleted successfully!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/getsubopt.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/getsubopt.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/getsubopt.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/getsubopt.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/mkostemps.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/mkostemps.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/mkostemps.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/mkostemps.stdout
new file mode 100644
index 0000000000..f3562f6879
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/mkostemps.stdout
@@ -0,0 +1,3 @@
+Start unchanged: 0
+End unchanged: 0
+Read & Write Successful
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/ptsname.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/ptsname.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/ptsname.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/ptsname.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/qsort.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/qsort.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/qsort.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/qsort.stdout
new file mode 100644
index 0000000000..49755a611e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/qsort.stdout
@@ -0,0 +1,2 @@
+Before: 23 16 8 4 42 15 
+After: 4 8 15 16 23 42 
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand.stdout
new file mode 100644
index 0000000000..2a50461db2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand.stdout
@@ -0,0 +1,8 @@
+67141780
+201425341
+201425341
+67141780
+264204
+271585844
+264204
+271585844
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand48.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand48.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand48.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand48.stdout
new file mode 100644
index 0000000000..fa871030ba
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/rand48.stdout
@@ -0,0 +1,14 @@
+lrand48 (uninitialized): 0 2116118 89401895 379337186 782977366 196130996 198207689 1046291021 1131187612 975888346
+drand48 (seeded with srand48): 0.750266 0.607593 0.567593 0.799563 0.984984 0.205670 0.625922 0.794426 0.369416 0.854100
+lrand48 (seeded with srand48): 1611183183 1304796356 1218897288 1717049088 2115236938 441672110 1344158015 1706017430 793314380 1834165927
+mrand48 (seeded with srand48): -1072600929 -1685374584 -1857172720 -860869119 -64493420 883344220 -1606651266 -882932436 1586628760 -626635441
+erand48: 0.210555 0.014158 0.111353 0.658369 0.103767 0.180385 0.945033 0.745768 0.290272 0.111716
+nrand48: 514983590 590935818 1480794144 1496813112 2133865028 1816766485 2095074020 126058208 909762120 14734916
+jrand48: -1066398599 903693914 -1922375113 -2090140830 1218074962 1662411059 -722435322 764426686 -874142666 -1454656015
+seed48_return: [40c0, 4d4f, daa6]
+lrand48 (seeded with seed48): 386486647 2049879217 706208537 1265096744 1586830881 1884641178 1566935266 1256810805 875501172 1670187935
+xsubi restored froom seed48 return value: [40c0, 4d4f, daa6]
+nrand48 (from xsubi value returned by seed48): 1654466549 509433115 2007628085 1022767111 1935848687 967444157 1967758021 686622820 989863078 1688030308
+lrand48 (with parameters from lcong48): 2015972364 2009368981 971134301 317520085 149004773 538917235 242519436 1066970146 991527304 1588277058
+lrand48 (seeded with srand48 after lcong48 call): 1611183183 1304796356 1218897288 1717049088 2115236938 441672110 1344158015 1706017430 793314380 1834165927
+lrand48 (seeded with seed48 after lcong48 call): 386486647 2049879217 706208537 1265096744 1586830881 1884641178 1566935266 1256810805 875501172 1670187935
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/random.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/random.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/random.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/random.stdout
new file mode 100644
index 0000000000..9a754a9eb6
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/random.stdout
@@ -0,0 +1,1011 @@
+Uninitialized:
+262836907
+2022765545
+1985587709
+1559253607
+547725525
+1277054513
+317849018
+1695317205
+643446864
+1262735440
+964614733
+622582094
+280266812
+1939173898
+732650777
+1270232897
+336669216
+1669264236
+554325996
+1080138202
+1193538846
+2016671310
+1114491314
+2115358120
+2122955106
+982493572
+450262557
+439534734
+1723376538
+2066693252
+901041
+1986213445
+1941975150
+1986488750
+1397983404
+342217027
+1116059615
+1715832423
+2037534232
+1759506479
+831084215
+854665318
+234604926
+1111351027
+646355568
+967255703
+234100276
+983024785
+489036291
+788426273
+2063162987
+1682575137
+657613935
+1030170653
+1650449610
+633085394
+2012664225
+2100712167
+1072620128
+1588557116
+2019921771
+1073521169
+1427286913
+1814413273
+912526271
+677786670
+9146653
+2028585886
+246135445
+2046680885
+
+Seed 1:
+262836907
+2022765545
+1985587709
+1559253607
+547725525
+1277054513
+317849018
+1695317205
+643446864
+1262735440
+964614733
+622582094
+280266812
+1939173898
+732650777
+1270232897
+336669216
+1669264236
+554325996
+1080138202
+1193538846
+2016671310
+1114491314
+2115358120
+2122955106
+982493572
+450262557
+439534734
+1723376538
+2066693252
+901041
+1986213445
+1941975150
+1986488750
+1397983404
+342217027
+1116059615
+1715832423
+2037534232
+1759506479
+831084215
+854665318
+234604926
+1111351027
+646355568
+967255703
+234100276
+983024785
+489036291
+788426273
+2063162987
+1682575137
+657613935
+1030170653
+1650449610
+633085394
+2012664225
+2100712167
+1072620128
+1588557116
+2019921771
+1073521169
+1427286913
+1814413273
+912526271
+677786670
+9146653
+2028585886
+246135445
+2046680885
+
+Seed 1337:
+1124688561
+1792831582
+1708122057
+1060061055
+2060905921
+703006049
+867046930
+1599327113
+1946461956
+1851068511
+2107308161
+1080994526
+361067458
+2035914970
+1577981791
+72922558
+783590643
+1752267570
+1350489214
+1338091804
+225460930
+62532035
+540341638
+1391100769
+1535109757
+2039272559
+206716062
+1139547941
+462353593
+1176324546
+1766476968
+1587042155
+821672480
+1327115377
+499619562
+735094753
+2030121427
+1366666492
+186938219
+1829099735
+1070251355
+146762732
+762610613
+1431318813
+35194054
+193108756
+1504241371
+818784698
+1945376326
+707246937
+9392854
+23353608
+769778973
+549734493
+1414454377
+157405082
+441523404
+1621170440
+1296953024
+903876997
+650011338
+915946344
+343435504
+1471683818
+95578073
+843055066
+59294924
+2125699500
+62237911
+246233143
+
+Seed 42, size 8:
+1250496027
+1116302264
+1000676753
+1668674806
+908095735
+71666532
+896336333
+1736731266
+1314989459
+1535244752
+391441865
+1108520142
+1206814703
+534045436
+1974836613
+238077914
+1413854219
+705377000
+397905153
+1440974758
+1972995559
+282367380
+881784893
+1823504434
+879663491
+70219520
+1215814457
+1726604670
+318196447
+1939145516
+1030877685
+968547210
+1513076219
+1793402392
+1673312369
+1341335126
+481933015
+1376947140
+1980983981
+529748450
+192473459
+2072944688
+631833769
+202943022
+2012129743
+762679132
+1776566885
+562641722
+542512107
+293225800
+266051553
+1950339334
+562037703
+932343284
+1167153437
+829945746
+711923043
+392328544
+485452313
+748288734
+1303618751
+1013548940
+1115918037
+1967580906
+210226651
+149786744
+1677411153
+1109690294
+2007723191
+1000815652
+
+Seed 42, size 31:
+1250496027
+1116302264
+1000676753
+1668674806
+908095735
+71666532
+896336333
+1736731266
+1314989459
+1535244752
+391441865
+1108520142
+1206814703
+534045436
+1974836613
+238077914
+1413854219
+705377000
+397905153
+1440974758
+1972995559
+282367380
+881784893
+1823504434
+879663491
+70219520
+1215814457
+1726604670
+318196447
+1939145516
+1030877685
+968547210
+1513076219
+1793402392
+1673312369
+1341335126
+481933015
+1376947140
+1980983981
+529748450
+192473459
+2072944688
+631833769
+202943022
+2012129743
+762679132
+1776566885
+562641722
+542512107
+293225800
+266051553
+1950339334
+562037703
+932343284
+1167153437
+829945746
+711923043
+392328544
+485452313
+748288734
+1303618751
+1013548940
+1115918037
+1967580906
+210226651
+149786744
+1677411153
+1109690294
+2007723191
+1000815652
+
+Seed 42, size 32:
+1105844101
+1165395678
+461296413
+1259424640
+70225557
+1467961981
+315013290
+1176069659
+485874011
+776309703
+288010651
+556099569
+96788036
+603023941
+1732169228
+582662048
+1379333644
+2020179879
+1138761617
+1476121681
+475720173
+723447197
+2058783729
+1855053817
+596143428
+1050061698
+1183691850
+1071863601
+1773508895
+1094991931
+779433771
+222168675
+2145053629
+1963125621
+1294032277
+1771078876
+910633905
+2073466048
+1993247552
+908203886
+1889108021
+1139796181
+531799115
+652258278
+1065778581
+377563019
+1560462165
+807402954
+1517359200
+2092261280
+1459661233
+435654133
+322340651
+872639750
+1243057087
+1839699851
+817417382
+555234672
+127870336
+1139758033
+1427874422
+1370927423
+831974236
+97808156
+1926162096
+959844572
+1237566189
+1206552870
+183288347
+2069540425
+
+Seed 42, size 63:
+1105844101
+1165395678
+461296413
+1259424640
+70225557
+1467961981
+315013290
+1176069659
+485874011
+776309703
+288010651
+556099569
+96788036
+603023941
+1732169228
+582662048
+1379333644
+2020179879
+1138761617
+1476121681
+475720173
+723447197
+2058783729
+1855053817
+596143428
+1050061698
+1183691850
+1071863601
+1773508895
+1094991931
+779433771
+222168675
+2145053629
+1963125621
+1294032277
+1771078876
+910633905
+2073466048
+1993247552
+908203886
+1889108021
+1139796181
+531799115
+652258278
+1065778581
+377563019
+1560462165
+807402954
+1517359200
+2092261280
+1459661233
+435654133
+322340651
+872639750
+1243057087
+1839699851
+817417382
+555234672
+127870336
+1139758033
+1427874422
+1370927423
+831974236
+97808156
+1926162096
+959844572
+1237566189
+1206552870
+183288347
+2069540425
+
+Seed 42, size 64:
+2058979096
+1114567745
+1168098319
+1326828429
+585052544
+738633083
+1597984519
+103976400
+637164838
+949355699
+301019638
+1539653489
+829283131
+1994476715
+899306595
+810802043
+1925369788
+945984460
+125329241
+710381785
+1449014869
+899515740
+1003492141
+1640656979
+442529030
+743548669
+135718510
+965001641
+811994708
+1711301303
+374619698
+152505839
+1098490299
+1223819540
+1934201325
+1235732546
+2135248287
+991256780
+484430111
+926959142
+1670507811
+1806226321
+623744314
+1435739022
+999556678
+1374176376
+1526682215
+477688866
+1701508406
+1488226084
+576474982
+564239621
+1555496401
+2039926513
+819402007
+342426170
+1168843
+624913157
+2060652179
+912725209
+139417938
+1666100153
+2143789020
+1697813778
+1038556214
+1615031197
+31787170
+1587283572
+1479726437
+151644796
+
+Seed 42, size 127:
+2058979096
+1114567745
+1168098319
+1326828429
+585052544
+738633083
+1597984519
+103976400
+637164838
+949355699
+301019638
+1539653489
+829283131
+1994476715
+899306595
+810802043
+1925369788
+945984460
+125329241
+710381785
+1449014869
+899515740
+1003492141
+1640656979
+442529030
+743548669
+135718510
+965001641
+811994708
+1711301303
+374619698
+152505839
+1098490299
+1223819540
+1934201325
+1235732546
+2135248287
+991256780
+484430111
+926959142
+1670507811
+1806226321
+623744314
+1435739022
+999556678
+1374176376
+1526682215
+477688866
+1701508406
+1488226084
+576474982
+564239621
+1555496401
+2039926513
+819402007
+342426170
+1168843
+624913157
+2060652179
+912725209
+139417938
+1666100153
+2143789020
+1697813778
+1038556214
+1615031197
+31787170
+1587283572
+1479726437
+151644796
+
+Seed 42, size 128:
+1105844101
+1165395678
+461296413
+1259424640
+2024747114
+1114771942
+1792613078
+189454326
+466435881
+883763281
+1626567616
+1631629466
+1277725798
+1234887654
+657326752
+1836263319
+715263951
+471085233
+2086498417
+1163602145
+1547997976
+1405363974
+632333445
+201224285
+286947872
+1468210882
+103627486
+2147177614
+373040761
+1110293054
+1202766264
+1478884863
+128205084
+1664062677
+590825855
+5468550
+631350971
+235955286
+194922877
+1097786852
+1119718567
+1821490493
+581932670
+249960717
+908894499
+1239259422
+2086224037
+1624158450
+1710344655
+2025238806
+640276948
+1110858983
+1283119132
+1272610393
+1312083268
+1570067004
+593337627
+1415710754
+1569760970
+966378389
+378520161
+625043586
+297779604
+506725245
+141622615
+888605459
+512193796
+772973586
+1124560745
+707116673
+
+Seed 42, size 255:
+1105844101
+1165395678
+461296413
+1259424640
+2024747114
+1114771942
+1792613078
+189454326
+466435881
+883763281
+1626567616
+1631629466
+1277725798
+1234887654
+657326752
+1836263319
+715263951
+471085233
+2086498417
+1163602145
+1547997976
+1405363974
+632333445
+201224285
+286947872
+1468210882
+103627486
+2147177614
+373040761
+1110293054
+1202766264
+1478884863
+128205084
+1664062677
+590825855
+5468550
+631350971
+235955286
+194922877
+1097786852
+1119718567
+1821490493
+581932670
+249960717
+908894499
+1239259422
+2086224037
+1624158450
+1710344655
+2025238806
+640276948
+1110858983
+1283119132
+1272610393
+1312083268
+1570067004
+593337627
+1415710754
+1569760970
+966378389
+378520161
+625043586
+297779604
+506725245
+141622615
+888605459
+512193796
+772973586
+1124560745
+707116673
+
+Seed 42, size 256:
+2058979096
+1114567745
+1168098319
+1326828429
+585052544
+738633083
+1597984519
+103976400
+637164838
+949355699
+301019638
+1539653489
+829283131
+1994476715
+240955585
+1996759270
+1022456556
+1580994077
+1061370374
+875128855
+1125363953
+1573702147
+503131242
+1969480447
+1438211747
+91438056
+1120505602
+1956383039
+1858786240
+1571532334
+1295962411
+342691299
+190922750
+587812343
+1882440834
+1251108553
+1546539316
+237235092
+229958515
+1788514159
+1180131104
+1278005195
+1236529116
+1834489224
+2008240486
+153071308
+1122241977
+1443493489
+827253675
+1844422894
+1615942404
+1444719301
+1322997186
+2068652336
+1108669174
+1117641112
+329168079
+1033958612
+870068653
+1235189147
+1628422544
+186507460
+1238820988
+1150316436
+117400533
+1285498853
+464843634
+1049896178
+1788529262
+1239030133
+
+Seed 42, other state array:
+1105844101
+1165395678
+461296413
+1259424640
+70225557
+1467961981
+315013290
+1176069659
+485874011
+776309703
+288010651
+556099569
+96788036
+603023941
+1732169228
+582662048
+1379333644
+2020179879
+1138761617
+1476121681
+475720173
+723447197
+2058783729
+1855053817
+596143428
+1050061698
+1183691850
+1071863601
+1773508895
+1094991931
+779433771
+222168675
+2145053629
+1963125621
+1294032277
+1771078876
+910633905
+2073466048
+1993247552
+908203886
+1889108021
+1139796181
+531799115
+652258278
+1065778581
+377563019
+1560462165
+807402954
+1517359200
+2092261280
+1459661233
+435654133
+322340651
+872639750
+1243057087
+1839699851
+817417382
+555234672
+127870336
+1139758033
+1427874422
+1370927423
+831974236
+97808156
+1926162096
+959844572
+1237566189
+1206552870
+183288347
+2069540425
+
+State data pointer restored correctly by setstate().
+
+Seed 42, back to first state array:
+1343006534
+1980171372
+782043423
+1083063062
+475232903
+1304516034
+1151509101
+1392464686
+1241740309
+116713217
+1697707295
+611594021
+1486722877
+464603182
+2038305329
+393952924
+215949723
+1654161471
+1745599527
+718621482
+527520873
+238823465
+1810355799
+958834563
+1301525862
+1492448612
+2080260955
+1815218141
+918843046
+317898715
+555133807
+785092322
+426122834
+1606253938
+736775485
+1973304601
+1660310177
+1521067015
+1674138324
+648896653
+2092390142
+772160169
+469099415
+2085041819
+1382277472
+557791010
+478959698
+1587628873
+557786337
+886954417
+1920913029
+643498035
+1878687182
+1359626079
+1546133539
+637470879
+1787787315
+1905187849
+1043203054
+1508046688
+410459218
+51504832
+1290534966
+486057852
+318745576
+1100789000
+36368414
+511601317
+1816117351
+820142804
+
+Pointer returned by initstate with size < 8: (nil)
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtod.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtod.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtod.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtod.stdout
new file mode 100644
index 0000000000..a92def04f3
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtod.stdout
@@ -0,0 +1,196 @@
+d: 0.000000 Endptr: "a 1 hello"
+d: 1.000000 Endptr: " hello"
+d: 1.000000 Endptr: " hello 2"
+d: 10.123000 Endptr: ""
+d: 10.123000 Endptr: ""
+d: -5.300000 Endptr: ""
+d: 16.071045 Endptr: ""
+d: 1.136719 Endptr: ""
+d: 3.128906 Endptr: ""
+d: 100000.000000 Endptr: ""
+d: 100000.000000 Endptr: ""
+d: 0.000010 Endptr: ""
+d: 100000.000000 Endptr: "   "
+d: 100000.000000 Endptr: "   "
+d: 0.000010 Endptr: "   "
+d: 10000000000.000000 Endptr: ""
+d: 1.000000 Endptr: "eXXXX"
+d: 1.000000 Endptr: "e"
+d: 1.000000 Endptr: "e "
+d: 10000000000.000000 Endptr: ""
+d: 1.000000 Endptr: "e+XXXX"
+d: 1.000000 Endptr: "e+"
+d: 1.000000 Endptr: "e+ "
+d: 0.000000 Endptr: ""
+d: 1.000000 Endptr: "e-XXXX"
+d: 1.000000 Endptr: "e-"
+d: 1.000000 Endptr: "e- "
+d: -100000.000000 Endptr: ""
+d: -100000.000000 Endptr: ""
+d: -0.000010 Endptr: ""
+d: -100000.000000 Endptr: "   "
+d: -100000.000000 Endptr: "   "
+d: -0.000010 Endptr: "   "
+d: -10000000000.000000 Endptr: ""
+d: -1.000000 Endptr: "eXXXX"
+d: -1.000000 Endptr: "e"
+d: -1.000000 Endptr: "e "
+d: -10000000000.000000 Endptr: ""
+d: -1.000000 Endptr: "e+XXXX"
+d: -1.000000 Endptr: "e+"
+d: -1.000000 Endptr: "e+ "
+d: -0.000000 Endptr: ""
+d: -1.000000 Endptr: "e-XXXX"
+d: -1.000000 Endptr: "e-"
+d: -1.000000 Endptr: "e- "
+d: 1234000.000000 Endptr: ""
+d: 1234000.000000 Endptr: ""
+d: 0.000123 Endptr: ""
+d: 1234000.000000 Endptr: "   "
+d: 1234000.000000 Endptr: "   "
+d: 0.000123 Endptr: "   "
+d: 123400000000.000000 Endptr: ""
+d: 12.340000 Endptr: "eXXXX"
+d: 12.340000 Endptr: "e"
+d: 12.340000 Endptr: "e "
+d: 123400000000.000000 Endptr: ""
+d: 12.340000 Endptr: "e+XXXX"
+d: 12.340000 Endptr: "e+"
+d: 12.340000 Endptr: "e+ "
+d: 0.000000 Endptr: ""
+d: 12.340000 Endptr: "e-XXXX"
+d: 12.340000 Endptr: "e-"
+d: 12.340000 Endptr: "e- "
+d: -1234000.000000 Endptr: ""
+d: -1234000.000000 Endptr: ""
+d: -0.000123 Endptr: ""
+d: -1234000.000000 Endptr: "   "
+d: -1234000.000000 Endptr: "   "
+d: -0.000123 Endptr: "   "
+d: -123400000000.000000 Endptr: ""
+d: -12.340000 Endptr: "eXXXX"
+d: -12.340000 Endptr: "e"
+d: -12.340000 Endptr: "e "
+d: -123400000000.000000 Endptr: ""
+d: -12.340000 Endptr: "e+XXXX"
+d: -12.340000 Endptr: "e+"
+d: -12.340000 Endptr: "e+ "
+d: -0.000000 Endptr: ""
+d: -12.340000 Endptr: "e-XXXX"
+d: -12.340000 Endptr: "e-"
+d: -12.340000 Endptr: "e- "
+d: 192.000000 Endptr: ""
+d: -192.000000 Endptr: ""
+d: 0.005859 Endptr: ""
+d: -0.005859 Endptr: ""
+d: 10.000000 Endptr: ""
+d: 0.156250 Endptr: ""
+d: -10.000000 Endptr: ""
+d: -0.156250 Endptr: ""
+d: 16.062500 Endptr: ""
+d: 16.062500 Endptr: ""
+d: -16.062500 Endptr: ""
+d: -16.062500 Endptr: ""
+d: 0.500000 Endptr: ""
+d: 5.000000 Endptr: ""
+d: 50.000000 Endptr: ""
+d: 500.000000 Endptr: ""
+d: 5000.000000 Endptr: ""
+d: 50000.000000 Endptr: ""
+d: 500000.000000 Endptr: ""
+d: 5000000.000000 Endptr: ""
+d: 50000000.000000 Endptr: ""
+d: 500000000.000000 Endptr: ""
+d: 5000000000.000000 Endptr: ""
+d: 50000000000.000000 Endptr: ""
+d: 500000000000.000000 Endptr: ""
+d: 5000000000000.000000 Endptr: ""
+d: 50000000000000.000000 Endptr: ""
+d: 500000000000000.000000 Endptr: ""
+d: 5000000000000000.000000 Endptr: ""
+d: 50000000000000000.000000 Endptr: ""
+d: 500000000000000000.000000 Endptr: ""
+d: 5000000000000000000.000000 Endptr: ""
+d: 50000000000000000000.000000 Endptr: ""
+d: 500000000000000000000.000000 Endptr: ""
+d: 5000000000000000000000.000000 Endptr: ""
+d: 49999999999999995805696.000000 Endptr: ""
+d: 499999999999999991611392.000000 Endptr: ""
+d: 5000000000000000452984832.000000 Endptr: ""
+d: 50000000000000002382364672.000000 Endptr: ""
+d: 500000000000000006643777536.000000 Endptr: ""
+d: 4999999999999999791559868416.000000 Endptr: ""
+d: 49999999999999995716575428608.000000 Endptr: ""
+d: 500000000000000009942312419328.000000 Endptr: ""
+d: 4999999999999999817948147482624.000000 Endptr: ""
+d: 50000000000000002683081102196736.000000 Endptr: ""
+d: 499999999999999972787615493521408.000000 Endptr: ""
+d: 4999999999999999727876154935214080.000000 Endptr: ""
+d: 49999999999999998431683053958987776.000000 Endptr: ""
+d: 500000000000000021210318687008980992.000000 Endptr: ""
+d: 4999999999999999769381329101060571136.000000 Endptr: ""
+d: 49999999999999998874404911728017014784.000000 Endptr: ""
+d: -0.500000 Endptr: ""
+d: -5.000000 Endptr: ""
+d: -50.000000 Endptr: ""
+d: -500.000000 Endptr: ""
+d: -5000.000000 Endptr: ""
+d: -50000.000000 Endptr: ""
+d: -500000.000000 Endptr: ""
+d: -5000000.000000 Endptr: ""
+d: -50000000.000000 Endptr: ""
+d: -500000000.000000 Endptr: ""
+d: -5000000000.000000 Endptr: ""
+d: -50000000000.000000 Endptr: ""
+d: -500000000000.000000 Endptr: ""
+d: -5000000000000.000000 Endptr: ""
+d: -50000000000000.000000 Endptr: ""
+d: -500000000000000.000000 Endptr: ""
+d: -5000000000000000.000000 Endptr: ""
+d: -50000000000000000.000000 Endptr: ""
+d: -500000000000000000.000000 Endptr: ""
+d: -5000000000000000000.000000 Endptr: ""
+d: -50000000000000000000.000000 Endptr: ""
+d: -500000000000000000000.000000 Endptr: ""
+d: -5000000000000000000000.000000 Endptr: ""
+d: -49999999999999995805696.000000 Endptr: ""
+d: -499999999999999991611392.000000 Endptr: ""
+d: -5000000000000000452984832.000000 Endptr: ""
+d: -50000000000000002382364672.000000 Endptr: ""
+d: -500000000000000006643777536.000000 Endptr: ""
+d: -4999999999999999791559868416.000000 Endptr: ""
+d: -49999999999999995716575428608.000000 Endptr: ""
+d: -500000000000000009942312419328.000000 Endptr: ""
+d: -4999999999999999817948147482624.000000 Endptr: ""
+d: -50000000000000002683081102196736.000000 Endptr: ""
+d: -499999999999999972787615493521408.000000 Endptr: ""
+d: -4999999999999999727876154935214080.000000 Endptr: ""
+d: -49999999999999998431683053958987776.000000 Endptr: ""
+d: -500000000000000021210318687008980992.000000 Endptr: ""
+d: -4999999999999999769381329101060571136.000000 Endptr: ""
+d: -49999999999999998874404911728017014784.000000 Endptr: ""
+d: -0.000000 Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: " foobarbaz"
+d: inf Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: " foobarbaz"
+d: -inf Endptr: ""
+d: -inf Endptr: ""
+d: -inf Endptr: ""
+d: -inf Endptr: " foobarbaz"
+d: nan Endptr: "0.1e5"
+d: nan Endptr: "-37"
+d: nan Endptr: "1.05"
+d: nan Endptr: " foo bar baz"
+d: nan Endptr: "0.1e5"
+d: nan Endptr: "-37"
+d: nan Endptr: "1.05"
+d: nan Endptr: " foo bar baz"
+d: nan Endptr: "0.1e5"
+d: nan Endptr: "-37"
+d: nan Endptr: "1.05"
+d: nan Endptr: " foo bar baz"
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtol.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtol.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtol.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtol.stdout
new file mode 100644
index 0000000000..4c4177ba7b
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtol.stdout
@@ -0,0 +1,26 @@
+-42
+endptr ""
+555
+endptr ""
+1234567890
+endptr "    "
+-42
+endptr ""
+555
+endptr ""
+1234567890
+endptr "    "
+38acf
+endptr "g"
+abcdef12
+endptr ""
+cafebeef
+endptr ""
+731
+endptr "89"
+731
+endptr "89"
+0
+endptr "b"
+0
+endptr "b"
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtoul.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtoul.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtoul.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtoul.stdout
new file mode 100644
index 0000000000..398260ab44
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/strtoul.stdout
@@ -0,0 +1,26 @@
+-42
+endptr ""
+555
+endptr ""
+1234567890
+endptr "    "
+-42
+endptr ""
+555
+endptr ""
+1234567890
+endptr "    "
+38acf
+endptr "g"
+abcdef12
+endptr ""
+21000004
+endptr ""
+731
+endptr "89"
+731
+endptr "89"
+0
+endptr "b"
+0
+endptr "b"
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/system.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/system.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/system.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/system.stdout
new file mode 100644
index 0000000000..90f99da2e1
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/stdlib/system.stdout
@@ -0,0 +1,2 @@
+shell found: 1
+test of system
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/mem.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/mem.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/mem.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/mem.stdout
new file mode 100644
index 0000000000..a6c001081f
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/mem.stdout
@@ -0,0 +1,5 @@
+# mem #
+Correct memchr
+Correct memrchr
+Correct memccpy
+Correct memcmp
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/memcpy.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/memcpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/memcpy.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/memcpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/memmem.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/memmem.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/memmem.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/memmem.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/stpcpy.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/stpcpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/stpcpy.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/stpcpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/stpncpy.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/stpncpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/stpncpy.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/stpncpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strcat.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strcat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strcat.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strcat.stdout
new file mode 100644
index 0000000000..10bda51843
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strcat.stdout
@@ -0,0 +1,2 @@
+hello world
+hello world
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strchr.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strchr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strchr.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strchr.stdout
new file mode 100644
index 0000000000..43f3dcfdf0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strchr.stdout
@@ -0,0 +1,4 @@
+ello
+ld
+
+(nil)
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strchrnul.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strchrnul.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strchrnul.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strchrnul.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strcpy.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strcpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strcpy.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strcpy.stdout
new file mode 100644
index 0000000000..f08e831ac1
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strcpy.stdout
@@ -0,0 +1,7 @@
+strcpy works!
+strncpy works!
+strncpy shaaaaaaaaa
+strlcpy works!
+copied 14
+strlcpy works! and strlcat!
+copied 27
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strcspn.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strcspn.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strcspn.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strcspn.stdout
new file mode 100644
index 0000000000..2b24e31277
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strcspn.stdout
@@ -0,0 +1,2 @@
+2
+6
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strlen.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strlen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strlen.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strlen.stdout
new file mode 100644
index 0000000000..9ce90c8a65
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strlen.stdout
@@ -0,0 +1,9 @@
+12
+0
+12
+12
+0
+12
+6
+12
+0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strncmp.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strncmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strncmp.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strncmp.stdout
new file mode 100644
index 0000000000..e385d8a988
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strncmp.stdout
@@ -0,0 +1,6 @@
+-97
+-195
+1
+-255
+-2
+0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strpbrk.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strpbrk.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strpbrk.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strpbrk.stdout
new file mode 100644
index 0000000000..7a6bc8b089
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strpbrk.stdout
@@ -0,0 +1,3 @@
+The quick drawn fix jumps over the lazy bug
+lazy bug
+NULL
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strrchr.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strrchr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strrchr.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strrchr.stdout
new file mode 100644
index 0000000000..836469707d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strrchr.stdout
@@ -0,0 +1 @@
+strrch PASS
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strsep.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strsep.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strsep.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strsep.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strsignal.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strsignal.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strsignal.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strsignal.stdout
new file mode 100644
index 0000000000..833dc63089
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strsignal.stdout
@@ -0,0 +1 @@
+# strsignal #
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strspn.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strspn.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strspn.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strspn.stdout
new file mode 100644
index 0000000000..54d9c92604
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strspn.stdout
@@ -0,0 +1,3 @@
+5
+1
+0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strstr.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strstr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strstr.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strstr.stdout
new file mode 100644
index 0000000000..56fe13b7b1
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strstr.stdout
@@ -0,0 +1,5 @@
+rust
+libc we trust
+(null)
+(null)
+RUST
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok.stdout
new file mode 100644
index 0000000000..4428c25c54
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok.stdout
@@ -0,0 +1 @@
+I'd_just_like_to_interject_for_a_moment._What_you're_referring_to_as_Linux,_is_in_fact,_GNU/Linux,_or_as_I've_recently_taken_to_calling_it,_GNU_plus_Linux.
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok_r.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok_r.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok_r.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok_r.stdout
new file mode 100644
index 0000000000..4428c25c54
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/string/strtok_r.stdout
@@ -0,0 +1 @@
+I'd_just_like_to_interject_for_a_moment._What_you're_referring_to_as_Linux,_is_in_fact,_GNU/Linux,_or_as_I've_recently_taken_to_calling_it,_GNU_plus_Linux.
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/strings.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/strings.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/strings.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/strings.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_epoll/epollet.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_epoll/epollet.stdout
new file mode 100644
index 0000000000..cc912d90cf
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sys_epoll/epollet.stdout
@@ -0,0 +1,5 @@
+ctl ADD: 0
+wait for HUP, edge-triggered: 1
+wait for HUP again: 0
+ctl MOD: 0
+wait for HUP: 1
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_mman.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/sys_mman.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_mman.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_mman.stdout
new file mode 100644
index 0000000000..108b1819b0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sys_mman.stdout
@@ -0,0 +1,9 @@
+Page size: 4096
+Mapping 1 page of memory...
+Mapping 3 pages of memory...
+Randomizing mapping #1
+Randomizing mapping #2
+Unmapping page 2 of map2
+Randomizing page 1 of mapping #2
+Randomizing page 3 of mapping #2
+Unmapping it all at once!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/recv.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/recv.stdout
new file mode 100644
index 0000000000..cb2239126a
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/recv.stdout
@@ -0,0 +1,2 @@
+send foo
+recv foo
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/recvfrom.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/recvfrom.stdout
new file mode 100644
index 0000000000..e9f413f935
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/recvfrom.stdout
@@ -0,0 +1,2 @@
+sendto   bar
+recvfrom bar
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixpeername.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixpeername.stdout
new file mode 100644
index 0000000000..f9686e7295
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixpeername.stdout
@@ -0,0 +1,3 @@
+listen sockname [AF_UNIX]: unixpeername.sock
+client peername [AF_UNIX]: unixpeername.sock
+client sockname [AF_UNIX]: (unnamed)
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixrecv.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixrecv.stdout
new file mode 100644
index 0000000000..e9636a2916
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixrecv.stdout
@@ -0,0 +1,2 @@
+send ipsum
+recv ipsum
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixrecvfrom.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixrecvfrom.stdout
new file mode 100644
index 0000000000..ad8e531910
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixrecvfrom.stdout
@@ -0,0 +1,2 @@
+send     lorem
+recvfrom lorem
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixsocketpair.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixsocketpair.stdout
new file mode 100644
index 0000000000..bb7fc428fa
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sys_socket/unixsocketpair.stdout
@@ -0,0 +1,6 @@
+SOCK_STREAM
+child:  ping
+parent: pong
+SOCK_DGRAM
+child:  ping
+parent: pong
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/chmod.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/chmod.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/chmod.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/chmod.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/fstatat.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/fstatat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/fstatat.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/fstatat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/lstat.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/lstat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/lstat.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_stat/lstat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_syslog/syslog.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/sys_syslog/syslog.stderr
new file mode 100644
index 0000000000..faddade2a6
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/sys_syslog/syslog.stderr
@@ -0,0 +1,13 @@
+relibc_test: This is a test message with formatting: 5
+relibc_test: Hank Hill
+relibc_test: Foo has been bar'd
+relibc_test: And now, Eeveelutions
+relibc_test: Espeon
+relibc_test: Umbreon
+relibc_test: Sylveon
+relibc_test: Glaceon
+relibc_test: Leafeon
+relibc_test: Vaporeon
+relibc_test: Flareon
+relibc_test: Jolteon
+relibc_test: Bye from relibc's syslog tests!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/sys_syslog/syslog.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/sys_syslog/syslog.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/termios.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/termios.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/termios.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/termios.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/asctime.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/asctime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/asctime.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/asctime.stdout
new file mode 100644
index 0000000000..f21cdff5f4
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/time/asctime.stdout
@@ -0,0 +1,5 @@
+Thu Jan  1 00:00:00 1970
+Sun Jan  1 00:00:00 1000
+Sat Dec 31 23:59:60 9999
+Sun Jan-99 00:00:00 -999
+Sat Dec999 99:99:99 9999
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/constants.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/constants.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/constants.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/constants.stdout
new file mode 100644
index 0000000000..cf14858d8c
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/time/constants.stdout
@@ -0,0 +1,2 @@
+(nil)
+1000000
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/gmtime.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/gmtime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/gmtime.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/gmtime.stdout
new file mode 100644
index 0000000000..a5da960f12
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/time/gmtime.stdout
@@ -0,0 +1,168 @@
+Unix epoch:
+  tm_sec    = 0
+  tm_min    = 0
+  tm_hour   = 0
+  tm_mday   = 1
+  tm_mon    = 0
+  tm_year   = 70
+  tm_wday   = 4
+  tm_yday   = 0
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+1970-03-01 00:00:00:
+  tm_sec    = 0
+  tm_min    = 0
+  tm_hour   = 0
+  tm_mday   = 1
+  tm_mon    = 2
+  tm_year   = 70
+  tm_wday   = 0
+  tm_yday   = 59
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+1970-12-31 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 31
+  tm_mon    = 11
+  tm_year   = 70
+  tm_wday   = 4
+  tm_yday   = 364
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+1972-02-29 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 29
+  tm_mon    = 1
+  tm_year   = 72
+  tm_wday   = 2
+  tm_yday   = 59
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+1972-12-31 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 31
+  tm_mon    = 11
+  tm_year   = 72
+  tm_wday   = 0
+  tm_yday   = 365
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+2000-02-29 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 29
+  tm_mon    = 1
+  tm_year   = 100
+  tm_wday   = 2
+  tm_yday   = 59
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+2000-12-31 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 31
+  tm_mon    = 11
+  tm_year   = 100
+  tm_wday   = 0
+  tm_yday   = 365
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+2100-03-01 00:00:00:
+  tm_sec    = 0
+  tm_min    = 0
+  tm_hour   = 0
+  tm_mday   = 1
+  tm_mon    = 2
+  tm_year   = 200
+  tm_wday   = 1
+  tm_yday   = 59
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+2100-12-31 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 31
+  tm_mon    = 11
+  tm_year   = 200
+  tm_wday   = 5
+  tm_yday   = 364
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+Year 2038, pre-i32 overflow:
+  tm_sec    = 7
+  tm_min    = 14
+  tm_hour   = 3
+  tm_mday   = 19
+  tm_mon    = 0
+  tm_year   = 138
+  tm_wday   = 2
+  tm_yday   = 18
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+Year 2038, post-i32 overflow:
+  tm_sec    = 8
+  tm_min    = 14
+  tm_hour   = 3
+  tm_mday   = 19
+  tm_mon    = 0
+  tm_year   = 138
+  tm_wday   = 2
+  tm_yday   = 18
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+Year 2106, pre-u32 overflow:
+  tm_sec    = 15
+  tm_min    = 28
+  tm_hour   = 6
+  tm_mday   = 7
+  tm_mon    = 1
+  tm_year   = 206
+  tm_wday   = 0
+  tm_yday   = 37
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+Year 2106, post-u32 overflow:
+  tm_sec    = 16
+  tm_min    = 28
+  tm_hour   = 6
+  tm_mday   = 7
+  tm_mon    = 1
+  tm_year   = 206
+  tm_wday   = 0
+  tm_yday   = 37
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/localtime.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/localtime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/localtime.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/localtime.stdout
new file mode 100644
index 0000000000..eb828a2b0d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/time/localtime.stdout
@@ -0,0 +1,9 @@
+Year 69, Day of year: 332, Month 10, Day of month: 29, Day of week: 6, 0:0:0
+Year 69, Day of year: 364, Month 11, Day of month: 31, Day of week: 3, 0:0:0
+Year 69, Day of year: 364, Month 11, Day of month: 31, Day of week: 3, 23:59:59
+Year 69, Day of year: 364, Month 11, Day of month: 31, Day of week: 3, 23:51:40
+Year 70, Day of year: 0, Month 0, Day of month: 1, Day of week: 4, 0:0:0
+Year 70, Day of year: 0, Month 0, Day of month: 1, Day of week: 4, 0:0:1
+Year 118, Day of year: 193, Month 6, Day of month: 13, Day of week: 5, 4:9:10
+Fri Jul 13 06:03:43 2018
+Fri Jul 13 06:03:43 2018
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/localtime_r.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/localtime_r.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/localtime_r.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/localtime_r.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/macros.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/macros.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/macros.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/macros.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/mktime.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/mktime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/mktime.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/mktime.stdout
new file mode 100644
index 0000000000..c9b309e63c
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/time/mktime.stdout
@@ -0,0 +1,6 @@
+31536000
+-2851200 = -2851200
+-86400 = -86400
+-500 = -500
+0 = 0
+1531454950 = 1531454950
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/strftime.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/strftime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/strftime.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/strftime.stdout
new file mode 100644
index 0000000000..7d12e13954
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/time/strftime.stdout
@@ -0,0 +1,14 @@
+20: Tue Tuesday Jul July
+16: The 21st century
+11: 06:25:42 AM
+11: 03:00:00 PM
+5: 15:00
+15: 15 1531839600 2
+6: 198 28
+28: Tue Jul 17 15:00:00 UTC 2018
+0: Tue Aug 07 19:17:11 UTC 2018Tue Aug 07 19:17:11 U
+53
+52
+52
+1
+53
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/strptime.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/strptime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/strptime.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/strptime.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/time.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/time.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/time.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/time.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/timegm.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/timegm.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/timegm.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/timegm.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/tzset.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/time/tzset.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/time/tzset.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/time/tzset.stdout
new file mode 100644
index 0000000000..9962d8acc0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/time/tzset.stdout
@@ -0,0 +1 @@
+tzname[0] UTC, tzname[1] UTC, daylight 0, timezone 0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/tls.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/tls.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/tls.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/tls.stdout
new file mode 100644
index 0000000000..d0b7b3c2e6
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/tls.stdout
@@ -0,0 +1,2 @@
+0 == 0
+1 == 1
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/access.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/access.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/access.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/access.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/alarm.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/alarm.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/alarm.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/alarm.stdout
new file mode 100644
index 0000000000..4ed7f83631
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/alarm.stdout
@@ -0,0 +1,4 @@
+alarm(0) baseline: ok
+alarm(1) fires: ok
+alarm(0) cancel: ok
+alarm re-arm returns remaining: ok
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/brk.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/brk.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/brk.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/brk.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/confstr.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/confstr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/confstr.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/confstr.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/constants.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/constants.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/constants.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/constants.stdout
new file mode 100644
index 0000000000..90c907f1ff
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/constants.stdout
@@ -0,0 +1,16 @@
+_POSIX_VERSION: 200809
+NULL: (nil)
+R_OK: 4
+W_OK: 2
+X_OK: 1
+F_OK: 0
+SEEK_SET: 0
+SEEK_CUR: 1
+SEEK_END: 2
+F_LOCK: 1
+F_ULOCK: 0
+F_TEST: 3
+F_TLOCK: 2
+STDIN_FILENO: 0
+STDOUT_FILENO: 1
+STDERR_FILENO: 2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/dup.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/dup.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/dup.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/dup.stdout
new file mode 100644
index 0000000000..4fb8e07602
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/dup.stdout
@@ -0,0 +1 @@
+duped fd is 1 greater than the original fd
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/exec.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/exec.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/exec.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/exec.stdout
new file mode 100644
index 0000000000..0f56119c73
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/exec.stdout
@@ -0,0 +1 @@
+exec works :D
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fchdir.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fchdir.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fchdir.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fchdir.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fork.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fork.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fork.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fork.stdout
new file mode 100644
index 0000000000..98f331c9de
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fork.stdout
@@ -0,0 +1,3 @@
+Hello from prepare
+Hello from child
+Hello from parent
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fsync.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fsync.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fsync.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/fsync.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/ftruncate.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/ftruncate.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/ftruncate.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/ftruncate.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt.stdout
new file mode 100644
index 0000000000..aba2d44d3f
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt.stdout
@@ -0,0 +1,42 @@
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 0
+errflg: 0
+ifile: 
+ofile: 
+result: 0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt_long.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt_long.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt_long.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt_long.stdout
new file mode 100644
index 0000000000..d2f352b822
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/getopt_long.stdout
@@ -0,0 +1,20 @@
+--- Running: test --test0 -a
+getopt_long returned 1, argument test0=(null)
+Option -a with value (null)
+--- Running: test --test1 -a
+getopt_long returned 0, set flag to 2, argument test1=(null)
+Option -a with value (null)
+--- Running: test --test2 -a
+getopt_long returned 3, argument test2=(null)
+Option -a with value (null)
+--- Running: test --test2=arg -a
+getopt_long returned 3, argument test2=arg
+Option -a with value (null)
+--- Running: test --test3 -a
+getopt_long returned 4, argument test3=-a
+--- Running: test --test3=arg -a
+getopt_long returned 4, argument test3=arg
+Option -a with value (null)
+--- Running: test --test3 arg -a
+getopt_long returned 4, argument test3=arg
+Option -a with value (null)
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/pipe.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/pipe.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/pipe.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/pipe.stdout
new file mode 100644
index 0000000000..980a0d5f19
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/pipe.stdout
@@ -0,0 +1 @@
+Hello World!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/readlinkat.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/readlinkat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/readlinkat.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/readlinkat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/rmdir.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/rmdir.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/rmdir.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/rmdir.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/sleep.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/sleep.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/sleep.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/sleep.stdout
new file mode 100644
index 0000000000..25867863a2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/sleep.stdout
@@ -0,0 +1 @@
+unslept: 0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/swab.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/swab.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/swab.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/swab.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/write.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/write.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/unistd/write.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/write.stdout
new file mode 100644
index 0000000000..980a0d5f19
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/unistd/write.stdout
@@ -0,0 +1 @@
+Hello World!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fgetwc.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fgetwc.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fgetwc.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fgetwc.stdout
new file mode 100644
index 0000000000..e7cabf537e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fgetwc.stdout
@@ -0,0 +1,3 @@
+êçã
+こんにちは世界
+Привет мир
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fwide.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fwide.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fwide.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fwide.stdout
new file mode 100644
index 0000000000..44e0be8e35
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/fwide.stdout
@@ -0,0 +1,4 @@
+0
+0
+0
+0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbrtowc.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbrtowc.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbrtowc.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbrtowc.stdout
new file mode 100644
index 0000000000..8ea12e1952
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbrtowc.stdout
@@ -0,0 +1,2 @@
+Processing 11 UTF-8 code units: [ 0x7a 0xc3 0x9f 0xe6 0xb0 0xb4 0xf0 0x9f 0x8d 0x8c 0 ]
+into 5 wchar_t units: [ 0x7a 0xdf 0x6c34 0x1f34c 0 ]
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbsrtowcs.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbsrtowcs.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbsrtowcs.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbsrtowcs.stdout
new file mode 100644
index 0000000000..e8f8258f2e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/mbsrtowcs.stdout
@@ -0,0 +1 @@
+The length, including '\0': 5 
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/printf-on-wchars.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/printf-on-wchars.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/printf-on-wchars.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/printf-on-wchars.stdout
new file mode 100644
index 0000000000..b14ed25516
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/printf-on-wchars.stdout
@@ -0,0 +1,4 @@
+This is a few one-byte chars: 1 2 a b
+Long one-byte string: Hello World
+This is a few multi-byte chars: ❤ R 😠 C
+Long multi-byte string: 👉😎👉 Zoop!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/putwchar.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/putwchar.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/putwchar.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/putwchar.stdout
new file mode 100644
index 0000000000..42d65d1da0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/putwchar.stdout
@@ -0,0 +1 @@
+zß水🍌
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/ungetwc.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/ungetwc.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/ungetwc.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/ungetwc.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcpcpy.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcpcpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcpcpy.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcpcpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcpncpy.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcpncpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcpncpy.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcpncpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcrtomb.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcrtomb.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcrtomb.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcrtomb.stdout
new file mode 100644
index 0000000000..ed85da3696
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcrtomb.stdout
@@ -0,0 +1,2 @@
+Processing 5 wchar_t units: [ 0x7a 0xdf 0x6c34 0x1f34c 0 ]
+into 11 UTF-8 code units: [ 0x7a 0xc3 0x9f 0xe6 0xb0 0xb4 0xf0 0x9f 0x8d 0x8c 0 ]
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcscasecmp.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcscasecmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcscasecmp.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcscasecmp.stdout
new file mode 100644
index 0000000000..fdd11f6552
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcscasecmp.stdout
@@ -0,0 +1,4 @@
+wcscasecmp(s1, s1) = 0
+wcscasecmp(s1, s2) = -1
+wcscasecmp(s2, s1) = 1
+wcscasecmp(s2, s2) = 0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcschr.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcschr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcschr.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcschr.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcscspn.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcscspn.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcscspn.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcscspn.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsdup.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsdup.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsdup.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsdup.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsncasecmp.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsncasecmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsncasecmp.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsncasecmp.stdout
new file mode 100644
index 0000000000..6a4bd43fc4
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsncasecmp.stdout
@@ -0,0 +1,5 @@
+wcsncasecmp(s1, s1, 17) = 0
+wcsncasecmp(s1, s2, 17) = -1
+wcsncasecmp(s2, s1, 17) = 1
+wcsncasecmp(s2, s1, 15) = 0
+wcsncasecmp(s1, s2, 0) = 0
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsnlen.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsnlen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsnlen.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsnlen.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsnrtombs.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsnrtombs.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsnrtombs.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsnrtombs.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsrchr.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsrchr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsrchr.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsrchr.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsrtombs.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsrtombs.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsrtombs.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsrtombs.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsstr.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsstr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsstr.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcsstr.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstod.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstod.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstod.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstod.stdout
new file mode 100644
index 0000000000..0292990d95
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstod.stdout
@@ -0,0 +1,6 @@
+strtod(1.2345wowzah) = (1.234500, wowzah)
+strtod(53) = (53.000000, )
+strtod(-254352.5...) = (-254352.500000, ...)
+strtod(   19.2 wat) = (19.200000,  wat)
+strtod(365.24 29.53) = (365.240000,  29.53)
+strtod( 29.53) = (29.530000, )
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoimax.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoimax.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoimax.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoimax.stdout
new file mode 100644
index 0000000000..b9a14be845
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoimax.stdout
@@ -0,0 +1,6 @@
+-123
+255
+44027
+8
+10
+16
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstok.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstok.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstok.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstok.stdout
new file mode 100644
index 0000000000..bb7ba090dd
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstok.stdout
@@ -0,0 +1,12 @@
+Hello
+from
+the
+otter
+slide.
+Must
+have
+gone
+down
+a
+thousand
+tiiiiiimeeeees...
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstol.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstol.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstol.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstol.stdout
new file mode 100644
index 0000000000..55aa50779a
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstol.stdout
@@ -0,0 +1 @@
+The decimal equivalents are: 2001, 6340800, -3624224 and 7340031.
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoumax.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoumax.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoumax.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoumax.stdout
new file mode 100644
index 0000000000..8e372f7589
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcstoumax.stdout
@@ -0,0 +1,3 @@
+nptr = `10110134932`
+wcstoumax = 10110134932
+Stopped scan at ``
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcswidth.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcswidth.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcswidth.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcswidth.stdout
new file mode 100644
index 0000000000..7da79364d8
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wcswidth.stdout
@@ -0,0 +1 @@
+wcswidth(L"relibc", 6) = 6
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wprintf.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wprintf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wprintf.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wprintf.stdout
new file mode 100644
index 0000000000..724e64b5b5
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wprintf.stdout
@@ -0,0 +1,67 @@
+percent: %
+wstring: String
+char: c
+int: -16
+uint: 32
+hex: beef
+HEX: C0FFEE
+string: end
+%n returned 44, total len of write: 87
+
+Padding madness:
+ 001   +2
+   c
+ 0x00000ff
+ 001
+0 0x1
+ 1
+(00123) (  123)
+(-0123) ( -123)
+(             )
+0xabcdef
+(nil)
+
+Positional madness:
+4 3 2
+00002
+|Fiz     |Buz     |     Fiz|     Tot|
+int:          5 double: 0.100000 0.200000 0.300000 0.400000
+-1717986918 0.100000
+-1717986918 0.200000
+
+Float madness:
+        1.234568e+02
+        1.000000E-05
+          123.456789
+            0.000010
+       -1.234568e+02
+-00000001.234568e+02
+%.5g: -123.46
+%.5f: -123.45679
+%.5e: -1.23457e+02
+%.*g: -1.2e+02
+%.*f: -123.46
+%.*e: -1.23e+02
+%.*2$g: -123.46
+%.*2$f: -123.45679
+%.*2$e: -1.23457e+02
+100000
+1e+06
+1.000000e+06
+0.0001
+1E-05
+1.000000E-05
+
+Non-finite float madness:
+%e: inf -inf nan -nan
+%E: INF -INF NAN -NAN
+%f: inf -inf nan -nan
+%F: INF -INF NAN -NAN
+%g: inf -inf nan -nan
+%G: INF -INF NAN -NAN
+Things that have been buggy
++05
+Testing asprintf...
+printed: test string, value: 11
+printed: test string 2, value: 13
+printed: test string 2, value: 13
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wscanf.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wscanf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wscanf.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wscanf.stdout
new file mode 100644
index 0000000000..90abc9a7f6
Binary files /dev/null and b/recipes/core/relibc/tests/expected/bins_dynamic/wchar/wscanf.stdout differ
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towlower.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towlower.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towlower.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towlower.stdout
new file mode 100644
index 0000000000..fdbf17836f
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towlower.stdout
@@ -0,0 +1,2 @@
+HaLf WiDe ChAr StRiNg!
+half wide char string!
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towupper.stderr b/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towupper.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towupper.stdout b/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towupper.stdout
new file mode 100644
index 0000000000..a09771e7bc
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_dynamic/wctype/towupper.stdout
@@ -0,0 +1,2 @@
+HaLf WiDe ChAr StRiNg!
+HALF WIDE CHAR STRING!
diff --git a/recipes/core/relibc/tests/expected/bins_static/alloca.stderr b/recipes/core/relibc/tests/expected/bins_static/alloca.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/alloca.stdout b/recipes/core/relibc/tests/expected/bins_static/alloca.stdout
new file mode 100644
index 0000000000..d0a7d827f2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/alloca.stdout
@@ -0,0 +1 @@
+AAAAAAAAAAAAAAAA
diff --git a/recipes/core/relibc/tests/expected/bins_static/args.stderr b/recipes/core/relibc/tests/expected/bins_static/args.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/args.stdout b/recipes/core/relibc/tests/expected/bins_static/args.stdout
new file mode 100644
index 0000000000..deefb2f3da
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/args.stdout
@@ -0,0 +1 @@
+test args 
diff --git a/recipes/core/relibc/tests/expected/bins_static/arpainet.stderr b/recipes/core/relibc/tests/expected/bins_static/arpainet.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/arpainet.stdout b/recipes/core/relibc/tests/expected/bins_static/arpainet.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/assert.stderr b/recipes/core/relibc/tests/expected/bins_static/assert.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/assert.stdout b/recipes/core/relibc/tests/expected/bins_static/assert.stdout
new file mode 100644
index 0000000000..028678d987
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/assert.stdout
@@ -0,0 +1,2 @@
+yay!
+groovy!
diff --git a/recipes/core/relibc/tests/expected/bins_static/constructor.stderr b/recipes/core/relibc/tests/expected/bins_static/constructor.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/constructor.stdout b/recipes/core/relibc/tests/expected/bins_static/constructor.stdout
new file mode 100644
index 0000000000..14e23d4cbb
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/constructor.stdout
@@ -0,0 +1,6 @@
+constructor (101)
+constructor (102)
+constructor (103)
+constructor (104)
+constructor (no priority)
+main
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/blowfish.stderr b/recipes/core/relibc/tests/expected/bins_static/crypt/blowfish.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/blowfish.stdout b/recipes/core/relibc/tests/expected/bins_static/crypt/blowfish.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/md5.stderr b/recipes/core/relibc/tests/expected/bins_static/crypt/md5.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/md5.stdout b/recipes/core/relibc/tests/expected/bins_static/crypt/md5.stdout
new file mode 100644
index 0000000000..f985b46aff
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/crypt/md5.stdout
@@ -0,0 +1 @@
+Success!
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/pbkdf2.stderr b/recipes/core/relibc/tests/expected/bins_static/crypt/pbkdf2.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/pbkdf2.stdout b/recipes/core/relibc/tests/expected/bins_static/crypt/pbkdf2.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/scrypt.stderr b/recipes/core/relibc/tests/expected/bins_static/crypt/scrypt.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/scrypt.stdout b/recipes/core/relibc/tests/expected/bins_static/crypt/scrypt.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/sha256.stderr b/recipes/core/relibc/tests/expected/bins_static/crypt/sha256.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/sha256.stdout b/recipes/core/relibc/tests/expected/bins_static/crypt/sha256.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/sha512.stderr b/recipes/core/relibc/tests/expected/bins_static/crypt/sha512.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/crypt/sha512.stdout b/recipes/core/relibc/tests/expected/bins_static/crypt/sha512.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/ctype.stderr b/recipes/core/relibc/tests/expected/bins_static/ctype.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/ctype.stdout b/recipes/core/relibc/tests/expected/bins_static/ctype.stdout
new file mode 100644
index 0000000000..e83b1e5f11
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/ctype.stdout
@@ -0,0 +1 @@
+Success: 0
diff --git a/recipes/core/relibc/tests/expected/bins_static/destructor.stderr b/recipes/core/relibc/tests/expected/bins_static/destructor.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/destructor.stdout b/recipes/core/relibc/tests/expected/bins_static/destructor.stdout
new file mode 100644
index 0000000000..1da7c29706
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/destructor.stdout
@@ -0,0 +1,6 @@
+main
+destructor (no priority)
+destructor (104)
+destructor (103)
+destructor (102)
+destructor (101)
diff --git a/recipes/core/relibc/tests/expected/bins_static/dirent/fdopendir.stderr b/recipes/core/relibc/tests/expected/bins_static/dirent/fdopendir.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/dirent/fdopendir.stdout b/recipes/core/relibc/tests/expected/bins_static/dirent/fdopendir.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/dirent/scandir.stderr b/recipes/core/relibc/tests/expected/bins_static/dirent/scandir.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/dirent/scandir.stdout b/recipes/core/relibc/tests/expected/bins_static/dirent/scandir.stdout
new file mode 100644
index 0000000000..4820bea846
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/dirent/scandir.stdout
@@ -0,0 +1,7 @@
+1-never-gonna-give-you-up
+2-never-gonna-let-you-down
+4-and-desert-you
+5-never-gonna-make-you-cry
+6-never-gonna-say-goodbye
+7-never-gonna-tell-a-lie
+8-and-hurt-you
diff --git a/recipes/core/relibc/tests/expected/bins_static/err.stderr b/recipes/core/relibc/tests/expected/bins_static/err.stderr
new file mode 100644
index 0000000000..b79d9c196f
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/err.stderr
@@ -0,0 +1,6 @@
+err: Ran out of coffee: Owner died
+err: Cat pulled out your ethernet cable
+err: Eat 42 cookies: Permission denied
+err: Potato, krumpli: Invalid exchange
+err: I'm sorry, Dave. I'm afraid I can't do that.: Operation not permitted
+err: Bye. It's crowded.: Too many users
diff --git a/recipes/core/relibc/tests/expected/bins_static/err.stdout b/recipes/core/relibc/tests/expected/bins_static/err.stdout
new file mode 100644
index 0000000000..8ef72cb5bc
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/err.stdout
@@ -0,0 +1,2 @@
+err: Dang it, Bobby.: No such file or directory
+Exiting due to error code: 87
diff --git a/recipes/core/relibc/tests/expected/bins_static/errno.stderr b/recipes/core/relibc/tests/expected/bins_static/errno.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/errno.stdout b/recipes/core/relibc/tests/expected/bins_static/errno.stdout
new file mode 100644
index 0000000000..58419805ea
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/errno.stdout
@@ -0,0 +1,136 @@
+E2BIG macro available
+EACCES macro available
+EADDRINUSE macro available
+EADDRNOTAVAIL macro available
+EADV macro available
+EAFNOSUPPORT macro available
+EAGAIN macro available
+EALREADY macro available
+EBADE macro available
+EBADF macro available
+EBADFD macro available
+EBADMSG macro available
+EBADR macro available
+EBADRQC macro available
+EBADSLT macro available
+EBFONT macro available
+EBUSY macro available
+ECANCELED macro available
+ECHILD macro available
+ECHRNG macro available
+ECOMM macro available
+ECONNABORTED macro available
+ECONNREFUSED macro available
+ECONNRESET macro available
+EDEADLK macro available
+EDEADLOCK macro available
+EDESTADDRREQ macro available
+EDOM macro available
+EDOTDOT macro available
+EDQUOT macro available
+EEXIST macro available
+EFAULT macro available
+EFBIG macro available
+EHOSTDOWN macro available
+EHOSTUNREACH macro available
+EIDRM macro available
+EILSEQ macro available
+EINPROGRESS macro available
+EINTR macro available
+EINVAL macro available
+EIO macro available
+EISCONN macro available
+EISDIR macro available
+EISNAM macro available
+EKEYEXPIRED macro available
+EKEYREJECTED macro available
+EKEYREVOKED macro available
+EL2HLT macro available
+EL2NSYNC macro available
+EL3HLT macro available
+EL3RST macro available
+ELIBACC macro available
+ELIBBAD macro available
+ELIBEXEC macro available
+ELIBMAX macro available
+ELIBSCN macro available
+ELNRNG macro available
+ELOOP macro available
+EMEDIUMTYPE macro available
+EMFILE macro available
+EMLINK macro available
+EMSGSIZE macro available
+EMULTIHOP macro available
+ENAMETOOLONG macro available
+ENAVAIL macro available
+ENETDOWN macro available
+ENETRESET macro available
+ENETUNREACH macro available
+ENFILE macro available
+ENOANO macro available
+ENOBUFS macro available
+ENOCSI macro available
+ENODATA macro available
+ENODEV macro available
+ENOENT macro available
+ENOEXEC macro available
+ENOKEY macro available
+ENOLCK macro available
+ENOLINK macro available
+ENOMEDIUM macro available
+ENOMEM macro available
+ENOMSG macro available
+ENONET macro available
+ENOPKG macro available
+ENOPROTOOPT macro available
+ENOSPC macro available
+ENOSR macro available
+ENOSTR macro available
+ENOSYS macro available
+ENOTBLK macro available
+ENOTCONN macro available
+ENOTDIR macro available
+ENOTEMPTY macro available
+ENOTNAM macro available
+ENOTRECOVERABLE macro available
+ENOTSOCK macro available
+ENOTSUP macro available
+ENOTTY macro available
+ENOTUNIQ macro available
+ENXIO macro available
+EOPNOTSUPP macro available
+EOVERFLOW macro available
+EOWNERDEAD macro available
+EPERM macro available
+EPFNOSUPPORT macro available
+EPIPE macro available
+EPROTO macro available
+EPROTONOSUPPORT macro available
+EPROTOTYPE macro available
+ERANGE macro available
+EREMCHG macro available
+EREMOTE macro available
+EREMOTEIO macro available
+ERESTART macro available
+EROFS macro available
+ESHUTDOWN macro available
+ESOCKTNOSUPPORT macro available
+ESPIPE macro available
+ESRCH macro available
+ESRMNT macro available
+ESTALE macro available
+ESTRPIPE macro available
+ETIME macro available
+ETIMEDOUT macro available
+ETOOMANYREFS macro available
+ETXTBSY macro available
+EUCLEAN macro available
+EUNATCH macro available
+EUSERS macro available
+EWOULDBLOCK macro available
+EXDEV macro available
+EXFULL macro available
+errno
+changed to argv[0]
+changed to program_invocation_name
+changed to program_invocation_short_name
diff --git a/recipes/core/relibc/tests/expected/bins_static/error.stderr b/recipes/core/relibc/tests/expected/bins_static/error.stderr
new file mode 100644
index 0000000000..4eb19d82f3
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/error.stderr
@@ -0,0 +1 @@
+perror: No such file or directory
diff --git a/recipes/core/relibc/tests/expected/bins_static/error.stdout b/recipes/core/relibc/tests/expected/bins_static/error.stdout
new file mode 100644
index 0000000000..4e744d1bfb
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/error.stdout
@@ -0,0 +1,4 @@
+errno: 2 = No such file or directory
+errno: 2 = No such file or directory, return: 0
+errno: 2 = No, return: 34
+errno: 2 = , return: 34
diff --git a/recipes/core/relibc/tests/expected/bins_static/fcntl/create.stderr b/recipes/core/relibc/tests/expected/bins_static/fcntl/create.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/fcntl/create.stdout b/recipes/core/relibc/tests/expected/bins_static/fcntl/create.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/fcntl/fcntl.stderr b/recipes/core/relibc/tests/expected/bins_static/fcntl/fcntl.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/fcntl/fcntl.stdout b/recipes/core/relibc/tests/expected/bins_static/fcntl/fcntl.stdout
new file mode 100644
index 0000000000..4fb8e07602
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/fcntl/fcntl.stdout
@@ -0,0 +1 @@
+duped fd is 1 greater than the original fd
diff --git a/recipes/core/relibc/tests/expected/bins_static/fcntl/open.stderr b/recipes/core/relibc/tests/expected/bins_static/fcntl/open.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/fcntl/open.stdout b/recipes/core/relibc/tests/expected/bins_static/fcntl/open.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/fcntl/posix_fallocate.stderr b/recipes/core/relibc/tests/expected/bins_static/fcntl/posix_fallocate.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/fcntl/posix_fallocate.stdout b/recipes/core/relibc/tests/expected/bins_static/fcntl/posix_fallocate.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/fnmatch.stderr b/recipes/core/relibc/tests/expected/bins_static/fnmatch.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/fnmatch.stdout b/recipes/core/relibc/tests/expected/bins_static/fnmatch.stdout
new file mode 100644
index 0000000000..48ba8aef2e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/fnmatch.stdout
@@ -0,0 +1,32 @@
+Should succeed:
+"*World" matches "Hello World"
+"*World" matches "World"
+"Hello*" matches "Hello World"
+"H[ae]llo?World" matches "Hallo+World"
+"H[ae]llo?World" matches "Hello_World"
+"[0-9][!a]" matches "1b"
+"/a/*/d" matches "/a/b/c/d"
+"/a/*/d" matches "/a/bc/d"
+"*hello" matches ".hello"
+"/*hello" matches "/.hello"
+"[a!][a!]" matches "!a"
+"[\]]" matches "]"
+"[\\]" matches "\"
+"hello[/+]world" matches "hello/world"
+"hello world" matches "HELLO WORLD"
+
+Should fail:
+"*World" doesn't match "Hello Potato"
+"*World" doesn't match "Potato"
+"H[ae]llo?World" doesn't match "Hillo+World"
+"H[ae]llo?World" doesn't match "Hello__World"
+"[0-9][!a]" doesn't match "ab"
+"[0-9][!a]" doesn't match "2a"
+"/a/*/d" doesn't match "/a/b/c/d"
+"/a/*/d" doesn't match "/a/bc/d/"
+"*hello" doesn't match ".hello"
+"/*hello" doesn't match "/.hello"
+"[a!][a!]" doesn't match "ab"
+"hello[/+]world" doesn't match "hello/world"
+"hello world" doesn't match "HELLO WORLD"
+"********************a" doesn't match "xxxxxxxxxxxxxxxxxxxxb"
diff --git a/recipes/core/relibc/tests/expected/bins_static/futimens.stderr b/recipes/core/relibc/tests/expected/bins_static/futimens.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/futimens.stdout b/recipes/core/relibc/tests/expected/bins_static/futimens.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/iso646.stderr b/recipes/core/relibc/tests/expected/bins_static/iso646.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/iso646.stdout b/recipes/core/relibc/tests/expected/bins_static/iso646.stdout
new file mode 100644
index 0000000000..5f8a399fe8
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/iso646.stdout
@@ -0,0 +1,33 @@
+0 and 0: 0
+1 and 0: 0
+0 and 1: 0
+1 and 1: 1
+0 and_eq 0: 0
+1 and_eq 0: 0
+0 and_eq 1: 0
+1 and_eq 1: 1
+a bitand b: 8
+a bitor b: 14
+compl a: 245
+not 0: 1
+not 1: 0
+0 not_eq 0: 0
+1 not_eq 0: 1
+0 not_eq 1: 0
+1 not_eq 1: 1
+0 or 0: 0
+1 or 0: 1
+0 or 1: 1
+1 or 1: 1
+0 or_eq 0: 0
+1 or_eq 0: 1
+0 or_eq 1: 1
+1 or_eq 1: 1
+0 xor 0: 0
+1 xor 0: 1
+0 xor 1: 1
+1 xor 1: 0
+0 xor_eq 0: 0
+1 xor_eq 0: 1
+0 xor_eq 1: 1
+1 xor_eq 1: 0
diff --git a/recipes/core/relibc/tests/expected/bins_static/libgen.stderr b/recipes/core/relibc/tests/expected/bins_static/libgen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/libgen.stdout b/recipes/core/relibc/tests/expected/bins_static/libgen.stdout
new file mode 100644
index 0000000000..6e32d2008d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/libgen.stdout
@@ -0,0 +1,21 @@
+dirname("") == "."
+basename("") == "."
+dirname(".") == "."
+basename(".") == "."
+dirname("..") == "."
+basename("..") == ".."
+dirname("/") == "/"
+basename("/") == "/"
+dirname("///") == "/"
+basename("///") == "/"
+dirname("//usr//lib//") == "//usr"
+basename("//usr//lib//") == "lib"
+dirname("/usr") == "/"
+basename("/usr") == "usr"
+dirname("/usr/") == "/"
+basename("/usr/") == "usr"
+dirname("/usr/lib") == "/usr"
+basename("/usr/lib") == "lib"
+dirname(NULL) == "."
+basename(NULL) == "."
+Success: 0
diff --git a/recipes/core/relibc/tests/expected/bins_static/locale/duplocale.stderr b/recipes/core/relibc/tests/expected/bins_static/locale/duplocale.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/locale/duplocale.stdout b/recipes/core/relibc/tests/expected/bins_static/locale/duplocale.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/locale/newlocale.stderr b/recipes/core/relibc/tests/expected/bins_static/locale/newlocale.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/locale/newlocale.stdout b/recipes/core/relibc/tests/expected/bins_static/locale/newlocale.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/locale/setlocale.stderr b/recipes/core/relibc/tests/expected/bins_static/locale/setlocale.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/locale/setlocale.stdout b/recipes/core/relibc/tests/expected/bins_static/locale/setlocale.stdout
new file mode 100644
index 0000000000..5d516f2e6d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/locale/setlocale.stdout
@@ -0,0 +1 @@
+success!
diff --git a/recipes/core/relibc/tests/expected/bins_static/malloc/usable_size.stderr b/recipes/core/relibc/tests/expected/bins_static/malloc/usable_size.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/malloc/usable_size.stdout b/recipes/core/relibc/tests/expected/bins_static/malloc/usable_size.stdout
new file mode 100644
index 0000000000..4188b67b66
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/malloc/usable_size.stdout
@@ -0,0 +1,2 @@
+malloc: 27 bytes
+malloc_usable_size: 48 bytes
diff --git a/recipes/core/relibc/tests/expected/bins_static/math.stderr b/recipes/core/relibc/tests/expected/bins_static/math.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/math.stdout b/recipes/core/relibc/tests/expected/bins_static/math.stdout
new file mode 100644
index 0000000000..8654177967
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/math.stdout
@@ -0,0 +1 @@
+cos(3.140000) = -0.999999
diff --git a/recipes/core/relibc/tests/expected/bins_static/mkfifo.stderr b/recipes/core/relibc/tests/expected/bins_static/mkfifo.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/mkfifo.stdout b/recipes/core/relibc/tests/expected/bins_static/mkfifo.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/mknod.stderr b/recipes/core/relibc/tests/expected/bins_static/mknod.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/mknod.stdout b/recipes/core/relibc/tests/expected/bins_static/mknod.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/mknodat.stderr b/recipes/core/relibc/tests/expected/bins_static/mknodat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/mknodat.stdout b/recipes/core/relibc/tests/expected/bins_static/mknodat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/ptrace.stderr b/recipes/core/relibc/tests/expected/bins_static/ptrace.stderr
new file mode 100644
index 0000000000..289c82a876
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/ptrace.stderr
@@ -0,0 +1,4 @@
+This is printed to STDOUT.
+Or, at least, that's what I thought.
+But all write(...) syscalls are actually redirected to STDERR by the tracer.
+Big surprise, right!
diff --git a/recipes/core/relibc/tests/expected/bins_static/ptrace.stdout b/recipes/core/relibc/tests/expected/bins_static/ptrace.stdout
new file mode 100644
index 0000000000..824e89accd
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/ptrace.stdout
@@ -0,0 +1,5 @@
+Set regs
+Set regs
+Set regs
+Set regs
+Child exited with status 0
diff --git a/recipes/core/relibc/tests/expected/bins_static/pty/forkpty.stderr b/recipes/core/relibc/tests/expected/bins_static/pty/forkpty.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/pty/forkpty.stdout b/recipes/core/relibc/tests/expected/bins_static/pty/forkpty.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/regex.stderr b/recipes/core/relibc/tests/expected/bins_static/regex.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/regex.stdout b/recipes/core/relibc/tests/expected/bins_static/regex.stdout
new file mode 100644
index 0000000000..07caf6fc01
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/regex.stdout
@@ -0,0 +1,3 @@
+Matching group: 25 - 36
+Matching group: 31 - 36
+Matching group: -1 - -1
diff --git a/recipes/core/relibc/tests/expected/bins_static/select.stderr b/recipes/core/relibc/tests/expected/bins_static/select.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/select.stdout b/recipes/core/relibc/tests/expected/bins_static/select.stdout
new file mode 100644
index 0000000000..a4a5b784a2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/select.stdout
@@ -0,0 +1,8 @@
+Testing select on file
+Is set before? 1
+Amount of things ready: 1
+Is set after? 1
+Testing select on pipe
+Is set before? 1
+Amount of things ready: 1
+Is set after? 1
diff --git a/recipes/core/relibc/tests/expected/bins_static/setjmp.stderr b/recipes/core/relibc/tests/expected/bins_static/setjmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/setjmp.stdout b/recipes/core/relibc/tests/expected/bins_static/setjmp.stdout
new file mode 100644
index 0000000000..c7e6bcddd8
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/setjmp.stdout
@@ -0,0 +1,2 @@
+jumping...
+hi from jump
diff --git a/recipes/core/relibc/tests/expected/bins_static/sigaction.stderr b/recipes/core/relibc/tests/expected/bins_static/sigaction.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sigaction.stdout b/recipes/core/relibc/tests/expected/bins_static/sigaction.stdout
new file mode 100644
index 0000000000..8a6d2448ef
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sigaction.stdout
@@ -0,0 +1,5 @@
+Raising...
+Signal handler1 called!
+Raising...
+Signal handler2 called!
+Raised.
diff --git a/recipes/core/relibc/tests/expected/bins_static/sigaltstack.stderr b/recipes/core/relibc/tests/expected/bins_static/sigaltstack.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sigaltstack.stdout b/recipes/core/relibc/tests/expected/bins_static/sigaltstack.stdout
new file mode 100644
index 0000000000..be1dfac342
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sigaltstack.stdout
@@ -0,0 +1,101 @@
+SIGUSR2 handler00
+SIGUSR2 handler01
+SIGUSR2 handler02
+SIGUSR2 handler03
+SIGUSR2 handler04
+SIGUSR2 handler05
+SIGUSR2 handler06
+SIGUSR2 handler07
+SIGUSR2 handler08
+SIGUSR2 handler09
+SIGUSR2 handler10
+SIGUSR2 handler11
+SIGUSR2 handler12
+SIGUSR2 handler13
+SIGUSR2 handler14
+SIGUSR2 handler15
+SIGUSR2 handler16
+SIGUSR2 handler17
+SIGUSR2 handler18
+SIGUSR2 handler19
+SIGUSR2 handler20
+SIGUSR2 handler21
+SIGUSR2 handler22
+SIGUSR2 handler23
+SIGUSR2 handler24
+SIGUSR2 handler25
+SIGUSR2 handler26
+SIGUSR2 handler27
+SIGUSR2 handler28
+SIGUSR2 handler29
+SIGUSR2 handler30
+SIGUSR2 handler31
+SIGUSR2 handler32
+SIGUSR2 handler33
+SIGUSR2 handler34
+SIGUSR2 handler35
+SIGUSR2 handler36
+SIGUSR2 handler37
+SIGUSR2 handler38
+SIGUSR2 handler39
+SIGUSR2 handler40
+SIGUSR2 handler41
+SIGUSR2 handler42
+SIGUSR2 handler43
+SIGUSR2 handler44
+SIGUSR2 handler45
+SIGUSR2 handler46
+SIGUSR2 handler47
+SIGUSR2 handler48
+SIGUSR2 handler49
+SIGUSR2 handler50
+SIGUSR2 handler51
+SIGUSR2 handler52
+SIGUSR2 handler53
+SIGUSR2 handler54
+SIGUSR2 handler55
+SIGUSR2 handler56
+SIGUSR2 handler57
+SIGUSR2 handler58
+SIGUSR2 handler59
+SIGUSR2 handler60
+SIGUSR2 handler61
+SIGUSR2 handler62
+SIGUSR2 handler63
+SIGUSR2 handler64
+SIGUSR2 handler65
+SIGUSR2 handler66
+SIGUSR2 handler67
+SIGUSR2 handler68
+SIGUSR2 handler69
+SIGUSR2 handler70
+SIGUSR2 handler71
+SIGUSR2 handler72
+SIGUSR2 handler73
+SIGUSR2 handler74
+SIGUSR2 handler75
+SIGUSR2 handler76
+SIGUSR2 handler77
+SIGUSR2 handler78
+SIGUSR2 handler79
+SIGUSR2 handler80
+SIGUSR2 handler81
+SIGUSR2 handler82
+SIGUSR2 handler83
+SIGUSR2 handler84
+SIGUSR2 handler85
+SIGUSR2 handler86
+SIGUSR2 handler87
+SIGUSR2 handler88
+SIGUSR2 handler89
+SIGUSR2 handler90
+SIGUSR2 handler91
+SIGUSR2 handler92
+SIGUSR2 handler93
+SIGUSR2 handler94
+SIGUSR2 handler95
+SIGUSR2 handler96
+SIGUSR2 handler97
+SIGUSR2 handler98
+SIGUSR2 handler99
+SIGUSR2 handler00
diff --git a/recipes/core/relibc/tests/expected/bins_static/signal.stderr b/recipes/core/relibc/tests/expected/bins_static/signal.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/signal.stdout b/recipes/core/relibc/tests/expected/bins_static/signal.stdout
new file mode 100644
index 0000000000..7d184e34c8
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/signal.stdout
@@ -0,0 +1,3 @@
+Raising...
+Signal handler called!
+Raised.
diff --git a/recipes/core/relibc/tests/expected/bins_static/sigsetjmp.stderr b/recipes/core/relibc/tests/expected/bins_static/sigsetjmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sigsetjmp.stdout b/recipes/core/relibc/tests/expected/bins_static/sigsetjmp.stdout
new file mode 100644
index 0000000000..eb99a60c8e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sigsetjmp.stdout
@@ -0,0 +1,2 @@
+Starting jump...
+Jump done.
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/all.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/all.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/all.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/all.stdout
new file mode 100644
index 0000000000..92881132c2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/all.stdout
@@ -0,0 +1,4 @@
+H
+Jello World!
+
+Hello
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/buffer.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/buffer.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/buffer.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/buffer.stdout
new file mode 100644
index 0000000000..4b124bc7c0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/buffer.stdout
@@ -0,0 +1,5 @@
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTest
+Hello
+World
+It works
+No buffering issues here
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/dprintf.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/dprintf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/dprintf.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/dprintf.stdout
new file mode 100644
index 0000000000..e12bc872a0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/dprintf.stdout
@@ -0,0 +1,2 @@
+Hello, world
+a
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fgets.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/fgets.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fgets.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/fgets.stdout
new file mode 100644
index 0000000000..a856e2de52
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/fgets.stdout
@@ -0,0 +1,31 @@
+Hello World!
+
+Line 2
+
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
+hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
+qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
+uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
+vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
+zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
+EOF
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fputs.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/fputs.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fputs.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/fputs.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fread.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/fread.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fread.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/fread.stdout
new file mode 100644
index 0000000000..f3fbf213be
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/fread.stdout
@@ -0,0 +1,32 @@
+1
+22
+333
+4444
+55555
+666666
+7777777
+88888888
+999999999
+AAAAAAAAAA
+BBBBBBBBBBB
+CCCCCCCCCCCC
+DDDDDDDDDDDDD
+EEEEEEEEEEEEEE
+FFFFFFFFFFFFFFF
+0000000000000000
+11111111111111111
+222222222222222222
+3333333333333333333
+44444444444444444444
+555555555555555555555
+6666666666666666666666
+77777777777777777777777
+888888888888888888888888
+9999999999999999999999999
+AAAAAAAAAAAAAAAAAAAAAAAAAA
+BBBBBBBBBBBBBBBBBBBBBBBBBBB
+CCCCCCCCCCCCCCCCCCCCCCCCCCCC
+DDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+00000000000000000000000000000000
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/freopen.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/freopen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/freopen.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/freopen.stdout
new file mode 100644
index 0000000000..1dd338fd1a
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/freopen.stdout
@@ -0,0 +1,3 @@
+Hello
+0
+0
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf.stdout
new file mode 100644
index 0000000000..73f11e68cf
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf.stdout
@@ -0,0 +1,14 @@
+1 2 3 9
+9
+16
+35
+48
+92
+109
+152
+201
+241
+276
+293
+299
+301
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf_offby1.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf_offby1.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf_offby1.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf_offby1.stdout
new file mode 100644
index 0000000000..daf724a9e5
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/fscanf_offby1.stdout
@@ -0,0 +1 @@
+1234, 7, 32
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fseek.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/fseek.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fseek.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/fseek.stdout
new file mode 100644
index 0000000000..b6163b2663
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/fseek.stdout
@@ -0,0 +1,2 @@
+Line 2
+ftello: 21
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fwrite.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/fwrite.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/fwrite.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/fwrite.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/getc_unget.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/getc_unget.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/getc_unget.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/getc_unget.stdout
new file mode 100644
index 0000000000..f01a3f968d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/getc_unget.stdout
@@ -0,0 +1 @@
+Worked!
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/getline.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/getline.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/getline.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/getline.stdout
new file mode 100644
index 0000000000..ba753ef6b2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/getline.stdout
@@ -0,0 +1,41 @@
+  1: getline(NULL, NULL, stream)
+     => 22 (Invalid argument) - EINVAL
+  2: getline(NULL, &n, stream)
+     => 22 (Invalid argument) - EINVAL
+  3: getline(&lineptr, NULL, stream)
+     => 22 (Invalid argument) - EINVAL
+  4: getline(NULL, NULL, NULL)
+     => 22 (Invalid argument) - EINVAL
+  5: getline(&lineptr, NULL, NULL)
+     => 22 (Invalid argument) - EINVAL
+  6: getline(NULL, &n, NULL)
+     => 22 (Invalid argument) - EINVAL
+  7: getline(&lineptr, &n, NULL)
+     => 22 (Invalid argument) - EINVAL
+  8: getdelim(&lineptr, &n, 25600, stream)
+     => 22 (Invalid argument) - EINVAL
+
+  1: status = 27, strlen = 27, feof = 0, ferror = 0
+     |>Space: the final frontier.
+  2: status = 1, strlen = 1, feof = 0, ferror = 0
+     |>
+  3: status = 50, strlen = 50, feof = 0, ferror = 0
+     |>These are the voyages of the starship Enterprise.
+  4: status = 24, strlen = 24, feof = 0, ferror = 0
+     |>Its continuing mission:
+  5: status = 33, strlen = 33, feof = 0, ferror = 0
+     |>- to explore strange new worlds;
+  6: status = 46, strlen = 46, feof = 0, ferror = 0
+     |>- to seek out new life and new civilizations;
+  7: status = 45, strlen = 45, feof = 0, ferror = 0
+     |>- to boldly go where no one has gone before!
+
+overread 1, status = -1, feof = 1, ferror = 0
+|~- to boldly go where no one has gone before!
+
+overread 2, status = -1, feof = 1, ferror = 0
+|~- to boldly go where no one has gone before!
+
+overread 3, status = -1, feof = 1, ferror = 0
+|~- to boldly go where no one has gone before!
+
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/mutex.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/mutex.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/mutex.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/mutex.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/popen.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/popen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/popen.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/popen.stdout
new file mode 100644
index 0000000000..05f7216cbe
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/popen.stdout
@@ -0,0 +1,8 @@
+Line 1: 1-never-gonna-give-you-up
+Line 2: 2-never-gonna-let-you-down
+Line 3: 3-never-gonna-run-around
+Line 4: 4-and-desert-you
+Line 5: 5-never-gonna-make-you-cry
+Line 6: 6-never-gonna-say-goodbye
+Line 7: 7-never-gonna-tell-a-lie
+Line 8: 8-and-hurt-you
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/printf.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/printf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/printf.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/printf.stdout
new file mode 100644
index 0000000000..a13543aeb2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/printf.stdout
@@ -0,0 +1,78 @@
+percent: %
+string: String
+char: c
+char: �
+int: -16
+uint: 32
+hex: beef
+HEX: C0FFEE
+string: end
+%n returned 51, total len of write: 94
+
+Padding madness:
+ 001   +2
+   c
+ 0x00000ff
+ 001
+0 0x1
+ 1
+(00123) (  123)
+(-0123) ( -123)
+(             )
+0xabcdef
+(nil)
+
+Positional madness:
+4 3 2
+00002
+|Fiz     |Buz     |     Fiz|     Tot|
+int:          5 double: 0.100000 0.200000 0.300000 0.400000
+-1717986918 0.100000
+-1717986918 0.200000
+
+Float madness:
+        1.234568e+02
+        1.000000E-05
+          123.456789
+            0.000010
+       -1.234568e+02
+-00000001.234568e+02
+%.5g: -123.46
+%.5f: -123.45679
+%.5e: -1.23457e+02
+%.*g: -1.2e+02
+%.*f: -123.46
+%.*e: -1.23e+02
+%.*2$g: -123.46
+%.*2$f: -123.45679
+%.*2$e: -1.23457e+02
+100000
+1e+06
+1.000000e+06
+0.0001
+1E-05
+1.000000E-05
+001234.56
+001234.56
+
+Non-finite float madness:
+%e: inf -inf nan -nan
+%E: INF -INF NAN -NAN
+%f: inf -inf nan -nan
+%F: INF -INF NAN -NAN
+%g: inf -inf nan -nan
+%G: INF -INF NAN -NAN
+Things that have been buggy
++05
+Testing asprintf...
+printed: test string, value: 11
+printed: test string 2, value: 13
+printed: test string 2, value: 13
+
+%m: Owner died
+
+C23:
+Binary %b: 100
+Binary %b alternate: 0b100
+Binary %B: 100
+Binary %B alternate: 0B100
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/printf_neg_pad.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/printf_neg_pad.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/printf_neg_pad.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/printf_neg_pad.stdout
new file mode 100644
index 0000000000..f573a2b6d2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/printf_neg_pad.stdout
@@ -0,0 +1,2 @@
+A    BCC/
+AB    CC/
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/printf_space_pad.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/printf_space_pad.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/printf_space_pad.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/printf_space_pad.stdout
new file mode 100644
index 0000000000..8e9107f351
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/printf_space_pad.stdout
@@ -0,0 +1 @@
+A  B
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/putc_unlocked.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/putc_unlocked.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/putc_unlocked.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/putc_unlocked.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/rename.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/rename.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/rename.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/rename.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/renameat.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/renameat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/renameat.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/renameat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/scanf.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/scanf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/scanf.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/scanf.stdout
new file mode 100644
index 0000000000..dca295ccb5
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/scanf.stdout
@@ -0,0 +1,16 @@
+2, { sa: 12, ia: 345, ib: 0, ic: 0, fa: 0.000000, da: 0.000000, ptr: (nil), char: a, string1: , string2: , string3: , string4:  }
+3, { sa: 12, ia: 18, ib: 837, ic: 8, fa: 0.000000, da: 0.000000, ptr: (nil), char: a, string1: , string2: , string3: , string4:  }
+2, { sa: 12, ia: 18, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: (nil), char: a, string1: , string2: , string3: , string4:  }
+1, { sa: 12, ia: 18, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: a, string1: , string2: , string3: , string4:  }
+1, { sa: 12, ia: 18, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: a, string1: Hello, string2: , string3: , string4:  }
+1, { sa: 12, ia: 15, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: a, string1: Hello, string2: , string3: , string4:  }
+2, { sa: 12, ia: 15, ib: 837, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: elllo, string2: , string3: , string4:  }
+1, { sa: 12, ia: 0, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: elllo, string2: , string3: , string4:  }
+0, { sa: 12, ia: 0, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: elllo, string2: , string3: , string4:  }
+2, { sa: 12, ia: 42, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: world, string2: , string3: , string4:  }
+2, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: world, string2: planet, string3: , string4:  }
+4, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: e, string2: o, string3: l, string4: d }
+4, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: a, string2: e, string3: f, string4: dddddd }
+4, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: a, string2: e, string3: f, string4: dddddd }
+1, { sa: 12, ia: 84, ib: 8, ic: 8, fa: 0.100000, da: 0.200000, ptr: 0xabcdef, char: h, string1: testbbbb, string2: e, string3: f, string4: dddddd }
+3 "https" "//" "redox-os.org" ""
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/setvbuf.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/setvbuf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/setvbuf.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/setvbuf.stdout
new file mode 100644
index 0000000000..ebda98d01a
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/setvbuf.stdout
@@ -0,0 +1,4 @@
+H
+Hello World!
+
+Hello
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/sprintf.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/sprintf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/sprintf.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/sprintf.stdout
new file mode 100644
index 0000000000..4c76b1a825
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/sprintf.stdout
@@ -0,0 +1 @@
+This stri
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_ftell.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_ftell.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_ftell.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_ftell.stdout
new file mode 100644
index 0000000000..e36f413519
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_ftell.stdout
@@ -0,0 +1,28 @@
+#, 0
+i, 1
+n, 2
+h, -9
+e, -8
+l, -7
+l, -6
+o, -5
+ , -4
+w, -3
+o, -2
+r, -1
+l, 0
+d, 1
+
+, 2
+c, 3
+l, 4
+u, 5
+d, 6
+e, 7
+ , 8
+<, 9
+s, 10
+t, 11
+d, 12
+i, 13
+o, 14
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_multiple.stderr b/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_multiple.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_multiple.stdout b/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_multiple.stdout
new file mode 100644
index 0000000000..3b18e512db
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdio/ungetc_multiple.stdout
@@ -0,0 +1 @@
+hello world
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/a64l.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/a64l.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/a64l.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/a64l.stdout
new file mode 100644
index 0000000000..d22f10d973
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/a64l.stdout
@@ -0,0 +1,42 @@
+Correct a64l: azAZ9. = 194301926
+Correct a64l: azA = 53222
+l64a(0): 
+l64a(1): /
+l64a(2): 0
+l64a(11): 9
+l64a(12): A
+l64a(37): Z
+l64a(38): a
+l64a(63): z
+l64a(64): ./
+l64a(65): //
+l64a(4095): zz
+l64a(4096): ../
+l64a(262143): zzz
+l64a(262144): .../
+l64a(16777215): zzzz
+l64a(16777216): ..../
+l64a(1073741823): zzzzz
+l64a(1073741824): ...../
+l64a(2147483647): zzzzz/
+a64l(l64a(0)): 0
+a64l(l64a(1)): 1
+a64l(l64a(2)): 2
+a64l(l64a(11)): 11
+a64l(l64a(12)): 12
+a64l(l64a(37)): 37
+a64l(l64a(38)): 38
+a64l(l64a(63)): 63
+a64l(l64a(64)): 64
+a64l(l64a(65)): 65
+a64l(l64a(4095)): 4095
+a64l(l64a(4096)): 4096
+a64l(l64a(262143)): 262143
+a64l(l64a(262144)): 262144
+a64l(l64a(16777215)): 16777215
+a64l(l64a(16777216)): 16777216
+a64l(l64a(1073741823)): 1073741823
+a64l(l64a(1073741824)): 1073741824
+a64l(l64a(2147483647)): 2147483647
+l64a(x) (lower 32 bits of x are 1985229328): E61Jq/
+a64l(l64a(x)) (lower 32 bits of x are 1985229328): 1985229328
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/alloc.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/alloc.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/alloc.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/alloc.stdout
new file mode 100644
index 0000000000..d5bc92dc00
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/alloc.stdout
@@ -0,0 +1,30 @@
+malloc (size 0): (OK)
+malloc: pointer: (not NULL), error value: 0 = Success
+malloc (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+calloc (size 0): (OK)
+calloc: pointer: (not NULL), error value: 0 = Success
+calloc (overflowing): pointer: (nil), error value: 12 = Out of memory
+realloc (size 0): (OK)
+realloc: pointer: (not NULL), error value: 0 = Success
+realloc (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+reallocarray: pointer: (not NULL), error value: 0 = Success
+reallocarray (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+memalign (size 0): (OK)
+memalign: pointer: (alignment OK), error value: 0 = Success
+memalign (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+memalign (alignment 0): pointer: (nil), error value: 22 = Invalid argument
+memalign (alignment 3): pointer: (nil), error value: 22 = Invalid argument
+aligned_alloc (size % alignment == 0): pointer: (alignment OK), error value: 0 = Success
+aligned_alloc (size % alignment != 0): pointer: (nil), error value: 22 = Invalid argument
+valloc (size 0): (OK)
+valloc: pointer: (alignment OK), error value: 0 = Success
+valloc (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+posix_memalign: pointer: (alignment OK), error value: 0 = Success
+posix_memalign (alignment 0): pointer: (nil), error value: 22 = Invalid argument
+posix_memalign (non-power-of-two multiple of sizeof(void *)): pointer: (nil), error value: 22 = Invalid argument
+posix_memalign (size 0): (OK)
+posix_memalign (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
+pvalloc (size 0): (OK)
+pvalloc: pointer: (alignment OK), error value: 0 = Success
+pvalloc (2 pages): pointer: (alignment OK), error value: 0 = Success
+pvalloc (SIZE_MAX): pointer: (nil), error value: 12 = Out of memory
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/atof.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/atof.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/atof.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/atof.stdout
new file mode 100644
index 0000000000..3227d85385
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/atof.stdout
@@ -0,0 +1,2 @@
+-3.140000
+inf
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/atoi.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/atoi.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/atoi.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/atoi.stdout
new file mode 100644
index 0000000000..d90e37ccea
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/atoi.stdout
@@ -0,0 +1,6 @@
+-42
+555
+1234567890
+-42
+555
+1234567890
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/div.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/div.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/div.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/div.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/env.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/env.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/env.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/env.stdout
new file mode 100644
index 0000000000..a0596ab55e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/env.stdout
@@ -0,0 +1,8 @@
+It's working!!
+Updates accordingly.
+in place
+TEST=in place
+Value overwritten and not in place because it's really long
+TEST=in place
+Value overwritten and not in place because it's really long
+Value deleted successfully!
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/getsubopt.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/getsubopt.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/getsubopt.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/getsubopt.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/mkostemps.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/mkostemps.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/mkostemps.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/mkostemps.stdout
new file mode 100644
index 0000000000..f3562f6879
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/mkostemps.stdout
@@ -0,0 +1,3 @@
+Start unchanged: 0
+End unchanged: 0
+Read & Write Successful
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/ptsname.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/ptsname.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/ptsname.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/ptsname.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/qsort.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/qsort.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/qsort.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/qsort.stdout
new file mode 100644
index 0000000000..49755a611e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/qsort.stdout
@@ -0,0 +1,2 @@
+Before: 23 16 8 4 42 15 
+After: 4 8 15 16 23 42 
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/rand.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/rand.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/rand.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/rand.stdout
new file mode 100644
index 0000000000..2a50461db2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/rand.stdout
@@ -0,0 +1,8 @@
+67141780
+201425341
+201425341
+67141780
+264204
+271585844
+264204
+271585844
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/rand48.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/rand48.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/rand48.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/rand48.stdout
new file mode 100644
index 0000000000..fa871030ba
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/rand48.stdout
@@ -0,0 +1,14 @@
+lrand48 (uninitialized): 0 2116118 89401895 379337186 782977366 196130996 198207689 1046291021 1131187612 975888346
+drand48 (seeded with srand48): 0.750266 0.607593 0.567593 0.799563 0.984984 0.205670 0.625922 0.794426 0.369416 0.854100
+lrand48 (seeded with srand48): 1611183183 1304796356 1218897288 1717049088 2115236938 441672110 1344158015 1706017430 793314380 1834165927
+mrand48 (seeded with srand48): -1072600929 -1685374584 -1857172720 -860869119 -64493420 883344220 -1606651266 -882932436 1586628760 -626635441
+erand48: 0.210555 0.014158 0.111353 0.658369 0.103767 0.180385 0.945033 0.745768 0.290272 0.111716
+nrand48: 514983590 590935818 1480794144 1496813112 2133865028 1816766485 2095074020 126058208 909762120 14734916
+jrand48: -1066398599 903693914 -1922375113 -2090140830 1218074962 1662411059 -722435322 764426686 -874142666 -1454656015
+seed48_return: [40c0, 4d4f, daa6]
+lrand48 (seeded with seed48): 386486647 2049879217 706208537 1265096744 1586830881 1884641178 1566935266 1256810805 875501172 1670187935
+xsubi restored froom seed48 return value: [40c0, 4d4f, daa6]
+nrand48 (from xsubi value returned by seed48): 1654466549 509433115 2007628085 1022767111 1935848687 967444157 1967758021 686622820 989863078 1688030308
+lrand48 (with parameters from lcong48): 2015972364 2009368981 971134301 317520085 149004773 538917235 242519436 1066970146 991527304 1588277058
+lrand48 (seeded with srand48 after lcong48 call): 1611183183 1304796356 1218897288 1717049088 2115236938 441672110 1344158015 1706017430 793314380 1834165927
+lrand48 (seeded with seed48 after lcong48 call): 386486647 2049879217 706208537 1265096744 1586830881 1884641178 1566935266 1256810805 875501172 1670187935
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/random.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/random.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/random.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/random.stdout
new file mode 100644
index 0000000000..9a754a9eb6
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/random.stdout
@@ -0,0 +1,1011 @@
+Uninitialized:
+262836907
+2022765545
+1985587709
+1559253607
+547725525
+1277054513
+317849018
+1695317205
+643446864
+1262735440
+964614733
+622582094
+280266812
+1939173898
+732650777
+1270232897
+336669216
+1669264236
+554325996
+1080138202
+1193538846
+2016671310
+1114491314
+2115358120
+2122955106
+982493572
+450262557
+439534734
+1723376538
+2066693252
+901041
+1986213445
+1941975150
+1986488750
+1397983404
+342217027
+1116059615
+1715832423
+2037534232
+1759506479
+831084215
+854665318
+234604926
+1111351027
+646355568
+967255703
+234100276
+983024785
+489036291
+788426273
+2063162987
+1682575137
+657613935
+1030170653
+1650449610
+633085394
+2012664225
+2100712167
+1072620128
+1588557116
+2019921771
+1073521169
+1427286913
+1814413273
+912526271
+677786670
+9146653
+2028585886
+246135445
+2046680885
+
+Seed 1:
+262836907
+2022765545
+1985587709
+1559253607
+547725525
+1277054513
+317849018
+1695317205
+643446864
+1262735440
+964614733
+622582094
+280266812
+1939173898
+732650777
+1270232897
+336669216
+1669264236
+554325996
+1080138202
+1193538846
+2016671310
+1114491314
+2115358120
+2122955106
+982493572
+450262557
+439534734
+1723376538
+2066693252
+901041
+1986213445
+1941975150
+1986488750
+1397983404
+342217027
+1116059615
+1715832423
+2037534232
+1759506479
+831084215
+854665318
+234604926
+1111351027
+646355568
+967255703
+234100276
+983024785
+489036291
+788426273
+2063162987
+1682575137
+657613935
+1030170653
+1650449610
+633085394
+2012664225
+2100712167
+1072620128
+1588557116
+2019921771
+1073521169
+1427286913
+1814413273
+912526271
+677786670
+9146653
+2028585886
+246135445
+2046680885
+
+Seed 1337:
+1124688561
+1792831582
+1708122057
+1060061055
+2060905921
+703006049
+867046930
+1599327113
+1946461956
+1851068511
+2107308161
+1080994526
+361067458
+2035914970
+1577981791
+72922558
+783590643
+1752267570
+1350489214
+1338091804
+225460930
+62532035
+540341638
+1391100769
+1535109757
+2039272559
+206716062
+1139547941
+462353593
+1176324546
+1766476968
+1587042155
+821672480
+1327115377
+499619562
+735094753
+2030121427
+1366666492
+186938219
+1829099735
+1070251355
+146762732
+762610613
+1431318813
+35194054
+193108756
+1504241371
+818784698
+1945376326
+707246937
+9392854
+23353608
+769778973
+549734493
+1414454377
+157405082
+441523404
+1621170440
+1296953024
+903876997
+650011338
+915946344
+343435504
+1471683818
+95578073
+843055066
+59294924
+2125699500
+62237911
+246233143
+
+Seed 42, size 8:
+1250496027
+1116302264
+1000676753
+1668674806
+908095735
+71666532
+896336333
+1736731266
+1314989459
+1535244752
+391441865
+1108520142
+1206814703
+534045436
+1974836613
+238077914
+1413854219
+705377000
+397905153
+1440974758
+1972995559
+282367380
+881784893
+1823504434
+879663491
+70219520
+1215814457
+1726604670
+318196447
+1939145516
+1030877685
+968547210
+1513076219
+1793402392
+1673312369
+1341335126
+481933015
+1376947140
+1980983981
+529748450
+192473459
+2072944688
+631833769
+202943022
+2012129743
+762679132
+1776566885
+562641722
+542512107
+293225800
+266051553
+1950339334
+562037703
+932343284
+1167153437
+829945746
+711923043
+392328544
+485452313
+748288734
+1303618751
+1013548940
+1115918037
+1967580906
+210226651
+149786744
+1677411153
+1109690294
+2007723191
+1000815652
+
+Seed 42, size 31:
+1250496027
+1116302264
+1000676753
+1668674806
+908095735
+71666532
+896336333
+1736731266
+1314989459
+1535244752
+391441865
+1108520142
+1206814703
+534045436
+1974836613
+238077914
+1413854219
+705377000
+397905153
+1440974758
+1972995559
+282367380
+881784893
+1823504434
+879663491
+70219520
+1215814457
+1726604670
+318196447
+1939145516
+1030877685
+968547210
+1513076219
+1793402392
+1673312369
+1341335126
+481933015
+1376947140
+1980983981
+529748450
+192473459
+2072944688
+631833769
+202943022
+2012129743
+762679132
+1776566885
+562641722
+542512107
+293225800
+266051553
+1950339334
+562037703
+932343284
+1167153437
+829945746
+711923043
+392328544
+485452313
+748288734
+1303618751
+1013548940
+1115918037
+1967580906
+210226651
+149786744
+1677411153
+1109690294
+2007723191
+1000815652
+
+Seed 42, size 32:
+1105844101
+1165395678
+461296413
+1259424640
+70225557
+1467961981
+315013290
+1176069659
+485874011
+776309703
+288010651
+556099569
+96788036
+603023941
+1732169228
+582662048
+1379333644
+2020179879
+1138761617
+1476121681
+475720173
+723447197
+2058783729
+1855053817
+596143428
+1050061698
+1183691850
+1071863601
+1773508895
+1094991931
+779433771
+222168675
+2145053629
+1963125621
+1294032277
+1771078876
+910633905
+2073466048
+1993247552
+908203886
+1889108021
+1139796181
+531799115
+652258278
+1065778581
+377563019
+1560462165
+807402954
+1517359200
+2092261280
+1459661233
+435654133
+322340651
+872639750
+1243057087
+1839699851
+817417382
+555234672
+127870336
+1139758033
+1427874422
+1370927423
+831974236
+97808156
+1926162096
+959844572
+1237566189
+1206552870
+183288347
+2069540425
+
+Seed 42, size 63:
+1105844101
+1165395678
+461296413
+1259424640
+70225557
+1467961981
+315013290
+1176069659
+485874011
+776309703
+288010651
+556099569
+96788036
+603023941
+1732169228
+582662048
+1379333644
+2020179879
+1138761617
+1476121681
+475720173
+723447197
+2058783729
+1855053817
+596143428
+1050061698
+1183691850
+1071863601
+1773508895
+1094991931
+779433771
+222168675
+2145053629
+1963125621
+1294032277
+1771078876
+910633905
+2073466048
+1993247552
+908203886
+1889108021
+1139796181
+531799115
+652258278
+1065778581
+377563019
+1560462165
+807402954
+1517359200
+2092261280
+1459661233
+435654133
+322340651
+872639750
+1243057087
+1839699851
+817417382
+555234672
+127870336
+1139758033
+1427874422
+1370927423
+831974236
+97808156
+1926162096
+959844572
+1237566189
+1206552870
+183288347
+2069540425
+
+Seed 42, size 64:
+2058979096
+1114567745
+1168098319
+1326828429
+585052544
+738633083
+1597984519
+103976400
+637164838
+949355699
+301019638
+1539653489
+829283131
+1994476715
+899306595
+810802043
+1925369788
+945984460
+125329241
+710381785
+1449014869
+899515740
+1003492141
+1640656979
+442529030
+743548669
+135718510
+965001641
+811994708
+1711301303
+374619698
+152505839
+1098490299
+1223819540
+1934201325
+1235732546
+2135248287
+991256780
+484430111
+926959142
+1670507811
+1806226321
+623744314
+1435739022
+999556678
+1374176376
+1526682215
+477688866
+1701508406
+1488226084
+576474982
+564239621
+1555496401
+2039926513
+819402007
+342426170
+1168843
+624913157
+2060652179
+912725209
+139417938
+1666100153
+2143789020
+1697813778
+1038556214
+1615031197
+31787170
+1587283572
+1479726437
+151644796
+
+Seed 42, size 127:
+2058979096
+1114567745
+1168098319
+1326828429
+585052544
+738633083
+1597984519
+103976400
+637164838
+949355699
+301019638
+1539653489
+829283131
+1994476715
+899306595
+810802043
+1925369788
+945984460
+125329241
+710381785
+1449014869
+899515740
+1003492141
+1640656979
+442529030
+743548669
+135718510
+965001641
+811994708
+1711301303
+374619698
+152505839
+1098490299
+1223819540
+1934201325
+1235732546
+2135248287
+991256780
+484430111
+926959142
+1670507811
+1806226321
+623744314
+1435739022
+999556678
+1374176376
+1526682215
+477688866
+1701508406
+1488226084
+576474982
+564239621
+1555496401
+2039926513
+819402007
+342426170
+1168843
+624913157
+2060652179
+912725209
+139417938
+1666100153
+2143789020
+1697813778
+1038556214
+1615031197
+31787170
+1587283572
+1479726437
+151644796
+
+Seed 42, size 128:
+1105844101
+1165395678
+461296413
+1259424640
+2024747114
+1114771942
+1792613078
+189454326
+466435881
+883763281
+1626567616
+1631629466
+1277725798
+1234887654
+657326752
+1836263319
+715263951
+471085233
+2086498417
+1163602145
+1547997976
+1405363974
+632333445
+201224285
+286947872
+1468210882
+103627486
+2147177614
+373040761
+1110293054
+1202766264
+1478884863
+128205084
+1664062677
+590825855
+5468550
+631350971
+235955286
+194922877
+1097786852
+1119718567
+1821490493
+581932670
+249960717
+908894499
+1239259422
+2086224037
+1624158450
+1710344655
+2025238806
+640276948
+1110858983
+1283119132
+1272610393
+1312083268
+1570067004
+593337627
+1415710754
+1569760970
+966378389
+378520161
+625043586
+297779604
+506725245
+141622615
+888605459
+512193796
+772973586
+1124560745
+707116673
+
+Seed 42, size 255:
+1105844101
+1165395678
+461296413
+1259424640
+2024747114
+1114771942
+1792613078
+189454326
+466435881
+883763281
+1626567616
+1631629466
+1277725798
+1234887654
+657326752
+1836263319
+715263951
+471085233
+2086498417
+1163602145
+1547997976
+1405363974
+632333445
+201224285
+286947872
+1468210882
+103627486
+2147177614
+373040761
+1110293054
+1202766264
+1478884863
+128205084
+1664062677
+590825855
+5468550
+631350971
+235955286
+194922877
+1097786852
+1119718567
+1821490493
+581932670
+249960717
+908894499
+1239259422
+2086224037
+1624158450
+1710344655
+2025238806
+640276948
+1110858983
+1283119132
+1272610393
+1312083268
+1570067004
+593337627
+1415710754
+1569760970
+966378389
+378520161
+625043586
+297779604
+506725245
+141622615
+888605459
+512193796
+772973586
+1124560745
+707116673
+
+Seed 42, size 256:
+2058979096
+1114567745
+1168098319
+1326828429
+585052544
+738633083
+1597984519
+103976400
+637164838
+949355699
+301019638
+1539653489
+829283131
+1994476715
+240955585
+1996759270
+1022456556
+1580994077
+1061370374
+875128855
+1125363953
+1573702147
+503131242
+1969480447
+1438211747
+91438056
+1120505602
+1956383039
+1858786240
+1571532334
+1295962411
+342691299
+190922750
+587812343
+1882440834
+1251108553
+1546539316
+237235092
+229958515
+1788514159
+1180131104
+1278005195
+1236529116
+1834489224
+2008240486
+153071308
+1122241977
+1443493489
+827253675
+1844422894
+1615942404
+1444719301
+1322997186
+2068652336
+1108669174
+1117641112
+329168079
+1033958612
+870068653
+1235189147
+1628422544
+186507460
+1238820988
+1150316436
+117400533
+1285498853
+464843634
+1049896178
+1788529262
+1239030133
+
+Seed 42, other state array:
+1105844101
+1165395678
+461296413
+1259424640
+70225557
+1467961981
+315013290
+1176069659
+485874011
+776309703
+288010651
+556099569
+96788036
+603023941
+1732169228
+582662048
+1379333644
+2020179879
+1138761617
+1476121681
+475720173
+723447197
+2058783729
+1855053817
+596143428
+1050061698
+1183691850
+1071863601
+1773508895
+1094991931
+779433771
+222168675
+2145053629
+1963125621
+1294032277
+1771078876
+910633905
+2073466048
+1993247552
+908203886
+1889108021
+1139796181
+531799115
+652258278
+1065778581
+377563019
+1560462165
+807402954
+1517359200
+2092261280
+1459661233
+435654133
+322340651
+872639750
+1243057087
+1839699851
+817417382
+555234672
+127870336
+1139758033
+1427874422
+1370927423
+831974236
+97808156
+1926162096
+959844572
+1237566189
+1206552870
+183288347
+2069540425
+
+State data pointer restored correctly by setstate().
+
+Seed 42, back to first state array:
+1343006534
+1980171372
+782043423
+1083063062
+475232903
+1304516034
+1151509101
+1392464686
+1241740309
+116713217
+1697707295
+611594021
+1486722877
+464603182
+2038305329
+393952924
+215949723
+1654161471
+1745599527
+718621482
+527520873
+238823465
+1810355799
+958834563
+1301525862
+1492448612
+2080260955
+1815218141
+918843046
+317898715
+555133807
+785092322
+426122834
+1606253938
+736775485
+1973304601
+1660310177
+1521067015
+1674138324
+648896653
+2092390142
+772160169
+469099415
+2085041819
+1382277472
+557791010
+478959698
+1587628873
+557786337
+886954417
+1920913029
+643498035
+1878687182
+1359626079
+1546133539
+637470879
+1787787315
+1905187849
+1043203054
+1508046688
+410459218
+51504832
+1290534966
+486057852
+318745576
+1100789000
+36368414
+511601317
+1816117351
+820142804
+
+Pointer returned by initstate with size < 8: (nil)
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/strtod.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/strtod.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/strtod.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/strtod.stdout
new file mode 100644
index 0000000000..a92def04f3
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/strtod.stdout
@@ -0,0 +1,196 @@
+d: 0.000000 Endptr: "a 1 hello"
+d: 1.000000 Endptr: " hello"
+d: 1.000000 Endptr: " hello 2"
+d: 10.123000 Endptr: ""
+d: 10.123000 Endptr: ""
+d: -5.300000 Endptr: ""
+d: 16.071045 Endptr: ""
+d: 1.136719 Endptr: ""
+d: 3.128906 Endptr: ""
+d: 100000.000000 Endptr: ""
+d: 100000.000000 Endptr: ""
+d: 0.000010 Endptr: ""
+d: 100000.000000 Endptr: "   "
+d: 100000.000000 Endptr: "   "
+d: 0.000010 Endptr: "   "
+d: 10000000000.000000 Endptr: ""
+d: 1.000000 Endptr: "eXXXX"
+d: 1.000000 Endptr: "e"
+d: 1.000000 Endptr: "e "
+d: 10000000000.000000 Endptr: ""
+d: 1.000000 Endptr: "e+XXXX"
+d: 1.000000 Endptr: "e+"
+d: 1.000000 Endptr: "e+ "
+d: 0.000000 Endptr: ""
+d: 1.000000 Endptr: "e-XXXX"
+d: 1.000000 Endptr: "e-"
+d: 1.000000 Endptr: "e- "
+d: -100000.000000 Endptr: ""
+d: -100000.000000 Endptr: ""
+d: -0.000010 Endptr: ""
+d: -100000.000000 Endptr: "   "
+d: -100000.000000 Endptr: "   "
+d: -0.000010 Endptr: "   "
+d: -10000000000.000000 Endptr: ""
+d: -1.000000 Endptr: "eXXXX"
+d: -1.000000 Endptr: "e"
+d: -1.000000 Endptr: "e "
+d: -10000000000.000000 Endptr: ""
+d: -1.000000 Endptr: "e+XXXX"
+d: -1.000000 Endptr: "e+"
+d: -1.000000 Endptr: "e+ "
+d: -0.000000 Endptr: ""
+d: -1.000000 Endptr: "e-XXXX"
+d: -1.000000 Endptr: "e-"
+d: -1.000000 Endptr: "e- "
+d: 1234000.000000 Endptr: ""
+d: 1234000.000000 Endptr: ""
+d: 0.000123 Endptr: ""
+d: 1234000.000000 Endptr: "   "
+d: 1234000.000000 Endptr: "   "
+d: 0.000123 Endptr: "   "
+d: 123400000000.000000 Endptr: ""
+d: 12.340000 Endptr: "eXXXX"
+d: 12.340000 Endptr: "e"
+d: 12.340000 Endptr: "e "
+d: 123400000000.000000 Endptr: ""
+d: 12.340000 Endptr: "e+XXXX"
+d: 12.340000 Endptr: "e+"
+d: 12.340000 Endptr: "e+ "
+d: 0.000000 Endptr: ""
+d: 12.340000 Endptr: "e-XXXX"
+d: 12.340000 Endptr: "e-"
+d: 12.340000 Endptr: "e- "
+d: -1234000.000000 Endptr: ""
+d: -1234000.000000 Endptr: ""
+d: -0.000123 Endptr: ""
+d: -1234000.000000 Endptr: "   "
+d: -1234000.000000 Endptr: "   "
+d: -0.000123 Endptr: "   "
+d: -123400000000.000000 Endptr: ""
+d: -12.340000 Endptr: "eXXXX"
+d: -12.340000 Endptr: "e"
+d: -12.340000 Endptr: "e "
+d: -123400000000.000000 Endptr: ""
+d: -12.340000 Endptr: "e+XXXX"
+d: -12.340000 Endptr: "e+"
+d: -12.340000 Endptr: "e+ "
+d: -0.000000 Endptr: ""
+d: -12.340000 Endptr: "e-XXXX"
+d: -12.340000 Endptr: "e-"
+d: -12.340000 Endptr: "e- "
+d: 192.000000 Endptr: ""
+d: -192.000000 Endptr: ""
+d: 0.005859 Endptr: ""
+d: -0.005859 Endptr: ""
+d: 10.000000 Endptr: ""
+d: 0.156250 Endptr: ""
+d: -10.000000 Endptr: ""
+d: -0.156250 Endptr: ""
+d: 16.062500 Endptr: ""
+d: 16.062500 Endptr: ""
+d: -16.062500 Endptr: ""
+d: -16.062500 Endptr: ""
+d: 0.500000 Endptr: ""
+d: 5.000000 Endptr: ""
+d: 50.000000 Endptr: ""
+d: 500.000000 Endptr: ""
+d: 5000.000000 Endptr: ""
+d: 50000.000000 Endptr: ""
+d: 500000.000000 Endptr: ""
+d: 5000000.000000 Endptr: ""
+d: 50000000.000000 Endptr: ""
+d: 500000000.000000 Endptr: ""
+d: 5000000000.000000 Endptr: ""
+d: 50000000000.000000 Endptr: ""
+d: 500000000000.000000 Endptr: ""
+d: 5000000000000.000000 Endptr: ""
+d: 50000000000000.000000 Endptr: ""
+d: 500000000000000.000000 Endptr: ""
+d: 5000000000000000.000000 Endptr: ""
+d: 50000000000000000.000000 Endptr: ""
+d: 500000000000000000.000000 Endptr: ""
+d: 5000000000000000000.000000 Endptr: ""
+d: 50000000000000000000.000000 Endptr: ""
+d: 500000000000000000000.000000 Endptr: ""
+d: 5000000000000000000000.000000 Endptr: ""
+d: 49999999999999995805696.000000 Endptr: ""
+d: 499999999999999991611392.000000 Endptr: ""
+d: 5000000000000000452984832.000000 Endptr: ""
+d: 50000000000000002382364672.000000 Endptr: ""
+d: 500000000000000006643777536.000000 Endptr: ""
+d: 4999999999999999791559868416.000000 Endptr: ""
+d: 49999999999999995716575428608.000000 Endptr: ""
+d: 500000000000000009942312419328.000000 Endptr: ""
+d: 4999999999999999817948147482624.000000 Endptr: ""
+d: 50000000000000002683081102196736.000000 Endptr: ""
+d: 499999999999999972787615493521408.000000 Endptr: ""
+d: 4999999999999999727876154935214080.000000 Endptr: ""
+d: 49999999999999998431683053958987776.000000 Endptr: ""
+d: 500000000000000021210318687008980992.000000 Endptr: ""
+d: 4999999999999999769381329101060571136.000000 Endptr: ""
+d: 49999999999999998874404911728017014784.000000 Endptr: ""
+d: -0.500000 Endptr: ""
+d: -5.000000 Endptr: ""
+d: -50.000000 Endptr: ""
+d: -500.000000 Endptr: ""
+d: -5000.000000 Endptr: ""
+d: -50000.000000 Endptr: ""
+d: -500000.000000 Endptr: ""
+d: -5000000.000000 Endptr: ""
+d: -50000000.000000 Endptr: ""
+d: -500000000.000000 Endptr: ""
+d: -5000000000.000000 Endptr: ""
+d: -50000000000.000000 Endptr: ""
+d: -500000000000.000000 Endptr: ""
+d: -5000000000000.000000 Endptr: ""
+d: -50000000000000.000000 Endptr: ""
+d: -500000000000000.000000 Endptr: ""
+d: -5000000000000000.000000 Endptr: ""
+d: -50000000000000000.000000 Endptr: ""
+d: -500000000000000000.000000 Endptr: ""
+d: -5000000000000000000.000000 Endptr: ""
+d: -50000000000000000000.000000 Endptr: ""
+d: -500000000000000000000.000000 Endptr: ""
+d: -5000000000000000000000.000000 Endptr: ""
+d: -49999999999999995805696.000000 Endptr: ""
+d: -499999999999999991611392.000000 Endptr: ""
+d: -5000000000000000452984832.000000 Endptr: ""
+d: -50000000000000002382364672.000000 Endptr: ""
+d: -500000000000000006643777536.000000 Endptr: ""
+d: -4999999999999999791559868416.000000 Endptr: ""
+d: -49999999999999995716575428608.000000 Endptr: ""
+d: -500000000000000009942312419328.000000 Endptr: ""
+d: -4999999999999999817948147482624.000000 Endptr: ""
+d: -50000000000000002683081102196736.000000 Endptr: ""
+d: -499999999999999972787615493521408.000000 Endptr: ""
+d: -4999999999999999727876154935214080.000000 Endptr: ""
+d: -49999999999999998431683053958987776.000000 Endptr: ""
+d: -500000000000000021210318687008980992.000000 Endptr: ""
+d: -4999999999999999769381329101060571136.000000 Endptr: ""
+d: -49999999999999998874404911728017014784.000000 Endptr: ""
+d: -0.000000 Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: " foobarbaz"
+d: inf Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: ""
+d: inf Endptr: " foobarbaz"
+d: -inf Endptr: ""
+d: -inf Endptr: ""
+d: -inf Endptr: ""
+d: -inf Endptr: " foobarbaz"
+d: nan Endptr: "0.1e5"
+d: nan Endptr: "-37"
+d: nan Endptr: "1.05"
+d: nan Endptr: " foo bar baz"
+d: nan Endptr: "0.1e5"
+d: nan Endptr: "-37"
+d: nan Endptr: "1.05"
+d: nan Endptr: " foo bar baz"
+d: nan Endptr: "0.1e5"
+d: nan Endptr: "-37"
+d: nan Endptr: "1.05"
+d: nan Endptr: " foo bar baz"
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/strtol.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/strtol.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/strtol.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/strtol.stdout
new file mode 100644
index 0000000000..4c4177ba7b
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/strtol.stdout
@@ -0,0 +1,26 @@
+-42
+endptr ""
+555
+endptr ""
+1234567890
+endptr "    "
+-42
+endptr ""
+555
+endptr ""
+1234567890
+endptr "    "
+38acf
+endptr "g"
+abcdef12
+endptr ""
+cafebeef
+endptr ""
+731
+endptr "89"
+731
+endptr "89"
+0
+endptr "b"
+0
+endptr "b"
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/strtoul.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/strtoul.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/strtoul.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/strtoul.stdout
new file mode 100644
index 0000000000..398260ab44
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/strtoul.stdout
@@ -0,0 +1,26 @@
+-42
+endptr ""
+555
+endptr ""
+1234567890
+endptr "    "
+-42
+endptr ""
+555
+endptr ""
+1234567890
+endptr "    "
+38acf
+endptr "g"
+abcdef12
+endptr ""
+21000004
+endptr ""
+731
+endptr "89"
+731
+endptr "89"
+0
+endptr "b"
+0
+endptr "b"
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/system.stderr b/recipes/core/relibc/tests/expected/bins_static/stdlib/system.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/stdlib/system.stdout b/recipes/core/relibc/tests/expected/bins_static/stdlib/system.stdout
new file mode 100644
index 0000000000..90f99da2e1
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/stdlib/system.stdout
@@ -0,0 +1,2 @@
+shell found: 1
+test of system
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/mem.stderr b/recipes/core/relibc/tests/expected/bins_static/string/mem.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/mem.stdout b/recipes/core/relibc/tests/expected/bins_static/string/mem.stdout
new file mode 100644
index 0000000000..a6c001081f
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/mem.stdout
@@ -0,0 +1,5 @@
+# mem #
+Correct memchr
+Correct memrchr
+Correct memccpy
+Correct memcmp
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/memcpy.stderr b/recipes/core/relibc/tests/expected/bins_static/string/memcpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/memcpy.stdout b/recipes/core/relibc/tests/expected/bins_static/string/memcpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/memmem.stderr b/recipes/core/relibc/tests/expected/bins_static/string/memmem.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/memmem.stdout b/recipes/core/relibc/tests/expected/bins_static/string/memmem.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/stpcpy.stderr b/recipes/core/relibc/tests/expected/bins_static/string/stpcpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/stpcpy.stdout b/recipes/core/relibc/tests/expected/bins_static/string/stpcpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/stpncpy.stderr b/recipes/core/relibc/tests/expected/bins_static/string/stpncpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/stpncpy.stdout b/recipes/core/relibc/tests/expected/bins_static/string/stpncpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strcat.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strcat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strcat.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strcat.stdout
new file mode 100644
index 0000000000..10bda51843
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strcat.stdout
@@ -0,0 +1,2 @@
+hello world
+hello world
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strchr.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strchr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strchr.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strchr.stdout
new file mode 100644
index 0000000000..43f3dcfdf0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strchr.stdout
@@ -0,0 +1,4 @@
+ello
+ld
+
+(nil)
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strchrnul.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strchrnul.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strchrnul.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strchrnul.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strcpy.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strcpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strcpy.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strcpy.stdout
new file mode 100644
index 0000000000..f08e831ac1
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strcpy.stdout
@@ -0,0 +1,7 @@
+strcpy works!
+strncpy works!
+strncpy shaaaaaaaaa
+strlcpy works!
+copied 14
+strlcpy works! and strlcat!
+copied 27
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strcspn.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strcspn.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strcspn.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strcspn.stdout
new file mode 100644
index 0000000000..2b24e31277
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strcspn.stdout
@@ -0,0 +1,2 @@
+2
+6
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strlen.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strlen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strlen.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strlen.stdout
new file mode 100644
index 0000000000..9ce90c8a65
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strlen.stdout
@@ -0,0 +1,9 @@
+12
+0
+12
+12
+0
+12
+6
+12
+0
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strncmp.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strncmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strncmp.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strncmp.stdout
new file mode 100644
index 0000000000..e385d8a988
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strncmp.stdout
@@ -0,0 +1,6 @@
+-97
+-195
+1
+-255
+-2
+0
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strpbrk.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strpbrk.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strpbrk.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strpbrk.stdout
new file mode 100644
index 0000000000..7a6bc8b089
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strpbrk.stdout
@@ -0,0 +1,3 @@
+The quick drawn fix jumps over the lazy bug
+lazy bug
+NULL
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strrchr.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strrchr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strrchr.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strrchr.stdout
new file mode 100644
index 0000000000..836469707d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strrchr.stdout
@@ -0,0 +1 @@
+strrch PASS
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strsep.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strsep.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strsep.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strsep.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strsignal.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strsignal.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strsignal.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strsignal.stdout
new file mode 100644
index 0000000000..833dc63089
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strsignal.stdout
@@ -0,0 +1 @@
+# strsignal #
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strspn.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strspn.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strspn.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strspn.stdout
new file mode 100644
index 0000000000..54d9c92604
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strspn.stdout
@@ -0,0 +1,3 @@
+5
+1
+0
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strstr.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strstr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strstr.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strstr.stdout
new file mode 100644
index 0000000000..56fe13b7b1
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strstr.stdout
@@ -0,0 +1,5 @@
+rust
+libc we trust
+(null)
+(null)
+RUST
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strtok.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strtok.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strtok.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strtok.stdout
new file mode 100644
index 0000000000..4428c25c54
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strtok.stdout
@@ -0,0 +1 @@
+I'd_just_like_to_interject_for_a_moment._What_you're_referring_to_as_Linux,_is_in_fact,_GNU/Linux,_or_as_I've_recently_taken_to_calling_it,_GNU_plus_Linux.
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strtok_r.stderr b/recipes/core/relibc/tests/expected/bins_static/string/strtok_r.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/string/strtok_r.stdout b/recipes/core/relibc/tests/expected/bins_static/string/strtok_r.stdout
new file mode 100644
index 0000000000..4428c25c54
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/string/strtok_r.stdout
@@ -0,0 +1 @@
+I'd_just_like_to_interject_for_a_moment._What_you're_referring_to_as_Linux,_is_in_fact,_GNU/Linux,_or_as_I've_recently_taken_to_calling_it,_GNU_plus_Linux.
diff --git a/recipes/core/relibc/tests/expected/bins_static/strings.stderr b/recipes/core/relibc/tests/expected/bins_static/strings.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/strings.stdout b/recipes/core/relibc/tests/expected/bins_static/strings.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_epoll/epollet.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_epoll/epollet.stdout
new file mode 100644
index 0000000000..cc912d90cf
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sys_epoll/epollet.stdout
@@ -0,0 +1,5 @@
+ctl ADD: 0
+wait for HUP, edge-triggered: 1
+wait for HUP again: 0
+ctl MOD: 0
+wait for HUP: 1
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_mman.stderr b/recipes/core/relibc/tests/expected/bins_static/sys_mman.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_mman.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_mman.stdout
new file mode 100644
index 0000000000..108b1819b0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sys_mman.stdout
@@ -0,0 +1,9 @@
+Page size: 4096
+Mapping 1 page of memory...
+Mapping 3 pages of memory...
+Randomizing mapping #1
+Randomizing mapping #2
+Unmapping page 2 of map2
+Randomizing page 1 of mapping #2
+Randomizing page 3 of mapping #2
+Unmapping it all at once!
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_socket/recv.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_socket/recv.stdout
new file mode 100644
index 0000000000..cb2239126a
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sys_socket/recv.stdout
@@ -0,0 +1,2 @@
+send foo
+recv foo
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_socket/recvfrom.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_socket/recvfrom.stdout
new file mode 100644
index 0000000000..e9f413f935
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sys_socket/recvfrom.stdout
@@ -0,0 +1,2 @@
+sendto   bar
+recvfrom bar
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixpeername.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixpeername.stdout
new file mode 100644
index 0000000000..f9686e7295
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixpeername.stdout
@@ -0,0 +1,3 @@
+listen sockname [AF_UNIX]: unixpeername.sock
+client peername [AF_UNIX]: unixpeername.sock
+client sockname [AF_UNIX]: (unnamed)
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixrecv.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixrecv.stdout
new file mode 100644
index 0000000000..e9636a2916
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixrecv.stdout
@@ -0,0 +1,2 @@
+send ipsum
+recv ipsum
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixrecvfrom.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixrecvfrom.stdout
new file mode 100644
index 0000000000..ad8e531910
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixrecvfrom.stdout
@@ -0,0 +1,2 @@
+send     lorem
+recvfrom lorem
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixsocketpair.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixsocketpair.stdout
new file mode 100644
index 0000000000..bb7fc428fa
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sys_socket/unixsocketpair.stdout
@@ -0,0 +1,6 @@
+SOCK_STREAM
+child:  ping
+parent: pong
+SOCK_DGRAM
+child:  ping
+parent: pong
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_stat/chmod.stderr b/recipes/core/relibc/tests/expected/bins_static/sys_stat/chmod.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_stat/chmod.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_stat/chmod.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_stat/fstatat.stderr b/recipes/core/relibc/tests/expected/bins_static/sys_stat/fstatat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_stat/fstatat.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_stat/fstatat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_stat/lstat.stderr b/recipes/core/relibc/tests/expected/bins_static/sys_stat/lstat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_stat/lstat.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_stat/lstat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_syslog/syslog.stderr b/recipes/core/relibc/tests/expected/bins_static/sys_syslog/syslog.stderr
new file mode 100644
index 0000000000..faddade2a6
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/sys_syslog/syslog.stderr
@@ -0,0 +1,13 @@
+relibc_test: This is a test message with formatting: 5
+relibc_test: Hank Hill
+relibc_test: Foo has been bar'd
+relibc_test: And now, Eeveelutions
+relibc_test: Espeon
+relibc_test: Umbreon
+relibc_test: Sylveon
+relibc_test: Glaceon
+relibc_test: Leafeon
+relibc_test: Vaporeon
+relibc_test: Flareon
+relibc_test: Jolteon
+relibc_test: Bye from relibc's syslog tests!
diff --git a/recipes/core/relibc/tests/expected/bins_static/sys_syslog/syslog.stdout b/recipes/core/relibc/tests/expected/bins_static/sys_syslog/syslog.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/termios.stderr b/recipes/core/relibc/tests/expected/bins_static/termios.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/termios.stdout b/recipes/core/relibc/tests/expected/bins_static/termios.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/asctime.stderr b/recipes/core/relibc/tests/expected/bins_static/time/asctime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/asctime.stdout b/recipes/core/relibc/tests/expected/bins_static/time/asctime.stdout
new file mode 100644
index 0000000000..f21cdff5f4
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/time/asctime.stdout
@@ -0,0 +1,5 @@
+Thu Jan  1 00:00:00 1970
+Sun Jan  1 00:00:00 1000
+Sat Dec 31 23:59:60 9999
+Sun Jan-99 00:00:00 -999
+Sat Dec999 99:99:99 9999
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/constants.stderr b/recipes/core/relibc/tests/expected/bins_static/time/constants.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/constants.stdout b/recipes/core/relibc/tests/expected/bins_static/time/constants.stdout
new file mode 100644
index 0000000000..cf14858d8c
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/time/constants.stdout
@@ -0,0 +1,2 @@
+(nil)
+1000000
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/gmtime.stderr b/recipes/core/relibc/tests/expected/bins_static/time/gmtime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/gmtime.stdout b/recipes/core/relibc/tests/expected/bins_static/time/gmtime.stdout
new file mode 100644
index 0000000000..a5da960f12
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/time/gmtime.stdout
@@ -0,0 +1,168 @@
+Unix epoch:
+  tm_sec    = 0
+  tm_min    = 0
+  tm_hour   = 0
+  tm_mday   = 1
+  tm_mon    = 0
+  tm_year   = 70
+  tm_wday   = 4
+  tm_yday   = 0
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+1970-03-01 00:00:00:
+  tm_sec    = 0
+  tm_min    = 0
+  tm_hour   = 0
+  tm_mday   = 1
+  tm_mon    = 2
+  tm_year   = 70
+  tm_wday   = 0
+  tm_yday   = 59
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+1970-12-31 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 31
+  tm_mon    = 11
+  tm_year   = 70
+  tm_wday   = 4
+  tm_yday   = 364
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+1972-02-29 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 29
+  tm_mon    = 1
+  tm_year   = 72
+  tm_wday   = 2
+  tm_yday   = 59
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+1972-12-31 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 31
+  tm_mon    = 11
+  tm_year   = 72
+  tm_wday   = 0
+  tm_yday   = 365
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+2000-02-29 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 29
+  tm_mon    = 1
+  tm_year   = 100
+  tm_wday   = 2
+  tm_yday   = 59
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+2000-12-31 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 31
+  tm_mon    = 11
+  tm_year   = 100
+  tm_wday   = 0
+  tm_yday   = 365
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+2100-03-01 00:00:00:
+  tm_sec    = 0
+  tm_min    = 0
+  tm_hour   = 0
+  tm_mday   = 1
+  tm_mon    = 2
+  tm_year   = 200
+  tm_wday   = 1
+  tm_yday   = 59
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+2100-12-31 23:59:59:
+  tm_sec    = 59
+  tm_min    = 59
+  tm_hour   = 23
+  tm_mday   = 31
+  tm_mon    = 11
+  tm_year   = 200
+  tm_wday   = 5
+  tm_yday   = 364
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+Year 2038, pre-i32 overflow:
+  tm_sec    = 7
+  tm_min    = 14
+  tm_hour   = 3
+  tm_mday   = 19
+  tm_mon    = 0
+  tm_year   = 138
+  tm_wday   = 2
+  tm_yday   = 18
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+Year 2038, post-i32 overflow:
+  tm_sec    = 8
+  tm_min    = 14
+  tm_hour   = 3
+  tm_mday   = 19
+  tm_mon    = 0
+  tm_year   = 138
+  tm_wday   = 2
+  tm_yday   = 18
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+Year 2106, pre-u32 overflow:
+  tm_sec    = 15
+  tm_min    = 28
+  tm_hour   = 6
+  tm_mday   = 7
+  tm_mon    = 1
+  tm_year   = 206
+  tm_wday   = 0
+  tm_yday   = 37
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
+
+Year 2106, post-u32 overflow:
+  tm_sec    = 16
+  tm_min    = 28
+  tm_hour   = 6
+  tm_mday   = 7
+  tm_mon    = 1
+  tm_year   = 206
+  tm_wday   = 0
+  tm_yday   = 37
+  tm_isdst  = 0
+  tm_gmtoff = 0
+  tm_zone   = UTC
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/localtime.stderr b/recipes/core/relibc/tests/expected/bins_static/time/localtime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/localtime.stdout b/recipes/core/relibc/tests/expected/bins_static/time/localtime.stdout
new file mode 100644
index 0000000000..eb828a2b0d
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/time/localtime.stdout
@@ -0,0 +1,9 @@
+Year 69, Day of year: 332, Month 10, Day of month: 29, Day of week: 6, 0:0:0
+Year 69, Day of year: 364, Month 11, Day of month: 31, Day of week: 3, 0:0:0
+Year 69, Day of year: 364, Month 11, Day of month: 31, Day of week: 3, 23:59:59
+Year 69, Day of year: 364, Month 11, Day of month: 31, Day of week: 3, 23:51:40
+Year 70, Day of year: 0, Month 0, Day of month: 1, Day of week: 4, 0:0:0
+Year 70, Day of year: 0, Month 0, Day of month: 1, Day of week: 4, 0:0:1
+Year 118, Day of year: 193, Month 6, Day of month: 13, Day of week: 5, 4:9:10
+Fri Jul 13 06:03:43 2018
+Fri Jul 13 06:03:43 2018
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/localtime_r.stderr b/recipes/core/relibc/tests/expected/bins_static/time/localtime_r.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/localtime_r.stdout b/recipes/core/relibc/tests/expected/bins_static/time/localtime_r.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/macros.stderr b/recipes/core/relibc/tests/expected/bins_static/time/macros.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/macros.stdout b/recipes/core/relibc/tests/expected/bins_static/time/macros.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/mktime.stderr b/recipes/core/relibc/tests/expected/bins_static/time/mktime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/mktime.stdout b/recipes/core/relibc/tests/expected/bins_static/time/mktime.stdout
new file mode 100644
index 0000000000..c9b309e63c
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/time/mktime.stdout
@@ -0,0 +1,6 @@
+31536000
+-2851200 = -2851200
+-86400 = -86400
+-500 = -500
+0 = 0
+1531454950 = 1531454950
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/strftime.stderr b/recipes/core/relibc/tests/expected/bins_static/time/strftime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/strftime.stdout b/recipes/core/relibc/tests/expected/bins_static/time/strftime.stdout
new file mode 100644
index 0000000000..7d12e13954
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/time/strftime.stdout
@@ -0,0 +1,14 @@
+20: Tue Tuesday Jul July
+16: The 21st century
+11: 06:25:42 AM
+11: 03:00:00 PM
+5: 15:00
+15: 15 1531839600 2
+6: 198 28
+28: Tue Jul 17 15:00:00 UTC 2018
+0: Tue Aug 07 19:17:11 UTC 2018Tue Aug 07 19:17:11 U
+53
+52
+52
+1
+53
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/strptime.stderr b/recipes/core/relibc/tests/expected/bins_static/time/strptime.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/strptime.stdout b/recipes/core/relibc/tests/expected/bins_static/time/strptime.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/time.stderr b/recipes/core/relibc/tests/expected/bins_static/time/time.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/time.stdout b/recipes/core/relibc/tests/expected/bins_static/time/time.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/timegm.stderr b/recipes/core/relibc/tests/expected/bins_static/time/timegm.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/timegm.stdout b/recipes/core/relibc/tests/expected/bins_static/time/timegm.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/tzset.stderr b/recipes/core/relibc/tests/expected/bins_static/time/tzset.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/time/tzset.stdout b/recipes/core/relibc/tests/expected/bins_static/time/tzset.stdout
new file mode 100644
index 0000000000..9962d8acc0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/time/tzset.stdout
@@ -0,0 +1 @@
+tzname[0] UTC, tzname[1] UTC, daylight 0, timezone 0
diff --git a/recipes/core/relibc/tests/expected/bins_static/tls.stderr b/recipes/core/relibc/tests/expected/bins_static/tls.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/tls.stdout b/recipes/core/relibc/tests/expected/bins_static/tls.stdout
new file mode 100644
index 0000000000..d0b7b3c2e6
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/tls.stdout
@@ -0,0 +1,2 @@
+0 == 0
+1 == 1
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/access.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/access.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/access.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/access.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/alarm.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/alarm.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/alarm.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/alarm.stdout
new file mode 100644
index 0000000000..4ed7f83631
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/alarm.stdout
@@ -0,0 +1,4 @@
+alarm(0) baseline: ok
+alarm(1) fires: ok
+alarm(0) cancel: ok
+alarm re-arm returns remaining: ok
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/brk.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/brk.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/brk.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/brk.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/confstr.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/confstr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/confstr.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/confstr.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/constants.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/constants.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/constants.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/constants.stdout
new file mode 100644
index 0000000000..90c907f1ff
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/constants.stdout
@@ -0,0 +1,16 @@
+_POSIX_VERSION: 200809
+NULL: (nil)
+R_OK: 4
+W_OK: 2
+X_OK: 1
+F_OK: 0
+SEEK_SET: 0
+SEEK_CUR: 1
+SEEK_END: 2
+F_LOCK: 1
+F_ULOCK: 0
+F_TEST: 3
+F_TLOCK: 2
+STDIN_FILENO: 0
+STDOUT_FILENO: 1
+STDERR_FILENO: 2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/dup.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/dup.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/dup.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/dup.stdout
new file mode 100644
index 0000000000..4fb8e07602
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/dup.stdout
@@ -0,0 +1 @@
+duped fd is 1 greater than the original fd
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/exec.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/exec.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/exec.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/exec.stdout
new file mode 100644
index 0000000000..0f56119c73
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/exec.stdout
@@ -0,0 +1 @@
+exec works :D
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/fchdir.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/fchdir.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/fchdir.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/fchdir.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/fork.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/fork.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/fork.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/fork.stdout
new file mode 100644
index 0000000000..98f331c9de
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/fork.stdout
@@ -0,0 +1,3 @@
+Hello from prepare
+Hello from child
+Hello from parent
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/fsync.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/fsync.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/fsync.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/fsync.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/ftruncate.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/ftruncate.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/ftruncate.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/ftruncate.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/getopt.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/getopt.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/getopt.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/getopt.stdout
new file mode 100644
index 0000000000..aba2d44d3f
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/getopt.stdout
@@ -0,0 +1,42 @@
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 1
+errflg: 0
+ifile: 
+ofile: arg
+result: 0
+bflg: 0
+aflg: 0
+errflg: 0
+ifile: 
+ofile: 
+result: 0
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/getopt_long.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/getopt_long.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/getopt_long.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/getopt_long.stdout
new file mode 100644
index 0000000000..d2f352b822
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/getopt_long.stdout
@@ -0,0 +1,20 @@
+--- Running: test --test0 -a
+getopt_long returned 1, argument test0=(null)
+Option -a with value (null)
+--- Running: test --test1 -a
+getopt_long returned 0, set flag to 2, argument test1=(null)
+Option -a with value (null)
+--- Running: test --test2 -a
+getopt_long returned 3, argument test2=(null)
+Option -a with value (null)
+--- Running: test --test2=arg -a
+getopt_long returned 3, argument test2=arg
+Option -a with value (null)
+--- Running: test --test3 -a
+getopt_long returned 4, argument test3=-a
+--- Running: test --test3=arg -a
+getopt_long returned 4, argument test3=arg
+Option -a with value (null)
+--- Running: test --test3 arg -a
+getopt_long returned 4, argument test3=arg
+Option -a with value (null)
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/pipe.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/pipe.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/pipe.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/pipe.stdout
new file mode 100644
index 0000000000..980a0d5f19
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/pipe.stdout
@@ -0,0 +1 @@
+Hello World!
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/readlinkat.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/readlinkat.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/readlinkat.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/readlinkat.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/rmdir.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/rmdir.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/rmdir.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/rmdir.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/sleep.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/sleep.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/sleep.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/sleep.stdout
new file mode 100644
index 0000000000..25867863a2
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/sleep.stdout
@@ -0,0 +1 @@
+unslept: 0
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/swab.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/swab.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/swab.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/swab.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/write.stderr b/recipes/core/relibc/tests/expected/bins_static/unistd/write.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/unistd/write.stdout b/recipes/core/relibc/tests/expected/bins_static/unistd/write.stdout
new file mode 100644
index 0000000000..980a0d5f19
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/unistd/write.stdout
@@ -0,0 +1 @@
+Hello World!
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/fgetwc.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/fgetwc.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/fgetwc.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/fgetwc.stdout
new file mode 100644
index 0000000000..e7cabf537e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/fgetwc.stdout
@@ -0,0 +1,3 @@
+êçã
+こんにちは世界
+Привет мир
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/fwide.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/fwide.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/fwide.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/fwide.stdout
new file mode 100644
index 0000000000..44e0be8e35
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/fwide.stdout
@@ -0,0 +1,4 @@
+0
+0
+0
+0
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/mbrtowc.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/mbrtowc.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/mbrtowc.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/mbrtowc.stdout
new file mode 100644
index 0000000000..8ea12e1952
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/mbrtowc.stdout
@@ -0,0 +1,2 @@
+Processing 11 UTF-8 code units: [ 0x7a 0xc3 0x9f 0xe6 0xb0 0xb4 0xf0 0x9f 0x8d 0x8c 0 ]
+into 5 wchar_t units: [ 0x7a 0xdf 0x6c34 0x1f34c 0 ]
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/mbsrtowcs.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/mbsrtowcs.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/mbsrtowcs.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/mbsrtowcs.stdout
new file mode 100644
index 0000000000..e8f8258f2e
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/mbsrtowcs.stdout
@@ -0,0 +1 @@
+The length, including '\0': 5 
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/printf-on-wchars.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/printf-on-wchars.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/printf-on-wchars.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/printf-on-wchars.stdout
new file mode 100644
index 0000000000..b14ed25516
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/printf-on-wchars.stdout
@@ -0,0 +1,4 @@
+This is a few one-byte chars: 1 2 a b
+Long one-byte string: Hello World
+This is a few multi-byte chars: ❤ R 😠 C
+Long multi-byte string: 👉😎👉 Zoop!
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/putwchar.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/putwchar.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/putwchar.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/putwchar.stdout
new file mode 100644
index 0000000000..42d65d1da0
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/putwchar.stdout
@@ -0,0 +1 @@
+zß水🍌
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/ungetwc.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/ungetwc.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/ungetwc.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/ungetwc.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcpcpy.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcpcpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcpcpy.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcpcpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcpncpy.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcpncpy.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcpncpy.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcpncpy.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcrtomb.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcrtomb.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcrtomb.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcrtomb.stdout
new file mode 100644
index 0000000000..ed85da3696
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wcrtomb.stdout
@@ -0,0 +1,2 @@
+Processing 5 wchar_t units: [ 0x7a 0xdf 0x6c34 0x1f34c 0 ]
+into 11 UTF-8 code units: [ 0x7a 0xc3 0x9f 0xe6 0xb0 0xb4 0xf0 0x9f 0x8d 0x8c 0 ]
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcscasecmp.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcscasecmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcscasecmp.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcscasecmp.stdout
new file mode 100644
index 0000000000..fdd11f6552
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wcscasecmp.stdout
@@ -0,0 +1,4 @@
+wcscasecmp(s1, s1) = 0
+wcscasecmp(s1, s2) = -1
+wcscasecmp(s2, s1) = 1
+wcscasecmp(s2, s2) = 0
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcschr.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcschr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcschr.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcschr.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcscspn.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcscspn.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcscspn.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcscspn.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsdup.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsdup.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsdup.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsdup.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsncasecmp.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsncasecmp.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsncasecmp.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsncasecmp.stdout
new file mode 100644
index 0000000000..6a4bd43fc4
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsncasecmp.stdout
@@ -0,0 +1,5 @@
+wcsncasecmp(s1, s1, 17) = 0
+wcsncasecmp(s1, s2, 17) = -1
+wcsncasecmp(s2, s1, 17) = 1
+wcsncasecmp(s2, s1, 15) = 0
+wcsncasecmp(s1, s2, 0) = 0
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsnlen.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsnlen.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsnlen.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsnlen.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsnrtombs.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsnrtombs.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsnrtombs.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsnrtombs.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsrchr.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsrchr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsrchr.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsrchr.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsrtombs.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsrtombs.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsrtombs.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsrtombs.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsstr.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsstr.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcsstr.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcsstr.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstod.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstod.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstod.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstod.stdout
new file mode 100644
index 0000000000..0292990d95
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstod.stdout
@@ -0,0 +1,6 @@
+strtod(1.2345wowzah) = (1.234500, wowzah)
+strtod(53) = (53.000000, )
+strtod(-254352.5...) = (-254352.500000, ...)
+strtod(   19.2 wat) = (19.200000,  wat)
+strtod(365.24 29.53) = (365.240000,  29.53)
+strtod( 29.53) = (29.530000, )
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoimax.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoimax.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoimax.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoimax.stdout
new file mode 100644
index 0000000000..b9a14be845
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoimax.stdout
@@ -0,0 +1,6 @@
+-123
+255
+44027
+8
+10
+16
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstok.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstok.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstok.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstok.stdout
new file mode 100644
index 0000000000..bb7ba090dd
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstok.stdout
@@ -0,0 +1,12 @@
+Hello
+from
+the
+otter
+slide.
+Must
+have
+gone
+down
+a
+thousand
+tiiiiiimeeeees...
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstol.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstol.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstol.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstol.stdout
new file mode 100644
index 0000000000..55aa50779a
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstol.stdout
@@ -0,0 +1 @@
+The decimal equivalents are: 2001, 6340800, -3624224 and 7340031.
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoumax.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoumax.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoumax.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoumax.stdout
new file mode 100644
index 0000000000..8e372f7589
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wcstoumax.stdout
@@ -0,0 +1,3 @@
+nptr = `10110134932`
+wcstoumax = 10110134932
+Stopped scan at ``
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcswidth.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wcswidth.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wcswidth.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wcswidth.stdout
new file mode 100644
index 0000000000..7da79364d8
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wcswidth.stdout
@@ -0,0 +1 @@
+wcswidth(L"relibc", 6) = 6
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wprintf.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wprintf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wprintf.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wprintf.stdout
new file mode 100644
index 0000000000..724e64b5b5
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wchar/wprintf.stdout
@@ -0,0 +1,67 @@
+percent: %
+wstring: String
+char: c
+int: -16
+uint: 32
+hex: beef
+HEX: C0FFEE
+string: end
+%n returned 44, total len of write: 87
+
+Padding madness:
+ 001   +2
+   c
+ 0x00000ff
+ 001
+0 0x1
+ 1
+(00123) (  123)
+(-0123) ( -123)
+(             )
+0xabcdef
+(nil)
+
+Positional madness:
+4 3 2
+00002
+|Fiz     |Buz     |     Fiz|     Tot|
+int:          5 double: 0.100000 0.200000 0.300000 0.400000
+-1717986918 0.100000
+-1717986918 0.200000
+
+Float madness:
+        1.234568e+02
+        1.000000E-05
+          123.456789
+            0.000010
+       -1.234568e+02
+-00000001.234568e+02
+%.5g: -123.46
+%.5f: -123.45679
+%.5e: -1.23457e+02
+%.*g: -1.2e+02
+%.*f: -123.46
+%.*e: -1.23e+02
+%.*2$g: -123.46
+%.*2$f: -123.45679
+%.*2$e: -1.23457e+02
+100000
+1e+06
+1.000000e+06
+0.0001
+1E-05
+1.000000E-05
+
+Non-finite float madness:
+%e: inf -inf nan -nan
+%E: INF -INF NAN -NAN
+%f: inf -inf nan -nan
+%F: INF -INF NAN -NAN
+%g: inf -inf nan -nan
+%G: INF -INF NAN -NAN
+Things that have been buggy
++05
+Testing asprintf...
+printed: test string, value: 11
+printed: test string 2, value: 13
+printed: test string 2, value: 13
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wscanf.stderr b/recipes/core/relibc/tests/expected/bins_static/wchar/wscanf.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wchar/wscanf.stdout b/recipes/core/relibc/tests/expected/bins_static/wchar/wscanf.stdout
new file mode 100644
index 0000000000..90abc9a7f6
Binary files /dev/null and b/recipes/core/relibc/tests/expected/bins_static/wchar/wscanf.stdout differ
diff --git a/recipes/core/relibc/tests/expected/bins_static/wctype/towlower.stderr b/recipes/core/relibc/tests/expected/bins_static/wctype/towlower.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wctype/towlower.stdout b/recipes/core/relibc/tests/expected/bins_static/wctype/towlower.stdout
new file mode 100644
index 0000000000..fdbf17836f
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wctype/towlower.stdout
@@ -0,0 +1,2 @@
+HaLf WiDe ChAr StRiNg!
+half wide char string!
diff --git a/recipes/core/relibc/tests/expected/bins_static/wctype/towupper.stderr b/recipes/core/relibc/tests/expected/bins_static/wctype/towupper.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/bins_static/wctype/towupper.stdout b/recipes/core/relibc/tests/expected/bins_static/wctype/towupper.stdout
new file mode 100644
index 0000000000..a09771e7bc
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/bins_static/wctype/towupper.stdout
@@ -0,0 +1,2 @@
+HaLf WiDe ChAr StRiNg!
+HALF WIDE CHAR STRING!
diff --git a/recipes/core/relibc/tests/expected/endian.stderr b/recipes/core/relibc/tests/expected/endian.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/endian.stdout b/recipes/core/relibc/tests/expected/endian.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/features.stderr b/recipes/core/relibc/tests/expected/features.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/features.stdout b/recipes/core/relibc/tests/expected/features.stdout
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/glob.stderr b/recipes/core/relibc/tests/expected/glob.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/recipes/core/relibc/tests/expected/glob.stdout b/recipes/core/relibc/tests/expected/glob.stdout
new file mode 100644
index 0000000000..ef1351361b
--- /dev/null
+++ b/recipes/core/relibc/tests/expected/glob.stdout
@@ -0,0 +1,70 @@
+Pattern = eample_dir/*
+(NOMATCH)
+
+Pattern = eample_dir/*
+glob_err("eample_dir", "No such file or directory") -> 0
+(ABORTED)
+
+Pattern = ./example_dir/*
+(Matched 8)
+0 - ./example_dir/1-never-gonna-give-you-up
+1 - ./example_dir/2-never-gonna-let-you-down
+2 - ./example_dir/3-never-gonna-run-around
+3 - ./example_dir/4-and-desert-you
+4 - ./example_dir/5-never-gonna-make-you-cry
+5 - ./example_dir/6-never-gonna-say-goodbye
+6 - ./example_dir/7-never-gonna-tell-a-lie
+7 - ./example_dir/8-and-hurt-you
+
+Pattern = example_dir/*never*
+(Matched 6)
+0 - example_dir/1-never-gonna-give-you-up
+1 - example_dir/2-never-gonna-let-you-down
+2 - example_dir/3-never-gonna-run-around
+3 - example_dir/5-never-gonna-make-you-cry
+4 - example_dir/6-never-gonna-say-goodbye
+5 - example_dir/7-never-gonna-tell-a-lie
+
+Pattern = example_dir/?-and*
+(Matched 8)
+0 - example_dir/1-never-gonna-give-you-up
+1 - example_dir/2-never-gonna-let-you-down
+2 - example_dir/3-never-gonna-run-around
+3 - example_dir/5-never-gonna-make-you-cry
+4 - example_dir/6-never-gonna-say-goodbye
+5 - example_dir/7-never-gonna-tell-a-lie
+6 - example_dir/4-and-desert-you
+7 - example_dir/8-and-hurt-you
+
+Pattern = example_dir/*never*
+(Matched 6) (with 4 gl_offs)
+0 - NULL
+1 - NULL
+2 - NULL
+3 - NULL
+4 - example_dir/1-never-gonna-give-you-up
+5 - example_dir/2-never-gonna-let-you-down
+6 - example_dir/3-never-gonna-run-around
+7 - example_dir/5-never-gonna-make-you-cry
+8 - example_dir/6-never-gonna-say-goodbye
+9 - example_dir/7-never-gonna-tell-a-lie
+
+Pattern = example_dir/?-and*
+(Matched 8) (with 4 gl_offs)
+0 - <Saved gl_offs string>
+1 - NULL
+2 - NULL
+3 - NULL
+4 - example_dir/1-never-gonna-give-you-up
+5 - example_dir/2-never-gonna-let-you-down
+6 - example_dir/3-never-gonna-run-around
+7 - example_dir/5-never-gonna-make-you-cry
+8 - example_dir/6-never-gonna-say-goodbye
+9 - example_dir/7-never-gonna-tell-a-lie
+10 - example_dir/4-and-desert-you
+11 - example_dir/8-and-hurt-you
+
+Pattern = example_dir
+(Matched 1)
+0 - example_dir/
+
diff --git a/recipes/core/relibc/tests/fcntl/create.c b/recipes/core/relibc/tests/fcntl/create.c
new file mode 100644
index 0000000000..c365bbcbd7
--- /dev/null
+++ b/recipes/core/relibc/tests/fcntl/create.c
@@ -0,0 +1,18 @@
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int fd = creat("create.out", 0755);
+    ERROR_IF(creat, fd, == -1);
+    UNEXP_IF(creat, fd, < 0);
+
+    int written = write(fd, "Hello World!\n", 13);
+    ERROR_IF(write, written, == -1);
+
+    int c = close(fd);
+    ERROR_IF(close, c, == -1);
+    UNEXP_IF(close, c, != 0);
+}
diff --git a/recipes/core/relibc/tests/fcntl/fcntl.c b/recipes/core/relibc/tests/fcntl/fcntl.c
new file mode 100644
index 0000000000..66c6bd3bd7
--- /dev/null
+++ b/recipes/core/relibc/tests/fcntl/fcntl.c
@@ -0,0 +1,31 @@
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    // Lose our fd and pull it again
+    {
+        int fd = creat("fcntl.out", 0777);
+        ERROR_IF(creat, fd, == -1);
+        UNEXP_IF(creat, fd, < 0);
+    }
+
+    int newfd = open("fcntl.out", 0);
+    ERROR_IF(open, newfd, == -1);
+    UNEXP_IF(open, newfd, < 0);
+
+    int newfd2 = fcntl(newfd, F_DUPFD, 0);
+    // TODO: The standard doesn't define errors for F_DUPFD
+
+    printf("duped fd is %d greater than the original fd\n", newfd2 - newfd);
+
+    int c1 = close(newfd);
+    ERROR_IF(close, c1, == -1);
+    UNEXP_IF(close, c1, != 0);
+
+    int c2 = close(newfd2);
+    ERROR_IF(close, c2, == -1);
+    UNEXP_IF(close, c2, != 0);
+}
diff --git a/recipes/core/relibc/tests/fcntl/open.c b/recipes/core/relibc/tests/fcntl/open.c
new file mode 100644
index 0000000000..ed8a999f3a
--- /dev/null
+++ b/recipes/core/relibc/tests/fcntl/open.c
@@ -0,0 +1,296 @@
+#include <assert.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+__attribute__((nonnull))
+int cloexec_test(char path[], int argc, char* argv[]) {
+    assert(argc >= 1);
+
+    int fd = open(path, O_RDONLY | O_CLOEXEC);
+    if (fd == -1) {
+        perror("open (O_CLOEXEC)");
+        return -1;
+    }
+
+    pid_t child = fork();
+    if (child == -1) {
+        perror("fork");
+        close(fd);
+        return -1;
+    } else if (child == 0) {
+        // In child process where fd should be closed after execv.
+        char fd_str[8] = {0};
+        sprintf(fd_str, "%d", fd);
+
+        char* new_argv[] = {
+            argv[0],
+            fd_str,
+            NULL
+        };
+
+        if (execv(argv[0], new_argv) == -1) {
+            perror("execv");
+        }
+
+        exit(EXIT_FAILURE);
+    } else {
+        // In parent where fd should remain open.
+        int status = -1;
+        if (waitpid(child, &status, 0) == -1) {
+            perror("waitpid");
+            return -1;
+        }
+
+        if (fcntl(fd, F_GETFD) < 0) {
+            fputs(
+                "File descriptor closed in parent after exec with O_CLOEXEC\n",
+                stderr
+            );
+            kill(child, SIGKILL);
+            waitpid(child, NULL, 0);
+
+            return -1;
+        }
+
+        if (WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS) {
+            return 0;
+        } else {
+            fputs(
+                "Child process to test O_CLOEXEC failed\n",
+                stderr
+            );
+            return -1;
+        }
+    }
+
+    // Unreachable
+    return -1;
+}
+
+int cloexec_validate(int argc, char* argv[]) {
+    assert(argc == 2);
+
+    char* end = NULL;
+    int fd = (int) strtol(argv[1], &end, 0);
+
+    if (*end == '\0') {
+        if (fcntl(fd, F_GETFD) >= 0) {
+            fputs(
+                "File descriptor still open after exec with O_CLOEXEC\n",
+                stderr
+            );
+
+            return EXIT_FAILURE;
+        }
+        return EXIT_SUCCESS;
+    } else {
+        fputs(
+            "Invalid file descriptor number passed to cloxec_validate\n",
+            stderr
+        );
+        return EXIT_FAILURE;
+    }
+}
+
+int main(int argc, char* argv[]) {
+    // The test runner inserts two fixed arg, so argc == 2 is fine
+    if (argc == 2) {
+        return cloexec_validate(argc, argv);
+    } else if (argc == 0) {
+        fprintf(
+            stderr,
+            "Invalid number of arguments: %d\n",
+            argc
+        );
+        return EXIT_FAILURE;
+    }
+
+    int result = EXIT_FAILURE;
+
+    char dir_template[] = "open_tests.XXXXXX";
+    size_t dlen = sizeof(dir_template) - 1;
+    if (!mkdtemp(dir_template)) {
+        perror("mkdtemp");
+        goto bye;
+    }
+
+    char file_path[PATH_MAX] = {0};
+    const char file_name[] = "peanut";
+    memcpy(file_path, dir_template, dlen);
+    file_path[dlen] = '/';
+    memcpy(&file_path[dlen + 1], file_name, sizeof(file_name));
+    
+    int fd = open(file_path, O_CREAT, 0644);
+    if (fd == -1) {
+        perror("open (creating file in temp dir)");
+        goto clean_opened_dir;
+    }
+    if (close(fd) == -1) {
+        perror("close (file)");
+        goto clean_opened_dir;
+    }
+
+    // Check that close actually closed fd
+    if (fcntl(fd, F_GETFD) >= 0) {
+        fputs(
+            "File descriptor was not closed by close\n",
+            stderr
+        );
+        goto clean_opened_file;
+    }
+
+    // Opening a file with O_DIRECTORY should fail
+    fd = open(file_path, O_DIRECTORY);
+    if (fd != -1) {
+        fputs(
+            "File successfully opened with O_DIRECTORY\n",
+            stderr
+        );
+        close(fd);
+        goto clean_opened_file;
+    }
+    
+    // O_CREAT | O_EXCL should fail on existing file
+    fd = open(file_path, O_CREAT | O_EXCL, 0644);
+    if (fd != -1) {
+        fputs(
+            "Existing file created with O_CREAT | O_EXCL\n",
+            stderr
+        );
+        close(fd);
+        goto clean_opened_file;
+    }
+
+    // O_PATH
+    fd = open(file_path, O_PATH | O_WRONLY);
+    // O_PATH should ignore O_WRONLY but NOT fail.
+    if (fd == -1) {
+        perror("open (O_PATH)");
+        goto clean_opened_file;
+    }
+
+// TODO: There is no special handling to O_PATH at kernel level
+#ifndef __redox__
+    // Writing this buf should fail.
+    const char buf[] = "Valencia peanuts";
+    if (write(fd, buf, sizeof(buf)) != -1) {
+        fputs(
+            "Writing to an O_PATH fd succeeded\n",
+            stderr
+        );
+        close(fd);
+        goto clean_opened_file;
+    }
+#endif
+
+    // But fstat should succeed with O_PATH
+    struct stat stat = {0};
+    if (fstat(fd, &stat) == -1) {
+        perror("fstat (O_PATH)");
+        close(fd);
+        goto clean_opened_file;
+    }
+
+    // O_NOATIME (disabled since Redox doesn't have it)
+    // struct timespec atime_expected = stat.st_atim;
+
+    close(fd);
+    /* fd = open(file_path, O_NOATIME); */
+    /* if (fd == -1) { */
+    /*     perror("open (O_NOATIME)"); */
+    /*     close(fd); */
+    /*     goto clean_opened_file; */
+    /* } */
+    /**/
+    /* if (fstat(fd, &stat) == -1) { */
+    /*     perror("fstat (O_PATH)"); */
+    /*     close(fd); */
+    /*     goto clean_opened_file; */
+    /* } */
+    /**/
+    /* struct timespec atime_actual = stat.st_atim; */
+    /* if ( */
+    /*     (atime_expected.tv_nsec != atime_actual.tv_nsec) */
+    /*     || (atime_expected.tv_sec != atime_actual.tv_sec) */
+    /* ) { */
+    /*     fputs( */
+    /*         "Access time changed with O_NOATIME\n", */
+    /*         stderr */
+    /*     ); */
+    /*     close(fd); */
+    /*     goto clean_opened_file; */
+    /* } */
+    /* close(fd); */
+
+    // O_NOFOLLOW
+    char sym_path[PATH_MAX] = {0};
+    const char sym_name[] = "cashew";
+    memcpy(sym_path, dir_template, dlen);
+    sym_path[dlen] = '/';
+    memcpy(&sym_path[dlen + 1], sym_name, sizeof(sym_name));
+
+    if (symlink(file_path, sym_path) == -1) {
+        perror("symlink");
+        goto clean_opened_file;
+    }
+    fd = open(sym_path, O_NOFOLLOW);
+    if (fd != -1) {
+        fputs(
+            "Symlink opened with O_NOFOLLOW\n",
+            stderr
+        );
+        close(fd);
+        goto clean_symlink;
+    }
+
+    // O_CLOEXEC
+    cloexec_test(file_path, argc, argv);
+
+    // Opening existing directory
+    int dirfd = open(dir_template, O_RDONLY);
+    if (dirfd == -1) {
+        perror("open (existing dir)");
+        goto clean_symlink;
+    }
+    close(dirfd);
+
+    // Opening existing directory (read/write)
+    dirfd = open(dir_template, O_RDWR);
+    if (dirfd != -1) {
+        fputs(
+            "Opening a directory with O_RDWR incorrectly succeeded\n",
+            stderr
+        );
+        goto clean_symlink;
+    }
+    close(dirfd);
+
+    // Opening existing directory (write only; should fail)
+    dirfd = -1;
+    dirfd = open(dir_template, O_WRONLY);
+    if (dirfd != -1) {
+        fputs(
+            "Opening a directory with O_WRONLY incorrectly succeeded\n",
+            stderr
+        );
+        goto clean_symlink;
+    }
+
+    result = EXIT_SUCCESS;
+clean_symlink:
+    unlink(sym_path);
+clean_opened_file:
+    unlink(file_path);
+clean_opened_dir:
+    rmdir(dir_template);
+bye:
+    return result;
+}
diff --git a/recipes/core/relibc/tests/fcntl/posix_fallocate.c b/recipes/core/relibc/tests/fcntl/posix_fallocate.c
new file mode 100644
index 0000000000..bb5fdded95
--- /dev/null
+++ b/recipes/core/relibc/tests/fcntl/posix_fallocate.c
@@ -0,0 +1,217 @@
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/socket.h>
+#include <sys/stat.h>
+
+__attribute__((nonnull))
+int run_test(
+    int filefd,
+    const char error_msg[],
+    off_t offset,
+    off_t length,
+    int dirfd,
+    const char file_name[],
+    off_t expected_size
+) {
+    // posix_fallocate does not set errno.
+    int result = posix_fallocate(filefd, offset, length);
+    if (result != 0) {
+        const char* error = strerror(result);
+        fprintf(stderr, "%s: %s\n", error_msg, error);
+        return -1;
+    }
+
+    struct stat stat = {0};
+    if (fstatat(dirfd, file_name, &stat, 0) == -1) {
+        perror("fstatat");
+        return -1;
+    }
+
+    if (stat.st_size != expected_size) {
+        fprintf(
+            stderr,
+            "Expected: %zd\nActual: %zd\n",
+            expected_size,
+            stat.st_size
+        );
+        return -1;
+    }
+
+    return 0;
+}
+
+int main(void) {
+    int result = EXIT_FAILURE;
+
+    char dir_template[] = "/tmp/pfalloctest.XXXXXX";
+    size_t dlen = sizeof(dir_template) - 1;
+    if (!mkdtemp(dir_template)) {
+        perror("mkdtemp");
+        goto bye;
+    }
+    int dirfd = open(dir_template, O_DIRECTORY);
+    if (dirfd == -1) {
+        perror("open");
+        goto rmtemp;
+    }
+
+    // Failure conditions.
+    // These are mostly a gut check for whatever backing syscall is used
+    // in relibc. If it ever changes, we have to make sure the correct
+    // errors are returned. If they're not, we have to add checks to our
+    // relibc implementation. Linux's backing syscall (SYS_fallocate)
+    // already does these checks.
+    //
+    // Directory:
+    if (posix_fallocate(dirfd, 0, 1000) == 0) {
+        fputs("posix_fallocate succeeded on a directory\n", stderr);
+        goto rmtemp;
+    }
+
+    // Socket:
+    int sock = socket(AF_UNIX, SOCK_STREAM, 0);
+    if (sock == -1) {
+        perror("socket");
+        goto rmtemp;
+    }
+    if (posix_fallocate(sock, 0, 1000) == 0) {
+        fputs("posix_fallocate succeeded on a socket\n", stderr);
+        close(sock);
+        goto rmtemp;
+    }
+    close(sock);
+
+    // Pipe:
+    int pipefd[2] = {0};
+    if (pipe(pipefd) == -1) {
+        perror("pipe");
+        goto rmtemp;
+    }
+    if (posix_fallocate(pipefd[0], 0, 1000) == 0) {
+        fputs("posix_fallocate succeeded on a pipe\n", stderr);
+        close(pipefd[0]);
+        close(pipefd[1]);
+        goto rmtemp;
+    }
+    close(pipefd[0]);
+    close(pipefd[1]);
+
+    // Success conditions.
+    const char name[] = "commander_keen";
+    char path[PATH_MAX] = {0};
+    memcpy(path, dir_template, dlen);
+    path[dlen] = '/';
+    memcpy(&path[dlen + 1], name, sizeof(name));
+
+    int file = open(path, O_CREAT | O_RDWR);
+    if (file == -1) {
+        perror("open");
+        goto rmtemp;
+    }
+
+    // Expand an empty file.
+    if (
+        run_test(
+            file,
+            "posix_fallocate failed expanding an empty file",
+            0,
+            1000,
+            dirfd,
+            name,
+            1000
+        ) == -1
+    ) {
+        fputs("FAILED: Expanding empty file test\n", stderr);
+        goto rmtempfile;
+    }
+
+    // Don't shrink a file.
+    if (
+        run_test(
+            file,
+            "posix_fallocate failed on already allocated file",
+            0,
+            1,
+            dirfd,
+            name,
+            1000
+        ) == -1
+    ) {
+        fputs("FAILED: posix_fallocate should not shrink files\n", stderr);
+        goto rmtempfile;
+    }
+
+    // Don't overwrite allocated byte ranges.
+    if (ftruncate(file, 0) == -1) {
+        perror("ftruncate");
+        goto rmtempfile;
+    }
+    const char msg[] = "If you're reading this you must play Commander Keen";
+    if (write(file, msg, sizeof(msg)) != sizeof(msg)) {
+        perror("write");
+        goto rmtempfile;
+    }
+
+    if (
+        run_test(
+            file,
+            "posix_fallocate failed on an allocated range",
+            0,
+            sizeof(msg),
+            dirfd,
+            name,
+            sizeof(msg)
+        ) == -1
+    ) {
+        fputs(
+            "FAILED: posix_fallocate don't overwrite allocated ranges test\n",
+            stderr
+        );
+        goto rmtempfile;
+    }
+    // And now check that the range wasn't overwritten.
+    char buf[sizeof(msg)] = {0};
+    if (lseek(file, 0, SEEK_SET) == -1) {
+        perror("lseek");
+        goto rmtempfile;
+    }
+    if (read(file, buf, sizeof(msg)) != sizeof(msg)) {
+        perror("read");
+        goto rmtempfile;
+    }
+    if (strncmp(msg, buf, sizeof(msg)) != 0) {
+        fputs("FAILED: posix_fallocate overwrote/destroyed a file\n", stderr);
+        goto rmtempfile;
+    }
+
+    // Offset + length that goes beyond file end expands file.
+    if (
+        run_test(
+            file,
+            "posix_fallocate failed on file expansion test",
+            sizeof(msg),
+            1000,
+            dirfd,
+            name,
+            sizeof(msg) + 1000
+        ) == -1
+    ) {
+        fputs("FAILED: posix_fallocate file expansion test\n", stderr);
+        goto rmtempfile;
+    }
+
+    result = EXIT_SUCCESS;
+rmtempfile:
+    close(file);
+    unlink(path);
+rmtemp:
+    rmdir(dir_template);
+bye:
+    return result;
+}
+
diff --git a/recipes/core/relibc/tests/features.c b/recipes/core/relibc/tests/features.c
new file mode 100644
index 0000000000..d33bda8429
--- /dev/null
+++ b/recipes/core/relibc/tests/features.c
@@ -0,0 +1,50 @@
+// These tests are primarily to ensure the macros compile without 
+// causing any funny business.
+// TODO: does not compile with glibc
+
+#include <features.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifndef __GLIBC__
+__deprecated
+#endif
+static void legacy(void) {}
+
+#ifndef __GLIBC__
+__deprecatedNote("Sometimes deletes user's home (oops); use foobar")
+#endif
+static void legacy_notes(void) {}
+
+#ifndef __GLIBC__
+__nodiscard
+#endif
+static uint8_t the_answer(void) {
+    return 42;
+}
+
+// GCC bug
+/* #pragma GCC diagnostic push */
+/* #pragma GCC diagnostic ignored "-Wattributes" */
+/* __noreturn */
+/* static void foobar(void) { */
+    // The test suite isn't picking up noreturn in the headers for exit, abort
+    // Those functions (and this test) works fine in both Redox itself and Linux
+    // Using _Exit instead works for the tests in CI. Why? I dunno.
+/*     _Exit(0); */
+/* } */
+/* #pragma GCC diagnostic pop */
+
+int main(void) {
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    legacy();
+    legacy_notes();
+    #pragma GCC diagnostic pop
+    const int answer = the_answer();
+    char buf[40] = {0};
+    sprintf(buf, "Hey, -Werror, I'm using answer: %d\n", answer);
+    /* foobar(); */
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/fnmatch.c b/recipes/core/relibc/tests/fnmatch.c
new file mode 100644
index 0000000000..ab88cfd3ad
--- /dev/null
+++ b/recipes/core/relibc/tests/fnmatch.c
@@ -0,0 +1,48 @@
+#include <fnmatch.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+void test(char* pattern, char* input, int flags) {
+    if (!fnmatch(pattern, input, flags)) {
+        printf("\"%s\" matches \"%s\"\n", pattern, input);
+    } else {
+        printf("\"%s\" doesn't match \"%s\"\n", pattern, input);
+    }
+}
+
+int main(void) {
+    puts("Should succeed:");
+    test("*World", "Hello World", 0);
+    test("*World", "World", 0);
+    test("Hello*", "Hello World", 0);
+    test("H[ae]llo?World", "Hallo+World", 0);
+    test("H[ae]llo?World", "Hello_World", 0);
+    test("[0-9][!a]", "1b", 0);
+    test("/a/*/d", "/a/b/c/d", 0);
+    test("/a/*/d", "/a/bc/d", FNM_PATHNAME);
+    test("*hello", ".hello", 0);
+    test("/*hello", "/.hello", FNM_PERIOD);
+    test("[a!][a!]", "!a", 0);
+    test("[\\]]", "]", 0);
+    test("[\\\\]", "\\", 0);
+    test("hello[/+]world", "hello/world", 0);
+    test("hello world", "HELLO WORLD", FNM_CASEFOLD);
+
+    puts("");
+    puts("Should fail:");
+    test("*World", "Hello Potato", 0);
+    test("*World", "Potato", 0);
+    test("H[ae]llo?World", "Hillo+World", 0);
+    test("H[ae]llo?World", "Hello__World", 0);
+    test("[0-9][!a]", "ab", 0);
+    test("[0-9][!a]", "2a", 0);
+    test("/a/*/d", "/a/b/c/d", FNM_PATHNAME);
+    test("/a/*/d", "/a/bc/d/", FNM_PATHNAME);
+    test("*hello", ".hello", FNM_PERIOD);
+    test("/*hello", "/.hello", FNM_PERIOD | FNM_PATHNAME);
+    test("[a!][a!]", "ab", 0);
+    test("hello[/+]world", "hello/world", FNM_PATHNAME);
+    test("hello world", "HELLO WORLD", 0);
+    test("********************a", "xxxxxxxxxxxxxxxxxxxxb", 0);
+}
diff --git a/recipes/core/relibc/tests/futimens.c b/recipes/core/relibc/tests/futimens.c
new file mode 100644
index 0000000000..20b20ab15b
--- /dev/null
+++ b/recipes/core/relibc/tests/futimens.c
@@ -0,0 +1,100 @@
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+
+int check_mtime(char *path, int expected_sec, int expected_nsec, int err_gap) {
+  // Checks whether the moditication time of the file located at *path* match the provided times.
+  // When err_gap is set, only checks for a match on sec with a margin of error of +/- err_gap.
+  struct stat sb;
+  if (stat(path, &sb) != 0) {
+    fprintf(stderr, "stat: %s\n", strerror(errno));
+    return -1;
+  }
+  if (err_gap > 0) {
+    if (sb.st_mtim.tv_sec < expected_sec + err_gap && sb.st_mtim.tv_sec > expected_sec - err_gap) {
+      return 0;
+    }
+  } else {
+    if (sb.st_mtim.tv_sec == expected_sec && sb.st_mtim.tv_nsec == expected_nsec) {
+      return 0;
+    }
+  }
+  fprintf(stderr, "Wrong modified time: %d.%d\n", sb.st_mtim.tv_sec, sb.st_mtim.tv_nsec);
+  return -1;
+}
+
+
+int main(void) {
+  char temp[] = "/tmp/stattest-XXXXXX";
+  const char file[] = "/mkfifo_fifo";
+  int len = sizeof(temp) + sizeof(int);
+  char* path = calloc(len, sizeof(char));
+
+  if (path == NULL) {
+    fprintf(stderr, "Could not allocate: %s\n", strerror(errno));
+    exit(1);
+  }
+
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+  strncat(path, mktemp(temp), sizeof(temp));
+  #pragma GCC diagnostic pop
+  strncat(path, file, sizeof(file));
+  if (mkdir(temp, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) {
+    fprintf(stderr, "mkdir %s: %s\n", temp, strerror(errno));
+    exit(1);
+  }
+
+  int tmp = open(path, O_CREAT | O_CLOEXEC | O_RDONLY | S_IRWXU | S_IRWXG | S_IRWXO);
+  if (tmp == -1) {
+    fprintf(stderr, "touch %s: %s\n", path, strerror(errno));
+    exit(1);
+  }
+  if (close(tmp) == -1) {
+    fprintf(stderr, "close %s: %s\n", path, strerror(errno));
+    exit(1);
+  }
+
+  int fd = open(path, 0, 0);
+  if (fd == -1) {
+    fprintf(stderr, "open %s: %s\n", path, strerror(errno));
+    exit(1);
+  }
+
+  const struct timespec times[] = { { .tv_sec = 10 }, { .tv_sec = 20 } };
+  if (futimens(fd, times) == -1) {
+    fprintf(stderr, "futimens: %s\n", strerror(errno));
+    exit(1);
+  }
+  if (check_mtime(path, 20, 0, 0) != 0) {
+    exit(1);
+  }
+  // Access times are not flushed to disk, so atime checks can't be (currently) performed
+
+  const struct timespec omit_times[] = { { 25, UTIME_OMIT }, { 12, UTIME_OMIT } };
+  if (futimens(fd, omit_times) == -1) {
+    fprintf(stderr, "futimens: %s\n", strerror(errno));
+    exit(1);
+  }
+  if (check_mtime(path, 20, 0, 0) != 0) {
+    exit(1);
+  }
+
+  const struct timespec now_times[] = { { 25, UTIME_NOW }, { 12, UTIME_NOW } };
+  if (futimens(fd, now_times) == -1) {
+    fprintf(stderr, "futimens: %s\n", strerror(errno));
+    exit(1);
+  }
+  int now_ts = time(NULL);
+  if (check_mtime(path, now_ts, 0, 1) != 0) {
+    exit(1);
+  }
+}
+
diff --git a/recipes/core/relibc/tests/glob.c b/recipes/core/relibc/tests/glob.c
new file mode 100644
index 0000000000..b7e545dd6e
--- /dev/null
+++ b/recipes/core/relibc/tests/glob.c
@@ -0,0 +1,85 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <glob.h>
+
+
+typedef int (*err_func_t)(const char *epath, int eerrno);
+
+
+static char *gl_offs_test_string = "<Saved gl_offs string>";
+
+
+int glob_err(const char *epath, int eerrno) {
+    printf("glob_err(\"%s\", \"%s\") -> %d\n", epath, strerror(eerrno), 0);
+    return 0;
+}
+
+void glob_test(const char *pattern, int flags, err_func_t errfunc, glob_t *pglob) {
+    printf("Pattern = %s\n", pattern);
+
+    int retval = glob(pattern, flags, errfunc, pglob);
+
+    if (retval != 0) {
+        if (retval == GLOB_ABORTED) {
+            puts("(ABORTED)\n");
+        }
+        else if (retval == GLOB_NOMATCH) {
+            puts("(NOMATCH)\n");
+        }
+        else if (retval == GLOB_NOSPACE) {
+            puts("(NOSPACE)\n");
+        }
+        else {
+            printf(" (Unknown retval %d!)\n", retval);
+        }
+        return;
+    }
+
+    size_t gl_offs = flags & GLOB_DOOFFS ? pglob->gl_offs : 0;
+
+    printf("(Matched %lu)", pglob->gl_pathc);
+
+    if (flags & GLOB_DOOFFS) {
+        printf(" (with %lu gl_offs)\n", gl_offs);
+    }
+    else {
+        puts("");
+    }
+
+    for(unsigned int i = 0; i < (gl_offs + pglob->gl_pathc); i++) {
+        if (!pglob->gl_pathv[i]) {
+            printf("%d - NULL\n", i);
+        }
+        else {
+            printf("%d - %s\n", i, pglob->gl_pathv[i]);
+        }
+    }
+    printf("%s", "\n");
+}
+
+int main(void) {
+    glob_t pglob = {0};
+
+    glob_test("eample_dir/*", 0, NULL, &pglob);
+    globfree(&pglob);
+
+    glob_test("eample_dir/*", GLOB_ERR, glob_err, &pglob);
+    globfree(&pglob);
+
+    glob_test("./example_dir/*", 0, glob_err, &pglob);
+    globfree(&pglob);
+
+    glob_test("example_dir/*never*", 0, glob_err, &pglob);
+    glob_test("example_dir/?-and*", GLOB_APPEND, glob_err, &pglob);
+    globfree(&pglob);
+
+    pglob.gl_offs = 4;
+    glob_test("example_dir/*never*", GLOB_DOOFFS, glob_err, &pglob);
+    pglob.gl_pathv[0] = gl_offs_test_string;
+    glob_test("example_dir/?-and*", GLOB_DOOFFS | GLOB_APPEND, glob_err, &pglob);
+    globfree(&pglob);
+
+    glob_test("example_dir", GLOB_MARK, glob_err, &pglob);
+    globfree(&pglob);
+}
diff --git a/recipes/core/relibc/tests/grp/getgrgid_r.c b/recipes/core/relibc/tests/grp/getgrgid_r.c
new file mode 100644
index 0000000000..ed2fea5dcc
--- /dev/null
+++ b/recipes/core/relibc/tests/grp/getgrgid_r.c
@@ -0,0 +1,42 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <grp.h>
+
+void test_getgrgid(gid_t gid) {
+    struct group *out = getgrgid(gid);
+    
+    if (out == NULL) {
+        printf("Did not find a group %d\n", gid);
+        return;
+    }
+    
+    printf("getgrgid\n");
+    
+    printf("    %d = %s, GID: %d\n", gid, out->gr_name, out->gr_gid);
+}
+
+void test_getgrgid_r(gid_t gid) {
+    char buf[100];
+    
+    struct group grp;
+    struct group *tmp;
+    
+    int status = getgrgid_r(gid, &grp, buf, sizeof(buf), &tmp);
+    
+    if (tmp == NULL) {
+        const char *reason = status != 0 ? strerror(status) : "(not found)";
+        printf("Did not find a group %d: %s\n", gid, reason);
+        return;
+    }
+    
+    printf("getgrgid_r\n");   
+    
+    printf("    %d = %s, GID: %d\n", gid, grp.gr_name, grp.gr_gid);
+}
+
+int main(void) {
+    test_getgrgid(1050);
+    test_getgrgid_r(1050);
+}
diff --git a/recipes/core/relibc/tests/grp/getgrnam_r.c b/recipes/core/relibc/tests/grp/getgrnam_r.c
new file mode 100644
index 0000000000..694d4fe1c9
--- /dev/null
+++ b/recipes/core/relibc/tests/grp/getgrnam_r.c
@@ -0,0 +1,42 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <grp.h>
+
+void test_getgrnam(const char *gr_name) {
+    struct group* out = getgrnam(gr_name);
+    
+    if (out == NULL) {
+        printf("Did not find a group '%s'\n", gr_name);
+        return;
+    }
+    
+    printf("getgrnam\n");
+
+    printf("    '%s' = %d\n", gr_name, out->gr_gid);
+}
+
+void test_getgrnam_r(const char *gr_name) {
+    char buf[100];
+    
+    struct group grp;
+    struct group* out = &grp;
+    
+    int status = getgrnam_r(gr_name, &grp, buf, sizeof(buf), &out);
+    
+    if (out == NULL) {
+        const char *reason = (status != 0) ? strerror(status) : "(not found)";
+        printf("Did not find a group %s: %s\n", gr_name, reason);
+        return;
+    }
+    
+    printf("getgrnam_r\n");   
+    
+    printf("    '%s' = %d\n", gr_name, out->gr_gid);
+}
+
+int main(void) {
+    test_getgrnam("lcake");
+    test_getgrnam_r("lcake");
+}
diff --git a/recipes/core/relibc/tests/grp/getgrouplist.c b/recipes/core/relibc/tests/grp/getgrouplist.c
new file mode 100644
index 0000000000..61e11d1a9a
--- /dev/null
+++ b/recipes/core/relibc/tests/grp/getgrouplist.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+#include <grp.h>
+
+int main(void) {
+    gid_t groups[20];
+    int ngroup = 20;
+    int num_groups = getgrouplist("user", 1000, groups, &ngroup);
+    
+    printf("Num Groups: %d\n", num_groups);
+    
+    for (int i = 0; i < num_groups; i++)
+        printf("i: %d\n", groups[i]);
+    
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/grp/getgroups.c b/recipes/core/relibc/tests/grp/getgroups.c
new file mode 100644
index 0000000000..7b06f293e2
--- /dev/null
+++ b/recipes/core/relibc/tests/grp/getgroups.c
@@ -0,0 +1,25 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <grp.h>
+
+int main() {
+    gid_t primary_gid = getegid();
+    struct group *pg = getgrgid(primary_gid);
+
+    printf("getegid: %u (%s)\n", primary_gid, pg ? pg->gr_name : "?");
+
+    int count = getgroups(0, NULL);
+    gid_t *list = malloc(sizeof(gid_t) * count);
+    getgroups(count, list);
+
+    printf("getgroups: %d\n", count);
+    for (int i = 0; i < count; i++) {
+        struct group *sg = getgrgid(list[i]);
+        
+        printf("  - %u (%s)\n", list[i], sg ? sg->gr_name : "?");
+    }
+
+    free(list);
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/grp/gr_iter.c b/recipes/core/relibc/tests/grp/gr_iter.c
new file mode 100644
index 0000000000..bf3e2e5090
--- /dev/null
+++ b/recipes/core/relibc/tests/grp/gr_iter.c
@@ -0,0 +1,10 @@
+#include <stdio.h>
+#include <grp.h>
+#include <string.h>
+
+int main(void) {
+    puts("getgrent\n");
+    
+    for (struct group* grp = getgrent(); grp != NULL; grp = getgrent())
+        printf("    %s = %d\n", grp->gr_name, grp->gr_gid);
+}
diff --git a/recipes/core/relibc/tests/includes.c b/recipes/core/relibc/tests/includes.c
new file mode 100644
index 0000000000..014235d740
--- /dev/null
+++ b/recipes/core/relibc/tests/includes.c
@@ -0,0 +1,91 @@
+// This test file exist only to check dependency graph, using `redoxer cc includes.c -H`
+
+// generate: find src/header -mindepth 1 -maxdepth 1 -type d -not -name "_*" -printf "#include <%f.h>\n" | sed -e 's|_|/|g' | sort
+
+// TODO: No include guard in these headers, probably expected?
+// #include <arch/aarch64/user.h>
+// #include <arch/riscv64/user.h>
+// #include <arch/x64/user.h>
+
+#include <arpa/inet.h>
+#include <assert.h>
+#ifndef __GLIBC__
+#include <bits/locale-t.h>
+#include <bits/pthread.h>
+#include <dl-tls.h>
+#endif
+#include <crypt.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <dlfcn.h>
+#include <elf.h>
+#include <endian.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <float.h>
+#include <fnmatch.h>
+#include <getopt.h>
+#include <glob.h>
+#include <grp.h>
+#include <ifaddrs.h>
+#include <inttypes.h>
+#include <langinfo.h>
+#include <libgen.h>
+#include <limits.h>
+#include <locale.h>
+#include <malloc.h>
+#include <monetary.h>
+#include <netdb.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <poll.h>
+#include <pthread.h>
+#include <pty.h>
+#include <pwd.h>
+#include <regex.h>
+#include <sched.h>
+#include <semaphore.h>
+#include <setjmp.h>
+#include <sgtty.h>
+#include <shadow.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/auxv.h>
+#include <sys/epoll.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/procfs.h>
+#include <sys/ptrace.h>
+#include <sys/random.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <sys/syslog.h>
+#include <sys/timeb.h>
+#include <sys/time.h>
+#include <sys/times.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <tar.h>
+#include <termios.h>
+#include <time.h>
+#include <unistd.h>
+#include <utime.h>
+#include <utmp.h>
+#include <wchar.h>
+#include <wctype.h>
+
+int main() {
+}
diff --git a/recipes/core/relibc/tests/iso646.c b/recipes/core/relibc/tests/iso646.c
new file mode 100644
index 0000000000..82f544807f
--- /dev/null
+++ b/recipes/core/relibc/tests/iso646.c
@@ -0,0 +1,92 @@
+#include <iso646.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main() {
+    uint8_t a_bits = 0xa; // 0b0000_1010
+    uint8_t b_bits = 0xc; // 0b0000_1100
+
+    uint8_t c_bits;
+    int c_bool;
+
+    printf("0 and 0: %d\n", 0 and 0);
+    printf("1 and 0: %d\n", 1 and 0);
+    printf("0 and 1: %d\n", 0 and 1);
+    printf("1 and 1: %d\n", 1 and 1);
+
+    c_bool = 0;
+    c_bool and_eq 0;
+    printf("0 and_eq 0: %d\n", c_bool);
+    c_bool = 1;
+    c_bool and_eq 0;
+    printf("1 and_eq 0: %d\n", c_bool);
+    c_bool = 0;
+    c_bool and_eq 1;
+    printf("0 and_eq 1: %d\n", c_bool);
+    c_bool = 1;
+    c_bool and_eq 1;
+    printf("1 and_eq 1: %d\n", c_bool);
+
+    c_bits = a_bits bitand b_bits;
+    printf("a bitand b: %d\n", c_bits);
+
+    c_bits = a_bits bitor b_bits;
+    printf("a bitor b: %d\n", c_bits);
+
+    c_bits = compl a_bits;
+    printf("compl a: %d\n", c_bits);
+
+    printf("not 0: %d\n", not 0);
+    printf("not 1: %d\n", not 1);
+
+    c_bool = 0;
+    c_bool not_eq 0;
+    printf("0 not_eq 0: %d\n", c_bool);
+    c_bool = 1;
+    c_bool not_eq 0;
+    printf("1 not_eq 0: %d\n", c_bool);
+    c_bool = 0;
+    c_bool not_eq 1;
+    printf("0 not_eq 1: %d\n", c_bool);
+    c_bool = 1;
+    c_bool not_eq 1;
+    printf("1 not_eq 1: %d\n", c_bool);
+
+    printf("0 or 0: %d\n", 0 or 0);
+    printf("1 or 0: %d\n", 1 or 0);
+    printf("0 or 1: %d\n", 0 or 1);
+    printf("1 or 1: %d\n", 1 or 1);
+
+    c_bool = 0;
+    c_bool or_eq 0;
+    printf("0 or_eq 0: %d\n", c_bool);
+    c_bool = 1;
+    c_bool or_eq 0;
+    printf("1 or_eq 0: %d\n", c_bool);
+    c_bool = 0;
+    c_bool or_eq 1;
+    printf("0 or_eq 1: %d\n", c_bool);
+    c_bool = 1;
+    c_bool or_eq 1;
+    printf("1 or_eq 1: %d\n", c_bool);
+
+    printf("0 xor 0: %d\n", 0 xor 0);
+    printf("1 xor 0: %d\n", 1 xor 0);
+    printf("0 xor 1: %d\n", 0 xor 1);
+    printf("1 xor 1: %d\n", 1 xor 1);
+
+    c_bool = 0;
+    c_bool xor_eq 0;
+    printf("0 xor_eq 0: %d\n", c_bool);
+    c_bool = 1;
+    c_bool xor_eq 0;
+    printf("1 xor_eq 0: %d\n", c_bool);
+    c_bool = 0;
+    c_bool xor_eq 1;
+    printf("0 xor_eq 1: %d\n", c_bool);
+    c_bool = 1;
+    c_bool xor_eq 1;
+    printf("1 xor_eq 1: %d\n", c_bool);
+}
diff --git a/recipes/core/relibc/tests/kill-waitpid.c b/recipes/core/relibc/tests/kill-waitpid.c
new file mode 100644
index 0000000000..000029127c
--- /dev/null
+++ b/recipes/core/relibc/tests/kill-waitpid.c
@@ -0,0 +1,36 @@
+#include <assert.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/wait.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int err;
+
+    int fds[2];
+    err = pipe(fds);
+    ERROR_IF(pipe, err, == -1);
+
+    int child = fork();
+    ERROR_IF(fork, child, == -1);
+
+    if (child == 0) {
+        // block forever
+        char buf[1];
+        read(fds[0], buf, 1);
+    }
+
+    err = kill(child, SIGTERM);
+    ERROR_IF(kill, err, == -1);
+
+    int status;
+    err = waitpid(child, &status, 0);
+    ERROR_IF(waitpid, err, == -1);
+    printf("STATUS %d\n", status);
+    assert(WIFSIGNALED(status));
+    assert(WTERMSIG(status) == SIGTERM);
+}
diff --git a/recipes/core/relibc/tests/libfoo.c b/recipes/core/relibc/tests/libfoo.c
new file mode 100644
index 0000000000..b2106a4ec5
--- /dev/null
+++ b/recipes/core/relibc/tests/libfoo.c
@@ -0,0 +1,3 @@
+char *FOO = "foo";
+
+void a() {}
diff --git a/recipes/core/relibc/tests/libfoobar.c b/recipes/core/relibc/tests/libfoobar.c
new file mode 100644
index 0000000000..67cef36df6
--- /dev/null
+++ b/recipes/core/relibc/tests/libfoobar.c
@@ -0,0 +1,4 @@
+char *BAR = "bar";
+
+void a();
+void b() { a(); }
diff --git a/recipes/core/relibc/tests/libgen.c b/recipes/core/relibc/tests/libgen.c
new file mode 100644
index 0000000000..8cec95a78b
--- /dev/null
+++ b/recipes/core/relibc/tests/libgen.c
@@ -0,0 +1,127 @@
+#include <libgen.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+#define TODO NULL
+
+// TODO: Tests for Redox schemes
+struct test_case {
+    char *path;
+    char *dirname;
+    char *basename;
+} test_cases[] = {
+    // Classic UNIX
+    // path              dirname  basename
+    { "",                ".",     "."   },
+    { ".",               ".",     "."   },
+    { "..",              ".",     ".."  },
+    { "/",               "/",     "/"   },
+    { "///",             "/",     "/"   },
+    { "//usr//lib//",    "//usr", "lib" },
+    { "/usr",            "/",     "usr" },
+    { "/usr/",           "/",     "usr" },
+    { "/usr/lib",        "/usr",  "lib" },
+    { NULL,              ".",     "."   }
+    // Root scheme
+    // path              dirname  basename
+    //{ ":",               TODO,    TODO },
+    //{ ":/",              TODO,    TODO },
+    //{ ":/scheme",        TODO,    TODO },
+    // Regular scheme
+    // path              dirname  basename
+    //{ "file:",           TODO,    TODO },
+    //{ "file:usr",        TODO,    TODO },
+    //{ "file:usr/",       TODO,    TODO },
+    //{ "file:usr/lib",    TODO,    TODO },
+    //{ "file:/",          TODO,    TODO },
+    //{ "file:/usr",       TODO,    TODO },
+    //{ "file:/usr/",      TODO,    TODO },
+    //{ "file:/usr/lib",   TODO,    TODO },
+    //{ "file:///",        TODO,    TODO },
+    //{ "file://usr",      TODO,    TODO },
+    //{ "file://usr//",    TODO,    TODO },
+    // Hierarchical scheme
+    // path              dirname  basename
+    //{ "disk/0:",         TODO,    TODO },
+    //{ "disk/0:/",        TODO,    TODO },
+    //{ "disk/0:///",      TODO,    TODO },
+    //{ "disk/0:/usr",     TODO,    TODO },
+    //{ "disk/0:/usr/",    TODO,    TODO },
+    //{ "disk/0:/usr/lib", TODO,    TODO },
+    // Malformed
+    // path              dirname  basename
+    //{ "/file:/sys:/usr", TODO,    TODO },
+    //{ "/file:/usr",      TODO,    TODO },
+    //{ "/file:sys:/usr",  TODO,    TODO },
+    //{ "/file:usr",       TODO,    TODO },
+    //{ ":file/usr",       TODO,    TODO },
+    //{ "file:/sys:/usr",  TODO,    TODO },
+    //{ "file::/",         TODO,    TODO },
+    //{ "file::/usr/lib",  TODO,    TODO }
+};
+
+size_t num_test_cases = sizeof(test_cases) / sizeof(struct test_case);
+
+int safe_strcmp(char *s1, char *s2) {
+    if (s1 == NULL && s2 == NULL) {
+        return 0;
+    } else if (s1 == NULL && s2 != NULL) {
+        return 1;
+    } else if (s1 != NULL && s2 == NULL) {
+        return -1;
+    } else {
+        return strcmp(s1, s2);
+    }
+}
+
+#define CHECK_TEST(tc, fn, retval)                                             \
+    do {                                                                       \
+        /* API for basename and dirname allow the passed in string to */       \
+        /* be modified. This means we have to pass a modifiable copy. */       \
+        char *path = NULL;                                                     \
+        if (tc.path != NULL)                                                   \
+            path = strdup(tc.path);                                            \
+                                                                               \
+        char *output = fn(path);                                               \
+                                                                               \
+        /* Printing NULLs with printf("%s") is undefined behaviour, */         \
+        /* that's why they are handled here this way.               */         \
+        char display_path[64] = "NULL";                                        \
+        char display_output[64] = "NULL";                                      \
+        char display_expected[64] = "NULL";                                    \
+        if (tc.path != NULL) sprintf(display_path, "\"%s\"", tc.path);         \
+        if (output != NULL) sprintf(display_output, "\"%s\"", output);         \
+        if (tc.fn != NULL) sprintf(display_expected, "\"%s\"", tc.fn);         \
+                                                                               \
+        if (safe_strcmp(output, tc.fn) != 0) {                                 \
+            retval = EXIT_FAILURE;                                             \
+            printf("%s(%s) != %s, expected: %s\n",                             \
+                #fn, display_path, display_output, display_expected);          \
+        } else {                                                               \
+            printf("%s(%s) == %s\n",                                           \
+                #fn, display_path, display_output);                            \
+        }                                                                      \
+                                                                               \
+        free(path);                                                            \
+    } while (0)
+
+int main(void) {
+    int retval = EXIT_SUCCESS;
+
+    for(size_t i = 0; i < num_test_cases; ++i) {
+        struct test_case tc = test_cases[i];
+        CHECK_TEST(tc, dirname, retval);
+        CHECK_TEST(tc, basename, retval);
+    }
+
+    if (retval == EXIT_SUCCESS) {
+        printf("Success: %d\n", retval);
+    } else {
+        printf("Failure: %d\n", retval);
+    }
+
+    return retval;
+}
diff --git a/recipes/core/relibc/tests/limits.c b/recipes/core/relibc/tests/limits.c
new file mode 100644
index 0000000000..f59585ff7c
--- /dev/null
+++ b/recipes/core/relibc/tests/limits.c
@@ -0,0 +1,48 @@
+#include <stdio.h>
+#include <limits.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+int main() {
+    char        c_max  = CHAR_MAX;
+    char        c_min  = CHAR_MIN;
+    signed char sc_max = SCHAR_MAX;
+    signed char sc_min = SCHAR_MIN;
+    short       s_max  = SHRT_MAX;
+    short       s_min  = SHRT_MIN;
+    int         i_max  = INT_MAX;
+    int         i_min  = INT_MIN;
+    long        l_max  = LONG_MAX;
+    long        l_min  = LONG_MIN;
+    long long   ll_max = LLONG_MAX;
+    long long   ll_min = LLONG_MIN;
+    ssize_t     ss_max = SSIZE_MAX;
+    unsigned char      uc_max = UCHAR_MAX;
+    unsigned short     us_max = USHRT_MAX;
+    unsigned int       ui_max = UINT_MAX;
+    unsigned long      ul_max = ULONG_MAX;
+    unsigned long long ull_max = ULLONG_MAX;
+#ifndef __GLIBC__
+    int long_bit = LONG_BIT;
+    int word_bit = WORD_BIT;
+#endif
+
+    printf("CHAR      : [%d, %d]\n", c_min, c_max);
+    printf("SCHAR     : [%d, %d]\n", sc_min, sc_max);
+    printf("SHRT      : [%d, %d]\n", s_min, s_max);
+    printf("INT       : [%d, %d]\n", i_min, i_max);
+    printf("LONG      : [%ld, %ld]\n", l_min, l_max);
+    printf("LLONG     : [%lld, %lld]\n", ll_min, ll_max);
+    printf("SSIZE_MAX : %zd\n\n", ss_max);
+    printf("UCHAR_MAX  : %u\n", uc_max);
+    printf("USHRT_MAX  : %u\n", us_max);
+    printf("UINT_MAX   : %u\n", ui_max);
+    printf("ULONG_MAX  : %lu\n", ul_max);
+    printf("ULLONG_MAX : %llu\n\n", ull_max);
+#ifndef __GLIBC__
+    printf("LONG_BIT : %d\n", long_bit);
+    printf("WORD_BIT : %d\n", word_bit);
+#endif
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/locale/duplocale.c b/recipes/core/relibc/tests/locale/duplocale.c
new file mode 100644
index 0000000000..735fbbe353
--- /dev/null
+++ b/recipes/core/relibc/tests/locale/duplocale.c
@@ -0,0 +1,39 @@
+#include <locale.h>
+#include <stdio.h>
+#include <assert.h>
+#include <stdint.h>
+
+int main() {
+    struct lconv *lconv0 = localeconv();
+
+    locale_t locale0 = uselocale(NULL);
+    assert(locale0 == LC_GLOBAL_LOCALE);
+
+    locale_t locale1 = uselocale(LC_GLOBAL_LOCALE);
+    assert(locale1 == LC_GLOBAL_LOCALE);
+
+    struct lconv *lconv1 = localeconv();
+    assert(lconv0 == lconv1);
+    
+    locale_t locale2 = newlocale(LC_ALL_MASK, "C", (locale_t)0);
+    assert(locale2 != LC_GLOBAL_LOCALE);
+
+    struct lconv *lconv2 = localeconv();
+    assert(lconv2 == lconv1);
+    
+    locale_t locale3 = duplocale(locale2);
+    assert(locale3 != locale2);
+    assert(locale3 != LC_GLOBAL_LOCALE);
+
+    locale_t locale4 = uselocale(locale3);
+    assert(locale4 == locale1);
+
+    struct lconv *lconv3 = localeconv();
+    assert(lconv3 != lconv2);
+
+    // should not crash
+    freelocale(locale3);
+    freelocale(locale2);
+    freelocale(locale1);
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/locale/newlocale.c b/recipes/core/relibc/tests/locale/newlocale.c
new file mode 100644
index 0000000000..c9d16b2cc6
--- /dev/null
+++ b/recipes/core/relibc/tests/locale/newlocale.c
@@ -0,0 +1,18 @@
+#include <locale.h>
+#include <stdio.h>
+#include <assert.h>
+#include <stdint.h>
+
+int main() {    
+    locale_t locale0 = newlocale(LC_ALL_MASK, "C", (locale_t)0);
+    assert(locale0 != (locale_t)0);
+
+    locale_t locale1 = newlocale(LC_ALL_MASK, "non-existent-locale", (locale_t)0);
+    assert(locale1 == (locale_t)0);
+
+    // TODO: locale files inside redoxer (linux and redox)?
+    // locale_t locale2 = newlocale(LC_ALL_MASK, "en_US", (locale_t)0);
+    // assert(locale2 != (locale_t)0);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/locale/setlocale.c b/recipes/core/relibc/tests/locale/setlocale.c
new file mode 100644
index 0000000000..bb80cf7d0f
--- /dev/null
+++ b/recipes/core/relibc/tests/locale/setlocale.c
@@ -0,0 +1,15 @@
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    // TODO: Implement locale properly and test it here
+    char* val = setlocale(LC_ALL, NULL);
+    if (strcmp(val, "C") == 0) {
+        puts("success!");
+    } else {
+        printf("setlocale returned the wrong value: %s", val);
+    }
+}
diff --git a/recipes/core/relibc/tests/malloc/usable_size.c b/recipes/core/relibc/tests/malloc/usable_size.c
new file mode 100644
index 0000000000..933ebf03f2
--- /dev/null
+++ b/recipes/core/relibc/tests/malloc/usable_size.c
@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <malloc.h>
+#include <string.h>
+#include <assert.h>
+
+int main(void) {
+    size_t request_size = 27;
+    char *ptr = (char *)malloc(request_size);
+
+    if (!ptr) {
+        fprintf(stderr, "Allocation failed\n");
+        return 1;
+    }
+
+    size_t actual_size = malloc_usable_size(ptr);
+
+    printf("malloc: %zu bytes\n", request_size);
+    printf("malloc_usable_size: %zu bytes\n", actual_size);
+
+    assert(actual_size >= request_size);
+    memset(ptr, 'A', actual_size); 
+    ptr[actual_size - 1] = '\0';
+
+    assert(ptr[0] == 'A');
+    assert(ptr[actual_size - 2] == 'A');
+    assert(ptr[actual_size - 1] == '\0');
+    free(ptr);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/math.c b/recipes/core/relibc/tests/math.c
new file mode 100644
index 0000000000..8ff0a72911
--- /dev/null
+++ b/recipes/core/relibc/tests/math.c
@@ -0,0 +1,10 @@
+#include <math.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    double pi = 3.14;
+    float c = cos(pi);
+    printf("cos(%f) = %f\n", pi, c);
+}
diff --git a/recipes/core/relibc/tests/mkfifo.c b/recipes/core/relibc/tests/mkfifo.c
new file mode 100644
index 0000000000..318419a507
--- /dev/null
+++ b/recipes/core/relibc/tests/mkfifo.c
@@ -0,0 +1,46 @@
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+int main(void) {
+  char temp[] = "/tmp/stattest-XXXXXX";
+  const char file[] = "/mkfifo_fifo";
+  int len = sizeof(temp) + sizeof(file);
+
+  char* path = malloc(len * sizeof(char));
+  path[0] = '\0';
+
+  if (path == NULL) {
+    fprintf(stderr, "Could not allocate: %s\n", strerror(errno));
+    exit(1);
+  }
+
+
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+  path = strncat(path, mktemp(temp), sizeof(temp));
+  #pragma GCC diagnostic pop
+  path = strncat(path, file, sizeof(file));
+  if (mkdir(temp, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) {
+    fprintf(stderr, "mkdir %s: %s\n", temp, strerror(errno));
+    exit(1);
+  }
+  if (mkfifo(path, S_IRUSR) == -1) {
+    fprintf(stderr, "mkfifo %s: %s\n", path, strerror(errno));
+    exit(1);
+  }
+  struct stat sb;
+  if (stat(path, &sb) != 0) {
+    fprintf(stderr, "stat: %s\n", strerror(errno));
+    exit(1);
+  }
+  if (!(sb.st_mode & S_IFIFO)) {
+    fprintf(stderr, "Not a FIFO: %d\n", sb.st_mode);
+    exit(1);
+  }
+}
diff --git a/recipes/core/relibc/tests/mknod.c b/recipes/core/relibc/tests/mknod.c
new file mode 100644
index 0000000000..50d533a2a2
--- /dev/null
+++ b/recipes/core/relibc/tests/mknod.c
@@ -0,0 +1,50 @@
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+int main(void) {
+  char temp[] = "/tmp/stattest-XXXXXX";
+  const char file[] = "/mknod";
+  int len = sizeof(temp) + sizeof(file);
+
+  char* path = malloc(len * sizeof(char));
+  path[0] = '\0';
+
+  if (path == NULL) {
+    fprintf(stderr, "Could not allocate: %s\n", strerror(errno));
+    exit(1);
+  }
+
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+  if(!mktemp(temp)) {
+    fprintf(stderr, "Unable to create a unique dir name %s: %s\n", temp, strerror(errno));
+    exit(1);
+  }
+  #pragma GCC diagnostic pop
+
+  path = strncat(path, temp, strlen(temp));
+  path = strncat(path, file, strlen(file));
+  if (mkdir(temp, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) {
+    fprintf(stderr, "mkdir %s: %s\n", temp, strerror(errno));
+    exit(1);
+  }
+  if (mknod(path, S_IFREG, S_IRUSR) == -1) {
+    fprintf(stderr, "mknod %s: %s\n", path, strerror(errno));
+    exit(1);
+  }
+  struct stat sb;
+  if (stat(path, &sb) != 0) {
+    fprintf(stderr, "stat: %s\n", strerror(errno));
+    exit(1);
+  }
+  if (!(sb.st_mode & S_IFREG)) {
+    fprintf(stderr, "Expected S_IFREG flag to be set, got mode: %d\n", sb.st_mode);
+    exit(1);
+  }
+}
diff --git a/recipes/core/relibc/tests/mknodat.c b/recipes/core/relibc/tests/mknodat.c
new file mode 100644
index 0000000000..ad2798624f
--- /dev/null
+++ b/recipes/core/relibc/tests/mknodat.c
@@ -0,0 +1,62 @@
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+int main(void) {
+  char temp[] = "/tmp/stattest-XXXXXX";
+  const char separator[] = "/";
+  const char file[] = "mknod"; // relative
+  int len = sizeof(temp) + sizeof(file) + sizeof(separator);
+
+  char* path = malloc(len * sizeof(char));
+  path[0] = '\0';
+
+  if (path == NULL) {
+    fprintf(stderr, "Could not allocate: %s\n", strerror(errno));
+    exit(1);
+  }
+
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+  if(!mktemp(temp)) {
+    fprintf(stderr, "Unable to create a unique dir name %s: %s\n", temp, strerror(errno));
+    exit(1);
+  }
+  #pragma GCC diagnostic pop
+
+  if (mkdir(temp, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) {
+    fprintf(stderr, "mkdir %s: %s\n", temp, strerror(errno));
+    exit(1);
+  }
+
+  int dir_fd = open(temp, O_RDONLY);
+  if(dir_fd == -1) {
+    fprintf(stderr, "unable to open temp directory: %s with error: %s\n", temp, strerror(errno));
+    exit(1);
+  }
+
+  if (mknodat(dir_fd, file, S_IFREG, S_IRUSR) == -1) {
+    fprintf(stderr, "mknod %s: %s\n", path, strerror(errno));
+    exit(1);
+  }
+
+  path = strncat(path, temp, strlen(temp));
+  path = strncat(path, separator, strlen(temp));
+  path = strncat(path, file, strlen(file));
+
+  struct stat sb;
+  if (stat(path, &sb) != 0) {
+    fprintf(stderr, "stat for %s: %s\n", path, strerror(errno));
+    exit(1);
+  }
+
+  if (!(sb.st_mode & S_IFREG)) {
+    fprintf(stderr, "Expected S_IFREG flag to be set, got mode: %d\n", sb.st_mode);
+    exit(1);
+  }
+}
diff --git a/recipes/core/relibc/tests/net/if.c b/recipes/core/relibc/tests/net/if.c
new file mode 100644
index 0000000000..5cce1465f4
--- /dev/null
+++ b/recipes/core/relibc/tests/net/if.c
@@ -0,0 +1,43 @@
+#include <net/if.h>
+#include <string.h>
+
+#include "../test_helpers.h"
+
+#define assert_eq(value, expected)                                             \
+  {                                                                            \
+    if (value != expected) {                                                   \
+      fprintf(stderr, "%s:%d: failed\n", __FILE__, __LINE__);                  \
+      exit(EXIT_FAILURE);                                                      \
+    }                                                                          \
+  }
+
+int main(void) {
+  const struct if_nameindex *list = if_nameindex();
+
+  // Currently always returning a stub
+  const struct if_nameindex *first = &(list[0]);
+  assert_eq(first->if_index, 1);
+  assert_eq(strcmp(first->if_name, "stub"), 0);
+
+  // Last item with 0 values determines the end of the list
+  const struct if_nameindex *second = &(list[1]);
+  assert_eq(second->if_index, 0);
+  assert_eq(second->if_name, 0);
+
+  unsigned idx;
+  idx = if_nametoindex(0);
+  assert_eq(idx, 0);
+  idx = if_nametoindex("any");
+  assert_eq(idx, 0);
+  idx = if_nametoindex("stub");
+  assert_eq(idx, 1);
+
+  const char *name;
+  name = if_indextoname(0, 0);
+  assert_eq(name, 0);
+
+  name = if_indextoname(1, 0);
+  assert_eq(strcmp(name, "stub"), 0);
+
+  printf("OK\n");
+}
diff --git a/recipes/core/relibc/tests/netdb/getaddrinfo.c b/recipes/core/relibc/tests/netdb/getaddrinfo.c
new file mode 100644
index 0000000000..e1bb13562f
--- /dev/null
+++ b/recipes/core/relibc/tests/netdb/getaddrinfo.c
@@ -0,0 +1,49 @@
+// Adapted from https://gist.github.com/jirihnidek/bf7a2363e480491da72301b228b35d5d
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <netdb.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    struct addrinfo hints, *res;
+    int errcode;
+    char addrstr[INET6_ADDRSTRLEN];
+    void *ptr;
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = PF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags |= AI_CANONNAME;
+
+    errcode = getaddrinfo("www.redox-os.org", NULL, &hints, &res);
+    if (errcode != 0) {
+        perror("getaddrinfo");
+        exit(EXIT_FAILURE);
+    }
+
+    while (res) {
+        switch (res->ai_family) {
+        case AF_INET:
+            ptr = &((struct sockaddr_in *) res->ai_addr)->sin_addr;
+            break;
+        case AF_INET6:
+            ptr = &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr;
+            break;
+        }
+        inet_ntop(res->ai_family, ptr, addrstr, INET6_ADDRSTRLEN);
+
+        printf(
+            "IPv%d address: %s (%s)\n",
+            res->ai_family == AF_INET6 ? 6 : 4,
+            addrstr,
+            res->ai_canonname
+        );
+
+        res = res->ai_next;
+    }
+}
diff --git a/recipes/core/relibc/tests/netdb/getaddrinfo_null.c b/recipes/core/relibc/tests/netdb/getaddrinfo_null.c
new file mode 100644
index 0000000000..01b69cb860
--- /dev/null
+++ b/recipes/core/relibc/tests/netdb/getaddrinfo_null.c
@@ -0,0 +1,44 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+#include <sys/types.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+
+#include "test_helpers.h"
+
+int test_getaddrinfo(int ai_flags, size_t* ipv4_addr) {
+    struct addrinfo hints, *res;
+    int status;
+
+    memset(&hints, 0, sizeof hints);
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = ai_flags;
+
+    if ((status = getaddrinfo(NULL, "8080", &hints, &res)) != 0) {
+        return status;
+    }
+
+    *ipv4_addr = ((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr;
+    freeaddrinfo(res);
+    return 0;
+}
+
+int main() {
+    size_t ipv4_addr;
+    char addrstr[INET_ADDRSTRLEN];
+
+    int status = test_getaddrinfo(0, &ipv4_addr);
+    ERROR_IF(getaddrinfo, status, != 0);
+    ERROR_IF(getaddrinfo_ai_addr, ipv4_addr, == 0);
+    inet_ntop(AF_INET, &ipv4_addr, addrstr, INET_ADDRSTRLEN);
+    printf("local IPv4 address 1: %s\n", addrstr);
+
+    status = test_getaddrinfo(AI_PASSIVE, &ipv4_addr);
+    ERROR_IF(getaddrinfo, status, != 0);
+    ERROR_IF(getaddrinfo_ai_addr, ipv4_addr, != 0);
+    inet_ntop(AF_INET, &ipv4_addr, addrstr, INET_ADDRSTRLEN);
+    printf("local IPv4 address 2: %s\n", addrstr);
+}
diff --git a/recipes/core/relibc/tests/netdb/netdb.c b/recipes/core/relibc/tests/netdb/netdb.c
new file mode 100644
index 0000000000..2ccf70ec00
--- /dev/null
+++ b/recipes/core/relibc/tests/netdb/netdb.c
@@ -0,0 +1,280 @@
+/* Copyright (C) 1998-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>, 1998.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+/*
+  Testing of some network related lookup functions.
+  The system databases looked up are:
+  - /etc/services
+  - /etc/hosts
+  - /etc/networks
+  - /etc/protocols
+  The tests try to be fairly generic and simple so that they work on
+  every possible setup (and might therefore not detect some possible
+  errors).
+*/
+
+#include <netdb.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+#define ADDR_SIZE sizeof(uint8_t) * 4
+
+int error_count;
+static void
+output_servent (const char *call, struct servent *sptr)
+{
+  char **pptr;
+  if (sptr == NULL)
+    printf ("Call: %s returned NULL\n", call);
+  else
+    {
+      printf ("Call: %s, returned: s_name: %s, s_port: %d, s_proto: %s\n",
+              call, sptr->s_name, ntohs(sptr->s_port), sptr->s_proto);
+      for (pptr = sptr->s_aliases; *pptr != NULL; pptr++)
+        printf ("  alias: %s\n", *pptr);
+    }
+}
+static void
+test_services (void)
+{
+  struct servent *sptr;
+  sptr = getservbyname ("domain", "tcp");
+  // output_servent ("getservbyname (\"domain\", \"tcp\")", sptr);
+  sptr = getservbyname ("domain", "udp");
+  // output_servent ("getservbyname (\"domain\", \"udp\")", sptr);
+  sptr = getservbyname ("domain", NULL);
+  // output_servent ("getservbyname (\"domain\", NULL)", sptr);
+  sptr = getservbyname ("not-existant", NULL);
+  // output_servent ("getservbyname (\"not-existant\", NULL)", sptr);
+  /* This shouldn't return anything.  */
+  sptr = getservbyname ("", "");
+  // output_servent ("getservbyname (\"\", \"\")", sptr);
+  sptr = getservbyname ("", "tcp");
+  // output_servent ("getservbyname (\"\", \"tcp\")", sptr);
+  sptr = getservbyport (htons(53), "tcp");
+  // output_servent ("getservbyport (htons(53), \"tcp\")", sptr);
+  sptr = getservbyport (htons(53), NULL);
+  // output_servent ("getservbyport (htons(53), NULL)", sptr);
+  sptr = getservbyport (htons(1), "udp"); /* shouldn't exist */
+  // output_servent ("getservbyport (htons(1), \"udp\")", sptr);
+  setservent (0);
+  do
+    {
+      sptr = getservent ();
+      //output_servent ("getservent ()", sptr);
+    }
+  while (sptr != NULL);
+  endservent ();
+}
+static void
+output_hostent (const char *call, struct hostent *hptr)
+{
+  char **pptr;
+  char buf[INET6_ADDRSTRLEN];
+  if (hptr == NULL)
+    printf ("Call: %s returned NULL\n", call);
+  else
+    {
+      printf ("Call: %s returned: name: %s, addr_type: %d\n",
+              call, hptr->h_name, hptr->h_addrtype);
+      if (hptr->h_aliases)
+        for (pptr = hptr->h_aliases; *pptr != NULL; pptr++)
+          printf ("  alias: %s\n", *pptr);
+      for (pptr = hptr->h_addr_list; *pptr != NULL; pptr++)
+        printf ("  ip: %s\n",
+                inet_ntop (hptr->h_addrtype, *pptr, buf, sizeof (buf)));
+    }
+}
+static void
+test_hosts (void)
+{
+  struct hostent *hptr1, *hptr2;
+  char *name = NULL;
+  size_t namelen = 0;
+  struct in_addr ip;
+  hptr1 = gethostbyname ("localhost");
+  hptr2 = gethostbyname ("LocalHost");
+  if (hptr1 != NULL || hptr2 != NULL)
+    {
+      if (hptr1 == NULL)
+        {
+          printf ("localhost not found - but LocalHost found:-(\n");
+          ++error_count;
+        }
+      else if (hptr2 == NULL)
+        {
+          printf ("LocalHost not found - but localhost found:-(\n");
+          ++error_count;
+        }
+      else if (strcmp (hptr1->h_name, hptr2->h_name) != 0)
+        {
+          printf ("localhost and LocalHost have different canoncial name\n");
+          printf ("gethostbyname (\"localhost\")->%s\n", hptr1->h_name);
+          printf ("gethostbyname (\"LocalHost\")->%s\n", hptr2->h_name);
+          ++error_count;
+        }
+       //else
+       //  output_hostent ("gethostbyname(\"localhost\")", hptr1);
+    }
+  hptr1 = gethostbyname ("127.0.0.1");
+  //output_hostent ("gethostbyname (\"127.0.0.1\")", hptr1);
+  while (gethostname (name, namelen) < 0 && errno == ENAMETOOLONG)
+    {
+      namelen += 2;                /* tiny increments to test a lot */
+      name = realloc (name, namelen);
+    }
+  if (gethostname (name, namelen) == 0)
+    {
+      // printf ("Hostname: %s\n", name);
+      if (name != NULL)
+        {
+          hptr1 = gethostbyname (name);
+        //  output_hostent ("gethostbyname (gethostname(...))", hptr1);
+        }
+    }
+  ip.s_addr = htonl (INADDR_LOOPBACK);
+
+  hptr1 = gethostbyaddr ((char *) &ip, sizeof(ip), AF_INET);
+  if (hptr1 != NULL)
+    {
+     // printf ("official name of 127.0.0.1: %s\n", hptr1->h_name);
+    }
+  sethostent (0);
+  do
+    {
+      hptr1 = gethostent ();
+      //output_hostent ("gethostent ()", hptr1);
+    }
+  while (hptr1 != NULL);
+  endhostent ();
+  struct hostent* redox = gethostbyname("redox-os.org");
+  if (redox == NULL) {
+      ++error_count;
+  }
+  //output_hostent("gethostbyname(\"redox-os.org\")", redox);
+  struct in_addr el_goog;
+  inet_aton("8.8.4.4", &el_goog);
+  struct hostent* google = gethostbyaddr(&el_goog, 4, AF_INET);
+  if (google == NULL) {
+      ++error_count;
+  }
+  //output_hostent("gethostbyaddr(\"8.8.4.4\")",google);
+}
+
+static void
+output_protoent (const char *call, struct protoent *prptr)
+{
+  char **pptr;
+  if (prptr == NULL)
+    printf ("Call: %s returned NULL\n", call);
+  else
+    {
+      printf ("Call: %s, returned: p_name: %s, p_proto: %d\n",
+              call, prptr->p_name, prptr->p_proto);
+      for (pptr = prptr->p_aliases; *pptr != NULL; pptr++)
+        printf ("  alias: %s\n", *pptr);
+    }
+}
+static void
+test_protocols (void)
+{
+  struct protoent *prptr;
+  prptr = getprotobyname ("ICMP");
+ // output_protoent ("getprotobyname (\"ICMP\")", prptr);
+  prptr = getprotobynumber (1);
+ // output_protoent ("getprotobynumber (1)", prptr);
+  setprotoent (0);
+  do
+    {
+      prptr = getprotoent ();
+     // output_protoent ("getprotoent ()", prptr);
+    }
+  while (prptr != NULL);
+  endprotoent ();
+}
+static void
+test_network (void)
+{
+  struct netent *nptr = getnetbyname ("loopback");
+  if (nptr != NULL) {
+    printf("network name %d", nptr->n_net);
+  } else {
+    ++error_count;
+  }
+  do
+    {
+      nptr = getnetent();
+      if (nptr != NULL) {
+          printf("network name %s", nptr->n_name);
+      }
+    }
+  while (nptr != NULL);
+  setnetent (0);
+}
+static void
+test_h_errno (void) {
+  const uint8_t addr[] = {0, 0, 0, 0};
+  struct hostent *host = gethostbyaddr(addr, ADDR_SIZE, AF_INET);
+  if (host) {
+    ++error_count;
+  }
+
+  int err = h_errno;
+  herror("Prefix test");
+  if (err != HOST_NOT_FOUND) {
+    ++error_count;
+  }
+
+  host = gethostbyname("");
+  if (host) {
+    ++error_count;
+  }
+
+  err = h_errno;
+  herror("");
+  if (err != HOST_NOT_FOUND) {
+    ++error_count;
+  }
+}
+static int
+do_test (void)
+{
+  /*
+    setdb ("db");
+  */
+  test_h_errno ();
+  test_hosts ();
+  test_network ();
+  test_protocols ();
+  test_services ();
+  if (error_count)
+    printf ("\n %d errors occurred!\n", error_count);
+  else
+    printf ("No visible errors occurred!\n");
+  return (error_count != 0);
+}
+
+int main(void) {
+    do_test();
+}
diff --git a/recipes/core/relibc/tests/psignal.c b/recipes/core/relibc/tests/psignal.c
new file mode 100644
index 0000000000..375d1b0552
--- /dev/null
+++ b/recipes/core/relibc/tests/psignal.c
@@ -0,0 +1,22 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    puts("------psignal------");
+    psignal(SIGUSR1, "a prefix");
+    puts("------  end  ------");
+    puts("------psiginfo-----");
+    siginfo_t info = { 0 };
+    info.si_code = SI_USER;
+    info.si_pid = 42;
+    info.si_uid = 1337;
+    info.si_addr = (void *)0xdeadbeef;
+    info.si_value.sival_ptr = (void *)0xfedface;
+    psiginfo(&info, "another prefix");
+    puts("------        -----");
+}
diff --git a/recipes/core/relibc/tests/pthread/barrier.c b/recipes/core/relibc/tests/pthread/barrier.c
new file mode 100644
index 0000000000..34be540015
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/barrier.c
@@ -0,0 +1,124 @@
+#include "../test_helpers.h"
+#include "common.h"
+
+#include <assert.h>
+#include <pthread.h>
+#include <stdatomic.h>
+#include <stdbool.h>
+
+// Same test logic as test_barrier in rustc/library/std/sync/barrier/tests.rs
+
+#define N 10
+
+struct arg {
+  pthread_barrier_t *barrier;
+  volatile _Atomic(unsigned) *count;
+  bool is_leader;
+};
+
+void *routine(void *arg_raw) {
+  struct arg *arg = arg_raw;
+
+  int status = pthread_barrier_wait(arg->barrier);
+
+  arg->is_leader = status == PTHREAD_BARRIER_SERIAL_THREAD;
+
+  if (!arg->is_leader)
+    ERROR_IF(pthread_barrier_wait, status, != 0);
+
+  // We can now modify the counter.
+  atomic_fetch_add_explicit(arg->count, 1, memory_order_relaxed);
+
+  return NULL;
+}
+
+int main(void) {
+  int status;
+
+  pthread_barrier_t barrier;
+
+  pthread_barrierattr_t attr;
+  status = pthread_barrierattr_init(&attr);
+  ERROR_IF(pthread_barrierattr_init, status, != 0);
+
+  int pshared;
+
+  //
+  // BARRIER ATTR
+  //
+
+  status = pthread_barrierattr_getpshared(&attr, &pshared);
+
+  // PTHREAD_PROCESS_PRIVATE is default according to POSIX.
+  assert(pshared == PTHREAD_PROCESS_PRIVATE);
+
+  ERROR_IF(pthread_barrierattr_getpshared, status, != 0);
+
+  status = pthread_barrierattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
+  ERROR_IF(pthread_barrierattr_setpshared, status, != 0);
+
+  status = pthread_barrierattr_getpshared(&attr, &pshared);
+  assert(pshared == PTHREAD_PROCESS_SHARED);
+  ERROR_IF(pthread_barrierattr_getpshared, status, != 0);
+
+  status = pthread_barrierattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);
+  ERROR_IF(pthread_barrierattr_setpshared, status, != 0);
+
+  status = pthread_barrierattr_getpshared(&attr, &pshared);
+  assert(pshared == PTHREAD_PROCESS_PRIVATE);
+  ERROR_IF(pthread_barrierattr_getpshared, status, != 0);
+
+  //
+  // BARRIER
+  //
+
+  status = pthread_barrier_init(&barrier, &attr, N);
+  ERROR_IF(pthread_barrier_init, status, != 0);
+
+  status = pthread_barrierattr_destroy(&attr);
+  ERROR_IF(pthread_barrierattr_destroy, status, != 0);
+
+  //
+  // CREATE THREAD
+  //
+
+  pthread_t threads[N - 1];
+  struct arg args[N - 1];
+  _Atomic(unsigned) count = false;
+
+  for (size_t i = 0; i < N - 1; i++) {
+    args[i] = (struct arg){ .count = &count, .barrier = &barrier, .is_leader = false };
+    status = pthread_create(&threads[i], NULL, routine, &args[i]);
+    ERROR_IF(pthread_create, status, != 0);
+  }
+
+  // Must not be set before having waited for the barrier. This is part of the
+  // test. Normally spawned threads run before the scheduler returns to the
+  // parent thread, so it should at least partially verify that barriers work.
+  unsigned value = atomic_load_explicit(&count, memory_order_relaxed);
+
+  UNEXP_IF(count_before_barrier_wait, value, > 0);
+
+  status = pthread_barrier_wait(&barrier);
+
+  bool leader_found = status == PTHREAD_BARRIER_SERIAL_THREAD;
+
+  if (!leader_found) {
+    ERROR_IF(pthread_barrier_wait, status, != 0);
+  }
+
+  for (size_t i = 0; i < N - 1; i++) {
+    status = pthread_join(threads[i], NULL);
+    ERROR_IF(pthread_join, status, != 0);
+
+    // SAFETY: pthread_create and pthread_join are Acquire-Release
+    leader_found |= args[i].is_leader;
+  }
+
+  assert(leader_found);
+
+  status = pthread_barrier_destroy(&barrier);
+  ERROR_IF(pthread_barrier_destroy, status, != 0);
+
+  return 0;
+}
diff --git a/recipes/core/relibc/tests/pthread/cleanup.c b/recipes/core/relibc/tests/pthread/cleanup.c
new file mode 100644
index 0000000000..015b56eda2
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/cleanup.c
@@ -0,0 +1,65 @@
+#include <assert.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <pthread.h>
+
+// TODO: glibc requires arg to be not const, but not relibc
+#ifndef __GLIBC__
+const char *msg1 = "first";
+const char *msg2 = "second";
+const char *msg3 = "third";
+#else
+char *msg1 = "first";
+char *msg2 = "second";
+char *msg3 = "third";
+#endif
+
+void cleanup1(void *arg) {
+    printf("Running %s cleanup callback\n", (const char *)arg);
+}
+void cleanup2(void *arg) {
+    fprintf(stderr, "Running %s cleanup callback, to stderr\n", (const char *)arg);
+}
+void cleanup3(void *arg) {
+    printf("Running final (%s) callback\n", (const char *)arg);
+}
+
+void *routine(void *arg) {
+    assert(arg == NULL);
+
+    puts("1");
+    pthread_cleanup_push(cleanup1, msg1);
+    puts("2");
+    pthread_cleanup_push(cleanup2, msg2);
+    puts("3");
+    pthread_cleanup_push(cleanup3, msg3);
+    puts("4");
+    pthread_cleanup_pop(true);
+    puts("5");
+    //exit(EXIT_SUCCESS);
+    pthread_exit(NULL);
+    puts("6");
+    pthread_cleanup_pop(true);
+    pthread_cleanup_pop(true);
+    return NULL;
+}
+
+int main(void) {
+    int result;
+
+    puts("Main thread started");
+    pthread_t second_thread;
+    if ((result = pthread_create(&second_thread, NULL, routine, NULL)) != 0) {
+        fprintf(stderr, "thread creation failed: %s\n", strerror(result));
+        return EXIT_FAILURE;
+    }
+    if ((result = pthread_join(second_thread, NULL)) != 0) {
+        fprintf(stderr, "failed to join thread: %s\n", strerror(result));
+        return EXIT_FAILURE;
+    }
+    puts("Main thread about to exit");
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/pthread/common.h b/recipes/core/relibc/tests/pthread/common.h
new file mode 100644
index 0000000000..2c2dbc305a
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/common.h
@@ -0,0 +1,24 @@
+#ifndef _COMMON_H
+#define _COMMON_H
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int fail(int status, const char *reason) {
+  fprintf(stderr, "%s failed: %s\n", reason, strerror(status));
+
+  return EXIT_FAILURE;
+}
+
+uintptr_t black_box_uintptr_t(uintptr_t arg) {
+  // Rust implements this by putting the value behind a volatile pointer and then simply loading it.
+
+  uintptr_t arg_slot = arg;
+  volatile uintptr_t *ptr = &arg_slot;
+
+  return *ptr;
+}
+
+#endif // _COMMON_H
diff --git a/recipes/core/relibc/tests/pthread/customstack.c b/recipes/core/relibc/tests/pthread/customstack.c
new file mode 100644
index 0000000000..ebbc5eed10
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/customstack.c
@@ -0,0 +1,81 @@
+#include <assert.h>
+#include <errno.h>
+#include <pthread.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#include "common.h"
+
+#define STACKSIZE 128 * 1024
+
+struct retval {
+  uintptr_t some_stack_pointer;
+};
+struct arg {
+  int status;
+};
+
+void *routine(void *arg_raw) {
+  struct arg *arg = arg_raw;
+
+  struct retval *retval = malloc(sizeof(struct retval));
+
+  if (retval == NULL) {
+    arg->status = ENOMEM;
+    return NULL;
+  }
+
+  char some_array[256] = { 0 };
+  retval->some_stack_pointer = black_box_uintptr_t((uintptr_t)some_array);
+
+  return retval;
+}
+
+int main(void) {
+  int status;
+  static char stack[STACKSIZE];
+
+  pthread_attr_t attr;
+  if ((status = pthread_attr_init(&attr)) != 0) {
+    return fail(status, "attr init");
+  }
+  if ((status = pthread_attr_setstack(&attr, stack, STACKSIZE)) != 0) {
+    return fail(status, "attr setstack");
+  }
+
+  void *stack_again;
+  size_t stacksize_again;
+
+  if ((status = pthread_attr_getstack(&attr, &stack_again, &stacksize_again)) != 0) {
+    return fail(status, "attr getstack");
+  }
+
+  assert(stack_again == stack);
+  assert(stacksize_again == STACKSIZE);
+
+  pthread_t thread;
+
+  if ((status = pthread_create(&thread, &attr, routine, NULL)) != 0) {
+    return fail(status, "pthread create");
+  }
+
+  if ((status = pthread_attr_destroy(&attr)) != 0) {
+    return fail(status, "attr destroy");
+  }
+
+  void *retval_raw;
+
+  if ((status = pthread_join(thread, &retval_raw)) != 0) {
+    return fail(status, "pthread join");
+  }
+
+  struct retval *retval = retval_raw;
+
+  assert(retval->some_stack_pointer >= (uintptr_t)stack);
+  assert(retval->some_stack_pointer < ((uintptr_t)stack) + STACKSIZE);
+
+  free(retval);
+
+  return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/pthread/exit.c b/recipes/core/relibc/tests/pthread/exit.c
new file mode 100644
index 0000000000..5538a0f593
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/exit.c
@@ -0,0 +1,31 @@
+#include <assert.h>
+#include <stddef.h>
+#include <unistd.h>
+
+#include <pthread.h>
+
+#include "common.h"
+
+void *routine(void *arg) {
+    assert(arg == NULL);
+
+    usleep(100000);
+
+    puts("Thread succeeded");
+
+    return NULL;
+}
+
+int main(void) {
+    int status;
+    pthread_t thread;
+
+    if ((status = pthread_create(&thread, NULL, routine, NULL)) != 0) {
+        return fail(status, "failed to create thread");
+    }
+    if ((status = pthread_detach(thread)) != 0) {
+        return fail(status, "failed to detach thread");
+    }
+
+    pthread_exit(NULL);
+}
diff --git a/recipes/core/relibc/tests/pthread/extjoin.c b/recipes/core/relibc/tests/pthread/extjoin.c
new file mode 100644
index 0000000000..da19101075
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/extjoin.c
@@ -0,0 +1,68 @@
+#include <assert.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <pthread.h>
+#include <unistd.h>
+
+#include "common.h"
+
+struct arg2 {
+    int status;
+    pthread_t t1;
+};
+
+void *routine1(void *arg) {
+    assert(arg == NULL);
+    puts("Thread 1 spawned, waiting 1s.");
+    usleep(100000);
+    puts("Thread 1 finished.");
+    return strdup("message from thread 1");
+}
+void *routine2(void *arg_raw) {
+    struct arg2 *arg = arg_raw;
+
+    puts("Thread 2 spawned, awaiting thread 1.");
+
+    void *retval_raw;
+    int status;
+
+    if ((status = pthread_join(arg->t1, &retval_raw)) != 0) {
+        arg->status = fail(status, "t1 join from thread 2");
+        return NULL;
+    }
+    char *retval = retval_raw;
+
+    assert(strcmp(retval, "message from thread 1") == 0);
+
+    free(retval);
+
+    return NULL;
+}
+
+int main(void) {
+    pthread_t t1;
+    pthread_t t2;
+
+    int status;
+
+    puts("Main thread.");
+
+    if ((status = pthread_create(&t1, NULL, routine1, NULL)) != 0) {
+        return fail(status, "t1 create");
+    }
+
+    puts("Created thread 1.");
+
+    struct arg2 arg = { .status = 0, .t1 = t1 };
+
+    if ((status = pthread_create(&t2, NULL, routine2, &arg)) != 0) {
+        return fail(status, "t2 create");
+    }
+
+    if ((status = pthread_join(t2, NULL)) != 0) {
+        return fail(status, "t2 join");
+    }
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/pthread/main.c b/recipes/core/relibc/tests/pthread/main.c
new file mode 100644
index 0000000000..186e306c2b
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/main.c
@@ -0,0 +1,38 @@
+#include <assert.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <fcntl.h>
+
+#include "common.h"
+
+void *thread_main(void *arg) {
+    puts("Thread main");
+
+    assert(arg == NULL);
+
+    return NULL;
+}
+
+int main(void) {
+    int status;
+
+    puts("Start, sleeping 1 second");
+    usleep(100000);
+    pthread_t thread;
+    void *arg = NULL;
+    if ((status = pthread_create(&thread, NULL, thread_main, arg)) != 0) {
+        return fail(status, "create thread");
+    }
+    puts("Started");
+    void *retval;
+    if ((status = pthread_join(thread, &retval)) != 0) {
+        return fail(status, "join thread");
+    }
+    assert(retval == NULL);
+    puts("Joined");
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/pthread/mutex_recursive.c b/recipes/core/relibc/tests/pthread/mutex_recursive.c
new file mode 100644
index 0000000000..2e22a30f58
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/mutex_recursive.c
@@ -0,0 +1,108 @@
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include "../test_helpers.h"
+
+#define N 10
+#define M 10000
+
+struct arg {
+  pthread_mutex_t *mutex;
+  unsigned *protected;
+};
+
+void *routine(void *arg_raw) {
+  struct arg *arg = arg_raw;
+  int status;
+
+  unsigned depth = 0;
+  unsigned i = 0;
+
+  while (i < M) {
+    // Bad random distribution, but should work.
+    bool lock_again = (depth == 0) || (random_bool() && random_bool());
+
+    if (lock_again) {
+      status = pthread_mutex_lock(arg->mutex);
+      ERROR_IF(pthread_mutex_lock, status, != 0);
+
+      depth += 1;
+    } else {
+      status = pthread_mutex_unlock(arg->mutex);
+      ERROR_IF(pthread_mutex_unlock, status, != 0);
+
+      depth -= 1;
+    }
+    if (depth == 0) {
+      continue;
+    }
+
+    unsigned value = *arg->protected;
+    *arg->protected = value + 1;
+
+    i += 1;
+  }
+  while (depth > 0) {
+    status = pthread_mutex_unlock(arg->mutex);
+    ERROR_IF(pthread_mutex_unlock, status, != 0);
+
+    depth--;
+  }
+
+  return NULL;
+}
+
+int main(void) {
+  int status;
+  pthread_mutex_t mutex;
+  pthread_mutexattr_t attr;
+
+  status = pthread_mutexattr_init(&attr);
+  ERROR_IF(pthread_mutexattr_init, status, != 0);
+
+  status = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+  ERROR_IF(pthread_mutexattr_settype, status, != 0);
+
+  status = pthread_mutex_init(&mutex, &attr);
+  ERROR_IF(pthread_mutex_init, status, != 0);
+
+  status = pthread_mutexattr_destroy(&attr);
+  ERROR_IF(pthread_mutexattr_destroy, status, != 0);
+
+  status = pthread_mutex_lock(&mutex);
+  ERROR_IF(pthread_mutex_lock, status, != 0);
+
+  status = pthread_mutex_trylock(&mutex);
+  ERROR_IF(pthread_mutex_trylock, status, != 0);
+
+  status = pthread_mutex_unlock(&mutex);
+  ERROR_IF(pthread_mutex_unlock, status, != 0);
+
+  // Still locked with count = 1.
+
+  pthread_t threads[N];
+  struct arg args[N];
+  unsigned protected = 0;
+
+  for (size_t i = 0; i < N; i++) {
+    args[i] = (struct arg){ .mutex = &mutex, .protected = &protected };
+    status = pthread_create(&threads[i], NULL, routine, &args[i]);
+    ERROR_IF(pthread_create, status, != 0);
+  }
+
+  protected = 1;
+
+  status = pthread_mutex_unlock(&mutex);
+  ERROR_IF(pthread_mutex_unlock, status, != 0);
+
+  for (size_t i = 0; i < N; i++) {
+    status = pthread_join(threads[i], NULL);
+    ERROR_IF(pthread_join, status, != 0);
+  }
+
+  status = pthread_mutex_destroy(&mutex);
+  ERROR_IF(pthread_mutex_destroy, status, != 0);
+
+  return 0;
+}
diff --git a/recipes/core/relibc/tests/pthread/once.c b/recipes/core/relibc/tests/pthread/once.c
new file mode 100644
index 0000000000..40a9c5ce20
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/once.c
@@ -0,0 +1,100 @@
+#include <assert.h>
+#include <pthread.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "common.h"
+#include "../test_helpers.h"
+
+_Thread_local size_t this_thread_count = 0;
+
+#define COUNT 1024
+#define THREADS 4
+
+static void constructor(void) {
+  this_thread_count++;
+}
+
+struct arg {
+  pthread_barrier_t *barrier;
+  pthread_once_t *onces;
+  size_t count;
+  size_t index;
+};
+
+void *routine(void *arg_raw) {
+  int status;
+  struct arg *arg = arg_raw;
+
+  if (arg->index == THREADS - 1) {
+    printf("main thread at %zu\n", arg->index);
+  } else {
+    printf("spawned %zu\n", arg->index);
+  }
+
+  status = pthread_barrier_wait(arg->barrier);
+
+  printf("waited %zu leader=%s\n", arg->index, (status == PTHREAD_BARRIER_SERIAL_THREAD) ? "true" : "false");
+
+  if (status != PTHREAD_BARRIER_SERIAL_THREAD) {
+    ERROR_IF(pthread_barrier_wait, status, != 0);
+    return NULL;
+  }
+
+  for (size_t i = 0; i < COUNT; i++) {
+    status = pthread_once(&arg->onces[i], constructor);
+    ERROR_IF(pthread_once, status, != 0);
+  }
+
+  arg->count = this_thread_count;
+
+  return NULL;
+}
+
+int main(void) {
+  // TODO: Better test to simulate contention?
+
+  int status;
+
+  pthread_once_t onces[COUNT];
+
+  for (size_t i = 0; i < COUNT; i++) {
+    onces[i] = PTHREAD_ONCE_INIT;
+  }
+
+  pthread_barrier_t barrier;
+
+  printf("Barrier at %p, onces at %p\n", &barrier, onces);
+
+  status = pthread_barrier_init(&barrier, NULL, THREADS);
+  ERROR_IF(pthread_barrier_init, status, != 0);
+
+  pthread_t threads[THREADS];
+  struct arg args[THREADS];
+
+  for (size_t i = 0; i < THREADS; i++) {
+    args[i] = (struct arg){ .barrier = &barrier, .onces = onces, .count = 0, .index = i };
+    printf("spawning %zu\n", i);
+
+    status = pthread_create(&threads[i], NULL, routine, &args[i]);
+    ERROR_IF(pthread_create, status, != 0);
+  }
+
+  size_t total_count = 0;
+
+  for (size_t i = 0; i < THREADS; i++) {
+    status = pthread_join(threads[i], NULL);
+    ERROR_IF(pthread_join, status, != 0);
+
+    total_count += args[i].count;
+  }
+
+  status = pthread_barrier_destroy(&barrier);
+  ERROR_IF(pthread_barrier_destroy, status, != 0);
+
+  assert(total_count == COUNT);
+
+  return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/pthread/rwlock_randtest.c b/recipes/core/relibc/tests/pthread/rwlock_randtest.c
new file mode 100644
index 0000000000..e263efd472
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/rwlock_randtest.c
@@ -0,0 +1,64 @@
+#include "../test_helpers.h"
+#include "common.h"
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
+
+// Same test logic as frob in rustc/library/std/sync/rwlock/tests.rs
+
+#define N 10
+//#define M 1000
+#define M 100000
+
+struct arg {
+  pthread_rwlock_t *rwlock;
+};
+
+void *routine(void *arg_raw) {
+  struct arg *arg = arg_raw;
+  int status;
+
+  for (uint64_t i = 0; i < M; i++) {
+    if (random_bool()) {
+      status = pthread_rwlock_wrlock(arg->rwlock);
+      ERROR_IF(pthread_rwlock_wrlock, status, != 0);
+    } else {
+      status = pthread_rwlock_rdlock(arg->rwlock);
+      ERROR_IF(pthread_rwlock_rdlock, status, != 0);
+    }
+    status = pthread_rwlock_unlock(arg->rwlock);
+    ERROR_IF(pthread_rwlock_unlock, status, != 0);
+  }
+
+  return NULL;
+}
+
+int main(void) {
+  int status;
+
+  pthread_rwlock_t rwlock;
+
+  status = pthread_rwlock_init(&rwlock, NULL);
+  ERROR_IF(pthread_rwlock_init, status, != 0);
+
+  pthread_t threads[N];
+  struct arg args[N];
+
+  for (size_t i = 0; i < N; i++) {
+    args[i] = (struct arg){ .rwlock = &rwlock };
+
+    status = pthread_create(&threads[i], NULL, routine, &args[i]);
+    ERROR_IF(pthread_create, status, != 0);
+  }
+
+  for (size_t i = 0; i < N; i++) {
+    status = pthread_join(threads[i], NULL);
+    ERROR_IF(pthread_join, status, != 0);
+  }
+
+  status = pthread_rwlock_destroy(&rwlock);
+  ERROR_IF(pthread_rwlock_destroy, status, != 0);
+  
+  return 0;
+}
diff --git a/recipes/core/relibc/tests/pthread/rwlock_trylock.c b/recipes/core/relibc/tests/pthread/rwlock_trylock.c
new file mode 100644
index 0000000000..8a8274e53f
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/rwlock_trylock.c
@@ -0,0 +1,58 @@
+#include "../test_helpers.h"
+#include "common.h"
+
+#include <assert.h>
+#include <pthread.h>
+#include <errno.h>
+#include <time.h>
+
+// Adapted from test_rwlock_try_write in rustc/library/std/sync/rwlock/tests.rs
+
+int main(void) {
+  int status;
+  pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
+
+  pthread_rwlockattr_t attr;
+  status = pthread_rwlockattr_init(&attr);
+  ERROR_IF(pthread_rwlockattr_init, status, != 0);
+
+  // Call setpshared twice to check both constants work.
+  status = pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
+  ERROR_IF(pthread_rwlockattr_setpshared, status, != 0);
+  status = pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);
+  ERROR_IF(pthread_rwlockattr_setpshared, status, != 0);
+
+  status = pthread_rwlock_init(&rwlock, &attr);
+  ERROR_IF(pthread_rwlock_init, status, != 0);
+
+  status = pthread_rwlockattr_destroy(&attr);
+  ERROR_IF(pthread_rwlockattr_destroy, status, != 0);
+
+  status = pthread_rwlock_rdlock(&rwlock);
+  ERROR_IF(pthread_rwlock_rdlock, status, != 0);
+
+  status = pthread_rwlock_trywrlock(&rwlock);
+  UNEXP_IF(pthread_rwlock_trywrlock, status, != EBUSY);
+
+  struct timespec ts;
+  clock_gettime(CLOCK_REALTIME, &ts);
+  ts.tv_nsec += 200 * 1000000;
+  status = pthread_rwlock_timedwrlock(&rwlock, &ts);
+  UNEXP_IF(pthread_rwlock_timedwrlock, status, != ETIMEDOUT);
+
+  status = pthread_rwlock_unlock(&rwlock);
+  ERROR_IF(pthread_rwlock_unlock, status, != 0);
+
+  status = pthread_rwlock_trywrlock(&rwlock);
+  ERROR_IF(pthread_rwlock_rdlock, status, != 0);
+
+  clock_gettime(CLOCK_REALTIME, &ts);
+  ts.tv_nsec += 200 * 1000000;
+  status = pthread_rwlock_timedrdlock(&rwlock, &ts);
+  UNEXP_IF(pthread_rwlock_timedrdlock, status, != ETIMEDOUT);
+
+  status = pthread_rwlock_destroy(&rwlock);
+  ERROR_IF(pthread_rwlock_destroy, status, != 0);
+
+  return 0;
+}
diff --git a/recipes/core/relibc/tests/pthread/thread_fork.c b/recipes/core/relibc/tests/pthread/thread_fork.c
new file mode 100644
index 0000000000..e4b0ee9c2e
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/thread_fork.c
@@ -0,0 +1,51 @@
+/// test fork inside thread
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <sys/wait.h>
+
+#include "test_helpers.h"
+
+#define NUM_THREADS 4
+#define ITERATIONS 3
+
+
+void* thread_func(void* arg) {
+    long tid = (long)arg;
+
+    for (int i = 0; i < ITERATIONS; i++) {
+        printf("thread %ld loop %i\n", tid, i);
+
+        pid_t pid = fork();
+        ERROR_IF(fork, pid, < 0);
+
+        if (pid == 0) {
+            _exit(0);
+        } else {
+            waitpid(pid, NULL, 0);
+        }
+
+        usleep(1000); 
+    }
+
+    return NULL;
+}
+
+int main() {
+    pthread_t threads[NUM_THREADS];
+    int status;
+
+    for (long i = 0; i < NUM_THREADS; i++) {
+        status = pthread_create(&threads[i], NULL, thread_func, (void*)i);
+        ERROR_IF(pthread_create, status, != 0);
+    }
+
+    printf("joining threads\n");
+    for (int i = 0; i < NUM_THREADS; i++) {
+        pthread_join(threads[i], NULL);
+    }
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/pthread/timedwait.c b/recipes/core/relibc/tests/pthread/timedwait.c
new file mode 100644
index 0000000000..d0d909b67e
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/timedwait.c
@@ -0,0 +1,86 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <time.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+pthread_mutex_t lock;
+pthread_cond_t cond;
+struct timespec start_time;
+int ready = 0;
+
+struct timespec get_timeout(long msec) {
+    struct timespec ts;
+    clock_gettime(CLOCK_REALTIME, &ts);
+    ts.tv_nsec += msec * 1000000;
+    return ts;
+}
+
+void print_timed(char* msg) {
+    struct timespec end_time;
+    clock_gettime(CLOCK_MONOTONIC, &end_time);
+    printf("[%.3f]: ", (end_time.tv_nsec - start_time.tv_nsec) / 1000000000.0 +
+            (end_time.tv_sec  - start_time.tv_sec));
+    printf("%s\n", msg);
+    fflush(NULL);
+}
+
+void* signaler_thread(void* arg) {
+    (void)arg;
+
+    usleep(150000); // 150ms
+    ready = 1;
+    print_timed("signaler_thread");
+    pthread_cond_signal(&cond);
+    return NULL;
+}
+
+void test_timeout_case() {
+    pthread_mutex_lock(&lock);
+    struct timespec ts = get_timeout(500);
+    print_timed("test_timeout_case start");
+    int rc = pthread_cond_timedwait(&cond, &lock, &ts);
+    UNEXP_IF(pthread_cond_timedwait, rc, != ETIMEDOUT);
+    print_timed("test_timeout_case end");
+    pthread_mutex_unlock(&lock);
+}
+
+void test_success_case() {
+    ready = 0;
+    pthread_t thread;
+    pthread_create(&thread, NULL, signaler_thread, NULL);
+    pthread_mutex_lock(&lock);
+    struct timespec ts = get_timeout(50000);
+    print_timed("test_success_case start");
+    while (!ready) {
+        print_timed("test_success_case waiting");
+        int rc = pthread_cond_timedwait(&cond, &lock, &ts);
+        UNEXP_IF(pthread_cond_timedwait, rc, != 0);
+    }
+    print_timed("test_success_case end");
+    pthread_mutex_unlock(&lock);
+    pthread_join(thread, NULL);
+}
+
+int main() {
+   clock_gettime(CLOCK_MONOTONIC, &start_time);
+    if (pthread_mutex_init(&lock, NULL) != 0) {
+        perror("mutex init failed");
+        return 1;
+    }
+    if (pthread_cond_init(&cond, NULL) != 0) {
+        perror("cond init failed");
+        return 1;
+    }
+    test_timeout_case();
+    // TODO: "rlct_clone not implemented for aarch64 yet"
+#if defined(__linux__) && defined(__aarch64__)
+    printf("test_success_case skipped");
+#else
+    test_success_case();
+#endif
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/pthread/timeout.c b/recipes/core/relibc/tests/pthread/timeout.c
new file mode 100644
index 0000000000..eea85e1380
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/timeout.c
@@ -0,0 +1,91 @@
+#include "../test_helpers.h"
+#include "common.h"
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <pthread.h>
+#include <time.h>
+
+struct arg {
+    int status;
+    bool completed;
+    pthread_barrier_t barrier;
+    pthread_mutex_t mutex;
+};
+
+void *routine(void *arg_raw) {
+    struct arg *arg = (struct arg *)arg_raw;
+
+    int barrier_status = pthread_barrier_wait(&arg->barrier);
+
+    if (barrier_status != 0 && barrier_status != PTHREAD_BARRIER_SERIAL_THREAD) {
+        arg->status = barrier_status;
+        fputs("failed to wait for barrier\n", stderr);
+        return NULL;
+    }
+    puts("thread waited");
+
+    struct timespec abstime;
+    if ((arg->status = clock_gettime(CLOCK_MONOTONIC, &abstime)) != 0) {
+        fputs("failed to get current time\n", stderr);
+        return NULL;
+    }
+    abstime.tv_sec += 1;
+
+    if ((arg->status = pthread_mutex_timedlock(&arg->mutex, &abstime)) != ETIMEDOUT) {
+        fputs("failed to fail at locking mutex\n", stderr);
+        return NULL;
+    }
+    arg->status = 0;
+
+    return NULL;
+}
+
+int main(void) {
+    int status;
+
+    struct arg arg;
+    arg.completed = false;
+
+    status = pthread_barrier_init(&arg.barrier, NULL, 2);
+    ERROR_IF2(pthread_barrier_init, status, != 0);
+
+    status = pthread_mutex_init(&arg.mutex, NULL);
+    ERROR_IF2(pthread_mutex_init, status, != 0);
+
+    status = pthread_mutex_trylock(&arg.mutex);
+    ERROR_IF2(pthread_mutex_trylock, status, != 0);
+
+    pthread_t thread;
+    status = pthread_create(&thread, NULL, routine, &arg);
+    ERROR_IF2(pthread_create, status, != 0);
+
+    status = pthread_barrier_wait(&arg.barrier);
+    if (status != PTHREAD_BARRIER_SERIAL_THREAD) {
+        ERROR_IF2(pthread_barrier_wait, status, != 0);
+    }
+    puts("main waited");
+
+    status = pthread_join(thread, NULL);
+    ERROR_IF2(pthread_join, status, != 0);
+
+    status = pthread_mutex_unlock(&arg.mutex);
+    ERROR_IF2(pthread_mutex_unlock, status, != 0);
+
+    if (arg.status != 0) {
+        fprintf(stderr, "thread failed: %s\n", strerror(arg.status));
+        return EXIT_FAILURE;
+    }
+
+    status = pthread_mutex_destroy(&arg.mutex);
+    ERROR_IF2(pthread_mutex_destroy, status, != 0);
+
+    status = pthread_barrier_destroy(&arg.barrier);
+    ERROR_IF2(pthread_barrier_destroy, status, != 0);
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/pthread/tls.c b/recipes/core/relibc/tests/pthread/tls.c
new file mode 100644
index 0000000000..21a4a614c8
--- /dev/null
+++ b/recipes/core/relibc/tests/pthread/tls.c
@@ -0,0 +1,99 @@
+#include <assert.h>
+// PTHREAD_KEYS_MAX, PTHREAD_DESTRUCTOR_ITERATIONS
+#include <limits.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+pthread_key_t key_a, key_b, key_c, key_d, key_e;
+size_t total_destructor_runs = 0;
+
+void drop_key_a(void *val_a) {
+    assert(pthread_getspecific(key_a) == NULL && val_a == (void *)0xaaaa);
+    total_destructor_runs++;
+
+    void *val_b = pthread_getspecific(key_b);
+    printf("drop_key_a(a=%p, b=%p)\n", val_a, val_b);
+
+    if (total_destructor_runs <= 2) {
+        pthread_setspecific(key_a, val_a);
+        return;
+    }
+
+    if (val_b != NULL) {
+        assert(val_b == (void *)0xbbbb);
+    } else {
+        pthread_setspecific(key_b, (void *)0xbbbb);
+    }
+}
+
+void drop_key_b(void *val_b) {
+    assert(pthread_getspecific(key_b) == NULL && val_b == (void *)0xbbbb);
+    total_destructor_runs++;
+
+    void *val_a = pthread_getspecific(key_a);
+    printf("drop_key_b(a=%p, b=%p)\n", val_a, val_b);
+
+    if (total_destructor_runs <= 2) {
+        pthread_setspecific(key_b, val_b);
+        return;
+    }
+
+    if (val_a != NULL) {
+        assert(val_a == (void *)0xaaaa);
+    } else {
+        pthread_setspecific(key_a, (void *)0xaaaa);
+    }
+}
+
+void drop_unreachable(void *val_c) {
+    // Should never be called.
+    (void)val_c;
+    assert(false);
+}
+
+void drop_key_d(void *val_d) {
+    assert(pthread_getspecific(key_d) == NULL && val_d == (void *)0xdddd);
+    // [`pthread_key_{create,setspecific,getspecific,delete}`] can still be used
+    // inside the destructor itself.
+    printf("drop_key_d(d=%p)\n", val_d);
+    pthread_key_t key_g;
+    assert(!pthread_key_create(&key_g, drop_unreachable));
+    assert(!pthread_setspecific(key_g, &key_g));
+    assert(pthread_getspecific(key_g) == &key_g);
+    assert(!pthread_key_delete(key_g));
+}
+
+void *test_tls_destructors(void *arg) {
+    (void)arg;
+    assert(!pthread_key_create(&key_a, drop_key_a));
+    assert(!pthread_key_create(&key_b, drop_key_b));
+    assert(!pthread_key_create(&key_c, drop_unreachable));
+    assert(!pthread_key_create(&key_d, drop_key_d));
+    assert(!pthread_key_create(&key_e, drop_unreachable));
+    assert(!pthread_setspecific(key_a, (void *)0xaaaa));
+    assert(!pthread_setspecific(key_b, (void *)0xbbbb));
+    assert(!pthread_setspecific(key_c, (void *)0xcccc));
+    assert(!pthread_setspecific(key_d, (void *)0xdddd));
+    assert(!pthread_key_delete(key_c));
+    return NULL;
+}
+
+int main(void) {
+    pthread_key_t key_f;
+    assert(!pthread_key_create(&key_f, NULL));
+    assert(!pthread_setspecific(key_f, &key_f));
+    assert(pthread_getspecific(key_f) == &key_f);
+    assert(!pthread_key_delete(key_f));
+
+    pthread_t t1;
+    assert(!pthread_create(&t1, NULL, test_tls_destructors, NULL));
+    assert(!pthread_join(t1, NULL));
+    printf("total_destructor_iterations: %zu\n", total_destructor_runs);
+    // There are two destructors (i.e., `drop_key_{a, b}`), so the total number
+    // of iterations will be `2 * PTHREAD_DESTRUCTOR_ITERATIONS`.
+    assert((total_destructor_runs / 2) == PTHREAD_DESTRUCTOR_ITERATIONS);
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/ptrace.c b/recipes/core/relibc/tests/ptrace.c
new file mode 100644
index 0000000000..23d3c833f1
--- /dev/null
+++ b/recipes/core/relibc/tests/ptrace.c
@@ -0,0 +1,85 @@
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <sys/ptrace.h>
+#include <sys/user.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+#ifdef __linux__
+
+#define SYS_write 1
+
+#endif
+#ifdef __redox__
+
+#define SYS_write 0x21000004
+
+#endif
+
+int main() {
+    int pid = fork();
+    ERROR_IF(fork, pid, == -1);
+
+    if (pid == 0) {
+        // Test behavior on Redox when TRACEME hasn't been activated
+        // before waitpid is invoked!
+        usleep(100000);
+
+        int result = ptrace(PTRACE_TRACEME, 0, NULL, NULL);
+        ERROR_IF(ptrace, result, == -1);
+        UNEXP_IF(ptrace, result, != 0);
+
+        // Alert parent: I'm ready
+        result = raise(SIGSTOP);
+        ERROR_IF(raise, result, == -1);
+        UNEXP_IF(raise, result, != 0);
+
+        puts("This is printed to STDOUT.");
+        puts("Or, at least, that's what I thought.");
+        puts("But all write(...) syscalls are actually redirected to STDERR by the tracer.");
+        puts("Big surprise, right!");
+    } else {
+        // Wait for child process to be ready
+        int result = waitpid(pid, NULL, 0);
+        ERROR_IF(waitpid, result, == -1);
+
+        int status;
+        while (true) {
+            // puts("----- Pre-syscall -----");
+            result = ptrace(PTRACE_SYSCALL, pid, NULL, NULL);
+            ERROR_IF(ptrace, result, == -1);
+            UNEXP_IF(ptrace, result, != 0);
+            // puts("Wait...");
+            result = waitpid(pid, &status, 0);
+            ERROR_IF(waitpid, result, == -1);
+            if (WIFEXITED(status))
+                break;
+
+            struct user_regs_struct regs;
+            // puts("Get regs");
+            result = ptrace(PTRACE_GETREGS, pid, NULL, &regs);
+            ERROR_IF(ptrace, result, == -1);
+
+            if (regs.orig_rax == SYS_write || regs.orig_rax == SYS_write) {
+                regs.rdi = 2;
+                puts("Set regs");
+                result = ptrace(PTRACE_SETREGS, pid, NULL, &regs);
+                ERROR_IF(ptrace, result, == -1);
+            }
+
+            // puts("Post-syscall");
+            result = ptrace(PTRACE_SYSCALL, pid, NULL, NULL);
+            ERROR_IF(ptrace, result, == -1);
+            UNEXP_IF(ptrace, result, != 0);
+            // puts("Wait...");
+            result = waitpid(pid, &status, 0);
+            ERROR_IF(waitpid, result, == -1);
+            if (WIFEXITED(status))
+                break;
+        }
+        printf("Child exited with status %d\n", WEXITSTATUS(status));
+    }
+}
diff --git a/recipes/core/relibc/tests/pty/forkpty.c b/recipes/core/relibc/tests/pty/forkpty.c
new file mode 100644
index 0000000000..740acd457a
--- /dev/null
+++ b/recipes/core/relibc/tests/pty/forkpty.c
@@ -0,0 +1,38 @@
+/* Test of pty.h and forkpty function.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Simon Josefsson <simon@josefsson.org>, 2009.  */
+
+#include <pty.h>
+#include <stdio.h>
+#include <sys/wait.h>
+
+int main () {
+  int res = 0;
+  int amaster = 0;
+
+  res = forkpty (&amaster, NULL, NULL, NULL);
+  if (res == 0) {
+    printf("This is child process\n");
+  } else if (res > 0) {
+    printf("This is parent process\n");
+    wait(NULL);
+  } else {
+      printf ("forkpty returned %d\n", res);
+      return 1;
+  }
+  return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/pwd.c b/recipes/core/relibc/tests/pwd.c
new file mode 100644
index 0000000000..7d3942d930
--- /dev/null
+++ b/recipes/core/relibc/tests/pwd.c
@@ -0,0 +1,105 @@
+#include <errno.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+void print(struct passwd *pwd) {
+    printf("pw_name: %s\n", pwd->pw_name);
+    printf("pw_password: %s\n", pwd->pw_passwd);
+    printf("pw_uid: %u\n", pwd->pw_uid);
+    printf("pw_gid: %u\n", pwd->pw_gid);
+    printf("pw_gecos: %s\n", pwd->pw_gecos);
+    printf("pw_dir: %s\n", pwd->pw_dir);
+    printf("pw_shell: %s\n", pwd->pw_shell);
+}
+
+int main(void) {
+    puts("--- Checking getpwuid ---");
+    errno = 0;
+    struct passwd *pwd = getpwuid(0);
+    if (errno != 0) {
+        perror("getpwuid");
+        exit(EXIT_FAILURE);
+    }
+    if (pwd != NULL) {
+        print(pwd);
+    }
+
+    puts("--- Checking getpwnam ---");
+    errno = 0;
+    pwd = getpwnam("nobody");
+    if (errno != 0) {
+        perror("getpwnam");
+        exit(EXIT_FAILURE);
+    }
+    if (pwd != NULL) {
+        print(pwd);
+    }
+
+    puts("--- Checking getpwuid_r ---");
+    struct passwd pwd2;
+    struct passwd* result;
+    char* buf = malloc(300);
+    if (getpwuid_r(0, &pwd2, buf, 100, &result) < 0) {
+        perror("getpwuid_r");
+        free(buf);
+        exit(EXIT_FAILURE);
+    }
+    if (result != NULL) {
+        if (result != &pwd2) {
+            free(buf);
+            exit(EXIT_FAILURE);
+        }
+        print(&pwd2);
+    }
+
+    puts("--- Checking getpwnam_r ---");
+    if (getpwnam_r("nobody", &pwd2, buf, 300, &result) < 0) {
+        perror("getpwuid_r");
+        free(buf);
+        exit(EXIT_FAILURE);
+    }
+    if (result != NULL) {
+        if (result != &pwd2) {
+            free(buf);
+            exit(EXIT_FAILURE);
+        }
+        print(&pwd2);
+    }
+    free(buf);
+
+    puts("--- Checking getpwuid_r error handling ---");
+    char buf2[1];
+    if (getpwuid_r(0, &pwd2, buf2, 1, &result) == 0) {
+        puts("This shouldn't have succeeded, but it did!");
+        exit(EXIT_FAILURE);
+    }
+    if (errno != ERANGE) {
+        perror("getpwuid_r");
+        exit(EXIT_FAILURE);
+    }
+    puts("Returned ERANGE because the buffer was too small 👍");
+
+    errno = 0;
+
+    struct passwd *entry = NULL;
+    for (int i = 1; (entry = getpwent()); ++i) {
+        int backup = errno;
+        printf("--- getpwent #%d ---\n", i);
+        if (backup != 0) {
+            errno = backup;
+            perror("getpwent");
+            exit(EXIT_FAILURE);
+        }
+        print(entry);
+    }
+    puts("--- getpwent #1 (rewind) ---");
+    setpwent();
+    entry = getpwent();
+    perror("getpwent");
+    print(entry);
+
+    endpwent();
+}
diff --git a/recipes/core/relibc/tests/regex.c b/recipes/core/relibc/tests/regex.c
new file mode 100644
index 0000000000..894781e447
--- /dev/null
+++ b/recipes/core/relibc/tests/regex.c
@@ -0,0 +1,34 @@
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    regex_t regex;
+    char error_buf[256];
+
+    int error = regcomp(&regex, "h.llo \\(w.rld\\)", REG_ICASE);
+    if (error) {
+        regerror(error, &regex, error_buf, 255);
+        error_buf[255] = 0;
+        printf("regcomp error: %d = %s\n", error, error_buf);
+        exit(EXIT_FAILURE);
+    }
+
+    regmatch_t matches[3] = {{0}};
+
+    error = regexec(&regex, "Hey, how are you? Hello? Hallo Wurld??", 3, matches, 0);
+
+    regfree(&regex);
+
+    if (error) {
+        regerror(error, &regex, error_buf, 255);
+        printf("regexec error: %d = %s\n", error, error_buf);
+        exit(EXIT_FAILURE);
+    }
+
+    for (int group = 0; group < 3; group += 1) {
+        printf("Matching group: %d - %d\n", matches[group].rm_so, matches[group].rm_eo);
+    }
+}
diff --git a/recipes/core/relibc/tests/sa_restart.c b/recipes/core/relibc/tests/sa_restart.c
new file mode 100644
index 0000000000..75b086813f
--- /dev/null
+++ b/recipes/core/relibc/tests/sa_restart.c
@@ -0,0 +1,53 @@
+#include <assert.h>
+#include <signal.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+void action(int sig, siginfo_t *info, void *context) {
+    assert (sig == SIGUSR1);
+    (void)info;
+    (void)context;
+    char *msg = "Signal handler\n";
+    write(1, msg, strlen(msg));
+    _exit(0);
+}
+
+int main(void) {
+    int status;
+
+    struct sigaction act;
+    act.sa_sigaction = action;
+    act.sa_flags = SA_RESTART;
+    sigemptyset(&act.sa_mask);
+
+    status = sigaction(SIGUSR1, &act, NULL);
+    ERROR_IF(sigaction, status, == -1);
+
+    int fds[2];
+    status = pipe(fds);
+    ERROR_IF(pipe, status, == -1);
+
+    int parent = getpid();
+
+    status = fork();
+    ERROR_IF(fork, status, == -1);
+
+    if (status == 0) {
+        for (int i = 0; i < 1000; i++) {
+            status = kill(parent, SIGUSR1);
+            ERROR_IF(kill, status, == -1);
+        }
+        return 0;
+    }
+
+    char buffer[1];
+    status = read(fds[0], buffer, 1);
+    ERROR_IF(read, status, == -1);
+
+    return 1;
+}
diff --git a/recipes/core/relibc/tests/select.c b/recipes/core/relibc/tests/select.c
new file mode 100644
index 0000000000..dfe7161c2a
--- /dev/null
+++ b/recipes/core/relibc/tests/select.c
@@ -0,0 +1,83 @@
+#include <fcntl.h>
+#include <stdio.h>
+#include <sys/select.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int file_test(void) {
+    int fd = open("select.c", 0, 0);
+    if (fd < 0) {
+        perror("open");
+        return -1;
+    }
+
+    printf("Testing select on file\n");
+
+    fd_set read;
+    FD_ZERO(&read);
+    FD_SET(fd, &read);
+
+    printf("Is set before? %d\n", FD_ISSET(fd, &read));
+
+    int nfds = select(fd + 1, &read, NULL, NULL, NULL);
+    if (nfds < 0) {
+        perror("select");
+        return 1;
+    }
+    printf("Amount of things ready: %d\n", nfds);
+
+    printf("Is set after? %d\n", FD_ISSET(fd, &read));
+
+    close(fd);
+
+    return 0;
+}
+
+int pipe_test(void) {
+    int pipefd[2];
+    if (pipe2(pipefd, O_NONBLOCK) < 0) {
+        perror("pipe");
+        return 1;
+    }
+
+    char c = 'c';
+    if (write(pipefd[1], &c, sizeof(c)) < 0) {
+        perror("write");
+        return 1;
+    }
+
+    printf("Testing select on pipe\n");
+
+    fd_set read;
+    FD_ZERO(&read);
+    FD_SET(pipefd[0], &read);
+
+    printf("Is set before? %d\n", FD_ISSET(pipefd[0], &read));
+
+    int nfds = select(pipefd[0] + 1, &read, NULL, NULL, NULL);
+    if (nfds < 0) {
+        perror("select");
+        return 1;
+    }
+    printf("Amount of things ready: %d\n", nfds);
+
+    printf("Is set after? %d\n", FD_ISSET(pipefd[0], &read));
+
+    close(pipefd[0]);
+    close(pipefd[1]);
+
+    return 0;
+}
+
+int main(void) {
+    if (file_test()) {
+        return 1;
+    }
+
+    if (pipe_test()) {
+        return 1;
+    }
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/setjmp.c b/recipes/core/relibc/tests/setjmp.c
new file mode 100644
index 0000000000..3abc56f804
--- /dev/null
+++ b/recipes/core/relibc/tests/setjmp.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+#include <setjmp.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    jmp_buf buf;
+    if (setjmp(buf)) {
+        puts("hi from jump");
+    } else {
+        puts("jumping...");
+        longjmp(buf, 0);
+    }
+}
diff --git a/recipes/core/relibc/tests/sharedlib.c b/recipes/core/relibc/tests/sharedlib.c
new file mode 100644
index 0000000000..fe2dbf8256
--- /dev/null
+++ b/recipes/core/relibc/tests/sharedlib.c
@@ -0,0 +1,10 @@
+#include <stdio.h>
+
+int global_var = 42;
+_Thread_local int tls_var = 21;
+
+void print()
+{
+    fprintf(stdout, "sharedlib: global_var == %d\n", global_var);
+    fprintf(stdout, "sharedlib: tls_var == %d\n", tls_var);
+}
diff --git a/recipes/core/relibc/tests/sigaction.c b/recipes/core/relibc/tests/sigaction.c
new file mode 100644
index 0000000000..b332f3902d
--- /dev/null
+++ b/recipes/core/relibc/tests/sigaction.c
@@ -0,0 +1,70 @@
+#include <assert.h>
+#include <signal.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+void handler1(int sig) {
+    assert(sig == SIGUSR1);
+    char *str = "Signal handler1 called!\n";
+    write(STDOUT_FILENO, str, strlen(str));
+}
+
+sigset_t the_set = { 0 };
+
+void handler2(int sig, siginfo_t *info, void *context_raw) {
+    assert(sig == SIGUSR1);
+    char *str = "Signal handler2 called!\n";
+    write(STDOUT_FILENO, str, strlen(str));
+
+    assert(info != NULL);
+    assert(info->si_signo == SIGUSR1);
+#ifndef __linux
+    // TODO: SI_TKILL?
+    assert(info->si_code == SI_USER);
+    assert(info->si_pid == getpid());
+    assert(info->si_uid == getuid());
+#endif
+
+    ucontext_t *context = context_raw;
+    assert(context != NULL);
+#ifndef __linux__ // TODO
+    assert(memcmp(&context->uc_sigmask, &the_set, sizeof(sigset_t)));
+    assert(context->uc_link == NULL);
+#endif
+}
+
+int main(void) {
+	struct sigaction sa1 = { .sa_handler = handler1 };
+    struct sigaction sa2 = { .sa_sigaction = handler2, .sa_flags = SA_SIGINFO };
+    struct sigaction saold = {0};
+
+	sigemptyset(&sa1.sa_mask);
+    sigemptyset(&sa2.sa_mask);
+
+    int status = sigprocmask(SIG_SETMASK, NULL, &the_set);
+    ERROR_IF(sigprocmask, status, == -1);
+
+    int rcode = sigaction(SIGUSR1, &sa1, NULL);
+    ERROR_IF(signal, rcode, != 0);
+
+    puts("Raising...");
+
+    int raise_status = raise(SIGUSR1);
+    ERROR_IF(raise, raise_status, < 0);
+
+	rcode = sigaction(SIGUSR1, &sa2, &saold);
+    ERROR_IF(signal, rcode, != 0);
+    ERROR_IF(signal, saold.sa_handler, != sa1.sa_handler);
+
+    puts("Raising...");
+
+    raise_status = raise(SIGUSR1);
+    ERROR_IF(raise, raise_status, < 0);
+
+    puts("Raised.");
+}
diff --git a/recipes/core/relibc/tests/sigaltstack.c b/recipes/core/relibc/tests/sigaltstack.c
new file mode 100644
index 0000000000..c0dbe7a188
--- /dev/null
+++ b/recipes/core/relibc/tests/sigaltstack.c
@@ -0,0 +1,84 @@
+#include <assert.h>
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/mman.h>
+
+#include "test_helpers.h"
+
+size_t stack_size;
+void *stack_base;
+
+volatile sig_atomic_t counter = 0;
+
+void action(int sig, siginfo_t *info, void *context_raw) {
+    assert(sig == SIGUSR2);
+
+    ucontext_t *context = context_raw;
+    assert(context->uc_stack.ss_sp == stack_base);
+    assert(context->uc_stack.ss_size == stack_size);
+
+    // TODO: Technically an implementation detail, but safe to check here.
+    assert((size_t)info >= (size_t)stack_base);
+    assert((size_t)info <= ((size_t)stack_base + stack_size));
+
+    int c = counter++;
+
+    char str[] = "SIGUSR2 handlerXX\n";
+    size_t len = strlen(str);
+    str[len - 2] = '0' + (c % 10);
+    str[len - 3] = '0' + ((c / 10) % 10);
+    write(STDOUT_FILENO, str, len);
+
+    if (c < 100) {
+        raise(SIGUSR2);
+    }
+}
+
+int main(void) {
+    int status;
+
+    stack_size = 1024 * 1024; // TODO?
+    // in glibc MINSIGSTKSZ is a sysconf(MINSIGSTKSZ) macro
+    assert(stack_size >= (size_t)MINSIGSTKSZ * 100);
+    stack_base = mmap(NULL, stack_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    ERROR_IF(mmap, stack_base, == MAP_FAILED);
+
+    stack_t old_stack;
+    stack_t stack = (stack_t) { .ss_sp = stack_base, .ss_size = stack_size, .ss_flags = 0 };
+
+    status = sigaltstack(&stack, &old_stack);
+    ERROR_IF(sigaltstack, status, == -1);
+
+    assert((old_stack.ss_flags & SS_ONSTACK) == 0);
+
+    stack_t same;
+
+    status = sigaltstack(&old_stack, &same);
+    ERROR_IF(sigaltstack, status, == -1);
+    assert(same.ss_sp == stack.ss_sp);
+    assert(same.ss_size == stack.ss_size);
+    assert((same.ss_flags & SS_ONSTACK) == 0);
+
+    status = sigaltstack(&stack, NULL);
+    ERROR_IF(sigaltstack, status, == -1);
+
+    status = sigaltstack(NULL, &same);
+    ERROR_IF(sigaltstack, status, == -1);
+    assert(same.ss_sp == stack.ss_sp);
+    assert(same.ss_size == stack.ss_size);
+    assert((same.ss_flags & SS_ONSTACK) == 0);
+
+    struct sigaction sa;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_NODEFER;
+    sa.sa_sigaction = action;
+
+    status = sigaction(SIGUSR2, &sa, NULL);
+    ERROR_IF(sigaction, status, == -1);
+
+    raise(SIGUSR2);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/sigchld.c b/recipes/core/relibc/tests/sigchld.c
new file mode 100644
index 0000000000..6822bc01de
--- /dev/null
+++ b/recipes/core/relibc/tests/sigchld.c
@@ -0,0 +1,113 @@
+#include <assert.h>
+#include <errno.h>
+#include <signal.h>
+#include <sched.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+volatile sig_atomic_t atomic = 0;
+volatile sig_atomic_t atomic2 = 0;
+
+void action(int sig, siginfo_t *info, void *context) {
+    (void)context;
+
+    assert(sig == SIGCHLD);
+    assert(info != NULL);
+    atomic += 1;
+}
+void handler(int sig) {
+    assert(sig == SIGPIPE);
+    atomic2 += 1;
+}
+
+int main(void) {
+    int fds[2];
+    int status = pipe(fds);
+    ERROR_IF(pipe, status, == -1);
+
+    int child = fork();
+    ERROR_IF(fork, child, == -1);
+
+    sigset_t set;
+    sigemptyset(&set);
+    status = sigprocmask(SIG_SETMASK, &set, NULL);
+    ERROR_IF(sigprocmask, status, == -1);
+
+    struct sigaction sa;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = 0;
+    sa.sa_sigaction = action;
+    status = sigaction(SIGCHLD, &sa, NULL);
+    ERROR_IF(sigaction, status, == -1);
+
+    sa.sa_handler = handler;
+    status = sigaction(SIGPIPE, &sa, NULL);
+    ERROR_IF(sigaction, status, == -1);
+
+    if (child == 0) {
+        status = close(fds[1]);
+        ERROR_IF(close, status, == -1);
+
+        char buf[1];
+        status = read(fds[0], buf, 1);
+        ERROR_IF(read, status, == -1);
+        puts("Child exiting.");
+        return EXIT_SUCCESS;
+    } else {
+        int waitpid_stat;
+
+        close(fds[0]);
+        ERROR_IF(close, status, == -1);
+
+        puts("Sending SIGSTOP...");
+        status = kill(child, SIGSTOP);
+        ERROR_IF(kill, status, == -1);
+
+        while (atomic == 0) {
+            status = sched_yield();
+            ERROR_IF(sched_yield, status, == -1);
+        }
+        puts("First handler ran, checking status.");
+
+        status = waitpid(child, &waitpid_stat, WUNTRACED);
+        ERROR_IF(waitpid, status, == -1);
+        assert(WIFSTOPPED(waitpid_stat));
+        assert(WSTOPSIG(waitpid_stat) == SIGSTOP);
+        puts("Correct, sending SIGCONT...");
+
+        status = write(fds[1], "C", 1);
+        ERROR_IF(write, status, == -1);
+
+        status = kill(child, SIGCONT);
+        ERROR_IF(kill, status, == -1);
+
+        while (atomic == 1) {
+            status = sched_yield();
+            ERROR_IF(sched_yield, status, == -1);
+        }
+        puts("Second handler ran, checking status.");
+
+        status = waitpid(child, &waitpid_stat, 0);
+        ERROR_IF(waitpid, status, == -1);
+        assert(WIFEXITED(waitpid_stat));
+        assert(WEXITSTATUS(waitpid_stat) == 0);
+        puts("Child exited.");
+
+        puts("Writing to (broken) pipe.");
+        status = write(fds[1], "B", 1);
+        assert(status == -1);
+        assert(errno == EPIPE);
+
+        /*while (atomic2 == 0) {
+            status = sched_yield();
+            ERROR_IF(sched_yield, status, == -1);
+        }*/
+        puts("SIGSTOP handler successfully executed.");
+        return EXIT_SUCCESS;
+    }
+}
diff --git a/recipes/core/relibc/tests/signal.c b/recipes/core/relibc/tests/signal.c
new file mode 100644
index 0000000000..cdc3004821
--- /dev/null
+++ b/recipes/core/relibc/tests/signal.c
@@ -0,0 +1,26 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+void handler(int sig) {
+    UNEXP_IF(signal, sig, != SIGUSR1);
+    puts("Signal handler called!");
+}
+
+int main(void) {
+    void (*signal_status)(int) = signal(SIGUSR1, handler);
+    ERROR_IF(signal, signal_status, == SIG_ERR);
+    signal_status = signal(SIGUSR1, handler);
+    ERROR_IF(signal, signal_status, != handler);
+
+    puts("Raising...");
+
+    int raise_status = raise(SIGUSR1);
+    ERROR_IF(raise, raise_status, < 0);
+
+    puts("Raised.");
+}
diff --git a/recipes/core/relibc/tests/signals/kill-child.c b/recipes/core/relibc/tests/signals/kill-child.c
new file mode 100644
index 0000000000..c2644bd670
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/kill-child.c
@@ -0,0 +1,96 @@
+#include <assert.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+/*
+ * Test signal catching when being signalled from parent.
+ * Skip SIGKILL and SIGSTOP as these are not catchable.
+ */
+
+volatile sig_atomic_t sig_handled = 0;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	sig_handled = 1;
+}
+
+void child_proc(int signum)
+{
+	sigset_t sig_set;
+	int status;
+
+	sig_handled = 0;
+
+	status = sigemptyset(&sig_set);
+	ERROR_IF(sigemptyset, status, == -1);
+
+	status = sigaddset(&sig_set, signum);
+	ERROR_IF(sigaddset, status, == -1);
+
+	struct sigaction act;
+	act.sa_handler = sig_handler;
+	act.sa_flags = 0;
+	sigemptyset(&act.sa_mask);
+	sigaction(signum, &act, NULL);
+
+	status = usleep(200000);
+	ERROR_IF(usleep, status, == 0);
+
+	assert(sig_handled != 0);
+
+	exit(EXIT_SUCCESS);
+}
+
+void parent(int signum, pid_t pid)
+{
+	int status;
+
+	usleep(100000);
+	status = kill(pid, signum);
+	ERROR_IF(kill, status, != 0);
+
+	pid = wait(&status);
+	ERROR_IF(wait, pid, == (pid_t)-1);
+
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS)
+	{
+		printf("Child did not exit normally.\n");
+		exit(EXIT_FAILURE);
+	}
+	else
+	{
+		return;
+	}
+}
+
+void kill_child(int signum)
+{
+	int pid;
+
+	if ((pid = fork()) == 0)
+	{
+		child_proc(signum);
+	}
+	else
+	{
+		parent(signum, pid);
+	}
+}
+
+int main()
+{
+	for (long unsigned int i = 1; i <  sizeof(signals_list)/sizeof(signals_list[0]); i++)
+	{
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP)
+		{
+			continue;
+		}
+        printf("Testing for signal %s (%d)\n", strsignal(sig), sig);
+		kill_child(sig);
+	}
+	return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/signals/kill-group.c b/recipes/core/relibc/tests/signals/kill-group.c
new file mode 100644
index 0000000000..80059ef874
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/kill-group.c
@@ -0,0 +1,61 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// this test is to make sure that when a negative pid is supplied to kill, all the processes in that group will be killed
+
+int handler_called = 0;
+void sig_handler(int signo)
+{
+	(void) signo;
+	handler_called = 1;
+	return;
+}
+
+int kill_group(int signum)
+{
+	int pgrp;
+	struct sigaction act;
+	int status;
+
+	act.sa_handler=sig_handler;
+	act.sa_flags=0;
+	status = sigemptyset(&act.sa_mask);
+	ERROR_IF(sigemptyset, status, == -1);
+
+	status = sigaction(signum, &act, 0);
+	ERROR_IF(sigaction, status, == -1);
+
+	status = getpgrp();
+	pgrp = status;
+	ERROR_IF(getpgrp, status, == -1);
+
+	status = kill(-pgrp, signum);
+	ERROR_IF(kill, status, != 0);
+
+	ERROR_IF(kill, handler_called, !=1);
+	handler_called = 0;
+
+    return EXIT_SUCCESS;
+}
+
+int main()
+{
+    // Ensure we don't kill what was already in the process group.
+    int status = setpgid(0, 0);
+    ERROR_IF(setpgid, status, == -1);
+
+    for (unsigned int i = 0; i < sizeof(signals_list)/sizeof(signals_list[0]); i++)
+	{
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP)
+		{
+			continue;
+		}
+		kill_group(sig);
+	}
+	return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/signals/kill-invalid.c b/recipes/core/relibc/tests/signals/kill-invalid.c
new file mode 100644
index 0000000000..8cf8e7d3e6
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/kill-invalid.c
@@ -0,0 +1,22 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include "../test_helpers.h"
+
+//this test ensures that sending an invalid signal will set errno to esrch
+
+int main()
+{
+
+	/*
+	 * ESRCH
+	 */
+	int status;
+	status = kill(999999, 0);
+	ERROR_IF(kill, status, != -1);
+	ERROR_IF(kill, errno, != ESRCH);
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/kill-permission.c b/recipes/core/relibc/tests/signals/kill-permission.c
new file mode 100644
index 0000000000..eab0aef545
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/kill-permission.c
@@ -0,0 +1,20 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include "../test_helpers.h"
+
+// makes sure that a process is not killed if the user doesn't have permission to kill the process
+
+int main(void)
+{
+	int status;
+	// This is added in case user is root. If user is normal user, then it has no effect on the tests
+	setuid(1000); 
+	status = kill(1, 0);
+	ERROR_IF(kill, status, != -1);
+	ERROR_IF(kill, errno, != EPERM);
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/kill-self.c b/recipes/core/relibc/tests/signals/kill-self.c
new file mode 100644
index 0000000000..f05ec12a9f
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/kill-self.c
@@ -0,0 +1,56 @@
+#include <assert.h>
+#include <signal.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+/*
+ * Test signal catching when signalling self.
+ * Ensure all signals can be caught (other than SIGKILL and SIGSTOP).
+ */
+
+volatile sig_atomic_t handler_called = 0;
+
+void sig_handler(int sig)
+{
+	(void) sig;
+	handler_called = 1;
+}
+
+int kill_self(int sig)
+{
+	struct sigaction act;
+	int status;
+
+	handler_called = 0;
+
+	act.sa_handler = sig_handler;
+	act.sa_flags = 0;
+
+	status = sigemptyset(&act.sa_mask);
+	ERROR_IF(sigemptyset, status, == -1);
+
+	status = sigaction(sig, &act, NULL);
+	ERROR_IF(sigaction, status, == -1);
+
+	status = kill(getpid(), sig);
+	ERROR_IF(kill, status, != 0);
+
+	assert(handler_called == 1);
+
+	return EXIT_SUCCESS;
+}
+
+int main()
+{
+
+	for (unsigned int i = 1; i < sizeof(signals_list)/sizeof(signals_list[0]); i++)
+	{
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP)
+		{
+			continue;
+		}
+		kill_self(sig);
+	}
+	return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/signals/kill0-self.c b/recipes/core/relibc/tests/signals/kill0-self.c
new file mode 100644
index 0000000000..ad76980233
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/kill0-self.c
@@ -0,0 +1,16 @@
+#include <signal.h>
+#include "../test_helpers.h"
+
+/*
+ * Send signal 0 to self. This just reports whether a signal can be sent.
+ */
+
+int main()
+{
+	int status = 0;
+
+	status = kill(getpid(), 0);
+	ERROR_IF(kill, status, != 0);
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/killpg-child.c b/recipes/core/relibc/tests/signals/killpg-child.c
new file mode 100644
index 0000000000..d1ef669ca1
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/killpg-child.c
@@ -0,0 +1,82 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// test killing a child process 
+
+void sig_handler (int signo) {
+	(void) signo;
+	exit(EXIT_SUCCESS);
+}
+
+int killpg_test2(int signum)
+{
+	int child_pid, child_pgid;
+    printf("we are on signal %d\n   ", signum);
+
+	if ((child_pid = fork()) == 0) {
+		/* child here */
+		struct sigaction act;
+		act.sa_handler=sig_handler;
+		act.sa_flags=0;
+		sigemptyset(&act.sa_mask);
+		sigaction(signum, &act, 0);
+
+		/* change child's process group id */
+		setpgrp();
+
+		sigpause(SIGABRT);
+
+		return EXIT_FAILURE;
+	} else {
+		/* parent here */
+		int i;
+		sigignore(signum);
+
+		usleep(100000);
+		
+		child_pgid = getpgid(child_pid);
+		ERROR_IF(getpgid, child_pgid, == -1);
+
+		int status;
+		status = killpg(child_pgid, signum);
+		ERROR_IF(killpg, status, != 0);
+
+		status = wait(&i);
+		ERROR_IF(wait, status, == -1);
+
+		if (WEXITSTATUS(i) == EXIT_SUCCESS) {
+			printf("Child exited normally\n");
+			printf("Test PASSED\n");
+			return EXIT_SUCCESS;
+		} else {
+			printf("Child did not exit normally.\n");
+			printf("Test FAILED\n");
+			exit(EXIT_FAILURE);
+		}
+	}
+
+	return EXIT_FAILURE;
+}
+
+int main(){
+	int x;
+	for (unsigned int i = 1; i < sizeof(signals_list)/sizeof(signals_list[0]); i++)
+	{
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP || sig == SIGCHLD || sig == SIGINT || sig == SIGQUIT)
+		{
+			continue;
+		}
+		x = killpg_test2(sig);
+		if (x == EXIT_FAILURE){
+			return EXIT_FAILURE;
+		}
+	} 
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/killpg-esrch.c b/recipes/core/relibc/tests/signals/killpg-esrch.c
new file mode 100644
index 0000000000..ab1e62cd96
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/killpg-esrch.c
@@ -0,0 +1,19 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include "../test_helpers.h"
+
+// if a user tries to kill a process that does not exist the esrch error will be returned
+int main()
+{
+
+	int status;
+	status = killpg(999999, 0);
+	ERROR_IF(killpg, status, !=-1);
+
+	ERROR_IF(killpg, errno, != ESRCH);
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/killpg-invalid.c b/recipes/core/relibc/tests/signals/killpg-invalid.c
new file mode 100644
index 0000000000..b1f89dc023
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/killpg-invalid.c
@@ -0,0 +1,23 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include "../test_helpers.h"
+
+// the test makes sure that if an invalid signal is passed it will return the EINVAL error 
+int main()
+{
+	int pgrp;
+
+	pgrp = getpgrp();
+	ERROR_IF(getpgrp, pgrp, == -1);
+ 	
+	int status;
+	status = killpg(pgrp, -1);
+	ERROR_IF(killpg, status, != -1);
+
+	ERROR_IF(killpg, errno, != EINVAL);
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/killpg-self.c b/recipes/core/relibc/tests/signals/killpg-self.c
new file mode 100644
index 0000000000..afd4865112
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/killpg-self.c
@@ -0,0 +1,57 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// Test that the killpg() function shall send signal sig to the process 
+// group specified by prgp.
+
+void sig_handler(int signo)
+{
+	// printf("Caught signal %d being tested!\n", signo);
+	// printf("Test PASSED\n");
+	(void) signo;
+	return;
+}
+
+int killpg_test1(int signum)
+{
+	int pgrp;
+	struct sigaction act;
+
+	act.sa_handler=sig_handler;
+	act.sa_flags=0;
+	int status = sigemptyset(&act.sa_mask);
+	ERROR_IF(sigemptyset, status, == -1);
+
+	status = sigaction(signum, &act, 0);
+	ERROR_IF(sigaction, status, == -1);
+
+	pgrp = getpgrp();
+	ERROR_IF(getpgrp, pgrp, == -1);
+
+	status = killpg(pgrp, signum);
+	ERROR_IF(killpg, status, != 0);
+
+    return EXIT_SUCCESS;
+}
+
+int main(){
+    // UB if pg == 1, so set it here first
+    int status = setpgid(0, 0);
+    ERROR_IF(setpgid, status, == -1);
+
+	for (unsigned int i = 0; i < sizeof(signals_list)/sizeof(signals_list[0]); i++)
+	{
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP)
+		{
+			continue;
+		}
+		killpg_test1(sig);
+	}
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/killpg0-self.c b/recipes/core/relibc/tests/signals/killpg0-self.c
new file mode 100644
index 0000000000..e319660eca
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/killpg0-self.c
@@ -0,0 +1,25 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "../test_helpers.h"
+
+// test sending signal 0 to self will killpg
+
+int main()
+{
+    // UB if pg == 1, so set it here first
+    int err = setpgid(0, 0);
+    ERROR_IF(setpgid, err, == -1);
+
+	int pgrp;
+
+	pgrp = getpgrp();
+	ERROR_IF(getpgrp, pgrp, == -1);
+
+	int status;
+	status = killpg(pgrp, 0);
+	ERROR_IF(killpg, status, != 0);
+
+	return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/signals/pthread_kill-child.c b/recipes/core/relibc/tests/signals/pthread_kill-child.c
new file mode 100644
index 0000000000..04eb8a68aa
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/pthread_kill-child.c
@@ -0,0 +1,46 @@
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include "../test_helpers.h"
+
+//test with pthread_kill to kill a child process
+
+void * thread_function(void *arg)
+{
+	/* Does nothing */
+	(void) arg;
+	pthread_exit((void*)0);
+	
+	/* To please some compilers */
+	return NULL;
+}
+
+int main()
+{
+	pthread_t child_thread;
+	pthread_t invalid_tid;
+	
+	int rc;
+
+	rc = pthread_create(&child_thread, NULL, 
+		thread_function, NULL);
+	ERROR_IF(pthread_create, rc, != 0);
+	
+	rc = pthread_join(child_thread, NULL);
+	ERROR_IF(pthread_join, rc, != 0);
+		
+	// Now the child_thread exited, it is an invalid tid
+	memcpy(&invalid_tid, &child_thread, 
+			sizeof(pthread_t)); 
+    usleep(300);
+
+	int status;
+	status = pthread_kill(invalid_tid, 0);
+	ERROR_IF(pthread_kill, status, != ESRCH);
+ 
+	exit(EXIT_SUCCESS);
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/pthread_kill-invalid.c b/recipes/core/relibc/tests/signals/pthread_kill-invalid.c
new file mode 100644
index 0000000000..053f817557
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/pthread_kill-invalid.c
@@ -0,0 +1,23 @@
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include "../test_helpers.h"
+
+//test with pthread_kill making sure sending an invalid signal returns einval
+
+int main()
+{
+	pthread_t main_thread;
+
+	main_thread = pthread_self();
+
+	int status;
+	status = pthread_kill(main_thread, -1);
+	ERROR_IF(pthread_kill, status, != EINVAL);
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/pthread_kill-self.c b/recipes/core/relibc/tests/signals/pthread_kill-self.c
new file mode 100644
index 0000000000..dcc42b85c2
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/pthread_kill-self.c
@@ -0,0 +1,94 @@
+#include <pthread.h>
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+//test pthread_kill on self
+
+# define INTHREAD 0
+# define INMAIN 1
+# define SIGTOTEST SIGABRT
+
+int sem1;		/* Manual semaphore */
+volatile sig_atomic_t handler_called = 0;
+int count = 1;
+
+struct signal {
+	int signum;
+};
+
+void handler() {
+	handler_called = 1;
+	return;
+}
+
+void *a_thread_func( void *arg)
+{
+	
+	struct sigaction act;
+	act.sa_flags = 0;
+	act.sa_handler = handler;
+	sigemptyset(&act.sa_mask);
+	sigaction(((struct signal *)arg)->signum, &act, 0);
+
+	sem1=INMAIN;
+
+	while(sem1==INMAIN)
+		usleep(100000);
+
+	// sleep(50);
+
+	handler_called=-1;
+	pthread_exit(0);
+	return NULL;
+}
+
+int pthread_kill_test1(int signum)
+{
+	pthread_t new_th;
+
+	sem1=INTHREAD;
+
+	struct signal arg;
+	arg.signum = signum;
+
+	int status;
+	status = pthread_create(&new_th, NULL, a_thread_func, &arg);
+	ERROR_IF(pthread_create, status, != 0);
+
+	while(sem1==INTHREAD)
+		usleep(100000);
+
+	status = pthread_kill(new_th, signum);
+	ERROR_IF(pthread_kill, status, != 0);
+
+    usleep(100000);
+	sem1=INTHREAD;
+	
+	while(handler_called==0)
+		usleep(100000);
+
+	ERROR_IF(pthread_kill, handler_called, == -1);
+	ERROR_IF(pthread_kill, handler_called, == 0);
+	
+	handler_called = 0;
+	return EXIT_SUCCESS;	
+}
+
+int main(){
+	for (unsigned int i = 0; i < sizeof(signals_list)/sizeof(signals_list[0]); i++)
+	{
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP)
+		{
+			continue;
+		}
+		pthread_kill_test1(sig);
+	}
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/pthread_kill0-self.c b/recipes/core/relibc/tests/signals/pthread_kill0-self.c
new file mode 100644
index 0000000000..a4723a9e94
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/pthread_kill0-self.c
@@ -0,0 +1,21 @@
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "../test_helpers.h"
+
+// test sending 0 with pthread_kill to self
+
+int main()
+{
+	pthread_t main_thread;
+
+	main_thread = pthread_self();
+
+	int status;
+	status = pthread_kill(main_thread, 0);
+	ERROR_IF(pthread_kill, status, != 0);
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/raise-compliance.c b/recipes/core/relibc/tests/signals/raise-compliance.c
new file mode 100644
index 0000000000..6722729398
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/raise-compliance.c
@@ -0,0 +1,48 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// The raise() function shall send the signal sig to the executing [CX] [Option Start]  thread or process. [Option End] If a signal handler is called, the raise() function shall not return until after the signal handler does.
+
+// [CX] [Option Start] The effect of the raise() function shall be equivalent to calling: pthread_kill(pthread_self(), sig);
+
+void sig_hand(int i)
+
+{
+   if (i < 1 || i > 32){
+      printf("an invalid signal was given: %d", i);
+   }
+   static int count = 1;          
+
+   count++;
+   printf("%d \n", count);
+   if (count == 32) { 
+      printf("reached 32nd signal\n");
+      return;
+   }
+   else{
+      printf("count is %d\n", count);
+   }
+}
+
+void raise_test(int sig){
+   signal(sig, sig_hand);
+   raise(sig);
+}
+
+int main(void)
+{
+   for (int i = 0; i < N_SIGNALS; i++)
+	{
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP)
+		{
+			continue;
+		}
+		raise_test(sig);
+	}
+	return EXIT_SUCCESS;
+}                            
+
diff --git a/recipes/core/relibc/tests/signals/sigaddset-add.c b/recipes/core/relibc/tests/signals/sigaddset-add.c
new file mode 100644
index 0000000000..bcbad4aba7
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigaddset-add.c
@@ -0,0 +1,39 @@
+
+#define _OPEN_SYS
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// The sigaddset() function adds the individual signal specified by the signo to the signal set pointed to by set.
+
+// Applications shall call either sigemptyset() or sigfillset() at least once for each object of type sigset_t prior to any other use of that object. If such an object is not initialized in this way, but is nonetheless supplied as an argument to any of pthread_sigmask(), sigaction(), sigaddset(), sigdelset(), sigismember(), sigpending(), sigprocmask(), sigsuspend(), sigtimedwait(), sigwait(), or sigwaitinfo(), the results are undefined.
+
+void addset_test(sigset_t *sigset, int signal)
+{
+  int status;
+
+  status = sigismember(sigset, signal);
+  ERROR_IF(sigismember, status, != 0);
+
+  status = sigaddset(sigset, signal);
+  ERROR_IF(sigaddset, status, != 0);
+
+  status = sigismember(sigset, signal);
+  ERROR_IF(sigismember, status, != 1);
+}
+
+int main()
+{
+  sigset_t sigset;
+
+  for (int i = 1; i < N_SIGNALS; i++)
+  {
+    sigemptyset(&sigset);
+
+    int sig = signals_list[i - 1].signal;
+
+    addset_test(&sigset, sig);
+  }
+}
diff --git a/recipes/core/relibc/tests/signals/sigdelset-delete.c b/recipes/core/relibc/tests/signals/sigdelset-delete.c
new file mode 100644
index 0000000000..bfab99121a
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigdelset-delete.c
@@ -0,0 +1,36 @@
+#define _OPEN_SYS
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// The sigdelset() function deletes the individual signal specified by signo from the signal set pointed to by set.
+
+// Applications should call either sigemptyset() or sigfillset() at least once for each object of type sigset_t prior to any other use of that object. If such an object is not initialized in this way, but is nonetheless supplied as an argument to any of pthread_sigmask(), sigaction(), sigaddset(), sigdelset(), sigismember(), sigpending(), sigprocmask(), sigsuspend(), sigtimedwait(), sigwait(), or sigwaitinfo(), the results are undefined.
+
+void delset_test(sigset_t *sigset, int signal)
+{
+  int status;
+  status = sigismember(sigset, signal);
+  ERROR_IF(sigismember, status, != 1);
+
+  status = sigdelset(sigset, signal);
+  ERROR_IF(sigdelset, status, != 0);
+
+  status = sigismember(sigset, signal);
+  ERROR_IF(sigismember, status, != 0);
+}
+
+int main()
+{
+  sigset_t sigset;
+
+  for (int i = 1; i < N_SIGNALS; i++)
+  {
+    sigfillset(&sigset);
+
+    int sig = signals_list[i - 1].signal;
+    delset_test(&sigset, sig);
+  }
+}
diff --git a/recipes/core/relibc/tests/signals/sigismember-invalid.c b/recipes/core/relibc/tests/signals/sigismember-invalid.c
new file mode 100644
index 0000000000..80c45fa236
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigismember-invalid.c
@@ -0,0 +1,21 @@
+#define _OPEN_SYS
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#include <stdlib.h>
+#include "../test_helpers.h"
+
+// test to make sure that if you pass an invalid signal to sigismember it will return EINVAL
+
+int main() {
+  sigset_t sigset;
+  int status;
+
+  sigfillset(&sigset);
+  status = sigismember(&sigset, -1);
+  ERROR_IF(sigismember, status, != -1);
+  ERROR_IF(sigismember, errno, != EINVAL);
+
+  return EXIT_SUCCESS;	
+
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigismember-valid.c b/recipes/core/relibc/tests/signals/sigismember-valid.c
new file mode 100644
index 0000000000..e6c54f5894
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigismember-valid.c
@@ -0,0 +1,42 @@
+#define _OPEN_SYS
+#include <stdio.h>
+#include <signal.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// The sigismember() function shall test whether the signal specified by signo is a member of the set pointed to by set.
+
+// Applications should call either sigemptyset() or sigfillset() at least once for each object of type sigset_t prior to any other use of that object. If such an object is not initialized in this way, but is nonetheless supplied as an argument to any of pthread_sigmask(), sigaction(), sigaddset(), sigdelset(), sigismember(), sigpending(), sigprocmask(), sigsuspend(), sigtimedwait(), sigwait(), or sigwaitinfo(), the results are undefined.
+
+void check_full(sigset_t set, int signum) {
+  if (!sigismember(&set, signum)) {
+    exit(EXIT_FAILURE);
+  }
+    
+}
+
+void check_empty(sigset_t set, int signum) {
+    if (sigismember(&set, signum)) {
+      exit(EXIT_FAILURE);
+    }
+
+}
+
+
+
+int main() {
+  sigset_t sigset;
+
+  sigfillset(&sigset);
+  for (int i=1; i<N_SIGNALS; i++){
+     int sig = signals_list[i-1].signal;
+    check_full(sigset, sig);
+  }
+
+  sigemptyset(&sigset);
+  for (int i=1; i<N_SIGNALS; i++){
+     int sig = signals_list[i-1].signal;
+    check_empty(sigset, sig);
+  }
+
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/signal-h-2.c b/recipes/core/relibc/tests/signals/signal-h-2.c
new file mode 100644
index 0000000000..ee050b22c7
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/signal-h-2.c
@@ -0,0 +1,32 @@
+#include "../test_helpers.h"
+#include <signal.h>
+
+/*
+ * This is a test to ensure all required items for signal.h are defined.
+ * The definitions follow the order described in
+ * <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html>
+ */
+
+void handler(int sig_num)
+{
+    (void)sig_num;
+}
+
+void action(int sig_num, siginfo_t *info, void *context)
+{
+    (void)sig_num;
+    (void)info;
+    (void)context;
+}
+
+int main()
+{
+    int (*sh)(int) __attribute__((unused)) = sighold;
+    int (*sigig)(int) __attribute__((unused)) = sigignore;
+    int (*sigintr)(int, int) __attribute__((unused)) = siginterrupt;
+    int (*paws)(int) __attribute__((unused)) = sigpause;
+    int (*srls)(int) __attribute__((unused)) = sigrelse;
+    void (*(*sset)(int, void (*)(int)))(int) __attribute__((unused)) = sigset;
+    
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/signals/signal-h.c b/recipes/core/relibc/tests/signals/signal-h.c
new file mode 100644
index 0000000000..8ec09b374d
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/signal-h.c
@@ -0,0 +1,232 @@
+#include "../test_helpers.h"
+#include <signal.h>
+
+/*
+ * This is a test to ensure all required items for signal.h are defined.
+ * The definitions follow the order described in
+ * <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html>
+ */
+
+void handler(int sig_num)
+{
+    (void)sig_num;
+}
+
+void action(int sig_num, siginfo_t *info, void *context)
+{
+    (void)sig_num;
+    (void)info;
+    (void)context;
+}
+
+int main()
+{
+    void (*sig_dfl)(int) __attribute__((unused)) = SIG_DFL;
+    void (*sig_err)(int) __attribute__((unused)) = SIG_ERR;
+    void (*sig_ign)(int) __attribute__((unused)) = SIG_IGN;
+    
+     pthread_t pthread_num __attribute__((unused)) = 0;
+    size_t size __attribute__((unused)) = 0;
+     uid_t uid __attribute__((unused)) = 0;
+
+     sig_atomic_t atomic __attribute__((unused)) = 0;
+     sigset_t sig_set __attribute__((unused)) ;
+     pid_t pid __attribute__((unused)) = 0;
+
+     pthread_attr_t *attr __attribute__((unused)) = NULL;
+
+    // struct sigevent sev;
+     union sigval sv;
+
+    sv.sival_int = (int)0;
+    sv.sival_ptr = (void *)0;
+
+    // sev.sigev_notify = (int)0;
+    // sev.sigev_notify = SIGEV_NONE;
+    // sev.sigev_notify = SIGEV_SIGNAL;
+    // sev.sigev_notify = SIGEV_THREAD;
+
+    // sev.sigev_signo = (int)0;
+    // sev.sigev_value = sv;
+    // sev.sigev_value.sival_int = (int)0;
+    // sev.sigev_value.sival_ptr = (void *)0;
+    // sev.sigev_notify_function = (void (*)(union sigval))0;
+    // sev.sigev_notify_attributes = (pthread_attr_t *)0;
+
+    int rt_sig_num __attribute__((unused)) = SIGRTMIN;
+     rt_sig_num = SIGRTMAX;
+    
+    // rt_sig_num = SIG2STR_MAX;
+
+    // sev.sigev_signo = SIGABRT;
+    // sev.sigev_signo = SIGALRM;
+    // sev.sigev_signo = SIGBUS;
+    // sev.sigev_signo = SIGCHLD;
+    // sev.sigev_signo = SIGCONT;
+    // sev.sigev_signo = SIGFPE;
+    // sev.sigev_signo = SIGHUP;
+    // sev.sigev_signo = SIGILL;
+    // sev.sigev_signo = SIGINT;
+    // sev.sigev_signo = SIGKILL;
+    // sev.sigev_signo = SIGPIPE;
+    // sev.sigev_signo = SIGQUIT;
+    // sev.sigev_signo = SIGSEGV;
+    // sev.sigev_signo = SIGSTOP;
+    // sev.sigev_signo = SIGTERM;
+    // sev.sigev_signo = SIGTSTP;
+    // sev.sigev_signo = SIGTTIN;
+    // sev.sigev_signo = SIGTTOU;
+    // sev.sigev_signo = SIGUSR1;
+    // sev.sigev_signo = SIGUSR2;
+    // sev.sigev_signo = SIGWINCH;
+    // sev.sigev_signo = SIGPOLL; 
+    // sev.sigev_signo = SIGPROF; 
+    // sev.sigev_signo = SIGSYS;
+    // sev.sigev_signo = SIGTRAP;
+    // sev.sigev_signo = SIGURG;
+    // sev.sigev_signo = SIGVTALRM;
+    // sev.sigev_signo = SIGXCPU;
+    // sev.sigev_signo = SIGXFSZ;
+
+    struct sigaction sa;
+
+    sa.sa_handler  = SIG_IGN;
+    sa.sa_handler = SIG_DFL;
+    sa.sa_handler = handler;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = (int)0;
+    sa.sa_sigaction = action;
+
+#ifndef SA_NOCLDSTOP
+#error "Required constant not defined SA_NOCLDSTOP"
+#endif
+#ifndef SIG_BLOCK
+#error "Required constant not defined SIG_BLOCK"
+#endif
+#ifndef SIG_UNBLOCK
+#error "Required constant not defined SIG_UNBLOCK"
+#endif
+#ifndef SIG_SETMASK
+#error "Required constant not defined SIG_SETMASK"
+#endif
+#ifndef SA_ONSTACK
+#error "Required constant not defined SA_ONSTACK"
+#endif
+#ifndef SA_RESETHAND
+#error "Required constant not defined SA_RESETHAND"
+#endif
+#ifndef SA_RESTART
+#error "Required constant not defined SA_RESTART"
+#endif
+#ifndef SA_SIGINFO
+#error "Required constant not defined SA_SIGINFO"
+#endif
+#ifndef SA_NOCLDWAIT
+#error "Required constant not defined SA_NOCLDWAIT"
+#endif
+#ifndef SA_NODEFER
+#error "Required constant not defined SA_NODEFER"
+#endif
+#ifndef SS_ONSTACK
+#error "Required constant not defined SS_ONSTACK"
+#endif
+#ifndef SS_DISABLE
+#error "Required constant not defined SS_DISABLE"
+#endif
+#ifndef MINSIGSTKSZ
+#error "Required constant not defined MINSIGSTKSZ"
+#endif
+#ifndef SIGSTKSZ
+#error "Required constant not defined SIGSTKSZ"
+#endif
+
+    // struct ucontext_t uc;
+    mcontext_t mc __attribute__((unused));
+    
+    // add parts to ucontext_t
+    // uc.uc_link = NULL;
+    // uc.uc_sigmask = 0;
+    // uc.uc_stack = NULL;
+    // uc.uc_mcontext = NULL;
+    
+
+    stack_t st __attribute__((unused));
+    st.ss_sp = NULL;
+    st.ss_size = (size_t)0;
+    st.ss_flags = (int)0;
+
+    siginfo_t si __attribute__((unused));
+    si.si_signo = SIGHUP;
+    si.si_code = (int)0;
+    si.si_errno = (int)0;
+    si.si_pid = (pid_t)0;
+    si.si_uid = (uid_t)0;
+    si.si_addr = NULL;
+    si.si_status = (int)0;
+    si.si_value = sv;
+
+    // si.si_code = ILL_ILLOPC;
+    // si.si_code = ILL_ILLOPN;
+    // si.si_code = ILL_ILLADR;
+    // si.si_code = ILL_ILLTRP;
+    // si.si_code = ILL_PRVOPC;
+    // si.si_code = ILL_PRVREG;
+    // si.si_code = ILL_COPROC;
+    // si.si_code = ILL_BADSTK;
+    // si.si_code = FPE_INTDIV;
+    // si.si_code = FPE_INTOVF;
+    // si.si_code = FPE_FLTDIV;
+    // si.si_code = FPE_FLTOVF;
+    // si.si_code = FPE_FLTUND;
+    // si.si_code = FPE_FLTRES;
+    // si.si_code = FPE_FLTINV;
+    // si.si_code = FPE_FLTSUB;
+    // si.si_code = SEGV_MAPERR;
+    // si.si_code = SEGV_ACCERR;
+    // si.si_code = BUS_ADRALN;
+    // si.si_code = BUS_ADRERR;
+    // si.si_code = BUS_OBJERR;
+    // si.si_code = TRAP_BRKPT;
+    // si.si_code = TRAP_TRACE;
+    // si.si_code = CLD_EXITED;
+    // si.si_code = CLD_KILLED;
+    // si.si_code = CLD_DUMPED;
+    // si.si_code = CLD_TRAPPED;
+    // si.si_code = CLD_STOPPED;
+    // si.si_code = CLD_CONTINUED;
+    // si.si_code = SI_USER;
+    // si.si_code = SI_QUEUE;
+    // si.si_code = SI_TIMER;
+    // si.si_code = SI_ASYNCIO;
+    // si.si_code = SI_MESGQ;
+
+    // void (*(*bs)(int, void (*)(int)))(int) = bsd_signal;
+    int (*k)(pid_t, int) __attribute__((unused))= kill;
+    int (*kpg)(pid_t, int) __attribute__((unused))= killpg;
+    void (*psig)(const siginfo_t *, const char *) __attribute__((unused))= psiginfo;
+    void (*ps)(int, const char *) __attribute__((unused))= psignal;
+    int (*ptk)(pthread_t, int) __attribute__((unused))= pthread_kill;
+    int (*ptsm)(int, const sigset_t *, sigset_t *) __attribute__((unused))= pthread_sigmask;
+    int (*r)(int) __attribute__((unused))= raise;
+    // int (*s2s)(int, char*) = sig2str;
+    int (*sact)(int, const struct sigaction *restrict,
+                struct sigaction *restrict) __attribute__((unused)) = sigaction;
+    int (*sas)(sigset_t *, int) __attribute__((unused))= sigaddset;
+    int (*sastk)(const stack_t *restrict, stack_t *restrict) __attribute__((unused))= sigaltstack;
+    int (*sds)(sigset_t *, int) __attribute__((unused))= sigdelset;
+    int (*ses)(sigset_t *) __attribute__((unused))= sigemptyset;
+    int (*sfs)(sigset_t *) __attribute__((unused))= sigfillset;
+    int (*ismem)(const sigset_t *, int) __attribute__((unused))= sigismember;
+    void ( *(*sgnl)(int, void (*)(int)))(int) __attribute__((unused))= signal;
+    int (*pend)(sigset_t *) __attribute__((unused))= sigpending;
+    int (*spmsk)(int, const sigset_t *restrict, sigset_t *restrict) __attribute__((unused))= sigprocmask;
+    int (*sigq)(pid_t, int, const union sigval) __attribute__((unused))= sigqueue;
+    int (*susp)(const sigset_t *) __attribute__((unused))= sigsuspend;
+    int (*stmwt)(const sigset_t *restrict, siginfo_t *restrict,
+                      const struct timespec *restrict) __attribute__((unused))= sigtimedwait;
+    int (*swt)(const sigset_t *restrict, int *restrict) __attribute__((unused))= sigwait;
+    int (*swtinfo)(const sigset_t *restrict, siginfo_t *restrict) __attribute__((unused))= sigwaitinfo;
+    // int (*str2s)(const char *restrict, int *restrict) = str2sig;
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/signals/signal-handle_return.c b/recipes/core/relibc/tests/signals/signal-handle_return.c
new file mode 100644
index 0000000000..933f992078
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/signal-handle_return.c
@@ -0,0 +1,35 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "../test_helpers.h"
+
+void SIGUSR1_handler(int signo)
+{
+	(void) signo;
+	printf("do nothing useful\n");
+}
+
+void SIGUSR2_handler(int signo)
+{
+	(void) signo;
+	printf("do nothing useful\n");
+}
+
+int main()
+{
+	void (*status) (int);
+	status = signal(SIGUSR1, SIGUSR1_handler);
+	ERROR_IF(signal, status, == SIG_ERR);
+
+	status = signal(SIGUSR2, SIGUSR2_handler);
+	ERROR_IF(signal, status, == SIG_ERR);
+
+	status = signal(SIGUSR1,SIG_IGN);
+	// printf("status is %d\n", status);
+	// printf("SIGUSR1_handler is %d\n", SIGUSR1_handler);
+	ERROR_IF(signal, status, != SIGUSR1_handler);
+
+	//this seems to be a weird comparison error
+
+	return EXIT_SUCCESS;
+} 
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/signal-handler.c b/recipes/core/relibc/tests/signals/signal-handler.c
new file mode 100644
index 0000000000..f6eba8e168
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/signal-handler.c
@@ -0,0 +1,33 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "../test_helpers.h"
+
+int handler_called = 0;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	printf("SIGCHLD called. Inside handler\n");
+	handler_called = 1;
+}
+
+int main()
+{
+	void (*status) (int);
+	status = signal(SIGCHLD, sig_handler);
+	ERROR_IF(signal, status, == SIG_ERR);
+
+	status = signal(SIGCHLD,SIG_DFL);
+	ERROR_IF(signal, status, != sig_handler);
+
+	//same comparison error from handle_return
+    
+	raise(SIGCHLD);
+	
+	if (handler_called == 1) {
+		return EXIT_FAILURE;
+	}
+    handler_called = 0;
+	return EXIT_SUCCESS;
+} 
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/signal-handler2.c b/recipes/core/relibc/tests/signals/signal-handler2.c
new file mode 100644
index 0000000000..7cc8394bdd
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/signal-handler2.c
@@ -0,0 +1,37 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+int handler_called = 0;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	// printf("%d called. Inside handler\n", signo);
+	handler_called = 1;
+}
+
+int signal_test3(int signum)
+{
+	void (*status) (int);
+	status = signal(signum, sig_handler);
+	ERROR_IF(signal, status, == SIG_ERR);
+	
+	raise(signum);
+	
+	ERROR_IF(raise, handler_called, != 1);
+	return EXIT_SUCCESS;
+}
+
+int main(){
+    for (unsigned int i = 0; i < sizeof(signals_list)/sizeof(signals_list[0]); i++){
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP){
+			continue;
+		}
+		signal_test3(sig);
+	}
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/signal-ignore.c b/recipes/core/relibc/tests/signals/signal-ignore.c
new file mode 100644
index 0000000000..37a7c744bf
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/signal-ignore.c
@@ -0,0 +1,45 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+int handler_called = 0;
+
+void sig_handler(int signo)
+{
+	printf("%d called. Inside handler\n", signo);
+	handler_called = 1;
+}
+
+int signal_test2(int signum)
+{
+	void (*status) (int);
+	status = signal(signum, sig_handler);
+	ERROR_IF(signal, status, == SIG_ERR);
+    
+	status = signal(signum, SIG_IGN);
+	ERROR_IF(signal, status, != sig_handler);
+
+	// same issue as handle_return
+
+	raise(signum);
+
+	ERROR_IF(raise, handler_called, == 1);	
+    handler_called = 0;
+	return EXIT_SUCCESS;
+} 
+
+int main(){
+    for (unsigned int i = 0; i < sizeof(signals_list)/sizeof(signals_list[0]); i++){
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP){
+			continue;
+		}
+		signal_test2(sig);
+	}
+	return EXIT_SUCCESS;
+}
+
+
+
diff --git a/recipes/core/relibc/tests/signals/signal-invalid.c b/recipes/core/relibc/tests/signals/signal-invalid.c
new file mode 100644
index 0000000000..afad26247a
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/signal-invalid.c
@@ -0,0 +1,25 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "../test_helpers.h"
+
+// test to make sure sending an invalid signal sets errno
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	printf("handler does nothing useful.\n");
+}
+
+int main()
+{
+	errno = -1;
+
+	void (*status) (int);
+	status = signal(-1, sig_handler);
+	ERROR_IF(signal, status, != SIG_ERR);
+	ERROR_IF(signal, errno, <= 0);
+
+	return EXIT_SUCCESS;
+} 
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/signal-uncatchable.c b/recipes/core/relibc/tests/signals/signal-uncatchable.c
new file mode 100644
index 0000000000..1bf85db82c
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/signal-uncatchable.c
@@ -0,0 +1,25 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "../test_helpers.h"
+
+//make sure you can't catch uncatchable signals
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	printf("handler does nothing useful.\n");
+}
+
+int main()
+{
+	errno = -1;
+	void (*status) (int);
+	status = signal(SIGKILL, sig_handler);
+	ERROR_IF(signal, status, != SIG_ERR);
+
+	ERROR_IF(signal, errno, <= 0);
+
+	return EXIT_SUCCESS;
+} 
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/signals_list.h b/recipes/core/relibc/tests/signals/signals_list.h
new file mode 100644
index 0000000000..75bf3cd847
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/signals_list.h
@@ -0,0 +1,79 @@
+#ifndef _SIGNALS_LIST
+#define _SIGNALS_LIST 1
+
+#include <signal.h>
+
+#ifdef SIGSTKFLT
+#endif
+
+const int N_SIGNALS = (28
+#ifdef SIGSTKFLT
+                       + 1
+#endif
+#ifdef SIGWINCH
+                       + 1
+#endif
+#ifdef SIGIO
+                       + 1
+#endif
+#ifdef SIGPWR
+                       + 1
+#endif
+#ifdef SIGUNUSED
+                       + 1
+#endif
+);
+
+struct signalAction
+{
+    int signal;
+    char action;
+};
+
+const struct signalAction signals_list[] = {
+    {SIGABRT, 'A'},
+    {SIGALRM, 'T'},
+    {SIGBUS, 'A'},
+    {SIGCHLD, 'I'},
+    {SIGCONT, 'C'},
+    {SIGFPE, 'A'},
+    {SIGHUP, 'T'},
+    {SIGILL, 'A'},
+    {SIGINT, 'T'},
+    {SIGKILL, 'T'},
+    {SIGPIPE, 'T'},
+    {SIGQUIT, 'A'},
+    {SIGSEGV, 'A'},
+    {SIGSTOP, 'S'},
+    {SIGTERM, 'T'},
+    {SIGTSTP, 'S'},
+    {SIGTTIN, 'S'},
+    {SIGTTOU, 'S'},
+    {SIGUSR1, 'T'},
+    {SIGUSR2, 'T'},
+    // {SIGPOLL, 'T'},
+    {SIGPROF, 'T'},
+    {SIGSYS, 'A'},
+    {SIGTRAP, 'A'},
+    {SIGURG, 'I'},
+    {SIGVTALRM, 'T'},
+    {SIGXCPU, 'A'},
+    {SIGXFSZ, 'A'},
+#ifdef SIGSTKFLT
+    {SIGSTKFLT, 'T'},
+#endif
+#ifdef SIGWINCH
+    {SIGWINCH, 'I'},
+#endif
+#ifdef SIGIO
+    {SIGIO, 'T'},
+#endif
+#ifdef SIGPWR
+    {SIGPWR, 'T'},
+#endif
+#ifdef SIGUNUSED
+    {SIGUNUSED, 'A'},
+#endif
+};
+
+#endif /* _SIGNALS_LIST */
diff --git a/recipes/core/relibc/tests/signals/sigpause-error.c b/recipes/core/relibc/tests/signals/sigpause-error.c
new file mode 100644
index 0000000000..b7299bf092
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigpause-error.c
@@ -0,0 +1,101 @@
+#include <pthread.h>
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+//  This program verifies that sigpause() returns -1 and sets errno to EINTR
+//  when it returns.
+
+#define INMAIN 0
+#define INTHREAD 1
+
+int handler_called = 0;
+int returned = 0;
+int return_value = 2;
+int result = 2;
+int sem = INMAIN;
+
+void handler() {
+	// printf("signal was called\n");
+	handler_called = 1;
+	return;
+}
+
+void *d_thread_func(void *sig)
+{
+
+	int signum = *(int *)sig;
+	printf("%d Pausing signal \n", signum);
+	int return_value = 0;
+	struct sigaction act;
+	act.sa_flags = 0;
+	act.sa_handler = handler;
+	sigemptyset(&act.sa_mask);
+	sigaction(signum, &act, 0);
+	return_value = sigpause(signum);
+	ERROR_IF(sigpause, return_value, != -1);
+	ERROR_IF(sigpause, errno, != EINTR);
+	result = 0;
+	if (return_value == -1) {
+		if (errno == EINTR) {
+			printf ("Test PASSED: sigpause returned -1 and set errno to EINTR\n");
+			result = 0;
+		} else {
+			printf ("Test FAILED: sigpause did not set errno to EINTR\n");
+			result = 1;
+		}
+	} else {
+		if (errno == EINTR) {
+			printf ("Test FAILED: sigpause did not return -1\n");
+		}
+		printf ("Test FAILED: sigpause did not set errno to EINTR\n");
+		printf ("Test FAILED: sigpause did not return -1\n");
+		result = 1;
+
+	}
+	sem = INMAIN;
+	return NULL;
+}
+
+
+int sigpause_error(int signum){
+	pthread_t new_th;
+
+	int status;
+	status = pthread_create(&new_th, NULL, d_thread_func, (void *)&signum);
+	ERROR_IF(pthread_create, status, != 0);
+
+	usleep(100000);
+
+	status = pthread_kill(new_th, signum);
+	ERROR_IF(pthread_kill, status, != 0);
+
+	sem = INTHREAD;
+	while (sem == INTHREAD)
+		usleep(100000);
+
+	if(result == 2) {
+		exit(EXIT_FAILURE);
+	}
+	if(result == 1) {
+		 exit(EXIT_FAILURE);
+	}
+
+	printf("Test PASSED\n");
+	return EXIT_SUCCESS;	
+}
+
+int main(){
+	for (int i=1; i<N_SIGNALS; i++){
+		if (i == SIGKILL || i == SIGSTOP){
+			continue;
+		}
+		sigpause_error(i);
+	}
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigpause-invalid.c b/recipes/core/relibc/tests/signals/sigpause-invalid.c
new file mode 100644
index 0000000000..e036bfee5f
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigpause-invalid.c
@@ -0,0 +1,56 @@
+#include "../test_helpers.h"
+#include <assert.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+//  This program verifies that sigpause() returns -1 and sets errno to EINVAL
+//  if passed an invalid signal number.
+
+#define INMAIN 0
+#define INTHREAD 1
+
+volatile sig_atomic_t handler_called = 0;
+int returned = 0;
+int return_value = 2;
+int result = 2;
+int sem = INMAIN;
+
+void handler() {
+	// printf("signal was called\n");
+	handler_called = 1;
+	return;
+}
+
+int sigpause_invalid(){
+	int return_value = 0;
+
+	return_value = sigpause(-1);
+
+	if (return_value == -1) {
+		if (errno == EINVAL) {
+			printf ("Test PASSED: sigpause returned -1 and set errno to EINVAL\n");
+			return EXIT_SUCCESS;
+		} else {
+			printf ("Test FAILED: sigpause did not set errno to EINVAL\n");
+			exit(EXIT_FAILURE);
+		}
+	} else {
+		printf ("Test FAILED: sigpause did not return -1\n");
+		if (errno == EINVAL) {
+			printf ("Test FAILED: sigpause did not set errno to EINVAL\n");
+		}
+		exit(EXIT_FAILURE);
+	}
+	return EXIT_SUCCESS;
+
+}
+
+int main(){
+	sigpause_invalid();
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigpause-pause.c b/recipes/core/relibc/tests/signals/sigpause-pause.c
new file mode 100644
index 0000000000..e2a24c763e
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigpause-pause.c
@@ -0,0 +1,75 @@
+#include <pthread.h>
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// This program verifies that sigpause() removes sig from the signal mask.
+
+int handler_called = 0;
+
+void handler() {
+	handler_called = 1;
+	return;
+}
+
+void *a_thread_func(void *sig)
+{
+	int status;
+	int signum = *(int *)sig;
+	printf("Pausing signal %s\n", signum);	
+	struct sigaction act;
+	act.sa_flags = 0;
+	act.sa_handler = handler;
+	status = sigemptyset(&act.sa_mask);
+	ERROR_IF(sigemptyset, status, != 0);
+	status = sigaction(signum, &act, 0);
+	ERROR_IF(sigaction, status, != 0);
+	status = sighold(signum);
+	ERROR_IF(sighold, status, != 0);
+	status = sigpause(signum);
+	ERROR_IF(sigpause, status, != 0);
+
+	return NULL;
+}
+
+
+
+int sigpause_basic(int signum)
+{
+	pthread_t new_th;
+	int status;
+	status = pthread_create(&new_th, NULL, a_thread_func, (void *)&signum);
+	ERROR_IF(pthread_create, status, != 0);
+
+	usleep(100000);
+
+	status = pthread_kill(new_th, signum);
+	ERROR_IF(pthread_kill, status, != 0);
+
+	usleep(100000);
+
+	if (handler_called != 1){
+		prinft("handler wasn't called\n");
+		exit(EXIT_FAILURE);
+	}
+	handler_called = 0;
+
+	return EXIT_SUCCESS;	
+}
+
+
+
+int main(){
+	for (int i=1; i<N_SIGNALS; i++){
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP){
+			continue;
+		}
+		sigpause_basic(sig);
+	}
+	return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/signals/sigpause-revert.c b/recipes/core/relibc/tests/signals/sigpause-revert.c
new file mode 100644
index 0000000000..3cf46964fd
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigpause-revert.c
@@ -0,0 +1,108 @@
+#include <assert.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+//  This program verifies that sigpause() restores sig to the signal mask before
+//  returning.
+
+volatile sig_atomic_t handler_called = false;
+
+void handler() {
+    handler_called = true;
+	return;
+}
+
+void *c_thread_func(void *sig)
+{
+	int signum = *(int *)sig;
+	printf("%d !!!\n", signum);
+
+	sigset_t pendingset;
+
+	puts("before sigpause");
+
+    assert(!handler_called);
+
+	if ((sigpause(signum) != -1) || (errno != EINTR)) {
+		puts("Test UNRESOLVED: sigpause didn't return -1 and/or didn't set errno correctly.");
+        exit(2);
+		return NULL;
+	}
+    assert(handler_called);
+    handler_called = false;
+
+	int status = raise(signum);
+    ERROR_IF(raise, status, == -1);
+
+    assert(!handler_called);
+
+	sigpending(&pendingset);
+	if (sigismember(&pendingset, signum) == 1) {
+		puts("Test PASSED: signal mask was restored when sigpause returned.");
+	}
+	
+	return NULL;
+
+}
+
+int sigpause_revert(int signum) {
+	pthread_t new_th;
+    int status;
+	struct sigaction act;
+
+    // Ensure thread inherits mask with signum blocked.
+	status = sighold(signum);
+    ERROR_IF(sighold, status, == -1);
+
+	act.sa_flags = 0;
+	act.sa_handler = handler;
+	status = sigemptyset(&act.sa_mask);
+    ERROR_IF(sigemptyset, status, == -1);
+	status = sigaction(signum, &act, NULL);
+    ERROR_IF(sigaction, status, == -1);
+
+	if((status = pthread_create(&new_th, NULL, c_thread_func, (void *)&signum)) != 0)
+	{
+        errno = status;
+		perror("Error creating thread");
+		exit(EXIT_FAILURE);
+	}
+
+	usleep(100000);
+    
+	if((status = pthread_kill(new_th, signum)) != 0)
+	{
+        errno = status;
+		perror("Test UNRESOLVED: Couldn't send signal to thread");
+		exit(EXIT_FAILURE);
+	}
+    if ((status = pthread_join(new_th, NULL)) != 0) {
+        errno = status;
+        perror("failed to join thread");
+        return EXIT_FAILURE;
+    }
+
+	puts("Test PASSED");
+	return EXIT_SUCCESS;
+}
+
+
+
+int main(){
+	for (int i=1; i<N_SIGNALS; i++){
+		if (i == SIGKILL || i == SIGSTOP){
+			continue;
+		}
+        printf("Testing signal %s\n", strsignal(i));
+		sigpause_revert(i);
+	}
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigpause-suspend.c b/recipes/core/relibc/tests/signals/sigpause-suspend.c
new file mode 100644
index 0000000000..ed2ab1d2a5
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigpause-suspend.c
@@ -0,0 +1,94 @@
+#include <assert.h>
+#include <pthread.h>
+#include <stdatomic.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// This program verifies that sigpause() suspends the calling process
+//  until it receives a signal.
+
+#define INMAIN 0
+#define INTHREAD 1
+
+volatile sig_atomic_t handler_called = 0;
+volatile atomic_bool completed = false;
+
+void handler() {
+	handler_called = 1;
+	return;
+}
+void *b_thread_func(void *code_raw) {
+    int *code = code_raw;
+	printf("Pausing signal %s\n", strsignal(*code));
+	sigpause(*code);
+    assert(handler_called != 0);
+    *code = 0;
+    atomic_store(&completed, true);
+
+	return NULL;
+}
+
+
+int sigpause_suspend(int signum)
+{
+    atomic_store(&completed, false);
+	int status;
+
+	struct sigaction act;
+	act.sa_flags = 0;
+	act.sa_handler = handler;
+	sigemptyset(&act.sa_mask);
+	status = sigaction(signum, &act, 0);
+    ERROR_IF(sigaction, status, == -1);
+
+	pthread_t new_th;
+
+    int code = signum;
+	if ((status = pthread_create(&new_th, NULL, b_thread_func, (void *)&code)) != 0) {
+        errno = status;
+        perror("failed to create thread");
+        return EXIT_FAILURE;
+    }
+    usleep(100000);
+    assert(!atomic_load(&completed));
+
+	if ((status = pthread_kill(new_th, signum)) != 0) {
+        errno = status;
+        perror("failed to kill thread");
+        return EXIT_FAILURE;
+    }
+
+    if ((status = pthread_join(new_th, NULL)) != 0) {
+        errno = status;
+        perror("failed to join thread");
+        return EXIT_FAILURE;
+    }
+
+	assert(code == 0);
+    assert(atomic_load(&completed));
+
+	return EXIT_SUCCESS;
+}
+
+
+int main(){
+    // TODO: upper limit for i (gives OOB otherwise)
+	for (int i=1; i<31; i++){
+		int sig = signals_list[i].signal;
+		if (sig == SIGKILL || sig == SIGSTOP){
+			continue;
+		}
+        printf("For signal %s (%d)\n", strsignal(sig), sig);
+		sigpause_suspend(sig);
+	}
+	return EXIT_SUCCESS;
+}
+
+
+
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-10.c b/recipes/core/relibc/tests/signals/sigprocmask-10.c
new file mode 100644
index 0000000000..f14c593bdf
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-10.c
@@ -0,0 +1,68 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "../test_helpers.h"
+
+// The thread's signal mask shall not be changed, if sigprocmask( ) fails.
+
+#define NUMSIGNALS 24
+
+int is_changed(sigset_t set) {
+	
+	int i;
+	int siglist[] = {SIGALRM, SIGBUS, SIGCHLD, 
+		SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT, 
+		SIGPIPE, SIGQUIT, SIGSEGV, 
+		SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU, 
+		SIGUSR1, SIGUSR2, SIGPROF, SIGSYS, 
+		SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+	for (i=0; i<NUMSIGNALS; i++) {
+		if (sigismember(&set, siglist[i]) != 0)
+			return 1;
+	}
+	return 0;
+}
+
+int get_rand() {
+
+	int r;
+	r=rand();
+	while ((r == SIG_BLOCK) || (r == SIG_SETMASK) || (r == SIG_UNBLOCK)) {
+		r = get_rand();
+	}
+	return r;
+}
+
+int main() {
+	
+	int r=get_rand();
+	sigset_t actl, oactl;
+	int status;
+
+	sigemptyset(&actl);
+	sigemptyset(&oactl);
+	status = sigaddset(&actl, SIGABRT);
+	ERROR_IF(sigaddset, status, != 0);
+
+	status = sigprocmask(SIG_SETMASK, &actl, NULL);
+	ERROR_IF(sigprocmask, status, != 0);
+
+	status = sigaddset(&actl, SIGALRM);
+	ERROR_IF(sigaddset, status, != 0);
+	
+	status = sigprocmask(r, &actl, NULL);
+	ERROR_IF(sigprocmask, status, != -1);
+
+	status = sigprocmask(SIG_SETMASK, NULL, &oactl);
+	ERROR_IF(sigprocmask, status, != 0);
+
+	status = sigismember(&oactl, SIGABRT);
+	ERROR_IF(sigismember, status, != 1);
+
+	if (is_changed(oactl)) {
+		exit(EXIT_FAILURE);
+	}
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-11.c b/recipes/core/relibc/tests/signals/sigprocmask-11.c
new file mode 100644
index 0000000000..8c54851f65
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-11.c
@@ -0,0 +1,20 @@
+
+#include <stdio.h>
+#include <signal.h>
+#include <stdlib.h>
+#include "../test_helpers.h"
+
+// sigprocmask( ) shall return 0, Upon successful completion; otherwise, it shall return -1
+// and errno shall be set to indicate the error, and the process' signal mask shall be unchanged.
+
+int main()
+{
+
+	sigset_t set;
+	sigaddset (&set, SIGABRT);
+
+	int status;
+	status = sigprocmask(SIG_SETMASK, &set, NULL);
+	ERROR_IF(sigprocmask, status, != 0);
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-3.c b/recipes/core/relibc/tests/signals/sigprocmask-3.c
new file mode 100644
index 0000000000..aee43032ca
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-3.c
@@ -0,0 +1,88 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+// The resulting set shall be the union of the current set and the signal 
+//  set pointed to by set, if the value of the argument how is SIG_BLOCK.
+
+volatile sig_atomic_t handler_called = 0;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	handler_called = 1;
+}
+
+int sigprocmask_block(int signum)
+{
+    int defaultsig = SIGALRM;
+    if (signum == SIGALRM) {
+        defaultsig = SIGHUP;
+    }
+	struct sigaction act;
+	sigset_t set1, set2, pending_set;
+	sigemptyset(&set1);
+	sigemptyset(&set2);
+	sigaddset(&set1, defaultsig);
+	sigaddset(&set2, signum);
+
+	act.sa_handler = sig_handler;
+	act.sa_flags = 0;
+	sigemptyset(&act.sa_mask);
+
+	int status;
+	status = sigaction(signum,  &act, 0);
+	ERROR_IF(sigaction, status, == -1);
+
+	status = sigaction(defaultsig,  &act, 0);
+	ERROR_IF(sigaction, status, == -1);	
+
+	status = sigprocmask(SIG_SETMASK, &set1, NULL);
+	ERROR_IF(sigprocmask, status, == -1);
+
+	status = sigprocmask(SIG_UNBLOCK, &set2, NULL);
+	ERROR_IF(sigprocmask, status, == -1);
+
+    printf("Raising %s\n", strsignal(signum));
+	status = raise(signum);
+	ERROR_IF(raise, status, == -1);
+
+	ERROR_IF(raise, handler_called, != 1);
+    handler_called = 0;
+
+    printf("Raising %s\n", strsignal(defaultsig));
+	status = raise(defaultsig);
+	ERROR_IF(raise, defaultsig, == -1);
+
+	ERROR_IF(raise, handler_called, == 1);
+
+	status = sigpending(&pending_set);
+	ERROR_IF(sigpending, status, == -1);
+
+	status = sigismember(&pending_set, defaultsig);
+	ERROR_IF(sigismember, status, != 1);
+
+	status = sigismember(&pending_set, signum);
+	ERROR_IF(sigismemeber, status, != 0);
+
+	// printf("Test PASSED: signal was added to the process's signal mask\n");
+    act.sa_handler = SIG_IGN;
+    sigaction(signum, &act, 0);
+    sigaction(defaultsig, &act, 0);
+
+	return EXIT_SUCCESS;
+}
+
+int main(){
+    for (int i=1; i<N_SIGNALS; i++){
+		if (i == SIGKILL || i == SIGSTOP){
+			continue;
+		}
+        printf("Testing signal %s (%d)\n", strsignal(i), i);
+		sigprocmask_block(i);
+	}
+	return 0;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-4.c b/recipes/core/relibc/tests/signals/sigprocmask-4.c
new file mode 100644
index 0000000000..e539ec4ba9
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-4.c
@@ -0,0 +1,42 @@
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+// The previous mask shall be stored in the location pointed to by oset, if the argument oset is not a null pointer.
+
+
+#define NUMSIGNALS 26
+
+int main()
+{
+	sigset_t oactl, tempset;
+	int i, j, test_failed=0;
+
+	int siglist[] = {SIGABRT, SIGALRM, SIGBUS, SIGCHLD, 
+		SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT, 
+		SIGPIPE, SIGQUIT, SIGSEGV, 
+		SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU, 
+		SIGUSR1, SIGUSR2, SIGPROF, SIGSYS, 
+		SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+	for (i=0; i<NUMSIGNALS; i++) {
+		sigemptyset(&oactl);
+		sigemptyset(&tempset);
+		sigaddset(&tempset, siglist[i]);
+		sigprocmask(SIG_BLOCK, &tempset, &oactl);
+		if (i > 0) {
+			for (j=0; j<i; j++) { 
+				if (sigismember(&oactl, siglist[j]) != 1) {
+					test_failed = 1;
+				}
+			}
+		}
+	}
+
+	if (test_failed != 0) {
+		exit(EXIT_FAILURE);
+	}
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-5.c b/recipes/core/relibc/tests/signals/sigprocmask-5.c
new file mode 100644
index 0000000000..a7cc8560ac
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-5.c
@@ -0,0 +1,49 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+// The value of the argument how is not significant and the process's signal mask shall be unchanged, and 
+// thus the call can be used to enquire about currently blocked signals, if the argument set is a null 
+// pointer.
+
+#define NUMSIGNALS 25
+
+int is_changed(sigset_t set, int sig) {
+	
+	int i;
+	int siglist[] = {SIGABRT, SIGALRM, SIGBUS, SIGCHLD, 
+		SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT, 
+		SIGPIPE, SIGQUIT, SIGSEGV, 
+		SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU, 
+		SIGUSR1, SIGUSR2, SIGPROF, SIGSYS, 
+		SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+	if (sigismember(&set, sig) != 1) {
+		return 1;
+	}
+	for (i=0; i<NUMSIGNALS; i++) {
+		if ((siglist[i] != sig)) {
+			if (sigismember(&set, siglist[i]) != 0) {
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+int main() {
+	sigset_t actl, oactl;
+
+	sigemptyset(&actl);
+	sigemptyset(&oactl);
+
+	sigaddset(&actl, SIGABRT);
+
+	sigprocmask(SIG_SETMASK, &actl, NULL);
+	sigprocmask(SIG_BLOCK, NULL, &oactl);
+	
+	if (is_changed(oactl, SIGABRT)) {
+		exit(EXIT_FAILURE);
+	}
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-6.c b/recipes/core/relibc/tests/signals/sigprocmask-6.c
new file mode 100644
index 0000000000..90df06142c
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-6.c
@@ -0,0 +1,46 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+#define NUMSIGNALS 25
+
+int is_changed(sigset_t set, int sig) {
+	
+	int i;
+	int siglist[] = {SIGABRT, SIGALRM, SIGBUS, SIGCHLD, 
+		SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT, 
+		SIGPIPE, SIGQUIT, SIGSEGV, 
+		SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU, 
+		SIGUSR1, SIGUSR2, SIGPROF, SIGSYS, 
+		SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+	if (sigismember(&set, sig) != 1) {
+		return 1;
+	}
+	for (i=0; i<NUMSIGNALS; i++) {
+		if ((siglist[i] != sig)) {
+			if (sigismember(&set, siglist[i]) != 0) {
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+int main() {
+	sigset_t actl, oactl;
+
+	sigemptyset(&actl);
+	sigemptyset(&oactl);
+
+	sigaddset(&actl, SIGABRT);
+
+	sigprocmask(SIG_SETMASK, &actl, NULL);
+	sigprocmask(SIG_SETMASK, NULL, &oactl);
+	
+	if (is_changed(oactl, SIGABRT)) {
+		exit(EXIT_FAILURE);
+	}
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-7.c b/recipes/core/relibc/tests/signals/sigprocmask-7.c
new file mode 100644
index 0000000000..55fdf0025d
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-7.c
@@ -0,0 +1,45 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define NUMSIGNALS 25
+
+int is_changed(sigset_t set, int sig) {
+	
+	int i;
+	int siglist[] = {SIGABRT, SIGALRM, SIGBUS, SIGCHLD, 
+		SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT, 
+		SIGPIPE, SIGQUIT, SIGSEGV, 
+		SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU, 
+		SIGUSR1, SIGUSR2, SIGPROF, SIGSYS, 
+		SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+	if (sigismember(&set, sig) != 1) {
+		return 1;
+	}
+	for (i=0; i<NUMSIGNALS; i++) {
+		if ((siglist[i] != sig)) {
+			if (sigismember(&set, siglist[i]) != 0) {
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+int main() {
+	sigset_t actl, oactl;
+
+	sigemptyset(&actl);
+	sigemptyset(&oactl);
+
+	sigaddset(&actl, SIGABRT);
+
+	sigprocmask(SIG_SETMASK, &actl, NULL);
+	sigprocmask(SIG_UNBLOCK, NULL, &oactl);
+	
+	if (is_changed(oactl, SIGABRT)) {
+		exit(EXIT_FAILURE);
+	}
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-8.c b/recipes/core/relibc/tests/signals/sigprocmask-8.c
new file mode 100644
index 0000000000..ba7284eb1d
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-8.c
@@ -0,0 +1,51 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "../test_helpers.h"
+
+// After the call to sigprocmask(), if there are any pending unblocked signals, at least one of those
+// signals shall be delivered before the call to sigprocmask() returns.
+
+int handler_called = 0;
+int sigprocmask_return_val = 1; /* some value that's not a 1 or 0 */
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	handler_called = 1;
+	if (sigprocmask_return_val != 1) {
+		printf("FAIL: sigprocmask() returned before signal was delivered.\n");
+		exit(EXIT_FAILURE);
+	}
+}
+
+int main()
+{
+	struct sigaction act;
+	sigset_t blocked_set1;
+	sigemptyset(&blocked_set1);
+	sigaddset(&blocked_set1, SIGABRT);
+
+	act.sa_handler = sig_handler;
+	act.sa_flags = 0;
+	sigemptyset(&act.sa_mask);
+
+	int status;
+
+	status = sigaction(SIGABRT,  &act, 0);
+	ERROR_IF(sigaction, status, == -1);
+
+	status = sigprocmask(SIG_SETMASK, &blocked_set1, NULL);
+	ERROR_IF(sigprocmask, status, == -1);
+
+	status = raise(SIGABRT);
+	ERROR_IF(raise, status, == -1); 
+
+	sigprocmask_return_val = sigprocmask(SIG_UNBLOCK, &blocked_set1, NULL);
+
+	ERROR_IF(sigprocmask, sigprocmask_return_val, != 0);
+
+	ERROR_IF(raise, handler_called, != 1);	
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-9.c b/recipes/core/relibc/tests/signals/sigprocmask-9.c
new file mode 100644
index 0000000000..168eed88c4
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-9.c
@@ -0,0 +1,28 @@
+#include "../test_helpers.h"
+#include <assert.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+//  Attempt to add SIGKILL and SIGSTOP to the process's signal mask and 
+//  verify that:
+//  - They do not get added.
+//  - sigprocmask() does not return -1.
+
+int main() {
+	sigset_t set1, set2;
+	int ret;
+
+	sigemptyset(&set1);
+	sigemptyset(&set2);
+	sigaddset(&set1, SIGKILL);
+	sigaddset(&set1, SIGSTOP);
+
+	ret = sigprocmask(SIG_SETMASK, &set1, NULL);
+    ERROR_IF(sigprocmask, ret, == -1);
+	ret = sigprocmask(SIG_SETMASK, NULL, &set2);
+    ERROR_IF(sigprocmask, ret, == -1);
+
+	assert(!sigismember(&set2, SIGKILL));
+	assert(!sigismember(&set2, SIGSTOP));
+}
diff --git a/recipes/core/relibc/tests/signals/sigprocmask-blocksingle.c b/recipes/core/relibc/tests/signals/sigprocmask-blocksingle.c
new file mode 100644
index 0000000000..5dd3d5a3c0
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigprocmask-blocksingle.c
@@ -0,0 +1,64 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+int handler_called = 0;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	handler_called = 1;
+}
+
+int sigprocmask_block(int signum)
+{
+	struct sigaction act;
+	sigset_t blocked_set, pending_set;
+	sigemptyset(&blocked_set);
+	sigaddset(&blocked_set, signum);
+
+	act.sa_handler = sig_handler;
+	act.sa_flags = 0;
+	sigemptyset(&act.sa_mask);
+
+	int status;
+	status = sigaction(signum,  &act, 0);
+	ERROR_IF(sigaction, status, == -1);
+
+	status = sigprocmask(SIG_SETMASK, &blocked_set, NULL);
+	ERROR_IF(sigprocmask, status, == -1);
+
+	status = raise(signum);
+	ERROR_IF(raise, status, == -1);
+
+	if (handler_called) {
+		printf("FAIL: Signal was not blocked\n");
+		exit(EXIT_FAILURE);
+	}
+
+	status = sigpending(&pending_set);
+	ERROR_IF(sigpending, status, == -1);
+
+	status = sigismember(&pending_set, signum);
+	ERROR_IF(sigismember, status, != 1);
+
+    act.sa_handler = SIG_IGN;
+    sigaction(signum, &act, 0);
+
+	return EXIT_SUCCESS;
+}
+
+int main(){
+    for (int i=1; i<N_SIGNALS; i++){
+		int sig = signals_list[i-1].signal;
+		if (sig == SIGKILL || sig == SIGSTOP){
+			continue;
+		}
+        printf("Testing signal %s (%d)\n", strsignal(i), i);
+		sigprocmask_block(sig);
+	}
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigrelse-1.c b/recipes/core/relibc/tests/signals/sigrelse-1.c
new file mode 100644
index 0000000000..c1ecbce0ba
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigrelse-1.c
@@ -0,0 +1,69 @@
+// The sigrelse() function shall remove sig from the signal mask of the calling process.
+
+#include <assert.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+volatile sig_atomic_t handler_called = 0;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	handler_called = 1;
+}
+
+int sigrelse_test(int signum)
+{
+    // needs to be reset
+    handler_called = 0;
+
+	struct sigaction act;
+	
+	act.sa_handler = sig_handler;
+	act.sa_flags = 0;
+	sigemptyset(&act.sa_mask);
+
+	int status;
+	status = sigaction(signum,  &act, NULL);
+	ERROR_IF(sigaction, status, == -1);
+
+	status = sighold(signum);
+    ERROR_IF(sighold, status, == -1);
+
+	assert(handler_called == 0);
+
+	status = raise(signum);
+	ERROR_IF(raise, status, == -1);	
+
+	assert(handler_called == 0);
+
+	status = sigrelse(signum);
+	ERROR_IF(sigrelse, status, == -1);
+
+	assert(handler_called == 1);
+	// if (handler_called) {
+	// 	printf("PASS: %d successfully removed from signal mask\n", signum);
+    // handler_called = 0;
+	// 	return EXIT_SUCCESS;
+	// } 
+	// printf("FAIL\n");
+	// exit(EXIT_FAILURE);
+	return EXIT_SUCCESS;
+}
+
+int main(){
+	for (int i=1; i<N_SIGNALS; i++){
+		if (i == SIGKILL || i == SIGSTOP){
+			continue;
+		}
+        printf("For signal %s\n", strsignal(i));
+		sigrelse_test(i);
+	}
+	return 0;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigrelse-2.c b/recipes/core/relibc/tests/signals/sigrelse-2.c
new file mode 100644
index 0000000000..2ca2d8392c
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigrelse-2.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+#include <signal.h>
+#include <stdlib.h>
+#include "../test_helpers.h"
+
+int main()
+{
+	int status;
+	status = (int)sigrelse(SIGABRT);
+	ERROR_IF(sigrelse, status, != 0);
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigrelse-3.c b/recipes/core/relibc/tests/signals/sigrelse-3.c
new file mode 100644
index 0000000000..980bca35bd
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigrelse-3.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "../test_helpers.h"
+
+int main()
+{
+        int status;
+        status = (int)sigrelse(100000);
+        ERROR_IF(sigrelse, status, != -1);
+        ERROR_IF(sigrelse, errno, != EINVAL);
+        return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/signals/sigset-1.c b/recipes/core/relibc/tests/signals/sigset-1.c
new file mode 100644
index 0000000000..fe2f04df1c
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigset-1.c
@@ -0,0 +1,46 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int handler_called = 0;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	printf("SIGURG called. Inside handler\n");
+	handler_called = 1;
+}
+
+int sigset_test(int signum)
+{
+
+	struct sigaction act;
+	act.sa_handler = sig_handler;
+	act.sa_flags = 0;
+	sigemptyset(&act.sa_mask);
+
+	if (sigaction(signum, &act, 0) != 0) {
+                perror("Unexpected error while using sigaction()");
+               	exit(EXIT_FAILURE);
+        }
+
+        if (sigset(signum,SIG_DFL) != sig_handler) {
+                perror("Unexpected error while using signal()");
+               	exit(EXIT_FAILURE);
+        }
+
+	raise(signum);
+	
+	if (handler_called == 1) {
+		printf("Test FAILED: handler was called even though default was expected\n");
+		exit(EXIT_FAILURE);
+	}	
+    printf("test passed, the signal was ignored\n");	
+	return EXIT_SUCCESS;
+} 
+
+int main(){
+    sigset_test(SIGURG);
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigset-10.c b/recipes/core/relibc/tests/signals/sigset-10.c
new file mode 100644
index 0000000000..68f8d37808
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigset-10.c
@@ -0,0 +1,25 @@
+#include <assert.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "../test_helpers.h"
+
+int main()
+{
+	void (*status) (int);
+	status = sigset(SIGKILL,SIG_IGN);
+	assert(status == SIG_ERR);
+	assert(errno == EINVAL);
+	// if (sigset(SIGKILL,SIG_IGN) == SIG_ERR) {
+	// 	if (errno != EINVAL) {
+	// 		printf("Test FAILED: sigset() returned SIG_ERR but didn't set errno to EINVAL\n");
+	// 		exit(EXIT_FAILURE);
+	// 	}
+	// } else {
+	// 	printf("Test FAILED: sigset() didn't return SIG_ERROR even though SIGKILL was passed to it\n");
+	// 	exit(EXIT_FAILURE);
+	// }
+    // printf("test passed: error was set successfully\n");
+	return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/signals/sigset-2.c b/recipes/core/relibc/tests/signals/sigset-2.c
new file mode 100644
index 0000000000..17ba64392b
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigset-2.c
@@ -0,0 +1,52 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+int handler_called = 0;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	printf("SIGUSR1 called. Inside handler\n");
+	handler_called = 1;
+}
+
+int sigset_test2(int signum)
+{
+	struct sigaction act;
+	act.sa_flags = 0;
+	act.sa_handler = sig_handler;
+	sigemptyset(&act.sa_mask);
+
+	if (sigaction(signum, &act, 0) != 0) {
+                perror("Unexpected error while using sigaction()");
+               	exit(EXIT_FAILURE);
+        }
+
+        if (sigset(signum,SIG_IGN) != sig_handler) {
+                perror("Unexpected error while using signal()");
+               	exit(EXIT_FAILURE);
+        }
+
+	raise(signum);
+	
+	if (handler_called == 1) {
+		printf("Test FAILED: handler was called even though ignore was expected\n");
+		exit(EXIT_FAILURE);
+	}		
+    printf("test %d passed, the signal was ignored\n", signum);
+	return EXIT_SUCCESS;
+} 
+
+int main(){
+    for (int i=1; i<N_SIGNALS; i++){
+		if (i == SIGKILL || i == SIGSTOP){
+			continue;
+		}
+		sigset_test2(i);
+	}
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigset-3.c b/recipes/core/relibc/tests/signals/sigset-3.c
new file mode 100644
index 0000000000..16abedc22f
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigset-3.c
@@ -0,0 +1,43 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+int handler_called = 0;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	// printf("SIGCHLD called. Inside handler\n");
+	handler_called = 1;
+}
+
+int sigset_test3(int signum)
+{
+	if (sigset(signum, sig_handler) == SIG_ERR) {
+                perror("Unexpected error while using sigset()");
+               		exit(EXIT_FAILURE);
+        }
+
+	raise(signum);
+	
+	if (handler_called != 1) {
+		printf("Test FAILED: handler wasn't called even though it was expected\n");
+			exit(EXIT_FAILURE);
+	}		
+    printf("test %d passed, handler was called\n", signum);
+    handler_called = 0;
+	return EXIT_SUCCESS;
+} 
+
+int main(){
+    for (int i=1; i<N_SIGNALS; i++){
+		if (i == SIGKILL || i == SIGSTOP){
+			continue;
+		}
+		sigset_test3(i);
+	}
+	return EXIT_SUCCESS;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigset-4.c b/recipes/core/relibc/tests/signals/sigset-4.c
new file mode 100644
index 0000000000..a25c7de6f6
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigset-4.c
@@ -0,0 +1,54 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+int signal_blocked = 0;
+int count = 1;
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	// printf("SIGCHLD called. Inside handler\n");
+	sigset_t mask;
+	sigprocmask(SIG_SETMASK, NULL, &mask);
+    if (count == SIGKILL || count == SIGSTOP){
+        count++;
+    }
+	if(sigismember(&mask, count)) {
+		signal_blocked = 1;
+	}
+    count++;
+}
+
+int sigset_test4(int signum)
+{
+	if (sigset(signum, sig_handler) == SIG_ERR) {
+                perror("Unexpected error while using sigset()");
+               	exit(EXIT_FAILURE);
+        }
+
+	raise(signum);
+	
+	if (signal_blocked != 1) {
+		printf("Test FAILED: signal was not added to the mask before the handler was executed\n");
+		exit(EXIT_FAILURE);
+	}
+    signal_blocked = 0;	
+    printf("test %d passed: the singal was added to the mask before the handler was executed\n", signum);
+	return EXIT_SUCCESS;
+} 
+
+int main(){
+    for (int i=1; i<N_SIGNALS; i++){
+		if (i == SIGKILL || i == SIGSTOP){
+			continue;
+		}
+		sigset_test4(i);
+	}
+	return EXIT_SUCCESS;
+}
+
+
+
diff --git a/recipes/core/relibc/tests/signals/sigset-5.c b/recipes/core/relibc/tests/signals/sigset-5.c
new file mode 100644
index 0000000000..1bcaeff80f
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigset-5.c
@@ -0,0 +1,70 @@
+#include <assert.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+#define NUMSIGNALS 26
+
+bool is_empty(sigset_t *set) {
+
+        int i;
+        int siglist[25] = {SIGABRT, SIGALRM, SIGBUS, SIGCHLD,
+                SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT,
+                SIGPIPE, SIGQUIT, SIGSEGV,
+                SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU,
+                SIGUSR1, SIGUSR2, SIGPROF, SIGSYS,
+                SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+        for (i=0; i<25; i++) {
+		if (sigismember(set, siglist[i]) != 0)
+			return false;
+        }
+        return true;
+}
+
+void sig_handler(int signo)
+{
+	printf("%d called. Inside handler\n", signo);
+}
+
+int sigset_test5(int signum)
+{
+	sigset_t mask;
+	sigemptyset(&mask);
+
+	sigprocmask(SIG_SETMASK, &mask, NULL);
+	void (*status) (int);
+
+	status = sigset(signum, sig_handler);
+	ERROR_IF(sigset, status, == SIG_ERR);
+	// if (sigset(signum, sig_handler) == SIG_ERR) {
+    //             perror("Unexpected error while using sigset()");
+    //            	exit(EXIT_FAILURE);
+    //     }
+
+	raise(signum);
+	sigprocmask(SIG_SETMASK, NULL, &mask);
+	bool status1 = is_empty(&mask);
+	assert(status1);
+	// if (is_empty(&mask) != 1) {
+	// 	printf("Test FAILED: signal mask should be empty\n");
+	// 	exit(EXIT_FAILURE);
+	// }
+    // printf("sig %d was successfully removed from the mask when handler returned\n", signum);
+	return EXIT_SUCCESS;
+} 
+
+int main(){
+    for (int i=1; i<N_SIGNALS; i++){
+        printf("Testing for sig %s (%d)\n", strsignal(i), i);
+		if (i == SIGKILL || i == SIGSTOP){
+			continue;
+		}
+		sigset_test5(i);
+	}
+	return 0;
+}
+
diff --git a/recipes/core/relibc/tests/signals/sigset-9.c b/recipes/core/relibc/tests/signals/sigset-9.c
new file mode 100644
index 0000000000..637c24505b
--- /dev/null
+++ b/recipes/core/relibc/tests/signals/sigset-9.c
@@ -0,0 +1,43 @@
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "signals_list.h"
+#include "../test_helpers.h"
+
+void sig_handler(int signo)
+{
+	(void) signo;
+	printf("SIGUSR1 called. Inside handler\n");
+}
+
+int sigset_test9(int signum)
+{
+	struct sigaction act;
+	act.sa_flags = 0;
+	act.sa_handler = sig_handler;
+	sigemptyset(&act.sa_mask);
+
+	if (sigaction(signum, &act, 0) != 0) {
+                perror("Unexpected error while using sigaction()");
+               	exit(EXIT_FAILURE);
+        }
+
+        if (sigset(signum,SIG_DFL) != sig_handler) {
+		printf("Test FAILED: sigset didn't return myhandler even though it was SIGUSR1's original disposition\n");
+               	exit(EXIT_FAILURE);
+        }
+    printf("test %d passed \n", signum);
+	return EXIT_SUCCESS;
+} 
+
+int main(){
+    for (int i=1; i<N_SIGNALS; i++){
+		if (i == SIGKILL || i == SIGSTOP){
+			continue;
+		}
+		sigset_test9(i);
+	}
+	return EXIT_SUCCESS;
+}
+
+
diff --git a/recipes/core/relibc/tests/sigqueue.c b/recipes/core/relibc/tests/sigqueue.c
new file mode 100644
index 0000000000..c69270f1c1
--- /dev/null
+++ b/recipes/core/relibc/tests/sigqueue.c
@@ -0,0 +1,157 @@
+#include <assert.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <stdio.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <limits.h>
+#include <errno.h>
+#include <sys/utsname.h>
+
+#include "test_helpers.h"
+
+#define THE_SIG SIGRTMIN
+
+volatile sig_atomic_t num = 0;
+
+int parent;
+
+void validate(int sig, const siginfo_t *info)
+{
+  assert(sig == THE_SIG);
+  assert(info != NULL);
+  assert(info->si_signo == THE_SIG);
+  assert(info->si_value.sival_int == num);
+  assert(info->si_code == SI_QUEUE);
+  assert(info->si_pid == parent);
+}
+
+void action(int sig, siginfo_t *info, void *context)
+{
+  (void)context;
+  assert(context != NULL);
+  validate(sig, info);
+  num++;
+}
+
+int main(void)
+{
+
+  int status, fds[2];
+
+  struct utsname utsname;
+
+  status = uname(&utsname);
+  if (status == 0) {
+    if (strncmp(utsname.sysname, "Linux", 6) == 0) {
+      printf("Test is not supported on Linux, relibc's siginfo_t is not compatible.\n");
+      return EXIT_SUCCESS;
+    }
+  }
+  status = pipe(fds);
+  ERROR_IF(pipe, status, == -1);
+
+  parent = getpid();
+  assert(parent != 0);
+
+  sigset_t set, mask;
+  status = sigfillset(&mask);
+  ERROR_IF(sigfillset, status, == -1);
+  status = sigdelset(&mask, SIGSEGV);
+  ERROR_IF(sigdelset, status, == -1);
+  status = sigdelset(&mask, SIGBUS);
+  ERROR_IF(sigdelset, status, == -1);
+  status = sigdelset(&mask, SIGILL);
+  ERROR_IF(sigdelset, status, == -1);
+  status = sigdelset(&mask, SIGFPE);
+  ERROR_IF(sigdelset, status, == -1);
+  status = sigdelset(&mask, SIGINT);
+  ERROR_IF(sigdelset, status, == -1);
+  status = sigprocmask(SIG_SETMASK, &mask, NULL);
+  ERROR_IF(sigprocmask, status, == -1);
+
+  status = sigemptyset(&set);
+  ERROR_IF(sigemptyset, status, == -1);
+  status = sigaddset(&set, THE_SIG);
+  ERROR_IF(sigaddset, status, == -1);
+
+  sigset_t empty_set;
+  status = sigemptyset(&empty_set);
+  ERROR_IF(sigemptyset, status, == -1);
+
+  int child = fork();
+  ERROR_IF(fork, child, == -1);
+
+  status = close(fds[child == 0 ? 0 : 1]);
+  ERROR_IF(close, status, == -1);
+
+  struct sigaction sa;
+  memcpy(&sa.sa_mask, &set, sizeof(sigset_t));
+  sa.sa_flags = SA_SIGINFO;
+  sa.sa_sigaction = action;
+
+  status = sigaction(THE_SIG, &sa, NULL);
+  ERROR_IF(sigaction, status, == -1);
+
+  if (child == 0)
+  {
+    assert(num == 0);
+    siginfo_t info;
+    struct timespec t = (struct timespec){.tv_sec = 1, .tv_nsec = 200000000};
+    status = sigtimedwait(&set, &info, &t);
+    ERROR_IF(sigtimedwait, status, == -1);
+    assert(status == THE_SIG);
+    validate(THE_SIG, &info);
+    assert(num == 0); // ensure no signal handler ran
+
+    num++;
+
+    // TODO: check status
+    status = sigsuspend(&empty_set);
+    if (status == -1)
+    {
+      UNEXP_IF(sigsuspend, errno, != EINTR);
+    }
+
+    assert(num == 2); // ensure signal handler ran
+
+    status = sigprocmask(SIG_SETMASK, &empty_set, NULL);
+    ERROR_IF(sigprocmask, status, == -1);
+
+    while (num < 31)
+    {
+    }
+
+    status = write(fds[1], "A", 1);
+    ERROR_IF(write, status, == -1);
+  }
+  else
+  {
+    struct timespec t = (struct timespec){.tv_sec = 0, .tv_nsec = 100000000};
+    status = nanosleep(&t, NULL);
+    ERROR_IF(nanosleep, status, < 0);
+
+    for (int n = 0; n <= 31; n++)
+    {
+      status = sigqueue(child, THE_SIG, (union sigval){.sival_int = n});
+      ERROR_IF(sigqueue, status, == -1);
+    }
+    char buf[1];
+    status = read(fds[0], buf, 1);
+    ERROR_IF(read, status, == -1);
+
+    pid_t wait_pid = 0;
+    int wait_status = 0;
+    wait_pid = wait(&wait_status);
+    ERROR_IF(wait, wait_pid, < 0);
+    UNEXP_IF(wait, wait_pid, != child);
+    if (!WIFEXITED(wait_status) || WEXITSTATUS(wait_status) != EXIT_SUCCESS)
+    {
+      fprintf(stderr, "Unexpected result, WIFEXITED %s, WEXITSTATUS %d\n",
+              WIFEXITED(wait_status) ? "true" : "false", WEXITSTATUS(wait_status));
+      return EXIT_FAILURE;
+    }
+  }
+
+  return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/sigsetjmp.c b/recipes/core/relibc/tests/sigsetjmp.c
new file mode 100644
index 0000000000..0063d21528
--- /dev/null
+++ b/recipes/core/relibc/tests/sigsetjmp.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+#include <setjmp.h>
+#include <signal.h>
+
+int main() {
+sigjmp_buf jb;
+
+if (sigsetjmp(jb, 1)) {
+printf("Jump done.\n");
+} else {
+printf ("Starting jump...\n");
+siglongjmp(jb, 1);
+}
+return 0;
+}
diff --git a/recipes/core/relibc/tests/src/main.rs b/recipes/core/relibc/tests/src/main.rs
new file mode 100644
index 0000000000..69f3024766
--- /dev/null
+++ b/recipes/core/relibc/tests/src/main.rs
@@ -0,0 +1,315 @@
+#![feature(exit_status_error)]
+
+use std::{
+    env, fs,
+    io::{self, Read, Write},
+    path::{Path, PathBuf},
+    process::{self, Command, ExitStatus, Stdio},
+    sync::mpsc,
+    thread,
+    time::{Duration, Instant},
+};
+
+fn find_expected_dir() -> Option<PathBuf> {
+    let mut current_dir = env::current_exe()
+        .ok()
+        .and_then(|p| p.parent().map(|parent| parent.to_path_buf()))
+        .unwrap_or_else(|| PathBuf::from("."));
+
+    let mut found_expected_dir = None;
+
+    while current_dir.pop() {
+        let check = current_dir.join("expected");
+        if check.is_dir() {
+            found_expected_dir = Some(check);
+            break;
+        }
+    }
+
+    if found_expected_dir.is_none() {
+        if let Ok(cwd) = env::current_dir() {
+            let check = cwd.join("expected");
+            if check.is_dir() {
+                found_expected_dir = Some(check);
+            }
+        }
+    }
+
+    found_expected_dir
+}
+
+fn expected(
+    expected_dir: &Path,
+    bin: &str,
+    kind: &str,
+    generated: &[u8],
+    status: ExitStatus,
+) -> Result<(), String> {
+    let expect_file = Path::new(bin).with_added_extension(kind);
+    let components: Vec<_> = expect_file
+        .components()
+        .filter_map(|c| c.as_os_str().to_str())
+        .rev()
+        .collect();
+
+    let mut expected_file = None;
+    for i in 0..components.len() {
+        let sub_path: Vec<_> = components[0..=i]
+            .iter()
+            .rev()
+            .map(|s| s.to_string())
+            .collect();
+
+        let check_file = expected_dir.join(sub_path.join("/"));
+        if check_file.is_file() {
+            expected_file = Some(fs::read(check_file));
+            break;
+        }
+    }
+
+    let expect_name = components.first().unwrap();
+    let expected = match expected_file {
+        Some(Ok(ok)) => ok,
+        Some(Err(err)) => {
+            return Err(format!("{} failed to read {}: {}", bin, expect_name, err));
+        }
+        None => {
+            if kind == "stderr" {
+                // missing stderr file, assume test expect none emitted
+                vec![]
+            } else {
+                return Err(format!("{} expected file not found: {}", bin, expect_name));
+            }
+        }
+    };
+
+    if expected != generated {
+        println!("# {}: {}: expected #", bin, kind);
+        io::stdout().write(&expected).unwrap();
+
+        println!("# {}: {}: generated #", bin, kind);
+        io::stdout().write(generated).unwrap();
+
+        return Err(format!(
+            "{} failed - retcode {}, {} mismatch",
+            bin, status, kind
+        ));
+    }
+
+    Ok(())
+}
+
+const STATUS_ONLY: &str = "-s";
+
+fn print_tabbed(output: Vec<u8>, name: &str) {
+    if let Ok(stdout) = String::from_utf8(output) {
+        let stdout: Vec<String> = stdout.trim().lines().map(|p| format!("  {}", p)).collect();
+        let stdout = stdout.join("\n");
+        if stdout.as_str() == "" {
+            println!("{name}: empty content");
+        } else {
+            println!("{name}:\n{}", stdout);
+        }
+    } else {
+        println!("can't print out {name}: not utf8");
+    }
+}
+
+#[cfg(target_os = "redox")]
+fn print_kernel_version() {
+    let Ok(uname) = fs::read_to_string("/scheme/sys/uname") else {
+        eprintln!("kernel version: unable to get one");
+        return;
+    };
+    eprintln!(
+        "kernel version: {}",
+        uname
+            .lines()
+            .last()
+            .map(|s| s.get(..8))
+            .flatten()
+            .unwrap_or("?")
+    );
+}
+
+fn main() {
+    let mut failures = Vec::new();
+    let timeout = Duration::from_secs(10);
+    let slowtime = Duration::from_secs(1);
+    let bins: Vec<String> = env::args().skip(1).collect();
+    let single_test = bins.len() == 1;
+    let expected_dir = find_expected_dir();
+
+    #[cfg(target_os = "redox")]
+    print_kernel_version();
+
+    for bin in bins {
+        let status_only = bin.starts_with(STATUS_ONLY);
+        let bin = if bin.starts_with(STATUS_ONLY) {
+            bin.strip_prefix(STATUS_ONLY).unwrap().to_string()
+        } else {
+            bin
+        };
+
+        println!("# {} #", bin);
+
+        let start_time = Instant::now();
+
+        let (tx, rx) = mpsc::channel();
+        let bin_for_spawn = bin.clone();
+
+        // There's an issue when pthread hangs, spawn() also hangs, so let's use separate thread to spawn
+        thread::spawn(move || {
+            let result = Command::new(&bin_for_spawn)
+                .arg("test")
+                .arg("args")
+                .stdout(Stdio::piped())
+                .stderr(Stdio::piped())
+                .spawn();
+            tx.send(result).expect("Can't send");
+        });
+
+        let mut status = None;
+        let mut child = None;
+
+        loop {
+            if start_time.elapsed() > timeout {
+                let failure = format!(
+                    "\x1b[0;91;49m{}: assumed hangs after {}ms\x1b[0m",
+                    bin,
+                    start_time.elapsed().as_millis()
+                );
+                println!("{}", failure);
+                failures.push(failure);
+                break;
+            }
+
+            if start_time.elapsed() > slowtime {
+                println!("# waiting {}ms", start_time.elapsed().as_millis());
+            }
+
+            let c = match &mut child {
+                Some(child) => child,
+                None => match rx.try_recv() {
+                    Ok(Ok(c)) => {
+                        child = Some(c);
+                        continue;
+                    }
+                    Ok(Err(err)) => {
+                        let failure = format!("{}: failed to execute: {}", bin, err);
+                        println!("{}", failure);
+                        failures.push(failure);
+                        break;
+                    }
+                    Err(mpsc::TryRecvError::Disconnected) => {
+                        let failure = format!("{}: failed to execute: thread died", bin);
+                        println!("{}", failure);
+                        failures.push(failure);
+                        break;
+                    }
+                    Err(mpsc::TryRecvError::Empty) => {
+                        thread::sleep(Duration::from_millis(if start_time.elapsed() < slowtime {
+                            25
+                        } else {
+                            500
+                        }));
+                        continue;
+                    }
+                },
+            };
+
+            match c.try_wait() {
+                Ok(Some(s)) => {
+                    status = Some(s);
+                    break;
+                }
+                Ok(None) => {
+                    thread::sleep(Duration::from_millis(if start_time.elapsed() < slowtime {
+                        25
+                    } else {
+                        500
+                    }));
+                }
+                Err(e) => {
+                    failures.push(format!("{}: error waiting: {}", bin, e));
+                    break;
+                }
+            }
+        }
+
+        match (status, child) {
+            (exit_status, Some(mut child)) => {
+                if exit_status.is_none() {
+                    match child.kill() {
+                        Ok(_) => {}
+                        Err(e) => {
+                            // if can't be killed then getting the output will hang
+                            println!("Unable to kill, can't get output: {:?}", e);
+                            continue;
+                        }
+                    }
+                }
+                let mut stdout = Vec::new();
+                let mut stderr = Vec::new();
+                child.stdout.unwrap().read_to_end(&mut stdout).unwrap();
+                child.stderr.unwrap().read_to_end(&mut stderr).unwrap();
+
+                let Some(exit_status) = exit_status else {
+                    // hangs
+                    print_tabbed(stdout, "stdout");
+                    print_tabbed(stderr, "stderr");
+                    continue;
+                };
+
+                if !status_only {
+                    let Some(expected_dir) = &expected_dir else {
+                        eprintln!("Expected directory not found");
+                        process::exit(1);
+                    };
+
+                    if let Err(failure) =
+                        expected(expected_dir, &bin, "stdout", &stdout, exit_status)
+                    {
+                        println!("{}", failure);
+                        failures.push(failure);
+                    }
+                    if let Err(failure) =
+                        expected(expected_dir, &bin, "stderr", &stderr, exit_status)
+                    {
+                        println!("{}", failure);
+                        failures.push(failure);
+                    }
+                }
+
+                if let Err(e) = exit_status.exit_ok() {
+                    let failure = format!("# {}: {}", bin, e);
+                    println!("{}", failure);
+                    failures.push(failure);
+                }
+
+                if single_test {
+                    print_tabbed(stdout, "stdout");
+                    print_tabbed(stderr, "stderr");
+                }
+            }
+            (_, _) => {
+                continue;
+            }
+        }
+
+        if start_time.elapsed() > slowtime {
+            println!(
+                "\x1b[0;93;49m  test exection took too long: {}ms\x1b[0m",
+                start_time.elapsed().as_millis()
+            );
+        }
+    }
+
+    if !failures.is_empty() {
+        println!("\x1b[1;91;49m# FAILURES #\x1b[0m");
+        for failure in failures {
+            println!("{}", failure);
+        }
+        process::exit(1);
+    }
+}
diff --git a/recipes/core/relibc/tests/stdio/all.c b/recipes/core/relibc/tests/stdio/all.c
new file mode 100644
index 0000000000..4807b584db
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/all.c
@@ -0,0 +1,29 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    FILE *f = fopen("stdio/stdio.in", "r");
+    ERROR_IF(fopen, f, == NULL);
+
+    int c = fgetc(f);
+    ERROR_IF(fgetc, c, == EOF);
+    UNEXP_IF(fgetc, c, < 0);
+    UNEXP_IF(fgetc, c, > 255);
+    printf("%c\n", c);
+
+    int u = ungetc('J', f);
+    ERROR_IF(ungetc, u, == EOF);
+
+    char in[30] = { 0 };
+    char *s = fgets(in, 30, f);
+    ERROR_IF(fgets, s, == NULL);
+    printf("%s\n", in);
+
+    __attribute__((unused)) int vb = setvbuf(stdout, 0, _IONBF, 0);
+    //ERROR_IF(setvbuf, vb, > 0); // TODO: Cannot use this, doesn't set errno
+    //UNEXP_IF(setvbuf, vb, != 0);
+
+    printf("Hello\n");
+}
diff --git a/recipes/core/relibc/tests/stdio/buffer.c b/recipes/core/relibc/tests/stdio/buffer.c
new file mode 100644
index 0000000000..69efe8ebac
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/buffer.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    // Tests what used to be a bug with buffering
+    fwrite("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 1, 999, stdout);
+    fwrite("Test\n", 1, 5, stdout);
+    fwrite("Hello\nWorld\n", 1, 12, stdout);
+    puts("It works");
+    puts("No buffering issues here");
+}
diff --git a/recipes/core/relibc/tests/stdio/ctermid.c b/recipes/core/relibc/tests/stdio/ctermid.c
new file mode 100644
index 0000000000..5a291cf607
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/ctermid.c
@@ -0,0 +1,22 @@
+#include <stdio.h>
+#include <string.h>
+
+#define DEVTTY "/dev/tty"
+
+int main(void)
+{
+    char *name = ctermid(NULL);
+    if(strcmp(name, DEVTTY) != 0) {
+        printf("ctermid name differs: expected %s, got: %s\n", DEVTTY, name);
+        return 1;
+    }
+
+    char name2[L_ctermid];
+    ctermid(name2);
+    if(strcmp(name, DEVTTY) != 0) {
+        printf("ctermid name2 differs: expected %s, got: %s\n", DEVTTY, name2);
+        return 1;
+    }
+
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/stdio/dprintf.c b/recipes/core/relibc/tests/stdio/dprintf.c
new file mode 100644
index 0000000000..b61d5cfa97
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/dprintf.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    const char *msg = "Hello, %s";
+
+    int fd = dup(STDOUT_FILENO);
+    ERROR_IF(dup, fd, == -1);
+
+    int result = dprintf(fd, msg, "world");
+    ERROR_IF(dprintf, result, != sizeof("Hello, world") - 1);
+    UNEXP_IF(dprintf, result, < 0);
+
+    result = dprintf(fd, "\na\n");
+    UNEXP_IF(dprintf, result, < 0);
+    ERROR_IF(dprintf, result, != sizeof("\na\n") - 1);
+
+    close(fd);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/stdio/fgets.c b/recipes/core/relibc/tests/stdio/fgets.c
new file mode 100644
index 0000000000..ed02999cde
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/fgets.c
@@ -0,0 +1,24 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    FILE *f = fopen("stdio/stdio.in", "r");
+    ERROR_IF(fopen, f, == NULL);
+
+    char line[256];
+
+    while (1) {
+        if (fgets(line, 256, f)) {
+            fputs(line, stdout);
+        } else {
+            puts("EOF");
+            if (!feof(f)) {
+                puts("feof() not updated!");
+                exit(EXIT_FAILURE);
+            }
+            break;
+        }
+    }
+}
diff --git a/recipes/core/relibc/tests/stdio/fputs.c b/recipes/core/relibc/tests/stdio/fputs.c
new file mode 100644
index 0000000000..e377bfe8db
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/fputs.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    FILE *f = fopen("stdio/fputs.out", "w");
+    ERROR_IF(fopen, f, == NULL);
+
+    char *in = "Hello World!";
+
+    int p = fputs(in, f);
+    ERROR_IF(fputs, p, == EOF);
+    UNEXP_IF(fputs, p, < 0);
+
+    int c = fclose(f);
+    ERROR_IF(fclose, c, == EOF);
+    UNEXP_IF(fclose, c, != 0);
+}
diff --git a/recipes/core/relibc/tests/stdio/fputs.out b/recipes/core/relibc/tests/stdio/fputs.out
new file mode 100644
index 0000000000..c57eff55eb
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/fputs.out
@@ -0,0 +1 @@
+Hello World!
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/stdio/fread.c b/recipes/core/relibc/tests/stdio/fread.c
new file mode 100644
index 0000000000..cc084d1cd4
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/fread.c
@@ -0,0 +1,29 @@
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    FILE *fp = fopen("stdio/fread.in", "rb");
+    ERROR_IF(fopen, fp, == NULL);
+
+    char buf[33] = { 0 };
+    for (int i = 1; i <= 32; ++i) {
+        size_t nread = fread(buf, 1, i, fp);
+        if (nread == 0) {
+            if (feof(fp)) {
+                fprintf(stderr, "early EOF\n");
+                return EXIT_FAILURE;
+            } else {
+                perror("fread");
+                return EXIT_FAILURE;
+            }
+        }
+        buf[i] = 0;
+
+        printf("%s\n", buf);
+    }
+
+    fclose(fp);
+}
diff --git a/recipes/core/relibc/tests/stdio/fread.in b/recipes/core/relibc/tests/stdio/fread.in
new file mode 100644
index 0000000000..94b32220d7
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/fread.in
@@ -0,0 +1 @@
+122333444455555666666777777788888888999999999AAAAAAAAAABBBBBBBBBBBCCCCCCCCCCCCDDDDDDDDDDDDDEEEEEEEEEEEEEEFFFFFFFFFFFFFFF0000000000000000111111111111111112222222222222222223333333333333333333444444444444444444445555555555555555555556666666666666666666666777777777777777777777778888888888888888888888889999999999999999999999999AAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000
diff --git a/recipes/core/relibc/tests/stdio/freopen.c b/recipes/core/relibc/tests/stdio/freopen.c
new file mode 100644
index 0000000000..f1415399bc
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/freopen.c
@@ -0,0 +1,39 @@
+#include <assert.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <wchar.h>
+
+#include "test_helpers.h"
+
+int test_reopen_opens_file(void) {
+    FILE *f = freopen("stdio/stdio.in", "r", stdin);
+    ERROR_IF(freopen, f, == NULL);
+
+    char in[6];
+    fgets(in, 6, stdin);
+    printf("%s\n", in); // should print Hello
+    fclose(f);
+    return 0;
+}
+
+int test_reopen_resets_orientation(void) {
+    FILE *f = freopen("stdio/stdio.in", "r", stdin);
+    assert(fwide(f, 0) == 0);
+    assert(fwide(f, -1) == -1);
+
+    f = freopen("stdio/stdio.in", "r", stdin);
+    assert(fwide(f, 0) == 0);
+
+    fclose(f);
+    return 0;
+}
+
+int main(void) {
+    int(*tests[])(void) = {
+        &test_reopen_opens_file,
+        &test_reopen_resets_orientation,
+    };
+    for(size_t i = 0; i < sizeof(tests) / sizeof(int(*)(void)); i++) {
+        printf("%d\n", (*tests[i])());
+    }
+}
diff --git a/recipes/core/relibc/tests/stdio/fscanf.c b/recipes/core/relibc/tests/stdio/fscanf.c
new file mode 100644
index 0000000000..01d4c9c03b
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/fscanf.c
@@ -0,0 +1,13 @@
+//@ 1 2 3
+//@ SS
+#include <stdio.h>
+int main() {
+    FILE *f = fopen("stdio/fscanf.c", "r");
+    int x, y, z;
+    fscanf(f, "//@ %d %d %d",&x , &y, &z);
+    printf("%d %d %d %ld\n", x, y, z, ftell(f));
+    while(-1 != fscanf(f, "%*[^\n]")) {
+        printf("%ld\n", ftell(f));
+        getc(f);
+    }
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/stdio/fscanf_offby1.c b/recipes/core/relibc/tests/stdio/fscanf_offby1.c
new file mode 100644
index 0000000000..c833935793
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/fscanf_offby1.c
@@ -0,0 +1,8 @@
+//1234 a
+#include <stdio.h>
+int main() {
+        FILE *f = fopen("stdio/fscanf_offby1.c", "r");
+        int x;
+        fscanf(f, "//%d", &x);
+        printf("%d, %ld, %d\n", x, ftell(f), fgetc(f));
+}
diff --git a/recipes/core/relibc/tests/stdio/fseek.c b/recipes/core/relibc/tests/stdio/fseek.c
new file mode 100644
index 0000000000..9b8bc1b046
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/fseek.c
@@ -0,0 +1,20 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    FILE *f = fopen("stdio/stdio.in", "r");
+    ERROR_IF(fopen, f, == NULL);
+
+    int status = fseek(f, 14, SEEK_CUR);
+    ERROR_IF(fseek, status, == -1);
+    UNEXP_IF(fseek, status, != 0);
+
+    char buffer[256];
+    printf("%s", fgets(buffer, 256, f));
+
+    off_t pos = ftello(f);
+    ERROR_IF(ftello, pos, == -1);
+    printf("ftello: %ld\n", pos);
+}
diff --git a/recipes/core/relibc/tests/stdio/fwrite.c b/recipes/core/relibc/tests/stdio/fwrite.c
new file mode 100644
index 0000000000..308c9c296a
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/fwrite.c
@@ -0,0 +1,27 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    FILE *f = fopen("stdio/fwrite.out", "w");
+    ERROR_IF(fopen, f, == NULL);
+
+    const char ptr[] = "Hello World!";
+
+    if (fwrite(ptr, 0, 17, f)) {
+        exit(EXIT_FAILURE);
+    }
+
+    if (fwrite(ptr, 7, 0, f)) {
+        exit(EXIT_FAILURE);
+    }
+
+    if (fwrite(ptr, 0, 0, f)) {
+        exit(EXIT_FAILURE);
+    }
+
+    fwrite(ptr, sizeof(ptr), 1, f);
+    fclose(f);
+}
diff --git a/recipes/core/relibc/tests/stdio/fwrite.out b/recipes/core/relibc/tests/stdio/fwrite.out
new file mode 100644
index 0000000000..3615520240
Binary files /dev/null and b/recipes/core/relibc/tests/stdio/fwrite.out differ
diff --git a/recipes/core/relibc/tests/stdio/getc_unget.c b/recipes/core/relibc/tests/stdio/getc_unget.c
new file mode 100644
index 0000000000..77351c40f1
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/getc_unget.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+	ungetc('h', stdin);
+	char c;
+	if ((c = getchar()) == 'h') {
+		printf("Worked!\n");
+		exit(EXIT_SUCCESS);
+	}
+	printf("failed :( %c\n", c);
+	exit(EXIT_FAILURE);
+}
diff --git a/recipes/core/relibc/tests/stdio/getline.c b/recipes/core/relibc/tests/stdio/getline.c
new file mode 100644
index 0000000000..87a0fabca6
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/getline.c
@@ -0,0 +1,168 @@
+// https://pubs.opengroup.org/onlinepubs/9699919799/functions/getline.html
+
+/// ssize_t getdelim(char **restrict lineptr, size_t *restrict n,
+///                  int delimiter, FILE *restrict stream);
+/// ssize_t getline(char **restrict lineptr, size_t *restrict n,
+///                 FILE *restrict stream);
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+const char   *INFILE_NAME   = "stdio/getline.in";
+const size_t INFILE_LINES   = 7;
+const size_t OVERREAD_LINES = 3;
+
+void test_null_args();
+
+void test_ferror();
+
+void test_read_and_overread();
+
+int main(void) {
+    setbuf(stdout, NULL);
+
+    // test if supplying NULL for either pointer correctly yields EINVAL
+    test_null_args();
+
+    // test reading stream with error flag set
+    test_ferror();
+
+    // "normal" case - read all `INFILE_LINES` lines of the test file and then overread by 3
+    test_read_and_overread();
+}
+
+void test_null_args() {
+
+
+    // Basics: NULL handling
+    // Test all combinations of NULL pointers since we fail on any one.
+    //
+    // I can't explicitly find that stream can't be NULL but nothing else
+    // makes sense, so let's return EINVAL
+#define TEST_FOR_EINVAL(x)                           \
+    do                                               \
+    {                                                \
+        size_t n = 0;                                \
+        char *lineptr = NULL;                        \
+        ssize_t status = 0;                          \
+        FILE *stream = NULL;                         \
+                                                     \
+        stream = fopen(INFILE_NAME, "r");            \
+        ERROR_IF(fopen, stream, == NULL);            \
+        ERROR_IF(fopen, ferror(stream), );           \
+                                                     \
+        status = x;                                  \
+        printf("%3zu: %s\n     => ", ++counter, #x); \
+        CHECK_AND_PRINT_ERRNO(EINVAL);               \
+        assert(status == -1 && errno == EINVAL);     \
+                                                     \
+        if (stream != NULL)                          \
+            fclose(stream);                          \
+        if (lineptr != NULL)                         \
+            free(lineptr);                           \
+        stream = NULL;                               \
+        errno = 0;                                   \
+        (void)n;                                     \
+    } while (0);
+
+        static size_t counter = 0;
+
+        TEST_FOR_EINVAL(getline(NULL, NULL, stream));
+
+        TEST_FOR_EINVAL(getline(NULL, &n, stream));
+        TEST_FOR_EINVAL(getline(&lineptr, NULL, stream));
+
+        // don't always use, as glibc doesn't tolerate stream being NULL or delim being out-of-range for char
+#ifdef _RELIBC_STDIO_H
+        TEST_FOR_EINVAL(getline(NULL, NULL, NULL));
+        TEST_FOR_EINVAL(getline(&lineptr, NULL, NULL));
+        TEST_FOR_EINVAL(getline(NULL, &n, NULL));
+        TEST_FOR_EINVAL(getline(&lineptr, &n, NULL));
+
+        // test if using delim out of char range correctly causes EINVAL
+        // POSIX specifies UB, so we try to be more helpful
+        TEST_FOR_EINVAL(getdelim(&lineptr, &n, 25600, stream));
+#endif
+
+#undef TEST_FOR_EINVAL
+    printf("\n");
+}
+
+void test_ferror() {
+    // TODO test behavior on error flag set
+}
+
+void test_read_and_overread() {
+    // Basic use cases
+    // Read all INFILE_LINES lines of sample input, then overread OVERREAD_LINES times
+
+    size_t  n        = 0;
+    char    *lineptr = NULL;
+    ssize_t status;
+    FILE    *stream  = NULL;
+
+    stream = fopen(INFILE_NAME, "r");
+
+    for (size_t i = 0; i < INFILE_LINES; ++i) {
+        /// "Upon successful completion, the getline() and getdelim() functions
+        /// shall return the number of bytes written into the buffer, including
+        /// the delimiter character if one was encountered before EOF, but
+        /// excluding the terminating NUL character."
+        printf("%3zu: ", i + 1);
+        status = getline(&lineptr, &n, stream);
+
+        /// "If the end-of-file indicator for the stream is set, or if no
+        /// characters were read and the stream is at end-of-file, the
+        /// end-of-file indicator for the stream shall be set and the function
+        /// shall return -1."
+        assert(!(status == -1 && feof(stream)));
+
+        /// "If an error occurs, the error indicator for the stream shall be
+        /// set, and the function shall return -1 and set errno to indicate the
+        /// error."
+        ERROR_IF(getline, status, == -1 && ferror(stream));
+
+        // This should only execute if the other error cases (with stream flags set) did not abort.
+        UNEXP_IF(getline, status, == -1);
+
+        // Print length and content to verify. Also test if the buffer is big
+        // enough and if strlen of input matches the return value.
+        // Although this doesn't HAVE to be true, as the input could contain
+        // NUL bytes, ours doesn't.
+        printf("status = %zi, strlen = %zu, feof = %s, ferror = %s\n     |>%s",
+               status, strlen(lineptr), feof(stream) ? "1" : "0", ferror(stream) ? "1" : "0", lineptr);
+        // fflush(stdout);
+
+        assert(strlen(lineptr) == (size_t) status); // we can cast to size_t since we
+        assert(n >= (size_t) status + 1);           // UNEXP_IF against status being -1
+    }
+    printf("\n");
+
+    // OVERREAD
+
+    for (size_t i = 0; i < OVERREAD_LINES; ++i) {
+        /// "If the end-of-file indicator for the stream is set, or if no
+        /// characters were read and the stream is at end-of-file, the
+        /// end-of-file indicator for the stream shall be set and the function
+        /// shall return -1."
+        status = getline(&lineptr, &n, stream);
+        printf("overread %zu, status = %zi, feof = %s, ferror = %s\n",
+                i + 1,
+                status,
+                feof(stream) ? "1" : "0", ferror(stream) ? "1" : "0");
+        if (i == 0) {
+            assert(status == -1);
+            assert(feof(stream));
+            assert(!ferror(stream));
+        }
+        printf("|~%s\n", lineptr);
+    }
+
+    // cleanup
+    fclose(stream);
+    free(lineptr);
+}
diff --git a/recipes/core/relibc/tests/stdio/getline.in b/recipes/core/relibc/tests/stdio/getline.in
new file mode 100644
index 0000000000..8399a9b4cb
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/getline.in
@@ -0,0 +1,7 @@
+Space: the final frontier.
+
+These are the voyages of the starship Enterprise.
+Its continuing mission:
+- to explore strange new worlds;
+- to seek out new life and new civilizations;
+- to boldly go where no one has gone before!
diff --git a/recipes/core/relibc/tests/stdio/mutex.c b/recipes/core/relibc/tests/stdio/mutex.c
new file mode 100644
index 0000000000..dc729d3c5f
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/mutex.c
@@ -0,0 +1,47 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+
+#include "test_helpers.h"
+
+FILE *f;
+
+void* thread_wontlock(void* arg) {
+    (void)arg;
+
+    int result = ftrylockfile(f);
+    UNEXP_IF(ftrylockfile, result, == 0);
+
+    return NULL;
+}
+
+void* thread_willlock(void* arg) {
+    (void)arg;
+
+    int result = ftrylockfile(f);
+    UNEXP_IF(ftrylockfile, result, != 0);
+
+    return NULL;
+}
+
+int main(void) {
+    f = fopen("stdio/stdio.in", "r");
+    ERROR_IF(fopen, f, == NULL);
+    flockfile(f);
+    flockfile(f);
+    thread_willlock(NULL);
+
+    pthread_t thread;
+    for (int i = 1; i <= 3; i++) {
+        pthread_create(&thread, NULL, thread_wontlock, NULL);
+        pthread_join(thread, NULL);
+        funlockfile(f);
+    }
+
+    pthread_create(&thread, NULL, thread_willlock, NULL);
+    pthread_join(thread, NULL);
+
+    // TODO: glibc refuses to quit test without this
+    //       but in relibc, it will result in EPERM
+    // funlockfile(f);
+}
diff --git a/recipes/core/relibc/tests/stdio/popen.c b/recipes/core/relibc/tests/stdio/popen.c
new file mode 100644
index 0000000000..0b9cc519bb
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/popen.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    FILE *fp = popen("ls -1 example_dir", "r");
+    ERROR_IF(popen, fp, == NULL);
+
+    int lineno = 0;
+    char path[256] = { 0 };
+    while (fgets(path, 256, fp) != NULL) {
+        lineno++;
+        printf("Line %d: %s", lineno, path);
+    }
+
+    int status = pclose(fp);
+    ERROR_IF(pclose, status, == -1);
+}
diff --git a/recipes/core/relibc/tests/stdio/printf.c b/recipes/core/relibc/tests/stdio/printf.c
new file mode 100644
index 0000000000..f794782793
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/printf.c
@@ -0,0 +1,108 @@
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h> // free()
+#include <math.h> // INFINITY, NAN constants
+
+int main(void) {
+    int sofar = 0;
+    int len = printf(
+        "percent: %%\nstring: %s\nchar: %c\nchar: %c\nint: %d\n%nuint: %u\nhex: %x\nHEX: %X\nstring: %s\n",
+        "String",
+        'c',
+        254,
+        -16,
+        &sofar,
+        32,
+        0xbeef,
+        0xC0FFEE,
+        "end"
+    );
+    printf("%%n returned %d, total len of write: %d\n", sofar, len);
+
+    puts("\nPadding madness:");
+    printf("% -5.3d %+3d\n", 1, 2);
+    printf("%4c\n", 'c');
+    printf("%#10.7x\n", 0xFF);
+    printf("%#4.3o\n", 01);
+    printf("%#x %#x\n", 0, 1);
+    printf("%.0d %.0d\n", 0, 1);
+    printf("(%05d) (%5d)\n", 123, 123);
+    printf("(%05d) (%5d)\n", -123, -123);
+    printf("(%13.0d)\n", 0);
+    printf("%p\n", (void*) 0xABCDEF);
+    printf("%p\n", (void*) 0);
+
+    puts("\nPositional madness:");
+    printf("%3$d %2$d %1$d\n", 2, 3, 4);
+    printf("%.*3$d\n", 2, 0, 5);
+    printf("|%-*6$.*5$s|%-*6$.*5$s|%*6$.*5$s|%*6$.*5$s|\n", "Fizz", "Buzz", "FizzBuzz", "TotalBuzz", 3, 8);
+    printf("int: %*6$d double: %lf %lf %lf %lf\n", 5, 0.1, 0.2, 0.3, 0.4, 10);
+    printf("%1$d %1$lf\n", 5, 0.1);
+    printf("%1$d %lf\n", 5, 0.2);
+    //printf("int: %*6$d no info on middle types\n", 5, 0.1, 0.2, 0.3, 0.4, 10);
+
+    puts("\nFloat madness:");
+    printf("%20e\n", 123.456789123);
+    printf("%20E\n", 0.00001);
+    printf("%20f\n", 123.456789123);
+    printf("%20F\n", 0.00001);
+    printf("%20e\n", -123.456789123);
+    printf("%020e\n", -123.456789123);
+    printf("%%.5g: %.5g\n", -123.456789123);
+    printf("%%.5f: %.5f\n", -123.456789123);
+    printf("%%.5e: %.5e\n", -123.456789123);
+    printf("%%.*g: %.*g\n", 2, -123.456789123);
+    printf("%%.*f: %.*f\n", 2, -123.456789123);
+    printf("%%.*e: %.*e\n", 2, -123.456789123);
+    printf("%%.*2$g: %.*2$g\n", -123.456789123, 5);
+    printf("%%.*2$f: %.*2$f\n", -123.456789123, 5);
+    printf("%%.*2$e: %.*2$e\n", -123.456789123, 5);
+
+    printf("%g\n", 100000.0);
+    printf("%g\n", 1000000.0);
+    printf("%e\n", 1000000.0);
+    printf("%G\n", 0.0001);
+    printf("%G\n", 0.00001);
+    printf("%E\n", 0.00001);
+
+    printf("%2$0*1$.*3$lf\n", 9, 1234.56, 2);
+    printf("%2$0*1$.*3$Lf\n", 9, 1234.56L, 2);
+
+    double nonfinites[] = {INFINITY, -INFINITY, NAN, -NAN};
+    char *float_formats[] = {"%e", "%E", "%f", "%F", "%g", "%G"};
+    puts("\nNon-finite float madness:");
+    for (size_t i = 0; i < sizeof(float_formats)/sizeof(char *); i++) {
+        printf("%s:", float_formats[i]);
+        for (size_t j = 0; j < sizeof(nonfinites)/sizeof(double); j++) {
+            printf(" ");
+            printf(float_formats[i], nonfinites[j]);
+        }
+        printf("\n");
+    }
+
+    puts("Things that have been buggy");
+    printf("%s%0*lu\n", "+", 2, 5l); // this format string was found in GDB
+
+    puts("Testing asprintf...");
+    char *s = NULL;
+    int res = asprintf(&s, "test string");
+    printf("printed: %s, value: %d\n", s, res);
+    free(s);
+    res = asprintf(&s, "test string %d", 2);
+    printf("printed: %s, value: %d\n", s, res);
+    free(s);
+    res = asprintf(&s, "test %s %d", "string", 2);
+    printf("printed: %s, value: %d\n", s, res);
+    free(s);
+
+    errno = EOWNERDEAD;
+    printf("\n%%m: %m\n");
+
+    puts("\nC23:");
+    printf("Binary %%b: %b\n", 4);
+    printf("Binary %%b alternate: %#b\n", 4);
+    printf("Binary %%B: %B\n", 4);
+    printf("Binary %%B alternate: %#B\n", 4);
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/stdio/printf_neg_pad.c b/recipes/core/relibc/tests/stdio/printf_neg_pad.c
new file mode 100644
index 0000000000..7f443034b9
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/printf_neg_pad.c
@@ -0,0 +1,5 @@
+#include <stdio.h>
+int main() {
+        printf ("A%*s%s/\n", 5, "B", "CC");
+        printf ("A%*s%s/\n", -5, "B", "CC");
+}
diff --git a/recipes/core/relibc/tests/stdio/printf_space_pad.c b/recipes/core/relibc/tests/stdio/printf_space_pad.c
new file mode 100644
index 0000000000..9e9172826d
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/printf_space_pad.c
@@ -0,0 +1,4 @@
+#include <stdio.h>
+int main() {
+  printf ("%s%*s\n","A", 3, "B");
+}
diff --git a/recipes/core/relibc/tests/stdio/putc_unlocked.c b/recipes/core/relibc/tests/stdio/putc_unlocked.c
new file mode 100644
index 0000000000..693bdafafe
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/putc_unlocked.c
@@ -0,0 +1,23 @@
+#include <assert.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void)
+{
+    FILE* fp = tmpfile();
+    assert(fp != NULL);
+    flockfile(fp);
+    int c = 'c', r = 0;
+    r = putc_unlocked(c, fp);
+    ERROR_IF(putc_unlocked, r, == EOF);
+    r = fflush(fp);
+    ERROR_IF(fflush, r, == EOF);
+    funlockfile(fp);
+    // make sure unlock works
+    r = putc(c, fp);
+    ERROR_IF(putc, r, == EOF);
+    r = fflush(fp);
+    ERROR_IF(fflush, r, == EOF);
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/stdio/rename.c b/recipes/core/relibc/tests/stdio/rename.c
new file mode 100644
index 0000000000..293a9fb302
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/rename.c
@@ -0,0 +1,139 @@
+#include <assert.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+static char oldpath[] = "old-name.out";
+static char newpath[] = "new-name.out";
+static char str[] = "Hello, World!";
+
+// Test that renaming a broken symbolic link works.
+// Symlinks should not be resolved by rename.
+// One of the problems that arises when links are resolved is that
+// broken links can't be renamed.
+//
+// This test returns EXIT_FAILURE/EXIT_SUCCESS because it needs to clean
+// up temporary files on failure. The test helpers call _exit.
+int rename_broken_symlink(void) {
+    int result = EXIT_FAILURE;
+
+    char dir_template[] = "/tmp/sltest.XXXXXX";
+    size_t dlen = sizeof(dir_template) - 1;
+    char* temp_dir = mkdtemp(dir_template);
+    if (!temp_dir) {
+        perror("mkdtemp");
+        return EXIT_FAILURE;
+    }
+
+    // TODO: Almost all of the code below can be vastly simplified
+    // with openat/symlinkat later.
+
+    // Broken link to be created
+    const char link_name[] = "sym";
+    char link_path[PATH_MAX] = {0};
+    memcpy(link_path, temp_dir, dlen);
+    link_path[dlen] = '/';
+    memcpy(&link_path[dlen + 1], link_name, sizeof(link_name));
+
+    // Non-existing target
+    const char link_target[] = "target";
+    char target_path[PATH_MAX] = {0};
+    memcpy(target_path, temp_dir, dlen);
+    target_path[dlen] = '/';
+    memcpy(&target_path[dlen + 1], link_target, sizeof(link_target));
+
+    // New name of link (i.e. mv sym symrename)
+    const char link_rename[] = "symrename";
+    char rename_path[PATH_MAX] = {0};
+    memcpy(rename_path, temp_dir, dlen);
+    rename_path[dlen] = '/';
+    memcpy(&rename_path[dlen + 1], link_rename, sizeof(link_rename));
+
+    // Target most definitely does NOT exist.
+    // This is a sanity check that shouldn't fail as test uses temp dirs.
+    int target_fd = open(target_path, O_RDONLY);
+    if (target_fd != -1) {
+        fprintf(stderr,
+                "Target exists when it shouldn't: %s\n",
+                target_path
+        );
+        // Skip clean up on the very exceptional case that the
+        // randomized dir and file exists.
+        goto skip_cleanup;
+    }
+
+    // Create a broken symlink in a temp directory
+    if (symlink(target_path, link_path) < 0) {
+        perror("symlink");
+        goto cleanup;
+    }
+
+    // Rename the link; this should work even if target doesn't exist
+    if (rename(link_path, rename_path) < 0) {
+        perror("rename");
+        goto cleanup;
+    }
+
+    // TODO: Assert paths exist (needs openat)
+
+    result = EXIT_SUCCESS;
+cleanup:
+    unlink(link_path);
+    unlink(rename_path);
+    rmdir(temp_dir);
+skip_cleanup:
+    return result;
+}
+
+int main(void) {
+    char buf[14] = { 0 };
+
+    // Create old file
+    int fd = creat(oldpath, 0777);
+    ERROR_IF(creat, fd, == -1);
+    UNEXP_IF(creat, fd, < 0);
+
+    int written_bytes = write(fd, str, strlen(str));
+    ERROR_IF(write, written_bytes, == -1);
+
+    int c1 = close(fd);
+    ERROR_IF(close, c1, == -1);
+    UNEXP_IF(close, c1, != 0);
+
+    // Rename old file to new file
+    int rn_status = rename(oldpath, newpath);
+    ERROR_IF(rename, rn_status, == -1);
+    UNEXP_IF(rename, rn_status, != 0);
+
+    // Read new file
+    fd = open(newpath, O_RDONLY);
+    ERROR_IF(open, fd, == -1);
+    UNEXP_IF(open, fd, < 0);
+
+    int read_bytes = read(fd, buf, strlen(str));
+    ERROR_IF(read, read_bytes, == -1);
+    UNEXP_IF(read, read_bytes, < 0);
+
+    int c2 = close(fd);
+    ERROR_IF(close, c2, == -1);
+    UNEXP_IF(close, c2, != 0);
+
+    // Remove new file
+    int rm_status = remove(newpath);
+    ERROR_IF(remove, rm_status, == -1);
+    UNEXP_IF(remove, rm_status, != 0);
+
+    // Compare file contents
+    if (strcmp(str, buf) != 0) {
+        puts("Comparison failed!");
+        exit(EXIT_FAILURE);
+    }
+
+    int broken_symlink_res = rename_broken_symlink();
+    assert(broken_symlink_res == EXIT_SUCCESS);
+}
diff --git a/recipes/core/relibc/tests/stdio/renameat.c b/recipes/core/relibc/tests/stdio/renameat.c
new file mode 100644
index 0000000000..9fba5fc762
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/renameat.c
@@ -0,0 +1,225 @@
+#include <fcntl.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static int temp_file(
+    const char dir[],
+    size_t dlen,
+    char buf[PATH_MAX],
+    const char name[],
+    size_t nlen,
+    bool create
+) {
+    memcpy(buf, dir, dlen);
+    buf[dlen] = '/';
+    memcpy(&buf[dlen + 1], name, nlen);
+
+    if (create) {
+        int fd = open(buf, O_CREAT);
+        if (fd == -1) {
+            perror("open (file A)");
+            close(fd);
+            return -1;
+        }
+        close(fd);
+    }
+
+    return 0;
+}
+
+int main(void) {
+    int result = EXIT_FAILURE;
+
+    char dir_template[] = "/tmp/mvattest.XXXXXX";
+    size_t dlen = sizeof(dir_template) - 1;
+    if (!mkdtemp(dir_template)) {
+        perror("mkdtemp");
+        goto bye;
+    }
+    int dirfd = open(dir_template, O_DIRECTORY | O_PATH);
+    if (dirfd == -1) {
+        perror("open (temp directory)");
+        goto bye;
+    }
+
+    char dir_template2[] = "/tmp/mvattest2.XXXXXX";
+    size_t dlen2 = sizeof(dir_template2) - 1;
+    if (!mkdtemp(dir_template2)) {
+        perror("mkdtemp");
+        goto close_dir1;
+    }
+    int dirfd2 = open(dir_template2, O_DIRECTORY | O_PATH);
+    if (dirfd2 == -1) {
+        perror("open (temp directory)");
+        goto close_dir1;
+    }
+
+    // File A
+    const char file_a[] = "power";
+    char file_a_path[PATH_MAX] = {0};
+    if (temp_file(dir_template, dlen, file_a_path, file_a, sizeof(file_a), true) == -1) {
+        goto close_dir2;
+    }
+    
+    // File B
+    const char file_b[] = "nyanko";
+    char file_b_path[PATH_MAX] = {0};
+    if (
+        temp_file(
+            dir_template,
+            dlen,
+            file_b_path,
+            file_b,
+            sizeof(file_b),
+            false
+        ) == -1
+    ) {
+        goto remove_ab;
+    }
+
+    // File A but in directory 2
+    char file_a_dir2[PATH_MAX] = {0};
+    if (
+        temp_file(
+            dir_template2,
+            dlen2,
+            file_a_dir2,
+            file_a,
+            sizeof(file_a),
+            false
+        ) == -1
+    ) {
+        goto remove_all;
+    }
+
+    // Move file A to file B normally (same dir)
+    if (renameat(dirfd, file_a, dirfd, file_b) == -1) {
+        perror("renameat (A -> B, basic)");
+        goto remove_all;
+    }
+    if (access(file_b_path, F_OK) == -1) {
+        perror("access (file B, basic)");
+        goto remove_all;
+    }
+
+    // Move file B to A (absolute path; same dir)
+    if (renameat(dirfd, file_b_path, dirfd, file_a) == -1) {
+        perror("renameat (B -> A, absolute path)");
+        goto remove_all;
+    }
+    if (access(file_a_path, F_OK) == -1) {
+        perror("access (file A, absolute path)");
+        goto remove_all;
+    }
+
+    // Move A to B (both absolute)
+    if (renameat(dirfd, file_a_path, dirfd, file_b_path) == -1) {
+        perror("renameat (A -> B, both absolute)");
+        goto remove_all;
+    }
+    if (access(file_b_path, F_OK) == -1) {
+        perror("access (file B, both absolute)");
+        goto remove_all;
+    }
+
+    // Move B to B
+    if (renameat(dirfd, file_b, dirfd, file_b) == -1) {
+        perror("renameat (B -> B)");
+        goto remove_all;
+    }
+    if (access(file_b_path, F_OK) == -1) {
+        perror("access (file B)");
+        goto remove_all;
+    }
+
+    // Move file B to A (AT_FDCWD)
+    char cwd[PATH_MAX] = {0};
+    if (!getcwd(cwd, PATH_MAX)) {
+        perror("getcwd");
+        goto remove_all;
+    }
+    if (chdir(dir_template) == -1) {
+        perror("chdir");
+        goto remove_all;
+    }
+
+    if (renameat(AT_FDCWD, file_b, dirfd, file_a) == -1) {
+        perror("renameat (B -> A, AT_FDCWD)");
+        goto remove_all;
+    }
+    if (access(file_a_path, F_OK) == -1) {
+        perror("access (file A, AT_FDCWD)");
+        goto remove_all;
+    }
+
+    // Reset, though it doesn't really matter.
+    if (chdir(cwd) == -1) {
+        perror("chdir");
+        goto remove_all;
+    }
+
+    // Move to different directory
+    if (renameat(dirfd, file_a, dirfd2, file_a) == -1) {
+        perror("renameat (A -> B, different dirs)");
+        goto remove_all;
+    }
+    if (access(file_a_dir2, F_OK) == -1) {
+        perror("access (file A in dir2)");
+        goto remove_all;
+    }
+
+    // Move non-existing file
+    if (renameat(dirfd, "aki", dirfd, "denji") == 0) {
+        // Wut?
+        fputs("renameat succeeded at moving a non-existing file\n", stderr);
+        goto remove_all;
+    }
+
+    // RENAME_NOREPLACE
+    // Create file B in dir 1 first because we moved it earlier.
+    int fd = open(file_b_path, O_CREAT);
+    if (fd == -1) {
+        perror("open (file B in dir 1)");
+        close(fd);
+        goto remove_all;
+    }
+    close(fd);
+
+    if (renameat2(dirfd, file_b, dirfd2, file_a, RENAME_NOREPLACE) == 0) {
+        fputs("renameat2 (B -> A, noreplace) succeeded\n", stderr);
+        goto remove_all;
+    }
+    if (access(file_a_dir2, F_OK) == -1) {
+        fputs("RENAME_NOREPLACE ate file A in dir 2\n", stderr);
+        goto remove_all;
+    }
+    if (access(file_b_path, F_OK) == -1) {
+        fputs("RENAME_NOREPLACE ate file B in dir 1\n", stderr);
+        goto remove_all;
+    }
+
+    // TODO: RENAME_EXCHANGE (Needs frename support in Redox)
+    // Notes for later:
+    // * Write a message to both files
+    // * Swap
+    // * Check if the files swapped correctly by strcmp messages
+
+    result = EXIT_SUCCESS;
+remove_all:
+    remove(file_a_dir2);
+remove_ab:
+    remove(file_a_path);
+    remove(file_b_path);
+    rmdir(dir_template);
+    rmdir(dir_template2);
+close_dir2:
+    close(dirfd2);
+close_dir1:
+    close(dirfd);
+bye:
+    return result;
+}
diff --git a/recipes/core/relibc/tests/stdio/scanf.c b/recipes/core/relibc/tests/stdio/scanf.c
new file mode 100644
index 0000000000..6a02557383
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/scanf.c
@@ -0,0 +1,83 @@
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+struct params {
+    short sa;
+    int ia;
+    int ib;
+    int ic;
+    float fa;
+    double da;
+    int *ptr;
+    char c;
+    char string1[20];
+    char string2[20];
+    char string3[20];
+    char string4[20];
+};
+
+void test(char* fmt_in, char* input, struct params *p, ...) {
+    va_list args;
+    va_start(args, p);
+    int ret = vsscanf(input, fmt_in, args);
+    va_end(args);
+
+    printf(
+        "%d, { sa: %hhd, ia: %d, ib: %d, ic: %d, fa: %f, da: %lf, ptr: %p, char: %c, string1: %s, string2: %s, string3: %s, string4: %s }\n",
+        ret, p->sa, p->ia, p->ib, p->ic, p->fa, p->da, p->ptr, p->c, p->string1, p->string2, p->string3, p->string4
+    );
+}
+
+int main(void) {
+    struct params p = { .c = 'a' };
+
+    test("%hd %d", "12 345", &p, &p.sa, &p.ia);
+    test("%x %i %i", "12 0x345 010", &p, &p.ia, &p.ib, &p.ic);
+    test("%f.%lf", "0.1.0.2", &p, &p.fa, &p.da);
+    test("%p", "0xABCDEF", &p, &p.ptr);
+    test("%s", "Hello World", &p, &p.string1);
+    test("%3i", "0xFF", &p, &p.ia);
+    test("%c%3c", "hello", &p, &p.c, &p.string1);
+    test("test: %2i%n", "test: 0xFF", &p, &p.ia, &p.ib);
+    test("hello world%%", "hello world%", &p);
+    test("hello %5ls %d", "hello world 42", &p, &p.string1, &p.ia);
+    test("bye %ls %d", "bye planet 84", &p, &p.string2, &p.ia);
+    test("h%1[ae]ll%1[^a] wor%1[^\n]%[d]", "hello world", &p, &p.string1, &p.string2, &p.string3, &p.string4);
+    test("h%1[ae]ll%1[^a] wor%1[^\n]%[d]", "halle worfdddddd", &p, &p.string1, &p.string2, &p.string3, &p.string4);
+    test("h%1[ae]ll%1[^a] wor%1[^\n]%[d]", "halle worfdddddd", &p, &p.string1, &p.string2, &p.string3, &p.string4);
+    test("%[^a]%[b]", "testbbbb", &p, &p.string1, &p.string2);
+
+
+    // Scanf stolen from the url parsing in curl
+    char protobuf[16];
+    char slashbuf[4];
+    char hostbuf[100];
+    char pathbuf[100];
+
+    // don't push NUL, make sure scanf does that
+    memset(protobuf, 97, 16);
+    memset(slashbuf, 97, 4);
+    memset(hostbuf, 97, 100);
+    memset(pathbuf, 97, 100);
+
+    int ret = sscanf(
+        "https://redox-os.org\0# extra garbage for nul test", "%15[^\n/:]:%3[/]%[^\n/?#]%[^\n]",
+        &protobuf, &slashbuf, &hostbuf, &pathbuf
+    );
+    if (ret < 4) {
+        *pathbuf = 0;
+    }
+    if (ret < 3) {
+        *hostbuf = 0;
+    }
+    if (ret < 2) {
+        *slashbuf = 0;
+    }
+    if (ret < 1) {
+        *protobuf = 0;
+    }
+
+    printf("%d \"%s\" \"%s\" \"%s\" \"%s\"\n", ret, &protobuf, &slashbuf, &hostbuf, &pathbuf);
+}
diff --git a/recipes/core/relibc/tests/stdio/setvbuf.c b/recipes/core/relibc/tests/stdio/setvbuf.c
new file mode 100644
index 0000000000..2e79590aba
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/setvbuf.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+	setvbuf(stdout, 0, _IONBF, 0);
+	FILE *f = fopen("stdio/stdio.in", "r");
+	setvbuf(f, 0, _IONBF, 0);
+	printf("%c\n", fgetc(f));
+	ungetc('H', f);
+	char *in = malloc(30);
+	printf("%s\n", fgets(in, 30, f));
+	printf("Hello\n");
+}
diff --git a/recipes/core/relibc/tests/stdio/sprintf.c b/recipes/core/relibc/tests/stdio/sprintf.c
new file mode 100644
index 0000000000..0c29fe291b
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/sprintf.c
@@ -0,0 +1,34 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char buffer[72];
+
+    int ret = sprintf(
+        buffer,
+        "This string fits in the buffer because it is only %d bytes in length",
+        68
+    );
+    if (ret != 68) {
+        printf("Failed! Return value was %d\n", ret);
+        exit(EXIT_FAILURE);
+    }
+
+    memset(buffer, 0, sizeof(buffer));
+
+    ret = snprintf(
+        buffer,
+        10,
+        "This string is way longer and does not fit in the buffer because it %d bytes in length",
+        86
+    );
+    if (ret != 86) {
+        printf("Failed! Return value was %d\n", ret);
+        exit(EXIT_FAILURE);
+    }
+
+    puts(buffer);
+}
diff --git a/recipes/core/relibc/tests/stdio/stdio.in b/recipes/core/relibc/tests/stdio/stdio.in
new file mode 100644
index 0000000000..e4d4901390
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/stdio.in
@@ -0,0 +1,30 @@
+Hello World!
+
+Line 2
+
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
+hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
+qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
+rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
+uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
+vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
+zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
diff --git a/recipes/core/relibc/tests/stdio/tempnam.c b/recipes/core/relibc/tests/stdio/tempnam.c
new file mode 100644
index 0000000000..8fd7edf6d0
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/tempnam.c
@@ -0,0 +1,127 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+static void test_prefix(const char *prefix);
+static void test_dir(const char *dir);
+static void test_dir_and_prefix(const char *dir, const char *prefix);
+
+int main(void) {
+    char *first_null = tempnam(NULL, NULL);
+    if(first_null == NULL) {
+	// NOTE: assuming that we can at least get one file name
+	puts("tempnam(NULL, NULL) returned NULL on first try");
+	exit(EXIT_FAILURE);
+    }
+    printf("%s\n", first_null);
+
+    char *second_null = tempnam(NULL, NULL);
+    if(second_null == NULL) {
+	// NOTE: assuming that we can at least get one file name
+	puts("tempnam(NULL, NULL) returned NULL on second try");
+	free(first_null);
+	exit(EXIT_FAILURE);
+    }
+    printf("%s\n", second_null);
+
+    free(first_null);
+    free(second_null);
+
+    if(first_null == second_null) {
+	puts("tempnam(NULL, NULL) returns the same address");
+	exit(EXIT_FAILURE);
+    }
+
+    // Ensure the "prefix" argument works
+    test_prefix("this_is_a_test_prefix");
+    test_prefix("exact");
+    test_prefix("hi");
+    test_prefix("");
+
+    // Ensure the "dir" argument works
+
+    // NOTE: needed because TMPDIR is the first directory checked
+    unsetenv("TMPDIR");
+
+    test_dir("/tmp");
+    test_dir("");
+    // NOTE: assumes /root is NOT writable
+    test_dir("/root");
+
+    // Ensure "prefix" and "dir" work together
+    test_dir_and_prefix("/tmp", "this_is_a_prefix");
+    test_dir_and_prefix("/tmp", "exact");
+    test_dir_and_prefix("/root", "exact");
+    test_dir_and_prefix("/root", "long_prefix");
+    test_dir_and_prefix("", "prefix");
+    test_dir_and_prefix("/tmp", "test");
+
+    return 0;
+}
+
+static void test_prefix(const char *prefix) {
+    test_dir_and_prefix(NULL, prefix);
+}
+
+static void test_dir(const char *dir) {
+    test_dir_and_prefix(dir, NULL);
+}
+
+static void test_dir_and_prefix(const char *dir, const char *prefix) {
+    char funcbuf[256];
+    if(dir && prefix) {
+        snprintf(funcbuf, sizeof(funcbuf), "tempnam(\"%s\", \"%s\")", dir, prefix);
+    } else if(dir) {
+        snprintf(funcbuf, sizeof(funcbuf), "tempnam(\"%s\", NULL)", dir);
+    } else if(prefix) {
+        snprintf(funcbuf, sizeof(funcbuf), "tempnam(NULL, \"%s\")", prefix);
+    } else {
+        strcpy(funcbuf, "tempnam(NULL, NULL)");
+    }
+
+    char *result = tempnam(dir, prefix);
+    if(!result) {
+        printf("%s failed\n", funcbuf);
+        exit(EXIT_FAILURE);
+    }
+    printf("%s\n", result);
+
+    if(prefix) {
+        char buf[7] = { '/' };
+        strncpy(&buf[1], prefix, sizeof(buf) - 2);
+        buf[6] = 0;
+
+        char *prev = NULL;
+        char *substr = result;
+        do {
+            prev = substr;
+            substr = strstr(&substr[1], buf);
+        } while(substr);
+        substr = prev;
+
+        if(!substr) {
+            printf("%s did not add the full (5 bytes at most) prefix\n", funcbuf);
+            free(result);
+            exit(EXIT_FAILURE);
+        } else if(strlen(substr) != strlen(&buf[1]) + L_tmpnam) {
+            printf("%s has the wrong length\n", funcbuf);
+            free(result);
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    if(dir) {
+        char *substr = strstr(result, dir);
+        char *other_substr = strstr(result, P_tmpdir);
+        if(!substr && !other_substr) {
+            printf("%s is in an unexpected directory\n", funcbuf);
+            free(result);
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    free(result);
+}
+
diff --git a/recipes/core/relibc/tests/stdio/tmpnam.c b/recipes/core/relibc/tests/stdio/tmpnam.c
new file mode 100644
index 0000000000..02c07d6724
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/tmpnam.c
@@ -0,0 +1,41 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char *first_null = tmpnam(NULL);
+    if(first_null == NULL) {
+	// NOTE: assuming that we can at least get one file name
+	puts("tmpnam(NULL) returned NULL on first try");
+	exit(EXIT_FAILURE);
+    }
+    printf("%s\n", first_null);
+
+    char *second_null = tmpnam(NULL);
+    if(second_null == NULL) {
+	// NOTE: assuming that we can at least get one file name
+	puts("tmpnam(NULL) returned NULL on second try");
+	exit(EXIT_FAILURE);
+    }
+    printf("%s\n", second_null);
+
+    if(first_null != second_null) {
+	puts("tmpnam(NULL) returns different addresses");
+	exit(EXIT_FAILURE);
+    }
+
+    char buffer[L_tmpnam + 1];
+    char *buf_result = tmpnam(buffer);
+    if(buf_result == NULL) {
+	puts("tmpnam(buffer) failed");
+	exit(EXIT_FAILURE);
+    } else if(buf_result != buffer) {
+	puts("tmpnam(buffer) did not return buffer's address");
+	exit(EXIT_FAILURE);
+    }
+    printf("%s\n", buffer);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/stdio/ungetc_ftell.c b/recipes/core/relibc/tests/stdio/ungetc_ftell.c
new file mode 100644
index 0000000000..10be6a3057
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/ungetc_ftell.c
@@ -0,0 +1,37 @@
+#include <stdio.h>
+int main() {
+	FILE *f = fopen("stdio/ungetc_ftell.c", "r");
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	ungetc('\n', f);ungetc('d', f);
+	ungetc('l', f);	ungetc('r', f);
+	ungetc('o', f);	ungetc('w', f);
+	ungetc(' ', f);	ungetc('o', f);
+	ungetc('l', f);	ungetc('l', f);
+	ungetc('e', f);	ungetc('h', f);
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+	printf("%c, %ld\n", getc(f), ftell(f));
+}
diff --git a/recipes/core/relibc/tests/stdio/ungetc_multiple.c b/recipes/core/relibc/tests/stdio/ungetc_multiple.c
new file mode 100644
index 0000000000..611430489a
--- /dev/null
+++ b/recipes/core/relibc/tests/stdio/ungetc_multiple.c
@@ -0,0 +1,27 @@
+#include <stdio.h>
+int main() {
+  ungetc('\n', stdin);
+  ungetc('d', stdin);
+  ungetc('l', stdin);
+  ungetc('r', stdin);
+  ungetc('o', stdin);
+  ungetc('w', stdin);
+  ungetc(' ', stdin);
+  ungetc('o', stdin);
+  ungetc('l', stdin);
+  ungetc('l', stdin);
+  ungetc('e', stdin);
+  ungetc('h', stdin);
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+  putchar(getchar());
+}
diff --git a/recipes/core/relibc/tests/stdlib/a64l.c b/recipes/core/relibc/tests/stdlib/a64l.c
new file mode 100644
index 0000000000..2696c34664
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/a64l.c
@@ -0,0 +1,53 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char * s = "azAZ9."; // test boundaries
+    long l = a64l(s);
+    if (l != 194301926) {
+        printf("Invalid result: a64l(%s) = %ld\n", s, l);
+        exit(EXIT_FAILURE);
+    }
+    printf("Correct a64l: %s = %ld\n", s, l);
+
+    
+    s = "azA"; // test null terminated string
+    l = a64l(s);
+    if (l != 53222) {
+        printf("Invalid result: a64l(%s) = %ld\n", s, l);
+        exit(EXIT_FAILURE);
+    }
+    printf("Correct a64l: %s = %ld\n", s, l);
+    
+    /* Test near boundaries of digit character mapping, and near
+     * boundaries for number of digits */
+    long l64a_test_values[] = {0, 1, 2, 11, 12, 37, \
+        38, 63, \
+        64, 65, 4095, \
+        4096, 262143, \
+        262144, 16777215, \
+        16777216, 1073741823, \
+        1073741824, 2147483647};
+    
+    // l64a tests
+    for (size_t i = 0; i < sizeof(l64a_test_values)/sizeof(long); i++) {
+        printf("l64a(%ld): %s\n", l64a_test_values[i], l64a(l64a_test_values[i]));
+    }
+    
+    // a64l(l64a(x)) round-trip tests
+    for (size_t i = 0; i < sizeof(l64a_test_values)/sizeof(long); i++) {
+        printf("a64l(l64a(%ld)): %ld\n", l64a_test_values[i], a64l(l64a(l64a_test_values[i])));
+    }
+    
+    /* For testing 32-bit truncation behavior (for platforms where long
+     * is larger than 32 bits). Note that the behavior for a64l() and
+     * l64a() is unspecified for negative values. */
+    int64_t test_value_64bit = 0x7edcba9876543210;
+    printf("l64a(x) (lower 32 bits of x are %ld): %s\n", ((long)test_value_64bit) & 0xffffffff, l64a((long)test_value_64bit));
+    
+    /* Test for trunctation in l64a(a64(x)) round trip (POSIX says the
+     * result of that is "x in the low-order 32-bits". */
+    printf("a64l(l64a(x)) (lower 32 bits of x are %ld): %ld\n", ((long)test_value_64bit) & 0xffffffff, a64l(l64a((long)test_value_64bit)));
+}
diff --git a/recipes/core/relibc/tests/stdlib/alloc.c b/recipes/core/relibc/tests/stdlib/alloc.c
new file mode 100644
index 0000000000..2e51c144c6
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/alloc.c
@@ -0,0 +1,341 @@
+#include <malloc.h> /* for pvalloc() */
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h> /* for size_t */
+#include <stdint.h> /* for SIZE_MAX */
+#include <string.h> /* for strerror() */
+#include <unistd.h> /* for sysconf() */
+
+#include "test_helpers.h"
+
+/* For regular allocations that should succeed without particular
+ * alignment requirements. */
+void test_non_null(void *ptr, int error_val) {
+    if (ptr != NULL) {
+        // Constant output for successful case
+        printf("pointer: (not NULL), ");
+    }
+    else {
+        printf("pointer: %p, ", ptr);
+    }
+    printf("error value: %d = %s\n",
+        error_val, strerror(error_val));
+}
+
+/* For testing functions that should return pointers with a particular
+ * alignment (successful case). */
+void test_valid_aligned(void *ptr, size_t alignment, int error_val) {
+    /* Cast to uintptr_t to allow taking modulo of address. The
+     * uintptr_t type is guaranteed to be able to hold any valid object
+     * address. */
+    uintptr_t ptr_alignment_rem = (uintptr_t)ptr % (uintptr_t)alignment;
+    
+    if (ptr != NULL && ptr_alignment_rem == 0) {
+        // Constant output for successful case
+        printf("pointer: (alignment OK), ");
+    }
+    else {
+        printf("pointer: %p, ", ptr);
+    }
+    printf("error value: %d = %s\n",
+        error_val, strerror(error_val));
+}
+
+/* For testing functions that should return pointers with a particular
+ * alignment. With invalid alignment, we expect constant output (a NULL
+ * pointer and EINVAL). */
+void test_invalid_aligned(void *ptr, int error_val) {
+    printf("pointer: %p, error value: %d = %s\n",
+        ptr, error_val, strerror(error_val));
+}
+
+/* For testing size-0 allocation requests. */
+void test_size_zero(void *ptr, size_t alignment, int error_val) {
+    /* Facilitates checking alignment upon non-NULL return */
+    uintptr_t ptr_alignment_rem = (uintptr_t)ptr % (uintptr_t)alignment;
+    
+    /* For allocation functions, POSIX permits returning either a NULL
+     * pointer and optionally an implementation-defined error value, or
+     * succeeding with a non-NULL pointer. */
+    if (ptr == NULL || (ptr_alignment_rem == 0 && error_val == 0)) {
+        // Constant output for successful case
+        printf("(OK)\n");
+    }
+    else {
+        printf("pointer: %p, error value: %d = %s\n",
+        ptr, error_val, strerror(error_val));
+    }
+}
+
+/* For cases where we expect allocation to fail, returning a NULL
+ * pointer and indicating ENOMEM. */
+void test_cannot_alloc(void *ptr, int error_val) {
+    printf("pointer: %p, error value: %d = %s\n",
+        ptr, error_val, strerror(error_val));
+}
+
+int main(void) {
+    size_t sample_alloc_size = 256;
+    size_t sample_realloc_size = sample_alloc_size + 1;
+    
+    /* ensure values are mapped to variables */
+    size_t zero_size = 0;
+    size_t max_size = SIZE_MAX;
+    size_t page_size = (size_t)sysconf(_SC_PAGESIZE);
+    size_t aligned_alloc_alignment = 128;
+    size_t aligned_alloc_goodsize = 256;
+    size_t aligned_alloc_badsize = 257;
+    size_t nonpow2_mul_voidptr_size = 3*sizeof(void *);
+    size_t pow2_mul_voidptr_size = 4*sizeof(void *);
+    
+    size_t i;
+    
+    errno = 0;
+    char * ptr_zerosize_malloc = (char *)malloc(zero_size);
+    int malloc_zerosize_errno = errno;
+    printf("malloc (size 0): ");
+    test_size_zero(ptr_zerosize_malloc, 1, malloc_zerosize_errno);
+    free(ptr_zerosize_malloc);
+    
+    errno = 0;
+    char * ptr_malloc = (char *)malloc(sample_alloc_size);
+    int malloc_errno = errno;
+    printf("malloc: ");
+    test_non_null(ptr_malloc, malloc_errno);
+    for(i = 0; i < sample_alloc_size; i++) {
+        ptr_malloc[i] = (char)i;
+    }
+    free(ptr_malloc);
+    
+    errno = 0;
+    char * ptr_malloc_maxsize = (char *)malloc(max_size);
+    int malloc_maxsize_errno = errno;
+    printf("malloc (SIZE_MAX): ");
+    test_cannot_alloc(ptr_malloc_maxsize, malloc_maxsize_errno);
+    free(ptr_malloc_maxsize);
+    
+    errno = 0;
+    char * ptr_zerosize_calloc = (char *)calloc(zero_size, 1);
+    int calloc_zerosize_errno = errno;
+    printf("calloc (size 0): ");
+    test_size_zero(ptr_zerosize_calloc, 1, calloc_zerosize_errno);
+    free(ptr_zerosize_calloc);
+    
+    errno = 0;
+    char * ptr_calloc = (char *)calloc(sample_alloc_size, 1);
+    int calloc_errno = errno;
+    printf("calloc: ");
+    test_non_null(ptr_calloc, calloc_errno);
+    for(i = 0; i < sample_alloc_size; i++) {
+        ptr_calloc[i] = (char)i;
+    }
+    free(ptr_calloc);
+    
+    errno = 0;
+    char * ptr_calloc_overflow = (char *)calloc(max_size, max_size);
+    int calloc_overflow_errno = errno;
+    printf("calloc (overflowing): ");
+    test_cannot_alloc(ptr_calloc_overflow, calloc_overflow_errno);
+    free(ptr_calloc_overflow);
+    
+    char * ptr_realloc_size0 = (char *)malloc(sample_alloc_size);
+    errno = 0;
+    ptr_realloc_size0 = (char *)realloc(ptr_realloc_size0, zero_size);
+    int realloc_size0_errno = errno;
+    printf("realloc (size 0): ");
+    test_size_zero(ptr_realloc_size0, 1, realloc_size0_errno);
+    free(ptr_realloc_size0);
+    
+    char * ptr_realloc = (char *)malloc(sample_alloc_size);
+    errno = 0;
+    ptr_realloc = (char *)realloc(ptr_realloc, sample_realloc_size);
+    int realloc_errno = errno;
+    printf("realloc: ");
+    test_non_null(ptr_realloc, realloc_errno);
+    for(i = 0; i < sample_realloc_size; i++) {
+        ptr_realloc[i] = (char)i;
+    }
+    free(ptr_realloc);
+    
+    char * ptr_realloc_maxsize = (char *)malloc(sample_alloc_size);
+    errno = 0;
+    ptr_realloc_maxsize = (char *)realloc(ptr_realloc_maxsize, max_size);
+    int realloc_maxsize_errno = errno;
+    printf("realloc (SIZE_MAX): ");
+    test_cannot_alloc(ptr_realloc_maxsize, realloc_maxsize_errno);
+    free(ptr_realloc_maxsize);
+
+    errno = 0;
+    char * ptr_reallocarray_maxsize = (char *)malloc(sample_alloc_size);
+    ptr_reallocarray_maxsize = (char *)reallocarray(ptr_reallocarray_maxsize, 2, sample_alloc_size);
+    int reallocarray_errno = errno;
+    printf("reallocarray: ");
+    test_non_null(ptr_reallocarray_maxsize, reallocarray_errno);
+    for(i = 0; i < sample_realloc_size; i++) {
+        ptr_realloc[i] = (char)i;
+    }
+    errno = 0;
+    ptr_reallocarray_maxsize = (char *)reallocarray(ptr_reallocarray_maxsize, 2, max_size);
+    reallocarray_errno = errno;
+    printf("reallocarray (SIZE_MAX): ");
+    test_cannot_alloc(ptr_reallocarray_maxsize, reallocarray_errno);
+    free(ptr_reallocarray_maxsize);
+    
+    // Warning for deprecated functions is expected so silence -Werror
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    errno = 0;
+    char * ptr_memalign_size0 = (char *)memalign(aligned_alloc_alignment, zero_size);
+    int memalign_size0_errno = errno;
+    printf("memalign (size 0): ");
+    test_size_zero(ptr_memalign_size0, aligned_alloc_alignment, memalign_size0_errno);
+    free(ptr_memalign_size0);
+    
+    errno = 0;
+    char * ptr_memalign = (char *)memalign(aligned_alloc_alignment, sample_alloc_size);
+    int memalign_errno = errno;
+    printf("memalign: ");
+    test_valid_aligned(ptr_memalign, aligned_alloc_alignment, memalign_errno);
+    for(i = 0; i < sample_alloc_size; i++) {
+        ptr_memalign[i] = (char)i;
+    }
+    free(ptr_memalign);
+    
+    errno = 0;
+    char * ptr_memalign_maxsize = (char *)memalign(aligned_alloc_alignment, max_size);
+    int memalign_maxsize_errno = errno;
+    printf("memalign (SIZE_MAX): ");
+    test_cannot_alloc(ptr_memalign_maxsize, memalign_maxsize_errno);
+    free(ptr_memalign_maxsize);
+    
+    errno = 0;
+    char * ptr_memalign_align0 = (char *)memalign(0, sample_alloc_size);
+    int memalign_align0_errno = errno;
+    printf("memalign (alignment 0): ");
+    test_invalid_aligned(ptr_memalign_align0, memalign_align0_errno);
+    free(ptr_memalign_align0);
+    
+    errno = 0;
+    char * ptr_memalign_align3 = (char *)memalign(3, sample_alloc_size);
+    int memalign_align3_errno = errno;
+    printf("memalign (alignment 3): ");
+    test_invalid_aligned(ptr_memalign_align3, memalign_align3_errno);
+    free(ptr_memalign_align3);
+
+    #pragma GCC diagnostic pop
+    
+    errno = 0;
+    char * ptr_aligned_alloc_goodsize = (char *)aligned_alloc(aligned_alloc_alignment, aligned_alloc_goodsize);
+    int aligned_alloc_goodsize_errno = errno;
+    printf("aligned_alloc (size %% alignment == 0): ");
+    test_valid_aligned(ptr_aligned_alloc_goodsize, aligned_alloc_alignment, aligned_alloc_goodsize_errno);
+    free(ptr_aligned_alloc_goodsize);
+    
+    errno = 0;
+    char * ptr_aligned_alloc_badsize = (char *)aligned_alloc(aligned_alloc_alignment, aligned_alloc_badsize);
+    int aligned_alloc_badsize_errno = errno;
+    printf("aligned_alloc (size %% alignment != 0): ");
+    test_invalid_aligned(ptr_aligned_alloc_badsize, aligned_alloc_badsize_errno);
+    free(ptr_aligned_alloc_badsize);
+    
+    // Warning for deprecated functions is expected so silence -Werror
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+    errno = 0;
+    char * ptr_valloc_size0 = (char *)valloc(zero_size);
+    int valloc_size0_errno = errno;
+    printf("valloc (size 0): ");
+    test_size_zero(ptr_valloc_size0, page_size, valloc_size0_errno);
+    free(ptr_valloc_size0);
+    
+    errno = 0;
+    char * ptr_valloc = (char *)valloc(sample_alloc_size);
+    int valloc_errno = errno;
+    printf("valloc: ");
+    test_valid_aligned(ptr_valloc, page_size, valloc_errno);
+    free(ptr_valloc);
+    
+    errno = 0;
+    char * ptr_valloc_maxsize = (char *)valloc(max_size);
+    int valloc_maxsize_errno = errno;
+    printf("valloc (SIZE_MAX): ");
+    test_cannot_alloc(ptr_valloc_maxsize, valloc_maxsize_errno);
+    free(ptr_valloc_maxsize);
+    
+    errno = 0;
+    void * ptr_posix_memalign = NULL;
+    int posix_memalign_return = posix_memalign(&ptr_posix_memalign, pow2_mul_voidptr_size, sample_alloc_size);
+    printf("posix_memalign: ");
+    test_valid_aligned(ptr_posix_memalign, pow2_mul_voidptr_size, posix_memalign_return);
+    free(ptr_posix_memalign);
+    
+    errno = 0;
+    void * ptr_posix_memalign_align0 = NULL;
+    int posix_memalign_align0_return = posix_memalign(&ptr_posix_memalign_align0, zero_size, sample_alloc_size);
+    printf("posix_memalign (alignment 0): ");
+    test_invalid_aligned(ptr_posix_memalign_align0, posix_memalign_align0_return);
+    free(ptr_posix_memalign_align0);
+    
+    errno = 0;
+    void * ptr_posix_memalign_nonpow2mul = NULL;
+    int posix_memalign_nonpow2mul_return = posix_memalign(&ptr_posix_memalign_nonpow2mul, nonpow2_mul_voidptr_size, sample_alloc_size);
+    printf("posix_memalign (non-power-of-two multiple of sizeof(void *)): ");
+    test_invalid_aligned(ptr_posix_memalign_nonpow2mul, posix_memalign_nonpow2mul_return);
+    free(ptr_posix_memalign_nonpow2mul);
+    
+    errno = 0;
+    void * ptr_posix_memalign_size0 = NULL;
+    int posix_memalign_size0_return = posix_memalign(&ptr_posix_memalign_size0, pow2_mul_voidptr_size, zero_size);
+    printf("posix_memalign (size 0): ");
+    test_size_zero(ptr_posix_memalign_size0, pow2_mul_voidptr_size, posix_memalign_size0_return);
+    free(ptr_posix_memalign_size0);
+    
+    errno = 0;
+    void * ptr_posix_memalign_maxsize = NULL;
+    int posix_memalign_maxsize_return = posix_memalign(&ptr_posix_memalign_maxsize, pow2_mul_voidptr_size, max_size);
+    printf("posix_memalign (SIZE_MAX): ");
+    test_cannot_alloc(ptr_posix_memalign_maxsize, posix_memalign_maxsize_return);
+    free(ptr_posix_memalign_maxsize);
+
+    errno = 0;
+    char * ptr_pvalloc_size0 = (char *)pvalloc(zero_size);
+    int pvalloc_size0_errno = errno;
+    printf("pvalloc (size 0): ");
+    test_size_zero(ptr_pvalloc_size0, page_size, pvalloc_size0_errno);
+    free(ptr_pvalloc_size0);
+
+    errno = 0;
+    char * ptr_pvalloc = (char *)pvalloc(sample_alloc_size);
+    int pvalloc_errno = errno;
+    printf("pvalloc: ");
+    test_valid_aligned(ptr_pvalloc, page_size, pvalloc_errno);
+    /* Check that the alloc size is rounded up to nearest page-size
+     * multiple */
+    for(i = 0; i < page_size; i++) {
+        ptr_pvalloc[i] = (char)i;
+    }
+    free(ptr_pvalloc);
+
+    errno = 0;
+    char * ptr_pvalloc_multipage = (char *)pvalloc(page_size + 1);
+    int pvalloc_multipage_errno = errno;
+    printf("pvalloc (2 pages): ");
+    test_valid_aligned(ptr_pvalloc_multipage, page_size, pvalloc_multipage_errno);
+    /* Check that the alloc size is rounded up to nearest page-size
+     * multiple */
+    for(i = 0; i < 2*page_size; i++) {
+        ptr_pvalloc_multipage[i] = (char)i;
+    }
+    free(ptr_pvalloc_multipage);
+
+    errno = 0;
+    char * ptr_pvalloc_maxsize = (char *)pvalloc(max_size);
+    int pvalloc_maxsize_errno = errno;
+    printf("pvalloc (SIZE_MAX): ");
+    test_cannot_alloc(ptr_pvalloc_maxsize, pvalloc_maxsize_errno);
+    free(ptr_pvalloc_maxsize);
+
+    #pragma GCC diagnostic pop
+}
diff --git a/recipes/core/relibc/tests/stdlib/atof.c b/recipes/core/relibc/tests/stdlib/atof.c
new file mode 100644
index 0000000000..f9783467b7
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/atof.c
@@ -0,0 +1,12 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    double d = atof("-3.14");
+    printf("%f\n", d);
+
+    d = atof("INF");
+    printf("%f\n", d);
+}
diff --git a/recipes/core/relibc/tests/stdlib/atoi.c b/recipes/core/relibc/tests/stdlib/atoi.c
new file mode 100644
index 0000000000..26497f27f4
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/atoi.c
@@ -0,0 +1,13 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    printf("%d\n", atoi("         -42"));
+    printf("%d\n", atoi(" +555"));
+    printf("%d\n", atoi("   1234567890    "));
+    printf("%ld\n", atol("         -42"));
+    printf("%ld\n", atol(" +555"));
+    printf("%ld\n", atol("   1234567890    "));
+}
diff --git a/recipes/core/relibc/tests/stdlib/bsearch.c b/recipes/core/relibc/tests/stdlib/bsearch.c
new file mode 100644
index 0000000000..139cb53d65
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/bsearch.c
@@ -0,0 +1,56 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int int_cmp(const void* a, const void* b) {
+    return *(const int*) a - *(const int*) b;
+}
+
+#define BSEARCH_TEST_INT(key, arr, len, expect) \
+    do { \
+        void* res = bsearch((const void*) &key, (void*) arr, len, sizeof(int), int_cmp); \
+        if (res != expect) { \
+            printf("FAIL bsearch for %d in [", key); \
+            size_t i = 0; \
+            for (; i < len; ++i) printf("%d,", arr[i]); \
+            printf("] expected %p but got %p\n", (void*) expect, res); \
+            exit(EXIT_FAILURE); \
+        } \
+    } while (0)
+
+int main(void) {
+    int x = 0;
+    int y = 1024;
+
+    // TODO: Zero sized arrays are a non-standard GNU extension
+    //int empty[] = {};
+    //BSEARCH_TEST_INT(x, empty, 0, NULL);
+
+    int singleton[] = {42};
+    printf("%p\n%p\n", singleton, &singleton[1]);
+    BSEARCH_TEST_INT(x, singleton, 1, NULL);
+    BSEARCH_TEST_INT(singleton[0], singleton, 1, &singleton[0]);
+    BSEARCH_TEST_INT(y, singleton, 1, NULL);
+
+    int two[] = {14, 42};
+    BSEARCH_TEST_INT(x, two, 2, NULL);
+    BSEARCH_TEST_INT(y, two, 2, NULL);
+    BSEARCH_TEST_INT(two[0], two, 2, &two[0]);
+    BSEARCH_TEST_INT(two[0], two, 1, &two[0]);
+    BSEARCH_TEST_INT(two[1], two, 2, &two[1]);
+    BSEARCH_TEST_INT(two[1], two, 1, NULL);
+
+    int three[] = {-5, -1, 4};
+    BSEARCH_TEST_INT(three[0], three, 3, &three[0]);
+    BSEARCH_TEST_INT(three[1], three, 3, &three[1]);
+    BSEARCH_TEST_INT(three[2], three, 3, &three[2]);
+
+    int big[] = {-19, -13, -7, -3, 2, 5, 11};
+    BSEARCH_TEST_INT(big[0], big, 7, big);
+    BSEARCH_TEST_INT(big[6], big, 7, &big[6]);
+    BSEARCH_TEST_INT(big[3], big, 7, &big[3]);
+    BSEARCH_TEST_INT(x, big, 7, NULL);
+
+    printf("PASS bsearch\n");
+}
diff --git a/recipes/core/relibc/tests/stdlib/div.c b/recipes/core/relibc/tests/stdlib/div.c
new file mode 100644
index 0000000000..5a768b8ed8
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/div.c
@@ -0,0 +1,23 @@
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+volatile float f;
+volatile long double ld;
+volatile unsigned long long ll;
+lldiv_t mydivt;
+
+int main(void) {
+    char* tmp;
+    f = strtof("gnu", &tmp);
+    ld = strtold("gnu", &tmp);
+    ll = strtoll("gnu", &tmp, 10);
+    ll = strtoull("gnu", &tmp, 10);
+    ll = llabs(10);
+    mydivt = lldiv(10,1);
+    ll = mydivt.quot;
+    ll = mydivt.rem;
+    ll = atoll("10");
+    _Exit(0);
+}
+
diff --git a/recipes/core/relibc/tests/stdlib/env.c b/recipes/core/relibc/tests/stdlib/env.c
new file mode 100644
index 0000000000..b5524067b1
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/env.c
@@ -0,0 +1,45 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    //puts(getenv("SHELL"));
+    //puts(getenv("CC"));
+
+    char* owned = malloc(26); // "TEST=Updates accordingly." + NUL
+    strcpy(owned, "TEST=It's working!!");
+
+    putenv(owned);
+    puts(getenv("TEST"));
+
+    strcpy(owned, "TEST=Updates accordingly.");
+    puts(getenv("TEST"));
+
+    // Allocation is reused
+    setenv("TEST", "in place", 1);
+    puts(getenv("TEST"));
+    puts(owned);
+
+    // Allocation is not reused
+    setenv("TEST", "Value overwritten and not in place because it's really long", 1);
+    puts(getenv("TEST"));
+    puts(owned);
+
+    // Value is not overwritten
+    setenv("TEST", "Value not overwritten", 0);
+    puts(getenv("TEST"));
+
+    unsetenv("TEST");
+    char* env = getenv("TEST");
+    if (env) {
+        puts("This should be null, but isn't");
+        puts(env);
+        exit(EXIT_FAILURE);
+    } else {
+        puts("Value deleted successfully!");
+    }
+
+    free(owned);
+}
diff --git a/recipes/core/relibc/tests/stdlib/getsubopt.c b/recipes/core/relibc/tests/stdlib/getsubopt.c
new file mode 100644
index 0000000000..4717f65fcd
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/getsubopt.c
@@ -0,0 +1,55 @@
+#include "test_helpers.h"
+
+int main(void) {
+    char *const tokens[] = {
+        "ro",
+        "rw",
+        "foo",
+        "baz",
+        NULL
+    };
+
+    // getsubopt modifies the string in-place
+    char opt_str[] = "ro,foo=bar,bool,baz=,rw";
+    char *options = opt_str;
+    char *value = NULL;
+    int idx;
+
+    idx = getsubopt(&options, tokens, &value);
+    UNEXP_IF(getsubopt, idx, != 0);
+    if (value != NULL) {
+        printf("getsubopt failed: expected NULL value for 'ro', got '%s'\n", value);
+        exit(EXIT_FAILURE);
+    }
+
+    idx = getsubopt(&options, tokens, &value);
+    UNEXP_IF(getsubopt, idx, != 2);
+    if (value == NULL || strcmp(value, "bar") != 0) {
+        printf("getsubopt failed: expected 'bar', got '%s'\n", value ? value : "NULL");
+        exit(EXIT_FAILURE);
+    }
+
+    idx = getsubopt(&options, tokens, &value);
+    UNEXP_IF(getsubopt, idx, != -1);
+    if (value == NULL || strcmp(value, "bool") != 0) {
+        printf("getsubopt failed: expected 'bool' in value, got '%s'\n", value ? value : "NULL");
+        exit(EXIT_FAILURE);
+    }
+
+    idx = getsubopt(&options, tokens, &value);
+    UNEXP_IF(getsubopt, idx, != 3);
+    if (value == NULL || strcmp(value, "") != 0) {
+        printf("getsubopt failed: expected empty string value, got '%s'\n", value ? value : "NULL");
+        exit(EXIT_FAILURE);
+    }
+
+    idx = getsubopt(&options, tokens, &value);
+    UNEXP_IF(getsubopt, idx, != 1);
+    if (value != NULL) {
+        printf("getsubopt failed: expected NULL value for 'rw', got '%s'\n", value);
+        exit(EXIT_FAILURE);
+    }
+
+    idx = getsubopt(&options, tokens, &value);
+    UNEXP_IF(getsubopt, idx, != -1);
+}
diff --git a/recipes/core/relibc/tests/stdlib/mkostemps.c b/recipes/core/relibc/tests/stdlib/mkostemps.c
new file mode 100644
index 0000000000..370ffd009a
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/mkostemps.c
@@ -0,0 +1,28 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char* file_name = (char*) calloc(18, sizeof(char));
+    strcpy(file_name, "tempXXXXXX.suffix");
+    int fd = mkostemps(file_name, 7, 0);
+    FILE* fp = fdopen(fd, "w+");
+    printf("Start unchanged: %d\n", strncmp(file_name, "temp", 4));
+    printf("End unchanged: %d\n", strcmp(file_name + 4 + 6, ".suffix"));
+
+    char* write = "Writing to file";
+    fputs(write, fp);
+
+    char buffer[sizeof write];
+    memset(buffer, 0, sizeof buffer);
+    fgets(buffer, strlen(buffer), fp);
+    if (strcmp(write, buffer)) {
+        printf("Read & Write Successful\n");
+    } else {
+        printf("Read & Write Failed\n");
+    }
+    fclose(fp);
+    remove(file_name);
+}
diff --git a/recipes/core/relibc/tests/stdlib/mktemp.c b/recipes/core/relibc/tests/stdlib/mktemp.c
new file mode 100644
index 0000000000..577fb51fc2
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/mktemp.c
@@ -0,0 +1,16 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char* string = (char*) calloc(20, sizeof(char));
+    strcpy(string, "tempXXXXXX");
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    mktemp(string);
+    #pragma GCC diagnostic pop
+    printf("%s\n",string);
+    free(string);
+}
diff --git a/recipes/core/relibc/tests/stdlib/ptsname.c b/recipes/core/relibc/tests/stdlib/ptsname.c
new file mode 100644
index 0000000000..82d2687d84
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/ptsname.c
@@ -0,0 +1,89 @@
+/* Test for ptsname/ptsname_r.
+   Copyright (C) 2014-2024 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define DEV_TTY		"/dev/tty"
+#define PTSNAME_EINVAL	"./ptsname-einval"
+
+int do_single_test(int fd, char * buf, size_t buflen, int expected_err) {
+
+    int ret = ptsname_r(fd, buf, buflen);
+    int err = errno;
+
+    if (expected_err == 0) {
+        if (ret != 0) {
+            printf("ptsname_r: expected: return = 0\n");
+            printf("           got: return = %d, errno = %d (%s)\n",
+                ret, err, strerror(err));
+            return 1;
+        }
+    } else {
+        if (ret == 0 || errno != expected_err) {
+            printf("ptsname_r: expected: return = %d, errno = %d (%s)\n",
+                -1, expected_err, strerror(expected_err));
+            printf("           got: return = %d, errno = %d (%s)\n",
+                ret, err, strerror(err));
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+int main(void) {
+    char buf[512] = {0};
+    int result = 0;
+    errno = 0;
+    /* Tests with a real PTS master.  */
+    int fd = posix_openpt(O_RDWR);
+    if (fd != -1) {
+        result |= do_single_test(fd, buf, sizeof(buf), 0);
+        result |= do_single_test(fd, buf, 1, ERANGE);
+        close(fd);
+    } else
+        printf("posix_openpt (O_RDWR) failed\nerrno %d (%s)\n",
+            errno, strerror(errno));
+
+    // TODO: open(DEV_TTY, O_RDONLY) gives error on CI 
+    // /* Test with a terminal device which is not a PTS master.  */
+    // fd = open(DEV_TTY, O_RDONLY);
+    // if (fd != -1) {
+    //     result |= do_single_test(fd, buf, sizeof(buf), ENOTTY);
+    //     close(fd);
+    // } else
+    //     printf("open (\"%s\", O_RDWR) failed\nerrno %d (%s)\n",
+    //         DEV_TTY, errno, strerror(errno));
+
+    /* Test with a file.  */
+    fd = open(PTSNAME_EINVAL, O_RDWR | O_CREAT, 0600);
+    if (fd != -1) {
+        result |= do_single_test(fd, buf, sizeof(buf), ENOTTY);
+        close(fd);
+        unlink(PTSNAME_EINVAL);
+    } else
+        printf("open (\"%s\", O_RDWR | OCREAT) failed\nerrno %d (%s)\n",
+            PTSNAME_EINVAL, errno, strerror(errno));
+
+    return result;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/stdlib/qsort.c b/recipes/core/relibc/tests/stdlib/qsort.c
new file mode 100644
index 0000000000..0de6d141b5
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/qsort.c
@@ -0,0 +1,33 @@
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+
+int values[] = { 23, 16, 8, 4, 42, 15 };
+
+int cmpfunc (const void * a_ptr, const void * b_ptr) {
+    int a = *(const int *)a_ptr;
+    int b = *(const int *)b_ptr;
+    return a - b;
+}
+
+int main () {
+    size_t i;
+
+    printf("Before: ");
+    for(i = 0; i < ARRAY_SIZE(values); i++) {
+        printf("%d ", values[i]);
+    }
+    printf("\n");
+
+    qsort(values, ARRAY_SIZE(values), sizeof(int), cmpfunc);
+
+    printf("After: ");
+    for(i = 0; i < ARRAY_SIZE(values); i++) {
+        printf("%d ", values[i]);
+    }
+    printf("\n");
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/stdlib/rand.c b/recipes/core/relibc/tests/stdlib/rand.c
new file mode 100644
index 0000000000..29791888d8
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/rand.c
@@ -0,0 +1,70 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    // Uninitialized generator
+    int rand_uninit = rand();
+    printf("%d\n", rand_uninit);
+
+    // Testing the reproducibility of values
+    srand(259);
+    int rand_seed259_1 = rand();
+    printf("%d\n", rand_seed259_1);
+
+    srand(259);
+    int rand_seed259_2 = rand();
+    printf("%d\n", rand_seed259_2);
+
+    if (rand_seed259_1 != rand_seed259_2) {
+        puts("rand() doesn't return reproducible values");
+        exit(EXIT_FAILURE);
+    }
+
+    // Seed value 1 should return the same values as the ininitialized generator
+    srand(1);
+    int rand_seed1 = rand();
+    printf("%d\n", rand_seed1);
+
+    if (rand_uninit != rand_seed1) {
+        puts("srand(1) doesn't work");
+        exit(EXIT_FAILURE);
+    }
+
+    // Ensure rand_r() fails with NULL input
+    if (rand_r(NULL) != EINVAL) {
+        puts("rand_r(NULL) doesn't return EINVAL");
+        exit(EXIT_FAILURE);
+    }
+
+    // Ensure rand_r() produces unique values
+    int seed = 259;
+    int rand_r_seed259_1 = rand_r((unsigned *)&seed);
+    printf("%d\n", rand_r_seed259_1);
+
+    int rand_r_seed259_2 = rand_r((unsigned *)&seed);
+    printf("%d\n", rand_r_seed259_2);
+
+    if (rand_r_seed259_1 == rand_r_seed259_2) {
+        puts("rand_r() fails to produce unique values");
+        exit(EXIT_FAILURE);
+    }
+
+    // Ensure rand_r() returns reproducible values
+    seed = 259;
+    int rand_r_seed259_1_2 = rand_r((unsigned *)&seed);
+    printf("%d\n", rand_r_seed259_1_2);
+
+    int rand_r_seed259_2_2 = rand_r((unsigned *)&seed);
+    printf("%d\n", rand_r_seed259_2_2);
+
+    if (rand_r_seed259_1 != rand_r_seed259_1_2
+        || rand_r_seed259_2 != rand_r_seed259_2_2)
+    {
+        puts("rand_r() is not reproducible");
+	exit(EXIT_FAILURE);
+    }
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/stdlib/rand48.c b/recipes/core/relibc/tests/stdlib/rand48.c
new file mode 100644
index 0000000000..a1685f27fd
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/rand48.c
@@ -0,0 +1,137 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    long x_l, x_m;
+    double x_d;
+    long seedval = 0xcafebeef;
+    unsigned short seed[3] = {0xfedc, 0xba98, 0x7654};
+    unsigned short xsubi[3] = {0xabcd, 0xef42, 0x5678};
+    unsigned short lcong48_params[7] = {0x0123, 0x4567, 0x89ab, 0xcdef, 0x4242, 0xf000, 0xbaaa};
+    unsigned short xsubi_from_seed48[3] = {0, 0, 0};
+    
+    /* Test uninitialized behavior */
+    printf("lrand48 (uninitialized):");
+    for (int i = 0; i < 10; i++)
+    {
+        x_l = lrand48();
+        printf(" %ld", x_l);
+    }
+    printf("\n");
+    
+    /* Test different output types with same seed, builtin X_i and
+     * default multiplier and addend */
+    srand48(seedval);
+    printf("drand48 (seeded with srand48):");
+    for (int i = 0; i < 10; i++)
+    {
+        x_d = drand48();
+        printf(" %lf", x_d);
+    }
+    printf("\n");
+    
+    srand48(seedval);
+    printf("lrand48 (seeded with srand48):");
+    for (int i = 0; i < 10; i++)
+    {
+        x_l = lrand48();
+        printf(" %ld", x_l);
+    }
+    printf("\n");
+    
+    srand48(seedval);
+    printf("mrand48 (seeded with srand48):");
+    for (int i = 0; i < 10; i++)
+    {
+        x_m = mrand48();
+        printf(" %ld", x_m);
+    }
+    printf("\n");
+    
+    /* Test corresponding functions taking user-supplied X_i, with
+     * default multiplier and addend */
+    printf("erand48:");
+    for (int i = 0; i < 10; i++)
+    {
+        x_d = erand48(xsubi);
+        printf(" %lf", x_d);
+    }
+    printf("\n");
+    
+    printf("nrand48:");
+    for (int i = 0; i < 10; i++)
+    {
+        x_l = nrand48(xsubi);
+        printf(" %ld", x_l);
+    }
+    printf("\n");
+    
+    printf("jrand48:");
+    for (int i = 0; i < 10; i++)
+    {
+        x_l = jrand48(xsubi);
+        printf(" %ld", x_l);
+    }
+    printf("\n");
+    
+    /* Test seed48() "stashing" behavior.  */
+    unsigned short *seed48_return = seed48(seed);
+    printf("seed48_return: [%x, %x, %x]\n",
+        seed48_return[0], seed48_return[1], seed48_return[2]);
+    
+    /* Test seeding behavior of seed48() */
+    printf("lrand48 (seeded with seed48):");
+    for (int i = 0; i < 10; i++)
+    {
+        x_l = lrand48();
+        printf(" %ld", x_l);
+    }
+    printf("\n");
+    
+    /* Test restore from seed48()'s "stashed" value */
+    xsubi_from_seed48[0] = seed48_return[0];
+    xsubi_from_seed48[1] = seed48_return[1];
+    xsubi_from_seed48[2] = seed48_return[2];
+    printf("xsubi restored froom seed48 return value: [%x, %x, %x]\n",
+        xsubi_from_seed48[0], xsubi_from_seed48[1], xsubi_from_seed48[2]);
+    printf("nrand48 (from xsubi value returned by seed48):");
+    for (int i = 0; i < 10; i++)
+    {
+        x_l = nrand48(xsubi_from_seed48);
+        printf(" %ld", x_l);
+    }
+    printf("\n");
+    
+    /* Test behavior with all-user-defined parameters */
+    lcong48(lcong48_params);
+    printf("lrand48 (with parameters from lcong48):");
+    for (int i = 0; i < 10; i++)
+    {
+        x_l = lrand48();
+        printf(" %ld", x_l);
+    }
+    printf("\n");
+    
+    /* Test multiplier- and addend-restoring behavior of srand48() */
+    srand48(seedval);
+    printf("lrand48 (seeded with srand48 after lcong48 call):");
+    for (int i = 0; i < 10; i++)
+    {
+        x_l = lrand48();
+        printf(" %ld", x_l);
+    }
+    printf("\n");
+    
+    /* Test multiplier- and addend-restoring behavior of seed48() */
+    lcong48(lcong48_params);
+    seed48(seed);
+    printf("lrand48 (seeded with seed48 after lcong48 call):");
+    for (int i = 0; i < 10; i++)
+    {
+        x_l = lrand48();
+        printf(" %ld", x_l);
+    }
+    printf("\n");
+}
diff --git a/recipes/core/relibc/tests/stdlib/random.c b/recipes/core/relibc/tests/stdlib/random.c
new file mode 100644
index 0000000000..1c46861346
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/random.c
@@ -0,0 +1,100 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+/* The output of these tests are checked against that from musl. Other
+ * algorithms may yield different results and still comply with the
+ * POSIX requirements. */
+
+int main(void) {
+    /* Should be enough to exercise the rollover branching in random()
+     * for all possible state array sizes (up to 256 bytes, i.e. 64
+     * 32-bit values). */
+    size_t test_seq_len = 70;
+
+    long random_result;
+
+    // Should give same result as with seed 1
+    puts("Uninitialized:");
+    for (size_t i = 0; i < test_seq_len; i++) {
+        random_result = random();
+        printf("%ld\n", random_result);
+    }
+
+    puts("\nSeed 1:");
+    srandom(1);
+    for (size_t i = 0; i < test_seq_len; i++) {
+        random_result = random();
+        printf("%ld\n", random_result);
+    }
+
+    puts("\nSeed 1337:");
+    srandom(1337);
+    for (size_t i = 0; i < test_seq_len; i++) {
+        random_result = random();
+        printf("%ld\n", random_result);
+    }
+
+    /* 256 bytes (as below) is the largest possible amount of state
+     * data. Created as a uint32_t to avoid possible alignment issues
+     * with char. */
+    uint32_t new_state[64] = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+
+    unsigned int seed = 42;
+
+    // Should exercise the different branches in initstate()
+    size_t sizes[] = {8, 31, 32, 63, 64, 127, 128, 255, 256};
+
+    for (size_t j = 0; j < sizeof(sizes)/sizeof(size_t); j++) {
+        size_t size = sizes[j];
+        printf("\nSeed %d, size %ld:\n", seed, size);
+        initstate(seed, (char *)new_state, size);
+
+        for (size_t i = 0; i < test_seq_len; i++) {
+            random_result = random();
+            printf("%ld\n", random_result);
+        }
+    }
+
+    /* Test that setstate() allows the use of a different state array,
+     * and that it correctly returns the old value. */
+    uint32_t other_new_state[64] = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+
+    initstate(seed, (char *)other_new_state, 32);
+    printf("\nSeed %d, other state array:\n", seed);
+    for (size_t i = 0; i < test_seq_len; i++) {
+        random_result = random();
+        printf("%ld\n", random_result);
+    }
+
+    char *should_be_other_new_state_ptr = setstate((char *)new_state);
+    if (should_be_other_new_state_ptr == (char *)other_new_state) {
+        puts("\nState data pointer restored correctly by setstate().");
+    }
+    else {
+        puts("\nState data pointer NOT restored correctly by setstate().");
+    }
+    printf("\nSeed %d, back to first state array:\n", seed);
+    for (size_t i = 0; i < test_seq_len; i++) {
+        random_result = random();
+        printf("%ld\n", random_result);
+    }
+
+    // Should yield NULL
+    char *state_with_size_less_than_8 = initstate(seed, (char *)new_state, 7);
+    printf("\nPointer returned by initstate with size < 8: %p\n",
+        state_with_size_less_than_8);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/stdlib/realpath.c b/recipes/core/relibc/tests/stdlib/realpath.c
new file mode 100644
index 0000000000..7abe26527d
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/realpath.c
@@ -0,0 +1,19 @@
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char *path_res = realpath("stdlib/realpath.c", NULL);
+    ERROR_IF(realpath, path_res, == NULL);
+    puts(path_res);
+    free(path_res);
+
+    char path_arg[PATH_MAX] = { 0 };
+    char *res = realpath("stdlib/realpath.c", path_arg);
+    ERROR_IF(realpath, res, == NULL);
+    puts(path_arg);
+}
diff --git a/recipes/core/relibc/tests/stdlib/strtod.c b/recipes/core/relibc/tests/stdlib/strtod.c
new file mode 100644
index 0000000000..8b0450259a
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/strtod.c
@@ -0,0 +1,81 @@
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char* endptr = 0;
+    double d;
+
+    char* inputs[] = {
+        "a 1 hello", " 1 hello", "1 hello 2",
+        "10.123", "010.123", "-5.3",
+        "0x10.123", "0x1.23", "0x3.21",
+
+        "1e5", "1e+5", "1e-5",
+        "1e5   ", "1e+5   ", "1e-5   ",
+
+        "1e10", "1eXXXX", "1e", "1e ",
+        "1e+10", "1e+XXXX", "1e+", "1e+ ",
+        "1e-10", "1e-XXXX", "1e-", "1e- ",
+
+        "-1e5", "-1e+5", "-1e-5",
+        "-1e5   ", "-1e+5   ", "-1e-5   ",
+
+        "-1e10", "-1eXXXX", "-1e", "-1e ",
+        "-1e+10", "-1e+XXXX", "-1e+", "-1e+ ",
+        "-1e-10", "-1e-XXXX", "-1e-", "-1e- ",
+
+        "12.34e5", "12.34e+5", "12.34e-5",
+        "12.34e5   ", "12.34e+5   ", "12.34e-5   ",
+
+        "12.34e10", "12.34eXXXX", "12.34e", "12.34e ",
+        "12.34e+10", "12.34e+XXXX", "12.34e+", "12.34e+ ",
+        "12.34e-10", "12.34e-XXXX", "12.34e-", "12.34e- ",
+
+        "-12.34e5", "-12.34e+5", "-12.34e-5",
+        "-12.34e5   ", "-12.34e+5   ", "-12.34e-5   ",
+
+        "-12.34e10", "-12.34eXXXX", "-12.34e", "-12.34e ",
+        "-12.34e+10", "-12.34e+XXXX", "-12.34e+", "-12.34e+ ",
+        "-12.34e-10", "-12.34e-XXXX", "-12.34e-", "-12.34e- ",
+
+        "0x0.3p10", "-0x0.3p10", "0x0.3p-5", "-0x0.3p-5",
+        "0x1.4p3", "0x1.4p-3", "-0x1.4p3", "-0x1.4p-3",
+        "0x10.1p0", "0x10.1p-0", "-0x10.1p0", "-0x10.1p-0",
+
+        "0.5e0", "0.5e1", "0.5e2", "0.5e3", "0.5e4",
+        "0.5e5", "0.5e6", "0.5e7", "0.5e8", "0.5e9",
+        "0.5e10", "0.5e11", "0.5e12", "0.5e13", "0.5e14",
+        "0.5e15", "0.5e16", "0.5e17", "0.5e18", "0.5e19",
+        "0.5e20", "0.5e21", "0.5e22", "0.5e23", "0.5e24",
+        "0.5e25", "0.5e26", "0.5e27", "0.5e28", "0.5e29",
+        "0.5e30", "0.5e31", "0.5e32", "0.5e33", "0.5e34",
+        "0.5e35", "0.5e36", "0.5e37", "0.5e38",
+
+        "-0.5e0", "-0.5e1", "-0.5e2", "-0.5e3", "-0.5e4",
+        "-0.5e5", "-0.5e6", "-0.5e7", "-0.5e8", "-0.5e9",
+        "-0.5e10", "-0.5e11", "-0.5e12", "-0.5e13", "-0.5e14",
+        "-0.5e15", "-0.5e16", "-0.5e17", "-0.5e18", "-0.5e19",
+        "-0.5e20", "-0.5e21", "-0.5e22", "-0.5e23", "-0.5e24",
+        "-0.5e25", "-0.5e26", "-0.5e27", "-0.5e28", "-0.5e29",
+        "-0.5e30", "-0.5e31", "-0.5e32", "-0.5e33", "-0.5e34",
+        "-0.5e35", "-0.5e36", "-0.5e37", "-0.5e38",
+
+        "-0",
+
+        "INF", "inf", "iNf", "Inf foobarbaz",
+        "+INF", "+inf", "+iNf", "+Inf foobarbaz",
+        "-INF", "-inf", "-iNf", "-Inf foobarbaz",
+
+        "NaN0.1e5", "nan-37", "nAn1.05", "Nan foo bar baz",
+        "+NaN0.1e5", "+nan-37", "+nAn1.05", "+Nan foo bar baz",
+        "-NaN0.1e5", "-nan-37", "-nAn1.05", "-Nan foo bar baz",
+
+    };
+    for (size_t i = 0; i < sizeof(inputs) / sizeof(char*); i += 1) {
+        d = strtod(inputs[i], &endptr);
+        printf("d: %f Endptr: \"%s\"\n", d, endptr);
+    }
+}
diff --git a/recipes/core/relibc/tests/stdlib/strtol.c b/recipes/core/relibc/tests/stdlib/strtol.c
new file mode 100644
index 0000000000..118d635de4
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/strtol.c
@@ -0,0 +1,46 @@
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char *endptr;
+
+    printf("%ld\n", strtol("         -42", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%ld\n", strtol(" +555", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%ld\n", strtol("   1234567890    ", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+
+    printf("%ld\n", strtol("         -42", &endptr, 10));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%ld\n", strtol(" +555", &endptr, 10));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%ld\n", strtol("   1234567890    ", &endptr, 10));
+    printf("endptr \"%s\"\n", endptr);
+
+    printf("%lx\n", strtol("  0x38Acfg", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%lx\n", strtol("0Xabcdef12", &endptr, 16));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%lx\n", strtol("cafebeef", &endptr, 16));
+    printf("endptr \"%s\"\n", endptr);
+
+    printf("%lo\n", strtol("  073189", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%lo\n", strtol("     073189", &endptr, 8));
+    printf("endptr \"%s\"\n", endptr);
+
+    printf("%lo\n", strtol("  0b", &endptr, 8));
+    if(errno != 0) {
+        printf("errno is not 0 (%d), something went wrong\n", errno);
+    }
+    printf("endptr \"%s\"\n", endptr);
+    printf("%lo\n", strtol("  0b", &endptr, 0));
+    if(errno != 0) {
+        printf("errno is not 0 (%d), something went wrong\n", errno);
+    }
+    printf("endptr \"%s\"\n", endptr);
+}
diff --git a/recipes/core/relibc/tests/stdlib/strtoul.c b/recipes/core/relibc/tests/stdlib/strtoul.c
new file mode 100644
index 0000000000..b558f0c170
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/strtoul.c
@@ -0,0 +1,46 @@
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char *endptr;
+
+    printf("%ld\n", strtoul("         -42", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%ld\n", strtoul(" +555", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%ld\n", strtoul("   1234567890    ", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+
+    printf("%ld\n", strtoul("         -42", &endptr, 10));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%ld\n", strtoul(" +555", &endptr, 10));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%ld\n", strtoul("   1234567890    ", &endptr, 10));
+    printf("endptr \"%s\"\n", endptr);
+
+    printf("%lx\n", strtoul("  0x38Acfg", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%lx\n", strtoul("0Xabcdef12", &endptr, 16));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%lx\n", strtoul("0x21000004", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+
+    printf("%lo\n", strtoul("  073189", &endptr, 0));
+    printf("endptr \"%s\"\n", endptr);
+    printf("%lo\n", strtoul("     073189", &endptr, 8));
+    printf("endptr \"%s\"\n", endptr);
+
+    printf("%lo\n", strtoul("  0b", &endptr, 8));
+    if(errno != 0) {
+        printf("errno is not 0 (%d), something went wrong\n", errno);
+    }
+    printf("endptr \"%s\"\n", endptr);
+    printf("%lo\n", strtoul("  0b", NULL, 0));
+    if(errno != 0) {
+        printf("errno is not 0 (%d), something went wrong\n", errno);
+    }
+    printf("endptr \"%s\"\n", endptr);
+}
diff --git a/recipes/core/relibc/tests/stdlib/system.c b/recipes/core/relibc/tests/stdlib/system.c
new file mode 100644
index 0000000000..821c216f6c
--- /dev/null
+++ b/recipes/core/relibc/tests/stdlib/system.c
@@ -0,0 +1,18 @@
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    // testing shell detection
+    // this means, because we don't detect if a shell actually exists but just assume it does, this test case breaks in
+    // environments without `sh`. I think that is a reasonable tradeoff.
+    // (And if there isn't a shell, system() won't work anyways)
+    int status = system(NULL);
+    printf("shell found: %i\n", status);
+    fflush(stdout);
+    ERROR_IF(system, status, == 0);
+
+    // base case
+    status = system("echo test of system");
+    ERROR_IF(system, status, == -1);
+}
diff --git a/recipes/core/relibc/tests/string/mem.c b/recipes/core/relibc/tests/string/mem.c
new file mode 100644
index 0000000000..ed27237237
--- /dev/null
+++ b/recipes/core/relibc/tests/string/mem.c
@@ -0,0 +1,48 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    puts("# mem #");
+    char arr[100];
+    memset(arr, 0, 100); // Compiler builtin, should work
+    arr[50] = 1;
+    if ((size_t)memchr((void *)arr, 1, 100) - (size_t)arr != 50) {
+        puts("Incorrect memchr");
+        exit(EXIT_FAILURE);
+    }
+    puts("Correct memchr");
+    if ((size_t)memrchr((void *)arr, 1, 100) - (size_t)arr != 50) {
+        puts("Incorrect memrchr");
+        exit(EXIT_FAILURE);
+    }
+    puts("Correct memrchr");
+    char arr2[51];
+    memset(arr2, 0, 51); // Compiler builtin, should work
+    memccpy((void *)arr2, (void *)arr, 1, 51);
+    if (arr[50] != 1) {
+        puts("Incorrect memccpy");
+        exit(EXIT_FAILURE);
+    }
+    puts("Correct memccpy");
+    int res;
+    if ((res = memcmp("hello world", "hello world", 11))) {
+        printf("Incorrect memcmp (1), expected 0 found %d\n", res);
+        exit(EXIT_FAILURE);
+    }
+    if ((res = memcmp("hello world", "hello worlt", 11)) >= 0) {
+        printf("Incorrect memcmp (2), expected -, found %d\n", res);
+        exit(EXIT_FAILURE);
+    }
+    if ((res = memcmp("hello world", "hallo world", 5)) <= 0) {
+        printf("Incorrect memcmp (3), expected +, found %d\n", res);
+        exit(EXIT_FAILURE);
+    }
+    if ((res = memcmp("hello world", "henlo world", 5)) >= 0) {
+        printf("Incorrect memcmp (4), expected -, found %d\n", res);
+        exit(EXIT_FAILURE);
+    }
+    puts("Correct memcmp");
+}
diff --git a/recipes/core/relibc/tests/string/memcpy.c b/recipes/core/relibc/tests/string/memcpy.c
new file mode 100644
index 0000000000..f9978dd697
--- /dev/null
+++ b/recipes/core/relibc/tests/string/memcpy.c
@@ -0,0 +1,53 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+#define MIN(x, y) (((x) < (y)) ? (x) : (y))
+
+int main(void) {
+    const uint8_t UNTOUCHED_BYTE = 0x00;
+    const uint8_t TOUCHED_BYTE = 0xff;
+    // In order to fully exercise the implementation, this should be at least 3 times the largest possible chunk size
+    const size_t BUFFER_LEN = 64;
+
+    uint8_t *s1_buffer = malloc(BUFFER_LEN);
+    uint8_t *s2_buffer = malloc(BUFFER_LEN);
+
+    // Loop through all possible combinations of s1 and s2 alignments and slice length within the buffers allocated
+    for (size_t s1_offset = 0; s1_offset < BUFFER_LEN; s1_offset++) {
+        for (size_t s2_offset = 0; s2_offset < BUFFER_LEN; s2_offset++) {
+            size_t n_max = BUFFER_LEN - MAX(s1_offset, s2_offset);
+            for (size_t n = 1; n <= n_max; n++) {
+                // Clear buffers
+                memset(s1_buffer, UNTOUCHED_BYTE, BUFFER_LEN);
+                memset(s2_buffer, UNTOUCHED_BYTE, BUFFER_LEN);
+
+                // Fill s2 subslice
+                memset(s2_buffer + s2_offset, TOUCHED_BYTE, n);
+
+                // Do the actual memcpy of the slice of interest
+                memcpy(s1_buffer + s1_offset, s2_buffer + s2_offset, n);
+
+                // Check that area below the slice of interest is untouched
+                for (size_t i = 0; i < s1_offset; i++) {
+                    assert(s1_buffer[i] == UNTOUCHED_BYTE);
+                }
+
+                // Check that the slice of interest was copied
+                assert(memcmp(s1_buffer + s1_offset, s2_buffer + s2_offset, n) == 0);
+
+                // Check that area above the slice of interest is untouched
+                for (size_t i = s1_offset + n; i < BUFFER_LEN; i++) {
+                    assert(s1_buffer[i] == UNTOUCHED_BYTE);
+                }
+            }
+        }
+    }
+
+    free(s1_buffer);
+    free(s2_buffer);
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/string/memmem.c b/recipes/core/relibc/tests/string/memmem.c
new file mode 100644
index 0000000000..c3ff546428
--- /dev/null
+++ b/recipes/core/relibc/tests/string/memmem.c
@@ -0,0 +1,31 @@
+#include <assert.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    uint8_t haystack[] = {1, 1, 2, 1, 2, 3, 1, 2, 3, 4};
+    uint8_t present_needle[] = {1, 2, 3};
+    uint8_t absent_needle[] = {1, 2, 3, 4, 5};
+    uint8_t long_needle[] = {1, 1, 2, 1, 2, 3, 1, 2, 3, 4, 1};
+
+    size_t haystacklen = sizeof(haystack);
+    size_t present_needlelen = sizeof(present_needle);
+    size_t absent_needlelen = sizeof(absent_needle);
+    size_t long_needlelen = sizeof(long_needle);
+
+    uint8_t *present_needle_match_ptr = memmem(haystack, haystacklen, present_needle, present_needlelen);
+    assert(present_needle_match_ptr == haystack + 3);
+
+    uint8_t *absent_needle_match_ptr = memmem(haystack, haystacklen, absent_needle, absent_needlelen);
+    assert(absent_needle_match_ptr == NULL);
+
+    // Explicitly specified to return haystack for needlelen == 0.
+    uint8_t *zero_needle_match_ptr = memmem(haystack, haystacklen, present_needle, 0);
+    assert(zero_needle_match_ptr == haystack);
+
+    uint8_t *long_needle_match_ptr = memmem(haystack, haystacklen, long_needle, long_needlelen);
+    assert(long_needle_match_ptr == NULL);
+}
diff --git a/recipes/core/relibc/tests/string/stpcpy.c b/recipes/core/relibc/tests/string/stpcpy.c
new file mode 100644
index 0000000000..9d10d41199
--- /dev/null
+++ b/recipes/core/relibc/tests/string/stpcpy.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include <assert.h>
+
+void test_stpcpy(const char *src, char *dest) {
+    char *end = stpcpy(dest, src);
+    assert(strcmp(dest, src) == 0);
+    assert(*end == '\0');
+    assert(end == dest + strlen(dest));
+}
+
+int main() {
+    char dest[20];
+
+    test_stpcpy("Hello, World!", dest);
+
+    // Test case 2: Empty string
+    test_stpcpy("", dest);
+
+    // Test case 3: String with special characters
+    test_stpcpy("Special chars: !@#$%^&*()", dest);
+
+    // Test case 4: String with spaces
+    test_stpcpy("A string with spaces", dest);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/string/stpncpy.c b/recipes/core/relibc/tests/string/stpncpy.c
new file mode 100644
index 0000000000..27b558f088
--- /dev/null
+++ b/recipes/core/relibc/tests/string/stpncpy.c
@@ -0,0 +1,40 @@
+#include <string.h>
+#include <assert.h>
+
+int main() {
+    // Define some test strings
+    const char *src = "Hello, World!";
+    char dest[50];
+    
+    // Test 1: Copy exactly 5 characters from src to dest
+    char *result = stpncpy(dest, src, 5);
+    dest[5] = '\0';  // Ensure the destination string is null-terminated
+    assert(strcmp(dest, "Hello") == 0);  // Verify the string in dest
+    assert(result == &dest[5]);  // Ensure the return pointer points to the null terminator
+
+    // Test 2: Copy 15 characters from src to dest (more than the length of src)
+    result = stpncpy(dest, src, 15);
+    dest[13] = '\0';  // Ensure the destination string is null-terminated
+    assert(strcmp(dest, "Hello, World!") == 0);  // Verify the string in dest
+    assert(result == &dest[13]);  // Ensure the return pointer points to the null terminator
+
+    // Test 3: Copy 3 characters from src to dest
+    result = stpncpy(dest, src, 3);
+    dest[3] = '\0';  // Ensure the destination string is null-terminated
+    assert(strcmp(dest, "Hel") == 0);  // Verify the string in dest
+    assert(result == &dest[3]);  // Ensure the return pointer points to the null terminator
+
+    // Test 4: Copy 0 characters from src to dest
+    result = stpncpy(dest, src, 0);
+    dest[0] = '\0';  // Ensure the destination is explicitly null-terminated
+    assert(dest[0] == '\0');  // Ensure the destination is an empty string
+    assert(result == dest);  // Ensure the return pointer points to the start of dest
+
+    // Test 5: Copy exactly the length of the source string
+    result = stpncpy(dest, src, strlen(src));
+    dest[strlen(src)] = '\0';  // Ensure the destination string is null-terminated
+    assert(strcmp(dest, "Hello, World!") == 0);  // Verify the string in dest
+    assert(result == &dest[strlen(src)]);  // Ensure the return pointer points to the null terminator
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/string/strcat.c b/recipes/core/relibc/tests/string/strcat.c
new file mode 100644
index 0000000000..cbfe52218b
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strcat.c
@@ -0,0 +1,12 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char dest1[12] = "hello";
+	  printf("%s\n", strcat(dest1, " world")); // should be hello world
+
+    char dest2[12] = "hello";
+  	printf("%s\n", strncat(dest2, " world foobar", 6)); // should be hello world
+}
diff --git a/recipes/core/relibc/tests/string/strchr.c b/recipes/core/relibc/tests/string/strchr.c
new file mode 100644
index 0000000000..51f4b7aa56
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strchr.c
@@ -0,0 +1,11 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+	printf("%s\n", strchr("hello", 'e')); // should be ello
+	printf("%s\n", strchr("world", 'l')); // should be ld
+	printf("%s\n", strchr("world", '\0')); // should be an empty, nul-terminated string
+	printf("%p\n", strchr("world", 'x')); // should be a null pointer
+}
diff --git a/recipes/core/relibc/tests/string/strchrnul.c b/recipes/core/relibc/tests/string/strchrnul.c
new file mode 100644
index 0000000000..9911e03608
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strchrnul.c
@@ -0,0 +1,31 @@
+#include <string.h>
+#include <assert.h>
+
+
+int main() {
+    // Test 1: Character is present in the string
+    const char *str1 = "Hello, World!";
+    const char *result1 = strchrnul(str1, 'o');
+    assert(result1 == &str1[4]); // 'o' is at position 4 in "Hello, World!"
+
+    // Test 2: Character is not in the string (should return the null terminator)
+    const char *str2 = "Hello, World!";
+    const char *result2 = strchrnul(str2, 'z');
+    assert(result2 == &str2[13]); // 'z' is not present, so it returns the null terminator
+
+    // Test 3: Character is the first character in the string
+    const char *str3 = "abcdef";
+    const char *result3 = strchrnul(str3, 'a');
+    assert(result3 == &str3[0]); // 'a' is at position 0
+
+    // Test 4: Character is the last character in the string
+    const char *str4 = "abcdef";
+    const char *result4 = strchrnul(str4, 'f');
+    assert(result4 == &str4[5]); // 'f' is at position 5, the last character
+
+    // Test 5: Searching for the null terminator itself
+    const char *str5 = "abcdef";
+    const char *result5 = strchrnul(str5, '\0');
+    assert(result5 == &str5[6]); // The null terminator is at position 6 (end of the string)
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/string/strcpy.c b/recipes/core/relibc/tests/string/strcpy.c
new file mode 100644
index 0000000000..25b0276317
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strcpy.c
@@ -0,0 +1,29 @@
+#include <stdio.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char dst[20];
+
+    strcpy(dst, "strcpy works!");
+    puts(dst);
+    strncpy(dst, "strncpy works!", 20);
+    puts(dst);
+
+    // Make sure no NUL is placed
+    memset(dst, 'a', 20);
+    dst[19] = 0;
+    strncpy(dst, "strncpy should work here too", 10);
+    puts(dst);
+
+    // The string should be properly terminated regardless
+    char ndst[28];
+
+    size_t r = strlcpy(ndst, "strlcpy works!", 28);
+    puts(ndst);
+    printf("copied %lu\n", r);
+    r = strlcat(ndst, " and strlcat!", 28);
+    puts(ndst);
+    printf("copied %lu\n", r);
+}
diff --git a/recipes/core/relibc/tests/string/strcspn.c b/recipes/core/relibc/tests/string/strcspn.c
new file mode 100644
index 0000000000..969d6ec663
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strcspn.c
@@ -0,0 +1,10 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+	char *world = "world";
+	printf("%ld\n", strcspn("hello", world)); // should be 2
+	printf("%ld\n", strcspn("banana", world)); // should be 6
+}
diff --git a/recipes/core/relibc/tests/string/strlen.c b/recipes/core/relibc/tests/string/strlen.c
new file mode 100644
index 0000000000..d5125c52dc
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strlen.c
@@ -0,0 +1,76 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char dest1[13] = "hello world!";
+    int dest1_len = strlen(dest1);
+    printf("%d\n", dest1_len);
+    if(dest1_len != 12) {
+        puts("strlen(\"hello world!\") failed");
+	exit(EXIT_FAILURE);
+    }
+
+    char empty[1] = { 0 };
+    int empty_len = strlen(empty);
+    printf("%d\n", empty_len);
+    if(empty_len != 0) {
+        puts("strlen(\"\") failed");
+        exit(EXIT_FAILURE);
+    }
+
+    dest1_len = strnlen(dest1, sizeof(dest1));
+    printf("%d\n", dest1_len);
+    if(dest1_len != 12) {
+        puts("strnlen(\"hello world!\", 13) failed");
+        exit(EXIT_FAILURE);
+    }
+
+    dest1_len = strnlen(dest1, sizeof(dest1) - 1);
+    printf("%d\n", dest1_len);
+    if(dest1_len != 12) {
+        puts("strnlen(\"hello world!\", 12) failed");
+        exit(EXIT_FAILURE);
+    }
+
+    dest1_len = strnlen(dest1, 0);
+    printf("%d\n", dest1_len);
+    if(dest1_len != 0) {
+        puts("strnlen(\"hello world!\", 0) failed");
+        exit(EXIT_FAILURE);
+    }
+
+    dest1_len = strnlen(dest1, 300);
+    printf("%d\n", dest1_len);
+    if(dest1_len != 12) {
+        puts("strnlen(\"hello world!\", 300) failed");
+        exit(EXIT_FAILURE);
+    }
+
+// no strnlen_s on glibc
+#ifndef __GLIBC__
+    dest1_len = strnlen_s(dest1, 6);
+    printf("%d\n", dest1_len);
+    if(dest1_len != 6) {
+        puts("strnlen_s(\"hello world!\", 6) failed");
+        exit(EXIT_FAILURE);
+    }
+
+    dest1_len = strnlen_s(dest1, 20);
+    printf("%d\n", dest1_len);
+    if(dest1_len != 12) {
+        puts("strnlen_s(\"hello world!\", 20) failed");
+        exit(EXIT_FAILURE);
+    }
+
+    int null_len = strnlen_s(NULL, 100);
+    printf("%d\n", null_len);
+    if(null_len != 0) {
+        puts("strnlen_s(NULL, 100) failed");
+        exit(EXIT_FAILURE);
+    }
+#endif
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/string/strncmp.c b/recipes/core/relibc/tests/string/strncmp.c
new file mode 100644
index 0000000000..d42b3e39a5
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strncmp.c
@@ -0,0 +1,13 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    printf("%d\n", strncmp("a", "aa", 2));
+    printf("%d\n", strncmp("a", "aä", 2));
+    printf("%d\n", strncmp("\xFF", "\xFE", 2));
+    printf("%d\n", strncmp("", "\xFF", 1));
+    printf("%d\n", strncmp("a", "c", 1));
+    printf("%d\n", strncmp("a", "a", 2));
+}
diff --git a/recipes/core/relibc/tests/string/strpbrk.c b/recipes/core/relibc/tests/string/strpbrk.c
new file mode 100644
index 0000000000..88e62f7463
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strpbrk.c
@@ -0,0 +1,20 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char* source = "The quick drawn fix jumps over the lazy bug";
+
+    // should be "The quick drawn fix jumps over the lazy bug"
+    char* res1 = strpbrk(source, "From The Very Beginning");
+    printf("%s\n", (res1) ? res1 : "NULL"); 
+
+    // should be "lazy bug"
+    char* res2 = strpbrk(source, "lzbg");
+    printf("%s\n", (res2) ? res2 : "NULL"); 
+
+    // should be "NULL"
+    char* res3 = strpbrk(source, "404");
+    printf("%s\n", (res3) ? res3 : "NULL");
+}
diff --git a/recipes/core/relibc/tests/string/strrchr.c b/recipes/core/relibc/tests/string/strrchr.c
new file mode 100644
index 0000000000..1013e76100
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strrchr.c
@@ -0,0 +1,25 @@
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char s0[] = "hello, world";
+    char *ptr = strrchr(s0, 'l');
+    if (ptr != &s0[10]) {
+        printf("%p != %p\n", ptr, &s0[10]);
+        puts("strrchr FAIL");
+        exit(EXIT_FAILURE);
+    }
+
+    char s1[] = "";
+    ptr = strrchr(s1, 'a');
+    if (ptr != NULL) {
+        printf("%p != 0\n", ptr);
+        puts("strrchr FAIL");
+        exit(EXIT_FAILURE);
+    }
+
+    puts("strrch PASS");
+}
diff --git a/recipes/core/relibc/tests/string/strsep.c b/recipes/core/relibc/tests/string/strsep.c
new file mode 100644
index 0000000000..bfa6c4a11b
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strsep.c
@@ -0,0 +1,68 @@
+#include <string.h>
+#include <assert.h>
+
+int main() {
+    // Test case 1: Basic case with multiple tokens
+    char str1[] = "apple,orange,banana";
+    char *delim = ",";
+    char *token = str1;
+    char *result = NULL;
+
+    // First token should be "apple"
+    result = strsep(&token, delim);
+    assert(result != NULL && strcmp(result, "apple") == 0);
+
+    // Second token should be "orange"
+    result = strsep(&token, delim);
+    assert(result != NULL && strcmp(result, "orange") == 0);
+
+    // Third token should be "banana"
+    result = strsep(&token, delim);
+    assert(result != NULL && strcmp(result, "banana") == 0);
+
+    // No more tokens
+    result = strsep(&token, delim);
+    assert(result == NULL);
+
+    // Test case 2: Empty string
+    char str2[] = "";
+    token = str2;
+    result = strsep(&token, delim);
+
+    // Test case 3: String with no delimiter
+    char str3[] = "apple";
+    token = str3;
+    result = strsep(&token, delim);
+    assert(result != NULL && strcmp(result, "apple") == 0);
+    assert(token == NULL);  // No more tokens
+
+    // Test case 4: String starts with delimiter
+    char str4[] = ",apple,orange";
+    token = str4;
+    result = strsep(&token, delim);
+    assert(result != NULL && strlen(result) == 0);  // First token should be an empty string ("")
+
+    result = strsep(&token, delim);
+    assert(result != NULL && strcmp(result, "apple") == 0);
+
+    // Test case 5: Multiple delimiters in a row
+    char str5[] = "apple,,orange";
+    token = str5;
+    result = strsep(&token, delim);
+    assert(result != NULL && strcmp(result, "apple") == 0);
+    result = strsep(&token, delim);
+    assert(result != NULL && strlen(result) == 0);  // Empty token due to consecutive delimiters
+    result = strsep(&token, delim);
+    assert(result != NULL && strcmp(result, "orange") == 0);
+
+    // Test case 6: Delimiters at the end of the string
+    char str6[] = "apple,orange,";
+    token = str6;
+    result = strsep(&token, delim);
+    assert(result != NULL && strcmp(result, "apple") == 0);
+    result = strsep(&token, delim);
+    assert(result != NULL && strcmp(result, "orange") == 0);
+    result = strsep(&token, delim);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/string/strsignal.c b/recipes/core/relibc/tests/string/strsignal.c
new file mode 100644
index 0000000000..490d11f38c
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strsignal.c
@@ -0,0 +1,27 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    puts("# strsignal #");
+    const char *x = strsignal(SIGHUP);
+    if (strcmp(x, "Hangup")) {
+        printf("Incorrect strsignal (1), found: .%s.\n", x);
+        exit(EXIT_FAILURE);
+    }
+    x = strsignal(0); 
+    if (strcmp(x, "Unknown signal")) {
+        printf("Incorrect strsignal (2), found: .%s.\n", x);
+        exit(EXIT_FAILURE);
+    }
+    x = strsignal(100); 
+    if (strcmp(x, "Unknown signal")) {
+        printf("Incorrect strsignal (3), found: .%s.\n", x);
+        exit(EXIT_FAILURE);
+    }
+
+
+}
diff --git a/recipes/core/relibc/tests/string/strspn.c b/recipes/core/relibc/tests/string/strspn.c
new file mode 100644
index 0000000000..2f5ae33e9d
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strspn.c
@@ -0,0 +1,13 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+	char *hello = "hello";
+	char *world = "world";
+	char *banana = "banana";
+	printf("%lu\n", strspn(hello, "hello")); // should be 5
+	printf("%lu\n", strspn(world, "wendy")); // should be 1
+	printf("%lu\n", strspn(banana, "apple")); // should be 0
+}
diff --git a/recipes/core/relibc/tests/string/strstr.c b/recipes/core/relibc/tests/string/strstr.c
new file mode 100644
index 0000000000..aa097864ca
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strstr.c
@@ -0,0 +1,12 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    printf("%s\n", strstr("In relibc we trust", "rust"));
+    printf("%s\n", strstr("In relibc we trust", "libc"));
+    printf("%s\n", strstr("In relibc we trust", "bugs"));
+    printf("%s\n", strstr("IN RELIBC WE TRUST", "rust"));
+    printf("%s\n", strcasestr("IN RELIBC WE TRUST", "rust"));
+}
diff --git a/recipes/core/relibc/tests/string/strtok.c b/recipes/core/relibc/tests/string/strtok.c
new file mode 100644
index 0000000000..4781968e82
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strtok.c
@@ -0,0 +1,17 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char source[] = "I'd just like to interject for a moment.  What you're referring to as Linux, "
+                    "is in fact, GNU/Linux, or as I've recently taken to calling it, GNU plus Linux.\n";
+
+    char* token = strtok(source, " ");
+    while (token) {
+        printf("%s", token);
+        if ((token = strtok(NULL, " "))) {
+            printf("_");
+        }
+    }
+}
diff --git a/recipes/core/relibc/tests/string/strtok_r.c b/recipes/core/relibc/tests/string/strtok_r.c
new file mode 100644
index 0000000000..1c188c76b1
--- /dev/null
+++ b/recipes/core/relibc/tests/string/strtok_r.c
@@ -0,0 +1,18 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char source[] = "I'd just like to interject for a moment.  What you're referring to as Linux, "
+                    "is in fact, GNU/Linux, or as I've recently taken to calling it, GNU plus Linux.\n";
+    char* sp;
+
+    char* token = strtok_r(source, " ", &sp);
+    while (token) {
+        printf("%s", token);
+        if ((token = strtok_r(NULL, " ", &sp))) {
+            printf("_");
+        }
+    }
+}
diff --git a/recipes/core/relibc/tests/strings.c b/recipes/core/relibc/tests/strings.c
new file mode 100644
index 0000000000..ede5d6289c
--- /dev/null
+++ b/recipes/core/relibc/tests/strings.c
@@ -0,0 +1,47 @@
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <strings.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    assert(!bcmp("hello", "hehe", 2));
+    assert(bcmp("hello", "haha", 2));
+
+    char* new = malloc(3);
+    bcopy("hi", new, 3); // include nul byte
+
+    assert(!strcasecmp("hi", new));
+    assert(strcasecmp("he", new));
+
+    assert(strcasecmp("hello", "HEllO") == 0);
+    assert(strcasecmp("hello", "HEllOo") < 0);
+    assert(strcasecmp("5", "5") == 0);
+    assert(strcasecmp("5", "4") > 0);
+    assert(strcasecmp("5", "6") < 0);
+    assert(strncasecmp("hello", "Hello World", 5) == 0);
+    assert(strncasecmp("FLOOR0_1", "FLOOR0_1FLOOR4_1", 8) == 0);
+    assert(strncasecmp("FL00RO_1", "FLOOR0_1FLOOR4_1", 8) < 0);
+
+    // Ensure we aren't relying on the 5th (lowercase) bit on non-alpha characters
+    assert(strcasecmp("{[", "[{") > 0);
+
+    bzero(new, 1);
+    assert(*new == 0);
+    assert(*(new+1) == 'i');
+    assert(*(new+2) == 0);
+
+    assert(ffs(1) == 1);
+    assert(ffs(2) == 2);
+    assert(ffs(3) == 1);
+    assert(ffs(10) == 2);
+
+    char* str = "hihih";
+    assert(index(str, 'i') == str + 1);
+    assert(rindex(str, 'i') == str + 3);
+
+    char buf[] = "password";
+    explicit_bzero(buf, sizeof(buf));
+    assert(buf[0] == 0);
+}
diff --git a/recipes/core/relibc/tests/sys_epoll/epoll.c b/recipes/core/relibc/tests/sys_epoll/epoll.c
new file mode 100644
index 0000000000..fa367e07cf
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_epoll/epoll.c
@@ -0,0 +1,180 @@
+#include <fcntl.h>
+#include <stdio.h>
+#include <sys/epoll.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "../test_helpers.h"
+
+int reader(int fd) {
+    // Create an epoll file
+    int epollfd = epoll_create1(EPOLL_CLOEXEC);
+    if (epollfd < 0) {
+        perror("epoll_create1");
+        return 1;
+    }
+
+    // Register for events from the reader file
+    struct epoll_event ev;
+    ev.events = EPOLLIN;
+    ev.data.fd = fd;
+    if (epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev) < 0) {
+        perror("epoll_ctl");
+        return 1;
+    }
+
+    struct epoll_event events[8];
+
+    // Check that epoll returns error on a zero or negative number of events
+    int nfds0 = epoll_wait(epollfd, events, 0, -1);
+    if (nfds0 != -1 || errno != EINVAL) {
+        perror("epoll_wait");
+        return 1;
+    }
+
+#ifndef __GLIBC__
+    int nfds_n1 = epoll_wait(epollfd, events, -1, -1);
+#else
+    // glibc does not support events len -1
+    int nfds_n1 = epoll_wait(epollfd, events, 8, -1);
+#endif
+    if (nfds_n1 != -1 || errno != EINVAL) {
+        perror("epoll_wait");
+        return 1;
+    }
+
+    // Process exactly 1024 events
+    for (int i = 0; i < 1024; i++) {
+        // Wait for the next event
+        int nfds = epoll_wait(epollfd, events, sizeof(events)/sizeof(struct epoll_event), -1);
+        if (nfds < 0) {
+            perror("epoll_wait");
+            return 1;
+        }
+
+        // For each event received
+        for (int n = 0; n < nfds; n++) {
+            // If the event is the reader file
+            if (events[n].data.fd == fd) {
+                // Read the current event count
+                int writer_i;
+                ssize_t status = read(fd, &writer_i, sizeof(writer_i));
+                ERROR_IF(read, status, == -1);
+                size_t count = (size_t)status;
+
+                if (count < sizeof(writer_i)) {
+                    fprintf(stderr, "read %zu instead of %d\n", count, sizeof(writer_i));
+                    return 1;
+                }
+                // Make sure the writer's event count matches our own
+                if (i != writer_i) {
+                    fprintf(stderr, "received event count %d instead of %d\n", writer_i, i);
+                    return 1;
+                }
+                printf("%d == %d\n", i, writer_i);
+            } else {
+                // Otherwise, return an error
+                fprintf(stderr, "unknown fd %d\n", events[n].data.fd);
+                return 1;
+            }
+        }
+    }
+
+    return 0;
+}
+
+int writer(int fd) {
+    // Create an epoll file
+    int epollfd = epoll_create1(EPOLL_CLOEXEC);
+    if (epollfd < 0) {
+        perror("epoll_create1");
+        return 1;
+    }
+
+    // Register for events from the writer file
+    struct epoll_event ev;
+    ev.events = EPOLLOUT;
+    ev.data.fd = fd;
+    if (epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev) < 0) {
+        perror("epoll_ctl");
+        return 1;
+    }
+
+    // Process exactly 1024 events
+    struct epoll_event events[8];
+    for (int i = 0; i < 1024; i++) {
+        // Wait for the next event
+        int nfds = epoll_wait(epollfd, events, sizeof(events)/sizeof(struct epoll_event), -1);
+        if (nfds < 0) {
+            perror("epoll_wait");
+            return 1;
+        }
+
+        // For each event received
+        for (int n = 0; n < nfds; n++) {
+            // If the event is the writer file
+            if (events[n].data.fd == fd) {
+                // Write the current event count
+                ssize_t status = write(fd, &i, sizeof(i));
+                ERROR_IF(write, status, == -1);
+                size_t count = (size_t)status;
+
+                if (count < sizeof(i)) {
+                    fprintf(stderr, "wrote %zu instead of %d\n", count, sizeof(i));
+                    return 1;
+                }
+            } else {
+                // Otherwise, return an error
+                fprintf(stderr, "unknown fd %d\n", events[n].data.fd);
+                return 1;
+            }
+        }
+    }
+
+    return 0;
+}
+
+int main(void) {
+    // Create a non-blocking pipe to use for epoll testing
+    int pipefd[2];
+    if (pipe2(pipefd, O_CLOEXEC | O_NONBLOCK) < 0) {
+        perror("pipe2");
+        return 1;
+    }
+
+    pid_t pid = fork();
+    if (pid < 0) {
+        perror("fork");
+        return 1;
+    } else if (pid == 0) {
+        // Child process will read events
+        close(pipefd[1]);
+        return reader(pipefd[0]);
+    } else {
+        // Parent process will write events
+        close(pipefd[0]);
+        int ret = writer(pipefd[1]);
+
+        // Wait for child process
+        int status = 0;
+        if (waitpid(pid, &status, 0) != pid) {
+            perror("waitpid");
+            return 1;
+        }
+
+        // If writer failed, return exit status
+        if (ret != 0) {
+            return ret;
+        }
+
+        // If child exited with exit status
+        if (WIFEXITED(status)) {
+            // Return the child's exit status
+            return WEXITSTATUS(status);
+        } else {
+            // Otherwise, return 1
+            return 1;
+        }
+    }
+}
diff --git a/recipes/core/relibc/tests/sys_epoll/epollet.c b/recipes/core/relibc/tests/sys_epoll/epollet.c
new file mode 100644
index 0000000000..7c0646730b
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_epoll/epollet.c
@@ -0,0 +1,46 @@
+// test code found on dbus, currently hangs on redox
+
+#include <sys/epoll.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#define _DBUS_ZERO(object) (memset (&(object), '\0', sizeof ((object))))
+
+int
+main (void)
+{
+  struct epoll_event input;
+  struct epoll_event output;
+  int epfd = epoll_create1 (EPOLL_CLOEXEC);
+  
+  int pipefds[2];
+  pipe(pipefds);
+  close(pipefds[1]); 
+  int fd = pipefds[0]; 
+  
+  int ret;
+
+  _DBUS_ZERO (input);
+
+  input.events = EPOLLHUP | EPOLLET;
+  ret = epoll_ctl (epfd, EPOLL_CTL_ADD, fd, &input);
+  printf ("ctl ADD: %d\n", ret);
+
+  ret = epoll_wait (epfd, &output, 1, -1);
+  printf ("wait for HUP, edge-triggered: %d\n", ret);
+
+  ret = epoll_wait (epfd, &output, 1, 100); 
+  printf ("wait for HUP again: %d\n", ret);
+
+  input.events = EPOLLHUP;
+  ret = epoll_ctl (epfd, EPOLL_CTL_MOD, fd, &input);
+  printf ("ctl MOD: %d\n", ret);
+
+  ret = epoll_wait (epfd, &output, 1, -1);
+  printf ("wait for HUP: %d\n", ret);
+
+  close(fd);
+  close(epfd);
+  return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/sys_mman/fmap.c b/recipes/core/relibc/tests/sys_mman/fmap.c
new file mode 100644
index 0000000000..002f5cc5c4
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_mman/fmap.c
@@ -0,0 +1,104 @@
+// copied from autoconf mmap test, currently panicking kernel
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the file system buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propagated back to all the places they're supposed to be.
+
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+int
+main (void)
+{
+  char *data, *data2, *data3;
+  const char *cdata2;
+  int i, pagesize;
+  int fd, fd2;
+
+  pagesize = sysconf(_SC_PAGESIZE);
+
+  /* First, make a file with some known garbage in it. */
+  data = (char *) malloc (pagesize);
+  if (!data)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    *(data + i) = rand ();
+  umask (0);
+  fd = creat ("conftest.mmap", 0600);
+  if (fd < 0)
+    return 2;
+  if (write (fd, data, pagesize) != pagesize)
+    return 3;
+  close (fd);
+
+  /* Next, check that the tail of a page is zero-filled.  File must have
+     non-zero length, otherwise we risk SIGBUS for entire page.  */
+  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
+  if (fd2 < 0)
+    return 4;
+  cdata2 = "";
+  if (write (fd2, cdata2, 1) != 1)
+    return 5;
+  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  if (data2 == MAP_FAILED)
+    return 6;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data2 + i))
+      return 7;
+  close (fd2);
+  if (munmap (data2, pagesize))
+    return 8;
+
+  /* Next, try to mmap the file at a fixed address which already has
+     something else allocated at it.  If we can, also make sure that
+     we see the same garbage.  */
+  fd = open ("conftest.mmap", O_RDWR);
+  if (fd < 0)
+    return 9;
+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+    return 10;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data2 + i))
+      return 11;
+
+  /* Finally, make sure that changes to the mapped area do not
+     percolate back to the file as seen by read().  (This is a bug on
+     some variants of i386 svr4.0.)  */
+  for (i = 0; i < pagesize; ++i)
+    *(data2 + i) = *(data2 + i) + 1;
+  data3 = (char *) malloc (pagesize);
+  if (!data3)
+    return 12;
+  if (read (fd, data3, pagesize) != pagesize)
+    return 13;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data3 + i))
+      return 14;
+  close (fd);
+  free (data);
+  free (data3);
+  return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/sys_mman/mmap.c b/recipes/core/relibc/tests/sys_mman/mmap.c
new file mode 100644
index 0000000000..81b868ca74
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_mman/mmap.c
@@ -0,0 +1,52 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/mman.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main() {
+    int page_size = getpagesize();
+    printf("Page size: %d\n", page_size);
+
+    puts("Mapping 1 page of memory...");
+    char *map1 = mmap((void *) 0x200000000, (size_t) page_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED_NOREPLACE, -1, 0);
+    puts("Mapping 3 pages of memory...");
+    char *map2 = mmap(map1 + page_size, (size_t) page_size * 4, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED_NOREPLACE, -1, 0);
+
+    ERROR_IF(mmap, map1, == MAP_FAILED);
+    ERROR_IF(mmap, map2, == MAP_FAILED);
+
+    (void)madvise(map1 + page_size + 3, page_size, PROT_NONE);
+
+    puts("Randomizing mapping #1");
+    for (int i = 0; i < page_size; ++i) {
+        map1[i] = (char) (rand() & 0xFF);
+    }
+    puts("Randomizing mapping #2");
+    for (int i = 0; i < page_size * 3; ++i) {
+        map2[i] = (char) (rand() & 0xFF);
+    }
+
+    puts("Unmapping page 2 of map2");
+    munmap(map2 + page_size, page_size);
+
+    puts("Randomizing page 1 of mapping #2");
+    for (int i = 0; i < page_size; ++i) {
+        map2[i] = (char) (rand() % 256);
+    }
+
+    puts("Randomizing page 3 of mapping #2");
+    for (int i = 0; i < page_size; ++i) {
+        map2[page_size * 2 + i] = (char) (rand() % 256);
+    }
+
+    // Page fault:
+    // map2[page_size] = 0;
+
+    puts("Unmapping it all at once!");
+    munmap(map1, (size_t) page_size * 5);
+
+    // Page fault:
+    // *map2 = 0;
+}
diff --git a/recipes/core/relibc/tests/sys_resource/constants.c b/recipes/core/relibc/tests/sys_resource/constants.c
new file mode 100644
index 0000000000..7a93b7f4d5
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_resource/constants.c
@@ -0,0 +1,27 @@
+#include <stdio.h>
+#include <sys/resource.h>
+
+int main(void) {
+    // Checks availability of constants specified in
+    // https://pubs.opengroup.org/onlinepubs/7908799/xsh/sysresource.h.html
+    printf("PRIO_PROCESS: %d\n", PRIO_PROCESS);
+    printf("PRIO_PGRP: %d\n", PRIO_PGRP);
+    printf("PRIO_USER: %d\n", PRIO_USER);
+
+    printf("RLIM_INFINITY: %lld\n", RLIM_INFINITY);
+    printf("RLIM_SAVED_MAX: %lld\n", RLIM_SAVED_MAX);
+    printf("RLIM_SAVED_CUR: %lld\n", RLIM_SAVED_CUR);
+
+    printf("RUSAGE_SELF: %lld\n", RUSAGE_SELF);
+    printf("RUSAGE_CHILDREN: %lld\n", RUSAGE_CHILDREN);
+
+    printf("RLIMIT_CORE: %d\n", RLIMIT_CORE);
+    printf("RLIMIT_CPU: %d\n", RLIMIT_CPU);
+    printf("RLIMIT_DATA: %d\n", RLIMIT_DATA);
+    printf("RLIMIT_FSIZE: %d\n", RLIMIT_FSIZE);
+    printf("RLIMIT_NOFILE: %d\n", RLIMIT_NOFILE);
+    printf("RLIMIT_STACK: %d\n", RLIMIT_STACK);
+    printf("RLIMIT_AS: %d\n", RLIMIT_AS);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/sys_resource/getrusage.c b/recipes/core/relibc/tests/sys_resource/getrusage.c
new file mode 100644
index 0000000000..4a5c51e39e
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_resource/getrusage.c
@@ -0,0 +1,39 @@
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/resource.h>
+
+#include "test_helpers.h"
+
+void ptimeval(struct timeval* val) {
+    printf("{ tv_sec: %ld, tv_usec: %ld }\n", val->tv_sec, val->tv_usec);
+}
+
+int main(void) {
+    struct rusage r_usage;
+
+    int status = getrusage(RUSAGE_SELF, &r_usage);
+    ERROR_IF(getrusage, status, == -1);
+    UNEXP_IF(getrusage, status, != 0);
+
+    printf("ru_utime:");
+    ptimeval(&r_usage.ru_utime);
+
+    printf("ru_stime:");
+    ptimeval(&r_usage.ru_utime);
+
+    printf("ru_maxrss: %ld\n", r_usage.ru_maxrss);
+    printf("ru_ixrss: %ld\n", r_usage.ru_ixrss);
+    printf("ru_idrss: %ld\n", r_usage.ru_idrss);
+    printf("ru_isrss: %ld\n", r_usage.ru_isrss);
+    printf("ru_minflt: %ld\n", r_usage.ru_minflt);
+    printf("ru_majflt: %ld\n", r_usage.ru_majflt);
+    printf("ru_nswap: %ld\n", r_usage.ru_nswap);
+    printf("ru_inblock: %ld\n", r_usage.ru_inblock);
+    printf("ru_oublock: %ld\n", r_usage.ru_oublock);
+    printf("ru_msgsnd: %ld\n", r_usage.ru_msgsnd);
+    printf("ru_msgrcv: %ld\n", r_usage.ru_msgrcv);
+    printf("ru_nsignals: %ld\n", r_usage.ru_nsignals);
+    printf("ru_nvcsw: %ld\n", r_usage.ru_nvcsw);
+    printf("ru_nivcsw: %ld\n", r_usage.ru_nivcsw);
+}
diff --git a/recipes/core/relibc/tests/sys_socket/getpeername.c b/recipes/core/relibc/tests/sys_socket/getpeername.c
new file mode 100644
index 0000000000..98eb2fa28a
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/getpeername.c
@@ -0,0 +1,77 @@
+#include <arpa/inet.h>
+
+#include "test_helpers.h"
+
+void print_sockaddr(char *ctx, struct sockaddr *addr) {
+    char ip_string[INET6_ADDRSTRLEN];
+    void *raw_ip_addr;
+    char *fam;
+    in_port_t port;
+
+    if (addr->sa_family == AF_INET) {
+        struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr;
+        raw_ip_addr = &(ipv4->sin_addr);
+        port = ntohs(ipv4->sin_port);
+        fam = "AF_INET";
+    } else if (addr->sa_family == AF_INET6) {
+        struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)addr;
+        raw_ip_addr = &(ipv6->sin6_addr);
+        port = ntohs(ipv6->sin6_port);
+        fam = "AF_INET6";
+    } else {
+        printf("Unknown address family: %d\n", addr->sa_family);
+        exit(1);
+    }
+
+    if (inet_ntop(addr->sa_family, raw_ip_addr, ip_string, sizeof(ip_string)) == NULL) {
+        perror("inet_ntop failed");
+        exit(1);
+    }
+
+    printf("%s [%s]: %s:%u\n", ctx, fam, ip_string, port);
+}
+
+int main(void)
+{
+    int status;
+    int listen_fd = socket(AF_INET, SOCK_STREAM, 0);
+    ERROR_IF(socket, listen_fd, == -1);
+
+    struct sockaddr_in addr =
+    {
+        .sin_family = AF_INET,
+        .sin_addr = { .s_addr = htonl(0x7F000001 /* 127.0.0.1 */) },
+        .sin_port = htons(0),
+    };
+    struct sockaddr* saddr = (struct sockaddr*)&addr;
+    socklen_t addr_len = sizeof(struct sockaddr_in);
+    status = bind(listen_fd, saddr, addr_len);
+    ERROR_IF(bind, status, == -1);
+
+    status = listen(listen_fd, 1);
+    ERROR_IF(bind, status, == -1);
+
+    status = getsockname(listen_fd, saddr, &addr_len);
+    ERROR_IF(getsockname, status, == -1);
+    print_sockaddr("listen sockname", saddr);
+
+    int client_fd = socket(AF_INET, SOCK_STREAM, 0);
+    ERROR_IF(socket, client_fd, == -1);
+
+    status = connect(client_fd, saddr, addr_len);
+    ERROR_IF(connect, status, == -1);
+
+    struct sockaddr_in peer;
+    struct sockaddr* speer = (struct sockaddr*)&peer;
+	socklen_t peer_len = sizeof(struct sockaddr_in);
+    status = getpeername(client_fd, speer, &peer_len);
+    ERROR_IF(getpeername, status, == -1);
+    print_sockaddr("client peername", speer);
+
+    status = memcmp(saddr, speer, sizeof(struct sockaddr_in));
+    UNEXP_IF(memcmp, status, != 0);
+
+    status = getsockname(client_fd, saddr, &addr_len);
+    ERROR_IF(getsockname, status, == -1);
+    print_sockaddr("client sockname", saddr);
+}
diff --git a/recipes/core/relibc/tests/sys_socket/recv.c b/recipes/core/relibc/tests/sys_socket/recv.c
new file mode 100644
index 0000000000..058fea14d9
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/recv.c
@@ -0,0 +1,50 @@
+#include <arpa/inet.h>
+
+#include "test_helpers.h"
+
+int main(void)
+{
+    int status;
+    int listen_fd = socket(AF_INET, SOCK_STREAM, 0);
+    ERROR_IF(socket, listen_fd, == -1);
+
+    struct sockaddr_in addr =
+    {
+        .sin_family = AF_INET,
+        .sin_addr = { .s_addr = htonl(0x7F000001 /* 127.0.0.1 */) },
+        .sin_port = htons(0),
+    };
+    struct sockaddr* saddr = (struct sockaddr*)&addr;
+    socklen_t addr_len = sizeof(struct sockaddr_in);
+    status = bind(listen_fd, saddr, addr_len);
+    ERROR_IF(bind, status, == -1);
+
+    status = listen(listen_fd, 1);
+    ERROR_IF(listen, status, == -1);
+
+    status = getsockname(listen_fd, saddr, &addr_len);
+    ERROR_IF(getsockname, status, == -1);
+
+    int client_fd = socket(AF_INET, SOCK_STREAM, 0);
+    ERROR_IF(socket, client_fd, == -1);
+
+    status = connect(client_fd, saddr, addr_len);
+    ERROR_IF(connect, status, == -1);
+
+    int server_fd = accept(listen_fd, NULL, NULL);
+    ERROR_IF(accept, status, == -1);
+
+    char *c = "foo";
+    status = send(server_fd, c, 4, 0);
+    ERROR_IF(send, status, == -1);
+
+    char x[4];
+    ssize_t amount = recv(client_fd, x, 4, 0);
+    ERROR_IF(recv, amount, == -1);
+    UNEXP_IF(recv, amount, != 4);
+
+    status = strcmp(c, x);
+    printf("send %s\n", c);
+    printf("recv %s\n", x);
+    UNEXP_IF(strcmp, status, != 0);
+}
diff --git a/recipes/core/relibc/tests/sys_socket/recvfrom.c b/recipes/core/relibc/tests/sys_socket/recvfrom.c
new file mode 100644
index 0000000000..2b57597280
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/recvfrom.c
@@ -0,0 +1,56 @@
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void)
+{
+    int status;
+    int server_fd = socket(AF_INET, SOCK_DGRAM, 0);
+    ERROR_IF(socket, server_fd, == -1);
+
+    struct sockaddr_in addr =
+    {
+        .sin_family = AF_INET,
+        .sin_addr = { .s_addr = htonl(0x7F000001 /* 127.0.0.1 */) },
+        .sin_port = htons(0),
+    };
+    struct sockaddr* saddr = (struct sockaddr*)&addr;
+    socklen_t addr_len = sizeof(struct sockaddr_in);
+    status = bind(server_fd, saddr, addr_len);
+    ERROR_IF(bind, status, == -1);
+
+    status = getsockname(server_fd, saddr, &addr_len);
+    ERROR_IF(getsockname, status, == -1);
+
+    int client_fd = socket(AF_INET, SOCK_DGRAM, 0);
+    ERROR_IF(socket, client_fd, == -1);
+    
+    status = connect(client_fd, saddr, addr_len);
+    ERROR_IF(connect, status, == -1);
+
+    struct sockaddr_in name;
+    struct sockaddr* sname = (struct sockaddr*)&name;
+    socklen_t name_len = sizeof(struct sockaddr_in);
+    status = getsockname(client_fd, sname, &name_len);
+    ERROR_IF(getsockname, status, == -1);
+
+    char *c = "bar";
+    status = sendto(server_fd, c, 4, 0, sname, name_len);
+    ERROR_IF(sendto, status, == -1);
+
+    struct sockaddr_in from;
+    struct sockaddr* sfrom = (struct sockaddr*)&from;
+    socklen_t from_len = sizeof(struct sockaddr_in);
+    char x[4];
+    ssize_t amount = recvfrom(client_fd, x, 4, 0, sfrom, &from_len);
+    ERROR_IF(recvfrom, amount, == -1);
+    UNEXP_IF(recvfrom, amount, != 4);
+
+    status = strcmp(c, x);
+    printf("sendto   %s\n", c);
+    printf("recvfrom %s\n", x);
+    UNEXP_IF(strcmp, status, != 0);
+}
diff --git a/recipes/core/relibc/tests/sys_socket/shutdown.c b/recipes/core/relibc/tests/sys_socket/shutdown.c
new file mode 100644
index 0000000000..9653633ddc
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/shutdown.c
@@ -0,0 +1,85 @@
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int sv[2];
+    pid_t pid;
+    char buf[64];
+    const char *parent_msg = "ping";
+    const char *child_msg = "pong";
+
+    int status = socketpair(AF_UNIX, SOCK_STREAM, 0, sv);
+    ERROR_IF(socketpair, status, == -1);
+
+    pid = fork();
+    ERROR_IF(fork, pid, == -1);
+
+    if (pid == 0) {
+        close(sv[0]);
+
+        memset(buf, 0, sizeof(buf));
+        ssize_t n = recv(sv[1], buf, sizeof(buf), 0);
+        ERROR_IF(recv, n, == -1);
+        printf("child:  received '%s'\n", buf);
+
+        n = recv(sv[1], buf, sizeof(buf), 0);
+        if (n != 0) {
+            fprintf(
+                stderr,
+                "FAILURE: Expected EOF (0) after parent shutdown, got %ld\n",
+                (long)n);
+            exit(EXIT_FAILURE);
+        }
+        printf("child:  verified EOF from parent (SHUT_WR worked)\n");
+
+        status = send(sv[1], child_msg, 5, 0);
+        ERROR_IF(send, status, == -1);
+
+        close(sv[1]);
+        exit(0);
+    } else {
+        close(sv[1]);
+
+        status = send(sv[0], parent_msg, 5, 0);
+        ERROR_IF(send, status, == -1);
+
+        status = shutdown(sv[0], SHUT_WR);
+        ERROR_IF(shutdown, status, == -1);
+        printf("parent: shutdown(SHUT_WR) performed\n");
+
+        memset(buf, 0, sizeof(buf));
+        ssize_t n = recv(sv[0], buf, sizeof(buf), 0);
+        ERROR_IF(recv, n, == -1);
+
+        if (n == 0) {
+            fprintf(stderr,
+                    "FAILURE: Parent received EOF, but expected 'pong'\n");
+            exit(EXIT_FAILURE);
+        }
+        printf("parent: received '%s' (Shutdown allows reading)\n", buf);
+
+        status = send(sv[0], "garbage", 7, MSG_NOSIGNAL);
+        if (status != -1 || errno != EPIPE) {
+            fprintf(stderr,
+                    "WARNING: Expected EPIPE on write after shutdown, got "
+                    "status %d\n",
+                    status);
+        } else {
+            printf("parent: verified EPIPE on write after shutdown\n");
+        }
+
+        close(sv[0]);
+        wait(NULL);
+    }
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/sys_socket/unixpeername.c b/recipes/core/relibc/tests/sys_socket/unixpeername.c
new file mode 100644
index 0000000000..cef0c0453e
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/unixpeername.c
@@ -0,0 +1,77 @@
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+void print_sockaddr(char *ctx, struct sockaddr *addr, socklen_t len) {
+    if (addr->sa_family == AF_UNIX) {
+        struct sockaddr_un *un = (struct sockaddr_un *)addr;
+        if (len <= sizeof(sa_family_t)) {
+            printf("%s [AF_UNIX]: (unnamed)\n", ctx);
+        } else {
+            printf("%s [AF_UNIX]: %s\n", ctx, un->sun_path);
+        }
+    } else {
+        printf("%s: Unknown address family %d\n", ctx, addr->sa_family);
+        exit(1);
+    }
+}
+
+int main(void)
+{
+    int status;
+    // TODO: in linux the sockname shown exactly like this string, not the case with redox.
+    const char* socket_path = "unixpeername.sock";
+    unlink(socket_path);
+
+    int listen_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    ERROR_IF(socket, listen_fd, == -1);
+
+    struct sockaddr_un addr = { .sun_family = AF_UNIX };
+    struct sockaddr* saddr = (struct sockaddr*)&addr;
+    socklen_t addr_len = sizeof(struct sockaddr_un);
+    strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
+
+    status = bind(listen_fd, saddr, addr_len);
+    ERROR_IF(bind, status, == -1);
+
+    // TODO: If this commented out, connect() should error with connection refused
+    status = listen(listen_fd, 1);
+    ERROR_IF(listen, status, == -1);
+
+    struct sockaddr_un check;
+    struct sockaddr* scheck = (struct sockaddr*)&check;
+    status = getsockname(listen_fd, scheck, &addr_len);
+    ERROR_IF(getsockname, status, == -1);
+    print_sockaddr("listen sockname", scheck, addr_len);
+
+    int client_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    ERROR_IF(socket, client_fd, == -1);
+
+    status = connect(client_fd, saddr, addr_len);
+    ERROR_IF(connect, status, == -1);
+
+    struct sockaddr_un peer;
+    struct sockaddr* speer = (struct sockaddr*)&peer;
+    socklen_t peer_len = sizeof(struct sockaddr_un);
+    status = getpeername(client_fd, speer, &peer_len);
+    ERROR_IF(getpeername, status, == -1);
+    print_sockaddr("client peername", speer, peer_len);
+
+    status = strcmp(check.sun_path, peer.sun_path);
+    UNEXP_IF(strcmp, status, != 0);
+
+    status = getsockname(client_fd, scheck, &addr_len);
+    ERROR_IF(getsockname, status, == -1);
+    print_sockaddr("client sockname", scheck, addr_len);
+
+    close(client_fd);
+    close(listen_fd);
+    unlink(socket_path);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/sys_socket/unixrecv.c b/recipes/core/relibc/tests/sys_socket/unixrecv.c
new file mode 100644
index 0000000000..5d02f896f4
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/unixrecv.c
@@ -0,0 +1,65 @@
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/wait.h>
+
+#include "test_helpers.h"
+
+int main(void)
+{
+    int status;
+    const char* socket_path = "unix_stream.sock";
+    unlink(socket_path);
+
+    int server_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    ERROR_IF(socket, server_fd, == -1);
+
+    struct sockaddr_un addr = { .sun_family = AF_UNIX };
+    strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
+
+    status = bind(server_fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_un));
+    ERROR_IF(bind, status, == -1);
+
+    status = listen(server_fd, 5);
+    ERROR_IF(listen, status, == -1);
+
+    pid_t pid = fork();
+    ERROR_IF(fork, pid, == -1);
+
+    if (pid == 0) {
+        // to test that blocking in accept() works
+        usleep(500000);
+
+        int client_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+        ERROR_IF(socket, client_fd, == -1);
+
+        status = connect(client_fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_un));
+        ERROR_IF(connect, status, == -1);
+
+        char *msg = "ipsum";
+        printf("send %s\n", msg);
+        status = send(client_fd, msg, 6, 0);
+        ERROR_IF(send, status, == -1);
+
+        close(client_fd);
+        return 0;
+    } else {
+        int accepted_fd = accept(server_fd, NULL, NULL);
+        ERROR_IF(accept, accepted_fd, == -1);
+
+        char x[6];
+        ssize_t amount = recv(accepted_fd, x, 6, 0);
+        ERROR_IF(recv, amount, == -1);
+
+        printf("recv %s\n", x);
+        close(accepted_fd);
+        close(server_fd);
+        
+        wait(NULL);
+        unlink(socket_path);
+    }
+
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/sys_socket/unixrecvearly.c b/recipes/core/relibc/tests/sys_socket/unixrecvearly.c
new file mode 100644
index 0000000000..6c496f53f2
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/unixrecvearly.c
@@ -0,0 +1,66 @@
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/wait.h>
+
+#include "test_helpers.h"
+
+// similar to "unixrecv", but this test if recv() works before accept().
+int main(void)
+{
+    int status;
+    const char* socket_path = "unix_read.sock";
+    unlink(socket_path);
+
+    int server_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    ERROR_IF(socket, server_fd, == -1);
+
+    struct sockaddr_un addr = { .sun_family = AF_UNIX };
+    strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
+
+    status = bind(server_fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_un));
+    ERROR_IF(bind, status, == -1);
+
+    status = listen(server_fd, 5);
+    ERROR_IF(listen, status, == -1);
+
+    pid_t pid = fork();
+    ERROR_IF(fork, pid, == -1);
+
+    if (pid == 0) {
+        int client_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+        ERROR_IF(socket, client_fd, == -1);
+
+        status = connect(client_fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_un));
+        ERROR_IF(connect, status, == -1);
+
+        char x[6];
+        ssize_t amount = recv(client_fd, x, 6, 0);
+        ERROR_IF(recv, amount, == -1);
+        printf("recv %s\n", x);
+
+        close(client_fd);
+        return 0;
+    } else {
+        // to test that blocking in recv() works
+        usleep(500000);
+
+        int accepted_fd = accept(server_fd, NULL, NULL);
+        ERROR_IF(accept, accepted_fd, == -1);
+
+        char *msg = "ipsum";
+        printf("send %s\n", msg);
+        status = send(accepted_fd, msg, 6, 0);
+        ERROR_IF(send, status, == -1);
+
+        close(accepted_fd);
+        close(server_fd);
+        
+        wait(NULL);
+        unlink(socket_path);
+    }
+
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/sys_socket/unixrecvfrom.c b/recipes/core/relibc/tests/sys_socket/unixrecvfrom.c
new file mode 100644
index 0000000000..8d11bd32b7
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/unixrecvfrom.c
@@ -0,0 +1,50 @@
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void)
+{
+    int status;
+    const char* socket_path = "unixrecvfrom.sock";
+    
+    unlink(socket_path);
+
+    int server_fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+    ERROR_IF(socket, server_fd, == -1);
+
+    struct sockaddr_un addr = { .sun_family = AF_UNIX };
+    strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
+
+    status = bind(server_fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_un));
+    ERROR_IF(bind, status, == -1);
+
+    int client_fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+    ERROR_IF(socket, client_fd, == -1);
+    
+    status = connect(client_fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_un));
+    ERROR_IF(connect, status, == -1);
+
+    char *c = "lorem";
+    status = send(client_fd, c, 6, 0);
+    ERROR_IF(send, status, == -1);
+
+    char x[6];
+    struct sockaddr_un from;
+    socklen_t from_len = sizeof(struct sockaddr_un);
+    
+    ssize_t amount = recvfrom(server_fd, x, 6, 0, (struct sockaddr*)&from, &from_len);
+    ERROR_IF(recvfrom, amount, == -1);
+    UNEXP_IF(recvfrom, amount, != 6);
+
+    status = strcmp(c, x);
+    printf("send     %s\n", c);
+    printf("recvfrom %s\n", x);
+    UNEXP_IF(strcmp, status, != 0);
+
+    close(server_fd);
+    close(client_fd);
+    unlink(socket_path);
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/sys_socket/unixsocketpair.c b/recipes/core/relibc/tests/sys_socket/unixsocketpair.c
new file mode 100644
index 0000000000..0f5aa0f618
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/unixsocketpair.c
@@ -0,0 +1,59 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+void socketpair_test(int flags) {
+    int sv[2]; 
+    pid_t pid;
+    char buf[64];
+    const char *parent_msg = "ping";
+    const char *child_msg = "pong";
+
+    int status = socketpair(AF_UNIX, flags, 0, sv);
+    ERROR_IF(socketpair, status, == -1);
+
+    pid = fork();
+    ERROR_IF(fork, pid, == -1);
+
+    if (pid == 0) {
+        close(sv[0]); 
+
+        ssize_t n = recv(sv[1], buf, sizeof(buf), 0);
+        ERROR_IF(recv, n, == -1);
+        printf("child:  %s\n", buf);
+
+        status = send(sv[1], child_msg, 5, 0);
+        ERROR_IF(send, status, == -1);
+
+        close(sv[1]);
+        exit(0);
+    } else {
+        close(sv[1]); 
+
+        status = send(sv[0], parent_msg, 5, 0);
+        ERROR_IF(send, status, == -1);
+
+        ssize_t n = recv(sv[0], buf, sizeof(buf), 0);
+        ERROR_IF(recv, n, == -1);
+        printf("parent: %s\n", buf);
+
+        close(sv[0]);
+        wait(NULL); 
+    }
+}
+
+int main(void) {
+    printf("SOCK_STREAM\n");
+    socketpair_test(SOCK_STREAM);
+    printf("SOCK_DGRAM\n");
+    socketpair_test(SOCK_DGRAM);
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/sys_socket/unixwrite.c b/recipes/core/relibc/tests/sys_socket/unixwrite.c
new file mode 100644
index 0000000000..4386c66be2
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_socket/unixwrite.c
@@ -0,0 +1,56 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+// similar to "unixrecv", but this test if write() works before accept().
+// "unixrecvfrom" is the similar test to this one, but using SOCK_DGRAM.
+// "unixrecvearly" is also the similar test to this one, but using recv().
+int main() {
+    int status;
+    const char* socket_path = "unix_write.sock";
+    unlink(socket_path);
+
+    int server_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    ERROR_IF(socket, server_fd, == -1);
+
+    struct sockaddr_un addr = { .sun_family = AF_UNIX };
+    strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
+
+    unlink(socket_path);
+
+    status = bind(server_fd, (struct sockaddr*)&addr, sizeof(addr));
+    ERROR_IF(bind, status, == -1);
+
+    status = listen(server_fd, 1);
+    ERROR_IF(listen, status, == -1);
+
+    int client_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    ERROR_IF(socket, client_fd, == -1);
+
+    status = connect(client_fd, (struct sockaddr*)&addr, sizeof(addr));
+    ERROR_IF(connect, status, == -1);
+
+    char *msg = "yes";
+    ssize_t ret = write(client_fd, msg, 4);
+    ERROR_IF(write, ret, == -1);
+    UNEXP_IF(raise, ret, != 4);
+
+    int accepted_fd = accept(server_fd, NULL, NULL);
+    ERROR_IF(accept, accepted_fd, == -1);
+
+    char x[4];
+    ssize_t amount = read(accepted_fd, x, 4);
+    ERROR_IF(read, amount, == -1);
+
+    close(accepted_fd);
+    close(client_fd);
+    close(server_fd);
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/sys_stat/chmod.c b/recipes/core/relibc/tests/sys_stat/chmod.c
new file mode 100644
index 0000000000..30be2a6f19
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_stat/chmod.c
@@ -0,0 +1,252 @@
+#include <fcntl.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+
+/* #if defined(__linux__) && !defined(__redox__) */
+/* #include <linux/version.h> */
+/* #else */
+/* #define KERNEL_VERSION(x,y,z) (0) */
+/* #endif */
+
+__attribute__((nonnull(2)))
+static bool check_mode(
+    int dir,
+    const char path[],
+    int flags,
+    mode_t expected
+) {
+    struct stat stat = {0};
+    if (fstatat(dir, path, &stat, flags) == -1) {
+        perror("fstatat");
+        return false;
+    }
+
+    if ((stat.st_mode & 0777) != expected) {
+        fprintf(
+            stderr,
+            "Mode mismatch\n\tExpected: %o\n\tActual: %o\n",
+            expected,
+            stat.st_mode & 0777
+        );
+        return false;
+    }
+
+    return true;
+}
+
+int main(void) {
+    int status = EXIT_FAILURE;
+
+    char template[] = "/tmp/chmtest.XXXXXX";
+    if (!mkdtemp(template)) {
+        perror("mkdtemp");
+        goto bye;
+    }
+    size_t len = sizeof(template) - 1;
+
+    // Create a file and a link to chmod.
+    const char file_name[] = "king_crimson";
+    char file_path[PATH_MAX] = {0};
+    memcpy(file_path, template, len);
+    file_path[len] = '/';
+    memcpy(&file_path[len + 1], file_name, sizeof(file_name));
+    
+    int filefd = open(file_path, O_CREAT);
+    if (filefd == -1) {
+        perror("open (file, O_CREAT)");
+        goto rmtempdir;
+    }
+
+    const char link_name[] = "red";
+    char link_path[PATH_MAX] = {0};
+    memcpy(link_path, template, len);
+    link_path[len] = '/';
+    memcpy(&link_path[len + 1], link_name, sizeof(link_name));
+
+    if (symlink(file_path, link_path) == -1) {
+        perror("symlink");
+        goto rmfiles;
+    }
+    #ifdef __redox__
+    int linkfd = open(link_path, O_PATH | O_NOFOLLOW | O_SYMLINK);
+    if (linkfd == -1) {
+        perror("open (link, O_NOFOLLOW)");
+        goto rmfiles;
+    }
+    #endif
+
+    int dir = open(template, O_DIRECTORY);
+    if (dir == -1) {
+        perror("open (temp dir)");
+        goto closelink;
+    }
+
+    // chmod
+
+    // File
+    if (chmod(file_path, 0666) == -1) {
+        perror("chmod file 0666");
+        goto closetemp;
+    }
+    if (!check_mode(dir, file_name, 0, 0666)) {
+        fprintf(stderr, "Context: chmod %s\n", file_name);
+        goto closetemp;
+    }
+
+    // Link (deferenced)
+    if (chmod(link_path, 0777) == -1) {
+        perror("chmod link 0777");
+        goto closetemp;
+    }
+    if (!check_mode(dir, file_name, 0, 0777)) {
+        fprintf(stderr, "Context: chmod %s\n", link_name);
+        goto closetemp;
+    }
+
+    // Dir
+    if (chmod(template, 0766) == -1) {
+        perror("chmod directory 0766");
+        goto closetemp;
+    }
+    if (!check_mode(dir, "", AT_EMPTY_PATH, 0766)) {
+        fprintf(stderr, "Context: chmod %s\n", template);
+        goto closetemp;
+    }
+
+    // fchmod
+
+    // File
+    if (fchmod(filefd, 0644) == -1) {
+        perror("fchmod file 0644");
+        goto closetemp;
+    }
+    if (!check_mode(dir, file_name, 0, 0644)) {
+        fprintf(stderr, "Context: fchmod %s\n", file_name);
+        goto closetemp;
+    }
+
+    // Link (not followed)
+    #ifdef __redox__
+    if (fchmod(linkfd, 0666) == -1) {
+        perror("fchmod link 0666");
+        goto closetemp;
+    }
+    if (!check_mode(dir, link_name, AT_SYMLINK_NOFOLLOW, 0666)) {
+        fprintf(stderr, "Context: fchmod %s\n", link_name);
+        goto closetemp;
+    }
+    #endif
+
+    // Directory
+    if (fchmod(dir, 0777) == -1) {
+        perror("fchmod directory 0777");
+        goto closetemp;
+    }
+    if (!check_mode(dir, "", AT_EMPTY_PATH, 0777)) {
+        fprintf(stderr, "Context: fchmod %s\n", template);
+        goto closetemp;
+    }
+
+    // fchmodat
+
+    // File (relative)
+    if (fchmodat(dir, file_name, 0666, 0) == -1) {
+        perror("fchmodat directory 0666");
+        goto closetemp;
+    }
+    if (!check_mode(dir, file_name, 0, 0666)) {
+        fprintf(stderr, "Context: fchmodat %s\n", file_name);
+        goto closetemp;
+    }
+
+    // File (absolute)
+    if (fchmodat(dir, file_path, 0777, 0) == -1) {
+        perror("fchmodat file 0777");
+        goto closetemp;
+    }
+    if (!check_mode(dir, file_name, 0, 0777)) {
+        fprintf(stderr, "Context: fchmodat %s\n", file_path);
+    }
+
+    // Link (followed)
+    if (fchmodat(dir, link_name, 0666, 0) == -1) {
+        perror("fchmodat link 0666");
+        goto closetemp;
+    }
+    if (!check_mode(dir, file_name, 0, 0666)) {
+        fprintf(stderr, "Context: fchmodat %s\n", link_name);
+        goto closetemp;
+    }
+
+    // Link (not followed)
+    #ifdef __redox__
+    if (fchmodat(dir, link_name, 0777, AT_SYMLINK_NOFOLLOW) == -1) {
+        perror("fchmodat link 0777");
+        goto closetemp;
+    }
+    if (!check_mode(dir, link_name, AT_SYMLINK_NOFOLLOW, 0777)) {
+        fprintf(stderr, "Context: fchmodat %s\n", link_name);
+        goto closetemp;
+    }
+    #endif
+
+    // Directory
+    // AT_EMPTY_PATH support is relatively new so this fails in CI.
+    #if defined(__redox__) // || LINUX_VERSION_CODE >= KERNEL_VERSION(6,6,0)
+    if (fchmodat(dir, "", 0700, AT_EMPTY_PATH) == -1) {
+        perror("fchmodat directory 0700");
+        goto closetemp;
+    }
+    if (!check_mode(dir, "", AT_EMPTY_PATH, 0700)) {
+        fprintf(stderr, "Context: fchmodat %s\n", template);
+        goto closetemp;
+    }
+
+    // Directory (cwd)
+    char old_cwd[PATH_MAX] = {0};
+    if (!getcwd(old_cwd, PATH_MAX)) {
+        perror("getcwd");
+        goto closetemp;
+    }
+    if (chdir(template) == -1) {
+        perror("chdir (temp dir)");
+        goto closetemp;
+    }
+
+    if (fchmodat(AT_FDCWD, "", 0777, AT_EMPTY_PATH) == -1) {
+        perror("fchmodat cwd 0777");
+        goto closetemp;
+    }
+    if (!check_mode(AT_FDCWD, "", AT_EMPTY_PATH, 0777)) {
+        fprintf(stderr, "Context: fchmodat %s\n", template);
+        goto closetemp;
+    }
+
+    if (chdir(old_cwd) == -1) {
+        perror("chdir (old cwd)");
+        goto closetemp;
+    }
+    #endif
+
+    status = EXIT_SUCCESS;
+closetemp:
+    close(dir);
+closelink:
+    #ifdef __redox__
+    close(linkfd);
+    #endif
+rmfiles:
+    close(filefd);
+    unlink(file_path);
+    unlink(link_path);
+rmtempdir:
+    rmdir(template);
+bye:
+    return status;
+}
diff --git a/recipes/core/relibc/tests/sys_stat/fstatat.c b/recipes/core/relibc/tests/sys_stat/fstatat.c
new file mode 100644
index 0000000000..a3a2b075c0
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_stat/fstatat.c
@@ -0,0 +1,356 @@
+#include <assert.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+
+// Create file `dir/name` and fill it with `contents`.
+__attribute__((nonnull))
+static const char* mktestfile(
+        const char dir[],
+        const char name[],
+        const char contents[]
+) {
+    size_t dir_len = strlen(dir);
+    size_t name_len = strlen(name);
+
+    // dir + / name + \0
+    char* path = malloc(dir_len + name_len + 2);
+    if (!path) {
+        perror("malloc");
+        return NULL;
+    }
+    // memcpy is faster/recommended but I'm lazy.
+    strcpy(path, dir);
+    strcat(path, "/");
+    strcat(path, name);
+
+    int fd = creat(path, 0700);
+    if (fd < 0) {
+        perror("creat");
+        free(path);
+        return NULL;
+    }
+
+    size_t contents_len = strlen(contents);
+    // Assumes that the handful of bytes of contents are fully written.
+    if (write(fd, contents, contents_len) < 0) {
+        perror("write");
+        free(path);
+        close(fd);
+        return NULL;
+    }
+
+    close(fd);
+    return path;
+}
+
+// Create a symlink, `dir/name`, to `target` and return its path.
+__attribute__((nonnull))
+static const char* mktestlink(
+    const char dir[],
+    const char name[],
+    const char target[]
+) {
+    char* path = malloc(strlen(dir) + strlen(name) + 2);
+    if (!path) {
+        perror("malloc");
+        return NULL;
+    }
+
+    strcpy(path, dir);
+    strcat(path, "/");
+    strcat(path, name);
+
+    if (symlink(target, path) == -1) {
+        perror("symlink");
+        free(path);
+        return NULL;
+    }
+
+    return path;
+}
+
+__attribute__((nonnull))
+static int run_test(
+    int fd,
+    int flags,
+    const char name[],
+    const char path[],
+    size_t expected,
+    mode_t mode
+) {
+    struct stat stat = {0};
+    if (fstatat(fd, name, &stat, flags) == -1) {
+        perror("fstatat");
+        return -1;
+    }
+
+    if ((size_t) stat.st_size != expected) {
+        fprintf(
+            stderr,
+            "fstatat invalid stats\n\tFile: %s\n\tExpected: %zu Actual: %ld\n",
+            path,
+            expected,
+            stat.st_size
+        );
+        return -1;
+    }
+    if ((stat.st_mode & S_IFMT) != mode) {
+        fprintf(
+            stderr,
+            "fstatat invalid mode\n\tFile: %s\n",
+            path
+        );
+        return -1;
+    }
+
+    // We create the temp dirs/files therefore we should own them.
+    uid_t uid = getuid();
+    gid_t gid = getgid();
+    if (stat.st_uid != uid || stat.st_gid != gid) {
+        fputs("fstatat invalid UID or GID", stderr);
+        fprintf(
+            stderr, 
+            "\n\tExpected UID: %u\n\tActual UID: %u\n",
+            uid, stat.st_uid
+        );
+        fprintf(
+            stderr, 
+            "\n\tExpected GID: %u\n\tActual GID: %u\n",
+            gid, stat.st_gid
+        );
+
+    }
+
+    return 0;
+}
+
+int main(void) {
+    int status = EXIT_FAILURE;
+
+    char dir_template_A[] = "/tmp/fsatest.XXXXXXX";
+    char* dir_A = mkdtemp(dir_template_A);
+    if (!dir_A) {
+        perror("mkdtemp (dir A)");
+        goto bye;
+    }
+
+    char dir_template_B[] = "/tmp/fsatest.XXXXXXX";
+    char* dir_B = mkdtemp(dir_template_B);
+    if (!dir_B) {
+        perror("mkdtemp (dir B)");
+        goto clean_dir_a;
+    }
+
+    // File in directory A
+    const char name[] = "file";
+    const char cont_A[] = "Flying Dutchman";
+    const char* file_A = mktestfile(dir_A, name, cont_A);
+    if (!file_A) {
+        goto clean_dir_b;
+    }
+    // Link from directory A to file A
+    const char link_A_name[] = "alink";
+    const char* link_A = mktestlink(dir_A, link_A_name, file_A);
+    if (!link_A) {
+        goto clean_file_a;
+    }
+
+    // File in directory B
+    const char cont_B[] = "Every Villain is Lemons";
+    const char* file_B = mktestfile(dir_B, name, cont_B);
+    if (!file_B) {
+        goto unlink_link_A;
+    }
+    const char link_B_name[] = "blink";
+    // Link from directory A to file B in directory B
+    const char* link_B = mktestlink(dir_A, link_B_name, file_B);
+    if (!link_B) {
+        goto unlink_file_B;
+    }
+
+    // TESTS
+    // The size of the file is used as a proxy for checking that stat worked.
+    int dir_a_fd = open(dir_A, O_DIRECTORY);
+    if (dir_a_fd == -1) {
+        perror("open (dir A)");
+        goto unlink_link_B;
+    }
+
+    // fstatat works (basic)
+    size_t len_cont_A = strlen(cont_A);
+    if (run_test(dir_a_fd, 0, name, file_A, len_cont_A, S_IFREG) == -1) {
+        goto close_dir_a_fd;
+    }
+    
+    // fstatat follows symlinks (same dir)
+    if (run_test(dir_a_fd, 0, link_A_name, link_A, len_cont_A, S_IFREG) == -1) {
+        fprintf(stderr, "Context: link %s -> %s\n", link_A, file_A);
+        goto close_dir_a_fd;
+    }
+
+    // fstatat follows symlinks (to diff dir)
+    size_t len_cont_B = strlen(cont_B);
+    if (run_test(dir_a_fd, 0, link_B_name, link_B, len_cont_B, S_IFREG) == -1) {
+        fprintf(stderr, "Context: link %s -> %s\n", link_B, file_B);
+        goto close_dir_a_fd;
+    }
+
+    // AT_SYMLINK_NOFOLLOW
+    if (
+        run_test(
+            dir_a_fd,
+            AT_SYMLINK_NOFOLLOW,
+            link_A_name,
+            link_A,
+            strlen(file_A),
+            S_IFLNK
+        ) == -1
+    ) {
+        fprintf(stderr, "Context: link %s (no follow)\n", link_A);
+        goto close_dir_a_fd;
+    }
+
+    // TODO: O_SEARCH (no Redox support)
+
+    // AT_FDCWD
+    char old_cwd[PATH_MAX] = {0};
+    if (!getcwd(old_cwd, PATH_MAX)) {
+        perror("getcwd");
+        goto close_dir_a_fd;
+    }
+    if (chdir(dir_A) == -1) {
+        perror("chdir");
+        goto close_dir_a_fd;
+    }
+    if (run_test(AT_FDCWD, 0, name, "./", len_cont_A, S_IFREG) == -1) {
+        fputs("Context: AT_FDCWD\n", stderr);
+        goto close_dir_a_fd;
+    }
+    if (chdir(old_cwd) == -1) {
+        perror("chdir");
+        goto close_dir_a_fd;
+    }
+
+    // Absolute path
+    if (run_test(dir_a_fd, 0, file_A, file_A, len_cont_A, S_IFREG) == -1) {
+        fprintf(stderr, "Context: absolute path %s\n", file_A);
+        goto close_dir_a_fd;
+    }
+
+    // Relative path that traverses dir boundaries
+    // The path isn't resolved beneath the directory but rather resolved
+    // relative to it. Directory traversal is allowed if AT_RESOLVE_BENEATH
+    // isn't used.
+    const char nested_name[] = "nested";
+    char* nested_dir = malloc(strlen(dir_A) + strlen(nested_name) + 2);
+    if (!nested_dir) {
+        perror("malloc");
+        goto close_dir_a_fd;
+    }
+    strcpy(nested_dir, dir_A);
+    strcat(nested_dir, "/");
+    strcat(nested_dir, nested_name);
+    if (mkdir(nested_dir, 0700) == -1) {
+        perror("mkdir");
+        goto clean_nested_dir;
+    }
+    
+    int nested_fd = open(nested_dir, O_DIRECTORY);
+    if (nested_fd < 0) {
+        perror("open");
+        goto remove_nested_dir;
+    }
+    char rel_nested[sizeof(name) + 5] = "../";
+    strcat(rel_nested, name);
+    if (
+        run_test(
+            nested_fd,
+            0,
+            rel_nested,
+            rel_nested,
+            len_cont_A,
+            S_IFREG
+        ) == -1
+    ) {
+        fprintf(
+            stderr,
+            "Context: relative path from %s to ../%s\n",
+            nested_dir,
+            name
+        );
+        goto close_nested_dir;
+    }
+
+    // TODO: AT_RESOLVE_BENEATH
+
+    // AT_EMPTY_PATH (empty path)
+    struct stat stat = {0};
+    if (fstatat(dir_a_fd, "", &stat, AT_EMPTY_PATH) == -1) {
+        fputs("Context: AT_EMPTY_PATH with empty path\n", stderr);
+        goto close_dir_a_fd;
+    }
+    if ((stat.st_mode & S_IFMT) != S_IFDIR) {
+        fputs("Context: AT_EMPTY_PATH should stat dir (empty path)\n", stderr);
+        goto close_dir_a_fd;
+    }
+    
+    // AT_EMPTY_PATH (non-empty path)
+    if (
+        run_test(
+            dir_a_fd,
+            AT_EMPTY_PATH,
+            link_A_name,
+            link_A,
+            len_cont_A,
+            S_IFREG
+        ) == -1
+    ) {
+        fputs("Context: AT_EMPTY_PATH with path should stat path\n", stderr);
+        goto close_dir_a_fd;
+    }
+
+    // TODO: Swapped directories resolves correctly
+
+    // Failure conditions:
+    // Empty path without AT_EMPTY_PATH
+    stat = (struct stat) {0};
+    if (fstatat(dir_a_fd, "", &stat, 0) == 0) {
+        fputs("Context: empty path should fail\n", stderr);
+        goto close_dir_a_fd;
+    }
+
+    // Clean up is LIFO where the last created resource is the first cleaned.
+    status = EXIT_SUCCESS;
+close_nested_dir:
+    close(nested_fd);
+remove_nested_dir:
+    rmdir(nested_dir);
+clean_nested_dir:
+    free((void*) nested_dir);
+close_dir_a_fd:
+    close(dir_a_fd);
+unlink_link_B:
+    unlink(link_B);
+    free((void*) link_B);
+unlink_file_B:
+    unlink(file_B);
+    free((void*) file_B);
+unlink_link_A:
+    unlink(link_A);
+    free((void*) link_A);
+clean_file_a:
+    unlink(file_A);
+    free((void*) file_A);
+clean_dir_b:
+    rmdir(dir_B);
+clean_dir_a:
+    rmdir(dir_A);
+bye:
+    return status;
+}
diff --git a/recipes/core/relibc/tests/sys_stat/lstat.c b/recipes/core/relibc/tests/sys_stat/lstat.c
new file mode 100644
index 0000000000..9dd4dd05c1
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_stat/lstat.c
@@ -0,0 +1,101 @@
+#include <assert.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+
+int main(void) {
+    int status = EXIT_FAILURE;
+
+    char tempdir_path[] = "/tmp/lstat_test.XXXXXX";
+    if (!mkdtemp(tempdir_path)) {
+        perror("mkdtemp");
+        goto bye;
+    }
+    int tempdir = open(tempdir_path, O_DIRECTORY);
+    if (tempdir == -1) {
+        perror("open (tempdir)");
+        goto rmtemp;
+    }
+
+    // Source
+    const char src_name[] = "kerouac";
+    char src_buf[PATH_MAX] = {0};
+    strcpy(src_buf, tempdir_path);
+    strcat(src_buf, "/");
+    strcat(src_buf, src_name);
+    // TODO: Use openat
+    int source = open(src_buf, O_CREAT);
+    if (source == -1) {
+        perror("open");
+        goto close_dir;
+    }
+
+    // Dest (link)
+    const char dst_name[] = "on_the_road";
+    char dst_buf[PATH_MAX] = {0};
+    strcpy(dst_buf, tempdir_path);
+    strcat(dst_buf, "/");
+    strcat(dst_buf, dst_name);
+    if (symlink(src_buf, dst_buf) == -1) {
+        perror("symlink");
+        goto rm_source;
+    }
+
+    struct stat src_stat = {0};
+    if (fstatat(tempdir, dst_name, &src_stat, 0) == -1) {
+        perror("fstatat");
+        goto rm_dest;
+    }
+    // Quick consistency check
+    uid_t uid = getuid();
+    gid_t gid = getgid();
+    if (src_stat.st_uid != uid) {
+        fprintf(
+            stderr,
+            "uid:\n\tExpected %ld\n\tActual: %ld\n",
+            (intmax_t) uid,
+            (intmax_t) gid
+        );
+        goto rm_dest;
+    }
+    if (src_stat.st_nlink != 1) {
+        fputs("nlink: Expected one hard link\n", stderr);
+        goto rm_dest;
+    }
+    if ((src_stat.st_mode & S_IFMT) != S_IFREG) {
+        fputs("mode: Expected a normal file\n", stderr);
+        goto rm_dest;
+    }
+
+    struct stat dst_stat = {0};
+    if (lstat(dst_buf, &dst_stat) == -1) {
+        perror("lstat");
+        goto rm_dest;
+    }
+    if (memcmp(&src_stat, &dst_stat, sizeof(struct stat)) == 0) {
+        fputs("lstat incorrectly followed the symlink\n", stderr);
+        goto rm_dest;
+    }
+    if ((dst_stat.st_mode & S_IFMT) != S_IFLNK) {
+        fputs("lstat did not stat a link\n", stderr);
+        goto rm_dest;
+    }
+
+    status = EXIT_SUCCESS;
+rm_dest:
+    unlink(dst_buf);
+rm_source:
+    unlink(src_buf);
+close_dir:
+    close(tempdir);
+rmtemp:
+    rmdir(tempdir_path);
+bye:
+    return status;
+}
diff --git a/recipes/core/relibc/tests/sys_stat/stat.c b/recipes/core/relibc/tests/sys_stat/stat.c
new file mode 100644
index 0000000000..95fadb1751
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_stat/stat.c
@@ -0,0 +1,31 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    printf("sizeof(struct stat): %ld\n", sizeof(struct stat));
+
+    struct stat buf = {0};
+
+    int stat_status = stat("sys_stat/stat.c", &buf);
+    ERROR_IF(stat, stat_status, == -1);
+    UNEXP_IF(stat, stat_status, != 0);
+
+    printf("st_size: %lu\n", buf.st_size);
+    printf("st_blksize: %lu\n", buf.st_blksize);
+    printf("st_dev: %lu\n", buf.st_dev);
+    printf("st_ino: %lu\n", buf.st_ino);
+    printf("st_mode: %o\n", buf.st_mode);
+    printf("st_nlink: %lu\n", buf.st_nlink);
+    printf("st_uid: %u\n", buf.st_uid);
+    printf("st_gid: %u\n", buf.st_gid);
+
+    assert(buf.st_size > 600);
+    assert(buf.st_nlink == 1);
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/sys_statvfs/statvfs.c b/recipes/core/relibc/tests/sys_statvfs/statvfs.c
new file mode 100644
index 0000000000..62785f1bfa
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_statvfs/statvfs.c
@@ -0,0 +1,42 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/statvfs.h>
+
+int test_statvfs(const char *path) {
+    struct statvfs buf;
+
+    printf("Testing statvfs on: %s\n", path);
+
+    if (statvfs(path, &buf) != 0) {
+        perror("statvfs failed");
+        return EXIT_FAILURE;
+    }
+
+    printf("  Filesystem block size: %lu\n", buf.f_bsize);
+    printf("  Fragment size:         %lu\n", buf.f_frsize);
+    printf("  Total blocks:          %lu\n", buf.f_blocks);
+    printf("  Free blocks:           %lu\n", buf.f_bfree);
+    printf("  Available blocks:      %lu\n", buf.f_bavail);
+    printf("  Total inodes:          %lu\n", buf.f_files);
+    printf("  Free inodes:           %lu\n", buf.f_ffree);
+
+    if (buf.f_bsize == 0 || buf.f_frsize == 0) {
+        fprintf(stderr, "ERROR: Block size or fragment size is zero.\n");
+        return EXIT_FAILURE;
+    }
+
+    if (buf.f_blocks == 0) {
+        fprintf(stderr, "ERROR: Total number of blocks is zero.\n");
+        return EXIT_FAILURE;
+    }
+
+    return 0;
+}
+
+int main(void) {
+    const char *test_path = "/";
+
+    return test_statvfs(test_path);
+}
diff --git a/recipes/core/relibc/tests/sys_syslog/syslog.c b/recipes/core/relibc/tests/sys_syslog/syslog.c
new file mode 100644
index 0000000000..f7a5a2e75a
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_syslog/syslog.c
@@ -0,0 +1,46 @@
+#include <stdlib.h>
+#include <syslog.h>
+
+int main(void) {
+    // Test that syslog succeeds without explicitly calling openlog
+    syslog(LOG_INFO, "Testing syslog; disregard");
+    closelog();
+
+    // The rest of the tests use LOG_PERROR so we get verifiable output on stderr
+    openlog("relibc_test",
+            LOG_CONS | LOG_PERROR | LOG_NDELAY,
+            LOG_LOCAL2
+    );
+
+    // Basic
+    syslog(LOG_EMERG, "This is a test message with formatting: %d", 5);
+
+    // Only alert should print
+    setlogmask(LOG_MASK(LOG_ALERT));
+    syslog(LOG_ALERT, "Hank Hill");
+    syslog(LOG_EMERG, "Sells propane and propane accessories");
+
+    // Squelch all logs with a priority less than WARNING.
+    setlogmask(LOG_UPTO(LOG_WARNING));
+    // First line should be emitted while the second shouldn't.
+    syslog(LOG_WARNING, "Foo has been bar'd");
+    syslog(LOG_NOTICE, "I am a very spammy log message. Ha!");
+
+    // All of these should print
+    setlogmask(LOG_UPTO(LOG_DEBUG));
+    syslog(LOG_DEBUG, "And now, Eeveelutions");
+    syslog(LOG_DEBUG, "Espeon");
+    syslog(LOG_INFO, "Umbreon");
+    syslog(LOG_NOTICE, "Sylveon");
+    syslog(LOG_WARNING, "Glaceon");
+    syslog(LOG_ERR, "Leafeon");
+    syslog(LOG_CRIT, "Vaporeon");
+    syslog(LOG_ALERT, "Flareon");
+    syslog(LOG_EMERG, "Jolteon");
+    
+    // The log file should automatically open even if closed.
+    closelog();
+    syslog(LOG_INFO, "Bye from relibc's syslog tests!");
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/sys_utsname/uname.c b/recipes/core/relibc/tests/sys_utsname/uname.c
new file mode 100644
index 0000000000..836fef71fd
--- /dev/null
+++ b/recipes/core/relibc/tests/sys_utsname/uname.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include <sys/utsname.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    struct utsname system_info;
+
+    int result = uname(&system_info);
+    ERROR_IF(uname, result, == -1);
+    UNEXP_IF(uname, result, < 0);
+
+    printf("sysname: '%s'\n", system_info.sysname);
+    printf("nodename: '%s'\n", system_info.nodename);
+    printf("release: '%s'\n", system_info.release);
+    printf("version: '%s'\n", system_info.version);
+    printf("machine: '%s'\n", system_info.machine);
+    //printf("domainname: '%s'\n", system_info.domainname);
+}
diff --git a/recipes/core/relibc/tests/termios.c b/recipes/core/relibc/tests/termios.c
new file mode 100644
index 0000000000..36436811d6
--- /dev/null
+++ b/recipes/core/relibc/tests/termios.c
@@ -0,0 +1,57 @@
+#include <assert.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <termios.h>
+#include <unistd.h>
+
+int main(void) {
+    // Check that the tty supports VDISABLE
+    int vdisable = pathconf("/dev/tty", _PC_VDISABLE);
+    assert(vdisable == _POSIX_VDISABLE);
+
+    int termfd = open("/dev/tty", O_RDWR, O_NDELAY | O_NOCTTY);
+    if (termfd < 0) {
+        perror("open");
+        return EXIT_FAILURE;
+    }
+
+    // Currently set/default options
+    struct termios termios = {0};
+    if (tcgetattr(termfd, &termios) < 0) {
+        perror("tcgetattr");
+        close(termfd);
+        return EXIT_FAILURE;
+    }
+    struct termios term_restore = termios;
+
+    const cc_t verase = termios.c_cc[VERASE];
+    assert(verase != _POSIX_VDISABLE);
+    // Disable backspace key control char
+    termios.c_cc[VERASE] = _POSIX_VDISABLE;
+
+    if (tcsetattr(termfd, TCSANOW, &termios) < 0) {
+        perror("tcsetattr (setting VDISABLE)");
+        close(termfd);
+        return EXIT_FAILURE;
+    }
+
+    // Check that it was actually set
+    struct termios term_vdisable = {0};
+    if (tcgetattr(termfd, &term_vdisable) < 0) {
+        perror("tcgetattr (after setting VDISABLE)");
+        close(termfd);
+        return EXIT_FAILURE;
+    }
+    assert(term_vdisable.c_cc[VERASE] == _POSIX_VDISABLE);
+
+    // Restore old config
+    if (tcsetattr(termfd, TCSAFLUSH, &term_restore) < 0) {
+        perror("tcsetattr (restoring settings)");
+        close(termfd);
+        return EXIT_FAILURE;
+    }
+
+    close(termfd);
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/test_helpers.h b/recipes/core/relibc/tests/test_helpers.h
new file mode 100644
index 0000000000..de4a360951
--- /dev/null
+++ b/recipes/core/relibc/tests/test_helpers.h
@@ -0,0 +1,132 @@
+#ifndef _TEST_HELPERS
+#define _TEST_HELPERS
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+// Throws errors on a well-defined API error values.
+//
+// Only use with API functions that sets the errno variable.
+// Do not pass functions as the status or condition arguments, they might be
+// evaluated multiple times.
+//
+// Usage example:
+//
+// > Upon successful completion, fclose() returns 0.
+// > Otherwise, it returns EOF and sets errno to indicate the error.
+//
+// int status = fclose(fp);
+// ERROR_IF(fclose, status, == EOF);
+//
+// Use it only for checking the API error values.
+// Do not use it for checking the correctness of the results. If you need to
+// do that, print the values to the standard output and use the expected outputs
+// directory.
+//
+// For example:
+//
+// int c = fgetc(f);            // !!! DO NOT USE THIS WAY !!!
+// ERROR_IF(fgetc, c, != 'H');  // !!! DO NOT USE THIS WAY !!!
+//
+// Correct usage:
+//
+// int c = fgetc(f);            // OK
+// ERROR_IF(fgetc, c, == EOF);  // OK
+// printf("result: %c\n", c);   // OK
+//
+#define ERROR_IF(func, status, condition) \
+    do { \
+        if (status condition) { \
+            fprintf(stderr, "%s:%s:%d: '%s' failed: %s (%d)\n", \
+                __FILE__, __func__, __LINE__, #func, strerror(errno), errno); \
+            _exit(EXIT_FAILURE); \
+        } \
+    } while(0)
+
+#define ERROR_IF2(func, status, condition) \
+    do { \
+        if (status condition) { \
+            fprintf(stderr, "%s:%s:%d: '%s' failed: %s (%d)\n", \
+                __FILE__, __func__, __LINE__, #func, strerror(status), status); \
+            _exit(EXIT_FAILURE); \
+        } \
+    } while(0)
+
+// Throws errors on API return values not defined by the standards.
+//
+// Do not pass functions as the status or condition arguments, they might be
+// evaluated multiple times.
+//
+// Use it only for detecting return values that should have never been returned
+// in any case by the API functions.
+//
+// Usage example:
+//
+// > The fgetc() function obtains the next byte as an unsigned char
+// > converted to an int.
+//
+// int c = fgetc(f);
+// UNEXP_IF(fgetc, c, < 0);
+// UNEXP_IF(fgetc, c, > 255);
+//
+#define UNEXP_IF(func, status, condition) \
+    do { \
+        if (status condition) { \
+            fprintf(stderr, "%s:%s:%d: '%s' returned a non-standard value: ", \
+                __FILE__, __func__, __LINE__, #func); \
+            fprintf(stderr, _Generic((status), \
+                char *: "char*(%p) = \"%1$s\"", \
+                void *: "void*(%p)", \
+                ssize_t: "%li", \
+                default: "%i" \
+            ), status); \
+            fprintf(stderr, "\n"); \
+            _exit(EXIT_FAILURE); \
+        } \
+    } while (0)
+
+// A convenience macro to show where the test fail.
+#define exit(code) \
+    do { \
+        if (code != EXIT_SUCCESS) { \
+            fprintf(stderr, "%s:%s:%d: Test failed with exit(%s)\n", \
+                __FILE__, __func__, __LINE__, #code); \
+        } \
+        _exit(code); \
+    } while(0)
+
+// Duplicate of lrand48() logic but suitable for multithreaded use
+int random_bool() {
+    _Thread_local static uint64_t xsubi = 0;
+    xsubi = (0x5deece66d * xsubi + 0xb) & (0xffffffffffff);
+    return (xsubi >> 17) % 2 == 0;
+}
+
+// Quick helper for checking desired errno status.
+// Use as macro: CHECK_AND_PRINT_ERRNO(<desired errno, e.g. EINVAL>);
+// If errno is as expected, prints this; otherwise, prints expected vs. actual and exit.
+void printf_errno(int errnoval, char *errnoname) {
+
+    printf("%d (%s)",
+               errno, strerror(errno));
+    if (errno != errnoval) {
+        printf("\n^^^^^ FAILURE ^^^^^ (SHOULD BE %d - %s (%s))\n",
+               errnoval, errnoname, strerror(errnoval));
+    } else {
+        printf(" - %s\n", errnoname);
+    }
+}
+
+#define CHECK_AND_PRINT_ERRNO(errnoval)     \
+    do {                                    \
+        printf_errno(errnoval, #errnoval);  \
+        if (errnoval != errno) {            \
+            exit(EXIT_FAILURE);             \
+        }                                   \
+    } while(0);
+
+#endif /* _TEST_HELPERS */
diff --git a/recipes/core/relibc/tests/time/asctime.c b/recipes/core/relibc/tests/time/asctime.c
new file mode 100644
index 0000000000..2525eddf0a
--- /dev/null
+++ b/recipes/core/relibc/tests/time/asctime.c
@@ -0,0 +1,39 @@
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    time_t unix_epoch = 0;
+    struct tm *unix_epoch_tm_ptr = gmtime(&unix_epoch);
+
+    char *time_string = NULL;
+
+    /* Min/max non-UB-causing values according to ISO C11 and newer. */
+    struct tm iso_c_min_tm = {.tm_sec = 0, .tm_min = 0, .tm_hour = 0, .tm_mday = 1, .tm_mon = 0, .tm_year = 1000-1900, .tm_wday = 0, .tm_yday = 0, .tm_isdst = 0, .tm_gmtoff = 0, .tm_zone = NULL};
+    struct tm iso_c_max_tm = {.tm_sec = 60, .tm_min = 59, .tm_hour = 23, .tm_mday = 31, .tm_mon = 11, .tm_year = 9999-1900, .tm_wday = 6, .tm_yday = 0, .tm_isdst = 0, .tm_gmtoff = 0, .tm_zone = NULL};
+
+    /* Min/max non-UB-causing values according to POSIX (issue 7). These
+     * will cause UB according to the ISO standard! */
+    struct tm posix_min_tm = {.tm_sec = 0, .tm_min = 0, .tm_hour = 0, .tm_mday = -99, .tm_mon = 0, .tm_year = -999-1900, .tm_wday = 0, .tm_yday = 0, .tm_isdst = 0, .tm_gmtoff = 0, .tm_zone = NULL};
+    struct tm posix_max_tm = {.tm_sec = 99, .tm_min = 99, .tm_hour = 99, .tm_mday = 999, .tm_mon = 11, .tm_year = 9999-1900, .tm_wday = 6, .tm_yday = 0, .tm_isdst = 0, .tm_gmtoff = 0, .tm_zone = NULL};
+
+    time_string = asctime(unix_epoch_tm_ptr);
+    printf("%s", time_string);
+
+    time_string = asctime(&iso_c_min_tm);
+    printf("%s", time_string);
+
+    time_string = asctime(&iso_c_max_tm);
+    printf("%s", time_string);
+
+    time_string = asctime(&posix_min_tm);
+    printf("%s", time_string);
+
+    time_string = asctime(&posix_max_tm);
+    printf("%s", time_string);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/time/constants.c b/recipes/core/relibc/tests/time/constants.c
new file mode 100644
index 0000000000..b29f13f253
--- /dev/null
+++ b/recipes/core/relibc/tests/time/constants.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+#include <time.h>
+
+int main(void) {
+    /* TODO: ensure that it is really time.h supplying the NULL constant */
+    printf("%p\n", NULL);
+
+    /* Cast to long to avoid format string mismatch in case CLOCKS_PER_SEC is
+    defined as some other type. The expected value (1 million) will always fit
+    in a long and will always have that value on conforming systems. */
+    printf("%ld\n", (long)CLOCKS_PER_SEC);
+}
diff --git a/recipes/core/relibc/tests/time/gettimeofday.c b/recipes/core/relibc/tests/time/gettimeofday.c
new file mode 100644
index 0000000000..e43b38dc86
--- /dev/null
+++ b/recipes/core/relibc/tests/time/gettimeofday.c
@@ -0,0 +1,14 @@
+#include <sys/time.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    struct timeval tv;
+
+    // gettimeofday always returns 0, no errors are defined
+    int gtod = gettimeofday(&tv, NULL);
+    UNEXP_IF(gettimeofday, gtod, != 0);
+
+    printf("%ld: %ld\n", tv.tv_sec, tv.tv_usec);
+}
diff --git a/recipes/core/relibc/tests/time/gmtime.c b/recipes/core/relibc/tests/time/gmtime.c
new file mode 100644
index 0000000000..da4bdb08d7
--- /dev/null
+++ b/recipes/core/relibc/tests/time/gmtime.c
@@ -0,0 +1,113 @@
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helpers.h"
+
+void print_tm(const struct tm *tm_ptr) {
+    printf("  tm_sec    = %d\n", tm_ptr->tm_sec);
+    printf("  tm_min    = %d\n", tm_ptr->tm_min);
+    printf("  tm_hour   = %d\n", tm_ptr->tm_hour);
+    printf("  tm_mday   = %d\n", tm_ptr->tm_mday);
+    printf("  tm_mon    = %d\n", tm_ptr->tm_mon);
+    printf("  tm_year   = %d\n", tm_ptr->tm_year);
+    printf("  tm_wday   = %d\n", tm_ptr->tm_wday);
+    printf("  tm_yday   = %d\n", tm_ptr->tm_yday);
+    printf("  tm_isdst  = %d\n", tm_ptr->tm_isdst);
+    printf("  tm_gmtoff = %ld\n", tm_ptr->tm_gmtoff);
+    printf("  tm_zone   = %s\n", tm_ptr->tm_zone);
+}
+
+int main(void) {
+    time_t unix_epoch_seconds = 0;
+
+    // Exercise the different branches of the leap year logic
+    // 1970: common year
+    time_t y1970_mar01_seconds = 5097600;    // 1970-03-01 00:00:00
+    time_t y1970_dec31_seconds = 31535999;   // 1970-12-31 23:59:59
+
+    // 1972: leap year
+    time_t y1972_feb29_seconds = 68255999;   // 1972-02-29 23:59:59
+    time_t y1972_dec31_seconds = 94694399;   // 1972-12-31 23:59:59
+
+    // 2000: leap year
+    time_t y2000_feb29_seconds = 951868799;  // 2000-02-29 23:59:59
+    time_t y2000_dec31_seconds = 978307199;  // 2000-12-31 23:59:59
+
+    // 2100: common year
+    time_t y2100_mar01_seconds = 4107542400; // 2100-03-01 00:00:00
+    time_t y2100_dec31_seconds = 4133980799; // 2100-12-31 23:59:59
+
+    // Year 2038-related corner cases
+    time_t y2038_pre_seconds = 2147483647;
+    time_t y2038_post_seconds = 2147483648;
+    time_t y2106_pre_seconds = 4294967295;
+    time_t y2106_post_seconds = 4294967296;
+
+    struct tm *result_tm = NULL;
+
+    puts("Unix epoch:");
+    result_tm = gmtime(&unix_epoch_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("1970-03-01 00:00:00:");
+    result_tm = gmtime(&y1970_mar01_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("1970-12-31 23:59:59:");
+    result_tm = gmtime(&y1970_dec31_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("1972-02-29 23:59:59:");
+    result_tm = gmtime(&y1972_feb29_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("1972-12-31 23:59:59:");
+    result_tm = gmtime(&y1972_dec31_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("2000-02-29 23:59:59:");
+    result_tm = gmtime(&y2000_feb29_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("2000-12-31 23:59:59:");
+    result_tm = gmtime(&y2000_dec31_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("2100-03-01 00:00:00:");
+    result_tm = gmtime(&y2100_mar01_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("2100-12-31 23:59:59:");
+    result_tm = gmtime(&y2100_dec31_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("Year 2038, pre-i32 overflow:");
+    result_tm = gmtime(&y2038_pre_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("Year 2038, post-i32 overflow:");
+    result_tm = gmtime(&y2038_post_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("Year 2106, pre-u32 overflow:");
+    result_tm = gmtime(&y2106_pre_seconds);
+    print_tm(result_tm);
+
+    puts("");
+    puts("Year 2106, post-u32 overflow:");
+    result_tm = gmtime(&y2106_post_seconds);
+    print_tm(result_tm);
+}
diff --git a/recipes/core/relibc/tests/time/localtime.c b/recipes/core/relibc/tests/time/localtime.c
new file mode 100644
index 0000000000..9d1098fd40
--- /dev/null
+++ b/recipes/core/relibc/tests/time/localtime.c
@@ -0,0 +1,31 @@
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int day = 60 * 60 * 24;
+    time_t inputs[] = { -(day * 33), -day, -1, -500, 0, 1, 1531454950 };
+    for (size_t i = 0; i < (sizeof(inputs) / sizeof(time_t)); i += 1) {
+        struct tm* t = localtime(&inputs[i]);
+
+        printf(
+            "Year %d, Day of year: %d, Month %d, Day of month: %d, Day of week: %d, %d:%d:%d\n",
+            t->tm_year, t->tm_yday, t->tm_mon, t->tm_mday, t->tm_wday, t->tm_hour, t->tm_min, t->tm_sec
+        );
+    }
+
+    time_t input = 1531461823;
+    fputs(ctime(&input), stdout); // Omit newline
+
+    char ctime_r_buffer[26];
+    /* ctime_r() generally returns the address of the provided buffer,
+     * but may return NULL upon error according to the spec. */
+    char *ctime_r_result = ctime_r(&input, ctime_r_buffer);
+    if (ctime_r_result == ctime_r_buffer) {
+        fputs(ctime_r_result, stdout);
+    } else {
+        printf("Unexpected pointer from ctime_r: %p\n", ctime_r_result);
+    }
+}
diff --git a/recipes/core/relibc/tests/time/localtime_r.c b/recipes/core/relibc/tests/time/localtime_r.c
new file mode 100644
index 0000000000..a874daee1e
--- /dev/null
+++ b/recipes/core/relibc/tests/time/localtime_r.c
@@ -0,0 +1,124 @@
+#include <assert.h>
+#include <time.h>
+#include <string.h>
+#include <stdlib.h>
+
+void test_localtime_r_epoch() {
+    time_t t = 0;  // Unix epoch (1970-01-01 00:00:00)
+    struct tm result;
+
+    setenv("TZ", "UTC", 1);
+    tzset();
+
+    assert(localtime_r(&t, &result) != NULL); 
+    assert(result.tm_year == 70);   // Year 1970 - 1900
+    assert(result.tm_mon == 0);     // January
+    assert(result.tm_mday == 1);    // 1st of January
+    assert(result.tm_hour == 0);    // Midnight
+    assert(result.tm_min == 0);     
+    assert(result.tm_sec == 0);     
+
+    assert(result.tm_isdst == -1 || result.tm_isdst == 0);
+}
+
+void test_localtime_r_non_epoch() {
+    time_t t = 1609459200;  // January 1, 2021 00:00:00 UTC (New Year 2021)
+    struct tm result;
+
+    setenv("TZ", "UTC", 1);
+    tzset();
+
+    assert(localtime_r(&t, &result) != NULL);
+    assert(result.tm_year == 121);  // Year 2021 - 1900
+    assert(result.tm_mon == 0);    // January
+    assert(result.tm_mday == 1);   // 1st of January
+    assert(result.tm_hour == 0);   // Midnight
+    assert(result.tm_min == 0);
+    assert(result.tm_sec == 0);
+}
+
+void test_localtime_r_dst() {
+    time_t t = 1615708800;  // March 14 2021 08:00:00 UTC
+    struct tm result;
+
+    setenv("TZ", "UTC", 1);
+    tzset();
+
+    assert(localtime_r(&t, &result) != NULL);  // Ensure localtime_r does not fail
+    assert(result.tm_year == 121);  // Year 2021 - 1900
+    assert(result.tm_mon == 2);    // March
+    assert(result.tm_mday == 14);  // 14th
+    assert(result.tm_hour == 8);   // 08:00:00 local time
+    assert(result.tm_min == 0);
+    assert(result.tm_sec == 0);
+}
+
+void test_localtime_r_large_time() {
+    time_t t = 32503680000;  // A large value: 1 January 3000 (UTC)
+    struct tm result;
+
+    setenv("TZ", "UTC", 1);
+    tzset();
+
+    assert(localtime_r(&t, &result) != NULL);  // Ensure localtime_r does not fail
+    assert(result.tm_year == 1100);  // Year 3000 - 1900 = 1100
+    assert(result.tm_mon == 0);     // January
+    assert(result.tm_mday == 1);    // 1st of January
+    assert(result.tm_hour == 0);    // Midnight
+    assert(result.tm_min == 0);
+    assert(result.tm_sec == 0);
+}
+
+void test_dst_transition() {
+    time_t t = 1615809600;  // March 15 2021, 08:00:00 UTC
+    struct tm result;
+
+    setenv("TZ", "America/New_York", 1); 
+    tzset();
+
+    localtime_r(&t, &result);
+
+    assert(result.tm_year == 121);  // Year 2021 - 1900 = 121
+    assert(result.tm_mon == 2);     // March (0-based index)
+    assert(result.tm_mday == 15);    // 15th
+    assert(result.tm_hour == 8);    // 00:00:00 local time
+    assert(result.tm_min == 0);
+    assert(result.tm_sec == 0);
+
+    assert(result.tm_isdst == 1);  // DST should be active
+    
+    assert(strcmp(tzname[0], "EST") == 0 || strcmp(tzname[0], "EDT") == 0);  // Standard or DST name
+    assert(strcmp(tzname[1], "EDT") == 0);  // Should be the DST version of the timezone
+}
+
+void test_standard_time() {
+    time_t t = 1609459200;  // January 1, 2021, 00:00:00 UTC
+    struct tm result;
+
+    setenv("TZ", "Asia/Tokyo", 1);
+    tzset();
+
+    localtime_r(&t, &result);
+
+    assert(result.tm_year == 121);  // Year 2021 - 1900 = 121
+    assert(result.tm_mon == 0);     // January (0-based index)
+    assert(result.tm_mday == 1);    // 1st
+    assert(result.tm_hour == 9);    // 09:00:00 local time
+    assert(result.tm_min == 0);
+    assert(result.tm_sec == 0);
+
+    assert(result.tm_isdst == 0);  // DST should NOT be active
+    
+    assert(strcmp(tzname[0], "JST") == 0);  // Standard time name
+    assert(strcmp(tzname[1], "EST") != 0);  // Should NOT be in DST
+}
+
+int main() {
+    test_localtime_r_epoch();
+    test_localtime_r_non_epoch();
+    test_localtime_r_dst();
+    test_localtime_r_large_time();
+    test_dst_transition();
+    test_standard_time();
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/time/macros.c b/recipes/core/relibc/tests/time/macros.c
new file mode 100644
index 0000000000..60e2f96e7c
--- /dev/null
+++ b/recipes/core/relibc/tests/time/macros.c
@@ -0,0 +1,38 @@
+#include <assert.h>
+#include <sys/time.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    struct timeval x = { .tv_usec = 15 };
+    struct timeval y = { 0 };
+    struct timeval z = { 0 };
+    struct timeval one_usec = { .tv_usec = 1 };
+    struct timeval max_usec = { .tv_usec = 999999 };
+    struct timeval one_sec = { .tv_sec = 1 };
+
+    assert(!timerisset(&y));
+    assert(timerisset(&x));
+    timerclear(&x);
+    assert(!timerisset(&x));
+
+    assert(timercmp(&x, &y, ==));
+    timeradd(&y, &one_usec, &z);
+    assert(!timercmp(&x, &z, ==));
+    assert(timercmp(&x, &z, <));
+
+    timeradd(&z, &max_usec, &y);
+    assert(y.tv_sec == 1);
+    assert(y.tv_usec == 0);
+    timersub(&y, &one_usec, &z);
+    assert(z.tv_sec == 0);
+    assert(z.tv_usec == 999999);
+    timeradd(&z, &one_sec, &y);
+    assert(y.tv_sec == 1);
+    assert(y.tv_usec == 999999);
+    for (int i = 0; i < 3; i += 1) {
+        timersub(&y, &one_sec, &y);
+    }
+    assert(y.tv_sec == -2);
+    assert(y.tv_usec == 999999);
+}
diff --git a/recipes/core/relibc/tests/time/mktime.c b/recipes/core/relibc/tests/time/mktime.c
new file mode 100644
index 0000000000..bc8c9c755d
--- /dev/null
+++ b/recipes/core/relibc/tests/time/mktime.c
@@ -0,0 +1,60 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "test_helpers.h"
+
+int check(time_t input) {
+    struct tm *t = localtime(&input);
+    ERROR_IF(localtime, t, == NULL);
+
+    time_t output = mktime(t);
+    ERROR_IF(mktime, output, == (time_t)-1);
+
+    printf("%ld = %ld\n", input, output);
+
+    if (input != output) {
+        printf(
+            "Year %d, Day of year: %d, Month %d, Day of month: %d, Day of week: %d, %d:%d:%d\n",
+            t->tm_year, t->tm_yday, t->tm_mon, t->tm_mday, t->tm_wday, t->tm_hour, t->tm_min, t->tm_sec
+        );
+        puts("Failed!");
+        return 1;
+    }
+    return 0;
+}
+
+int main(void) {
+    struct tm t = { 0 };
+
+    t.tm_year = 71;
+    t.tm_mday = 1;
+
+    printf("%ld\n", mktime(&t));
+
+    int day = 60 * 60 * 24;
+    time_t inputs[] = { -(day * 33), -day, -500, 0, 1531454950 };
+    for (int i = 0; i < 5; i += 1) {
+        if (check(inputs[i])) {
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    srand(time(NULL));
+
+    for (int i = 0; i < 10; i += 1) {
+        time_t input = (time_t) rand();
+
+        struct tm *time = localtime(&input);
+        ERROR_IF(localtime, time, == NULL);
+
+        time_t output = mktime(time);
+        ERROR_IF(mktime, output, == (time_t)-1);
+
+        if (input != output) {
+            // asctime has newline
+            printf("Comparison %ld == %ld failed. Time: %s", input, output, asctime(time));
+        }
+    }
+}
diff --git a/recipes/core/relibc/tests/time/strftime.c b/recipes/core/relibc/tests/time/strftime.c
new file mode 100644
index 0000000000..629f86f838
--- /dev/null
+++ b/recipes/core/relibc/tests/time/strftime.c
@@ -0,0 +1,167 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <assert.h>
+#include "test_helpers.h"
+
+#define PRINT_BUFSZ 50
+#define V_BUFSZ 3
+#define BUFS 30
+
+void print(time_t timestamp, char* fmt) {
+    char out[PRINT_BUFSZ] = {0};
+    size_t n = strftime(out, PRINT_BUFSZ, fmt, localtime(&timestamp));
+    printf("%zu: %s\n", n, out);
+
+}
+
+void strftime_mix(void) {
+    setenv("TZ", "Australia/Melbourne", 1);
+    tzset();
+
+    // Initialize a struct tm with a known fixed date and time.
+    // December 31, 2020 23:59:59, which is a Thursday.
+    struct tm t = {0};
+    t.tm_year = 2020 - 1900;   // Years since 1900.
+    t.tm_mon  = 11;            // December (0-based, so 11 means December).
+    t.tm_mday = 31;
+    t.tm_hour = 23;
+    t.tm_min  = 59;
+    t.tm_sec  = 59;
+    t.tm_wday = 4;             // Thursday (0 = Sunday, so Thursday = 4).
+    t.tm_yday = 365;           
+    t.tm_gmtoff = 39600;       // GMT offset for AEDT (UTC+11).
+    t.tm_isdst = 11;           // Daylight saving time is in effect.
+    t.tm_zone = "AEDT";        // Time zone name.
+    char buf[BUFS];
+
+    strftime(buf, BUFS, "%a", &t);
+    assert(strcmp(buf, "Thu") == 0);
+
+    strftime(buf, BUFS, "%A", &t);
+    assert(strcmp(buf, "Thursday") == 0);
+
+    strftime(buf, BUFS, "%b", &t);
+    assert(strcmp(buf, "Dec") == 0);
+
+    strftime(buf, BUFS, "%B", &t);
+    assert(strcmp(buf, "December") == 0);
+
+    strftime(buf, BUFS, "%d", &t);
+    assert(strcmp(buf, "31") == 0);
+
+    strftime(buf, BUFS, "%H", &t);
+    assert(strcmp(buf, "23") == 0);
+
+    strftime(buf, BUFS, "%I", &t);
+    assert(strcmp(buf, "11") == 0);
+
+    // Day of the year as a zero-padded decimal number (001-366).
+    strftime(buf, BUFS, "%j", &t);
+    // Even though t.tm_yday is 365 (zero-based), %j is one-based: "366"
+    assert(strcmp(buf, "366") == 0);
+
+    strftime(buf, BUFS, "%m", &t);
+    assert(strcmp(buf, "12") == 0);
+
+    strftime(buf, BUFS, "%M", &t);
+    assert(strcmp(buf, "59") == 0);
+
+    strftime(buf, BUFS, "%p", &t);
+    assert(strcmp(buf, "PM") == 0);
+
+    strftime(buf, BUFS, "%S", &t);
+    assert(strcmp(buf, "59") == 0);
+
+    strftime(buf, BUFS, "%U", &t);
+    assert(strcmp(buf, "52") == 0);
+
+    strftime(buf, BUFS, "%w", &t);
+    assert(strcmp(buf, "4") == 0);
+
+    strftime(buf, BUFS, "%W", &t);
+    assert(strcmp(buf, "52") == 0);
+
+    strftime(buf, BUFS, "%y", &t);
+    assert(strcmp(buf, "20") == 0);
+
+    strftime(buf, BUFS, "%Y", &t);
+    assert(strcmp(buf, "2020") == 0);
+
+    strftime(buf, BUFS, "%Z", &t);
+    assert(strcmp(buf, "AEDT") == 0);
+
+    strftime(buf, BUFS, "%z", &t);
+    assert(strcmp(buf, "+1100") == 0);
+
+    strftime(buf, BUFS, "%F", &t);
+    assert(strcmp(buf, "2020-12-31") == 0);
+
+    strftime(buf, BUFS, "%R", &t);
+    assert(strcmp(buf, "23:59") == 0);
+
+    strftime(buf, BUFS, "%r", &t);
+    assert(strcmp(buf, "11:59:59 PM") == 0);
+
+    strftime(buf, BUFS, "%T", &t);
+    assert(strcmp(buf, "23:59:59") == 0);
+}
+
+void test_v(void) {
+    char buf[V_BUFSZ] = {0};
+    struct tm time = {0};
+
+    // Example dates copied from Wikipedia
+    // Saturday 2005-01-01
+    time.tm_yday = 0;
+    time.tm_wday = 6;
+    time.tm_year = 2005;
+    strftime(buf, V_BUFSZ, "%V", &time);
+    puts(buf);
+
+    // Saturday 2005-12-31
+    time.tm_yday = 365;
+    time.tm_wday = 6;
+    strftime(buf, V_BUFSZ, "%V", &time);
+    puts(buf);
+
+    // Sunday 2006-01-01
+    time.tm_yday = 0;
+    time.tm_wday = 0;
+    time.tm_year = 2006;
+    strftime(buf, V_BUFSZ, "%V", &time);
+    puts(buf);
+
+    // Sunday 2008-12-28
+    time.tm_yday = 362;
+    time.tm_wday = 0;
+    time.tm_year = 2008;
+    strftime(buf, V_BUFSZ, "%V", &time);
+    puts(buf);
+
+    // Friday 2010-01-01
+    time.tm_yday = 0;
+    time.tm_wday = 5;
+    time.tm_year = 2010;
+    strftime(buf, V_BUFSZ, "%V", &time);
+    puts(buf);
+}
+
+int main(void) {
+    print(1531808742, "%a %A %b %B");
+    print(1531808742, "The %Cst century");
+    print(1531808742, "%I:%M:%S %p");
+    print(1531839600, "%r");
+    print(1531839600, "%R");
+    print(1531839600, "%H %s %u");
+    print(1531839600, "%j %U");
+    print(1531839600, "%+");
+    print(1533669431, "%+%+%+%+%+"); // will overflow 50 characters
+
+    // ISO-8601 tests
+    test_v();
+
+    strftime_mix();
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/time/strptime.c b/recipes/core/relibc/tests/time/strptime.c
new file mode 100644
index 0000000000..af96064513
--- /dev/null
+++ b/recipes/core/relibc/tests/time/strptime.c
@@ -0,0 +1,129 @@
+#include <assert.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "test_helpers.h"
+
+__attribute__((nonnull))
+static void strptime_test(const char* restrict time,
+                          const char* restrict format,
+                          struct tm expected,
+                          const char* restrict exp_str) {
+    struct tm actual = {0};
+    const char* result = strptime(time, format, &actual);
+
+    // This struct is packed and zeroed beforehand so it shouldn't
+    // have any holes to throw off memcmp.
+    //
+    // If relibc implements the GNU extensions that store timezone,
+    // then this will need to be modified to memcmp up to
+    // sizeof(struct tm) - sizeof(char*) followed by a strcmp.
+    //
+    // glibc and musl differ a bit which is why some calls to
+    // this function comment out tm_yday and tm_wday.
+    // glibc seems to set these fields even if they're not specified,
+    // which is a cool extra but implementation specific behavior.
+    if(memcmp(&expected, &actual, sizeof(struct tm))) {
+        puts("struct tm expected versus actual\n");
+        printf("%-8s %d %4d\n", "tm_year", expected.tm_year, actual.tm_year);
+        printf("%-8s %d %4d\n", "tm_mon", expected.tm_mon, actual.tm_mon);
+        printf("%-8s %d %4d\n", "tm_mday", expected.tm_mday, actual.tm_mday);
+        printf("%-8s %d %4d\n", "tm_hour", expected.tm_hour, actual.tm_hour);
+        printf("%-8s %d %4d\n", "tm_min", expected.tm_min, actual.tm_min);
+        printf("%-8s %d %4d\n", "tm_sec", expected.tm_sec, actual.tm_sec);
+        printf("%-8s %d %4d\n", "tm_wday", expected.tm_wday, actual.tm_wday);
+        printf("%-8s %d %4d\n", "tm_yday", expected.tm_yday, actual.tm_yday);
+        printf("%-8s %d %4d\n", "tm_isdst", expected.tm_isdst, actual.tm_isdst);
+        
+        exit(EXIT_FAILURE);
+    }
+    
+    // Safety:
+    // `time` our static string which definitely ends with NUL
+    // `result` is from strptime and ends with a NUL because `time` does
+    size_t diff = strlen(time) - strlen(result);
+    assert(!strncmp(exp_str, result, diff));
+}
+
+int main(void) {
+    const char emi[] = "02:24:14";
+    struct tm emi_expect = {
+        .tm_hour = 2,
+        .tm_min = 24,
+        .tm_sec = 14,
+    };
+    strptime_test(emi, "%T", emi_expect, "");
+
+    const char daydream[] = "1981-11-18 Daydream Nation";
+    struct tm daydream_expect = {
+        .tm_year = 81,
+        .tm_mon = 10,
+        .tm_mday = 18,
+        /* .tm_wday = 3, */
+        /* .tm_yday = 321, */
+    };
+    const char* daydream_rem = &daydream[10];
+    strptime_test(daydream,
+                  "%Y-%m-%d",
+                  daydream_expect,
+                  daydream_rem
+    );
+
+    // strptime(3): "(This is the American style date, very confusing to
+    // non-Americans [...])"
+    const char america[] = "07/04/76 AMERICA! (Can't use 1776 here :( ))";
+    struct tm america_expect = {
+        .tm_year = 76,
+        .tm_mon = 6,
+        .tm_mday = 4,
+        /* .tm_yday = 185, */
+    };
+    const char* america_rem = &america[9];
+    strptime_test(america,
+                  "%D%n",
+                  america_expect,
+                  america_rem
+    );
+
+    const char percent[] = "%";
+    struct tm percent_expect = {0};
+    strptime_test(percent,
+                  "%%",
+                  percent_expect,
+                  ""
+    );
+
+    // TODO: Locale offset
+    const char redox[] = "Mon Oct 31 11:19:57 2016";
+    struct tm redox_expect = {
+        .tm_year = 116,
+        .tm_mon = 9,
+        .tm_mday = 31,
+        .tm_hour = 11,
+        .tm_min = 19,
+        .tm_sec = 57,
+        /* .tm_yday = 304, */
+        .tm_wday = 1,
+    };
+    strptime_test(redox,
+                  "%a%t%b%t%d%t%T%t%Y",
+                  redox_expect,
+                  "");
+
+    // Roundtrip
+    const char roundtrip[] = "2012-01-19 13:37:00";
+    const char roundtrip_fmt[] = "%Y-%m-%d %H:%M:%S";
+    struct tm roundtrip_tm = {0};
+    strptime(roundtrip, roundtrip_fmt, &roundtrip_tm);
+
+    char rt_actual[32];
+    size_t rt_res = strftime(rt_actual, 32, roundtrip_fmt, &roundtrip_tm);
+    size_t rt_len = strnlen(roundtrip, 32);
+    assert(rt_res == rt_len);
+    assert(!strncmp(roundtrip, rt_actual, rt_len));
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/time/time.c b/recipes/core/relibc/tests/time/time.c
new file mode 100644
index 0000000000..0655cc50a3
--- /dev/null
+++ b/recipes/core/relibc/tests/time/time.c
@@ -0,0 +1,44 @@
+#include <err.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    struct timespec tm = {0};
+
+    int cgt = clock_gettime(CLOCK_REALTIME, &tm);
+    ERROR_IF(clock_gettime, cgt, == -1);
+
+    cgt = clock_getres(CLOCK_REALTIME, &tm);
+    ERROR_IF(clock_getres, cgt, == -1);
+
+    cgt = timespec_get(&tm, TIME_UTC);
+    if (cgt != TIME_UTC) {
+        errx(
+            EXIT_FAILURE,
+            "timespec_get should have returned %d but returned %d\n",
+            TIME_UTC,
+            cgt
+        );
+    }
+
+    cgt = timespec_getres(&tm, TIME_UTC);
+    if (cgt != TIME_UTC) {
+        errx(
+            EXIT_FAILURE,
+            "timespec_getres should have returned %d but returned %d\n",
+            TIME_UTC,
+            cgt
+        );
+    }
+
+    time_t t = time(NULL);
+    ERROR_IF(time, t, == (time_t)-1);
+
+    // TODO: Support clock() on Redox
+    // clock_t c = clock();
+    // ERROR_IF(clock, c, == (clock_t)-1);
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/time/timegm.c b/recipes/core/relibc/tests/time/timegm.c
new file mode 100644
index 0000000000..9fbfa89fac
--- /dev/null
+++ b/recipes/core/relibc/tests/time/timegm.c
@@ -0,0 +1,49 @@
+#include <time.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+int main(void) {
+    setenv("TZ", "UTC", 1);
+    tzset();
+
+    struct {
+        time_t timestamp;
+        const char *expected_asctime;
+    } test_cases[] = {
+        {0, "Thu Jan  1 00:00:00 1970\n"},
+        {5097600, "Sun Mar  1 00:00:00 1970\n"},
+        {31535999, "Thu Dec 31 23:59:59 1970\n"},
+        {68255999, "Tue Feb 29 23:59:59 1972\n"}, // 1972 is a leap year
+        {94694399, "Sun Dec 31 23:59:59 1972\n"},
+        {951868799, "Tue Feb 29 23:59:59 2000\n"}, // 2000 is a leap year
+        {978307199, "Sun Dec 31 23:59:59 2000\n"},
+        {4107542400, "Mon Mar  1 00:00:00 2100\n"}, // 2100 is not a leap year
+        {4133980799, "Fri Dec 31 23:59:59 2100\n"},
+        {2147483647, "Tue Jan 19 03:14:07 2038\n"}, // 32-bit overflow point
+        {2147483648, "Tue Jan 19 03:14:08 2038\n"},
+        {4294967295, "Sun Feb  7 06:28:15 2106\n"}, // Unsigned 32-bit overflow
+        {4294967296, "Sun Feb  7 06:28:16 2106\n"}
+    };
+    int num_tests = sizeof(test_cases) / sizeof(test_cases[0]);
+
+    for (int i = 0; i < num_tests; i++) {
+        time_t orig = test_cases[i].timestamp;
+        const char *expected_asctime = test_cases[i].expected_asctime;
+
+        struct tm *tm_ptr = gmtime(&orig);
+        assert(tm_ptr != NULL);
+
+        struct tm local_tm;
+        memcpy(&local_tm, tm_ptr, sizeof(struct tm));
+
+        char *asc_time = asctime(&local_tm);
+        assert(asc_time != NULL);
+        assert(strcmp(asc_time, expected_asctime) == 0);
+
+        time_t computed = timegm(&local_tm);
+        assert(computed == orig);
+    }
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/time/times.c b/recipes/core/relibc/tests/time/times.c
new file mode 100644
index 0000000000..018f9423e7
--- /dev/null
+++ b/recipes/core/relibc/tests/time/times.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+#include <sys/times.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    struct tms tms;
+
+    int status = times(&tms);
+    ERROR_IF(times, status, == (time_t)-1);
+
+    printf("tm_utime: %ld\n", tms.tms_utime);
+    printf("tm_stime: %ld\n", tms.tms_stime);
+    printf("tm_cutime: %ld\n", tms.tms_cutime);
+    printf("tm_cstime: %ld\n", tms.tms_cstime);
+}
diff --git a/recipes/core/relibc/tests/time/tzset.c b/recipes/core/relibc/tests/time/tzset.c
new file mode 100644
index 0000000000..87fa15f719
--- /dev/null
+++ b/recipes/core/relibc/tests/time/tzset.c
@@ -0,0 +1,16 @@
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+extern int daylight;
+extern long timezone;
+extern char *tzname[2];
+void tzset(void);
+
+int main(void) {
+    tzset();
+    printf("tzname[0] %s, tzname[1] %s, daylight %d, timezone %ld\n",
+        tzname[0], tzname[1], daylight, timezone);
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/tls.c b/recipes/core/relibc/tests/tls.c
new file mode 100644
index 0000000000..2be0006d3e
--- /dev/null
+++ b/recipes/core/relibc/tests/tls.c
@@ -0,0 +1,10 @@
+#include <stdio.h>
+
+_Thread_local int tbss = 0;
+_Thread_local int tdata = 1;
+
+int main(void) {
+    printf("%d == 0\n", tbss);
+    printf("%d == 1\n", tdata);
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/unistd/access.c b/recipes/core/relibc/tests/unistd/access.c
new file mode 100644
index 0000000000..87ee7c9fbc
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/access.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    if (access("example_dir/1-never-gonna-give-you-up", R_OK | W_OK)) {
+        perror("access");
+        exit(EXIT_FAILURE);
+    }
+    if (!access("example_dir/1-never-gonna-give-you-up", X_OK)) {
+        puts("Accessing a file with X_OK worked even though it... probably... shouldn't?");
+        puts("Please run `chmod 644 example_dir/*` and try again.");
+        exit(EXIT_FAILURE);
+    }
+}
diff --git a/recipes/core/relibc/tests/unistd/alarm.c b/recipes/core/relibc/tests/unistd/alarm.c
new file mode 100644
index 0000000000..4b0b2f96d6
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/alarm.c
@@ -0,0 +1,80 @@
+/*
+ * Tests for alarm(2) - POSIX: https://pubs.opengroup.org/onlinepubs/9799919799/functions/alarm.html
+ *
+ * Verifies:
+ *  1. alarm(0) with no pending alarm returns 0
+ *  2. alarm(1) delivers SIGALRM after ~1 second (tested via pause())
+ *  3. alarm(0) cancels a pending alarm
+ *  4. re-arming alarm returns the remaining seconds from the previous alarm
+ */
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+static volatile sig_atomic_t alarm_count = 0;
+
+static void handler(int sig) {
+    (void)sig;
+    alarm_count++;
+}
+
+int main(void) {
+    struct sigaction sa;
+    sa.sa_handler = handler;
+    sa.sa_flags = 0;
+    sigemptyset(&sa.sa_mask);
+    int r = sigaction(SIGALRM, &sa, NULL);
+    ERROR_IF(sigaction, r, == -1);
+
+    /* alarm(0) with no existing alarm must return 0 */
+    unsigned prev = alarm(0);
+    UNEXP_IF(alarm, (int)prev, != 0);
+    puts("alarm(0) baseline: ok");
+
+    /* alarm(1): SIGALRM must fire; pause() blocks until the signal arrives */
+    alarm_count = 0;
+    alarm(1);
+    pause();
+    if (alarm_count != 1) {
+        fprintf(stderr, "SIGALRM did not fire (count=%d)\n", (int)alarm_count);
+        return EXIT_FAILURE;
+    }
+    puts("alarm(1) fires: ok");
+
+    /* alarm(0) must cancel a pending alarm and return remaining secs > 0 */
+    alarm_count = 0;
+    alarm(10);
+    unsigned remaining = alarm(0);
+    if (remaining == 0) {
+        fprintf(stderr, "alarm(0) cancel: expected remaining > 0\n");
+        return EXIT_FAILURE;
+    }
+    /* Wait longer than original alarm; SIGALRM must NOT fire */
+    sleep(2);
+    if (alarm_count != 0) {
+        fprintf(stderr, "SIGALRM fired after alarm(0) cancel\n");
+        return EXIT_FAILURE;
+    }
+    puts("alarm(0) cancel: ok");
+
+    /*
+     * Re-arming: arm with 10s, sleep 1s, then re-arm with 3s.
+     * The return value must be the remaining time (~9s) which is > 0.
+     */
+    alarm_count = 0;
+    alarm(10);
+    sleep(1);
+    remaining = alarm(3);
+    if (remaining == 0) {
+        fprintf(stderr, "re-arm: expected remaining > 0, got 0\n");
+        return EXIT_FAILURE;
+    }
+    alarm(0); /* disarm so SIGALRM doesn't fire after the test */
+    puts("alarm re-arm returns remaining: ok");
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/unistd/brk.c b/recipes/core/relibc/tests/unistd/brk.c
new file mode 100644
index 0000000000..0dc7566ccb
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/brk.c
@@ -0,0 +1,26 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+	// sbrk report current brk
+    void * current = sbrk(0);
+    ERROR_IF(sbrk, current, == (void *)-1);
+
+    // sbrk increment and report previous brk
+    void * prev = current;
+    current = sbrk(4096);
+    ERROR_IF(sbrk, current, != prev);
+
+    // sbrk report current break
+    prev = current;
+    current = sbrk(0);
+    ERROR_IF(sbrk, current, != (void*)((uintptr_t)prev + 4096));
+
+    // brk set break to new value
+    int status = brk((void*)((uintptr_t)current + 4096));
+    ERROR_IF(brk, status, == -1);
+    UNEXP_IF(brk, status, != 0);
+}
diff --git a/recipes/core/relibc/tests/unistd/chdir.c b/recipes/core/relibc/tests/unistd/chdir.c
new file mode 100644
index 0000000000..70e5881afb
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/chdir.c
@@ -0,0 +1,27 @@
+#include <limits.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char cwd[PATH_MAX] = { 0 };
+    char *cwd_result = NULL;
+
+    cwd_result = getcwd(cwd, PATH_MAX);
+    ERROR_IF(getcwd, cwd_result, == NULL);
+    UNEXP_IF(getcwd, cwd_result, != cwd);
+
+    printf("getcwd before chdir: %s\n", cwd);
+
+    int status = chdir("..");
+    ERROR_IF(chdir, status, == -1);
+    UNEXP_IF(chdir, status, != 0);
+
+    cwd_result = getcwd(cwd, PATH_MAX);
+    ERROR_IF(getcwd, cwd_result, == NULL);
+    UNEXP_IF(getcwd, cwd_result, != cwd);
+
+    printf("getcwd after chdir: %s\n", cwd);
+}
diff --git a/recipes/core/relibc/tests/unistd/confstr.c b/recipes/core/relibc/tests/unistd/confstr.c
new file mode 100644
index 0000000000..d9abde8811
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/confstr.c
@@ -0,0 +1,34 @@
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define CSPATHSZ 9
+#define BADSIZ 4
+
+int main(void) {
+    char actual[CSPATHSZ] = {0};
+    assert(confstr(_CS_PATH, actual, CSPATHSZ) == CSPATHSZ);
+    const char expected[] = "/usr/bin";
+    assert(strncmp(expected, actual, CSPATHSZ) == 0);
+
+    // The constants other than _CS_PATH just return an empty str (no support).
+    char empty[] = "";
+    assert(
+        confstr(
+            _CS_POSIX_V6_LP64_OFF64_LIBS,
+           empty,
+           0
+        ) == 1
+    );
+
+    // Buffers that are too small should return the expected size.
+    char small[BADSIZ] = {0};
+    assert(confstr(_CS_PATH, small, BADSIZ) == CSPATHSZ);
+
+    // Null buffer and zero length should return the expected size
+    // for the constant.
+    assert(confstr(_CS_PATH, NULL, 0) == CSPATHSZ);
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/unistd/constants.c b/recipes/core/relibc/tests/unistd/constants.c
new file mode 100644
index 0000000000..46549c54a3
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/constants.c
@@ -0,0 +1,123 @@
+#include <unistd.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    // Constants specified in https://pubs.opengroup.org/onlinepubs/7908799/xsh/unistd.h.html
+
+    printf("_POSIX_VERSION: %ld\n", _POSIX_VERSION);
+    /* TODO
+    printf("_POSIX2_VERSION: %ld\n", _POSIX2_VERSION);
+    printf("_POSIX2_C_VERSION: %ld\n", _POSIX2_C_VERSION);
+    printf("_XOPEN_VERSION: %d\n", _XOPEN_VERSION);
+
+    printf("_XOPEN_XCU_VERSION: %d\n", _XOPEN_XCU_VERSION);
+    
+    printf("_XOPEN_XPG2: %d\n", _XOPEN_XPG2);
+    printf("_XOPEN_XPG3: %d\n", _XOPEN_XPG3);
+    printf("_XOPEN_XPG4: %d\n", _XOPEN_XPG4);
+    printf("_XOPEN_UNIX: %d\n", _XOPEN_UNIX);
+
+    printf("_POSIX_CHOWN_RESTRICTED: %d\n", _POSIX_CHOWN_RESTRICTED);
+    printf("_POSIX_NO_TRUNC: %d\n", _POSIX_NO_TRUNC);
+    printf("_POSIX_VDISABLE: %d\n", _POSIX_VDISABLE);
+    printf("_POSIX_SAVED_IDS: %d\n", _POSIX_SAVED_IDS);
+    printf("_POSIX_JOB_CONTROL: %d\n", _POSIX_JOB_CONTROL);
+    printf("_POSIX_THREADS: %ld\n", _POSIX_THREADS);
+    printf("_POSIX_THREAD_ATTR_STACKADDR: %ld\n", _POSIX_THREAD_ATTR_STACKADDR);
+    printf("_POSIX_THREAD_ATTR_STACKSIZE: %ld\n", _POSIX_THREAD_ATTR_STACKSIZE);
+    printf("_POSIX_THREAD_PROCESS_SHARED: %ld\n", _POSIX_THREAD_PROCESS_SHARED);
+    printf("_POSIX_THREAD_SAFE_FUNCTIONS: %ld\n", _POSIX_THREAD_SAFE_FUNCTIONS);
+
+    printf("_POSIX2_C_BIND: %ld\n", _POSIX2_C_BIND);
+    printf("_POSIX2_C_DEV: %ld\n", _POSIX2_C_DEV);
+    printf("_POSIX2_CHAR_TERM: %ld\n", _POSIX2_CHAR_TERM);
+    printf("_POSIX2_FORT_DEV: %d\n", _POSIX2_FORT_DEV);
+    printf("_POSIX2_FORT_RUN: %d\n", _POSIX2_FORT_RUN);
+    printf("_POSIX2_LOCALEDEF: %ld\n", _POSIX2_LOCALEDEF);
+    printf("_POSIX2_SW_DEV: %ld\n", _POSIX2_SW_DEV);
+    printf("_POSIX2_UPE: %d\n", _POSIX2_UPE);
+    printf("_XOPEN_CRYPT: %d\n", _XOPEN_CRYPT);
+    printf("_XOPEN_ENH_I18N: %d\n", _XOPEN_ENH_I18N);
+    printf("_XOPEN_LEGACY: %d\n", _XOPEN_LEGACY);
+    printf("_XOPEN_REALTIME: %d\n", _XOPEN_REALTIME);
+    printf("_XOPEN_REALTIME_THREADS: %d\n", _XOPEN_REALTIME_THREADS);
+    printf("_XOPEN_SHM: %d\n", _XOPEN_SHM);
+    printf("_XBS5_ILP32_OFF32: %d\n", _XBS5_ILP32_OFF32);
+    printf("_XBS5_ILP32_OFFBIG: %d\n", _XBS5_ILP32_OFFBIG);
+    printf("_XBS5_LP64_OFF64: %d\n", _XBS5_LP64_OFF64);
+    printf("_XBS5_LPBIG_OFFBIG: %d\n", _XBS5_LPBIG_OFFBIG);
+
+    printf("_POSIX_ASYNCHRONOUS_IO: %ld\n", _POSIX_ASYNCHRONOUS_IO);
+    printf("_POSIX_MEMLOCK: %ld\n", _POSIX_MEMLOCK);
+    printf("_POSIX_MEMLOCK_RANGE: %ld\n", _POSIX_MEMLOCK_RANGE);
+    printf("_POSIX_MESSAGE_PASSING: %ld\n", _POSIX_MESSAGE_PASSING);
+    printf("_POSIX_PRIORITY_SCHEDULING: %ld\n", _POSIX_PRIORITY_SCHEDULING);
+    printf("_POSIX_REALTIME_SIGNALS: %ld\n", _POSIX_REALTIME_SIGNALS);
+    printf("_POSIX_SEMAPHORES: %ld\n", _POSIX_SEMAPHORES);
+    printf("_POSIX_SHARED_MEMORY_OBJECTS: %ld\n", _POSIX_SHARED_MEMORY_OBJECTS);
+    printf("_POSIX_SYNCHRONIZED_IO: %ld\n", _POSIX_SYNCHRONIZED_IO);
+    printf("_POSIX_TIMERS: %ld\n", _POSIX_TIMERS);
+
+    printf("_POSIX_FSYNC: %ld\n", _POSIX_FSYNC);
+    printf("_POSIX_MAPPED_FILES: %ld\n", _POSIX_MAPPED_FILES);
+    printf("_POSIX_MEMORY_PROTECTION: %ld\n", _POSIX_MEMORY_PROTECTION);
+
+    printf("_POSIX_PRIORITIZED_IO: %ld\n", _POSIX_PRIORITIZED_IO);
+
+    printf("_POSIX_THREAD_PRIORITY_SCHEDULING: %ld\n", _POSIX_THREAD_PRIORITY_SCHEDULING);
+    printf("_POSIX_THREAD_PRIO_INHERIT: %ld\n", _POSIX_THREAD_PRIO_INHERIT);
+    printf("_POSIX_THREAD_PRIO_PROTECT: %ld\n", _POSIX_THREAD_PRIO_PROTECT);
+
+    printf("_POSIX_ASYNC_IO: %d\n", _POSIX_ASYNC_IO);
+    printf("_POSIX_PRIO_IO: %d\n", _POSIX_PRIO_IO);
+    printf("_POSIX_SYNC_IO: %d\n", _POSIX_SYNC_IO);
+    */
+
+    printf("NULL: %p\n", NULL);
+
+    printf("R_OK: %d\n", R_OK);
+    printf("W_OK: %d\n", W_OK);
+    printf("X_OK: %d\n", X_OK);
+    printf("F_OK: %d\n", F_OK);
+
+    /* TODO: confstr() constants:
+    printf("_CS_PATH: %d\n", _CS_PATH);
+    printf("_CS_XBS5_ILP32_OFF32_CFLAGS: %d\n", _CS_XBS5_ILP32_OFF32_CFLAGS);
+    printf("_CS_XBS5_ILP32_OFF32_LDFLAGS: %d\n", _CS_XBS5_ILP32_OFF32_LDFLAGS);
+    printf("_CS_XBS5_ILP32_OFF32_LIBS: %d\n", _CS_XBS5_ILP32_OFF32_LIBS);
+    printf("_CS_XBS5_ILP32_OFF32_LINTFLAGS: %d\n", _CS_XBS5_ILP32_OFF32_LINTFLAGS);
+    printf("_CS_XBS5_ILP32_OFFBIG_CFLAGS: %d\n", _CS_XBS5_ILP32_OFFBIG_CFLAGS);
+    printf("_CS_XBS5_ILP32_OFFBIG_LDFLAGS: %d\n", _CS_XBS5_ILP32_OFFBIG_LDFLAGS);
+    printf("_CS_XBS5_ILP32_OFFBIG_LIBS: %d\n", _CS_XBS5_ILP32_OFFBIG_LIBS);
+    printf("_CS_XBS5_ILP32_OFFBIG_LINTFLAGS: %d\n", _CS_XBS5_ILP32_OFFBIG_LINTFLAGS);
+    printf("_CS_XBS5_LP64_OFF64_CFLAGS: %d\n", _CS_XBS5_LP64_OFF64_CFLAGS);
+    printf("_CS_XBS5_LP64_OFF64_LDFLAGS: %d\n", _CS_XBS5_LP64_OFF64_LDFLAGS);
+    printf("_CS_XBS5_LP64_OFF64_LIBS: %d\n", _CS_XBS5_LP64_OFF64_LIBS);
+    printf("_CS_XBS5_LP64_OFF64_LINTFLAGS: %d\n", _CS_XBS5_LP64_OFF64_LINTFLAGS);
+    printf("_CS_XBS5_LPBIG_OFFBIG_CFLAGS: %d\n", _CS_XBS5_LPBIG_OFFBIG_CFLAGS);
+    printf("_CS_XBS5_LPBIG_OFFBIG_LDFLAGS: %d\n", _CS_XBS5_LPBIG_OFFBIG_LDFLAGS);
+    printf("_CS_XBS5_LPBIG_OFFBIG_LIBS: %d\n", _CS_XBS5_LPBIG_OFFBIG_LIBS);
+    printf("_CS_XBS5_LPBIG_OFFBIG_LINTFLAGS: %d\n", _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS);
+    */
+
+    printf("SEEK_SET: %d\n", SEEK_SET);
+    printf("SEEK_CUR: %d\n", SEEK_CUR);
+    printf("SEEK_END: %d\n", SEEK_END);
+
+    // sysconf() constants (_SC_*) are tested separately
+
+    printf("F_LOCK: %d\n", F_LOCK);
+    printf("F_ULOCK: %d\n", F_ULOCK);
+    printf("F_TEST: %d\n", F_TEST);
+    printf("F_TLOCK: %d\n", F_TLOCK);
+
+    // pathconf() constants (_PC_*) are tested separately
+
+    printf("STDIN_FILENO: %d\n", STDIN_FILENO);
+    printf("STDOUT_FILENO: %d\n", STDOUT_FILENO);
+    printf("STDERR_FILENO: %d\n", STDERR_FILENO);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/unistd/dup.c b/recipes/core/relibc/tests/unistd/dup.c
new file mode 100644
index 0000000000..cb7449e577
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/dup.c
@@ -0,0 +1,46 @@
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int fd0 = creat("dup.out", 0777);
+    ERROR_IF(creat, fd0, == -1);
+    UNEXP_IF(creat, fd0, < 0);
+
+    int fd1 = open("dup.out", 0);
+    ERROR_IF(open, fd1, == -1);
+    UNEXP_IF(open, fd1, < 0);
+
+    int fd2 = dup(fd1);
+    ERROR_IF(dup, fd2, == -1);
+    UNEXP_IF(dup, fd2, < 0);
+
+    printf("duped fd is %d greater than the original fd\n", fd2 - fd1);
+
+    int c1 = close(fd1);
+    ERROR_IF(close, c1, == -1);
+    UNEXP_IF(close, c1, != 0);
+
+    int c2 = close(fd2);
+    ERROR_IF(close, c2, == -1);
+    UNEXP_IF(close, c2, != 0);
+
+    int fd3 = open("dup.out", O_RDWR);
+
+    ERROR_IF(open, fd3, == -1);
+    UNEXP_IF(open, fd3, < 0);
+
+    int fd4 = dup2(fd3, 1);
+    ERROR_IF(dup2, fd4, == -1);
+    UNEXP_IF(dup2, fd4, < 0);
+
+    int p = printf("hello fd %d", fd3);
+    ERROR_IF(printf, p, == -1);
+    UNEXP_IF(printf, p, < 0);
+
+    int c3 = close(fd3);
+    ERROR_IF(close, c3, == -1);
+    UNEXP_IF(close, c3, != 0);
+}
diff --git a/recipes/core/relibc/tests/unistd/exec.c b/recipes/core/relibc/tests/unistd/exec.c
new file mode 100644
index 0000000000..00d13b3a84
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/exec.c
@@ -0,0 +1,12 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char* args[] = {"sh", "-c", "echo 'exec works :D'", NULL};
+
+    int status = execv("/bin/sh", args);
+    ERROR_IF(execv, status, == -1);
+}
diff --git a/recipes/core/relibc/tests/unistd/fchdir.c b/recipes/core/relibc/tests/unistd/fchdir.c
new file mode 100644
index 0000000000..d80db6ea25
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/fchdir.c
@@ -0,0 +1,20 @@
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int fd = open("/usr", O_DIRECTORY);
+    ERROR_IF(open, fd, == -1);
+    UNEXP_IF(open, fd, < 0);
+
+    int status = fchdir(fd);
+    ERROR_IF(fchdir, status, == -1);
+    UNEXP_IF(fchdir, status, != 0);
+
+    int c = close(fd);
+    ERROR_IF(close, c, == -1);
+    UNEXP_IF(close, c, != 0);
+}
diff --git a/recipes/core/relibc/tests/unistd/fork.c b/recipes/core/relibc/tests/unistd/fork.c
new file mode 100644
index 0000000000..225ead36e2
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/fork.c
@@ -0,0 +1,30 @@
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+void prepare() {
+    puts("Hello from prepare");
+}
+void parent() {
+    // Make sure we print in the right order and also don't exit
+    // before the fork does.
+    int us_status = usleep(1000);
+    ERROR_IF(usleep, us_status, == -1);
+    UNEXP_IF(usleep, us_status, != 0);
+
+    puts("Hello from parent");
+}
+void child() {
+    puts("Hello from child");
+}
+
+int main(void) {
+    int status = pthread_atfork(prepare, parent, child);
+    ERROR_IF(pthread_atfork, status, == -1);
+
+    int pid = fork();
+    ERROR_IF(fork, pid, == -1);
+}
diff --git a/recipes/core/relibc/tests/unistd/fsync.c b/recipes/core/relibc/tests/unistd/fsync.c
new file mode 100644
index 0000000000..b53ffd68e6
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/fsync.c
@@ -0,0 +1,20 @@
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int fd = open("example_dir/1-never-gonna-give-you-up", O_RDWR);
+    ERROR_IF(open, fd, == -1);
+    UNEXP_IF(open, fd, < 0);
+
+    int status = fsync(fd);
+    ERROR_IF(fsync, status, == -1);
+    UNEXP_IF(fsync, status, != 0);
+
+    int c = close(fd);
+    ERROR_IF(close, c, == -1);
+    UNEXP_IF(close, c, != 0);
+}
diff --git a/recipes/core/relibc/tests/unistd/ftruncate.c b/recipes/core/relibc/tests/unistd/ftruncate.c
new file mode 100644
index 0000000000..c1b35cefa5
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/ftruncate.c
@@ -0,0 +1,24 @@
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int fd = creat("ftruncate.out", 0777);
+    ERROR_IF(creat, fd, == -1);
+    UNEXP_IF(creat, fd, < 0);
+
+    int status = ftruncate(fd, 100);
+    ERROR_IF(ftruncate, status, == -1);
+    UNEXP_IF(ftruncate, status, != 0);
+
+    int c = close(fd);
+    ERROR_IF(close, c, == -1);
+    UNEXP_IF(close, c, != 0);
+
+    status = truncate("ftruncate.out", 100);
+    ERROR_IF(truncate, status, == -1);
+    UNEXP_IF(truncate, status, != 0);
+}
diff --git a/recipes/core/relibc/tests/unistd/getcwd.c b/recipes/core/relibc/tests/unistd/getcwd.c
new file mode 100644
index 0000000000..1df201e4f9
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/getcwd.c
@@ -0,0 +1,24 @@
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char first[PATH_MAX] = { 0 };
+    getcwd(first, PATH_MAX);
+    puts(first);
+
+    char* second = getcwd(NULL, 0);
+    puts(second);
+
+    if (strcmp(first, second)) {
+        puts("Not matching");
+        free(second);
+        exit(EXIT_FAILURE);
+    }
+
+    free(second);
+}
diff --git a/recipes/core/relibc/tests/unistd/gethostname.c b/recipes/core/relibc/tests/unistd/gethostname.c
new file mode 100644
index 0000000000..aa13ed6b83
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/gethostname.c
@@ -0,0 +1,15 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    char hostname[256] = { 0 };
+
+    int status = gethostname(hostname, 256);
+    ERROR_IF(gethostname, status, == -1);
+    UNEXP_IF(gethostname, status, != 0);
+
+    printf("Hostname: %s\n", hostname);
+}
diff --git a/recipes/core/relibc/tests/unistd/getid.c b/recipes/core/relibc/tests/unistd/getid.c
new file mode 100644
index 0000000000..fdd8eb285d
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/getid.c
@@ -0,0 +1,16 @@
+#include <unistd.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    gid_t egid = getegid();
+    uid_t euid = geteuid();
+    gid_t gid = getgid();
+    pid_t pgid = getpgid(0);
+    pid_t pid = getpid();
+    pid_t ppid = getppid();
+    uid_t uid = getuid();
+    printf("egid: %d, euid: %d, gid: %d, pgid: %d, pid: %d, ppid %d, uid %d\n",
+            egid, euid, gid, pgid, pid, ppid, uid);
+}
diff --git a/recipes/core/relibc/tests/unistd/getopt.c b/recipes/core/relibc/tests/unistd/getopt.c
new file mode 100644
index 0000000000..2505788a25
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/getopt.c
@@ -0,0 +1,71 @@
+#include <unistd.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+#define RUN(...) \
+    do { \
+        optind = 1; \
+        optarg = NULL; \
+        opterr = 1; \
+        optopt = -1; \
+        char *args_arr[] = { __VA_ARGS__ }; \
+        printf("result: %d\n", runner(sizeof(args_arr) / sizeof(args_arr[0]), args_arr)); \
+    } while (0)
+
+int runner(int argc, char *argv[]) {
+    int c;
+    int bflg = 0, aflg = 0, errflg = 0;
+    char *ifile = "";
+    char *ofile = "";
+
+    while((c = getopt(argc, argv, ":abf:o:")) != -1) {
+        switch(c) {
+            case 'a':
+                if(bflg)
+                    errflg++;
+                else
+                    aflg++;
+                break;
+            case 'b':
+                if(aflg)
+                    errflg++;
+                else
+                    bflg++;
+                break;
+            case 'f':
+                ifile = optarg;
+                break;
+            case 'o':
+                ofile = optarg;
+                break;
+            case ':':
+                printf("Option -%c requires an operand\n", optopt);
+                errflg++;
+                break;
+            case '?':
+                printf("Unrecognized option: -%c\n", optopt);
+                errflg++;
+        }
+    }
+    printf("bflg: %d\n", bflg);
+    printf("aflg: %d\n", aflg);
+    printf("errflg: %d\n", errflg);
+    printf("ifile: %s\n", ifile);
+    printf("ofile: %s\n", ofile);
+    if(errflg) {
+        printf("Usage: info goes here\n");
+        return 2;
+    }
+    return 0;
+}
+
+int main(void) {
+    RUN("test", "-ao", "arg", "path", "path");
+    RUN("test", "-a", "-o", "arg", "path", "path");
+    RUN("test", "-o", "arg", "-a", "path", "path");
+    RUN("test", "-a", "-o", "arg", "--", "path", "path");
+    RUN("test", "-a", "-oarg", "path", "path");
+    RUN("test", "-aoarg", "path", "path");
+    RUN("test");
+}
diff --git a/recipes/core/relibc/tests/unistd/getopt_long.c b/recipes/core/relibc/tests/unistd/getopt_long.c
new file mode 100644
index 0000000000..92716068ce
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/getopt_long.c
@@ -0,0 +1,66 @@
+#include <getopt.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+#define RUN(...) \
+    do { \
+        optind = 1; \
+        optarg = NULL; \
+        opterr = 1; \
+        optopt = -1; \
+        char *args_arr[] = { __VA_ARGS__ }; \
+        runner(sizeof(args_arr) / sizeof(char*), args_arr); \
+    } while (0)
+
+void runner(int argc, char *argv[]) {
+    printf("--- Running:");
+    for (int i = 0; i < argc; i += 1) {
+        printf(" %s", argv[i]);
+    }
+    puts("");
+
+    static int flag = 0;
+
+    static struct option long_options[] = {
+        {"test0", no_argument, NULL,  1},
+        {"test1", no_argument, &flag, 2},
+        {"test2", optional_argument, NULL, 3},
+        {"test3", required_argument, NULL, 4},
+        {NULL, 0, NULL, 5},
+    };
+
+    int option_index = 0;
+    int c;
+    while((c = getopt_long(argc, argv, ":a", long_options, &option_index)) != -1) {
+        switch(c) {
+            case 'a':
+                printf("Option -a with value %s\n", optarg);
+                break;
+            case ':':
+                printf("unrecognized argument: -%c\n", optopt);
+                break;
+            case '?':
+                printf("error: -%c\n", optopt);
+                break;
+            default:
+                printf("getopt_long returned %d, ", c);
+                if (flag) {
+                    printf("set flag to %d, ", flag);
+                    flag = 0;
+                }
+                printf("argument %s=%s\n", long_options[option_index].name, optarg);
+                break;
+        }
+    }
+}
+
+int main(void) {
+    RUN("test", "--test0", "-a");
+    RUN("test", "--test1", "-a");
+    RUN("test", "--test2", "-a");
+    RUN("test", "--test2=arg", "-a");
+    RUN("test", "--test3", "-a");
+    RUN("test", "--test3=arg", "-a");
+    RUN("test", "--test3", "arg", "-a");
+}
diff --git a/recipes/core/relibc/tests/unistd/getpagesize.c b/recipes/core/relibc/tests/unistd/getpagesize.c
new file mode 100644
index 0000000000..e7f2b43924
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/getpagesize.c
@@ -0,0 +1,11 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int getpagesize_result = getpagesize();
+
+    printf("Page size: %d\n", getpagesize_result);
+}
diff --git a/recipes/core/relibc/tests/unistd/getpass.c b/recipes/core/relibc/tests/unistd/getpass.c
new file mode 100644
index 0000000000..07c8e5c9a5
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/getpass.c
@@ -0,0 +1,39 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+// #include "test_helpers.h"
+
+int main(void)
+{
+    const char *pass = "pass";
+    const char *prompt = "Enter password: ";
+
+    char *result = getpass(prompt);
+
+    if(strcmp(pass, result)) {
+        printf("incorrect password\n");
+        exit(EXIT_FAILURE);
+    }
+
+    const char *pass_127_chars = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    result = getpass(prompt);
+
+    if(strcmp(pass_127_chars, result)) {
+        printf("incorrect password\n");
+        exit(EXIT_FAILURE);
+    }
+
+    const char *pass_empty = "";
+    result = getpass(prompt);
+
+    if(strcmp(pass_empty, result)) {
+        printf("incorrect password\n");
+        exit(EXIT_FAILURE);
+    }
+
+    printf("matching passwords\n", result);
+
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/unistd/getpass.exp b/recipes/core/relibc/tests/unistd/getpass.exp
new file mode 100644
index 0000000000..a707a04655
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/getpass.exp
@@ -0,0 +1,18 @@
+#!/usr/bin/expect
+
+set testgetpass [lindex $argv 0];
+
+spawn $testgetpass
+expect "Enter password: "
+send -- "pass\r"
+
+expect "Enter password: "
+send -- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\r"
+
+expect "Enter password: "
+send -- "\r"
+
+expect {
+    "incorrect password" { exit 123 }
+    eof
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/unistd/isatty.c b/recipes/core/relibc/tests/unistd/isatty.c
new file mode 100644
index 0000000000..5f7edfe886
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/isatty.c
@@ -0,0 +1,26 @@
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int status = isatty(STDOUT_FILENO);
+
+    if (status == 1) {
+        puts("'Tis a tty :D");
+    } else if (status == 0) {
+        if (errno == ENOTTY) {
+            // I wouldn't consider stdout not being a TTY an error
+            // (CI runners, etc.) 
+            puts("Whatever a tty is, it's not me");
+        } else {
+            perror("isatty");
+            exit(EXIT_FAILURE);
+        }
+    } else {
+        printf("isatty returned %d, unexpected result\n", status);
+        exit(EXIT_FAILURE);
+    }
+}
diff --git a/recipes/core/relibc/tests/unistd/link.c b/recipes/core/relibc/tests/unistd/link.c
new file mode 100644
index 0000000000..5c09c12606
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/link.c
@@ -0,0 +1,49 @@
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    printf("sizeof(struct stat): %ld\n", sizeof(struct stat));
+
+    struct stat buf;
+
+    // Stat for the inode
+    if (stat("unistd/link.c", &buf)) {
+        perror("stat");
+        exit(EXIT_FAILURE);
+    }
+    unsigned long inode = buf.st_ino;
+    printf("%ld\n", inode);
+
+    // Create the link
+    if (link("unistd/link.c", "link.out")) {
+        perror("link");
+        exit(EXIT_FAILURE);
+    }
+
+    // Make sure inodes match
+    if (stat("link.out", &buf)) {
+        perror("stat");
+    }
+    printf("%ld\n", inode);
+    printf("%ld\n", buf.st_ino);
+    if (inode != buf.st_ino) {
+        puts("Created file is not a link.");
+        printf("unistd/link.c inode: %ld\n", inode);
+        printf("link.out inode: %ld\n", buf.st_ino);
+    }
+
+    // Remove link
+    if (unlink("link.out")) {
+        perror("unlink");
+        exit(EXIT_FAILURE);
+    }
+    if (!stat("link.out", &buf) || errno != ENOENT) {
+        perror("stat");
+        exit(EXIT_FAILURE);
+    }
+}
diff --git a/recipes/core/relibc/tests/unistd/pathconf.c b/recipes/core/relibc/tests/unistd/pathconf.c
new file mode 100644
index 0000000000..bbbf922b79
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/pathconf.c
@@ -0,0 +1,35 @@
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+#define PC(N) \
+    do { \
+        errno = 0; \
+        printf("%s (%d): %ld (%d)\n", #N, _PC_ ## N, fpathconf(0, _PC_ ## N), errno); \
+    } while (0)
+
+int main(void) {
+    PC(LINK_MAX);
+    PC(MAX_CANON);
+    PC(MAX_INPUT);
+    PC(NAME_MAX);
+    PC(PATH_MAX);
+    PC(PIPE_BUF);
+    PC(CHOWN_RESTRICTED);
+    PC(NO_TRUNC);
+    PC(VDISABLE);
+    PC(SYNC_IO);
+    PC(ASYNC_IO);
+    PC(PRIO_IO);
+    PC(SOCK_MAXBUF);
+    PC(FILESIZEBITS);
+    PC(REC_INCR_XFER_SIZE);
+    PC(REC_MAX_XFER_SIZE);
+    PC(REC_MIN_XFER_SIZE);
+    PC(REC_XFER_ALIGN);
+    PC(ALLOC_SIZE_MIN);
+    PC(SYMLINK_MAX);
+    PC(2_SYMLINKS);
+}
diff --git a/recipes/core/relibc/tests/unistd/pipe.c b/recipes/core/relibc/tests/unistd/pipe.c
new file mode 100644
index 0000000000..9f4b79a62e
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/pipe.c
@@ -0,0 +1,76 @@
+//http://www2.cs.uregina.ca/~hamilton/courses/330/notes/unix/pipes/pipes.html
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int pip[2];
+    char instring[20];
+    char *outstring = "Hello World!";
+
+    int pipe_status = pipe(pip);
+    ERROR_IF(pipe, pipe_status, == -1);
+    UNEXP_IF(pipe, pipe_status, != 0);
+
+    int pid = fork();
+    ERROR_IF(fork, pid, == -1);
+
+    if (pid == 0) {
+        // child: sends message to parent
+        // close read end
+        int cr = close(pip[0]);
+        ERROR_IF(close, cr, == -1);
+        UNEXP_IF(close, cr, != 0);
+
+        // send 7 characters in the string, including end-of-string
+        ssize_t bytes = write(pip[1], outstring, strlen(outstring));
+        ERROR_IF(write, bytes, == -1);
+
+        // check result
+        if ((size_t)bytes != strlen(outstring)) {
+            fprintf(stderr, "pipe write: %d != %ld\n", bytes, strlen(outstring));
+            exit(EXIT_FAILURE);
+        }
+
+        // close write end
+        int cw = close(pip[1]);
+        ERROR_IF(close, cw, == -1);
+        UNEXP_IF(close, cw, != 0);
+
+        exit(EXIT_SUCCESS);
+    } else {
+        // parent: receives message from child
+        // close write end
+        int cw = close(pip[1]);
+        ERROR_IF(close, cw, == -1);
+        UNEXP_IF(close, cw, != 0);
+
+        // clear memory
+        memset(instring, 0, sizeof(instring));
+
+        // read from the pipe
+        ssize_t bytes = read(pip[0], instring, sizeof(instring) - 1);
+        ERROR_IF(read, bytes, == -1);
+
+        // check result
+        if ((size_t)bytes != strlen(outstring)) {
+            fprintf(stderr, "pipe read: %d != %ld\n", bytes, strlen(outstring));
+            exit(EXIT_FAILURE);
+        } else if (memcmp(instring, outstring, strlen(outstring)) != 0) {
+            fprintf(stderr, "pipe read does not match pipe write\n");
+            exit(EXIT_FAILURE);
+        } else {
+            printf("%s\n", instring);
+        }
+
+        // close read end
+        int cr = close(pip[0]);
+        ERROR_IF(close, cr, == -1);
+        UNEXP_IF(close, cr, != 0);
+
+        exit(EXIT_SUCCESS);
+    }
+}
diff --git a/recipes/core/relibc/tests/unistd/readlinkat.c b/recipes/core/relibc/tests/unistd/readlinkat.c
new file mode 100644
index 0000000000..9009543438
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/readlinkat.c
@@ -0,0 +1,146 @@
+#include <assert.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+__attribute__((nonnull))
+static int run_test(
+    int dir,
+    const char name[],
+    char buf[PATH_MAX],
+    const char expected[]
+) {
+    if (readlinkat(dir, name, buf, PATH_MAX) == -1) {
+        perror("readlinkat");
+        return -1;
+    }
+    if (strncmp(expected, buf, PATH_MAX) != 0) {
+        fprintf(
+            stderr,
+            "readlinkat mismatch\n\tExpected: %s\n\tActual: %s\n",
+            expected,
+            buf
+        );
+        return -1;
+    }
+
+    return 0;
+}
+
+int main(void) {
+    int status = EXIT_FAILURE;
+
+    char template[] = "/tmp/rlatest.XXXXXX";
+    if (!mkdtemp(template)) {
+        perror("mkdtemp");
+        goto bye;
+    }
+    int dir = open(template, O_DIRECTORY);
+    if (dir == -1) {
+        perror("open");
+        goto rmtempdir;
+    }
+
+    // Set up file and link.
+    size_t len = sizeof(template) - 1;
+    const char file_name[] = "miku";
+    char file_path[PATH_MAX] = {0};
+    memcpy(file_path, template, len);
+    file_path[len] = '/';
+    memcpy(&file_path[len + 1], file_name, sizeof(file_name));
+    int file = open(file_path, O_CREAT | O_WRONLY);
+    if (file == -1) {
+        perror("open");
+        goto close_dir;
+    }
+
+    // Writing a sentinel message to the target file is useful in case
+    // readlinkat reads the file instead of the link. If that happens,
+    // it will self-evident instead of printing an empty string.
+    // (n.b. this totally happened to me so I KNOW it's useful)
+    const char msg[] = "readlinkat read the file instead of the link...oops";
+    const ssize_t msg_len = sizeof(msg);
+    assert(msg_len < PATH_MAX);
+    if (write(file, msg, msg_len) < msg_len) {
+        perror("write");
+        goto rmfiles;
+    }
+    if (close(file) == -1) {
+        perror("close");
+        goto rmfiles;
+    }
+    file = -1;
+
+    const char link_name[] = "link";
+    char link_path[PATH_MAX] = {0};
+    memcpy(link_path, template, len);
+    link_path[len] = '/';
+    memcpy(&link_path[len + 1], link_name, len);
+    if (symlink(file_path, link_path) == -1) {
+        perror("symlink");
+        goto rmfiles;
+    }
+
+    // Relative path
+    char buf[PATH_MAX] = {0};
+    if (run_test(dir, link_name, buf, file_path) == -1) {
+        fputs("Context: Basic test (relative path)\n", stderr);
+        goto rmfiles;
+    }
+
+    // Absolute path
+    memset(buf, 0, PATH_MAX);
+    if (run_test(dir, link_path, buf, file_path) == -1) {
+        fputs("Context: Absolute path\n", stderr);
+        goto rmfiles;
+    }
+
+    // AT_FDCWD
+    memset(buf, 0, PATH_MAX);
+    char old_cwd[PATH_MAX] = {0};
+    if (!getcwd(old_cwd, PATH_MAX)) {
+        perror("getcwd");
+        goto rmfiles;
+    }
+    if (chdir(template) == -1) {
+        perror("chdir");
+        goto rmfiles;
+    }
+    if (run_test(AT_FDCWD, link_name, buf, file_path) == -1) {
+        fputs("Context: AT_FDCWD\n", stderr);
+        goto rmfiles;
+    }
+    if (chdir(old_cwd) == -1) {
+        perror("chdir");
+        goto rmfiles;
+    }
+
+    // Not a dir
+    memset(buf, 0, PATH_MAX);
+    file = open(file_path, O_PATH);
+    if (file == -1) {
+        perror("open");
+        goto rmfiles;
+    }
+    if (readlinkat(file, "", buf, PATH_MAX) != -1) {
+        fputs("Context: Using a file for dirfd should fail\n", stderr);
+        fprintf(stderr, "readlinkat wrote this into buf: %s\n", buf);
+        goto close_file;
+    }
+
+    status = EXIT_SUCCESS;
+close_file:
+    close(file);
+rmfiles:
+    unlink(file_path);
+    unlink(link_path);
+close_dir:
+    close(dir);
+rmtempdir:
+    rmdir(template);
+bye:
+    return status;
+}
diff --git a/recipes/core/relibc/tests/unistd/rmdir.c b/recipes/core/relibc/tests/unistd/rmdir.c
new file mode 100644
index 0000000000..be9e7be919
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/rmdir.c
@@ -0,0 +1,15 @@
+#include <unistd.h>
+#include <sys/stat.h>
+#include <stdio.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int mk_status = mkdir("foo", 0);
+    ERROR_IF(mkdir, mk_status, == -1);
+    UNEXP_IF(mkdir, mk_status, != 0);
+
+    int rm_status = rmdir("foo");
+    ERROR_IF(rmdir, rm_status, == -1);
+    UNEXP_IF(rmdir, rm_status, != 0);
+}
diff --git a/recipes/core/relibc/tests/unistd/setid.c b/recipes/core/relibc/tests/unistd/setid.c
new file mode 100644
index 0000000000..c5184bddd2
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/setid.c
@@ -0,0 +1,28 @@
+/*
+ * The process joins process group 0.
+ */
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int pg_status = setpgid(getpid(), 0);
+    ERROR_IF(setpgid, pg_status, == -1);
+    UNEXP_IF(setpgid, pg_status, != 0);
+
+    printf("%d belongs to process group %d\n", getpid(), getpgrp());
+
+    int reg_status = setregid(-1, -1);
+    ERROR_IF(setregid, reg_status, == -1);
+    UNEXP_IF(setregid, reg_status, != 0);
+
+    printf("%d has egid %d and gid %d\n", getpid(), getegid(), getgid());
+
+    int reu_status = setreuid(-1, -1);
+    ERROR_IF(setreuid, reu_status, == -1);
+    UNEXP_IF(setreuid, reu_status, != 0);
+
+    printf("%d has euid %d and uid %d\n", getpid(), geteuid(), getuid());
+}
diff --git a/recipes/core/relibc/tests/unistd/sleep.c b/recipes/core/relibc/tests/unistd/sleep.c
new file mode 100644
index 0000000000..92b254e79f
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/sleep.c
@@ -0,0 +1,43 @@
+#include <time.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <signal.h>
+
+#include "test_helpers.h"
+
+int usleep(useconds_t);
+
+void handler(int _s)
+{
+    (void)_s;
+}
+
+int main(void)
+{
+    // sleep has no error codes and doesn't set errno
+    unsigned int unslept = sleep(1);
+    printf("unslept: %u\n", unslept);
+
+    struct sigaction sa;
+    memset(&sa, 0, sizeof(sa));
+    sa.sa_handler = handler;
+    sigaction(SIGALRM, &sa, NULL);
+    // TODO: This test is unreliable, overlapping use of alarm and sleep is not recommended.
+    // alarm(1);
+
+    // unslept = sleep(10);
+    // if (unslept < 7)
+    // {
+    //     printf("after alarm, unslept too short: %u\n", unslept);
+    //     exit(EXIT_FAILURE);
+    // }
+
+    int us_status = usleep(100000);
+    ERROR_IF(usleep, us_status, == -1);
+    UNEXP_IF(usleep, us_status, != 0);
+
+    struct timespec tm = {0, 10000};
+    int ns_status = nanosleep(&tm, NULL);
+    ERROR_IF(nanosleep, ns_status, == -1);
+    UNEXP_IF(nanosleep, ns_status, != 0);
+}
diff --git a/recipes/core/relibc/tests/unistd/swab.c b/recipes/core/relibc/tests/unistd/swab.c
new file mode 100644
index 0000000000..dd4603913a
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/swab.c
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <unistd.h>
+
+int main(void) {
+    const char source[] = {0, 1, 2, 3, 4, 5, 6};
+    char destination[] = {0, 0, 0, 0, 0, 0};
+    const char flipped_source[] = {1, 0, 3, 2, 5, 4};
+    const char first_two_source_bytes_flipped[] = {1, 0};
+
+#ifndef __GLIBC__
+    swab(source, destination, /* nbytes */ -3);
+    for (size_t i = 0; i < sizeof(destination); ++i) {
+        if (destination[i] != 0) {
+            puts("If nbytes is negative destionation shouldn't be modified");
+            return 1;
+        }
+    }
+#endif
+
+    swab(source, destination, /* nbytes */ 0);
+    for (size_t i = 0; i < sizeof(destination); ++i) {
+        if (destination[i] != 0) {
+            puts("If nbytes is zero destionation shouldn't be modified");
+            return 1;
+        }
+    }
+
+    swab(source, destination, /* nbytes */ 3);
+    for (size_t i = 0; i < sizeof(first_two_source_bytes_flipped); ++i) {
+        if (destination[i] != first_two_source_bytes_flipped[i]) {
+            puts("copied bytes don't match expected values");
+            return 1;
+        }
+    }
+    // If nbytes is not even it's not specified what should happen to the
+    // last byte so the third byte in destination is not checked.
+    for (size_t i = sizeof(first_two_source_bytes_flipped) + 1; i < sizeof(destination); ++i) {
+        if (destination[i] != 0) {
+            puts("swab modified too many bytes in destination");
+            return 1;
+        }
+    }
+
+    swab(source, destination, /* nbytes */ sizeof(destination));
+    for (size_t i = 0; i < sizeof(destination); ++i) {
+        if (destination[i] != flipped_source[i]) {
+            puts("copied bytes don't match expected values");
+            return 1;
+        }
+    }
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/unistd/sysconf.c b/recipes/core/relibc/tests/unistd/sysconf.c
new file mode 100644
index 0000000000..05b1ed1b66
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/sysconf.c
@@ -0,0 +1,32 @@
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+#define SC(N) \
+    do { \
+        errno = 0; \
+        printf("%s (%d): %ld (%d)\n", #N, _SC_ ## N, sysconf(_SC_ ## N), errno); \
+    } while (0)
+
+int main(void) {
+    SC(ARG_MAX);
+    SC(CHILD_MAX);
+    SC(CLK_TCK);
+    SC(NGROUPS_MAX);
+    SC(OPEN_MAX);
+    SC(STREAM_MAX);
+    SC(TZNAME_MAX);
+    SC(VERSION);
+    SC(PAGESIZE);
+    SC(RE_DUP_MAX);
+    SC(LOGIN_NAME_MAX);
+    SC(TTY_NAME_MAX);
+    SC(SYMLOOP_MAX);
+    SC(HOST_NAME_MAX);
+    SC(NPROCESSORS_CONF);
+    SC(NPROCESSORS_ONLN);
+    SC(PHYS_PAGES);
+    SC(AVPHYS_PAGES);
+}
diff --git a/recipes/core/relibc/tests/unistd/write.c b/recipes/core/relibc/tests/unistd/write.c
new file mode 100644
index 0000000000..6810af3855
--- /dev/null
+++ b/recipes/core/relibc/tests/unistd/write.c
@@ -0,0 +1,8 @@
+#include <unistd.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    int written = write(STDOUT_FILENO, "Hello World!\n", 13);
+    ERROR_IF(write, written, == -1);
+}
diff --git a/recipes/core/relibc/tests/waitpid.c b/recipes/core/relibc/tests/waitpid.c
new file mode 100644
index 0000000000..4d89c078ca
--- /dev/null
+++ b/recipes/core/relibc/tests/waitpid.c
@@ -0,0 +1,38 @@
+#include <assert.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+void for_code(int code) {
+    pid_t pid = fork();
+    ERROR_IF(fork, pid, == -1);
+
+    // Testing successful exit
+    if (pid == 0) {
+        // child
+        usleep(100000);
+        _Exit(code);
+    }
+    printf("Testing waitpid of child %d for code %d\n", pid, code);
+    // parent
+    int status;
+    pid_t wid = waitpid(pid, &status, 0);
+    ERROR_IF(waitpid, wid, == -1);
+
+    assert(WIFEXITED(status));
+    assert(WEXITSTATUS(status) == code);
+
+    puts("Success");
+}
+
+int main(void) {
+    for_code(EXIT_SUCCESS);
+    for_code(EXIT_FAILURE);
+    for_code(42);
+    for_code(255);
+    // TODO: Also add coverage for e.g. WIFSTOPPED, WSTOPSIG, WTERMSIG, etc
+
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/core/relibc/tests/waitpid_multiple.c b/recipes/core/relibc/tests/waitpid_multiple.c
new file mode 100644
index 0000000000..f787c84e04
--- /dev/null
+++ b/recipes/core/relibc/tests/waitpid_multiple.c
@@ -0,0 +1,58 @@
+#include <stdio.h>
+#include <assert.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    // Spawn three childrens, one with same pgid and two with pgid set to its own
+    // pid, so the exit order is two different pgid, then followed with same pgid
+
+    pid_t pid_samepgid = fork();
+    ERROR_IF(fork, pid_samepgid, == -1);
+
+    if (pid_samepgid == 0) {
+        // child
+        usleep(300000);
+        _Exit(2);
+    }
+    pid_t pid_diffpgids[2];
+    for (int i = 0; i < 2; i++) {
+        pid_diffpgids[i] = fork();
+        ERROR_IF(fork, pid_diffpgids[i], == -1);
+
+        if (pid_diffpgids[i] == 0) {
+            int ret = setpgid(0, 0);
+            ERROR_IF(setpgid, ret, == -1);
+
+            // child
+            usleep((i + 1) * 100000);
+            _Exit(i);
+        }
+    }
+    int status;
+    pid_t wid;
+
+    // First, check that the first different-pgid proc is recognized.
+    wid = waitpid(-1, &status, 0);
+    ERROR_IF(waitpid, wid, == -1);
+    assert(wid == pid_diffpgids[0]);
+    assert(WIFEXITED(status));
+    assert(WEXITSTATUS(status) == 0);
+
+    // Then, check that the longest-waiting proc with the same pgid is properly matched.
+    wid = waitpid(0, &status, 0);
+    ERROR_IF(waitpid, wid, == -1);
+    assert(wid == pid_samepgid);
+    assert(WIFEXITED(status));
+    assert(WEXITSTATUS(status) == 2);
+
+    // Finally, the last different-pgid must have completed.
+    wid = waitpid(-1, &status, WNOHANG);
+    ERROR_IF(waitpid, wid, == -1);
+    assert(wid == pid_diffpgids[1]);
+    assert(WIFEXITED(status));
+    assert(WEXITSTATUS(status) == 1);
+}
diff --git a/recipes/core/relibc/tests/wchar/fgetwc.c b/recipes/core/relibc/tests/wchar/fgetwc.c
new file mode 100644
index 0000000000..1aeeff16ff
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/fgetwc.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include <wchar.h>
+#include <locale.h>
+
+int main(void)
+{
+    setlocale(LC_ALL, "");
+    wint_t wc;
+    FILE *fp = fopen("wchar/fgetwc.in", "r");
+    if (!fp) {
+        return 1;
+    }
+
+    while (WEOF != (wc = fgetwc(fp)))                      
+      printf("%lc", wc);
+
+    fclose(fp);
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/fgetwc.in b/recipes/core/relibc/tests/wchar/fgetwc.in
new file mode 100644
index 0000000000..e7cabf537e
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/fgetwc.in
@@ -0,0 +1,3 @@
+êçã
+こんにちは世界
+Привет мир
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/wchar/fwide.c b/recipes/core/relibc/tests/wchar/fwide.c
new file mode 100644
index 0000000000..12eceb75a0
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/fwide.c
@@ -0,0 +1,60 @@
+#include <assert.h>
+#include <stdio.h>
+#include <wchar.h>
+
+int test_initial_orientation(void) {
+	FILE *f = tmpfile();
+	assert(fwide(f, 0) == 0);
+	return 0;
+}
+
+int test_manual_byte_orientation(void) {
+	FILE *f = tmpfile();
+
+	// set manually to byte orientation
+	assert(fwide(f, -483) == -1);
+
+	// Cannot change to wchar orientation
+	assert(fwide(f, 1) == -1);
+
+	fclose(f);
+	return 0;
+}
+
+int test_manual_wchar_orientation(void) {
+	FILE *f = tmpfile();
+
+	// set manually to wchar orientation
+	assert(fwide(f, 483) == 1);
+
+	// Cannot change to byte orientation
+	assert(fwide(f, -1) == 1);
+
+	fclose(f);
+	return 0;
+}
+
+int test_orientation_after_fprintf(void) {
+	// open file and write bytes; implicitly setting the bytes orientation
+	FILE *f = tmpfile();
+	assert(fprintf(f, "blah\n") == 5);
+
+	// Check that bytes orientation is set
+	assert(fwide(f, 0) == -1);
+
+	fclose(f);
+	return 0;
+}
+
+int main() {
+	int(*tests[])(void) = {
+		&test_initial_orientation,
+		&test_manual_byte_orientation,
+		&test_manual_wchar_orientation,
+		&test_orientation_after_fprintf,
+	};
+	for(size_t i = 0; i < sizeof(tests) / sizeof(int(*)(void)); i++) {
+		printf("%d\n", (*tests[i])());
+	}
+}
+
diff --git a/recipes/core/relibc/tests/wchar/mbrtowc.c b/recipes/core/relibc/tests/wchar/mbrtowc.c
new file mode 100644
index 0000000000..0a1824429a
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/mbrtowc.c
@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+ 
+#include "test_helpers.h"
+
+int main(void) {
+    mbstate_t state;
+    memset(&state, 0, sizeof state);
+    char in[] = u8"z\u00df\u6c34\U0001F34C"; // or u8"zß水🍌"
+    size_t in_sz = sizeof in / sizeof *in;
+ 
+    printf("Processing %zu UTF-8 code units: [ ", in_sz); //Should be 11 regular chars
+    for(size_t n = 0; n < in_sz; ++n) printf("%#x ", (unsigned char)in[n]);
+    puts("]");
+ 
+    wchar_t out[in_sz];
+    char *p_in = in, *end = in + in_sz;
+    wchar_t *p_out = out;
+    int rc;
+    while((rc = mbrtowc(p_out, p_in, end - p_in, &state)) > 0)
+    {
+        p_in += rc;
+        p_out += 1;
+    }
+ 
+    size_t out_sz = p_out - out + 1;
+    printf("into %zu wchar_t units: [ ", out_sz); //Should be 5 wchars
+    for(size_t x = 0; x < out_sz; ++x) printf("%#x ", out[x]);
+    puts("]");
+}
diff --git a/recipes/core/relibc/tests/wchar/mbsrtowcs.c b/recipes/core/relibc/tests/wchar/mbsrtowcs.c
new file mode 100644
index 0000000000..6db79da51a
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/mbsrtowcs.c
@@ -0,0 +1,25 @@
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+
+#include "test_helpers.h"
+
+void print_as_wide(const char* mbstr)
+{
+    mbstate_t state;
+    memset(&state, 0, sizeof state);
+    size_t len = 1 + mbsrtowcs(NULL, &mbstr, 0, &state);
+    wchar_t wstr[len];
+    mbsrtowcs(&wstr[0], &mbstr, len, &state);
+
+    //Should be 5
+    printf("The length, including '\\0': %li \n",len);
+
+    //missing wprintf to print this wide string
+    //wprintf(L"The wide string: %ls \n", &wstr[0]);
+}
+
+int main(void) {
+    const char* mbstr = u8"z\u00df\u6c34\U0001f34c"; // or u8"zß水🍌"
+    print_as_wide(mbstr);
+}
diff --git a/recipes/core/relibc/tests/wchar/printf-on-wchars.c b/recipes/core/relibc/tests/wchar/printf-on-wchars.c
new file mode 100644
index 0000000000..20860c74f1
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/printf-on-wchars.c
@@ -0,0 +1,22 @@
+#include <stdio.h>
+#include <sys/types.h>
+#include <wchar.h>
+
+int main() {
+    wint_t a = L'1';
+    wint_t b = L'2';
+    wint_t c = L'a';
+    wint_t d = L'b';
+    printf("This is a few one-byte chars: %lc %lc %lc %lc\n", a, b, c, d);
+    wchar_t *s = L"Hello World";
+    printf("Long one-byte string: %ls\n", s);
+
+    a = L'❤';
+    b = L'R';
+    c = L'😠';
+    d = L'C';
+    printf("This is a few multi-byte chars: %lc %lc %lc %lc\n", a, b, c, d);
+
+    s = L"👉😎👉 Zoop!";
+    printf("Long multi-byte string: %ls\n", s);
+}
diff --git a/recipes/core/relibc/tests/wchar/putwchar.c b/recipes/core/relibc/tests/wchar/putwchar.c
new file mode 100644
index 0000000000..fc25911468
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/putwchar.c
@@ -0,0 +1,15 @@
+#include <string.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    wchar_t *wcs = L"zß水🍌";
+
+    for (int i = 0; wcs[i] != L'\0'; i++) {
+        wint_t status = putwchar(wcs[i]);
+        ERROR_IF(putwchar, status, == WEOF);
+    }
+}
diff --git a/recipes/core/relibc/tests/wchar/ungetwc.c b/recipes/core/relibc/tests/wchar/ungetwc.c
new file mode 100644
index 0000000000..26f2649a4d
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/ungetwc.c
@@ -0,0 +1,28 @@
+#include <wchar.h>
+#include <wctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <locale.h>
+
+int main()
+{
+   setlocale(LC_ALL, "");
+   FILE *stream;
+   wint_t wc;
+   wint_t wc2;
+
+   if (NULL == (stream = fopen("wchar/ungetwc.in", "r+")))
+      return 1;
+ 
+   while (WEOF != (wc = fgetwc(stream)) && iswdigit(wc)) {}
+ 
+   if (WEOF != wc)
+      ungetwc(wc, stream);
+   
+   wc2 = fgetwc(stream);
+   assert(WEOF != wc2);
+   assert(wc == wc2);
+   
+   return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/wchar/ungetwc.in b/recipes/core/relibc/tests/wchar/ungetwc.in
new file mode 100644
index 0000000000..a86807323c
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/ungetwc.in
@@ -0,0 +1 @@
+123çA
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/wchar/wcpcpy.c b/recipes/core/relibc/tests/wchar/wcpcpy.c
new file mode 100644
index 0000000000..c65421220d
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcpcpy.c
@@ -0,0 +1,16 @@
+#include <wchar.h>
+#include <assert.h>
+#include <string.h>
+
+int main() {
+    wchar_t src[] = L"こんにちは世界!";
+    wchar_t dest[9];
+
+    wchar_t* result = wcpcpy(dest, src);
+
+    assert(wcscmp(dest, src) == 0);
+    assert(*result == L'\0');
+    assert(result == dest + wcslen(src));
+
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/wchar/wcpncpy.c b/recipes/core/relibc/tests/wchar/wcpncpy.c
new file mode 100644
index 0000000000..62c0bdb4e2
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcpncpy.c
@@ -0,0 +1,37 @@
+#include <wchar.h>
+#include <assert.h>
+#include <string.h>
+
+int main() {
+    wchar_t src[] = L"Привет мир";
+
+    size_t n_input = 10;
+    size_t n_short = 6;
+    size_t n_long = 15;
+
+    // Initialize with sentinel values to detect exactly how much is overwritten
+    wchar_t dest_short[] = L"\x12\x34\x56\x78\x90\x12\x34\x56\x78\x90\x12\x34\x56\x78";
+    wchar_t dest_long[] = L"\x12\x34\x56\x78\x90\x12\x34\x56\x78\x90\x12\x34\x56\x78";
+
+    wchar_t expected_short[] = L"Привет\x34\x56\x78\x90\x12\x34\x56\x78";
+
+    // The "short" test should copy exactly n_short characters without terminating null
+    wchar_t* result_short = wcpncpy(dest_short, src, n_short);
+    assert(wcsncmp(dest_short, src, n_short) == 0);
+    assert(result_short == dest_short + n_short);
+    for (size_t i = n_short; i < n_long; i++) {
+        // Check that the sentinel characters have not been overwritten
+        assert(dest_short[i] == expected_short[i]);
+    }
+
+    // The "long" test should write the input string, with nulls appended up to n_long
+    wchar_t* result_long = wcpncpy(dest_long, src, n_long);
+    assert(wcsncmp(dest_long, src, n_long) == 0);
+    assert(result_long == dest_long + n_input);
+    for (size_t i = n_input; i < n_long; i++) {
+        // Check that nulls are written up to n_long
+        assert(dest_long[i] == L'\0');
+    }
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/wcrtomb.c b/recipes/core/relibc/tests/wchar/wcrtomb.c
new file mode 100644
index 0000000000..9978da5ab4
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcrtomb.c
@@ -0,0 +1,30 @@
+#include <string.h>  
+#include <stdio.h>  
+#include <wchar.h> 
+#include <stdlib.h>
+
+#include "test_helpers.h"
+
+int main(void) {
+    mbstate_t state;
+    memset(&state, 0, sizeof state);
+    wchar_t in[] = L"zß水🍌"; // or "z\u00df\u6c34\U0001F34C"
+    size_t in_sz = sizeof in / sizeof *in;
+ 
+    printf("Processing %zu wchar_t units: [ ", in_sz);
+    for(size_t n = 0; n < in_sz; ++n) printf("%#x ", (unsigned int)in[n]);
+    puts("]");
+ 
+    char out[MB_CUR_MAX * in_sz];
+    char *p = out;
+    for(size_t n = 0; n < in_sz; ++n) {
+        int rc = wcrtomb(p, in[n], &state); 
+        if(rc == -1) break;
+        p += rc;
+    }
+ 
+    size_t out_sz = p - out;
+    printf("into %zu UTF-8 code units: [ ", out_sz);
+    for(size_t x = 0; x < out_sz; ++x) printf("%#x ", +(unsigned char)out[x]);
+    puts("]");
+}
diff --git a/recipes/core/relibc/tests/wchar/wcscasecmp.c b/recipes/core/relibc/tests/wchar/wcscasecmp.c
new file mode 100644
index 0000000000..7241be198a
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcscasecmp.c
@@ -0,0 +1,11 @@
+#include <stdio.h>
+#include <wchar.h>
+
+int main() {
+  wchar_t *s1 = L"ThIs Is StRiNg 1.";
+  wchar_t *s2 = L"tHiS iS sTrInG 2.";
+  printf("wcscasecmp(s1, s1) = %d\n", wcscasecmp(s1, s1));
+  printf("wcscasecmp(s1, s2) = %d\n", wcscasecmp(s1, s2));
+  printf("wcscasecmp(s2, s1) = %d\n", wcscasecmp(s2, s1));
+  printf("wcscasecmp(s2, s2) = %d\n", wcscasecmp(s2, s2));
+}
diff --git a/recipes/core/relibc/tests/wchar/wcschr.c b/recipes/core/relibc/tests/wchar/wcschr.c
new file mode 100644
index 0000000000..2b396d4763
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcschr.c
@@ -0,0 +1,13 @@
+#include <assert.h>
+#include <wchar.h>
+
+int main(void) {
+    wchar_t *haystack = L"Hello World!";
+
+    assert(wcschr(haystack, L'H') == haystack);
+    assert(wcschr(haystack, L'W') == &haystack[6]);
+    assert(wcschr(haystack, L'\0') == &haystack[12]); // the terminating nul is considered part of the string
+    assert(wcschr(haystack, L'X') == NULL);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/wcscspn.c b/recipes/core/relibc/tests/wchar/wcscspn.c
new file mode 100644
index 0000000000..f61adae236
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcscspn.c
@@ -0,0 +1,16 @@
+#include <assert.h>
+#include <wchar.h>
+
+int main(void) {
+
+    assert(wcscspn(L"", L"") == 0);
+    assert(wcscspn(L"", L"h") == 0);
+    assert(wcscspn(L"a", L"a") == 0);
+
+    assert(wcscspn(L"ba", L"ab") == 0);
+    assert(wcscspn(L"ba", L"a") == 1);
+
+    assert(wcscspn(L"abcdefghijkl$\"£$%", L"zxqrst,./$w") == 12);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/wcsdup.c b/recipes/core/relibc/tests/wchar/wcsdup.c
new file mode 100644
index 0000000000..27d4a2c580
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcsdup.c
@@ -0,0 +1,16 @@
+#include <wchar.h>
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+int main() {
+    wchar_t src[] = L"こんにちは世界Привет мир";
+
+    wchar_t* dup = wcsdup(src);
+    
+    assert(wcscmp(dup, src) == 0);
+    assert(dup != src);
+    free(dup);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/wcsncasecmp.c b/recipes/core/relibc/tests/wchar/wcsncasecmp.c
new file mode 100644
index 0000000000..d0e815fe6e
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcsncasecmp.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+#include <wchar.h>
+
+int main() {
+  wchar_t *s1 = L"This is string 1.";
+  wchar_t *s2 = L"This is string 2.";
+  printf("wcsncasecmp(s1, s1, 17) = %d\n", wcsncasecmp(s1, s1, 17));
+  printf("wcsncasecmp(s1, s2, 17) = %d\n", wcsncasecmp(s1, s2, 17));
+  printf("wcsncasecmp(s2, s1, 17) = %d\n", wcsncasecmp(s2, s1, 17));
+  printf("wcsncasecmp(s2, s1, 15) = %d\n", wcsncasecmp(s2, s1, 15));
+  printf("wcsncasecmp(s1, s2, 0) = %d\n", wcsncasecmp(s1, s2, 0));
+}
diff --git a/recipes/core/relibc/tests/wchar/wcsnlen.c b/recipes/core/relibc/tests/wchar/wcsnlen.c
new file mode 100644
index 0000000000..ff1c705fbf
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcsnlen.c
@@ -0,0 +1,9 @@
+#include <wchar.h>
+#include <assert.h>
+
+int main() {
+   // size is 17
+   wchar_t* str1 = L"こんにちは世界Привет мир";
+   assert(wcsnlen(str1, 10) == 10);
+   assert(wcsnlen(str1, 100) == 17);
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/wchar/wcsnrtombs.c b/recipes/core/relibc/tests/wchar/wcsnrtombs.c
new file mode 100644
index 0000000000..eb2a859267
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcsnrtombs.c
@@ -0,0 +1,18 @@
+#include <assert.h>
+#include <locale.h>
+#include <wchar.h>
+#include <string.h>
+
+int main() {
+    setlocale(LC_ALL, "");
+
+    const wchar_t *src = L"こんにちは世界Привет мир";
+    char dst[20] = {0};
+    mbstate_t ps;
+
+    size_t result = wcsnrtombs(dst, &src, 4, sizeof(dst), &ps);
+    assert(result == 12);
+    assert(strcmp(dst, "こんにち") == 0);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/wcsrchr.c b/recipes/core/relibc/tests/wchar/wcsrchr.c
new file mode 100644
index 0000000000..08b43ea0fc
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcsrchr.c
@@ -0,0 +1,24 @@
+#include <assert.h>
+#include <wchar.h>
+
+int main() {
+    wchar_t *s;
+
+    assert(wcsrchr(L"", L'a') == NULL);
+    
+    s = L"a";
+    assert(wcsrchr(s, L'a') == s);
+
+    s = L"aa";
+    assert(wcsrchr(s, L'a') == s + 1);
+
+    s = L"aab";
+    assert(wcsrchr(s, L'a') == s + 1);
+    
+    s = L"abcdef!\"£$%^e&*";
+    assert(wcsrchr(s, L'g') == NULL);
+    assert(wcsrchr(s, L'\"') == s + 7);
+    assert(wcsrchr(s, L'e') == s + 12);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/wcsrtombs.c b/recipes/core/relibc/tests/wchar/wcsrtombs.c
new file mode 100644
index 0000000000..087a8862ae
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcsrtombs.c
@@ -0,0 +1,23 @@
+#include <assert.h>
+#include <wchar.h>
+#include <string.h>
+#include <stdlib.h>
+
+int main() {
+    const wchar_t *wcs1 = L"";
+    size_t mb_len1 = wcsrtombs(NULL, &wcs1, 0, NULL);
+    assert(mb_len1 == 0);
+
+    const wchar_t *wcs2 = L"Hello, world!";
+    size_t mb_len2 = wcsrtombs(NULL, &wcs2, 0, NULL);
+    assert(mb_len2 == strlen("Hello, world!"));
+
+    // wcsrtombs resets wcs2 to zero, so we need to fill it again
+    wcs2 = L"Hello, world!";
+    char *mbs2 = malloc(mb_len2 + 1);
+    wcsrtombs(mbs2, &wcs2, mb_len2 + 1, NULL);
+    assert(strcmp(mbs2, "Hello, world!") == 0);
+    free(mbs2);
+
+    return 0;
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/wchar/wcsstr.c b/recipes/core/relibc/tests/wchar/wcsstr.c
new file mode 100644
index 0000000000..b49a4baac2
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcsstr.c
@@ -0,0 +1,27 @@
+#include <assert.h>
+#include <wchar.h>
+
+int main(void) {
+    wchar_t *haystack = L"Hello, World!";
+    wchar_t *haystack_empty = L"";
+
+    wchar_t *needle_expected = L"World";
+    wchar_t *needle_expected_multiple = L"l";
+    wchar_t *needle_not_expected = L"Rust";
+    wchar_t *needle_too_long = L"Hello, World!!!";
+    wchar_t *needle_empty = L"";
+
+    assert(wcsstr(haystack, needle_expected) == haystack + 7);
+    assert(wcsstr(haystack, needle_expected_multiple) == haystack + 2);
+    assert(wcsstr(haystack, needle_not_expected) == NULL);
+    assert(wcsstr(haystack, needle_too_long) == NULL);
+    assert(wcsstr(haystack, needle_empty) == haystack);
+
+    assert(wcsstr(haystack_empty, needle_expected) == NULL);
+    assert(wcsstr(haystack_empty, needle_expected_multiple) == NULL);
+    assert(wcsstr(haystack_empty, needle_not_expected) == NULL);
+    assert(wcsstr(haystack_empty, needle_too_long) == NULL);
+    assert(wcsstr(haystack_empty, needle_empty) == haystack_empty);
+
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/wcstod.c b/recipes/core/relibc/tests/wchar/wcstod.c
new file mode 100644
index 0000000000..dd71e42191
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcstod.c
@@ -0,0 +1,20 @@
+#include <sys/types.h>
+#include <wchar.h>
+// TODO: remove glibc?
+#ifdef __GLIBC__
+#include <stdio.h>
+#endif
+
+void attempt(wchar_t *s) {
+    wchar_t *end;
+    double result = wcstod(s, &end);
+    printf("strtod(%lls) = (%f, %lls)\n", s, result, end);
+}
+int main() {
+    attempt(L"1.2345wowzah");
+    attempt(L"53");
+    attempt(L"-254352.5...");
+    attempt(L"   19.2 wat");
+    attempt(L"365.24 29.53");
+    attempt(L" 29.53");
+}
diff --git a/recipes/core/relibc/tests/wchar/wcstoimax.c b/recipes/core/relibc/tests/wchar/wcstoimax.c
new file mode 100644
index 0000000000..546314d063
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcstoimax.c
@@ -0,0 +1,13 @@
+#include <inttypes.h>
+#include <stdio.h>
+#include <wchar.h>
+
+int main(void) {
+    wchar_t* endptr;
+    wprintf(L"%ld\n", wcstoimax(L" -123junk", &endptr, 10)); /* base 10                    */
+    wprintf(L"%ld\n", wcstoimax(L"11111111", &endptr, 2));   /* base 2                     */
+    wprintf(L"%ld\n", wcstoimax(L"XyZ", &endptr, 36));       /* base 36                    */
+    wprintf(L"%ld\n", wcstoimax(L"010", &endptr, 0));        /* octal auto-detection       */
+    wprintf(L"%ld\n", wcstoimax(L"10", &endptr, 0));         /* decimal auto-detection     */
+    wprintf(L"%ld\n", wcstoimax(L"0x10", &endptr, 0));       /* hexadecimal auto-detection */
+}
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/wchar/wcstok.c b/recipes/core/relibc/tests/wchar/wcstok.c
new file mode 100644
index 0000000000..0fe7483b2a
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcstok.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+#include <wchar.h>
+
+int main() {
+    wchar_t wcs[] = L"Hello    from the     otter\tslide.\nMust have    gone  down a\t\t\t \n thousand tiiiiiimeeeees...\n\n\n";
+    wchar_t *token;
+    wchar_t *state;
+    for (token = wcstok(wcs, L" \t\n", &state);
+         token != NULL;
+         token = wcstok(NULL, L" \t\n", &state)) {
+        fputws(token, stdout);
+        fputwc(L'\n', stdout);
+    }
+}
diff --git a/recipes/core/relibc/tests/wchar/wcstol.c b/recipes/core/relibc/tests/wchar/wcstol.c
new file mode 100644
index 0000000000..e33b5343ab
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcstol.c
@@ -0,0 +1,17 @@
+// from http://www.cplusplus.com/reference/cwchar/wcstol/
+#include <stdio.h>
+#include <wchar.h>
+
+int main () {
+  wchar_t wsNumbers[] = L"2001 60c0c0 -1101110100110100100000 0x6fffff";
+  wchar_t * pEnd;
+  long int li1, li2, li3, li4;
+
+  li1 = wcstol(wsNumbers,&pEnd,10);
+  li2 = wcstol(pEnd,&pEnd,16);
+  li3 = wcstol(pEnd,&pEnd,2);
+  li4 = wcstol(pEnd,NULL,0);
+
+  printf("The decimal equivalents are: %ld, %ld, %ld and %ld.\n", li1, li2, li3, li4);
+  return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/wcstoumax.c b/recipes/core/relibc/tests/wchar/wcstoumax.c
new file mode 100644
index 0000000000..8f4c80b8aa
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcstoumax.c
@@ -0,0 +1,15 @@
+#include <inttypes.h>      
+#include <stdio.h>
+#include <wchar.h>
+
+int main(void) {                                                    
+    wchar_t *nptr;                                    
+    wchar_t *endptr;                                  
+    uintmax_t  j;                                      
+    int base = 10;                                    
+    nptr = L"10110134932";                            
+    printf("nptr = `%ls`\n", nptr);                   
+    j = wcstoumax(nptr, &endptr, base);            
+    printf("wcstoumax = %ju\n", j);            
+    printf("Stopped scan at `%ls`\n", endptr);
+} 
\ No newline at end of file
diff --git a/recipes/core/relibc/tests/wchar/wcswidth.c b/recipes/core/relibc/tests/wchar/wcswidth.c
new file mode 100644
index 0000000000..79aeb921cb
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wcswidth.c
@@ -0,0 +1,10 @@
+#include <stdio.h>
+#include <wchar.h>
+
+int main () {
+    wchar_t *wcs = L"relibc";
+    size_t len = wcslen(wcs);
+    int width = wcswidth(wcs, len);
+    printf("wcswidth(L\"%ls\", %d) = %d\n", wcs, len, width);
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wchar/wprintf.c b/recipes/core/relibc/tests/wchar/wprintf.c
new file mode 100644
index 0000000000..c635fff661
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wprintf.c
@@ -0,0 +1,93 @@
+#include <stdio.h>
+#include <stdlib.h> // free()
+#include <wchar.h>
+#include <math.h> // INFINITY, NAN constants
+
+int main(void) {
+    int sofar = 0;
+    int len = wprintf(
+        L"percent: %%\nwstring: %ls\nchar: %lc\nint: %d\n%nuint: %u\nhex: %x\nHEX: %X\nstring: %s\n",
+        L"String",
+        L'c',
+        -16,
+        &sofar,
+        32,
+        0xbeef,
+        0xC0FFEE,
+        "end"
+    );
+    wprintf(L"%%n returned %d, total len of write: %d\n", sofar, len);
+
+    wprintf(L"\nPadding madness:\n");
+    wprintf(L"% -5.3d %+3d\n", 1, 2);
+    wprintf(L"%4c\n", 'c');
+    wprintf(L"%#10.7x\n", 0xFF);
+    wprintf(L"%#4.3o\n", 01);
+    wprintf(L"%#x %#x\n", 0, 1);
+    wprintf(L"%.0d %.0d\n", 0, 1);
+    wprintf(L"(%05d) (%5d)\n", 123, 123);
+    wprintf(L"(%05d) (%5d)\n", -123, -123);
+    wprintf(L"(%13.0d)\n", 0);
+    wprintf(L"%p\n", (void*) 0xABCDEF);
+    wprintf(L"%p\n", (void*) 0);
+
+    wprintf(L"\nPositional madness:\n");
+    wprintf(L"%3$d %2$d %1$d\n", 2, 3, 4);
+    wprintf(L"%.*3$d\n", 2, 0, 5);
+    wprintf(L"|%-*6$.*5$s|%-*6$.*5$s|%*6$.*5$s|%*6$.*5$s|\n", "Fizz", "Buzz", "FizzBuzz", "TotalBuzz", 3, 8);
+    wprintf(L"int: %*6$d double: %lf %lf %lf %lf\n", 5, 0.1, 0.2, 0.3, 0.4, 10);
+    wprintf(L"%1$d %1$lf\n", 5, 0.1);
+    wprintf(L"%1$d %lf\n", 5, 0.2);
+    //wprintf(L"int: %*6$d no info on middle types\n", 5, 0.1, 0.2, 0.3, 0.4, 10);
+
+    wprintf(L"\nFloat madness:\n");
+    wprintf(L"%20e\n", 123.456789123);
+    wprintf(L"%20E\n", 0.00001);
+    wprintf(L"%20f\n", 123.456789123);
+    wprintf(L"%20F\n", 0.00001);
+    wprintf(L"%20e\n", -123.456789123);
+    wprintf(L"%020e\n", -123.456789123);
+    wprintf(L"%%.5g: %.5g\n", -123.456789123);
+    wprintf(L"%%.5f: %.5f\n", -123.456789123);
+    wprintf(L"%%.5e: %.5e\n", -123.456789123);
+    wprintf(L"%%.*g: %.*g\n", 2, -123.456789123);
+    wprintf(L"%%.*f: %.*f\n", 2, -123.456789123);
+    wprintf(L"%%.*e: %.*e\n", 2, -123.456789123);
+    wprintf(L"%%.*2$g: %.*2$g\n", -123.456789123, 5);
+    wprintf(L"%%.*2$f: %.*2$f\n", -123.456789123, 5);
+    wprintf(L"%%.*2$e: %.*2$e\n", -123.456789123, 5);
+
+    wprintf(L"%g\n", 100000.0);
+    wprintf(L"%g\n", 1000000.0);
+    wprintf(L"%e\n", 1000000.0);
+    wprintf(L"%G\n", 0.0001);
+    wprintf(L"%G\n", 0.00001);
+    wprintf(L"%E\n", 0.00001);
+
+    double nonfinites[] = {INFINITY, -INFINITY, NAN, -NAN};
+    wchar_t *float_formats[] = {L"%e", L"%E", L"%f", L"%F", L"%g", L"%G"};
+    wprintf(L"\nNon-finite float madness:\n");
+    for (size_t i = 0; i < sizeof(float_formats)/sizeof(char *); i++) {
+        wprintf(L"%ls:", float_formats[i]);
+        for (size_t j = 0; j < sizeof(nonfinites)/sizeof(double); j++) {
+            wprintf(L" ");
+            wprintf(float_formats[i], nonfinites[j]);
+        }
+        wprintf(L"\n");
+    }
+
+    wprintf(L"Things that have been buggy\n");
+    wprintf(L"%s%0*lu\n", "+", 2, 5l); // this format string was found in GDB
+
+    wprintf(L"Testing asprintf...\n");
+    char *s = NULL;
+    int res = asprintf(&s, "test string");
+    wprintf(L"printed: %s, value: %d\n", s, res);
+    free(s);
+    res = asprintf(&s, "test string %d", 2);
+    wprintf(L"printed: %s, value: %d\n", s, res);
+    free(s);
+    res = asprintf(&s, "test %s %d", "string", 2);
+    wprintf(L"printed: %s, value: %d\n", s, res);
+    free(s);
+}
diff --git a/recipes/core/relibc/tests/wchar/wscanf.c b/recipes/core/relibc/tests/wchar/wscanf.c
new file mode 100644
index 0000000000..01962484f0
--- /dev/null
+++ b/recipes/core/relibc/tests/wchar/wscanf.c
@@ -0,0 +1,102 @@
+/* swscanf example */
+#include <wchar.h>
+#include <stdio.h>
+// TODO: remove glibc?
+#ifdef __GLIBC__
+#include <stdarg.h>
+#endif
+
+#include "test_helpers.h"
+
+struct params {
+    short sa;
+    int ia;
+    int ib;
+    int ic;
+    float fa;
+    double da;
+    int *ptr;
+    char c;
+    wchar_t wc;
+    char string1[20];
+    char string2[20];
+    char string3[20];
+    char string4[20];
+    wchar_t wstring1[20];
+    wchar_t wstring2[20];
+    wchar_t wstring3[20];
+    wchar_t wstring4[20];
+};
+
+
+void test(wchar_t* fmt_in, wchar_t* input, struct params *p, ...) {
+    va_list args;
+    va_start(args, p);
+    wint_t ret = vswscanf(input, fmt_in, args);
+    va_end(args);
+
+    wprintf(
+        L"%d, { sa: %hhd, ia: %d, ib: %d, ic: %d, fa: %f, da: %lf, ptr: %p, char: %c, wide char: %lc, string1: %s, string2: %s, string3: %s, string4: %s, wstring1: %ls, wstring2: %ls, wstring3: %ls, wstring4: %ls }\n",
+        ret, p->sa, p->ia, p->ib, p->ic, p->fa, p->da, p->ptr, p->c, p->wc, p->string1, p->string2, p->string3, p->string4, p->wstring1, p->wstring2, p->wstring3, p->wstring4
+    );
+}
+
+int main ()
+{
+    struct params p = { .c = 'a' };
+
+    test(L"%hd %d", L"12 345", &p, &p.sa, &p.ia);
+    test(L"%x %i %i", L"12 0x345 010", &p, &p.ia, &p.ib, &p.ic);
+    test(L"%f.%lf", L"0.1.0.2", &p, &p.fa, &p.da);
+    test(L"%p", L"0xABCDEF", &p, &p.ptr);
+    test(L"%s", L"Hello World", &p, &p.string1);
+    test(L"%3i", L"0xFF", &p, &p.ia);
+    test(L"%c%3c", L"hello", &p, &p.c, &p.string1);
+    test(L"%lc", L"β", &p, &p.wc);
+    test(L"%lc %f", L"π 3.14", &p, &p.wc, &p.fa);
+    test(L"test: %2i%n", L"test: 0xFF", &p, &p.ia, &p.ib);
+    test(L"hello world%%", L"hello world%", &p);
+    test(L"hello %5ls %d", L"hello world 42", &p, &p.wstring1, &p.ia);
+    test(L"bye %ls %d", L"bye planet 84", &p, &p.wstring2, &p.ia);
+    test(L"h%1[ae]ll%1[^a] wor%1[^\n]%[d]", L"hello world", &p, &p.string1, &p.string2, &p.string3, &p.string4);
+    test(L"h%1[ae]ll%1[^a] wor%1[^\n]%[d]", L"halle worfdddddd", &p, &p.string1, &p.string2, &p.string3, &p.string4);
+    test(L"%[^a]%[b]", L"testbbbb", &p, &p.string1, &p.string2);
+    test(L"%ls %ls", L"Привет мир", &p, &p.wstring1, &p.wstring2);
+    test(L"%ls %ls", L"こんにちは 世界", &p, &p.wstring1, &p.wstring2);
+    test(L"%ls %d %ls %d", L"αβγ 123 δεζ 456", &p, &p.wstring1, &p.ia, &p.wstring2, &p.ib);
+    test(L"%ls %s %ls %s", L"αβγ test1 δεζ test2", &p, &p.wstring1, &p.string1, &p.wstring2, &p.string2);
+    test(L"%ls %ls %ls %ls", L"z ß 水 🍌", &p, &p.wstring1, &p.wstring2, &p.wstring3, &p.wstring4);
+
+    // Scanf stolen from the url parsing in curl
+    wchar_t protobuf[16];
+    wchar_t slashbuf[4];
+    wchar_t hostbuf[100];
+    wchar_t pathbuf[100];
+
+    // don't push NUL, make sure scanf does that
+    memset(protobuf, 97, 16);
+    memset(slashbuf, 97, 4);
+    memset(hostbuf, 97, 100);
+    memset(pathbuf, 97, 100);
+
+    int ret = swscanf(
+        L"https://redox-os.org\0# extra garbage for nul test", L"%15[^\n/:]:%3[/]%[^\n/?#]%[^\n]",
+        &protobuf, &slashbuf, &hostbuf, &pathbuf
+    );
+    if (ret < 4) {
+        *pathbuf = 0;
+    }
+    if (ret < 3) {
+        *hostbuf = 0;
+    }
+    if (ret < 2) {
+        *slashbuf = 0;
+    }
+    if (ret < 1) {
+        *protobuf = 0;
+    }
+
+    wprintf(L"%d \"%s\" \"%s\" \"%s\" \"%s\"\n", ret, &protobuf, &slashbuf, &hostbuf, &pathbuf);
+
+  return 0;
+}
diff --git a/recipes/core/relibc/tests/wctype/towlower.c b/recipes/core/relibc/tests/wctype/towlower.c
new file mode 100644
index 0000000000..93767c82c9
--- /dev/null
+++ b/recipes/core/relibc/tests/wctype/towlower.c
@@ -0,0 +1,13 @@
+#include <stddef.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <wctype.h>
+
+int main() {
+    wchar_t *str = L"HaLf WiDe ChAr StRiNg!\n";
+    fputws(str, stdout);
+    for (size_t i = 0; i < wcslen(str); i++) {
+        putwchar(towctrans(str[i], wctrans("tolower")));
+    }
+    return 0;
+}
diff --git a/recipes/core/relibc/tests/wctype/towupper.c b/recipes/core/relibc/tests/wctype/towupper.c
new file mode 100644
index 0000000000..a9bb4fbfe5
--- /dev/null
+++ b/recipes/core/relibc/tests/wctype/towupper.c
@@ -0,0 +1,13 @@
+#include <stdio.h>
+#include <stddef.h>
+#include <wchar.h>
+#include <wctype.h>
+
+int main() {
+    wchar_t *str = L"HaLf WiDe ChAr StRiNg!\n";
+    fputws(str, stdout);
+    for (size_t i = 0; i < wcslen(str); i++) {
+        putwchar(towctrans(str[i], wctrans("toupper")));
+    }
+    return 0;
+}
diff --git a/recipes/libs/expat/source/Makefile.in b/recipes/libs/expat/source/Makefile.in
index a9459a8920..a6176eeed4 100644
--- a/recipes/libs/expat/source/Makefile.in
+++ b/recipes/libs/expat/source/Makefile.in
@@ -242,8 +242,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/expat.pc.in \
 	$(top_srcdir)/conftools/ltmain.sh \
 	$(top_srcdir)/conftools/missing AUTHORS COPYING README.md \
 	conftools/ar-lib conftools/compile conftools/config.guess \
-	conftools/config.sub conftools/install-sh conftools/ltmain.sh \
-	conftools/missing
+	conftools/config.sub conftools/depcomp conftools/install-sh \
+	conftools/ltmain.sh conftools/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
diff --git a/recipes/libs/expat/source/autom4te.cache/output.0 b/recipes/libs/expat/source/autom4te.cache/output.0
index 03ed11bf0b..2016e94ddc 100644
--- a/recipes/libs/expat/source/autom4te.cache/output.0
+++ b/recipes/libs/expat/source/autom4te.cache/output.0
@@ -1,11 +1,11 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.72 for expat 2.5.0.
+@%:@ Generated by GNU Autoconf 2.73 for expat 2.5.0.
 @%:@
 @%:@ Report bugs to <expat-bugs@libexpat.org>.
 @%:@ 
 @%:@ 
-@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 @%:@ Inc.
 @%:@ 
 @%:@ 
@@ -22,7 +22,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -109,7 +109,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -131,10 +131,13 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -145,7 +148,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -263,22 +266,25 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org and
 $0: expat-bugs@libexpat.org about your system, including
 $0: any error possibly output before this message. Then
 $0: install a modern shell, or manually run the script
@@ -339,7 +345,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -348,7 +354,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -431,9 +437,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -460,7 +466,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -506,7 +512,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -520,29 +526,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -603,6 +586,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIB@&t@OBJS=
@@ -785,13 +769,13 @@ build_os
 build_vendor
 build_cpu
 build
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -974,7 +958,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1000,7 +984,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1213,7 +1197,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1229,7 +1213,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1273,9 +1257,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1283,7 +1267,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -1291,7 +1275,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1355,7 +1339,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1569,9 +1553,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1608,7 +1592,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1618,9 +1602,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 expat configure 2.5.0
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1644,7 +1628,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1652,7 +1636,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1660,7 +1644,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1684,7 +1668,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1692,7 +1676,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1703,7 +1687,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1726,7 +1710,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1748,8 +1732,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_header_compile
@@ -1760,7 +1744,7 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1812,8 +1796,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_func
@@ -1831,7 +1815,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1839,7 +1823,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -1847,7 +1831,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1870,7 +1854,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1878,7 +1862,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -1886,7 +1870,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -1910,7 +1894,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1918,7 +1902,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -1929,7 +1913,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1958,26 +1942,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -1996,7 +1980,7 @@ fi
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2042,8 +2026,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_type
@@ -2247,7 +2231,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -2259,7 +2243,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?@<:@ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -2267,7 +2251,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by expat $as_me 2.5.0, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -2307,7 +2291,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2342,7 +2326,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2371,31 +2355,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2404,67 +2379,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -2473,21 +2476,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -2509,12 +2512,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -2524,27 +2527,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -2624,7 +2720,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -2635,7 +2732,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -2723,15 +2820,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -2747,13 +2844,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -2871,222 +2967,6 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
 as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
 as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
 as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
-# Test code for whether the C++ compiler supports C++98 (global declarations)
-ac_cxx_conftest_cxx98_globals='
-// Does the compiler advertise C++98 conformance?
-#if !defined __cplusplus || __cplusplus < 199711L
-# error "Compiler does not advertise C++98 conformance"
-#endif
-
-// These inclusions are to reject old compilers that
-// lack the unsuffixed header files.
-#include <cstdlib>
-#include <exception>
-
-// <cassert> and <cstring> are *not* freestanding headers in C++98.
-extern void assert (int);
-namespace std {
-  extern int strcmp (const char *, const char *);
-}
-
-// Namespaces, exceptions, and templates were all added after "C++ 2.0".
-using std::exception;
-using std::strcmp;
-
-namespace {
-
-void test_exception_syntax()
-{
-  try {
-    throw "test";
-  } catch (const char *s) {
-    // Extra parentheses suppress a warning when building autoconf itself,
-    // due to lint rules shared with more typical C programs.
-    assert (!(strcmp) (s, "test"));
-  }
-}
-
-template <typename T> struct test_template
-{
-  T const val;
-  explicit test_template(T t) : val(t) {}
-  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
-};
-
-} // anonymous namespace
-'
-
-# Test code for whether the C++ compiler supports C++98 (body of main)
-ac_cxx_conftest_cxx98_main='
-  assert (argc);
-  assert (! argv[0]);
-{
-  test_exception_syntax ();
-  test_template<double> tt (2.0);
-  assert (tt.add (4) == 6.0);
-  assert (true && !false);
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (global declarations)
-ac_cxx_conftest_cxx11_globals='
-// Does the compiler advertise C++ 2011 conformance?
-#if !defined __cplusplus || __cplusplus < 201103L
-# error "Compiler does not advertise C++11 conformance"
-#endif
-
-namespace cxx11test
-{
-  constexpr int get_val() { return 20; }
-
-  struct testinit
-  {
-    int i;
-    double d;
-  };
-
-  class delegate
-  {
-  public:
-    delegate(int n) : n(n) {}
-    delegate(): delegate(2354) {}
-
-    virtual int getval() { return this->n; };
-  protected:
-    int n;
-  };
-
-  class overridden : public delegate
-  {
-  public:
-    overridden(int n): delegate(n) {}
-    virtual int getval() override final { return this->n * 2; }
-  };
-
-  class nocopy
-  {
-  public:
-    nocopy(int i): i(i) {}
-    nocopy() = default;
-    nocopy(const nocopy&) = delete;
-    nocopy & operator=(const nocopy&) = delete;
-  private:
-    int i;
-  };
-
-  // for testing lambda expressions
-  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
-  {
-    return f(v);
-  }
-
-  // for testing variadic templates and trailing return types
-  template <typename V> auto sum(V first) -> V
-  {
-    return first;
-  }
-  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
-  {
-    return first + sum(rest...);
-  }
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (body of main)
-ac_cxx_conftest_cxx11_main='
-{
-  // Test auto and decltype
-  auto a1 = 6538;
-  auto a2 = 48573953.4;
-  auto a3 = "String literal";
-
-  int total = 0;
-  for (auto i = a3; *i; ++i) { total += *i; }
-
-  decltype(a2) a4 = 34895.034;
-}
-{
-  // Test constexpr
-  short sa[cxx11test::get_val()] = { 0 };
-}
-{
-  // Test initializer lists
-  cxx11test::testinit il = { 4323, 435234.23544 };
-}
-{
-  // Test range-based for
-  int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
-                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
-  for (auto &x : array) { x += 23; }
-}
-{
-  // Test lambda expressions
-  using cxx11test::eval;
-  assert (eval ([](int x) { return x*2; }, 21) == 42);
-  double d = 2.0;
-  assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
-  assert (d == 5.0);
-  assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
-  assert (d == 5.0);
-}
-{
-  // Test use of variadic templates
-  using cxx11test::sum;
-  auto a = sum(1);
-  auto b = sum(1, 2);
-  auto c = sum(1.0, 2.0, 3.0);
-}
-{
-  // Test constructor delegation
-  cxx11test::delegate d1;
-  cxx11test::delegate d2();
-  cxx11test::delegate d3(45);
-}
-{
-  // Test override and final
-  cxx11test::overridden o1(55464);
-}
-{
-  // Test nullptr
-  char *c = nullptr;
-}
-{
-  // Test template brackets
-  test_template<::test_template<int>> v(test_template<int>(12));
-}
-{
-  // Unicode literals
-  char const *utf8 = u8"UTF-8 string \u2500";
-  char16_t const *utf16 = u"UTF-8 string \u2500";
-  char32_t const *utf32 = U"UTF-32 string \u2500";
-}
-'
-
-# Test code for whether the C compiler supports C++11 (complete).
-ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
-${ac_cxx_conftest_cxx11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  ${ac_cxx_conftest_cxx11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C++98 (complete).
-ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  return ok;
-}
-"
-
 as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H"
 as_fn_append ac_func_c_list " getpagesize HAVE_GETPAGESIZE"
 
@@ -3103,7 +2983,7 @@ ac_aux_dir_candidates="${srcdir}/conftools"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -3116,7 +2996,7 @@ do
   esac
   as_found=:
   
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -3127,13 +3007,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -3145,7 +3025,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -3198,38 +3078,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -3239,10 +3125,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -3250,6 +3136,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3269,7 +3172,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -3285,8 +3188,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -3302,10 +3205,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -3320,8 +3223,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -3337,7 +3240,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 am__api_version='1.18'
@@ -3357,7 +3260,7 @@ am__api_version='1.18'
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -3380,8 +3283,8 @@ case $as_dir in @%:@((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3431,8 +3334,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3442,7 +3345,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
 printf %s "checking whether sleep supports fractional seconds... " >&6; }
 if test ${am_cv_sleep_fractional_seconds+y}
 then :
@@ -3458,10 +3361,10 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
-printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf '%s\n' "$am_cv_sleep_fractional_seconds" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
 printf %s "checking filesystem timestamp resolution... " >&6; }
 if test ${am_cv_filesystem_timestamp_resolution+y}
 then :
@@ -3513,9 +3416,9 @@ if (
   # if, for instance, CONFIG_SHELL is bash and it inherits a
   # broken ls alias from the environment.  This has actually
   # happened.  Such a system could not be considered "sane".
-  printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  printf '%s\n' ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "ls -t produces unexpected output.
 Make sure there is not a broken ls alias in your environment.
 See 'config.log' for more details" "$LINENO" 5; }
@@ -3596,12 +3499,12 @@ rm -f conftest.ts?
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
-printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf '%s\n' "$am_cv_filesystem_timestamp_resolution" >&6; }
 
 # This check should not be cached, as it may vary across builds of
 # different projects.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
@@ -3609,14 +3512,14 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
@@ -3646,8 +3549,8 @@ for am_try in 1 2; do
   am_has_slept=yes
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
-printf "%s\n" "$am_build_env_is_sane" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf '%s\n' "$am_build_env_is_sane" >&6; }
 if test "$am_build_env_is_sane" = no; then
   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
@@ -3676,7 +3579,7 @@ test "$program_suffix" != NONE &&
 # Double any \ or $.
 # By default was 's,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf '%s\n' "$program_transform_name" | sed "$ac_script"`
 
 
 # Expand $ac_aux_dir to an absolute path.
@@ -3691,8 +3594,8 @@ if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf '%s\n' "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -3712,7 +3615,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -3733,7 +3636,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3745,11 +3648,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -3758,7 +3661,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -3779,7 +3682,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3791,11 +3694,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -3803,8 +3706,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -3817,7 +3720,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
 printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test ${ac_cv_path_mkdir+y}
@@ -3860,14 +3763,14 @@ fi
     MKDIR_P='mkdir -p'
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf '%s\n' "$MKDIR_P" >&6; }
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -3888,7 +3791,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3900,21 +3803,21 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -3922,7 +3825,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -3935,12 +3838,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -3961,13 +3864,13 @@ then :
 fi
 
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 printf %s "checking whether $am_make supports nested variables... " >&6; }
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) if printf "%s\n" 'TRUE=$(BAR$(V))
+  e) if printf '%s\n' 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -3980,8 +3883,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf '%s\n' "$am_cv_make_support_nested_variables" >&6; }
 AM_BACKSLASH='\'
 
 am__rm_f_notfound=
@@ -3994,7 +3897,7 @@ esac
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
 printf %s "checking xargs -n works... " >&6; }
 if test ${am_cv_xargs_n_works+y}
 then :
@@ -4010,8 +3913,8 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
-printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf '%s\n' "$am_cv_xargs_n_works" >&6; }
 if test "$am_cv_xargs_n_works" = yes
 then :
   am__xargs_n='xargs -n'
@@ -4046,10 +3949,10 @@ fi
  VERSION='2.5.0'
 
 
-printf "%s\n" "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
  
-printf "%s\n" "@%:@define VERSION \"$VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -4095,34 +3998,34 @@ _am_tools='gnutar plaintar pax cpio none'
       # (that is, avoid stderr redirection).
       am_uid=`id -u || echo unknown`
       am_gid=`id -g || echo unknown`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
 printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
       if test x$am_uid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
       elif test $am_uid -le $am_max_uid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
 printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
       if test x$gm_gid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
       elif test $am_gid -le $am_max_gid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
 printf %s "checking how to create a ustar tar archive... " >&6; }
 
   # Go ahead even if we have the value already cached.  We do so because we
@@ -4206,8 +4109,8 @@ else case e in @%:@(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
-printf "%s\n" "$am_cv_prog_tar_ustar" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+printf '%s\n' "$am_cv_prog_tar_ustar" >&6; }
 
 
 
@@ -4253,11 +4156,14 @@ ac_config_headers="$ac_config_headers expat_config.h"
 
 
 
+
+
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
 printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
 cat > confinc.mk << 'END'
 am__doit:
@@ -4294,8 +4200,8 @@ esac
   fi
 done
 rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf '%s\n' "${_am_result}" >&6; }
 
 @%:@ Check whether --enable-dependency-tracking was given.
 if test ${enable_dependency_tracking+y}
@@ -4325,7 +4231,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -4346,7 +4252,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4358,11 +4264,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4371,7 +4277,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -4392,7 +4298,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4404,11 +4310,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -4416,8 +4322,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -4430,7 +4336,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -4451,7 +4357,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4463,11 +4369,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4476,7 +4382,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -4502,7 +4408,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4526,11 +4432,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4541,7 +4447,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -4562,7 +4468,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4574,11 +4480,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4591,7 +4497,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -4612,7 +4518,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4624,11 +4530,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4640,8 +4546,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -4653,7 +4559,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -4674,7 +4580,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4686,11 +4592,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4699,7 +4605,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -4720,7 +4626,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4732,11 +4638,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -4744,8 +4650,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -4757,13 +4663,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -4773,7 +4679,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -4783,7 +4689,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -4803,9 +4709,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -4826,10 +4732,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -4870,29 +4776,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -4900,10 +4806,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -4920,15 +4826,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -4951,7 +4857,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -4960,10 +4866,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -4971,31 +4877,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -5019,10 +4925,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -5034,11 +4940,11 @@ then :
   esac
 done
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -5046,11 +4952,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -5082,8 +4988,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -5093,7 +4999,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -5161,8 +5067,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -5181,7 +5087,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -5193,7 +5148,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -5210,16 +5165,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -5230,7 +5185,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -5259,16 +5214,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -5279,7 +5234,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -5308,16 +5263,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -5339,7 +5294,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
 printf %s "checking whether $CC understands -c and -o together... " >&6; }
 if test ${am_cv_prog_cc_c_o+y}
 then :
@@ -5381,8 +5336,8 @@ _ACEOF
   unset am_i ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf '%s\n' "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -5400,7 +5355,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CC"   am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CC_dependencies_compiler_type+y}
 then :
@@ -5513,8 +5468,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if 
@@ -5535,7 +5490,7 @@ fi
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -5556,7 +5511,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5568,11 +5523,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5585,7 +5540,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -5606,7 +5561,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5618,11 +5573,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5634,8 +5589,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -5645,7 +5600,7 @@ fi
 : ${AR=ar}
 : ${ARFLAGS=cr}
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
 printf %s "checking the archiver ($AR) interface... " >&6; }
 if test ${am_cv_ar_interface+y}
 then :
@@ -5668,7 +5623,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
   (eval $am_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test "$ac_status" -eq 0; then
         am_cv_ar_interface=ar
@@ -5677,7 +5632,7 @@ then :
         { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
   (eval $am_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         if test "$ac_status" -eq 0; then
           am_cv_ar_interface=lib
@@ -5697,8 +5652,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
-printf "%s\n" "$am_cv_ar_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+printf '%s\n' "$am_cv_ar_interface" >&6; }
 
 case $am_cv_ar_interface in
 ar)
@@ -5718,21 +5673,21 @@ unknown)
 esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -5740,7 +5695,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -5753,12 +5708,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -5766,8 +5721,8 @@ fi
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
@@ -5811,7 +5766,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -5838,12 +5793,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -5859,7 +5814,7 @@ esac
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -5902,7 +5857,7 @@ case `"$ac_path_SED" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -5931,8 +5886,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -5949,7 +5904,7 @@ Xsed="$SED -e 1s/^X//"
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -5986,7 +5941,7 @@ case `"$ac_path_GREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6015,12 +5970,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -6060,7 +6015,7 @@ case `"$ac_path_EGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6090,14 +6045,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
  
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -6137,7 +6092,7 @@ case `"$ac_path_FGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6167,8 +6122,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
  
 
@@ -6204,7 +6159,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -6234,10 +6189,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -6273,14 +6228,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -6297,8 +6252,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -6309,7 +6264,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -6365,8 +6320,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -6379,7 +6334,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -6400,7 +6355,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6412,11 +6367,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6429,7 +6384,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -6450,7 +6405,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6462,11 +6417,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6478,8 +6433,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -6507,7 +6462,7 @@ test -z "$NM" && NM=nm
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -6529,11 +6484,11 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -6666,11 +6621,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -6714,7 +6669,7 @@ esac
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -6756,14 +6711,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -6785,14 +6740,14 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -6801,8 +6756,8 @@ else case e in @%:@(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -6834,7 +6789,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -6855,7 +6810,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6868,11 +6823,11 @@ esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6885,7 +6840,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -6906,7 +6861,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6918,11 +6873,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6931,7 +6886,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -6952,7 +6907,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6964,11 +6919,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -6976,8 +6931,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -6993,7 +6948,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -7206,8 +7161,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -7251,7 +7206,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -7272,7 +7227,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7284,11 +7239,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7297,7 +7252,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -7318,7 +7273,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7330,11 +7285,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -7342,8 +7297,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -7360,7 +7315,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -7389,8 +7344,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -7403,7 +7358,7 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
@@ -7424,7 +7379,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7436,11 +7391,11 @@ esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7449,7 +7404,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
@@ -7470,7 +7425,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7482,11 +7437,11 @@ esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -7494,8 +7449,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -7509,7 +7464,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -7530,7 +7485,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7542,11 +7497,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7559,7 +7514,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -7580,7 +7535,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7592,11 +7547,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7608,8 +7563,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -7645,7 +7600,7 @@ lt_ar_flags=$AR_FLAGS
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -7670,7 +7625,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -7678,7 +7633,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -7691,8 +7646,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -7709,7 +7664,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -7730,7 +7685,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7742,11 +7697,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7755,7 +7710,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -7776,7 +7731,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7788,11 +7743,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -7800,8 +7755,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -7891,7 +7846,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -8048,7 +8003,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
@@ -8121,7 +8076,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -8157,11 +8112,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -8207,7 +8162,7 @@ fi
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 @%:@ Check whether --with-sysroot was given.
@@ -8235,20 +8190,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -8293,11 +8248,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -8314,8 +8269,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
     
     
@@ -8355,7 +8310,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -8375,7 +8330,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -8413,7 +8368,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -8454,7 +8409,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -8517,7 +8472,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -8557,8 +8512,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -8571,7 +8526,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -8608,7 +8563,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -8629,7 +8584,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8641,11 +8596,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8654,7 +8609,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -8675,7 +8630,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8687,11 +8642,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -8699,8 +8654,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -8710,7 +8665,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -8726,8 +8681,8 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -8742,7 +8697,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -8763,7 +8718,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8775,11 +8730,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8788,7 +8743,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -8809,7 +8764,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8821,11 +8776,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -8833,8 +8788,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -8846,7 +8801,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -8867,7 +8822,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8879,11 +8834,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8892,7 +8847,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -8913,7 +8868,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8925,11 +8880,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -8937,8 +8892,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -8950,7 +8905,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -8971,7 +8926,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8983,11 +8938,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8996,7 +8951,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -9017,7 +8972,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9029,11 +8984,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -9041,8 +8996,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -9054,7 +9009,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -9075,7 +9030,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9087,11 +9042,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9100,7 +9055,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -9121,7 +9076,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9133,11 +9088,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -9145,8 +9100,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -9158,7 +9113,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -9179,7 +9134,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9191,11 +9146,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9204,7 +9159,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -9225,7 +9180,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9237,11 +9192,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -9249,8 +9204,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -9285,7 +9240,7 @@ fi
     
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -9320,12 +9275,12 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
     # Feature test to disable chained fixups since it is not
     # compatible with '-undefined dynamic_lookup'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
 printf %s "checking for -no_fixup_chains linker flag... " >&6; }
 if test ${lt_cv_support_no_fixup_chains+y}
 then :
@@ -9359,10 +9314,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -9396,10 +9351,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -9433,8 +9388,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -9525,7 +9480,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -9545,14 +9500,14 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
   
-printf "%s\n" "@%:@define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "@%:@define STDC_HEADERS 1" >>confdefs.h
 
 fi
 ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -9568,7 +9523,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -9589,7 +9544,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9601,11 +9556,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9614,7 +9569,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -9635,7 +9590,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9647,11 +9602,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -9659,8 +9614,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -9672,7 +9627,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -9693,7 +9648,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9705,11 +9660,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9718,7 +9673,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -9739,7 +9694,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9751,11 +9706,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -9763,8 +9718,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -9776,7 +9731,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -9797,7 +9752,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9809,11 +9764,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9822,7 +9777,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -9843,7 +9798,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9855,11 +9810,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -9867,8 +9822,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -10060,7 +10015,7 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
   @%:@ Check whether --enable-aix-soname was given.
 if test ${enable_aix_soname+y}
@@ -10102,8 +10057,8 @@ esac
 fi
 
   with_aix_soname=$enable_aix_soname
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -10185,7 +10140,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -10202,15 +10157,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
     
     
     
 
-printf "%s\n" "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -10256,7 +10211,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -10311,11 +10266,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     
@@ -10324,7 +10279,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -10379,11 +10334,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10452,10 +10407,6 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 if test -n "$compiler"; then
   
 lt_prog_compiler_no_builtin_flag=
@@ -10468,7 +10419,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -10505,8 +10456,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -10884,7 +10835,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -10893,15 +10844,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -10938,8 +10889,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -10967,7 +10918,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -10997,8 +10948,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -11012,7 +10963,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -11061,15 +11012,15 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
     
     
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -11118,8 +11069,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -11127,7 +11078,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -11135,11 +11086,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -11151,7 +11102,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -12056,7 +12007,7 @@ fi
 	
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -12086,8 +12037,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -12127,7 +12078,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -12151,8 +12102,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -12443,8 +12394,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -12480,7 +12431,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -12492,7 +12443,7 @@ else case e in @%:@(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -12510,7 +12461,7 @@ else case e in @%:@(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -12525,8 +12476,8 @@ else case e in @%:@(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -12685,7 +12636,7 @@ esac
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -13958,7 +13909,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -13967,15 +13918,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -14012,8 +13963,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -14035,7 +13986,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -14065,8 +14016,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -14087,8 +14038,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -14209,7 +14160,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -14234,8 +14185,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -14279,7 +14230,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -14320,8 +14271,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -14350,7 +14301,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -14391,8 +14342,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -14402,7 +14353,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -14443,13 +14394,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -14490,13 +14441,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -14537,8 +14488,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -14584,7 +14535,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -14668,7 +14619,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -14687,12 +14638,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -14776,7 +14727,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -14795,8 +14746,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -14834,40 +14785,40 @@ fi
   
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -14885,12 +14836,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -14915,15 +14866,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
   
 
@@ -14979,8 +14930,8 @@ then :
   
 
 for flag in -Wall -Wextra; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
 printf %s "checking whether C compiler accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -15005,8 +14956,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -15015,18 +14966,18 @@ then :
   
   case " $AM_CFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
   (: AM_CFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -15034,10 +14985,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -15055,8 +15006,8 @@ done
   
 
 for flag in -fexceptions; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
 printf %s "checking whether C compiler accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -15081,8 +15032,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -15091,18 +15042,18 @@ then :
   
   case " $AM_CFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
   (: AM_CFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -15110,10 +15061,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -15131,8 +15082,8 @@ done
   
 
 for flag in -fno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
 printf %s "checking whether C compiler accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -15157,8 +15108,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -15167,18 +15118,18 @@ then :
   
   case " $AM_CFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
   (: AM_CFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -15186,10 +15137,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -15207,8 +15158,8 @@ done
   
 
 for flag in -pedantic -Wduplicated-cond -Wduplicated-branches -Wlogical-op; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
 printf %s "checking whether C compiler accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -15233,8 +15184,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -15243,18 +15194,18 @@ then :
   
   case " $AM_CFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
   (: AM_CFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -15262,10 +15213,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -15283,8 +15234,8 @@ done
   
 
 for flag in -Wrestrict -Wnull-dereference -Wjump-misses-init -Wdouble-promotion; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
 printf %s "checking whether C compiler accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -15309,8 +15260,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -15319,18 +15270,18 @@ then :
   
   case " $AM_CFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
   (: AM_CFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -15338,10 +15289,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -15359,8 +15310,8 @@ done
   
 
 for flag in -Wshadow -Wformat=2 -Wno-pedantic-ms-format -Wmisleading-indentation; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
 printf %s "checking whether C compiler accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -15385,8 +15336,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -15395,18 +15346,18 @@ then :
   
   case " $AM_CFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains \$flag"; } >&5
   (: AM_CFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -15414,10 +15365,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -15438,12 +15389,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-
-
-
-
-
-
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -15458,7 +15403,7 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CXX+y}
 then :
@@ -15479,7 +15424,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -15491,11 +15436,11 @@ esac
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-printf "%s\n" "$CXX" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf '%s\n' "$CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -15508,7 +15453,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CXX+y}
 then :
@@ -15529,7 +15474,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -15541,11 +15486,11 @@ esac
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-printf "%s\n" "$ac_ct_CXX" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf '%s\n' "$ac_ct_CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -15557,8 +15502,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -15568,7 +15513,7 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -15578,7 +15523,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -15588,11 +15533,11 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
 printf %s "checking whether the compiler supports GNU C++... " >&6; }
 if test ${ac_cv_cxx_compiler_gnu+y}
 then :
@@ -15624,8 +15569,8 @@ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_cxx_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -15635,7 +15580,7 @@ else
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+y}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 printf %s "checking whether $CXX accepts -g... " >&6; }
 if test ${ac_cv_prog_cxx_g+y}
 then :
@@ -15703,8 +15648,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+printf '%s\n' "$ac_cv_prog_cxx_g" >&6; }
 if test $ac_test_CXXFLAGS; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -15720,106 +15665,6 @@ else
     CXXFLAGS=
   fi
 fi
-ac_prog_cxx_stdcxx=no
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
-printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
-then :
-  printf %s "(cached) " >&6
-else case e in @%:@(
-  e) ac_cv_prog_cxx_cxx11=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx11_program
-_ACEOF
-for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in @%:@(
-  e) if test "x$ac_cv_prog_cxx_cxx11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx11" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11 ;;
-esac
-fi
-fi
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
-printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
-then :
-  printf %s "(cached) " >&6
-else case e in @%:@(
-  e) ac_cv_prog_cxx_cxx98=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx98_program
-_ACEOF
-for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx98=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx98" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in @%:@(
-  e) if test "x$ac_cv_prog_cxx_cxx98" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx98" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98 ;;
-esac
-fi
-fi
-
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -15828,7 +15673,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CXX_dependencies_compiler_type+y}
 then :
@@ -15941,8 +15786,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
  if 
@@ -15974,7 +15819,7 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 printf %s "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test ${ac_cv_prog_CXXCPP+y}
@@ -16041,8 +15886,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-printf "%s\n" "$CXXCPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+printf '%s\n' "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -16090,8 +15935,8 @@ if $ac_preproc_ok
 then :
   
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -16239,7 +16084,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -16269,10 +16114,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -16308,14 +16153,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -16332,8 +16177,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -16386,7 +16231,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     fi
 
     # PORTME: fill in a description of your system's C++ link characteristics
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
     ld_shlibs_CXX=yes
     case $host_os in
@@ -17478,8 +17323,8 @@ fi
         ;;
     esac
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-printf "%s\n" "$ld_shlibs_CXX" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+printf '%s\n' "$ld_shlibs_CXX" >&6; }
     test no = "$ld_shlibs_CXX" && can_build_shared=no
 
     GCC_CXX=$GXX
@@ -17517,7 +17362,7 @@ esac
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -18005,7 +17850,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic_CXX+y}
 then :
@@ -18014,15 +17859,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_CXX" >&6; }
 lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works_CXX+y}
 then :
@@ -18059,8 +17904,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
     case $lt_prog_compiler_pic_CXX in
@@ -18082,7 +17927,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works_CXX+y}
 then :
@@ -18112,8 +17957,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
     :
@@ -18124,7 +17969,7 @@ fi
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o_CXX+y}
 then :
@@ -18173,12 +18018,12 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o_CXX+y}
 then :
@@ -18227,8 +18072,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 
@@ -18236,7 +18081,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -18244,11 +18089,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -18257,7 +18102,7 @@ fi
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -18297,8 +18142,8 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
     ;;
   esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-printf "%s\n" "$ld_shlibs_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+printf '%s\n' "$ld_shlibs_CXX" >&6; }
 test no = "$ld_shlibs_CXX" && can_build_shared=no
 
 with_gnu_ld_CXX=$with_gnu_ld
@@ -18325,7 +18170,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc_CXX+y}
 then :
@@ -18337,7 +18182,7 @@ else case e in @%:@(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -18355,7 +18200,7 @@ else case e in @%:@(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc_CXX=no
@@ -18370,8 +18215,8 @@ else case e in @%:@(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
       archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
       ;;
     esac
@@ -18440,7 +18285,7 @@ esac
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 library_names_spec=
@@ -19619,7 +19464,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic_CXX+y}
 then :
@@ -19628,15 +19473,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_CXX" >&6; }
 lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works_CXX+y}
 then :
@@ -19673,8 +19518,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
     case $lt_prog_compiler_pic_CXX in
@@ -19696,7 +19541,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works_CXX+y}
 then :
@@ -19726,8 +19571,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
     :
@@ -19748,8 +19593,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -19813,7 +19658,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" ||
@@ -19838,8 +19683,8 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-printf "%s\n" "$hardcode_action_CXX" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+printf '%s\n' "$hardcode_action_CXX" >&6; }
 
 if test relink = "$hardcode_action_CXX" ||
    test yes = "$inherit_rpath_CXX"; then
@@ -19886,8 +19731,8 @@ then :
   
 
 for flag in -Wall -Wextra; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
 printf %s "checking whether C++ compiler accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -19912,8 +19757,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -19922,18 +19767,18 @@ then :
   
   case " $AM_CXXFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS already contains \$flag"; } >&5
   (: AM_CXXFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CXXFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
   (: AM_CXXFLAGS="$AM_CXXFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -19941,10 +19786,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CXXFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
   (: AM_CXXFLAGS="$AM_CXXFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -19962,8 +19807,8 @@ done
   
 
 for flag in -fexceptions; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
 printf %s "checking whether C++ compiler accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -19988,8 +19833,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -19998,18 +19843,18 @@ then :
   
   case " $AM_CXXFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS already contains \$flag"; } >&5
   (: AM_CXXFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CXXFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
   (: AM_CXXFLAGS="$AM_CXXFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -20017,10 +19862,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CXXFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
   (: AM_CXXFLAGS="$AM_CXXFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -20038,8 +19883,8 @@ done
   
 
 for flag in -fno-strict-aliasing; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_cxxflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_cxxflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
 printf %s "checking whether C++ compiler accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -20064,8 +19909,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -20074,18 +19919,18 @@ then :
   
   case " $AM_CXXFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS already contains \$flag"; } >&5
   (: AM_CXXFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CXXFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
   (: AM_CXXFLAGS="$AM_CXXFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -20093,10 +19938,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CXXFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CXXFLAGS=\"\$AM_CXXFLAGS\""; } >&5
   (: AM_CXXFLAGS="$AM_CXXFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -20124,8 +19969,8 @@ then :
   
 
 for flag in -fno-strict-aliasing; do
-  as_CACHEVAR=`printf "%s\n" "ax_cv_check_ldflags__$flag" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
+  as_CACHEVAR=`printf '%s\n' "ax_cv_check_ldflags__$flag" | sed "$as_sed_sh"`
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
 printf %s "checking whether the linker accepts $flag... " >&6; }
 if eval test \${$as_CACHEVAR+y}
 then :
@@ -20158,8 +20003,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$as_CACHEVAR
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
 then :
   
@@ -20168,18 +20013,18 @@ then :
   
   case " $AM_LDFLAGS " in @%:@(
   *" $flag "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS already contains \$flag"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS already contains \$flag"; } >&5
   (: AM_LDFLAGS already contains $flag) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_LDFLAGS " $flag"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
   (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -20187,10 +20032,10 @@ esac
 else case e in @%:@(
   e) 
   AM_LDFLAGS=$flag
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
   (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -20217,7 +20062,7 @@ esac ;; @%:@(
      ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiler supports visibility" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether compiler supports visibility" >&5
 printf %s "checking whether compiler supports visibility... " >&6; }
 if test ${expatcfg_cv_compiler_supports_visibility+y}
 then :
@@ -20241,8 +20086,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
       CFLAGS=$OLDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $expatcfg_cv_compiler_supports_visibility" >&5
-printf "%s\n" "$expatcfg_cv_compiler_supports_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $expatcfg_cv_compiler_supports_visibility" >&5
+printf '%s\n' "$expatcfg_cv_compiler_supports_visibility" >&6; }
    if test "$expatcfg_cv_compiler_supports_visibility" = yes
 then :
   
@@ -20252,18 +20097,18 @@ then :
   
   case " $AM_CFLAGS " in @%:@(
   *" -fvisibility=hidden "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains -fvisibility=hidden"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS already contains -fvisibility=hidden"; } >&5
   (: AM_CFLAGS already contains -fvisibility=hidden) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CFLAGS " -fvisibility=hidden"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -20271,10 +20116,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CFLAGS=-fvisibility=hidden
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CFLAGS=\"\$AM_CFLAGS\""; } >&5
   (: AM_CFLAGS="$AM_CFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -20288,18 +20133,18 @@ then :
   
   case " $AM_CPPFLAGS " in @%:@(
   *" -DXML_ENABLE_VISIBILITY=1 "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CPPFLAGS already contains -DXML_ENABLE_VISIBILITY=1"; } >&5
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CPPFLAGS already contains -DXML_ENABLE_VISIBILITY=1"; } >&5
   (: AM_CPPFLAGS already contains -DXML_ENABLE_VISIBILITY=1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } ;; @%:@(
   *) :
     
      as_fn_append AM_CPPFLAGS " -DXML_ENABLE_VISIBILITY=1"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CPPFLAGS=\"\$AM_CPPFLAGS\""; } >&5
+     { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CPPFLAGS=\"\$AM_CPPFLAGS\""; } >&5
   (: AM_CPPFLAGS="$AM_CPPFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
      ;;
 esac
@@ -20307,10 +20152,10 @@ esac
 else case e in @%:@(
   e) 
   AM_CPPFLAGS=-DXML_ENABLE_VISIBILITY=1
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : AM_CPPFLAGS=\"\$AM_CPPFLAGS\""; } >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: : AM_CPPFLAGS=\"\$AM_CPPFLAGS\""; } >&5
   (: AM_CPPFLAGS="$AM_CPPFLAGS") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
    ;;
 esac
@@ -20320,7 +20165,7 @@ fi
 fi
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 printf %s "checking whether byte ordering is bigendian... " >&6; }
 if test ${ac_cv_c_bigendian+y}
 then :
@@ -20542,18 +20387,18 @@ fi
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-printf "%s\n" "$ac_cv_c_bigendian" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf '%s\n' "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     printf "%s\n" "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf '%s\n' "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
 
                 BYTEORDER=4321;; #(
    no)
      BYTEORDER=1234 ;; #(
    universal)
      	
-printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf '%s\n' "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -20562,10 +20407,10 @@ printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
  esac
 
 
-printf "%s\n" "@%:@define BYTEORDER $BYTEORDER" >>confdefs.h
+printf '%s\n' "@%:@define BYTEORDER $BYTEORDER" >>confdefs.h
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 printf %s "checking for an ANSI C-conforming const... " >&6; }
 if test ${ac_cv_c_const+y}
 then :
@@ -20606,15 +20451,12 @@ main (void)
     *t++ = 0;
     if (s) return 0;
   }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  { /* Derived from code rejected by Sun C 1.0 and similar vintage.  */
     int x[] = {25, 17};
-    const int *foo = &x[0];
+    typedef int const *iptr;
+    iptr foo = &x[0];
     ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
+    if (!*foo) return 0;
   }
   { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
@@ -20642,11 +20484,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-printf "%s\n" "$ac_cv_c_const" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+printf '%s\n' "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
   
-printf "%s\n" "@%:@define const /**/" >>confdefs.h
+printf '%s\n' "@%:@define const /**/" >>confdefs.h
 
 fi
 
@@ -20656,7 +20498,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define size_t unsigned int" >>confdefs.h
+printf '%s\n' "@%:@define size_t unsigned int" >>confdefs.h
  ;;
 esac
 fi
@@ -20724,8 +20566,8 @@ EXPATCFG_ON_MINGW=no
 case "${host_os}" in @%:@(
   mingw*) :
     EXPATCFG_ON_MINGW=yes
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: detected OS: MinGW" >&5
-printf "%s\n" "$as_me: detected OS: MinGW" >&6;} ;; @%:@(
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: detected OS: MinGW" >&5
+printf '%s\n' "$as_me: detected OS: MinGW" >&6;} ;; @%:@(
   *) :
      ;;
 esac
@@ -20777,7 +20619,7 @@ case $host in
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
 printf %s "checking for _mwvalidcheckl in -lmw... " >&6; }
 if test ${ac_cv_lib_mw__mwvalidcheckl+y}
 then :
@@ -20818,14 +20660,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
-printf "%s\n" "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
+printf '%s\n' "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
 if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes
 then :
   LIBM=-lmw
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
 printf %s "checking for cos in -lm... " >&6; }
 if test ${ac_cv_lib_m_cos+y}
 then :
@@ -20866,8 +20708,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-printf "%s\n" "$ac_cv_lib_m_cos" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+printf '%s\n' "$ac_cv_lib_m_cos" >&6; }
 if test "x$ac_cv_lib_m_cos" = xyes
 then :
   LIBM="$LIBM -lm"
@@ -20875,7 +20717,7 @@ fi
 
   ;;
 *)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
 printf %s "checking for cos in -lm... " >&6; }
 if test ${ac_cv_lib_m_cos+y}
 then :
@@ -20916,8 +20758,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-printf "%s\n" "$ac_cv_lib_m_cos" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+printf '%s\n' "$ac_cv_lib_m_cos" >&6; }
 if test "x$ac_cv_lib_m_cos" = xyes
 then :
   LIBM=-lm
@@ -20940,7 +20782,7 @@ fi
 
 if test "x${with_libbsd}" != xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for arc4random_buf in -lbsd" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for arc4random_buf in -lbsd" >&5
 printf %s "checking for arc4random_buf in -lbsd... " >&6; }
 if test ${ac_cv_lib_bsd_arc4random_buf+y}
 then :
@@ -20981,11 +20823,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_arc4random_buf" >&5
-printf "%s\n" "$ac_cv_lib_bsd_arc4random_buf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_arc4random_buf" >&5
+printf '%s\n' "$ac_cv_lib_bsd_arc4random_buf" >&6; }
 if test "x$ac_cv_lib_bsd_arc4random_buf" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_LIBBSD 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_LIBBSD 1" >>confdefs.h
 
   LIBS="-lbsd $LIBS"
 
@@ -20998,7 +20840,7 @@ esac
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for arc4random_buf (BSD or libbsd)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for arc4random_buf (BSD or libbsd)" >&5
 printf %s "checking for arc4random_buf (BSD or libbsd)... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -21016,15 +20858,15 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   
-printf "%s\n" "@%:@define HAVE_ARC4RANDOM_BUF 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ARC4RANDOM_BUF 1" >>confdefs.h
 
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for arc4random (BSD, macOS or libbsd)" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for arc4random (BSD, macOS or libbsd)" >&5
 printf %s "checking for arc4random (BSD, macOS or libbsd)... " >&6; }
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -21043,13 +20885,13 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   
-printf "%s\n" "@%:@define HAVE_ARC4RANDOM 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ARC4RANDOM 1" >>confdefs.h
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; } ;;
 esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -21072,7 +20914,7 @@ fi
 
 if test "x$with_getrandom" != xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getrandom (Linux 3.17+, glibc 2.25+)" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for getrandom (Linux 3.17+, glibc 2.25+)" >&5
 printf %s "checking for getrandom (Linux 3.17+, glibc 2.25+)... " >&6; }
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -21087,13 +20929,13 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   
-printf "%s\n" "@%:@define HAVE_GETRANDOM 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_GETRANDOM 1" >>confdefs.h
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       if test "x$with_getrandom" = xyes
 then :
   as_fn_error $? "enforced the use of getrandom --with-getrandom, but not detected" "$LINENO" 5
@@ -21117,7 +20959,7 @@ fi
 
 if test "x$with_sys_getrandom" != xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for syscall SYS_getrandom (Linux 3.17+)" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for syscall SYS_getrandom (Linux 3.17+)" >&5
 printf %s "checking for syscall SYS_getrandom (Linux 3.17+)... " >&6; }
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -21134,13 +20976,13 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   
-printf "%s\n" "@%:@define HAVE_SYSCALL_GETRANDOM 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_SYSCALL_GETRANDOM 1" >>confdefs.h
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       if test "x$with_sys_getrandom" = xyes
 then :
   as_fn_error $? "enforced the use of syscall SYS_getrandom --with-sys-getrandom, but not detected" "$LINENO" 5
@@ -21154,13 +20996,13 @@ fi
 ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
 if test "x$ac_cv_header_fcntl_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_FCNTL_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_FCNTL_H 1" >>confdefs.h
 
 fi
 ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
 if test "x$ac_cv_header_unistd_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_UNISTD_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_UNISTD_H 1" >>confdefs.h
 
 fi
 
@@ -21170,7 +21012,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define off_t long int" >>confdefs.h
+printf '%s\n' "@%:@define off_t long int" >>confdefs.h
  ;;
 esac
 fi
@@ -21191,7 +21033,7 @@ do
 done
   
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 printf %s "checking for working mmap... " >&6; }
 if test ${ac_cv_func_mmap_fixed_mapped+y}
 then :
@@ -21355,11 +21197,11 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
-printf "%s\n" "$ac_cv_func_mmap_fixed_mapped" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+printf '%s\n' "$ac_cv_func_mmap_fixed_mapped" >&6; }
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
   
-printf "%s\n" "@%:@define HAVE_MMAP 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MMAP 1" >>confdefs.h
 
 fi
 rm -f conftest.mmap conftest.txt
@@ -21376,13 +21218,13 @@ fi
 
 
 
-printf "%s\n" "@%:@define XML_NS 1" >>confdefs.h
+printf '%s\n' "@%:@define XML_NS 1" >>confdefs.h
 
 
-printf "%s\n" "@%:@define XML_DTD 1" >>confdefs.h
+printf '%s\n' "@%:@define XML_DTD 1" >>confdefs.h
 
 
-printf "%s\n" "@%:@define XML_DEV_URANDOM 1" >>confdefs.h
+printf '%s\n' "@%:@define XML_DEV_URANDOM 1" >>confdefs.h
 
 
 @%:@ Check whether --enable-xml-attr-info was given.
@@ -21397,7 +21239,7 @@ fi
 if test "x${enable_xml_attr_info}" = "xyes"
 then :
   
-printf "%s\n" "@%:@define XML_ATTR_INFO 1" >>confdefs.h
+printf '%s\n' "@%:@define XML_ATTR_INFO 1" >>confdefs.h
 
 fi
 
@@ -21415,7 +21257,9 @@ then :
   enable_xml_context=1024
 fi
    
-printf "%s\n" "@%:@define XML_CONTEXT_BYTES ${enable_xml_context}" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+@%:@define XML_CONTEXT_BYTES ${enable_xml_context}
+_ACEOF
 
 fi
 
@@ -21437,7 +21281,7 @@ then :
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DOCBOOK_TO_MAN+y}
 then :
@@ -21458,7 +21302,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DOCBOOK_TO_MAN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -21470,11 +21314,11 @@ esac
 fi
 DOCBOOK_TO_MAN=$ac_cv_prog_DOCBOOK_TO_MAN
 if test -n "$DOCBOOK_TO_MAN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOCBOOK_TO_MAN" >&5
-printf "%s\n" "$DOCBOOK_TO_MAN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DOCBOOK_TO_MAN" >&5
+printf '%s\n' "$DOCBOOK_TO_MAN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -21561,7 +21405,7 @@ SO_PATCH="${LIBREVISION}"
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
 printf %s "checking size of void *... " >&6; }
 if test ${ac_cv_sizeof_void_p+y}
 then :
@@ -21571,25 +21415,18 @@ else case e in @%:@(
 then :
   
 else case e in @%:@(
-  e) if test "$ac_cv_type_void_p" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (void *)
-See 'config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_void_p=0
-   fi ;;
+  e) ac_cv_sizeof_void_p=0 ;;
 esac
 fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
-printf "%s\n" "$ac_cv_sizeof_void_p" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+printf '%s\n' "$ac_cv_sizeof_void_p" >&6; }
 
 
 
-printf "%s\n" "@%:@define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h
+printf '%s\n' "@%:@define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h
 
   # sets ac_cv_sizeof_void_p
 
@@ -21612,7 +21449,7 @@ printf "%s\n" "@%:@define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library name prefix" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library name prefix" >&5
 printf %s "checking for shared library name prefix... " >&6; }
 case "${host_os}" in @%:@(
   cygwin*) :
@@ -21620,8 +21457,8 @@ case "${host_os}" in @%:@(
   *) :
     CMAKE_SHARED_LIBRARY_PREFIX=lib ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${CMAKE_SHARED_LIBRARY_PREFIX}" >&5
-printf "%s\n" "${CMAKE_SHARED_LIBRARY_PREFIX}" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${CMAKE_SHARED_LIBRARY_PREFIX}" >&5
+printf '%s\n' "${CMAKE_SHARED_LIBRARY_PREFIX}" >&6; }
 
 
 case "${host_os}" in @%:@(
@@ -21652,44 +21489,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -21701,8 +21501,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -21716,8 +21516,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -21734,7 +21534,7 @@ U=
 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -21745,14 +21545,14 @@ LIB@&t@OBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
 printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf '%s\n' "done" >&6; }
 case $enable_silent_rules in @%:@ (((
   yes) AM_DEFAULT_VERBOSITY=0;;
    no) AM_DEFAULT_VERBOSITY=1;;
@@ -21824,13 +21624,21 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in @%:@(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -21844,7 +21652,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -21856,7 +21664,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -21943,7 +21751,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -21959,9 +21767,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -22056,7 +21864,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -22078,29 +21886,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -22142,7 +21927,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -22151,7 +21936,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -22204,19 +21989,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by expat $as_me 2.5.0, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -22238,7 +22023,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -22246,7 +22031,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -22278,16 +22063,16 @@ $config_commands
 Report bugs to <expat-bugs@libexpat.org>."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 expat config.status 2.5.0
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -22296,10 +22081,14 @@ srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -22327,15 +22116,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -22343,7 +22132,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -22352,7 +22141,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -22376,29 +22165,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
 @%:@@%:@ Running $as_me. @%:@@%:@
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -22791,7 +22580,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -22897,9 +22686,9 @@ _ACEOF
 
 # Create commands to substitute file output variables.
 {
-  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
-  echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
-  echo "$ac_subst_files" | sed 's/.*/F@<:@"&"@:>@="$&"/' &&
+  echo 'cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1' &&
+  printf '%s\n' 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
+  printf '%s\n' "$ac_subst_files" | sed 's/.*/F@<:@"&"@:>@="$&"/' &&
   echo "_ACAWK" &&
   echo "_ACEOF"
 } >conf$$files.sh &&
@@ -22913,13 +22702,13 @@ rm -f conf$$files.sh
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -22930,7 +22719,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -22975,9 +22764,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -23012,7 +22801,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 \$ac_cs_awk_pipe_fini
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -23044,7 +22833,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -23115,9 +22904,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -23135,8 +22924,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -23151,7 +22944,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -23195,7 +22988,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -23203,17 +22996,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -23230,7 +23023,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23254,9 +23047,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -23301,7 +23094,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -23318,10 +23111,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -23335,11 +23128,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -23368,9 +23161,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -23386,20 +23179,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -23419,7 +23212,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$_am_arg" |
+printf '%s\n' X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23439,8 +23232,8 @@ printf "%s\n" X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
   
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -23466,7 +23259,7 @@ esac
   for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    am_mf=`printf '%s\n' "$am_mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile which includes
     # dependency-tracking related rules and includes.
     # Grep'ing the whole file directly is not great: AIX grep has a line
@@ -23478,7 +23271,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$am_mf" : 'X\(//\)[^/]' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$am_mf" |
+printf '%s\n' X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23500,7 +23293,7 @@ printf "%s\n" X"$am_mf" |
 $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$am_mf" |
+printf '%s\n' X/"$am_mf" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -23525,8 +23318,8 @@ printf "%s\n" X/"$am_mf" |
    (exit $ac_status); } || am_rc=$?
   done
   if test $am_rc -ne 0; then
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
     for automatic dependency tracking.  If GNU make was not used, consider
     re-running the configure script with MAKE=\"gmake\" (or whatever is
@@ -24269,7 +24062,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -24285,24 +24078,31 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in @%:@(
+  -*) :
+    ac_no_opts=-- ;; @%:@(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: 
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: 
 
 Automake flags (can be overridden by user flags):
   AM_CPPFLAGS: ${AM_CPPFLAGS}
@@ -24315,7 +24115,7 @@ User flags (override Automake flags on conflict):
        CFLAGS: ${CFLAGS}
      CXXFLAGS: ${CXXFLAGS}
       LDFLAGS: ${LDFLAGS}" >&5
-printf "%s\n" "$as_me: 
+printf '%s\n' "$as_me: 
 
 Automake flags (can be overridden by user flags):
   AM_CPPFLAGS: ${AM_CPPFLAGS}
diff --git a/recipes/libs/expat/source/autom4te.cache/requests b/recipes/libs/expat/source/autom4te.cache/requests
index 68ecb387c8..02ea694267 100644
--- a/recipes/libs/expat/source/autom4te.cache/requests
+++ b/recipes/libs/expat/source/autom4te.cache/requests
@@ -1,4 +1,4 @@
-# This file was generated by Autom4te 2.72.
+# This file was generated by Autom4te 2.73.
 # It contains the lists of macros which have been traced.
 # It can be safely removed.
 
@@ -11,412 +11,21 @@
                       ],
                       [
                         '/usr/share/autoconf/autoconf/autoconf.m4f',
-                        '/usr/share/aclocal-1.18/internal/ac-config-macro-dirs.m4',
-                        '/usr/share/aclocal-1.18/amversion.m4',
-                        '/usr/share/aclocal-1.18/ar-lib.m4',
-                        '/usr/share/aclocal-1.18/auxdir.m4',
-                        '/usr/share/aclocal-1.18/cond.m4',
-                        '/usr/share/aclocal-1.18/depend.m4',
-                        '/usr/share/aclocal-1.18/depout.m4',
-                        '/usr/share/aclocal-1.18/init.m4',
-                        '/usr/share/aclocal-1.18/install-sh.m4',
-                        '/usr/share/aclocal-1.18/lead-dot.m4',
-                        '/usr/share/aclocal-1.18/make.m4',
-                        '/usr/share/aclocal-1.18/missing.m4',
-                        '/usr/share/aclocal-1.18/options.m4',
-                        '/usr/share/aclocal-1.18/prog-cc-c-o.m4',
-                        '/usr/share/aclocal-1.18/rmf.m4',
-                        '/usr/share/aclocal-1.18/runlog.m4',
-                        '/usr/share/aclocal-1.18/sanity.m4',
-                        '/usr/share/aclocal-1.18/silent.m4',
-                        '/usr/share/aclocal-1.18/strip.m4',
-                        '/usr/share/aclocal-1.18/substnot.m4',
-                        '/usr/share/aclocal-1.18/tar.m4',
-                        '/usr/share/aclocal-1.18/xargsn.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltargz.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltsugar.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltversion.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4',
-                        'acinclude.m4',
+                        'aclocal.m4',
                         'configure.ac'
                       ],
                       {
-                        'AC_CHECK_LIBM' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CONFIG_LINKS' => 1,
                         'AC_CONFIG_MACRO_DIR' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AC_DEFUN' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_PROG_NM' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AU_DEFUN' => 1,
-                        'AX_APPEND_COMPILE_FLAGS' => 1,
-                        'AX_APPEND_FLAG' => 1,
-                        'AX_APPEND_LINK_FLAGS' => 1,
-                        'AX_CHECK_COMPILE_FLAG' => 1,
-                        'AX_CHECK_LINK_FLAG' => 1,
-                        'AX_REQUIRE_DEFINED' => 1,
-                        'EXPATCFG_COMPILER_SUPPORTS_VISIBILITY' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'LTDL_INIT' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_FUNC_ARGZ' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'LT_INIT' => 1,
-                        'LT_LANG' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'LT_LIB_M' => 1,
-                        'LT_OUTPUT' => 1,
-                        'LT_PATH_LD' => 1,
-                        'LT_PATH_NM' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        'LT_PROG_GO' => 1,
-                        'LT_PROG_RC' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        '_AM_FILESYSTEM_TIMESTAMP_RESOLUTION' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        '_AM_PROG_RM_F' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        '_AM_PROG_XARGS_N' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        '_AM_SILENT_RULES' => 1,
-                        '_AM_SLEEP_FRACTIONAL_SECONDS' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_LTDL_SETUP' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_PROG_F77' => 1,
-                        '_LT_PROG_FC' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        '_m4_warn' => 1,
-                        'include' => 1,
-                        'm4_include' => 1,
-                        'm4_pattern_allow' => 1,
-                        'm4_pattern_forbid' => 1
-                      }
-                    ], 'Autom4te::Request' ),
-             bless( [
-                      '1',
-                      1,
-                      [
-                        '/usr/share/autoconf',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot//share/aclocal'
-                      ],
-                      [
-                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-                        'aclocal.m4',
-                        'configure.ac'
-                      ],
-                      {
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AC_INIT' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_NLS' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'GTK_DOC_CHECK' => 1,
-                        'IT_PROG_INTLTOOL' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_INIT' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        '_AM_COND_IF' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        '_m4_warn' => 1,
-                        'include' => 1,
-                        'm4_include' => 1,
-                        'm4_pattern_allow' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'm4_sinclude' => 1,
-                        'sinclude' => 1
-                      }
-                    ], 'Autom4te::Request' ),
-             bless( [
-                      '2',
-                      1,
-                      [
-                        '/usr/share/autoconf',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot//share/aclocal'
-                      ],
-                      [
-                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-                        'aclocal.m4',
-                        '/usr/share/autoconf/autoconf/trailer.m4',
-                        'configure.ac'
-                      ],
-                      {
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AC_INIT' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_NLS' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'GTK_DOC_CHECK' => 1,
-                        'IT_PROG_INTLTOOL' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_INIT' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        '_AM_COND_IF' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        '_m4_warn' => 1,
-                        'include' => 1,
-                        'm4_include' => 1,
-                        'm4_pattern_allow' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'm4_sinclude' => 1,
-                        'sinclude' => 1
-                      }
-                    ], 'Autom4te::Request' ),
-             bless( [
-                      '3',
-                      1,
-                      [
-                        '/usr/share/autoconf'
-                      ],
-                      [
-                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-                        'aclocal.m4',
-                        'configure.ac'
-                      ],
-                      {
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AC_FC_FREEFORM' => 1,
@@ -425,6 +34,9 @@
                         'AC_FC_SRCEXT' => 1,
                         'AC_INIT' => 1,
                         'AC_LIBSOURCE' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_SUBST' => 1,
@@ -436,6 +48,9 @@
                         'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'AM_GNU_GETTEXT' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AM_ICONV' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
@@ -453,6 +68,7 @@
                         'AM_SILENT_RULES' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
                         'GTK_DOC_CHECK' => 1,
+                        'GUILE_FLAGS' => 1,
                         'IT_PROG_INTLTOOL' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
                         'LT_INIT' => 1,
diff --git a/recipes/libs/expat/source/autom4te.cache/traces.0 b/recipes/libs/expat/source/autom4te.cache/traces.0
index d615b139e3..3115ceee7c 100644
--- a/recipes/libs/expat/source/autom4te.cache/traces.0
+++ b/recipes/libs/expat/source/autom4te.cache/traces.0
@@ -1,2698 +1,15 @@
-m4trace:/usr/share/aclocal-1.18/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.18'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.18.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-m4trace:/usr/share/aclocal-1.18/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.18.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-m4trace:/usr/share/aclocal-1.18/ar-lib.m4:13: -1- AC_DEFUN([AM_PROG_AR], [AC_BEFORE([$0], [LT_INIT])dnl
-AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
-AC_BEFORE([$0], [AC_PROG_AR])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([ar-lib])dnl
-AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
-: ${AR=ar}
-: ${ARFLAGS=cr}
-
-AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
-  [AC_LANG_PUSH([C])
-   am_cv_ar_interface=ar
-   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
-     [am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([am_ar_try])
-      if test "$ac_status" -eq 0; then
-        am_cv_ar_interface=ar
-      else
-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
-        AC_TRY_EVAL([am_ar_try])
-        if test "$ac_status" -eq 0; then
-          am_cv_ar_interface=lib
-        else
-          am_cv_ar_interface=unknown
-        fi
-      fi
-      rm -f conftest.lib libconftest.a
-     ])
-   AC_LANG_POP([C])])
-
-case $am_cv_ar_interface in
-ar)
-  ;;
-lib)
-  # Microsoft lib, so override with the ar-lib wrapper script.
-  # FIXME: It is wrong to rewrite AR.
-  # But if we don't then we get into trouble of one sort or another.
-  # A longer-term fix would be to have automake use am__AR in this case,
-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
-  # similar.
-  AR="$am_aux_dir/ar-lib $AR"
-  ;;
-unknown)
-  m4_default([$1],
-             [AC_MSG_ERROR([could not determine $AR interface])])
-  ;;
-esac
-AC_SUBST([AR])dnl
-])
-m4trace:/usr/share/aclocal-1.18/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-])
-m4trace:/usr/share/aclocal-1.18/cond.m4:12: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-m4trace:/usr/share/aclocal-1.18/depend.m4:26: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thus:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-m4trace:/usr/share/aclocal-1.18/depend.m4:163: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-m4trace:/usr/share/aclocal-1.18/depend.m4:171: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-m4trace:/usr/share/aclocal-1.18/depout.m4:11: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
-  # requiring Autoconf 2.70 or later.
-  AS_CASE([$CONFIG_FILES],
-          [*\'*], [eval set x "$CONFIG_FILES"],
-          [*], [set x $CONFIG_FILES])
-  shift
-  # Used to flag and report bootstrapping failures.
-  am_rc=0
-  for am_mf
-  do
-    # Strip MF so we end up with the name of the file.
-    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
-    # dependency-tracking related rules and includes.
-    # Grep'ing the whole file directly is not great: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
-      || continue
-    am_dirpart=`AS_DIRNAME(["$am_mf"])`
-    am_filepart=`AS_BASENAME(["$am_mf"])`
-    AM_RUN_LOG([cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles]) || am_rc=$?
-  done
-  if test $am_rc -ne 0; then
-    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  If GNU make was not used, consider
-    re-running the configure script with MAKE="gmake" (or whatever is
-    necessary).  You can also try re-running configure with the
-    '--disable-dependency-tracking' option to at least be able to build
-    the package (albeit without support for automatic dependency tracking).])
-  fi
-  AS_UNSET([am_dirpart])
-  AS_UNSET([am_filepart])
-  AS_UNSET([am_mf])
-  AS_UNSET([am_rc])
-  rm -f conftest-deps.mk
-}
-])
-m4trace:/usr/share/aclocal-1.18/depout.m4:64: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
-m4trace:/usr/share/aclocal-1.18/init.m4:29: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl
-m4_ifdef([_$0_ALREADY_INIT],
-  [m4_fatal([$0 expanded multiple times
-]m4_defn([_$0_ALREADY_INIT]))],
-  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-  [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-    [_AM_IF_OPTION([tar-v7], [_AM_PROG_TAR([v7])],
-      [_AM_PROG_TAR([ustar])])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-# Variables for tags utilities; see am/tags.am
-if test -z "$CTAGS"; then
-  CTAGS=ctags
-fi
-AC_SUBST([CTAGS])
-if test -z "$ETAGS"; then
-  ETAGS=etags
-fi
-AC_SUBST([ETAGS])
-if test -z "$CSCOPE"; then
-  CSCOPE=cscope
-fi
-AC_SUBST([CSCOPE])
-
-AC_REQUIRE([_AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-
-AC_REQUIRE([_AM_PROG_RM_F])
-AC_REQUIRE([_AM_PROG_XARGS_N])
-
-dnl The trailing newline in this macro's definition is deliberate, for
-dnl backward compatibility and to allow trailing 'dnl'-style comments
-dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
-])
-m4trace:/usr/share/aclocal-1.18/init.m4:167: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-m4trace:/usr/share/aclocal-1.18/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST([install_sh])])
-m4trace:/usr/share/aclocal-1.18/lead-dot.m4:10: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-m4trace:/usr/share/aclocal-1.18/make.m4:13: -1- AC_DEFUN([AM_MAKE_INCLUDE], [AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
-cat > confinc.mk << 'END'
-am__doit:
-	@echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
-  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
-  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
-      ['0:this is the am__doit target'],
-      [AS_CASE([$s],
-          [BSD], [am__include='.include' am__quote='"'],
-          [am__include='include' am__quote=''])])
-  if test "$am__include" != "#"; then
-    _am_result="yes ($s style)"
-    break
-  fi
-done
-rm -f confinc.* confmf.*
-AC_MSG_RESULT([${_am_result}])
-AC_SUBST([am__include])])
-m4trace:/usr/share/aclocal-1.18/make.m4:42: -1- m4_pattern_allow([^am__quote$])
-m4trace:/usr/share/aclocal-1.18/missing.m4:11: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-m4trace:/usr/share/aclocal-1.18/missing.m4:20: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  MISSING="\${SHELL} '$am_aux_dir/missing'"
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-m4trace:/usr/share/aclocal-1.18/options.m4:11: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-m4trace:/usr/share/aclocal-1.18/options.m4:17: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-m4trace:/usr/share/aclocal-1.18/options.m4:23: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-m4trace:/usr/share/aclocal-1.18/options.m4:29: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-m4trace:/usr/share/aclocal-1.18/prog-cc-c-o.m4:12: -1- AC_DEFUN([_AM_PROG_CC_C_O], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  # aligned with autoconf, so not including core; see bug#72225.
-  rm -f -r a.out a.exe b.out conftest.$ac_ext conftest.$ac_objext \
-    conftest.dSYM conftest1.$ac_ext conftest1.$ac_objext conftest1.dSYM \
-    conftest2.$ac_ext conftest2.$ac_objext conftest2.dSYM
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-m4trace:/usr/share/aclocal-1.18/prog-cc-c-o.m4:50: -1- AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-m4trace:/usr/share/aclocal-1.18/rmf.m4:12: -1- AC_DEFUN([_AM_PROG_RM_F], [am__rm_f_notfound=
-AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
-AC_SUBST(am__rm_f_notfound)
-])
-m4trace:/usr/share/aclocal-1.18/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-m4trace:/usr/share/aclocal-1.18/sanity.m4:11: -1- AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
-AC_CACHE_CHECK([whether sleep supports fractional seconds],
-               am_cv_sleep_fractional_seconds, [dnl
-AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
-                                 [am_cv_sleep_fractional_seconds=no])
-])])
-m4trace:/usr/share/aclocal-1.18/sanity.m4:28: -1- AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
-AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
-AC_CACHE_CHECK([filesystem timestamp resolution],
-               am_cv_filesystem_timestamp_resolution, [dnl
-# Default to the worst case.
-am_cv_filesystem_timestamp_resolution=2
-
-# Only try to go finer than 1 sec if sleep can do it.
-# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
-# - 1 sec is not much of a win compared to 2 sec, and
-# - it takes 2 seconds to perform the test whether 1 sec works.
-# 
-# Instead, just use the default 2s on platforms that have 1s resolution,
-# accept the extra 1s delay when using $sleep in the Automake tests, in
-# exchange for not incurring the 2s delay for running the test for all
-# packages.
-#
-am_try_resolutions=
-if test "$am_cv_sleep_fractional_seconds" = yes; then
-  # Even a millisecond often causes a bunch of false positives,
-  # so just try a hundredth of a second. The time saved between .001 and
-  # .01 is not terribly consequential.
-  am_try_resolutions="0.01 0.1 $am_try_resolutions"
-fi
-
-# In order to catch current-generation FAT out, we must *modify* files
-# that already exist; the *creation* timestamp is finer.  Use names
-# that make ls -t sort them differently when they have equal
-# timestamps than when they have distinct timestamps, keeping
-# in mind that ls -t prints the *newest* file first.
-rm -f conftest.ts?
-: > conftest.ts1
-: > conftest.ts2
-: > conftest.ts3
-
-# Make sure ls -t actually works.  Do 'set' in a subshell so we don't
-# clobber the current shell's arguments. (Outer-level square brackets
-# are removed by m4; they're present so that m4 does not expand
-# <dollar><star>; be careful, easy to get confused.)
-if (
-     set X `[ls -t conftest.ts[12]]` &&
-     {
-       test "$[]*" != "X conftest.ts1 conftest.ts2" ||
-       test "$[]*" != "X conftest.ts2 conftest.ts1";
-     }
-); then :; else
-  # If neither matched, then we have a broken ls.  This can happen
-  # if, for instance, CONFIG_SHELL is bash and it inherits a
-  # broken ls alias from the environment.  This has actually
-  # happened.  Such a system could not be considered "sane".
-  _AS_ECHO_UNQUOTED(
-    ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
-    [AS_MESSAGE_LOG_FD])
-  AC_MSG_FAILURE([ls -t produces unexpected output.
-Make sure there is not a broken ls alias in your environment.])
-fi
-
-for am_try_res in $am_try_resolutions; do
-  # Any one fine-grained sleep might happen to cross the boundary
-  # between two values of a coarser actual resolution, but if we do
-  # two fine-grained sleeps in a row, at least one of them will fall
-  # entirely within a coarse interval.
-  echo alpha > conftest.ts1
-  sleep $am_try_res
-  echo beta > conftest.ts2
-  sleep $am_try_res
-  echo gamma > conftest.ts3
-
-  # We assume that 'ls -t' will make use of high-resolution
-  # timestamps if the operating system supports them at all.
-  if (set X `ls -t conftest.ts?` &&
-      test "$[]2" = conftest.ts3 &&
-      test "$[]3" = conftest.ts2 &&
-      test "$[]4" = conftest.ts1); then
-    #
-    # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
-    # because we don't need to test make.
-    make_ok=true
-    if test $am_try_res != 1; then
-      # But if we've succeeded so far with a subsecond resolution, we
-      # have one more thing to check: make. It can happen that
-      # everything else supports the subsecond mtimes, but make doesn't;
-      # notably on macOS, which ships make 3.81 from 2006 (the last one
-      # released under GPLv2). https://bugs.gnu.org/68808
-      # 
-      # We test $MAKE if it is defined in the environment, else "make".
-      # It might get overridden later, but our hope is that in practice
-      # it does not matter: it is the system "make" which is (by far)
-      # the most likely to be broken, whereas if the user overrides it,
-      # probably they did so with a better, or at least not worse, make.
-      # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
-      #
-      # Create a Makefile (real tab character here):
-      rm -f conftest.mk
-      echo 'conftest.ts1: conftest.ts2' >conftest.mk
-      echo '	touch conftest.ts2' >>conftest.mk
-      #
-      # Now, running
-      #   touch conftest.ts1; touch conftest.ts2; make
-      # should touch ts1 because ts2 is newer. This could happen by luck,
-      # but most often, it will fail if make's support is insufficient. So
-      # test for several consecutive successes.
-      #
-      # (We reuse conftest.ts[12] because we still want to modify existing
-      # files, not create new ones, per above.)
-      n=0
-      make=${MAKE-make}
-      until test $n -eq 3; do
-        echo one > conftest.ts1
-        sleep $am_try_res
-        echo two > conftest.ts2 # ts2 should now be newer than ts1
-        if $make -f conftest.mk | grep 'up to date' >/dev/null; then
-          make_ok=false
-          break # out of $n loop
-        fi
-        n=`expr $n + 1`
-      done
-    fi
-    #
-    if $make_ok; then
-      # Everything we know to check worked out, so call this resolution good.
-      am_cv_filesystem_timestamp_resolution=$am_try_res
-      break # out of $am_try_res loop
-    fi
-    # Otherwise, we'll go on to check the next resolution.
-  fi
-done
-rm -f conftest.ts?
-# (end _am_filesystem_timestamp_resolution)
-])])
-m4trace:/usr/share/aclocal-1.18/sanity.m4:161: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
-# This check should not be cached, as it may vary across builds of
-# different projects.
-AC_MSG_CHECKING([whether build environment is sane])
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-am_build_env_is_sane=no
-am_has_slept=no
-rm -f conftest.file
-for am_try in 1 2; do
-  echo "timestamp, slept: $am_has_slept" > conftest.file
-  if (
-    set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-    if test "$[]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-    fi
-    test "$[]2" = conftest.file
-  ); then
-    am_build_env_is_sane=yes
-    break
-  fi
-  # Just in case.
-  sleep "$am_cv_filesystem_timestamp_resolution"
-  am_has_slept=yes
-done
-
-AC_MSG_RESULT([$am_build_env_is_sane])
-if test "$am_build_env_is_sane" = no; then
-  AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
-  ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
-  am_sleep_pid=$!
-])
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
-m4trace:/usr/share/aclocal-1.18/silent.m4:11: -1- AC_DEFUN([_AM_SILENT_RULES], [AM_DEFAULT_VERBOSITY=1
-AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
-dnl to AM_SILENT_RULES to change the default value.
-AC_CONFIG_COMMANDS_PRE([dnl
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-esac
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-])dnl
-])
-m4trace:/usr/share/aclocal-1.18/silent.m4:69: -1- AC_DEFUN([AM_SILENT_RULES], [AC_REQUIRE([_AM_SILENT_RULES])
-AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])m4_newline
-dnl We intentionally force a newline after the assignment, since a) nothing
-dnl good can come of more text following, and b) that was the behavior
-dnl before 1.17. See https://bugs.gnu.org/72267.
-])
-m4trace:/usr/share/aclocal-1.18/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-m4trace:/usr/share/aclocal-1.18/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
-m4trace:/usr/share/aclocal-1.18/substnot.m4:17: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-m4trace:/usr/share/aclocal-1.18/tar.m4:23: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
-m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test x$am_uid = xunknown; then
-        AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
-      elif test $am_uid -le $am_max_uid; then
-        AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test x$gm_gid = xunknown; then
-        AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
-      elif test $am_gid -le $am_max_gid; then
-        AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
-
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
-  rm -rf conftest.dir
-
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-])
-m4trace:/usr/share/aclocal-1.18/xargsn.m4:12: -1- AC_DEFUN([_AM_PROG_XARGS_N], [AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
-AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
-3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
-AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
-  am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
-])dnl
-AC_SUBST(am__xargs_n)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:62: -1- AC_DEFUN([LT_INIT], [AC_PREREQ([2.64])dnl We use AC_PATH_PROGS_FEATURE_CHECK
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:100: -1- AU_DEFUN([AC_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:100: -1- AC_DEFUN([AC_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AC_PROG_LIBTOOL' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_INIT], [LT_INIT($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:101: -1- AU_DEFUN([AM_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:101: -1- AC_DEFUN([AM_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AM_PROG_LIBTOOL' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_INIT], [LT_INIT($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:621: -1- AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-'$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2024 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-while test 0 != $[#]
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try '$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try '$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test yes = "$silent" &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:813: -1- AC_DEFUN([LT_SUPPORTED_TAG], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:824: -1- AC_DEFUN([LT_LANG], [AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:916: -1- AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:916: -1- AC_DEFUN([AC_LIBTOOL_CXX], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_CXX' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(C++)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:917: -1- AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:917: -1- AC_DEFUN([AC_LIBTOOL_F77], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_F77' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(Fortran 77)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:918: -1- AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:918: -1- AC_DEFUN([AC_LIBTOOL_FC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_FC' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(Fortran)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:919: -1- AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:919: -1- AC_DEFUN([AC_LIBTOOL_GCJ], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_GCJ' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(Java)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:920: -1- AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:920: -1- AC_DEFUN([AC_LIBTOOL_RC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_RC' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(Windows Resource)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1278: -1- AC_DEFUN([_LT_WITH_SYSROOT], [m4_require([_LT_DECL_SED])dnl
-AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
-  [Search for dependent libraries within DIR (or the compiler's sysroot
-   if not specified).])],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     # Trim trailing / since we'll always append absolute paths and we want
-     # to avoid //, if only for less confusing output for the user.
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([$with_sysroot])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and where our libraries should be installed.])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1618: -1- AC_DEFUN([_LT_COMPILER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test yes = "[$]$2"; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1660: -1- AU_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1660: -1- AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_COMPILER_OPTION' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1669: -1- AC_DEFUN([_LT_LINKER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-])
-
-if test yes = "[$]$2"; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1704: -1- AU_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1704: -1- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_LINKER_OPTION' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1711: -1- AC_DEFUN([LT_CMD_MAX_LEN], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | windows* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1850: -1- AU_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1850: -1- AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_SYS_MAX_CMD_LEN' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:1961: -1- AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl
-if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | windows* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen=shl_load],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen=dlopen],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:2086: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:2086: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN_SELF' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3296: -1- AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$1"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac])
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3358: -1- AU_DEFUN([AC_PATH_TOOL_PREFIX], [m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3358: -1- AC_DEFUN([AC_PATH_TOOL_PREFIX], [m4_warn([obsolete], [The macro 'AC_PATH_TOOL_PREFIX' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3381: -1- AC_DEFUN([LT_PATH_LD], [AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test no = "$withval" || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw* | *-*-windows*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi])
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3470: -1- AU_DEFUN([AM_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3470: -1- AC_DEFUN([AM_PROG_LD], [m4_warn([obsolete], [The macro 'AM_PROG_LD' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3471: -1- AU_DEFUN([AC_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3471: -1- AC_DEFUN([AC_PROG_LD], [m4_warn([obsolete], [The macro 'AC_PROG_LD' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3811: -1- AC_DEFUN([LT_PATH_NM], [AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3906: -1- AU_DEFUN([AM_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3906: -1- AC_DEFUN([AM_PROG_NM], [m4_warn([obsolete], [The macro 'AM_PROG_NM' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3907: -1- AU_DEFUN([AC_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3907: -1- AC_DEFUN([AC_PROG_NM], [m4_warn([obsolete], [The macro 'AC_PROG_NM' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3978: -1- AC_DEFUN([_LT_DLL_DEF_P], [dnl
-  test DEF = "`$SED -n dnl
-    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
-    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
-    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
-    -e q dnl                          Only consider the first "real" line
-    $1`" dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:3992: -1- AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM=-lm)
-  ;;
-esac
-AC_SUBST([LIBM])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:4011: -1- AU_DEFUN([AC_CHECK_LIBM], [m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:4011: -1- AC_DEFUN([AC_CHECK_LIBM], [m4_warn([obsolete], [The macro 'AC_CHECK_LIBM' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:8336: -1- AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:8345: -1- AU_DEFUN([LT_AC_PROG_GCJ], [m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:8345: -1- AC_DEFUN([LT_AC_PROG_GCJ], [m4_warn([obsolete], [The macro 'LT_AC_PROG_GCJ' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:8352: -1- AC_DEFUN([LT_PROG_GO], [AC_CHECK_TOOL(GOC, gccgo,)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:8359: -1- AC_DEFUN([LT_PROG_RC], [AC_CHECK_TOOL(RC, windres,)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:8364: -1- AU_DEFUN([LT_AC_PROG_RC], [m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/libtool.m4:8364: -1- AC_DEFUN([LT_AC_PROG_RC], [m4_warn([obsolete], [The macro 'LT_AC_PROG_RC' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltargz.m4:13: -1- AC_DEFUN([LT_FUNC_ARGZ], [
-dnl Required for use of '$SED' in Cygwin configuration.
-AC_REQUIRE([AC_PROG_SED])dnl
-AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
-
-AC_CHECK_TYPES([error_t],
-  [],
-  [AC_DEFINE([error_t], [int],
-   [Define to a type to use for 'error_t' if it is not otherwise available.])
-   AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h
-    does not typedef error_t.])],
-  [#if defined(HAVE_ARGZ_H)
-#  include <argz.h>
-#endif])
-
-LT_ARGZ_H=
-AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \
-	argz_next argz_stringify], [], [LT_ARGZ_H=lt__argz.h; AC_LIBOBJ([lt__argz])])
-
-dnl if have system argz functions, allow forced use of
-dnl libltdl-supplied implementation (and default to do so
-dnl on "known bad" systems). Could use a runtime check, but
-dnl (a) detecting malloc issues is notoriously unreliable
-dnl (b) only known system that declares argz functions,
-dnl     provides them, yet they are broken, is cygwin
-dnl     releases prior to 16-Mar-2007 (1.5.24 and earlier)
-dnl So, it's more straightforward simply to special case
-dnl this for known bad systems.
-AS_IF([test -z "$LT_ARGZ_H"],
-    [AC_CACHE_CHECK(
-        [if argz actually works],
-        [lt_cv_sys_argz_works],
-        [[case $host_os in #(
-	 *cygwin*)
-	   lt_cv_sys_argz_works=no
-	   if test no != "$cross_compiling"; then
-	     lt_cv_sys_argz_works="guessing no"
-	   else
-	     lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
-	     save_IFS=$IFS
-	     IFS=-.
-	     set x `uname -r | $SED -e "$lt_sed_extract_leading_digits"`
-	     IFS=$save_IFS
-	     lt_os_major=${2-0}
-	     lt_os_minor=${3-0}
-	     lt_os_micro=${4-0}
-	     if test 1 -lt "$lt_os_major" \
-		|| { test 1 -eq "$lt_os_major" \
-		  && { test 5 -lt "$lt_os_minor" \
-		    || { test 5 -eq "$lt_os_minor" \
-		      && test 24 -lt "$lt_os_micro"; }; }; }; then
-	       lt_cv_sys_argz_works=yes
-	     fi
-	   fi
-	   ;; #(
-	 *) lt_cv_sys_argz_works=yes ;;
-	 esac]])
-     AS_IF([test yes = "$lt_cv_sys_argz_works"],
-        [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
-                   [This value is set to 1 to indicate that the system argz facility works])],
-        [LT_ARGZ_H=lt__argz.h
-        AC_LIBOBJ([lt__argz])])])
-
-AC_SUBST([LT_ARGZ_H])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:17: -1- AC_DEFUN([LT_CONFIG_LTDL_DIR], [AC_BEFORE([$0], [LTDL_INIT])
-_$0($*)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:69: -1- AC_DEFUN([LTDL_CONVENIENCE], [AC_BEFORE([$0], [LTDL_INIT])dnl
-dnl Although the argument is deprecated and no longer documented,
-dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one
-dnl here make sure it is the same as any other declaration of libltdl's
-dnl location!  This also ensures lt_ltdl_dir is set when configure.ac is
-dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
-m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
-_$0()
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:82: -1- AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
-_LTDL_CONVENIENCE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:82: -1- AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_CONVENIENCE' is obsolete.
-You should run autoupdate.])dnl
-_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
-_LTDL_CONVENIENCE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:125: -1- AC_DEFUN([LTDL_INSTALLABLE], [AC_BEFORE([$0], [LTDL_INIT])dnl
-dnl Although the argument is deprecated and no longer documented,
-dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one
-dnl here make sure it is the same as any other declaration of libltdl's
-dnl location!  This also ensures lt_ltdl_dir is set when configure.ac is
-dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
-m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
-_$0()
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:138: -1- AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
-_LTDL_INSTALLABLE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:138: -1- AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_INSTALLABLE' is obsolete.
-You should run autoupdate.])dnl
-_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
-_LTDL_INSTALLABLE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:214: -1- AC_DEFUN([_LT_LIBOBJ], [
-  m4_pattern_allow([^_LT_LIBOBJS$])
-  _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:227: -1- AC_DEFUN([LTDL_INIT], [dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-dnl We need to keep our own list of libobjs separate from our parent project,
-dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while
-dnl we look for our own LIBOBJs.
-m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ]))
-m4_pushdef([AC_LIBSOURCES])
-
-dnl If not otherwise defined, default to the 1.5.x compatible subproject mode:
-m4_if(_LTDL_MODE, [],
-        [m4_define([_LTDL_MODE], m4_default([$2], [subproject]))
-        m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])],
-                [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])
-
-AC_ARG_WITH([included_ltdl],
-    [AS_HELP_STRING([--with-included-ltdl],
-                    [use the GNU ltdl sources included here])])
-
-if test yes != "$with_included_ltdl"; then
-  # We are not being forced to use the included libltdl sources, so
-  # decide whether there is a useful installed version we can use.
-  AC_CHECK_HEADER([ltdl.h],
-      [AC_CHECK_DECL([lt_dlinterface_register],
-	   [AC_CHECK_LIB([ltdl], [lt_dladvise_preload],
-	       [with_included_ltdl=no],
-	       [with_included_ltdl=yes])],
-	   [with_included_ltdl=yes],
-	   [AC_INCLUDES_DEFAULT
-	    #include <ltdl.h>])],
-      [with_included_ltdl=yes],
-      [AC_INCLUDES_DEFAULT]
-  )
-fi
-
-dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE
-dnl was called yet, then for old times' sake, we assume libltdl is in an
-dnl eponymous directory:
-AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])])
-
-AC_ARG_WITH([ltdl_include],
-    [AS_HELP_STRING([--with-ltdl-include=DIR],
-                    [use the ltdl headers installed in DIR])])
-
-if test -n "$with_ltdl_include"; then
-  if test -f "$with_ltdl_include/ltdl.h"; then :
-  else
-    AC_MSG_ERROR([invalid ltdl include directory: '$with_ltdl_include'])
-  fi
-else
-  with_ltdl_include=no
-fi
-
-AC_ARG_WITH([ltdl_lib],
-    [AS_HELP_STRING([--with-ltdl-lib=DIR],
-                    [use the libltdl.la installed in DIR])])
-
-if test -n "$with_ltdl_lib"; then
-  if test -f "$with_ltdl_lib/libltdl.la"; then :
-  else
-    AC_MSG_ERROR([invalid ltdl library directory: '$with_ltdl_lib'])
-  fi
-else
-  with_ltdl_lib=no
-fi
-
-case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
-  ,yes,no,no,)
-	m4_case(m4_default(_LTDL_TYPE, [convenience]),
-	    [convenience], [_LTDL_CONVENIENCE],
-	    [installable], [_LTDL_INSTALLABLE],
-	  [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)])
-	;;
-  ,no,no,no,)
-	# If the included ltdl is not to be used, then use the
-	# preinstalled libltdl we found.
-	AC_DEFINE([HAVE_LTDL], [1],
-	  [Define this if a modern libltdl is already installed])
-	LIBLTDL=-lltdl
-	LTDLDEPS=
-	LTDLINCL=
-	;;
-  ,no*,no,*)
-	AC_MSG_ERROR(['--with-ltdl-include' and '--with-ltdl-lib' options must be used together])
-	;;
-  *)	with_included_ltdl=no
-	LIBLTDL="-L$with_ltdl_lib -lltdl"
-	LTDLDEPS=
-	LTDLINCL=-I$with_ltdl_include
-	;;
-esac
-INCLTDL=$LTDLINCL
-
-# Report our decision...
-AC_MSG_CHECKING([where to find libltdl headers])
-AC_MSG_RESULT([$LTDLINCL])
-AC_MSG_CHECKING([where to find libltdl library])
-AC_MSG_RESULT([$LIBLTDL])
-
-_LTDL_SETUP
-
-dnl restore autoconf definition.
-m4_popdef([AC_LIBOBJ])
-m4_popdef([AC_LIBSOURCES])
-
-AC_CONFIG_COMMANDS_PRE([
-    _ltdl_libobjs=
-    _ltdl_ltlibobjs=
-    if test -n "$_LT_LIBOBJS"; then
-      # Remove the extension.
-      _lt_sed_drop_objext='s/\.o$//;s/\.obj$//'
-      for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | $SED "$_lt_sed_drop_objext" | sort -u`; do
-        _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext"
-        _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo"
-      done
-    fi
-    AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs])
-    AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs])
-])
-
-# Only expand once:
-m4_define([LTDL_INIT])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:353: -1- AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:353: -1- AC_DEFUN([AC_LIB_LTDL], [m4_warn([obsolete], [The macro 'AC_LIB_LTDL' is obsolete.
-You should run autoupdate.])dnl
-LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:354: -1- AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:354: -1- AC_DEFUN([AC_WITH_LTDL], [m4_warn([obsolete], [The macro 'AC_WITH_LTDL' is obsolete.
-You should run autoupdate.])dnl
-LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:355: -1- AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:355: -1- AC_DEFUN([LT_WITH_LTDL], [m4_warn([obsolete], [The macro 'LT_WITH_LTDL' is obsolete.
-You should run autoupdate.])dnl
-LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:368: -1- AC_DEFUN([_LTDL_SETUP], [AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_SYS_MODULE_EXT])dnl
-AC_REQUIRE([LT_SYS_MODULE_PATH])dnl
-AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl
-AC_REQUIRE([LT_LIB_DLLOAD])dnl
-AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
-AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl
-AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl
-AC_REQUIRE([LT_FUNC_ARGZ])dnl
-
-m4_require([_LT_CHECK_OBJDIR])dnl
-m4_require([_LT_HEADER_DLFCN])dnl
-m4_require([_LT_CHECK_DLPREOPEN])dnl
-m4_require([_LT_DECL_SED])dnl
-
-dnl Don't require this, or it will be expanded earlier than the code
-dnl that sets the variables it relies on:
-_LT_ENABLE_INSTALL
-
-dnl _LTDL_MODE specific code must be called at least once:
-_LTDL_MODE_DISPATCH
-
-# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS
-# the user used.  This is so that ltdl.h can pick up the parent projects
-# config.h file, The first file in AC_CONFIG_HEADERS must contain the
-# definitions required by ltdl.c.
-# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
-AC_CONFIG_COMMANDS_PRE([dnl
-m4_pattern_allow([^LT_CONFIG_H$])dnl
-m4_ifset([AH_HEADER],
-    [LT_CONFIG_H=AH_HEADER],
-    [m4_ifset([AC_LIST_HEADERS],
-	    [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's|^[[      ]]*||;s|[[ :]].*$||'`],
-	[])])])
-AC_SUBST([LT_CONFIG_H])
-
-AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
-	[], [], [AC_INCLUDES_DEFAULT])
-
-AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
-AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
-
-m4_pattern_allow([LT_LIBEXT])dnl
-AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
-
-name=
-eval "lt_libprefix=\"$libname_spec\""
-m4_pattern_allow([LT_LIBPREFIX])dnl
-AC_DEFINE_UNQUOTED([LT_LIBPREFIX],["$lt_libprefix"],[The archive prefix])
-
-name=ltdl
-eval "LTDLOPEN=\"$libname_spec\""
-AC_SUBST([LTDLOPEN])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:445: -1- AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
-  [lt_cv_sys_dlopen_deplibs],
-  [# PORTME does your system automatically load deplibs for dlopen?
-  # or its logical equivalent (e.g. shl_load for HP-UX < 11)
-  # For now, we just catch OSes we know something about -- in the
-  # future, we'll try test this programmatically.
-  lt_cv_sys_dlopen_deplibs=unknown
-  case $host_os in
-  aix3*|aix4.1.*|aix4.2.*)
-    # Unknown whether this is true for these versions of AIX, but
-    # we want this 'case' here to explicitly catch those versions.
-    lt_cv_sys_dlopen_deplibs=unknown
-    ;;
-  aix[[4-9]]*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  amigaos*)
-    case $host_cpu in
-    powerpc)
-      lt_cv_sys_dlopen_deplibs=no
-      ;;
-    esac
-    ;;
-  darwin*)
-    # Assuming the user has installed a libdl from somewhere, this is true
-    # If you are looking for one http://www.opendarwin.org/projects/dlcompat
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  freebsd* | dragonfly* | midnightbsd*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
-    # GNU and its variants, using gnu ld.so (Glibc)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  hpux10*|hpux11*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  interix*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  irix[[12345]]*|irix6.[[01]]*)
-    # Catch all versions of IRIX before 6.2, and indicate that we don't
-    # know how it worked for any of those versions.
-    lt_cv_sys_dlopen_deplibs=unknown
-    ;;
-  irix*)
-    # The case above catches anything before 6.2, and it's known that
-    # at 6.2 and later dlopen does load deplibs.
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  *-mlibc)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  redox*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  netbsd* | netbsdelf*-gnu)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  openbsd*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  osf[[1234]]*)
-    # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
-    # it did *not* use an RPATH in a shared library to find objects the
-    # library depends on, so we explicitly say 'no'.
-    lt_cv_sys_dlopen_deplibs=no
-    ;;
-  osf5.0|osf5.0a|osf5.1)
-    # dlopen *does* load deplibs and with the right loader patch applied
-    # it even uses RPATH in a shared library to search for shared objects
-    # that the library depends on, but there's no easy way to know if that
-    # patch is installed.  Since this is the case, all we can really
-    # say is unknown -- it depends on the patch being installed.  If
-    # it is, this changes to 'yes'.  Without it, it would be 'no'.
-    lt_cv_sys_dlopen_deplibs=unknown
-    ;;
-  osf*)
-    # the two cases above should catch all versions of osf <= 5.1.  Read
-    # the comments above for what we know about them.
-    # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
-    # is used to find them so we can finally say 'yes'.
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  qnx*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  solaris*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
-  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  esac
-  ])
-if test yes != "$lt_cv_sys_dlopen_deplibs"; then
- AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1],
-    [Define if the OS needs help to load dependent libraries for dlopen().])
-fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:550: -1- AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:550: -1- AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_warn([obsolete], [The macro 'AC_LTDL_SYS_DLOPEN_DEPLIBS' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:557: -1- AC_DEFUN([LT_SYS_MODULE_EXT], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
-AC_CACHE_CHECK([what extension is used for runtime loadable modules],
-  [libltdl_cv_shlibext],
-[
-module=yes
-eval libltdl_cv_shlibext=$shrext_cmds
-module=no
-eval libltdl_cv_shrext=$shrext_cmds
-  ])
-if test -n "$libltdl_cv_shlibext"; then
-  m4_pattern_allow([LT_MODULE_EXT])dnl
-  AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"],
-    [Define to the extension used for runtime loadable modules, say, ".so".])
-fi
-if test "$libltdl_cv_shrext" != "$libltdl_cv_shlibext"; then
-  m4_pattern_allow([LT_SHARED_EXT])dnl
-  AC_DEFINE_UNQUOTED([LT_SHARED_EXT], ["$libltdl_cv_shrext"],
-    [Define to the shared library suffix, say, ".dylib".])
-fi
-if test -n "$shared_archive_member_spec"; then
-  m4_pattern_allow([LT_SHARED_LIB_MEMBER])dnl
-  AC_DEFINE_UNQUOTED([LT_SHARED_LIB_MEMBER], ["($shared_archive_member_spec.o)"],
-    [Define to the shared archive member specification, say "(shr.o)".])
-fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:585: -1- AU_DEFUN([AC_LTDL_SHLIBEXT], [m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:585: -1- AC_DEFUN([AC_LTDL_SHLIBEXT], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBEXT' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:592: -1- AC_DEFUN([LT_SYS_MODULE_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
-AC_CACHE_CHECK([what variable specifies run-time module search path],
-  [lt_cv_module_path_var], [lt_cv_module_path_var=$shlibpath_var])
-if test -n "$lt_cv_module_path_var"; then
-  m4_pattern_allow([LT_MODULE_PATH_VAR])dnl
-  AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"],
-    [Define to the name of the environment variable that determines the run-time module search path.])
-fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:604: -1- AU_DEFUN([AC_LTDL_SHLIBPATH], [m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:604: -1- AC_DEFUN([AC_LTDL_SHLIBPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBPATH' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:611: -1- AC_DEFUN([LT_SYS_DLSEARCH_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
-AC_CACHE_CHECK([for the default library search path],
-  [lt_cv_sys_dlsearch_path],
-  [lt_cv_sys_dlsearch_path=$sys_lib_dlsearch_path_spec])
-if test -n "$lt_cv_sys_dlsearch_path"; then
-  sys_dlsearch_path=
-  for dir in $lt_cv_sys_dlsearch_path; do
-    if test -z "$sys_dlsearch_path"; then
-      sys_dlsearch_path=$dir
-    else
-      sys_dlsearch_path=$sys_dlsearch_path$PATH_SEPARATOR$dir
-    fi
-  done
-  m4_pattern_allow([LT_DLSEARCH_PATH])dnl
-  AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"],
-    [Define to the system default library search path.])
-fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:632: -1- AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:632: -1- AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SYSSEARCHPATH' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:658: -1- AC_DEFUN([LT_LIB_DLLOAD], [m4_pattern_allow([^LT_DLLOADERS$])
-LT_DLLOADERS=
-AC_SUBST([LT_DLLOADERS])
-
-AC_LANG_PUSH([C])
-lt_dlload_save_LIBS=$LIBS
-
-LIBADD_DLOPEN=
-AC_SEARCH_LIBS([dlopen], [dl],
-	[AC_DEFINE([HAVE_LIBDL], [1],
-		   [Define if you have the libdl library or equivalent.])
-	if test "$ac_cv_search_dlopen" != "none required"; then
-	  LIBADD_DLOPEN=-ldl
-	fi
-	libltdl_cv_lib_dl_dlopen=yes
-	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
-    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H
-#  include <dlfcn.h>
-#endif
-    ]], [[dlopen(0, 0);]])],
-	    [AC_DEFINE([HAVE_LIBDL], [1],
-		       [Define if you have the libdl library or equivalent.])
-	    libltdl_cv_func_dlopen=yes
-	    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
-	[AC_CHECK_LIB([svld], [dlopen],
-		[AC_DEFINE([HAVE_LIBDL], [1],
-			 [Define if you have the libdl library or equivalent.])
-	        LIBADD_DLOPEN=-lsvld libltdl_cv_func_dlopen=yes
-		LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])])
-if test yes = "$libltdl_cv_func_dlopen" || test yes = "$libltdl_cv_lib_dl_dlopen"
-then
-  lt_save_LIBS=$LIBS
-  LIBS="$LIBS $LIBADD_DLOPEN"
-  AC_CHECK_FUNCS([dlerror])
-  LIBS=$lt_save_LIBS
-fi
-AC_SUBST([LIBADD_DLOPEN])
-
-LIBADD_SHL_LOAD=
-AC_CHECK_FUNC([shl_load],
-	[AC_DEFINE([HAVE_SHL_LOAD], [1],
-		   [Define if you have the shl_load function.])
-	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"],
-    [AC_CHECK_LIB([dld], [shl_load],
-	    [AC_DEFINE([HAVE_SHL_LOAD], [1],
-		       [Define if you have the shl_load function.])
-	    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
-	    LIBADD_SHL_LOAD=-ldld])])
-AC_SUBST([LIBADD_SHL_LOAD])
-
-case $host_os in
-darwin[[1567]].*)
-# We only want this for pre-Mac OS X 10.4.
-  AC_CHECK_FUNC([_dyld_func_lookup],
-	[AC_DEFINE([HAVE_DYLD], [1],
-		   [Define if you have the _dyld_func_lookup function.])
-	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"])
-  ;;
-beos*)
-  LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
-  ;;
-cygwin* | mingw* | windows* | pw32*)
-  AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
-  LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
-  ;;
-esac
-
-AC_CHECK_LIB([dld], [dld_link],
-	[AC_DEFINE([HAVE_DLD], [1],
-		   [Define if you have the GNU dld library.])
-		LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"])
-AC_SUBST([LIBADD_DLD_LINK])
-
-m4_pattern_allow([^LT_DLPREOPEN$])
-LT_DLPREOPEN=
-if test -n "$LT_DLLOADERS"
-then
-  for lt_loader in $LT_DLLOADERS; do
-    LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader "
-  done
-  AC_DEFINE([HAVE_LIBDLLOADER], [1],
-            [Define if libdlloader will be built on this platform])
-fi
-AC_SUBST([LT_DLPREOPEN])
-
-dnl This isn't used anymore, but set it for backwards compatibility
-LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
-AC_SUBST([LIBADD_DL])
-
-LIBS=$lt_dlload_save_LIBS
-AC_LANG_POP
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:753: -1- AU_DEFUN([AC_LTDL_DLLIB], [m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:753: -1- AC_DEFUN([AC_LTDL_DLLIB], [m4_warn([obsolete], [The macro 'AC_LTDL_DLLIB' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:761: -1- AC_DEFUN([LT_SYS_SYMBOL_USCORE], [m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-AC_CACHE_CHECK([for _ prefix in compiled symbols],
-  [lt_cv_sys_symbol_underscore],
-  [lt_cv_sys_symbol_underscore=no
-  cat > conftest.$ac_ext <<_LT_EOF
-void nm_test_func(){}
-int main(void){nm_test_func;return 0;}
-_LT_EOF
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    ac_nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
-      # See whether the symbols have a leading underscore.
-      if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
-        lt_cv_sys_symbol_underscore=yes
-      else
-        if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
-	  :
-        else
-	  echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD
-        fi
-      fi
-    else
-      echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.c >&AS_MESSAGE_LOG_FD
-  fi
-  rm -rf conftest*
-  ])
-  sys_symbol_underscore=$lt_cv_sys_symbol_underscore
-  AC_SUBST([sys_symbol_underscore])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:798: -1- AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:798: -1- AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_SYMBOL_USCORE' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:805: -1- AC_DEFUN([LT_FUNC_DLSYM_USCORE], [AC_REQUIRE([_LT_COMPILER_PIC])dnl	for lt_prog_compiler_wl
-AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl	for lt_cv_sys_symbol_underscore
-AC_REQUIRE([LT_SYS_MODULE_EXT])dnl	for libltdl_cv_shlibext
-if test yes = "$lt_cv_sys_symbol_underscore"; then
-  if test yes = "$libltdl_cv_func_dlopen" || test yes = "$libltdl_cv_lib_dl_dlopen"; then
-    AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
-      [libltdl_cv_need_uscore],
-      [libltdl_cv_need_uscore=unknown
-      dlsym_uscore_save_LIBS=$LIBS
-      LIBS="$LIBS $LIBADD_DLOPEN"
-      libname=conftmod # stay within 8.3 filename limits!
-      cat >$libname.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-int fnord () { return 42; }]
-_LT_EOF
-
-      # ltfn_module_cmds module_cmds
-      # Execute tilde-delimited MODULE_CMDS with environment primed for
-      # $module_cmds or $archive_cmds type content.
-      ltfn_module_cmds ()
-      {( # subshell avoids polluting parent global environment
-          module_cmds_save_ifs=$IFS; IFS='~'
-          for cmd in @S|@1; do
-            IFS=$module_cmds_save_ifs
-            libobjs=$libname.$ac_objext; lib=$libname$libltdl_cv_shlibext
-            rpath=/not-exists; soname=$libname$libltdl_cv_shlibext; output_objdir=.
-            major=; versuffix=; verstring=; deplibs=
-            ECHO=echo; wl=$lt_prog_compiler_wl; allow_undefined_flag=
-            eval $cmd
-          done
-          IFS=$module_cmds_save_ifs
-      )}
-
-      # Compile a loadable module using libtool macro expansion results.
-      $CC $pic_flag -c $libname.$ac_ext
-      ltfn_module_cmds "${module_cmds:-$archive_cmds}"
-
-      # Try to fetch fnord with dlsym().
-      libltdl_dlunknown=0; libltdl_dlnouscore=1; libltdl_dluscore=2
-      cat >conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-#include <stdio.h>
-#ifndef RTLD_GLOBAL
-#  ifdef DL_GLOBAL
-#    define RTLD_GLOBAL DL_GLOBAL
-#  else
-#    define RTLD_GLOBAL 0
-#  endif
-#endif
-#ifndef RTLD_NOW
-#  ifdef DL_NOW
-#    define RTLD_NOW DL_NOW
-#  else
-#    define RTLD_NOW 0
-#  endif
-#endif
-int main (void) {
-  void *handle = dlopen ("`pwd`/$libname$libltdl_cv_shlibext", RTLD_GLOBAL|RTLD_NOW);
-  int status = $libltdl_dlunknown;
-  if (handle) {
-    if (dlsym (handle, "fnord"))
-      status = $libltdl_dlnouscore;
-    else {
-      if (dlsym (handle, "_fnord"))
-        status = $libltdl_dluscore;
-      else
-	puts (dlerror ());
-    }
-    dlclose (handle);
-  } else
-    puts (dlerror ());
-  return status;
-}]
-_LT_EOF
-      if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
-        (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-        libltdl_status=$?
-        case x$libltdl_status in
-          x$libltdl_dlnouscore) libltdl_cv_need_uscore=no ;;
-	  x$libltdl_dluscore) libltdl_cv_need_uscore=yes ;;
-	  x*) libltdl_cv_need_uscore=unknown ;;
-        esac
-      fi
-      rm -rf conftest* $libname*
-      LIBS=$dlsym_uscore_save_LIBS
-    ])
-  fi
-fi
-
-if test yes = "$libltdl_cv_need_uscore"; then
-  AC_DEFINE([NEED_USCORE], [1],
-    [Define if dlsym() requires a leading underscore in symbol names.])
-fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:912: -1- AU_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:912: -1- AC_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_DLSYM_USCORE' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:14: -1- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:113: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'dlopen' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:113: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN' is obsolete.
-You should run autoupdate.])dnl
-_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'dlopen' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:148: -1- AU_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'win32-dll' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:148: -1- AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_WIN32_DLL' is obsolete.
-You should run autoupdate.])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'win32-dll' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:197: -1- AC_DEFUN([AC_ENABLE_SHARED], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:201: -1- AC_DEFUN([AC_DISABLE_SHARED], [_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:205: -1- AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:205: -1- AC_DEFUN([AM_ENABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_ENABLE_SHARED' is obsolete.
-You should run autoupdate.])dnl
-AC_ENABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:206: -1- AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:206: -1- AC_DEFUN([AM_DISABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_DISABLE_SHARED' is obsolete.
-You should run autoupdate.])dnl
-AC_DISABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:251: -1- AC_DEFUN([AC_ENABLE_STATIC], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:255: -1- AC_DEFUN([AC_DISABLE_STATIC], [_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:259: -1- AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:259: -1- AC_DEFUN([AM_ENABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_ENABLE_STATIC' is obsolete.
-You should run autoupdate.])dnl
-AC_ENABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:260: -1- AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:260: -1- AC_DEFUN([AM_DISABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_DISABLE_STATIC' is obsolete.
-You should run autoupdate.])dnl
-AC_DISABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:305: -1- AU_DEFUN([AC_ENABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'fast-install' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:305: -1- AC_DEFUN([AC_ENABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_ENABLE_FAST_INSTALL' is obsolete.
-You should run autoupdate.])dnl
-_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'fast-install' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:312: -1- AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'disable-fast-install' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:312: -1- AC_DEFUN([AC_DISABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_DISABLE_FAST_INSTALL' is obsolete.
-You should run autoupdate.])dnl
-_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'disable-fast-install' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:441: -1- AU_DEFUN([AC_LIBTOOL_PICMODE], [_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'pic-only' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltoptions.m4:441: -1- AC_DEFUN([AC_LIBTOOL_PICMODE], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_PICMODE' is obsolete.
-You should run autoupdate.])dnl
-_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'pic-only' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltsugar.m4:14: -1- AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltversion.m4:19: -1- AC_DEFUN([LTVERSION_VERSION], [macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:37: -1- AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:41: -1- AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:42: -1- AC_DEFUN([_LT_AC_SHELL_INIT])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:43: -1- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:45: -1- AC_DEFUN([_LT_AC_TAGVAR])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:46: -1- AC_DEFUN([AC_LTDL_ENABLE_INSTALL])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:47: -1- AC_DEFUN([AC_LTDL_PREOPEN])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:48: -1- AC_DEFUN([_LT_AC_SYS_COMPILER])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:49: -1- AC_DEFUN([_LT_AC_LOCK])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:50: -1- AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:51: -1- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:52: -1- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:53: -1- AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:54: -1- AC_DEFUN([AC_LIBTOOL_OBJDIR])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:55: -1- AC_DEFUN([AC_LTDL_OBJDIR])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:56: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:57: -1- AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:58: -1- AC_DEFUN([AC_PATH_MAGIC])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:59: -1- AC_DEFUN([AC_PROG_LD_GNU])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:60: -1- AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:61: -1- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:62: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:63: -1- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:64: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:65: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:66: -1- AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:67: -1- AC_DEFUN([LT_AC_PROG_EGREP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:68: -1- AC_DEFUN([LT_AC_PROG_SED])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:72: -1- AC_DEFUN([_AC_PROG_LIBTOOL])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:73: -1- AC_DEFUN([AC_LIBTOOL_SETUP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:74: -1- AC_DEFUN([_LT_AC_CHECK_DLFCN])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:75: -1- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:76: -1- AC_DEFUN([_LT_AC_TAGCONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:78: -1- AC_DEFUN([_LT_AC_LANG_CXX])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:79: -1- AC_DEFUN([_LT_AC_LANG_F77])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:80: -1- AC_DEFUN([_LT_AC_LANG_GCJ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:81: -1- AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:82: -1- AC_DEFUN([_LT_AC_LANG_C_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:83: -1- AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:84: -1- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:85: -1- AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:86: -1- AC_DEFUN([_LT_AC_LANG_F77_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:87: -1- AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:88: -1- AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:89: -1- AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:90: -1- AC_DEFUN([_LT_AC_LANG_RC_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:91: -1- AC_DEFUN([AC_LIBTOOL_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:92: -1- AC_DEFUN([_LT_AC_FILE_LTDLL_C])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:94: -1- AC_DEFUN([_LT_AC_PROG_CXXCPP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:97: -1- AC_DEFUN([_LT_PROG_F77])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:98: -1- AC_DEFUN([_LT_PROG_FC])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/lt~obsolete.m4:99: -1- AC_DEFUN([_LT_PROG_CXX])
+m4trace:aclocal.m4:724: -1- AC_SUBST([am__quote])
+m4trace:aclocal.m4:724: -1- AC_SUBST_TRACE([am__quote])
+m4trace:aclocal.m4:724: -1- m4_pattern_allow([^am__quote$])
+m4trace:aclocal.m4:10597: -1- m4_include([acinclude.m4])
 m4trace:acinclude.m4:4: -1- m4_include([conftools/ax-require-defined.m4])
-m4trace:conftools/ax-require-defined.m4:35: -1- AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])
 m4trace:acinclude.m4:5: -1- m4_include([conftools/ax-check-compile-flag.m4])
-m4trace:conftools/ax-check-compile-flag.m4:61: -1- AC_DEFUN([AX_CHECK_COMPILE_FLAG], [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 -Werror $1"
-  AC_COMPILE_IFELSE([m4_default([$5],
-                                [AC_LANG_SOURCE(
-                                   [[int main(void) { return 0; }]])])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])
 m4trace:acinclude.m4:6: -1- m4_include([conftools/ax-check-link-flag.m4])
-m4trace:conftools/ax-check-link-flag.m4:39: -1- AC_DEFUN([AX_CHECK_LINK_FLAG], [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
-AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS $4 $1"
-  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  LDFLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])
 m4trace:acinclude.m4:7: -1- m4_include([conftools/ax-append-flag.m4])
-m4trace:conftools/ax-append-flag.m4:33: -1- AC_DEFUN([AX_APPEND_FLAG], [dnl
-AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
-AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
-AS_VAR_SET_IF(FLAGS,[
-  AS_CASE([" AS_VAR_GET(FLAGS) "],
-    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
-    [
-     AS_VAR_APPEND(FLAGS,[" $1"])
-     AC_RUN_LOG([: FLAGS="$FLAGS"])
-    ])
-  ],
-  [
-  AS_VAR_SET(FLAGS,[$1])
-  AC_RUN_LOG([: FLAGS="$FLAGS"])
-  ])
-AS_VAR_POPDEF([FLAGS])dnl
-])
 m4trace:acinclude.m4:8: -1- m4_include([conftools/ax-append-compile-flags.m4])
-m4trace:conftools/ax-append-compile-flags.m4:40: -1- AC_DEFUN([AX_APPEND_COMPILE_FLAGS], [AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-for flag in $1; do
-  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4])
-done
-])
 m4trace:acinclude.m4:9: -1- m4_include([conftools/ax-append-link-flags.m4])
-m4trace:conftools/ax-append-link-flags.m4:38: -1- AC_DEFUN([AX_APPEND_LINK_FLAGS], [AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-for flag in $1; do
-  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4])
-done
-])
 m4trace:acinclude.m4:10: -1- m4_include([conftools/expatcfg-compiler-supports-visibility.m4])
-m4trace:conftools/expatcfg-compiler-supports-visibility.m4:25: -1- AC_DEFUN([EXPATCFG_COMPILER_SUPPORTS_VISIBILITY], [AC_CACHE_CHECK([whether compiler supports visibility],
-     [expatcfg_cv_compiler_supports_visibility],
-     [AS_VAR_SET([expatcfg_cv_compiler_supports_visibility],[no])
-      AS_VAR_COPY([OLDFLAGS],[CFLAGS])
-      AS_VAR_APPEND([CFLAGS],[" -fvisibility=hidden -Wall -Werror -Wno-unknown-warning-option"])
-      AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-          void __attribute__((visibility("default"))) foo(void);
-          void foo(void) {}
-        ]])],
-        [AS_VAR_SET([expatcfg_cv_compiler_supports_visibility],[yes])])
-      AS_VAR_COPY([CFLAGS],[OLDFLAGS])])
-   AS_IF([test "$expatcfg_cv_compiler_supports_visibility" = yes],[$1],[$2])])
+m4trace:configure.ac:63: -1- AC_INIT([expat], [2.5.0], [expat-bugs@libexpat.org])
 m4trace:configure.ac:63: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:63: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:63: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section 'AC_LIBOBJ vs LIBOBJS'])
@@ -2700,514 +17,861 @@ m4trace:configure.ac:63: -1- m4_pattern_allow([^AS_FLAGS$])
 m4trace:configure.ac:63: -1- m4_pattern_forbid([^_?m4_])
 m4trace:configure.ac:63: -1- m4_pattern_forbid([^dnl$])
 m4trace:configure.ac:63: -1- m4_pattern_forbid([^_?AS_])
+m4trace:configure.ac:63: -1- AC_SUBST([SHELL])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([SHELL])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^SHELL$])
+m4trace:configure.ac:63: -1- AC_SUBST([PATH_SEPARATOR])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PATH_SEPARATOR$])
+m4trace:configure.ac:63: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([PACKAGE_NAME])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:63: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:63: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:63: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([PACKAGE_STRING])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:63: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:63: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL],       ['AC_PACKAGE_URL'])])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([PACKAGE_URL])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_URL$])
+m4trace:configure.ac:63: -1- AC_SUBST([exec_prefix], [NONE])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([exec_prefix])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^exec_prefix$])
+m4trace:configure.ac:63: -1- AC_SUBST([prefix], [NONE])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([prefix])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^prefix$])
+m4trace:configure.ac:63: -1- AC_SUBST([program_transform_name], [s,x,x,])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([program_transform_name])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^program_transform_name$])
+m4trace:configure.ac:63: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([bindir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^bindir$])
+m4trace:configure.ac:63: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([sbindir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^sbindir$])
+m4trace:configure.ac:63: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([libexecdir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^libexecdir$])
+m4trace:configure.ac:63: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([datarootdir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.ac:63: -1- AC_SUBST([datadir], ['${datarootdir}'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([datadir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^datadir$])
+m4trace:configure.ac:63: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([sysconfdir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^sysconfdir$])
+m4trace:configure.ac:63: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([sharedstatedir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^sharedstatedir$])
+m4trace:configure.ac:63: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([localstatedir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^localstatedir$])
+m4trace:configure.ac:63: -1- AC_SUBST([runstatedir], ['${localstatedir}/run'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([runstatedir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^runstatedir$])
+m4trace:configure.ac:63: -1- AC_SUBST([includedir], ['${prefix}/include'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([includedir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^includedir$])
+m4trace:configure.ac:63: -1- AC_SUBST([oldincludedir], ['/usr/include'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([oldincludedir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^oldincludedir$])
+m4trace:configure.ac:63: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
+				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
+				     ['${datarootdir}/doc/${PACKAGE}'])])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([docdir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.ac:63: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([infodir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^infodir$])
+m4trace:configure.ac:63: -1- AC_SUBST([htmldir], ['${docdir}'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([htmldir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^htmldir$])
+m4trace:configure.ac:63: -1- AC_SUBST([dvidir], ['${docdir}'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([dvidir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^dvidir$])
+m4trace:configure.ac:63: -1- AC_SUBST([pdfdir], ['${docdir}'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([pdfdir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^pdfdir$])
+m4trace:configure.ac:63: -1- AC_SUBST([psdir], ['${docdir}'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([psdir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^psdir$])
+m4trace:configure.ac:63: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([libdir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^libdir$])
+m4trace:configure.ac:63: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([localedir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.ac:63: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([mandir])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^mandir$])
+m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:63: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
+@%:@undef PACKAGE_NAME])
+m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:63: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
+@%:@undef PACKAGE_TARNAME])
+m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:63: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
+@%:@undef PACKAGE_VERSION])
+m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:63: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
+@%:@undef PACKAGE_STRING])
+m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:63: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
+@%:@undef PACKAGE_BUGREPORT])
+m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^PACKAGE_URL$])
+m4trace:configure.ac:63: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */
+@%:@undef PACKAGE_URL])
+m4trace:configure.ac:63: -1- AC_SUBST([DEFS])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([DEFS])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.ac:63: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.ac:63: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.ac:63: -1- m4_pattern_allow([^ECHO_T$])
+m4trace:configure.ac:63: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([LIBS])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:63: -1- AC_SUBST([build_alias])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([build_alias])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^build_alias$])
+m4trace:configure.ac:63: -1- AC_SUBST([host_alias])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([host_alias])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^host_alias$])
+m4trace:configure.ac:63: -1- AC_SUBST([target_alias])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([target_alias])
 m4trace:configure.ac:63: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.ac:63: -1- AC_SUBST([ECHO_C])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([ECHO_C])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.ac:63: -1- AC_SUBST([ECHO_N])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([ECHO_N])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.ac:63: -1- AC_SUBST([ECHO_T])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([ECHO_T])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^ECHO_T$])
+m4trace:configure.ac:67: -1- AC_CONFIG_AUX_DIR([conftools])
 m4trace:configure.ac:68: -1- AC_CONFIG_MACRO_DIR([m4])
 m4trace:configure.ac:68: -1- AC_CONFIG_MACRO_DIR_TRACE([m4])
+m4trace:configure.ac:69: -1- AC_CANONICAL_HOST
+m4trace:configure.ac:69: -1- AC_CANONICAL_BUILD
+m4trace:configure.ac:69: -1- AC_REQUIRE_AUX_FILE([config.sub])
+m4trace:configure.ac:69: -1- AC_REQUIRE_AUX_FILE([config.guess])
+m4trace:configure.ac:69: -1- AC_SUBST([build], [$ac_cv_build])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([build])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:69: -1- AC_SUBST([build_cpu], [$[1]])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([build_cpu])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:69: -1- AC_SUBST([build_vendor], [$[2]])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([build_vendor])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:69: -1- AC_SUBST([build_os])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([build_os])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:69: -1- AC_SUBST([host], [$ac_cv_host])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([host])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:69: -1- AC_SUBST([host_cpu], [$[1]])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([host_cpu])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:69: -1- AC_SUBST([host_vendor], [$[2]])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([host_vendor])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:69: -1- AC_SUBST([host_os])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([host_os])
 m4trace:configure.ac:69: -1- m4_pattern_allow([^host_os$])
 m4trace:configure.ac:70: -1- AM_INIT_AUTOMAKE
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:70: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
 m4trace:configure.ac:70: -1- AM_AUTOMAKE_VERSION([1.18.1])
-m4trace:configure.ac:70: -1- _AM_AUTOCONF_VERSION([2.72])
+m4trace:configure.ac:70: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:70: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:70: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:70: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([INSTALL_DATA])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:70: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([am__isrc])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^am__isrc$])
 m4trace:configure.ac:70: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:70: -1- AC_SUBST([CYGPATH_W])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([CYGPATH_W])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:70: -1- _AM_SET_OPTIONS([])
+m4trace:configure.ac:70: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([PACKAGE])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:70: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([VERSION])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:70: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])
-m4trace:configure.ac:70: -2- _AM_MANGLE_OPTION([no-define])
+m4trace:configure.ac:70: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:70: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
+@%:@undef PACKAGE])
+m4trace:configure.ac:70: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:70: -1- AM_SANITY_CHECK
-m4trace:configure.ac:70: -1- _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
-m4trace:configure.ac:70: -1- _AM_SLEEP_FRACTIONAL_SECONDS
-m4trace:configure.ac:70: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-m4trace:configure.ac:70: -1- AM_MISSING_HAS_RUN
-m4trace:configure.ac:70: -1- AM_AUX_DIR_EXPAND
+m4trace:configure.ac:70: -1- AH_OUTPUT([VERSION], [/* Version number of package */
+@%:@undef VERSION])
+m4trace:configure.ac:70: -1- AC_REQUIRE_AUX_FILE([missing])
+m4trace:configure.ac:70: -1- AC_SUBST([ACLOCAL])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([ACLOCAL])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:70: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
+m4trace:configure.ac:70: -1- AC_SUBST([AUTOCONF])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([AUTOCONF])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:70: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+m4trace:configure.ac:70: -1- AC_SUBST([AUTOMAKE])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([AUTOMAKE])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:70: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
+m4trace:configure.ac:70: -1- AC_SUBST([AUTOHEADER])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([AUTOHEADER])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:70: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
+m4trace:configure.ac:70: -1- AC_SUBST([MAKEINFO])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([MAKEINFO])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:70: -1- AM_PROG_INSTALL_SH
+m4trace:configure.ac:70: -1- AC_SUBST([install_sh])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([install_sh])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:70: -1- AM_PROG_INSTALL_STRIP
+m4trace:configure.ac:70: -1- AC_SUBST([STRIP])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([STRIP])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:70: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.ac:70: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:70: -1- AC_SUBST([MKDIR_P])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([MKDIR_P])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.ac:70: -1- AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([mkdir_p])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:70: -1- AC_SUBST([AWK])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([AWK])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:70: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([SET_MAKE])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:70: -1- AM_SET_LEADING_DOT
+m4trace:configure.ac:70: -1- AC_SUBST([am__leading_dot])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([am__leading_dot])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:70: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-    [_AM_IF_OPTION([tar-v7], [_AM_PROG_TAR([v7])],
-      [_AM_PROG_TAR([ustar])])])])
-m4trace:configure.ac:70: -2- _AM_MANGLE_OPTION([tar-ustar])
-m4trace:configure.ac:70: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_IF_OPTION([tar-v7], [_AM_PROG_TAR([v7])],
-      [_AM_PROG_TAR([ustar])])])
-m4trace:configure.ac:70: -2- _AM_MANGLE_OPTION([tar-pax])
-m4trace:configure.ac:70: -1- _AM_IF_OPTION([tar-v7], [_AM_PROG_TAR([v7])], [_AM_PROG_TAR([ustar])])
-m4trace:configure.ac:70: -2- _AM_MANGLE_OPTION([tar-v7])
-m4trace:configure.ac:70: -1- _AM_PROG_TAR([ustar])
+m4trace:configure.ac:70: -1- AC_SUBST([AMTAR], ['$${TAR-tar}'])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([AMTAR])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:70: -1- AM_RUN_LOG([$_am_tar --version])
-m4trace:configure.ac:70: -1- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-m4trace:configure.ac:70: -1- AM_RUN_LOG([$am__untar <conftest.tar])
-m4trace:configure.ac:70: -1- AM_RUN_LOG([cat conftest.dir/file])
+m4trace:configure.ac:70: -1- AC_SUBST([am__tar])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([am__tar])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:70: -1- AC_SUBST([am__untar])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([am__untar])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:70: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-m4trace:configure.ac:70: -2- _AM_MANGLE_OPTION([no-dependencies])
+m4trace:configure.ac:70: -1- AC_SUBST([CTAGS])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([CTAGS])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^CTAGS$])
+m4trace:configure.ac:70: -1- AC_SUBST([ETAGS])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([ETAGS])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^ETAGS$])
+m4trace:configure.ac:70: -1- AC_SUBST([CSCOPE])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([CSCOPE])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^CSCOPE$])
-m4trace:configure.ac:70: -1- _AM_SILENT_RULES
+m4trace:configure.ac:70: -1- AC_SUBST([AM_V])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([AM_V])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AM_V$])
-m4trace:configure.ac:70: -1- AM_SUBST_NOTMAKE([AM_V])
 m4trace:configure.ac:70: -1- _AM_SUBST_NOTMAKE([AM_V])
+m4trace:configure.ac:70: -1- AC_SUBST([AM_DEFAULT_V])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([AM_DEFAULT_V])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AM_DEFAULT_V$])
-m4trace:configure.ac:70: -1- AM_SUBST_NOTMAKE([AM_DEFAULT_V])
 m4trace:configure.ac:70: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
+m4trace:configure.ac:70: -1- AC_SUBST([AM_DEFAULT_VERBOSITY])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([AM_DEFAULT_VERBOSITY])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
+m4trace:configure.ac:70: -1- AC_SUBST([AM_BACKSLASH])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([AM_BACKSLASH])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^AM_BACKSLASH$])
 m4trace:configure.ac:70: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
-m4trace:configure.ac:70: -1- _AM_PROG_RM_F
+m4trace:configure.ac:70: -1- AC_SUBST([am__rm_f_notfound])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([am__rm_f_notfound])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^am__rm_f_notfound$])
-m4trace:configure.ac:70: -1- _AM_PROG_XARGS_N
+m4trace:configure.ac:70: -1- AC_SUBST([am__xargs_n])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([am__xargs_n])
 m4trace:configure.ac:70: -1- m4_pattern_allow([^am__xargs_n$])
+m4trace:configure.ac:88: -1- AC_CONFIG_HEADERS([expat_config.h])
+m4trace:configure.ac:89: -1- AH_OUTPUT([00001], [#ifndef EXPAT_CONFIG_H
+#define EXPAT_CONFIG_H 1])
+m4trace:configure.ac:91: -1- AH_OUTPUT([zzzz2], [#endif // ndef EXPAT_CONFIG_H])
 m4trace:configure.ac:93: -1- AM_PROG_AR
+m4trace:configure.ac:93: -1- AC_REQUIRE_AUX_FILE([ar-lib])
+m4trace:configure.ac:93: -1- AC_SUBST([AR])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([AR])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:93: -1- AC_SUBST([ac_ct_AR])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([ac_ct_AR])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^ac_ct_AR$])
+m4trace:configure.ac:93: -1- AC_SUBST([CC])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:93: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([CFLAGS])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:93: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([LDFLAGS])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:93: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([LIBS])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:93: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([CPPFLAGS])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:93: -1- AC_SUBST([CC])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:93: -1- AC_SUBST([CC])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:93: -1- AC_SUBST([CC])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:93: -1- AC_SUBST([CC])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:93: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([ac_ct_CC])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:93: -1- AC_SUBST([CC])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:93: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([EXEEXT])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:93: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([OBJEXT])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:93: -1- _AM_PROG_CC_C_O
-m4trace:configure.ac:93: -1- AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext])
-m4trace:configure.ac:93: -1- _AM_DEPENDENCIES([CC])
-m4trace:configure.ac:93: -1- AM_SET_DEPDIR
+m4trace:configure.ac:93: -1- AC_REQUIRE_AUX_FILE([compile])
+m4trace:configure.ac:93: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([DEPDIR])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:93: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:93: -1- AM_MAKE_INCLUDE
-m4trace:configure.ac:93: -1- AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+m4trace:configure.ac:93: -1- AC_SUBST([am__include])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([am__include])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:93: -1- AM_DEP_TRACK
 m4trace:configure.ac:93: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:93: -1- AC_SUBST([AMDEP_TRUE])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([AMDEP_TRUE])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:93: -1- AC_SUBST([AMDEP_FALSE])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([AMDEP_FALSE])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^AMDEP_FALSE$])
 m4trace:configure.ac:93: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
 m4trace:configure.ac:93: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:93: -1- AC_SUBST([AMDEPBACKSLASH])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
 m4trace:configure.ac:93: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:93: -1- AC_SUBST([am__nodep])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([am__nodep])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^am__nodep$])
 m4trace:configure.ac:93: -1- _AM_SUBST_NOTMAKE([am__nodep])
+m4trace:configure.ac:93: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([CCDEPMODE])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^CCDEPMODE$])
 m4trace:configure.ac:93: -1- AM_CONDITIONAL([am__fastdepCC], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:93: -1- AC_SUBST([am__fastdepCC_TRUE])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:93: -1- AC_SUBST([am__fastdepCC_FALSE])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
 m4trace:configure.ac:93: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
 m4trace:configure.ac:93: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:93: -1- AC_SUBST([AR])
+m4trace:configure.ac:93: -1- AC_SUBST_TRACE([AR])
 m4trace:configure.ac:93: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:95: -1- AC_SUBST([LN_S], [$as_ln_s])
+m4trace:configure.ac:95: -1- AC_SUBST_TRACE([LN_S])
 m4trace:configure.ac:95: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:96: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.ac:96: -1- AC_SUBST_TRACE([SET_MAKE])
 m4trace:configure.ac:96: -1- m4_pattern_allow([^SET_MAKE$])
 m4trace:configure.ac:99: -1- LT_INIT([win32-dll])
 m4trace:configure.ac:99: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-m4trace:configure.ac:99: -1- LTOPTIONS_VERSION
-m4trace:configure.ac:99: -1- LTSUGAR_VERSION
-m4trace:configure.ac:99: -1- LTVERSION_VERSION
-m4trace:configure.ac:99: -1- LTOBSOLETE_VERSION
-m4trace:configure.ac:99: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:99: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:99: -1- AC_SUBST([AS])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([AS])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^AS$])
+m4trace:configure.ac:99: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([DLLTOOL])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:99: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([OBJDUMP])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:99: -1- AC_SUBST([LIBTOOL])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LIBTOOL])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^LIBTOOL$])
-m4trace:configure.ac:99: -1- _LT_PREPARE_SED_QUOTE_VARS
-m4trace:configure.ac:99: -1- _LT_PROG_ECHO_BACKSLASH
-m4trace:configure.ac:99: -1- LT_PATH_LD
+m4trace:configure.ac:99: -1- AC_SUBST([SED])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([SED])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:99: -1- AC_PROG_EGREP
+m4trace:configure.ac:99: -1- AC_SUBST([GREP])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([GREP])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:99: -1- AC_SUBST([EGREP])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([EGREP])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:99: -1- AC_SUBST([FGREP])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([FGREP])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^FGREP$])
+m4trace:configure.ac:99: -1- AC_SUBST([GREP])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([GREP])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:99: -1- AC_SUBST([LD])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LD])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:99: -1- LT_PATH_NM
+m4trace:configure.ac:99: -1- AC_SUBST([DUMPBIN])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([DUMPBIN])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:99: -1- AC_SUBST([ac_ct_DUMPBIN])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
+m4trace:configure.ac:99: -1- AC_SUBST([DUMPBIN])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([DUMPBIN])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:99: -1- AC_SUBST([NM])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([NM])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^NM$])
-m4trace:configure.ac:99: -1- LT_CMD_MAX_LEN
+m4trace:configure.ac:99: -1- AC_SUBST([FILECMD])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([FILECMD])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^FILECMD$])
+m4trace:configure.ac:99: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([OBJDUMP])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:99: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([OBJDUMP])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:99: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([DLLTOOL])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:99: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([DLLTOOL])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:99: -1- AC_SUBST([AR])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([AR])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:99: -1- AC_SUBST([ac_ct_AR])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([ac_ct_AR])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^ac_ct_AR$])
+m4trace:configure.ac:99: -1- AC_SUBST([STRIP])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([STRIP])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:99: -1- AC_SUBST([RANLIB])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([RANLIB])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:99: -1- _LT_WITH_SYSROOT
 m4trace:configure.ac:99: -1- m4_pattern_allow([LT_OBJDIR])
+m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^LT_OBJDIR$])
-m4trace:configure.ac:99: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:99: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
-m4trace:configure.ac:99: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
+m4trace:configure.ac:99: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory where libtool stores uninstalled libraries. */
+@%:@undef LT_OBJDIR])
 m4trace:configure.ac:99: -1- LT_SUPPORTED_TAG([CC])
-m4trace:configure.ac:99: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:99: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:99: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
-m4trace:configure.ac:99: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, )=" $_LT_TAGVAR(lt_prog_compiler_pic, )" ;;
-     esac], [_LT_TAGVAR(lt_prog_compiler_pic, )=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, )=no])
-m4trace:configure.ac:99: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
+m4trace:configure.ac:99: -1- AC_SUBST([MANIFEST_TOOL])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([MANIFEST_TOOL])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^MANIFEST_TOOL$])
-m4trace:configure.ac:99: -1- _LT_DLL_DEF_P([$export_symbols])
-m4trace:configure.ac:99: -1- _LT_DLL_DEF_P([$export_symbols])
-m4trace:configure.ac:99: -1- _LT_REQUIRED_DARWIN_CHECKS
+m4trace:configure.ac:99: -1- AC_SUBST([DSYMUTIL])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([DSYMUTIL])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^DSYMUTIL$])
+m4trace:configure.ac:99: -1- AC_SUBST([NMEDIT])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([NMEDIT])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^NMEDIT$])
+m4trace:configure.ac:99: -1- AC_SUBST([LIPO])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LIPO])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^LIPO$])
+m4trace:configure.ac:99: -1- AC_SUBST([OTOOL])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([OTOOL])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^OTOOL$])
+m4trace:configure.ac:99: -1- AC_SUBST([OTOOL64])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([OTOOL64])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^OTOOL64$])
-m4trace:configure.ac:99: -1- _LT_LINKER_OPTION([if $CC understands -b], [lt_cv_prog_compiler__b], [-b], [_LT_TAGVAR(archive_cmds, )='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, )='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])
+m4trace:configure.ac:99: -1- AC_SUBST([LT_SYS_LIBRARY_PATH])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LT_SYS_LIBRARY_PATH])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^LT_SYS_LIBRARY_PATH$])
-m4trace:configure.ac:99: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, )=" $_LT_TAGVAR(lt_prog_compiler_pic, )" ;;
-     esac], [_LT_TAGVAR(lt_prog_compiler_pic, )=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, )=no])
-m4trace:configure.ac:99: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
-m4trace:configure.ac:99: -1- LT_SYS_DLOPEN_SELF
-m4trace:configure.ac:99: -1- AC_DEFUN([_AC_Header_stdio_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" stdio.h ]AS_TR_SH([stdio.h]) AS_TR_CPP([HAVE_stdio.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:99: -1- AC_DEFUN([_AC_Header_stdlib_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" stdlib.h ]AS_TR_SH([stdlib.h]) AS_TR_CPP([HAVE_stdlib.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:99: -1- AC_DEFUN([_AC_Header_string_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" string.h ]AS_TR_SH([string.h]) AS_TR_CPP([HAVE_string.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:99: -1- AC_DEFUN([_AC_Header_inttypes_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" inttypes.h ]AS_TR_SH([inttypes.h]) AS_TR_CPP([HAVE_inttypes.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:99: -1- AC_DEFUN([_AC_Header_stdint_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" stdint.h ]AS_TR_SH([stdint.h]) AS_TR_CPP([HAVE_stdint.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:99: -1- AC_DEFUN([_AC_Header_strings_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" strings.h ]AS_TR_SH([strings.h]) AS_TR_CPP([HAVE_strings.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:99: -1- AC_DEFUN([_AC_Header_sys_stat_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" sys/stat.h ]AS_TR_SH([sys/stat.h]) AS_TR_CPP([HAVE_sys/stat.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:99: -1- AC_DEFUN([_AC_Header_sys_types_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" sys/types.h ]AS_TR_SH([sys/types.h]) AS_TR_CPP([HAVE_sys/types.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:99: -1- AC_DEFUN([_AC_Header_unistd_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" unistd.h ]AS_TR_SH([unistd.h]) AS_TR_CPP([HAVE_unistd.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
+@%:@undef HAVE_DLFCN_H])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STDIO_H], [/* Define to 1 if you have the <stdio.h> header file. */
+@%:@undef HAVE_STDIO_H])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+@%:@undef HAVE_STDLIB_H])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+@%:@undef HAVE_STRING_H])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+@%:@undef HAVE_INTTYPES_H])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+@%:@undef HAVE_STDINT_H])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+@%:@undef HAVE_STRINGS_H])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
+@%:@undef HAVE_SYS_STAT_H])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+@%:@undef HAVE_SYS_TYPES_H])
+m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+@%:@undef HAVE_UNISTD_H])
+m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:99: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if all of the C89 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+@%:@undef STDC_HEADERS])
+m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
+m4trace:configure.ac:101: -1- AC_SUBST([LIBCURRENT])
+m4trace:configure.ac:101: -1- AC_SUBST_TRACE([LIBCURRENT])
 m4trace:configure.ac:101: -1- m4_pattern_allow([^LIBCURRENT$])
+m4trace:configure.ac:102: -1- AC_SUBST([LIBREVISION])
+m4trace:configure.ac:102: -1- AC_SUBST_TRACE([LIBREVISION])
 m4trace:configure.ac:102: -1- m4_pattern_allow([^LIBREVISION$])
+m4trace:configure.ac:103: -1- AC_SUBST([LIBAGE])
+m4trace:configure.ac:103: -1- AC_SUBST_TRACE([LIBAGE])
 m4trace:configure.ac:103: -1- m4_pattern_allow([^LIBAGE$])
 m4trace:configure.ac:106: -1- _m4_warn([obsolete], [The macro 'AC_PROG_CC_C99' is obsolete.
-You should run autoupdate.], [./lib/autoconf/c.m4:1662: AC_PROG_CC_C99 is expanded from...
+You should run autoupdate.], [./lib/autoconf/c.m4:1788: AC_PROG_CC_C99 is expanded from...
 configure.ac:106: the top level])
-m4trace:configure.ac:108: -1- AX_APPEND_COMPILE_FLAGS([-Wall -Wextra], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:108: -1- AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [AM_CFLAGS])], [], [], [])
-m4trace:configure.ac:108: -1- AX_APPEND_FLAG([$flag], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_APPEND_COMPILE_FLAGS([-fexceptions], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:108: -1- AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [AM_CFLAGS])], [], [], [])
-m4trace:configure.ac:108: -1- AX_APPEND_FLAG([$flag], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:108: -1- AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [AM_CFLAGS])], [], [], [])
-m4trace:configure.ac:108: -1- AX_APPEND_FLAG([$flag], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_APPEND_COMPILE_FLAGS([-pedantic -Wduplicated-cond -Wduplicated-branches -Wlogical-op], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:108: -1- AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [AM_CFLAGS])], [], [], [])
-m4trace:configure.ac:108: -1- AX_APPEND_FLAG([$flag], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_APPEND_COMPILE_FLAGS([-Wrestrict -Wnull-dereference -Wjump-misses-init -Wdouble-promotion], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:108: -1- AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [AM_CFLAGS])], [], [], [])
-m4trace:configure.ac:108: -1- AX_APPEND_FLAG([$flag], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_APPEND_COMPILE_FLAGS([-Wshadow -Wformat=2 -Wno-pedantic-ms-format -Wmisleading-indentation], [AM_CFLAGS])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-m4trace:configure.ac:108: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:108: -1- AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [AM_CFLAGS])], [], [], [])
-m4trace:configure.ac:108: -1- AX_APPEND_FLAG([$flag], [AM_CFLAGS])
+m4trace:configure.ac:120: -1- AC_SUBST([CXX])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([CXX])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:120: -1- AC_SUBST([CXXFLAGS])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([CXXFLAGS])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:120: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([LDFLAGS])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:120: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([LIBS])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:120: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([CPPFLAGS])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:120: -1- AC_SUBST([CXX])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([CXX])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:120: -1- AC_SUBST([ac_ct_CXX])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([ac_ct_CXX])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:120: -1- _AM_DEPENDENCIES([CXX])
+m4trace:configure.ac:120: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([CXXDEPMODE])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^CXXDEPMODE$])
 m4trace:configure.ac:120: -1- AM_CONDITIONAL([am__fastdepCXX], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:120: -1- AC_SUBST([am__fastdepCXX_TRUE])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:120: -1- AC_SUBST([am__fastdepCXX_FALSE])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
 m4trace:configure.ac:120: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
 m4trace:configure.ac:120: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:120: -1- LT_LANG([CXX])
 m4trace:configure.ac:120: -1- LT_SUPPORTED_TAG([CXX])
+m4trace:configure.ac:120: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([CXXCPP])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:120: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([CPPFLAGS])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:120: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([CXXCPP])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:120: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:120: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:120: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:120: -1- LT_PATH_LD
+m4trace:configure.ac:120: -1- AC_SUBST([LD])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([LD])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:120: -1- _LT_DLL_DEF_P([$export_symbols])
-m4trace:configure.ac:120: -1- _LT_DLL_DEF_P([$export_symbols])
-m4trace:configure.ac:120: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, CXX)=" $_LT_TAGVAR(lt_prog_compiler_pic, CXX)" ;;
-     esac], [_LT_TAGVAR(lt_prog_compiler_pic, CXX)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, CXX)=no])
-m4trace:configure.ac:120: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
+m4trace:configure.ac:120: -1- AC_SUBST([LT_SYS_LIBRARY_PATH])
+m4trace:configure.ac:120: -1- AC_SUBST_TRACE([LT_SYS_LIBRARY_PATH])
 m4trace:configure.ac:120: -1- m4_pattern_allow([^LT_SYS_LIBRARY_PATH$])
-m4trace:configure.ac:120: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, CXX)=" $_LT_TAGVAR(lt_prog_compiler_pic, CXX)" ;;
-     esac], [_LT_TAGVAR(lt_prog_compiler_pic, CXX)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, CXX)=no])
-m4trace:configure.ac:120: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
-m4trace:configure.ac:122: -1- AX_APPEND_COMPILE_FLAGS([-Wall -Wextra], [AM_CXXFLAGS])
-m4trace:configure.ac:122: -1- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-m4trace:configure.ac:122: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:122: -1- AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [AM_CXXFLAGS])], [], [], [])
-m4trace:configure.ac:122: -1- AX_APPEND_FLAG([$flag], [AM_CXXFLAGS])
-m4trace:configure.ac:122: -1- AX_APPEND_COMPILE_FLAGS([-fexceptions], [AM_CXXFLAGS])
-m4trace:configure.ac:122: -1- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-m4trace:configure.ac:122: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:122: -1- AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [AM_CXXFLAGS])], [], [], [])
-m4trace:configure.ac:122: -1- AX_APPEND_FLAG([$flag], [AM_CXXFLAGS])
-m4trace:configure.ac:122: -1- AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing], [AM_CXXFLAGS])
-m4trace:configure.ac:122: -1- AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
-m4trace:configure.ac:122: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:122: -1- AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [AM_CXXFLAGS])], [], [], [])
-m4trace:configure.ac:122: -1- AX_APPEND_FLAG([$flag], [AM_CXXFLAGS])
-m4trace:configure.ac:131: -1- AX_APPEND_LINK_FLAGS([-fno-strict-aliasing], [AM_LDFLAGS])
-m4trace:configure.ac:131: -1- AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-m4trace:configure.ac:131: -1- AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
-m4trace:configure.ac:131: -1- AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([AM_LDFLAGS], [LDFLAGS])])], [], [], [])
-m4trace:configure.ac:131: -1- AX_APPEND_FLAG([$flag], [m4_default([AM_LDFLAGS], [LDFLAGS])])
-m4trace:configure.ac:139: -1- EXPATCFG_COMPILER_SUPPORTS_VISIBILITY([
-  AX_APPEND_FLAG([-fvisibility=hidden],              [AM_CFLAGS])
-  AS_IF([test "${enable_shared}" = yes],
-        [AX_APPEND_FLAG([-DXML_ENABLE_VISIBILITY=1], [AM_CPPFLAGS])])])
-m4trace:configure.ac:139: -1- AX_APPEND_FLAG([-fvisibility=hidden], [AM_CFLAGS])
-m4trace:configure.ac:139: -1- AX_APPEND_FLAG([-DXML_ENABLE_VISIBILITY=1], [AM_CPPFLAGS])
+m4trace:configure.ac:153: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif])
+m4trace:configure.ac:153: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
 m4trace:configure.ac:153: -1- m4_pattern_allow([^WORDS_BIGENDIAN$])
+m4trace:configure.ac:153: -1- AC_DEFINE_TRACE_LITERAL([AC_APPLE_UNIVERSAL_BUILD])
 m4trace:configure.ac:153: -1- m4_pattern_allow([^AC_APPLE_UNIVERSAL_BUILD$])
+m4trace:configure.ac:153: -1- AH_OUTPUT([AC_APPLE_UNIVERSAL_BUILD], [/* Define if building universal (internal helper macro) */
+@%:@undef AC_APPLE_UNIVERSAL_BUILD])
+m4trace:configure.ac:156: -1- AC_DEFINE_TRACE_LITERAL([BYTEORDER])
 m4trace:configure.ac:156: -1- m4_pattern_allow([^BYTEORDER$])
+m4trace:configure.ac:156: -1- AH_OUTPUT([BYTEORDER], [/* 1234 = LILENDIAN, 4321 = BIGENDIAN */
+@%:@undef BYTEORDER])
+m4trace:configure.ac:158: -1- AC_DEFINE_TRACE_LITERAL([const])
 m4trace:configure.ac:158: -1- m4_pattern_allow([^const$])
+m4trace:configure.ac:158: -1- AH_OUTPUT([const], [/* Define to empty if \'const\' does not conform to ANSI C. */
+@%:@undef const])
+m4trace:configure.ac:159: -1- AC_DEFINE_TRACE_LITERAL([size_t])
 m4trace:configure.ac:159: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:159: -1- AH_OUTPUT([size_t], [/* Define as \'unsigned int\' if <stddef.h> doesn\'t define. */
+@%:@undef size_t])
 m4trace:configure.ac:165: -1- AM_CONDITIONAL([WITH_XMLWF], [test x${with_xmlwf} = xyes])
+m4trace:configure.ac:165: -1- AC_SUBST([WITH_XMLWF_TRUE])
+m4trace:configure.ac:165: -1- AC_SUBST_TRACE([WITH_XMLWF_TRUE])
 m4trace:configure.ac:165: -1- m4_pattern_allow([^WITH_XMLWF_TRUE$])
+m4trace:configure.ac:165: -1- AC_SUBST([WITH_XMLWF_FALSE])
+m4trace:configure.ac:165: -1- AC_SUBST_TRACE([WITH_XMLWF_FALSE])
 m4trace:configure.ac:165: -1- m4_pattern_allow([^WITH_XMLWF_FALSE$])
 m4trace:configure.ac:165: -1- _AM_SUBST_NOTMAKE([WITH_XMLWF_TRUE])
 m4trace:configure.ac:165: -1- _AM_SUBST_NOTMAKE([WITH_XMLWF_FALSE])
 m4trace:configure.ac:171: -1- AM_CONDITIONAL([WITH_EXAMPLES], [test x${with_examples} = xyes])
+m4trace:configure.ac:171: -1- AC_SUBST([WITH_EXAMPLES_TRUE])
+m4trace:configure.ac:171: -1- AC_SUBST_TRACE([WITH_EXAMPLES_TRUE])
 m4trace:configure.ac:171: -1- m4_pattern_allow([^WITH_EXAMPLES_TRUE$])
+m4trace:configure.ac:171: -1- AC_SUBST([WITH_EXAMPLES_FALSE])
+m4trace:configure.ac:171: -1- AC_SUBST_TRACE([WITH_EXAMPLES_FALSE])
 m4trace:configure.ac:171: -1- m4_pattern_allow([^WITH_EXAMPLES_FALSE$])
 m4trace:configure.ac:171: -1- _AM_SUBST_NOTMAKE([WITH_EXAMPLES_TRUE])
 m4trace:configure.ac:171: -1- _AM_SUBST_NOTMAKE([WITH_EXAMPLES_FALSE])
 m4trace:configure.ac:177: -1- AM_CONDITIONAL([WITH_TESTS], [test x${with_tests} = xyes])
+m4trace:configure.ac:177: -1- AC_SUBST([WITH_TESTS_TRUE])
+m4trace:configure.ac:177: -1- AC_SUBST_TRACE([WITH_TESTS_TRUE])
 m4trace:configure.ac:177: -1- m4_pattern_allow([^WITH_TESTS_TRUE$])
+m4trace:configure.ac:177: -1- AC_SUBST([WITH_TESTS_FALSE])
+m4trace:configure.ac:177: -1- AC_SUBST_TRACE([WITH_TESTS_FALSE])
 m4trace:configure.ac:177: -1- m4_pattern_allow([^WITH_TESTS_FALSE$])
 m4trace:configure.ac:177: -1- _AM_SUBST_NOTMAKE([WITH_TESTS_TRUE])
 m4trace:configure.ac:177: -1- _AM_SUBST_NOTMAKE([WITH_TESTS_FALSE])
 m4trace:configure.ac:185: -1- AM_CONDITIONAL([MINGW], [test x${EXPATCFG_ON_MINGW} = xyes])
+m4trace:configure.ac:185: -1- AC_SUBST([MINGW_TRUE])
+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([MINGW_TRUE])
 m4trace:configure.ac:185: -1- m4_pattern_allow([^MINGW_TRUE$])
+m4trace:configure.ac:185: -1- AC_SUBST([MINGW_FALSE])
+m4trace:configure.ac:185: -1- AC_SUBST_TRACE([MINGW_FALSE])
 m4trace:configure.ac:185: -1- m4_pattern_allow([^MINGW_FALSE$])
 m4trace:configure.ac:185: -1- _AM_SUBST_NOTMAKE([MINGW_TRUE])
 m4trace:configure.ac:185: -1- _AM_SUBST_NOTMAKE([MINGW_FALSE])
 m4trace:configure.ac:188: -1- AM_CONDITIONAL([UNICODE], [echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP} XML_UNICODE >/dev/null])
+m4trace:configure.ac:188: -1- AC_SUBST([UNICODE_TRUE])
+m4trace:configure.ac:188: -1- AC_SUBST_TRACE([UNICODE_TRUE])
 m4trace:configure.ac:188: -1- m4_pattern_allow([^UNICODE_TRUE$])
+m4trace:configure.ac:188: -1- AC_SUBST([UNICODE_FALSE])
+m4trace:configure.ac:188: -1- AC_SUBST_TRACE([UNICODE_FALSE])
 m4trace:configure.ac:188: -1- m4_pattern_allow([^UNICODE_FALSE$])
 m4trace:configure.ac:188: -1- _AM_SUBST_NOTMAKE([UNICODE_TRUE])
 m4trace:configure.ac:188: -1- _AM_SUBST_NOTMAKE([UNICODE_FALSE])
 m4trace:configure.ac:189: -1- AM_CONDITIONAL([_INTERNAL_UNICODE_WCHAR_T], [echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP} XML_UNICODE_WCHAR_T >/dev/null])
+m4trace:configure.ac:189: -1- AC_SUBST([_INTERNAL_UNICODE_WCHAR_T_TRUE])
+m4trace:configure.ac:189: -1- AC_SUBST_TRACE([_INTERNAL_UNICODE_WCHAR_T_TRUE])
 m4trace:configure.ac:189: -1- m4_pattern_allow([^_INTERNAL_UNICODE_WCHAR_T_TRUE$])
+m4trace:configure.ac:189: -1- AC_SUBST([_INTERNAL_UNICODE_WCHAR_T_FALSE])
+m4trace:configure.ac:189: -1- AC_SUBST_TRACE([_INTERNAL_UNICODE_WCHAR_T_FALSE])
 m4trace:configure.ac:189: -1- m4_pattern_allow([^_INTERNAL_UNICODE_WCHAR_T_FALSE$])
 m4trace:configure.ac:189: -1- _AM_SUBST_NOTMAKE([_INTERNAL_UNICODE_WCHAR_T_TRUE])
 m4trace:configure.ac:189: -1- _AM_SUBST_NOTMAKE([_INTERNAL_UNICODE_WCHAR_T_FALSE])
 m4trace:configure.ac:190: -1- AM_CONDITIONAL([_INTERNAL_MIN_SIZE], [echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP} XML_MIN_SIZE >/dev/null])
+m4trace:configure.ac:190: -1- AC_SUBST([_INTERNAL_MIN_SIZE_TRUE])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([_INTERNAL_MIN_SIZE_TRUE])
 m4trace:configure.ac:190: -1- m4_pattern_allow([^_INTERNAL_MIN_SIZE_TRUE$])
+m4trace:configure.ac:190: -1- AC_SUBST([_INTERNAL_MIN_SIZE_FALSE])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([_INTERNAL_MIN_SIZE_FALSE])
 m4trace:configure.ac:190: -1- m4_pattern_allow([^_INTERNAL_MIN_SIZE_FALSE$])
 m4trace:configure.ac:190: -1- _AM_SUBST_NOTMAKE([_INTERNAL_MIN_SIZE_TRUE])
 m4trace:configure.ac:190: -1- _AM_SUBST_NOTMAKE([_INTERNAL_MIN_SIZE_FALSE])
 m4trace:configure.ac:191: -1- AM_CONDITIONAL([_INTERNAL_LARGE_SIZE], [echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP} XML_LARGE_SIZE >/dev/null])
+m4trace:configure.ac:191: -1- AC_SUBST([_INTERNAL_LARGE_SIZE_TRUE])
+m4trace:configure.ac:191: -1- AC_SUBST_TRACE([_INTERNAL_LARGE_SIZE_TRUE])
 m4trace:configure.ac:191: -1- m4_pattern_allow([^_INTERNAL_LARGE_SIZE_TRUE$])
+m4trace:configure.ac:191: -1- AC_SUBST([_INTERNAL_LARGE_SIZE_FALSE])
+m4trace:configure.ac:191: -1- AC_SUBST_TRACE([_INTERNAL_LARGE_SIZE_FALSE])
 m4trace:configure.ac:191: -1- m4_pattern_allow([^_INTERNAL_LARGE_SIZE_FALSE$])
 m4trace:configure.ac:191: -1- _AM_SUBST_NOTMAKE([_INTERNAL_LARGE_SIZE_TRUE])
 m4trace:configure.ac:191: -1- _AM_SUBST_NOTMAKE([_INTERNAL_LARGE_SIZE_FALSE])
-m4trace:configure.ac:193: -1- LT_LIB_M
+m4trace:configure.ac:193: -1- AC_SUBST([LIBM])
+m4trace:configure.ac:193: -1- AC_SUBST_TRACE([LIBM])
 m4trace:configure.ac:193: -1- m4_pattern_allow([^LIBM$])
+m4trace:configure.ac:199: -1- AH_OUTPUT([HAVE_LIBBSD], [/* Define to 1 if you have the \'bsd\' library (-lbsd). */
+@%:@undef HAVE_LIBBSD])
+m4trace:configure.ac:199: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBBSD])
 m4trace:configure.ac:199: -1- m4_pattern_allow([^HAVE_LIBBSD$])
+m4trace:configure.ac:206: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ARC4RANDOM_BUF])
 m4trace:configure.ac:206: -1- m4_pattern_allow([^HAVE_ARC4RANDOM_BUF$])
+m4trace:configure.ac:206: -1- AH_OUTPUT([HAVE_ARC4RANDOM_BUF], [/* Define to 1 if you have the `arc4random_buf\' function. */
+@%:@undef HAVE_ARC4RANDOM_BUF])
+m4trace:configure.ac:206: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ARC4RANDOM])
 m4trace:configure.ac:206: -1- m4_pattern_allow([^HAVE_ARC4RANDOM$])
+m4trace:configure.ac:206: -1- AH_OUTPUT([HAVE_ARC4RANDOM], [/* Define to 1 if you have the `arc4random\' function. */
+@%:@undef HAVE_ARC4RANDOM])
+m4trace:configure.ac:244: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETRANDOM])
 m4trace:configure.ac:244: -1- m4_pattern_allow([^HAVE_GETRANDOM$])
+m4trace:configure.ac:244: -1- AH_OUTPUT([HAVE_GETRANDOM], [/* Define to 1 if you have the `getrandom\' function. */
+@%:@undef HAVE_GETRANDOM])
+m4trace:configure.ac:267: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSCALL_GETRANDOM])
 m4trace:configure.ac:267: -1- m4_pattern_allow([^HAVE_SYSCALL_GETRANDOM$])
+m4trace:configure.ac:267: -1- AH_OUTPUT([HAVE_SYSCALL_GETRANDOM], [/* Define to 1 if you have `syscall\' and `SYS_getrandom\'. */
+@%:@undef HAVE_SYSCALL_GETRANDOM])
+m4trace:configure.ac:285: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
+@%:@undef HAVE_FCNTL_H])
+m4trace:configure.ac:285: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FCNTL_H])
 m4trace:configure.ac:285: -1- m4_pattern_allow([^HAVE_FCNTL_H$])
+m4trace:configure.ac:285: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+@%:@undef HAVE_UNISTD_H])
+m4trace:configure.ac:285: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H])
 m4trace:configure.ac:285: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
+m4trace:configure.ac:286: -1- AC_DEFINE_TRACE_LITERAL([off_t])
 m4trace:configure.ac:286: -1- m4_pattern_allow([^off_t$])
-m4trace:configure.ac:287: -1- AC_DEFUN([_AC_Header_unistd_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" unistd.h ]AS_TR_SH([unistd.h]) AS_TR_CPP([HAVE_unistd.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:287: -1- AC_DEFUN([_AC_Header_sys_param_h], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
-  [" sys/param.h ]AS_TR_SH([sys/param.h]) AS_TR_CPP([HAVE_sys/param.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
-m4trace:configure.ac:287: -1- AC_DEFUN([_AC_Func_getpagesize], [m4_divert_text([INIT_PREPARE],
-  [AS_VAR_APPEND([ac_func_]]_AC_LANG_ABBREV[[_list],
-  [" getpagesize ]AS_TR_CPP([HAVE_getpagesize])["])])_AC_FUNCS_EXPANSION(_AC_LANG_ABBREV)])
+m4trace:configure.ac:286: -1- AH_OUTPUT([off_t], [/* Define to \'long int\' if <sys/types.h> does not define. */
+@%:@undef off_t])
+m4trace:configure.ac:287: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+@%:@undef HAVE_UNISTD_H])
+m4trace:configure.ac:287: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+@%:@undef HAVE_SYS_PARAM_H])
+m4trace:configure.ac:287: -1- AH_OUTPUT([HAVE_GETPAGESIZE], [/* Define to 1 if you have the \'getpagesize\' function. */
+@%:@undef HAVE_GETPAGESIZE])
+m4trace:configure.ac:287: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MMAP])
 m4trace:configure.ac:287: -1- m4_pattern_allow([^HAVE_MMAP$])
+m4trace:configure.ac:287: -1- AH_OUTPUT([HAVE_MMAP], [/* Define to 1 if you have a working \'mmap\' system call. */
+@%:@undef HAVE_MMAP])
+m4trace:configure.ac:292: -1- AC_SUBST([FILEMAP])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([FILEMAP])
 m4trace:configure.ac:292: -1- m4_pattern_allow([^FILEMAP$])
+m4trace:configure.ac:296: -1- AC_DEFINE_TRACE_LITERAL([XML_NS])
 m4trace:configure.ac:296: -1- m4_pattern_allow([^XML_NS$])
+m4trace:configure.ac:296: -1- AH_OUTPUT([XML_NS], [/* Define to make XML Namespaces functionality available. */
+@%:@undef XML_NS])
+m4trace:configure.ac:298: -1- AC_DEFINE_TRACE_LITERAL([XML_DTD])
 m4trace:configure.ac:298: -1- m4_pattern_allow([^XML_DTD$])
+m4trace:configure.ac:298: -1- AH_OUTPUT([XML_DTD], [/* Define to make parameter entity parsing functionality available. */
+@%:@undef XML_DTD])
+m4trace:configure.ac:300: -1- AC_DEFINE_TRACE_LITERAL([XML_DEV_URANDOM])
 m4trace:configure.ac:300: -1- m4_pattern_allow([^XML_DEV_URANDOM$])
+m4trace:configure.ac:300: -1- AH_OUTPUT([XML_DEV_URANDOM], [/* Define to include code reading entropy from `/dev/urandom\'. */
+@%:@undef XML_DEV_URANDOM])
+m4trace:configure.ac:308: -1- AC_DEFINE_TRACE_LITERAL([XML_ATTR_INFO])
 m4trace:configure.ac:308: -1- m4_pattern_allow([^XML_ATTR_INFO$])
+m4trace:configure.ac:308: -1- AH_OUTPUT([XML_ATTR_INFO], [/* Define to allow retrieving the byte offsets for attribute names and values.
+   */
+@%:@undef XML_ATTR_INFO])
+m4trace:configure.ac:319: -1- AC_DEFINE_TRACE_LITERAL([XML_CONTEXT_BYTES])
 m4trace:configure.ac:319: -1- m4_pattern_allow([^XML_CONTEXT_BYTES$])
+m4trace:configure.ac:319: -1- AH_OUTPUT([XML_CONTEXT_BYTES], [/* Define to specify how much context to retain around the current parse
+   point. */
+@%:@undef XML_CONTEXT_BYTES])
+m4trace:configure.ac:334: -1- AC_SUBST([DOCBOOK_TO_MAN])
+m4trace:configure.ac:334: -1- AC_SUBST_TRACE([DOCBOOK_TO_MAN])
 m4trace:configure.ac:334: -1- m4_pattern_allow([^DOCBOOK_TO_MAN$])
+m4trace:configure.ac:335: -1- AC_SUBST([DOCBOOK_TO_MAN])
+m4trace:configure.ac:335: -1- AC_SUBST_TRACE([DOCBOOK_TO_MAN])
 m4trace:configure.ac:335: -1- m4_pattern_allow([^DOCBOOK_TO_MAN$])
 m4trace:configure.ac:348: -1- AM_CONDITIONAL([WITH_DOCBOOK], [test "x${DOCBOOK_TO_MAN}" != x])
+m4trace:configure.ac:348: -1- AC_SUBST([WITH_DOCBOOK_TRUE])
+m4trace:configure.ac:348: -1- AC_SUBST_TRACE([WITH_DOCBOOK_TRUE])
 m4trace:configure.ac:348: -1- m4_pattern_allow([^WITH_DOCBOOK_TRUE$])
+m4trace:configure.ac:348: -1- AC_SUBST([WITH_DOCBOOK_FALSE])
+m4trace:configure.ac:348: -1- AC_SUBST_TRACE([WITH_DOCBOOK_FALSE])
 m4trace:configure.ac:348: -1- m4_pattern_allow([^WITH_DOCBOOK_FALSE$])
 m4trace:configure.ac:348: -1- _AM_SUBST_NOTMAKE([WITH_DOCBOOK_TRUE])
 m4trace:configure.ac:348: -1- _AM_SUBST_NOTMAKE([WITH_DOCBOOK_FALSE])
+m4trace:configure.ac:380: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_VOID_P])
 m4trace:configure.ac:380: -1- m4_pattern_allow([^SIZEOF_VOID_P$])
+m4trace:configure.ac:380: -1- AH_OUTPUT([SIZEOF_VOID_P], [/* The size of \'void *\', as computed by sizeof. */
+@%:@undef SIZEOF_VOID_P])
+m4trace:configure.ac:381: -1- AC_SUBST([EXPAT_ATTR_INFO])
+m4trace:configure.ac:381: -1- AC_SUBST_TRACE([EXPAT_ATTR_INFO])
 m4trace:configure.ac:381: -1- m4_pattern_allow([^EXPAT_ATTR_INFO$])
+m4trace:configure.ac:382: -1- AC_SUBST([EXPAT_DTD])
+m4trace:configure.ac:382: -1- AC_SUBST_TRACE([EXPAT_DTD])
 m4trace:configure.ac:382: -1- m4_pattern_allow([^EXPAT_DTD$])
+m4trace:configure.ac:383: -1- AC_SUBST([EXPAT_LARGE_SIZE])
+m4trace:configure.ac:383: -1- AC_SUBST_TRACE([EXPAT_LARGE_SIZE])
 m4trace:configure.ac:383: -1- m4_pattern_allow([^EXPAT_LARGE_SIZE$])
+m4trace:configure.ac:384: -1- AC_SUBST([EXPAT_MIN_SIZE])
+m4trace:configure.ac:384: -1- AC_SUBST_TRACE([EXPAT_MIN_SIZE])
 m4trace:configure.ac:384: -1- m4_pattern_allow([^EXPAT_MIN_SIZE$])
+m4trace:configure.ac:385: -1- AC_SUBST([EXPAT_NS])
+m4trace:configure.ac:385: -1- AC_SUBST_TRACE([EXPAT_NS])
 m4trace:configure.ac:385: -1- m4_pattern_allow([^EXPAT_NS$])
+m4trace:configure.ac:386: -1- AC_SUBST([EXPAT_CONTEXT_BYTES])
+m4trace:configure.ac:386: -1- AC_SUBST_TRACE([EXPAT_CONTEXT_BYTES])
 m4trace:configure.ac:386: -1- m4_pattern_allow([^EXPAT_CONTEXT_BYTES$])
+m4trace:configure.ac:387: -1- AC_SUBST([EXPAT_CHAR_TYPE])
+m4trace:configure.ac:387: -1- AC_SUBST_TRACE([EXPAT_CHAR_TYPE])
 m4trace:configure.ac:387: -1- m4_pattern_allow([^EXPAT_CHAR_TYPE$])
 m4trace:configure.ac:388: -1- m4_pattern_allow([^PACKAGE_INIT$])
+m4trace:configure.ac:389: -1- AC_SUBST([LIBDIR_BASENAME])
+m4trace:configure.ac:389: -1- AC_SUBST_TRACE([LIBDIR_BASENAME])
 m4trace:configure.ac:389: -1- m4_pattern_allow([^LIBDIR_BASENAME$])
+m4trace:configure.ac:390: -1- AC_SUBST([SO_MAJOR])
+m4trace:configure.ac:390: -1- AC_SUBST_TRACE([SO_MAJOR])
 m4trace:configure.ac:390: -1- m4_pattern_allow([^SO_MAJOR$])
+m4trace:configure.ac:391: -1- AC_SUBST([SO_MINOR])
+m4trace:configure.ac:391: -1- AC_SUBST_TRACE([SO_MINOR])
 m4trace:configure.ac:391: -1- m4_pattern_allow([^SO_MINOR$])
+m4trace:configure.ac:392: -1- AC_SUBST([SO_PATCH])
+m4trace:configure.ac:392: -1- AC_SUBST_TRACE([SO_PATCH])
 m4trace:configure.ac:392: -1- m4_pattern_allow([^SO_PATCH$])
+m4trace:configure.ac:393: -1- AC_SUBST([ac_cv_sizeof_void_p])
+m4trace:configure.ac:393: -1- AC_SUBST_TRACE([ac_cv_sizeof_void_p])
 m4trace:configure.ac:393: -1- m4_pattern_allow([^ac_cv_sizeof_void_p$])
+m4trace:configure.ac:397: -1- AC_SUBST([AM_CPPFLAGS])
+m4trace:configure.ac:397: -1- AC_SUBST_TRACE([AM_CPPFLAGS])
 m4trace:configure.ac:397: -1- m4_pattern_allow([^AM_CPPFLAGS$])
+m4trace:configure.ac:398: -1- AC_SUBST([AM_CFLAGS])
+m4trace:configure.ac:398: -1- AC_SUBST_TRACE([AM_CFLAGS])
 m4trace:configure.ac:398: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:399: -1- AC_SUBST([AM_CXXFLAGS])
+m4trace:configure.ac:399: -1- AC_SUBST_TRACE([AM_CXXFLAGS])
 m4trace:configure.ac:399: -1- m4_pattern_allow([^AM_CXXFLAGS$])
+m4trace:configure.ac:400: -1- AC_SUBST([AM_LDFLAGS])
+m4trace:configure.ac:400: -1- AC_SUBST_TRACE([AM_LDFLAGS])
 m4trace:configure.ac:400: -1- m4_pattern_allow([^AM_LDFLAGS$])
+m4trace:configure.ac:408: -1- AC_SUBST([CMAKE_SHARED_LIBRARY_PREFIX])
+m4trace:configure.ac:408: -1- AC_SUBST_TRACE([CMAKE_SHARED_LIBRARY_PREFIX])
 m4trace:configure.ac:408: -1- m4_pattern_allow([^CMAKE_SHARED_LIBRARY_PREFIX$])
+m4trace:configure.ac:414: -1- AC_CONFIG_FILES([Makefile
+  expat.pc
+  cmake/expat-config.cmake
+  cmake/autotools/expat-config-version.cmake
+  cmake/autotools/expat-noconfig.cmake:${CMAKE_NOCONFIG_SOURCE}
+  doc/Makefile
+  examples/Makefile
+  lib/Makefile
+  tests/Makefile
+  tests/benchmark/Makefile
+  xmlwf/Makefile])
+m4trace:configure.ac:425: -1- AC_CONFIG_FILES([run.sh], [chmod +x run.sh])
+m4trace:configure.ac:426: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
 m4trace:configure.ac:426: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:426: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([LTLIBOBJS])
 m4trace:configure.ac:426: -1- m4_pattern_allow([^LTLIBOBJS$])
 m4trace:configure.ac:426: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:426: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
 m4trace:configure.ac:426: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:426: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
 m4trace:configure.ac:426: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
 m4trace:configure.ac:426: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
 m4trace:configure.ac:426: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:426: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:426: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:426: -1- AM_RUN_LOG([cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles])
-m4trace:configure.ac:426: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:426: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:426: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
diff --git a/recipes/libs/expat/source/doc/Makefile.in b/recipes/libs/expat/source/doc/Makefile.in
index b392f36709..f74cea83a0 100644
--- a/recipes/libs/expat/source/doc/Makefile.in
+++ b/recipes/libs/expat/source/doc/Makefile.in
@@ -360,9 +360,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
+	  $(AUTOMAKE) --foreign doc/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/recipes/libs/expat/source/examples/Makefile.in b/recipes/libs/expat/source/examples/Makefile.in
index 74676809f2..6830c6f5f4 100644
--- a/recipes/libs/expat/source/examples/Makefile.in
+++ b/recipes/libs/expat/source/examples/Makefile.in
@@ -380,9 +380,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu examples/Makefile
+	  $(AUTOMAKE) --foreign examples/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/recipes/libs/expat/source/lib/Makefile.in b/recipes/libs/expat/source/lib/Makefile.in
index 0d537b34d7..07e31bf9e9 100644
--- a/recipes/libs/expat/source/lib/Makefile.in
+++ b/recipes/libs/expat/source/lib/Makefile.in
@@ -460,9 +460,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu lib/Makefile
+	  $(AUTOMAKE) --foreign lib/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/recipes/libs/expat/source/tests/Makefile.in b/recipes/libs/expat/source/tests/Makefile.in
index d32c5c68ad..937cff1d82 100644
--- a/recipes/libs/expat/source/tests/Makefile.in
+++ b/recipes/libs/expat/source/tests/Makefile.in
@@ -699,9 +699,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/Makefile
+	  $(AUTOMAKE) --foreign tests/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/recipes/libs/expat/source/tests/benchmark/Makefile.in b/recipes/libs/expat/source/tests/benchmark/Makefile.in
index 03bc1eb3c7..afa7ee2c72 100644
--- a/recipes/libs/expat/source/tests/benchmark/Makefile.in
+++ b/recipes/libs/expat/source/tests/benchmark/Makefile.in
@@ -378,9 +378,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/benchmark/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/benchmark/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/benchmark/Makefile
+	  $(AUTOMAKE) --foreign tests/benchmark/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/recipes/libs/expat/source/xmlwf/Makefile.in b/recipes/libs/expat/source/xmlwf/Makefile.in
index cdb4d79656..e558475530 100644
--- a/recipes/libs/expat/source/xmlwf/Makefile.in
+++ b/recipes/libs/expat/source/xmlwf/Makefile.in
@@ -402,9 +402,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xmlwf/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xmlwf/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu xmlwf/Makefile
+	  $(AUTOMAKE) --foreign xmlwf/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/recipes/libs/glib/recipe.toml b/recipes/libs/glib/recipe.toml
new file mode 100644
index 0000000000..b43eae2638
--- /dev/null
+++ b/recipes/libs/glib/recipe.toml
@@ -0,0 +1,23 @@
+[source]
+tar = "https://download.gnome.org/sources/glib/2.87/glib-2.87.0.tar.xz"
+blake3 = "26b77ae24bc02f85d1c6742fe601167b056085f117cda70da7b805cefa6195e9"
+patches = [
+    "redox.patch",
+]
+
+[build]
+template = "custom"
+dependencies = [
+    "gettext",
+    "libffi",
+    "libiconv",
+    "pcre2",
+    "zlib",
+]
+script = """
+DYNAMIC_INIT
+cookbook_meson \
+    -Ddefault_library=static \
+    -Dxattr=false \
+    -Dc_args="['-I${COOKBOOK_SYSROOT}/include','-Wno-error=implicit-function-declaration']"
+"""
diff --git a/recipes/libs/libiconv/recipe.toml b/recipes/libs/libiconv/recipe.toml
index fbb62bb311..1d3baecaca 100644
--- a/recipes/libs/libiconv/recipe.toml
+++ b/recipes/libs/libiconv/recipe.toml
@@ -96,14 +96,24 @@ sed -i '0,/cross_compiling=maybe/s//cross_compiling=yes/' "${COOKBOOK_SOURCE}/co
 python3 - <<'PYEOF'
 from pathlib import Path
 import os
+
+ltversion_text = Path('/usr/share/aclocal/ltversion.m4').read_text()
+for line in ltversion_text.splitlines():
+    line = line.strip().lstrip('[')
+    if line.startswith("macro_version='") and line.endswith("'"):
+        host_ver = line[len("macro_version='"):-1]
+    if line.startswith("macro_revision='") and line.endswith("'"):
+        host_rev = line[len("macro_revision='"):-1]
+
 for relative in ('configure', 'libcharset/configure'):
     path = Path(os.environ['COOKBOOK_SOURCE']) / relative
     lines = path.read_text().splitlines()
     for i, line in enumerate(lines):
-        if "macro_version='2.4.7'" in line or "macro_version='2.5.4-redox-9510'" in line:
-            lines[i] = "macro_version='2.6.0'"
-        if "macro_revision='2.4.7'" in line or "macro_revision='2.5.4-redox-9510'" in line:
-            lines[i] = "macro_revision='2.6.0'"
+        stripped = line.strip()
+        if stripped.startswith("macro_version='") and stripped.endswith("'"):
+            lines[i] = line.replace(stripped, f"macro_version='{host_ver}'")
+        if stripped.startswith("macro_revision='") and stripped.endswith("'"):
+            lines[i] = line.replace(stripped, f"macro_revision='{host_rev}'")
         if "grep -v '^ *+' conftest.err >conftest.er1" in line:
             lines[i] = "test -f conftest.err && grep -v '^ *+' conftest.err > conftest.er1.tmp && mv -f conftest.er1.tmp conftest.er1 || :"
         if 'cat conftest.er1 >&5' in line:
diff --git a/recipes/libs/libiconv/source/aclocal.m4 b/recipes/libs/libiconv/source/aclocal.m4
index 5cd59bb415..d24affad63 100644
--- a/recipes/libs/libiconv/source/aclocal.m4
+++ b/recipes/libs/libiconv/source/aclocal.m4
@@ -14,8 +14,8 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
-[m4_warning([this file was generated for autoconf 2.72.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.73],,
+[m4_warning([this file was generated for autoconf 2.73.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
@@ -3289,393 +3289,6 @@ AC_DEFUN([gl_FUNC_GETPROGNAME],
   fi
 ])
 
-# gettext.m4 serial 71 (gettext-0.20.2)
-dnl Copyright (C) 1995-2014, 2016, 2018-2022 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL must be one of 'external', 'use-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages other than GNU gettext, and
-dnl    'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED).
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value '$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])
-  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
-    [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
-])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define([gt_included_intl],
-    ifelse([$1], [external], [no], [yes]))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED([$2])
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AC_REQUIRE([AM_NLS])
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH([included-gettext],
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-               ]],
-               [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-               ]])],
-            [eval "$gt_func_gnugettext_libc=yes"],
-            [eval "$gt_func_gnugettext_libc=no"])])
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            [$gt_func_gnugettext_libintl],
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_LINK_IFELSE(
-              [AC_LANG_PROGRAM(
-                 [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                 ]],
-                 [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                 ]])],
-              [eval "$gt_func_gnugettext_libintl=yes"],
-              [eval "$gt_func_gnugettext_libintl=no"])
-            dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_LINK_IFELSE(
-                [AC_LANG_PROGRAM(
-                   [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                   ]],
-                   [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                   ]])],
-                [LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
-                ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE([ENABLE_NLS], [1],
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE([HAVE_GETTEXT], [1],
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE([HAVE_DCGETTEXT], [1],
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
-    dnl because some of the testsuite requires it.
-    BUILD_INCLUDED_LIBINTL=yes
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST([BUILD_INCLUDED_LIBINTL])
-    AC_SUBST([USE_INCLUDED_LIBINTL])
-    AC_SUBST([CATOBJEXT])
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST([INTLLIBS])
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST([LIBINTL])
-  AC_SUBST([LTLIBINTL])
-  AC_SUBST([POSUB])
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
-  m4_divert_text([DEFAULTS], [gt_needs=])
-  m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
-  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-
-dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
-
 # gnulib-common.m4 serial 73
 dnl Copyright (C) 2007-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -5617,969 +5230,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/zzgnulib.m4
 ])
 
-# host-cpu-c-abi.m4 serial 15
-dnl Copyright (C) 2002-2022 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible and Sam Steingold.
-
-dnl Sets the HOST_CPU variable to the canonical name of the CPU.
-dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its
-dnl C language ABI (application binary interface).
-dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in
-dnl config.h.
-dnl
-dnl This canonical name can be used to select a particular assembly language
-dnl source file that will interoperate with C code on the given host.
-dnl
-dnl For example:
-dnl * 'i386' and 'sparc' are different canonical names, because code for i386
-dnl   will not run on SPARC CPUs and vice versa. They have different
-dnl   instruction sets.
-dnl * 'sparc' and 'sparc64' are different canonical names, because code for
-dnl   'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code
-dnl   contains 32-bit instructions, whereas 'sparc64' code contains 64-bit
-dnl   instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit
-dnl   mode, but not both.
-dnl * 'mips' and 'mipsn32' are different canonical names, because they use
-dnl   different argument passing and return conventions for C functions, and
-dnl   although the instruction set of 'mips' is a large subset of the
-dnl   instruction set of 'mipsn32'.
-dnl * 'mipsn32' and 'mips64' are different canonical names, because they use
-dnl   different sizes for the C types like 'int' and 'void *', and although
-dnl   the instruction sets of 'mipsn32' and 'mips64' are the same.
-dnl * The same canonical name is used for different endiannesses. You can
-dnl   determine the endianness through preprocessor symbols:
-dnl   - 'arm': test __ARMEL__.
-dnl   - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL.
-dnl   - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN.
-dnl * The same name 'i386' is used for CPUs of type i386, i486, i586
-dnl   (Pentium), AMD K7, Pentium II, Pentium IV, etc., because
-dnl   - Instructions that do not exist on all of these CPUs (cmpxchg,
-dnl     MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your
-dnl     assembly language source files use such instructions, you will
-dnl     need to make the distinction.
-dnl   - Speed of execution of the common instruction set is reasonable across
-dnl     the entire family of CPUs. If you have assembly language source files
-dnl     that are optimized for particular CPU types (like GNU gmp has), you
-dnl     will need to make the distinction.
-dnl   See <https://en.wikipedia.org/wiki/X86_instruction_listings>.
-AC_DEFUN([gl_HOST_CPU_C_ABI],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_C_ASM])
-  AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi],
-    [case "$host_cpu" in
-
-changequote(,)dnl
-       i[34567]86 )
-changequote([,])dnl
-         gl_cv_host_cpu_c_abi=i386
-         ;;
-
-       x86_64 )
-         # On x86_64 systems, the C compiler may be generating code in one of
-         # these ABIs:
-         # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
-         # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
-         #   with native Windows (mingw, MSVC).
-         # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
-         # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if (defined __x86_64__ || defined __amd64__ \
-                     || defined _M_X64 || defined _M_AMD64)
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                 [[#if defined __ILP32__ || defined _ILP32
-                    int ok;
-                   #else
-                    error fail
-                   #endif
-                 ]])],
-              [gl_cv_host_cpu_c_abi=x86_64-x32],
-              [gl_cv_host_cpu_c_abi=x86_64])],
-           [gl_cv_host_cpu_c_abi=i386])
-         ;;
-
-changequote(,)dnl
-       alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] )
-changequote([,])dnl
-         gl_cv_host_cpu_c_abi=alpha
-         ;;
-
-       arm* | aarch64 )
-         # Assume arm with EABI.
-         # On arm64 systems, the C compiler may be generating code in one of
-         # these ABIs:
-         # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
-         # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
-         # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#ifdef __aarch64__
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                [[#if defined __ILP32__ || defined _ILP32
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-              [gl_cv_host_cpu_c_abi=arm64-ilp32],
-              [gl_cv_host_cpu_c_abi=arm64])],
-           [# Don't distinguish little-endian and big-endian arm, since they
-            # don't require different machine code for simple operations and
-            # since the user can distinguish them through the preprocessor
-            # defines __ARMEL__ vs. __ARMEB__.
-            # But distinguish arm which passes floating-point arguments and
-            # return values in integer registers (r0, r1, ...) - this is
-            # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which
-            # passes them in float registers (s0, s1, ...) and double registers
-            # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer
-            # sets the preprocessor defines __ARM_PCS (for the first case) and
-            # __ARM_PCS_VFP (for the second case), but older GCC does not.
-            echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c
-            # Look for a reference to the register d0 in the .s file.
-            AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
-            if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then
-              gl_cv_host_cpu_c_abi=armhf
-            else
-              gl_cv_host_cpu_c_abi=arm
-            fi
-            rm -f conftest*
-           ])
-         ;;
-
-       hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
-         # On hppa, the C compiler may be generating 32-bit code or 64-bit
-         # code. In the latter case, it defines _LP64 and __LP64__.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#ifdef __LP64__
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=hppa64],
-           [gl_cv_host_cpu_c_abi=hppa])
-         ;;
-
-       ia64* )
-         # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
-         # 32-bit code. In the latter case, it defines _ILP32.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#ifdef _ILP32
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=ia64-ilp32],
-           [gl_cv_host_cpu_c_abi=ia64])
-         ;;
-
-       mips* )
-         # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
-         # at 32.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=mips64],
-           [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but
-            # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIN32.
-            # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but
-            # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIO32.
-            AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                 [[#if (_MIPS_SIM == _ABIN32)
-                    int ok;
-                   #else
-                    error fail
-                   #endif
-                 ]])],
-              [gl_cv_host_cpu_c_abi=mipsn32],
-              [gl_cv_host_cpu_c_abi=mips])])
-         ;;
-
-       powerpc* )
-         # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
-         # No need to distinguish them here; the caller may distinguish
-         # them based on the OS.
-         # On powerpc64 systems, the C compiler may still be generating
-         # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
-         # be generating 64-bit code.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __powerpc64__ || defined __LP64__
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [# On powerpc64, there are two ABIs on Linux: The AIX compatible
-            # one and the ELFv2 one. The latter defines _CALL_ELF=2.
-            AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                 [[#if defined _CALL_ELF && _CALL_ELF == 2
-                    int ok;
-                   #else
-                    error fail
-                   #endif
-                 ]])],
-              [gl_cv_host_cpu_c_abi=powerpc64-elfv2],
-              [gl_cv_host_cpu_c_abi=powerpc64])
-           ],
-           [gl_cv_host_cpu_c_abi=powerpc])
-         ;;
-
-       rs6000 )
-         gl_cv_host_cpu_c_abi=powerpc
-         ;;
-
-       riscv32 | riscv64 )
-         # There are 2 architectures (with variants): rv32* and rv64*.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if __riscv_xlen == 64
-                  int ok;
-                #else
-                  error fail
-                #endif
-              ]])],
-           [cpu=riscv64],
-           [cpu=riscv32])
-         # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
-         # Size of 'long' and 'void *':
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __LP64__
-                  int ok;
-                #else
-                  error fail
-                #endif
-              ]])],
-           [main_abi=lp64],
-           [main_abi=ilp32])
-         # Float ABIs:
-         # __riscv_float_abi_double:
-         #   'float' and 'double' are passed in floating-point registers.
-         # __riscv_float_abi_single:
-         #   'float' are passed in floating-point registers.
-         # __riscv_float_abi_soft:
-         #   No values are passed in floating-point registers.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __riscv_float_abi_double
-                  int ok;
-                #else
-                  error fail
-                #endif
-              ]])],
-           [float_abi=d],
-           [AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                 [[#if defined __riscv_float_abi_single
-                     int ok;
-                   #else
-                     error fail
-                   #endif
-                 ]])],
-              [float_abi=f],
-              [float_abi=''])
-           ])
-         gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}"
-         ;;
-
-       s390* )
-         # On s390x, the C compiler may be generating 64-bit (= s390x) code
-         # or 31-bit (= s390) code.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __LP64__ || defined __s390x__
-                  int ok;
-                #else
-                  error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=s390x],
-           [gl_cv_host_cpu_c_abi=s390])
-         ;;
-
-       sparc | sparc64 )
-         # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
-         # C compiler still generates 32-bit code.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __sparcv9 || defined __arch64__
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=sparc64],
-           [gl_cv_host_cpu_c_abi=sparc])
-         ;;
-
-       *)
-         gl_cv_host_cpu_c_abi="$host_cpu"
-         ;;
-     esac
-    ])
-
-  dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same.
-  HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'`
-  HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi"
-  AC_SUBST([HOST_CPU])
-  AC_SUBST([HOST_CPU_C_ABI])
-
-  # This was
-  #   AC_DEFINE_UNQUOTED([__${HOST_CPU}__])
-  #   AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__])
-  # earlier, but KAI C++ 3.2d doesn't like this.
-  sed -e 's/-/_/g' >> confdefs.h <<EOF
-#ifndef __${HOST_CPU}__
-#define __${HOST_CPU}__ 1
-#endif
-#ifndef __${HOST_CPU_C_ABI}__
-#define __${HOST_CPU_C_ABI}__ 1
-#endif
-EOF
-  AH_TOP([/* CPU and C ABI indicator */
-#ifndef __i386__
-#undef __i386__
-#endif
-#ifndef __x86_64_x32__
-#undef __x86_64_x32__
-#endif
-#ifndef __x86_64__
-#undef __x86_64__
-#endif
-#ifndef __alpha__
-#undef __alpha__
-#endif
-#ifndef __arm__
-#undef __arm__
-#endif
-#ifndef __armhf__
-#undef __armhf__
-#endif
-#ifndef __arm64_ilp32__
-#undef __arm64_ilp32__
-#endif
-#ifndef __arm64__
-#undef __arm64__
-#endif
-#ifndef __hppa__
-#undef __hppa__
-#endif
-#ifndef __hppa64__
-#undef __hppa64__
-#endif
-#ifndef __ia64_ilp32__
-#undef __ia64_ilp32__
-#endif
-#ifndef __ia64__
-#undef __ia64__
-#endif
-#ifndef __loongarch64__
-#undef __loongarch64__
-#endif
-#ifndef __m68k__
-#undef __m68k__
-#endif
-#ifndef __mips__
-#undef __mips__
-#endif
-#ifndef __mipsn32__
-#undef __mipsn32__
-#endif
-#ifndef __mips64__
-#undef __mips64__
-#endif
-#ifndef __powerpc__
-#undef __powerpc__
-#endif
-#ifndef __powerpc64__
-#undef __powerpc64__
-#endif
-#ifndef __powerpc64_elfv2__
-#undef __powerpc64_elfv2__
-#endif
-#ifndef __riscv32__
-#undef __riscv32__
-#endif
-#ifndef __riscv64__
-#undef __riscv64__
-#endif
-#ifndef __riscv32_ilp32__
-#undef __riscv32_ilp32__
-#endif
-#ifndef __riscv32_ilp32f__
-#undef __riscv32_ilp32f__
-#endif
-#ifndef __riscv32_ilp32d__
-#undef __riscv32_ilp32d__
-#endif
-#ifndef __riscv64_ilp32__
-#undef __riscv64_ilp32__
-#endif
-#ifndef __riscv64_ilp32f__
-#undef __riscv64_ilp32f__
-#endif
-#ifndef __riscv64_ilp32d__
-#undef __riscv64_ilp32d__
-#endif
-#ifndef __riscv64_lp64__
-#undef __riscv64_lp64__
-#endif
-#ifndef __riscv64_lp64f__
-#undef __riscv64_lp64f__
-#endif
-#ifndef __riscv64_lp64d__
-#undef __riscv64_lp64d__
-#endif
-#ifndef __s390__
-#undef __s390__
-#endif
-#ifndef __s390x__
-#undef __s390x__
-#endif
-#ifndef __sh__
-#undef __sh__
-#endif
-#ifndef __sparc__
-#undef __sparc__
-#endif
-#ifndef __sparc64__
-#undef __sparc64__
-#endif
-])
-
-])
-
-
-dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI
-dnl (application binary interface) is a 32-bit one, to 'no' if it is a 64-bit
-dnl one, or to 'unknown' if unknown.
-dnl This is a simplified variant of gl_HOST_CPU_C_ABI.
-AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit],
-    [if test -n "$gl_cv_host_cpu_c_abi"; then
-       case "$gl_cv_host_cpu_c_abi" in
-         i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
-           gl_cv_host_cpu_c_abi_32bit=yes ;;
-         x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
-           gl_cv_host_cpu_c_abi_32bit=no ;;
-         *)
-           gl_cv_host_cpu_c_abi_32bit=unknown ;;
-       esac
-     else
-       case "$host_cpu" in
-
-         # CPUs that only support a 32-bit ABI.
-         arc \
-         | bfin \
-         | cris* \
-         | csky \
-         | epiphany \
-         | ft32 \
-         | h8300 \
-         | m68k \
-         | microblaze | microblazeel \
-         | nds32 | nds32le | nds32be \
-         | nios2 | nios2eb | nios2el \
-         | or1k* \
-         | or32 \
-         | sh | sh[1234] | sh[1234]e[lb] \
-         | tic6x \
-         | xtensa* )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         # CPUs that only support a 64-bit ABI.
-changequote(,)dnl
-         alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
-         | mmix )
-changequote([,])dnl
-           gl_cv_host_cpu_c_abi_32bit=no
-           ;;
-
-changequote(,)dnl
-         i[34567]86 )
-changequote([,])dnl
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         x86_64 )
-           # On x86_64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
-           # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
-           #   with native Windows (mingw, MSVC).
-           # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if (defined __x86_64__ || defined __amd64__ \
-                       || defined _M_X64 || defined _M_AMD64) \
-                      && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         arm* | aarch64 )
-           # Assume arm with EABI.
-           # On arm64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
-           # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
-           # On hppa, the C compiler may be generating 32-bit code or 64-bit
-           # code. In the latter case, it defines _LP64 and __LP64__.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#ifdef __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         ia64* )
-           # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
-           # 32-bit code. In the latter case, it defines _ILP32.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#ifdef _ILP32
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=yes],
-             [gl_cv_host_cpu_c_abi_32bit=no])
-           ;;
-
-         mips* )
-           # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
-           # at 32.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         powerpc* )
-           # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
-           # No need to distinguish them here; the caller may distinguish
-           # them based on the OS.
-           # On powerpc64 systems, the C compiler may still be generating
-           # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
-           # be generating 64-bit code.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __powerpc64__ || defined __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         rs6000 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         riscv32 | riscv64 )
-           # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
-           # Size of 'long' and 'void *':
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __LP64__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         s390* )
-           # On s390x, the C compiler may be generating 64-bit (= s390x) code
-           # or 31-bit (= s390) code.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __LP64__ || defined __s390x__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         sparc | sparc64 )
-           # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
-           # C compiler still generates 32-bit code.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __sparcv9 || defined __arch64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         *)
-           gl_cv_host_cpu_c_abi_32bit=unknown
-           ;;
-       esac
-     fi
-    ])
-
-  HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
-])
-
-# iconv.m4 serial 24
-dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.64])
-
-dnl Note: AM_ICONV is documented in the GNU gettext manual
-dnl <https://www.gnu.org/software/gettext/manual/html_node/AM_005fICONV.html>.
-dnl Don't make changes that are incompatible with that documentation!
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[
-#include <stdlib.h>
-#include <iconv.h>
-         ]],
-         [[iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);]])],
-      [am_cv_func_iconv=yes])
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-           ]],
-           [[iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);]])],
-        [am_cv_lib_iconv=yes]
-        [am_cv_func_iconv=yes])
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
-      dnl Solaris 10.
-      am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      am_cv_func_iconv_works=no
-      for ac_iconv_const in '' 'const'; do
-        AC_RUN_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <iconv.h>
-#include <string.h>
-
-#ifndef ICONV_CONST
-# define ICONV_CONST $ac_iconv_const
-#endif
-             ]],
-             [[int result = 0;
-  /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from
-     successful returns.  This is even documented in
-     <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\263";
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  {
-    /* Try standardized names.  */
-    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
-    /* Try IRIX, OSF/1 names.  */
-    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
-    /* Try AIX names.  */
-    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
-    /* Try HP-UX names.  */
-    iconv_t cd4 = iconv_open ("utf8", "eucJP");
-    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
-        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
-    if (cd1 != (iconv_t)(-1))
-      iconv_close (cd1);
-    if (cd2 != (iconv_t)(-1))
-      iconv_close (cd2);
-    if (cd3 != (iconv_t)(-1))
-      iconv_close (cd3);
-    if (cd4 != (iconv_t)(-1))
-      iconv_close (cd4);
-  }
-  return result;
-]])],
-          [am_cv_func_iconv_works=yes], ,
-          [case "$host_os" in
-             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-             *)            am_cv_func_iconv_works="guessing yes" ;;
-           esac])
-        test "$am_cv_func_iconv_works" = no || break
-      done
-      LIBS="$am_save_LIBS"
-    ])
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-    AC_DEFINE([HAVE_ICONV], [1],
-      [Define if you have the iconv() function and it works.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST([LIBICONV])
-  AC_SUBST([LTLIBICONV])
-])
-
-dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
-AC_DEFUN_ONCE([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([whether iconv is compatible with its POSIX signature],
-      [gl_cv_iconv_nonconst],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-            ]],
-            [[]])],
-         [gl_cv_iconv_nonconst=yes],
-         [gl_cv_iconv_nonconst=no])
-      ])
-  else
-    dnl When compiling GNU libiconv on a system that does not have iconv yet,
-    dnl pick the POSIX compliant declaration without 'const'.
-    gl_cv_iconv_nonconst=yes
-  fi
-  if test $gl_cv_iconv_nonconst = yes; then
-    iconv_arg1=""
-  else
-    iconv_arg1="const"
-  fi
-  AC_DEFINE_UNQUOTED([ICONV_CONST], [$iconv_arg1],
-    [Define as const if the declaration of iconv() needs const.])
-  dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
-  m4_ifdef([gl_ICONV_H_DEFAULTS],
-    [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
-     if test $gl_cv_iconv_nonconst != yes; then
-       ICONV_CONST="const"
-     fi
-    ])
-])
-
 # include_next.m4 serial 26
 dnl Copyright (C) 2006-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -6805,72 +5455,6 @@ AC_DEFUN([gl_NEXT_HEADERS_INTERNAL],
 # this fallback is safe for all earlier autoconf versions.
 m4_define_default([AC_LANG_DEFINES_PROVIDED])
 
-# intlmacosx.m4 serial 8 (gettext-0.20.2)
-dnl Copyright (C) 2004-2014, 2016, 2019-2022 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on Mac OS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in Mac OS X 10.4.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    [gt_cv_func_CFPreferencesCopyAppValue],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFPreferences.h>]],
-          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
-      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent,
-  dnl because in macOS 10.13.4 it has the following behaviour:
-  dnl When two or more languages are specified in the
-  dnl "System Preferences > Language & Region > Preferred Languages" panel,
-  dnl it returns en_CC where CC is the territory (even when English is not among
-  dnl the preferred languages!).  What we want instead is what
-  dnl CFLocaleCopyCurrent returned in earlier macOS releases and what
-  dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
-  dnl first among the preferred languages and CC is the territory.
-  AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFLocale.h>]],
-          [[CFLocaleCopyPreferredLanguages();]])],
-       [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
-       [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
-      [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
-     || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
-
 # inttypes.m4 serial 36
 dnl Copyright (C) 2006-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -7233,1313 +5817,6 @@ AC_DEFUN([gl_LARGEFILE],
   esac
 ])
 
-# lib-ld.m4 serial 10
-dnl Copyright (C) 1996-2003, 2009-2022 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
-
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-2.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-        [assume the C compiler uses GNU ld [default=no]])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-if test -n "$LD"; then
-  AC_MSG_CHECKING([for ld])
-elif test "$GCC" = yes; then
-  AC_MSG_CHECKING([for ld used by $CC])
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-if test -n "$LD"; then
-  # Let the user override the test with a path.
-  :
-else
-  AC_CACHE_VAL([acl_cv_path_LD],
-  [
-    acl_cv_path_LD= # Final result of this test
-    ac_prog=ld # Program to search in $PATH
-    if test "$GCC" = yes; then
-      # Check if gcc -print-prog-name=ld gives a path.
-      case $host in
-        *-*-mingw*)
-          # gcc leaves a trailing carriage return which upsets mingw
-          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-        *)
-          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
-      esac
-      case $acl_output in
-        # Accept absolute paths.
-        [[\\/]]* | ?:[[\\/]]*)
-          re_direlt='/[[^/]][[^/]]*/\.\./'
-          # Canonicalize the pathname of ld
-          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
-          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
-            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
-          done
-          # Got the pathname. No search in PATH is needed.
-          acl_cv_path_LD="$acl_output"
-          ac_prog=
-          ;;
-        "")
-          # If it fails, then pretend we aren't using GCC.
-          ;;
-        *)
-          # If it is relative, then search for the first ld in PATH.
-          with_gnu_ld=unknown
-          ;;
-      esac
-    fi
-    if test -n "$ac_prog"; then
-      # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-      for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
-        test -z "$ac_dir" && ac_dir=.
-        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-          acl_cv_path_LD="$ac_dir/$ac_prog"
-          # Check to see if the program is GNU ld.  I'd rather use --version,
-          # but apparently some variants of GNU ld only accept -v.
-          # Break only if it was the GNU/non-GNU ld that we prefer.
-          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-            *GNU* | *'with BFD'*)
-              test "$with_gnu_ld" != no && break
-              ;;
-            *)
-              test "$with_gnu_ld" != yes && break
-              ;;
-          esac
-        fi
-      done
-      IFS="$acl_save_ifs"
-    fi
-    case $host in
-      *-*-aix*)
-        AC_COMPILE_IFELSE(
-          [AC_LANG_SOURCE(
-             [[#if defined __powerpc64__ || defined __LP64__
-                int ok;
-               #else
-                error fail
-               #endif
-             ]])],
-          [# The compiler produces 64-bit code. Add option '-b64' so that the
-           # linker groks 64-bit object files.
-           case "$acl_cv_path_LD " in
-             *" -b64 "*) ;;
-             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
-           esac
-          ], [])
-        ;;
-      sparc64-*-netbsd*)
-        AC_COMPILE_IFELSE(
-          [AC_LANG_SOURCE(
-             [[#if defined __sparcv9 || defined __arch64__
-                int ok;
-               #else
-                error fail
-               #endif
-             ]])],
-          [],
-          [# The compiler produces 32-bit code. Add option '-m elf32_sparc'
-           # so that the linker groks 32-bit object files.
-           case "$acl_cv_path_LD " in
-             *" -m elf32_sparc "*) ;;
-             *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
-           esac
-          ])
-        ;;
-    esac
-  ])
-  LD="$acl_cv_path_LD"
-fi
-if test -n "$LD"; then
-  AC_MSG_RESULT([$LD])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([no acceptable ld found in \$PATH])
-fi
-AC_LIB_PROG_LD_GNU
-])
-
-# lib-link.m4 serial 32
-dnl Copyright (C) 2001-2022 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.61])
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. The missing-message
-dnl defaults to 'no' and may contain additional hints for the user.
-dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
-dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
-    dnl because these -l options might require -L options that are present in
-    dnl LIBS. -l options benefit only from the -L options listed before it.
-    dnl Otherwise, add it to the front of LIBS, because it may be a static
-    dnl library that depends on another static library that is present in LIBS.
-    dnl Static libraries benefit only from the static libraries listed after
-    dnl it.
-    case " $LIB[]NAME" in
-      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
-      *)       LIBS="$LIB[]NAME $LIBS" ;;
-    esac
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([[$3]], [[$4]])],
-      [ac_cv_lib[]Name=yes],
-      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-    LIB[]NAME[]_PREFIX=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl   acl_libext,
-dnl   acl_shlibext,
-dnl   acl_libname_spec,
-dnl   acl_library_names_spec,
-dnl   acl_hardcode_libdir_flag_spec,
-dnl   acl_hardcode_libdir_separator,
-dnl   acl_hardcode_direct,
-dnl   acl_hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  dnl Complain if config.rpath is missing.
-  AC_REQUIRE_AUX_FILE([config.rpath])
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE([rpath],
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_FROMPACKAGE(name, package)
-dnl declares that libname comes from the given package. The configure file
-dnl will then not have a --with-libname-prefix option but a
-dnl --with-package-prefix option. Several libraries can come from the same
-dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
-dnl macro call that searches for libname.
-AC_DEFUN([AC_LIB_FROMPACKAGE],
-[
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_frompackage_]NAME, [$2])
-  popdef([NAME])
-  pushdef([PACK],[$2])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
-  popdef([PACKUP])
-  popdef([PACK])
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-    eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
-    eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
-  ])
-  AC_ARG_WITH(PACK[-prefix],
-[[  --with-]]PACK[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
-  --without-]]PACK[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-          eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
-          eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        additional_libdir2="$withval/$acl_libdirstem2"
-        additional_libdir3="$withval/$acl_libdirstem3"
-      fi
-    fi
-])
-  if test "X$additional_libdir2" = "X$additional_libdir"; then
-    additional_libdir2=
-  fi
-  if test "X$additional_libdir3" = "X$additional_libdir"; then
-    additional_libdir3=
-  fi
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  LIB[]NAME[]_PREFIX=
-  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
-  dnl computed. So it has to be reset here.
-  HAVE_LIB[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
-              if test "X$found_dir" = "X"; then
-                eval dir=\$$additional_libdir_variable
-                if test -n "$dir"; then
-                  dnl The same code as in the loop below:
-                  dnl First look for a shared library.
-                  if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                  dnl Then look for a static library.
-                  if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                fi
-              fi
-            done
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  dnl First look for a shared library.
-                  if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                  dnl Then look for a static library.
-                  if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$acl_hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem3 | */$acl_libdirstem3/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $dependency_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
-                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
-                      haveit=
-                      if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
-                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$dependency_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$dependency_libdir"; then
-                            dnl Really add $dependency_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$dependency_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$dependency_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$dependency_libdir"; then
-                            dnl Really add $dependency_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$dependency_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    dnl But on GNU systems, ignore -lc options, because
-                    dnl   - linking with libc is the default anyway,
-                    dnl   - linking with libc.a may produce an error
-                    dnl     "/usr/bin/ld: dynamic STT_GNU_IFUNC symbol `strcmp' with pointer equality in `/usr/lib/libc.a(strcmp.o)' can not be used when making an executable; recompile with -fPIE and relink with -pie"
-                    dnl     or may produce an executable that always crashes, see
-                    dnl     <https://lists.gnu.org/archive/html/grep-devel/2020-09/msg00052.html>.
-                    dep=`echo "X$dep" | sed -e 's/^X-l//'`
-                    if test "X$dep" != Xc \
-                       || case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) false ;;
-                            *)                          true ;;
-                          esac; then
-                      names_next_round="$names_next_round $dep"
-                    fi
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-  popdef([PACKLIBS])
-  popdef([PACKUP])
-  popdef([PACK])
-  popdef([NAME])
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
-
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
-[
-  AC_REQUIRE([AC_LIB_RPATH])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  $1=
-  if test "$enable_rpath" != no; then
-    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-      dnl Use an explicit option to hardcode directories into the resulting
-      dnl binary.
-      rpathdirs=
-      next=
-      for opt in $2; do
-        if test -n "$next"; then
-          dir="$next"
-          dnl No need to hardcode the standard /usr/lib.
-          if test "X$dir" != "X/usr/$acl_libdirstem" \
-             && test "X$dir" != "X/usr/$acl_libdirstem2" \
-             && test "X$dir" != "X/usr/$acl_libdirstem3"; then
-            rpathdirs="$rpathdirs $dir"
-          fi
-          next=
-        else
-          case $opt in
-            -L) next=yes ;;
-            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
-                 dnl No need to hardcode the standard /usr/lib.
-                 if test "X$dir" != "X/usr/$acl_libdirstem" \
-                    && test "X$dir" != "X/usr/$acl_libdirstem2" \
-                    && test "X$dir" != "X/usr/$acl_libdirstem3"; then
-                   rpathdirs="$rpathdirs $dir"
-                 fi
-                 next= ;;
-            *) next= ;;
-          esac
-        fi
-      done
-      if test "X$rpathdirs" != "X"; then
-        if test -n ""$3""; then
-          dnl libtool is used for linking. Use -R options.
-          for dir in $rpathdirs; do
-            $1="${$1}${$1:+ }-R$dir"
-          done
-        else
-          dnl The linker is used for linking directly.
-          if test -n "$acl_hardcode_libdir_separator"; then
-            dnl Weird platform: only the last -rpath option counts, the user
-            dnl must pass all path elements in one option.
-            alldirs=
-            for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
-            done
-            acl_save_libdir="$libdir"
-            libdir="$alldirs"
-            eval flag=\"$acl_hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
-            $1="$flag"
-          else
-            dnl The -rpath options are cumulative.
-            for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
-              libdir="$dir"
-              eval flag=\"$acl_hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
-              $1="${$1}${$1:+ }$flag"
-            done
-          fi
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST([$1])
-])
-
-# lib-prefix.m4 serial 20
-dnl Copyright (C) 2001-2005, 2008-2022 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH([lib-prefix],
-[[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir]],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_PREPARE_MULTILIB creates
-dnl - a function acl_is_expected_elfclass, that tests whether standard input
-dn;   has a 32-bit or 64-bit ELF header, depending on the host CPU ABI,
-dnl - 3 variables acl_libdirstem, acl_libdirstem2, acl_libdirstem3, containing
-dnl   the basename of the libdir to try in turn, either "lib" or "lib64" or
-dnl   "lib/64" or "lib32" or "lib/sparcv9" or "lib/amd64" or similar.
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
-  dnl There is no formal standard regarding lib, lib32, and lib64.
-  dnl On most glibc systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. However, on
-  dnl Arch Linux based distributions, it's the opposite: 32-bit libraries go
-  dnl under $prefix/lib32 and 64-bit libraries go under $prefix/lib.
-  dnl We determine the compiler's default mode by looking at the compiler's
-  dnl library search path. If at least one of its elements ends in /lib64 or
-  dnl points to a directory whose absolute pathname ends in /lib64, we use that
-  dnl for 64-bit ABIs. Similarly for 32-bit ABIs. Otherwise we use the default,
-  dnl namely "lib".
-  dnl On Solaris systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
-  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
-
-  AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf],
-    [AC_EGREP_CPP([Extensible Linking Format],
-       [#if defined __ELF__ || (defined __linux__ && defined __EDG__)
-        Extensible Linking Format
-        #endif
-       ],
-       [gl_cv_elf=yes],
-       [gl_cv_elf=no])
-    ])
-  if test $gl_cv_elf = yes; then
-    # Extract the ELF class of a file (5th byte) in decimal.
-    # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
-    if od -A x < /dev/null >/dev/null 2>/dev/null; then
-      # Use POSIX od.
-      func_elfclass ()
-      {
-        od -A n -t d1 -j 4 -N 1
-      }
-    else
-      # Use BSD hexdump.
-      func_elfclass ()
-      {
-        dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "'
-        echo
-      }
-    fi
-    # Use 'expr', not 'test', to compare the values of func_elfclass, because on
-    # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002,
-    # not 1 or 2.
-changequote(,)dnl
-    case $HOST_CPU_C_ABI_32BIT in
-      yes)
-        # 32-bit ABI.
-        acl_is_expected_elfclass ()
-        {
-          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 1 > /dev/null
-        }
-        ;;
-      no)
-        # 64-bit ABI.
-        acl_is_expected_elfclass ()
-        {
-          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 2 > /dev/null
-        }
-        ;;
-      *)
-        # Unknown.
-        acl_is_expected_elfclass ()
-        {
-          :
-        }
-        ;;
-    esac
-changequote([,])dnl
-  else
-    acl_is_expected_elfclass ()
-    {
-      :
-    }
-  fi
-
-  dnl Allow the user to override the result by setting acl_cv_libdirstems.
-  AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
-    [acl_cv_libdirstems],
-    [dnl Try 'lib' first, because that's the default for libdir in GNU, see
-     dnl <https://www.gnu.org/prep/standards/html_node/Directory-Variables.html>.
-     acl_libdirstem=lib
-     acl_libdirstem2=
-     acl_libdirstem3=
-     case "$host_os" in
-       solaris*)
-         dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
-         dnl <https://docs.oracle.com/cd/E19253-01/816-5138/dev-env/index.html>.
-         dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
-         dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
-         dnl symlink is missing, so we set acl_libdirstem2 too.
-         if test $HOST_CPU_C_ABI_32BIT = no; then
-           acl_libdirstem2=lib/64
-           case "$host_cpu" in
-             sparc*)        acl_libdirstem3=lib/sparcv9 ;;
-             i*86 | x86_64) acl_libdirstem3=lib/amd64 ;;
-           esac
-         fi
-         ;;
-       *)
-         dnl If $CC generates code for a 32-bit ABI, the libraries are
-         dnl surely under $prefix/lib or $prefix/lib32, not $prefix/lib64.
-         dnl Similarly, if $CC generates code for a 64-bit ABI, the libraries
-         dnl are surely under $prefix/lib or $prefix/lib64, not $prefix/lib32.
-         dnl Find the compiler's search path. However, non-system compilers
-         dnl sometimes have odd library search paths. But we can't simply invoke
-         dnl '/usr/bin/gcc -print-search-dirs' because that would not take into
-         dnl account the -m32/-m31 or -m64 options from the $CC or $CFLAGS.
-         searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
-                     | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-         if test $HOST_CPU_C_ABI_32BIT != no; then
-           # 32-bit or unknown ABI.
-           if test -d /usr/lib32; then
-             acl_libdirstem2=lib32
-           fi
-         fi
-         if test $HOST_CPU_C_ABI_32BIT != yes; then
-           # 64-bit or unknown ABI.
-           if test -d /usr/lib64; then
-             acl_libdirstem3=lib64
-           fi
-         fi
-         if test -n "$searchpath"; then
-           acl_save_IFS="${IFS= 	}"; IFS=":"
-           for searchdir in $searchpath; do
-             if test -d "$searchdir"; then
-               case "$searchdir" in
-                 */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;;
-                 */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;;
-                 */../ | */.. )
-                   # Better ignore directories of this form. They are misleading.
-                   ;;
-                 *) searchdir=`cd "$searchdir" && pwd`
-                    case "$searchdir" in
-                      */lib32 ) acl_libdirstem2=lib32 ;;
-                      */lib64 ) acl_libdirstem3=lib64 ;;
-                    esac ;;
-               esac
-             fi
-           done
-           IFS="$acl_save_IFS"
-           if test $HOST_CPU_C_ABI_32BIT = yes; then
-             # 32-bit ABI.
-             acl_libdirstem3=
-           fi
-           if test $HOST_CPU_C_ABI_32BIT = no; then
-             # 64-bit ABI.
-             acl_libdirstem2=
-           fi
-         fi
-         ;;
-     esac
-     test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-     test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
-     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
-    ])
-  dnl Decompose acl_cv_libdirstems into acl_libdirstem, acl_libdirstem2, and
-  dnl acl_libdirstem3.
-changequote(,)dnl
-  acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
-  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
-  acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
-changequote([,])dnl
-])
-
 # libunistring-base.m4 serial 7
 dnl Copyright (C) 2010-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -9230,39 +6507,6 @@ AC_DEFUN_ONCE([gl_MULTIARCH],
   AC_SUBST([APPLE_UNIVERSAL_BUILD])
 ])
 
-# nls.m4 serial 6 (gettext-0.20.2)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2022 Free
-dnl Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
 # nocrash.m4 serial 5
 dnl Copyright (C) 2005, 2009-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -9597,549 +6841,6 @@ AC_DEFUN([gl_PATHMAX_SNIPPET_PREREQ],
   AC_CHECK_HEADERS_ONCE([unistd.h sys/param.h])
 ])
 
-# po.m4 serial 31 (gettext-0.20.2)
-dnl Copyright (C) 1995-2014, 2016, 2018-2022 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  AC_REQUIRE([AC_PROG_SED])dnl
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Release version of the gettext macros. This is used to ensure that
-  dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.20])
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-
-  dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([GMSGFMT_015])
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
-  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([XGETTEXT_015])
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
-  dnl Test whether it is GNU msgmerge >= 0.20.
-  if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
-    MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
-  else
-    dnl Test whether it is GNU msgmerge >= 0.12.
-    if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
-      MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
-    else
-      dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is
-      dnl slow. But this is not a big problem, as such old gettext versions are
-      dnl hardly in use any more.
-      MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
-    fi
-  fi
-  AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION])
-
-  dnl Support for AM_XGETTEXT_OPTION.
-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
-  AC_CONFIG_COMMANDS([po-directories], [[
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done]],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
-    OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
-
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  tab=`printf '\t'`
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
-  # Seen the first line of the variable definition.
-  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
-
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
-    ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      fi
-      for desiredlang in $desiredlanguages; do
-        # Use the presentlang catalog if desiredlang is
-        #   a. equal to presentlang, or
-        #   b. a variant of presentlang (because in this case,
-        #      presentlang can be used as a fallback for messages
-        #      which are not translated in the desiredlang catalog).
-        case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
-
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  tab=`printf '\t'`
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-])
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
-  XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
-  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
-
-# progtest.m4 serial 9 (gettext-0.21.1)
-dnl Copyright (C) 1996-2003, 2005, 2008-2022 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ([2.53])
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL([ac_cv_path_$1],
-[case "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in m4_if([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-m4_if([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-    ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test m4_if([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$][$1])
-else
-  AC_MSG_RESULT([no])
-fi
-AC_SUBST([$1])dnl
-])
-
 # raise.m4 serial 4
 dnl Copyright (C) 2011-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -14140,6 +10841,281 @@ gl_COMPILER_PREPARE_CHECK_DECL
 # Automake to include this file after all other gnulib .m4 files.
 AC_DEFUN([gl_ZZGNULIB])
 
+# build-to-host.m4
+# serial 5
+dnl Copyright (C) 2023-2024 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl Written by Bruno Haible.
+
+dnl When the build environment ($build_os) is different from the target runtime
+dnl environment ($host_os), file names may need to be converted from the build
+dnl environment syntax to the target runtime environment syntax. This is
+dnl because the Makefiles are executed (mostly) by build environment tools and
+dnl therefore expect file names in build environment syntax, whereas the runtime
+dnl expects file names in target runtime environment syntax.
+dnl
+dnl For example, if $build_os = cygwin and $host_os = mingw32, filenames need
+dnl be converted from Cygwin syntax to native Windows syntax:
+dnl   /cygdrive/c/foo/bar -> C:\foo\bar
+dnl   /usr/local/share    -> C:\cygwin64\usr\local\share
+dnl
+dnl gl_BUILD_TO_HOST([somedir])
+dnl This macro takes as input an AC_SUBSTed variable 'somedir', which must
+dnl already have its final value assigned, and produces two additional
+dnl AC_SUBSTed variables 'somedir_c' and 'somedir_c_make', that designate the
+dnl same file name value, just in different syntax:
+dnl   - somedir_c       is the file name in target runtime environment syntax,
+dnl                     as a C string (starting and ending with a double-quote,
+dnl                     and with escaped backslashes and double-quotes in
+dnl                     between).
+dnl   - somedir_c_make  is the same thing, escaped for use in a Makefile.
+
+AC_DEFUN([gl_BUILD_TO_HOST],
+[
+  AC_REQUIRE([AC_CANONICAL_BUILD])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_BUILD_TO_HOST_INIT])
+
+  dnl Define somedir_c.
+  gl_final_[$1]="$[$1]"
+  dnl Translate it from build syntax to host syntax.
+  case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw* | windows*)
+          gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;;
+      esac
+      ;;
+  esac
+  dnl Convert it to C string syntax.
+  [$1]_c=`printf '%s\n' "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+  [$1]_c='"'"$[$1]_c"'"'
+  AC_SUBST([$1_c])
+
+  dnl Define somedir_c_make.
+  [$1]_c_make=`printf '%s\n' "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+  dnl Use the substituted somedir variable, when possible, so that the user
+  dnl may adjust somedir a posteriori when there are no special characters.
+  if test "$[$1]_c_make" = '\"'"${gl_final_[$1]}"'\"'; then
+    [$1]_c_make='\"$([$1])\"'
+  fi
+  AC_SUBST([$1_c_make])
+])
+
+dnl Some initializations for gl_BUILD_TO_HOST.
+AC_DEFUN([gl_BUILD_TO_HOST_INIT],
+[
+  gl_sed_double_backslashes='s/\\/\\\\/g'
+  gl_sed_escape_doublequotes='s/"/\\"/g'
+changequote(,)dnl
+  gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
+changequote([,])dnl
+  gl_sed_escape_for_make_2='s,\$,\\$$,g'
+  dnl Find out how to remove carriage returns from output. Solaris /usr/ucb/tr
+  dnl does not understand '\r'.
+  case `echo r | tr -d '\r'` in
+    '') gl_tr_cr='\015' ;;
+    *)  gl_tr_cr='\r' ;;
+  esac
+])
+
+
+dnl The following macros are convenience invocations of gl_BUILD_TO_HOST
+dnl for some of the variables that are defined by Autoconf.
+dnl To do so for _all_ the possible variables, use the module 'configmake'.
+
+dnl Defines bindir_c and bindir_c_make.
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_BINDIR],
+[
+  dnl Find the final value of bindir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_bindir="${bindir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval bindir="$bindir"
+  gl_BUILD_TO_HOST([bindir])
+  bindir="${gl_saved_bindir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines datadir_c and datadir_c_make,
+dnl where datadir = $(datarootdir)
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_DATADIR],
+[
+  dnl Find the final value of datadir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_datadir="${datadir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval datadir="$datadir"
+  gl_BUILD_TO_HOST([datadir])
+  datadir="${gl_saved_datadir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines libdir_c and libdir_c_make.
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_LIBDIR],
+[
+  dnl Find the final value of libdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libdir="${libdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libdir="$libdir"
+  gl_BUILD_TO_HOST([libdir])
+  libdir="${gl_saved_libdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines libexecdir_c and libexecdir_c_make.
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_LIBEXECDIR],
+[
+  dnl Find the final value of libexecdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libexecdir="${libexecdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libexecdir="$libexecdir"
+  gl_BUILD_TO_HOST([libexecdir])
+  libexecdir="${gl_saved_libexecdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines localedir_c and localedir_c_make.
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_LOCALEDIR],
+[
+  dnl Find the final value of localedir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
+  gl_BUILD_TO_HOST([localedir])
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines pkgdatadir_c and pkgdatadir_c_make,
+dnl where pkgdatadir = $(datadir)/$(PACKAGE)
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_PKGDATADIR],
+[
+  dnl Find the final value of pkgdatadir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_datadir="${datadir}"
+  gl_saved_pkgdatadir="${pkgdatadir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval datadir="$datadir"
+  eval pkgdatadir="$pkgdatadir"
+  gl_BUILD_TO_HOST([pkgdatadir])
+  pkgdatadir="${gl_saved_pkgdatadir}"
+  datadir="${gl_saved_datadir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines pkglibdir_c and pkglibdir_c_make,
+dnl where pkglibdir = $(libdir)/$(PACKAGE)
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_PKGLIBDIR],
+[
+  dnl Find the final value of pkglibdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libdir="${libdir}"
+  gl_saved_pkglibdir="${pkglibdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libdir="$libdir"
+  eval pkglibdir="$pkglibdir"
+  gl_BUILD_TO_HOST([pkglibdir])
+  pkglibdir="${gl_saved_pkglibdir}"
+  libdir="${gl_saved_libdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines pkglibexecdir_c and pkglibexecdir_c_make,
+dnl where pkglibexecdir = $(libexecdir)/$(PACKAGE)
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_PKGLIBEXECDIR],
+[
+  dnl Find the final value of pkglibexecdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libexecdir="${libexecdir}"
+  gl_saved_pkglibexecdir="${pkglibexecdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libexecdir="$libexecdir"
+  eval pkglibexecdir="$pkglibexecdir"
+  gl_BUILD_TO_HOST([pkglibexecdir])
+  pkglibexecdir="${gl_saved_pkglibexecdir}"
+  libexecdir="${gl_saved_libexecdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+
 dnl Copyright (C) 1993-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -14234,9 +11210,2651 @@ yes
   fi
 ])
 
+# gettext.m4
+# serial 81 (gettext-0.23)
+dnl Copyright (C) 1995-2014, 2016, 2018-2024 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Lesser General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Lesser General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <bruno@clisp.org>, 2000-2024.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL must be one of 'external', 'use-libtool', 'here'.
+dnl    INTLSYMBOL should be 'external' for packages other than GNU gettext.
+dnl    It should be 'use-libtool' for the packages 'gettext-runtime' and
+dnl    'gettext-tools'.
+dnl    It should be 'here' for the package 'gettext-runtime/intl'.
+dnl    If INTLSYMBOL is 'here', then a libtool library
+dnl    $(top_builddir)/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED).
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value '$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [m4_if([$1], [here], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old],
+    [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
+])])
+  m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_building_libintl_in_same_build_tree],
+    m4_if([$1], [use-libtool], [yes], [m4_if([$1], [here], [yes], [no])]))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+  dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
+  m4_if(gt_building_libintl_in_same_build_tree, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AC_REQUIRE([AM_NLS])
+
+  m4_if(gt_building_libintl_in_same_build_tree, yes, [
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    m4_if(gt_building_libintl_in_same_build_tree, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH([included-gettext],
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+               ]],
+               [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+               ]])],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          m4_if(gt_building_libintl_in_same_build_tree, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            [$gt_func_gnugettext_libintl],
+           [gt_saved_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_saved_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_LINK_IFELSE(
+              [AC_LANG_PROGRAM(
+                 [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+                 ]],
+                 [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+                 ]])],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
+            dnl Now see whether libintl exists and depends on libiconv or other
+            dnl OS dependent libraries, specifically on macOS and AIX.
+            gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
+            AC_REQUIRE([AC_CANONICAL_HOST])
+            case "$host_os" in
+              aix*) gt_LIBINTL_EXTRA="-lpthread" ;;
+            esac
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+               && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+              LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
+              AC_LINK_IFELSE(
+                [AC_LANG_PROGRAM(
+                   [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+                   ]],
+                   [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+                   ]])],
+                [LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA"
+                 eval "$gt_func_gnugettext_libintl=yes"
+                ])
+            fi
+            CPPFLAGS="$gt_saved_CPPFLAGS"
+            LIBS="$gt_saved_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools \
+                && test "$PACKAGE" != libintl; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    m4_if(gt_building_libintl_in_same_build_tree, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
+        LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE([ENABLE_NLS], [1],
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE([HAVE_GETTEXT], [1],
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  m4_if(gt_building_libintl_in_same_build_tree, yes, [
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST([USE_INCLUDED_LIBINTL])
+    AC_SUBST([CATOBJEXT])
+  ])
+
+  m4_if(gt_building_libintl_in_same_build_tree, yes, [], [
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLLIBS="$LIBINTL"
+    AC_SUBST([INTLLIBS])
+  ])
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  AC_SUBST([POSUB])
+
+  dnl Define localedir_c and localedir_c_make.
+  gl_BUILD_TO_HOST_LOCALEDIR
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+
+
+dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
+
+# host-cpu-c-abi.m4
+# serial 18
+dnl Copyright (C) 2002-2024 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Bruno Haible and Sam Steingold.
+
+dnl Sets the HOST_CPU variable to the canonical name of the CPU.
+dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its
+dnl C language ABI (application binary interface).
+dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in
+dnl config.h.
+dnl
+dnl This canonical name can be used to select a particular assembly language
+dnl source file that will interoperate with C code on the given host.
+dnl
+dnl For example:
+dnl * 'i386' and 'sparc' are different canonical names, because code for i386
+dnl   will not run on SPARC CPUs and vice versa. They have different
+dnl   instruction sets.
+dnl * 'sparc' and 'sparc64' are different canonical names, because code for
+dnl   'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code
+dnl   contains 32-bit instructions, whereas 'sparc64' code contains 64-bit
+dnl   instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit
+dnl   mode, but not both.
+dnl * 'mips' and 'mipsn32' are different canonical names, because they use
+dnl   different argument passing and return conventions for C functions, and
+dnl   although the instruction set of 'mips' is a large subset of the
+dnl   instruction set of 'mipsn32'.
+dnl * 'mipsn32' and 'mips64' are different canonical names, because they use
+dnl   different sizes for the C types like 'int' and 'void *', and although
+dnl   the instruction sets of 'mipsn32' and 'mips64' are the same.
+dnl * The same canonical name is used for different endiannesses. You can
+dnl   determine the endianness through preprocessor symbols:
+dnl   - 'arm': test __ARMEL__.
+dnl   - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL.
+dnl   - 'powerpc64': test __BIG_ENDIAN__ vs. __LITTLE_ENDIAN__.
+dnl * The same name 'i386' is used for CPUs of type i386, i486, i586
+dnl   (Pentium), AMD K7, Pentium II, Pentium IV, etc., because
+dnl   - Instructions that do not exist on all of these CPUs (cmpxchg,
+dnl     MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your
+dnl     assembly language source files use such instructions, you will
+dnl     need to make the distinction.
+dnl   - Speed of execution of the common instruction set is reasonable across
+dnl     the entire family of CPUs. If you have assembly language source files
+dnl     that are optimized for particular CPU types (like GNU gmp has), you
+dnl     will need to make the distinction.
+dnl   See <https://en.wikipedia.org/wiki/X86_instruction_listings>.
+AC_DEFUN([gl_HOST_CPU_C_ABI],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_C_ASM])
+  AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi],
+    [case "$host_cpu" in
+
+changequote(,)dnl
+       i[34567]86 )
+changequote([,])dnl
+         gl_cv_host_cpu_c_abi=i386
+         ;;
+
+       x86_64 )
+         # On x86_64 systems, the C compiler may be generating code in one of
+         # these ABIs:
+         # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
+         # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
+         #   with native Windows (mingw, MSVC).
+         # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
+         # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#if (defined __x86_64__ || defined __amd64__ \
+                     || defined _M_X64 || defined _M_AMD64)
+                 int ok;
+                #else
+                 error fail
+                #endif
+              ]])],
+           [AC_COMPILE_IFELSE(
+              [AC_LANG_SOURCE(
+                 [[#if defined __ILP32__ || defined _ILP32
+                    int ok;
+                   #else
+                    error fail
+                   #endif
+                 ]])],
+              [gl_cv_host_cpu_c_abi=x86_64-x32],
+              [gl_cv_host_cpu_c_abi=x86_64])],
+           [gl_cv_host_cpu_c_abi=i386])
+         ;;
+
+changequote(,)dnl
+       alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] )
+changequote([,])dnl
+         gl_cv_host_cpu_c_abi=alpha
+         ;;
+
+       arm* | aarch64 )
+         # Assume arm with EABI.
+         # On arm64 systems, the C compiler may be generating code in one of
+         # these ABIs:
+         # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
+         # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
+         # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#ifdef __aarch64__
+                 int ok;
+                #else
+                 error fail
+                #endif
+              ]])],
+           [AC_COMPILE_IFELSE(
+              [AC_LANG_SOURCE(
+                [[#if defined __ILP32__ || defined _ILP32
+                   int ok;
+                  #else
+                   error fail
+                  #endif
+                ]])],
+              [gl_cv_host_cpu_c_abi=arm64-ilp32],
+              [gl_cv_host_cpu_c_abi=arm64])],
+           [# Don't distinguish little-endian and big-endian arm, since they
+            # don't require different machine code for simple operations and
+            # since the user can distinguish them through the preprocessor
+            # defines __ARMEL__ vs. __ARMEB__.
+            # But distinguish arm which passes floating-point arguments and
+            # return values in integer registers (r0, r1, ...) - this is
+            # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which
+            # passes them in float registers (s0, s1, ...) and double registers
+            # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer
+            # sets the preprocessor defines __ARM_PCS (for the first case) and
+            # __ARM_PCS_VFP (for the second case), but older GCC does not.
+            echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c
+            # Look for a reference to the register d0 in the .s file.
+            AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
+            if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then
+              gl_cv_host_cpu_c_abi=armhf
+            else
+              gl_cv_host_cpu_c_abi=arm
+            fi
+            rm -f conftest*
+           ])
+         ;;
+
+       hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
+         # On hppa, the C compiler may be generating 32-bit code or 64-bit
+         # code. In the latter case, it defines _LP64 and __LP64__.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#ifdef __LP64__
+                 int ok;
+                #else
+                 error fail
+                #endif
+              ]])],
+           [gl_cv_host_cpu_c_abi=hppa64],
+           [gl_cv_host_cpu_c_abi=hppa])
+         ;;
+
+       ia64* )
+         # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
+         # 32-bit code. In the latter case, it defines _ILP32.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#ifdef _ILP32
+                 int ok;
+                #else
+                 error fail
+                #endif
+              ]])],
+           [gl_cv_host_cpu_c_abi=ia64-ilp32],
+           [gl_cv_host_cpu_c_abi=ia64])
+         ;;
+
+       mips* )
+         # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
+         # at 32.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
+                 int ok;
+                #else
+                 error fail
+                #endif
+              ]])],
+           [gl_cv_host_cpu_c_abi=mips64],
+           [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but
+            # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIN32.
+            # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but
+            # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIO32.
+            AC_COMPILE_IFELSE(
+              [AC_LANG_SOURCE(
+                 [[#if (_MIPS_SIM == _ABIN32)
+                    int ok;
+                   #else
+                    error fail
+                   #endif
+                 ]])],
+              [gl_cv_host_cpu_c_abi=mipsn32],
+              [gl_cv_host_cpu_c_abi=mips])])
+         ;;
+
+       powerpc* )
+         # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
+         # No need to distinguish them here; the caller may distinguish
+         # them based on the OS.
+         # On powerpc64 systems, the C compiler may still be generating
+         # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
+         # be generating 64-bit code.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#if defined __powerpc64__ || defined __LP64__
+                 int ok;
+                #else
+                 error fail
+                #endif
+              ]])],
+           [# On powerpc64, there are two ABIs on Linux: The AIX compatible
+            # one and the ELFv2 one. The latter defines _CALL_ELF=2.
+            AC_COMPILE_IFELSE(
+              [AC_LANG_SOURCE(
+                 [[#if defined _CALL_ELF && _CALL_ELF == 2
+                    int ok;
+                   #else
+                    error fail
+                   #endif
+                 ]])],
+              [gl_cv_host_cpu_c_abi=powerpc64-elfv2],
+              [gl_cv_host_cpu_c_abi=powerpc64])
+           ],
+           [gl_cv_host_cpu_c_abi=powerpc])
+         ;;
+
+       rs6000 )
+         gl_cv_host_cpu_c_abi=powerpc
+         ;;
+
+       riscv32 | riscv64 )
+         # There are 2 architectures (with variants): rv32* and rv64*.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#if __riscv_xlen == 64
+                  int ok;
+                #else
+                  error fail
+                #endif
+              ]])],
+           [cpu=riscv64],
+           [cpu=riscv32])
+         # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
+         # Size of 'long' and 'void *':
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#if defined __LP64__
+                  int ok;
+                #else
+                  error fail
+                #endif
+              ]])],
+           [main_abi=lp64],
+           [main_abi=ilp32])
+         # Float ABIs:
+         # __riscv_float_abi_double:
+         #   'float' and 'double' are passed in floating-point registers.
+         # __riscv_float_abi_single:
+         #   'float' are passed in floating-point registers.
+         # __riscv_float_abi_soft:
+         #   No values are passed in floating-point registers.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#if defined __riscv_float_abi_double
+                  int ok;
+                #else
+                  error fail
+                #endif
+              ]])],
+           [float_abi=d],
+           [AC_COMPILE_IFELSE(
+              [AC_LANG_SOURCE(
+                 [[#if defined __riscv_float_abi_single
+                     int ok;
+                   #else
+                     error fail
+                   #endif
+                 ]])],
+              [float_abi=f],
+              [float_abi=''])
+           ])
+         gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}"
+         ;;
+
+       s390* )
+         # On s390x, the C compiler may be generating 64-bit (= s390x) code
+         # or 31-bit (= s390) code.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#if defined __LP64__ || defined __s390x__
+                  int ok;
+                #else
+                  error fail
+                #endif
+              ]])],
+           [gl_cv_host_cpu_c_abi=s390x],
+           [gl_cv_host_cpu_c_abi=s390])
+         ;;
+
+       sparc | sparc64 )
+         # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
+         # C compiler still generates 32-bit code.
+         AC_COMPILE_IFELSE(
+           [AC_LANG_SOURCE(
+              [[#if defined __sparcv9 || defined __arch64__
+                 int ok;
+                #else
+                 error fail
+                #endif
+              ]])],
+           [gl_cv_host_cpu_c_abi=sparc64],
+           [gl_cv_host_cpu_c_abi=sparc])
+         ;;
+
+       *)
+         gl_cv_host_cpu_c_abi="$host_cpu"
+         ;;
+     esac
+    ])
+
+  dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same.
+  HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'`
+  HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi"
+  AC_SUBST([HOST_CPU])
+  AC_SUBST([HOST_CPU_C_ABI])
+
+  # This was
+  #   AC_DEFINE_UNQUOTED([__${HOST_CPU}__])
+  #   AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__])
+  # earlier, but KAI C++ 3.2d doesn't like this.
+  sed -e 's/-/_/g' >> confdefs.h <<EOF
+#ifndef __${HOST_CPU}__
+#define __${HOST_CPU}__ 1
+#endif
+#ifndef __${HOST_CPU_C_ABI}__
+#define __${HOST_CPU_C_ABI}__ 1
+#endif
+EOF
+  AH_TOP([/* CPU and C ABI indicator */
+#ifndef __i386__
+#undef __i386__
+#endif
+#ifndef __x86_64_x32__
+#undef __x86_64_x32__
+#endif
+#ifndef __x86_64__
+#undef __x86_64__
+#endif
+#ifndef __alpha__
+#undef __alpha__
+#endif
+#ifndef __arm__
+#undef __arm__
+#endif
+#ifndef __armhf__
+#undef __armhf__
+#endif
+#ifndef __arm64_ilp32__
+#undef __arm64_ilp32__
+#endif
+#ifndef __arm64__
+#undef __arm64__
+#endif
+#ifndef __hppa__
+#undef __hppa__
+#endif
+#ifndef __hppa64__
+#undef __hppa64__
+#endif
+#ifndef __ia64_ilp32__
+#undef __ia64_ilp32__
+#endif
+#ifndef __ia64__
+#undef __ia64__
+#endif
+#ifndef __loongarch64__
+#undef __loongarch64__
+#endif
+#ifndef __m68k__
+#undef __m68k__
+#endif
+#ifndef __mips__
+#undef __mips__
+#endif
+#ifndef __mipsn32__
+#undef __mipsn32__
+#endif
+#ifndef __mips64__
+#undef __mips64__
+#endif
+#ifndef __powerpc__
+#undef __powerpc__
+#endif
+#ifndef __powerpc64__
+#undef __powerpc64__
+#endif
+#ifndef __powerpc64_elfv2__
+#undef __powerpc64_elfv2__
+#endif
+#ifndef __riscv32__
+#undef __riscv32__
+#endif
+#ifndef __riscv64__
+#undef __riscv64__
+#endif
+#ifndef __riscv32_ilp32__
+#undef __riscv32_ilp32__
+#endif
+#ifndef __riscv32_ilp32f__
+#undef __riscv32_ilp32f__
+#endif
+#ifndef __riscv32_ilp32d__
+#undef __riscv32_ilp32d__
+#endif
+#ifndef __riscv64_ilp32__
+#undef __riscv64_ilp32__
+#endif
+#ifndef __riscv64_ilp32f__
+#undef __riscv64_ilp32f__
+#endif
+#ifndef __riscv64_ilp32d__
+#undef __riscv64_ilp32d__
+#endif
+#ifndef __riscv64_lp64__
+#undef __riscv64_lp64__
+#endif
+#ifndef __riscv64_lp64f__
+#undef __riscv64_lp64f__
+#endif
+#ifndef __riscv64_lp64d__
+#undef __riscv64_lp64d__
+#endif
+#ifndef __s390__
+#undef __s390__
+#endif
+#ifndef __s390x__
+#undef __s390x__
+#endif
+#ifndef __sh__
+#undef __sh__
+#endif
+#ifndef __sparc__
+#undef __sparc__
+#endif
+#ifndef __sparc64__
+#undef __sparc64__
+#endif
+])
+
+])
+
+
+dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI
+dnl (application binary interface) is a 32-bit one, to 'no' if it is a 64-bit
+dnl one.
+dnl This is a simplified variant of gl_HOST_CPU_C_ABI.
+AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit],
+    [case "$host_cpu" in
+
+       # CPUs that only support a 32-bit ABI.
+       arc \
+       | bfin \
+       | cris* \
+       | csky \
+       | epiphany \
+       | ft32 \
+       | h8300 \
+       | m68k \
+       | microblaze | microblazeel \
+       | nds32 | nds32le | nds32be \
+       | nios2 | nios2eb | nios2el \
+       | or1k* \
+       | or32 \
+       | sh | sh[1234] | sh[1234]e[lb] \
+       | tic6x \
+       | xtensa* )
+         gl_cv_host_cpu_c_abi_32bit=yes
+         ;;
+
+       # CPUs that only support a 64-bit ABI.
+changequote(,)dnl
+       alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
+       | mmix )
+changequote([,])dnl
+         gl_cv_host_cpu_c_abi_32bit=no
+         ;;
+
+       *)
+         if test -n "$gl_cv_host_cpu_c_abi"; then
+           dnl gl_HOST_CPU_C_ABI has already been run. Use its result.
+           case "$gl_cv_host_cpu_c_abi" in
+             i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+               gl_cv_host_cpu_c_abi_32bit=yes ;;
+             x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+               gl_cv_host_cpu_c_abi_32bit=no ;;
+             *)
+               gl_cv_host_cpu_c_abi_32bit=unknown ;;
+           esac
+         else
+           gl_cv_host_cpu_c_abi_32bit=unknown
+         fi
+         if test $gl_cv_host_cpu_c_abi_32bit = unknown; then
+           AC_COMPILE_IFELSE(
+             [AC_LANG_SOURCE(
+                [[int test_pointer_size[sizeof (void *) - 5];
+                ]])],
+             [gl_cv_host_cpu_c_abi_32bit=no],
+             [gl_cv_host_cpu_c_abi_32bit=yes])
+         fi
+         ;;
+     esac
+    ])
+
+  HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
+])
+
+# iconv.m4
+# serial 28
+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2024 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.64])
+
+dnl Note: AM_ICONV is documented in the GNU gettext manual
+dnl <https://www.gnu.org/software/gettext/manual/html_node/AM_005fICONV.html>.
+dnl Don't make changes that are incompatible with that documentation!
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
+  gl_saved_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[
+#include <stdlib.h>
+#include <iconv.h>
+         ]],
+         [[iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);]])],
+      [am_cv_func_iconv=yes])
+    if test "$am_cv_func_iconv" != yes; then
+      gl_saved_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+#include <stdlib.h>
+#include <iconv.h>
+           ]],
+           [[iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);]])],
+        [am_cv_lib_iconv=yes]
+        [am_cv_func_iconv=yes])
+      LIBS="$gl_saved_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
+      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
+      dnl Solaris 10, macOS 14.4.
+      gl_saved_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        AC_RUN_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[
+#include <iconv.h>
+#include <string.h>
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+             ]],
+             [[int result = 0;
+  /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from
+     successful returns.  This is even documented in
+     <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\263";
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 4;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 16;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  {
+    /* Try standardized names.  */
+    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+    /* Try IRIX, OSF/1 names.  */
+    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+    /* Try AIX names.  */
+    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+    /* Try HP-UX names.  */
+    iconv_t cd4 = iconv_open ("utf8", "eucJP");
+    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+      result |= 32;
+    if (cd1 != (iconv_t)(-1))
+      iconv_close (cd1);
+    if (cd2 != (iconv_t)(-1))
+      iconv_close (cd2);
+    if (cd3 != (iconv_t)(-1))
+      iconv_close (cd3);
+    if (cd4 != (iconv_t)(-1))
+      iconv_close (cd4);
+  }
+  return result;
+]])],
+          [am_cv_func_iconv_works=yes], ,
+          [case "$host_os" in
+             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+             *)            am_cv_func_iconv_works="guessing yes" ;;
+           esac])
+        test "$am_cv_func_iconv_works" = no || break
+      done
+      LIBS="$gl_saved_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE([HAVE_ICONV], [1],
+      [Define if you have the iconv() function and it works.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$gl_saved_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST([LIBICONV])
+  AC_SUBST([LTLIBICONV])
+])
+
+dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+AC_DEFUN_ONCE([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
+    AC_CACHE_CHECK([whether iconv is compatible with its POSIX signature],
+      [gl_cv_iconv_nonconst],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+            ]],
+            [[]])],
+         [gl_cv_iconv_nonconst=yes],
+         [gl_cv_iconv_nonconst=no])
+      ])
+  else
+    dnl When compiling GNU libiconv on a system that does not have iconv yet,
+    dnl pick the POSIX compliant declaration without 'const'.
+    gl_cv_iconv_nonconst=yes
+  fi
+  if test $gl_cv_iconv_nonconst = yes; then
+    iconv_arg1=""
+  else
+    iconv_arg1="const"
+  fi
+  AC_DEFINE_UNQUOTED([ICONV_CONST], [$iconv_arg1],
+    [Define as const if the declaration of iconv() needs const.])
+  dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+  m4_ifdef([gl_ICONV_H_DEFAULTS],
+    [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+     if test $gl_cv_iconv_nonconst != yes; then
+       ICONV_CONST="const"
+     fi
+    ])
+
+  dnl A summary result, for those packages which want to print a summary at the
+  dnl end of the configuration.
+  if test "$am_func_iconv" = yes; then
+    if test -n "$LIBICONV"; then
+      am_cv_func_iconv_summary='yes, in libiconv'
+    else
+      am_cv_func_iconv_summary='yes, in libc'
+    fi
+  else
+    if test "$am_cv_func_iconv" = yes; then
+      am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
+    else
+      am_cv_func_iconv_summary='no, consider installing GNU libiconv'
+    fi
+  fi
+])
+
+# intlmacosx.m4
+# serial 10 (gettext-0.23)
+dnl Copyright (C) 2004-2014, 2016, 2019-2024 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Lesser General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Lesser General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in Mac OS X 10.4.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_saved_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFPreferences.h>]],
+          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_saved_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent,
+  dnl because in macOS 10.13.4 it has the following behaviour:
+  dnl When two or more languages are specified in the
+  dnl "System Preferences > Language & Region > Preferred Languages" panel,
+  dnl it returns en_CC where CC is the territory (even when English is not among
+  dnl the preferred languages!).  What we want instead is what
+  dnl CFLocaleCopyCurrent returned in earlier macOS releases and what
+  dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
+  dnl first among the preferred languages and CC is the territory.
+  AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
+    [gt_saved_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFLocale.h>]],
+          [[CFLocaleCopyPreferredLanguages();]])],
+       [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
+       [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
+     LIBS="$gt_saved_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
+      [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+     || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+    dnl Starting with macOS version 14, CoreFoundation relies on CoreServices,
+    dnl and we have to link it in explicitly, otherwise an exception
+    dnl NSInvalidArgumentException "unrecognized selector sent to instance"
+    dnl occurs.
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
+# lib-ld.m4
+# serial 13
+dnl Copyright (C) 1996-2003, 2009-2024 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
+
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes
+  ;;
+*)
+  acl_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-2.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([[--with-gnu-ld]],
+        [assume the C compiler uses GNU ld [default=no]])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+if test -n "$LD"; then
+  AC_MSG_CHECKING([for ld])
+elif test "$GCC" = yes; then
+  AC_MSG_CHECKING([for ld used by $CC])
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+if test -n "$LD"; then
+  # Let the user override the test with a path.
+  :
+else
+  AC_CACHE_VAL([acl_cv_path_LD],
+  [
+    acl_cv_path_LD= # Final result of this test
+    ac_prog=ld # Program to search in $PATH
+    if test "$GCC" = yes; then
+      # Check if gcc -print-prog-name=ld gives a path.
+      case $host in
+        *-*-mingw* | windows*)
+          # gcc leaves a trailing carriage return which upsets mingw
+          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+        *)
+          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
+      esac
+      case $acl_output in
+        # Accept absolute paths.
+        [[\\/]]* | ?:[[\\/]]*)
+          re_direlt='/[[^/]][[^/]]*/\.\./'
+          # Canonicalize the pathname of ld
+          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
+          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
+            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
+          done
+          # Got the pathname. No search in PATH is needed.
+          acl_cv_path_LD="$acl_output"
+          ac_prog=
+          ;;
+        "")
+          # If it fails, then pretend we aren't using GCC.
+          ;;
+        *)
+          # If it is relative, then search for the first ld in PATH.
+          with_gnu_ld=unknown
+          ;;
+      esac
+    fi
+    if test -n "$ac_prog"; then
+      # Search for $ac_prog in $PATH.
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
+      for ac_dir in $PATH; do
+        IFS="$acl_saved_IFS"
+        test -z "$ac_dir" && ac_dir=.
+        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+          acl_cv_path_LD="$ac_dir/$ac_prog"
+          # Check to see if the program is GNU ld.  I'd rather use --version,
+          # but apparently some variants of GNU ld only accept -v.
+          # Break only if it was the GNU/non-GNU ld that we prefer.
+          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+            *GNU* | *'with BFD'*)
+              test "$with_gnu_ld" != no && break
+              ;;
+            *)
+              test "$with_gnu_ld" != yes && break
+              ;;
+          esac
+        fi
+      done
+      IFS="$acl_saved_IFS"
+    fi
+    case $host in
+      *-*-aix*)
+        AC_COMPILE_IFELSE(
+          [AC_LANG_SOURCE(
+             [[#if defined __powerpc64__ || defined __LP64__
+                int ok;
+               #else
+                error fail
+               #endif
+             ]])],
+          [# The compiler produces 64-bit code. Add option '-b64' so that the
+           # linker groks 64-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -b64 "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
+           esac
+          ], [])
+        ;;
+      sparc64-*-netbsd*)
+        AC_COMPILE_IFELSE(
+          [AC_LANG_SOURCE(
+             [[#if defined __sparcv9 || defined __arch64__
+                int ok;
+               #else
+                error fail
+               #endif
+             ]])],
+          [],
+          [# The compiler produces 32-bit code. Add option '-m elf32_sparc'
+           # so that the linker groks 32-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -m elf32_sparc "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
+           esac
+          ])
+        ;;
+    esac
+  ])
+  LD="$acl_cv_path_LD"
+fi
+if test -n "$LD"; then
+  AC_MSG_RESULT([$LD])
+else
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([no acceptable ld found in \$PATH])
+fi
+AC_LIB_PROG_LD_GNU
+])
+
+# lib-link.m4
+# serial 34
+dnl Copyright (C) 2001-2024 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.61])
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  acl_saved_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    acl_saved_LIBS="$LIBS"
+    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIB[]NAME" in
+      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+      *)       LIBS="$LIB[]NAME $LIBS" ;;
+    esac
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[$3]], [[$4]])],
+      [ac_cv_lib[]Name=yes],
+      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+    LIBS="$acl_saved_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$acl_saved_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_libname_spec,
+dnl   acl_library_names_spec,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Complain if config.rpath is missing.
+  AC_REQUIRE_AUX_FILE([config.rpath])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE([rpath],
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+    eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+    eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
+  ])
+  AC_ARG_WITH(PACK[-prefix],
+[[  --with-]]PACK[[-prefix[=DIR]  search for ]]PACKLIBS[[ in DIR/include and DIR/lib
+  --without-]]PACK[[-prefix     don't search for ]]PACKLIBS[[ in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+          eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+          eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        additional_libdir2="$withval/$acl_libdirstem2"
+        additional_libdir3="$withval/$acl_libdirstem3"
+      fi
+    fi
+])
+  if test "X$additional_libdir2" = "X$additional_libdir"; then
+    additional_libdir2=
+  fi
+  if test "X$additional_libdir3" = "X$additional_libdir"; then
+    additional_libdir3=
+  fi
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Use breadth-first search.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIB[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
+              if test "X$found_dir" = "X"; then
+                eval dir=\$$additional_libdir_variable
+                if test -n "$dir"; then
+                  dnl The same code as in the loop below:
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                fi
+              fi
+            done
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem3 | */$acl_libdirstem3/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              saved_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$saved_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $dependency_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
+                      haveit=
+                      if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$dependency_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$dependency_libdir"; then
+                            dnl Really add $dependency_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$dependency_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$dependency_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$dependency_libdir"; then
+                            dnl Really add $dependency_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$dependency_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    dnl But on GNU systems, ignore -lc options, because
+                    dnl   - linking with libc is the default anyway,
+                    dnl   - linking with libc.a may produce an error
+                    dnl     "/usr/bin/ld: dynamic STT_GNU_IFUNC symbol `strcmp' with pointer equality in `/usr/lib/libc.a(strcmp.o)' can not be used when making an executable; recompile with -fPIE and relink with -pie"
+                    dnl     or may produce an executable that always crashes, see
+                    dnl     <https://lists.gnu.org/archive/html/grep-devel/2020-09/msg00052.html>.
+                    dep=`echo "X$dep" | sed -e 's/^X-l//'`
+                    if test "X$dep" != Xc \
+                       || case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) false ;;
+                            *)                          true ;;
+                          esac; then
+                      names_next_round="$names_next_round $dep"
+                    fi
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_saved_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_saved_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_saved_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_saved_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2" \
+             && test "X$dir" != "X/usr/$acl_libdirstem3"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem3"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_saved_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_saved_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_saved_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_saved_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
+
+# lib-prefix.m4
+# serial 23
+dnl Copyright (C) 2001-2005, 2008-2024 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_ARG_WITH([lib-prefix],
+[[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_saved_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a function acl_is_expected_elfclass, that tests whether standard input
+dn;   has a 32-bit or 64-bit ELF header, depending on the host CPU ABI,
+dnl - 3 variables acl_libdirstem, acl_libdirstem2, acl_libdirstem3, containing
+dnl   the basename of the libdir to try in turn, either "lib" or "lib64" or
+dnl   "lib/64" or "lib32" or "lib/sparcv9" or "lib/amd64" or similar.
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib, lib32, and lib64.
+  dnl On most glibc systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. However, on
+  dnl Arch Linux based distributions, it's the opposite: 32-bit libraries go
+  dnl under $prefix/lib32 and 64-bit libraries go under $prefix/lib.
+  dnl We determine the compiler's default mode by looking at the compiler's
+  dnl library search path. If at least one of its elements ends in /lib64 or
+  dnl points to a directory whose absolute pathname ends in /lib64, we use that
+  dnl for 64-bit ABIs. Similarly for 32-bit ABIs. Otherwise we use the default,
+  dnl namely "lib".
+  dnl On Solaris systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
+
+  AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf],
+    [AC_EGREP_CPP([Extensible Linking Format],
+       [#if defined __ELF__ || (defined __linux__ && (defined __EDG__ || defined __SUNPRO_C))
+        Extensible Linking Format
+        #endif
+       ],
+       [gl_cv_elf=yes],
+       [gl_cv_elf=no])
+    ])
+  if test $gl_cv_elf = yes; then
+    # Extract the ELF class of a file (5th byte) in decimal.
+    # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
+    if od -A x < /dev/null >/dev/null 2>/dev/null; then
+      # Use POSIX od.
+      func_elfclass ()
+      {
+        od -A n -t d1 -j 4 -N 1
+      }
+    else
+      # Use BSD hexdump.
+      func_elfclass ()
+      {
+        dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "'
+        echo
+      }
+    fi
+    # Use 'expr', not 'test', to compare the values of func_elfclass, because on
+    # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002,
+    # not 1 or 2.
+changequote(,)dnl
+    case $HOST_CPU_C_ABI_32BIT in
+      yes)
+        # 32-bit ABI.
+        acl_is_expected_elfclass ()
+        {
+          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 1 > /dev/null
+        }
+        ;;
+      no)
+        # 64-bit ABI.
+        acl_is_expected_elfclass ()
+        {
+          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 2 > /dev/null
+        }
+        ;;
+      *)
+        # Unknown.
+        acl_is_expected_elfclass ()
+        {
+          :
+        }
+        ;;
+    esac
+changequote([,])dnl
+  else
+    acl_is_expected_elfclass ()
+    {
+      :
+    }
+  fi
+
+  dnl Allow the user to override the result by setting acl_cv_libdirstems.
+  AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
+    [acl_cv_libdirstems],
+    [dnl Try 'lib' first, because that's the default for libdir in GNU, see
+     dnl <https://www.gnu.org/prep/standards/html_node/Directory-Variables.html>.
+     acl_libdirstem=lib
+     acl_libdirstem2=
+     acl_libdirstem3=
+     case "$host_os" in
+       solaris*)
+         dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+         dnl <https://docs.oracle.com/cd/E19253-01/816-5138/dev-env/index.html>.
+         dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+         dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+         dnl symlink is missing, so we set acl_libdirstem2 too.
+         if test $HOST_CPU_C_ABI_32BIT = no; then
+           acl_libdirstem2=lib/64
+           case "$host_cpu" in
+             sparc*)        acl_libdirstem3=lib/sparcv9 ;;
+             i*86 | x86_64) acl_libdirstem3=lib/amd64 ;;
+           esac
+         fi
+         ;;
+       netbsd*)
+         dnl On NetBSD/sparc64, there is a 'sparc' subdirectory that contains
+         dnl 32-bit libraries.
+         if test $HOST_CPU_C_ABI_32BIT != no; then
+           case "$host_cpu" in
+             sparc*) acl_libdirstem2=lib/sparc ;;
+           esac
+         fi
+         ;;
+       *)
+         dnl If $CC generates code for a 32-bit ABI, the libraries are
+         dnl surely under $prefix/lib or $prefix/lib32, not $prefix/lib64.
+         dnl Similarly, if $CC generates code for a 64-bit ABI, the libraries
+         dnl are surely under $prefix/lib or $prefix/lib64, not $prefix/lib32.
+         dnl Find the compiler's search path. However, non-system compilers
+         dnl sometimes have odd library search paths. But we can't simply invoke
+         dnl '/usr/bin/gcc -print-search-dirs' because that would not take into
+         dnl account the -m32/-m31 or -m64 options from the $CC or $CFLAGS.
+         searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
+                     | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+         if test $HOST_CPU_C_ABI_32BIT != no; then
+           # 32-bit or unknown ABI.
+           if test -d /usr/lib32; then
+             acl_libdirstem2=lib32
+           fi
+         fi
+         if test $HOST_CPU_C_ABI_32BIT != yes; then
+           # 64-bit or unknown ABI.
+           if test -d /usr/lib64; then
+             acl_libdirstem3=lib64
+           fi
+         fi
+         if test -n "$searchpath"; then
+           acl_saved_IFS="${IFS= 	}"; IFS=":"
+           for searchdir in $searchpath; do
+             if test -d "$searchdir"; then
+               case "$searchdir" in
+                 */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;;
+                 */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;;
+                 */../ | */.. )
+                   # Better ignore directories of this form. They are misleading.
+                   ;;
+                 *) searchdir=`cd "$searchdir" && pwd`
+                    case "$searchdir" in
+                      */lib32 ) acl_libdirstem2=lib32 ;;
+                      */lib64 ) acl_libdirstem3=lib64 ;;
+                    esac ;;
+               esac
+             fi
+           done
+           IFS="$acl_saved_IFS"
+           if test $HOST_CPU_C_ABI_32BIT = yes; then
+             # 32-bit ABI.
+             acl_libdirstem3=
+           fi
+           if test $HOST_CPU_C_ABI_32BIT = no; then
+             # 64-bit ABI.
+             acl_libdirstem2=
+           fi
+         fi
+         ;;
+     esac
+     test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+     test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
+     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
+    ])
+  dnl Decompose acl_cv_libdirstems into acl_libdirstem, acl_libdirstem2, and
+  dnl acl_libdirstem3.
+changequote(,)dnl
+  acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
+  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
+  acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
+changequote([,])dnl
+])
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2019, 2021-2024 Free Software
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2026 Free Software
 #   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
@@ -14245,7 +13863,7 @@ yes
 # modifications, as long as this notice is preserved.
 
 m4_define([_LT_COPYING], [dnl
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -14268,7 +13886,7 @@ m4_define([_LT_COPYING], [dnl
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ])
 
-# serial 63 LT_INIT
+# serial 66 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -14736,6 +14354,87 @@ m4_define([_LT_LIBTOOL_TAG_VARS],
 # ------------------------------
 m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
 
+# _LT_OBJECTIVE_C
+# ------------------------------
+m4_defun([_LT_OBJECTIVE_C], [
+  AC_CACHE_CHECK([for Objective C compilation],
+    [lt_cv_objc_compiles],
+    [ save_CFLAGS=$CFLAGS
+      CFLAGS=$OBJCFLAGS
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([#import <Foundation/Foundation.h>
+@interface Addition : NSObject
+- (int)this:(int)a that:(int)b;
+@end
+
+@implementation Addition
+- (int)this:(int)a that:(int)b
+{
+  return a + b;
+}
+@end
+],[])],
+        lt_cv_objc_compiles=yes,
+        lt_cv_objc_compiles=no
+      )
+      CFLAGS=$save_CFLAGS
+    ]
+  )
+  objc_compiles=$lt_cv_objc_compiles
+  _LT_DECL([], [objc_compiles], [1],
+    [Check for compiling Objective C code])
+])
+
+# _LT_OBJECTIVE_CXX
+# ------------------------------
+m4_defun([_LT_OBJECTIVE_CXX], [
+  AC_CACHE_CHECK([for Objective C++ compilation],
+    [lt_cv_objcxx_compiles],
+    [ save_CFLAGS=$CFLAGS
+      CFLAGS=$OBJCXXFLAGS
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([#import <Foundation/Foundation.h>
+@interface Addition : NSObject
+- (int)this:(int)a that:(int)b;
+@end
+
+@implementation Addition
+- (int)this:(int)a that:(int)b
+{
+  return a + b;
+}
+@end
+],[])],
+        lt_cv_objcxx_compiles=yes,
+        lt_cv_objcxx_compiles=no
+      )
+      CFLAGS=$save_CFLAGS
+    ]
+  )
+  objcxx_compiles=$lt_cv_objcxx_compiles
+  _LT_DECL([], [objcxx_compiles], [1],
+    [Check for compiling Objective C++ code])
+])
+
+m4_defun([_LT_ML64], [
+  AC_CACHE_CHECK([for ML64 compilation],
+    [lt_cv_ml64_compiles],
+    [ save_CFLAGS=$CFLAGS
+      CFLAGS=$ML64FLAGS
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([ret
+],[])],
+        lt_cv_ml64_compiles=yes,
+        lt_cv_ml64_compiles=no
+      )
+      CFLAGS=$save_CFLAGS
+    ]
+  )
+  objc_compiles=$lt_cv_objc_compiles
+  _LT_DECL([], [ml64_compiles], [1],
+    [Check for compiling ml64 code])
+])
+
 
 # _LT_CONFIG_COMMANDS
 # -------------------
@@ -14881,7 +14580,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2024 Free Software Foundation, Inc.
+Copyright (C) 2025-2026 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -15056,6 +14755,9 @@ AC_DEFUN([LT_LANG],
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Objective-C],		[_LT_LANG(OBJC)],
+  [Objective-C++],	[_LT_LANG(OBJCXX)],
+  [Microsoft Macro Assembler],  [_LT_LANG(ML64)],
   [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
@@ -15078,6 +14780,26 @@ m4_defun([_LT_LANG],
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_ML64], [
+m4_defun([AC_PROG_ML64],
+[AC_LANG_PUSH(ML64)dnl
+AC_ARG_VAR([ML64],     [ml64 compiler command])dnl
+AC_ARG_VAR([ML64FLAGS], [ml64 compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(ML64, ml64)
+if test -z "$ML64"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(ML64, [${ac_tool_prefix}ml64], [${ac_tool_prefix}ml64])
+  fi
+fi
+if test -z "$ML64"; then
+  AC_CHECK_PROG(ML64, ml64, ml64, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+
 m4_ifndef([AC_PROG_GO], [
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_GO.  When it is available in    #
@@ -15126,19 +14848,34 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
       [LT_LANG(GCJ)],
       [m4_ifdef([AC_PROG_GCJ],
 	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+
        m4_ifdef([A][M_PROG_GCJ],
 	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
 AC_PROVIDE_IFELSE([AC_PROG_GO],
   [LT_LANG(GO)],
   [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
 
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+  [LT_LANG(OBJC)],
+  [m4_define([AC_PROG_OBJC], defn([AC_PROG_OBJC])[LT_LANG(OBJC)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+  [LT_LANG(OBJCXX)],
+  [m4_define([AC_PROG_OBJCXX], defn([AC_PROG_OBJCXX])[LT_LANG(OBJCXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_ML64],
+  [LT_LANG(ML64)],
+  [m4_define([AC_PROG_ML64], defn([AC_PROG_ML64])[LT_LANG(ML64)])])
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
+
+
+])
+
+# _LT_LANG_DEFAULT_CONFIG
 
 # Obsolete macros:
 AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
@@ -15389,8 +15126,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
     _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
     m4_if([$1], [CXX],
 [   if test yes = "$_lt_dar_needs_single_mod" -a yes != "$lt_cv_apple_cc_single_mod"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 ],[])
   else
@@ -15765,7 +15502,7 @@ _LT_DECL([], [AR], [1], [The archiver])
 
 test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
 lt_ar_flags=$AR_FLAGS
-_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
+_LT_DECL([], [lt_ar_flags], [1], [Flags to create an archive (by configure)])
 
 # Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
 # by AR_FLAGS because that was never working and AR_FLAGS is about to die.
@@ -15868,9 +15605,9 @@ AC_CACHE_CHECK([$1], [$2],
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
@@ -15908,9 +15645,9 @@ AC_CACHE_CHECK([$1], [$2],
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          $2=yes
        fi
      else
@@ -15953,9 +15690,9 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -16351,9 +16088,9 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
@@ -16856,8 +16593,8 @@ m4_if([$1], [],[
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -17117,6 +16854,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -17204,6 +16953,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -17222,30 +16973,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -17290,9 +17019,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -17741,7 +17475,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -17909,16 +17643,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -18335,13 +18065,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -18355,22 +18085,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -18391,8 +18121,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -18668,7 +18400,7 @@ m4_if([$1], [CXX], [
 	  # AIX 5 now supports IA64 processor
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.expsym'
 	fi
 	;;
       chorus*)
@@ -18741,6 +18473,8 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
+      *-mlibc)
+	;;
       linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
@@ -18754,7 +18488,7 @@ m4_if([$1], [CXX], [
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  icpc* )
+	  icpc* | icpx*)
 	    # Intel C++, used to be incompatible with GCC.
 	    # ICC 10 doesn't accept -KPIC any more.
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -18807,10 +18541,6 @@ m4_if([$1], [CXX], [
 	;;
       netbsd* | netbsdelf*-gnu)
 	;;
-      *-mlibc)
-	;;
-      redox*)
-	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
         # it will coredump.
@@ -19019,7 +18749,7 @@ m4_if([$1], [CXX], [
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -19071,7 +18801,13 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -19087,7 +18823,7 @@ m4_if([$1], [CXX], [
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -19110,6 +18846,12 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -19167,18 +18909,6 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    *-mlibc)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-      ;;
-
-    redox*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -19335,7 +19065,8 @@ m4_if([$1], [CXX], [
     ;;
   cygwin* | mingw* | windows* | cegcc*)
     case $cc_basename in
-    cl* | icl*)
+    cl* | icl* | icx* | icpx*)
+      # Native MSVC and Intel compilers
       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
       ;;
     *)
@@ -19541,17 +19272,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -19560,7 +19291,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
@@ -19580,6 +19310,11 @@ _LT_EOF
       _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -19605,7 +19340,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
@@ -19660,16 +19395,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -19978,8 +19703,8 @@ _LT_EOF
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -19989,14 +19714,20 @@ _LT_EOF
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	_LT_TAGVAR(archive_cmds, $1)='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
@@ -20028,7 +19759,7 @@ _LT_EOF
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	_LT_TAGVAR(archive_cmds, $1)='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	# FIXME: Should let the user specify the lib program.
@@ -20202,6 +19933,9 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -20213,12 +19947,6 @@ _LT_EOF
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -20265,17 +19993,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -20284,7 +20012,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
@@ -20310,8 +20037,8 @@ _LT_EOF
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -20328,21 +20055,21 @@ _LT_EOF
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -20812,8 +20539,8 @@ if test yes != "$_lt_caught_CXX_error"; then
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test yes = "$with_gnu_ld"; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
         _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
@@ -20838,13 +20565,13 @@ if test yes != "$_lt_caught_CXX_error"; then
         # linker, instead of GNU ld.  If possible, this setting should
         # overridden to take advantage of the native linker features on
         # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
       fi
 
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"'
 
     else
       GXX=no
@@ -21055,8 +20782,8 @@ if test yes != "$_lt_caught_CXX_error"; then
 
       cygwin* | mingw* | windows* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl* | ,icl* | no,icl*)
-	  # Native MSVC or ICC
+	,cl* | no,cl* | ,icl* | no,icl* | ,icx* | no,icx* | ,icpx* | no,icpx*)
+	  # Native MSVC and Intel compilers
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -21068,14 +20795,20 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  # Tell ltmain to make .dll files, not .so files.
 	  shrext_cmds=.dll
 	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  # A check exists to verify if there are linker flags, which will use
+	  # different commands when linking.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
               cp "$export_symbols" "$output_objdir/$soname.def";
-              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
             else
-              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+            fi~
+            if test -z "$linker_flags"; then
+               $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+            else
+               $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
             fi~
-            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
             linknames='
 	  # The linker will not automatically build a static lib if we build a DLL.
 	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
@@ -21109,7 +20842,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  _LT_TAGVAR(file_list_spec, $1)='@'
 
 	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	    # If the export-symbols file already is a .def file, use it as
 	    # is; otherwise, prepend EXPORTS...
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
@@ -21118,7 +20851,7 @@ if test yes != "$_lt_caught_CXX_error"; then
               echo EXPORTS > $output_objdir/$soname.def;
               cat $export_symbols >> $output_objdir/$soname.def;
             fi~
-            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+            $CC -shared $stdlibflag $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	  else
 	    _LT_TAGVAR(ld_shlibs, $1)=no
 	  fi
@@ -21134,17 +20867,17 @@ if test yes != "$_lt_caught_CXX_error"; then
 	_LT_TAGVAR(hardcode_minus_L, $1)=yes
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	shrext_cmds=.dll
-	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	_LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  echo EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  echo EXPORTS >> $output_objdir/$libname.def~
 	  prefix_cmds="$SED"~
 	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	    prefix_cmds="$prefix_cmds -e 1d";
@@ -21153,7 +20886,6 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;
@@ -21225,7 +20957,7 @@ if test yes != "$_lt_caught_CXX_error"; then
             ;;
           *)
             if test yes = "$GXX"; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $stdlibflag $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -21293,13 +21025,13 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      if test no = "$with_gnu_ld"; then
 	        case $host_cpu in
 	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -21340,9 +21072,9 @@ if test yes != "$_lt_caught_CXX_error"; then
           *)
 	    if test yes = "$GXX"; then
 	      if test no = "$with_gnu_ld"; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -21353,6 +21085,10 @@ if test yes != "$_lt_caught_CXX_error"; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
+      *-mlibc)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
       linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
@@ -21380,7 +21116,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 	    ;;
-	  icpc* | ecpc* )
+	  icpc* | ecpc* | icpx*)
 	    # Intel C++
 	    with_gnu_ld=yes
 	    # version 8.0 and above of icpc choke on multiply defined symbols
@@ -21518,14 +21254,6 @@ if test yes != "$_lt_caught_CXX_error"; then
 	esac
 	;;
 
-      *-mlibc)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      redox*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
       netbsd*)
         if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
@@ -21533,9 +21261,11 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	  _LT_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	else
+	  _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	output_verbose_link_cmd=func_echo_all
 	;;
 
       *nto* | *qnx*)
@@ -21595,10 +21325,10 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-                  echo "-hidden">> $lib.exp~
-                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
-                  $RM $lib.exp'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done~
+                  echo "-hidden">> $lib.expsym~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.expsym  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.expsym'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
 	    esac
@@ -21620,10 +21350,10 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -21633,7 +21363,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -21677,8 +21407,8 @@ if test yes != "$_lt_caught_CXX_error"; then
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.expsym -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.expsym'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -21713,25 +21443,25 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    if test yes,no = "$GXX,$with_gnu_ld"; then
 	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+                  $CC -shared $pic_flag $stdlibflag $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.expsym'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"'
 	      else
 	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+                  $CC -G $stdlibflag $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.expsym'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
@@ -21816,6 +21546,14 @@ if test yes != "$_lt_caught_CXX_error"; then
         _LT_TAGVAR(ld_shlibs, $1)=no
         ;;
 
+      emscripten*)
+        # Emscripten side modules (-sSIDE_MODULE=2) use a separate PIC sysroot
+        # and do not link system libraries (they are imported from the main module
+        # at runtime).  Re-run the verbose link with -sSIDE_MODULE=2 so that the
+        # detected paths point to the PIC sysroot instead of the non-PIC one.
+        output_verbose_link_cmd='$CC -sSIDE_MODULE=2 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP " [[-]]L"'
+        ;;
+
       *)
         # FIXME: insert proper C++ library support
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -21965,10 +21703,14 @@ if AC_TRY_EVAL(ac_compile); then
   # the conftest object file.
   pre_test_object_deps_done=no
 
+  if test yes = "$enable_cxx_stdlib"; then
+    output_verbose_link_cmd=
+  fi
+
   for p in `eval "$output_verbose_link_cmd"`; do
     case $prev$p in
 
-    -L* | -R* | -l*)
+    -L* | -R* | -l* | */libclang_rt.*.a)
        # Some compilers place space between "-{L,R,l}" and the path.
        # Remove the space.
        if test x-L = x"$p" ||
@@ -22427,6 +22169,72 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_ML64_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the ML64 assembler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_ML64_CONFIG],
+[AC_REQUIRE([LT_PROG_ML64])dnl
+AC_LANG_SAVE
+
+# Source file extension for ML64 test sources.
+ac_ext=asm
+
+#Object file extension for compile ML64 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="main PROC ret main ENDP"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="main PROC ret main ENDP"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# TODO? Check for compilation issues with ML64 flags.
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${ML64-"gcc"}
+CFLAGS=$ML64FLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_ML64_CONFIG
+
+
 # _LT_LANG_GO_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for the GNU Go compiler
@@ -22494,6 +22302,146 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GO_CONFIG
 
 
+# _LT_LANG_OBJC_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Objective-C compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_OBJC_CONFIG],
+[AC_REQUIRE([LT_PROG_OBJC])dnl
+AC_LANG_SAVE
+
+# Source file extension for OBJC test sources.
+ac_ext=m
+
+# Object file extension for compiled OBJC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(void){return(0);}'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Check for compilation issues with OBJC flags
+_LT_OBJECTIVE_C
+if test "yes" = "$lt_cv_gnustep_exists"; then
+  OBJCFLAGS="$OBJCFLAGS `gnustep-config --objc-flags`"
+fi
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${OBJC-"gcc"}
+CFLAGS=$OBJCFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_OBJC_CONFIG
+
+
+# _LT_LANG_OBJCXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Objective-C++ compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_OBJCXX_CONFIG],
+[AC_REQUIRE([LT_PROG_OBJCXX])dnl
+AC_LANG_SAVE
+
+# Source file extension for OBJCXX test sources.
+ac_ext=mm
+
+# Object file extension for compiled OBJCXX test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Check for compilation issues with OBJCXX flags
+_LT_OBJECTIVE_CXX
+if test "yes" = "$lt_cv_gnustep_exists"; then
+  OBJCXXFLAGS="$OBJCXXFLAGS `gnustep-config --objc-flags`"
+fi
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${OBJCXX-"g++"}
+CFLAGS=$OBJCXXFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_OBJCXX_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -22546,6 +22494,34 @@ CC=$lt_save_CC
 CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_RC_CONFIG
 
+# LT_PROG_ML64
+# -----------
+AC_DEFUN([LT_PROG_ML64],
+[AC_CHECK_TOOL(ML64, ml64,)
+])
+
+
+# LT_PROG_OBJC
+# -----------
+AC_DEFUN([LT_PROG_OBJC],
+[AC_CHECK_TOOL(OBJC, gcc,)
+  AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,)
+  if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
+    test set = "${OBJCFLAGS+set}" || OBJCFLAGS="`gnustep-config --objc-flags`"
+  fi
+  AC_SUBST(OBJCFLAGS)[]dnl
+])
+
+# LT_PROG_OBJCXX
+# -----------
+AC_DEFUN([LT_PROG_OBJCXX],
+[AC_CHECK_TOOL(OBJCXX, g++,)
+  AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,)
+  if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
+    test set = "${OBJCXXFLAGS+set}" || OBJCXXFLAGS="`gnustep-config --objc-flags`"
+  fi
+  AC_SUBST(OBJCXXFLAGS)[]dnl
+])
 
 # LT_PROG_GCJ
 # -----------
@@ -22737,6 +22713,42 @@ to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
 _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
          [0], [convert $build files to toolchain format])dnl
+
+AS_CASE([$host],
+  [*-*-mingw* | *-*-windows* | *-*-cygwin*],
+  [AS_CASE([$build],
+    [*-*-mingw* | *-*-windows* | *-*-cygwin*],
+    [AC_MSG_CHECKING([whether cygpath is installed])
+      AC_CACHE_VAL([lt_cv_cygpath_installed],
+        [lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          AS_IF([test 0 = "$_lt_result"],
+            [lt_cv_cygpath_installed=yes],
+            [lt_cv_cygpath_installed=no])
+        ])
+      AC_MSG_RESULT([$lt_cv_cygpath_installed])
+      _LT_DECL([cygpath_installed], [lt_cv_cygpath_installed],
+               [0], [whether cygpath is installed])dnl
+      AS_IF([test "xyes" != "x$lt_cv_cygpath_installed"],
+        [
+          AC_MSG_CHECKING([whether to use cmd with one slash or two slashes])
+          AC_CACHE_VAL([lt_cv_cmd_slashes],
+            [
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              AS_IF([test 0 != $?],
+                [AC_MSG_ERROR([Do not know how to convert paths])])
+              AS_CASE([$_lt_result],
+                [one-slash*],[lt_cv_cmd_slashes="one"],
+                [two-slashes*],[lt_cv_cmd_slashes="two"],
+                [AC_MSG_ERROR([Do not know how to convert paths])]
+              )
+            ])
+          AC_MSG_RESULT([$lt_cv_cmd_slashes])
+        ])
+    ])
+  ]
+)dnl
 ])# _LT_PATH_CONVERSION_FUNCTIONS
 
 dnl Copyright (C) 1993-2002 Free Software Foundation, Inc.
@@ -23376,7 +23388,7 @@ m4_define([lt_dict_filter],
 
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2019, 2021-2024 Free Software Foundation,
+#   Copyright (C) 2004, 2011-2019, 2021-2026 Free Software Foundation,
 #   Inc.
 #   Written by Scott James Remnant, 2004
 #
@@ -23386,15 +23398,15 @@ m4_define([lt_dict_filter],
 
 # @configure_input@
 
-# serial 4443 ltversion.m4
+# serial 4532 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.5.4-redox-9510])
-m4_define([LT_PACKAGE_REVISION], [2.5.4])
+m4_define([LT_PACKAGE_VERSION], [2.6.0.23-b08cb])
+m4_define([LT_PACKAGE_REVISION], [2.6.0.23])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+[macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
@@ -23499,3 +23511,587 @@ m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
 m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
+# nls.m4
+# serial 6 (gettext-0.20.2)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2024 Free
+dnl Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Lesser General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Lesser General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
+
+# po.m4
+# serial 33 (gettext-0.23)
+dnl Copyright (C) 1995-2014, 2016, 2018-2022, 2024 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Lesser General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Lesser General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <bruno@clisp.org>, 2000-2024.
+
+AC_PREREQ([2.60])
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.22])
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl Test whether it is GNU msgmerge >= 0.20.
+  if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
+    MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
+  else
+    dnl Test whether it is GNU msgmerge >= 0.12.
+    if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
+      MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
+    else
+      dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is
+      dnl slow. But this is not a big problem, as such old gettext versions are
+      dnl hardly in use any more.
+      MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
+    fi
+  fi
+  AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+  AC_CONFIG_COMMANDS([po-directories], [[
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+                    useit=yes
+                    ;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done]],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
+    OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  tab=`printf '\t'`
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
+  # Seen the first line of the variable definition.
+  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+    ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+            useit=yes
+            ;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  tab=`printf '\t'`
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
+
+# progtest.m4
+# serial 10 (gettext-0.23)
+dnl Copyright (C) 1996-2003, 2005, 2008-2024 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Lesser General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Lesser General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+AC_PREREQ([2.53])
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL([ac_cv_path_$1],
+[case "[$]$1" in
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
+  *)
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in m4_if([$5], , $PATH, [$5]); do
+      IFS="$gt_saved_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$gt_saved_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+m4_if([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+    ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test m4_if([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$][$1])
+else
+  AC_MSG_RESULT([no])
+fi
+AC_SUBST([$1])dnl
+])
+
diff --git a/recipes/libs/libiconv/source/autom4te.cache/output.0 b/recipes/libs/libiconv/source/autom4te.cache/output.0
index f74361bf92..ea7a6f1e0f 100644
--- a/recipes/libs/libiconv/source/autom4te.cache/output.0
+++ b/recipes/libs/libiconv/source/autom4te.cache/output.0
@@ -1,9 +1,9 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.72 for libiconv 1.17.
+@%:@ Generated by GNU Autoconf 2.73 for libiconv 1.17.
 @%:@ 
 @%:@ 
-@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 @%:@ Inc.
 @%:@ 
 @%:@ 
@@ -20,7 +20,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -107,7 +107,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -129,10 +129,13 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -143,7 +146,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -261,22 +264,25 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -336,7 +342,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -345,7 +351,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -428,9 +434,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -457,7 +463,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -503,7 +509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -517,29 +523,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -600,6 +583,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIB@&t@OBJS=
@@ -1544,6 +1528,8 @@ BROKEN_WCHAR_H
 USE_MBSTATE_T
 HAVE_WCHAR_T
 ICONV_CONST
+localedir_c_make
+localedir_c
 POSUB
 LTLIBINTL
 LIBINTL
@@ -1663,13 +1649,13 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -1846,7 +1832,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1872,7 +1858,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -2085,7 +2071,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2101,7 +2087,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2145,9 +2131,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -2155,7 +2141,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -2163,7 +2149,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -2227,7 +2213,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -2433,9 +2419,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2472,7 +2458,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2482,9 +2468,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libiconv configure 1.17
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2508,7 +2494,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2516,7 +2502,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2524,7 +2510,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -2547,7 +2533,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2555,7 +2541,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2563,7 +2549,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -2581,7 +2567,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2603,8 +2589,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_header_compile
@@ -2622,7 +2608,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2630,7 +2616,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2641,7 +2627,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -2663,7 +2649,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2715,8 +2701,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_func
@@ -2734,26 +2720,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -2967,7 +2953,7 @@ rm -f conftest.val
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -3013,8 +2999,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_type
@@ -3031,7 +3017,7 @@ ac_fn_check_decl ()
   fi
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 printf %s "checking whether $as_decl_name is declared... " >&6; }
 if eval test \${$3+y}
 then :
@@ -3071,8 +3057,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   ac_compile="$ac_save_ac_compile"
 
@@ -3085,7 +3071,7 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 printf %s "checking for $2.$3... " >&6; }
 if eval test \${$4+y}
 then :
@@ -3135,8 +3121,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_member
@@ -3145,7 +3131,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -3157,7 +3143,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?@<:@ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -3165,7 +3151,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libiconv $as_me 1.17, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -3205,7 +3191,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -3240,7 +3226,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -3269,31 +3255,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -3302,67 +3279,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -3371,21 +3376,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -3407,12 +3412,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -3422,27 +3427,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -3522,7 +3620,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -3533,7 +3632,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -3621,15 +3720,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -3645,13 +3744,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -3805,7 +3903,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -3818,7 +3916,7 @@ do
   esac
   as_found=:
   
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -3829,13 +3927,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -3847,7 +3945,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -3900,38 +3998,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -3941,10 +4045,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -3952,6 +4056,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3979,7 +4100,7 @@ am__api_version='1.18'
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -4002,8 +4123,8 @@ case $as_dir in @%:@((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4053,8 +4174,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -4064,7 +4185,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
 printf %s "checking whether sleep supports fractional seconds... " >&6; }
 if test ${am_cv_sleep_fractional_seconds+y}
 then :
@@ -4080,10 +4201,10 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
-printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf '%s\n' "$am_cv_sleep_fractional_seconds" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
 printf %s "checking filesystem timestamp resolution... " >&6; }
 if test ${am_cv_filesystem_timestamp_resolution+y}
 then :
@@ -4135,9 +4256,9 @@ if (
   # if, for instance, CONFIG_SHELL is bash and it inherits a
   # broken ls alias from the environment.  This has actually
   # happened.  Such a system could not be considered "sane".
-  printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  printf '%s\n' ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "ls -t produces unexpected output.
 Make sure there is not a broken ls alias in your environment.
 See 'config.log' for more details" "$LINENO" 5; }
@@ -4218,12 +4339,12 @@ rm -f conftest.ts?
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
-printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf '%s\n' "$am_cv_filesystem_timestamp_resolution" >&6; }
 
 # This check should not be cached, as it may vary across builds of
 # different projects.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
@@ -4231,14 +4352,14 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
@@ -4268,8 +4389,8 @@ for am_try in 1 2; do
   am_has_slept=yes
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
-printf "%s\n" "$am_build_env_is_sane" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf '%s\n' "$am_build_env_is_sane" >&6; }
 if test "$am_build_env_is_sane" = no; then
   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
@@ -4298,7 +4419,7 @@ test "$program_suffix" != NONE &&
 # Double any \ or $.
 # By default was 's,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf '%s\n' "$program_transform_name" | sed "$ac_script"`
 
 
 # Expand $ac_aux_dir to an absolute path.
@@ -4313,8 +4434,8 @@ if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf '%s\n' "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -4334,7 +4455,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -4355,7 +4476,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4367,11 +4488,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4380,7 +4501,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -4401,7 +4522,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4413,11 +4534,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -4425,8 +4546,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -4439,7 +4560,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
 printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test ${ac_cv_path_mkdir+y}
@@ -4482,14 +4603,14 @@ fi
     MKDIR_P='mkdir -p'
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf '%s\n' "$MKDIR_P" >&6; }
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -4510,7 +4631,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4522,21 +4643,21 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -4544,7 +4665,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -4557,12 +4678,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4583,13 +4704,13 @@ then :
 fi
 
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 printf %s "checking whether $am_make supports nested variables... " >&6; }
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) if printf "%s\n" 'TRUE=$(BAR$(V))
+  e) if printf '%s\n' 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -4602,8 +4723,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf '%s\n' "$am_cv_make_support_nested_variables" >&6; }
 AM_BACKSLASH='\'
 
 am__rm_f_notfound=
@@ -4616,7 +4737,7 @@ esac
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
 printf %s "checking xargs -n works... " >&6; }
 if test ${am_cv_xargs_n_works+y}
 then :
@@ -4632,8 +4753,8 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
-printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf '%s\n' "$am_cv_xargs_n_works" >&6; }
 if test "$am_cv_xargs_n_works" = yes
 then :
   am__xargs_n='xargs -n'
@@ -4668,10 +4789,10 @@ fi
  VERSION='1.17'
 
 
-printf "%s\n" "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
  
-printf "%s\n" "@%:@define VERSION \"$VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -4717,34 +4838,34 @@ _am_tools='gnutar plaintar pax cpio none'
       # (that is, avoid stderr redirection).
       am_uid=`id -u || echo unknown`
       am_gid=`id -g || echo unknown`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
 printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
       if test x$am_uid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
       elif test $am_uid -le $am_max_uid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
 printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
       if test x$gm_gid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
       elif test $am_gid -le $am_max_gid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
 printf %s "checking how to create a ustar tar archive... " >&6; }
 
   # Go ahead even if we have the value already cached.  We do so because we
@@ -4828,8 +4949,8 @@ else case e in @%:@(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
-printf "%s\n" "$am_cv_prog_tar_ustar" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+printf '%s\n' "$am_cv_prog_tar_ustar" >&6; }
 
 
 
@@ -4856,10 +4977,10 @@ fi
 
 ac_config_headers="$ac_config_headers config.h lib/config.h"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -4867,7 +4988,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -4880,12 +5001,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4900,6 +5021,9 @@ fi
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4908,7 +5032,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -4929,7 +5053,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4941,11 +5065,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4954,7 +5078,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -4975,7 +5099,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4987,11 +5111,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -4999,8 +5123,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5013,7 +5137,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5034,7 +5158,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5046,11 +5170,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5059,7 +5183,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5085,7 +5209,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5109,11 +5233,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5124,7 +5248,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5145,7 +5269,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5157,11 +5281,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5174,7 +5298,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5195,7 +5319,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5207,11 +5331,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5223,8 +5347,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5236,7 +5360,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5257,7 +5381,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5269,11 +5393,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5282,7 +5406,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5303,7 +5427,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5315,11 +5439,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5327,8 +5451,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5340,13 +5464,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -5356,7 +5480,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -5366,7 +5490,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -5386,9 +5510,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -5409,10 +5533,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -5453,29 +5577,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -5483,10 +5607,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -5503,15 +5627,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -5534,7 +5658,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -5543,10 +5667,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -5554,31 +5678,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -5602,10 +5726,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -5617,11 +5741,11 @@ then :
   esac
 done
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -5629,11 +5753,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -5665,8 +5789,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -5676,7 +5800,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -5744,8 +5868,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -5764,7 +5888,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -5776,7 +5949,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -5793,16 +5966,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -5813,7 +5986,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -5842,16 +6015,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -5862,7 +6035,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -5891,16 +6064,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -5922,7 +6095,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
 printf %s "checking whether $CC understands -c and -o together... " >&6; }
 if test ${am_cv_prog_cc_c_o+y}
 then :
@@ -5964,8 +6137,8 @@ _ACEOF
   unset am_i ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf '%s\n' "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -5982,7 +6155,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
 printf %s "checking whether the compiler is clang... " >&6; }
 if test ${gl_cv_compiler_clang+y}
 then :
@@ -6015,11 +6188,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
-printf "%s\n" "$gl_cv_compiler_clang" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
+printf '%s\n' "$gl_cv_compiler_clang" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
 printf %s "checking for compiler option needed when checking for declarations... " >&6; }
 if test ${gl_cv_compiler_check_decl_option+y}
 then :
@@ -6054,8 +6227,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
-printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
+printf '%s\n' "$gl_cv_compiler_check_decl_option" >&6; }
   if test "x$gl_cv_compiler_check_decl_option" != xnone; then
     ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
   else
@@ -6066,7 +6239,7 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
 printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
 cat > confinc.mk << 'END'
 am__doit:
@@ -6103,8 +6276,8 @@ esac
   fi
 done
 rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf '%s\n' "${_am_result}" >&6; }
 
 @%:@ Check whether --enable-dependency-tracking was given.
 if test ${enable_dependency_tracking+y}
@@ -6129,7 +6302,7 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CC_dependencies_compiler_type+y}
 then :
@@ -6242,8 +6415,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if 
@@ -6262,7 +6435,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -6333,8 +6506,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -6382,8 +6555,8 @@ if $ac_preproc_ok
 then :
   
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -6399,7 +6572,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_STRIP+y}
 then :
@@ -6422,7 +6595,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_STRIP="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6436,11 +6609,11 @@ esac
 fi
 STRIP=$ac_cv_path_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
  # Installed binaries are usually stripped using 'strip' when the user
@@ -6451,7 +6624,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -6472,7 +6645,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6484,11 +6657,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6497,7 +6670,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -6518,7 +6691,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6530,11 +6703,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6542,8 +6715,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6562,7 +6735,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -6578,8 +6751,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -6595,10 +6768,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -6613,8 +6786,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -6630,7 +6803,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -6648,7 +6821,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -6668,7 +6841,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
   
-printf "%s\n" "@%:@define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "@%:@define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -6677,7 +6850,7 @@ fi
     
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
@@ -6706,10 +6879,10 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
@@ -6760,49 +6933,51 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "@%:@define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "@%:@define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "@%:@define _MINIX 1" >>confdefs.h
+    printf '%s\n' "@%:@define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
 
 else case e in @%:@(
   e) MINIX= ;;
@@ -6810,12 +6985,12 @@ esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
@@ -6826,13 +7001,13 @@ fi
   case "$host_os" in
     openbsd*)
       
-printf "%s\n" "@%:@define _ISOC11_SOURCE 1" >>confdefs.h
+printf '%s\n' "@%:@define _ISOC11_SOURCE 1" >>confdefs.h
 
       ;;
   esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
 printf %s "checking for egrep -e... " >&6; }
 if test ${ac_cv_path_EGREP_TRADITIONAL+y}
 then :
@@ -6869,7 +7044,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6931,7 +7106,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6962,14 +7137,14 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
-printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf '%s\n' "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
  EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
 
 
           
     
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
 printf %s "checking for Minix Amsterdam compiler... " >&6; }
 if test ${gl_cv_c_amsterdam_compiler+y}
 then :
@@ -6997,8 +7172,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
-printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
+printf '%s\n' "$gl_cv_c_amsterdam_compiler" >&6; }
 
       if test $gl_cv_c_amsterdam_compiler = yes; then
     if test -z "$AR"; then
@@ -7014,7 +7189,7 @@ printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -7035,7 +7210,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7047,11 +7222,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7060,7 +7235,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -7081,7 +7256,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7093,11 +7268,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -7105,8 +7280,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -7128,7 +7303,7 @@ fi
             if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
@@ -7149,7 +7324,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7161,11 +7336,11 @@ esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7174,7 +7349,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
@@ -7195,7 +7370,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7207,11 +7382,11 @@ esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -7219,8 +7394,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -7241,7 +7416,7 @@ fi
 
 if test "$enable_largefile" != no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 printf %s "checking for special C compiler options needed for large files... " >&6; }
 if test ${ac_cv_sys_largefile_CC+y}
 then :
@@ -7293,13 +7468,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf '%s\n' "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
 if test ${ac_cv_sys_file_offset_bits+y}
 then :
@@ -7367,18 +7542,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf '%s\n' "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *) 
-printf "%s\n" "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
+printf '%s\n' "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   case $ac_cv_sys_file_offset_bits in @%:@(
   unknown) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
 if test ${ac_cv_sys_large_files+y}
 then :
@@ -7446,12 +7621,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-printf "%s\n" "$ac_cv_sys_large_files" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf '%s\n' "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *) 
-printf "%s\n" "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
+printf '%s\n' "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest* ;; @%:@(
@@ -7466,7 +7641,7 @@ fi
  if test "$enable_year2038" != no
 then :
   
-                            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
+                            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
 printf %s "checking for time_t past the year 2038... " >&6; }
 if test ${gl_cv_type_time_t_y2038+y}
 then :
@@ -7495,10 +7670,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
-printf "%s\n" "$gl_cv_type_time_t_y2038" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
+printf '%s\n' "$gl_cv_type_time_t_y2038" >&6; }
   if test "$gl_cv_type_time_t_y2038" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
 printf %s "checking for 64-bit time_t with _TIME_BITS=64... " >&6; }
 if test ${gl_cv_type_time_t_bits_macro+y}
 then :
@@ -7529,14 +7704,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
-printf "%s\n" "$gl_cv_type_time_t_bits_macro" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
+printf '%s\n' "$gl_cv_type_time_t_bits_macro" >&6; }
     if test "$gl_cv_type_time_t_bits_macro" = yes; then
       
-printf "%s\n" "@%:@define _TIME_BITS 64" >>confdefs.h
+printf '%s\n' "@%:@define _TIME_BITS 64" >>confdefs.h
 
             
-printf "%s\n" "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
+printf '%s\n' "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
 
       gl_cv_type_time_t_y2038=yes
     fi
@@ -7553,8 +7728,8 @@ printf "%s\n" "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "The 'time_t' type stops working after January 2038.
           Remove _USE_32BIT_TIME_T from the compiler flags.
 See 'config.log' for more details" "$LINENO" 5; }
@@ -7565,11 +7740,11 @@ else case e in @%:@(
        # problem.  Otherwise, just warn the builder.
        
        if test "$gl_warned_about_y2038" != yes; then
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5
-printf "%s\n" "$as_me: WARNING: The 'time_t' type stops working after January 2038,
+printf '%s\n' "$as_me: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;}
@@ -7592,7 +7767,7 @@ fi
   case "$host_os" in
     mingw*)
       
-printf "%s\n" "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
+printf '%s\n' "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 
       ;;
   esac
@@ -7709,14 +7884,14 @@ printf "%s\n" "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
     
     
@@ -7754,7 +7929,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -7781,12 +7956,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -7802,7 +7977,7 @@ esac
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -7845,7 +8020,7 @@ case `"$ac_path_SED" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7874,8 +8049,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -7892,7 +8067,7 @@ Xsed="$SED -e 1s/^X//"
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -7929,7 +8104,7 @@ case `"$ac_path_GREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7958,12 +8133,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -8003,7 +8178,7 @@ case `"$ac_path_EGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8033,14 +8208,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
  
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -8080,7 +8255,7 @@ case `"$ac_path_FGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8110,8 +8285,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
  
 
@@ -8147,7 +8322,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -8177,10 +8352,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -8216,14 +8391,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -8240,8 +8415,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -8252,7 +8427,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -8308,8 +8483,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -8322,7 +8497,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -8343,7 +8518,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8355,11 +8530,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8372,7 +8547,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -8393,7 +8568,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8405,11 +8580,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8421,8 +8596,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -8450,7 +8625,7 @@ test -z "$NM" && NM=nm
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -8472,22 +8647,22 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -8505,9 +8680,9 @@ else case e in @%:@(
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -8620,11 +8795,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -8668,7 +8843,7 @@ esac
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -8710,14 +8885,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -8739,14 +8914,85 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+case $host in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+      
+    
+    
+    
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+  
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in @%:@(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; @%:@(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; @%:@(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+        
+fi
+     ;; @%:@(
+  *) :
+     ;;
+esac
+  
+ ;; @%:@(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -8755,8 +9001,8 @@ else case e in @%:@(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -8771,7 +9017,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -8788,7 +9034,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -8809,7 +9055,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8822,11 +9068,11 @@ esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8839,7 +9085,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -8860,7 +9106,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8872,11 +9118,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8885,7 +9131,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -8906,7 +9152,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8918,11 +9164,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -8930,8 +9176,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -8947,7 +9193,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -9064,16 +9310,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -9160,8 +9402,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -9205,7 +9447,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -9226,7 +9468,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9238,11 +9480,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9251,7 +9493,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -9272,7 +9514,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9284,11 +9526,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -9296,8 +9538,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -9314,7 +9556,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -9343,8 +9585,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -9359,7 +9601,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -9380,7 +9622,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9392,11 +9634,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9409,7 +9651,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -9430,7 +9672,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9442,11 +9684,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9458,8 +9700,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -9495,7 +9737,7 @@ lt_ar_flags=$AR_FLAGS
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -9520,7 +9762,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -9528,7 +9770,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -9541,8 +9783,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -9559,7 +9801,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -9580,7 +9822,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9592,11 +9834,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9605,7 +9847,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -9626,7 +9868,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9638,11 +9880,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -9650,8 +9892,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -9741,7 +9983,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -9801,13 +10043,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -9821,22 +10063,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -9857,8 +10099,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -9898,7 +10142,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
@@ -9971,7 +10215,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -10007,11 +10251,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -10057,7 +10301,7 @@ fi
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 @%:@ Check whether --with-sysroot was given.
@@ -10085,20 +10329,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -10143,11 +10387,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -10164,8 +10408,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
     
     
@@ -10205,7 +10449,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -10225,7 +10469,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -10263,7 +10507,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -10304,7 +10548,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -10367,7 +10611,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -10407,8 +10651,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -10421,7 +10665,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -10458,7 +10702,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -10479,7 +10723,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10491,11 +10735,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10504,7 +10748,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -10525,7 +10769,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10537,11 +10781,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -10549,8 +10793,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -10560,7 +10804,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -10576,8 +10820,8 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -10592,7 +10836,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -10613,7 +10857,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10625,11 +10869,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10638,7 +10882,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -10659,7 +10903,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10671,11 +10915,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -10683,8 +10927,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -10696,7 +10940,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -10717,7 +10961,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10729,11 +10973,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10742,7 +10986,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -10763,7 +11007,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10775,11 +11019,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -10787,8 +11031,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -10800,7 +11044,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -10821,7 +11065,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10833,11 +11077,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10846,7 +11090,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -10867,7 +11111,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10879,11 +11123,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -10891,8 +11135,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -10904,7 +11148,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -10925,7 +11169,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10937,11 +11181,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10950,7 +11194,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -10971,7 +11215,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10983,11 +11227,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -10995,8 +11239,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -11008,7 +11252,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -11029,7 +11273,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11041,11 +11285,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11054,7 +11298,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -11075,7 +11319,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11087,11 +11331,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -11099,8 +11343,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -11135,7 +11379,7 @@ fi
     
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -11170,12 +11414,12 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
     # Feature test to disable chained fixups since it is not
     # compatible with '-undefined dynamic_lookup'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
 printf %s "checking for -no_fixup_chains linker flag... " >&6; }
 if test ${lt_cv_support_no_fixup_chains+y}
 then :
@@ -11209,10 +11453,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -11246,10 +11490,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -11283,8 +11527,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -11373,7 +11617,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_inc
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -11420,7 +11664,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -11441,7 +11685,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11453,11 +11697,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11466,7 +11710,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -11487,7 +11731,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11499,11 +11743,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -11511,8 +11755,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -11524,7 +11768,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -11545,7 +11789,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11557,11 +11801,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11570,7 +11814,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -11591,7 +11835,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11603,11 +11847,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -11615,8 +11859,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -11628,7 +11872,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -11649,7 +11893,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11661,11 +11905,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11674,7 +11918,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -11695,7 +11939,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11707,11 +11951,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -11719,8 +11963,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -11857,7 +12101,7 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
   
 @%:@ Check whether --with-aix-soname was given.
@@ -11884,8 +12128,8 @@ fi
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -11967,7 +12211,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -11984,15 +12228,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
     
     
     
 
-printf "%s\n" "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -12038,7 +12282,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12093,11 +12337,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     
@@ -12106,7 +12350,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12161,11 +12405,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12250,7 +12494,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -12277,9 +12521,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -12287,8 +12531,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -12426,7 +12670,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -12477,7 +12721,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -12493,7 +12743,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -12516,6 +12766,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -12573,18 +12829,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -12666,7 +12910,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -12675,15 +12919,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -12710,9 +12954,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -12720,8 +12964,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -12749,7 +12993,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -12765,9 +13009,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -12779,8 +13023,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -12794,7 +13038,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -12825,9 +13069,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -12843,15 +13087,15 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
     
     
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -12882,9 +13126,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -12900,8 +13144,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -12909,7 +13153,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -12917,11 +13161,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -12933,7 +13177,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -13127,17 +13371,17 @@ _LT_EOF
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -13146,7 +13390,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -13166,6 +13409,11 @@ _LT_EOF
       archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -13191,7 +13439,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
@@ -13246,16 +13494,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -13654,8 +13892,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -13665,14 +13903,20 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -13704,7 +13948,7 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
@@ -13838,7 +14082,7 @@ fi
 	
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -13854,9 +14098,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
@@ -13868,8 +14112,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -13909,7 +14153,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -13933,8 +14177,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -13949,6 +14193,9 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -13960,12 +14207,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -14012,17 +14253,17 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -14031,7 +14272,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -14057,8 +14297,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -14075,21 +14315,21 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -14225,8 +14465,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -14262,7 +14502,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -14274,7 +14514,7 @@ else case e in @%:@(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -14292,7 +14532,7 @@ else case e in @%:@(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -14307,8 +14547,8 @@ else case e in @%:@(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -14467,7 +14707,7 @@ esac
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -14760,8 +15000,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -15028,6 +15268,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -15138,6 +15390,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -15156,30 +15410,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -15224,9 +15456,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -15500,7 +15737,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -15551,7 +15788,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -15567,7 +15810,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -15590,6 +15833,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -15647,18 +15896,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -15740,7 +15977,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -15749,15 +15986,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -15784,9 +16021,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -15794,8 +16031,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -15817,7 +16054,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -15833,9 +16070,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -15847,8 +16084,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -15869,8 +16106,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15991,7 +16228,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -16016,8 +16253,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -16061,7 +16298,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16102,8 +16339,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -16132,7 +16369,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -16173,8 +16410,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -16184,7 +16421,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16225,13 +16462,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -16272,13 +16509,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -16319,8 +16556,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -16366,7 +16603,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -16450,7 +16687,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16469,12 +16706,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -16558,7 +16795,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16577,8 +16814,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -16616,40 +16853,40 @@ fi
   
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -16667,12 +16904,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -16697,15 +16934,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
   
 
@@ -16726,11 +16963,18 @@ CC=$lt_save_CC
 
 
 
+
        
        
 
 
 
+
+
+
+
+
+
 
 
         ac_config_commands="$ac_config_commands libtool"
@@ -16766,16 +17010,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -16792,7 +17036,7 @@ else case e in @%:@(
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -16822,9 +17066,9 @@ else case e in @%:@(
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -16841,7 +17085,7 @@ else case e in @%:@(
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -16899,14 +17143,14 @@ fi
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
@@ -16923,13 +17167,13 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 printf %s "checking for shared library path variable... " >&6; }
 if test ${acl_cv_libpath+y}
 then :
@@ -16944,12 +17188,12 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-printf "%s\n" "$acl_cv_libpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+printf '%s\n' "$acl_cv_libpath" >&6; }
   shlibpath_var="$acl_cv_shlibpath_var"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
 printf %s "checking whether to activate relocatable installation... " >&6; }
   @%:@ Check whether --enable-relocatable was given.
 if test ${enable_relocatable+y}
@@ -16966,8 +17210,8 @@ esac
 fi
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-printf "%s\n" "$RELOCATABLE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+printf '%s\n' "$RELOCATABLE" >&6; }
 
 
   
@@ -16977,11 +17221,13 @@ printf "%s\n" "$RELOCATABLE" >&6; }
     reloc_final_prefix="$prefix"
   fi
   
-printf "%s\n" "@%:@define INSTALLPREFIX \"${reloc_final_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+@%:@define INSTALLPREFIX "${reloc_final_prefix}"
+_ACEOF
 
   if test $RELOCATABLE = yes; then
     
-printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
 
   fi
 
@@ -17002,14 +17248,14 @@ printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
 if test "x$ac_cv_header_mach_o_dyld_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
 
 fi
 
     ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
 if test "x$ac_cv_func__NSGetExecutablePath" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
 
 fi
 
@@ -17028,7 +17274,7 @@ fi
         ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
 if test "x$ac_cv_func_copy_file_range" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
@@ -17126,7 +17372,7 @@ fi
 if test ${enable_extra_encodings+y}
 then :
   enableval=$enable_extra_encodings; 
-printf "%s\n" "@%:@define ENABLE_EXTRA 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_EXTRA 1" >>confdefs.h
 
    USE_EXTRA_ENCODINGS=yes
 else case e in @%:@(
@@ -17137,7 +17383,7 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to copy files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to copy files" >&5
 printf %s "checking how to copy files... " >&6; }
 if test ${cl_cv_prog_cp+y}
 then :
@@ -17155,11 +17401,11 @@ rm -f conftest*
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_cp" >&5
-printf "%s\n" "$cl_cv_prog_cp" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_cp" >&5
+printf '%s\n' "$cl_cv_prog_cp" >&6; }
 CP="$cl_cv_prog_cp"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to make hard links" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to make hard links" >&5
 printf %s "checking how to make hard links... " >&6; }
 if test ${cl_cv_prog_LN+y}
 then :
@@ -17177,19 +17423,19 @@ rm -f conftestdata conftestfile
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_LN" >&5
-printf "%s\n" "$cl_cv_prog_LN" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_LN" >&5
+printf '%s\n' "$cl_cv_prog_LN" >&6; }
 LN="$cl_cv_prog_LN"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 
@@ -17201,7 +17447,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RC+y}
 then :
@@ -17222,7 +17468,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17234,11 +17480,11 @@ esac
 fi
 RC=$ac_cv_prog_RC
 if test -n "$RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
-printf "%s\n" "$RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+printf '%s\n' "$RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17247,7 +17493,7 @@ if test -z "$ac_cv_prog_RC"; then
   ac_ct_RC=$RC
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RC+y}
 then :
@@ -17268,7 +17514,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RC="windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17280,11 +17526,11 @@ esac
 fi
 ac_ct_RC=$ac_cv_prog_ac_ct_RC
 if test -n "$ac_ct_RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
-printf "%s\n" "$ac_ct_RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
+printf '%s\n' "$ac_ct_RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RC" = x; then
@@ -17292,8 +17538,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RC=$ac_ct_RC
@@ -17391,7 +17637,7 @@ if test $WOE32 = yes; then
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_WINDRES+y}
 then :
@@ -17412,7 +17658,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17424,11 +17670,11 @@ esac
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
-printf "%s\n" "$WINDRES" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+printf '%s\n' "$WINDRES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17437,7 +17683,7 @@ if test -z "$ac_cv_prog_WINDRES"; then
   ac_ct_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_WINDRES+y}
 then :
@@ -17458,7 +17704,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_WINDRES="windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17470,11 +17716,11 @@ esac
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
-printf "%s\n" "$ac_ct_WINDRES" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+printf '%s\n' "$ac_ct_WINDRES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_WINDRES" = x; then
@@ -17482,8 +17728,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     WINDRES=$ac_ct_WINDRES
@@ -17499,7 +17745,7 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -17530,9 +17776,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -17576,8 +17822,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -17586,7 +17832,7 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
@@ -17600,15 +17846,15 @@ printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
   else
     acl_final_exec_prefix="$exec_prefix"
   fi
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
+  prefix="$acl_saved_prefix"
 
 
     
   
-                                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+                                                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 printf %s "checking for shared library run path origin... " >&6; }
 if test ${acl_cv_rpath+y}
 then :
@@ -17623,8 +17869,8 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-printf "%s\n" "$acl_cv_rpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf '%s\n' "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   acl_libext="$acl_cv_libext"
   acl_shlibext="$acl_cv_shlibext"
@@ -17646,281 +17892,75 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
 printf %s "checking 32-bit host C ABI... " >&6; }
 if test ${gl_cv_host_cpu_c_abi_32bit+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) if test -n "$gl_cv_host_cpu_c_abi"; then
-       case "$gl_cv_host_cpu_c_abi" in
-         i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
-           gl_cv_host_cpu_c_abi_32bit=yes ;;
-         x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
-           gl_cv_host_cpu_c_abi_32bit=no ;;
-         *)
-           gl_cv_host_cpu_c_abi_32bit=unknown ;;
-       esac
-     else
-       case "$host_cpu" in
+  e) case "$host_cpu" in
 
-         # CPUs that only support a 32-bit ABI.
-         arc \
-         | bfin \
-         | cris* \
-         | csky \
-         | epiphany \
-         | ft32 \
-         | h8300 \
-         | m68k \
-         | microblaze | microblazeel \
-         | nds32 | nds32le | nds32be \
-         | nios2 | nios2eb | nios2el \
-         | or1k* \
-         | or32 \
-         | sh | sh1234 | sh1234elb \
-         | tic6x \
-         | xtensa* )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
+       # CPUs that only support a 32-bit ABI.
+       arc \
+       | bfin \
+       | cris* \
+       | csky \
+       | epiphany \
+       | ft32 \
+       | h8300 \
+       | m68k \
+       | microblaze | microblazeel \
+       | nds32 | nds32le | nds32be \
+       | nios2 | nios2eb | nios2el \
+       | or1k* \
+       | or32 \
+       | sh | sh1234 | sh1234elb \
+       | tic6x \
+       | xtensa* )
+         gl_cv_host_cpu_c_abi_32bit=yes
+         ;;
 
-         # CPUs that only support a 64-bit ABI.
-         alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
-         | mmix )
-           gl_cv_host_cpu_c_abi_32bit=no
-           ;;
+       # CPUs that only support a 64-bit ABI.
+       alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
+       | mmix )
+         gl_cv_host_cpu_c_abi_32bit=no
+         ;;
 
-         i[34567]86 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         x86_64 )
-           # On x86_64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
-           # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
-           #   with native Windows (mingw, MSVC).
-           # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if (defined __x86_64__ || defined __amd64__ \
-                       || defined _M_X64 || defined _M_AMD64) \
-                      && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         arm* | aarch64 )
-           # Assume arm with EABI.
-           # On arm64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
-           # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
-           # On hppa, the C compiler may be generating 32-bit code or 64-bit
-           # code. In the latter case, it defines _LP64 and __LP64__.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         ia64* )
-           # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
-           # 32-bit code. In the latter case, it defines _ILP32.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef _ILP32
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=yes
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         mips* )
-           # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
-           # at 32.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         powerpc* )
-           # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
-           # No need to distinguish them here; the caller may distinguish
-           # them based on the OS.
-           # On powerpc64 systems, the C compiler may still be generating
-           # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
-           # be generating 64-bit code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __powerpc64__ || defined __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         rs6000 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         riscv32 | riscv64 )
-           # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
-           # Size of 'long' and 'void *':
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         s390* )
-           # On s390x, the C compiler may be generating 64-bit (= s390x) code
-           # or 31-bit (= s390) code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__ || defined __s390x__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         sparc | sparc64 )
-           # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
-           # C compiler still generates 32-bit code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __sparcv9 || defined __arch64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         *)
+       *)
+         if test -n "$gl_cv_host_cpu_c_abi"; then
+                      case "$gl_cv_host_cpu_c_abi" in
+             i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+               gl_cv_host_cpu_c_abi_32bit=yes ;;
+             x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+               gl_cv_host_cpu_c_abi_32bit=no ;;
+             *)
+               gl_cv_host_cpu_c_abi_32bit=unknown ;;
+           esac
+         else
            gl_cv_host_cpu_c_abi_32bit=unknown
-           ;;
-       esac
-     fi
+         fi
+         if test $gl_cv_host_cpu_c_abi_32bit = unknown; then
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int test_pointer_size[sizeof (void *) - 5];
+                
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_host_cpu_c_abi_32bit=no
+else case e in @%:@(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+         fi
+         ;;
+     esac
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
-printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
+printf '%s\n' "$gl_cv_host_cpu_c_abi_32bit" >&6; }
 
   HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
 
@@ -17928,7 +17968,7 @@ printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
                                 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
 printf %s "checking for ELF binary format... " >&6; }
 if test ${gl_cv_elf+y}
 then :
@@ -17936,7 +17976,7 @@ then :
 else case e in @%:@(
   e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if defined __ELF__ || (defined __linux__ && defined __EDG__)
+#if defined __ELF__ || (defined __linux__ && (defined __EDG__ || defined __SUNPRO_C))
         Extensible Linking Format
         #endif
        
@@ -17954,8 +17994,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
-printf "%s\n" "$gl_cv_elf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
+printf '%s\n' "$gl_cv_elf" >&6; }
   if test $gl_cv_elf = yes; then
     # Extract the ELF class of a file (5th byte) in decimal.
     # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
@@ -18006,7 +18046,7 @@ printf "%s\n" "$gl_cv_elf" >&6; }
     }
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
 printf %s "checking for the common suffixes of directories in the library search path... " >&6; }
 if test ${acl_cv_libdirstems+y}
 then :
@@ -18025,6 +18065,13 @@ else case e in @%:@(
            esac
          fi
          ;;
+       netbsd*)
+                           if test $HOST_CPU_C_ABI_32BIT != no; then
+           case "$host_cpu" in
+             sparc*) acl_libdirstem2=lib/sparc ;;
+           esac
+         fi
+         ;;
        *)
                                                                                  searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
                      | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
@@ -18041,7 +18088,7 @@ else case e in @%:@(
            fi
          fi
          if test -n "$searchpath"; then
-           acl_save_IFS="${IFS= 	}"; IFS=":"
+           acl_saved_IFS="${IFS= 	}"; IFS=":"
            for searchdir in $searchpath; do
              if test -d "$searchdir"; then
                case "$searchdir" in
@@ -18058,7 +18105,7 @@ else case e in @%:@(
                esac
              fi
            done
-           IFS="$acl_save_IFS"
+           IFS="$acl_saved_IFS"
            if test $HOST_CPU_C_ABI_32BIT = yes; then
              # 32-bit ABI.
              acl_libdirstem3=
@@ -18076,8 +18123,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
-printf "%s\n" "$acl_cv_libdirstems" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+printf '%s\n' "$acl_cv_libdirstems" >&6; }
       acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
   acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
   acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
@@ -18094,9 +18141,9 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
   
     use_additional=yes
   
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
     eval additional_includedir=\"$includedir\"
@@ -18104,8 +18151,8 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
   
 @%:@ Check whether --with-libiconv-prefix was given.
@@ -18117,9 +18164,9 @@ then :
     else
       if test "X$withval" = "X"; then
         
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
           eval additional_includedir=\"$includedir\"
@@ -18127,8 +18174,8 @@ then :
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
         
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -18240,13 +18287,13 @@ fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
               
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -18334,13 +18381,13 @@ fi
                                                                                 haveit=
                     for x in $LDFLAGS $LIBICONV; do
                       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -18402,13 +18449,13 @@ fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCICONV; do
                     
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -18424,12 +18471,12 @@ fi
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -18451,13 +18498,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LIBICONV; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -18472,13 +18519,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LTLIBICONV; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -18552,17 +18599,17 @@ fi
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
     fi
@@ -18583,19 +18630,19 @@ fi
        
       
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
   
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -18608,7 +18655,7 @@ fi
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
@@ -18640,7 +18687,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -18665,22 +18712,22 @@ then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
   e) 
-                  am_save_LIBS="$LIBS"
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -18728,6 +18775,35 @@ int result = 0;
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -18744,7 +18820,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -18763,7 +18839,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18783,7 +18859,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18801,7 +18877,7 @@ int result = 0;
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -18828,12 +18904,12 @@ fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -18843,16 +18919,16 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
     
-printf "%s\n" "@%:@define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -18860,7 +18936,7 @@ printf "%s\n" "$LIBICONV" >&6; }
   
 
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
 printf %s "checking whether iconv is compatible with its POSIX signature... " >&6; }
 if test ${gl_cv_iconv_nonconst+y}
 then :
@@ -18896,8 +18972,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
-printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
+printf '%s\n' "$gl_cv_iconv_nonconst" >&6; }
   else
             gl_cv_iconv_nonconst=yes
   fi
@@ -18907,12 +18983,26 @@ printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
     iconv_arg1="const"
   fi
   
-printf "%s\n" "@%:@define ICONV_CONST $iconv_arg1" >>confdefs.h
+printf '%s\n' "@%:@define ICONV_CONST $iconv_arg1" >>confdefs.h
 
     
 
+      if test "$am_func_iconv" = yes; then
+    if test -n "$LIBICONV"; then
+      am_cv_func_iconv_summary='yes, in libiconv'
+    else
+      am_cv_func_iconv_summary='yes, in libc'
+    fi
+  else
+    if test "$am_cv_func_iconv" = yes; then
+      am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
+    else
+      am_cv_func_iconv_summary='no, consider installing GNU libiconv'
+    fi
+  fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 printf %s "checking whether NLS is requested... " >&6; }
     @%:@ Check whether --enable-nls was given.
 if test ${enable_nls+y}
@@ -18923,13 +19013,13 @@ else case e in @%:@(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   
 
 
           
-      GETTEXT_MACRO_VERSION=0.20
+      GETTEXT_MACRO_VERSION=0.22
 
 
     
@@ -18963,7 +19053,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGFMT+y}
 then :
@@ -18974,9 +19064,9 @@ else case e in @%:@(
     ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -18989,7 +19079,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
     ;;
 esac ;;
@@ -18997,16 +19087,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-printf "%s\n" "$MSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf '%s\n' "$MSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_GMSGFMT+y}
 then :
@@ -19029,7 +19119,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19043,11 +19133,11 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-printf "%s\n" "$GMSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf '%s\n' "$GMSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -19088,7 +19178,7 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XGETTEXT+y}
 then :
@@ -19099,9 +19189,9 @@ else case e in @%:@(
     ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -19114,7 +19204,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
     ;;
 esac ;;
@@ -19122,11 +19212,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-printf "%s\n" "$XGETTEXT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf '%s\n' "$XGETTEXT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     rm -f messages.po
@@ -19167,7 +19257,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGMERGE+y}
 then :
@@ -19178,9 +19268,9 @@ else case e in @%:@(
     ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -19192,7 +19282,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
     ;;
 esac ;;
@@ -19200,11 +19290,11 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-printf "%s\n" "$MSGMERGE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf '%s\n' "$MSGMERGE" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -19226,20 +19316,66 @@ fi
 
 
 
-    
-  
-  
+  gl_sed_double_backslashes='s/\\/\\\\/g'
+  gl_sed_escape_doublequotes='s/"/\\"/g'
+  gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
+  gl_sed_escape_for_make_2='s,\$,\\$$,g'
+      case `echo r | tr -d '\r'` in
+    '') gl_tr_cr='\015' ;;
+    *)  gl_tr_cr='\r' ;;
+  esac
+
+
+    gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+      if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
   
   
   
   
 
+    gl_final_localedir="$localedir"
+    case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw* | windows*)
+          gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;;
+      esac
+      ;;
+  esac
+    localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+  localedir_c='"'"$localedir_c"'"'
   
+
+    localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+      if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then
+    localedir_c_make='\"$(localedir)\"'
+  fi
   
 
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+
 
     
+  
+  
+  
+  
+  
+  
 
+  
+  
+
+
+  
     
   
 
@@ -19248,13 +19384,13 @@ fi
   
 
     
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
 if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_LIBS="$LIBS"
+  e) gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19276,23 +19412,23 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS" ;;
+     LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf '%s\n' "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
     
-printf "%s\n" "@%:@define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+                    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
 printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; }
 if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_LIBS="$LIBS"
+  e) gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19314,20 +19450,20 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS" ;;
+     LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
-printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+printf '%s\n' "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
   if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
     
-printf "%s\n" "@%:@define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
 
   fi
   INTL_MACOSX_LIBS=
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
      || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
   fi
   
 
@@ -19367,7 +19503,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
           gt_expression_test_code=
         fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 printf %s "checking for GNU gettext in libc... " >&6; }
 if eval test \${$gt_func_gnugettext_libc+y}
 then :
@@ -19409,8 +19545,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libc
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
                     
@@ -19418,19 +19554,19 @@ printf "%s\n" "$ac_res" >&6; }
        
       
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
   
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -19443,7 +19579,7 @@ printf "%s\n" "$ac_res" >&6; }
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
@@ -19475,7 +19611,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19500,22 +19636,22 @@ then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
   e) 
-                  am_save_LIBS="$LIBS"
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -19563,6 +19699,35 @@ int result = 0;
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -19579,7 +19744,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -19598,7 +19763,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -19618,7 +19783,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -19636,7 +19801,7 @@ int result = 0;
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -19663,12 +19828,12 @@ fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -19678,16 +19843,16 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
     
-printf "%s\n" "@%:@define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -19703,9 +19868,9 @@ printf "%s\n" "$LIBICONV" >&6; }
   
     use_additional=yes
   
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
     eval additional_includedir=\"$includedir\"
@@ -19713,8 +19878,8 @@ printf "%s\n" "$LIBICONV" >&6; }
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
   
 @%:@ Check whether --with-libintl-prefix was given.
@@ -19726,9 +19891,9 @@ then :
     else
       if test "X$withval" = "X"; then
         
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
           eval additional_includedir=\"$includedir\"
@@ -19736,8 +19901,8 @@ then :
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
         
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -19849,13 +20014,13 @@ fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBINTL; do
               
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -19943,13 +20108,13 @@ fi
                                                                                 haveit=
                     for x in $LDFLAGS $LIBINTL; do
                       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -20011,13 +20176,13 @@ fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCINTL; do
                     
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -20033,12 +20198,12 @@ fi
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -20060,13 +20225,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LIBINTL; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -20081,13 +20246,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LTLIBINTL; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -20161,17 +20326,17 @@ fi
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
     fi
@@ -20186,15 +20351,15 @@ fi
   
   
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 printf %s "checking for GNU gettext in libintl... " >&6; }
 if eval test \${$gt_func_gnugettext_libintl+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_CPPFLAGS="$CPPFLAGS"
+  e) gt_saved_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
+            gt_saved_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20233,8 +20398,14 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
+                                    gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
+            
+            case "$host_os" in
+              aix*) gt_LIBINTL_EXTRA="-lpthread" ;;
+            esac
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+               && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+              LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20265,27 +20436,28 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
-  LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+  LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA"
                  eval "$gt_func_gnugettext_libintl=yes"
                 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
             fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS" ;;
+            CPPFLAGS="$gt_saved_CPPFLAGS"
+            LIBS="$gt_saved_LIBS" ;;
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libintl
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
         fi
 
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
+                && test "$PACKAGE" != gettext-tools \
+                && test "$PACKAGE" != libintl; }; then
           gt_use_preinstalled_gnugettext=yes
         else
                     LIBINTL=
@@ -20306,19 +20478,19 @@ printf "%s\n" "$ac_res" >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
       
-printf "%s\n" "@%:@define ENABLE_NLS 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
 printf %s "checking whether to use NLS... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
 printf %s "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
@@ -20329,30 +20501,30 @@ printf %s "checking where the gettext function comes from... " >&6; }
     else
       gt_source="included intl directory"
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-printf "%s\n" "$gt_source" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf '%s\n' "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
 printf %s "checking how to link with libintl... " >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-printf "%s\n" "$LIBINTL" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf '%s\n' "$LIBINTL" >&6; }
         
   for element in $INCINTL; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -20367,10 +20539,10 @@ printf "%s\n" "$LIBINTL" >&6; }
       fi
 
             
-printf "%s\n" "@%:@define HAVE_GETTEXT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_GETTEXT 1" >>confdefs.h
 
       
-printf "%s\n" "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -20379,18 +20551,22 @@ printf "%s\n" "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
 
   
 
-    INTLLIBS="$LIBINTL"
+  
+        INTLLIBS="$LIBINTL"
+    
   
 
     
   
   
 
+    
+
 
 
 
     
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
@@ -20418,20 +20594,20 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
      
-printf "%s\n" "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
      
-printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
+printf '%s\n' "@%:@define mbstate_t int" >>confdefs.h
 
    fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 printf %s "checking for wchar_t... " >&6; }
 if test ${gt_cv_c_wchar_t+y}
 then :
@@ -20459,11 +20635,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
-printf "%s\n" "$gt_cv_c_wchar_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+printf '%s\n' "$gt_cv_c_wchar_t" >&6; }
   if test $gt_cv_c_wchar_t = yes; then
     
-printf "%s\n" "@%:@define HAVE_WCHAR_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WCHAR_T 1" >>confdefs.h
 
   fi
 
@@ -20486,31 +20662,31 @@ fi
 ac_fn_c_check_func "$LINENO" "getc_unlocked" "ac_cv_func_getc_unlocked"
 if test "x$ac_cv_func_getc_unlocked" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETC_UNLOCKED 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETC_UNLOCKED 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc"
 if test "x$ac_cv_func_mbrtowc" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MBRTOWC 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MBRTOWC 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "wcrtomb" "ac_cv_func_wcrtomb"
 if test "x$ac_cv_func_wcrtomb" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WCRTOMB 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WCRTOMB 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "mbsinit" "ac_cv_func_mbsinit"
 if test "x$ac_cv_func_mbsinit" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MBSINIT 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MBSINIT 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
 if test "x$ac_cv_func_setlocale" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
 
 fi
 
@@ -20522,7 +20698,7 @@ else
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> is standalone" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> is standalone" >&5
 printf %s "checking whether <wchar.h> is standalone... " >&6; }
 if test ${gl_cv_header_wchar_h_standalone+y}
 then :
@@ -20550,8 +20726,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_standalone" >&5
-printf "%s\n" "$gl_cv_header_wchar_h_standalone" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_standalone" >&5
+printf '%s\n' "$gl_cv_header_wchar_h_standalone" >&6; }
 if test $gl_cv_header_wchar_h_standalone = yes; then
   BROKEN_WCHAR_H=0
 else
@@ -20565,7 +20741,7 @@ do :
   ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
 if test "x$ac_cv_func_memmove" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
  
 else case e in @%:@(
   e) SRCLIBOBJS="$SRCLIBOBJS $ac_func.$ac_objext" ;;
@@ -20575,7 +20751,7 @@ fi
 done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 printf %s "checking for nl_langinfo and CODESET... " >&6; }
 if test ${am_cv_langinfo_codeset+y}
 then :
@@ -20604,11 +20780,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf '%s\n' "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
     
-printf "%s\n" "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -20685,7 +20861,7 @@ gl_mda_defines='
 
        
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 printf %s "checking for working fcntl.h... " >&6; }
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
@@ -20819,15 +20995,15 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+printf '%s\n' "$gl_cv_header_working_fcntl_h" >&6; }
 
   case $gl_cv_header_working_fcntl_h in #(
   *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
 
 
   case $gl_cv_header_working_fcntl_h in #(
@@ -20835,7 +21011,7 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 
 
 
@@ -20844,12 +21020,12 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
 if test "x$ac_cv_header_wchar_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WCHAR_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WCHAR_H 1" >>confdefs.h
 
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EILSEQ" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EILSEQ" >&5
 printf %s "checking for EILSEQ... " >&6; }
 if test ${ac_cv_decl_EILSEQ+y}
 then :
@@ -20915,18 +21091,18 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_EILSEQ" >&5
-printf "%s\n" "$ac_cv_decl_EILSEQ" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_EILSEQ" >&5
+printf '%s\n' "$ac_cv_decl_EILSEQ" >&6; }
   if test "$ac_cv_decl_EILSEQ" != yes; then
     
-printf "%s\n" "@%:@define EILSEQ $ac_cv_decl_EILSEQ" >>confdefs.h
+printf '%s\n' "@%:@define EILSEQ $ac_cv_decl_EILSEQ" >>confdefs.h
 
     EILSEQ="$ac_cv_decl_EILSEQ"
     
   fi
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 printf %s "checking whether byte ordering is bigendian... " >&6; }
 if test ${ac_cv_c_bigendian+y}
 then :
@@ -21148,20 +21324,20 @@ fi
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-printf "%s\n" "$ac_cv_c_bigendian" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf '%s\n' "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     printf "%s\n" "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf '%s\n' "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
      
-printf "%s\n" "@%:@define WORDS_LITTLEENDIAN 1" >>confdefs.h
+printf '%s\n' "@%:@define WORDS_LITTLEENDIAN 1" >>confdefs.h
 
    ;; #(
    universal)
      	
-printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf '%s\n' "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -21182,8 +21358,8 @@ printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 if test ${enable_cross_guesses+y}
 then :
   enableval=$enable_cross_guesses; if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
-printf "%s\n" "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
+printf '%s\n' "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
        enableval=conservative
      fi
      gl_cross_guesses="$enableval"
@@ -21209,14 +21385,14 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define size_t unsigned int" >>confdefs.h
+printf '%s\n' "@%:@define size_t unsigned int" >>confdefs.h
  ;;
 esac
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 printf %s "checking for working alloca.h... " >&6; }
 if test ${ac_cv_working_alloca_h+y}
 then :
@@ -21245,15 +21421,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+printf '%s\n' "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
   
-printf "%s\n" "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 printf %s "checking for alloca... " >&6; }
 if test ${ac_cv_func_alloca_works+y}
 then :
@@ -21298,12 +21474,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+printf '%s\n' "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
   
-printf "%s\n" "@%:@define HAVE_ALLOCA 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -21317,10 +21493,10 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-printf "%s\n" "@%:@define C_ALLOCA 1" >>confdefs.h
+printf '%s\n' "@%:@define C_ALLOCA 1" >>confdefs.h
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 printf %s "checking stack direction for C alloca... " >&6; }
 if test ${ac_cv_c_stack_direction+y}
 then :
@@ -21364,9 +21540,9 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
-printf "%s\n" "@%:@define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+printf '%s\n' "$ac_cv_c_stack_direction" >&6; }
+printf '%s\n' "@%:@define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
 
 
 fi
@@ -21449,7 +21625,7 @@ fi
   REPLACE_WCTOMB=0;          
 
 
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 printf %s "checking whether lstat correctly handles trailing slash... " >&6; }
 if test ${gl_cv_func_lstat_dereferences_slashed_symlink+y}
 then :
@@ -21509,12 +21685,12 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
-printf "%s\n" "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
+printf '%s\n' "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
   case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
     *yes)
       
-printf "%s\n" "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
+printf '%s\n' "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
       ;;
   esac
@@ -21523,7 +21699,7 @@ printf "%s\n" "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
@@ -21554,11 +21730,11 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
     
-printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
@@ -21566,7 +21742,7 @@ printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
 
   
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
 printf %s "checking whether realpath works... " >&6; }
 if test ${gl_cv_func_realpath_works+y}
 then :
@@ -21800,17 +21976,17 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
-printf "%s\n" "$gl_cv_func_realpath_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
+printf '%s\n' "$gl_cv_func_realpath_works" >&6; }
   case "$gl_cv_func_realpath_works" in
     *yes)
       
-printf "%s\n" "@%:@define FUNC_REALPATH_WORKS 1" >>confdefs.h
+printf '%s\n' "@%:@define FUNC_REALPATH_WORKS 1" >>confdefs.h
 
       ;;
     *nearly)
       
-printf "%s\n" "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
+printf '%s\n' "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
 
       ;;
   esac
@@ -21827,7 +22003,7 @@ printf "%s\n" "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -22031,7 +22207,7 @@ fi
   
 
   
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 printf %s "checking for C/C++ restrict keyword... " >&6; }
 if test ${ac_cv_c_restrict+y}
 then :
@@ -22071,14 +22247,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
-printf "%s\n" "$ac_cv_c_restrict" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+printf '%s\n' "$ac_cv_c_restrict" >&6; }
  
  case $ac_cv_c_restrict in
    restrict) ;;
-   no) printf "%s\n" "@%:@define restrict /**/" >>confdefs.h
+   no) printf '%s\n' "@%:@define restrict /**/" >>confdefs.h
  ;;
-   *)  printf "%s\n" "@%:@define restrict $ac_cv_c_restrict" >>confdefs.h
+   *)  printf '%s\n' "@%:@define restrict $ac_cv_c_restrict" >>confdefs.h
  ;;
  esac
 
@@ -22187,7 +22363,7 @@ printf "%s\n" "$ac_cv_c_restrict" >&6; }
   if test $ac_cv_func__set_invalid_parameter_handler = yes; then
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
     
-printf "%s\n" "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
 
   else
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
@@ -22540,7 +22716,7 @@ printf "%s\n" "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
     
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
 printf %s "checking if environ is properly declared... " >&6; }
 if test ${gt_cv_var_environ_declaration+y}
 then :
@@ -22574,11 +22750,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
-printf "%s\n" "$gt_cv_var_environ_declaration" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
+printf '%s\n' "$gt_cv_var_environ_declaration" >&6; }
   if test $gt_cv_var_environ_declaration = yes; then
     
-printf "%s\n" "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
   fi
   
@@ -22589,7 +22765,7 @@ printf "%s\n" "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
 printf %s "checking whether the preprocessor supports include_next... " >&6; }
 if test ${gl_cv_have_include_next+y}
 then :
@@ -22654,8 +22830,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
-printf "%s\n" "$gl_cv_have_include_next" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
+printf '%s\n' "$gl_cv_have_include_next" >&6; }
   PRAGMA_SYSTEM_HEADER=
   if test $gl_cv_have_include_next = yes; then
     INCLUDE_NEXT=include_next
@@ -22676,7 +22852,7 @@ printf "%s\n" "$gl_cv_have_include_next" >&6; }
   
   
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
 printf %s "checking whether source code line length is unlimited... " >&6; }
 if test ${gl_cv_source_line_length_unlimited+y}
 then :
@@ -22703,8 +22879,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
-printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
+printf '%s\n' "$gl_cv_source_line_length_unlimited" >&6; }
   if test $gl_cv_source_line_length_unlimited = no; then
     PRAGMA_COLUMNS="#pragma COLUMNS 10000"
   else
@@ -22714,7 +22890,7 @@ printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
 printf %s "checking for complete errno.h... " >&6; }
 if test ${gl_cv_header_errno_h_complete+y}
 then :
@@ -22791,8 +22967,8 @@ rm -rf conftest*
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
-printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
+printf '%s\n' "$gl_cv_header_errno_h_complete" >&6; }
   if test $gl_cv_header_errno_h_complete = yes; then
     GL_GENERATE_ERRNO_H=false
   else
@@ -22807,7 +22983,7 @@ printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_errno_h='<'errno.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
 printf %s "checking absolute name of <errno.h>... " >&6; }
 if test ${gl_cv_next_errno_h+y}
 then :
@@ -22852,8 +23028,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
-printf "%s\n" "$gl_cv_next_errno_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
+printf '%s\n' "$gl_cv_next_errno_h" >&6; }
      fi
      NEXT_ERRNO_H=$gl_cv_next_errno_h
 
@@ -22873,7 +23049,7 @@ printf "%s\n" "$gl_cv_next_errno_h" >&6; }
   fi
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
 printf %s "checking for EMULTIHOP value... " >&6; }
 if test ${gl_cv_header_errno_h_EMULTIHOP+y}
 then :
@@ -22934,8 +23110,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
     case $gl_cv_header_errno_h_EMULTIHOP in
       yes | no)
         EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE=
@@ -22950,7 +23126,7 @@ printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
 
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
 printf %s "checking for ENOLINK value... " >&6; }
 if test ${gl_cv_header_errno_h_ENOLINK+y}
 then :
@@ -23011,8 +23187,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
-printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
+printf '%s\n' "$gl_cv_header_errno_h_ENOLINK" >&6; }
     case $gl_cv_header_errno_h_ENOLINK in
       yes | no)
         ENOLINK_HIDDEN=0; ENOLINK_VALUE=
@@ -23027,7 +23203,7 @@ printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
 
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
 printf %s "checking for EOVERFLOW value... " >&6; }
 if test ${gl_cv_header_errno_h_EOVERFLOW+y}
 then :
@@ -23088,8 +23264,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
     case $gl_cv_header_errno_h_EOVERFLOW in
       yes | no)
         EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE=
@@ -23103,8 +23279,8 @@ printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
   fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
-printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to detect undeclared functions" >&5
+printf %s "checking for $CC options to detect undeclared functions... " >&6; }
 if test ${ac_cv_c_undeclared_builtin_options+y}
 then :
   printf %s "(cached) " >&6
@@ -23172,12 +23348,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
-printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf '%s\n' "$ac_cv_c_undeclared_builtin_options" >&6; }
   case $ac_cv_c_undeclared_builtin_options in @%:@(
   'cannot detect') :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot make $CC report undeclared builtins
 See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
   'none needed') :
@@ -23186,7 +23362,50 @@ See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
     ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
 esac
 
-ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to ignore future-version functions" >&5
+printf %s "checking for $CC options to ignore future-version functions... " >&6; }
+if test ${ac_cv_c_future_darwin_options+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)       ac_compile_saved="$ac_compile"
+   ac_compile="$ac_compile -Werror=unguarded-availability-new"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if ! (defined __APPLE__ && defined __MACH__)
+	   #error "-Werror=unguarded-availability-new not needed here"
+	  #endif
+	
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_future_darwin_options='-Werror=unguarded-availability-new'
+else case e in @%:@(
+  e) ac_cv_c_future_darwin_options='none needed' ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_compile="$ac_compile_saved"
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_future_darwin_options" >&5
+printf '%s\n' "$ac_cv_c_future_darwin_options" >&6; }
+ case $ac_cv_c_future_darwin_options in @%:@(
+  'none needed') :
+    ac_c_future_darwin_options='' ;; @%:@(
+  *) :
+    ac_c_future_darwin_options=$ac_cv_c_future_darwin_options ;;
+esac
+
+ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_strerror_r" = xyes
 then :
   ac_have_decl=1
@@ -23194,7 +23413,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
 
 
 if test $ac_cv_have_decl_strerror_r = yes; then
@@ -23202,11 +23421,11 @@ if test $ac_cv_have_decl_strerror_r = yes; then
   # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well
   # as AC_CHECK_DECLS_ONCE.)
   
-printf "%s\n" "@%:@define HAVE_STRERROR_R 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRERROR_R 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
 printf %s "checking whether strerror_r returns char *... " >&6; }
 if test ${ac_cv_func_strerror_r_char_p+y}
 then :
@@ -23241,11 +23460,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+printf '%s\n' "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
   
-printf "%s\n" "@%:@define STRERROR_R_CHAR_P 1" >>confdefs.h
+printf '%s\n' "@%:@define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
@@ -23253,7 +23472,7 @@ fi
   XGETTEXT_EXTRA_OPTIONS=
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5
 printf %s "checking whether ctype.h defines __header_inline... " >&6; }
 if test ${gl_cv_have___header_inline+y}
 then :
@@ -23277,11 +23496,11 @@ fi
 rm -f conftest.err conftest.i conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5
-printf "%s\n" "$gl_cv_have___header_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5
+printf '%s\n' "$gl_cv_have___header_inline" >&6; }
   if test "$gl_cv_have___header_inline" = yes; then
     
-printf "%s\n" "@%:@define HAVE___HEADER_INLINE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE___HEADER_INLINE 1" >>confdefs.h
 
   fi
 
@@ -23358,7 +23577,7 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      
-printf "%s\n" "@%:@define pid_t $ac_pid_type" >>confdefs.h
+printf '%s\n' "@%:@define pid_t $ac_pid_type" >>confdefs.h
 
      ;;
 esac
@@ -23371,7 +23590,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define mode_t int" >>confdefs.h
+printf '%s\n' "@%:@define mode_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -23390,7 +23609,7 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_fcntl_h='<'fcntl.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
 printf %s "checking absolute name of <fcntl.h>... " >&6; }
 if test ${gl_cv_next_fcntl_h+y}
 then :
@@ -23435,8 +23654,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
-printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
+printf '%s\n' "$gl_cv_next_fcntl_h" >&6; }
      fi
      NEXT_FCNTL_H=$gl_cv_next_fcntl_h
 
@@ -23487,7 +23706,7 @@ printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
   REPLACE_STAT=0;       
   REPLACE_UTIMENSAT=0;  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
 printf %s "checking whether stat file-mode macros are broken... " >&6; }
 if test ${ac_cv_header_stat_broken+y}
 then :
@@ -23525,11 +23744,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-printf "%s\n" "$ac_cv_header_stat_broken" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+printf '%s\n' "$ac_cv_header_stat_broken" >&6; }
 if test $ac_cv_header_stat_broken = yes; then
   
-printf "%s\n" "@%:@define STAT_MACROS_BROKEN 1" >>confdefs.h
+printf '%s\n' "@%:@define STAT_MACROS_BROKEN 1" >>confdefs.h
 
 fi
 
@@ -23537,7 +23756,7 @@ fi
   
   case "$host_os" in
     mingw*)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
 printf %s "checking for 64-bit off_t... " >&6; }
 if test ${gl_cv_type_off_t_64+y}
 then :
@@ -23567,14 +23786,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
-printf "%s\n" "$gl_cv_type_off_t_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
+printf '%s\n' "$gl_cv_type_off_t_64" >&6; }
       if test $gl_cv_type_off_t_64 = no; then
         WINDOWS_64_BIT_OFF_T=1
       else
         WINDOWS_64_BIT_OFF_T=0
       fi
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
 printf %s "checking for 64-bit st_size... " >&6; }
 if test ${gl_cv_member_st_size_64+y}
 then :
@@ -23605,8 +23824,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
-printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
+printf '%s\n' "$gl_cv_member_st_size_64" >&6; }
       if test $gl_cv_member_st_size_64 = no; then
         WINDOWS_64_BIT_ST_SIZE=1
       else
@@ -23636,7 +23855,7 @@ printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_stat_h='<'sys/stat.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
 printf %s "checking absolute name of <sys/stat.h>... " >&6; }
 if test ${gl_cv_next_sys_stat_h+y}
 then :
@@ -23687,8 +23906,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
-printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
+printf '%s\n' "$gl_cv_next_sys_stat_h" >&6; }
      fi
      NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h
 
@@ -23725,7 +23944,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define nlink_t int" >>confdefs.h
+printf '%s\n' "@%:@define nlink_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -23744,7 +23963,7 @@ fi
       ac_fn_c_check_header_compile "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default"
 if test "x$ac_cv_header_sdkddkver_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SDKDDKVER_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SDKDDKVER_H 1" >>confdefs.h
 
 fi
 
@@ -23834,7 +24053,7 @@ fi
 
   
 
-ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getdtablesize" = xyes
 then :
   ac_have_decl=1
@@ -23842,7 +24061,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
 
 
 
@@ -23860,7 +24079,7 @@ printf "%s\n" "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_limits_h='<'limits.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
 printf %s "checking absolute name of <limits.h>... " >&6; }
 if test ${gl_cv_next_limits_h+y}
 then :
@@ -23911,8 +24130,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
-printf "%s\n" "$gl_cv_next_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
+printf '%s\n' "$gl_cv_next_limits_h" >&6; }
      fi
      NEXT_LIMITS_H=$gl_cv_next_limits_h
 
@@ -23929,7 +24148,7 @@ printf "%s\n" "$gl_cv_next_limits_h" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
 printf %s "checking whether limits.h has WORD_BIT, BOOL_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_limits_width+y}
 then :
@@ -23964,8 +24183,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
-printf "%s\n" "$gl_cv_header_limits_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
+printf '%s\n' "$gl_cv_header_limits_width" >&6; }
   if test "$gl_cv_header_limits_width" = yes; then
     GL_GENERATE_LIMITS_H=false
   else
@@ -23973,7 +24192,7 @@ printf "%s\n" "$gl_cv_header_limits_width" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
 printf %s "checking for wint_t... " >&6; }
 if test ${gt_cv_c_wint_t+y}
 then :
@@ -24001,14 +24220,14 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
-printf "%s\n" "$gt_cv_c_wint_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+printf '%s\n' "$gt_cv_c_wint_t" >&6; }
   if test $gt_cv_c_wint_t = yes; then
     
-printf "%s\n" "@%:@define HAVE_WINT_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WINT_T 1" >>confdefs.h
 
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
 printf %s "checking whether wint_t is large enough... " >&6; }
 if test ${gl_cv_type_wint_t_large_enough+y}
 then :
@@ -24037,8 +24256,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
-printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
+printf '%s\n' "$gl_cv_type_wint_t_large_enough" >&6; }
     if test $gl_cv_type_wint_t_large_enough = no; then
       GNULIBHEADERS_OVERRIDE_WINT_T=1
     else
@@ -24050,7 +24269,7 @@ printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
   
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
 printf %s "checking whether the compiler produces multi-arch binaries... " >&6; }
 if test ${gl_cv_c_multiarch+y}
 then :
@@ -24094,8 +24313,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
-printf "%s\n" "$gl_cv_c_multiarch" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
+printf '%s\n' "$gl_cv_c_multiarch" >&6; }
   if test $gl_cv_c_multiarch = yes; then
     APPLE_UNIVERSAL_BUILD=1
   else
@@ -24109,10 +24328,10 @@ printf "%s\n" "$gl_cv_c_multiarch" >&6; }
   
 
       
-printf "%s\n" "@%:@define HAVE_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LONG_LONG_INT 1" >>confdefs.h
 
   
-printf "%s\n" "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
 
 
       
@@ -24151,7 +24370,7 @@ printf "%s\n" "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdint_h='<'stdint.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
 printf %s "checking absolute name of <stdint.h>... " >&6; }
 if test ${gl_cv_next_stdint_h+y}
 then :
@@ -24202,8 +24421,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
-printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+printf '%s\n' "$gl_cv_next_stdint_h" >&6; }
      fi
      NEXT_STDINT_H=$gl_cv_next_stdint_h
 
@@ -24227,7 +24446,7 @@ printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
   
 
     if test $ac_cv_header_stdint_h = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
 printf %s "checking whether stdint.h conforms to C99... " >&6; }
 if test ${gl_cv_header_working_stdint_h+y}
 then :
@@ -24504,8 +24723,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdint_h" >&6; }
   fi
 
   HAVE_C99_STDINT_H=0
@@ -24515,7 +24734,7 @@ printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
   case "$gl_cv_header_working_stdint_h" in
     *yes)
       HAVE_C99_STDINT_H=1
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
 printf %s "checking whether stdint.h works without ISO C predefines... " >&6; }
 if test ${gl_cv_header_stdint_without_STDC_macros+y}
 then :
@@ -24556,18 +24775,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
-printf "%s\n" "$gl_cv_header_stdint_without_STDC_macros" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
+printf '%s\n' "$gl_cv_header_stdint_without_STDC_macros" >&6; }
 
       if test $gl_cv_header_stdint_without_STDC_macros = no; then
         
-printf "%s\n" "@%:@define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_CONSTANT_MACROS 1" >>confdefs.h
 
         
-printf "%s\n" "@%:@define __STDC_LIMIT_MACROS 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_LIMIT_MACROS 1" >>confdefs.h
 
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
 printf %s "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_stdint_width+y}
 then :
@@ -24607,8 +24826,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
-printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
+printf '%s\n' "$gl_cv_header_stdint_width" >&6; }
       if test "$gl_cv_header_stdint_width" = yes; then
         GL_GENERATE_STDINT_H=false
       fi
@@ -24617,13 +24836,13 @@ printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
                   ac_fn_c_check_header_compile "$LINENO" "sys/inttypes.h" "ac_cv_header_sys_inttypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_inttypes_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
 
 fi
 ac_fn_c_check_header_compile "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_bitypes_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SYS_BITYPES_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SYS_BITYPES_H 1" >>confdefs.h
 
 fi
 
@@ -24639,7 +24858,7 @@ fi
     
           
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
@@ -24665,14 +24884,16 @@ fi
 esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "@%:@define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -24682,7 +24903,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
@@ -24708,14 +24929,16 @@ fi
 esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "@%:@define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -24724,7 +24947,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
 printf %s "checking whether $gltype is signed... " >&6; }
 if eval test \${gl_cv_type_${gltype}_signed+y}
 then :
@@ -24761,12 +24984,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_signed
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_type_${gltype}_signed
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     if test "$result" = yes; then
-      printf "%s\n" "@%:@define HAVE_SIGNED_${GLTYPE} 1" >>confdefs.h
+      cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
 
       eval HAVE_SIGNED_${GLTYPE}=1
     else
@@ -24781,7 +25006,7 @@ printf "%s\n" "$ac_res" >&6; }
     
           
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
@@ -24835,13 +25060,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "@%:@define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
   
@@ -24850,7 +25077,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
@@ -24904,13 +25131,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "@%:@define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
   
@@ -24963,7 +25192,7 @@ printf "%s\n" "$ac_res" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_inttypes_h='<'inttypes.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
 printf %s "checking absolute name of <inttypes.h>... " >&6; }
 if test ${gl_cv_next_inttypes_h+y}
 then :
@@ -25014,8 +25243,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
-printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
+printf '%s\n' "$gl_cv_next_inttypes_h" >&6; }
      fi
      NEXT_INTTYPES_H=$gl_cv_next_inttypes_h
 
@@ -25059,7 +25288,7 @@ printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
 printf %s "checking whether malloc is ptrdiff_t safe... " >&6; }
 if test ${gl_cv_malloc_ptrdiff+y}
 then :
@@ -25107,8 +25336,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
-printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
+printf '%s\n' "$gl_cv_malloc_ptrdiff" >&6; }
 
 
   
@@ -25117,7 +25346,7 @@ printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
 printf %s "checking whether malloc, realloc, calloc set errno on failure... " >&6; }
 if test ${gl_cv_func_malloc_posix+y}
 then :
@@ -25136,8 +25365,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
-printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
+printf '%s\n' "$gl_cv_func_malloc_posix" >&6; }
 
 
   
@@ -25145,7 +25374,7 @@ printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
   
   if test "$gl_cv_func_malloc_posix" = yes; then
     
-printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC_FOR_MALLOC_POSIX=1
@@ -25153,7 +25382,7 @@ printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
 
   
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
 printf %s "checking whether malloc (0) returns nonnull... " >&6; }
 if test ${ac_cv_func_malloc_0_nonnull+y}
 then :
@@ -25203,8 +25432,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+printf '%s\n' "$ac_cv_func_malloc_0_nonnull" >&6; }
   case $ac_cv_func_malloc_0_nonnull in @%:@(
   *yes) :
     gl_cv_func_malloc_0_nonnull=1 ;; @%:@(
@@ -25213,7 +25442,7 @@ printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
 esac
 
   
-printf "%s\n" "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
+printf '%s\n' "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
 
 
 
@@ -25437,7 +25666,7 @@ printf "%s\n" "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>co
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
 printf %s "checking whether <limits.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_limits_h+y}
 then :
@@ -25465,11 +25694,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_limits_h" >&6; }
   if test $gl_cv_minmax_in_limits_h = yes; then
     
-printf "%s\n" "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
 
   fi
   
@@ -25478,7 +25707,7 @@ printf "%s\n" "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
 printf %s "checking whether <sys/param.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_sys_param_h+y}
 then :
@@ -25506,11 +25735,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_sys_param_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_sys_param_h" >&6; }
   if test $gl_cv_minmax_in_sys_param_h = yes; then
     
-printf "%s\n" "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
 
   fi
   
@@ -25521,7 +25750,7 @@ printf "%s\n" "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
   
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
 printf %s "checking for O_CLOEXEC... " >&6; }
 if test ${gl_cv_macro_O_CLOEXEC+y}
 then :
@@ -25552,12 +25781,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
-printf "%s\n" "$gl_cv_macro_O_CLOEXEC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
+printf '%s\n' "$gl_cv_macro_O_CLOEXEC" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
 printf %s "checking for promoted mode_t type... " >&6; }
 if test ${gl_cv_promoted_mode_t+y}
 then :
@@ -25586,10 +25815,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
-printf "%s\n" "$gl_cv_promoted_mode_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
+printf '%s\n' "$gl_cv_promoted_mode_t" >&6; }
   
-printf "%s\n" "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
+printf '%s\n' "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
 
 
 
@@ -25617,7 +25846,7 @@ printf "%s\n" "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
 if test "x$ac_cv_type_sigset_t" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_SIGSET_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_SIGSET_T 1" >>confdefs.h
 
 gl_cv_type_sigset_t=yes
 else case e in @%:@(
@@ -25631,7 +25860,7 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
 printf %s "checking for SIGPIPE... " >&6; }
 if test ${gl_cv_header_signal_h_SIGPIPE+y}
 then :
@@ -25660,8 +25889,8 @@ rm -rf conftest*
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
-printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
+printf '%s\n' "$gl_cv_header_signal_h_SIGPIPE" >&6; }
 
 
     
@@ -25686,7 +25915,7 @@ printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; }
 
   
 
-ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_setenv" = xyes
 then :
   ac_have_decl=1
@@ -25694,11 +25923,11 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
 if test ${gt_cv_ssize_t+y}
 then :
@@ -25726,11 +25955,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+printf '%s\n' "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
     
-printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
+printf '%s\n' "@%:@define ssize_t int" >>confdefs.h
 
   fi
 
@@ -25740,7 +25969,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define uid_t int" >>confdefs.h
+printf '%s\n' "@%:@define uid_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -25751,7 +25980,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define gid_t int" >>confdefs.h
+printf '%s\n' "@%:@define gid_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -25770,7 +25999,7 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_signal_h='<'signal.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
 printf %s "checking absolute name of <signal.h>... " >&6; }
 if test ${gl_cv_next_signal_h+y}
 then :
@@ -25815,8 +26044,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
-printf "%s\n" "$gl_cv_next_signal_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
+printf '%s\n' "$gl_cv_next_signal_h" >&6; }
      fi
      NEXT_SIGNAL_H=$gl_cv_next_signal_h
 
@@ -26184,7 +26413,7 @@ then :
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if test -f conftest.o; then
        gl_asmext='s'
@@ -26207,7 +26436,7 @@ rm -rf conftest*
 
   
         
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
 printf %s "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
 if test ${gl_cv_prog_as_underscore+y}
 then :
@@ -26224,7 +26453,7 @@ EOF
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if LC_ALL=C $EGREP '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
@@ -26235,21 +26464,21 @@ EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
-printf "%s\n" "$gl_cv_prog_as_underscore" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
+printf '%s\n' "$gl_cv_prog_as_underscore" >&6; }
   if test $gl_cv_prog_as_underscore = yes; then
     USER_LABEL_PREFIX=_
   else
     USER_LABEL_PREFIX=
   fi
   
-printf "%s\n" "@%:@define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
+printf '%s\n' "@%:@define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
 
   ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
   
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 printf %s "checking for stdbool.h that conforms to C99... " >&6; }
 if test ${ac_cv_header_stdbool_h+y}
 then :
@@ -26335,13 +26564,13 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-printf "%s\n" "$ac_cv_header_stdbool_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+printf '%s\n' "$ac_cv_header_stdbool_h" >&6; }
    ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 if test "x$ac_cv_type__Bool" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE__BOOL 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE__BOOL 1" >>confdefs.h
 
 
 fi
@@ -26360,7 +26589,7 @@ fi
 
   GL_GENERATE_STDDEF_H=false
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
 printf %s "checking for good max_align_t... " >&6; }
 if test ${gl_cv_type_max_align_t+y}
 then :
@@ -26401,8 +26630,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
-printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
+printf '%s\n' "$gl_cv_type_max_align_t" >&6; }
   if test $gl_cv_type_max_align_t = no; then
     HAVE_MAX_ALIGN_T=0
     GL_GENERATE_STDDEF_H=true
@@ -26413,7 +26642,7 @@ printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
     GL_GENERATE_STDDEF_H=true
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
 printf %s "checking whether NULL can be used in arbitrary expressions... " >&6; }
 if test ${gl_cv_decl_null_works+y}
 then :
@@ -26442,8 +26671,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-printf "%s\n" "$gl_cv_decl_null_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+printf '%s\n' "$gl_cv_decl_null_works" >&6; }
   if test $gl_cv_decl_null_works = no; then
     REPLACE_NULL=1
     GL_GENERATE_STDDEF_H=true
@@ -26461,7 +26690,7 @@ printf "%s\n" "$gl_cv_decl_null_works" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stddef_h='<'stddef.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
 printf %s "checking absolute name of <stddef.h>... " >&6; }
 if test ${gl_cv_next_stddef_h+y}
 then :
@@ -26506,8 +26735,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+printf '%s\n' "$gl_cv_next_stddef_h" >&6; }
      fi
      NEXT_STDDEF_H=$gl_cv_next_stddef_h
 
@@ -26527,7 +26756,7 @@ printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
 
 
   
-ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcloseall" = xyes
 then :
   ac_have_decl=1
@@ -26535,12 +26764,12 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
 
 
   
   
-  printf "%s\n" "@%:@define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
+  printf '%s\n' "@%:@define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
 
   
   
@@ -26553,7 +26782,7 @@ printf "%s\n" "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdio_h='<'stdio.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
 printf %s "checking absolute name of <stdio.h>... " >&6; }
 if test ${gl_cv_next_stdio_h+y}
 then :
@@ -26598,8 +26827,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
-printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
+printf '%s\n' "$gl_cv_next_stdio_h" >&6; }
      fi
      NEXT_STDIO_H=$gl_cv_next_stdio_h
 
@@ -26616,7 +26845,7 @@ printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
 
 
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
 printf %s "checking which flavor of printf attribute matches inttypes macros... " >&6; }
 if test ${gl_cv_func_printf_attribute_flavor+y}
 then :
@@ -26654,11 +26883,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
-printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
+printf '%s\n' "$gl_cv_func_printf_attribute_flavor" >&6; }
   if test "$gl_cv_func_printf_attribute_flavor" = gnu; then
     
-printf "%s\n" "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
 
   fi
 
@@ -26685,7 +26914,7 @@ printf "%s\n" "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
     HAVE_DECL_FCLOSEALL=0
   fi
 
-ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ecvt" = xyes
 then :
   ac_have_decl=1
@@ -26693,9 +26922,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcvt" = xyes
 then :
   ac_have_decl=1
@@ -26703,9 +26932,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_gcvt" = xyes
 then :
   ac_have_decl=1
@@ -26713,7 +26942,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
 
 
   
@@ -26728,7 +26957,7 @@ printf "%s\n" "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdlib_h='<'stdlib.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
 printf %s "checking absolute name of <stdlib.h>... " >&6; }
 if test ${gl_cv_next_stdlib_h+y}
 then :
@@ -26773,8 +27002,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
-printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
+printf '%s\n' "$gl_cv_next_stdlib_h" >&6; }
      fi
      NEXT_STDLIB_H=$gl_cv_next_stdlib_h
 
@@ -26812,7 +27041,7 @@ printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
 
 
      REPLACE_STRERROR_0=0
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
 printf %s "checking whether strerror(0) succeeds... " >&6; }
 if test ${gl_cv_func_strerror_0_works+y}
 then :
@@ -26868,14 +27097,14 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
-printf "%s\n" "$gl_cv_func_strerror_0_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
+printf '%s\n' "$gl_cv_func_strerror_0_works" >&6; }
   case "$gl_cv_func_strerror_0_works" in
     *yes) ;;
     *)
       REPLACE_STRERROR_0=1
       
-printf "%s\n" "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
+printf '%s\n' "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
 
       ;;
   esac
@@ -26893,7 +27122,7 @@ printf "%s\n" "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_string_h='<'string.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
 printf %s "checking absolute name of <string.h>... " >&6; }
 if test ${gl_cv_next_string_h+y}
 then :
@@ -26938,8 +27167,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
-printf "%s\n" "$gl_cv_next_string_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
+printf '%s\n' "$gl_cv_next_string_h" >&6; }
      fi
      NEXT_STRING_H=$gl_cv_next_string_h
 
@@ -26974,7 +27203,7 @@ printf "%s\n" "$gl_cv_next_string_h" >&6; }
   
 
     
-printf "%s\n" "@%:@define _USE_STD_STAT 1" >>confdefs.h
+printf '%s\n' "@%:@define _USE_STD_STAT 1" >>confdefs.h
 
 
   
@@ -26988,7 +27217,7 @@ printf "%s\n" "@%:@define _USE_STD_STAT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_types_h='<'sys/types.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
 printf %s "checking absolute name of <sys/types.h>... " >&6; }
 if test ${gl_cv_next_sys_types_h+y}
 then :
@@ -27033,8 +27262,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
-printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
+printf '%s\n' "$gl_cv_next_sys_types_h" >&6; }
      fi
      NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
 
@@ -27086,7 +27315,7 @@ printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
 
 
     
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
 printf %s "checking for struct timespec in <time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_time_h+y}
 then :
@@ -27114,8 +27343,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
 
   TIME_H_DEFINES_STRUCT_TIMESPEC=0
   SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
@@ -27124,7 +27353,7 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
   if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
     TIME_H_DEFINES_STRUCT_TIMESPEC=1
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
 printf %s "checking for struct timespec in <sys/time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_sys_time_h+y}
 then :
@@ -27152,12 +27381,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
     if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
       SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
 printf %s "checking for struct timespec in <pthread.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_pthread_h+y}
 then :
@@ -27185,12 +27414,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
       if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
         PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
 printf %s "checking for struct timespec in <unistd.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_unistd_h+y}
 then :
@@ -27218,8 +27447,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
         if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
           UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
         fi
@@ -27245,7 +27474,7 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_time_h='<'time.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
 printf %s "checking absolute name of <time.h>... " >&6; }
 if test ${gl_cv_next_time_h+y}
 then :
@@ -27290,8 +27519,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
-printf "%s\n" "$gl_cv_next_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
+printf '%s\n' "$gl_cv_next_time_h" >&6; }
      fi
      NEXT_TIME_H=$gl_cv_next_time_h
 
@@ -27311,7 +27540,7 @@ printf "%s\n" "$gl_cv_next_time_h" >&6; }
 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
 printf %s "checking for TIME_UTC in <time.h>... " >&6; }
 if test ${gl_cv_time_h_has_TIME_UTC+y}
 then :
@@ -27339,8 +27568,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
-printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
+printf '%s\n' "$gl_cv_time_h_has_TIME_UTC" >&6; }
   if test $gl_cv_time_h_has_TIME_UTC = yes; then
     TIME_H_DEFINES_TIME_UTC=1
   else
@@ -27402,7 +27631,7 @@ printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
   
 
   
-ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_execvpe" = xyes
 then :
   ac_have_decl=1
@@ -27410,7 +27639,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
 
 
       
@@ -27427,7 +27656,7 @@ printf "%s\n" "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_unistd_h='<'unistd.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
 printf %s "checking absolute name of <unistd.h>... " >&6; }
 if test ${gl_cv_next_unistd_h+y}
 then :
@@ -27478,8 +27707,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
-printf "%s\n" "$gl_cv_next_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
+printf '%s\n' "$gl_cv_next_unistd_h" >&6; }
      fi
      NEXT_UNISTD_H=$gl_cv_next_unistd_h
 
@@ -27546,7 +27775,7 @@ q
     LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
   fi
 
-ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27554,9 +27783,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_feof_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27564,9 +27793,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ferror_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27574,9 +27803,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fflush_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27584,9 +27813,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fgets_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27594,9 +27823,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27604,9 +27833,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputs_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27614,9 +27843,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fread_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27624,9 +27853,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27634,9 +27863,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27644,9 +27873,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getchar_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27654,9 +27883,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27664,9 +27893,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putchar_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27674,7 +27903,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
     HAVE_BTOWC=1;         
@@ -27737,7 +27966,7 @@ printf "%s\n" "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
             
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
 printf %s "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
 if test ${gl_cv_header_wchar_h_correct_inline+y}
 then :
@@ -27762,7 +27991,7 @@ _ACEOF
             && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27778,7 +28007,7 @@ _ACEOF
               && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
              if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
                :
@@ -27794,8 +28023,8 @@ _ACEOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
-printf "%s\n" "$gl_cv_header_wchar_h_correct_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
+printf '%s\n' "$gl_cv_header_wchar_h_correct_inline" >&6; }
   if test $gl_cv_header_wchar_h_correct_inline = no; then
     as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
 This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
@@ -27843,7 +28072,7 @@ Configuration aborted." "$LINENO" 5
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_wchar_h='<'wchar.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
 printf %s "checking absolute name of <wchar.h>... " >&6; }
 if test ${gl_cv_next_wchar_h+y}
 then :
@@ -27894,8 +28123,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
-printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
+printf '%s\n' "$gl_cv_next_wchar_h" >&6; }
      fi
      NEXT_WCHAR_H=$gl_cv_next_wchar_h
 
@@ -27939,7 +28168,7 @@ printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
   ac_fn_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" "
       #include <wchar.h>
     
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_wcsdup" = xyes
 then :
   ac_have_decl=1
@@ -27947,7 +28176,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_have_decl_wcsdup = no; then
     HAVE_DECL_WCSDUP=0
@@ -28125,7 +28354,7 @@ printf "%s\n" "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
   
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5
 printf %s "checking for C compiler option to allow warnings... " >&6; }
 if test ${gl_cv_cc_wallow+y}
 then :
@@ -28137,13 +28366,13 @@ else case e in @%:@(
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null
      { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null
                          if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then
        gl_cv_cc_wallow='-Wno-error'
@@ -28154,8 +28383,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5
-printf "%s\n" "$gl_cv_cc_wallow" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5
+printf '%s\n' "$gl_cv_cc_wallow" >&6; }
   case "$gl_cv_cc_wallow" in
     none) GL_CFLAG_ALLOW_WARNINGS='' ;;
     *)    GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;;
@@ -28197,7 +28426,7 @@ EOF
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gl_command\""; } >&5
   (eval $gl_command) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
       gl_options=`grep -v '#' conftest.out`
       for word in $gl_options; do
@@ -28302,7 +28531,7 @@ fi
 
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
 printf %s "checking for __builtin_expect... " >&6; }
 if test ${gl_cv___builtin_expect+y}
 then :
@@ -28348,13 +28577,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
-printf "%s\n" "$gl_cv___builtin_expect" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
+printf '%s\n' "$gl_cv___builtin_expect" >&6; }
   if test "$gl_cv___builtin_expect" = yes; then
-    printf "%s\n" "@%:@define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
+    printf '%s\n' "@%:@define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
 
   elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
-    printf "%s\n" "@%:@define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
+    printf '%s\n' "@%:@define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
 
   fi
   
@@ -28399,7 +28628,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
 
   
@@ -28417,7 +28646,7 @@ printf "%s\n" "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
 
@@ -28436,7 +28665,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
 
 
 
@@ -28444,7 +28673,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
   
   
   
-printf "%s\n" "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
 
 
   
@@ -28464,7 +28693,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -28513,13 +28742,13 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_CLOSE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CLOSE 1" >>confdefs.h
 
 
 
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
@@ -28550,18 +28779,18 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
     
-printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
 printf %s "checking whether dup2 works... " >&6; }
 if test ${gl_cv_func_dup2_works+y}
 then :
@@ -28669,8 +28898,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
-printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
+printf '%s\n' "$gl_cv_func_dup2_works" >&6; }
   case "$gl_cv_func_dup2_works" in
     *yes) ;;
     *)
@@ -28678,7 +28907,7 @@ printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
       ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize"
 if test "x$ac_cv_func_setdtablesize" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETDTABLESIZE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETDTABLESIZE 1" >>confdefs.h
 
 fi
 
@@ -28720,7 +28949,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
 
 
 
@@ -28740,7 +28969,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_ENVIRON 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_ENVIRON 1" >>confdefs.h
 
 
 
@@ -28779,7 +29008,7 @@ fi
 
   
   
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
 printf %s "checking for error_at_line... " >&6; }
 if test ${ac_cv_lib_error_at_line+y}
 then :
@@ -28807,8 +29036,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-printf "%s\n" "$ac_cv_lib_error_at_line" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
+printf '%s\n' "$ac_cv_lib_error_at_line" >&6; }
 
   
      if test "$ac_cv_lib_error_at_line" = no; then
@@ -28859,7 +29088,7 @@ fi
   fi
 
   else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
 printf %s "checking whether fcntl handles F_DUPFD correctly... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_works+y}
 then :
@@ -28937,8 +29166,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
     case $gl_cv_func_fcntl_f_dupfd_works in
       *yes) ;;
       *) 
@@ -28951,11 +29180,11 @@ printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
   fi
 
         
-printf "%s\n" "@%:@define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
+printf '%s\n' "@%:@define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
  ;;
     esac
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
 printf %s "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_cloexec+y}
 then :
@@ -29030,8 +29259,8 @@ fi
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
     case "$gl_cv_func_fcntl_f_dupfd_cloexec" in
       *yes) ;;
       *)    
@@ -29077,7 +29306,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
 
 
 
@@ -29091,7 +29320,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
   
   
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
@@ -29126,13 +29355,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
     
-printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -29172,7 +29401,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
 
 
 
@@ -29240,7 +29469,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
 
 
 
@@ -29251,7 +29480,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
   
   if test $ac_cv_func_getdtablesize = yes &&
      test $ac_cv_have_decl_getdtablesize = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
 printf %s "checking whether getdtablesize works... " >&6; }
 if test ${gl_cv_func_getdtablesize_works+y}
 then :
@@ -29308,8 +29537,8 @@ fi
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
-printf "%s\n" "$gl_cv_func_getdtablesize_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
+printf '%s\n' "$gl_cv_func_getdtablesize_works" >&6; }
     case "$gl_cv_func_getdtablesize_works" in
       *yes | "no (limitation)") ;;
       *) REPLACE_GETDTABLESIZE=1 ;;
@@ -29352,7 +29581,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
 
 
 
@@ -29361,7 +29590,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
   
   ac_found=0
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
@@ -29369,14 +29598,14 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
@@ -29384,14 +29613,14 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include <stdlib.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl___argv" = xyes
 then :
   ac_have_decl=1
@@ -29399,7 +29628,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
@@ -29410,7 +29639,7 @@ fi
   if test $ac_found = 0; then
     # On OpenBSD 5.1, using the global __progname variable appears to be
     # the only way to implement getprogname.
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
 printf %s "checking whether __progname is defined in default libraries... " >&6; }
 if test ${gl_cv_var___progname+y}
 then :
@@ -29441,11 +29670,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
-printf "%s\n" "$gl_cv_var___progname" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
+printf '%s\n' "$gl_cv_var___progname" >&6; }
     if test "$gl_cv_var___progname" = yes; then
       
-printf "%s\n" "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
 
     fi
   fi
@@ -29467,7 +29696,7 @@ printf "%s\n" "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -29498,9 +29727,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -29544,8 +29773,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -29554,11 +29783,11 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
 printf %s "checking whether the compiler supports the __inline keyword... " >&6; }
 if test ${gl_cv_c___inline+y}
 then :
@@ -29586,11 +29815,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
-printf "%s\n" "$gl_cv_c___inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
+printf '%s\n' "$gl_cv_c___inline" >&6; }
   if test $gl_cv_c___inline = yes; then
     
-printf "%s\n" "@%:@define HAVE___INLINE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE___INLINE 1" >>confdefs.h
 
   fi
 
@@ -29656,7 +29885,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -29665,7 +29894,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
   
     
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
@@ -29693,15 +29922,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
      
-printf "%s\n" "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
      
-printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
+printf '%s\n' "@%:@define mbstate_t int" >>confdefs.h
 
    fi
 
@@ -29714,7 +29943,7 @@ printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -29763,7 +29992,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
 
 
 
@@ -29802,7 +30031,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
 
 
   
@@ -29820,7 +30049,7 @@ printf "%s\n" "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
       fi
       
          
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
 printf %s "checking whether open recognizes a trailing slash... " >&6; }
 if test ${gl_cv_func_open_slash+y}
 then :
@@ -29881,12 +30110,12 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
-printf "%s\n" "$gl_cv_func_open_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
+printf '%s\n' "$gl_cv_func_open_slash" >&6; }
   case "$gl_cv_func_open_slash" in
     *no)
       
-printf "%s\n" "@%:@define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
       ;;
   esac
@@ -29938,7 +30167,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
 
 
 
@@ -29946,7 +30175,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
       
 
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
@@ -29954,10 +30183,10 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
@@ -29965,7 +30194,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 
   
   
@@ -29973,7 +30202,7 @@ printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl"
   ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
 if test "x$ac_cv_func_raise" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAISE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAISE 1" >>confdefs.h
 
 fi
 
@@ -30047,7 +30276,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
 
 
 
@@ -30058,7 +30287,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -30105,7 +30334,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
 
 
 
@@ -30153,7 +30382,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
 
 
 
@@ -30163,7 +30392,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
   if test $ac_cv_func_readlink = no; then
     HAVE_READLINK=0
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
 printf %s "checking whether readlink signature is correct... " >&6; }
 if test ${gl_cv_decl_readlink_works+y}
 then :
@@ -30192,9 +30421,9 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
-printf "%s\n" "$gl_cv_decl_readlink_works" >&6; }
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
+printf '%s\n' "$gl_cv_decl_readlink_works" >&6; }
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
 printf %s "checking whether readlink handles trailing slash correctly... " >&6; }
 if test ${gl_cv_func_readlink_trailing_slash+y}
 then :
@@ -30246,8 +30475,8 @@ fi
       rm -f conftest.link conftest.lnk2 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
-printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
+printf '%s\n' "$gl_cv_func_readlink_trailing_slash" >&6; }
     case "$gl_cv_func_readlink_trailing_slash" in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -30256,13 +30485,13 @@ printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
         ;;
       *)
         
-printf "%s\n" "@%:@define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
     esac
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
 printf %s "checking whether readlink truncates results correctly... " >&6; }
 if test ${gl_cv_func_readlink_truncate+y}
 then :
@@ -30313,8 +30542,8 @@ fi
       rm -f conftest.link conftest.lnk2 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
-printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
+printf '%s\n' "$gl_cv_func_readlink_truncate" >&6; }
     case $gl_cv_func_readlink_truncate in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -30323,7 +30552,7 @@ printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
         ;;
       *)
         
-printf "%s\n" "@%:@define READLINK_TRUNCATE_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define READLINK_TRUNCATE_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
@@ -30366,7 +30595,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
 
 
 
@@ -30404,7 +30633,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -30463,7 +30692,7 @@ fi
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -30479,7 +30708,7 @@ fi
   
   if test "$gl_cv_func_malloc_posix" = yes; then
     
-printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC_FOR_MALLOC_POSIX=1
@@ -30495,7 +30724,7 @@ printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
   
   
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
@@ -30530,13 +30759,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
     
-printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -30551,7 +30780,7 @@ printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -30566,7 +30795,7 @@ fi
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -30594,14 +30823,14 @@ fi
   ac_fn_c_check_header_compile "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
 if test "x$ac_cv_header_search_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SEARCH_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SEARCH_H 1" >>confdefs.h
 
 fi
 
   ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
 if test "x$ac_cv_func_tsearch" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_TSEARCH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_TSEARCH 1" >>confdefs.h
 
 fi
 
@@ -30623,7 +30852,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_SIGPIPE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_SIGPIPE 1" >>confdefs.h
 
 
     
@@ -30701,12 +30930,12 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
 
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
 if test ${gt_cv_ssize_t+y}
 then :
@@ -30734,11 +30963,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+printf '%s\n' "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
     
-printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
+printf '%s\n' "@%:@define ssize_t int" >>confdefs.h
 
   fi
 
@@ -30751,7 +30980,7 @@ printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
                   REPLACE_STAT=1
       ;;
     *)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
 printf %s "checking whether stat handles trailing slashes on files... " >&6; }
 if test ${gl_cv_func_stat_file_slash+y}
 then :
@@ -30810,13 +31039,13 @@ fi
          rm -f conftest.tmp conftest.lnk ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
-printf "%s\n" "$gl_cv_func_stat_file_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
+printf '%s\n' "$gl_cv_func_stat_file_slash" >&6; }
       case $gl_cv_func_stat_file_slash in
         *no)
           REPLACE_STAT=1
           
-printf "%s\n" "@%:@define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
+printf '%s\n' "@%:@define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
 ;;
       esac
       case $host_os in
@@ -30878,7 +31107,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
 
 
 
@@ -30892,9 +31121,9 @@ printf "%s\n" "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
 if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
 printf %s "checking whether struct stat.st_atim is of type struct timespec... " >&6; }
 if test ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+y}
 then :
@@ -30932,11 +31161,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
-printf "%s\n" "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
+printf '%s\n' "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
      if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then
        
-printf "%s\n" "@%:@define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
+printf '%s\n' "@%:@define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
 
      fi
 else case e in @%:@(
@@ -30946,7 +31175,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30956,7 +31185,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30966,7 +31195,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -30990,7 +31219,7 @@ fi
 if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -31000,7 +31229,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -31010,7 +31239,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -31023,7 +31252,7 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
 printf %s "checking for working stdalign.h... " >&6; }
 if test ${gl_cv_header_working_stdalign_h+y}
 then :
@@ -31081,8 +31310,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdalign_h" >&6; }
 
   if test $gl_cv_header_working_stdalign_h = yes; then
     GL_GENERATE_STDALIGN_H=false
@@ -31339,13 +31568,13 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FSCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FSCANF 1" >>confdefs.h
 
 
 
   
   
-printf "%s\n" "@%:@define GNULIB_FSCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_FSCANF 1" >>confdefs.h
 
 
   
@@ -31363,13 +31592,13 @@ printf "%s\n" "@%:@define GNULIB_FSCANF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_SCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_SCANF 1" >>confdefs.h
 
 
 
   
   
-printf "%s\n" "@%:@define GNULIB_SCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_SCANF 1" >>confdefs.h
 
 
   
@@ -31387,7 +31616,7 @@ printf "%s\n" "@%:@define GNULIB_SCANF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
 
 
 
@@ -31406,7 +31635,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
 
 
 
@@ -31425,7 +31654,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
 
 
@@ -31444,7 +31673,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
 
 
 
@@ -31463,7 +31692,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
 
 
 
@@ -31482,7 +31711,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
 
 
@@ -31501,7 +31730,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
 
 
@@ -31520,7 +31749,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
 
 
@@ -31539,7 +31768,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
 
 
@@ -31558,7 +31787,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
 
 
@@ -31577,7 +31806,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
 
 
 
@@ -31596,7 +31825,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
 
 
@@ -31615,7 +31844,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
 
 
@@ -31634,7 +31863,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
 
 
 
@@ -31653,7 +31882,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
 
 
 
@@ -31670,7 +31899,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
   
      
   if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
 printf %s "checking for working strerror function... " >&6; }
 if test ${gl_cv_func_working_strerror+y}
 then :
@@ -31715,8 +31944,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
-printf "%s\n" "$gl_cv_func_working_strerror" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
+printf '%s\n' "$gl_cv_func_working_strerror" >&6; }
     case "$gl_cv_func_working_strerror" in
       *yes) ;;
       *)
@@ -31744,7 +31973,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_STRERROR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_STRERROR 1" >>confdefs.h
 
 
   
@@ -31767,7 +31996,7 @@ printf "%s\n" "@%:@define GNULIB_STRERROR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_STRERROR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_STRERROR 1" >>confdefs.h
 
 
 
@@ -31797,7 +32026,7 @@ fi
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -31950,10 +32179,10 @@ fi
 
 
   
-printf "%s\n" "@%:@define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
 
   
-printf "%s\n" "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
+printf '%s\n' "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
 
   
       
@@ -31973,7 +32202,7 @@ printf "%s\n" "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs
   
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5
 printf %s "checking for variable-length arrays... " >&6; }
 if test ${ac_cv_c_vararrays+y}
 then :
@@ -32043,15 +32272,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5
-printf "%s\n" "$ac_cv_c_vararrays" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5
+printf '%s\n' "$ac_cv_c_vararrays" >&6; }
   if test "$ac_cv_c_vararrays" = yes; then
         
-printf "%s\n" "@%:@define HAVE_C_VARARRAYS 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_C_VARARRAYS 1" >>confdefs.h
 
   elif test "$ac_cv_c_vararrays" = no; then
     
-printf "%s\n" "@%:@define __STDC_NO_VLA__ 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_NO_VLA__ 1" >>confdefs.h
 
   fi
 
@@ -32180,44 +32409,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -32229,8 +32421,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -32244,8 +32436,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -32262,7 +32454,7 @@ U=
 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -32273,14 +32465,14 @@ LIB@&t@OBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
 printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf '%s\n' "done" >&6; }
 case $enable_silent_rules in @%:@ (((
   yes) AM_DEFAULT_VERBOSITY=0;;
    no) AM_DEFAULT_VERBOSITY=1;;
@@ -32378,13 +32570,21 @@ fi
   
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in @%:@(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -32398,7 +32598,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -32410,7 +32610,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -32497,7 +32697,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -32513,9 +32713,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -32610,7 +32810,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -32632,29 +32832,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -32696,7 +32873,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -32705,7 +32882,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32758,19 +32935,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by libiconv $as_me 1.17, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -32792,7 +32969,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -32800,7 +32977,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -32832,16 +33009,16 @@ $config_commands
 Report bugs to the package provider."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 libiconv config.status 1.17
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -32850,10 +33027,14 @@ srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -32881,15 +33062,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -32897,7 +33078,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -32906,7 +33087,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -32930,29 +33111,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
 @%:@@%:@ Running $as_me. @%:@@%:@
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -33001,6 +33182,7 @@ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
@@ -33183,6 +33365,7 @@ file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
+lt_ar_flags \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -33327,7 +33510,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -33420,13 +33603,13 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -33437,7 +33620,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -33482,9 +33665,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -33513,7 +33696,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -33545,7 +33728,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -33616,9 +33799,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -33636,8 +33819,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -33652,7 +33839,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -33696,7 +33883,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -33704,17 +33891,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -33731,7 +33918,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33755,9 +33942,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -33802,7 +33989,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -33819,10 +34006,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -33836,11 +34023,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -33864,9 +34051,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -33882,20 +34069,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -33915,7 +34102,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$_am_arg" |
+printf '%s\n' X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33935,8 +34122,8 @@ printf "%s\n" X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
   
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -33962,7 +34149,7 @@ esac
   for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    am_mf=`printf '%s\n' "$am_mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile which includes
     # dependency-tracking related rules and includes.
     # Grep'ing the whole file directly is not great: AIX grep has a line
@@ -33974,7 +34161,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$am_mf" : 'X\(//\)[^/]' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$am_mf" |
+printf '%s\n' X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33996,7 +34183,7 @@ printf "%s\n" X"$am_mf" |
 $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$am_mf" |
+printf '%s\n' X/"$am_mf" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -34021,8 +34208,8 @@ printf "%s\n" X/"$am_mf" |
    (exit $ac_status); } || am_rc=$?
   done
   if test $am_rc -ne 0; then
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
     for automatic dependency tracking.  If GNU make was not used, consider
     re-running the configure script with MAKE=\"gmake\" (or whatever is
@@ -34058,7 +34245,7 @@ See 'config.log' for more details" "$LINENO" 5; }
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -34181,6 +34368,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
 # A file(cmd) program that detects file types.
 FILECMD=$lt_FILECMD
 
@@ -34203,7 +34393,7 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 AR=$lt_AR
 
 # Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
+lt_ar_flags=$lt_lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}
@@ -34812,7 +35002,9 @@ _LT_EOF
                 #      presentlang can be used as a fallback for messages
                 #      which are not translated in the desiredlang catalog).
                 case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
+                  "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+                    useit=yes
+                    ;;
                 esac
               done
               if test $useit = yes; then
@@ -34847,7 +35039,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -34863,11 +35055,18 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in @%:@(
+  -*) :
+    ac_no_opts=-- ;; @%:@(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
@@ -34913,7 +35112,7 @@ if test "$no_recursion" != yes; then
       ;;
     *)
       case $ac_arg in
-      *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
       as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
     esac
@@ -34923,7 +35122,7 @@ if test "$no_recursion" != yes; then
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -34944,17 +35143,17 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    printf "%s\n" "$ac_msg" >&6
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
+    printf '%s\n' "$ac_msg" >&6
     as_dir="$ac_dir"; as_fn_mkdir_p
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -34991,8 +35190,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
     elif test -f "$ac_srcdir/configure"; then
       ac_sub_configure=$ac_srcdir/configure
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
+printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
@@ -35005,8 +35204,8 @@ printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+printf '%s\n' "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
@@ -35017,7 +35216,7 @@ printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args -
   done
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/recipes/libs/libiconv/source/autom4te.cache/output.1 b/recipes/libs/libiconv/source/autom4te.cache/output.1
index 0a3af0c2c4..665a193d7b 100644
--- a/recipes/libs/libiconv/source/autom4te.cache/output.1
+++ b/recipes/libs/libiconv/source/autom4te.cache/output.1
@@ -1,9 +1,9 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.72 for libiconv 1.17.
+@%:@ Generated by GNU Autoconf 2.73 for libiconv 1.17.
 @%:@ 
 @%:@ 
-@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 @%:@ Inc.
 @%:@ 
 @%:@ 
@@ -20,7 +20,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -107,7 +107,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -129,10 +129,13 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -143,7 +146,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -261,22 +264,25 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -336,7 +342,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -345,7 +351,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -428,9 +434,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -457,7 +463,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -503,7 +509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -517,29 +523,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -600,6 +583,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIB@&t@OBJS=
@@ -1544,6 +1528,8 @@ BROKEN_WCHAR_H
 USE_MBSTATE_T
 HAVE_WCHAR_T
 ICONV_CONST
+localedir_c_make
+localedir_c
 POSUB
 LTLIBINTL
 LIBINTL
@@ -1663,13 +1649,13 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -1846,7 +1832,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1872,7 +1858,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -2085,7 +2071,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2101,7 +2087,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2145,9 +2131,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -2155,7 +2141,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -2163,7 +2149,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -2227,7 +2213,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -2433,9 +2419,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2472,7 +2458,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2482,9 +2468,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libiconv configure 1.17
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2508,7 +2494,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2516,7 +2502,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2524,7 +2510,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -2547,7 +2533,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2555,7 +2541,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2563,7 +2549,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -2581,7 +2567,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2603,8 +2589,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_header_compile
@@ -2622,7 +2608,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2630,7 +2616,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2641,7 +2627,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -2663,7 +2649,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2715,8 +2701,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_func
@@ -2734,26 +2720,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -2967,7 +2953,7 @@ rm -f conftest.val
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -3013,8 +2999,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_type
@@ -3031,7 +3017,7 @@ ac_fn_check_decl ()
   fi
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 printf %s "checking whether $as_decl_name is declared... " >&6; }
 if eval test \${$3+y}
 then :
@@ -3071,8 +3057,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   ac_compile="$ac_save_ac_compile"
 
@@ -3085,7 +3071,7 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 printf %s "checking for $2.$3... " >&6; }
 if eval test \${$4+y}
 then :
@@ -3135,8 +3121,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_member
@@ -3145,7 +3131,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -3157,7 +3143,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?@<:@ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -3165,7 +3151,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libiconv $as_me 1.17, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -3205,7 +3191,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -3240,7 +3226,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -3269,31 +3255,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -3302,67 +3279,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -3371,21 +3376,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -3407,12 +3412,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -3422,27 +3427,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -3522,7 +3620,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -3533,7 +3632,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -3621,15 +3720,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -3645,13 +3744,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -3805,7 +3903,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -3818,7 +3916,7 @@ do
   esac
   as_found=:
   
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -3829,13 +3927,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -3847,7 +3945,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -3900,38 +3998,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -3941,10 +4045,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -3952,6 +4056,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3979,7 +4100,7 @@ am__api_version='1.18'
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -4002,8 +4123,8 @@ case $as_dir in @%:@((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4053,8 +4174,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -4064,7 +4185,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
 printf %s "checking whether sleep supports fractional seconds... " >&6; }
 if test ${am_cv_sleep_fractional_seconds+y}
 then :
@@ -4080,10 +4201,10 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
-printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf '%s\n' "$am_cv_sleep_fractional_seconds" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
 printf %s "checking filesystem timestamp resolution... " >&6; }
 if test ${am_cv_filesystem_timestamp_resolution+y}
 then :
@@ -4135,9 +4256,9 @@ if (
   # if, for instance, CONFIG_SHELL is bash and it inherits a
   # broken ls alias from the environment.  This has actually
   # happened.  Such a system could not be considered "sane".
-  printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  printf '%s\n' ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "ls -t produces unexpected output.
 Make sure there is not a broken ls alias in your environment.
 See 'config.log' for more details" "$LINENO" 5; }
@@ -4218,12 +4339,12 @@ rm -f conftest.ts?
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
-printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf '%s\n' "$am_cv_filesystem_timestamp_resolution" >&6; }
 
 # This check should not be cached, as it may vary across builds of
 # different projects.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
@@ -4231,14 +4352,14 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
@@ -4268,8 +4389,8 @@ for am_try in 1 2; do
   am_has_slept=yes
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
-printf "%s\n" "$am_build_env_is_sane" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf '%s\n' "$am_build_env_is_sane" >&6; }
 if test "$am_build_env_is_sane" = no; then
   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
@@ -4298,7 +4419,7 @@ test "$program_suffix" != NONE &&
 # Double any \ or $.
 # By default was 's,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf '%s\n' "$program_transform_name" | sed "$ac_script"`
 
 
 # Expand $ac_aux_dir to an absolute path.
@@ -4313,8 +4434,8 @@ if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf '%s\n' "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -4334,7 +4455,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -4355,7 +4476,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4367,11 +4488,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4380,7 +4501,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -4401,7 +4522,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4413,11 +4534,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -4425,8 +4546,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -4439,7 +4560,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
 printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test ${ac_cv_path_mkdir+y}
@@ -4482,14 +4603,14 @@ fi
     MKDIR_P='mkdir -p'
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf '%s\n' "$MKDIR_P" >&6; }
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -4510,7 +4631,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4522,21 +4643,21 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -4544,7 +4665,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -4557,12 +4678,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4583,13 +4704,13 @@ then :
 fi
 
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 printf %s "checking whether $am_make supports nested variables... " >&6; }
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) if printf "%s\n" 'TRUE=$(BAR$(V))
+  e) if printf '%s\n' 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -4602,8 +4723,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf '%s\n' "$am_cv_make_support_nested_variables" >&6; }
 AM_BACKSLASH='\'
 
 am__rm_f_notfound=
@@ -4616,7 +4737,7 @@ esac
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
 printf %s "checking xargs -n works... " >&6; }
 if test ${am_cv_xargs_n_works+y}
 then :
@@ -4632,8 +4753,8 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
-printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf '%s\n' "$am_cv_xargs_n_works" >&6; }
 if test "$am_cv_xargs_n_works" = yes
 then :
   am__xargs_n='xargs -n'
@@ -4668,10 +4789,10 @@ fi
  VERSION='1.17'
 
 
-printf "%s\n" "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
  
-printf "%s\n" "@%:@define VERSION \"$VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -4717,34 +4838,34 @@ _am_tools='gnutar plaintar pax cpio none'
       # (that is, avoid stderr redirection).
       am_uid=`id -u || echo unknown`
       am_gid=`id -g || echo unknown`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
 printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
       if test x$am_uid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
       elif test $am_uid -le $am_max_uid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
 printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
       if test x$gm_gid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
       elif test $am_gid -le $am_max_gid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
 printf %s "checking how to create a ustar tar archive... " >&6; }
 
   # Go ahead even if we have the value already cached.  We do so because we
@@ -4828,8 +4949,8 @@ else case e in @%:@(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
-printf "%s\n" "$am_cv_prog_tar_ustar" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+printf '%s\n' "$am_cv_prog_tar_ustar" >&6; }
 
 
 
@@ -4856,10 +4977,10 @@ fi
 
 ac_config_headers="$ac_config_headers config.h lib/config.h"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -4867,7 +4988,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -4880,12 +5001,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4900,6 +5021,9 @@ fi
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4908,7 +5032,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -4929,7 +5053,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4941,11 +5065,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4954,7 +5078,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -4975,7 +5099,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4987,11 +5111,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -4999,8 +5123,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5013,7 +5137,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5034,7 +5158,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5046,11 +5170,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5059,7 +5183,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5085,7 +5209,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5109,11 +5233,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5124,7 +5248,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5145,7 +5269,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5157,11 +5281,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5174,7 +5298,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5195,7 +5319,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5207,11 +5331,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5223,8 +5347,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5236,7 +5360,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5257,7 +5381,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5269,11 +5393,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5282,7 +5406,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5303,7 +5427,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5315,11 +5439,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5327,8 +5451,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5340,13 +5464,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -5356,7 +5480,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -5366,7 +5490,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -5386,9 +5510,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -5409,10 +5533,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -5453,29 +5577,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -5483,10 +5607,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -5503,15 +5627,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -5534,7 +5658,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -5543,10 +5667,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -5554,31 +5678,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -5602,10 +5726,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -5617,11 +5741,11 @@ then :
   esac
 done
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -5629,11 +5753,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -5665,8 +5789,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -5676,7 +5800,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -5744,8 +5868,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -5764,7 +5888,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -5776,7 +5949,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -5793,16 +5966,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -5813,7 +5986,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -5842,16 +6015,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -5862,7 +6035,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -5891,16 +6064,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -5922,7 +6095,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
 printf %s "checking whether $CC understands -c and -o together... " >&6; }
 if test ${am_cv_prog_cc_c_o+y}
 then :
@@ -5964,8 +6137,8 @@ _ACEOF
   unset am_i ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf '%s\n' "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -5982,7 +6155,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
 printf %s "checking whether the compiler is clang... " >&6; }
 if test ${gl_cv_compiler_clang+y}
 then :
@@ -6015,11 +6188,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
-printf "%s\n" "$gl_cv_compiler_clang" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
+printf '%s\n' "$gl_cv_compiler_clang" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
 printf %s "checking for compiler option needed when checking for declarations... " >&6; }
 if test ${gl_cv_compiler_check_decl_option+y}
 then :
@@ -6054,8 +6227,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
-printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
+printf '%s\n' "$gl_cv_compiler_check_decl_option" >&6; }
   if test "x$gl_cv_compiler_check_decl_option" != xnone; then
     ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
   else
@@ -6066,7 +6239,7 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
 printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
 cat > confinc.mk << 'END'
 am__doit:
@@ -6103,8 +6276,8 @@ esac
   fi
 done
 rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf '%s\n' "${_am_result}" >&6; }
 
 @%:@ Check whether --enable-dependency-tracking was given.
 if test ${enable_dependency_tracking+y}
@@ -6129,7 +6302,7 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CC_dependencies_compiler_type+y}
 then :
@@ -6242,8 +6415,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if 
@@ -6262,7 +6435,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -6333,8 +6506,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -6382,8 +6555,8 @@ if $ac_preproc_ok
 then :
   
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -6399,7 +6572,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_STRIP+y}
 then :
@@ -6422,7 +6595,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_STRIP="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6436,11 +6609,11 @@ esac
 fi
 STRIP=$ac_cv_path_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
  # Installed binaries are usually stripped using 'strip' when the user
@@ -6451,7 +6624,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -6472,7 +6645,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6484,11 +6657,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6497,7 +6670,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -6518,7 +6691,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6530,11 +6703,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6542,8 +6715,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6562,7 +6735,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -6578,8 +6751,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -6595,10 +6768,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -6613,8 +6786,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -6630,7 +6803,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -6648,7 +6821,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -6668,7 +6841,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
   
-printf "%s\n" "@%:@define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "@%:@define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -6677,7 +6850,7 @@ fi
     
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
@@ -6706,10 +6879,10 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
@@ -6760,49 +6933,51 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "@%:@define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "@%:@define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "@%:@define _MINIX 1" >>confdefs.h
+    printf '%s\n' "@%:@define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
 
 else case e in @%:@(
   e) MINIX= ;;
@@ -6810,12 +6985,12 @@ esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
@@ -6826,13 +7001,13 @@ fi
   case "$host_os" in
     openbsd*)
       
-printf "%s\n" "@%:@define _ISOC11_SOURCE 1" >>confdefs.h
+printf '%s\n' "@%:@define _ISOC11_SOURCE 1" >>confdefs.h
 
       ;;
   esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
 printf %s "checking for egrep -e... " >&6; }
 if test ${ac_cv_path_EGREP_TRADITIONAL+y}
 then :
@@ -6869,7 +7044,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6931,7 +7106,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6962,14 +7137,14 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
-printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf '%s\n' "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
  EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
 
 
           
     
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
 printf %s "checking for Minix Amsterdam compiler... " >&6; }
 if test ${gl_cv_c_amsterdam_compiler+y}
 then :
@@ -6997,8 +7172,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
-printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
+printf '%s\n' "$gl_cv_c_amsterdam_compiler" >&6; }
 
       if test $gl_cv_c_amsterdam_compiler = yes; then
     if test -z "$AR"; then
@@ -7014,7 +7189,7 @@ printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -7035,7 +7210,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7047,11 +7222,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7060,7 +7235,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -7081,7 +7256,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7093,11 +7268,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -7105,8 +7280,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -7128,7 +7303,7 @@ fi
             if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
@@ -7149,7 +7324,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7161,11 +7336,11 @@ esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7174,7 +7349,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
@@ -7195,7 +7370,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7207,11 +7382,11 @@ esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -7219,8 +7394,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -7241,7 +7416,7 @@ fi
 
 if test "$enable_largefile" != no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 printf %s "checking for special C compiler options needed for large files... " >&6; }
 if test ${ac_cv_sys_largefile_CC+y}
 then :
@@ -7293,13 +7468,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf '%s\n' "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
 if test ${ac_cv_sys_file_offset_bits+y}
 then :
@@ -7367,18 +7542,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf '%s\n' "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *) 
-printf "%s\n" "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
+printf '%s\n' "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   case $ac_cv_sys_file_offset_bits in @%:@(
   unknown) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
 if test ${ac_cv_sys_large_files+y}
 then :
@@ -7446,12 +7621,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-printf "%s\n" "$ac_cv_sys_large_files" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf '%s\n' "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *) 
-printf "%s\n" "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
+printf '%s\n' "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest* ;; @%:@(
@@ -7466,7 +7641,7 @@ fi
  if test "$enable_year2038" != no
 then :
   
-                            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
+                            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
 printf %s "checking for time_t past the year 2038... " >&6; }
 if test ${gl_cv_type_time_t_y2038+y}
 then :
@@ -7495,10 +7670,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
-printf "%s\n" "$gl_cv_type_time_t_y2038" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
+printf '%s\n' "$gl_cv_type_time_t_y2038" >&6; }
   if test "$gl_cv_type_time_t_y2038" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
 printf %s "checking for 64-bit time_t with _TIME_BITS=64... " >&6; }
 if test ${gl_cv_type_time_t_bits_macro+y}
 then :
@@ -7529,14 +7704,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
-printf "%s\n" "$gl_cv_type_time_t_bits_macro" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
+printf '%s\n' "$gl_cv_type_time_t_bits_macro" >&6; }
     if test "$gl_cv_type_time_t_bits_macro" = yes; then
       
-printf "%s\n" "@%:@define _TIME_BITS 64" >>confdefs.h
+printf '%s\n' "@%:@define _TIME_BITS 64" >>confdefs.h
 
             
-printf "%s\n" "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
+printf '%s\n' "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
 
       gl_cv_type_time_t_y2038=yes
     fi
@@ -7553,8 +7728,8 @@ printf "%s\n" "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "The 'time_t' type stops working after January 2038.
           Remove _USE_32BIT_TIME_T from the compiler flags.
 See 'config.log' for more details" "$LINENO" 5; }
@@ -7565,11 +7740,11 @@ else case e in @%:@(
        # problem.  Otherwise, just warn the builder.
        
        if test "$gl_warned_about_y2038" != yes; then
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5
-printf "%s\n" "$as_me: WARNING: The 'time_t' type stops working after January 2038,
+printf '%s\n' "$as_me: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;}
@@ -7592,7 +7767,7 @@ fi
   case "$host_os" in
     mingw*)
       
-printf "%s\n" "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
+printf '%s\n' "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 
       ;;
   esac
@@ -7709,14 +7884,14 @@ printf "%s\n" "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
     
     
@@ -7754,7 +7929,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -7781,12 +7956,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -7802,7 +7977,7 @@ esac
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -7845,7 +8020,7 @@ case `"$ac_path_SED" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7874,8 +8049,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -7892,7 +8067,7 @@ Xsed="$SED -e 1s/^X//"
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -7929,7 +8104,7 @@ case `"$ac_path_GREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7958,12 +8133,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -8003,7 +8178,7 @@ case `"$ac_path_EGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8033,14 +8208,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
  
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -8080,7 +8255,7 @@ case `"$ac_path_FGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8110,8 +8285,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
  
 
@@ -8147,7 +8322,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -8177,10 +8352,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -8216,14 +8391,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -8240,8 +8415,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -8252,7 +8427,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -8308,8 +8483,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -8322,7 +8497,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -8343,7 +8518,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8355,11 +8530,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8372,7 +8547,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -8393,7 +8568,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8405,11 +8580,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8421,8 +8596,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -8450,7 +8625,7 @@ test -z "$NM" && NM=nm
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -8472,22 +8647,22 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -8505,9 +8680,9 @@ else case e in @%:@(
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -8620,11 +8795,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -8668,7 +8843,7 @@ esac
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -8710,14 +8885,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -8739,14 +8914,85 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+case $host in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+      
+    
+    
+    
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+  
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in @%:@(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; @%:@(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; @%:@(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+        
+fi
+     ;; @%:@(
+  *) :
+     ;;
+esac
+  
+ ;; @%:@(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -8755,8 +9001,8 @@ else case e in @%:@(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -8771,7 +9017,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -8788,7 +9034,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -8809,7 +9055,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8822,11 +9068,11 @@ esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8839,7 +9085,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -8860,7 +9106,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8872,11 +9118,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8885,7 +9131,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -8906,7 +9152,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8918,11 +9164,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -8930,8 +9176,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -8947,7 +9193,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -9064,16 +9310,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -9160,8 +9402,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -9205,7 +9447,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -9226,7 +9468,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9238,11 +9480,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9251,7 +9493,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -9272,7 +9514,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9284,11 +9526,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -9296,8 +9538,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -9314,7 +9556,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -9343,8 +9585,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -9359,7 +9601,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -9380,7 +9622,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9392,11 +9634,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9409,7 +9651,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -9430,7 +9672,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9442,11 +9684,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9458,8 +9700,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -9495,7 +9737,7 @@ lt_ar_flags=$AR_FLAGS
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -9520,7 +9762,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -9528,7 +9770,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -9541,8 +9783,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -9559,7 +9801,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -9580,7 +9822,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9592,11 +9834,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9605,7 +9847,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -9626,7 +9868,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9638,11 +9880,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -9650,8 +9892,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -9741,7 +9983,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -9801,13 +10043,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -9821,22 +10063,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -9857,8 +10099,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -9898,7 +10142,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
@@ -9971,7 +10215,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -10007,11 +10251,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -10057,7 +10301,7 @@ fi
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 @%:@ Check whether --with-sysroot was given.
@@ -10085,20 +10329,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -10143,11 +10387,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -10164,8 +10408,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
     
     
@@ -10205,7 +10449,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -10225,7 +10469,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -10263,7 +10507,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -10304,7 +10548,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -10367,7 +10611,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -10407,8 +10651,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -10421,7 +10665,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -10458,7 +10702,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -10479,7 +10723,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10491,11 +10735,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10504,7 +10748,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -10525,7 +10769,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10537,11 +10781,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -10549,8 +10793,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -10560,7 +10804,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -10576,8 +10820,8 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -10592,7 +10836,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -10613,7 +10857,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10625,11 +10869,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10638,7 +10882,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -10659,7 +10903,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10671,11 +10915,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -10683,8 +10927,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -10696,7 +10940,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -10717,7 +10961,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10729,11 +10973,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10742,7 +10986,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -10763,7 +11007,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10775,11 +11019,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -10787,8 +11031,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -10800,7 +11044,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -10821,7 +11065,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10833,11 +11077,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10846,7 +11090,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -10867,7 +11111,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10879,11 +11123,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -10891,8 +11135,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -10904,7 +11148,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -10925,7 +11169,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10937,11 +11181,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10950,7 +11194,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -10971,7 +11215,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10983,11 +11227,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -10995,8 +11239,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -11008,7 +11252,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -11029,7 +11273,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11041,11 +11285,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11054,7 +11298,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -11075,7 +11319,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11087,11 +11331,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -11099,8 +11343,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -11135,7 +11379,7 @@ fi
     
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -11170,12 +11414,12 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
     # Feature test to disable chained fixups since it is not
     # compatible with '-undefined dynamic_lookup'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
 printf %s "checking for -no_fixup_chains linker flag... " >&6; }
 if test ${lt_cv_support_no_fixup_chains+y}
 then :
@@ -11209,10 +11453,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -11246,10 +11490,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -11283,8 +11527,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -11373,7 +11617,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_inc
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -11420,7 +11664,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -11441,7 +11685,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11453,11 +11697,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11466,7 +11710,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -11487,7 +11731,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11499,11 +11743,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -11511,8 +11755,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -11524,7 +11768,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -11545,7 +11789,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11557,11 +11801,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11570,7 +11814,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -11591,7 +11835,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11603,11 +11847,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -11615,8 +11859,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -11628,7 +11872,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -11649,7 +11893,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11661,11 +11905,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11674,7 +11918,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -11695,7 +11939,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11707,11 +11951,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -11719,8 +11963,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -11857,7 +12101,7 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
   
 @%:@ Check whether --with-aix-soname was given.
@@ -11884,8 +12128,8 @@ fi
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -11967,7 +12211,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -11984,15 +12228,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
     
     
     
 
-printf "%s\n" "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -12038,7 +12282,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12093,11 +12337,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     
@@ -12106,7 +12350,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12161,11 +12405,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12246,7 +12490,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -12273,9 +12517,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -12283,8 +12527,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -12422,7 +12666,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -12473,7 +12717,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -12489,7 +12739,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -12512,6 +12762,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -12569,18 +12825,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -12662,7 +12906,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -12671,15 +12915,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -12706,9 +12950,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -12716,8 +12960,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -12745,7 +12989,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -12761,9 +13005,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -12775,8 +13019,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -12790,7 +13034,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -12821,9 +13065,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -12839,15 +13083,15 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
     
     
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -12878,9 +13122,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -12896,8 +13140,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -12905,7 +13149,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -12913,11 +13157,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -12929,7 +13173,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -13123,17 +13367,17 @@ _LT_EOF
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -13142,7 +13386,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -13162,6 +13405,11 @@ _LT_EOF
       archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -13187,7 +13435,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
@@ -13242,16 +13490,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -13650,8 +13888,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -13661,14 +13899,20 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -13700,7 +13944,7 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
@@ -13834,7 +14078,7 @@ fi
 	
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -13850,9 +14094,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
@@ -13864,8 +14108,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -13905,7 +14149,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -13929,8 +14173,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -13945,6 +14189,9 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -13956,12 +14203,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -14008,17 +14249,17 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -14027,7 +14268,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -14053,8 +14293,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -14071,21 +14311,21 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -14221,8 +14461,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -14258,7 +14498,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -14270,7 +14510,7 @@ else case e in @%:@(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -14288,7 +14528,7 @@ else case e in @%:@(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -14303,8 +14543,8 @@ else case e in @%:@(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -14463,7 +14703,7 @@ esac
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -14756,8 +14996,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -15024,6 +15264,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -15134,6 +15386,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -15152,30 +15406,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -15220,9 +15452,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -15496,7 +15733,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -15547,7 +15784,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -15563,7 +15806,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -15586,6 +15829,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -15643,18 +15892,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -15736,7 +15973,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -15745,15 +15982,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -15780,9 +16017,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -15790,8 +16027,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -15813,7 +16050,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -15829,9 +16066,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -15843,8 +16080,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -15865,8 +16102,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15987,7 +16224,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -16012,8 +16249,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -16057,7 +16294,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16098,8 +16335,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -16128,7 +16365,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -16169,8 +16406,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -16180,7 +16417,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16221,13 +16458,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -16268,13 +16505,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -16315,8 +16552,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -16362,7 +16599,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -16446,7 +16683,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16465,12 +16702,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -16554,7 +16791,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16573,8 +16810,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -16612,40 +16849,40 @@ fi
   
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -16663,12 +16900,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -16693,15 +16930,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
   
 
@@ -16722,11 +16959,18 @@ CC=$lt_save_CC
 
 
 
+
        
        
 
 
 
+
+
+
+
+
+
 
 
         ac_config_commands="$ac_config_commands libtool"
@@ -16762,16 +17006,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -16788,7 +17032,7 @@ else case e in @%:@(
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -16818,9 +17062,9 @@ else case e in @%:@(
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -16837,7 +17081,7 @@ else case e in @%:@(
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -16895,14 +17139,14 @@ fi
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
@@ -16919,13 +17163,13 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 printf %s "checking for shared library path variable... " >&6; }
 if test ${acl_cv_libpath+y}
 then :
@@ -16940,12 +17184,12 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-printf "%s\n" "$acl_cv_libpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+printf '%s\n' "$acl_cv_libpath" >&6; }
   shlibpath_var="$acl_cv_shlibpath_var"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
 printf %s "checking whether to activate relocatable installation... " >&6; }
   @%:@ Check whether --enable-relocatable was given.
 if test ${enable_relocatable+y}
@@ -16962,8 +17206,8 @@ esac
 fi
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-printf "%s\n" "$RELOCATABLE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+printf '%s\n' "$RELOCATABLE" >&6; }
 
 
   
@@ -16973,11 +17217,13 @@ printf "%s\n" "$RELOCATABLE" >&6; }
     reloc_final_prefix="$prefix"
   fi
   
-printf "%s\n" "@%:@define INSTALLPREFIX \"${reloc_final_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+@%:@define INSTALLPREFIX "${reloc_final_prefix}"
+_ACEOF
 
   if test $RELOCATABLE = yes; then
     
-printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
 
   fi
 
@@ -16998,14 +17244,14 @@ printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
 if test "x$ac_cv_header_mach_o_dyld_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
 
 fi
 
     ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
 if test "x$ac_cv_func__NSGetExecutablePath" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
 
 fi
 
@@ -17024,7 +17270,7 @@ fi
         ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
 if test "x$ac_cv_func_copy_file_range" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
@@ -17122,7 +17368,7 @@ fi
 if test ${enable_extra_encodings+y}
 then :
   enableval=$enable_extra_encodings; 
-printf "%s\n" "@%:@define ENABLE_EXTRA 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_EXTRA 1" >>confdefs.h
 
    USE_EXTRA_ENCODINGS=yes
 else case e in @%:@(
@@ -17133,7 +17379,7 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to copy files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to copy files" >&5
 printf %s "checking how to copy files... " >&6; }
 if test ${cl_cv_prog_cp+y}
 then :
@@ -17151,11 +17397,11 @@ rm -f conftest*
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_cp" >&5
-printf "%s\n" "$cl_cv_prog_cp" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_cp" >&5
+printf '%s\n' "$cl_cv_prog_cp" >&6; }
 CP="$cl_cv_prog_cp"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to make hard links" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to make hard links" >&5
 printf %s "checking how to make hard links... " >&6; }
 if test ${cl_cv_prog_LN+y}
 then :
@@ -17173,19 +17419,19 @@ rm -f conftestdata conftestfile
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_LN" >&5
-printf "%s\n" "$cl_cv_prog_LN" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_LN" >&5
+printf '%s\n' "$cl_cv_prog_LN" >&6; }
 LN="$cl_cv_prog_LN"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 
@@ -17197,7 +17443,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RC+y}
 then :
@@ -17218,7 +17464,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17230,11 +17476,11 @@ esac
 fi
 RC=$ac_cv_prog_RC
 if test -n "$RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
-printf "%s\n" "$RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+printf '%s\n' "$RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17243,7 +17489,7 @@ if test -z "$ac_cv_prog_RC"; then
   ac_ct_RC=$RC
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RC+y}
 then :
@@ -17264,7 +17510,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RC="windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17276,11 +17522,11 @@ esac
 fi
 ac_ct_RC=$ac_cv_prog_ac_ct_RC
 if test -n "$ac_ct_RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
-printf "%s\n" "$ac_ct_RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
+printf '%s\n' "$ac_ct_RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RC" = x; then
@@ -17288,8 +17534,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RC=$ac_ct_RC
@@ -17387,7 +17633,7 @@ if test $WOE32 = yes; then
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_WINDRES+y}
 then :
@@ -17408,7 +17654,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17420,11 +17666,11 @@ esac
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
-printf "%s\n" "$WINDRES" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+printf '%s\n' "$WINDRES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17433,7 +17679,7 @@ if test -z "$ac_cv_prog_WINDRES"; then
   ac_ct_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_WINDRES+y}
 then :
@@ -17454,7 +17700,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_WINDRES="windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17466,11 +17712,11 @@ esac
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
-printf "%s\n" "$ac_ct_WINDRES" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+printf '%s\n' "$ac_ct_WINDRES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_WINDRES" = x; then
@@ -17478,8 +17724,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     WINDRES=$ac_ct_WINDRES
@@ -17495,7 +17741,7 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -17526,9 +17772,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -17572,8 +17818,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -17582,7 +17828,7 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
@@ -17596,15 +17842,15 @@ printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
   else
     acl_final_exec_prefix="$exec_prefix"
   fi
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
+  prefix="$acl_saved_prefix"
 
 
     
   
-                                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+                                                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 printf %s "checking for shared library run path origin... " >&6; }
 if test ${acl_cv_rpath+y}
 then :
@@ -17619,8 +17865,8 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-printf "%s\n" "$acl_cv_rpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf '%s\n' "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   acl_libext="$acl_cv_libext"
   acl_shlibext="$acl_cv_shlibext"
@@ -17642,281 +17888,75 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
 printf %s "checking 32-bit host C ABI... " >&6; }
 if test ${gl_cv_host_cpu_c_abi_32bit+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) if test -n "$gl_cv_host_cpu_c_abi"; then
-       case "$gl_cv_host_cpu_c_abi" in
-         i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
-           gl_cv_host_cpu_c_abi_32bit=yes ;;
-         x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
-           gl_cv_host_cpu_c_abi_32bit=no ;;
-         *)
-           gl_cv_host_cpu_c_abi_32bit=unknown ;;
-       esac
-     else
-       case "$host_cpu" in
+  e) case "$host_cpu" in
 
-         # CPUs that only support a 32-bit ABI.
-         arc \
-         | bfin \
-         | cris* \
-         | csky \
-         | epiphany \
-         | ft32 \
-         | h8300 \
-         | m68k \
-         | microblaze | microblazeel \
-         | nds32 | nds32le | nds32be \
-         | nios2 | nios2eb | nios2el \
-         | or1k* \
-         | or32 \
-         | sh | sh1234 | sh1234elb \
-         | tic6x \
-         | xtensa* )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
+       # CPUs that only support a 32-bit ABI.
+       arc \
+       | bfin \
+       | cris* \
+       | csky \
+       | epiphany \
+       | ft32 \
+       | h8300 \
+       | m68k \
+       | microblaze | microblazeel \
+       | nds32 | nds32le | nds32be \
+       | nios2 | nios2eb | nios2el \
+       | or1k* \
+       | or32 \
+       | sh | sh1234 | sh1234elb \
+       | tic6x \
+       | xtensa* )
+         gl_cv_host_cpu_c_abi_32bit=yes
+         ;;
 
-         # CPUs that only support a 64-bit ABI.
-         alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
-         | mmix )
-           gl_cv_host_cpu_c_abi_32bit=no
-           ;;
+       # CPUs that only support a 64-bit ABI.
+       alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
+       | mmix )
+         gl_cv_host_cpu_c_abi_32bit=no
+         ;;
 
-         i[34567]86 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         x86_64 )
-           # On x86_64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
-           # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
-           #   with native Windows (mingw, MSVC).
-           # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if (defined __x86_64__ || defined __amd64__ \
-                       || defined _M_X64 || defined _M_AMD64) \
-                      && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         arm* | aarch64 )
-           # Assume arm with EABI.
-           # On arm64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
-           # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
-           # On hppa, the C compiler may be generating 32-bit code or 64-bit
-           # code. In the latter case, it defines _LP64 and __LP64__.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         ia64* )
-           # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
-           # 32-bit code. In the latter case, it defines _ILP32.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef _ILP32
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=yes
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         mips* )
-           # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
-           # at 32.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         powerpc* )
-           # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
-           # No need to distinguish them here; the caller may distinguish
-           # them based on the OS.
-           # On powerpc64 systems, the C compiler may still be generating
-           # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
-           # be generating 64-bit code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __powerpc64__ || defined __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         rs6000 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         riscv32 | riscv64 )
-           # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
-           # Size of 'long' and 'void *':
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         s390* )
-           # On s390x, the C compiler may be generating 64-bit (= s390x) code
-           # or 31-bit (= s390) code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__ || defined __s390x__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         sparc | sparc64 )
-           # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
-           # C compiler still generates 32-bit code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __sparcv9 || defined __arch64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         *)
+       *)
+         if test -n "$gl_cv_host_cpu_c_abi"; then
+                      case "$gl_cv_host_cpu_c_abi" in
+             i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+               gl_cv_host_cpu_c_abi_32bit=yes ;;
+             x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+               gl_cv_host_cpu_c_abi_32bit=no ;;
+             *)
+               gl_cv_host_cpu_c_abi_32bit=unknown ;;
+           esac
+         else
            gl_cv_host_cpu_c_abi_32bit=unknown
-           ;;
-       esac
-     fi
+         fi
+         if test $gl_cv_host_cpu_c_abi_32bit = unknown; then
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int test_pointer_size[sizeof (void *) - 5];
+                
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_host_cpu_c_abi_32bit=no
+else case e in @%:@(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+         fi
+         ;;
+     esac
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
-printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
+printf '%s\n' "$gl_cv_host_cpu_c_abi_32bit" >&6; }
 
   HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
 
@@ -17924,7 +17964,7 @@ printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
                                 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
 printf %s "checking for ELF binary format... " >&6; }
 if test ${gl_cv_elf+y}
 then :
@@ -17932,7 +17972,7 @@ then :
 else case e in @%:@(
   e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if defined __ELF__ || (defined __linux__ && defined __EDG__)
+#if defined __ELF__ || (defined __linux__ && (defined __EDG__ || defined __SUNPRO_C))
         Extensible Linking Format
         #endif
        
@@ -17950,8 +17990,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
-printf "%s\n" "$gl_cv_elf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
+printf '%s\n' "$gl_cv_elf" >&6; }
   if test $gl_cv_elf = yes; then
     # Extract the ELF class of a file (5th byte) in decimal.
     # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
@@ -18002,7 +18042,7 @@ printf "%s\n" "$gl_cv_elf" >&6; }
     }
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
 printf %s "checking for the common suffixes of directories in the library search path... " >&6; }
 if test ${acl_cv_libdirstems+y}
 then :
@@ -18021,6 +18061,13 @@ else case e in @%:@(
            esac
          fi
          ;;
+       netbsd*)
+                           if test $HOST_CPU_C_ABI_32BIT != no; then
+           case "$host_cpu" in
+             sparc*) acl_libdirstem2=lib/sparc ;;
+           esac
+         fi
+         ;;
        *)
                                                                                  searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
                      | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
@@ -18037,7 +18084,7 @@ else case e in @%:@(
            fi
          fi
          if test -n "$searchpath"; then
-           acl_save_IFS="${IFS= 	}"; IFS=":"
+           acl_saved_IFS="${IFS= 	}"; IFS=":"
            for searchdir in $searchpath; do
              if test -d "$searchdir"; then
                case "$searchdir" in
@@ -18054,7 +18101,7 @@ else case e in @%:@(
                esac
              fi
            done
-           IFS="$acl_save_IFS"
+           IFS="$acl_saved_IFS"
            if test $HOST_CPU_C_ABI_32BIT = yes; then
              # 32-bit ABI.
              acl_libdirstem3=
@@ -18072,8 +18119,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
-printf "%s\n" "$acl_cv_libdirstems" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+printf '%s\n' "$acl_cv_libdirstems" >&6; }
       acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
   acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
   acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
@@ -18090,9 +18137,9 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
   
     use_additional=yes
   
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
     eval additional_includedir=\"$includedir\"
@@ -18100,8 +18147,8 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
   
 @%:@ Check whether --with-libiconv-prefix was given.
@@ -18113,9 +18160,9 @@ then :
     else
       if test "X$withval" = "X"; then
         
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
           eval additional_includedir=\"$includedir\"
@@ -18123,8 +18170,8 @@ then :
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
         
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -18236,13 +18283,13 @@ fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
               
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -18330,13 +18377,13 @@ fi
                                                                                 haveit=
                     for x in $LDFLAGS $LIBICONV; do
                       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -18398,13 +18445,13 @@ fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCICONV; do
                     
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -18420,12 +18467,12 @@ fi
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -18447,13 +18494,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LIBICONV; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -18468,13 +18515,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LTLIBICONV; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -18548,17 +18595,17 @@ fi
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
     fi
@@ -18579,19 +18626,19 @@ fi
        
       
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
   
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -18604,7 +18651,7 @@ fi
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
@@ -18636,7 +18683,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -18661,22 +18708,22 @@ then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
   e) 
-                  am_save_LIBS="$LIBS"
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -18724,6 +18771,35 @@ int result = 0;
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -18740,7 +18816,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -18759,7 +18835,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18779,7 +18855,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18797,7 +18873,7 @@ int result = 0;
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -18824,12 +18900,12 @@ fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -18839,16 +18915,16 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
     
-printf "%s\n" "@%:@define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -18856,7 +18932,7 @@ printf "%s\n" "$LIBICONV" >&6; }
   
 
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
 printf %s "checking whether iconv is compatible with its POSIX signature... " >&6; }
 if test ${gl_cv_iconv_nonconst+y}
 then :
@@ -18892,8 +18968,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
-printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
+printf '%s\n' "$gl_cv_iconv_nonconst" >&6; }
   else
             gl_cv_iconv_nonconst=yes
   fi
@@ -18903,12 +18979,26 @@ printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
     iconv_arg1="const"
   fi
   
-printf "%s\n" "@%:@define ICONV_CONST $iconv_arg1" >>confdefs.h
+printf '%s\n' "@%:@define ICONV_CONST $iconv_arg1" >>confdefs.h
 
     
 
+      if test "$am_func_iconv" = yes; then
+    if test -n "$LIBICONV"; then
+      am_cv_func_iconv_summary='yes, in libiconv'
+    else
+      am_cv_func_iconv_summary='yes, in libc'
+    fi
+  else
+    if test "$am_cv_func_iconv" = yes; then
+      am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
+    else
+      am_cv_func_iconv_summary='no, consider installing GNU libiconv'
+    fi
+  fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 printf %s "checking whether NLS is requested... " >&6; }
     @%:@ Check whether --enable-nls was given.
 if test ${enable_nls+y}
@@ -18919,13 +19009,13 @@ else case e in @%:@(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   
 
 
           
-      GETTEXT_MACRO_VERSION=0.20
+      GETTEXT_MACRO_VERSION=0.22
 
 
     
@@ -18959,7 +19049,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGFMT+y}
 then :
@@ -18970,9 +19060,9 @@ else case e in @%:@(
     ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -18985,7 +19075,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
     ;;
 esac ;;
@@ -18993,16 +19083,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-printf "%s\n" "$MSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf '%s\n' "$MSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_GMSGFMT+y}
 then :
@@ -19025,7 +19115,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19039,11 +19129,11 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-printf "%s\n" "$GMSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf '%s\n' "$GMSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -19084,7 +19174,7 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XGETTEXT+y}
 then :
@@ -19095,9 +19185,9 @@ else case e in @%:@(
     ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -19110,7 +19200,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
     ;;
 esac ;;
@@ -19118,11 +19208,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-printf "%s\n" "$XGETTEXT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf '%s\n' "$XGETTEXT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     rm -f messages.po
@@ -19163,7 +19253,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGMERGE+y}
 then :
@@ -19174,9 +19264,9 @@ else case e in @%:@(
     ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -19188,7 +19278,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
     ;;
 esac ;;
@@ -19196,11 +19286,11 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-printf "%s\n" "$MSGMERGE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf '%s\n' "$MSGMERGE" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -19222,20 +19312,66 @@ fi
 
 
 
-    
-  
-  
+  gl_sed_double_backslashes='s/\\/\\\\/g'
+  gl_sed_escape_doublequotes='s/"/\\"/g'
+  gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
+  gl_sed_escape_for_make_2='s,\$,\\$$,g'
+      case `echo r | tr -d '\r'` in
+    '') gl_tr_cr='\015' ;;
+    *)  gl_tr_cr='\r' ;;
+  esac
+
+
+    gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+      if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
   
   
   
   
 
+    gl_final_localedir="$localedir"
+    case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw* | windows*)
+          gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;;
+      esac
+      ;;
+  esac
+    localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+  localedir_c='"'"$localedir_c"'"'
   
+
+    localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+      if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then
+    localedir_c_make='\"$(localedir)\"'
+  fi
   
 
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+
 
     
+  
+  
+  
+  
+  
+  
 
+  
+  
+
+
+  
     
   
 
@@ -19244,13 +19380,13 @@ fi
   
 
     
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
 if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_LIBS="$LIBS"
+  e) gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19272,23 +19408,23 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS" ;;
+     LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf '%s\n' "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
     
-printf "%s\n" "@%:@define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+                    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
 printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; }
 if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_LIBS="$LIBS"
+  e) gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19310,20 +19446,20 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS" ;;
+     LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
-printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+printf '%s\n' "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
   if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
     
-printf "%s\n" "@%:@define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
 
   fi
   INTL_MACOSX_LIBS=
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
      || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
   fi
   
 
@@ -19363,7 +19499,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
           gt_expression_test_code=
         fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 printf %s "checking for GNU gettext in libc... " >&6; }
 if eval test \${$gt_func_gnugettext_libc+y}
 then :
@@ -19405,8 +19541,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libc
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
                     
@@ -19414,19 +19550,19 @@ printf "%s\n" "$ac_res" >&6; }
        
       
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
   
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -19439,7 +19575,7 @@ printf "%s\n" "$ac_res" >&6; }
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
@@ -19471,7 +19607,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19496,22 +19632,22 @@ then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
   e) 
-                  am_save_LIBS="$LIBS"
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -19559,6 +19695,35 @@ int result = 0;
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -19575,7 +19740,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -19594,7 +19759,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -19614,7 +19779,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -19632,7 +19797,7 @@ int result = 0;
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -19659,12 +19824,12 @@ fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -19674,16 +19839,16 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
     
-printf "%s\n" "@%:@define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -19699,9 +19864,9 @@ printf "%s\n" "$LIBICONV" >&6; }
   
     use_additional=yes
   
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
     eval additional_includedir=\"$includedir\"
@@ -19709,8 +19874,8 @@ printf "%s\n" "$LIBICONV" >&6; }
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
   
 @%:@ Check whether --with-libintl-prefix was given.
@@ -19722,9 +19887,9 @@ then :
     else
       if test "X$withval" = "X"; then
         
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
           eval additional_includedir=\"$includedir\"
@@ -19732,8 +19897,8 @@ then :
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
         
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -19845,13 +20010,13 @@ fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBINTL; do
               
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -19939,13 +20104,13 @@ fi
                                                                                 haveit=
                     for x in $LDFLAGS $LIBINTL; do
                       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -20007,13 +20172,13 @@ fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCINTL; do
                     
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -20029,12 +20194,12 @@ fi
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -20056,13 +20221,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LIBINTL; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -20077,13 +20242,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LTLIBINTL; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -20157,17 +20322,17 @@ fi
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
     fi
@@ -20182,15 +20347,15 @@ fi
   
   
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 printf %s "checking for GNU gettext in libintl... " >&6; }
 if eval test \${$gt_func_gnugettext_libintl+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_CPPFLAGS="$CPPFLAGS"
+  e) gt_saved_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
+            gt_saved_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20229,8 +20394,14 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
+                                    gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
+            
+            case "$host_os" in
+              aix*) gt_LIBINTL_EXTRA="-lpthread" ;;
+            esac
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+               && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+              LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20261,27 +20432,28 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
-  LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+  LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA"
                  eval "$gt_func_gnugettext_libintl=yes"
                 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
             fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS" ;;
+            CPPFLAGS="$gt_saved_CPPFLAGS"
+            LIBS="$gt_saved_LIBS" ;;
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libintl
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
         fi
 
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
+                && test "$PACKAGE" != gettext-tools \
+                && test "$PACKAGE" != libintl; }; then
           gt_use_preinstalled_gnugettext=yes
         else
                     LIBINTL=
@@ -20302,19 +20474,19 @@ printf "%s\n" "$ac_res" >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
       
-printf "%s\n" "@%:@define ENABLE_NLS 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
 printf %s "checking whether to use NLS... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
 printf %s "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
@@ -20325,30 +20497,30 @@ printf %s "checking where the gettext function comes from... " >&6; }
     else
       gt_source="included intl directory"
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-printf "%s\n" "$gt_source" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf '%s\n' "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
 printf %s "checking how to link with libintl... " >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-printf "%s\n" "$LIBINTL" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf '%s\n' "$LIBINTL" >&6; }
         
   for element in $INCINTL; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -20363,10 +20535,10 @@ printf "%s\n" "$LIBINTL" >&6; }
       fi
 
             
-printf "%s\n" "@%:@define HAVE_GETTEXT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_GETTEXT 1" >>confdefs.h
 
       
-printf "%s\n" "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -20375,18 +20547,22 @@ printf "%s\n" "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
 
   
 
-    INTLLIBS="$LIBINTL"
+  
+        INTLLIBS="$LIBINTL"
+    
   
 
     
   
   
 
+    
+
 
 
 
     
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
@@ -20414,20 +20590,20 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
      
-printf "%s\n" "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
      
-printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
+printf '%s\n' "@%:@define mbstate_t int" >>confdefs.h
 
    fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 printf %s "checking for wchar_t... " >&6; }
 if test ${gt_cv_c_wchar_t+y}
 then :
@@ -20455,11 +20631,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
-printf "%s\n" "$gt_cv_c_wchar_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+printf '%s\n' "$gt_cv_c_wchar_t" >&6; }
   if test $gt_cv_c_wchar_t = yes; then
     
-printf "%s\n" "@%:@define HAVE_WCHAR_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WCHAR_T 1" >>confdefs.h
 
   fi
 
@@ -20482,31 +20658,31 @@ fi
 ac_fn_c_check_func "$LINENO" "getc_unlocked" "ac_cv_func_getc_unlocked"
 if test "x$ac_cv_func_getc_unlocked" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETC_UNLOCKED 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETC_UNLOCKED 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc"
 if test "x$ac_cv_func_mbrtowc" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MBRTOWC 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MBRTOWC 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "wcrtomb" "ac_cv_func_wcrtomb"
 if test "x$ac_cv_func_wcrtomb" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WCRTOMB 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WCRTOMB 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "mbsinit" "ac_cv_func_mbsinit"
 if test "x$ac_cv_func_mbsinit" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MBSINIT 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MBSINIT 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
 if test "x$ac_cv_func_setlocale" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
 
 fi
 
@@ -20518,7 +20694,7 @@ else
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> is standalone" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> is standalone" >&5
 printf %s "checking whether <wchar.h> is standalone... " >&6; }
 if test ${gl_cv_header_wchar_h_standalone+y}
 then :
@@ -20546,8 +20722,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_standalone" >&5
-printf "%s\n" "$gl_cv_header_wchar_h_standalone" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_standalone" >&5
+printf '%s\n' "$gl_cv_header_wchar_h_standalone" >&6; }
 if test $gl_cv_header_wchar_h_standalone = yes; then
   BROKEN_WCHAR_H=0
 else
@@ -20561,7 +20737,7 @@ do :
   ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
 if test "x$ac_cv_func_memmove" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
  
 else case e in @%:@(
   e) SRCLIBOBJS="$SRCLIBOBJS $ac_func.$ac_objext" ;;
@@ -20571,7 +20747,7 @@ fi
 done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 printf %s "checking for nl_langinfo and CODESET... " >&6; }
 if test ${am_cv_langinfo_codeset+y}
 then :
@@ -20600,11 +20776,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf '%s\n' "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
     
-printf "%s\n" "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -20681,7 +20857,7 @@ gl_mda_defines='
 
        
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 printf %s "checking for working fcntl.h... " >&6; }
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
@@ -20815,15 +20991,15 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+printf '%s\n' "$gl_cv_header_working_fcntl_h" >&6; }
 
   case $gl_cv_header_working_fcntl_h in #(
   *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
 
 
   case $gl_cv_header_working_fcntl_h in #(
@@ -20831,7 +21007,7 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 
 
 
@@ -20840,12 +21016,12 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
 if test "x$ac_cv_header_wchar_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WCHAR_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WCHAR_H 1" >>confdefs.h
 
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EILSEQ" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EILSEQ" >&5
 printf %s "checking for EILSEQ... " >&6; }
 if test ${ac_cv_decl_EILSEQ+y}
 then :
@@ -20911,18 +21087,18 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_EILSEQ" >&5
-printf "%s\n" "$ac_cv_decl_EILSEQ" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_EILSEQ" >&5
+printf '%s\n' "$ac_cv_decl_EILSEQ" >&6; }
   if test "$ac_cv_decl_EILSEQ" != yes; then
     
-printf "%s\n" "@%:@define EILSEQ $ac_cv_decl_EILSEQ" >>confdefs.h
+printf '%s\n' "@%:@define EILSEQ $ac_cv_decl_EILSEQ" >>confdefs.h
 
     EILSEQ="$ac_cv_decl_EILSEQ"
     
   fi
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 printf %s "checking whether byte ordering is bigendian... " >&6; }
 if test ${ac_cv_c_bigendian+y}
 then :
@@ -21144,20 +21320,20 @@ fi
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-printf "%s\n" "$ac_cv_c_bigendian" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf '%s\n' "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     printf "%s\n" "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf '%s\n' "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
      
-printf "%s\n" "@%:@define WORDS_LITTLEENDIAN 1" >>confdefs.h
+printf '%s\n' "@%:@define WORDS_LITTLEENDIAN 1" >>confdefs.h
 
    ;; #(
    universal)
      	
-printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf '%s\n' "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -21178,8 +21354,8 @@ printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 if test ${enable_cross_guesses+y}
 then :
   enableval=$enable_cross_guesses; if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
-printf "%s\n" "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
+printf '%s\n' "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
        enableval=conservative
      fi
      gl_cross_guesses="$enableval"
@@ -21205,14 +21381,14 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define size_t unsigned int" >>confdefs.h
+printf '%s\n' "@%:@define size_t unsigned int" >>confdefs.h
  ;;
 esac
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 printf %s "checking for working alloca.h... " >&6; }
 if test ${ac_cv_working_alloca_h+y}
 then :
@@ -21241,15 +21417,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+printf '%s\n' "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
   
-printf "%s\n" "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 printf %s "checking for alloca... " >&6; }
 if test ${ac_cv_func_alloca_works+y}
 then :
@@ -21294,12 +21470,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+printf '%s\n' "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
   
-printf "%s\n" "@%:@define HAVE_ALLOCA 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -21313,10 +21489,10 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-printf "%s\n" "@%:@define C_ALLOCA 1" >>confdefs.h
+printf '%s\n' "@%:@define C_ALLOCA 1" >>confdefs.h
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 printf %s "checking stack direction for C alloca... " >&6; }
 if test ${ac_cv_c_stack_direction+y}
 then :
@@ -21360,9 +21536,9 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
-printf "%s\n" "@%:@define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+printf '%s\n' "$ac_cv_c_stack_direction" >&6; }
+printf '%s\n' "@%:@define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
 
 
 fi
@@ -21445,7 +21621,7 @@ fi
   REPLACE_WCTOMB=0;          
 
 
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 printf %s "checking whether lstat correctly handles trailing slash... " >&6; }
 if test ${gl_cv_func_lstat_dereferences_slashed_symlink+y}
 then :
@@ -21505,12 +21681,12 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
-printf "%s\n" "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
+printf '%s\n' "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
   case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
     *yes)
       
-printf "%s\n" "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
+printf '%s\n' "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
       ;;
   esac
@@ -21519,7 +21695,7 @@ printf "%s\n" "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
@@ -21550,11 +21726,11 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
     
-printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
@@ -21562,7 +21738,7 @@ printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
 
   
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
 printf %s "checking whether realpath works... " >&6; }
 if test ${gl_cv_func_realpath_works+y}
 then :
@@ -21796,17 +21972,17 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
-printf "%s\n" "$gl_cv_func_realpath_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
+printf '%s\n' "$gl_cv_func_realpath_works" >&6; }
   case "$gl_cv_func_realpath_works" in
     *yes)
       
-printf "%s\n" "@%:@define FUNC_REALPATH_WORKS 1" >>confdefs.h
+printf '%s\n' "@%:@define FUNC_REALPATH_WORKS 1" >>confdefs.h
 
       ;;
     *nearly)
       
-printf "%s\n" "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
+printf '%s\n' "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
 
       ;;
   esac
@@ -21823,7 +21999,7 @@ printf "%s\n" "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -22027,7 +22203,7 @@ fi
   
 
   
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 printf %s "checking for C/C++ restrict keyword... " >&6; }
 if test ${ac_cv_c_restrict+y}
 then :
@@ -22067,14 +22243,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
-printf "%s\n" "$ac_cv_c_restrict" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+printf '%s\n' "$ac_cv_c_restrict" >&6; }
  
  case $ac_cv_c_restrict in
    restrict) ;;
-   no) printf "%s\n" "@%:@define restrict /**/" >>confdefs.h
+   no) printf '%s\n' "@%:@define restrict /**/" >>confdefs.h
  ;;
-   *)  printf "%s\n" "@%:@define restrict $ac_cv_c_restrict" >>confdefs.h
+   *)  printf '%s\n' "@%:@define restrict $ac_cv_c_restrict" >>confdefs.h
  ;;
  esac
 
@@ -22183,7 +22359,7 @@ printf "%s\n" "$ac_cv_c_restrict" >&6; }
   if test $ac_cv_func__set_invalid_parameter_handler = yes; then
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
     
-printf "%s\n" "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
 
   else
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
@@ -22536,7 +22712,7 @@ printf "%s\n" "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
     
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
 printf %s "checking if environ is properly declared... " >&6; }
 if test ${gt_cv_var_environ_declaration+y}
 then :
@@ -22570,11 +22746,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
-printf "%s\n" "$gt_cv_var_environ_declaration" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
+printf '%s\n' "$gt_cv_var_environ_declaration" >&6; }
   if test $gt_cv_var_environ_declaration = yes; then
     
-printf "%s\n" "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
   fi
   
@@ -22585,7 +22761,7 @@ printf "%s\n" "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
 printf %s "checking whether the preprocessor supports include_next... " >&6; }
 if test ${gl_cv_have_include_next+y}
 then :
@@ -22650,8 +22826,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
-printf "%s\n" "$gl_cv_have_include_next" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
+printf '%s\n' "$gl_cv_have_include_next" >&6; }
   PRAGMA_SYSTEM_HEADER=
   if test $gl_cv_have_include_next = yes; then
     INCLUDE_NEXT=include_next
@@ -22672,7 +22848,7 @@ printf "%s\n" "$gl_cv_have_include_next" >&6; }
   
   
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
 printf %s "checking whether source code line length is unlimited... " >&6; }
 if test ${gl_cv_source_line_length_unlimited+y}
 then :
@@ -22699,8 +22875,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
-printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
+printf '%s\n' "$gl_cv_source_line_length_unlimited" >&6; }
   if test $gl_cv_source_line_length_unlimited = no; then
     PRAGMA_COLUMNS="#pragma COLUMNS 10000"
   else
@@ -22710,7 +22886,7 @@ printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
 printf %s "checking for complete errno.h... " >&6; }
 if test ${gl_cv_header_errno_h_complete+y}
 then :
@@ -22787,8 +22963,8 @@ rm -rf conftest*
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
-printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
+printf '%s\n' "$gl_cv_header_errno_h_complete" >&6; }
   if test $gl_cv_header_errno_h_complete = yes; then
     GL_GENERATE_ERRNO_H=false
   else
@@ -22803,7 +22979,7 @@ printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_errno_h='<'errno.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
 printf %s "checking absolute name of <errno.h>... " >&6; }
 if test ${gl_cv_next_errno_h+y}
 then :
@@ -22848,8 +23024,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
-printf "%s\n" "$gl_cv_next_errno_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
+printf '%s\n' "$gl_cv_next_errno_h" >&6; }
      fi
      NEXT_ERRNO_H=$gl_cv_next_errno_h
 
@@ -22869,7 +23045,7 @@ printf "%s\n" "$gl_cv_next_errno_h" >&6; }
   fi
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
 printf %s "checking for EMULTIHOP value... " >&6; }
 if test ${gl_cv_header_errno_h_EMULTIHOP+y}
 then :
@@ -22930,8 +23106,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
     case $gl_cv_header_errno_h_EMULTIHOP in
       yes | no)
         EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE=
@@ -22946,7 +23122,7 @@ printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
 
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
 printf %s "checking for ENOLINK value... " >&6; }
 if test ${gl_cv_header_errno_h_ENOLINK+y}
 then :
@@ -23007,8 +23183,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
-printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
+printf '%s\n' "$gl_cv_header_errno_h_ENOLINK" >&6; }
     case $gl_cv_header_errno_h_ENOLINK in
       yes | no)
         ENOLINK_HIDDEN=0; ENOLINK_VALUE=
@@ -23023,7 +23199,7 @@ printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
 
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
 printf %s "checking for EOVERFLOW value... " >&6; }
 if test ${gl_cv_header_errno_h_EOVERFLOW+y}
 then :
@@ -23084,8 +23260,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
     case $gl_cv_header_errno_h_EOVERFLOW in
       yes | no)
         EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE=
@@ -23099,8 +23275,8 @@ printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
   fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
-printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to detect undeclared functions" >&5
+printf %s "checking for $CC options to detect undeclared functions... " >&6; }
 if test ${ac_cv_c_undeclared_builtin_options+y}
 then :
   printf %s "(cached) " >&6
@@ -23168,12 +23344,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
-printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf '%s\n' "$ac_cv_c_undeclared_builtin_options" >&6; }
   case $ac_cv_c_undeclared_builtin_options in @%:@(
   'cannot detect') :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot make $CC report undeclared builtins
 See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
   'none needed') :
@@ -23182,7 +23358,50 @@ See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
     ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
 esac
 
-ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to ignore future-version functions" >&5
+printf %s "checking for $CC options to ignore future-version functions... " >&6; }
+if test ${ac_cv_c_future_darwin_options+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)       ac_compile_saved="$ac_compile"
+   ac_compile="$ac_compile -Werror=unguarded-availability-new"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if ! (defined __APPLE__ && defined __MACH__)
+	   #error "-Werror=unguarded-availability-new not needed here"
+	  #endif
+	
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_future_darwin_options='-Werror=unguarded-availability-new'
+else case e in @%:@(
+  e) ac_cv_c_future_darwin_options='none needed' ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_compile="$ac_compile_saved"
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_future_darwin_options" >&5
+printf '%s\n' "$ac_cv_c_future_darwin_options" >&6; }
+ case $ac_cv_c_future_darwin_options in @%:@(
+  'none needed') :
+    ac_c_future_darwin_options='' ;; @%:@(
+  *) :
+    ac_c_future_darwin_options=$ac_cv_c_future_darwin_options ;;
+esac
+
+ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_strerror_r" = xyes
 then :
   ac_have_decl=1
@@ -23190,7 +23409,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
 
 
 if test $ac_cv_have_decl_strerror_r = yes; then
@@ -23198,11 +23417,11 @@ if test $ac_cv_have_decl_strerror_r = yes; then
   # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well
   # as AC_CHECK_DECLS_ONCE.)
   
-printf "%s\n" "@%:@define HAVE_STRERROR_R 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRERROR_R 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
 printf %s "checking whether strerror_r returns char *... " >&6; }
 if test ${ac_cv_func_strerror_r_char_p+y}
 then :
@@ -23237,11 +23456,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+printf '%s\n' "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
   
-printf "%s\n" "@%:@define STRERROR_R_CHAR_P 1" >>confdefs.h
+printf '%s\n' "@%:@define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
@@ -23249,7 +23468,7 @@ fi
   XGETTEXT_EXTRA_OPTIONS=
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5
 printf %s "checking whether ctype.h defines __header_inline... " >&6; }
 if test ${gl_cv_have___header_inline+y}
 then :
@@ -23273,11 +23492,11 @@ fi
 rm -f conftest.err conftest.i conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5
-printf "%s\n" "$gl_cv_have___header_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5
+printf '%s\n' "$gl_cv_have___header_inline" >&6; }
   if test "$gl_cv_have___header_inline" = yes; then
     
-printf "%s\n" "@%:@define HAVE___HEADER_INLINE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE___HEADER_INLINE 1" >>confdefs.h
 
   fi
 
@@ -23354,7 +23573,7 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      
-printf "%s\n" "@%:@define pid_t $ac_pid_type" >>confdefs.h
+printf '%s\n' "@%:@define pid_t $ac_pid_type" >>confdefs.h
 
      ;;
 esac
@@ -23367,7 +23586,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define mode_t int" >>confdefs.h
+printf '%s\n' "@%:@define mode_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -23386,7 +23605,7 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_fcntl_h='<'fcntl.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
 printf %s "checking absolute name of <fcntl.h>... " >&6; }
 if test ${gl_cv_next_fcntl_h+y}
 then :
@@ -23431,8 +23650,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
-printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
+printf '%s\n' "$gl_cv_next_fcntl_h" >&6; }
      fi
      NEXT_FCNTL_H=$gl_cv_next_fcntl_h
 
@@ -23483,7 +23702,7 @@ printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
   REPLACE_STAT=0;       
   REPLACE_UTIMENSAT=0;  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
 printf %s "checking whether stat file-mode macros are broken... " >&6; }
 if test ${ac_cv_header_stat_broken+y}
 then :
@@ -23521,11 +23740,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-printf "%s\n" "$ac_cv_header_stat_broken" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+printf '%s\n' "$ac_cv_header_stat_broken" >&6; }
 if test $ac_cv_header_stat_broken = yes; then
   
-printf "%s\n" "@%:@define STAT_MACROS_BROKEN 1" >>confdefs.h
+printf '%s\n' "@%:@define STAT_MACROS_BROKEN 1" >>confdefs.h
 
 fi
 
@@ -23533,7 +23752,7 @@ fi
   
   case "$host_os" in
     mingw*)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
 printf %s "checking for 64-bit off_t... " >&6; }
 if test ${gl_cv_type_off_t_64+y}
 then :
@@ -23563,14 +23782,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
-printf "%s\n" "$gl_cv_type_off_t_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
+printf '%s\n' "$gl_cv_type_off_t_64" >&6; }
       if test $gl_cv_type_off_t_64 = no; then
         WINDOWS_64_BIT_OFF_T=1
       else
         WINDOWS_64_BIT_OFF_T=0
       fi
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
 printf %s "checking for 64-bit st_size... " >&6; }
 if test ${gl_cv_member_st_size_64+y}
 then :
@@ -23601,8 +23820,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
-printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
+printf '%s\n' "$gl_cv_member_st_size_64" >&6; }
       if test $gl_cv_member_st_size_64 = no; then
         WINDOWS_64_BIT_ST_SIZE=1
       else
@@ -23632,7 +23851,7 @@ printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_stat_h='<'sys/stat.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
 printf %s "checking absolute name of <sys/stat.h>... " >&6; }
 if test ${gl_cv_next_sys_stat_h+y}
 then :
@@ -23683,8 +23902,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
-printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
+printf '%s\n' "$gl_cv_next_sys_stat_h" >&6; }
      fi
      NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h
 
@@ -23721,7 +23940,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define nlink_t int" >>confdefs.h
+printf '%s\n' "@%:@define nlink_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -23740,7 +23959,7 @@ fi
       ac_fn_c_check_header_compile "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default"
 if test "x$ac_cv_header_sdkddkver_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SDKDDKVER_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SDKDDKVER_H 1" >>confdefs.h
 
 fi
 
@@ -23830,7 +24049,7 @@ fi
 
   
 
-ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getdtablesize" = xyes
 then :
   ac_have_decl=1
@@ -23838,7 +24057,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
 
 
 
@@ -23856,7 +24075,7 @@ printf "%s\n" "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_limits_h='<'limits.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
 printf %s "checking absolute name of <limits.h>... " >&6; }
 if test ${gl_cv_next_limits_h+y}
 then :
@@ -23907,8 +24126,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
-printf "%s\n" "$gl_cv_next_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
+printf '%s\n' "$gl_cv_next_limits_h" >&6; }
      fi
      NEXT_LIMITS_H=$gl_cv_next_limits_h
 
@@ -23925,7 +24144,7 @@ printf "%s\n" "$gl_cv_next_limits_h" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
 printf %s "checking whether limits.h has WORD_BIT, BOOL_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_limits_width+y}
 then :
@@ -23960,8 +24179,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
-printf "%s\n" "$gl_cv_header_limits_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
+printf '%s\n' "$gl_cv_header_limits_width" >&6; }
   if test "$gl_cv_header_limits_width" = yes; then
     GL_GENERATE_LIMITS_H=false
   else
@@ -23969,7 +24188,7 @@ printf "%s\n" "$gl_cv_header_limits_width" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
 printf %s "checking for wint_t... " >&6; }
 if test ${gt_cv_c_wint_t+y}
 then :
@@ -23997,14 +24216,14 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
-printf "%s\n" "$gt_cv_c_wint_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+printf '%s\n' "$gt_cv_c_wint_t" >&6; }
   if test $gt_cv_c_wint_t = yes; then
     
-printf "%s\n" "@%:@define HAVE_WINT_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WINT_T 1" >>confdefs.h
 
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
 printf %s "checking whether wint_t is large enough... " >&6; }
 if test ${gl_cv_type_wint_t_large_enough+y}
 then :
@@ -24033,8 +24252,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
-printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
+printf '%s\n' "$gl_cv_type_wint_t_large_enough" >&6; }
     if test $gl_cv_type_wint_t_large_enough = no; then
       GNULIBHEADERS_OVERRIDE_WINT_T=1
     else
@@ -24046,7 +24265,7 @@ printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
   
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
 printf %s "checking whether the compiler produces multi-arch binaries... " >&6; }
 if test ${gl_cv_c_multiarch+y}
 then :
@@ -24090,8 +24309,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
-printf "%s\n" "$gl_cv_c_multiarch" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
+printf '%s\n' "$gl_cv_c_multiarch" >&6; }
   if test $gl_cv_c_multiarch = yes; then
     APPLE_UNIVERSAL_BUILD=1
   else
@@ -24105,10 +24324,10 @@ printf "%s\n" "$gl_cv_c_multiarch" >&6; }
   
 
       
-printf "%s\n" "@%:@define HAVE_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LONG_LONG_INT 1" >>confdefs.h
 
   
-printf "%s\n" "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
 
 
       
@@ -24147,7 +24366,7 @@ printf "%s\n" "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdint_h='<'stdint.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
 printf %s "checking absolute name of <stdint.h>... " >&6; }
 if test ${gl_cv_next_stdint_h+y}
 then :
@@ -24198,8 +24417,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
-printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+printf '%s\n' "$gl_cv_next_stdint_h" >&6; }
      fi
      NEXT_STDINT_H=$gl_cv_next_stdint_h
 
@@ -24223,7 +24442,7 @@ printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
   
 
     if test $ac_cv_header_stdint_h = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
 printf %s "checking whether stdint.h conforms to C99... " >&6; }
 if test ${gl_cv_header_working_stdint_h+y}
 then :
@@ -24500,8 +24719,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdint_h" >&6; }
   fi
 
   HAVE_C99_STDINT_H=0
@@ -24511,7 +24730,7 @@ printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
   case "$gl_cv_header_working_stdint_h" in
     *yes)
       HAVE_C99_STDINT_H=1
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
 printf %s "checking whether stdint.h works without ISO C predefines... " >&6; }
 if test ${gl_cv_header_stdint_without_STDC_macros+y}
 then :
@@ -24552,18 +24771,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
-printf "%s\n" "$gl_cv_header_stdint_without_STDC_macros" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
+printf '%s\n' "$gl_cv_header_stdint_without_STDC_macros" >&6; }
 
       if test $gl_cv_header_stdint_without_STDC_macros = no; then
         
-printf "%s\n" "@%:@define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_CONSTANT_MACROS 1" >>confdefs.h
 
         
-printf "%s\n" "@%:@define __STDC_LIMIT_MACROS 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_LIMIT_MACROS 1" >>confdefs.h
 
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
 printf %s "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_stdint_width+y}
 then :
@@ -24603,8 +24822,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
-printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
+printf '%s\n' "$gl_cv_header_stdint_width" >&6; }
       if test "$gl_cv_header_stdint_width" = yes; then
         GL_GENERATE_STDINT_H=false
       fi
@@ -24613,13 +24832,13 @@ printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
                   ac_fn_c_check_header_compile "$LINENO" "sys/inttypes.h" "ac_cv_header_sys_inttypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_inttypes_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
 
 fi
 ac_fn_c_check_header_compile "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_bitypes_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SYS_BITYPES_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SYS_BITYPES_H 1" >>confdefs.h
 
 fi
 
@@ -24635,7 +24854,7 @@ fi
     
           
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
@@ -24661,14 +24880,16 @@ fi
 esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "@%:@define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -24678,7 +24899,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
@@ -24704,14 +24925,16 @@ fi
 esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "@%:@define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -24720,7 +24943,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
 printf %s "checking whether $gltype is signed... " >&6; }
 if eval test \${gl_cv_type_${gltype}_signed+y}
 then :
@@ -24757,12 +24980,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_signed
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_type_${gltype}_signed
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     if test "$result" = yes; then
-      printf "%s\n" "@%:@define HAVE_SIGNED_${GLTYPE} 1" >>confdefs.h
+      cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
 
       eval HAVE_SIGNED_${GLTYPE}=1
     else
@@ -24777,7 +25002,7 @@ printf "%s\n" "$ac_res" >&6; }
     
           
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
@@ -24831,13 +25056,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "@%:@define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
   
@@ -24846,7 +25073,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
@@ -24900,13 +25127,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "@%:@define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
   
@@ -24959,7 +25188,7 @@ printf "%s\n" "$ac_res" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_inttypes_h='<'inttypes.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
 printf %s "checking absolute name of <inttypes.h>... " >&6; }
 if test ${gl_cv_next_inttypes_h+y}
 then :
@@ -25010,8 +25239,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
-printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
+printf '%s\n' "$gl_cv_next_inttypes_h" >&6; }
      fi
      NEXT_INTTYPES_H=$gl_cv_next_inttypes_h
 
@@ -25055,7 +25284,7 @@ printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
 printf %s "checking whether malloc is ptrdiff_t safe... " >&6; }
 if test ${gl_cv_malloc_ptrdiff+y}
 then :
@@ -25103,8 +25332,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
-printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
+printf '%s\n' "$gl_cv_malloc_ptrdiff" >&6; }
 
 
   
@@ -25113,7 +25342,7 @@ printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
 printf %s "checking whether malloc, realloc, calloc set errno on failure... " >&6; }
 if test ${gl_cv_func_malloc_posix+y}
 then :
@@ -25132,8 +25361,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
-printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
+printf '%s\n' "$gl_cv_func_malloc_posix" >&6; }
 
 
   
@@ -25141,7 +25370,7 @@ printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
   
   if test "$gl_cv_func_malloc_posix" = yes; then
     
-printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC_FOR_MALLOC_POSIX=1
@@ -25149,7 +25378,7 @@ printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
 
   
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
 printf %s "checking whether malloc (0) returns nonnull... " >&6; }
 if test ${ac_cv_func_malloc_0_nonnull+y}
 then :
@@ -25199,8 +25428,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+printf '%s\n' "$ac_cv_func_malloc_0_nonnull" >&6; }
   case $ac_cv_func_malloc_0_nonnull in @%:@(
   *yes) :
     gl_cv_func_malloc_0_nonnull=1 ;; @%:@(
@@ -25209,7 +25438,7 @@ printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
 esac
 
   
-printf "%s\n" "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
+printf '%s\n' "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
 
 
 
@@ -25433,7 +25662,7 @@ printf "%s\n" "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>co
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
 printf %s "checking whether <limits.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_limits_h+y}
 then :
@@ -25461,11 +25690,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_limits_h" >&6; }
   if test $gl_cv_minmax_in_limits_h = yes; then
     
-printf "%s\n" "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
 
   fi
   
@@ -25474,7 +25703,7 @@ printf "%s\n" "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
 printf %s "checking whether <sys/param.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_sys_param_h+y}
 then :
@@ -25502,11 +25731,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_sys_param_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_sys_param_h" >&6; }
   if test $gl_cv_minmax_in_sys_param_h = yes; then
     
-printf "%s\n" "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
 
   fi
   
@@ -25517,7 +25746,7 @@ printf "%s\n" "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
   
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
 printf %s "checking for O_CLOEXEC... " >&6; }
 if test ${gl_cv_macro_O_CLOEXEC+y}
 then :
@@ -25548,12 +25777,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
-printf "%s\n" "$gl_cv_macro_O_CLOEXEC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
+printf '%s\n' "$gl_cv_macro_O_CLOEXEC" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
 printf %s "checking for promoted mode_t type... " >&6; }
 if test ${gl_cv_promoted_mode_t+y}
 then :
@@ -25582,10 +25811,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
-printf "%s\n" "$gl_cv_promoted_mode_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
+printf '%s\n' "$gl_cv_promoted_mode_t" >&6; }
   
-printf "%s\n" "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
+printf '%s\n' "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
 
 
 
@@ -25613,7 +25842,7 @@ printf "%s\n" "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
 if test "x$ac_cv_type_sigset_t" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_SIGSET_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_SIGSET_T 1" >>confdefs.h
 
 gl_cv_type_sigset_t=yes
 else case e in @%:@(
@@ -25627,7 +25856,7 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
 printf %s "checking for SIGPIPE... " >&6; }
 if test ${gl_cv_header_signal_h_SIGPIPE+y}
 then :
@@ -25656,8 +25885,8 @@ rm -rf conftest*
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
-printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
+printf '%s\n' "$gl_cv_header_signal_h_SIGPIPE" >&6; }
 
 
     
@@ -25682,7 +25911,7 @@ printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; }
 
   
 
-ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_setenv" = xyes
 then :
   ac_have_decl=1
@@ -25690,11 +25919,11 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
 if test ${gt_cv_ssize_t+y}
 then :
@@ -25722,11 +25951,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+printf '%s\n' "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
     
-printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
+printf '%s\n' "@%:@define ssize_t int" >>confdefs.h
 
   fi
 
@@ -25736,7 +25965,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define uid_t int" >>confdefs.h
+printf '%s\n' "@%:@define uid_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -25747,7 +25976,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define gid_t int" >>confdefs.h
+printf '%s\n' "@%:@define gid_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -25766,7 +25995,7 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_signal_h='<'signal.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
 printf %s "checking absolute name of <signal.h>... " >&6; }
 if test ${gl_cv_next_signal_h+y}
 then :
@@ -25811,8 +26040,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
-printf "%s\n" "$gl_cv_next_signal_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
+printf '%s\n' "$gl_cv_next_signal_h" >&6; }
      fi
      NEXT_SIGNAL_H=$gl_cv_next_signal_h
 
@@ -26180,7 +26409,7 @@ then :
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if test -f conftest.o; then
        gl_asmext='s'
@@ -26203,7 +26432,7 @@ rm -rf conftest*
 
   
         
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
 printf %s "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
 if test ${gl_cv_prog_as_underscore+y}
 then :
@@ -26220,7 +26449,7 @@ EOF
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if LC_ALL=C $EGREP '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
@@ -26231,21 +26460,21 @@ EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
-printf "%s\n" "$gl_cv_prog_as_underscore" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
+printf '%s\n' "$gl_cv_prog_as_underscore" >&6; }
   if test $gl_cv_prog_as_underscore = yes; then
     USER_LABEL_PREFIX=_
   else
     USER_LABEL_PREFIX=
   fi
   
-printf "%s\n" "@%:@define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
+printf '%s\n' "@%:@define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
 
   ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
   
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 printf %s "checking for stdbool.h that conforms to C99... " >&6; }
 if test ${ac_cv_header_stdbool_h+y}
 then :
@@ -26331,13 +26560,13 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-printf "%s\n" "$ac_cv_header_stdbool_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+printf '%s\n' "$ac_cv_header_stdbool_h" >&6; }
    ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 if test "x$ac_cv_type__Bool" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE__BOOL 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE__BOOL 1" >>confdefs.h
 
 
 fi
@@ -26356,7 +26585,7 @@ fi
 
   GL_GENERATE_STDDEF_H=false
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
 printf %s "checking for good max_align_t... " >&6; }
 if test ${gl_cv_type_max_align_t+y}
 then :
@@ -26397,8 +26626,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
-printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
+printf '%s\n' "$gl_cv_type_max_align_t" >&6; }
   if test $gl_cv_type_max_align_t = no; then
     HAVE_MAX_ALIGN_T=0
     GL_GENERATE_STDDEF_H=true
@@ -26409,7 +26638,7 @@ printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
     GL_GENERATE_STDDEF_H=true
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
 printf %s "checking whether NULL can be used in arbitrary expressions... " >&6; }
 if test ${gl_cv_decl_null_works+y}
 then :
@@ -26438,8 +26667,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-printf "%s\n" "$gl_cv_decl_null_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+printf '%s\n' "$gl_cv_decl_null_works" >&6; }
   if test $gl_cv_decl_null_works = no; then
     REPLACE_NULL=1
     GL_GENERATE_STDDEF_H=true
@@ -26457,7 +26686,7 @@ printf "%s\n" "$gl_cv_decl_null_works" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stddef_h='<'stddef.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
 printf %s "checking absolute name of <stddef.h>... " >&6; }
 if test ${gl_cv_next_stddef_h+y}
 then :
@@ -26502,8 +26731,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+printf '%s\n' "$gl_cv_next_stddef_h" >&6; }
      fi
      NEXT_STDDEF_H=$gl_cv_next_stddef_h
 
@@ -26523,7 +26752,7 @@ printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
 
 
   
-ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcloseall" = xyes
 then :
   ac_have_decl=1
@@ -26531,12 +26760,12 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
 
 
   
   
-  printf "%s\n" "@%:@define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
+  printf '%s\n' "@%:@define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
 
   
   
@@ -26549,7 +26778,7 @@ printf "%s\n" "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdio_h='<'stdio.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
 printf %s "checking absolute name of <stdio.h>... " >&6; }
 if test ${gl_cv_next_stdio_h+y}
 then :
@@ -26594,8 +26823,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
-printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
+printf '%s\n' "$gl_cv_next_stdio_h" >&6; }
      fi
      NEXT_STDIO_H=$gl_cv_next_stdio_h
 
@@ -26612,7 +26841,7 @@ printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
 
 
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
 printf %s "checking which flavor of printf attribute matches inttypes macros... " >&6; }
 if test ${gl_cv_func_printf_attribute_flavor+y}
 then :
@@ -26650,11 +26879,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
-printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
+printf '%s\n' "$gl_cv_func_printf_attribute_flavor" >&6; }
   if test "$gl_cv_func_printf_attribute_flavor" = gnu; then
     
-printf "%s\n" "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
 
   fi
 
@@ -26681,7 +26910,7 @@ printf "%s\n" "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
     HAVE_DECL_FCLOSEALL=0
   fi
 
-ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ecvt" = xyes
 then :
   ac_have_decl=1
@@ -26689,9 +26918,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcvt" = xyes
 then :
   ac_have_decl=1
@@ -26699,9 +26928,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_gcvt" = xyes
 then :
   ac_have_decl=1
@@ -26709,7 +26938,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
 
 
   
@@ -26724,7 +26953,7 @@ printf "%s\n" "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdlib_h='<'stdlib.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
 printf %s "checking absolute name of <stdlib.h>... " >&6; }
 if test ${gl_cv_next_stdlib_h+y}
 then :
@@ -26769,8 +26998,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
-printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
+printf '%s\n' "$gl_cv_next_stdlib_h" >&6; }
      fi
      NEXT_STDLIB_H=$gl_cv_next_stdlib_h
 
@@ -26808,7 +27037,7 @@ printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
 
 
      REPLACE_STRERROR_0=0
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
 printf %s "checking whether strerror(0) succeeds... " >&6; }
 if test ${gl_cv_func_strerror_0_works+y}
 then :
@@ -26864,14 +27093,14 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
-printf "%s\n" "$gl_cv_func_strerror_0_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
+printf '%s\n' "$gl_cv_func_strerror_0_works" >&6; }
   case "$gl_cv_func_strerror_0_works" in
     *yes) ;;
     *)
       REPLACE_STRERROR_0=1
       
-printf "%s\n" "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
+printf '%s\n' "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
 
       ;;
   esac
@@ -26889,7 +27118,7 @@ printf "%s\n" "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_string_h='<'string.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
 printf %s "checking absolute name of <string.h>... " >&6; }
 if test ${gl_cv_next_string_h+y}
 then :
@@ -26934,8 +27163,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
-printf "%s\n" "$gl_cv_next_string_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
+printf '%s\n' "$gl_cv_next_string_h" >&6; }
      fi
      NEXT_STRING_H=$gl_cv_next_string_h
 
@@ -26970,7 +27199,7 @@ printf "%s\n" "$gl_cv_next_string_h" >&6; }
   
 
     
-printf "%s\n" "@%:@define _USE_STD_STAT 1" >>confdefs.h
+printf '%s\n' "@%:@define _USE_STD_STAT 1" >>confdefs.h
 
 
   
@@ -26984,7 +27213,7 @@ printf "%s\n" "@%:@define _USE_STD_STAT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_types_h='<'sys/types.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
 printf %s "checking absolute name of <sys/types.h>... " >&6; }
 if test ${gl_cv_next_sys_types_h+y}
 then :
@@ -27029,8 +27258,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
-printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
+printf '%s\n' "$gl_cv_next_sys_types_h" >&6; }
      fi
      NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
 
@@ -27082,7 +27311,7 @@ printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
 
 
     
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
 printf %s "checking for struct timespec in <time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_time_h+y}
 then :
@@ -27110,8 +27339,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
 
   TIME_H_DEFINES_STRUCT_TIMESPEC=0
   SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
@@ -27120,7 +27349,7 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
   if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
     TIME_H_DEFINES_STRUCT_TIMESPEC=1
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
 printf %s "checking for struct timespec in <sys/time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_sys_time_h+y}
 then :
@@ -27148,12 +27377,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
     if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
       SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
 printf %s "checking for struct timespec in <pthread.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_pthread_h+y}
 then :
@@ -27181,12 +27410,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
       if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
         PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
 printf %s "checking for struct timespec in <unistd.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_unistd_h+y}
 then :
@@ -27214,8 +27443,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
         if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
           UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
         fi
@@ -27241,7 +27470,7 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_time_h='<'time.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
 printf %s "checking absolute name of <time.h>... " >&6; }
 if test ${gl_cv_next_time_h+y}
 then :
@@ -27286,8 +27515,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
-printf "%s\n" "$gl_cv_next_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
+printf '%s\n' "$gl_cv_next_time_h" >&6; }
      fi
      NEXT_TIME_H=$gl_cv_next_time_h
 
@@ -27307,7 +27536,7 @@ printf "%s\n" "$gl_cv_next_time_h" >&6; }
 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
 printf %s "checking for TIME_UTC in <time.h>... " >&6; }
 if test ${gl_cv_time_h_has_TIME_UTC+y}
 then :
@@ -27335,8 +27564,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
-printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
+printf '%s\n' "$gl_cv_time_h_has_TIME_UTC" >&6; }
   if test $gl_cv_time_h_has_TIME_UTC = yes; then
     TIME_H_DEFINES_TIME_UTC=1
   else
@@ -27398,7 +27627,7 @@ printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
   
 
   
-ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_execvpe" = xyes
 then :
   ac_have_decl=1
@@ -27406,7 +27635,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
 
 
       
@@ -27423,7 +27652,7 @@ printf "%s\n" "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_unistd_h='<'unistd.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
 printf %s "checking absolute name of <unistd.h>... " >&6; }
 if test ${gl_cv_next_unistd_h+y}
 then :
@@ -27474,8 +27703,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
-printf "%s\n" "$gl_cv_next_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
+printf '%s\n' "$gl_cv_next_unistd_h" >&6; }
      fi
      NEXT_UNISTD_H=$gl_cv_next_unistd_h
 
@@ -27542,7 +27771,7 @@ q
     LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
   fi
 
-ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27550,9 +27779,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_feof_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27560,9 +27789,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ferror_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27570,9 +27799,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fflush_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27580,9 +27809,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fgets_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27590,9 +27819,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27600,9 +27829,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputs_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27610,9 +27839,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fread_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27620,9 +27849,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27630,9 +27859,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27640,9 +27869,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getchar_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27650,9 +27879,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27660,9 +27889,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putchar_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27670,7 +27899,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
     HAVE_BTOWC=1;         
@@ -27733,7 +27962,7 @@ printf "%s\n" "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
             
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
 printf %s "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
 if test ${gl_cv_header_wchar_h_correct_inline+y}
 then :
@@ -27758,7 +27987,7 @@ _ACEOF
             && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27774,7 +28003,7 @@ _ACEOF
               && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
              if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
                :
@@ -27790,8 +28019,8 @@ _ACEOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
-printf "%s\n" "$gl_cv_header_wchar_h_correct_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
+printf '%s\n' "$gl_cv_header_wchar_h_correct_inline" >&6; }
   if test $gl_cv_header_wchar_h_correct_inline = no; then
     as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
 This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
@@ -27839,7 +28068,7 @@ Configuration aborted." "$LINENO" 5
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_wchar_h='<'wchar.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
 printf %s "checking absolute name of <wchar.h>... " >&6; }
 if test ${gl_cv_next_wchar_h+y}
 then :
@@ -27890,8 +28119,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
-printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
+printf '%s\n' "$gl_cv_next_wchar_h" >&6; }
      fi
      NEXT_WCHAR_H=$gl_cv_next_wchar_h
 
@@ -27935,7 +28164,7 @@ printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
   ac_fn_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" "
       #include <wchar.h>
     
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_wcsdup" = xyes
 then :
   ac_have_decl=1
@@ -27943,7 +28172,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_have_decl_wcsdup = no; then
     HAVE_DECL_WCSDUP=0
@@ -28121,7 +28350,7 @@ printf "%s\n" "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
   
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5
 printf %s "checking for C compiler option to allow warnings... " >&6; }
 if test ${gl_cv_cc_wallow+y}
 then :
@@ -28133,13 +28362,13 @@ else case e in @%:@(
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null
      { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null
                          if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then
        gl_cv_cc_wallow='-Wno-error'
@@ -28150,8 +28379,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5
-printf "%s\n" "$gl_cv_cc_wallow" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5
+printf '%s\n' "$gl_cv_cc_wallow" >&6; }
   case "$gl_cv_cc_wallow" in
     none) GL_CFLAG_ALLOW_WARNINGS='' ;;
     *)    GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;;
@@ -28193,7 +28422,7 @@ EOF
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gl_command\""; } >&5
   (eval $gl_command) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
       gl_options=`grep -v '#' conftest.out`
       for word in $gl_options; do
@@ -28298,7 +28527,7 @@ fi
 
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
 printf %s "checking for __builtin_expect... " >&6; }
 if test ${gl_cv___builtin_expect+y}
 then :
@@ -28344,13 +28573,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
-printf "%s\n" "$gl_cv___builtin_expect" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
+printf '%s\n' "$gl_cv___builtin_expect" >&6; }
   if test "$gl_cv___builtin_expect" = yes; then
-    printf "%s\n" "@%:@define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
+    printf '%s\n' "@%:@define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
 
   elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
-    printf "%s\n" "@%:@define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
+    printf '%s\n' "@%:@define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
 
   fi
   
@@ -28395,7 +28624,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
 
   
@@ -28413,7 +28642,7 @@ printf "%s\n" "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
 
@@ -28432,7 +28661,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
 
 
 
@@ -28440,7 +28669,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
   
   
   
-printf "%s\n" "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
 
 
   
@@ -28460,7 +28689,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -28509,13 +28738,13 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_CLOSE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CLOSE 1" >>confdefs.h
 
 
 
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
@@ -28546,18 +28775,18 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
     
-printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
 printf %s "checking whether dup2 works... " >&6; }
 if test ${gl_cv_func_dup2_works+y}
 then :
@@ -28665,8 +28894,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
-printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
+printf '%s\n' "$gl_cv_func_dup2_works" >&6; }
   case "$gl_cv_func_dup2_works" in
     *yes) ;;
     *)
@@ -28674,7 +28903,7 @@ printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
       ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize"
 if test "x$ac_cv_func_setdtablesize" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETDTABLESIZE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETDTABLESIZE 1" >>confdefs.h
 
 fi
 
@@ -28716,7 +28945,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
 
 
 
@@ -28736,7 +28965,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_ENVIRON 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_ENVIRON 1" >>confdefs.h
 
 
 
@@ -28775,7 +29004,7 @@ fi
 
   
   
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
 printf %s "checking for error_at_line... " >&6; }
 if test ${ac_cv_lib_error_at_line+y}
 then :
@@ -28803,8 +29032,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-printf "%s\n" "$ac_cv_lib_error_at_line" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
+printf '%s\n' "$ac_cv_lib_error_at_line" >&6; }
 
   
      if test "$ac_cv_lib_error_at_line" = no; then
@@ -28855,7 +29084,7 @@ fi
   fi
 
   else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
 printf %s "checking whether fcntl handles F_DUPFD correctly... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_works+y}
 then :
@@ -28933,8 +29162,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
     case $gl_cv_func_fcntl_f_dupfd_works in
       *yes) ;;
       *) 
@@ -28947,11 +29176,11 @@ printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
   fi
 
         
-printf "%s\n" "@%:@define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
+printf '%s\n' "@%:@define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
  ;;
     esac
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
 printf %s "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_cloexec+y}
 then :
@@ -29026,8 +29255,8 @@ fi
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
     case "$gl_cv_func_fcntl_f_dupfd_cloexec" in
       *yes) ;;
       *)    
@@ -29073,7 +29302,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
 
 
 
@@ -29087,7 +29316,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
   
   
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
@@ -29122,13 +29351,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
     
-printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -29168,7 +29397,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
 
 
 
@@ -29236,7 +29465,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
 
 
 
@@ -29247,7 +29476,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
   
   if test $ac_cv_func_getdtablesize = yes &&
      test $ac_cv_have_decl_getdtablesize = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
 printf %s "checking whether getdtablesize works... " >&6; }
 if test ${gl_cv_func_getdtablesize_works+y}
 then :
@@ -29304,8 +29533,8 @@ fi
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
-printf "%s\n" "$gl_cv_func_getdtablesize_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
+printf '%s\n' "$gl_cv_func_getdtablesize_works" >&6; }
     case "$gl_cv_func_getdtablesize_works" in
       *yes | "no (limitation)") ;;
       *) REPLACE_GETDTABLESIZE=1 ;;
@@ -29348,7 +29577,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
 
 
 
@@ -29357,7 +29586,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
   
   ac_found=0
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
@@ -29365,14 +29594,14 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
@@ -29380,14 +29609,14 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include <stdlib.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl___argv" = xyes
 then :
   ac_have_decl=1
@@ -29395,7 +29624,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
@@ -29406,7 +29635,7 @@ fi
   if test $ac_found = 0; then
     # On OpenBSD 5.1, using the global __progname variable appears to be
     # the only way to implement getprogname.
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
 printf %s "checking whether __progname is defined in default libraries... " >&6; }
 if test ${gl_cv_var___progname+y}
 then :
@@ -29437,11 +29666,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
-printf "%s\n" "$gl_cv_var___progname" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
+printf '%s\n' "$gl_cv_var___progname" >&6; }
     if test "$gl_cv_var___progname" = yes; then
       
-printf "%s\n" "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
 
     fi
   fi
@@ -29463,7 +29692,7 @@ printf "%s\n" "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -29494,9 +29723,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -29540,8 +29769,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -29550,11 +29779,11 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
 printf %s "checking whether the compiler supports the __inline keyword... " >&6; }
 if test ${gl_cv_c___inline+y}
 then :
@@ -29582,11 +29811,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
-printf "%s\n" "$gl_cv_c___inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
+printf '%s\n' "$gl_cv_c___inline" >&6; }
   if test $gl_cv_c___inline = yes; then
     
-printf "%s\n" "@%:@define HAVE___INLINE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE___INLINE 1" >>confdefs.h
 
   fi
 
@@ -29652,7 +29881,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -29661,7 +29890,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
   
     
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
@@ -29689,15 +29918,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
      
-printf "%s\n" "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
      
-printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
+printf '%s\n' "@%:@define mbstate_t int" >>confdefs.h
 
    fi
 
@@ -29710,7 +29939,7 @@ printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -29759,7 +29988,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
 
 
 
@@ -29798,7 +30027,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
 
 
   
@@ -29816,7 +30045,7 @@ printf "%s\n" "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
       fi
       
          
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
 printf %s "checking whether open recognizes a trailing slash... " >&6; }
 if test ${gl_cv_func_open_slash+y}
 then :
@@ -29877,12 +30106,12 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
-printf "%s\n" "$gl_cv_func_open_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
+printf '%s\n' "$gl_cv_func_open_slash" >&6; }
   case "$gl_cv_func_open_slash" in
     *no)
       
-printf "%s\n" "@%:@define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
       ;;
   esac
@@ -29934,7 +30163,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
 
 
 
@@ -29942,7 +30171,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
       
 
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
@@ -29950,10 +30179,10 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
@@ -29961,7 +30190,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 
   
   
@@ -29969,7 +30198,7 @@ printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl"
   ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
 if test "x$ac_cv_func_raise" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAISE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAISE 1" >>confdefs.h
 
 fi
 
@@ -30043,7 +30272,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
 
 
 
@@ -30054,7 +30283,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -30101,7 +30330,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
 
 
 
@@ -30149,7 +30378,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
 
 
 
@@ -30159,7 +30388,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
   if test $ac_cv_func_readlink = no; then
     HAVE_READLINK=0
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
 printf %s "checking whether readlink signature is correct... " >&6; }
 if test ${gl_cv_decl_readlink_works+y}
 then :
@@ -30188,9 +30417,9 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
-printf "%s\n" "$gl_cv_decl_readlink_works" >&6; }
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
+printf '%s\n' "$gl_cv_decl_readlink_works" >&6; }
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
 printf %s "checking whether readlink handles trailing slash correctly... " >&6; }
 if test ${gl_cv_func_readlink_trailing_slash+y}
 then :
@@ -30242,8 +30471,8 @@ fi
       rm -f conftest.link conftest.lnk2 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
-printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
+printf '%s\n' "$gl_cv_func_readlink_trailing_slash" >&6; }
     case "$gl_cv_func_readlink_trailing_slash" in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -30252,13 +30481,13 @@ printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
         ;;
       *)
         
-printf "%s\n" "@%:@define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
     esac
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
 printf %s "checking whether readlink truncates results correctly... " >&6; }
 if test ${gl_cv_func_readlink_truncate+y}
 then :
@@ -30309,8 +30538,8 @@ fi
       rm -f conftest.link conftest.lnk2 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
-printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
+printf '%s\n' "$gl_cv_func_readlink_truncate" >&6; }
     case $gl_cv_func_readlink_truncate in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -30319,7 +30548,7 @@ printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
         ;;
       *)
         
-printf "%s\n" "@%:@define READLINK_TRUNCATE_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define READLINK_TRUNCATE_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
@@ -30362,7 +30591,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
 
 
 
@@ -30400,7 +30629,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -30459,7 +30688,7 @@ fi
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -30475,7 +30704,7 @@ fi
   
   if test "$gl_cv_func_malloc_posix" = yes; then
     
-printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC_FOR_MALLOC_POSIX=1
@@ -30491,7 +30720,7 @@ printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
   
   
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
@@ -30526,13 +30755,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
     
-printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -30547,7 +30776,7 @@ printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -30562,7 +30791,7 @@ fi
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -30590,14 +30819,14 @@ fi
   ac_fn_c_check_header_compile "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
 if test "x$ac_cv_header_search_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SEARCH_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SEARCH_H 1" >>confdefs.h
 
 fi
 
   ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
 if test "x$ac_cv_func_tsearch" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_TSEARCH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_TSEARCH 1" >>confdefs.h
 
 fi
 
@@ -30619,7 +30848,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_SIGPIPE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_SIGPIPE 1" >>confdefs.h
 
 
     
@@ -30697,12 +30926,12 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
 
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
 if test ${gt_cv_ssize_t+y}
 then :
@@ -30730,11 +30959,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+printf '%s\n' "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
     
-printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
+printf '%s\n' "@%:@define ssize_t int" >>confdefs.h
 
   fi
 
@@ -30747,7 +30976,7 @@ printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
                   REPLACE_STAT=1
       ;;
     *)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
 printf %s "checking whether stat handles trailing slashes on files... " >&6; }
 if test ${gl_cv_func_stat_file_slash+y}
 then :
@@ -30806,13 +31035,13 @@ fi
          rm -f conftest.tmp conftest.lnk ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
-printf "%s\n" "$gl_cv_func_stat_file_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
+printf '%s\n' "$gl_cv_func_stat_file_slash" >&6; }
       case $gl_cv_func_stat_file_slash in
         *no)
           REPLACE_STAT=1
           
-printf "%s\n" "@%:@define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
+printf '%s\n' "@%:@define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
 ;;
       esac
       case $host_os in
@@ -30874,7 +31103,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
 
 
 
@@ -30888,9 +31117,9 @@ printf "%s\n" "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
 if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
 printf %s "checking whether struct stat.st_atim is of type struct timespec... " >&6; }
 if test ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+y}
 then :
@@ -30928,11 +31157,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
-printf "%s\n" "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
+printf '%s\n' "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
      if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then
        
-printf "%s\n" "@%:@define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
+printf '%s\n' "@%:@define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
 
      fi
 else case e in @%:@(
@@ -30942,7 +31171,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30952,7 +31181,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30962,7 +31191,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -30986,7 +31215,7 @@ fi
 if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30996,7 +31225,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -31006,7 +31235,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -31019,7 +31248,7 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
 printf %s "checking for working stdalign.h... " >&6; }
 if test ${gl_cv_header_working_stdalign_h+y}
 then :
@@ -31077,8 +31306,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdalign_h" >&6; }
 
   if test $gl_cv_header_working_stdalign_h = yes; then
     GL_GENERATE_STDALIGN_H=false
@@ -31335,13 +31564,13 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FSCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FSCANF 1" >>confdefs.h
 
 
 
   
   
-printf "%s\n" "@%:@define GNULIB_FSCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_FSCANF 1" >>confdefs.h
 
 
   
@@ -31359,13 +31588,13 @@ printf "%s\n" "@%:@define GNULIB_FSCANF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_SCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_SCANF 1" >>confdefs.h
 
 
 
   
   
-printf "%s\n" "@%:@define GNULIB_SCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_SCANF 1" >>confdefs.h
 
 
   
@@ -31383,7 +31612,7 @@ printf "%s\n" "@%:@define GNULIB_SCANF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
 
 
 
@@ -31402,7 +31631,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
 
 
 
@@ -31421,7 +31650,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
 
 
@@ -31440,7 +31669,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
 
 
 
@@ -31459,7 +31688,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
 
 
 
@@ -31478,7 +31707,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
 
 
@@ -31497,7 +31726,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
 
 
@@ -31516,7 +31745,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
 
 
@@ -31535,7 +31764,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
 
 
@@ -31554,7 +31783,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
 
 
@@ -31573,7 +31802,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
 
 
 
@@ -31592,7 +31821,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
 
 
@@ -31611,7 +31840,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
 
 
@@ -31630,7 +31859,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
 
 
 
@@ -31649,7 +31878,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
 
 
 
@@ -31666,7 +31895,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
   
      
   if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
 printf %s "checking for working strerror function... " >&6; }
 if test ${gl_cv_func_working_strerror+y}
 then :
@@ -31711,8 +31940,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
-printf "%s\n" "$gl_cv_func_working_strerror" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
+printf '%s\n' "$gl_cv_func_working_strerror" >&6; }
     case "$gl_cv_func_working_strerror" in
       *yes) ;;
       *)
@@ -31740,7 +31969,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_STRERROR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_STRERROR 1" >>confdefs.h
 
 
   
@@ -31763,7 +31992,7 @@ printf "%s\n" "@%:@define GNULIB_STRERROR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_STRERROR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_STRERROR 1" >>confdefs.h
 
 
 
@@ -31793,7 +32022,7 @@ fi
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -31946,10 +32175,10 @@ fi
 
 
   
-printf "%s\n" "@%:@define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
 
   
-printf "%s\n" "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
+printf '%s\n' "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
 
   
       
@@ -31969,7 +32198,7 @@ printf "%s\n" "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs
   
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5
 printf %s "checking for variable-length arrays... " >&6; }
 if test ${ac_cv_c_vararrays+y}
 then :
@@ -32039,15 +32268,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5
-printf "%s\n" "$ac_cv_c_vararrays" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5
+printf '%s\n' "$ac_cv_c_vararrays" >&6; }
   if test "$ac_cv_c_vararrays" = yes; then
         
-printf "%s\n" "@%:@define HAVE_C_VARARRAYS 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_C_VARARRAYS 1" >>confdefs.h
 
   elif test "$ac_cv_c_vararrays" = no; then
     
-printf "%s\n" "@%:@define __STDC_NO_VLA__ 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_NO_VLA__ 1" >>confdefs.h
 
   fi
 
@@ -32176,44 +32405,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -32225,8 +32417,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -32240,8 +32432,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -32258,7 +32450,7 @@ U=
 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -32269,14 +32461,14 @@ LIB@&t@OBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
 printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf '%s\n' "done" >&6; }
 case $enable_silent_rules in @%:@ (((
   yes) AM_DEFAULT_VERBOSITY=0;;
    no) AM_DEFAULT_VERBOSITY=1;;
@@ -32374,13 +32566,21 @@ fi
   
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in @%:@(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -32394,7 +32594,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -32406,7 +32606,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -32493,7 +32693,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -32509,9 +32709,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -32606,7 +32806,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -32628,29 +32828,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -32692,7 +32869,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -32701,7 +32878,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32754,19 +32931,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by libiconv $as_me 1.17, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -32788,7 +32965,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -32796,7 +32973,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -32828,16 +33005,16 @@ $config_commands
 Report bugs to the package provider."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 libiconv config.status 1.17
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -32846,10 +33023,14 @@ srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -32877,15 +33058,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -32893,7 +33074,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -32902,7 +33083,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -32926,29 +33107,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
 @%:@@%:@ Running $as_me. @%:@@%:@
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -32997,6 +33178,7 @@ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
@@ -33179,6 +33361,7 @@ file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
+lt_ar_flags \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -33323,7 +33506,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -33416,13 +33599,13 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -33433,7 +33616,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -33478,9 +33661,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -33509,7 +33692,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -33541,7 +33724,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -33612,9 +33795,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -33632,8 +33815,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -33648,7 +33835,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -33692,7 +33879,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -33700,17 +33887,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -33727,7 +33914,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33751,9 +33938,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -33798,7 +33985,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -33815,10 +34002,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -33832,11 +34019,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -33860,9 +34047,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -33878,20 +34065,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -33911,7 +34098,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$_am_arg" |
+printf '%s\n' X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33931,8 +34118,8 @@ printf "%s\n" X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
   
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -33958,7 +34145,7 @@ esac
   for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    am_mf=`printf '%s\n' "$am_mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile which includes
     # dependency-tracking related rules and includes.
     # Grep'ing the whole file directly is not great: AIX grep has a line
@@ -33970,7 +34157,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$am_mf" : 'X\(//\)[^/]' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$am_mf" |
+printf '%s\n' X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33992,7 +34179,7 @@ printf "%s\n" X"$am_mf" |
 $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$am_mf" |
+printf '%s\n' X/"$am_mf" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -34017,8 +34204,8 @@ printf "%s\n" X/"$am_mf" |
    (exit $ac_status); } || am_rc=$?
   done
   if test $am_rc -ne 0; then
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
     for automatic dependency tracking.  If GNU make was not used, consider
     re-running the configure script with MAKE=\"gmake\" (or whatever is
@@ -34054,7 +34241,7 @@ See 'config.log' for more details" "$LINENO" 5; }
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -34177,6 +34364,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
 # A file(cmd) program that detects file types.
 FILECMD=$lt_FILECMD
 
@@ -34199,7 +34389,7 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 AR=$lt_AR
 
 # Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
+lt_ar_flags=$lt_lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}
@@ -34808,7 +34998,9 @@ _LT_EOF
                 #      presentlang can be used as a fallback for messages
                 #      which are not translated in the desiredlang catalog).
                 case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
+                  "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+                    useit=yes
+                    ;;
                 esac
               done
               if test $useit = yes; then
@@ -34843,7 +35035,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -34859,11 +35051,18 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in @%:@(
+  -*) :
+    ac_no_opts=-- ;; @%:@(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
@@ -34909,7 +35108,7 @@ if test "$no_recursion" != yes; then
       ;;
     *)
       case $ac_arg in
-      *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
       as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
     esac
@@ -34919,7 +35118,7 @@ if test "$no_recursion" != yes; then
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -34940,17 +35139,17 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    printf "%s\n" "$ac_msg" >&6
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
+    printf '%s\n' "$ac_msg" >&6
     as_dir="$ac_dir"; as_fn_mkdir_p
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -34987,8 +35186,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
     elif test -f "$ac_srcdir/configure"; then
       ac_sub_configure=$ac_srcdir/configure
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
+printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
@@ -35001,8 +35200,8 @@ printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+printf '%s\n' "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
@@ -35013,7 +35212,7 @@ printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args -
   done
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/recipes/libs/libiconv/source/autom4te.cache/output.2 b/recipes/libs/libiconv/source/autom4te.cache/output.2
index cc28ca85c6..355ed8e9c8 100644
--- a/recipes/libs/libiconv/source/autom4te.cache/output.2
+++ b/recipes/libs/libiconv/source/autom4te.cache/output.2
@@ -1,9 +1,9 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.72 for libiconv 1.17.
+@%:@ Generated by GNU Autoconf 2.73 for libiconv 1.17.
 @%:@ 
 @%:@ 
-@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 @%:@ Inc.
 @%:@ 
 @%:@ 
@@ -20,7 +20,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -107,7 +107,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -129,10 +129,13 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -143,7 +146,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -261,22 +264,25 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -336,7 +342,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -345,7 +351,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -428,9 +434,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -457,7 +463,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -503,7 +509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -517,29 +523,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -600,6 +583,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIB@&t@OBJS=
@@ -1544,6 +1528,8 @@ BROKEN_WCHAR_H
 USE_MBSTATE_T
 HAVE_WCHAR_T
 ICONV_CONST
+localedir_c_make
+localedir_c
 POSUB
 LTLIBINTL
 LIBINTL
@@ -1663,13 +1649,13 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -1846,7 +1832,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1872,7 +1858,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -2085,7 +2071,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2101,7 +2087,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2145,9 +2131,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -2155,7 +2141,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -2163,7 +2149,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -2227,7 +2213,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -2433,9 +2419,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2472,7 +2458,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2482,9 +2468,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libiconv configure 1.17
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2508,7 +2494,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2516,7 +2502,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2524,7 +2510,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -2547,7 +2533,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2555,7 +2541,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2563,7 +2549,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -2581,7 +2567,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2603,8 +2589,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_header_compile
@@ -2622,7 +2608,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2630,7 +2616,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2641,7 +2627,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -2663,7 +2649,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2715,8 +2701,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_func
@@ -2734,26 +2720,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -2967,7 +2953,7 @@ rm -f conftest.val
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -3013,8 +2999,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_type
@@ -3031,7 +3017,7 @@ ac_fn_check_decl ()
   fi
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 printf %s "checking whether $as_decl_name is declared... " >&6; }
 if eval test \${$3+y}
 then :
@@ -3071,8 +3057,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   ac_compile="$ac_save_ac_compile"
 
@@ -3085,7 +3071,7 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 printf %s "checking for $2.$3... " >&6; }
 if eval test \${$4+y}
 then :
@@ -3135,8 +3121,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_member
@@ -3145,7 +3131,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -3157,7 +3143,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?@<:@ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -3165,7 +3151,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libiconv $as_me 1.17, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -3205,7 +3191,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -3240,7 +3226,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -3269,31 +3255,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -3302,67 +3279,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -3371,21 +3376,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -3407,12 +3412,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -3422,27 +3427,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -3522,7 +3620,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -3533,7 +3632,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -3621,15 +3720,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -3645,13 +3744,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -3805,7 +3903,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -3818,7 +3916,7 @@ do
   esac
   as_found=:
   
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -3829,13 +3927,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -3847,7 +3945,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -3900,38 +3998,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -3941,10 +4045,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -3952,6 +4056,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3979,7 +4100,7 @@ am__api_version='1.18'
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -4002,8 +4123,8 @@ case $as_dir in @%:@((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4053,8 +4174,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -4064,7 +4185,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
 printf %s "checking whether sleep supports fractional seconds... " >&6; }
 if test ${am_cv_sleep_fractional_seconds+y}
 then :
@@ -4080,10 +4201,10 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
-printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf '%s\n' "$am_cv_sleep_fractional_seconds" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
 printf %s "checking filesystem timestamp resolution... " >&6; }
 if test ${am_cv_filesystem_timestamp_resolution+y}
 then :
@@ -4135,9 +4256,9 @@ if (
   # if, for instance, CONFIG_SHELL is bash and it inherits a
   # broken ls alias from the environment.  This has actually
   # happened.  Such a system could not be considered "sane".
-  printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  printf '%s\n' ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "ls -t produces unexpected output.
 Make sure there is not a broken ls alias in your environment.
 See 'config.log' for more details" "$LINENO" 5; }
@@ -4218,12 +4339,12 @@ rm -f conftest.ts?
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
-printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf '%s\n' "$am_cv_filesystem_timestamp_resolution" >&6; }
 
 # This check should not be cached, as it may vary across builds of
 # different projects.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
@@ -4231,14 +4352,14 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
@@ -4268,8 +4389,8 @@ for am_try in 1 2; do
   am_has_slept=yes
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
-printf "%s\n" "$am_build_env_is_sane" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf '%s\n' "$am_build_env_is_sane" >&6; }
 if test "$am_build_env_is_sane" = no; then
   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
@@ -4298,7 +4419,7 @@ test "$program_suffix" != NONE &&
 # Double any \ or $.
 # By default was 's,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf '%s\n' "$program_transform_name" | sed "$ac_script"`
 
 
 # Expand $ac_aux_dir to an absolute path.
@@ -4313,8 +4434,8 @@ if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf '%s\n' "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -4334,7 +4455,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -4355,7 +4476,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4367,11 +4488,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4380,7 +4501,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -4401,7 +4522,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4413,11 +4534,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -4425,8 +4546,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -4439,7 +4560,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
 printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test ${ac_cv_path_mkdir+y}
@@ -4482,14 +4603,14 @@ fi
     MKDIR_P='mkdir -p'
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf '%s\n' "$MKDIR_P" >&6; }
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -4510,7 +4631,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4522,21 +4643,21 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -4544,7 +4665,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -4557,12 +4678,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4583,13 +4704,13 @@ then :
 fi
 
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 printf %s "checking whether $am_make supports nested variables... " >&6; }
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) if printf "%s\n" 'TRUE=$(BAR$(V))
+  e) if printf '%s\n' 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -4602,8 +4723,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf '%s\n' "$am_cv_make_support_nested_variables" >&6; }
 AM_BACKSLASH='\'
 
 am__rm_f_notfound=
@@ -4616,7 +4737,7 @@ esac
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
 printf %s "checking xargs -n works... " >&6; }
 if test ${am_cv_xargs_n_works+y}
 then :
@@ -4632,8 +4753,8 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
-printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf '%s\n' "$am_cv_xargs_n_works" >&6; }
 if test "$am_cv_xargs_n_works" = yes
 then :
   am__xargs_n='xargs -n'
@@ -4668,10 +4789,10 @@ fi
  VERSION='1.17'
 
 
-printf "%s\n" "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
  
-printf "%s\n" "@%:@define VERSION \"$VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -4717,34 +4838,34 @@ _am_tools='gnutar plaintar pax cpio none'
       # (that is, avoid stderr redirection).
       am_uid=`id -u || echo unknown`
       am_gid=`id -g || echo unknown`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
 printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
       if test x$am_uid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
       elif test $am_uid -le $am_max_uid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
 printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
       if test x$gm_gid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
       elif test $am_gid -le $am_max_gid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
 printf %s "checking how to create a ustar tar archive... " >&6; }
 
   # Go ahead even if we have the value already cached.  We do so because we
@@ -4828,8 +4949,8 @@ else case e in @%:@(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
-printf "%s\n" "$am_cv_prog_tar_ustar" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+printf '%s\n' "$am_cv_prog_tar_ustar" >&6; }
 
 
 
@@ -4856,10 +4977,10 @@ fi
 
 ac_config_headers="$ac_config_headers config.h lib/config.h"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -4867,7 +4988,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -4880,12 +5001,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4900,6 +5021,9 @@ fi
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4908,7 +5032,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -4929,7 +5053,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4941,11 +5065,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4954,7 +5078,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -4975,7 +5099,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4987,11 +5111,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -4999,8 +5123,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5013,7 +5137,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5034,7 +5158,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5046,11 +5170,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5059,7 +5183,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5085,7 +5209,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5109,11 +5233,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5124,7 +5248,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5145,7 +5269,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5157,11 +5281,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5174,7 +5298,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5195,7 +5319,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5207,11 +5331,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5223,8 +5347,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5236,7 +5360,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5257,7 +5381,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5269,11 +5393,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5282,7 +5406,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5303,7 +5427,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5315,11 +5439,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5327,8 +5451,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5340,13 +5464,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -5356,7 +5480,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -5366,7 +5490,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -5386,9 +5510,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -5409,10 +5533,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -5453,29 +5577,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -5483,10 +5607,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -5503,15 +5627,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -5534,7 +5658,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -5543,10 +5667,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -5554,31 +5678,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -5602,10 +5726,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -5617,11 +5741,11 @@ then :
   esac
 done
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -5629,11 +5753,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -5665,8 +5789,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -5676,7 +5800,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -5744,8 +5868,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -5764,7 +5888,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -5776,7 +5949,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -5793,16 +5966,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -5813,7 +5986,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -5842,16 +6015,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -5862,7 +6035,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -5891,16 +6064,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -5922,7 +6095,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
 printf %s "checking whether $CC understands -c and -o together... " >&6; }
 if test ${am_cv_prog_cc_c_o+y}
 then :
@@ -5964,8 +6137,8 @@ _ACEOF
   unset am_i ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf '%s\n' "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -5982,7 +6155,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
 printf %s "checking whether the compiler is clang... " >&6; }
 if test ${gl_cv_compiler_clang+y}
 then :
@@ -6015,11 +6188,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
-printf "%s\n" "$gl_cv_compiler_clang" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
+printf '%s\n' "$gl_cv_compiler_clang" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
 printf %s "checking for compiler option needed when checking for declarations... " >&6; }
 if test ${gl_cv_compiler_check_decl_option+y}
 then :
@@ -6054,8 +6227,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
-printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
+printf '%s\n' "$gl_cv_compiler_check_decl_option" >&6; }
   if test "x$gl_cv_compiler_check_decl_option" != xnone; then
     ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
   else
@@ -6066,7 +6239,7 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
 printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
 cat > confinc.mk << 'END'
 am__doit:
@@ -6103,8 +6276,8 @@ esac
   fi
 done
 rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf '%s\n' "${_am_result}" >&6; }
 
 @%:@ Check whether --enable-dependency-tracking was given.
 if test ${enable_dependency_tracking+y}
@@ -6129,7 +6302,7 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CC_dependencies_compiler_type+y}
 then :
@@ -6242,8 +6415,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if 
@@ -6262,7 +6435,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -6333,8 +6506,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -6382,8 +6555,8 @@ if $ac_preproc_ok
 then :
   
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -6399,7 +6572,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_STRIP+y}
 then :
@@ -6422,7 +6595,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_STRIP="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6436,11 +6609,11 @@ esac
 fi
 STRIP=$ac_cv_path_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
  # Installed binaries are usually stripped using 'strip' when the user
@@ -6451,7 +6624,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -6472,7 +6645,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6484,11 +6657,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6497,7 +6670,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -6518,7 +6691,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6530,11 +6703,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6542,8 +6715,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6562,7 +6735,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -6578,8 +6751,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -6595,10 +6768,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -6613,8 +6786,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -6630,7 +6803,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -6648,7 +6821,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -6668,7 +6841,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
   
-printf "%s\n" "@%:@define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "@%:@define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -6677,7 +6850,7 @@ fi
     
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
@@ -6706,10 +6879,10 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
@@ -6760,49 +6933,51 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "@%:@define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "@%:@define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "@%:@define _MINIX 1" >>confdefs.h
+    printf '%s\n' "@%:@define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
 
 else case e in @%:@(
   e) MINIX= ;;
@@ -6810,12 +6985,12 @@ esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
@@ -6826,13 +7001,13 @@ fi
   case "$host_os" in
     openbsd*)
       
-printf "%s\n" "@%:@define _ISOC11_SOURCE 1" >>confdefs.h
+printf '%s\n' "@%:@define _ISOC11_SOURCE 1" >>confdefs.h
 
       ;;
   esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
 printf %s "checking for egrep -e... " >&6; }
 if test ${ac_cv_path_EGREP_TRADITIONAL+y}
 then :
@@ -6869,7 +7044,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6931,7 +7106,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6962,14 +7137,14 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
-printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf '%s\n' "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
  EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
 
 
           
     
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
 printf %s "checking for Minix Amsterdam compiler... " >&6; }
 if test ${gl_cv_c_amsterdam_compiler+y}
 then :
@@ -6997,8 +7172,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
-printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
+printf '%s\n' "$gl_cv_c_amsterdam_compiler" >&6; }
 
       if test $gl_cv_c_amsterdam_compiler = yes; then
     if test -z "$AR"; then
@@ -7014,7 +7189,7 @@ printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -7035,7 +7210,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7047,11 +7222,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7060,7 +7235,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -7081,7 +7256,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7093,11 +7268,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -7105,8 +7280,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -7128,7 +7303,7 @@ fi
             if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
@@ -7149,7 +7324,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7161,11 +7336,11 @@ esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7174,7 +7349,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
@@ -7195,7 +7370,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7207,11 +7382,11 @@ esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -7219,8 +7394,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -7241,7 +7416,7 @@ fi
 
 if test "$enable_largefile" != no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 printf %s "checking for special C compiler options needed for large files... " >&6; }
 if test ${ac_cv_sys_largefile_CC+y}
 then :
@@ -7293,13 +7468,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf '%s\n' "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
 if test ${ac_cv_sys_file_offset_bits+y}
 then :
@@ -7367,18 +7542,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf '%s\n' "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *) 
-printf "%s\n" "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
+printf '%s\n' "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   case $ac_cv_sys_file_offset_bits in @%:@(
   unknown) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
 if test ${ac_cv_sys_large_files+y}
 then :
@@ -7446,12 +7621,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-printf "%s\n" "$ac_cv_sys_large_files" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf '%s\n' "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *) 
-printf "%s\n" "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
+printf '%s\n' "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest* ;; @%:@(
@@ -7466,7 +7641,7 @@ fi
  if test "$enable_year2038" != no
 then :
   
-                            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
+                            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
 printf %s "checking for time_t past the year 2038... " >&6; }
 if test ${gl_cv_type_time_t_y2038+y}
 then :
@@ -7495,10 +7670,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
-printf "%s\n" "$gl_cv_type_time_t_y2038" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
+printf '%s\n' "$gl_cv_type_time_t_y2038" >&6; }
   if test "$gl_cv_type_time_t_y2038" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
 printf %s "checking for 64-bit time_t with _TIME_BITS=64... " >&6; }
 if test ${gl_cv_type_time_t_bits_macro+y}
 then :
@@ -7529,14 +7704,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
-printf "%s\n" "$gl_cv_type_time_t_bits_macro" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
+printf '%s\n' "$gl_cv_type_time_t_bits_macro" >&6; }
     if test "$gl_cv_type_time_t_bits_macro" = yes; then
       
-printf "%s\n" "@%:@define _TIME_BITS 64" >>confdefs.h
+printf '%s\n' "@%:@define _TIME_BITS 64" >>confdefs.h
 
             
-printf "%s\n" "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
+printf '%s\n' "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
 
       gl_cv_type_time_t_y2038=yes
     fi
@@ -7553,8 +7728,8 @@ printf "%s\n" "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "The 'time_t' type stops working after January 2038.
           Remove _USE_32BIT_TIME_T from the compiler flags.
 See 'config.log' for more details" "$LINENO" 5; }
@@ -7565,11 +7740,11 @@ else case e in @%:@(
        # problem.  Otherwise, just warn the builder.
        
        if test "$gl_warned_about_y2038" != yes; then
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5
-printf "%s\n" "$as_me: WARNING: The 'time_t' type stops working after January 2038,
+printf '%s\n' "$as_me: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;}
@@ -7592,7 +7767,7 @@ fi
   case "$host_os" in
     mingw*)
       
-printf "%s\n" "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
+printf '%s\n' "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 
       ;;
   esac
@@ -7709,14 +7884,14 @@ printf "%s\n" "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
     
     
@@ -7754,7 +7929,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -7781,12 +7956,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -7802,7 +7977,7 @@ esac
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -7845,7 +8020,7 @@ case `"$ac_path_SED" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7874,8 +8049,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -7892,7 +8067,7 @@ Xsed="$SED -e 1s/^X//"
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -7929,7 +8104,7 @@ case `"$ac_path_GREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7958,12 +8133,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -8003,7 +8178,7 @@ case `"$ac_path_EGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8033,14 +8208,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
  
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -8080,7 +8255,7 @@ case `"$ac_path_FGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8110,8 +8285,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
  
 
@@ -8147,7 +8322,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -8177,10 +8352,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -8216,14 +8391,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -8240,8 +8415,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -8252,7 +8427,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -8308,8 +8483,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -8322,7 +8497,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -8343,7 +8518,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8355,11 +8530,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8372,7 +8547,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -8393,7 +8568,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8405,11 +8580,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8421,8 +8596,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -8450,7 +8625,7 @@ test -z "$NM" && NM=nm
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -8472,22 +8647,22 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -8505,9 +8680,9 @@ else case e in @%:@(
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -8620,11 +8795,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -8668,7 +8843,7 @@ esac
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -8710,14 +8885,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -8739,14 +8914,85 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+case $host in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+      
+    
+    
+    
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+  
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in @%:@(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; @%:@(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; @%:@(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+        
+fi
+     ;; @%:@(
+  *) :
+     ;;
+esac
+  
+ ;; @%:@(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -8755,8 +9001,8 @@ else case e in @%:@(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -8771,7 +9017,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -8788,7 +9034,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -8809,7 +9055,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8822,11 +9068,11 @@ esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8839,7 +9085,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -8860,7 +9106,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8872,11 +9118,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8885,7 +9131,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -8906,7 +9152,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8918,11 +9164,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -8930,8 +9176,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -8947,7 +9193,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -9064,16 +9310,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -9160,8 +9402,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -9205,7 +9447,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -9226,7 +9468,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9238,11 +9480,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9251,7 +9493,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -9272,7 +9514,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9284,11 +9526,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -9296,8 +9538,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -9314,7 +9556,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -9343,8 +9585,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -9359,7 +9601,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -9380,7 +9622,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9392,11 +9634,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9409,7 +9651,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -9430,7 +9672,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9442,11 +9684,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9458,8 +9700,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -9495,7 +9737,7 @@ lt_ar_flags=$AR_FLAGS
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -9520,7 +9762,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -9528,7 +9770,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -9541,8 +9783,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -9559,7 +9801,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -9580,7 +9822,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9592,11 +9834,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9605,7 +9847,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -9626,7 +9868,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9638,11 +9880,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -9650,8 +9892,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -9741,7 +9983,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -9801,13 +10043,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -9821,22 +10063,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -9857,8 +10099,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -9898,7 +10142,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
@@ -9971,7 +10215,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -10007,11 +10251,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -10057,7 +10301,7 @@ fi
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 @%:@ Check whether --with-sysroot was given.
@@ -10085,20 +10329,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -10143,11 +10387,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -10164,8 +10408,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
     
     
@@ -10205,7 +10449,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -10225,7 +10469,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -10263,7 +10507,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -10304,7 +10548,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -10367,7 +10611,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -10407,8 +10651,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -10421,7 +10665,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -10458,7 +10702,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -10479,7 +10723,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10491,11 +10735,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10504,7 +10748,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -10525,7 +10769,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10537,11 +10781,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -10549,8 +10793,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -10560,7 +10804,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -10576,8 +10820,8 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -10592,7 +10836,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -10613,7 +10857,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10625,11 +10869,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10638,7 +10882,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -10659,7 +10903,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10671,11 +10915,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -10683,8 +10927,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -10696,7 +10940,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -10717,7 +10961,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10729,11 +10973,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10742,7 +10986,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -10763,7 +11007,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10775,11 +11019,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -10787,8 +11031,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -10800,7 +11044,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -10821,7 +11065,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10833,11 +11077,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10846,7 +11090,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -10867,7 +11111,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10879,11 +11123,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -10891,8 +11135,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -10904,7 +11148,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -10925,7 +11169,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10937,11 +11181,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10950,7 +11194,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -10971,7 +11215,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10983,11 +11227,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -10995,8 +11239,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -11008,7 +11252,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -11029,7 +11273,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11041,11 +11285,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11054,7 +11298,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -11075,7 +11319,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11087,11 +11331,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -11099,8 +11343,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -11135,7 +11379,7 @@ fi
     
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -11170,12 +11414,12 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
     # Feature test to disable chained fixups since it is not
     # compatible with '-undefined dynamic_lookup'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
 printf %s "checking for -no_fixup_chains linker flag... " >&6; }
 if test ${lt_cv_support_no_fixup_chains+y}
 then :
@@ -11209,10 +11453,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -11246,10 +11490,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -11283,8 +11527,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -11373,7 +11617,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_inc
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -11420,7 +11664,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -11441,7 +11685,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11453,11 +11697,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11466,7 +11710,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -11487,7 +11731,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11499,11 +11743,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -11511,8 +11755,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -11524,7 +11768,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -11545,7 +11789,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11557,11 +11801,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11570,7 +11814,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -11591,7 +11835,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11603,11 +11847,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -11615,8 +11859,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -11628,7 +11872,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -11649,7 +11893,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11661,11 +11905,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11674,7 +11918,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -11695,7 +11939,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11707,11 +11951,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -11719,8 +11963,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -11857,7 +12101,7 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
   
 @%:@ Check whether --with-aix-soname was given.
@@ -11884,8 +12128,8 @@ fi
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -11967,7 +12211,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -11984,15 +12228,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
     
     
     
 
-printf "%s\n" "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -12038,7 +12282,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12093,11 +12337,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     
@@ -12106,7 +12350,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12161,11 +12405,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12246,7 +12490,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -12273,9 +12517,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -12283,8 +12527,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -12422,7 +12666,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -12473,7 +12717,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -12489,7 +12739,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -12512,6 +12762,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -12569,18 +12825,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -12662,7 +12906,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -12671,15 +12915,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -12706,9 +12950,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -12716,8 +12960,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -12745,7 +12989,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -12761,9 +13005,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -12775,8 +13019,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -12790,7 +13034,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -12821,9 +13065,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -12839,15 +13083,15 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
     
     
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -12878,9 +13122,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -12896,8 +13140,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -12905,7 +13149,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -12913,11 +13157,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -12929,7 +13173,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -13123,17 +13367,17 @@ _LT_EOF
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -13142,7 +13386,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -13162,6 +13405,11 @@ _LT_EOF
       archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -13187,7 +13435,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
@@ -13242,16 +13490,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -13650,8 +13888,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -13661,14 +13899,20 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -13700,7 +13944,7 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
@@ -13834,7 +14078,7 @@ fi
 	
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -13850,9 +14094,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
@@ -13864,8 +14108,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -13905,7 +14149,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -13929,8 +14173,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -13945,6 +14189,9 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -13956,12 +14203,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -14008,17 +14249,17 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -14027,7 +14268,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -14053,8 +14293,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -14071,21 +14311,21 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -14221,8 +14461,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -14258,7 +14498,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -14270,7 +14510,7 @@ else case e in @%:@(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -14288,7 +14528,7 @@ else case e in @%:@(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -14303,8 +14543,8 @@ else case e in @%:@(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -14463,7 +14703,7 @@ esac
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -14756,8 +14996,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -15024,6 +15264,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -15134,6 +15386,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -15152,30 +15406,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -15220,9 +15452,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -15496,7 +15733,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -15547,7 +15784,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -15563,7 +15806,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -15586,6 +15829,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -15643,18 +15892,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -15736,7 +15973,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -15745,15 +15982,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -15780,9 +16017,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -15790,8 +16027,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -15813,7 +16050,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -15829,9 +16066,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -15843,8 +16080,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -15865,8 +16102,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15987,7 +16224,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -16012,8 +16249,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -16057,7 +16294,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16098,8 +16335,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -16128,7 +16365,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -16169,8 +16406,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -16180,7 +16417,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16221,13 +16458,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -16268,13 +16505,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -16315,8 +16552,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -16362,7 +16599,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -16446,7 +16683,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16465,12 +16702,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -16554,7 +16791,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16573,8 +16810,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -16612,40 +16849,40 @@ fi
   
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -16663,12 +16900,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -16693,15 +16930,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
   
 
@@ -16722,11 +16959,18 @@ CC=$lt_save_CC
 
 
 
+
        
        
 
 
 
+
+
+
+
+
+
 
 
         ac_config_commands="$ac_config_commands libtool"
@@ -16762,16 +17006,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -16788,7 +17032,7 @@ else case e in @%:@(
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -16818,9 +17062,9 @@ else case e in @%:@(
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -16837,7 +17081,7 @@ else case e in @%:@(
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -16895,14 +17139,14 @@ fi
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
@@ -16919,13 +17163,13 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 printf %s "checking for shared library path variable... " >&6; }
 if test ${acl_cv_libpath+y}
 then :
@@ -16940,12 +17184,12 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-printf "%s\n" "$acl_cv_libpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+printf '%s\n' "$acl_cv_libpath" >&6; }
   shlibpath_var="$acl_cv_shlibpath_var"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
 printf %s "checking whether to activate relocatable installation... " >&6; }
   @%:@ Check whether --enable-relocatable was given.
 if test ${enable_relocatable+y}
@@ -16962,8 +17206,8 @@ esac
 fi
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-printf "%s\n" "$RELOCATABLE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+printf '%s\n' "$RELOCATABLE" >&6; }
 
 
   
@@ -16973,11 +17217,13 @@ printf "%s\n" "$RELOCATABLE" >&6; }
     reloc_final_prefix="$prefix"
   fi
   
-printf "%s\n" "@%:@define INSTALLPREFIX \"${reloc_final_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+@%:@define INSTALLPREFIX "${reloc_final_prefix}"
+_ACEOF
 
   if test $RELOCATABLE = yes; then
     
-printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
 
   fi
 
@@ -16998,14 +17244,14 @@ printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
 if test "x$ac_cv_header_mach_o_dyld_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
 
 fi
 
     ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
 if test "x$ac_cv_func__NSGetExecutablePath" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
 
 fi
 
@@ -17024,7 +17270,7 @@ fi
         ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
 if test "x$ac_cv_func_copy_file_range" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
@@ -17122,7 +17368,7 @@ fi
 if test ${enable_extra_encodings+y}
 then :
   enableval=$enable_extra_encodings; 
-printf "%s\n" "@%:@define ENABLE_EXTRA 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_EXTRA 1" >>confdefs.h
 
    USE_EXTRA_ENCODINGS=yes
 else case e in @%:@(
@@ -17133,7 +17379,7 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to copy files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to copy files" >&5
 printf %s "checking how to copy files... " >&6; }
 if test ${cl_cv_prog_cp+y}
 then :
@@ -17151,11 +17397,11 @@ rm -f conftest*
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_cp" >&5
-printf "%s\n" "$cl_cv_prog_cp" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_cp" >&5
+printf '%s\n' "$cl_cv_prog_cp" >&6; }
 CP="$cl_cv_prog_cp"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to make hard links" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to make hard links" >&5
 printf %s "checking how to make hard links... " >&6; }
 if test ${cl_cv_prog_LN+y}
 then :
@@ -17173,19 +17419,19 @@ rm -f conftestdata conftestfile
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_LN" >&5
-printf "%s\n" "$cl_cv_prog_LN" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_LN" >&5
+printf '%s\n' "$cl_cv_prog_LN" >&6; }
 LN="$cl_cv_prog_LN"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 
@@ -17197,7 +17443,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RC+y}
 then :
@@ -17218,7 +17464,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17230,11 +17476,11 @@ esac
 fi
 RC=$ac_cv_prog_RC
 if test -n "$RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
-printf "%s\n" "$RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+printf '%s\n' "$RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17243,7 +17489,7 @@ if test -z "$ac_cv_prog_RC"; then
   ac_ct_RC=$RC
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RC+y}
 then :
@@ -17264,7 +17510,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RC="windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17276,11 +17522,11 @@ esac
 fi
 ac_ct_RC=$ac_cv_prog_ac_ct_RC
 if test -n "$ac_ct_RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
-printf "%s\n" "$ac_ct_RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
+printf '%s\n' "$ac_ct_RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RC" = x; then
@@ -17288,8 +17534,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RC=$ac_ct_RC
@@ -17387,7 +17633,7 @@ if test $WOE32 = yes; then
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_WINDRES+y}
 then :
@@ -17408,7 +17654,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17420,11 +17666,11 @@ esac
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
-printf "%s\n" "$WINDRES" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+printf '%s\n' "$WINDRES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17433,7 +17679,7 @@ if test -z "$ac_cv_prog_WINDRES"; then
   ac_ct_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_WINDRES+y}
 then :
@@ -17454,7 +17700,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_WINDRES="windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17466,11 +17712,11 @@ esac
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
-printf "%s\n" "$ac_ct_WINDRES" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+printf '%s\n' "$ac_ct_WINDRES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_WINDRES" = x; then
@@ -17478,8 +17724,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     WINDRES=$ac_ct_WINDRES
@@ -17495,7 +17741,7 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -17526,9 +17772,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -17572,8 +17818,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -17582,7 +17828,7 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
@@ -17596,15 +17842,15 @@ printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
   else
     acl_final_exec_prefix="$exec_prefix"
   fi
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
+  prefix="$acl_saved_prefix"
 
 
     
   
-                                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+                                                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 printf %s "checking for shared library run path origin... " >&6; }
 if test ${acl_cv_rpath+y}
 then :
@@ -17619,8 +17865,8 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-printf "%s\n" "$acl_cv_rpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf '%s\n' "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   acl_libext="$acl_cv_libext"
   acl_shlibext="$acl_cv_shlibext"
@@ -17642,281 +17888,75 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
 printf %s "checking 32-bit host C ABI... " >&6; }
 if test ${gl_cv_host_cpu_c_abi_32bit+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) if test -n "$gl_cv_host_cpu_c_abi"; then
-       case "$gl_cv_host_cpu_c_abi" in
-         i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
-           gl_cv_host_cpu_c_abi_32bit=yes ;;
-         x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
-           gl_cv_host_cpu_c_abi_32bit=no ;;
-         *)
-           gl_cv_host_cpu_c_abi_32bit=unknown ;;
-       esac
-     else
-       case "$host_cpu" in
+  e) case "$host_cpu" in
 
-         # CPUs that only support a 32-bit ABI.
-         arc \
-         | bfin \
-         | cris* \
-         | csky \
-         | epiphany \
-         | ft32 \
-         | h8300 \
-         | m68k \
-         | microblaze | microblazeel \
-         | nds32 | nds32le | nds32be \
-         | nios2 | nios2eb | nios2el \
-         | or1k* \
-         | or32 \
-         | sh | sh1234 | sh1234elb \
-         | tic6x \
-         | xtensa* )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
+       # CPUs that only support a 32-bit ABI.
+       arc \
+       | bfin \
+       | cris* \
+       | csky \
+       | epiphany \
+       | ft32 \
+       | h8300 \
+       | m68k \
+       | microblaze | microblazeel \
+       | nds32 | nds32le | nds32be \
+       | nios2 | nios2eb | nios2el \
+       | or1k* \
+       | or32 \
+       | sh | sh1234 | sh1234elb \
+       | tic6x \
+       | xtensa* )
+         gl_cv_host_cpu_c_abi_32bit=yes
+         ;;
 
-         # CPUs that only support a 64-bit ABI.
-         alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
-         | mmix )
-           gl_cv_host_cpu_c_abi_32bit=no
-           ;;
+       # CPUs that only support a 64-bit ABI.
+       alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
+       | mmix )
+         gl_cv_host_cpu_c_abi_32bit=no
+         ;;
 
-         i[34567]86 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         x86_64 )
-           # On x86_64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
-           # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
-           #   with native Windows (mingw, MSVC).
-           # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if (defined __x86_64__ || defined __amd64__ \
-                       || defined _M_X64 || defined _M_AMD64) \
-                      && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         arm* | aarch64 )
-           # Assume arm with EABI.
-           # On arm64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
-           # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
-           # On hppa, the C compiler may be generating 32-bit code or 64-bit
-           # code. In the latter case, it defines _LP64 and __LP64__.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         ia64* )
-           # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
-           # 32-bit code. In the latter case, it defines _ILP32.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef _ILP32
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=yes
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         mips* )
-           # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
-           # at 32.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         powerpc* )
-           # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
-           # No need to distinguish them here; the caller may distinguish
-           # them based on the OS.
-           # On powerpc64 systems, the C compiler may still be generating
-           # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
-           # be generating 64-bit code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __powerpc64__ || defined __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         rs6000 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         riscv32 | riscv64 )
-           # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
-           # Size of 'long' and 'void *':
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         s390* )
-           # On s390x, the C compiler may be generating 64-bit (= s390x) code
-           # or 31-bit (= s390) code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__ || defined __s390x__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         sparc | sparc64 )
-           # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
-           # C compiler still generates 32-bit code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __sparcv9 || defined __arch64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         *)
+       *)
+         if test -n "$gl_cv_host_cpu_c_abi"; then
+                      case "$gl_cv_host_cpu_c_abi" in
+             i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+               gl_cv_host_cpu_c_abi_32bit=yes ;;
+             x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+               gl_cv_host_cpu_c_abi_32bit=no ;;
+             *)
+               gl_cv_host_cpu_c_abi_32bit=unknown ;;
+           esac
+         else
            gl_cv_host_cpu_c_abi_32bit=unknown
-           ;;
-       esac
-     fi
+         fi
+         if test $gl_cv_host_cpu_c_abi_32bit = unknown; then
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int test_pointer_size[sizeof (void *) - 5];
+                
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_host_cpu_c_abi_32bit=no
+else case e in @%:@(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+         fi
+         ;;
+     esac
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
-printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
+printf '%s\n' "$gl_cv_host_cpu_c_abi_32bit" >&6; }
 
   HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
 
@@ -17924,7 +17964,7 @@ printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
                                 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
 printf %s "checking for ELF binary format... " >&6; }
 if test ${gl_cv_elf+y}
 then :
@@ -17932,7 +17972,7 @@ then :
 else case e in @%:@(
   e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if defined __ELF__ || (defined __linux__ && defined __EDG__)
+#if defined __ELF__ || (defined __linux__ && (defined __EDG__ || defined __SUNPRO_C))
         Extensible Linking Format
         #endif
        
@@ -17950,8 +17990,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
-printf "%s\n" "$gl_cv_elf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
+printf '%s\n' "$gl_cv_elf" >&6; }
   if test $gl_cv_elf = yes; then
     # Extract the ELF class of a file (5th byte) in decimal.
     # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
@@ -18002,7 +18042,7 @@ printf "%s\n" "$gl_cv_elf" >&6; }
     }
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
 printf %s "checking for the common suffixes of directories in the library search path... " >&6; }
 if test ${acl_cv_libdirstems+y}
 then :
@@ -18021,6 +18061,13 @@ else case e in @%:@(
            esac
          fi
          ;;
+       netbsd*)
+                           if test $HOST_CPU_C_ABI_32BIT != no; then
+           case "$host_cpu" in
+             sparc*) acl_libdirstem2=lib/sparc ;;
+           esac
+         fi
+         ;;
        *)
                                                                                  searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
                      | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
@@ -18037,7 +18084,7 @@ else case e in @%:@(
            fi
          fi
          if test -n "$searchpath"; then
-           acl_save_IFS="${IFS= 	}"; IFS=":"
+           acl_saved_IFS="${IFS= 	}"; IFS=":"
            for searchdir in $searchpath; do
              if test -d "$searchdir"; then
                case "$searchdir" in
@@ -18054,7 +18101,7 @@ else case e in @%:@(
                esac
              fi
            done
-           IFS="$acl_save_IFS"
+           IFS="$acl_saved_IFS"
            if test $HOST_CPU_C_ABI_32BIT = yes; then
              # 32-bit ABI.
              acl_libdirstem3=
@@ -18072,8 +18119,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
-printf "%s\n" "$acl_cv_libdirstems" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+printf '%s\n' "$acl_cv_libdirstems" >&6; }
       acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
   acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
   acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
@@ -18090,9 +18137,9 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
   
     use_additional=yes
   
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
     eval additional_includedir=\"$includedir\"
@@ -18100,8 +18147,8 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
   
 @%:@ Check whether --with-libiconv-prefix was given.
@@ -18113,9 +18160,9 @@ then :
     else
       if test "X$withval" = "X"; then
         
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
           eval additional_includedir=\"$includedir\"
@@ -18123,8 +18170,8 @@ then :
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
         
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -18236,13 +18283,13 @@ fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
               
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -18330,13 +18377,13 @@ fi
                                                                                 haveit=
                     for x in $LDFLAGS $LIBICONV; do
                       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -18398,13 +18445,13 @@ fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCICONV; do
                     
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -18420,12 +18467,12 @@ fi
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -18447,13 +18494,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LIBICONV; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -18468,13 +18515,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LTLIBICONV; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -18548,17 +18595,17 @@ fi
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
     fi
@@ -18579,19 +18626,19 @@ fi
        
       
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
   
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -18604,7 +18651,7 @@ fi
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
@@ -18636,7 +18683,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -18661,22 +18708,22 @@ then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
   e) 
-                  am_save_LIBS="$LIBS"
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -18724,6 +18771,35 @@ int result = 0;
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -18740,7 +18816,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -18759,7 +18835,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18779,7 +18855,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18797,7 +18873,7 @@ int result = 0;
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -18824,12 +18900,12 @@ fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -18839,16 +18915,16 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
     
-printf "%s\n" "@%:@define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -18856,7 +18932,7 @@ printf "%s\n" "$LIBICONV" >&6; }
   
 
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
 printf %s "checking whether iconv is compatible with its POSIX signature... " >&6; }
 if test ${gl_cv_iconv_nonconst+y}
 then :
@@ -18892,8 +18968,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
-printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
+printf '%s\n' "$gl_cv_iconv_nonconst" >&6; }
   else
             gl_cv_iconv_nonconst=yes
   fi
@@ -18903,12 +18979,26 @@ printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
     iconv_arg1="const"
   fi
   
-printf "%s\n" "@%:@define ICONV_CONST $iconv_arg1" >>confdefs.h
+printf '%s\n' "@%:@define ICONV_CONST $iconv_arg1" >>confdefs.h
 
     
 
+      if test "$am_func_iconv" = yes; then
+    if test -n "$LIBICONV"; then
+      am_cv_func_iconv_summary='yes, in libiconv'
+    else
+      am_cv_func_iconv_summary='yes, in libc'
+    fi
+  else
+    if test "$am_cv_func_iconv" = yes; then
+      am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
+    else
+      am_cv_func_iconv_summary='no, consider installing GNU libiconv'
+    fi
+  fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 printf %s "checking whether NLS is requested... " >&6; }
     @%:@ Check whether --enable-nls was given.
 if test ${enable_nls+y}
@@ -18919,13 +19009,13 @@ else case e in @%:@(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   
 
 
           
-      GETTEXT_MACRO_VERSION=0.20
+      GETTEXT_MACRO_VERSION=0.22
 
 
     
@@ -18959,7 +19049,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGFMT+y}
 then :
@@ -18970,9 +19060,9 @@ else case e in @%:@(
     ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -18985,7 +19075,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
     ;;
 esac ;;
@@ -18993,16 +19083,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-printf "%s\n" "$MSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf '%s\n' "$MSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_GMSGFMT+y}
 then :
@@ -19025,7 +19115,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19039,11 +19129,11 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-printf "%s\n" "$GMSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf '%s\n' "$GMSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -19084,7 +19174,7 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XGETTEXT+y}
 then :
@@ -19095,9 +19185,9 @@ else case e in @%:@(
     ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -19110,7 +19200,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
     ;;
 esac ;;
@@ -19118,11 +19208,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-printf "%s\n" "$XGETTEXT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf '%s\n' "$XGETTEXT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     rm -f messages.po
@@ -19163,7 +19253,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGMERGE+y}
 then :
@@ -19174,9 +19264,9 @@ else case e in @%:@(
     ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -19188,7 +19278,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
     ;;
 esac ;;
@@ -19196,11 +19286,11 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-printf "%s\n" "$MSGMERGE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf '%s\n' "$MSGMERGE" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -19222,20 +19312,66 @@ fi
 
 
 
-    
-  
-  
+  gl_sed_double_backslashes='s/\\/\\\\/g'
+  gl_sed_escape_doublequotes='s/"/\\"/g'
+  gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
+  gl_sed_escape_for_make_2='s,\$,\\$$,g'
+      case `echo r | tr -d '\r'` in
+    '') gl_tr_cr='\015' ;;
+    *)  gl_tr_cr='\r' ;;
+  esac
+
+
+    gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+      if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
   
   
   
   
 
+    gl_final_localedir="$localedir"
+    case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw* | windows*)
+          gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;;
+      esac
+      ;;
+  esac
+    localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+  localedir_c='"'"$localedir_c"'"'
   
+
+    localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+      if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then
+    localedir_c_make='\"$(localedir)\"'
+  fi
   
 
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+
 
     
+  
+  
+  
+  
+  
+  
 
+  
+  
+
+
+  
     
   
 
@@ -19244,13 +19380,13 @@ fi
   
 
     
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
 if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_LIBS="$LIBS"
+  e) gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19272,23 +19408,23 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS" ;;
+     LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf '%s\n' "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
     
-printf "%s\n" "@%:@define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+                    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
 printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; }
 if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_LIBS="$LIBS"
+  e) gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19310,20 +19446,20 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS" ;;
+     LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
-printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+printf '%s\n' "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
   if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
     
-printf "%s\n" "@%:@define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
 
   fi
   INTL_MACOSX_LIBS=
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
      || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
   fi
   
 
@@ -19363,7 +19499,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
           gt_expression_test_code=
         fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 printf %s "checking for GNU gettext in libc... " >&6; }
 if eval test \${$gt_func_gnugettext_libc+y}
 then :
@@ -19405,8 +19541,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libc
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
                     
@@ -19414,19 +19550,19 @@ printf "%s\n" "$ac_res" >&6; }
        
       
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
   
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -19439,7 +19575,7 @@ printf "%s\n" "$ac_res" >&6; }
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
@@ -19471,7 +19607,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19496,22 +19632,22 @@ then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
   e) 
-                  am_save_LIBS="$LIBS"
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -19559,6 +19695,35 @@ int result = 0;
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -19575,7 +19740,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -19594,7 +19759,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -19614,7 +19779,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -19632,7 +19797,7 @@ int result = 0;
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -19659,12 +19824,12 @@ fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -19674,16 +19839,16 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
     
-printf "%s\n" "@%:@define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -19699,9 +19864,9 @@ printf "%s\n" "$LIBICONV" >&6; }
   
     use_additional=yes
   
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
     eval additional_includedir=\"$includedir\"
@@ -19709,8 +19874,8 @@ printf "%s\n" "$LIBICONV" >&6; }
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
   
 @%:@ Check whether --with-libintl-prefix was given.
@@ -19722,9 +19887,9 @@ then :
     else
       if test "X$withval" = "X"; then
         
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
           eval additional_includedir=\"$includedir\"
@@ -19732,8 +19897,8 @@ then :
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
         
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -19845,13 +20010,13 @@ fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBINTL; do
               
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -19939,13 +20104,13 @@ fi
                                                                                 haveit=
                     for x in $LDFLAGS $LIBINTL; do
                       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -20007,13 +20172,13 @@ fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCINTL; do
                     
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -20029,12 +20194,12 @@ fi
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -20056,13 +20221,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LIBINTL; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -20077,13 +20242,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LTLIBINTL; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -20157,17 +20322,17 @@ fi
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
     fi
@@ -20182,15 +20347,15 @@ fi
   
   
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 printf %s "checking for GNU gettext in libintl... " >&6; }
 if eval test \${$gt_func_gnugettext_libintl+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_CPPFLAGS="$CPPFLAGS"
+  e) gt_saved_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
+            gt_saved_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20229,8 +20394,14 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
+                                    gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
+            
+            case "$host_os" in
+              aix*) gt_LIBINTL_EXTRA="-lpthread" ;;
+            esac
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+               && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+              LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20261,27 +20432,28 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
-  LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+  LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA"
                  eval "$gt_func_gnugettext_libintl=yes"
                 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
             fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS" ;;
+            CPPFLAGS="$gt_saved_CPPFLAGS"
+            LIBS="$gt_saved_LIBS" ;;
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libintl
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
         fi
 
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
+                && test "$PACKAGE" != gettext-tools \
+                && test "$PACKAGE" != libintl; }; then
           gt_use_preinstalled_gnugettext=yes
         else
                     LIBINTL=
@@ -20302,19 +20474,19 @@ printf "%s\n" "$ac_res" >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
       
-printf "%s\n" "@%:@define ENABLE_NLS 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
 printf %s "checking whether to use NLS... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
 printf %s "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
@@ -20325,30 +20497,30 @@ printf %s "checking where the gettext function comes from... " >&6; }
     else
       gt_source="included intl directory"
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-printf "%s\n" "$gt_source" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf '%s\n' "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
 printf %s "checking how to link with libintl... " >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-printf "%s\n" "$LIBINTL" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf '%s\n' "$LIBINTL" >&6; }
         
   for element in $INCINTL; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -20363,10 +20535,10 @@ printf "%s\n" "$LIBINTL" >&6; }
       fi
 
             
-printf "%s\n" "@%:@define HAVE_GETTEXT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_GETTEXT 1" >>confdefs.h
 
       
-printf "%s\n" "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -20375,18 +20547,22 @@ printf "%s\n" "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
 
   
 
-    INTLLIBS="$LIBINTL"
+  
+        INTLLIBS="$LIBINTL"
+    
   
 
     
   
   
 
+    
+
 
 
 
     
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
@@ -20414,20 +20590,20 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
      
-printf "%s\n" "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
      
-printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
+printf '%s\n' "@%:@define mbstate_t int" >>confdefs.h
 
    fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 printf %s "checking for wchar_t... " >&6; }
 if test ${gt_cv_c_wchar_t+y}
 then :
@@ -20455,11 +20631,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
-printf "%s\n" "$gt_cv_c_wchar_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+printf '%s\n' "$gt_cv_c_wchar_t" >&6; }
   if test $gt_cv_c_wchar_t = yes; then
     
-printf "%s\n" "@%:@define HAVE_WCHAR_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WCHAR_T 1" >>confdefs.h
 
   fi
 
@@ -20482,31 +20658,31 @@ fi
 ac_fn_c_check_func "$LINENO" "getc_unlocked" "ac_cv_func_getc_unlocked"
 if test "x$ac_cv_func_getc_unlocked" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETC_UNLOCKED 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETC_UNLOCKED 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc"
 if test "x$ac_cv_func_mbrtowc" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MBRTOWC 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MBRTOWC 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "wcrtomb" "ac_cv_func_wcrtomb"
 if test "x$ac_cv_func_wcrtomb" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WCRTOMB 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WCRTOMB 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "mbsinit" "ac_cv_func_mbsinit"
 if test "x$ac_cv_func_mbsinit" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MBSINIT 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MBSINIT 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
 if test "x$ac_cv_func_setlocale" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
 
 fi
 
@@ -20518,7 +20694,7 @@ else
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> is standalone" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> is standalone" >&5
 printf %s "checking whether <wchar.h> is standalone... " >&6; }
 if test ${gl_cv_header_wchar_h_standalone+y}
 then :
@@ -20546,8 +20722,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_standalone" >&5
-printf "%s\n" "$gl_cv_header_wchar_h_standalone" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_standalone" >&5
+printf '%s\n' "$gl_cv_header_wchar_h_standalone" >&6; }
 if test $gl_cv_header_wchar_h_standalone = yes; then
   BROKEN_WCHAR_H=0
 else
@@ -20561,7 +20737,7 @@ do :
   ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
 if test "x$ac_cv_func_memmove" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
  
 else case e in @%:@(
   e) SRCLIBOBJS="$SRCLIBOBJS $ac_func.$ac_objext" ;;
@@ -20571,7 +20747,7 @@ fi
 done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 printf %s "checking for nl_langinfo and CODESET... " >&6; }
 if test ${am_cv_langinfo_codeset+y}
 then :
@@ -20600,11 +20776,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf '%s\n' "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
     
-printf "%s\n" "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -20681,7 +20857,7 @@ gl_mda_defines='
 
        
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 printf %s "checking for working fcntl.h... " >&6; }
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
@@ -20815,15 +20991,15 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+printf '%s\n' "$gl_cv_header_working_fcntl_h" >&6; }
 
   case $gl_cv_header_working_fcntl_h in #(
   *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
 
 
   case $gl_cv_header_working_fcntl_h in #(
@@ -20831,7 +21007,7 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 
 
 
@@ -20840,12 +21016,12 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
 if test "x$ac_cv_header_wchar_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WCHAR_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WCHAR_H 1" >>confdefs.h
 
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EILSEQ" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EILSEQ" >&5
 printf %s "checking for EILSEQ... " >&6; }
 if test ${ac_cv_decl_EILSEQ+y}
 then :
@@ -20911,18 +21087,18 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_EILSEQ" >&5
-printf "%s\n" "$ac_cv_decl_EILSEQ" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_EILSEQ" >&5
+printf '%s\n' "$ac_cv_decl_EILSEQ" >&6; }
   if test "$ac_cv_decl_EILSEQ" != yes; then
     
-printf "%s\n" "@%:@define EILSEQ $ac_cv_decl_EILSEQ" >>confdefs.h
+printf '%s\n' "@%:@define EILSEQ $ac_cv_decl_EILSEQ" >>confdefs.h
 
     EILSEQ="$ac_cv_decl_EILSEQ"
     
   fi
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 printf %s "checking whether byte ordering is bigendian... " >&6; }
 if test ${ac_cv_c_bigendian+y}
 then :
@@ -21144,20 +21320,20 @@ fi
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-printf "%s\n" "$ac_cv_c_bigendian" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf '%s\n' "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     printf "%s\n" "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf '%s\n' "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
      
-printf "%s\n" "@%:@define WORDS_LITTLEENDIAN 1" >>confdefs.h
+printf '%s\n' "@%:@define WORDS_LITTLEENDIAN 1" >>confdefs.h
 
    ;; #(
    universal)
      	
-printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf '%s\n' "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -21178,8 +21354,8 @@ printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 if test ${enable_cross_guesses+y}
 then :
   enableval=$enable_cross_guesses; if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
-printf "%s\n" "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
+printf '%s\n' "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
        enableval=conservative
      fi
      gl_cross_guesses="$enableval"
@@ -21205,14 +21381,14 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define size_t unsigned int" >>confdefs.h
+printf '%s\n' "@%:@define size_t unsigned int" >>confdefs.h
  ;;
 esac
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 printf %s "checking for working alloca.h... " >&6; }
 if test ${ac_cv_working_alloca_h+y}
 then :
@@ -21241,15 +21417,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+printf '%s\n' "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
   
-printf "%s\n" "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 printf %s "checking for alloca... " >&6; }
 if test ${ac_cv_func_alloca_works+y}
 then :
@@ -21294,12 +21470,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+printf '%s\n' "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
   
-printf "%s\n" "@%:@define HAVE_ALLOCA 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -21313,10 +21489,10 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-printf "%s\n" "@%:@define C_ALLOCA 1" >>confdefs.h
+printf '%s\n' "@%:@define C_ALLOCA 1" >>confdefs.h
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 printf %s "checking stack direction for C alloca... " >&6; }
 if test ${ac_cv_c_stack_direction+y}
 then :
@@ -21360,9 +21536,9 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
-printf "%s\n" "@%:@define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+printf '%s\n' "$ac_cv_c_stack_direction" >&6; }
+printf '%s\n' "@%:@define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
 
 
 fi
@@ -21445,7 +21621,7 @@ fi
   REPLACE_WCTOMB=0;          
 
 
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 printf %s "checking whether lstat correctly handles trailing slash... " >&6; }
 if test ${gl_cv_func_lstat_dereferences_slashed_symlink+y}
 then :
@@ -21505,12 +21681,12 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
-printf "%s\n" "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
+printf '%s\n' "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
   case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
     *yes)
       
-printf "%s\n" "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
+printf '%s\n' "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
       ;;
   esac
@@ -21519,7 +21695,7 @@ printf "%s\n" "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
@@ -21550,11 +21726,11 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
     
-printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
@@ -21562,7 +21738,7 @@ printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
 
   
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
 printf %s "checking whether realpath works... " >&6; }
 if test ${gl_cv_func_realpath_works+y}
 then :
@@ -21796,17 +21972,17 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
-printf "%s\n" "$gl_cv_func_realpath_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
+printf '%s\n' "$gl_cv_func_realpath_works" >&6; }
   case "$gl_cv_func_realpath_works" in
     *yes)
       
-printf "%s\n" "@%:@define FUNC_REALPATH_WORKS 1" >>confdefs.h
+printf '%s\n' "@%:@define FUNC_REALPATH_WORKS 1" >>confdefs.h
 
       ;;
     *nearly)
       
-printf "%s\n" "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
+printf '%s\n' "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
 
       ;;
   esac
@@ -21823,7 +21999,7 @@ printf "%s\n" "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -22027,7 +22203,7 @@ fi
   
 
   
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 printf %s "checking for C/C++ restrict keyword... " >&6; }
 if test ${ac_cv_c_restrict+y}
 then :
@@ -22067,14 +22243,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
-printf "%s\n" "$ac_cv_c_restrict" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+printf '%s\n' "$ac_cv_c_restrict" >&6; }
  
  case $ac_cv_c_restrict in
    restrict) ;;
-   no) printf "%s\n" "@%:@define restrict /**/" >>confdefs.h
+   no) printf '%s\n' "@%:@define restrict /**/" >>confdefs.h
  ;;
-   *)  printf "%s\n" "@%:@define restrict $ac_cv_c_restrict" >>confdefs.h
+   *)  printf '%s\n' "@%:@define restrict $ac_cv_c_restrict" >>confdefs.h
  ;;
  esac
 
@@ -22183,7 +22359,7 @@ printf "%s\n" "$ac_cv_c_restrict" >&6; }
   if test $ac_cv_func__set_invalid_parameter_handler = yes; then
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
     
-printf "%s\n" "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
 
   else
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
@@ -22536,7 +22712,7 @@ printf "%s\n" "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
     
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
 printf %s "checking if environ is properly declared... " >&6; }
 if test ${gt_cv_var_environ_declaration+y}
 then :
@@ -22570,11 +22746,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
-printf "%s\n" "$gt_cv_var_environ_declaration" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
+printf '%s\n' "$gt_cv_var_environ_declaration" >&6; }
   if test $gt_cv_var_environ_declaration = yes; then
     
-printf "%s\n" "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
   fi
   
@@ -22585,7 +22761,7 @@ printf "%s\n" "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
 printf %s "checking whether the preprocessor supports include_next... " >&6; }
 if test ${gl_cv_have_include_next+y}
 then :
@@ -22650,8 +22826,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
-printf "%s\n" "$gl_cv_have_include_next" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
+printf '%s\n' "$gl_cv_have_include_next" >&6; }
   PRAGMA_SYSTEM_HEADER=
   if test $gl_cv_have_include_next = yes; then
     INCLUDE_NEXT=include_next
@@ -22672,7 +22848,7 @@ printf "%s\n" "$gl_cv_have_include_next" >&6; }
   
   
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
 printf %s "checking whether source code line length is unlimited... " >&6; }
 if test ${gl_cv_source_line_length_unlimited+y}
 then :
@@ -22699,8 +22875,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
-printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
+printf '%s\n' "$gl_cv_source_line_length_unlimited" >&6; }
   if test $gl_cv_source_line_length_unlimited = no; then
     PRAGMA_COLUMNS="#pragma COLUMNS 10000"
   else
@@ -22710,7 +22886,7 @@ printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
 printf %s "checking for complete errno.h... " >&6; }
 if test ${gl_cv_header_errno_h_complete+y}
 then :
@@ -22787,8 +22963,8 @@ rm -rf conftest*
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
-printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
+printf '%s\n' "$gl_cv_header_errno_h_complete" >&6; }
   if test $gl_cv_header_errno_h_complete = yes; then
     GL_GENERATE_ERRNO_H=false
   else
@@ -22803,7 +22979,7 @@ printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_errno_h='<'errno.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
 printf %s "checking absolute name of <errno.h>... " >&6; }
 if test ${gl_cv_next_errno_h+y}
 then :
@@ -22848,8 +23024,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
-printf "%s\n" "$gl_cv_next_errno_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
+printf '%s\n' "$gl_cv_next_errno_h" >&6; }
      fi
      NEXT_ERRNO_H=$gl_cv_next_errno_h
 
@@ -22869,7 +23045,7 @@ printf "%s\n" "$gl_cv_next_errno_h" >&6; }
   fi
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
 printf %s "checking for EMULTIHOP value... " >&6; }
 if test ${gl_cv_header_errno_h_EMULTIHOP+y}
 then :
@@ -22930,8 +23106,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
     case $gl_cv_header_errno_h_EMULTIHOP in
       yes | no)
         EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE=
@@ -22946,7 +23122,7 @@ printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
 
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
 printf %s "checking for ENOLINK value... " >&6; }
 if test ${gl_cv_header_errno_h_ENOLINK+y}
 then :
@@ -23007,8 +23183,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
-printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
+printf '%s\n' "$gl_cv_header_errno_h_ENOLINK" >&6; }
     case $gl_cv_header_errno_h_ENOLINK in
       yes | no)
         ENOLINK_HIDDEN=0; ENOLINK_VALUE=
@@ -23023,7 +23199,7 @@ printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
 
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
 printf %s "checking for EOVERFLOW value... " >&6; }
 if test ${gl_cv_header_errno_h_EOVERFLOW+y}
 then :
@@ -23084,8 +23260,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
     case $gl_cv_header_errno_h_EOVERFLOW in
       yes | no)
         EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE=
@@ -23099,8 +23275,8 @@ printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
   fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
-printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to detect undeclared functions" >&5
+printf %s "checking for $CC options to detect undeclared functions... " >&6; }
 if test ${ac_cv_c_undeclared_builtin_options+y}
 then :
   printf %s "(cached) " >&6
@@ -23168,12 +23344,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
-printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf '%s\n' "$ac_cv_c_undeclared_builtin_options" >&6; }
   case $ac_cv_c_undeclared_builtin_options in @%:@(
   'cannot detect') :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot make $CC report undeclared builtins
 See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
   'none needed') :
@@ -23182,7 +23358,50 @@ See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
     ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
 esac
 
-ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to ignore future-version functions" >&5
+printf %s "checking for $CC options to ignore future-version functions... " >&6; }
+if test ${ac_cv_c_future_darwin_options+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)       ac_compile_saved="$ac_compile"
+   ac_compile="$ac_compile -Werror=unguarded-availability-new"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if ! (defined __APPLE__ && defined __MACH__)
+	   #error "-Werror=unguarded-availability-new not needed here"
+	  #endif
+	
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_future_darwin_options='-Werror=unguarded-availability-new'
+else case e in @%:@(
+  e) ac_cv_c_future_darwin_options='none needed' ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_compile="$ac_compile_saved"
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_future_darwin_options" >&5
+printf '%s\n' "$ac_cv_c_future_darwin_options" >&6; }
+ case $ac_cv_c_future_darwin_options in @%:@(
+  'none needed') :
+    ac_c_future_darwin_options='' ;; @%:@(
+  *) :
+    ac_c_future_darwin_options=$ac_cv_c_future_darwin_options ;;
+esac
+
+ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_strerror_r" = xyes
 then :
   ac_have_decl=1
@@ -23190,7 +23409,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
 
 
 if test $ac_cv_have_decl_strerror_r = yes; then
@@ -23198,11 +23417,11 @@ if test $ac_cv_have_decl_strerror_r = yes; then
   # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well
   # as AC_CHECK_DECLS_ONCE.)
   
-printf "%s\n" "@%:@define HAVE_STRERROR_R 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRERROR_R 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
 printf %s "checking whether strerror_r returns char *... " >&6; }
 if test ${ac_cv_func_strerror_r_char_p+y}
 then :
@@ -23237,11 +23456,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+printf '%s\n' "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
   
-printf "%s\n" "@%:@define STRERROR_R_CHAR_P 1" >>confdefs.h
+printf '%s\n' "@%:@define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
@@ -23249,7 +23468,7 @@ fi
   XGETTEXT_EXTRA_OPTIONS=
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5
 printf %s "checking whether ctype.h defines __header_inline... " >&6; }
 if test ${gl_cv_have___header_inline+y}
 then :
@@ -23273,11 +23492,11 @@ fi
 rm -f conftest.err conftest.i conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5
-printf "%s\n" "$gl_cv_have___header_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5
+printf '%s\n' "$gl_cv_have___header_inline" >&6; }
   if test "$gl_cv_have___header_inline" = yes; then
     
-printf "%s\n" "@%:@define HAVE___HEADER_INLINE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE___HEADER_INLINE 1" >>confdefs.h
 
   fi
 
@@ -23354,7 +23573,7 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      
-printf "%s\n" "@%:@define pid_t $ac_pid_type" >>confdefs.h
+printf '%s\n' "@%:@define pid_t $ac_pid_type" >>confdefs.h
 
      ;;
 esac
@@ -23367,7 +23586,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define mode_t int" >>confdefs.h
+printf '%s\n' "@%:@define mode_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -23386,7 +23605,7 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_fcntl_h='<'fcntl.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
 printf %s "checking absolute name of <fcntl.h>... " >&6; }
 if test ${gl_cv_next_fcntl_h+y}
 then :
@@ -23431,8 +23650,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
-printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
+printf '%s\n' "$gl_cv_next_fcntl_h" >&6; }
      fi
      NEXT_FCNTL_H=$gl_cv_next_fcntl_h
 
@@ -23483,7 +23702,7 @@ printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
   REPLACE_STAT=0;       
   REPLACE_UTIMENSAT=0;  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
 printf %s "checking whether stat file-mode macros are broken... " >&6; }
 if test ${ac_cv_header_stat_broken+y}
 then :
@@ -23521,11 +23740,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-printf "%s\n" "$ac_cv_header_stat_broken" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+printf '%s\n' "$ac_cv_header_stat_broken" >&6; }
 if test $ac_cv_header_stat_broken = yes; then
   
-printf "%s\n" "@%:@define STAT_MACROS_BROKEN 1" >>confdefs.h
+printf '%s\n' "@%:@define STAT_MACROS_BROKEN 1" >>confdefs.h
 
 fi
 
@@ -23533,7 +23752,7 @@ fi
   
   case "$host_os" in
     mingw*)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
 printf %s "checking for 64-bit off_t... " >&6; }
 if test ${gl_cv_type_off_t_64+y}
 then :
@@ -23563,14 +23782,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
-printf "%s\n" "$gl_cv_type_off_t_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
+printf '%s\n' "$gl_cv_type_off_t_64" >&6; }
       if test $gl_cv_type_off_t_64 = no; then
         WINDOWS_64_BIT_OFF_T=1
       else
         WINDOWS_64_BIT_OFF_T=0
       fi
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
 printf %s "checking for 64-bit st_size... " >&6; }
 if test ${gl_cv_member_st_size_64+y}
 then :
@@ -23601,8 +23820,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
-printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
+printf '%s\n' "$gl_cv_member_st_size_64" >&6; }
       if test $gl_cv_member_st_size_64 = no; then
         WINDOWS_64_BIT_ST_SIZE=1
       else
@@ -23632,7 +23851,7 @@ printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_stat_h='<'sys/stat.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
 printf %s "checking absolute name of <sys/stat.h>... " >&6; }
 if test ${gl_cv_next_sys_stat_h+y}
 then :
@@ -23683,8 +23902,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
-printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
+printf '%s\n' "$gl_cv_next_sys_stat_h" >&6; }
      fi
      NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h
 
@@ -23721,7 +23940,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define nlink_t int" >>confdefs.h
+printf '%s\n' "@%:@define nlink_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -23740,7 +23959,7 @@ fi
       ac_fn_c_check_header_compile "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default"
 if test "x$ac_cv_header_sdkddkver_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SDKDDKVER_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SDKDDKVER_H 1" >>confdefs.h
 
 fi
 
@@ -23830,7 +24049,7 @@ fi
 
   
 
-ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getdtablesize" = xyes
 then :
   ac_have_decl=1
@@ -23838,7 +24057,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
 
 
 
@@ -23856,7 +24075,7 @@ printf "%s\n" "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_limits_h='<'limits.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
 printf %s "checking absolute name of <limits.h>... " >&6; }
 if test ${gl_cv_next_limits_h+y}
 then :
@@ -23907,8 +24126,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
-printf "%s\n" "$gl_cv_next_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
+printf '%s\n' "$gl_cv_next_limits_h" >&6; }
      fi
      NEXT_LIMITS_H=$gl_cv_next_limits_h
 
@@ -23925,7 +24144,7 @@ printf "%s\n" "$gl_cv_next_limits_h" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
 printf %s "checking whether limits.h has WORD_BIT, BOOL_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_limits_width+y}
 then :
@@ -23960,8 +24179,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
-printf "%s\n" "$gl_cv_header_limits_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
+printf '%s\n' "$gl_cv_header_limits_width" >&6; }
   if test "$gl_cv_header_limits_width" = yes; then
     GL_GENERATE_LIMITS_H=false
   else
@@ -23969,7 +24188,7 @@ printf "%s\n" "$gl_cv_header_limits_width" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
 printf %s "checking for wint_t... " >&6; }
 if test ${gt_cv_c_wint_t+y}
 then :
@@ -23997,14 +24216,14 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
-printf "%s\n" "$gt_cv_c_wint_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+printf '%s\n' "$gt_cv_c_wint_t" >&6; }
   if test $gt_cv_c_wint_t = yes; then
     
-printf "%s\n" "@%:@define HAVE_WINT_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WINT_T 1" >>confdefs.h
 
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
 printf %s "checking whether wint_t is large enough... " >&6; }
 if test ${gl_cv_type_wint_t_large_enough+y}
 then :
@@ -24033,8 +24252,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
-printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
+printf '%s\n' "$gl_cv_type_wint_t_large_enough" >&6; }
     if test $gl_cv_type_wint_t_large_enough = no; then
       GNULIBHEADERS_OVERRIDE_WINT_T=1
     else
@@ -24046,7 +24265,7 @@ printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
   
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
 printf %s "checking whether the compiler produces multi-arch binaries... " >&6; }
 if test ${gl_cv_c_multiarch+y}
 then :
@@ -24090,8 +24309,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
-printf "%s\n" "$gl_cv_c_multiarch" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
+printf '%s\n' "$gl_cv_c_multiarch" >&6; }
   if test $gl_cv_c_multiarch = yes; then
     APPLE_UNIVERSAL_BUILD=1
   else
@@ -24105,10 +24324,10 @@ printf "%s\n" "$gl_cv_c_multiarch" >&6; }
   
 
       
-printf "%s\n" "@%:@define HAVE_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LONG_LONG_INT 1" >>confdefs.h
 
   
-printf "%s\n" "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
 
 
       
@@ -24147,7 +24366,7 @@ printf "%s\n" "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdint_h='<'stdint.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
 printf %s "checking absolute name of <stdint.h>... " >&6; }
 if test ${gl_cv_next_stdint_h+y}
 then :
@@ -24198,8 +24417,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
-printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+printf '%s\n' "$gl_cv_next_stdint_h" >&6; }
      fi
      NEXT_STDINT_H=$gl_cv_next_stdint_h
 
@@ -24223,7 +24442,7 @@ printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
   
 
     if test $ac_cv_header_stdint_h = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
 printf %s "checking whether stdint.h conforms to C99... " >&6; }
 if test ${gl_cv_header_working_stdint_h+y}
 then :
@@ -24500,8 +24719,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdint_h" >&6; }
   fi
 
   HAVE_C99_STDINT_H=0
@@ -24511,7 +24730,7 @@ printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
   case "$gl_cv_header_working_stdint_h" in
     *yes)
       HAVE_C99_STDINT_H=1
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
 printf %s "checking whether stdint.h works without ISO C predefines... " >&6; }
 if test ${gl_cv_header_stdint_without_STDC_macros+y}
 then :
@@ -24552,18 +24771,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
-printf "%s\n" "$gl_cv_header_stdint_without_STDC_macros" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
+printf '%s\n' "$gl_cv_header_stdint_without_STDC_macros" >&6; }
 
       if test $gl_cv_header_stdint_without_STDC_macros = no; then
         
-printf "%s\n" "@%:@define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_CONSTANT_MACROS 1" >>confdefs.h
 
         
-printf "%s\n" "@%:@define __STDC_LIMIT_MACROS 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_LIMIT_MACROS 1" >>confdefs.h
 
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
 printf %s "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_stdint_width+y}
 then :
@@ -24603,8 +24822,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
-printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
+printf '%s\n' "$gl_cv_header_stdint_width" >&6; }
       if test "$gl_cv_header_stdint_width" = yes; then
         GL_GENERATE_STDINT_H=false
       fi
@@ -24613,13 +24832,13 @@ printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
                   ac_fn_c_check_header_compile "$LINENO" "sys/inttypes.h" "ac_cv_header_sys_inttypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_inttypes_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
 
 fi
 ac_fn_c_check_header_compile "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_bitypes_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SYS_BITYPES_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SYS_BITYPES_H 1" >>confdefs.h
 
 fi
 
@@ -24635,7 +24854,7 @@ fi
     
           
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
@@ -24661,14 +24880,16 @@ fi
 esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "@%:@define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -24678,7 +24899,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
@@ -24704,14 +24925,16 @@ fi
 esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "@%:@define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -24720,7 +24943,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
 printf %s "checking whether $gltype is signed... " >&6; }
 if eval test \${gl_cv_type_${gltype}_signed+y}
 then :
@@ -24757,12 +24980,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_signed
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_type_${gltype}_signed
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     if test "$result" = yes; then
-      printf "%s\n" "@%:@define HAVE_SIGNED_${GLTYPE} 1" >>confdefs.h
+      cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
 
       eval HAVE_SIGNED_${GLTYPE}=1
     else
@@ -24777,7 +25002,7 @@ printf "%s\n" "$ac_res" >&6; }
     
           
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
@@ -24831,13 +25056,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "@%:@define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
   
@@ -24846,7 +25073,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
@@ -24900,13 +25127,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "@%:@define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
   
@@ -24959,7 +25188,7 @@ printf "%s\n" "$ac_res" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_inttypes_h='<'inttypes.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
 printf %s "checking absolute name of <inttypes.h>... " >&6; }
 if test ${gl_cv_next_inttypes_h+y}
 then :
@@ -25010,8 +25239,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
-printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
+printf '%s\n' "$gl_cv_next_inttypes_h" >&6; }
      fi
      NEXT_INTTYPES_H=$gl_cv_next_inttypes_h
 
@@ -25055,7 +25284,7 @@ printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
 printf %s "checking whether malloc is ptrdiff_t safe... " >&6; }
 if test ${gl_cv_malloc_ptrdiff+y}
 then :
@@ -25103,8 +25332,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
-printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
+printf '%s\n' "$gl_cv_malloc_ptrdiff" >&6; }
 
 
   
@@ -25113,7 +25342,7 @@ printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
 printf %s "checking whether malloc, realloc, calloc set errno on failure... " >&6; }
 if test ${gl_cv_func_malloc_posix+y}
 then :
@@ -25132,8 +25361,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
-printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
+printf '%s\n' "$gl_cv_func_malloc_posix" >&6; }
 
 
   
@@ -25141,7 +25370,7 @@ printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
   
   if test "$gl_cv_func_malloc_posix" = yes; then
     
-printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC_FOR_MALLOC_POSIX=1
@@ -25149,7 +25378,7 @@ printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
 
   
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
 printf %s "checking whether malloc (0) returns nonnull... " >&6; }
 if test ${ac_cv_func_malloc_0_nonnull+y}
 then :
@@ -25199,8 +25428,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+printf '%s\n' "$ac_cv_func_malloc_0_nonnull" >&6; }
   case $ac_cv_func_malloc_0_nonnull in @%:@(
   *yes) :
     gl_cv_func_malloc_0_nonnull=1 ;; @%:@(
@@ -25209,7 +25438,7 @@ printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
 esac
 
   
-printf "%s\n" "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
+printf '%s\n' "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
 
 
 
@@ -25433,7 +25662,7 @@ printf "%s\n" "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>co
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
 printf %s "checking whether <limits.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_limits_h+y}
 then :
@@ -25461,11 +25690,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_limits_h" >&6; }
   if test $gl_cv_minmax_in_limits_h = yes; then
     
-printf "%s\n" "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
 
   fi
   
@@ -25474,7 +25703,7 @@ printf "%s\n" "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
 printf %s "checking whether <sys/param.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_sys_param_h+y}
 then :
@@ -25502,11 +25731,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_sys_param_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_sys_param_h" >&6; }
   if test $gl_cv_minmax_in_sys_param_h = yes; then
     
-printf "%s\n" "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
 
   fi
   
@@ -25517,7 +25746,7 @@ printf "%s\n" "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
   
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
 printf %s "checking for O_CLOEXEC... " >&6; }
 if test ${gl_cv_macro_O_CLOEXEC+y}
 then :
@@ -25548,12 +25777,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
-printf "%s\n" "$gl_cv_macro_O_CLOEXEC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
+printf '%s\n' "$gl_cv_macro_O_CLOEXEC" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
 printf %s "checking for promoted mode_t type... " >&6; }
 if test ${gl_cv_promoted_mode_t+y}
 then :
@@ -25582,10 +25811,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
-printf "%s\n" "$gl_cv_promoted_mode_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
+printf '%s\n' "$gl_cv_promoted_mode_t" >&6; }
   
-printf "%s\n" "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
+printf '%s\n' "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
 
 
 
@@ -25613,7 +25842,7 @@ printf "%s\n" "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
 if test "x$ac_cv_type_sigset_t" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_SIGSET_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_SIGSET_T 1" >>confdefs.h
 
 gl_cv_type_sigset_t=yes
 else case e in @%:@(
@@ -25627,7 +25856,7 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
 printf %s "checking for SIGPIPE... " >&6; }
 if test ${gl_cv_header_signal_h_SIGPIPE+y}
 then :
@@ -25656,8 +25885,8 @@ rm -rf conftest*
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
-printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
+printf '%s\n' "$gl_cv_header_signal_h_SIGPIPE" >&6; }
 
 
     
@@ -25682,7 +25911,7 @@ printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; }
 
   
 
-ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_setenv" = xyes
 then :
   ac_have_decl=1
@@ -25690,11 +25919,11 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
 if test ${gt_cv_ssize_t+y}
 then :
@@ -25722,11 +25951,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+printf '%s\n' "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
     
-printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
+printf '%s\n' "@%:@define ssize_t int" >>confdefs.h
 
   fi
 
@@ -25736,7 +25965,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define uid_t int" >>confdefs.h
+printf '%s\n' "@%:@define uid_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -25747,7 +25976,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define gid_t int" >>confdefs.h
+printf '%s\n' "@%:@define gid_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -25766,7 +25995,7 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_signal_h='<'signal.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
 printf %s "checking absolute name of <signal.h>... " >&6; }
 if test ${gl_cv_next_signal_h+y}
 then :
@@ -25811,8 +26040,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
-printf "%s\n" "$gl_cv_next_signal_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
+printf '%s\n' "$gl_cv_next_signal_h" >&6; }
      fi
      NEXT_SIGNAL_H=$gl_cv_next_signal_h
 
@@ -26180,7 +26409,7 @@ then :
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if test -f conftest.o; then
        gl_asmext='s'
@@ -26203,7 +26432,7 @@ rm -rf conftest*
 
   
         
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
 printf %s "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
 if test ${gl_cv_prog_as_underscore+y}
 then :
@@ -26220,7 +26449,7 @@ EOF
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if LC_ALL=C $EGREP '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
@@ -26231,21 +26460,21 @@ EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
-printf "%s\n" "$gl_cv_prog_as_underscore" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
+printf '%s\n' "$gl_cv_prog_as_underscore" >&6; }
   if test $gl_cv_prog_as_underscore = yes; then
     USER_LABEL_PREFIX=_
   else
     USER_LABEL_PREFIX=
   fi
   
-printf "%s\n" "@%:@define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
+printf '%s\n' "@%:@define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
 
   ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
   
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 printf %s "checking for stdbool.h that conforms to C99... " >&6; }
 if test ${ac_cv_header_stdbool_h+y}
 then :
@@ -26331,13 +26560,13 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-printf "%s\n" "$ac_cv_header_stdbool_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+printf '%s\n' "$ac_cv_header_stdbool_h" >&6; }
    ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 if test "x$ac_cv_type__Bool" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE__BOOL 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE__BOOL 1" >>confdefs.h
 
 
 fi
@@ -26356,7 +26585,7 @@ fi
 
   GL_GENERATE_STDDEF_H=false
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
 printf %s "checking for good max_align_t... " >&6; }
 if test ${gl_cv_type_max_align_t+y}
 then :
@@ -26397,8 +26626,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
-printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
+printf '%s\n' "$gl_cv_type_max_align_t" >&6; }
   if test $gl_cv_type_max_align_t = no; then
     HAVE_MAX_ALIGN_T=0
     GL_GENERATE_STDDEF_H=true
@@ -26409,7 +26638,7 @@ printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
     GL_GENERATE_STDDEF_H=true
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
 printf %s "checking whether NULL can be used in arbitrary expressions... " >&6; }
 if test ${gl_cv_decl_null_works+y}
 then :
@@ -26438,8 +26667,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-printf "%s\n" "$gl_cv_decl_null_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+printf '%s\n' "$gl_cv_decl_null_works" >&6; }
   if test $gl_cv_decl_null_works = no; then
     REPLACE_NULL=1
     GL_GENERATE_STDDEF_H=true
@@ -26457,7 +26686,7 @@ printf "%s\n" "$gl_cv_decl_null_works" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stddef_h='<'stddef.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
 printf %s "checking absolute name of <stddef.h>... " >&6; }
 if test ${gl_cv_next_stddef_h+y}
 then :
@@ -26502,8 +26731,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+printf '%s\n' "$gl_cv_next_stddef_h" >&6; }
      fi
      NEXT_STDDEF_H=$gl_cv_next_stddef_h
 
@@ -26523,7 +26752,7 @@ printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
 
 
   
-ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcloseall" = xyes
 then :
   ac_have_decl=1
@@ -26531,12 +26760,12 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
 
 
   
   
-  printf "%s\n" "@%:@define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
+  printf '%s\n' "@%:@define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
 
   
   
@@ -26549,7 +26778,7 @@ printf "%s\n" "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdio_h='<'stdio.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
 printf %s "checking absolute name of <stdio.h>... " >&6; }
 if test ${gl_cv_next_stdio_h+y}
 then :
@@ -26594,8 +26823,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
-printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
+printf '%s\n' "$gl_cv_next_stdio_h" >&6; }
      fi
      NEXT_STDIO_H=$gl_cv_next_stdio_h
 
@@ -26612,7 +26841,7 @@ printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
 
 
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
 printf %s "checking which flavor of printf attribute matches inttypes macros... " >&6; }
 if test ${gl_cv_func_printf_attribute_flavor+y}
 then :
@@ -26650,11 +26879,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
-printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
+printf '%s\n' "$gl_cv_func_printf_attribute_flavor" >&6; }
   if test "$gl_cv_func_printf_attribute_flavor" = gnu; then
     
-printf "%s\n" "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
 
   fi
 
@@ -26681,7 +26910,7 @@ printf "%s\n" "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
     HAVE_DECL_FCLOSEALL=0
   fi
 
-ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ecvt" = xyes
 then :
   ac_have_decl=1
@@ -26689,9 +26918,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcvt" = xyes
 then :
   ac_have_decl=1
@@ -26699,9 +26928,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_gcvt" = xyes
 then :
   ac_have_decl=1
@@ -26709,7 +26938,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
 
 
   
@@ -26724,7 +26953,7 @@ printf "%s\n" "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdlib_h='<'stdlib.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
 printf %s "checking absolute name of <stdlib.h>... " >&6; }
 if test ${gl_cv_next_stdlib_h+y}
 then :
@@ -26769,8 +26998,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
-printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
+printf '%s\n' "$gl_cv_next_stdlib_h" >&6; }
      fi
      NEXT_STDLIB_H=$gl_cv_next_stdlib_h
 
@@ -26808,7 +27037,7 @@ printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
 
 
      REPLACE_STRERROR_0=0
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
 printf %s "checking whether strerror(0) succeeds... " >&6; }
 if test ${gl_cv_func_strerror_0_works+y}
 then :
@@ -26864,14 +27093,14 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
-printf "%s\n" "$gl_cv_func_strerror_0_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
+printf '%s\n' "$gl_cv_func_strerror_0_works" >&6; }
   case "$gl_cv_func_strerror_0_works" in
     *yes) ;;
     *)
       REPLACE_STRERROR_0=1
       
-printf "%s\n" "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
+printf '%s\n' "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
 
       ;;
   esac
@@ -26889,7 +27118,7 @@ printf "%s\n" "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_string_h='<'string.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
 printf %s "checking absolute name of <string.h>... " >&6; }
 if test ${gl_cv_next_string_h+y}
 then :
@@ -26934,8 +27163,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
-printf "%s\n" "$gl_cv_next_string_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
+printf '%s\n' "$gl_cv_next_string_h" >&6; }
      fi
      NEXT_STRING_H=$gl_cv_next_string_h
 
@@ -26970,7 +27199,7 @@ printf "%s\n" "$gl_cv_next_string_h" >&6; }
   
 
     
-printf "%s\n" "@%:@define _USE_STD_STAT 1" >>confdefs.h
+printf '%s\n' "@%:@define _USE_STD_STAT 1" >>confdefs.h
 
 
   
@@ -26984,7 +27213,7 @@ printf "%s\n" "@%:@define _USE_STD_STAT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_types_h='<'sys/types.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
 printf %s "checking absolute name of <sys/types.h>... " >&6; }
 if test ${gl_cv_next_sys_types_h+y}
 then :
@@ -27029,8 +27258,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
-printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
+printf '%s\n' "$gl_cv_next_sys_types_h" >&6; }
      fi
      NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
 
@@ -27082,7 +27311,7 @@ printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
 
 
     
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
 printf %s "checking for struct timespec in <time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_time_h+y}
 then :
@@ -27110,8 +27339,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
 
   TIME_H_DEFINES_STRUCT_TIMESPEC=0
   SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
@@ -27120,7 +27349,7 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
   if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
     TIME_H_DEFINES_STRUCT_TIMESPEC=1
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
 printf %s "checking for struct timespec in <sys/time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_sys_time_h+y}
 then :
@@ -27148,12 +27377,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
     if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
       SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
 printf %s "checking for struct timespec in <pthread.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_pthread_h+y}
 then :
@@ -27181,12 +27410,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
       if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
         PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
 printf %s "checking for struct timespec in <unistd.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_unistd_h+y}
 then :
@@ -27214,8 +27443,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
         if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
           UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
         fi
@@ -27241,7 +27470,7 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_time_h='<'time.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
 printf %s "checking absolute name of <time.h>... " >&6; }
 if test ${gl_cv_next_time_h+y}
 then :
@@ -27286,8 +27515,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
-printf "%s\n" "$gl_cv_next_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
+printf '%s\n' "$gl_cv_next_time_h" >&6; }
      fi
      NEXT_TIME_H=$gl_cv_next_time_h
 
@@ -27307,7 +27536,7 @@ printf "%s\n" "$gl_cv_next_time_h" >&6; }
 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
 printf %s "checking for TIME_UTC in <time.h>... " >&6; }
 if test ${gl_cv_time_h_has_TIME_UTC+y}
 then :
@@ -27335,8 +27564,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
-printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
+printf '%s\n' "$gl_cv_time_h_has_TIME_UTC" >&6; }
   if test $gl_cv_time_h_has_TIME_UTC = yes; then
     TIME_H_DEFINES_TIME_UTC=1
   else
@@ -27398,7 +27627,7 @@ printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
   
 
   
-ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_execvpe" = xyes
 then :
   ac_have_decl=1
@@ -27406,7 +27635,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
 
 
       
@@ -27423,7 +27652,7 @@ printf "%s\n" "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_unistd_h='<'unistd.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
 printf %s "checking absolute name of <unistd.h>... " >&6; }
 if test ${gl_cv_next_unistd_h+y}
 then :
@@ -27474,8 +27703,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
-printf "%s\n" "$gl_cv_next_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
+printf '%s\n' "$gl_cv_next_unistd_h" >&6; }
      fi
      NEXT_UNISTD_H=$gl_cv_next_unistd_h
 
@@ -27542,7 +27771,7 @@ q
     LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
   fi
 
-ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27550,9 +27779,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_feof_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27560,9 +27789,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ferror_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27570,9 +27799,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fflush_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27580,9 +27809,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fgets_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27590,9 +27819,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27600,9 +27829,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputs_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27610,9 +27839,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fread_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27620,9 +27849,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27630,9 +27859,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27640,9 +27869,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getchar_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27650,9 +27879,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27660,9 +27889,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putchar_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27670,7 +27899,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
     HAVE_BTOWC=1;         
@@ -27733,7 +27962,7 @@ printf "%s\n" "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
             
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
 printf %s "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
 if test ${gl_cv_header_wchar_h_correct_inline+y}
 then :
@@ -27758,7 +27987,7 @@ _ACEOF
             && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27774,7 +28003,7 @@ _ACEOF
               && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
              if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
                :
@@ -27790,8 +28019,8 @@ _ACEOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
-printf "%s\n" "$gl_cv_header_wchar_h_correct_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
+printf '%s\n' "$gl_cv_header_wchar_h_correct_inline" >&6; }
   if test $gl_cv_header_wchar_h_correct_inline = no; then
     as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
 This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
@@ -27839,7 +28068,7 @@ Configuration aborted." "$LINENO" 5
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_wchar_h='<'wchar.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
 printf %s "checking absolute name of <wchar.h>... " >&6; }
 if test ${gl_cv_next_wchar_h+y}
 then :
@@ -27890,8 +28119,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
-printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
+printf '%s\n' "$gl_cv_next_wchar_h" >&6; }
      fi
      NEXT_WCHAR_H=$gl_cv_next_wchar_h
 
@@ -27935,7 +28164,7 @@ printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
   ac_fn_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" "
       #include <wchar.h>
     
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_wcsdup" = xyes
 then :
   ac_have_decl=1
@@ -27943,7 +28172,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_have_decl_wcsdup = no; then
     HAVE_DECL_WCSDUP=0
@@ -28121,7 +28350,7 @@ printf "%s\n" "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
   
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5
 printf %s "checking for C compiler option to allow warnings... " >&6; }
 if test ${gl_cv_cc_wallow+y}
 then :
@@ -28133,13 +28362,13 @@ else case e in @%:@(
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null
      { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null
                          if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then
        gl_cv_cc_wallow='-Wno-error'
@@ -28150,8 +28379,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5
-printf "%s\n" "$gl_cv_cc_wallow" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5
+printf '%s\n' "$gl_cv_cc_wallow" >&6; }
   case "$gl_cv_cc_wallow" in
     none) GL_CFLAG_ALLOW_WARNINGS='' ;;
     *)    GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;;
@@ -28193,7 +28422,7 @@ EOF
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gl_command\""; } >&5
   (eval $gl_command) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
       gl_options=`grep -v '#' conftest.out`
       for word in $gl_options; do
@@ -28298,7 +28527,7 @@ fi
 
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
 printf %s "checking for __builtin_expect... " >&6; }
 if test ${gl_cv___builtin_expect+y}
 then :
@@ -28344,13 +28573,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
-printf "%s\n" "$gl_cv___builtin_expect" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
+printf '%s\n' "$gl_cv___builtin_expect" >&6; }
   if test "$gl_cv___builtin_expect" = yes; then
-    printf "%s\n" "@%:@define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
+    printf '%s\n' "@%:@define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
 
   elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
-    printf "%s\n" "@%:@define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
+    printf '%s\n' "@%:@define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
 
   fi
   
@@ -28395,7 +28624,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
 
   
@@ -28413,7 +28642,7 @@ printf "%s\n" "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
 
@@ -28432,7 +28661,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
 
 
 
@@ -28440,7 +28669,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
   
   
   
-printf "%s\n" "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
 
 
   
@@ -28460,7 +28689,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -28509,13 +28738,13 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_CLOSE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CLOSE 1" >>confdefs.h
 
 
 
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
@@ -28546,18 +28775,18 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
     
-printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
 printf %s "checking whether dup2 works... " >&6; }
 if test ${gl_cv_func_dup2_works+y}
 then :
@@ -28665,8 +28894,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
-printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
+printf '%s\n' "$gl_cv_func_dup2_works" >&6; }
   case "$gl_cv_func_dup2_works" in
     *yes) ;;
     *)
@@ -28674,7 +28903,7 @@ printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
       ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize"
 if test "x$ac_cv_func_setdtablesize" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETDTABLESIZE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETDTABLESIZE 1" >>confdefs.h
 
 fi
 
@@ -28716,7 +28945,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
 
 
 
@@ -28736,7 +28965,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_ENVIRON 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_ENVIRON 1" >>confdefs.h
 
 
 
@@ -28775,7 +29004,7 @@ fi
 
   
   
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
 printf %s "checking for error_at_line... " >&6; }
 if test ${ac_cv_lib_error_at_line+y}
 then :
@@ -28803,8 +29032,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-printf "%s\n" "$ac_cv_lib_error_at_line" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
+printf '%s\n' "$ac_cv_lib_error_at_line" >&6; }
 
   
      if test "$ac_cv_lib_error_at_line" = no; then
@@ -28855,7 +29084,7 @@ fi
   fi
 
   else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
 printf %s "checking whether fcntl handles F_DUPFD correctly... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_works+y}
 then :
@@ -28933,8 +29162,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
     case $gl_cv_func_fcntl_f_dupfd_works in
       *yes) ;;
       *) 
@@ -28947,11 +29176,11 @@ printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
   fi
 
         
-printf "%s\n" "@%:@define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
+printf '%s\n' "@%:@define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
  ;;
     esac
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
 printf %s "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_cloexec+y}
 then :
@@ -29026,8 +29255,8 @@ fi
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
     case "$gl_cv_func_fcntl_f_dupfd_cloexec" in
       *yes) ;;
       *)    
@@ -29073,7 +29302,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
 
 
 
@@ -29087,7 +29316,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
   
   
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
@@ -29122,13 +29351,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
     
-printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -29168,7 +29397,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
 
 
 
@@ -29236,7 +29465,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
 
 
 
@@ -29247,7 +29476,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
   
   if test $ac_cv_func_getdtablesize = yes &&
      test $ac_cv_have_decl_getdtablesize = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
 printf %s "checking whether getdtablesize works... " >&6; }
 if test ${gl_cv_func_getdtablesize_works+y}
 then :
@@ -29304,8 +29533,8 @@ fi
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
-printf "%s\n" "$gl_cv_func_getdtablesize_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
+printf '%s\n' "$gl_cv_func_getdtablesize_works" >&6; }
     case "$gl_cv_func_getdtablesize_works" in
       *yes | "no (limitation)") ;;
       *) REPLACE_GETDTABLESIZE=1 ;;
@@ -29348,7 +29577,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
 
 
 
@@ -29357,7 +29586,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
   
   ac_found=0
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
@@ -29365,14 +29594,14 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
@@ -29380,14 +29609,14 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include <stdlib.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl___argv" = xyes
 then :
   ac_have_decl=1
@@ -29395,7 +29624,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
@@ -29406,7 +29635,7 @@ fi
   if test $ac_found = 0; then
     # On OpenBSD 5.1, using the global __progname variable appears to be
     # the only way to implement getprogname.
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
 printf %s "checking whether __progname is defined in default libraries... " >&6; }
 if test ${gl_cv_var___progname+y}
 then :
@@ -29437,11 +29666,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
-printf "%s\n" "$gl_cv_var___progname" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
+printf '%s\n' "$gl_cv_var___progname" >&6; }
     if test "$gl_cv_var___progname" = yes; then
       
-printf "%s\n" "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
 
     fi
   fi
@@ -29463,7 +29692,7 @@ printf "%s\n" "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -29494,9 +29723,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -29540,8 +29769,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -29550,11 +29779,11 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
 printf %s "checking whether the compiler supports the __inline keyword... " >&6; }
 if test ${gl_cv_c___inline+y}
 then :
@@ -29582,11 +29811,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
-printf "%s\n" "$gl_cv_c___inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
+printf '%s\n' "$gl_cv_c___inline" >&6; }
   if test $gl_cv_c___inline = yes; then
     
-printf "%s\n" "@%:@define HAVE___INLINE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE___INLINE 1" >>confdefs.h
 
   fi
 
@@ -29652,7 +29881,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -29661,7 +29890,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
   
     
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
@@ -29689,15 +29918,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
      
-printf "%s\n" "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
      
-printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
+printf '%s\n' "@%:@define mbstate_t int" >>confdefs.h
 
    fi
 
@@ -29710,7 +29939,7 @@ printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -29759,7 +29988,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
 
 
 
@@ -29798,7 +30027,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
 
 
   
@@ -29816,7 +30045,7 @@ printf "%s\n" "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
       fi
       
          
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
 printf %s "checking whether open recognizes a trailing slash... " >&6; }
 if test ${gl_cv_func_open_slash+y}
 then :
@@ -29877,12 +30106,12 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
-printf "%s\n" "$gl_cv_func_open_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
+printf '%s\n' "$gl_cv_func_open_slash" >&6; }
   case "$gl_cv_func_open_slash" in
     *no)
       
-printf "%s\n" "@%:@define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
       ;;
   esac
@@ -29934,7 +30163,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
 
 
 
@@ -29942,7 +30171,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
       
 
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
@@ -29950,10 +30179,10 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
@@ -29961,7 +30190,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 
   
   
@@ -29969,7 +30198,7 @@ printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl"
   ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
 if test "x$ac_cv_func_raise" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAISE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAISE 1" >>confdefs.h
 
 fi
 
@@ -30043,7 +30272,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
 
 
 
@@ -30054,7 +30283,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -30101,7 +30330,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
 
 
 
@@ -30149,7 +30378,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
 
 
 
@@ -30159,7 +30388,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
   if test $ac_cv_func_readlink = no; then
     HAVE_READLINK=0
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
 printf %s "checking whether readlink signature is correct... " >&6; }
 if test ${gl_cv_decl_readlink_works+y}
 then :
@@ -30188,9 +30417,9 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
-printf "%s\n" "$gl_cv_decl_readlink_works" >&6; }
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
+printf '%s\n' "$gl_cv_decl_readlink_works" >&6; }
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
 printf %s "checking whether readlink handles trailing slash correctly... " >&6; }
 if test ${gl_cv_func_readlink_trailing_slash+y}
 then :
@@ -30242,8 +30471,8 @@ fi
       rm -f conftest.link conftest.lnk2 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
-printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
+printf '%s\n' "$gl_cv_func_readlink_trailing_slash" >&6; }
     case "$gl_cv_func_readlink_trailing_slash" in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -30252,13 +30481,13 @@ printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
         ;;
       *)
         
-printf "%s\n" "@%:@define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
     esac
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
 printf %s "checking whether readlink truncates results correctly... " >&6; }
 if test ${gl_cv_func_readlink_truncate+y}
 then :
@@ -30309,8 +30538,8 @@ fi
       rm -f conftest.link conftest.lnk2 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
-printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
+printf '%s\n' "$gl_cv_func_readlink_truncate" >&6; }
     case $gl_cv_func_readlink_truncate in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -30319,7 +30548,7 @@ printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
         ;;
       *)
         
-printf "%s\n" "@%:@define READLINK_TRUNCATE_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define READLINK_TRUNCATE_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
@@ -30362,7 +30591,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
 
 
 
@@ -30400,7 +30629,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -30459,7 +30688,7 @@ fi
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -30475,7 +30704,7 @@ fi
   
   if test "$gl_cv_func_malloc_posix" = yes; then
     
-printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC_FOR_MALLOC_POSIX=1
@@ -30491,7 +30720,7 @@ printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
   
   
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
@@ -30526,13 +30755,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
     
-printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -30547,7 +30776,7 @@ printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -30562,7 +30791,7 @@ fi
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -30590,14 +30819,14 @@ fi
   ac_fn_c_check_header_compile "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
 if test "x$ac_cv_header_search_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SEARCH_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SEARCH_H 1" >>confdefs.h
 
 fi
 
   ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
 if test "x$ac_cv_func_tsearch" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_TSEARCH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_TSEARCH 1" >>confdefs.h
 
 fi
 
@@ -30619,7 +30848,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_SIGPIPE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_SIGPIPE 1" >>confdefs.h
 
 
     
@@ -30697,12 +30926,12 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
 
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
 if test ${gt_cv_ssize_t+y}
 then :
@@ -30730,11 +30959,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+printf '%s\n' "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
     
-printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
+printf '%s\n' "@%:@define ssize_t int" >>confdefs.h
 
   fi
 
@@ -30747,7 +30976,7 @@ printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
                   REPLACE_STAT=1
       ;;
     *)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
 printf %s "checking whether stat handles trailing slashes on files... " >&6; }
 if test ${gl_cv_func_stat_file_slash+y}
 then :
@@ -30806,13 +31035,13 @@ fi
          rm -f conftest.tmp conftest.lnk ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
-printf "%s\n" "$gl_cv_func_stat_file_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
+printf '%s\n' "$gl_cv_func_stat_file_slash" >&6; }
       case $gl_cv_func_stat_file_slash in
         *no)
           REPLACE_STAT=1
           
-printf "%s\n" "@%:@define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
+printf '%s\n' "@%:@define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
 ;;
       esac
       case $host_os in
@@ -30874,7 +31103,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
 
 
 
@@ -30888,9 +31117,9 @@ printf "%s\n" "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
 if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
 printf %s "checking whether struct stat.st_atim is of type struct timespec... " >&6; }
 if test ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+y}
 then :
@@ -30928,11 +31157,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
-printf "%s\n" "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
+printf '%s\n' "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
      if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then
        
-printf "%s\n" "@%:@define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
+printf '%s\n' "@%:@define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
 
      fi
 else case e in @%:@(
@@ -30942,7 +31171,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30952,7 +31181,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30962,7 +31191,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -30986,7 +31215,7 @@ fi
 if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30996,7 +31225,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -31006,7 +31235,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -31019,7 +31248,7 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
 printf %s "checking for working stdalign.h... " >&6; }
 if test ${gl_cv_header_working_stdalign_h+y}
 then :
@@ -31077,8 +31306,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdalign_h" >&6; }
 
   if test $gl_cv_header_working_stdalign_h = yes; then
     GL_GENERATE_STDALIGN_H=false
@@ -31335,13 +31564,13 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FSCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FSCANF 1" >>confdefs.h
 
 
 
   
   
-printf "%s\n" "@%:@define GNULIB_FSCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_FSCANF 1" >>confdefs.h
 
 
   
@@ -31359,13 +31588,13 @@ printf "%s\n" "@%:@define GNULIB_FSCANF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_SCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_SCANF 1" >>confdefs.h
 
 
 
   
   
-printf "%s\n" "@%:@define GNULIB_SCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_SCANF 1" >>confdefs.h
 
 
   
@@ -31383,7 +31612,7 @@ printf "%s\n" "@%:@define GNULIB_SCANF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
 
 
 
@@ -31402,7 +31631,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
 
 
 
@@ -31421,7 +31650,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
 
 
@@ -31440,7 +31669,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
 
 
 
@@ -31459,7 +31688,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
 
 
 
@@ -31478,7 +31707,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
 
 
@@ -31497,7 +31726,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
 
 
@@ -31516,7 +31745,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
 
 
@@ -31535,7 +31764,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
 
 
@@ -31554,7 +31783,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
 
 
@@ -31573,7 +31802,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
 
 
 
@@ -31592,7 +31821,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
 
 
@@ -31611,7 +31840,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
 
 
@@ -31630,7 +31859,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
 
 
 
@@ -31649,7 +31878,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
 
 
 
@@ -31666,7 +31895,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
   
      
   if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
 printf %s "checking for working strerror function... " >&6; }
 if test ${gl_cv_func_working_strerror+y}
 then :
@@ -31711,8 +31940,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
-printf "%s\n" "$gl_cv_func_working_strerror" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
+printf '%s\n' "$gl_cv_func_working_strerror" >&6; }
     case "$gl_cv_func_working_strerror" in
       *yes) ;;
       *)
@@ -31740,7 +31969,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_STRERROR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_STRERROR 1" >>confdefs.h
 
 
   
@@ -31763,7 +31992,7 @@ printf "%s\n" "@%:@define GNULIB_STRERROR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_STRERROR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_STRERROR 1" >>confdefs.h
 
 
 
@@ -31793,7 +32022,7 @@ fi
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -31946,10 +32175,10 @@ fi
 
 
   
-printf "%s\n" "@%:@define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
 
   
-printf "%s\n" "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
+printf '%s\n' "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
 
   
       
@@ -31969,7 +32198,7 @@ printf "%s\n" "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs
   
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5
 printf %s "checking for variable-length arrays... " >&6; }
 if test ${ac_cv_c_vararrays+y}
 then :
@@ -32039,15 +32268,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5
-printf "%s\n" "$ac_cv_c_vararrays" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5
+printf '%s\n' "$ac_cv_c_vararrays" >&6; }
   if test "$ac_cv_c_vararrays" = yes; then
         
-printf "%s\n" "@%:@define HAVE_C_VARARRAYS 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_C_VARARRAYS 1" >>confdefs.h
 
   elif test "$ac_cv_c_vararrays" = no; then
     
-printf "%s\n" "@%:@define __STDC_NO_VLA__ 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_NO_VLA__ 1" >>confdefs.h
 
   fi
 
@@ -32176,44 +32405,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -32225,8 +32417,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -32240,8 +32432,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -32258,7 +32450,7 @@ U=
 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -32269,14 +32461,14 @@ LIB@&t@OBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
 printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf '%s\n' "done" >&6; }
 case $enable_silent_rules in @%:@ (((
   yes) AM_DEFAULT_VERBOSITY=0;;
    no) AM_DEFAULT_VERBOSITY=1;;
@@ -32374,13 +32566,21 @@ fi
   
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in @%:@(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -32394,7 +32594,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -32406,7 +32606,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -32493,7 +32693,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -32509,9 +32709,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -32606,7 +32806,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -32628,29 +32828,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -32692,7 +32869,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -32701,7 +32878,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32754,19 +32931,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by libiconv $as_me 1.17, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -32788,7 +32965,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -32796,7 +32973,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -32828,16 +33005,16 @@ $config_commands
 Report bugs to the package provider."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 libiconv config.status 1.17
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -32846,10 +33023,14 @@ srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -32877,15 +33058,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -32893,7 +33074,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -32902,7 +33083,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -32926,29 +33107,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
 @%:@@%:@ Running $as_me. @%:@@%:@
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -32997,6 +33178,7 @@ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
@@ -33179,6 +33361,7 @@ file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
+lt_ar_flags \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -33323,7 +33506,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -33416,13 +33599,13 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -33433,7 +33616,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -33478,9 +33661,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -33509,7 +33692,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -33541,7 +33724,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -33612,9 +33795,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -33632,8 +33815,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -33648,7 +33835,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -33692,7 +33879,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -33700,17 +33887,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -33727,7 +33914,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33751,9 +33938,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -33798,7 +33985,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -33815,10 +34002,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -33832,11 +34019,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -33860,9 +34047,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -33878,20 +34065,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -33911,7 +34098,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$_am_arg" |
+printf '%s\n' X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33931,8 +34118,8 @@ printf "%s\n" X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
   
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -33958,7 +34145,7 @@ esac
   for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    am_mf=`printf '%s\n' "$am_mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile which includes
     # dependency-tracking related rules and includes.
     # Grep'ing the whole file directly is not great: AIX grep has a line
@@ -33970,7 +34157,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$am_mf" : 'X\(//\)[^/]' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$am_mf" |
+printf '%s\n' X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33992,7 +34179,7 @@ printf "%s\n" X"$am_mf" |
 $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$am_mf" |
+printf '%s\n' X/"$am_mf" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -34017,8 +34204,8 @@ printf "%s\n" X/"$am_mf" |
    (exit $ac_status); } || am_rc=$?
   done
   if test $am_rc -ne 0; then
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
     for automatic dependency tracking.  If GNU make was not used, consider
     re-running the configure script with MAKE=\"gmake\" (or whatever is
@@ -34054,7 +34241,7 @@ See 'config.log' for more details" "$LINENO" 5; }
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -34177,6 +34364,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
 # A file(cmd) program that detects file types.
 FILECMD=$lt_FILECMD
 
@@ -34199,7 +34389,7 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 AR=$lt_AR
 
 # Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
+lt_ar_flags=$lt_lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}
@@ -34808,7 +34998,9 @@ _LT_EOF
                 #      presentlang can be used as a fallback for messages
                 #      which are not translated in the desiredlang catalog).
                 case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
+                  "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+                    useit=yes
+                    ;;
                 esac
               done
               if test $useit = yes; then
@@ -34843,7 +35035,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -34859,11 +35051,18 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in @%:@(
+  -*) :
+    ac_no_opts=-- ;; @%:@(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
@@ -34909,7 +35108,7 @@ if test "$no_recursion" != yes; then
       ;;
     *)
       case $ac_arg in
-      *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
       as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
     esac
@@ -34919,7 +35118,7 @@ if test "$no_recursion" != yes; then
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -34940,17 +35139,17 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    printf "%s\n" "$ac_msg" >&6
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
+    printf '%s\n' "$ac_msg" >&6
     as_dir="$ac_dir"; as_fn_mkdir_p
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -34987,8 +35186,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
     elif test -f "$ac_srcdir/configure"; then
       ac_sub_configure=$ac_srcdir/configure
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
+printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
@@ -35001,8 +35200,8 @@ printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+printf '%s\n' "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
@@ -35013,8 +35212,8 @@ printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args -
   done
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
    
\ No newline at end of file
diff --git a/recipes/libs/libiconv/source/autom4te.cache/output.3 b/recipes/libs/libiconv/source/autom4te.cache/output.3
index 0a3af0c2c4..665a193d7b 100644
--- a/recipes/libs/libiconv/source/autom4te.cache/output.3
+++ b/recipes/libs/libiconv/source/autom4te.cache/output.3
@@ -1,9 +1,9 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.72 for libiconv 1.17.
+@%:@ Generated by GNU Autoconf 2.73 for libiconv 1.17.
 @%:@ 
 @%:@ 
-@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 @%:@ Inc.
 @%:@ 
 @%:@ 
@@ -20,7 +20,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -107,7 +107,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -129,10 +129,13 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -143,7 +146,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -261,22 +264,25 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -336,7 +342,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -345,7 +351,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -428,9 +434,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -457,7 +463,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -503,7 +509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -517,29 +523,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -600,6 +583,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIB@&t@OBJS=
@@ -1544,6 +1528,8 @@ BROKEN_WCHAR_H
 USE_MBSTATE_T
 HAVE_WCHAR_T
 ICONV_CONST
+localedir_c_make
+localedir_c
 POSUB
 LTLIBINTL
 LIBINTL
@@ -1663,13 +1649,13 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -1846,7 +1832,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1872,7 +1858,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -2085,7 +2071,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2101,7 +2087,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -2145,9 +2131,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -2155,7 +2141,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -2163,7 +2149,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -2227,7 +2213,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -2433,9 +2419,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2472,7 +2458,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2482,9 +2468,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libiconv configure 1.17
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2508,7 +2494,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2516,7 +2502,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2524,7 +2510,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -2547,7 +2533,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2555,7 +2541,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2563,7 +2549,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -2581,7 +2567,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2603,8 +2589,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_header_compile
@@ -2622,7 +2608,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2630,7 +2616,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -2641,7 +2627,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -2663,7 +2649,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2715,8 +2701,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_func
@@ -2734,26 +2720,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -2967,7 +2953,7 @@ rm -f conftest.val
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -3013,8 +2999,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_type
@@ -3031,7 +3017,7 @@ ac_fn_check_decl ()
   fi
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 printf %s "checking whether $as_decl_name is declared... " >&6; }
 if eval test \${$3+y}
 then :
@@ -3071,8 +3057,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   ac_compile="$ac_save_ac_compile"
 
@@ -3085,7 +3071,7 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 printf %s "checking for $2.$3... " >&6; }
 if eval test \${$4+y}
 then :
@@ -3135,8 +3121,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_member
@@ -3145,7 +3131,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -3157,7 +3143,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?@<:@ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -3165,7 +3151,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libiconv $as_me 1.17, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -3205,7 +3191,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -3240,7 +3226,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -3269,31 +3255,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -3302,67 +3279,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -3371,21 +3376,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -3407,12 +3412,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -3422,27 +3427,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -3522,7 +3620,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -3533,7 +3632,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -3621,15 +3720,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -3645,13 +3744,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -3805,7 +3903,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -3818,7 +3916,7 @@ do
   esac
   as_found=:
   
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -3829,13 +3927,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -3847,7 +3945,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -3900,38 +3998,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -3941,10 +4045,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -3952,6 +4056,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3979,7 +4100,7 @@ am__api_version='1.18'
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -4002,8 +4123,8 @@ case $as_dir in @%:@((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4053,8 +4174,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -4064,7 +4185,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
 printf %s "checking whether sleep supports fractional seconds... " >&6; }
 if test ${am_cv_sleep_fractional_seconds+y}
 then :
@@ -4080,10 +4201,10 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
-printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf '%s\n' "$am_cv_sleep_fractional_seconds" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
 printf %s "checking filesystem timestamp resolution... " >&6; }
 if test ${am_cv_filesystem_timestamp_resolution+y}
 then :
@@ -4135,9 +4256,9 @@ if (
   # if, for instance, CONFIG_SHELL is bash and it inherits a
   # broken ls alias from the environment.  This has actually
   # happened.  Such a system could not be considered "sane".
-  printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  printf '%s\n' ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "ls -t produces unexpected output.
 Make sure there is not a broken ls alias in your environment.
 See 'config.log' for more details" "$LINENO" 5; }
@@ -4218,12 +4339,12 @@ rm -f conftest.ts?
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
-printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf '%s\n' "$am_cv_filesystem_timestamp_resolution" >&6; }
 
 # This check should not be cached, as it may vary across builds of
 # different projects.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
@@ -4231,14 +4352,14 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
@@ -4268,8 +4389,8 @@ for am_try in 1 2; do
   am_has_slept=yes
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
-printf "%s\n" "$am_build_env_is_sane" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf '%s\n' "$am_build_env_is_sane" >&6; }
 if test "$am_build_env_is_sane" = no; then
   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
@@ -4298,7 +4419,7 @@ test "$program_suffix" != NONE &&
 # Double any \ or $.
 # By default was 's,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf '%s\n' "$program_transform_name" | sed "$ac_script"`
 
 
 # Expand $ac_aux_dir to an absolute path.
@@ -4313,8 +4434,8 @@ if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf '%s\n' "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -4334,7 +4455,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -4355,7 +4476,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4367,11 +4488,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4380,7 +4501,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -4401,7 +4522,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4413,11 +4534,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -4425,8 +4546,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -4439,7 +4560,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
 printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test ${ac_cv_path_mkdir+y}
@@ -4482,14 +4603,14 @@ fi
     MKDIR_P='mkdir -p'
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf '%s\n' "$MKDIR_P" >&6; }
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -4510,7 +4631,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4522,21 +4643,21 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -4544,7 +4665,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -4557,12 +4678,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4583,13 +4704,13 @@ then :
 fi
 
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 printf %s "checking whether $am_make supports nested variables... " >&6; }
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) if printf "%s\n" 'TRUE=$(BAR$(V))
+  e) if printf '%s\n' 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -4602,8 +4723,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf '%s\n' "$am_cv_make_support_nested_variables" >&6; }
 AM_BACKSLASH='\'
 
 am__rm_f_notfound=
@@ -4616,7 +4737,7 @@ esac
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
 printf %s "checking xargs -n works... " >&6; }
 if test ${am_cv_xargs_n_works+y}
 then :
@@ -4632,8 +4753,8 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
-printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf '%s\n' "$am_cv_xargs_n_works" >&6; }
 if test "$am_cv_xargs_n_works" = yes
 then :
   am__xargs_n='xargs -n'
@@ -4668,10 +4789,10 @@ fi
  VERSION='1.17'
 
 
-printf "%s\n" "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
  
-printf "%s\n" "@%:@define VERSION \"$VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -4717,34 +4838,34 @@ _am_tools='gnutar plaintar pax cpio none'
       # (that is, avoid stderr redirection).
       am_uid=`id -u || echo unknown`
       am_gid=`id -g || echo unknown`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
 printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
       if test x$am_uid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
       elif test $am_uid -le $am_max_uid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
 printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
       if test x$gm_gid = xunknown; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
+printf '%s\n' "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
       elif test $am_gid -le $am_max_gid; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
         _am_tools=none
       fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
 printf %s "checking how to create a ustar tar archive... " >&6; }
 
   # Go ahead even if we have the value already cached.  We do so because we
@@ -4828,8 +4949,8 @@ else case e in @%:@(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
-printf "%s\n" "$am_cv_prog_tar_ustar" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+printf '%s\n' "$am_cv_prog_tar_ustar" >&6; }
 
 
 
@@ -4856,10 +4977,10 @@ fi
 
 ac_config_headers="$ac_config_headers config.h lib/config.h"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -4867,7 +4988,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -4880,12 +5001,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4900,6 +5021,9 @@ fi
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4908,7 +5032,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -4929,7 +5053,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4941,11 +5065,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4954,7 +5078,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -4975,7 +5099,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4987,11 +5111,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -4999,8 +5123,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5013,7 +5137,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5034,7 +5158,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5046,11 +5170,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5059,7 +5183,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5085,7 +5209,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5109,11 +5233,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5124,7 +5248,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5145,7 +5269,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5157,11 +5281,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5174,7 +5298,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5195,7 +5319,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5207,11 +5331,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5223,8 +5347,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5236,7 +5360,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5257,7 +5381,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5269,11 +5393,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5282,7 +5406,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5303,7 +5427,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5315,11 +5439,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5327,8 +5451,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5340,13 +5464,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -5356,7 +5480,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -5366,7 +5490,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -5386,9 +5510,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -5409,10 +5533,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -5453,29 +5577,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -5483,10 +5607,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -5503,15 +5627,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -5534,7 +5658,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -5543,10 +5667,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -5554,31 +5678,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -5602,10 +5726,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -5617,11 +5741,11 @@ then :
   esac
 done
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -5629,11 +5753,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -5665,8 +5789,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -5676,7 +5800,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -5744,8 +5868,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -5764,7 +5888,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -5776,7 +5949,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -5793,16 +5966,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -5813,7 +5986,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -5842,16 +6015,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -5862,7 +6035,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -5891,16 +6064,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -5922,7 +6095,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
 printf %s "checking whether $CC understands -c and -o together... " >&6; }
 if test ${am_cv_prog_cc_c_o+y}
 then :
@@ -5964,8 +6137,8 @@ _ACEOF
   unset am_i ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf '%s\n' "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -5982,7 +6155,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
 printf %s "checking whether the compiler is clang... " >&6; }
 if test ${gl_cv_compiler_clang+y}
 then :
@@ -6015,11 +6188,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
-printf "%s\n" "$gl_cv_compiler_clang" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
+printf '%s\n' "$gl_cv_compiler_clang" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
 printf %s "checking for compiler option needed when checking for declarations... " >&6; }
 if test ${gl_cv_compiler_check_decl_option+y}
 then :
@@ -6054,8 +6227,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
-printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
+printf '%s\n' "$gl_cv_compiler_check_decl_option" >&6; }
   if test "x$gl_cv_compiler_check_decl_option" != xnone; then
     ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
   else
@@ -6066,7 +6239,7 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
 printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
 cat > confinc.mk << 'END'
 am__doit:
@@ -6103,8 +6276,8 @@ esac
   fi
 done
 rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf '%s\n' "${_am_result}" >&6; }
 
 @%:@ Check whether --enable-dependency-tracking was given.
 if test ${enable_dependency_tracking+y}
@@ -6129,7 +6302,7 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CC_dependencies_compiler_type+y}
 then :
@@ -6242,8 +6415,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if 
@@ -6262,7 +6435,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -6333,8 +6506,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -6382,8 +6555,8 @@ if $ac_preproc_ok
 then :
   
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -6399,7 +6572,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_STRIP+y}
 then :
@@ -6422,7 +6595,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_STRIP="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6436,11 +6609,11 @@ esac
 fi
 STRIP=$ac_cv_path_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
  # Installed binaries are usually stripped using 'strip' when the user
@@ -6451,7 +6624,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -6472,7 +6645,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6484,11 +6657,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6497,7 +6670,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -6518,7 +6691,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6530,11 +6703,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6542,8 +6715,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6562,7 +6735,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -6578,8 +6751,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -6595,10 +6768,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -6613,8 +6786,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -6630,7 +6803,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -6648,7 +6821,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -6668,7 +6841,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
   
-printf "%s\n" "@%:@define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "@%:@define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -6677,7 +6850,7 @@ fi
     
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
@@ -6706,10 +6879,10 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
@@ -6760,49 +6933,51 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "@%:@define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "@%:@define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "@%:@define _MINIX 1" >>confdefs.h
+    printf '%s\n' "@%:@define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
 
 else case e in @%:@(
   e) MINIX= ;;
@@ -6810,12 +6985,12 @@ esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
@@ -6826,13 +7001,13 @@ fi
   case "$host_os" in
     openbsd*)
       
-printf "%s\n" "@%:@define _ISOC11_SOURCE 1" >>confdefs.h
+printf '%s\n' "@%:@define _ISOC11_SOURCE 1" >>confdefs.h
 
       ;;
   esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
 printf %s "checking for egrep -e... " >&6; }
 if test ${ac_cv_path_EGREP_TRADITIONAL+y}
 then :
@@ -6869,7 +7044,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6931,7 +7106,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6962,14 +7137,14 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
-printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf '%s\n' "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
  EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
 
 
           
     
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
 printf %s "checking for Minix Amsterdam compiler... " >&6; }
 if test ${gl_cv_c_amsterdam_compiler+y}
 then :
@@ -6997,8 +7172,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
-printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
+printf '%s\n' "$gl_cv_c_amsterdam_compiler" >&6; }
 
       if test $gl_cv_c_amsterdam_compiler = yes; then
     if test -z "$AR"; then
@@ -7014,7 +7189,7 @@ printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -7035,7 +7210,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7047,11 +7222,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7060,7 +7235,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -7081,7 +7256,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7093,11 +7268,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -7105,8 +7280,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -7128,7 +7303,7 @@ fi
             if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
@@ -7149,7 +7324,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7161,11 +7336,11 @@ esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7174,7 +7349,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
@@ -7195,7 +7370,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7207,11 +7382,11 @@ esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -7219,8 +7394,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -7241,7 +7416,7 @@ fi
 
 if test "$enable_largefile" != no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 printf %s "checking for special C compiler options needed for large files... " >&6; }
 if test ${ac_cv_sys_largefile_CC+y}
 then :
@@ -7293,13 +7468,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf '%s\n' "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
 if test ${ac_cv_sys_file_offset_bits+y}
 then :
@@ -7367,18 +7542,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf '%s\n' "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *) 
-printf "%s\n" "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
+printf '%s\n' "@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   case $ac_cv_sys_file_offset_bits in @%:@(
   unknown) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
 if test ${ac_cv_sys_large_files+y}
 then :
@@ -7446,12 +7621,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-printf "%s\n" "$ac_cv_sys_large_files" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf '%s\n' "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *) 
-printf "%s\n" "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
+printf '%s\n' "@%:@define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest* ;; @%:@(
@@ -7466,7 +7641,7 @@ fi
  if test "$enable_year2038" != no
 then :
   
-                            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
+                            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
 printf %s "checking for time_t past the year 2038... " >&6; }
 if test ${gl_cv_type_time_t_y2038+y}
 then :
@@ -7495,10 +7670,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
-printf "%s\n" "$gl_cv_type_time_t_y2038" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
+printf '%s\n' "$gl_cv_type_time_t_y2038" >&6; }
   if test "$gl_cv_type_time_t_y2038" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
 printf %s "checking for 64-bit time_t with _TIME_BITS=64... " >&6; }
 if test ${gl_cv_type_time_t_bits_macro+y}
 then :
@@ -7529,14 +7704,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
-printf "%s\n" "$gl_cv_type_time_t_bits_macro" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
+printf '%s\n' "$gl_cv_type_time_t_bits_macro" >&6; }
     if test "$gl_cv_type_time_t_bits_macro" = yes; then
       
-printf "%s\n" "@%:@define _TIME_BITS 64" >>confdefs.h
+printf '%s\n' "@%:@define _TIME_BITS 64" >>confdefs.h
 
             
-printf "%s\n" "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
+printf '%s\n' "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
 
       gl_cv_type_time_t_y2038=yes
     fi
@@ -7553,8 +7728,8 @@ printf "%s\n" "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "The 'time_t' type stops working after January 2038.
           Remove _USE_32BIT_TIME_T from the compiler flags.
 See 'config.log' for more details" "$LINENO" 5; }
@@ -7565,11 +7740,11 @@ else case e in @%:@(
        # problem.  Otherwise, just warn the builder.
        
        if test "$gl_warned_about_y2038" != yes; then
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5
-printf "%s\n" "$as_me: WARNING: The 'time_t' type stops working after January 2038,
+printf '%s\n' "$as_me: WARNING: The 'time_t' type stops working after January 2038,
             and this package needs a wider 'time_t' type
             if there is any way to access timestamps after that.
             Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;}
@@ -7592,7 +7767,7 @@ fi
   case "$host_os" in
     mingw*)
       
-printf "%s\n" "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
+printf '%s\n' "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 
       ;;
   esac
@@ -7709,14 +7884,14 @@ printf "%s\n" "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
     
     
@@ -7754,7 +7929,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -7781,12 +7956,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -7802,7 +7977,7 @@ esac
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -7845,7 +8020,7 @@ case `"$ac_path_SED" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7874,8 +8049,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -7892,7 +8067,7 @@ Xsed="$SED -e 1s/^X//"
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -7929,7 +8104,7 @@ case `"$ac_path_GREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7958,12 +8133,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -8003,7 +8178,7 @@ case `"$ac_path_EGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8033,14 +8208,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
  
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -8080,7 +8255,7 @@ case `"$ac_path_FGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8110,8 +8285,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
  
 
@@ -8147,7 +8322,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -8177,10 +8352,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -8216,14 +8391,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -8240,8 +8415,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -8252,7 +8427,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -8308,8 +8483,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -8322,7 +8497,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -8343,7 +8518,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8355,11 +8530,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8372,7 +8547,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -8393,7 +8568,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8405,11 +8580,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8421,8 +8596,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -8450,7 +8625,7 @@ test -z "$NM" && NM=nm
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -8472,22 +8647,22 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -8505,9 +8680,9 @@ else case e in @%:@(
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -8620,11 +8795,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -8668,7 +8843,7 @@ esac
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -8710,14 +8885,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -8739,14 +8914,85 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+case $host in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+      
+    
+    
+    
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+  
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in @%:@(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; @%:@(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; @%:@(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+        
+fi
+     ;; @%:@(
+  *) :
+     ;;
+esac
+  
+ ;; @%:@(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -8755,8 +9001,8 @@ else case e in @%:@(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -8771,7 +9017,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -8788,7 +9034,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -8809,7 +9055,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8822,11 +9068,11 @@ esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8839,7 +9085,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -8860,7 +9106,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8872,11 +9118,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8885,7 +9131,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -8906,7 +9152,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8918,11 +9164,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -8930,8 +9176,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -8947,7 +9193,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -9064,16 +9310,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -9160,8 +9402,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -9205,7 +9447,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -9226,7 +9468,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9238,11 +9480,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9251,7 +9493,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -9272,7 +9514,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9284,11 +9526,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -9296,8 +9538,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -9314,7 +9556,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -9343,8 +9585,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -9359,7 +9601,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -9380,7 +9622,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9392,11 +9634,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9409,7 +9651,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -9430,7 +9672,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9442,11 +9684,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9458,8 +9700,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -9495,7 +9737,7 @@ lt_ar_flags=$AR_FLAGS
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -9520,7 +9762,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -9528,7 +9770,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -9541,8 +9783,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -9559,7 +9801,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -9580,7 +9822,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9592,11 +9834,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9605,7 +9847,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -9626,7 +9868,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9638,11 +9880,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -9650,8 +9892,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -9741,7 +9983,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -9801,13 +10043,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -9821,22 +10063,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -9857,8 +10099,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -9898,7 +10142,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
@@ -9971,7 +10215,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -10007,11 +10251,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -10057,7 +10301,7 @@ fi
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 @%:@ Check whether --with-sysroot was given.
@@ -10085,20 +10329,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -10143,11 +10387,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -10164,8 +10408,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
     
     
@@ -10205,7 +10449,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -10225,7 +10469,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -10263,7 +10507,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -10304,7 +10548,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -10367,7 +10611,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -10407,8 +10651,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -10421,7 +10665,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -10458,7 +10702,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -10479,7 +10723,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10491,11 +10735,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10504,7 +10748,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -10525,7 +10769,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10537,11 +10781,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -10549,8 +10793,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -10560,7 +10804,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -10576,8 +10820,8 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -10592,7 +10836,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -10613,7 +10857,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10625,11 +10869,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10638,7 +10882,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -10659,7 +10903,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10671,11 +10915,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -10683,8 +10927,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -10696,7 +10940,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -10717,7 +10961,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10729,11 +10973,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10742,7 +10986,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -10763,7 +11007,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10775,11 +11019,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -10787,8 +11031,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -10800,7 +11044,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -10821,7 +11065,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10833,11 +11077,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10846,7 +11090,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -10867,7 +11111,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10879,11 +11123,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -10891,8 +11135,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -10904,7 +11148,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -10925,7 +11169,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10937,11 +11181,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10950,7 +11194,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -10971,7 +11215,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10983,11 +11227,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -10995,8 +11239,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -11008,7 +11252,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -11029,7 +11273,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11041,11 +11285,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11054,7 +11298,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -11075,7 +11319,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11087,11 +11331,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -11099,8 +11343,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -11135,7 +11379,7 @@ fi
     
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -11170,12 +11414,12 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
     # Feature test to disable chained fixups since it is not
     # compatible with '-undefined dynamic_lookup'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
 printf %s "checking for -no_fixup_chains linker flag... " >&6; }
 if test ${lt_cv_support_no_fixup_chains+y}
 then :
@@ -11209,10 +11453,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -11246,10 +11490,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -11283,8 +11527,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -11373,7 +11617,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_inc
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -11420,7 +11664,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -11441,7 +11685,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11453,11 +11697,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11466,7 +11710,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -11487,7 +11731,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11499,11 +11743,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -11511,8 +11755,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -11524,7 +11768,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -11545,7 +11789,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11557,11 +11801,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11570,7 +11814,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -11591,7 +11835,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11603,11 +11847,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -11615,8 +11859,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -11628,7 +11872,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -11649,7 +11893,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11661,11 +11905,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11674,7 +11918,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -11695,7 +11939,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11707,11 +11951,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -11719,8 +11963,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -11857,7 +12101,7 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
   
 @%:@ Check whether --with-aix-soname was given.
@@ -11884,8 +12128,8 @@ fi
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -11967,7 +12211,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -11984,15 +12228,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
     
     
     
 
-printf "%s\n" "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -12038,7 +12282,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12093,11 +12337,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     
@@ -12106,7 +12350,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12161,11 +12405,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12246,7 +12490,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -12273,9 +12517,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -12283,8 +12527,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -12422,7 +12666,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -12473,7 +12717,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -12489,7 +12739,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -12512,6 +12762,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -12569,18 +12825,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -12662,7 +12906,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -12671,15 +12915,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -12706,9 +12950,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -12716,8 +12960,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -12745,7 +12989,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -12761,9 +13005,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -12775,8 +13019,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -12790,7 +13034,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -12821,9 +13065,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -12839,15 +13083,15 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
     
     
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -12878,9 +13122,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -12896,8 +13140,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -12905,7 +13149,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -12913,11 +13157,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -12929,7 +13173,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -13123,17 +13367,17 @@ _LT_EOF
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -13142,7 +13386,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -13162,6 +13405,11 @@ _LT_EOF
       archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -13187,7 +13435,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
@@ -13242,16 +13490,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -13650,8 +13888,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -13661,14 +13899,20 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -13700,7 +13944,7 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
@@ -13834,7 +14078,7 @@ fi
 	
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -13850,9 +14094,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
@@ -13864,8 +14108,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -13905,7 +14149,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -13929,8 +14173,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -13945,6 +14189,9 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -13956,12 +14203,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -14008,17 +14249,17 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -14027,7 +14268,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -14053,8 +14293,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -14071,21 +14311,21 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -14221,8 +14461,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -14258,7 +14498,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -14270,7 +14510,7 @@ else case e in @%:@(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -14288,7 +14528,7 @@ else case e in @%:@(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -14303,8 +14543,8 @@ else case e in @%:@(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -14463,7 +14703,7 @@ esac
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -14756,8 +14996,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -15024,6 +15264,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -15134,6 +15386,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -15152,30 +15406,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -15220,9 +15452,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -15496,7 +15733,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -15547,7 +15784,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -15563,7 +15806,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -15586,6 +15829,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -15643,18 +15892,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -15736,7 +15973,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -15745,15 +15982,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -15780,9 +16017,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -15790,8 +16027,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -15813,7 +16050,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -15829,9 +16066,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -15843,8 +16080,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -15865,8 +16102,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15987,7 +16224,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -16012,8 +16249,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -16057,7 +16294,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16098,8 +16335,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -16128,7 +16365,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -16169,8 +16406,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -16180,7 +16417,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16221,13 +16458,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -16268,13 +16505,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -16315,8 +16552,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -16362,7 +16599,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -16446,7 +16683,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16465,12 +16702,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -16554,7 +16791,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16573,8 +16810,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -16612,40 +16849,40 @@ fi
   
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -16663,12 +16900,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -16693,15 +16930,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
   
 
@@ -16722,11 +16959,18 @@ CC=$lt_save_CC
 
 
 
+
        
        
 
 
 
+
+
+
+
+
+
 
 
         ac_config_commands="$ac_config_commands libtool"
@@ -16762,16 +17006,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -16788,7 +17032,7 @@ else case e in @%:@(
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -16818,9 +17062,9 @@ else case e in @%:@(
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -16837,7 +17081,7 @@ else case e in @%:@(
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -16895,14 +17139,14 @@ fi
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
@@ -16919,13 +17163,13 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 printf %s "checking for shared library path variable... " >&6; }
 if test ${acl_cv_libpath+y}
 then :
@@ -16940,12 +17184,12 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-printf "%s\n" "$acl_cv_libpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+printf '%s\n' "$acl_cv_libpath" >&6; }
   shlibpath_var="$acl_cv_shlibpath_var"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
 printf %s "checking whether to activate relocatable installation... " >&6; }
   @%:@ Check whether --enable-relocatable was given.
 if test ${enable_relocatable+y}
@@ -16962,8 +17206,8 @@ esac
 fi
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-printf "%s\n" "$RELOCATABLE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+printf '%s\n' "$RELOCATABLE" >&6; }
 
 
   
@@ -16973,11 +17217,13 @@ printf "%s\n" "$RELOCATABLE" >&6; }
     reloc_final_prefix="$prefix"
   fi
   
-printf "%s\n" "@%:@define INSTALLPREFIX \"${reloc_final_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+@%:@define INSTALLPREFIX "${reloc_final_prefix}"
+_ACEOF
 
   if test $RELOCATABLE = yes; then
     
-printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
 
   fi
 
@@ -16998,14 +17244,14 @@ printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
 if test "x$ac_cv_header_mach_o_dyld_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
 
 fi
 
     ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
 if test "x$ac_cv_func__NSGetExecutablePath" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
 
 fi
 
@@ -17024,7 +17270,7 @@ fi
         ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
 if test "x$ac_cv_func_copy_file_range" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
@@ -17122,7 +17368,7 @@ fi
 if test ${enable_extra_encodings+y}
 then :
   enableval=$enable_extra_encodings; 
-printf "%s\n" "@%:@define ENABLE_EXTRA 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_EXTRA 1" >>confdefs.h
 
    USE_EXTRA_ENCODINGS=yes
 else case e in @%:@(
@@ -17133,7 +17379,7 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to copy files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to copy files" >&5
 printf %s "checking how to copy files... " >&6; }
 if test ${cl_cv_prog_cp+y}
 then :
@@ -17151,11 +17397,11 @@ rm -f conftest*
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_cp" >&5
-printf "%s\n" "$cl_cv_prog_cp" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_cp" >&5
+printf '%s\n' "$cl_cv_prog_cp" >&6; }
 CP="$cl_cv_prog_cp"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to make hard links" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to make hard links" >&5
 printf %s "checking how to make hard links... " >&6; }
 if test ${cl_cv_prog_LN+y}
 then :
@@ -17173,19 +17419,19 @@ rm -f conftestdata conftestfile
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_LN" >&5
-printf "%s\n" "$cl_cv_prog_LN" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cl_cv_prog_LN" >&5
+printf '%s\n' "$cl_cv_prog_LN" >&6; }
 LN="$cl_cv_prog_LN"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 
@@ -17197,7 +17443,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RC+y}
 then :
@@ -17218,7 +17464,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17230,11 +17476,11 @@ esac
 fi
 RC=$ac_cv_prog_RC
 if test -n "$RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
-printf "%s\n" "$RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+printf '%s\n' "$RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17243,7 +17489,7 @@ if test -z "$ac_cv_prog_RC"; then
   ac_ct_RC=$RC
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RC+y}
 then :
@@ -17264,7 +17510,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RC="windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17276,11 +17522,11 @@ esac
 fi
 ac_ct_RC=$ac_cv_prog_ac_ct_RC
 if test -n "$ac_ct_RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
-printf "%s\n" "$ac_ct_RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
+printf '%s\n' "$ac_ct_RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RC" = x; then
@@ -17288,8 +17534,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RC=$ac_ct_RC
@@ -17387,7 +17633,7 @@ if test $WOE32 = yes; then
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_WINDRES+y}
 then :
@@ -17408,7 +17654,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17420,11 +17666,11 @@ esac
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
-printf "%s\n" "$WINDRES" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+printf '%s\n' "$WINDRES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17433,7 +17679,7 @@ if test -z "$ac_cv_prog_WINDRES"; then
   ac_ct_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_WINDRES+y}
 then :
@@ -17454,7 +17700,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_WINDRES="windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17466,11 +17712,11 @@ esac
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
-printf "%s\n" "$ac_ct_WINDRES" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+printf '%s\n' "$ac_ct_WINDRES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_WINDRES" = x; then
@@ -17478,8 +17724,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     WINDRES=$ac_ct_WINDRES
@@ -17495,7 +17741,7 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -17526,9 +17772,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -17572,8 +17818,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -17582,7 +17828,7 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
@@ -17596,15 +17842,15 @@ printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
   else
     acl_final_exec_prefix="$exec_prefix"
   fi
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
+  prefix="$acl_saved_prefix"
 
 
     
   
-                                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+                                                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 printf %s "checking for shared library run path origin... " >&6; }
 if test ${acl_cv_rpath+y}
 then :
@@ -17619,8 +17865,8 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-printf "%s\n" "$acl_cv_rpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf '%s\n' "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   acl_libext="$acl_cv_libext"
   acl_shlibext="$acl_cv_shlibext"
@@ -17642,281 +17888,75 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
 printf %s "checking 32-bit host C ABI... " >&6; }
 if test ${gl_cv_host_cpu_c_abi_32bit+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) if test -n "$gl_cv_host_cpu_c_abi"; then
-       case "$gl_cv_host_cpu_c_abi" in
-         i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
-           gl_cv_host_cpu_c_abi_32bit=yes ;;
-         x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
-           gl_cv_host_cpu_c_abi_32bit=no ;;
-         *)
-           gl_cv_host_cpu_c_abi_32bit=unknown ;;
-       esac
-     else
-       case "$host_cpu" in
+  e) case "$host_cpu" in
 
-         # CPUs that only support a 32-bit ABI.
-         arc \
-         | bfin \
-         | cris* \
-         | csky \
-         | epiphany \
-         | ft32 \
-         | h8300 \
-         | m68k \
-         | microblaze | microblazeel \
-         | nds32 | nds32le | nds32be \
-         | nios2 | nios2eb | nios2el \
-         | or1k* \
-         | or32 \
-         | sh | sh1234 | sh1234elb \
-         | tic6x \
-         | xtensa* )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
+       # CPUs that only support a 32-bit ABI.
+       arc \
+       | bfin \
+       | cris* \
+       | csky \
+       | epiphany \
+       | ft32 \
+       | h8300 \
+       | m68k \
+       | microblaze | microblazeel \
+       | nds32 | nds32le | nds32be \
+       | nios2 | nios2eb | nios2el \
+       | or1k* \
+       | or32 \
+       | sh | sh1234 | sh1234elb \
+       | tic6x \
+       | xtensa* )
+         gl_cv_host_cpu_c_abi_32bit=yes
+         ;;
 
-         # CPUs that only support a 64-bit ABI.
-         alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
-         | mmix )
-           gl_cv_host_cpu_c_abi_32bit=no
-           ;;
+       # CPUs that only support a 64-bit ABI.
+       alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
+       | mmix )
+         gl_cv_host_cpu_c_abi_32bit=no
+         ;;
 
-         i[34567]86 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         x86_64 )
-           # On x86_64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
-           # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
-           #   with native Windows (mingw, MSVC).
-           # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if (defined __x86_64__ || defined __amd64__ \
-                       || defined _M_X64 || defined _M_AMD64) \
-                      && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         arm* | aarch64 )
-           # Assume arm with EABI.
-           # On arm64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
-           # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
-           # On hppa, the C compiler may be generating 32-bit code or 64-bit
-           # code. In the latter case, it defines _LP64 and __LP64__.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         ia64* )
-           # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
-           # 32-bit code. In the latter case, it defines _ILP32.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef _ILP32
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=yes
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         mips* )
-           # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
-           # at 32.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         powerpc* )
-           # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
-           # No need to distinguish them here; the caller may distinguish
-           # them based on the OS.
-           # On powerpc64 systems, the C compiler may still be generating
-           # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
-           # be generating 64-bit code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __powerpc64__ || defined __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         rs6000 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         riscv32 | riscv64 )
-           # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
-           # Size of 'long' and 'void *':
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         s390* )
-           # On s390x, the C compiler may be generating 64-bit (= s390x) code
-           # or 31-bit (= s390) code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __LP64__ || defined __s390x__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         sparc | sparc64 )
-           # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
-           # C compiler still generates 32-bit code.
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined __sparcv9 || defined __arch64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_host_cpu_c_abi_32bit=no
-else case e in @%:@(
-  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           ;;
-
-         *)
+       *)
+         if test -n "$gl_cv_host_cpu_c_abi"; then
+                      case "$gl_cv_host_cpu_c_abi" in
+             i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+               gl_cv_host_cpu_c_abi_32bit=yes ;;
+             x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+               gl_cv_host_cpu_c_abi_32bit=no ;;
+             *)
+               gl_cv_host_cpu_c_abi_32bit=unknown ;;
+           esac
+         else
            gl_cv_host_cpu_c_abi_32bit=unknown
-           ;;
-       esac
-     fi
+         fi
+         if test $gl_cv_host_cpu_c_abi_32bit = unknown; then
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int test_pointer_size[sizeof (void *) - 5];
+                
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_host_cpu_c_abi_32bit=no
+else case e in @%:@(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+         fi
+         ;;
+     esac
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
-printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
+printf '%s\n' "$gl_cv_host_cpu_c_abi_32bit" >&6; }
 
   HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
 
@@ -17924,7 +17964,7 @@ printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
                                 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
 printf %s "checking for ELF binary format... " >&6; }
 if test ${gl_cv_elf+y}
 then :
@@ -17932,7 +17972,7 @@ then :
 else case e in @%:@(
   e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if defined __ELF__ || (defined __linux__ && defined __EDG__)
+#if defined __ELF__ || (defined __linux__ && (defined __EDG__ || defined __SUNPRO_C))
         Extensible Linking Format
         #endif
        
@@ -17950,8 +17990,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
-printf "%s\n" "$gl_cv_elf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
+printf '%s\n' "$gl_cv_elf" >&6; }
   if test $gl_cv_elf = yes; then
     # Extract the ELF class of a file (5th byte) in decimal.
     # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
@@ -18002,7 +18042,7 @@ printf "%s\n" "$gl_cv_elf" >&6; }
     }
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
 printf %s "checking for the common suffixes of directories in the library search path... " >&6; }
 if test ${acl_cv_libdirstems+y}
 then :
@@ -18021,6 +18061,13 @@ else case e in @%:@(
            esac
          fi
          ;;
+       netbsd*)
+                           if test $HOST_CPU_C_ABI_32BIT != no; then
+           case "$host_cpu" in
+             sparc*) acl_libdirstem2=lib/sparc ;;
+           esac
+         fi
+         ;;
        *)
                                                                                  searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
                      | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
@@ -18037,7 +18084,7 @@ else case e in @%:@(
            fi
          fi
          if test -n "$searchpath"; then
-           acl_save_IFS="${IFS= 	}"; IFS=":"
+           acl_saved_IFS="${IFS= 	}"; IFS=":"
            for searchdir in $searchpath; do
              if test -d "$searchdir"; then
                case "$searchdir" in
@@ -18054,7 +18101,7 @@ else case e in @%:@(
                esac
              fi
            done
-           IFS="$acl_save_IFS"
+           IFS="$acl_saved_IFS"
            if test $HOST_CPU_C_ABI_32BIT = yes; then
              # 32-bit ABI.
              acl_libdirstem3=
@@ -18072,8 +18119,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
-printf "%s\n" "$acl_cv_libdirstems" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+printf '%s\n' "$acl_cv_libdirstems" >&6; }
       acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
   acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
   acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
@@ -18090,9 +18137,9 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
   
     use_additional=yes
   
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
     eval additional_includedir=\"$includedir\"
@@ -18100,8 +18147,8 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
   
 @%:@ Check whether --with-libiconv-prefix was given.
@@ -18113,9 +18160,9 @@ then :
     else
       if test "X$withval" = "X"; then
         
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
           eval additional_includedir=\"$includedir\"
@@ -18123,8 +18170,8 @@ then :
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
         
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -18236,13 +18283,13 @@ fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
               
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -18330,13 +18377,13 @@ fi
                                                                                 haveit=
                     for x in $LDFLAGS $LIBICONV; do
                       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -18398,13 +18445,13 @@ fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCICONV; do
                     
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -18420,12 +18467,12 @@ fi
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -18447,13 +18494,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LIBICONV; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -18468,13 +18515,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LTLIBICONV; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -18548,17 +18595,17 @@ fi
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
     fi
@@ -18579,19 +18626,19 @@ fi
        
       
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
   
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -18604,7 +18651,7 @@ fi
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
@@ -18636,7 +18683,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -18661,22 +18708,22 @@ then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
   e) 
-                  am_save_LIBS="$LIBS"
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -18724,6 +18771,35 @@ int result = 0;
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -18740,7 +18816,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -18759,7 +18835,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18779,7 +18855,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18797,7 +18873,7 @@ int result = 0;
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -18824,12 +18900,12 @@ fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -18839,16 +18915,16 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
     
-printf "%s\n" "@%:@define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -18856,7 +18932,7 @@ printf "%s\n" "$LIBICONV" >&6; }
   
 
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
 printf %s "checking whether iconv is compatible with its POSIX signature... " >&6; }
 if test ${gl_cv_iconv_nonconst+y}
 then :
@@ -18892,8 +18968,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
-printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
+printf '%s\n' "$gl_cv_iconv_nonconst" >&6; }
   else
             gl_cv_iconv_nonconst=yes
   fi
@@ -18903,12 +18979,26 @@ printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
     iconv_arg1="const"
   fi
   
-printf "%s\n" "@%:@define ICONV_CONST $iconv_arg1" >>confdefs.h
+printf '%s\n' "@%:@define ICONV_CONST $iconv_arg1" >>confdefs.h
 
     
 
+      if test "$am_func_iconv" = yes; then
+    if test -n "$LIBICONV"; then
+      am_cv_func_iconv_summary='yes, in libiconv'
+    else
+      am_cv_func_iconv_summary='yes, in libc'
+    fi
+  else
+    if test "$am_cv_func_iconv" = yes; then
+      am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
+    else
+      am_cv_func_iconv_summary='no, consider installing GNU libiconv'
+    fi
+  fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 printf %s "checking whether NLS is requested... " >&6; }
     @%:@ Check whether --enable-nls was given.
 if test ${enable_nls+y}
@@ -18919,13 +19009,13 @@ else case e in @%:@(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   
 
 
           
-      GETTEXT_MACRO_VERSION=0.20
+      GETTEXT_MACRO_VERSION=0.22
 
 
     
@@ -18959,7 +19049,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGFMT+y}
 then :
@@ -18970,9 +19060,9 @@ else case e in @%:@(
     ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -18985,7 +19075,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
     ;;
 esac ;;
@@ -18993,16 +19083,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-printf "%s\n" "$MSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf '%s\n' "$MSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_GMSGFMT+y}
 then :
@@ -19025,7 +19115,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19039,11 +19129,11 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-printf "%s\n" "$GMSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf '%s\n' "$GMSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -19084,7 +19174,7 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XGETTEXT+y}
 then :
@@ -19095,9 +19185,9 @@ else case e in @%:@(
     ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -19110,7 +19200,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
     ;;
 esac ;;
@@ -19118,11 +19208,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-printf "%s\n" "$XGETTEXT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf '%s\n' "$XGETTEXT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     rm -f messages.po
@@ -19163,7 +19253,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGMERGE+y}
 then :
@@ -19174,9 +19264,9 @@ else case e in @%:@(
     ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -19188,7 +19278,7 @@ else case e in @%:@(
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
   test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
     ;;
 esac ;;
@@ -19196,11 +19286,11 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-printf "%s\n" "$MSGMERGE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf '%s\n' "$MSGMERGE" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -19222,20 +19312,66 @@ fi
 
 
 
-    
-  
-  
+  gl_sed_double_backslashes='s/\\/\\\\/g'
+  gl_sed_escape_doublequotes='s/"/\\"/g'
+  gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
+  gl_sed_escape_for_make_2='s,\$,\\$$,g'
+      case `echo r | tr -d '\r'` in
+    '') gl_tr_cr='\015' ;;
+    *)  gl_tr_cr='\r' ;;
+  esac
+
+
+    gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+      if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
   
   
   
   
 
+    gl_final_localedir="$localedir"
+    case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw* | windows*)
+          gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;;
+      esac
+      ;;
+  esac
+    localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+  localedir_c='"'"$localedir_c"'"'
   
+
+    localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+      if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then
+    localedir_c_make='\"$(localedir)\"'
+  fi
   
 
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+
 
     
+  
+  
+  
+  
+  
+  
 
+  
+  
+
+
+  
     
   
 
@@ -19244,13 +19380,13 @@ fi
   
 
     
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
 if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_LIBS="$LIBS"
+  e) gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19272,23 +19408,23 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS" ;;
+     LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf '%s\n' "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
     
-printf "%s\n" "@%:@define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+                    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
 printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; }
 if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_LIBS="$LIBS"
+  e) gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19310,20 +19446,20 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS" ;;
+     LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
-printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+printf '%s\n' "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
   if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
     
-printf "%s\n" "@%:@define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
 
   fi
   INTL_MACOSX_LIBS=
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
      || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
   fi
   
 
@@ -19363,7 +19499,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
           gt_expression_test_code=
         fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 printf %s "checking for GNU gettext in libc... " >&6; }
 if eval test \${$gt_func_gnugettext_libc+y}
 then :
@@ -19405,8 +19541,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libc
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
                     
@@ -19414,19 +19550,19 @@ printf "%s\n" "$ac_res" >&6; }
        
       
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
   
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -19439,7 +19575,7 @@ printf "%s\n" "$ac_res" >&6; }
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
@@ -19471,7 +19607,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19496,22 +19632,22 @@ then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
   e) 
-                  am_save_LIBS="$LIBS"
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -19559,6 +19695,35 @@ int result = 0;
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -19575,7 +19740,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -19594,7 +19759,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -19614,7 +19779,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -19632,7 +19797,7 @@ int result = 0;
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -19659,12 +19824,12 @@ fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -19674,16 +19839,16 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
     
-printf "%s\n" "@%:@define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -19699,9 +19864,9 @@ printf "%s\n" "$LIBICONV" >&6; }
   
     use_additional=yes
   
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
     eval additional_includedir=\"$includedir\"
@@ -19709,8 +19874,8 @@ printf "%s\n" "$LIBICONV" >&6; }
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
   
 @%:@ Check whether --with-libintl-prefix was given.
@@ -19722,9 +19887,9 @@ then :
     else
       if test "X$withval" = "X"; then
         
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   
           eval additional_includedir=\"$includedir\"
@@ -19732,8 +19897,8 @@ then :
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
         
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -19845,13 +20010,13 @@ fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBINTL; do
               
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -19939,13 +20104,13 @@ fi
                                                                                 haveit=
                     for x in $LDFLAGS $LIBINTL; do
                       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -20007,13 +20172,13 @@ fi
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCINTL; do
                     
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -20029,12 +20194,12 @@ fi
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -20056,13 +20221,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LIBINTL; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -20077,13 +20242,13 @@ fi
                         haveit=
                         for x in $LDFLAGS $LTLIBINTL; do
                           
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -20157,17 +20322,17 @@ fi
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
     fi
@@ -20182,15 +20347,15 @@ fi
   
   
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 printf %s "checking for GNU gettext in libintl... " >&6; }
 if eval test \${$gt_func_gnugettext_libintl+y}
 then :
   printf %s "(cached) " >&6
 else case e in @%:@(
-  e) gt_save_CPPFLAGS="$CPPFLAGS"
+  e) gt_saved_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
+            gt_saved_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20229,8 +20394,14 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
+                                    gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
+            
+            case "$host_os" in
+              aix*) gt_LIBINTL_EXTRA="-lpthread" ;;
+            esac
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+               && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+              LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20261,27 +20432,28 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
-  LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+  LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA"
                  eval "$gt_func_gnugettext_libintl=yes"
                 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
             fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS" ;;
+            CPPFLAGS="$gt_saved_CPPFLAGS"
+            LIBS="$gt_saved_LIBS" ;;
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libintl
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
         fi
 
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
+                && test "$PACKAGE" != gettext-tools \
+                && test "$PACKAGE" != libintl; }; then
           gt_use_preinstalled_gnugettext=yes
         else
                     LIBINTL=
@@ -20302,19 +20474,19 @@ printf "%s\n" "$ac_res" >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
       
-printf "%s\n" "@%:@define ENABLE_NLS 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
 printf %s "checking whether to use NLS... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
 printf %s "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
@@ -20325,30 +20497,30 @@ printf %s "checking where the gettext function comes from... " >&6; }
     else
       gt_source="included intl directory"
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-printf "%s\n" "$gt_source" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf '%s\n' "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
 printf %s "checking how to link with libintl... " >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-printf "%s\n" "$LIBINTL" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf '%s\n' "$LIBINTL" >&6; }
         
   for element in $INCINTL; do
     haveit=
     for x in $CPPFLAGS; do
       
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -20363,10 +20535,10 @@ printf "%s\n" "$LIBINTL" >&6; }
       fi
 
             
-printf "%s\n" "@%:@define HAVE_GETTEXT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_GETTEXT 1" >>confdefs.h
 
       
-printf "%s\n" "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -20375,18 +20547,22 @@ printf "%s\n" "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
 
   
 
-    INTLLIBS="$LIBINTL"
+  
+        INTLLIBS="$LIBINTL"
+    
   
 
     
   
   
 
+    
+
 
 
 
     
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
@@ -20414,20 +20590,20 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
      
-printf "%s\n" "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
      
-printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
+printf '%s\n' "@%:@define mbstate_t int" >>confdefs.h
 
    fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 printf %s "checking for wchar_t... " >&6; }
 if test ${gt_cv_c_wchar_t+y}
 then :
@@ -20455,11 +20631,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
-printf "%s\n" "$gt_cv_c_wchar_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+printf '%s\n' "$gt_cv_c_wchar_t" >&6; }
   if test $gt_cv_c_wchar_t = yes; then
     
-printf "%s\n" "@%:@define HAVE_WCHAR_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WCHAR_T 1" >>confdefs.h
 
   fi
 
@@ -20482,31 +20658,31 @@ fi
 ac_fn_c_check_func "$LINENO" "getc_unlocked" "ac_cv_func_getc_unlocked"
 if test "x$ac_cv_func_getc_unlocked" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETC_UNLOCKED 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETC_UNLOCKED 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc"
 if test "x$ac_cv_func_mbrtowc" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MBRTOWC 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MBRTOWC 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "wcrtomb" "ac_cv_func_wcrtomb"
 if test "x$ac_cv_func_wcrtomb" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WCRTOMB 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WCRTOMB 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "mbsinit" "ac_cv_func_mbsinit"
 if test "x$ac_cv_func_mbsinit" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MBSINIT 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MBSINIT 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
 if test "x$ac_cv_func_setlocale" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
 
 fi
 
@@ -20518,7 +20694,7 @@ else
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> is standalone" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> is standalone" >&5
 printf %s "checking whether <wchar.h> is standalone... " >&6; }
 if test ${gl_cv_header_wchar_h_standalone+y}
 then :
@@ -20546,8 +20722,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_standalone" >&5
-printf "%s\n" "$gl_cv_header_wchar_h_standalone" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_standalone" >&5
+printf '%s\n' "$gl_cv_header_wchar_h_standalone" >&6; }
 if test $gl_cv_header_wchar_h_standalone = yes; then
   BROKEN_WCHAR_H=0
 else
@@ -20561,7 +20737,7 @@ do :
   ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
 if test "x$ac_cv_func_memmove" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMMOVE 1" >>confdefs.h
  
 else case e in @%:@(
   e) SRCLIBOBJS="$SRCLIBOBJS $ac_func.$ac_objext" ;;
@@ -20571,7 +20747,7 @@ fi
 done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 printf %s "checking for nl_langinfo and CODESET... " >&6; }
 if test ${am_cv_langinfo_codeset+y}
 then :
@@ -20600,11 +20776,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf '%s\n' "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
     
-printf "%s\n" "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -20681,7 +20857,7 @@ gl_mda_defines='
 
        
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 printf %s "checking for working fcntl.h... " >&6; }
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
@@ -20815,15 +20991,15 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+printf '%s\n' "$gl_cv_header_working_fcntl_h" >&6; }
 
   case $gl_cv_header_working_fcntl_h in #(
   *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
 
 
   case $gl_cv_header_working_fcntl_h in #(
@@ -20831,7 +21007,7 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 
 
 
@@ -20840,12 +21016,12 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
 if test "x$ac_cv_header_wchar_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WCHAR_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WCHAR_H 1" >>confdefs.h
 
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EILSEQ" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EILSEQ" >&5
 printf %s "checking for EILSEQ... " >&6; }
 if test ${ac_cv_decl_EILSEQ+y}
 then :
@@ -20911,18 +21087,18 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_EILSEQ" >&5
-printf "%s\n" "$ac_cv_decl_EILSEQ" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_EILSEQ" >&5
+printf '%s\n' "$ac_cv_decl_EILSEQ" >&6; }
   if test "$ac_cv_decl_EILSEQ" != yes; then
     
-printf "%s\n" "@%:@define EILSEQ $ac_cv_decl_EILSEQ" >>confdefs.h
+printf '%s\n' "@%:@define EILSEQ $ac_cv_decl_EILSEQ" >>confdefs.h
 
     EILSEQ="$ac_cv_decl_EILSEQ"
     
   fi
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 printf %s "checking whether byte ordering is bigendian... " >&6; }
 if test ${ac_cv_c_bigendian+y}
 then :
@@ -21144,20 +21320,20 @@ fi
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-printf "%s\n" "$ac_cv_c_bigendian" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf '%s\n' "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     printf "%s\n" "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf '%s\n' "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
      
-printf "%s\n" "@%:@define WORDS_LITTLEENDIAN 1" >>confdefs.h
+printf '%s\n' "@%:@define WORDS_LITTLEENDIAN 1" >>confdefs.h
 
    ;; #(
    universal)
      	
-printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf '%s\n' "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -21178,8 +21354,8 @@ printf "%s\n" "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 if test ${enable_cross_guesses+y}
 then :
   enableval=$enable_cross_guesses; if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
-printf "%s\n" "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5
+printf '%s\n' "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;}
        enableval=conservative
      fi
      gl_cross_guesses="$enableval"
@@ -21205,14 +21381,14 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define size_t unsigned int" >>confdefs.h
+printf '%s\n' "@%:@define size_t unsigned int" >>confdefs.h
  ;;
 esac
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 printf %s "checking for working alloca.h... " >&6; }
 if test ${ac_cv_working_alloca_h+y}
 then :
@@ -21241,15 +21417,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+printf '%s\n' "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
   
-printf "%s\n" "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 printf %s "checking for alloca... " >&6; }
 if test ${ac_cv_func_alloca_works+y}
 then :
@@ -21294,12 +21470,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+printf '%s\n' "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
   
-printf "%s\n" "@%:@define HAVE_ALLOCA 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -21313,10 +21489,10 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-printf "%s\n" "@%:@define C_ALLOCA 1" >>confdefs.h
+printf '%s\n' "@%:@define C_ALLOCA 1" >>confdefs.h
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 printf %s "checking stack direction for C alloca... " >&6; }
 if test ${ac_cv_c_stack_direction+y}
 then :
@@ -21360,9 +21536,9 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
-printf "%s\n" "@%:@define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+printf '%s\n' "$ac_cv_c_stack_direction" >&6; }
+printf '%s\n' "@%:@define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
 
 
 fi
@@ -21445,7 +21621,7 @@ fi
   REPLACE_WCTOMB=0;          
 
 
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+         { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 printf %s "checking whether lstat correctly handles trailing slash... " >&6; }
 if test ${gl_cv_func_lstat_dereferences_slashed_symlink+y}
 then :
@@ -21505,12 +21681,12 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
-printf "%s\n" "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5
+printf '%s\n' "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; }
   case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
     *yes)
       
-printf "%s\n" "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
+printf '%s\n' "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
       ;;
   esac
@@ -21519,7 +21695,7 @@ printf "%s\n" "@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
@@ -21550,11 +21726,11 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
     
-printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
@@ -21562,7 +21738,7 @@ printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
 
   
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
+     { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
 printf %s "checking whether realpath works... " >&6; }
 if test ${gl_cv_func_realpath_works+y}
 then :
@@ -21796,17 +21972,17 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
-printf "%s\n" "$gl_cv_func_realpath_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_realpath_works" >&5
+printf '%s\n' "$gl_cv_func_realpath_works" >&6; }
   case "$gl_cv_func_realpath_works" in
     *yes)
       
-printf "%s\n" "@%:@define FUNC_REALPATH_WORKS 1" >>confdefs.h
+printf '%s\n' "@%:@define FUNC_REALPATH_WORKS 1" >>confdefs.h
 
       ;;
     *nearly)
       
-printf "%s\n" "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
+printf '%s\n' "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
 
       ;;
   esac
@@ -21823,7 +21999,7 @@ printf "%s\n" "@%:@define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -22027,7 +22203,7 @@ fi
   
 
   
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 printf %s "checking for C/C++ restrict keyword... " >&6; }
 if test ${ac_cv_c_restrict+y}
 then :
@@ -22067,14 +22243,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
-printf "%s\n" "$ac_cv_c_restrict" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+printf '%s\n' "$ac_cv_c_restrict" >&6; }
  
  case $ac_cv_c_restrict in
    restrict) ;;
-   no) printf "%s\n" "@%:@define restrict /**/" >>confdefs.h
+   no) printf '%s\n' "@%:@define restrict /**/" >>confdefs.h
  ;;
-   *)  printf "%s\n" "@%:@define restrict $ac_cv_c_restrict" >>confdefs.h
+   *)  printf '%s\n' "@%:@define restrict $ac_cv_c_restrict" >>confdefs.h
  ;;
  esac
 
@@ -22183,7 +22359,7 @@ printf "%s\n" "$ac_cv_c_restrict" >&6; }
   if test $ac_cv_func__set_invalid_parameter_handler = yes; then
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
     
-printf "%s\n" "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
 
   else
     HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
@@ -22536,7 +22712,7 @@ printf "%s\n" "@%:@define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
     
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
 printf %s "checking if environ is properly declared... " >&6; }
 if test ${gt_cv_var_environ_declaration+y}
 then :
@@ -22570,11 +22746,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
-printf "%s\n" "$gt_cv_var_environ_declaration" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_var_environ_declaration" >&5
+printf '%s\n' "$gt_cv_var_environ_declaration" >&6; }
   if test $gt_cv_var_environ_declaration = yes; then
     
-printf "%s\n" "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
   fi
   
@@ -22585,7 +22761,7 @@ printf "%s\n" "@%:@define HAVE_ENVIRON_DECL 1" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
 printf %s "checking whether the preprocessor supports include_next... " >&6; }
 if test ${gl_cv_have_include_next+y}
 then :
@@ -22650,8 +22826,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
-printf "%s\n" "$gl_cv_have_include_next" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
+printf '%s\n' "$gl_cv_have_include_next" >&6; }
   PRAGMA_SYSTEM_HEADER=
   if test $gl_cv_have_include_next = yes; then
     INCLUDE_NEXT=include_next
@@ -22672,7 +22848,7 @@ printf "%s\n" "$gl_cv_have_include_next" >&6; }
   
   
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5
 printf %s "checking whether source code line length is unlimited... " >&6; }
 if test ${gl_cv_source_line_length_unlimited+y}
 then :
@@ -22699,8 +22875,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
-printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
+printf '%s\n' "$gl_cv_source_line_length_unlimited" >&6; }
   if test $gl_cv_source_line_length_unlimited = no; then
     PRAGMA_COLUMNS="#pragma COLUMNS 10000"
   else
@@ -22710,7 +22886,7 @@ printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
 printf %s "checking for complete errno.h... " >&6; }
 if test ${gl_cv_header_errno_h_complete+y}
 then :
@@ -22787,8 +22963,8 @@ rm -rf conftest*
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
-printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
+printf '%s\n' "$gl_cv_header_errno_h_complete" >&6; }
   if test $gl_cv_header_errno_h_complete = yes; then
     GL_GENERATE_ERRNO_H=false
   else
@@ -22803,7 +22979,7 @@ printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_errno_h='<'errno.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
 printf %s "checking absolute name of <errno.h>... " >&6; }
 if test ${gl_cv_next_errno_h+y}
 then :
@@ -22848,8 +23024,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
-printf "%s\n" "$gl_cv_next_errno_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
+printf '%s\n' "$gl_cv_next_errno_h" >&6; }
      fi
      NEXT_ERRNO_H=$gl_cv_next_errno_h
 
@@ -22869,7 +23045,7 @@ printf "%s\n" "$gl_cv_next_errno_h" >&6; }
   fi
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
 printf %s "checking for EMULTIHOP value... " >&6; }
 if test ${gl_cv_header_errno_h_EMULTIHOP+y}
 then :
@@ -22930,8 +23106,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
     case $gl_cv_header_errno_h_EMULTIHOP in
       yes | no)
         EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE=
@@ -22946,7 +23122,7 @@ printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
 
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
 printf %s "checking for ENOLINK value... " >&6; }
 if test ${gl_cv_header_errno_h_ENOLINK+y}
 then :
@@ -23007,8 +23183,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
-printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
+printf '%s\n' "$gl_cv_header_errno_h_ENOLINK" >&6; }
     case $gl_cv_header_errno_h_ENOLINK in
       yes | no)
         ENOLINK_HIDDEN=0; ENOLINK_VALUE=
@@ -23023,7 +23199,7 @@ printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
 
   
   if $GL_GENERATE_ERRNO_H; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
 printf %s "checking for EOVERFLOW value... " >&6; }
 if test ${gl_cv_header_errno_h_EOVERFLOW+y}
 then :
@@ -23084,8 +23260,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
-printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
+printf '%s\n' "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
     case $gl_cv_header_errno_h_EOVERFLOW in
       yes | no)
         EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE=
@@ -23099,8 +23275,8 @@ printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
   fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
-printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to detect undeclared functions" >&5
+printf %s "checking for $CC options to detect undeclared functions... " >&6; }
 if test ${ac_cv_c_undeclared_builtin_options+y}
 then :
   printf %s "(cached) " >&6
@@ -23168,12 +23344,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
-printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf '%s\n' "$ac_cv_c_undeclared_builtin_options" >&6; }
   case $ac_cv_c_undeclared_builtin_options in @%:@(
   'cannot detect') :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot make $CC report undeclared builtins
 See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
   'none needed') :
@@ -23182,7 +23358,50 @@ See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
     ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
 esac
 
-ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to ignore future-version functions" >&5
+printf %s "checking for $CC options to ignore future-version functions... " >&6; }
+if test ${ac_cv_c_future_darwin_options+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)       ac_compile_saved="$ac_compile"
+   ac_compile="$ac_compile -Werror=unguarded-availability-new"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if ! (defined __APPLE__ && defined __MACH__)
+	   #error "-Werror=unguarded-availability-new not needed here"
+	  #endif
+	
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_future_darwin_options='-Werror=unguarded-availability-new'
+else case e in @%:@(
+  e) ac_cv_c_future_darwin_options='none needed' ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_compile="$ac_compile_saved"
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_future_darwin_options" >&5
+printf '%s\n' "$ac_cv_c_future_darwin_options" >&6; }
+ case $ac_cv_c_future_darwin_options in @%:@(
+  'none needed') :
+    ac_c_future_darwin_options='' ;; @%:@(
+  *) :
+    ac_c_future_darwin_options=$ac_cv_c_future_darwin_options ;;
+esac
+
+ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_strerror_r" = xyes
 then :
   ac_have_decl=1
@@ -23190,7 +23409,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
 
 
 if test $ac_cv_have_decl_strerror_r = yes; then
@@ -23198,11 +23417,11 @@ if test $ac_cv_have_decl_strerror_r = yes; then
   # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well
   # as AC_CHECK_DECLS_ONCE.)
   
-printf "%s\n" "@%:@define HAVE_STRERROR_R 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRERROR_R 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
 printf %s "checking whether strerror_r returns char *... " >&6; }
 if test ${ac_cv_func_strerror_r_char_p+y}
 then :
@@ -23237,11 +23456,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+printf '%s\n' "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
   
-printf "%s\n" "@%:@define STRERROR_R_CHAR_P 1" >>confdefs.h
+printf '%s\n' "@%:@define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
@@ -23249,7 +23468,7 @@ fi
   XGETTEXT_EXTRA_OPTIONS=
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5
 printf %s "checking whether ctype.h defines __header_inline... " >&6; }
 if test ${gl_cv_have___header_inline+y}
 then :
@@ -23273,11 +23492,11 @@ fi
 rm -f conftest.err conftest.i conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5
-printf "%s\n" "$gl_cv_have___header_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5
+printf '%s\n' "$gl_cv_have___header_inline" >&6; }
   if test "$gl_cv_have___header_inline" = yes; then
     
-printf "%s\n" "@%:@define HAVE___HEADER_INLINE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE___HEADER_INLINE 1" >>confdefs.h
 
   fi
 
@@ -23354,7 +23573,7 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      
-printf "%s\n" "@%:@define pid_t $ac_pid_type" >>confdefs.h
+printf '%s\n' "@%:@define pid_t $ac_pid_type" >>confdefs.h
 
      ;;
 esac
@@ -23367,7 +23586,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define mode_t int" >>confdefs.h
+printf '%s\n' "@%:@define mode_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -23386,7 +23605,7 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_fcntl_h='<'fcntl.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <fcntl.h>" >&5
 printf %s "checking absolute name of <fcntl.h>... " >&6; }
 if test ${gl_cv_next_fcntl_h+y}
 then :
@@ -23431,8 +23650,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
-printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
+printf '%s\n' "$gl_cv_next_fcntl_h" >&6; }
      fi
      NEXT_FCNTL_H=$gl_cv_next_fcntl_h
 
@@ -23483,7 +23702,7 @@ printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
   REPLACE_STAT=0;       
   REPLACE_UTIMENSAT=0;  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
 printf %s "checking whether stat file-mode macros are broken... " >&6; }
 if test ${ac_cv_header_stat_broken+y}
 then :
@@ -23521,11 +23740,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-printf "%s\n" "$ac_cv_header_stat_broken" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+printf '%s\n' "$ac_cv_header_stat_broken" >&6; }
 if test $ac_cv_header_stat_broken = yes; then
   
-printf "%s\n" "@%:@define STAT_MACROS_BROKEN 1" >>confdefs.h
+printf '%s\n' "@%:@define STAT_MACROS_BROKEN 1" >>confdefs.h
 
 fi
 
@@ -23533,7 +23752,7 @@ fi
   
   case "$host_os" in
     mingw*)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
 printf %s "checking for 64-bit off_t... " >&6; }
 if test ${gl_cv_type_off_t_64+y}
 then :
@@ -23563,14 +23782,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
-printf "%s\n" "$gl_cv_type_off_t_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
+printf '%s\n' "$gl_cv_type_off_t_64" >&6; }
       if test $gl_cv_type_off_t_64 = no; then
         WINDOWS_64_BIT_OFF_T=1
       else
         WINDOWS_64_BIT_OFF_T=0
       fi
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5
 printf %s "checking for 64-bit st_size... " >&6; }
 if test ${gl_cv_member_st_size_64+y}
 then :
@@ -23601,8 +23820,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
-printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
+printf '%s\n' "$gl_cv_member_st_size_64" >&6; }
       if test $gl_cv_member_st_size_64 = no; then
         WINDOWS_64_BIT_ST_SIZE=1
       else
@@ -23632,7 +23851,7 @@ printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_stat_h='<'sys/stat.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
 printf %s "checking absolute name of <sys/stat.h>... " >&6; }
 if test ${gl_cv_next_sys_stat_h+y}
 then :
@@ -23683,8 +23902,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
-printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
+printf '%s\n' "$gl_cv_next_sys_stat_h" >&6; }
      fi
      NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h
 
@@ -23721,7 +23940,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define nlink_t int" >>confdefs.h
+printf '%s\n' "@%:@define nlink_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -23740,7 +23959,7 @@ fi
       ac_fn_c_check_header_compile "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default"
 if test "x$ac_cv_header_sdkddkver_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SDKDDKVER_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SDKDDKVER_H 1" >>confdefs.h
 
 fi
 
@@ -23830,7 +24049,7 @@ fi
 
   
 
-ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getdtablesize" = xyes
 then :
   ac_have_decl=1
@@ -23838,7 +24057,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
 
 
 
@@ -23856,7 +24075,7 @@ printf "%s\n" "@%:@define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_limits_h='<'limits.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5
 printf %s "checking absolute name of <limits.h>... " >&6; }
 if test ${gl_cv_next_limits_h+y}
 then :
@@ -23907,8 +24126,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
-printf "%s\n" "$gl_cv_next_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
+printf '%s\n' "$gl_cv_next_limits_h" >&6; }
      fi
      NEXT_LIMITS_H=$gl_cv_next_limits_h
 
@@ -23925,7 +24144,7 @@ printf "%s\n" "$gl_cv_next_limits_h" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5
 printf %s "checking whether limits.h has WORD_BIT, BOOL_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_limits_width+y}
 then :
@@ -23960,8 +24179,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
-printf "%s\n" "$gl_cv_header_limits_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
+printf '%s\n' "$gl_cv_header_limits_width" >&6; }
   if test "$gl_cv_header_limits_width" = yes; then
     GL_GENERATE_LIMITS_H=false
   else
@@ -23969,7 +24188,7 @@ printf "%s\n" "$gl_cv_header_limits_width" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
 printf %s "checking for wint_t... " >&6; }
 if test ${gt_cv_c_wint_t+y}
 then :
@@ -23997,14 +24216,14 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
-printf "%s\n" "$gt_cv_c_wint_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+printf '%s\n' "$gt_cv_c_wint_t" >&6; }
   if test $gt_cv_c_wint_t = yes; then
     
-printf "%s\n" "@%:@define HAVE_WINT_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WINT_T 1" >>confdefs.h
 
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5
 printf %s "checking whether wint_t is large enough... " >&6; }
 if test ${gl_cv_type_wint_t_large_enough+y}
 then :
@@ -24033,8 +24252,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
-printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
+printf '%s\n' "$gl_cv_type_wint_t_large_enough" >&6; }
     if test $gl_cv_type_wint_t_large_enough = no; then
       GNULIBHEADERS_OVERRIDE_WINT_T=1
     else
@@ -24046,7 +24265,7 @@ printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
   
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5
 printf %s "checking whether the compiler produces multi-arch binaries... " >&6; }
 if test ${gl_cv_c_multiarch+y}
 then :
@@ -24090,8 +24309,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
-printf "%s\n" "$gl_cv_c_multiarch" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
+printf '%s\n' "$gl_cv_c_multiarch" >&6; }
   if test $gl_cv_c_multiarch = yes; then
     APPLE_UNIVERSAL_BUILD=1
   else
@@ -24105,10 +24324,10 @@ printf "%s\n" "$gl_cv_c_multiarch" >&6; }
   
 
       
-printf "%s\n" "@%:@define HAVE_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LONG_LONG_INT 1" >>confdefs.h
 
   
-printf "%s\n" "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
 
 
       
@@ -24147,7 +24366,7 @@ printf "%s\n" "@%:@define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdint_h='<'stdint.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
 printf %s "checking absolute name of <stdint.h>... " >&6; }
 if test ${gl_cv_next_stdint_h+y}
 then :
@@ -24198,8 +24417,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
-printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
+printf '%s\n' "$gl_cv_next_stdint_h" >&6; }
      fi
      NEXT_STDINT_H=$gl_cv_next_stdint_h
 
@@ -24223,7 +24442,7 @@ printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
   
 
     if test $ac_cv_header_stdint_h = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
 printf %s "checking whether stdint.h conforms to C99... " >&6; }
 if test ${gl_cv_header_working_stdint_h+y}
 then :
@@ -24500,8 +24719,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdint_h" >&6; }
   fi
 
   HAVE_C99_STDINT_H=0
@@ -24511,7 +24730,7 @@ printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
   case "$gl_cv_header_working_stdint_h" in
     *yes)
       HAVE_C99_STDINT_H=1
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5
 printf %s "checking whether stdint.h works without ISO C predefines... " >&6; }
 if test ${gl_cv_header_stdint_without_STDC_macros+y}
 then :
@@ -24552,18 +24771,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
-printf "%s\n" "$gl_cv_header_stdint_without_STDC_macros" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
+printf '%s\n' "$gl_cv_header_stdint_without_STDC_macros" >&6; }
 
       if test $gl_cv_header_stdint_without_STDC_macros = no; then
         
-printf "%s\n" "@%:@define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_CONSTANT_MACROS 1" >>confdefs.h
 
         
-printf "%s\n" "@%:@define __STDC_LIMIT_MACROS 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_LIMIT_MACROS 1" >>confdefs.h
 
       fi
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5
 printf %s "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; }
 if test ${gl_cv_header_stdint_width+y}
 then :
@@ -24603,8 +24822,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
-printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
+printf '%s\n' "$gl_cv_header_stdint_width" >&6; }
       if test "$gl_cv_header_stdint_width" = yes; then
         GL_GENERATE_STDINT_H=false
       fi
@@ -24613,13 +24832,13 @@ printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
                   ac_fn_c_check_header_compile "$LINENO" "sys/inttypes.h" "ac_cv_header_sys_inttypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_inttypes_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
 
 fi
 ac_fn_c_check_header_compile "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_bitypes_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SYS_BITYPES_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SYS_BITYPES_H 1" >>confdefs.h
 
 fi
 
@@ -24635,7 +24854,7 @@ fi
     
           
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
@@ -24661,14 +24880,16 @@ fi
 esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "@%:@define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -24678,7 +24899,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 printf %s "checking for bit size of $gltype... " >&6; }
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
@@ -24704,14 +24925,16 @@ fi
 esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
                                                 result=0
     fi
     GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    printf "%s\n" "@%:@define BITSIZEOF_${GLTYPE} $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
     eval BITSIZEOF_${GLTYPE}=\$result
   done
@@ -24720,7 +24943,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
 printf %s "checking whether $gltype is signed... " >&6; }
 if eval test \${gl_cv_type_${gltype}_signed+y}
 then :
@@ -24757,12 +24980,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_signed
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     eval result=\$gl_cv_type_${gltype}_signed
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     if test "$result" = yes; then
-      printf "%s\n" "@%:@define HAVE_SIGNED_${GLTYPE} 1" >>confdefs.h
+      cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_SIGNED_${GLTYPE} 1
+_ACEOF
 
       eval HAVE_SIGNED_${GLTYPE}=1
     else
@@ -24777,7 +25002,7 @@ printf "%s\n" "$ac_res" >&6; }
     
           
   for gltype in ptrdiff_t size_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
@@ -24831,13 +25056,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "@%:@define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
   
@@ -24846,7 +25073,7 @@ printf "%s\n" "$ac_res" >&6; }
   
           
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 printf %s "checking for $gltype integer literal suffix... " >&6; }
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
@@ -24900,13 +25127,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
     test "$result" = no && result=
     eval ${GLTYPE}_SUFFIX=\$result
-    printf "%s\n" "@%:@define ${GLTYPE}_SUFFIX $result" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+@%:@define ${GLTYPE}_SUFFIX $result
+_ACEOF
 
   done
   
@@ -24959,7 +25188,7 @@ printf "%s\n" "$ac_res" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_inttypes_h='<'inttypes.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <inttypes.h>" >&5
 printf %s "checking absolute name of <inttypes.h>... " >&6; }
 if test ${gl_cv_next_inttypes_h+y}
 then :
@@ -25010,8 +25239,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
-printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
+printf '%s\n' "$gl_cv_next_inttypes_h" >&6; }
      fi
      NEXT_INTTYPES_H=$gl_cv_next_inttypes_h
 
@@ -25055,7 +25284,7 @@ printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5
 printf %s "checking whether malloc is ptrdiff_t safe... " >&6; }
 if test ${gl_cv_malloc_ptrdiff+y}
 then :
@@ -25103,8 +25332,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
-printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5
+printf '%s\n' "$gl_cv_malloc_ptrdiff" >&6; }
 
 
   
@@ -25113,7 +25342,7 @@ printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5
 printf %s "checking whether malloc, realloc, calloc set errno on failure... " >&6; }
 if test ${gl_cv_func_malloc_posix+y}
 then :
@@ -25132,8 +25361,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
-printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5
+printf '%s\n' "$gl_cv_func_malloc_posix" >&6; }
 
 
   
@@ -25141,7 +25370,7 @@ printf "%s\n" "$gl_cv_func_malloc_posix" >&6; }
   
   if test "$gl_cv_func_malloc_posix" = yes; then
     
-printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC_FOR_MALLOC_POSIX=1
@@ -25149,7 +25378,7 @@ printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
 
   
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5
 printf %s "checking whether malloc (0) returns nonnull... " >&6; }
 if test ${ac_cv_func_malloc_0_nonnull+y}
 then :
@@ -25199,8 +25428,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+printf '%s\n' "$ac_cv_func_malloc_0_nonnull" >&6; }
   case $ac_cv_func_malloc_0_nonnull in @%:@(
   *yes) :
     gl_cv_func_malloc_0_nonnull=1 ;; @%:@(
@@ -25209,7 +25438,7 @@ printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
 esac
 
   
-printf "%s\n" "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
+printf '%s\n' "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h
 
 
 
@@ -25433,7 +25662,7 @@ printf "%s\n" "@%:@define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>co
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5
 printf %s "checking whether <limits.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_limits_h+y}
 then :
@@ -25461,11 +25690,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_limits_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_limits_h" >&6; }
   if test $gl_cv_minmax_in_limits_h = yes; then
     
-printf "%s\n" "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
 
   fi
   
@@ -25474,7 +25703,7 @@ printf "%s\n" "@%:@define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5
 printf %s "checking whether <sys/param.h> defines MIN and MAX... " >&6; }
 if test ${gl_cv_minmax_in_sys_param_h+y}
 then :
@@ -25502,11 +25731,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
-printf "%s\n" "$gl_cv_minmax_in_sys_param_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5
+printf '%s\n' "$gl_cv_minmax_in_sys_param_h" >&6; }
   if test $gl_cv_minmax_in_sys_param_h = yes; then
     
-printf "%s\n" "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
 
   fi
   
@@ -25517,7 +25746,7 @@ printf "%s\n" "@%:@define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
   
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5
 printf %s "checking for O_CLOEXEC... " >&6; }
 if test ${gl_cv_macro_O_CLOEXEC+y}
 then :
@@ -25548,12 +25777,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
-printf "%s\n" "$gl_cv_macro_O_CLOEXEC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
+printf '%s\n' "$gl_cv_macro_O_CLOEXEC" >&6; }
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
 printf %s "checking for promoted mode_t type... " >&6; }
 if test ${gl_cv_promoted_mode_t+y}
 then :
@@ -25582,10 +25811,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
-printf "%s\n" "$gl_cv_promoted_mode_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
+printf '%s\n' "$gl_cv_promoted_mode_t" >&6; }
   
-printf "%s\n" "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
+printf '%s\n' "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
 
 
 
@@ -25613,7 +25842,7 @@ printf "%s\n" "@%:@define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h
 if test "x$ac_cv_type_sigset_t" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_SIGSET_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_SIGSET_T 1" >>confdefs.h
 
 gl_cv_type_sigset_t=yes
 else case e in @%:@(
@@ -25627,7 +25856,7 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
 printf %s "checking for SIGPIPE... " >&6; }
 if test ${gl_cv_header_signal_h_SIGPIPE+y}
 then :
@@ -25656,8 +25885,8 @@ rm -rf conftest*
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
-printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5
+printf '%s\n' "$gl_cv_header_signal_h_SIGPIPE" >&6; }
 
 
     
@@ -25682,7 +25911,7 @@ printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; }
 
   
 
-ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_setenv" = xyes
 then :
   ac_have_decl=1
@@ -25690,11 +25919,11 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
 if test ${gt_cv_ssize_t+y}
 then :
@@ -25722,11 +25951,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+printf '%s\n' "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
     
-printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
+printf '%s\n' "@%:@define ssize_t int" >>confdefs.h
 
   fi
 
@@ -25736,7 +25965,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define uid_t int" >>confdefs.h
+printf '%s\n' "@%:@define uid_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -25747,7 +25976,7 @@ then :
   
 else case e in @%:@(
   e) 
-printf "%s\n" "@%:@define gid_t int" >>confdefs.h
+printf '%s\n' "@%:@define gid_t int" >>confdefs.h
  ;;
 esac
 fi
@@ -25766,7 +25995,7 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_signal_h='<'signal.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
 printf %s "checking absolute name of <signal.h>... " >&6; }
 if test ${gl_cv_next_signal_h+y}
 then :
@@ -25811,8 +26040,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
-printf "%s\n" "$gl_cv_next_signal_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
+printf '%s\n' "$gl_cv_next_signal_h" >&6; }
      fi
      NEXT_SIGNAL_H=$gl_cv_next_signal_h
 
@@ -26180,7 +26409,7 @@ then :
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if test -f conftest.o; then
        gl_asmext='s'
@@ -26203,7 +26432,7 @@ rm -rf conftest*
 
   
         
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether C symbols are prefixed with underscore at the linker level" >&5
 printf %s "checking whether C symbols are prefixed with underscore at the linker level... " >&6; }
 if test ${gl_cv_prog_as_underscore+y}
 then :
@@ -26220,7 +26449,7 @@ EOF
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
      if LC_ALL=C $EGREP '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
@@ -26231,21 +26460,21 @@ EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
-printf "%s\n" "$gl_cv_prog_as_underscore" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_as_underscore" >&5
+printf '%s\n' "$gl_cv_prog_as_underscore" >&6; }
   if test $gl_cv_prog_as_underscore = yes; then
     USER_LABEL_PREFIX=_
   else
     USER_LABEL_PREFIX=
   fi
   
-printf "%s\n" "@%:@define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
+printf '%s\n' "@%:@define USER_LABEL_PREFIX $USER_LABEL_PREFIX" >>confdefs.h
 
   ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
   
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 printf %s "checking for stdbool.h that conforms to C99... " >&6; }
 if test ${ac_cv_header_stdbool_h+y}
 then :
@@ -26331,13 +26560,13 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-printf "%s\n" "$ac_cv_header_stdbool_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+printf '%s\n' "$ac_cv_header_stdbool_h" >&6; }
    ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 if test "x$ac_cv_type__Bool" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE__BOOL 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE__BOOL 1" >>confdefs.h
 
 
 fi
@@ -26356,7 +26585,7 @@ fi
 
   GL_GENERATE_STDDEF_H=false
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5
 printf %s "checking for good max_align_t... " >&6; }
 if test ${gl_cv_type_max_align_t+y}
 then :
@@ -26397,8 +26626,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
-printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
+printf '%s\n' "$gl_cv_type_max_align_t" >&6; }
   if test $gl_cv_type_max_align_t = no; then
     HAVE_MAX_ALIGN_T=0
     GL_GENERATE_STDDEF_H=true
@@ -26409,7 +26638,7 @@ printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
     GL_GENERATE_STDDEF_H=true
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
 printf %s "checking whether NULL can be used in arbitrary expressions... " >&6; }
 if test ${gl_cv_decl_null_works+y}
 then :
@@ -26438,8 +26667,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-printf "%s\n" "$gl_cv_decl_null_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+printf '%s\n' "$gl_cv_decl_null_works" >&6; }
   if test $gl_cv_decl_null_works = no; then
     REPLACE_NULL=1
     GL_GENERATE_STDDEF_H=true
@@ -26457,7 +26686,7 @@ printf "%s\n" "$gl_cv_decl_null_works" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stddef_h='<'stddef.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
 printf %s "checking absolute name of <stddef.h>... " >&6; }
 if test ${gl_cv_next_stddef_h+y}
 then :
@@ -26502,8 +26731,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+printf '%s\n' "$gl_cv_next_stddef_h" >&6; }
      fi
      NEXT_STDDEF_H=$gl_cv_next_stddef_h
 
@@ -26523,7 +26752,7 @@ printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
 
 
   
-ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcloseall" = xyes
 then :
   ac_have_decl=1
@@ -26531,12 +26760,12 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
 
 
   
   
-  printf "%s\n" "@%:@define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
+  printf '%s\n' "@%:@define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
 
   
   
@@ -26549,7 +26778,7 @@ printf "%s\n" "@%:@define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdio_h='<'stdio.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
 printf %s "checking absolute name of <stdio.h>... " >&6; }
 if test ${gl_cv_next_stdio_h+y}
 then :
@@ -26594,8 +26823,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
-printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
+printf '%s\n' "$gl_cv_next_stdio_h" >&6; }
      fi
      NEXT_STDIO_H=$gl_cv_next_stdio_h
 
@@ -26612,7 +26841,7 @@ printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
 
 
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5
 printf %s "checking which flavor of printf attribute matches inttypes macros... " >&6; }
 if test ${gl_cv_func_printf_attribute_flavor+y}
 then :
@@ -26650,11 +26879,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
-printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
+printf '%s\n' "$gl_cv_func_printf_attribute_flavor" >&6; }
   if test "$gl_cv_func_printf_attribute_flavor" = gnu; then
     
-printf "%s\n" "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
 
   fi
 
@@ -26681,7 +26910,7 @@ printf "%s\n" "@%:@define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h
     HAVE_DECL_FCLOSEALL=0
   fi
 
-ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ecvt" = xyes
 then :
   ac_have_decl=1
@@ -26689,9 +26918,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcvt" = xyes
 then :
   ac_have_decl=1
@@ -26699,9 +26928,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_gcvt" = xyes
 then :
   ac_have_decl=1
@@ -26709,7 +26938,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
 
 
   
@@ -26724,7 +26953,7 @@ printf "%s\n" "@%:@define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdlib_h='<'stdlib.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
 printf %s "checking absolute name of <stdlib.h>... " >&6; }
 if test ${gl_cv_next_stdlib_h+y}
 then :
@@ -26769,8 +26998,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
-printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
+printf '%s\n' "$gl_cv_next_stdlib_h" >&6; }
      fi
      NEXT_STDLIB_H=$gl_cv_next_stdlib_h
 
@@ -26808,7 +27037,7 @@ printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
 
 
      REPLACE_STRERROR_0=0
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
 printf %s "checking whether strerror(0) succeeds... " >&6; }
 if test ${gl_cv_func_strerror_0_works+y}
 then :
@@ -26864,14 +27093,14 @@ fi
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
-printf "%s\n" "$gl_cv_func_strerror_0_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
+printf '%s\n' "$gl_cv_func_strerror_0_works" >&6; }
   case "$gl_cv_func_strerror_0_works" in
     *yes) ;;
     *)
       REPLACE_STRERROR_0=1
       
-printf "%s\n" "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
+printf '%s\n' "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
 
       ;;
   esac
@@ -26889,7 +27118,7 @@ printf "%s\n" "@%:@define REPLACE_STRERROR_0 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_string_h='<'string.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <string.h>" >&5
 printf %s "checking absolute name of <string.h>... " >&6; }
 if test ${gl_cv_next_string_h+y}
 then :
@@ -26934,8 +27163,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
-printf "%s\n" "$gl_cv_next_string_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
+printf '%s\n' "$gl_cv_next_string_h" >&6; }
      fi
      NEXT_STRING_H=$gl_cv_next_string_h
 
@@ -26970,7 +27199,7 @@ printf "%s\n" "$gl_cv_next_string_h" >&6; }
   
 
     
-printf "%s\n" "@%:@define _USE_STD_STAT 1" >>confdefs.h
+printf '%s\n' "@%:@define _USE_STD_STAT 1" >>confdefs.h
 
 
   
@@ -26984,7 +27213,7 @@ printf "%s\n" "@%:@define _USE_STD_STAT 1" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_types_h='<'sys/types.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
 printf %s "checking absolute name of <sys/types.h>... " >&6; }
 if test ${gl_cv_next_sys_types_h+y}
 then :
@@ -27029,8 +27258,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
-printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
+printf '%s\n' "$gl_cv_next_sys_types_h" >&6; }
      fi
      NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
 
@@ -27082,7 +27311,7 @@ printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
 
 
     
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
 printf %s "checking for struct timespec in <time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_time_h+y}
 then :
@@ -27110,8 +27339,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
 
   TIME_H_DEFINES_STRUCT_TIMESPEC=0
   SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
@@ -27120,7 +27349,7 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
   if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
     TIME_H_DEFINES_STRUCT_TIMESPEC=1
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
 printf %s "checking for struct timespec in <sys/time.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_sys_time_h+y}
 then :
@@ -27148,12 +27377,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
     if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
       SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
 printf %s "checking for struct timespec in <pthread.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_pthread_h+y}
 then :
@@ -27181,12 +27410,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
       if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
         PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <unistd.h>" >&5
 printf %s "checking for struct timespec in <unistd.h>... " >&6; }
 if test ${gl_cv_sys_struct_timespec_in_unistd_h+y}
 then :
@@ -27214,8 +27443,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
-printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
+printf '%s\n' "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
         if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
           UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
         fi
@@ -27241,7 +27470,7 @@ printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_time_h='<'time.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
 printf %s "checking absolute name of <time.h>... " >&6; }
 if test ${gl_cv_next_time_h+y}
 then :
@@ -27286,8 +27515,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
-printf "%s\n" "$gl_cv_next_time_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
+printf '%s\n' "$gl_cv_next_time_h" >&6; }
      fi
      NEXT_TIME_H=$gl_cv_next_time_h
 
@@ -27307,7 +27536,7 @@ printf "%s\n" "$gl_cv_next_time_h" >&6; }
 
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5
 printf %s "checking for TIME_UTC in <time.h>... " >&6; }
 if test ${gl_cv_time_h_has_TIME_UTC+y}
 then :
@@ -27335,8 +27564,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
-printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
+printf '%s\n' "$gl_cv_time_h_has_TIME_UTC" >&6; }
   if test $gl_cv_time_h_has_TIME_UTC = yes; then
     TIME_H_DEFINES_TIME_UTC=1
   else
@@ -27398,7 +27627,7 @@ printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
   
 
   
-ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_execvpe" = xyes
 then :
   ac_have_decl=1
@@ -27406,7 +27635,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
 
 
       
@@ -27423,7 +27652,7 @@ printf "%s\n" "@%:@define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_unistd_h='<'unistd.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
 printf %s "checking absolute name of <unistd.h>... " >&6; }
 if test ${gl_cv_next_unistd_h+y}
 then :
@@ -27474,8 +27703,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
-printf "%s\n" "$gl_cv_next_unistd_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
+printf '%s\n' "$gl_cv_next_unistd_h" >&6; }
      fi
      NEXT_UNISTD_H=$gl_cv_next_unistd_h
 
@@ -27542,7 +27771,7 @@ q
     LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
   fi
 
-ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27550,9 +27779,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_feof_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27560,9 +27789,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ferror_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27570,9 +27799,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fflush_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27580,9 +27809,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fgets_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27590,9 +27819,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27600,9 +27829,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fputs_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27610,9 +27839,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fread_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27620,9 +27849,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27630,9 +27859,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27640,9 +27869,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_getchar_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27650,9 +27879,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putc_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27660,9 +27889,9 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h
 
-ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+ac_fn_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_putchar_unlocked" = xyes
 then :
   ac_have_decl=1
@@ -27670,7 +27899,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
     HAVE_BTOWC=1;         
@@ -27733,7 +27962,7 @@ printf "%s\n" "@%:@define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h
 
 
             
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
 printf %s "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
 if test ${gl_cv_header_wchar_h_correct_inline+y}
 then :
@@ -27758,7 +27987,7 @@ _ACEOF
             && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27774,7 +28003,7 @@ _ACEOF
               && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
              if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
                :
@@ -27790,8 +28019,8 @@ _ACEOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
-printf "%s\n" "$gl_cv_header_wchar_h_correct_inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
+printf '%s\n' "$gl_cv_header_wchar_h_correct_inline" >&6; }
   if test $gl_cv_header_wchar_h_correct_inline = no; then
     as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
 This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
@@ -27839,7 +28068,7 @@ Configuration aborted." "$LINENO" 5
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_wchar_h='<'wchar.h'>'
      else
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
+       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
 printf %s "checking absolute name of <wchar.h>... " >&6; }
 if test ${gl_cv_next_wchar_h+y}
 then :
@@ -27890,8 +28119,8 @@ _ACEOF
           ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
-printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
+printf '%s\n' "$gl_cv_next_wchar_h" >&6; }
      fi
      NEXT_WCHAR_H=$gl_cv_next_wchar_h
 
@@ -27935,7 +28164,7 @@ printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
   ac_fn_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" "
       #include <wchar.h>
     
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_wcsdup" = xyes
 then :
   ac_have_decl=1
@@ -27943,7 +28172,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
 
   if test $ac_cv_have_decl_wcsdup = no; then
     HAVE_DECL_WCSDUP=0
@@ -28121,7 +28350,7 @@ printf "%s\n" "@%:@define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
   
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5
 printf %s "checking for C compiler option to allow warnings... " >&6; }
 if test ${gl_cv_cc_wallow+y}
 then :
@@ -28133,13 +28362,13 @@ else case e in @%:@(
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null
      { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null
                          if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then
        gl_cv_cc_wallow='-Wno-error'
@@ -28150,8 +28379,8 @@ else case e in @%:@(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5
-printf "%s\n" "$gl_cv_cc_wallow" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5
+printf '%s\n' "$gl_cv_cc_wallow" >&6; }
   case "$gl_cv_cc_wallow" in
     none) GL_CFLAG_ALLOW_WARNINGS='' ;;
     *)    GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;;
@@ -28193,7 +28422,7 @@ EOF
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gl_command\""; } >&5
   (eval $gl_command) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
       gl_options=`grep -v '#' conftest.out`
       for word in $gl_options; do
@@ -28298,7 +28527,7 @@ fi
 
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
 printf %s "checking for __builtin_expect... " >&6; }
 if test ${gl_cv___builtin_expect+y}
 then :
@@ -28344,13 +28573,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
-printf "%s\n" "$gl_cv___builtin_expect" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5
+printf '%s\n' "$gl_cv___builtin_expect" >&6; }
   if test "$gl_cv___builtin_expect" = yes; then
-    printf "%s\n" "@%:@define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
+    printf '%s\n' "@%:@define HAVE___BUILTIN_EXPECT 1" >>confdefs.h
 
   elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then
-    printf "%s\n" "@%:@define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
+    printf '%s\n' "@%:@define HAVE___BUILTIN_EXPECT 2" >>confdefs.h
 
   fi
   
@@ -28395,7 +28624,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
 
   
@@ -28413,7 +28642,7 @@ printf "%s\n" "@%:@define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
 
 
@@ -28432,7 +28661,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_CANONICALIZE_FILE_NAME 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
 
 
 
@@ -28440,7 +28669,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_REALPATH 1" >>confdefs.h
   
   
   
-printf "%s\n" "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
 
 
   
@@ -28460,7 +28689,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -28509,13 +28738,13 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_CLOSE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_CLOSE 1" >>confdefs.h
 
 
 
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 printf %s "checking whether // is distinct from /... " >&6; }
 if test ${gl_cv_double_slash_root+y}
 then :
@@ -28546,18 +28775,18 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
-printf "%s\n" "$gl_cv_double_slash_root" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
+printf '%s\n' "$gl_cv_double_slash_root" >&6; }
   if test "$gl_cv_double_slash_root" = yes; then
     
-printf "%s\n" "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
+printf '%s\n' "@%:@define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
   fi
 
   
   
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5
 printf %s "checking whether dup2 works... " >&6; }
 if test ${gl_cv_func_dup2_works+y}
 then :
@@ -28665,8 +28894,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
-printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
+printf '%s\n' "$gl_cv_func_dup2_works" >&6; }
   case "$gl_cv_func_dup2_works" in
     *yes) ;;
     *)
@@ -28674,7 +28903,7 @@ printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
       ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize"
 if test "x$ac_cv_func_setdtablesize" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETDTABLESIZE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETDTABLESIZE 1" >>confdefs.h
 
 fi
 
@@ -28716,7 +28945,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
 
 
 
@@ -28736,7 +28965,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_DUP2 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_ENVIRON 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_ENVIRON 1" >>confdefs.h
 
 
 
@@ -28775,7 +29004,7 @@ fi
 
   
   
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
 printf %s "checking for error_at_line... " >&6; }
 if test ${ac_cv_lib_error_at_line+y}
 then :
@@ -28803,8 +29032,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-printf "%s\n" "$ac_cv_lib_error_at_line" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
+printf '%s\n' "$ac_cv_lib_error_at_line" >&6; }
 
   
      if test "$ac_cv_lib_error_at_line" = no; then
@@ -28855,7 +29084,7 @@ fi
   fi
 
   else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5
 printf %s "checking whether fcntl handles F_DUPFD correctly... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_works+y}
 then :
@@ -28933,8 +29162,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
     case $gl_cv_func_fcntl_f_dupfd_works in
       *yes) ;;
       *) 
@@ -28947,11 +29176,11 @@ printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
   fi
 
         
-printf "%s\n" "@%:@define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
+printf '%s\n' "@%:@define FCNTL_DUPFD_BUGGY 1" >>confdefs.h
  ;;
     esac
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5
 printf %s "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; }
 if test ${gl_cv_func_fcntl_f_dupfd_cloexec+y}
 then :
@@ -29026,8 +29255,8 @@ fi
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
-printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
+printf '%s\n' "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
     case "$gl_cv_func_fcntl_f_dupfd_cloexec" in
       *yes) ;;
       *)    
@@ -29073,7 +29302,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
 
 
 
@@ -29087,7 +29316,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FCNTL 1" >>confdefs.h
   
   
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
@@ -29122,13 +29351,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
     
-printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -29168,7 +29397,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FREE_POSIX 1" >>confdefs.h
 
 
 
@@ -29236,7 +29465,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
 
 
 
@@ -29247,7 +29476,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FSTAT 1" >>confdefs.h
   
   if test $ac_cv_func_getdtablesize = yes &&
      test $ac_cv_have_decl_getdtablesize = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5
 printf %s "checking whether getdtablesize works... " >&6; }
 if test ${gl_cv_func_getdtablesize_works+y}
 then :
@@ -29304,8 +29533,8 @@ fi
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
-printf "%s\n" "$gl_cv_func_getdtablesize_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
+printf '%s\n' "$gl_cv_func_getdtablesize_works" >&6; }
     case "$gl_cv_func_getdtablesize_works" in
       *yes | "no (limitation)") ;;
       *) REPLACE_GETDTABLESIZE=1 ;;
@@ -29348,7 +29577,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
 
 
 
@@ -29357,7 +29586,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
   
   ac_found=0
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
@@ -29365,14 +29594,14 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
@@ -29380,14 +29609,14 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
 fi
 
   ac_fn_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include <stdlib.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl___argv" = xyes
 then :
   ac_have_decl=1
@@ -29395,7 +29624,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
 then :
   ac_found=1
@@ -29406,7 +29635,7 @@ fi
   if test $ac_found = 0; then
     # On OpenBSD 5.1, using the global __progname variable appears to be
     # the only way to implement getprogname.
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5
 printf %s "checking whether __progname is defined in default libraries... " >&6; }
 if test ${gl_cv_var___progname+y}
 then :
@@ -29437,11 +29666,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
-printf "%s\n" "$gl_cv_var___progname" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
+printf '%s\n' "$gl_cv_var___progname" >&6; }
     if test "$gl_cv_var___progname" = yes; then
       
-printf "%s\n" "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
 
     fi
   fi
@@ -29463,7 +29692,7 @@ printf "%s\n" "@%:@define HAVE_VAR___PROGNAME 1" >>confdefs.h
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -29494,9 +29723,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -29540,8 +29769,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -29550,11 +29779,11 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the __inline keyword" >&5
 printf %s "checking whether the compiler supports the __inline keyword... " >&6; }
 if test ${gl_cv_c___inline+y}
 then :
@@ -29582,11 +29811,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
-printf "%s\n" "$gl_cv_c___inline" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
+printf '%s\n' "$gl_cv_c___inline" >&6; }
   if test $gl_cv_c___inline = yes; then
     
-printf "%s\n" "@%:@define HAVE___INLINE 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE___INLINE 1" >>confdefs.h
 
   fi
 
@@ -29652,7 +29881,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -29661,7 +29890,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
   
     
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 printf %s "checking for mbstate_t... " >&6; }
 if test ${ac_cv_type_mbstate_t+y}
 then :
@@ -29689,15 +29918,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-printf "%s\n" "$ac_cv_type_mbstate_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+printf '%s\n' "$ac_cv_type_mbstate_t" >&6; }
    if test $ac_cv_type_mbstate_t = yes; then
      
-printf "%s\n" "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MBSTATE_T 1" >>confdefs.h
 
    else
      
-printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
+printf '%s\n' "@%:@define mbstate_t int" >>confdefs.h
 
    fi
 
@@ -29710,7 +29939,7 @@ printf "%s\n" "@%:@define mbstate_t int" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -29759,7 +29988,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
 
 
 
@@ -29798,7 +30027,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
 
 
   
@@ -29816,7 +30045,7 @@ printf "%s\n" "@%:@define GNULIB_MSVC_NOTHROW 1" >>confdefs.h
       fi
       
          
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
 printf %s "checking whether open recognizes a trailing slash... " >&6; }
 if test ${gl_cv_func_open_slash+y}
 then :
@@ -29877,12 +30106,12 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
-printf "%s\n" "$gl_cv_func_open_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
+printf '%s\n' "$gl_cv_func_open_slash" >&6; }
   case "$gl_cv_func_open_slash" in
     *no)
       
-printf "%s\n" "@%:@define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
       ;;
   esac
@@ -29934,7 +30163,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
 
 
 
@@ -29942,7 +30171,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_OPEN 1" >>confdefs.h
       
 
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
@@ -29950,10 +30179,10 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 
   ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
@@ -29961,7 +30190,7 @@ else case e in @%:@(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 
   
   
@@ -29969,7 +30198,7 @@ printf "%s\n" "@%:@define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl"
   ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise"
 if test "x$ac_cv_func_raise" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAISE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAISE 1" >>confdefs.h
 
 fi
 
@@ -30043,7 +30272,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
 
 
 
@@ -30054,7 +30283,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_RAISE 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -30101,7 +30330,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_RAWMEMCHR 1" >>confdefs.h
 
 
 
@@ -30149,7 +30378,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
 
 
 
@@ -30159,7 +30388,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_READ 1" >>confdefs.h
   if test $ac_cv_func_readlink = no; then
     HAVE_READLINK=0
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
 printf %s "checking whether readlink signature is correct... " >&6; }
 if test ${gl_cv_decl_readlink_works+y}
 then :
@@ -30188,9 +30417,9 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
-printf "%s\n" "$gl_cv_decl_readlink_works" >&6; }
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlink_works" >&5
+printf '%s\n' "$gl_cv_decl_readlink_works" >&6; }
+            { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
 printf %s "checking whether readlink handles trailing slash correctly... " >&6; }
 if test ${gl_cv_func_readlink_trailing_slash+y}
 then :
@@ -30242,8 +30471,8 @@ fi
       rm -f conftest.link conftest.lnk2 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
-printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_trailing_slash" >&5
+printf '%s\n' "$gl_cv_func_readlink_trailing_slash" >&6; }
     case "$gl_cv_func_readlink_trailing_slash" in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -30252,13 +30481,13 @@ printf "%s\n" "$gl_cv_func_readlink_trailing_slash" >&6; }
         ;;
       *)
         
-printf "%s\n" "@%:@define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
     esac
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether readlink truncates results correctly" >&5
 printf %s "checking whether readlink truncates results correctly... " >&6; }
 if test ${gl_cv_func_readlink_truncate+y}
 then :
@@ -30309,8 +30538,8 @@ fi
       rm -f conftest.link conftest.lnk2 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
-printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_readlink_truncate" >&5
+printf '%s\n' "$gl_cv_func_readlink_truncate" >&6; }
     case $gl_cv_func_readlink_truncate in
       *yes)
         if test "$gl_cv_decl_readlink_works" != yes; then
@@ -30319,7 +30548,7 @@ printf "%s\n" "$gl_cv_func_readlink_truncate" >&6; }
         ;;
       *)
         
-printf "%s\n" "@%:@define READLINK_TRUNCATE_BUG 1" >>confdefs.h
+printf '%s\n' "@%:@define READLINK_TRUNCATE_BUG 1" >>confdefs.h
 
         REPLACE_READLINK=1
         ;;
@@ -30362,7 +30591,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
 
 
 
@@ -30400,7 +30629,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_READLINK 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
 
 
 
@@ -30459,7 +30688,7 @@ fi
     *)      ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
 if test "x$ac_cv_func_getcwd" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_GETCWD 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_GETCWD 1" >>confdefs.h
 
 fi
  ;;
@@ -30475,7 +30704,7 @@ fi
   
   if test "$gl_cv_func_malloc_posix" = yes; then
     
-printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
 
   else
     REPLACE_MALLOC_FOR_MALLOC_POSIX=1
@@ -30491,7 +30720,7 @@ printf "%s\n" "@%:@define HAVE_MALLOC_POSIX 1" >>confdefs.h
   
   
 
-                          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
+                          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether free is known to preserve errno" >&5
 printf %s "checking whether free is known to preserve errno... " >&6; }
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
@@ -30526,13 +30755,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
-printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
+printf '%s\n' "$gl_cv_func_free_preserves_errno" >&6; }
 
   case $gl_cv_func_free_preserves_errno in
    *yes)
     
-printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
 
     ;;
    *) REPLACE_FREE=1 ;;
@@ -30547,7 +30776,7 @@ printf "%s\n" "@%:@define HAVE_FREE_POSIX 1" >>confdefs.h
   ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy"
 if test "x$ac_cv_func_mempcpy" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MEMPCPY 1" >>confdefs.h
 
 fi
 
@@ -30562,7 +30791,7 @@ fi
   ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr"
 if test "x$ac_cv_func_rawmemchr" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_RAWMEMCHR 1" >>confdefs.h
 
 fi
 
@@ -30590,14 +30819,14 @@ fi
   ac_fn_c_check_header_compile "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default"
 if test "x$ac_cv_header_search_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SEARCH_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SEARCH_H 1" >>confdefs.h
 
 fi
 
   ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch"
 if test "x$ac_cv_func_tsearch" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_TSEARCH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_TSEARCH 1" >>confdefs.h
 
 fi
 
@@ -30619,7 +30848,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_SIGPIPE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_SIGPIPE 1" >>confdefs.h
 
 
     
@@ -30697,12 +30926,12 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h
 
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
 if test ${gt_cv_ssize_t+y}
 then :
@@ -30730,11 +30959,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+printf '%s\n' "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
     
-printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
+printf '%s\n' "@%:@define ssize_t int" >>confdefs.h
 
   fi
 
@@ -30747,7 +30976,7 @@ printf "%s\n" "@%:@define ssize_t int" >>confdefs.h
                   REPLACE_STAT=1
       ;;
     *)
-                        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
+                        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
 printf %s "checking whether stat handles trailing slashes on files... " >&6; }
 if test ${gl_cv_func_stat_file_slash+y}
 then :
@@ -30806,13 +31035,13 @@ fi
          rm -f conftest.tmp conftest.lnk ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
-printf "%s\n" "$gl_cv_func_stat_file_slash" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
+printf '%s\n' "$gl_cv_func_stat_file_slash" >&6; }
       case $gl_cv_func_stat_file_slash in
         *no)
           REPLACE_STAT=1
           
-printf "%s\n" "@%:@define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
+printf '%s\n' "@%:@define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
 ;;
       esac
       case $host_os in
@@ -30874,7 +31103,7 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
 
 
 
@@ -30888,9 +31117,9 @@ printf "%s\n" "@%:@define GNULIB_TEST_STAT 1" >>confdefs.h
 if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5
 printf %s "checking whether struct stat.st_atim is of type struct timespec... " >&6; }
 if test ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+y}
 then :
@@ -30928,11 +31157,11 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
-printf "%s\n" "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
+printf '%s\n' "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
      if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then
        
-printf "%s\n" "@%:@define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
+printf '%s\n' "@%:@define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
 
      fi
 else case e in @%:@(
@@ -30942,7 +31171,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30952,7 +31181,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30962,7 +31191,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -30986,7 +31215,7 @@ fi
 if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -30996,7 +31225,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
 
 
 else case e in @%:@(
@@ -31006,7 +31235,7 @@ else case e in @%:@(
 if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes
 then :
   
-printf "%s\n" "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -31019,7 +31248,7 @@ fi
 
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5
 printf %s "checking for working stdalign.h... " >&6; }
 if test ${gl_cv_header_working_stdalign_h+y}
 then :
@@ -31077,8 +31306,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
+printf '%s\n' "$gl_cv_header_working_stdalign_h" >&6; }
 
   if test $gl_cv_header_working_stdalign_h = yes; then
     GL_GENERATE_STDALIGN_H=false
@@ -31335,13 +31564,13 @@ fi
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FSCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FSCANF 1" >>confdefs.h
 
 
 
   
   
-printf "%s\n" "@%:@define GNULIB_FSCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_FSCANF 1" >>confdefs.h
 
 
   
@@ -31359,13 +31588,13 @@ printf "%s\n" "@%:@define GNULIB_FSCANF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_SCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_SCANF 1" >>confdefs.h
 
 
 
   
   
-printf "%s\n" "@%:@define GNULIB_SCANF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_SCANF 1" >>confdefs.h
 
 
   
@@ -31383,7 +31612,7 @@ printf "%s\n" "@%:@define GNULIB_SCANF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
 
 
 
@@ -31402,7 +31631,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FGETC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
 
 
 
@@ -31421,7 +31650,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
 
 
@@ -31440,7 +31669,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_GETCHAR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
 
 
 
@@ -31459,7 +31688,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FGETS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
 
 
 
@@ -31478,7 +31707,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FREAD 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
 
 
@@ -31497,7 +31726,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
 
 
@@ -31516,7 +31745,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
 
 
@@ -31535,7 +31764,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_VFPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
 
 
@@ -31554,7 +31783,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_VPRINTF 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
 
 
@@ -31573,7 +31802,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPUTC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
 
 
 
@@ -31592,7 +31821,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTC 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
 
 
@@ -31611,7 +31840,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTCHAR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
 
 
@@ -31630,7 +31859,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FPUTS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
 
 
 
@@ -31649,7 +31878,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_PUTS 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
 
 
 
@@ -31666,7 +31895,7 @@ printf "%s\n" "@%:@define GNULIB_TEST_FWRITE 1" >>confdefs.h
   
      
   if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5
 printf %s "checking for working strerror function... " >&6; }
 if test ${gl_cv_func_working_strerror+y}
 then :
@@ -31711,8 +31940,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
-printf "%s\n" "$gl_cv_func_working_strerror" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
+printf '%s\n' "$gl_cv_func_working_strerror" >&6; }
     case "$gl_cv_func_working_strerror" in
       *yes) ;;
       *)
@@ -31740,7 +31969,7 @@ fi
 
   
   
-printf "%s\n" "@%:@define GNULIB_STRERROR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_STRERROR 1" >>confdefs.h
 
 
   
@@ -31763,7 +31992,7 @@ printf "%s\n" "@%:@define GNULIB_STRERROR 1" >>confdefs.h
 
     
   
-printf "%s\n" "@%:@define GNULIB_TEST_STRERROR 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_TEST_STRERROR 1" >>confdefs.h
 
 
 
@@ -31793,7 +32022,7 @@ fi
                     ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
 if test "x$ac_cv_header_winsock2_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
@@ -31946,10 +32175,10 @@ fi
 
 
   
-printf "%s\n" "@%:@define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
+printf '%s\n' "@%:@define GNULIB_STDIO_SINGLE_THREAD 1" >>confdefs.h
 
   
-printf "%s\n" "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
+printf '%s\n' "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs.h
 
   
       
@@ -31969,7 +32198,7 @@ printf "%s\n" "@%:@define USE_UNLOCKED_IO GNULIB_STDIO_SINGLE_THREAD" >>confdefs
   
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5
 printf %s "checking for variable-length arrays... " >&6; }
 if test ${ac_cv_c_vararrays+y}
 then :
@@ -32039,15 +32268,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5
-printf "%s\n" "$ac_cv_c_vararrays" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5
+printf '%s\n' "$ac_cv_c_vararrays" >&6; }
   if test "$ac_cv_c_vararrays" = yes; then
         
-printf "%s\n" "@%:@define HAVE_C_VARARRAYS 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_C_VARARRAYS 1" >>confdefs.h
 
   elif test "$ac_cv_c_vararrays" = no; then
     
-printf "%s\n" "@%:@define __STDC_NO_VLA__ 1" >>confdefs.h
+printf '%s\n' "@%:@define __STDC_NO_VLA__ 1" >>confdefs.h
 
   fi
 
@@ -32176,44 +32405,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -32225,8 +32417,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -32240,8 +32432,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -32258,7 +32450,7 @@ U=
 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -32269,14 +32461,14 @@ LIB@&t@OBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
 printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf '%s\n' "done" >&6; }
 case $enable_silent_rules in @%:@ (((
   yes) AM_DEFAULT_VERBOSITY=0;;
    no) AM_DEFAULT_VERBOSITY=1;;
@@ -32374,13 +32566,21 @@ fi
   
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in @%:@(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -32394,7 +32594,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -32406,7 +32606,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -32493,7 +32693,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -32509,9 +32709,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -32606,7 +32806,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -32628,29 +32828,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -32692,7 +32869,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -32701,7 +32878,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32754,19 +32931,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by libiconv $as_me 1.17, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -32788,7 +32965,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -32796,7 +32973,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -32828,16 +33005,16 @@ $config_commands
 Report bugs to the package provider."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 libiconv config.status 1.17
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -32846,10 +33023,14 @@ srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -32877,15 +33058,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -32893,7 +33074,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -32902,7 +33083,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -32926,29 +33107,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
 @%:@@%:@ Running $as_me. @%:@@%:@
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -32997,6 +33178,7 @@ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
@@ -33179,6 +33361,7 @@ file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
+lt_ar_flags \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -33323,7 +33506,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -33416,13 +33599,13 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -33433,7 +33616,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -33478,9 +33661,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -33509,7 +33692,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -33541,7 +33724,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -33612,9 +33795,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -33632,8 +33815,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -33648,7 +33835,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -33692,7 +33879,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -33700,17 +33887,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -33727,7 +33914,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33751,9 +33938,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -33798,7 +33985,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -33815,10 +34002,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -33832,11 +34019,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -33860,9 +34047,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -33878,20 +34065,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -33911,7 +34098,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$_am_arg" |
+printf '%s\n' X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33931,8 +34118,8 @@ printf "%s\n" X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
   
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -33958,7 +34145,7 @@ esac
   for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    am_mf=`printf '%s\n' "$am_mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile which includes
     # dependency-tracking related rules and includes.
     # Grep'ing the whole file directly is not great: AIX grep has a line
@@ -33970,7 +34157,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$am_mf" : 'X\(//\)[^/]' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$am_mf" |
+printf '%s\n' X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -33992,7 +34179,7 @@ printf "%s\n" X"$am_mf" |
 $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$am_mf" |
+printf '%s\n' X/"$am_mf" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -34017,8 +34204,8 @@ printf "%s\n" X/"$am_mf" |
    (exit $ac_status); } || am_rc=$?
   done
   if test $am_rc -ne 0; then
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
     for automatic dependency tracking.  If GNU make was not used, consider
     re-running the configure script with MAKE=\"gmake\" (or whatever is
@@ -34054,7 +34241,7 @@ See 'config.log' for more details" "$LINENO" 5; }
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -34177,6 +34364,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
 # A file(cmd) program that detects file types.
 FILECMD=$lt_FILECMD
 
@@ -34199,7 +34389,7 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 AR=$lt_AR
 
 # Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
+lt_ar_flags=$lt_lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}
@@ -34808,7 +34998,9 @@ _LT_EOF
                 #      presentlang can be used as a fallback for messages
                 #      which are not translated in the desiredlang catalog).
                 case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
+                  "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+                    useit=yes
+                    ;;
                 esac
               done
               if test $useit = yes; then
@@ -34843,7 +35035,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -34859,11 +35051,18 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in @%:@(
+  -*) :
+    ac_no_opts=-- ;; @%:@(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
@@ -34909,7 +35108,7 @@ if test "$no_recursion" != yes; then
       ;;
     *)
       case $ac_arg in
-      *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
       as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
     esac
@@ -34919,7 +35118,7 @@ if test "$no_recursion" != yes; then
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -34940,17 +35139,17 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    printf "%s\n" "$ac_msg" >&6
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
+    printf '%s\n' "$ac_msg" >&6
     as_dir="$ac_dir"; as_fn_mkdir_p
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -34987,8 +35186,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
     elif test -f "$ac_srcdir/configure"; then
       ac_sub_configure=$ac_srcdir/configure
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
+printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
@@ -35001,8 +35200,8 @@ printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;
 	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+printf '%s\n' "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
 	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
@@ -35013,7 +35212,7 @@ printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args -
   done
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/recipes/libs/libiconv/source/autom4te.cache/requests b/recipes/libs/libiconv/source/autom4te.cache/requests
index 3cb443cf39..4f9ec7950b 100644
--- a/recipes/libs/libiconv/source/autom4te.cache/requests
+++ b/recipes/libs/libiconv/source/autom4te.cache/requests
@@ -1,4 +1,4 @@
-# This file was generated by Autom4te 2.72.
+# This file was generated by Autom4te 2.73.
 # It contains the lists of macros which have been traced.
 # It can be safely removed.
 
@@ -33,112 +33,113 @@
                         '/usr/share/aclocal-1.18/substnot.m4',
                         '/usr/share/aclocal-1.18/tar.m4',
                         '/usr/share/aclocal-1.18/xargsn.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltargz.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/00gnulib.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/__inline.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/absolute-header.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/alloca.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/asm-underscore.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/builtin-expect.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/canonicalize.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/close.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/codeset.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/double-slash-root.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/dup2.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/eealloc.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/environ.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/errno_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/error.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/extensions.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/extern-inline.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl-o.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/free.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fstat.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/getdtablesize.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/getprogname.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gettext.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/host-cpu-c-abi.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/iconv.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/include_next.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/intlmacosx.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/inttypes.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/largefile.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-ld.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-link.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-prefix.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/libunistring-base.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/limits-h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lstat.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/malloc.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/malloca.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/mbstate_t.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/mempcpy.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/minmax.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/mode_t.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/msvc-inval.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/msvc-nothrow.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/multiarch.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/nls.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/nocrash.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/off_t.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/open-cloexec.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/open-slash.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/open.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/pathmax.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/pid_t.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/po.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/progtest.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/raise.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/rawmemchr.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/read.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/readlink.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/realloc.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/safe-read.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/setenv.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/signal_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/signalblocking.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sigpipe.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/ssize_t.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stat-time.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stat.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/std-gnu11.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdalign.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdbool.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stddef_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdint.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdio_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdlib_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/strerror.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/string_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_types_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/time_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/unistd_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/unlocked-io.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/vararrays.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/visibility.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/warn-on-use.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wchar_h.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wchar_t.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wint_t.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/year2038.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/zzgnulib.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/cp.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/eilseq.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ln.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltsugar.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltversion.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4',
+                        '/usr/share/aclocal/ltargz.m4',
+                        '/usr/share/aclocal/ltdl.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/00gnulib.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/__inline.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/absolute-header.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/alloca.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/asm-underscore.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/builtin-expect.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/canonicalize.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/close.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/codeset.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/double-slash-root.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/dup2.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/eealloc.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/environ.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/errno_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/error.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/extensions.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/extern-inline.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl-o.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/free.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fstat.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/getdtablesize.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/getprogname.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/include_next.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/inttypes.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/largefile.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/libunistring-base.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/limits-h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/lstat.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/malloc.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/malloca.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/mbstate_t.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/mempcpy.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/minmax.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/mode_t.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/msvc-inval.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/msvc-nothrow.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/multiarch.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/nocrash.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/off_t.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/open-cloexec.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/open-slash.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/open.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/pathmax.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/pid_t.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/raise.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/rawmemchr.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/read.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/readlink.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/realloc.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/safe-read.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/setenv.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/signal_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/signalblocking.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sigpipe.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/ssize_t.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stat-time.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stat.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/std-gnu11.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdalign.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdbool.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stddef_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdint.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdio_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdlib_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/strerror.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/string_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_types_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/time_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/unistd_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/unlocked-io.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/vararrays.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/visibility.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/warn-on-use.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wchar_h.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wchar_t.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wint_t.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/year2038.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/zzgnulib.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/cp.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/eilseq.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/gettext.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/host-cpu-c-abi.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/iconv.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/intlmacosx.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-ld.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-link.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-prefix.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ln.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltsugar.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltversion.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/nls.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/po.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/progtest.m4',
                         'configure.ac'
                       ],
                       {
@@ -309,6 +310,9 @@
                         'LT_PATH_NM' => 1,
                         'LT_PROG_GCJ' => 1,
                         'LT_PROG_GO' => 1,
+                        'LT_PROG_ML64' => 1,
+                        'LT_PROG_OBJC' => 1,
+                        'LT_PROG_OBJCXX' => 1,
                         'LT_PROG_RC' => 1,
                         'LT_SUPPORTED_TAG' => 1,
                         'LT_SYS_DLOPEN_DEPLIBS' => 1,
@@ -395,6 +399,16 @@
                         'gl_ASSERT_NO_GNULIB_POSIXCHECK' => 1,
                         'gl_ASSERT_NO_GNULIB_TESTS' => 1,
                         'gl_BIGENDIAN' => 1,
+                        'gl_BUILD_TO_HOST' => 1,
+                        'gl_BUILD_TO_HOST_BINDIR' => 1,
+                        'gl_BUILD_TO_HOST_DATADIR' => 1,
+                        'gl_BUILD_TO_HOST_INIT' => 1,
+                        'gl_BUILD_TO_HOST_LIBDIR' => 1,
+                        'gl_BUILD_TO_HOST_LIBEXECDIR' => 1,
+                        'gl_BUILD_TO_HOST_LOCALEDIR' => 1,
+                        'gl_BUILD_TO_HOST_PKGDATADIR' => 1,
+                        'gl_BUILD_TO_HOST_PKGLIBDIR' => 1,
+                        'gl_BUILD_TO_HOST_PKGLIBEXECDIR' => 1,
                         'gl_CACHE_VAL_SILENT' => 1,
                         'gl_CANONICALIZE_LGPL' => 1,
                         'gl_CANONICALIZE_LGPL_SEPARATE' => 1,
@@ -627,9 +641,9 @@
                       1,
                       [
                         '/usr/share/autoconf',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot//share/aclocal'
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4',
+                        '/usr/share/aclocal'
                       ],
                       [
                         '/usr/share/autoconf/autoconf/autoconf.m4f',
@@ -646,6 +660,7 @@
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_CONFIG_LINKS' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
@@ -655,6 +670,9 @@
                         'AC_FC_SRCEXT' => 1,
                         'AC_INIT' => 1,
                         'AC_LIBSOURCE' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_SUBST' => 1,
@@ -666,6 +684,9 @@
                         'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'AM_GNU_GETTEXT' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AM_ICONV' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
@@ -683,6 +704,7 @@
                         'AM_SILENT_RULES' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
                         'GTK_DOC_CHECK' => 1,
+                        'GUILE_FLAGS' => 1,
                         'IT_PROG_INTLTOOL' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
                         'LT_INIT' => 1,
@@ -707,9 +729,9 @@
                       1,
                       [
                         '/usr/share/autoconf',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot//share/aclocal'
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4',
+                        '/usr/share/aclocal'
                       ],
                       [
                         '/usr/share/autoconf/autoconf/autoconf.m4f',
@@ -727,6 +749,7 @@
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_CONFIG_LINKS' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
@@ -736,6 +759,9 @@
                         'AC_FC_SRCEXT' => 1,
                         'AC_INIT' => 1,
                         'AC_LIBSOURCE' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_SUBST' => 1,
@@ -747,6 +773,9 @@
                         'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'AM_GNU_GETTEXT' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AM_ICONV' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
@@ -764,6 +793,7 @@
                         'AM_SILENT_RULES' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
                         'GTK_DOC_CHECK' => 1,
+                        'GUILE_FLAGS' => 1,
                         'IT_PROG_INTLTOOL' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
                         'LT_INIT' => 1,
@@ -804,6 +834,7 @@
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_CONFIG_LINKS' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
@@ -813,6 +844,9 @@
                         'AC_FC_SRCEXT' => 1,
                         'AC_INIT' => 1,
                         'AC_LIBSOURCE' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_SUBST' => 1,
@@ -824,6 +858,9 @@
                         'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'AM_GNU_GETTEXT' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AM_ICONV' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
@@ -841,6 +878,7 @@
                         'AM_SILENT_RULES' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
                         'GTK_DOC_CHECK' => 1,
+                        'GUILE_FLAGS' => 1,
                         'IT_PROG_INTLTOOL' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
                         'LT_INIT' => 1,
diff --git a/recipes/libs/libiconv/source/autom4te.cache/traces.0 b/recipes/libs/libiconv/source/autom4te.cache/traces.0
index e52dcdb9a6..1d7fcb2011 100644
--- a/recipes/libs/libiconv/source/autom4te.cache/traces.0
+++ b/recipes/libs/libiconv/source/autom4te.cache/traces.0
@@ -885,7 +885,7 @@ AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
 ])dnl
 AC_SUBST(am__xargs_n)
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltargz.m4:13: -1- AC_DEFUN([LT_FUNC_ARGZ], [
+m4trace:/usr/share/aclocal/ltargz.m4:13: -1- AC_DEFUN([LT_FUNC_ARGZ], [
 dnl Required for use of '$SED' in Cygwin configuration.
 AC_REQUIRE([AC_PROG_SED])dnl
 AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
@@ -950,10 +950,10 @@ AS_IF([test -z "$LT_ARGZ_H"],
 
 AC_SUBST([LT_ARGZ_H])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:17: -1- AC_DEFUN([LT_CONFIG_LTDL_DIR], [AC_BEFORE([$0], [LTDL_INIT])
+m4trace:/usr/share/aclocal/ltdl.m4:17: -1- AC_DEFUN([LT_CONFIG_LTDL_DIR], [AC_BEFORE([$0], [LTDL_INIT])
 _$0($*)
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:69: -1- AC_DEFUN([LTDL_CONVENIENCE], [AC_BEFORE([$0], [LTDL_INIT])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:69: -1- AC_DEFUN([LTDL_CONVENIENCE], [AC_BEFORE([$0], [LTDL_INIT])dnl
 dnl Although the argument is deprecated and no longer documented,
 dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one
 dnl here make sure it is the same as any other declaration of libltdl's
@@ -962,13 +962,13 @@ dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
 m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
 _$0()
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:82: -1- AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+m4trace:/usr/share/aclocal/ltdl.m4:82: -1- AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_CONVENIENCE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:82: -1- AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_CONVENIENCE' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:82: -1- AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_CONVENIENCE' is obsolete.
 You should run autoupdate.])dnl
 _LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_CONVENIENCE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:125: -1- AC_DEFUN([LTDL_INSTALLABLE], [AC_BEFORE([$0], [LTDL_INIT])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:125: -1- AC_DEFUN([LTDL_INSTALLABLE], [AC_BEFORE([$0], [LTDL_INIT])dnl
 dnl Although the argument is deprecated and no longer documented,
 dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one
 dnl here make sure it is the same as any other declaration of libltdl's
@@ -977,17 +977,17 @@ dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
 m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
 _$0()
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:138: -1- AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+m4trace:/usr/share/aclocal/ltdl.m4:138: -1- AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_INSTALLABLE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:138: -1- AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_INSTALLABLE' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:138: -1- AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_INSTALLABLE' is obsolete.
 You should run autoupdate.])dnl
 _LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_INSTALLABLE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:214: -1- AC_DEFUN([_LT_LIBOBJ], [
+m4trace:/usr/share/aclocal/ltdl.m4:214: -1- AC_DEFUN([_LT_LIBOBJ], [
   m4_pattern_allow([^_LT_LIBOBJS$])
   _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:227: -1- AC_DEFUN([LTDL_INIT], [dnl Parse OPTIONS
+m4trace:/usr/share/aclocal/ltdl.m4:227: -1- AC_DEFUN([LTDL_INIT], [dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
 dnl We need to keep our own list of libobjs separate from our parent project,
@@ -1110,19 +1110,19 @@ AC_CONFIG_COMMANDS_PRE([
 # Only expand once:
 m4_define([LTDL_INIT])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:353: -1- AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:353: -1- AC_DEFUN([AC_LIB_LTDL], [m4_warn([obsolete], [The macro 'AC_LIB_LTDL' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:353: -1- AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:353: -1- AC_DEFUN([AC_LIB_LTDL], [m4_warn([obsolete], [The macro 'AC_LIB_LTDL' is obsolete.
 You should run autoupdate.])dnl
 LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:354: -1- AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:354: -1- AC_DEFUN([AC_WITH_LTDL], [m4_warn([obsolete], [The macro 'AC_WITH_LTDL' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:354: -1- AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:354: -1- AC_DEFUN([AC_WITH_LTDL], [m4_warn([obsolete], [The macro 'AC_WITH_LTDL' is obsolete.
 You should run autoupdate.])dnl
 LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:355: -1- AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:355: -1- AC_DEFUN([LT_WITH_LTDL], [m4_warn([obsolete], [The macro 'LT_WITH_LTDL' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:355: -1- AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:355: -1- AC_DEFUN([LT_WITH_LTDL], [m4_warn([obsolete], [The macro 'LT_WITH_LTDL' is obsolete.
 You should run autoupdate.])dnl
 LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:368: -1- AC_DEFUN([_LTDL_SETUP], [AC_REQUIRE([AC_PROG_CC])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:368: -1- AC_DEFUN([_LTDL_SETUP], [AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([LT_SYS_MODULE_EXT])dnl
 AC_REQUIRE([LT_SYS_MODULE_PATH])dnl
 AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl
@@ -1176,7 +1176,7 @@ name=ltdl
 eval "LTDLOPEN=\"$libname_spec\""
 AC_SUBST([LTDLOPEN])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:445: -1- AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:445: -1- AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
   [lt_cv_sys_dlopen_deplibs],
   [# PORTME does your system automatically load deplibs for dlopen?
@@ -1231,9 +1231,6 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
   *-mlibc)
     lt_cv_sys_dlopen_deplibs=yes
     ;;
-  redox*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
   netbsd* | netbsdelf*-gnu)
     lt_cv_sys_dlopen_deplibs=yes
     ;;
@@ -1278,11 +1275,11 @@ if test yes != "$lt_cv_sys_dlopen_deplibs"; then
     [Define if the OS needs help to load dependent libraries for dlopen().])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:550: -1- AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:550: -1- AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_warn([obsolete], [The macro 'AC_LTDL_SYS_DLOPEN_DEPLIBS' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:547: -1- AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:547: -1- AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_warn([obsolete], [The macro 'AC_LTDL_SYS_DLOPEN_DEPLIBS' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:557: -1- AC_DEFUN([LT_SYS_MODULE_EXT], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:554: -1- AC_DEFUN([LT_SYS_MODULE_EXT], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
 AC_CACHE_CHECK([what extension is used for runtime loadable modules],
   [libltdl_cv_shlibext],
 [
@@ -1307,11 +1304,11 @@ if test -n "$shared_archive_member_spec"; then
     [Define to the shared archive member specification, say "(shr.o)".])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:585: -1- AU_DEFUN([AC_LTDL_SHLIBEXT], [m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:585: -1- AC_DEFUN([AC_LTDL_SHLIBEXT], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBEXT' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:582: -1- AU_DEFUN([AC_LTDL_SHLIBEXT], [m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:582: -1- AC_DEFUN([AC_LTDL_SHLIBEXT], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBEXT' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:592: -1- AC_DEFUN([LT_SYS_MODULE_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:589: -1- AC_DEFUN([LT_SYS_MODULE_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
 AC_CACHE_CHECK([what variable specifies run-time module search path],
   [lt_cv_module_path_var], [lt_cv_module_path_var=$shlibpath_var])
 if test -n "$lt_cv_module_path_var"; then
@@ -1320,11 +1317,11 @@ if test -n "$lt_cv_module_path_var"; then
     [Define to the name of the environment variable that determines the run-time module search path.])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:604: -1- AU_DEFUN([AC_LTDL_SHLIBPATH], [m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:604: -1- AC_DEFUN([AC_LTDL_SHLIBPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBPATH' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:601: -1- AU_DEFUN([AC_LTDL_SHLIBPATH], [m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:601: -1- AC_DEFUN([AC_LTDL_SHLIBPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBPATH' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:611: -1- AC_DEFUN([LT_SYS_DLSEARCH_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:608: -1- AC_DEFUN([LT_SYS_DLSEARCH_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
 AC_CACHE_CHECK([for the default library search path],
   [lt_cv_sys_dlsearch_path],
   [lt_cv_sys_dlsearch_path=$sys_lib_dlsearch_path_spec])
@@ -1342,11 +1339,11 @@ if test -n "$lt_cv_sys_dlsearch_path"; then
     [Define to the system default library search path.])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:632: -1- AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:632: -1- AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SYSSEARCHPATH' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:629: -1- AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:629: -1- AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SYSSEARCHPATH' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:658: -1- AC_DEFUN([LT_LIB_DLLOAD], [m4_pattern_allow([^LT_DLLOADERS$])
+m4trace:/usr/share/aclocal/ltdl.m4:655: -1- AC_DEFUN([LT_LIB_DLLOAD], [m4_pattern_allow([^LT_DLLOADERS$])
 LT_DLLOADERS=
 AC_SUBST([LT_DLLOADERS])
 
@@ -1438,11 +1435,11 @@ AC_SUBST([LIBADD_DL])
 LIBS=$lt_dlload_save_LIBS
 AC_LANG_POP
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:753: -1- AU_DEFUN([AC_LTDL_DLLIB], [m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:753: -1- AC_DEFUN([AC_LTDL_DLLIB], [m4_warn([obsolete], [The macro 'AC_LTDL_DLLIB' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:750: -1- AU_DEFUN([AC_LTDL_DLLIB], [m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:750: -1- AC_DEFUN([AC_LTDL_DLLIB], [m4_warn([obsolete], [The macro 'AC_LTDL_DLLIB' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:761: -1- AC_DEFUN([LT_SYS_SYMBOL_USCORE], [m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:758: -1- AC_DEFUN([LT_SYS_SYMBOL_USCORE], [m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 AC_CACHE_CHECK([for _ prefix in compiled symbols],
   [lt_cv_sys_symbol_underscore],
   [lt_cv_sys_symbol_underscore=no
@@ -1476,11 +1473,11 @@ _LT_EOF
   sys_symbol_underscore=$lt_cv_sys_symbol_underscore
   AC_SUBST([sys_symbol_underscore])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:798: -1- AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:798: -1- AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_SYMBOL_USCORE' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:795: -1- AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:795: -1- AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_SYMBOL_USCORE' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:805: -1- AC_DEFUN([LT_FUNC_DLSYM_USCORE], [AC_REQUIRE([_LT_COMPILER_PIC])dnl	for lt_prog_compiler_wl
+m4trace:/usr/share/aclocal/ltdl.m4:802: -1- AC_DEFUN([LT_FUNC_DLSYM_USCORE], [AC_REQUIRE([_LT_COMPILER_PIC])dnl	for lt_prog_compiler_wl
 AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl	for lt_cv_sys_symbol_underscore
 AC_REQUIRE([LT_SYS_MODULE_EXT])dnl	for libltdl_cv_shlibext
 if test yes = "$lt_cv_sys_symbol_underscore"; then
@@ -1584,11 +1581,11 @@ if test yes = "$libltdl_cv_need_uscore"; then
     [Define if dlsym() requires a leading underscore in symbol names.])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:912: -1- AU_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:912: -1- AC_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_DLSYM_USCORE' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:909: -1- AU_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:909: -1- AC_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_DLSYM_USCORE' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/00gnulib.m4:24: -1- AC_DEFUN([gl_COMPILER_CLANG], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/00gnulib.m4:24: -1- AC_DEFUN([gl_COMPILER_CLANG], [
 dnl AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([whether the compiler is clang],
     [gl_cv_compiler_clang],
@@ -1606,7 +1603,7 @@ dnl AC_REQUIRE([AC_PROG_CC])
         [gl_cv_compiler_clang=yes])
     ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/00gnulib.m4:43: -1- AC_DEFUN([gl_COMPILER_PREPARE_CHECK_DECL], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/00gnulib.m4:43: -1- AC_DEFUN([gl_COMPILER_PREPARE_CHECK_DECL], [
 dnl AC_REQUIRE([AC_PROG_CC])
 dnl AC_REQUIRE([gl_COMPILER_CLANG])
   AC_CACHE_CHECK([for compiler option needed when checking for declarations],
@@ -1632,8 +1629,8 @@ dnl AC_REQUIRE([gl_COMPILER_CLANG])
     ac_compile_for_check_decl="$ac_compile"
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/00gnulib.m4:85: -1- AC_DEFUN([gl_00GNULIB])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/__inline.m4:7: -1- AC_DEFUN([gl___INLINE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/00gnulib.m4:85: -1- AC_DEFUN([gl_00GNULIB])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/__inline.m4:7: -1- AC_DEFUN([gl___INLINE], [
   AC_CACHE_CHECK([whether the compiler supports the __inline keyword],
     [gl_cv_c___inline],
     [AC_COMPILE_IFELSE(
@@ -1648,7 +1645,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/_
       [Define to 1 if the compiler supports the keyword '__inline'.])
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/absolute-header.m4:22: -1- AC_DEFUN([gl_ABSOLUTE_HEADER], [AC_REQUIRE([AC_CANONICAL_HOST])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/absolute-header.m4:22: -1- AC_DEFUN([gl_ABSOLUTE_HEADER], [AC_REQUIRE([AC_CANONICAL_HOST])
 AC_LANG_PREPROC_REQUIRE()dnl
 m4_foreach_w([gl_HEADER_NAME], [$1],
   [AS_VAR_PUSHDEF([gl_absolute_header],
@@ -1669,7 +1666,7 @@ m4_foreach_w([gl_HEADER_NAME], [$1],
   AS_VAR_POPDEF([gl_absolute_header])dnl
 ])dnl
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/absolute-header.m4:52: -1- AC_DEFUN([gl_ABSOLUTE_HEADER_ONE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/absolute-header.m4:52: -1- AC_DEFUN([gl_ABSOLUTE_HEADER_ONE], [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
   dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
@@ -1717,7 +1714,7 @@ changequote([,])
 [`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
   sed -n "$gl_absolute_header_sed"`])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/alloca.m4:7: -1- AC_DEFUN([gl_FUNC_ALLOCA], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/alloca.m4:7: -1- AC_DEFUN([gl_FUNC_ALLOCA], [
   dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
   AC_REQUIRE([AC_PROG_CPP])
   AC_REQUIRE([AC_PROG_EGREP])
@@ -1737,11 +1734,11 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/a
     [GL_GENERATE_ALLOCA_H=true],
     [GL_GENERATE_ALLOCA_H=false])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/alloca.m4:31: -1- AC_DEFUN([gl_PREREQ_ALLOCA], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/alloca.m4:31: -1- AC_DEFUN([gl_PREREQ_ALLOCA], [
   AC_CHECK_HEADERS_ONCE(stdlib.h string.h)
   :
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/asm-underscore.m4:15: -1- AC_DEFUN([gl_ASM_SYMBOL_PREFIX], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/asm-underscore.m4:15: -1- AC_DEFUN([gl_ASM_SYMBOL_PREFIX], [
   AC_REQUIRE([AC_PROG_EGREP])
   dnl We don't use GCC's __USER_LABEL_PREFIX__ here, because
   dnl 1. It works only for GCC.
@@ -1776,7 +1773,7 @@ EOF
   ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"'
   AC_SUBST([ASM_SYMBOL_PREFIX])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/asm-underscore.m4:58: -1- AC_DEFUN([gl_C_ASM], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/asm-underscore.m4:58: -1- AC_DEFUN([gl_C_ASM], [
   AC_EGREP_CPP([MicrosoftCompiler],
     [
 #ifdef _MSC_VER
@@ -1801,7 +1798,7 @@ MicrosoftCompiler
      gl_c_asm_opt='-S'
     ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/builtin-expect.m4:10: -1- AC_DEFUN([gl___BUILTIN_EXPECT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/builtin-expect.m4:10: -1- AC_DEFUN([gl___BUILTIN_EXPECT], [
   AC_CACHE_CHECK([for __builtin_expect],
     [gl_cv___builtin_expect],
     [AC_LINK_IFELSE(
@@ -1840,7 +1837,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/b
 #endif
     ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/canonicalize.m4:11: -1- AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/canonicalize.m4:11: -1- AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE], [
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
   AC_CHECK_FUNCS_ONCE([canonicalize_file_name faccessat])
@@ -1855,7 +1852,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/c
     esac
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/canonicalize.m4:29: -1- AC_DEFUN([gl_CANONICALIZE_LGPL], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/canonicalize.m4:29: -1- AC_DEFUN([gl_CANONICALIZE_LGPL], [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_CANONICALIZE_LGPL_SEPARATE])
   if test $ac_cv_func_canonicalize_file_name = no; then
@@ -1879,7 +1876,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/c
     esac
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/canonicalize.m4:57: -1- AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/canonicalize.m4:57: -1- AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE], [
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
   AC_CHECK_FUNCS_ONCE([canonicalize_file_name faccessat])
@@ -1896,7 +1893,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/c
   AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
   AC_CHECK_HEADERS_ONCE([sys/param.h])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/canonicalize.m4:79: -1- AC_DEFUN([gl_FUNC_REALPATH_WORKS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/canonicalize.m4:79: -1- AC_DEFUN([gl_FUNC_REALPATH_WORKS], [
   AC_CHECK_FUNCS_ONCE([realpath lstat])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether realpath works], [gl_cv_func_realpath_works], [
@@ -2000,7 +1997,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/c
       ;;
   esac
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/close.m4:7: -1- AC_DEFUN([gl_FUNC_CLOSE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/close.m4:7: -1- AC_DEFUN([gl_FUNC_CLOSE], [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   m4_ifdef([gl_MSVC_INVAL], [
     AC_REQUIRE([gl_MSVC_INVAL])
@@ -2028,7 +2025,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/c
     fi
   ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/codeset.m4:10: -1- AC_DEFUN([AM_LANGINFO_CODESET], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/codeset.m4:10: -1- AC_DEFUN([AM_LANGINFO_CODESET], [
   AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
@@ -2042,7 +2039,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/c
       [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/double-slash-root.m4:7: -1- AC_DEFUN([gl_DOUBLE_SLASH_ROOT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/double-slash-root.m4:7: -1- AC_DEFUN([gl_DOUBLE_SLASH_ROOT], [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CACHE_CHECK([whether // is distinct from /], [gl_cv_double_slash_root],
     [ if test x"$cross_compiling" = xyes ; then
@@ -2073,7 +2070,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/d
       [Define to 1 if // is a file system root distinct from /.])
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/dup2.m4:7: -1- AC_DEFUN([gl_FUNC_DUP2], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/dup2.m4:7: -1- AC_DEFUN([gl_FUNC_DUP2], [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CACHE_CHECK([whether dup2 works], [gl_cv_func_dup2_works],
@@ -2168,12 +2165,12 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/d
     fi
   ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/dup2.m4:105: -1- AC_DEFUN([gl_PREREQ_DUP2], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/eealloc.m4:7: -1- AC_DEFUN([gl_EEALLOC], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/dup2.m4:105: -1- AC_DEFUN([gl_PREREQ_DUP2], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/eealloc.m4:7: -1- AC_DEFUN([gl_EEALLOC], [
   AC_REQUIRE([gl_EEMALLOC])
   AC_REQUIRE([gl_EEREALLOC])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/eealloc.m4:13: -1- AC_DEFUN([gl_EEMALLOC], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/eealloc.m4:13: -1- AC_DEFUN([gl_EEMALLOC], [
   _AC_FUNC_MALLOC_IF(
     [gl_cv_func_malloc_0_nonnull=1],
     [gl_cv_func_malloc_0_nonnull=0])
@@ -2181,7 +2178,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/e
     [If malloc(0) is != NULL, define this to 1.  Otherwise define this
      to 0.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/eealloc.m4:23: -1- AC_DEFUN([gl_EEREALLOC], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/eealloc.m4:23: -1- AC_DEFUN([gl_EEREALLOC], [
   _AC_FUNC_REALLOC_IF(
     [gl_cv_func_realloc_0_nonnull=1],
     [gl_cv_func_realloc_0_nonnull=0])
@@ -2189,7 +2186,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/e
     [If realloc(NULL,0) is != NULL, define this to 1.  Otherwise define this
      to 0.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/environ.m4:7: -1- AC_DEFUN_ONCE([gl_ENVIRON], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/environ.m4:7: -1- AC_DEFUN_ONCE([gl_ENVIRON], [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   dnl Persuade glibc <unistd.h> to declare environ.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
@@ -2207,7 +2204,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/e
     HAVE_DECL_ENVIRON=0
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/environ.m4:29: -1- AC_DEFUN([gt_CHECK_VAR_DECL], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/environ.m4:29: -1- AC_DEFUN([gt_CHECK_VAR_DECL], [
   define([gt_cv_var], [gt_cv_var_]$2[_declaration])
   AC_CACHE_CHECK([if $2 is properly declared], [gt_cv_var],
     [AC_COMPILE_IFELSE(
@@ -2224,7 +2221,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/e
   fi
   undefine([gt_cv_var])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/errno_h.m4:9: -1- AC_DEFUN_ONCE([gl_HEADER_ERRNO_H], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/errno_h.m4:9: -1- AC_DEFUN_ONCE([gl_HEADER_ERRNO_H], [
   AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [
     AC_EGREP_CPP([booboo],[
@@ -2294,7 +2291,7 @@ booboo
   gl_REPLACE_ERRNO_VALUE([ENOLINK])
   gl_REPLACE_ERRNO_VALUE([EOVERFLOW])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/errno_h.m4:87: -1- AC_DEFUN([gl_REPLACE_ERRNO_VALUE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/errno_h.m4:87: -1- AC_DEFUN([gl_REPLACE_ERRNO_VALUE], [
   if $GL_GENERATE_ERRNO_H; then
     AC_CACHE_CHECK([for ]$1[ value], [gl_cv_header_errno_h_]$1, [
       AC_EGREP_CPP([yes],[
@@ -2338,7 +2335,7 @@ yes
     AC_SUBST($1[_VALUE])
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/error.m4:9: -1- AC_DEFUN([gl_ERROR], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/error.m4:9: -1- AC_DEFUN([gl_ERROR], [
   dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer
   dnl maintained in Autoconf and because it invokes AC_LIBOBJ.
   AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line],
@@ -2349,7 +2346,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/e
        [ac_cv_lib_error_at_line=yes],
        [ac_cv_lib_error_at_line=no])])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/error.m4:23: -1- AC_DEFUN([gl_PREREQ_ERROR], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/error.m4:23: -1- AC_DEFUN([gl_PREREQ_ERROR], [
   dnl Use system extensions on Android, so that AC_FUNC_STRERROR_R
   dnl discovers the GNU API for strerror_r on Android API level 23 and later.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
@@ -2357,7 +2354,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/e
   AC_REQUIRE([AC_FUNC_STRERROR_R])
   :
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/extensions.m4:212: -1- AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/extensions.m4:212: -1- AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], [
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   dnl On OpenBSD 6.8 with GCC, the include files contain a couple of
@@ -2372,7 +2369,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/e
       ;;
   esac
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/extern-inline.m4:8: -1- AC_DEFUN([gl_EXTERN_INLINE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/extern-inline.m4:8: -1- AC_DEFUN([gl_EXTERN_INLINE], [
   AC_CACHE_CHECK([whether ctype.h defines __header_inline],
     [gl_cv_have___header_inline],
     [AC_PREPROC_IFELSE(
@@ -2494,7 +2491,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/e
 # define _GL_INLINE_HEADER_END
 #endif])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl-o.m4:14: -1- AC_DEFUN([gl_FCNTL_O_FLAGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl-o.m4:14: -1- AC_DEFUN([gl_FCNTL_O_FLAGS], [
   dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
@@ -2620,7 +2617,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/f
   AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
     [Define to 1 if O_NOFOLLOW works.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl.m4:16: -1- AC_DEFUN([gl_FUNC_FCNTL], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl.m4:16: -1- AC_DEFUN([gl_FUNC_FCNTL], [
   dnl Persuade glibc to expose F_DUPFD_CLOEXEC.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
@@ -2744,7 +2741,7 @@ choke me
     fi
   ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl.m4:142: -1- AC_DEFUN([gl_REPLACE_FCNTL], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl.m4:142: -1- AC_DEFUN([gl_REPLACE_FCNTL], [
   AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
   AC_CHECK_FUNCS_ONCE([fcntl])
   if test $ac_cv_func_fcntl = no; then
@@ -2753,7 +2750,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/f
     REPLACE_FCNTL=1
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl_h.m4:10: -1- AC_DEFUN_ONCE([gl_FCNTL_H], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl_h.m4:10: -1- AC_DEFUN_ONCE([gl_FCNTL_H], [
   AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
   AC_REQUIRE([gl_FCNTL_O_FLAGS])
   gl_NEXT_HEADERS([fcntl.h])
@@ -2770,14 +2767,14 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/f
   gl_WARN_ON_USE_PREPARE([[#include <fcntl.h>
     ]], [fcntl openat])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl_h.m4:33: -1- AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl_h.m4:33: -1- AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], [
   dnl Ensure to expand the default settings once only.
   gl_FCNTL_H_REQUIRE_DEFAULTS
   gl_MODULE_INDICATOR_SET_VARIABLE([$1])
   dnl Define it also as a C macro, for the benefit of the unit tests.
   gl_MODULE_INDICATOR_FOR_TESTS([$1])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl_h.m4:45: -1- AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl_h.m4:45: -1- AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], [
   m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL])
@@ -2791,7 +2788,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/f
   m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS])
   AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl_h.m4:61: -1- AC_DEFUN([gl_FCNTL_H_DEFAULTS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl_h.m4:61: -1- AC_DEFUN([gl_FCNTL_H_DEFAULTS], [
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_FCNTL=1;          AC_SUBST([HAVE_FCNTL])
   HAVE_OPENAT=1;         AC_SUBST([HAVE_OPENAT])
@@ -2800,7 +2797,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/f
   REPLACE_OPEN=0;        AC_SUBST([REPLACE_OPEN])
   REPLACE_OPENAT=0;      AC_SUBST([REPLACE_OPENAT])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/free.m4:9: -1- AC_DEFUN([gl_FUNC_FREE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/free.m4:9: -1- AC_DEFUN([gl_FUNC_FREE], [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
 
   dnl In the next release of POSIX, free must preserve errno.
@@ -2840,8 +2837,8 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/f
    *) REPLACE_FREE=1 ;;
   esac
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/free.m4:52: -1- AC_DEFUN([gl_PREREQ_FREE], [:])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fstat.m4:7: -1- AC_DEFUN([gl_FUNC_FSTAT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/free.m4:52: -1- AC_DEFUN([gl_PREREQ_FREE], [:])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fstat.m4:7: -1- AC_DEFUN([gl_FUNC_FSTAT], [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
 
@@ -2867,12 +2864,12 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/f
     fi
   ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fstat.m4:36: -1- AC_DEFUN([gl_PREREQ_FSTAT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fstat.m4:36: -1- AC_DEFUN([gl_PREREQ_FSTAT], [
   AC_REQUIRE([gl_SYS_STAT_H])
   AC_REQUIRE([gl_PREREQ_STAT_W32])
   :
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/getdtablesize.m4:7: -1- AC_DEFUN([gl_FUNC_GETDTABLESIZE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/getdtablesize.m4:7: -1- AC_DEFUN([gl_FUNC_GETDTABLESIZE], [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_FUNCS_ONCE([getdtablesize])
@@ -2925,8 +2922,8 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     HAVE_GETDTABLESIZE=0
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/getdtablesize.m4:63: -1- AC_DEFUN([gl_PREREQ_GETDTABLESIZE], [:])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/getprogname.m4:10: -1- AC_DEFUN([gl_FUNC_GETPROGNAME], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/getdtablesize.m4:63: -1- AC_DEFUN([gl_PREREQ_GETDTABLESIZE], [:])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/getprogname.m4:10: -1- AC_DEFUN([gl_FUNC_GETPROGNAME], [
   AC_CHECK_FUNCS_ONCE([getprogname getexecname])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   ac_found=0
@@ -2959,326 +2956,13 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     fi
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gettext.m4:55: -1- AC_DEFUN([AM_GNU_GETTEXT], [
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])
-  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
-    [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
-])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define([gt_included_intl],
-    ifelse([$1], [external], [no], [yes]))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED([$2])
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AC_REQUIRE([AM_NLS])
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH([included-gettext],
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-               ]],
-               [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-               ]])],
-            [eval "$gt_func_gnugettext_libc=yes"],
-            [eval "$gt_func_gnugettext_libc=no"])])
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            [$gt_func_gnugettext_libintl],
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_LINK_IFELSE(
-              [AC_LANG_PROGRAM(
-                 [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                 ]],
-                 [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                 ]])],
-              [eval "$gt_func_gnugettext_libintl=yes"],
-              [eval "$gt_func_gnugettext_libintl=no"])
-            dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_LINK_IFELSE(
-                [AC_LANG_PROGRAM(
-                   [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                   ]],
-                   [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                   ]])],
-                [LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
-                ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE([ENABLE_NLS], [1],
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE([HAVE_GETTEXT], [1],
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE([HAVE_DCGETTEXT], [1],
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
-    dnl because some of the testsuite requires it.
-    BUILD_INCLUDED_LIBINTL=yes
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST([BUILD_INCLUDED_LIBINTL])
-    AC_SUBST([USE_INCLUDED_LIBINTL])
-    AC_SUBST([CATOBJEXT])
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST([INTLLIBS])
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST([LIBINTL])
-  AC_SUBST([LTLIBINTL])
-  AC_SUBST([POSUB])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gettext.m4:375: -1- AC_DEFUN([AM_GNU_GETTEXT_NEED], [
-  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gettext.m4:382: -1- AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gettext.m4:386: -1- AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:11: -1- AC_DEFUN([gl_COMMON], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:11: -1- AC_DEFUN([gl_COMMON], [
   dnl Use AC_REQUIRE here, so that the code is expanded once only.
   AC_REQUIRE([gl_00GNULIB])
   AC_REQUIRE([gl_COMMON_BODY])
   AC_REQUIRE([gl_ZZGNULIB])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:17: -1- AC_DEFUN([gl_COMMON_BODY], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:17: -1- AC_DEFUN([gl_COMMON_BODY], [
   AH_VERBATIM([_GL_GNUC_PREREQ],
 [/* True if the compiler says it groks GNU C version MAJOR.MINOR.  */
 #if defined __GNUC__ && defined __GNUC_MINOR__
@@ -3778,18 +3462,18 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   LIBC_FATAL_STDERR_=1
   export LIBC_FATAL_STDERR_
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:522: -1- AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:522: -1- AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], [
   GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2])
   AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:537: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:537: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], [
   gl_MODULE_INDICATOR_SET_VARIABLE_AUX(
     [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]],
                                                        [abcdefghijklmnopqrstuvwxyz./-],
                                                        [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])],
     [gl_MODULE_INDICATOR_CONDITION])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:550: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:550: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX], [
   m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1],
     [
      dnl Simplify the expression VALUE || 1 to 1.
@@ -3798,7 +3482,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1],
                                              [gl_MODULE_INDICATOR_CONDITION])])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:564: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:564: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR], [
   dnl Simplify the expression 1 || CONDITION to 1.
   if test "$[]$1" != 1; then
     dnl Simplify the expression 0 || CONDITION to CONDITION.
@@ -3809,7 +3493,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     fi
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:589: -1- AC_DEFUN([gl_MODULE_INDICATOR], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:589: -1- AC_DEFUN([gl_MODULE_INDICATOR], [
   AC_DEFINE_UNQUOTED([GNULIB_]m4_translit([[$1]],
       [abcdefghijklmnopqrstuvwxyz./-],
       [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]),
@@ -3817,22 +3501,22 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     [Define to a C preprocessor expression that evaluates to 1 or 0,
      depending whether the gnulib module $1 shall be considered present.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:612: -1- AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:612: -1- AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [
   AC_DEFINE([GNULIB_TEST_]m4_translit([[$1]],
       [abcdefghijklmnopqrstuvwxyz./-],
       [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
     [Define to 1 when the gnulib module $1 should be tested.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:624: -1- AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:624: -1- AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK], [
   dnl Override gl_WARN_ON_USE_PREPARE.
   dnl But hide this definition from 'aclocal'.
   AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], [])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:635: -1- AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:635: -1- AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS], [
   dnl Override gl_MODULE_INDICATOR_FOR_TESTS.
   AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:643: -1- AC_DEFUN([gl_FEATURES_H], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:643: -1- AC_DEFUN([gl_FEATURES_H], [
   AC_CHECK_HEADERS_ONCE([features.h])
   if test $ac_cv_header_features_h = yes; then
     HAVE_FEATURES_H=1
@@ -3841,7 +3525,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   fi
   AC_SUBST([HAVE_FEATURES_H])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:657: -1- AC_DEFUN([gl_PROG_CC_C99], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:657: -1- AC_DEFUN([gl_PROG_CC_C99], [
   dnl Just use AC_PROG_CC_C99.
   dnl When AC_PROG_CC_C99 and AC_PROG_CC_STDC are used together, the substituted
   dnl value of CC will contain the C99 enabling options twice. But this is only
@@ -3852,7 +3536,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     [AC_REQUIRE([AC_PROG_CC])],
     [AC_REQUIRE([AC_PROG_CC_C99])])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:674: -1- AC_DEFUN([gl_PROG_AR_RANLIB], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:674: -1- AC_DEFUN([gl_PROG_AR_RANLIB], [
   dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
   dnl as "cc", and GCC as "gcc". They have different object file formats and
   dnl library formats. In particular, the GNU binutils programs ar and ranlib
@@ -3916,20 +3600,20 @@ Amsterdam
   fi
   AC_SUBST([RANLIB])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:794: -1- AC_DEFUN([gl_BIGENDIAN], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:794: -1- AC_DEFUN([gl_BIGENDIAN], [
   AC_C_BIGENDIAN
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:808: -1- AC_DEFUN([gl_SILENT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:808: -1- AC_DEFUN([gl_SILENT], [
   exec GL_TMP_FD>&AS_MESSAGE_FD AS_MESSAGE_FD>/dev/null
   $1
   exec AS_MESSAGE_FD>&GL_TMP_FD GL_TMP_FD>&-
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:820: -1- AC_DEFUN([gl_CACHE_VAL_SILENT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:820: -1- AC_DEFUN([gl_CACHE_VAL_SILENT], [
   gl_SILENT([
     AC_CACHE_VAL([$1], [$2])
   ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:834: -1- AC_DEFUN([gl_CONDITIONAL], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:834: -1- AC_DEFUN([gl_CONDITIONAL], [
   pushdef([AC_CONFIG_COMMANDS_PRE], [:])dnl
   AM_CONDITIONAL([$1], [$2])
   popdef([AC_CONFIG_COMMANDS_PRE])dnl
@@ -3938,7 +3622,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     [$1]_FALSE='#'
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:850: -1- AC_DEFUN([gl_CC_ALLOW_WARNINGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:850: -1- AC_DEFUN([gl_CC_ALLOW_WARNINGS], [
   AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([for C compiler option to allow warnings],
     [gl_cv_cc_wallow],
@@ -3963,7 +3647,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   esac
   AC_SUBST([GL_CFLAG_ALLOW_WARNINGS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:880: -1- AC_DEFUN([gl_CXX_ALLOW_WARNINGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:880: -1- AC_DEFUN([gl_CXX_ALLOW_WARNINGS], [
   dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX.
   if test -n "$CXX" && test "$CXX" != no; then
     AC_CACHE_CHECK([for C++ compiler option to allow warnings],
@@ -3992,7 +3676,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   fi
   AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:914: -1- AC_DEFUN([gl_CC_GNULIB_WARNINGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:914: -1- AC_DEFUN([gl_CC_GNULIB_WARNINGS], [
   AC_REQUIRE([gl_CC_ALLOW_WARNINGS])
   dnl Assume that the compiler supports -Wno-* options only if it also supports
   dnl -Wno-error.
@@ -4053,7 +3737,7 @@ EOF
   fi
   AC_SUBST([GL_CFLAG_GNULIB_WARNINGS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:984: -1- AC_DEFUN([gl_CONDITIONAL_HEADER], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:984: -1- AC_DEFUN([gl_CONDITIONAL_HEADER], [
   m4_pushdef([gl_header_name], AS_TR_SH(m4_toupper($1)))
   m4_pushdef([gl_generate_var], [GL_GENERATE_]AS_TR_SH(m4_toupper($1)))
   m4_pushdef([gl_generate_cond], [GL_GENERATE_]AS_TR_SH(m4_toupper($1)))
@@ -4074,11 +3758,11 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   m4_popdef([gl_generate_var])
   m4_popdef([gl_header_name])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:1016: -1- AC_DEFUN([GL_MDA_DEFINES], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:1016: -1- AC_DEFUN([GL_MDA_DEFINES], [
 AC_REQUIRE([_GL_MDA_DEFINES])
 [$gl_mda_defines]
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:1020: -1- AC_DEFUN([_GL_MDA_DEFINES], [gl_mda_defines='
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:1020: -1- AC_DEFUN([_GL_MDA_DEFINES], [gl_mda_defines='
 #if defined _WIN32 && !defined __CYGWIN__
 #define access    _access
 #define chdir     _chdir
@@ -4133,7 +3817,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
 #endif
 '
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:34: -1- AC_DEFUN([gl_EARLY], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:34: -1- AC_DEFUN([gl_EARLY], [
   m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
@@ -4245,7 +3929,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   # Code from module xalloc-oversized:
   # Code from module xreadlink:
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:150: -1- AC_DEFUN([gl_INIT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:150: -1- AC_DEFUN([gl_INIT], [
   AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
   gl_cond_libtool=false
   gl_libdeps=
@@ -4681,15 +4365,15 @@ changequote([, ])dnl
   LIBICRT_LTLIBDEPS="$gl_ltlibdeps"
   AC_SUBST([LIBICRT_LTLIBDEPS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:590: -1- AC_DEFUN([gl_LIBOBJ], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:590: -1- AC_DEFUN([gl_LIBOBJ], [
   AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
   gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:597: -1- AC_DEFUN([gl_REPLACE_FUNCS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:597: -1- AC_DEFUN([gl_REPLACE_FUNCS], [
   m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
   AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:606: -1- AC_DEFUN([gl_LIBSOURCES], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:606: -1- AC_DEFUN([gl_LIBSOURCES], [
   m4_foreach([_gl_NAME], [$1], [
     m4_if(_gl_NAME, [alloca.c], [], [
       m4_define([gl_LIBSOURCES_DIR], [srclib])
@@ -4697,15 +4381,15 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     ])
   ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:617: -1- AC_DEFUN([gltests_LIBOBJ], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:617: -1- AC_DEFUN([gltests_LIBOBJ], [
   AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl
   gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:624: -1- AC_DEFUN([gltests_REPLACE_FUNCS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:624: -1- AC_DEFUN([gltests_REPLACE_FUNCS], [
   m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
   AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:633: -1- AC_DEFUN([gltests_LIBSOURCES], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:633: -1- AC_DEFUN([gltests_LIBSOURCES], [
   m4_foreach([_gl_NAME], [$1], [
     m4_if(_gl_NAME, [alloca.c], [], [
       m4_define([gltests_LIBSOURCES_DIR], [tests])
@@ -4713,7 +4397,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     ])
   ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:644: -1- AC_DEFUN([gl_FILE_LIST], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-comp.m4:644: -1- AC_DEFUN([gl_FILE_LIST], [
   build-aux/config.libpath
   build-aux/config.rpath
   build-aux/install-reloc
@@ -4934,7 +4618,4981 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   m4/year2038.m4
   m4/zzgnulib.m4
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/host-cpu-c-abi.m4:50: -1- AC_DEFUN([gl_HOST_CPU_C_ABI], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/include_next.m4:36: -1- AC_DEFUN([gl_INCLUDE_NEXT], [
+  AC_LANG_PREPROC_REQUIRE()
+  AC_CACHE_CHECK([whether the preprocessor supports include_next],
+    [gl_cv_have_include_next],
+    [rm -rf conftestd1a conftestd1b conftestd2
+     mkdir conftestd1a conftestd1b conftestd2
+     dnl IBM C 9.0, 10.1 (original versions, prior to the 2009-01 updates) on
+     dnl AIX 6.1 support include_next when used as first preprocessor directive
+     dnl in a file, but not when preceded by another include directive. Check
+     dnl for this bug by including <stdio.h>.
+     dnl Additionally, with this same compiler, include_next is a no-op when
+     dnl used in a header file that was included by specifying its absolute
+     dnl file name. Despite these two bugs, include_next is used in the
+     dnl compiler's <math.h>. By virtue of the second bug, we need to use
+     dnl include_next as well in this case.
+     cat <<EOF > conftestd1a/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd1b/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include <stdio.h>
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+     gl_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
+dnl We intentionally avoid using AC_LANG_SOURCE here.
+     AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+       [gl_cv_have_include_next=yes],
+       [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+        AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
+          [gl_cv_have_include_next=buggy],
+          [gl_cv_have_include_next=no])
+       ])
+     CPPFLAGS="$gl_save_CPPFLAGS"
+     rm -rf conftestd1a conftestd1b conftestd2
+    ])
+  PRAGMA_SYSTEM_HEADER=
+  if test $gl_cv_have_include_next = yes; then
+    INCLUDE_NEXT=include_next
+    INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+    if test -n "$GCC"; then
+      PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
+    fi
+  else
+    if test $gl_cv_have_include_next = buggy; then
+      INCLUDE_NEXT=include
+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+    else
+      INCLUDE_NEXT=include
+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
+    fi
+  fi
+  AC_SUBST([INCLUDE_NEXT])
+  AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
+  AC_SUBST([PRAGMA_SYSTEM_HEADER])
+
+  dnl HP NonStop systems, which define __TANDEM, limit the line length
+  dnl after including some system header files.
+  AC_CACHE_CHECK([whether source code line length is unlimited],
+    [gl_cv_source_line_length_unlimited],
+    [AC_EGREP_CPP([choke me],
+       [
+#ifdef __TANDEM
+choke me
+#endif
+       ],
+       [gl_cv_source_line_length_unlimited=no],
+       [gl_cv_source_line_length_unlimited=yes])
+    ])
+  if test $gl_cv_source_line_length_unlimited = no; then
+    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
+  else
+    PRAGMA_COLUMNS=
+  fi
+  AC_SUBST([PRAGMA_COLUMNS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/include_next.m4:156: -1- AC_DEFUN([gl_CHECK_NEXT_HEADERS], [
+  gl_NEXT_HEADERS_INTERNAL([$1], [check])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/include_next.m4:166: -1- AC_DEFUN([gl_NEXT_HEADERS], [
+  gl_NEXT_HEADERS_INTERNAL([$1], [assume])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/include_next.m4:172: -1- AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], [
+  AC_REQUIRE([gl_INCLUDE_NEXT])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  m4_if([$2], [check],
+    [AC_CHECK_HEADERS_ONCE([$1])
+    ])
+
+  m4_foreach_w([gl_HEADER_NAME], [$1],
+    [AS_VAR_PUSHDEF([gl_next_header],
+                    [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
+     if test $gl_cv_have_include_next = yes; then
+       AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+     else
+       AC_CACHE_CHECK(
+         [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
+         [gl_next_header],
+         [m4_if([$2], [check],
+            [AS_VAR_PUSHDEF([gl_header_exists],
+                            [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
+             if test AS_VAR_GET([gl_header_exists]) = yes; then
+             AS_VAR_POPDEF([gl_header_exists])
+            ])
+          gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
+          AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
+          AS_VAR_SET([gl_next_header], ['"'$gl_header'"'])
+          m4_if([$2], [check],
+            [else
+               AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
+             fi
+            ])
+         ])
+     fi
+     AC_SUBST(
+       AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
+       [AS_VAR_GET([gl_next_header])])
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'gl_HEADER_NAME'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=AS_VAR_GET([gl_next_header])
+     fi
+     AC_SUBST(
+       AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
+       [$gl_next_as_first_directive])
+     AS_VAR_POPDEF([gl_next_header])])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/inttypes.m4:10: -1- AC_DEFUN_ONCE([gl_INTTYPES_H], [
+  AC_REQUIRE([gl_INTTYPES_INCOMPLETE])
+  gl_INTTYPES_PRI_SCN
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/inttypes.m4:16: -1- AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE], [
+  AC_REQUIRE([gl_STDINT_H])
+  AC_CHECK_HEADERS_ONCE([inttypes.h])
+
+  dnl Override <inttypes.h> always, so that the portability warnings work.
+  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
+  gl_CHECK_NEXT_HEADERS([inttypes.h])
+
+  AC_REQUIRE([gl_MULTIARCH])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[#include <inttypes.h>
+    ]], [imaxabs imaxdiv strtoimax strtoumax])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/inttypes.m4:36: -1- AC_DEFUN([gl_INTTYPES_PRI_SCN], [
+  PRIPTR_PREFIX=
+  if $GL_GENERATE_STDINT_H; then
+    dnl Using the gnulib <stdint.h>. It defines intptr_t to 'long' or
+    dnl 'long long', depending on _WIN64.
+    AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM([[
+         #ifdef _WIN64
+         LLP64
+         #endif
+         ]])
+      ],
+      [PRIPTR_PREFIX='"l"'],
+      [PRIPTR_PREFIX='"ll"'])
+  else
+    dnl Using the system's <stdint.h>.
+    for glpfx in '' l ll I64; do
+      case $glpfx in
+        '')  gltype1='int';;
+        l)   gltype1='long int';;
+        ll)  gltype1='long long int';;
+        I64) gltype1='__int64';;
+      esac
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([[#include <stdint.h>
+           extern intptr_t foo;
+           extern $gltype1 foo;]])],
+        [PRIPTR_PREFIX='"'$glpfx'"'])
+      test -n "$PRIPTR_PREFIX" && break
+    done
+  fi
+  AC_SUBST([PRIPTR_PREFIX])
+
+  gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
+    [INT32_MAX_LT_INTMAX_MAX],
+    [defined INT32_MAX && defined INTMAX_MAX],
+    [INT32_MAX < INTMAX_MAX],
+    [sizeof (int) < sizeof (long long int)])
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+    gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
+      [INT64_MAX_EQ_LONG_MAX],
+      [defined INT64_MAX],
+      [INT64_MAX == LONG_MAX],
+      [sizeof (long long int) == sizeof (long int)])
+  else
+    INT64_MAX_EQ_LONG_MAX=-1
+  fi
+  gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
+    [UINT32_MAX_LT_UINTMAX_MAX],
+    [defined UINT32_MAX && defined UINTMAX_MAX],
+    [UINT32_MAX < UINTMAX_MAX],
+    [sizeof (unsigned int) < sizeof (unsigned long long int)])
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+    gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
+      [UINT64_MAX_EQ_ULONG_MAX],
+      [defined UINT64_MAX],
+      [UINT64_MAX == ULONG_MAX],
+      [sizeof (unsigned long long int) == sizeof (unsigned long int)])
+  else
+    UINT64_MAX_EQ_ULONG_MAX=-1
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/inttypes.m4:106: -1- AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], [
+  AC_CACHE_CHECK([whether $3],
+    [gl_cv_test_$1],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[/* Work also in C++ mode.  */
+            #define __STDC_LIMIT_MACROS 1
+
+            /* Work if build is not clean.  */
+            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+
+            #include <limits.h>
+            #if HAVE_STDINT_H
+             #include <stdint.h>
+            #endif
+
+            #if $2
+             #define CONDITION ($3)
+            #else
+             #define CONDITION ($4)
+            #endif
+            int test[CONDITION ? 1 : -1];]])],
+       [gl_cv_test_$1=yes],
+       [gl_cv_test_$1=no])])
+  if test $gl_cv_test_$1 = yes; then
+    $1=1;
+  else
+    $1=0;
+  fi
+  AC_SUBST([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/inttypes.m4:143: -1- AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_INTTYPES_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/inttypes.m4:153: -1- AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/inttypes.m4:165: -1- AC_DEFUN([gl_INTTYPES_H_DEFAULTS], [
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_IMAXABS=1;   AC_SUBST([HAVE_DECL_IMAXABS])
+  HAVE_DECL_IMAXDIV=1;   AC_SUBST([HAVE_DECL_IMAXDIV])
+  HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
+  HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
+  HAVE_IMAXDIV_T=1;      AC_SUBST([HAVE_IMAXDIV_T])
+  REPLACE_STRTOIMAX=0;   AC_SUBST([REPLACE_STRTOIMAX])
+  REPLACE_STRTOUMAX=0;   AC_SUBST([REPLACE_STRTOUMAX])
+  INT32_MAX_LT_INTMAX_MAX=1;  AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
+  INT64_MAX_EQ_LONG_MAX='defined _LP64';  AC_SUBST([INT64_MAX_EQ_LONG_MAX])
+  PRIPTR_PREFIX=__PRIPTR_PREFIX;  AC_SUBST([PRIPTR_PREFIX])
+  UINT32_MAX_LT_UINTMAX_MAX=1;  AC_SUBST([UINT32_MAX_LT_UINTMAX_MAX])
+  UINT64_MAX_EQ_ULONG_MAX='defined _LP64';  AC_SUBST([UINT64_MAX_EQ_ULONG_MAX])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/largefile.m4:13: -1- AC_DEFUN([gl_SET_LARGEFILE_SOURCE], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_FUNC_FSEEKO
+  case "$host_os" in
+    hpux*)
+      AC_DEFINE([_LARGEFILE_SOURCE], [1],
+        [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).])
+      ;;
+  esac
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/largefile.m4:83: -1- AC_DEFUN([AC_SYS_LARGEFILE], [AC_ARG_ENABLE(largefile,
+               [  --disable-largefile     omit support for large files])
+AS_IF([test "$enable_largefile" != no],
+ [AC_CACHE_CHECK([for special C compiler options needed for large files],
+    ac_cv_sys_largefile_CC,
+    [ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+         # IRIX 6.2 and later do not support large files by default,
+         # so use the C compiler's -n32 option if that helps.
+         AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
+         AC_COMPILE_IFELSE([], [break])
+         CC="$CC -n32"
+         AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
+         break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi])
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
+    ac_cv_sys_file_offset_bits,
+    [Number of bits in a file offset, on hosts where this is settable.],
+    [_AC_SYS_LARGEFILE_TEST_INCLUDES])
+  AS_CASE([$ac_cv_sys_file_offset_bits],
+    [unknown],
+      [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1],
+         [ac_cv_sys_large_files],
+         [Define for large files, on AIX-style hosts.],
+         [_AC_SYS_LARGEFILE_TEST_INCLUDES])],
+    [64],
+      [gl_YEAR2038_BODY([])])])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/largefile.m4:126: -1- AC_DEFUN([gl_LARGEFILE], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      dnl Native Windows.
+      dnl mingw64 defines off_t to a 64-bit type already, if
+      dnl _FILE_OFFSET_BITS=64, which is ensured by AC_SYS_LARGEFILE.
+      AC_CACHE_CHECK([for 64-bit off_t], [gl_cv_type_off_t_64],
+        [AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <sys/types.h>
+                int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1];
+              ]],
+              [[]])],
+           [gl_cv_type_off_t_64=yes], [gl_cv_type_off_t_64=no])
+        ])
+      if test $gl_cv_type_off_t_64 = no; then
+        WINDOWS_64_BIT_OFF_T=1
+      else
+        WINDOWS_64_BIT_OFF_T=0
+      fi
+      dnl Some mingw versions define, if _FILE_OFFSET_BITS=64, 'struct stat'
+      dnl to 'struct _stat32i64' or 'struct _stat64' (depending on
+      dnl _USE_32BIT_TIME_T), which has a 32-bit st_size member.
+      AC_CACHE_CHECK([for 64-bit st_size], [gl_cv_member_st_size_64],
+        [AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <sys/types.h>
+                struct stat buf;
+                int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1];
+              ]],
+              [[]])],
+           [gl_cv_member_st_size_64=yes], [gl_cv_member_st_size_64=no])
+        ])
+      if test $gl_cv_member_st_size_64 = no; then
+        WINDOWS_64_BIT_ST_SIZE=1
+      else
+        WINDOWS_64_BIT_ST_SIZE=0
+      fi
+      ;;
+    *)
+      dnl Nothing to do on gnulib's side.
+      dnl A 64-bit off_t is
+      dnl   - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX,
+      dnl     OSF/1, Cygwin,
+      dnl   - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on
+      dnl     glibc, HP-UX, Solaris,
+      dnl   - enabled by _LARGE_FILES=1 (ensured by AC_SYS_LARGEFILE) on AIX,
+      dnl   - impossible to achieve on Minix 3.1.8.
+      WINDOWS_64_BIT_OFF_T=0
+      WINDOWS_64_BIT_ST_SIZE=0
+      ;;
+  esac
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/libunistring-base.m4:22: -1- AC_DEFUN([gl_LIBUNISTRING_MODULE], [
+  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
+  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
+  dnl gl_LIBUNISTRING_CORE if that macro has been run.
+  gl_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]),
+    [gl_LIBUNISTRING_VERSION_CMP([$1])])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/libunistring-base.m4:48: -1- AC_DEFUN([gl_LIBUNISTRING_LIBHEADER], [
+  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
+  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
+  dnl gl_LIBUNISTRING_CORE if that macro has been run.
+  if gl_LIBUNISTRING_VERSION_CMP([$1]); then
+    dnl It is OK to use a .h file in lib/ from within tests/, but not vice
+    dnl versa.
+    if test -z "$LIBUNISTRING_[]AS_TR_CPP([$2])"; then
+      LIBUNISTRING_[]AS_TR_CPP([$2])="${gl_source_base_prefix}$2"
+    fi
+  else
+    LIBUNISTRING_[]AS_TR_CPP([$2])=
+  fi
+  AC_SUBST([LIBUNISTRING_]AS_TR_CPP([$2]))
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/libunistring-base.m4:67: -1- AC_DEFUN([gl_LIBUNISTRING_LIB_PREPARE], [
+  dnl Ensure that HAVE_LIBUNISTRING is fully determined at this point.
+  m4_ifdef([gl_LIBUNISTRING], [AC_REQUIRE([gl_LIBUNISTRING])])
+
+  AC_REQUIRE([AC_PROG_AWK])
+
+dnl Sed expressions to extract the parts of a version number.
+changequote(,)
+gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+changequote([,])
+
+  if test "$HAVE_LIBUNISTRING" = yes; then
+    LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
+    LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
+    LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/libunistring-base.m4:103: -1- AC_DEFUN([gl_LIBUNISTRING_VERSION_CMP], [ { test "$HAVE_LIBUNISTRING" != yes \
+    || {
+         dnl AS_LITERAL_IF exists and works fine since autoconf-2.59 at least.
+         AS_LITERAL_IF([$1],
+           [dnl This is the optimized variant, that assumes the argument is a literal:
+            m4_pushdef([requested_version_major],
+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^\([0-9]*\).*], [\1]), [])])
+            m4_pushdef([requested_version_minor],
+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
+            m4_pushdef([requested_version_subminor],
+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.][0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
+            test $LIBUNISTRING_VERSION_MAJOR -lt requested_version_major \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq requested_version_major \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt requested_version_minor \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq requested_version_minor \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt requested_version_subminor
+                         }
+                    }
+               }
+            m4_popdef([requested_version_subminor])
+            m4_popdef([requested_version_minor])
+            m4_popdef([requested_version_major])
+           ],
+           [dnl This is the unoptimized variant:
+            requested_version_major=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_major"`
+            requested_version_minor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_minor"`
+            requested_version_subminor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_subminor"`
+            test $LIBUNISTRING_VERSION_MAJOR -lt $requested_version_major \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq $requested_version_major \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt $requested_version_minor \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq $requested_version_minor \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt $requested_version_subminor
+                         }
+                    }
+               }
+           ])
+       }
+  }])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/limits-h.m4:10: -1- AC_DEFUN_ONCE([gl_LIMITS_H], [
+  gl_CHECK_NEXT_HEADERS([limits.h])
+
+  AC_CACHE_CHECK([whether limits.h has WORD_BIT, BOOL_WIDTH etc.],
+    [gl_cv_header_limits_width],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+             #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+            #endif
+            #include <limits.h>
+            long long llm = LLONG_MAX;
+            int wb = WORD_BIT;
+            int ullw = ULLONG_WIDTH;
+            int bw = BOOL_WIDTH;
+          ]])],
+       [gl_cv_header_limits_width=yes],
+       [gl_cv_header_limits_width=no])])
+  if test "$gl_cv_header_limits_width" = yes; then
+    GL_GENERATE_LIMITS_H=false
+  else
+    GL_GENERATE_LIMITS_H=true
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/limits-h.m4:37: -1- AC_DEFUN([gl_REPLACE_LIMITS_H], [
+  AC_REQUIRE([gl_LIMITS_H])
+  GL_GENERATE_LIMITS_H=true
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/lstat.m4:11: -1- AC_DEFUN([gl_FUNC_LSTAT], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+  dnl If lstat does not exist, the replacement <sys/stat.h> does
+  dnl "#define lstat stat", and lstat.c is a no-op.
+  AC_CHECK_FUNCS_ONCE([lstat])
+  if test $ac_cv_func_lstat = yes; then
+    AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+    case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in
+      solaris* | *no)
+        REPLACE_LSTAT=1
+        ;;
+    esac
+  else
+    HAVE_LSTAT=0
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/lstat.m4:31: -1- AC_DEFUN([gl_PREREQ_LSTAT], [:])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/lstat.m4:33: -1- AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], [
+  dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it
+  dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ.
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether lstat correctly handles trailing slash],
+    [gl_cv_func_lstat_dereferences_slashed_symlink],
+    [rm -f conftest.sym conftest.file
+     echo >conftest.file
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [AC_INCLUDES_DEFAULT],
+          [[struct stat sbuf;
+            if (symlink ("conftest.file", "conftest.sym") != 0)
+              return 1;
+            /* Linux will dereference the symlink and fail, as required by
+               POSIX.  That is better in the sense that it means we will not
+               have to compile and use the lstat wrapper.  */
+            return lstat ("conftest.sym/", &sbuf) == 0;
+          ]])],
+       [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
+       [gl_cv_func_lstat_dereferences_slashed_symlink=no],
+       [case "$host_os" in
+          linux-* | linux)
+            # Guess yes on Linux systems.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+          *-gnu* | gnu*)
+            # Guess yes on glibc systems.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+          mingw*)
+            # Guess no on native Windows.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
+          *)
+            # If we don't know, obey --enable-cross-guesses.
+            gl_cv_func_lstat_dereferences_slashed_symlink="$gl_cross_guess_normal" ;;
+        esac
+       ])
+     rm -f conftest.sym conftest.file
+    ])
+  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
+    *yes)
+      AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
+        [Define to 1 if 'lstat' dereferences a symlink specified
+         with a trailing slash.])
+      ;;
+  esac
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/malloc.m4:9: -1- AC_DEFUN([_AC_FUNC_MALLOC_IF], [
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
+  AC_CACHE_CHECK([whether malloc (0) returns nonnull],
+    [ac_cv_func_malloc_0_nonnull],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stdlib.h>
+          ]],
+          [[void *p = malloc (0);
+            int result = !p;
+            free (p);
+            return result;]])
+       ],
+       [ac_cv_func_malloc_0_nonnull=yes],
+       [ac_cv_func_malloc_0_nonnull=no],
+       [case "$host_os" in
+          # Guess yes on platforms where we know the result.
+          *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
+          | gnu* | *-musl* | midnightbsd* \
+          | hpux* | solaris* | cygwin* | mingw* | msys* )
+            ac_cv_func_malloc_0_nonnull="guessing yes" ;;
+          # If we don't know, obey --enable-cross-guesses.
+          *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;;
+        esac
+       ])
+    ])
+  AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/malloc.m4:42: -1- AC_DEFUN([gl_FUNC_MALLOC_GNU], [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([gl_FUNC_MALLOC_POSIX])
+  REPLACE_MALLOC_FOR_MALLOC_GNU="$REPLACE_MALLOC_FOR_MALLOC_POSIX"
+  if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 0; then
+    _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC_FOR_MALLOC_GNU=1])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/malloc.m4:56: -1- AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF], [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF])
+  test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC_FOR_MALLOC_POSIX=1
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/malloc.m4:66: -1- AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF], [
+  AC_CACHE_CHECK([whether malloc is ptrdiff_t safe],
+    [gl_cv_malloc_ptrdiff],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stdint.h>
+          ]],
+          [[/* 64-bit ptrdiff_t is so wide that no practical platform
+               can exceed it.  */
+            #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0)
+
+            /* On rare machines where size_t fits in ptrdiff_t there
+               is no problem.  */
+            #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX)
+
+            /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t
+               bounds even on 32-bit platforms.  We don't know which
+               non-glibc systems are safe.  */
+            #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__))
+
+            #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE
+              return 0;
+            #else
+              #error "malloc might not be ptrdiff_t safe"
+              syntax error
+            #endif
+          ]])],
+       [gl_cv_malloc_ptrdiff=yes],
+       [gl_cv_malloc_ptrdiff=no])
+    ])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/malloc.m4:104: -1- AC_DEFUN([gl_FUNC_MALLOC_POSIX], [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF])
+  AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
+  if test "$gl_cv_func_malloc_posix" = yes; then
+    AC_DEFINE([HAVE_MALLOC_POSIX], [1],
+      [Define if malloc, realloc, and calloc set errno on allocation failure.])
+  else
+    REPLACE_MALLOC_FOR_MALLOC_POSIX=1
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/malloc.m4:119: -1- AC_DEFUN([gl_CHECK_MALLOC_POSIX], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure],
+    [gl_cv_func_malloc_posix],
+    [
+      dnl It is too dangerous to try to allocate a large amount of memory:
+      dnl some systems go to their knees when you do that. So assume that
+      dnl all Unix implementations of the function set errno on failure,
+      dnl except on those platforms where we have seen 'test-malloc-gnu',
+      dnl 'test-realloc-gnu', 'test-calloc-gnu' fail.
+      case "$host_os" in
+        mingw*)
+          gl_cv_func_malloc_posix=no ;;
+        irix* | solaris*)
+          dnl On IRIX 6.5, the three functions return NULL with errno unset
+          dnl when the argument is larger than PTRDIFF_MAX.
+          dnl On Solaris 11.3, the three functions return NULL with errno set
+          dnl to EAGAIN, not ENOMEM, when the argument is larger than
+          dnl PTRDIFF_MAX.
+          dnl Here is a test program:
+m4_divert_push([KILL])
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#define ptrdiff_t long
+#ifndef PTRDIFF_MAX
+# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1))
+#endif
+
+int main ()
+{
+  void *p;
+
+  fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX);
+
+  errno = 0;
+  p = malloc ((unsigned long) PTRDIFF_MAX + 1);
+  fprintf (stderr, "p=%p errno=%d\n", p, errno);
+
+  errno = 0;
+  p = calloc (PTRDIFF_MAX / 2 + 1, 2);
+  fprintf (stderr, "p=%p errno=%d\n", p, errno);
+
+  errno = 0;
+  p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1);
+  fprintf (stderr, "p=%p errno=%d\n", p, errno);
+
+  return 0;
+}
+m4_divert_pop([KILL])
+          gl_cv_func_malloc_posix=no ;;
+        *)
+          gl_cv_func_malloc_posix=yes ;;
+      esac
+    ])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/malloca.m4:8: -1- AC_DEFUN([gl_MALLOCA], [
+  dnl Use the autoconf tests for alloca(), but not the AC_SUBSTed variables
+  dnl @ALLOCA@ and @LTALLOCA@.
+  dnl gl_FUNC_ALLOCA   dnl Already brought in by the module dependencies.
+  AC_REQUIRE([gl_EEMALLOC])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/mbstate_t.m4:15: -1- AC_DEFUN([AC_TYPE_MBSTATE_T], [
+   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl for HP-UX 11.11
+
+   AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t],
+     [AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [AC_INCLUDES_DEFAULT[
+             #include <wchar.h>]],
+           [[mbstate_t x; return sizeof x;]])],
+        [ac_cv_type_mbstate_t=yes],
+        [ac_cv_type_mbstate_t=no])])
+   if test $ac_cv_type_mbstate_t = yes; then
+     AC_DEFINE([HAVE_MBSTATE_T], [1],
+               [Define to 1 if <wchar.h> declares mbstate_t.])
+   else
+     AC_DEFINE([mbstate_t], [int],
+               [Define to a type if <wchar.h> does not define.])
+   fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/mempcpy.m4:8: -1- AC_DEFUN([gl_FUNC_MEMPCPY], [
+  dnl Persuade glibc <string.h> to declare mempcpy().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_REQUIRE([gl_STRING_H_DEFAULTS])
+  AC_CHECK_FUNCS([mempcpy])
+  if test $ac_cv_func_mempcpy = no; then
+    HAVE_MEMPCPY=0
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/mempcpy.m4:24: -1- AC_DEFUN([gl_PREREQ_MEMPCPY], [
+  :
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/minmax.m4:9: -1- AC_DEFUN([gl_MINMAX], [
+  AC_REQUIRE([gl_PREREQ_MINMAX])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/minmax.m4:15: -1- AC_DEFUN([gl_PREREQ_MINMAX], [
+  gl_MINMAX_IN_HEADER([limits.h])
+  gl_MINMAX_IN_HEADER([sys/param.h])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/minmax.m4:25: -1- AC_DEFUN([gl_MINMAX_IN_HEADER], [
+  m4_pushdef([header], AS_TR_SH([$1]))
+  m4_pushdef([HEADER], AS_TR_CPP([$1]))
+  AC_CACHE_CHECK([whether <$1> defines MIN and MAX],
+    [gl_cv_minmax_in_]header,
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <$1>
+            int x = MIN (42, 17);]],
+          [[]])],
+       [gl_cv_minmax_in_]header[=yes],
+       [gl_cv_minmax_in_]header[=no])])
+  if test $gl_cv_minmax_in_[]header = yes; then
+    AC_DEFINE([HAVE_MINMAX_IN_]HEADER, 1,
+      [Define to 1 if <$1> defines the MIN and MAX macros.])
+  fi
+  m4_popdef([HEADER])
+  m4_popdef([header])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/mode_t.m4:12: -1- AC_DEFUN([gl_PROMOTED_TYPE_MODE_T], [
+  AC_REQUIRE([AC_TYPE_MODE_T])
+  AC_CACHE_CHECK([for promoted mode_t type], [gl_cv_promoted_mode_t], [
+    dnl Assume mode_t promotes to 'int' if and only if it is smaller than 'int',
+    dnl and to itself otherwise. This assumption is not guaranteed by the ISO C
+    dnl standard, but we don't know of any real-world counterexamples.
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]],
+      [[typedef int array[2 * (sizeof (mode_t) < sizeof (int)) - 1];]])],
+      [gl_cv_promoted_mode_t='int'],
+      [gl_cv_promoted_mode_t='mode_t'])
+  ])
+  AC_DEFINE_UNQUOTED([PROMOTED_MODE_T], [$gl_cv_promoted_mode_t],
+    [Define to the type that is the result of default argument promotions of type mode_t.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/msvc-inval.m4:7: -1- AC_DEFUN([gl_MSVC_INVAL], [
+  AC_CHECK_FUNCS_ONCE([_set_invalid_parameter_handler])
+  if test $ac_cv_func__set_invalid_parameter_handler = yes; then
+    HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
+    AC_DEFINE([HAVE_MSVC_INVALID_PARAMETER_HANDLER], [1],
+      [Define to 1 on MSVC platforms that have the "invalid parameter handler"
+       concept.])
+  else
+    HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
+  fi
+  AC_SUBST([HAVE_MSVC_INVALID_PARAMETER_HANDLER])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/msvc-nothrow.m4:7: -1- AC_DEFUN([gl_MSVC_NOTHROW], [
+  AC_REQUIRE([gl_MSVC_INVAL])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/multiarch.m4:21: -1- AC_DEFUN_ONCE([gl_MULTIARCH], [
+  dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN.
+  AC_CACHE_CHECK([whether the compiler produces multi-arch binaries],
+    [gl_cv_c_multiarch],
+    [gl_cv_c_multiarch=no
+     AC_COMPILE_IFELSE(
+       [AC_LANG_SOURCE(
+         [[#ifndef __APPLE_CC__
+            not a universal capable compiler
+           #endif
+           typedef int dummy;
+         ]])],
+       [
+        dnl Check for potential -arch flags.  It is not universal unless
+        dnl there are at least two -arch flags with different values.
+        arch=
+        prev=
+        for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
+          if test -n "$prev"; then
+            case $word in
+              i?86 | x86_64 | ppc | ppc64 | arm | arm64)
+                if test -z "$arch" || test "$arch" = "$word"; then
+                  arch="$word"
+                else
+                  gl_cv_c_multiarch=yes
+                fi
+                ;;
+            esac
+            prev=
+          else
+            if test "x$word" = "x-arch"; then
+              prev=arch
+            fi
+          fi
+        done
+       ])
+    ])
+  if test $gl_cv_c_multiarch = yes; then
+    APPLE_UNIVERSAL_BUILD=1
+  else
+    APPLE_UNIVERSAL_BUILD=0
+  fi
+  AC_SUBST([APPLE_UNIVERSAL_BUILD])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/nocrash.m4:18: -1- AC_DEFUN([GL_NOCRASH], [[
+#include <stdlib.h>
+#if defined __MACH__ && defined __APPLE__
+/* Avoid a crash on Mac OS X.  */
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <mach/thread_status.h>
+#include <mach/exception.h>
+#include <mach/task.h>
+#include <pthread.h>
+/* The exception port on which our thread listens.  */
+static mach_port_t our_exception_port;
+/* The main function of the thread listening for exceptions of type
+   EXC_BAD_ACCESS.  */
+static void *
+mach_exception_thread (void *arg)
+{
+  /* Buffer for a message to be received.  */
+  struct {
+    mach_msg_header_t head;
+    mach_msg_body_t msgh_body;
+    char data[1024];
+  } msg;
+  mach_msg_return_t retval;
+  /* Wait for a message on the exception port.  */
+  retval = mach_msg (&msg.head, MACH_RCV_MSG | MACH_RCV_LARGE, 0, sizeof (msg),
+                     our_exception_port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
+  if (retval != MACH_MSG_SUCCESS)
+    abort ();
+  exit (1);
+}
+static void
+nocrash_init (void)
+{
+  mach_port_t self = mach_task_self ();
+  /* Allocate a port on which the thread shall listen for exceptions.  */
+  if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port)
+      == KERN_SUCCESS) {
+    /* See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html.  */
+    if (mach_port_insert_right (self, our_exception_port, our_exception_port,
+                                MACH_MSG_TYPE_MAKE_SEND)
+        == KERN_SUCCESS) {
+      /* The exceptions we want to catch.  Only EXC_BAD_ACCESS is interesting
+         for us.  */
+      exception_mask_t mask = EXC_MASK_BAD_ACCESS;
+      /* Create the thread listening on the exception port.  */
+      pthread_attr_t attr;
+      pthread_t thread;
+      if (pthread_attr_init (&attr) == 0
+          && pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0
+          && pthread_create (&thread, &attr, mach_exception_thread, NULL) == 0) {
+        pthread_attr_destroy (&attr);
+        /* Replace the exception port info for these exceptions with our own.
+           Note that we replace the exception port for the entire task, not only
+           for a particular thread.  This has the effect that when our exception
+           port gets the message, the thread specific exception port has already
+           been asked, and we don't need to bother about it.
+           See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html.  */
+        task_set_exception_ports (self, mask, our_exception_port,
+                                  EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
+      }
+    }
+  }
+}
+#elif defined _WIN32 && ! defined __CYGWIN__
+/* Avoid a crash on native Windows.  */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <winerror.h>
+static LONG WINAPI
+exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
+{
+  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
+    {
+    case EXCEPTION_ACCESS_VIOLATION:
+    case EXCEPTION_IN_PAGE_ERROR:
+    case EXCEPTION_STACK_OVERFLOW:
+    case EXCEPTION_GUARD_PAGE:
+    case EXCEPTION_PRIV_INSTRUCTION:
+    case EXCEPTION_ILLEGAL_INSTRUCTION:
+    case EXCEPTION_DATATYPE_MISALIGNMENT:
+    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
+    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
+      exit (1);
+    }
+  return EXCEPTION_CONTINUE_SEARCH;
+}
+static void
+nocrash_init (void)
+{
+  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
+}
+#else
+/* Avoid a crash on POSIX systems.  */
+#include <signal.h>
+#include <unistd.h>
+/* A POSIX signal handler.  */
+static void
+exception_handler (int sig)
+{
+  _exit (1);
+}
+static void
+nocrash_init (void)
+{
+#ifdef SIGSEGV
+  signal (SIGSEGV, exception_handler);
+#endif
+#ifdef SIGBUS
+  signal (SIGBUS, exception_handler);
+#endif
+}
+#endif
+]])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/off_t.m4:10: -1- AC_DEFUN([gl_TYPE_OFF_T], [
+  m4_ifdef([gl_LARGEFILE], [
+    AC_REQUIRE([gl_LARGEFILE])
+  ], [
+    WINDOWS_64_BIT_OFF_T=0
+  ])
+  AC_SUBST([WINDOWS_64_BIT_OFF_T])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/open-cloexec.m4:8: -1- AC_DEFUN([gl_PREPROC_O_CLOEXEC], [
+  AC_CACHE_CHECK([for O_CLOEXEC],
+    [gl_cv_macro_O_CLOEXEC],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[#include <fcntl.h>
+                          #ifndef O_CLOEXEC
+                            choke me;
+                          #endif
+                        ]],
+                        [[return O_CLOEXEC;]])],
+       [gl_cv_macro_O_CLOEXEC=yes],
+       [gl_cv_macro_O_CLOEXEC=no])])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/open-slash.m4:9: -1- AC_DEFUN([gl_OPEN_TRAILING_SLASH_BUG], [
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  dnl open("foo/") should not create a file when the file name has a
+  dnl trailing slash.  FreeBSD only has the problem on symlinks.
+  AC_CHECK_FUNCS_ONCE([lstat])
+  AC_CACHE_CHECK([whether open recognizes a trailing slash],
+    [gl_cv_func_open_slash],
+    [# Assume that if we have lstat, we can also check symlinks.
+     if test $ac_cv_func_lstat = yes; then
+       touch conftest.tmp
+       ln -s conftest.tmp conftest.lnk
+     fi
+     AC_RUN_IFELSE(
+       [AC_LANG_SOURCE([[
+#include <fcntl.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+]GL_MDA_DEFINES[
+int main ()
+{
+  int result = 0;
+#if HAVE_LSTAT
+  if (open ("conftest.lnk/", O_RDONLY) != -1)
+    result |= 1;
+#endif
+  if (open ("conftest.sl/", O_CREAT, 0600) >= 0)
+    result |= 2;
+  return result;
+}]])],
+       [gl_cv_func_open_slash=yes],
+       [gl_cv_func_open_slash=no],
+       [
+changequote(,)dnl
+        case "$host_os" in
+          freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
+            gl_cv_func_open_slash="guessing no" ;;
+          *)
+            gl_cv_func_open_slash="guessing yes" ;;
+        esac
+changequote([,])dnl
+       ])
+     rm -f conftest.sl conftest.tmp conftest.lnk
+    ])
+  case "$gl_cv_func_open_slash" in
+    *no)
+      AC_DEFINE([OPEN_TRAILING_SLASH_BUG], [1],
+        [Define to 1 if open() fails to recognize a trailing slash.])
+      ;;
+  esac
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/open.m4:7: -1- AC_DEFUN([gl_FUNC_OPEN], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_PREPROC_O_CLOEXEC])
+  case "$host_os" in
+    mingw* | pw*)
+      REPLACE_OPEN=1
+      ;;
+    *)
+      dnl open("foo/") should not create a file when the file name has a
+      dnl trailing slash.  FreeBSD only has the problem on symlinks.
+      AC_CHECK_FUNCS_ONCE([lstat])
+      if test "$gl_cv_macro_O_CLOEXEC" != yes; then
+        REPLACE_OPEN=1
+      fi
+      gl_OPEN_TRAILING_SLASH_BUG
+      case "$gl_cv_func_open_slash" in
+        *no)
+          REPLACE_OPEN=1
+          ;;
+      esac
+      ;;
+  esac
+  dnl Replace open() for supporting the gnulib-defined fchdir() function,
+  dnl to keep fchdir's bookkeeping up-to-date.
+  m4_ifdef([gl_FUNC_FCHDIR], [
+    if test $REPLACE_OPEN = 0; then
+      gl_TEST_FCHDIR
+      if test $HAVE_FCHDIR = 0; then
+        REPLACE_OPEN=1
+      fi
+    fi
+  ])
+  dnl Replace open() for supporting the gnulib-defined O_NONBLOCK flag.
+  m4_ifdef([gl_NONBLOCKING_IO], [
+    if test $REPLACE_OPEN = 0; then
+      gl_NONBLOCKING_IO
+      if test $gl_cv_have_open_O_NONBLOCK != yes; then
+        REPLACE_OPEN=1
+      fi
+    fi
+  ])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/open.m4:52: -1- AC_DEFUN([gl_PREREQ_OPEN], [
+  AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T])
+  :
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/pathmax.m4:8: -1- AC_DEFUN([gl_PATHMAX], [
+  dnl Prerequisites of lib/pathmax.h.
+  AC_CHECK_HEADERS_ONCE([sys/param.h])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/pathmax.m4:16: -1- AC_DEFUN([gl_PATHMAX_SNIPPET], [[
+/* Arrange to define PATH_MAX, like "pathmax.h" does. */
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <limits.h>
+#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
+# include <sys/param.h>
+#endif
+#if !defined PATH_MAX && defined MAXPATHLEN
+# define PATH_MAX MAXPATHLEN
+#endif
+#ifdef __hpux
+# undef PATH_MAX
+# define PATH_MAX 1024
+#endif
+#if defined _WIN32 && ! defined __CYGWIN__
+# undef PATH_MAX
+# define PATH_MAX 260
+#endif
+]])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/pathmax.m4:39: -1- AC_DEFUN([gl_PATHMAX_SNIPPET_PREREQ], [
+  AC_CHECK_HEADERS_ONCE([unistd.h sys/param.h])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/raise.m4:7: -1- AC_DEFUN([gl_FUNC_RAISE], [
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CHECK_FUNCS([raise])
+  if test $ac_cv_func_raise = no; then
+    HAVE_RAISE=0
+  else
+    m4_ifdef([gl_MSVC_INVAL], [
+      AC_REQUIRE([gl_MSVC_INVAL])
+      if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+        REPLACE_RAISE=1
+      fi
+    ])
+    m4_ifdef([gl_SIGNALBLOCKING], [
+      gl_SIGNALBLOCKING
+      if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
+        m4_ifdef([gl_SIGNAL_SIGPIPE], [
+          gl_SIGNAL_SIGPIPE
+          if test $gl_cv_header_signal_h_SIGPIPE != yes; then
+            REPLACE_RAISE=1
+          fi
+        ], [:])
+      fi
+    ])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/raise.m4:36: -1- AC_DEFUN([gl_PREREQ_RAISE], [:])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/rawmemchr.m4:7: -1- AC_DEFUN([gl_FUNC_RAWMEMCHR], [
+  dnl Persuade glibc <string.h> to declare rawmemchr().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_REQUIRE([gl_STRING_H_DEFAULTS])
+  AC_CHECK_FUNCS([rawmemchr])
+  if test $ac_cv_func_rawmemchr = no; then
+    HAVE_RAWMEMCHR=0
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/rawmemchr.m4:20: -1- AC_DEFUN([gl_PREREQ_RAWMEMCHR], [:])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/read.m4:7: -1- AC_DEFUN([gl_FUNC_READ], [
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  m4_ifdef([gl_MSVC_INVAL], [
+    AC_REQUIRE([gl_MSVC_INVAL])
+    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+      REPLACE_READ=1
+    fi
+  ])
+  dnl This ifdef is just an optimization, to avoid performing a configure
+  dnl check whose result is not used. It does not make the test of
+  dnl GNULIB_UNISTD_H_NONBLOCKING or GNULIB_NONBLOCKING redundant.
+  m4_ifdef([gl_NONBLOCKING_IO], [
+    gl_NONBLOCKING_IO
+    if test $gl_cv_have_nonblocking != yes; then
+      REPLACE_READ=1
+    fi
+  ])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/read.m4:28: -1- AC_DEFUN([gl_PREREQ_READ], [:])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/readlink.m4:7: -1- AC_DEFUN([gl_FUNC_READLINK], [
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CHECK_FUNCS_ONCE([readlink])
+  if test $ac_cv_func_readlink = no; then
+    HAVE_READLINK=0
+  else
+    AC_CACHE_CHECK([whether readlink signature is correct],
+      [gl_cv_decl_readlink_works],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+           [[#include <unistd.h>
+      /* Cause compilation failure if original declaration has wrong type.  */
+      ssize_t readlink (const char *, char *, size_t);]])],
+         [gl_cv_decl_readlink_works=yes], [gl_cv_decl_readlink_works=no])])
+    dnl Solaris 9 ignores trailing slash.
+    dnl FreeBSD 7.2 dereferences only one level of links with trailing slash.
+    AC_CACHE_CHECK([whether readlink handles trailing slash correctly],
+      [gl_cv_func_readlink_trailing_slash],
+      [# We have readlink, so assume ln -s works.
+       ln -s conftest.no-such conftest.link
+       ln -s conftest.link conftest.lnk2
+       AC_RUN_IFELSE(
+         [AC_LANG_PROGRAM(
+           [[#include <unistd.h>
+]], [[char buf[20];
+      return readlink ("conftest.lnk2/", buf, sizeof buf) != -1;]])],
+         [gl_cv_func_readlink_trailing_slash=yes],
+         [gl_cv_func_readlink_trailing_slash=no],
+         [case "$host_os" in
+            # Guess yes on Linux or glibc systems.
+            linux-* | linux | *-gnu* | gnu*)
+              gl_cv_func_readlink_trailing_slash="guessing yes" ;;
+            # Guess no on AIX or HP-UX.
+            aix* | hpux*)
+              gl_cv_func_readlink_trailing_slash="guessing no" ;;
+            # If we don't know, obey --enable-cross-guesses.
+            *)
+              gl_cv_func_readlink_trailing_slash="$gl_cross_guess_normal" ;;
+          esac
+         ])
+      rm -f conftest.link conftest.lnk2])
+    case "$gl_cv_func_readlink_trailing_slash" in
+      *yes)
+        if test "$gl_cv_decl_readlink_works" != yes; then
+          REPLACE_READLINK=1
+        fi
+        ;;
+      *)
+        AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink
+          fails to recognize a trailing slash.])
+        REPLACE_READLINK=1
+        ;;
+    esac
+
+    AC_CACHE_CHECK([whether readlink truncates results correctly],
+      [gl_cv_func_readlink_truncate],
+      [# We have readlink, so assume ln -s works.
+       ln -s ab conftest.link
+       AC_RUN_IFELSE(
+         [AC_LANG_PROGRAM(
+           [[#include <unistd.h>
+]], [[char c;
+      return readlink ("conftest.link", &c, 1) != 1;]])],
+         [gl_cv_func_readlink_truncate=yes],
+         [gl_cv_func_readlink_truncate=no],
+         [case "$host_os" in
+            # Guess yes on Linux or glibc systems.
+            linux-* | linux | *-gnu* | gnu*)
+              gl_cv_func_readlink_truncate="guessing yes" ;;
+            # Guess no on AIX or HP-UX.
+            aix* | hpux*)
+              gl_cv_func_readlink_truncate="guessing no" ;;
+            # If we don't know, obey --enable-cross-guesses.
+            *)
+              gl_cv_func_readlink_truncate="$gl_cross_guess_normal" ;;
+          esac
+         ])
+      rm -f conftest.link conftest.lnk2])
+    case $gl_cv_func_readlink_truncate in
+      *yes)
+        if test "$gl_cv_decl_readlink_works" != yes; then
+          REPLACE_READLINK=1
+        fi
+        ;;
+      *)
+        AC_DEFINE([READLINK_TRUNCATE_BUG], [1], [Define to 1 if readlink
+          sets errno instead of truncating a too-long link.])
+        REPLACE_READLINK=1
+        ;;
+    esac
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/readlink.m4:104: -1- AC_DEFUN([gl_FUNC_READLINK_SEPARATE], [
+  AC_CHECK_FUNCS_ONCE([readlink])
+  gl_PREREQ_READLINK
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/readlink.m4:111: -1- AC_DEFUN([gl_PREREQ_READLINK], [
+  :
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/realloc.m4:9: -1- AC_DEFUN([_AC_FUNC_REALLOC_IF], [
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
+  AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull],
+    [ac_cv_func_realloc_0_nonnull],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stdlib.h>
+          ]],
+          [[void *p = realloc (0, 0);
+            int result = !p;
+            free (p);
+            return result;]])
+       ],
+       [ac_cv_func_realloc_0_nonnull=yes],
+       [ac_cv_func_realloc_0_nonnull=no],
+       [case "$host_os" in
+          # Guess yes on platforms where we know the result.
+          *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
+          | gnu* | *-musl* | midnightbsd* \
+          | hpux* | solaris* | cygwin* | mingw* | msys* )
+            ac_cv_func_realloc_0_nonnull="guessing yes" ;;
+          # If we don't know, obey --enable-cross-guesses.
+          *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;;
+        esac
+       ])
+    ])
+  AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/realloc.m4:42: -1- AC_DEFUN([gl_FUNC_REALLOC_GNU], [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([gl_FUNC_REALLOC_POSIX])
+  if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 0; then
+    _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC_FOR_REALLOC_GNU=1])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/realloc.m4:56: -1- AC_DEFUN([gl_FUNC_REALLOC_POSIX], [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([gl_FUNC_MALLOC_POSIX])
+  if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then
+    REPLACE_REALLOC_FOR_REALLOC_POSIX=1
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:10: -1- AC_DEFUN([gl_RELOCATABLE_LIBRARY], [
+  AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:14: -1- AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], [
+  AC_REQUIRE([gl_RELOCATABLE_NOP])
+  dnl Easier to put this here once, instead of into the DEFS of each Makefile.
+  if test "X$prefix" = "XNONE"; then
+    reloc_final_prefix="$ac_default_prefix"
+  else
+    reloc_final_prefix="$prefix"
+  fi
+  AC_DEFINE_UNQUOTED([INSTALLPREFIX], ["${reloc_final_prefix}"],
+    [Define to the value of ${prefix}, as a string.])
+  if test $RELOCATABLE = yes; then
+    AC_DEFINE([ENABLE_RELOCATABLE], [1],
+      [Define to 1 if the package shall run at any location in the file
+       system.])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:33: -1- AC_DEFUN([gl_RELOCATABLE_NOP], [
+  AC_MSG_CHECKING([whether to activate relocatable installation])
+  AC_ARG_ENABLE([relocatable],
+    [AS_HELP_STRING([--enable-relocatable],
+      [install a package that can be moved in the file system])],
+    [if test "$enableval" != no; then
+       RELOCATABLE=yes
+     else
+       RELOCATABLE=no
+     fi
+    ], RELOCATABLE=no)
+  AC_SUBST([RELOCATABLE])
+  AC_MSG_RESULT([$RELOCATABLE])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable.m4:13: -1- AC_DEFUN([gl_RELOCATABLE], [
+  AC_REQUIRE([gl_RELOCATABLE_BODY])
+  gl_RELOCATABLE_LIBRARY
+  : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
+  RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
+  RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable.m4:22: -1- AC_DEFUN([gl_RELOCATABLE_BODY], [
+  AC_REQUIRE([AC_PROG_INSTALL])
+
+  dnl This AC_BEFORE invocation leads to unjustified autoconf warnings
+  dnl when gl_RELOCATABLE_BODY is invoked more than once.
+  dnl
+  dnl We need this AC_BEFORE because AC_PROG_INSTALL is documented to
+  dnl overwrite earlier settings of INSTALL and INSTALL_PROGRAM (even
+  dnl though in autoconf-2.52..2.60 it doesn't do so), but we want this
+  dnl macro's setting of INSTALL_PROGRAM to persist.
+  dnl Arghh: AC_BEFORE does not work in this setting :-(
+  dnl AC_BEFORE([AC_PROG_INSTALL],[gl_RELOCATABLE_BODY])
+  dnl
+  dnl LT_INIT sets LIBTOOL, but we want this macro's setting of LIBTOOL to
+  dnl persist.
+  dnl Arghh: AC_BEFORE does not work in this setting :-(
+  dnl AC_BEFORE([LT_INIT],[gl_RELOCATABLE_BODY])
+
+  AC_REQUIRE([AC_LIB_LIBPATH])
+  AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  is_noop=no
+  use_elf_origin_trick=no
+  use_macos_tools=no
+  use_wrapper=no
+  if test $RELOCATABLE = yes; then
+    # --enable-relocatable implies --disable-rpath
+    enable_rpath=no
+    AC_CHECK_HEADERS([mach-o/dyld.h])
+    AC_CHECK_FUNCS([_NSGetExecutablePath])
+    case "$host_os" in
+      mingw*) is_noop=yes ;;
+      # For the platforms that support $ORIGIN, see
+      # <https://lekensteyn.nl/rpath.html>.
+      # glibc systems, Linux with musl libc: yes. Android: no.
+      linux*-android*) ;;
+      linux* | kfreebsd*) use_elf_origin_trick=yes ;;
+      # Hurd: <https://lists.gnu.org/r/bug-hurd/2019-02/msg00049.html>
+      # only after the glibc commit from 2018-01-08
+      # <https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=311ba8dc4416467947eff2ab327854f124226309>
+      gnu*)
+        # Test for a glibc version >= 2.27.
+        AC_CHECK_FUNCS([copy_file_range])
+        if test $ac_cv_func_copy_file_range = yes; then
+          use_elf_origin_trick=yes
+        fi
+        ;;
+changequote(,)dnl
+      # FreeBSD >= 7.3, DragonFly >= 3.0, MidnightBSD >= 1.1: yes.
+      freebsd | freebsd[1-7] | freebsd[1-6].* | freebsd7.[0-2]) ;;
+      dragonfly | dragonfly[1-2] | dragonfly[1-2].*) ;;
+      midnightbsd | midnightbsd0* | midnightbsd1.0*) ;;
+      freebsd* | dragonfly* | midnightbsd*) use_elf_origin_trick=yes ;;
+      # NetBSD >= 8.0: yes.
+      netbsd | netbsd[1-7] | netbsd[1-7].*) ;;
+      netbsdelf | netbsdelf[1-7] | netbsdelf[1-7].*) ;;
+      netbsd*) use_elf_origin_trick=yes ;;
+      # OpenBSD >= 5.4: yes.
+      openbsd | openbsd[1-5] | openbsd[1-4].* | openbsd5.[0-3]) ;;
+      openbsd*) use_elf_origin_trick=yes ;;
+      # Solaris >= 10: yes.
+      solaris | solaris2.[1-9] | solaris2.[1-9].*) ;;
+      solaris*) use_elf_origin_trick=yes ;;
+      # Haiku: yes.
+      haiku*) use_elf_origin_trick=yes ;;
+      # On Mac OS X 10.4 or newer, use Mac OS X tools. See
+      # <https://wincent.com/wiki/@executable_path,_@load_path_and_@rpath>.
+      darwin | darwin[1-7].*) ;;
+      darwin*) use_macos_tools=yes ;;
+changequote([,])dnl
+    esac
+    if test $is_noop = yes; then
+      RELOCATABLE_LDFLAGS=:
+      AC_SUBST([RELOCATABLE_LDFLAGS])
+    else
+      if test $use_elf_origin_trick = yes || test $use_macos_tools = yes; then
+        dnl Use the dynamic linker's support for relocatable programs.
+        case "$ac_aux_dir" in
+          /*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;;
+          *) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;;
+        esac
+        RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
+        AC_SUBST([RELOCATABLE_LDFLAGS])
+        if test $use_macos_tools = yes; then
+          dnl Use a libtool wrapper that uses Mac OS X tools.
+          case "$ac_aux_dir" in
+            /*) LIBTOOL="${CONFIG_SHELL-$SHELL} $ac_aux_dir/libtool-reloc $LIBTOOL" ;;
+            *) LIBTOOL="${CONFIG_SHELL-$SHELL} \$(top_builddir)/$ac_aux_dir/libtool-reloc $LIBTOOL" ;;
+          esac
+        fi
+      else
+        use_wrapper=yes
+        dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
+        dnl consisting of more than one word - libtool doesn't support this.
+        dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
+        dnl 'install-strip' target.
+        INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\""
+        AC_SUBST([INSTALL_PROGRAM_ENV])
+        case "$ac_aux_dir" in
+          /*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
+          *) INSTALL_PROGRAM="\$(top_builddir)/$ac_aux_dir/install-reloc" ;;
+        esac
+      fi
+    fi
+  fi
+  AM_CONDITIONAL([RELOCATABLE_VIA_LD],
+    [test $is_noop = yes || test $use_elf_origin_trick = yes || test $use_macos_tools = yes])
+  AM_CONDITIONAL([RELOCATABLE_VIA_WRAPPER], [test $use_wrapper = yes])
+
+  dnl RELOCATABLE_LIBRARY_PATH can be set in configure.ac. Default is empty.
+  AC_SUBST([RELOCATABLE_LIBRARY_PATH])
+
+  AC_SUBST([RELOCATABLE_CONFIG_H_DIR])
+  AC_SUBST([RELOCATABLE_SRC_DIR])
+  AC_SUBST([RELOCATABLE_BUILD_DIR])
+
+  dnl Ensure RELOCATABLE_STRIP is defined in Makefiles (at least those
+  dnl generated by automake), with value ':'.
+  RELOCATABLE_STRIP=':'
+  AC_SUBST([RELOCATABLE_STRIP])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable.m4:147: -1- AC_DEFUN([AC_LIB_LIBPATH], [
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library path variable], [acl_cv_libpath], [
+    LD="$LD" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.libpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_libpath=${acl_cv_shlibpath_var:-none}
+  ])
+  shlibpath_var="$acl_cv_shlibpath_var"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/safe-read.m4:9: -1- AC_DEFUN([gl_PREREQ_SAFE_READ], [
+  AC_REQUIRE([gt_TYPE_SSIZE_T])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/setenv.m4:7: -1- AC_DEFUN([gl_FUNC_SETENV], [
+  AC_REQUIRE([gl_FUNC_SETENV_SEPARATE])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  if test $ac_cv_func_setenv = no; then
+    HAVE_SETENV=0
+  else
+    AC_CACHE_CHECK([whether setenv validates arguments],
+      [gl_cv_func_setenv_works],
+      [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+       #include <stdlib.h>
+       #include <errno.h>
+       #include <string.h>
+      ]], [[
+       int result = 0;
+       {
+         if (setenv ("", "", 0) != -1)
+           result |= 1;
+         else if (errno != EINVAL)
+           result |= 2;
+       }
+       {
+         if (setenv ("a", "=", 1) != 0)
+           result |= 4;
+         else if (strcmp (getenv ("a"), "=") != 0)
+           result |= 8;
+       }
+       return result;
+      ]])],
+      [gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no],
+      [case "$host_os" in
+                        # Guess yes on glibc systems.
+         *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;;
+                        # Guess yes on musl systems.
+         *-musl*)       gl_cv_func_setenv_works="guessing yes" ;;
+                        # If we don't know, obey --enable-cross-guesses.
+         *)             gl_cv_func_setenv_works="$gl_cross_guess_normal" ;;
+       esac
+      ])])
+    case "$gl_cv_func_setenv_works" in
+      *yes) ;;
+      *)
+        REPLACE_SETENV=1
+        ;;
+    esac
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/setenv.m4:57: -1- AC_DEFUN([gl_FUNC_SETENV_SEPARATE], [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_CHECK_DECLS_ONCE([setenv])
+  if test $ac_cv_have_decl_setenv = no; then
+    HAVE_DECL_SETENV=0
+  fi
+  AC_CHECK_FUNCS_ONCE([setenv])
+  gl_PREREQ_SETENV
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/setenv.m4:68: -1- AC_DEFUN([gl_FUNC_UNSETENV], [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CHECK_DECLS_ONCE([unsetenv])
+  if test $ac_cv_have_decl_unsetenv = no; then
+    HAVE_DECL_UNSETENV=0
+  fi
+  AC_CHECK_FUNCS([unsetenv])
+  if test $ac_cv_func_unsetenv = no; then
+    HAVE_UNSETENV=0
+  else
+    HAVE_UNSETENV=1
+    dnl Some BSDs return void, failing to do error checking.
+    AC_CACHE_CHECK([for unsetenv() return type], [gt_cv_func_unsetenv_ret],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[
+#undef _BSD
+#define _BSD 1 /* unhide unsetenv declaration in OSF/1 5.1 <stdlib.h> */
+#include <stdlib.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+int unsetenv (const char *name);
+            ]],
+            [[]])],
+         [gt_cv_func_unsetenv_ret='int'],
+         [gt_cv_func_unsetenv_ret='void'])])
+    if test $gt_cv_func_unsetenv_ret = 'void'; then
+      AC_DEFINE([VOID_UNSETENV], [1], [Define to 1 if unsetenv returns void
+       instead of int.])
+      REPLACE_UNSETENV=1
+    fi
+
+    dnl Solaris 10 unsetenv does not remove all copies of a name.
+    dnl Haiku alpha 2 unsetenv gets confused by assignment to environ.
+    dnl OpenBSD 4.7 unsetenv("") does not fail.
+    AC_CACHE_CHECK([whether unsetenv obeys POSIX],
+      [gl_cv_func_unsetenv_works],
+      [AC_RUN_IFELSE(
+         [AC_LANG_PROGRAM([[
+            #include <stdlib.h>
+            #include <errno.h>
+            extern char **environ;
+           ]GL_MDA_DEFINES],
+           [[
+            char entry1[] = "a=1";
+            char entry2[] = "b=2";
+            char *env[] = { entry1, entry2, NULL };
+            if (putenv ((char *) "a=1")) return 1;
+            if (putenv (entry2)) return 2;
+            entry2[0] = 'a';
+            unsetenv ("a");
+            if (getenv ("a")) return 3;
+            if (!unsetenv ("") || errno != EINVAL) return 4;
+            entry2[0] = 'b';
+            environ = env;
+            if (!getenv ("a")) return 5;
+            entry2[0] = 'a';
+            unsetenv ("a");
+            if (getenv ("a")) return 6;
+           ]])],
+         [gl_cv_func_unsetenv_works=yes],
+         [gl_cv_func_unsetenv_works=no],
+         [case "$host_os" in
+                    # Guess yes on glibc systems.
+            *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;;
+                    # If we don't know, obey --enable-cross-guesses.
+            *)      gl_cv_func_unsetenv_works="$gl_cross_guess_normal" ;;
+          esac
+         ])
+      ])
+    case "$gl_cv_func_unsetenv_works" in
+      *yes) ;;
+      *)
+        REPLACE_UNSETENV=1
+        ;;
+    esac
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/setenv.m4:152: -1- AC_DEFUN([gl_PREREQ_SETENV], [
+  AC_REQUIRE([AC_FUNC_ALLOCA])
+  AC_REQUIRE([gl_ENVIRON])
+  AC_CHECK_HEADERS_ONCE([unistd.h])
+  AC_CHECK_HEADERS([search.h])
+  AC_CHECK_FUNCS([tsearch])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/setenv.m4:162: -1- AC_DEFUN([gl_PREREQ_UNSETENV], [
+  AC_REQUIRE([gl_ENVIRON])
+  AC_CHECK_HEADERS_ONCE([unistd.h])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/signal_h.m4:7: -1- AC_DEFUN_ONCE([gl_SIGNAL_H], [
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
+  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
+  gl_NEXT_HEADERS([signal.h])
+
+# AIX declares sig_atomic_t to already include volatile, and C89 compilers
+# then choke on 'volatile sig_atomic_t'.  C99 requires that it compile.
+  AC_CHECK_TYPE([volatile sig_atomic_t], [],
+    [HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0], [[
+#include <signal.h>
+    ]])
+
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
+  AC_REQUIRE([AC_TYPE_UID_T])
+
+  dnl Persuade glibc <signal.h> to define sighandler_t.
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+  AC_CHECK_TYPE([sighandler_t], [], [HAVE_SIGHANDLER_T=0], [[
+#include <signal.h>
+    ]])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[#include <signal.h>
+    ]], [pthread_sigmask sigaction
+    sigaddset sigdelset sigemptyset sigfillset sigismember
+    sigpending sigprocmask])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/signal_h.m4:41: -1- AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], [
+  AC_CHECK_TYPES([sigset_t],
+    [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
+    [[
+      #include <signal.h>
+      /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+      #include <sys/types.h>
+    ]])
+  if test $gl_cv_type_sigset_t != yes; then
+    HAVE_SIGSET_T=0
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/signal_h.m4:59: -1- AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_SIGNAL_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/signal_h.m4:71: -1- AC_DEFUN([gl_SIGNAL_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SIGMASK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAISE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGPROCMASK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGACTION])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/signal_h.m4:84: -1- AC_DEFUN([gl_SIGNAL_H_DEFAULTS], [
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING])
+  HAVE_PTHREAD_SIGMASK=1;      AC_SUBST([HAVE_PTHREAD_SIGMASK])
+  HAVE_RAISE=1;                AC_SUBST([HAVE_RAISE])
+  HAVE_SIGSET_T=1;             AC_SUBST([HAVE_SIGSET_T])
+  HAVE_SIGINFO_T=1;            AC_SUBST([HAVE_SIGINFO_T])
+  HAVE_SIGACTION=1;            AC_SUBST([HAVE_SIGACTION])
+  HAVE_STRUCT_SIGACTION_SA_SIGACTION=1;
+                               AC_SUBST([HAVE_STRUCT_SIGACTION_SA_SIGACTION])
+  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
+                               AC_SUBST([HAVE_TYPE_VOLATILE_SIG_ATOMIC_T])
+  HAVE_SIGHANDLER_T=1;         AC_SUBST([HAVE_SIGHANDLER_T])
+  REPLACE_PTHREAD_SIGMASK=0;   AC_SUBST([REPLACE_PTHREAD_SIGMASK])
+  REPLACE_RAISE=0;             AC_SUBST([REPLACE_RAISE])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/signalblocking.m4:12: -1- AC_DEFUN([gl_SIGNALBLOCKING], [
+  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
+  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
+  HAVE_POSIX_SIGNALBLOCKING=0
+  if test "$gl_cv_type_sigset_t" = yes; then
+    AC_CHECK_FUNC([sigprocmask], [HAVE_POSIX_SIGNALBLOCKING=1])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/signalblocking.m4:23: -1- AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sigpipe.m4:9: -1- AC_DEFUN([gl_SIGNAL_SIGPIPE], [
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE([gl_SIGNAL_SIGPIPE_BODY])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sigpipe.m4:16: -1- AC_DEFUN([gl_SIGNAL_SIGPIPE_BODY], [
+  AC_REQUIRE([AC_PROG_CC])
+  AC_CACHE_CHECK([for SIGPIPE], [gl_cv_header_signal_h_SIGPIPE], [
+    AC_EGREP_CPP([booboo],[
+#include <signal.h>
+#if !defined SIGPIPE
+booboo
+#endif
+      ],
+      [gl_cv_header_signal_h_SIGPIPE=no],
+      [gl_cv_header_signal_h_SIGPIPE=yes])
+  ])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/ssize_t.m4:10: -1- AC_DEFUN([gt_TYPE_SSIZE_T], [
+  AC_CACHE_CHECK([for ssize_t], [gt_cv_ssize_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <sys/types.h>]],
+          [[int x = sizeof (ssize_t *) + sizeof (ssize_t);
+            return !x;]])],
+       [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])])
+  if test $gt_cv_ssize_t = no; then
+    AC_DEFINE([ssize_t], [int],
+              [Define as a signed type of the same size as size_t.])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stat-time.m4:20: -1- AC_DEFUN([gl_STAT_TIME], [
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_CHECK_HEADERS_ONCE([sys/time.h])
+
+  AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec],
+    [AC_CACHE_CHECK([whether struct stat.st_atim is of type struct timespec],
+       [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec],
+       [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+          [[
+            #include <sys/types.h>
+            #include <sys/stat.h>
+            #if HAVE_SYS_TIME_H
+            # include <sys/time.h>
+            #endif
+            #include <time.h>
+            struct timespec ts;
+            struct stat st;
+          ]],
+          [[
+            st.st_atim = ts;
+          ]])],
+          [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes],
+          [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no])])
+     if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then
+       AC_DEFINE([TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC], [1],
+         [Define to 1 if the type of the st_atim member of a struct stat is
+          struct timespec.])
+     fi],
+    [AC_CHECK_MEMBERS([struct stat.st_atimespec.tv_nsec], [],
+       [AC_CHECK_MEMBERS([struct stat.st_atimensec], [],
+          [AC_CHECK_MEMBERS([struct stat.st_atim.st__tim.tv_nsec], [], [],
+             [#include <sys/types.h>
+              #include <sys/stat.h>])],
+          [#include <sys/types.h>
+           #include <sys/stat.h>])],
+       [#include <sys/types.h>
+        #include <sys/stat.h>])],
+    [#include <sys/types.h>
+     #include <sys/stat.h>])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stat-time.m4:70: -1- AC_DEFUN([gl_STAT_BIRTHTIME], [
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_CHECK_HEADERS_ONCE([sys/time.h])
+  AC_CHECK_MEMBERS([struct stat.st_birthtimespec.tv_nsec], [],
+    [AC_CHECK_MEMBERS([struct stat.st_birthtimensec], [],
+      [AC_CHECK_MEMBERS([struct stat.st_birthtim.tv_nsec], [], [],
+         [#include <sys/types.h>
+          #include <sys/stat.h>])],
+       [#include <sys/types.h>
+        #include <sys/stat.h>])],
+    [#include <sys/types.h>
+     #include <sys/stat.h>])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stat.m4:9: -1- AC_DEFUN([gl_FUNC_STAT], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([lstat])
+  case "$host_os" in
+    mingw*)
+      dnl On this platform, the original stat() returns st_atime, st_mtime,
+      dnl st_ctime values that are affected by the time zone.
+      REPLACE_STAT=1
+      ;;
+    *)
+      dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/").
+      dnl (For mingw, this is due to a broken stat() override in libmingwex.a.)
+      dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/").
+      AC_CACHE_CHECK([whether stat handles trailing slashes on files],
+        [gl_cv_func_stat_file_slash],
+        [touch conftest.tmp
+         # Assume that if we have lstat, we can also check symlinks.
+         if test $ac_cv_func_lstat = yes; then
+           ln -s conftest.tmp conftest.lnk
+         fi
+         AC_RUN_IFELSE(
+           [AC_LANG_PROGRAM(
+             [[#include <sys/stat.h>
+]], [[int result = 0;
+               struct stat st;
+               if (!stat ("conftest.tmp/", &st))
+                 result |= 1;
+#if HAVE_LSTAT
+               if (!stat ("conftest.lnk/", &st))
+                 result |= 2;
+#endif
+               return result;
+             ]])],
+           [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no],
+           [case "$host_os" in
+                               # Guess yes on Linux systems.
+              linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;;
+                               # Guess yes on glibc systems.
+              *-gnu* | gnu*)   gl_cv_func_stat_file_slash="guessing yes" ;;
+                               # If we don't know, obey --enable-cross-guesses.
+              *)               gl_cv_func_stat_file_slash="$gl_cross_guess_normal" ;;
+            esac
+           ])
+         rm -f conftest.tmp conftest.lnk])
+      case $gl_cv_func_stat_file_slash in
+        *no)
+          REPLACE_STAT=1
+          AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs
+            help when passed a file name with a trailing slash]);;
+      esac
+      case $host_os in
+        dnl Solaris stat can return a negative tv_nsec.
+        solaris*)
+          REPLACE_FSTAT=1 ;;
+      esac
+      ;;
+  esac
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stat.m4:71: -1- AC_DEFUN([gl_PREREQ_STAT], [
+  AC_REQUIRE([gl_SYS_STAT_H])
+  AC_REQUIRE([gl_PREREQ_STAT_W32])
+  :
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stat.m4:78: -1- AC_DEFUN([gl_PREREQ_STAT_W32], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_CHECK_HEADERS([sdkddkver.h])
+      ;;
+  esac
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdalign.m4:10: -1- AC_DEFUN([gl_STDALIGN_H], [
+  AC_CACHE_CHECK([for working stdalign.h],
+    [gl_cv_header_working_stdalign_h],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stdint.h>
+            #include <stdalign.h>
+            #include <stddef.h>
+
+            /* Test that alignof yields a result consistent with offsetof.
+               This catches GCC bug 52023
+               <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
+            #ifdef __cplusplus
+               template <class t> struct alignof_helper { char a; t b; };
+            # define ao(type) offsetof (alignof_helper<type>, b)
+            #else
+            # define ao(type) offsetof (struct { char a; type b; }, b)
+            #endif
+            char test_double[ao (double) % _Alignof (double) == 0 ? 1 : -1];
+            char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1];
+            char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1];
+
+            /* Test _Alignas only on platforms where gnulib can help.  */
+            #if \
+                ((defined __cplusplus && 201103 <= __cplusplus) \
+                 || (__TINYC__ && defined __attribute__) \
+                 || (defined __APPLE__ && defined __MACH__ \
+                     ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
+                     : __GNUC__) \
+                 || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
+                 || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \
+                 || 1300 <= _MSC_VER)
+              struct alignas_test { char c; char alignas (8) alignas_8; };
+              char test_alignas[offsetof (struct alignas_test, alignas_8) == 8
+                                ? 1 : -1];
+            #endif
+          ]])],
+       [gl_cv_header_working_stdalign_h=yes],
+       [gl_cv_header_working_stdalign_h=no])])
+
+  if test $gl_cv_header_working_stdalign_h = yes; then
+    GL_GENERATE_STDALIGN_H=false
+  else
+    GL_GENERATE_STDALIGN_H=true
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdbool.m4:12: -1- AC_DEFUN([gl_STDBOOL_H], [
+  AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  dnl On some platforms, <stdbool.h> does not exist or does not conform to C99.
+  dnl On Solaris 10 with CC=cc CXX=CC, <stdbool.h> exists but is not usable
+  dnl in C++ mode (and no <cstdbool> exists). In this case, we use our
+  dnl replacement, also in C mode (for binary compatibility between C and C++).
+  if test "$ac_cv_header_stdbool_h" = yes; then
+    case "$host_os" in
+      solaris*)
+        if test -z "$GCC"; then
+          GL_GENERATE_STDBOOL_H=true
+        else
+          GL_GENERATE_STDBOOL_H=false
+        fi
+        ;;
+      *)
+        GL_GENERATE_STDBOOL_H=false
+        ;;
+    esac
+  else
+    GL_GENERATE_STDBOOL_H=true
+  fi
+
+  if test "$ac_cv_type__Bool" = yes; then
+    HAVE__BOOL=1
+  else
+    HAVE__BOOL=0
+  fi
+  AC_SUBST([HAVE__BOOL])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdbool.m4:48: -1- AC_DEFUN([AC_CHECK_HEADER_STDBOOL], [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
+     [ac_cv_header_stdbool_h],
+     [AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+             #include <stdbool.h>
+
+             #ifdef __cplusplus
+              typedef bool Bool;
+             #else
+              typedef _Bool Bool;
+              #ifndef bool
+               "error: bool is not defined"
+              #endif
+              #ifndef false
+               "error: false is not defined"
+              #endif
+              #if false
+               "error: false is not 0"
+              #endif
+              #ifndef true
+               "error: true is not defined"
+              #endif
+              #if true != 1
+               "error: true is not 1"
+              #endif
+             #endif
+
+             #ifndef __bool_true_false_are_defined
+              "error: __bool_true_false_are_defined is not defined"
+             #endif
+
+             struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s;
+
+             char a[true == 1 ? 1 : -1];
+             char b[false == 0 ? 1 : -1];
+             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+             char d[(bool) 0.5 == true ? 1 : -1];
+             /* See body of main program for 'e'.  */
+             char f[(Bool) 0.0 == false ? 1 : -1];
+             char g[true];
+             char h[sizeof (Bool)];
+             char i[sizeof s.t];
+             enum { j = false, k = true, l = false * true, m = true * 256 };
+             /* The following fails for
+                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+             Bool n[m];
+             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+             char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+             /* Catch a bug in an HP-UX C compiler.  See
+                https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+                https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html
+              */
+             Bool q = true;
+             Bool *pq = &q;
+             bool *qq = &q;
+           ]],
+           [[
+             bool e = &s;
+             *pq |= q; *pq |= ! q;
+             *qq |= q; *qq |= ! q;
+             /* Refer to every declared value, to avoid compiler optimizations.  */
+             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                     + !m + !n + !o + !p + !q + !pq + !qq);
+           ]])],
+        [ac_cv_header_stdbool_h=yes],
+        [ac_cv_header_stdbool_h=no])])
+   AC_CHECK_TYPES([_Bool])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stddef_h.m4:9: -1- AC_DEFUN_ONCE([gl_STDDEF_H], [
+  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+  AC_REQUIRE([gt_TYPE_WCHAR_T])
+
+  dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
+  GL_GENERATE_STDDEF_H=false
+
+  dnl Test whether the type max_align_t exists and whether its alignment
+  dnl "is as great as is supported by the implementation in all contexts".
+  AC_CACHE_CHECK([for good max_align_t],
+    [gl_cv_type_max_align_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stddef.h>
+            unsigned int s = sizeof (max_align_t);
+            #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__
+            int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1];
+            int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1];
+            #endif
+            typedef struct { char a; max_align_t b; } max_helper;
+            typedef struct { char a; long b; } long_helper;
+            typedef struct { char a; double b; } double_helper;
+            typedef struct { char a; long double b; } long_double_helper;
+            int check3[2 * (offsetof (long_helper, b) <= offsetof (max_helper, b)) - 1];
+            int check4[2 * (offsetof (double_helper, b) <= offsetof (max_helper, b)) - 1];
+            int check5[2 * (offsetof (long_double_helper, b) <= offsetof (max_helper, b)) - 1];
+          ]])],
+       [gl_cv_type_max_align_t=yes],
+       [gl_cv_type_max_align_t=no])
+    ])
+  if test $gl_cv_type_max_align_t = no; then
+    HAVE_MAX_ALIGN_T=0
+    GL_GENERATE_STDDEF_H=true
+  fi
+
+  if test $gt_cv_c_wchar_t = no; then
+    HAVE_WCHAR_T=0
+    GL_GENERATE_STDDEF_H=true
+  fi
+
+  AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions],
+    [gl_cv_decl_null_works],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
+]])],
+      [gl_cv_decl_null_works=yes],
+      [gl_cv_decl_null_works=no])])
+  if test $gl_cv_decl_null_works = no; then
+    REPLACE_NULL=1
+    GL_GENERATE_STDDEF_H=true
+  fi
+
+  if $GL_GENERATE_STDDEF_H; then
+    gl_NEXT_HEADERS([stddef.h])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stddef_h.m4:73: -1- AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_STDDEF_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stddef_h.m4:83: -1- AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stddef_h.m4:91: -1- AC_DEFUN([gl_STDDEF_H_DEFAULTS], [
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
+  HAVE_MAX_ALIGN_T=1;            AC_SUBST([HAVE_MAX_ALIGN_T])
+  HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdint.m4:12: -1- AC_DEFUN_ONCE([gl_STDINT_H], [
+  AC_PREREQ([2.59])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  AC_REQUIRE([gl_LIMITS_H])
+  AC_REQUIRE([gt_TYPE_WINT_T])
+
+  dnl For backward compatibility. Some packages may still be testing these
+  dnl macros.
+  AC_DEFINE([HAVE_LONG_LONG_INT], [1],
+    [Define to 1 if the system has the type 'long long int'.])
+  AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
+    [Define to 1 if the system has the type 'unsigned long long int'.])
+
+  dnl Check for <wchar.h>, in the same way as gl_WCHAR_H does.
+  AC_CHECK_HEADERS_ONCE([wchar.h])
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
+  AC_SUBST([HAVE_WCHAR_H])
+
+  dnl Check for <inttypes.h>.
+  AC_CHECK_HEADERS_ONCE([inttypes.h])
+  if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
+  fi
+  AC_SUBST([HAVE_INTTYPES_H])
+
+  dnl Check for <sys/types.h>.
+  AC_CHECK_HEADERS_ONCE([sys/types.h])
+  if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
+  else
+    HAVE_SYS_TYPES_H=0
+  fi
+  AC_SUBST([HAVE_SYS_TYPES_H])
+
+  gl_CHECK_NEXT_HEADERS([stdint.h])
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
+  else
+    HAVE_STDINT_H=0
+  fi
+  AC_SUBST([HAVE_STDINT_H])
+
+  dnl Now see whether we need a substitute <stdint.h>.
+  if test $ac_cv_header_stdint_h = yes; then
+    AC_CACHE_CHECK([whether stdint.h conforms to C99],
+      [gl_cv_header_working_stdint_h],
+      [gl_cv_header_working_stdint_h=no
+       AC_COMPILE_IFELSE([
+         AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
+]
+gl_STDINT_INCLUDES
+[
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
+#else
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
+
+/* Check that SIZE_MAX has the correct type, if possible.  */
+#if 201112 <= __STDC_VERSION__
+int k = _Generic (SIZE_MAX, size_t: 0);
+#elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \
+       || (0x5110 <= __SUNPRO_C && !__STDC__))
+extern size_t k;
+extern __typeof__ (SIZE_MAX) k;
+#endif
+
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
+#define TYPE_MAXIMUM(t) \
+  ((t) ((t) 0 < (t) -1 \
+        ? (t) -1 \
+        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+struct s {
+  int check_PTRDIFF:
+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+      ? 1 : -1;
+  /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64.  */
+  int check_SIG_ATOMIC:
+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+      ? 1 : -1;
+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+  int check_WCHAR:
+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+      ? 1 : -1;
+  /* Detect bug in mingw.  */
+  int check_WINT:
+      WINT_MIN == TYPE_MINIMUM (wint_t)
+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
+      ? 1 : -1;
+
+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
+  int check_UINT8_C:
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+  int check_UINT16_C:
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+
+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
+#ifdef UINT8_MAX
+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
+         ]])],
+         [dnl Determine whether the various *_MIN, *_MAX macros are usable
+          dnl in preprocessor expression. We could do it by compiling a test
+          dnl program for each of these macros. It is faster to run a program
+          dnl that inspects the macro expansion.
+          dnl This detects a bug on HP-UX 11.23/ia64.
+          AC_RUN_IFELSE([
+            AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
+#include <stdint.h>
+]
+gl_STDINT_INCLUDES
+[
+#include <stdio.h>
+#include <string.h>
+#define MVAL(macro) MVAL1(macro)
+#define MVAL1(expression) #expression
+static const char *macro_values[] =
+  {
+#ifdef INT8_MAX
+    MVAL (INT8_MAX),
+#endif
+#ifdef INT16_MAX
+    MVAL (INT16_MAX),
+#endif
+#ifdef INT32_MAX
+    MVAL (INT32_MAX),
+#endif
+#ifdef INT64_MAX
+    MVAL (INT64_MAX),
+#endif
+#ifdef UINT8_MAX
+    MVAL (UINT8_MAX),
+#endif
+#ifdef UINT16_MAX
+    MVAL (UINT16_MAX),
+#endif
+#ifdef UINT32_MAX
+    MVAL (UINT32_MAX),
+#endif
+#ifdef UINT64_MAX
+    MVAL (UINT64_MAX),
+#endif
+    NULL
+  };
+]], [[
+  const char **mv;
+  for (mv = macro_values; *mv != NULL; mv++)
+    {
+      const char *value = *mv;
+      /* Test whether it looks like a cast expression.  */
+      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
+          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
+          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
+          || strncmp (value, "((int)"/*)*/, 6) == 0
+          || strncmp (value, "((signed short)"/*)*/, 15) == 0
+          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
+        return mv - macro_values + 1;
+    }
+  return 0;
+]])],
+              [gl_cv_header_working_stdint_h=yes],
+              [],
+              [case "$host_os" in
+                         # Guess yes on native Windows.
+                 mingw*) gl_cv_header_working_stdint_h="guessing yes" ;;
+                         # In general, assume it works.
+                 *)      gl_cv_header_working_stdint_h="guessing yes" ;;
+               esac
+              ])
+         ])
+      ])
+  fi
+
+  HAVE_C99_STDINT_H=0
+  HAVE_SYS_BITYPES_H=0
+  HAVE_SYS_INTTYPES_H=0
+  GL_GENERATE_STDINT_H=true
+  case "$gl_cv_header_working_stdint_h" in
+    *yes)
+      HAVE_C99_STDINT_H=1
+      dnl Now see whether the system <stdint.h> works without
+      dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined.
+      dnl If not, there would be problems when stdint.h is included from C++.
+      AC_CACHE_CHECK([whether stdint.h works without ISO C predefines],
+        [gl_cv_header_stdint_without_STDC_macros],
+        [gl_cv_header_stdint_without_STDC_macros=no
+         AC_COMPILE_IFELSE([
+           AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+]
+gl_STDINT_INCLUDES
+[
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+           ]])],
+           [gl_cv_header_stdint_without_STDC_macros=yes])
+        ])
+
+      if test $gl_cv_header_stdint_without_STDC_macros = no; then
+        AC_DEFINE([__STDC_CONSTANT_MACROS], [1],
+          [Define to 1 if the system <stdint.h> predates C++11.])
+        AC_DEFINE([__STDC_LIMIT_MACROS], [1],
+          [Define to 1 if the system <stdint.h> predates C++11.])
+      fi
+      AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.],
+        [gl_cv_header_stdint_width],
+        [gl_cv_header_stdint_width=no
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([[
+              /* Work if build is not clean.  */
+              #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1
+              #ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+               #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+              #endif
+              #include <stdint.h>
+              ]gl_STDINT_INCLUDES[
+              int iw = UINTMAX_WIDTH;
+              ]])],
+           [gl_cv_header_stdint_width=yes])])
+      if test "$gl_cv_header_stdint_width" = yes; then
+        GL_GENERATE_STDINT_H=false
+      fi
+      ;;
+    *)
+      dnl Check for <sys/inttypes.h>, and for
+      dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
+      AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])
+      if test $ac_cv_header_sys_inttypes_h = yes; then
+        HAVE_SYS_INTTYPES_H=1
+      fi
+      if test $ac_cv_header_sys_bitypes_h = yes; then
+        HAVE_SYS_BITYPES_H=1
+      fi
+      gl_STDINT_TYPE_PROPERTIES
+      ;;
+  esac
+
+  dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH.
+  gl_REPLACE_LIMITS_H
+
+  AC_SUBST([HAVE_C99_STDINT_H])
+  AC_SUBST([HAVE_SYS_BITYPES_H])
+  AC_SUBST([HAVE_SYS_INTTYPES_H])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdint.m4:371: -1- AC_DEFUN([gl_STDINT_BITSIZEOF], [
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+       [Define to the number of bits in type ']gltype['.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
+      [AC_COMPUTE_INT([result], [sizeof ($gltype) * CHAR_BIT],
+         [$2
+#include <limits.h>], [result=unknown])
+       eval gl_cv_bitsizeof_${gltype}=\$result
+      ])
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+      dnl Use a nonempty default, because some compilers, such as IRIX 5 cc,
+      dnl do a syntax check even on unused #if conditions and give an error
+      dnl on valid C code like this:
+      dnl   #if 0
+      dnl   # if  > 32
+      dnl   # endif
+      dnl   #endif
+      result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result])
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdint.m4:409: -1- AC_DEFUN([gl_CHECK_TYPES_SIGNED], [
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
+       [Define to 1 if ']gltype[' is a signed integer type.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([$2[
+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])],
+         result=yes, result=no)
+       eval gl_cv_type_${gltype}_signed=\$result
+      ])
+    eval result=\$gl_cv_type_${gltype}_signed
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    if test "$result" = yes; then
+      AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], [1])
+      eval HAVE_SIGNED_${GLTYPE}=1
+    else
+      eval HAVE_SIGNED_${GLTYPE}=0
+    fi
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdint.m4:442: -1- AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], [
+  dnl Use a shell loop, to avoid bloating configure, and
+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
+  dnl   config.h.in,
+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
+  m4_foreach_w([gltype], [$1],
+    [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
+       [Define to l, ll, u, ul, ull, etc., as suitable for
+        constants of type ']gltype['.])])
+  for gltype in $1 ; do
+    AC_CACHE_CHECK([for $gltype integer literal suffix],
+      [gl_cv_type_${gltype}_suffix],
+      [eval gl_cv_type_${gltype}_suffix=no
+       eval result=\$gl_cv_type_${gltype}_signed
+       if test "$result" = yes; then
+         glsufu=
+       else
+         glsufu=u
+       fi
+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
+         case $glsuf in
+           '')  gltype1='int';;
+           l)   gltype1='long int';;
+           ll)  gltype1='long long int';;
+           i64) gltype1='__int64';;
+           u)   gltype1='unsigned int';;
+           ul)  gltype1='unsigned long int';;
+           ull) gltype1='unsigned long long int';;
+           ui64)gltype1='unsigned __int64';;
+         esac
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([$2[
+              extern $gltype foo;
+              extern $gltype1 foo;]])],
+           [eval gl_cv_type_${gltype}_suffix=\$glsuf])
+         eval result=\$gl_cv_type_${gltype}_suffix
+         test "$result" != no && break
+       done])
+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    eval result=\$gl_cv_type_${gltype}_suffix
+    test "$result" = no && result=
+    eval ${GLTYPE}_SUFFIX=\$result
+    AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
+  done
+  m4_foreach_w([gltype], [$1],
+    [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdint.m4:492: -1- AC_DEFUN([gl_STDINT_INCLUDES], [[
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <wchar.h>
+  #endif
+]])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdint.m4:504: -1- AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], [
+  AC_REQUIRE([gl_MULTIARCH])
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+    gl_STDINT_BITSIZEOF([ptrdiff_t size_t],
+      [gl_STDINT_INCLUDES])
+  fi
+  gl_STDINT_BITSIZEOF([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+  gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+  gl_cv_type_ptrdiff_t_signed=yes
+  gl_cv_type_size_t_signed=no
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
+    gl_INTEGER_TYPE_SUFFIX([ptrdiff_t size_t],
+      [gl_STDINT_INCLUDES])
+  fi
+  gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t],
+    [gl_STDINT_INCLUDES])
+
+  dnl If wint_t is smaller than 'int', it cannot satisfy the ISO C 99
+  dnl requirement that wint_t is "unchanged by default argument promotions".
+  dnl In this case gnulib's <wchar.h> and <wctype.h> override wint_t.
+  dnl Set the variable BITSIZEOF_WINT_T accordingly.
+  if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then
+    BITSIZEOF_WINT_T=32
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdio_h.m4:7: -1- AC_DEFUN_ONCE([gl_STDIO_H], [
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+  AH_VERBATIM([MINGW_ANSI_STDIO],
+[/* Use GNU style printf and scanf.  */
+#ifndef __USE_MINGW_ANSI_STDIO
+# undef __USE_MINGW_ANSI_STDIO
+#endif
+])
+  AC_DEFINE([__USE_MINGW_ANSI_STDIO])
+  gl_NEXT_HEADERS([stdio.h])
+
+  dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and
+  dnl inttypes.h behave like gnu instead of system; we must give our
+  dnl printf wrapper the right attribute to match.
+  AC_CACHE_CHECK([which flavor of printf attribute matches inttypes macros],
+    [gl_cv_func_printf_attribute_flavor],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+       #define __STDC_FORMAT_MACROS 1
+       #include <stdio.h>
+       #include <inttypes.h>
+       /* For non-mingw systems, compilation will trivially succeed.
+          For mingw, compilation will succeed for older mingw (system
+          printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */
+       #if (defined _WIN32 && ! defined __CYGWIN__) && \
+         (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+       extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1];
+       #endif
+      ]])], [gl_cv_func_printf_attribute_flavor=system],
+      [gl_cv_func_printf_attribute_flavor=gnu])])
+  if test "$gl_cv_func_printf_attribute_flavor" = gnu; then
+    AC_DEFINE([GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU], [1],
+      [Define to 1 if printf and friends should be labeled with
+       attribute "__gnu_printf__" instead of "__printf__"])
+  fi
+
+  dnl This ifdef is an optimization, to avoid performing a configure check whose
+  dnl result is not used. But it does not make the test of
+  dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant.
+  m4_ifdef([gl_NONBLOCKING_IO], [
+    gl_NONBLOCKING_IO
+    if test $gl_cv_have_nonblocking != yes; then
+      REPLACE_STDIO_READ_FUNCS=1
+    fi
+  ])
+
+  dnl This ifdef is an optimization, to avoid performing a configure check whose
+  dnl result is not used. But it does not make the test of
+  dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant.
+  m4_ifdef([gl_SIGNAL_SIGPIPE], [
+    gl_SIGNAL_SIGPIPE
+    if test $gl_cv_header_signal_h_SIGPIPE != yes; then
+      REPLACE_STDIO_WRITE_FUNCS=1
+    fi
+  ])
+  dnl This ifdef is an optimization, to avoid performing a configure check whose
+  dnl result is not used. But it does not make the test of
+  dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant.
+  m4_ifdef([gl_NONBLOCKING_IO], [
+    gl_NONBLOCKING_IO
+    if test $gl_cv_have_nonblocking != yes; then
+      REPLACE_STDIO_WRITE_FUNCS=1
+    fi
+  ])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use, and which is not
+  dnl guaranteed by both C89 and C11.
+  gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
+    ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen
+    renameat snprintf tmpfile vdprintf vsnprintf])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_CHECK_DECLS_ONCE([fcloseall])
+  if test $ac_cv_have_decl_fcloseall = no; then
+    HAVE_DECL_FCLOSEALL=0
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdio_h.m4:91: -1- AC_DEFUN([gl_STDIO_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_STDIO_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdio_h.m4:103: -1- AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN_GNU])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX])
+    dnl Support Microsoft deprecated alias function names by default.
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdio_h.m4:172: -1- AC_DEFUN([gl_STDIO_H_DEFAULTS], [
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_FCLOSEALL=1;         AC_SUBST([HAVE_DECL_FCLOSEALL])
+  HAVE_DECL_FPURGE=1;            AC_SUBST([HAVE_DECL_FPURGE])
+  HAVE_DECL_FSEEKO=1;            AC_SUBST([HAVE_DECL_FSEEKO])
+  HAVE_DECL_FTELLO=1;            AC_SUBST([HAVE_DECL_FTELLO])
+  HAVE_DECL_GETDELIM=1;          AC_SUBST([HAVE_DECL_GETDELIM])
+  HAVE_DECL_GETLINE=1;           AC_SUBST([HAVE_DECL_GETLINE])
+  HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
+  HAVE_DECL_SNPRINTF=1;          AC_SUBST([HAVE_DECL_SNPRINTF])
+  HAVE_DECL_VSNPRINTF=1;         AC_SUBST([HAVE_DECL_VSNPRINTF])
+  HAVE_DPRINTF=1;                AC_SUBST([HAVE_DPRINTF])
+  HAVE_FSEEKO=1;                 AC_SUBST([HAVE_FSEEKO])
+  HAVE_FTELLO=1;                 AC_SUBST([HAVE_FTELLO])
+  HAVE_PCLOSE=1;                 AC_SUBST([HAVE_PCLOSE])
+  HAVE_POPEN=1;                  AC_SUBST([HAVE_POPEN])
+  HAVE_RENAMEAT=1;               AC_SUBST([HAVE_RENAMEAT])
+  HAVE_VASPRINTF=1;              AC_SUBST([HAVE_VASPRINTF])
+  HAVE_VDPRINTF=1;               AC_SUBST([HAVE_VDPRINTF])
+  REPLACE_DPRINTF=0;             AC_SUBST([REPLACE_DPRINTF])
+  REPLACE_FCLOSE=0;              AC_SUBST([REPLACE_FCLOSE])
+  REPLACE_FDOPEN=0;              AC_SUBST([REPLACE_FDOPEN])
+  REPLACE_FFLUSH=0;              AC_SUBST([REPLACE_FFLUSH])
+  REPLACE_FOPEN=0;               AC_SUBST([REPLACE_FOPEN])
+  REPLACE_FOPEN_FOR_FOPEN_GNU=0; AC_SUBST([REPLACE_FOPEN_FOR_FOPEN_GNU])
+  REPLACE_FPRINTF=0;             AC_SUBST([REPLACE_FPRINTF])
+  REPLACE_FPURGE=0;              AC_SUBST([REPLACE_FPURGE])
+  REPLACE_FREOPEN=0;             AC_SUBST([REPLACE_FREOPEN])
+  REPLACE_FSEEK=0;               AC_SUBST([REPLACE_FSEEK])
+  REPLACE_FSEEKO=0;              AC_SUBST([REPLACE_FSEEKO])
+  REPLACE_FTELL=0;               AC_SUBST([REPLACE_FTELL])
+  REPLACE_FTELLO=0;              AC_SUBST([REPLACE_FTELLO])
+  REPLACE_GETDELIM=0;            AC_SUBST([REPLACE_GETDELIM])
+  REPLACE_GETLINE=0;             AC_SUBST([REPLACE_GETLINE])
+  REPLACE_OBSTACK_PRINTF=0;      AC_SUBST([REPLACE_OBSTACK_PRINTF])
+  REPLACE_PERROR=0;              AC_SUBST([REPLACE_PERROR])
+  REPLACE_POPEN=0;               AC_SUBST([REPLACE_POPEN])
+  REPLACE_PRINTF=0;              AC_SUBST([REPLACE_PRINTF])
+  REPLACE_REMOVE=0;              AC_SUBST([REPLACE_REMOVE])
+  REPLACE_RENAME=0;              AC_SUBST([REPLACE_RENAME])
+  REPLACE_RENAMEAT=0;            AC_SUBST([REPLACE_RENAMEAT])
+  REPLACE_SNPRINTF=0;            AC_SUBST([REPLACE_SNPRINTF])
+  REPLACE_SPRINTF=0;             AC_SUBST([REPLACE_SPRINTF])
+  REPLACE_STDIO_READ_FUNCS=0;    AC_SUBST([REPLACE_STDIO_READ_FUNCS])
+  REPLACE_STDIO_WRITE_FUNCS=0;   AC_SUBST([REPLACE_STDIO_WRITE_FUNCS])
+  REPLACE_TMPFILE=0;             AC_SUBST([REPLACE_TMPFILE])
+  REPLACE_VASPRINTF=0;           AC_SUBST([REPLACE_VASPRINTF])
+  REPLACE_VDPRINTF=0;            AC_SUBST([REPLACE_VDPRINTF])
+  REPLACE_VFPRINTF=0;            AC_SUBST([REPLACE_VFPRINTF])
+  REPLACE_VPRINTF=0;             AC_SUBST([REPLACE_VPRINTF])
+  REPLACE_VSNPRINTF=0;           AC_SUBST([REPLACE_VSNPRINTF])
+  REPLACE_VSPRINTF=0;            AC_SUBST([REPLACE_VSPRINTF])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdlib_h.m4:7: -1- AC_DEFUN_ONCE([gl_STDLIB_H], [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  gl_NEXT_HEADERS([stdlib.h])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use, and which is not
+  dnl guaranteed by C89.
+  gl_WARN_ON_USE_PREPARE([[#include <stdlib.h>
+#if HAVE_SYS_LOADAVG_H
+/* OpenIndiana has a bug: <sys/time.h> must be included before
+   <sys/loadavg.h>.  */
+# include <sys/time.h>
+# include <sys/loadavg.h>
+#endif
+#if HAVE_RANDOM_H
+# include <random.h>
+#endif
+    ]], [_Exit aligned_alloc atoll canonicalize_file_name free
+    getloadavg getsubopt grantpt
+    initstate initstate_r mbtowc mkdtemp mkostemp mkostemps mkstemp mkstemps
+    posix_memalign posix_openpt ptsname ptsname_r qsort_r
+    random random_r reallocarray realpath rpmatch secure_getenv setenv
+    setstate setstate_r srandom srandom_r
+    strtod strtol strtold strtoll strtoul strtoull unlockpt unsetenv])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_CHECK_DECLS_ONCE([ecvt])
+  if test $ac_cv_have_decl_ecvt = no; then
+    HAVE_DECL_ECVT=0
+  fi
+  AC_CHECK_DECLS_ONCE([fcvt])
+  if test $ac_cv_have_decl_fcvt = no; then
+    HAVE_DECL_FCVT=0
+  fi
+  AC_CHECK_DECLS_ONCE([gcvt])
+  if test $ac_cv_have_decl_gcvt = no; then
+    HAVE_DECL_GCVT=0
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdlib_h.m4:53: -1- AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_STDLIB_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdlib_h.m4:65: -1- AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_GNU])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_GNU])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_GNU])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB])
+    dnl Support Microsoft deprecated alias function names by default.
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/stdlib_h.m4:122: -1- AC_DEFUN([gl_STDLIB_H_DEFAULTS], [
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
+  HAVE_ALIGNED_ALLOC=1;      AC_SUBST([HAVE_ALIGNED_ALLOC])
+  HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
+  HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
+  HAVE_DECL_ECVT=1;          AC_SUBST([HAVE_DECL_ECVT])
+  HAVE_DECL_FCVT=1;          AC_SUBST([HAVE_DECL_FCVT])
+  HAVE_DECL_GCVT=1;          AC_SUBST([HAVE_DECL_GCVT])
+  HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
+  HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
+  HAVE_GRANTPT=1;            AC_SUBST([HAVE_GRANTPT])
+  HAVE_INITSTATE=1;          AC_SUBST([HAVE_INITSTATE])
+  HAVE_DECL_INITSTATE=1;     AC_SUBST([HAVE_DECL_INITSTATE])
+  HAVE_MBTOWC=1;             AC_SUBST([HAVE_MBTOWC])
+  HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
+  HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
+  HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
+  HAVE_MKSTEMP=1;            AC_SUBST([HAVE_MKSTEMP])
+  HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
+  HAVE_POSIX_MEMALIGN=1;     AC_SUBST([HAVE_POSIX_MEMALIGN])
+  HAVE_POSIX_OPENPT=1;       AC_SUBST([HAVE_POSIX_OPENPT])
+  HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
+  HAVE_PTSNAME_R=1;          AC_SUBST([HAVE_PTSNAME_R])
+  HAVE_QSORT_R=1;            AC_SUBST([HAVE_QSORT_R])
+  HAVE_RANDOM=1;             AC_SUBST([HAVE_RANDOM])
+  HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
+  HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
+  HAVE_REALLOCARRAY=1;       AC_SUBST([HAVE_REALLOCARRAY])
+  HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
+  HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
+  HAVE_SECURE_GETENV=1;      AC_SUBST([HAVE_SECURE_GETENV])
+  HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
+  HAVE_DECL_SETENV=1;        AC_SUBST([HAVE_DECL_SETENV])
+  HAVE_SETSTATE=1;           AC_SUBST([HAVE_SETSTATE])
+  HAVE_DECL_SETSTATE=1;      AC_SUBST([HAVE_DECL_SETSTATE])
+  HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
+  HAVE_STRTOL=1;             AC_SUBST([HAVE_STRTOL])
+  HAVE_STRTOLD=1;            AC_SUBST([HAVE_STRTOLD])
+  HAVE_STRTOLL=1;            AC_SUBST([HAVE_STRTOLL])
+  HAVE_STRTOUL=1;            AC_SUBST([HAVE_STRTOUL])
+  HAVE_STRTOULL=1;           AC_SUBST([HAVE_STRTOULL])
+  HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA])
+  HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
+  HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
+  HAVE_DECL_UNSETENV=1;      AC_SUBST([HAVE_DECL_UNSETENV])
+  REPLACE_ALIGNED_ALLOC=0;   AC_SUBST([REPLACE_ALIGNED_ALLOC])
+  REPLACE_CALLOC_FOR_CALLOC_GNU=0;    AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_GNU])
+  REPLACE_CALLOC_FOR_CALLOC_POSIX=0;  AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_POSIX])
+  REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
+  REPLACE_FREE=0;            AC_SUBST([REPLACE_FREE])
+  REPLACE_INITSTATE=0;       AC_SUBST([REPLACE_INITSTATE])
+  REPLACE_MALLOC_FOR_MALLOC_GNU=0;    AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_GNU])
+  REPLACE_MALLOC_FOR_MALLOC_POSIX=0;  AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_POSIX])
+  REPLACE_MBTOWC=0;          AC_SUBST([REPLACE_MBTOWC])
+  REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
+  REPLACE_POSIX_MEMALIGN=0;  AC_SUBST([REPLACE_POSIX_MEMALIGN])
+  REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
+  REPLACE_PTSNAME_R=0;       AC_SUBST([REPLACE_PTSNAME_R])
+  REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
+  REPLACE_QSORT_R=0;         AC_SUBST([REPLACE_QSORT_R])
+  REPLACE_RANDOM=0;          AC_SUBST([REPLACE_RANDOM])
+  REPLACE_RANDOM_R=0;        AC_SUBST([REPLACE_RANDOM_R])
+  REPLACE_REALLOC_FOR_REALLOC_GNU=0;    AC_SUBST([REPLACE_REALLOC_FOR_REALLOC_GNU])
+  REPLACE_REALLOC_FOR_REALLOC_POSIX=0;  AC_SUBST([REPLACE_REALLOC_FOR_REALLOC_POSIX])
+  REPLACE_REALLOCARRAY=0;    AC_SUBST([REPLACE_REALLOCARRAY])
+  REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
+  REPLACE_SETENV=0;          AC_SUBST([REPLACE_SETENV])
+  REPLACE_SETSTATE=0;        AC_SUBST([REPLACE_SETSTATE])
+  REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
+  REPLACE_STRTOL=0;          AC_SUBST([REPLACE_STRTOL])
+  REPLACE_STRTOLD=0;         AC_SUBST([REPLACE_STRTOLD])
+  REPLACE_STRTOLL=0;         AC_SUBST([REPLACE_STRTOLL])
+  REPLACE_STRTOUL=0;         AC_SUBST([REPLACE_STRTOUL])
+  REPLACE_STRTOULL=0;        AC_SUBST([REPLACE_STRTOULL])
+  REPLACE_UNSETENV=0;        AC_SUBST([REPLACE_UNSETENV])
+  REPLACE_WCTOMB=0;          AC_SUBST([REPLACE_WCTOMB])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/strerror.m4:7: -1- AC_DEFUN([gl_FUNC_STRERROR], [
+  AC_REQUIRE([gl_STRING_H_DEFAULTS])
+  AC_REQUIRE([gl_HEADER_ERRNO_H])
+  AC_REQUIRE([gl_FUNC_STRERROR_0])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
+    AC_REQUIRE([gl_FUNC_STRERROR_R_WORKS])
+  ])
+  if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then
+    AC_CACHE_CHECK([for working strerror function],
+     [gl_cv_func_working_strerror],
+     [AC_RUN_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[#include <string.h>
+           ]],
+           [[if (!*strerror (-2)) return 1;]])],
+        [gl_cv_func_working_strerror=yes],
+        [gl_cv_func_working_strerror=no],
+        [case "$host_os" in
+                          # Guess yes on glibc systems.
+           *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
+                          # Guess yes on musl systems.
+           *-musl*)       gl_cv_func_working_strerror="guessing yes" ;;
+                          # If we don't know, obey --enable-cross-guesses.
+           *)             gl_cv_func_working_strerror="$gl_cross_guess_normal" ;;
+         esac
+        ])
+    ])
+    case "$gl_cv_func_working_strerror" in
+      *yes) ;;
+      *)
+        dnl The system's strerror() fails to return a string for out-of-range
+        dnl integers. Replace it.
+        REPLACE_STRERROR=1
+        ;;
+    esac
+    m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
+      dnl If the system's strerror_r or __xpg_strerror_r clobbers strerror's
+      dnl buffer, we must replace strerror.
+      case "$gl_cv_func_strerror_r_works" in
+        *no) REPLACE_STRERROR=1 ;;
+      esac
+    ])
+  else
+    dnl The system's strerror() cannot know about the new errno values we add
+    dnl to <errno.h>, or any fix for strerror(0). Replace it.
+    REPLACE_STRERROR=1
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/strerror.m4:60: -1- AC_DEFUN([gl_FUNC_STRERROR_0], [
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  REPLACE_STRERROR_0=0
+  AC_CACHE_CHECK([whether strerror(0) succeeds],
+   [gl_cv_func_strerror_0_works],
+   [AC_RUN_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[#include <string.h>
+           #include <errno.h>
+         ]],
+         [[int result = 0;
+           char *str;
+           errno = 0;
+           str = strerror (0);
+           if (!*str) result |= 1;
+           if (errno) result |= 2;
+           if (strstr (str, "nknown") || strstr (str, "ndefined"))
+             result |= 4;
+           return result;]])],
+      [gl_cv_func_strerror_0_works=yes],
+      [gl_cv_func_strerror_0_works=no],
+      [case "$host_os" in
+                        # Guess yes on glibc systems.
+         *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
+                        # Guess yes on musl systems.
+         *-musl*)       gl_cv_func_strerror_0_works="guessing yes" ;;
+                        # Guess yes on native Windows.
+         mingw*)        gl_cv_func_strerror_0_works="guessing yes" ;;
+                        # If we don't know, obey --enable-cross-guesses.
+         *)             gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
+       esac
+      ])
+  ])
+  case "$gl_cv_func_strerror_0_works" in
+    *yes) ;;
+    *)
+      REPLACE_STRERROR_0=1
+      AC_DEFINE([REPLACE_STRERROR_0], [1], [Define to 1 if strerror(0)
+        does not return a message implying success.])
+      ;;
+  esac
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/string_h.m4:12: -1- AC_DEFUN_ONCE([gl_STRING_H], [
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE([gl_STRING_H_DEFAULTS])
+  gl_NEXT_HEADERS([string.h])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use, and which is not
+  dnl guaranteed by C89.
+  gl_WARN_ON_USE_PREPARE([[#include <string.h>
+    ]],
+    [ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul
+     strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r
+     strerror_r strerrorname_np sigabbrev_np sigdescr_np strsignal strverscmp])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/string_h.m4:35: -1- AC_DEFUN([gl_STRING_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_STRING_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/string_h.m4:47: -1- AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP])
+    dnl Support Microsoft deprecated alias function names by default.
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS])
+  dnl Make sure the shell variable for GNULIB_FREE_POSIX is initialized.
+  gl_STDLIB_H_REQUIRE_DEFAULTS
+  AC_REQUIRE([gl_STRING_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/string_h.m4:101: -1- AC_DEFUN([gl_STRING_H_DEFAULTS], [
+  HAVE_MBSLEN=0;             AC_SUBST([HAVE_MBSLEN])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_EXPLICIT_BZERO=1;        AC_SUBST([HAVE_EXPLICIT_BZERO])
+  HAVE_FFSL=1;                  AC_SUBST([HAVE_FFSL])
+  HAVE_FFSLL=1;                 AC_SUBST([HAVE_FFSLL])
+  HAVE_DECL_MEMMEM=1;           AC_SUBST([HAVE_DECL_MEMMEM])
+  HAVE_MEMPCPY=1;               AC_SUBST([HAVE_MEMPCPY])
+  HAVE_DECL_MEMRCHR=1;          AC_SUBST([HAVE_DECL_MEMRCHR])
+  HAVE_RAWMEMCHR=1;             AC_SUBST([HAVE_RAWMEMCHR])
+  HAVE_STPCPY=1;                AC_SUBST([HAVE_STPCPY])
+  HAVE_STPNCPY=1;               AC_SUBST([HAVE_STPNCPY])
+  HAVE_STRCHRNUL=1;             AC_SUBST([HAVE_STRCHRNUL])
+  HAVE_DECL_STRDUP=1;           AC_SUBST([HAVE_DECL_STRDUP])
+  HAVE_DECL_STRNDUP=1;          AC_SUBST([HAVE_DECL_STRNDUP])
+  HAVE_DECL_STRNLEN=1;          AC_SUBST([HAVE_DECL_STRNLEN])
+  HAVE_STRPBRK=1;               AC_SUBST([HAVE_STRPBRK])
+  HAVE_STRSEP=1;                AC_SUBST([HAVE_STRSEP])
+  HAVE_STRCASESTR=1;            AC_SUBST([HAVE_STRCASESTR])
+  HAVE_DECL_STRTOK_R=1;         AC_SUBST([HAVE_DECL_STRTOK_R])
+  HAVE_DECL_STRERROR_R=1;       AC_SUBST([HAVE_DECL_STRERROR_R])
+  HAVE_STRERRORNAME_NP=1;       AC_SUBST([HAVE_STRERRORNAME_NP])
+  HAVE_SIGABBREV_NP=1;          AC_SUBST([HAVE_SIGABBREV_NP])
+  HAVE_SIGDESCR_NP=1;           AC_SUBST([HAVE_SIGDESCR_NP])
+  HAVE_DECL_STRSIGNAL=1;        AC_SUBST([HAVE_DECL_STRSIGNAL])
+  HAVE_STRVERSCMP=1;            AC_SUBST([HAVE_STRVERSCMP])
+  REPLACE_FFSLL=0;              AC_SUBST([REPLACE_FFSLL])
+  REPLACE_MEMCHR=0;             AC_SUBST([REPLACE_MEMCHR])
+  REPLACE_MEMMEM=0;             AC_SUBST([REPLACE_MEMMEM])
+  REPLACE_STPNCPY=0;            AC_SUBST([REPLACE_STPNCPY])
+  REPLACE_STRCHRNUL=0;          AC_SUBST([REPLACE_STRCHRNUL])
+  REPLACE_STRDUP=0;             AC_SUBST([REPLACE_STRDUP])
+  REPLACE_STRNCAT=0;            AC_SUBST([REPLACE_STRNCAT])
+  REPLACE_STRNDUP=0;            AC_SUBST([REPLACE_STRNDUP])
+  REPLACE_STRNLEN=0;            AC_SUBST([REPLACE_STRNLEN])
+  REPLACE_STRSTR=0;             AC_SUBST([REPLACE_STRSTR])
+  REPLACE_STRCASESTR=0;         AC_SUBST([REPLACE_STRCASESTR])
+  REPLACE_STRTOK_R=0;           AC_SUBST([REPLACE_STRTOK_R])
+  REPLACE_STRERROR=0;           AC_SUBST([REPLACE_STRERROR])
+  REPLACE_STRERROR_R=0;         AC_SUBST([REPLACE_STRERROR_R])
+  REPLACE_STRERRORNAME_NP=0;    AC_SUBST([REPLACE_STRERRORNAME_NP])
+  REPLACE_STRSIGNAL=0;          AC_SUBST([REPLACE_STRSIGNAL])
+  UNDEFINE_STRTOK_R=0;          AC_SUBST([UNDEFINE_STRTOK_R])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:9: -1- AC_DEFUN_ONCE([gl_SYS_SOCKET_H], [
+  AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have
+  dnl old-style declarations (with return type 'int' instead of 'ssize_t')
+  dnl unless _POSIX_PII_SOCKET is defined.
+  case "$host_os" in
+    osf*)
+      AC_DEFINE([_POSIX_PII_SOCKET], [1],
+        [Define to 1 in order to get the POSIX compatible declarations
+         of socket functions.])
+      ;;
+  esac
+
+  GL_GENERATE_SYS_SOCKET_H=false
+  AC_CACHE_CHECK([whether <sys/socket.h> is self-contained],
+    [gl_cv_header_sys_socket_h_selfcontained],
+    [
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[]])],
+        [gl_cv_header_sys_socket_h_selfcontained=yes],
+        [gl_cv_header_sys_socket_h_selfcontained=no])
+    ])
+  if test $gl_cv_header_sys_socket_h_selfcontained = yes; then
+    dnl If the shutdown function exists, <sys/socket.h> should define
+    dnl SHUT_RD, SHUT_WR, SHUT_RDWR.
+    AC_CHECK_FUNCS([shutdown])
+    if test $ac_cv_func_shutdown = yes; then
+      AC_CACHE_CHECK([whether <sys/socket.h> defines the SHUT_* macros],
+        [gl_cv_header_sys_socket_h_shut],
+        [
+          AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM([[#include <sys/socket.h>]],
+               [[int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR };]])],
+            [gl_cv_header_sys_socket_h_shut=yes],
+            [gl_cv_header_sys_socket_h_shut=no])
+        ])
+      if test $gl_cv_header_sys_socket_h_shut = no; then
+        GL_GENERATE_SYS_SOCKET_H=true
+      fi
+    fi
+  fi
+  # We need to check for ws2tcpip.h now.
+  gl_PREREQ_SYS_H_SOCKET
+  AC_CHECK_TYPES([struct sockaddr_storage, sa_family_t],,,[
+  /* sys/types.h is not needed according to POSIX, but the
+     sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+])
+  if test $ac_cv_type_struct_sockaddr_storage = no; then
+    HAVE_STRUCT_SOCKADDR_STORAGE=0
+  fi
+  if test $ac_cv_type_sa_family_t = no; then
+    HAVE_SA_FAMILY_T=0
+  fi
+  if test $ac_cv_type_struct_sockaddr_storage != no; then
+    AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],
+      [],
+      [HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0],
+      [#include <sys/types.h>
+       #ifdef HAVE_SYS_SOCKET_H
+       #include <sys/socket.h>
+       #endif
+       #ifdef HAVE_WS2TCPIP_H
+       #include <ws2tcpip.h>
+       #endif
+      ])
+  fi
+  if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \
+     || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then
+    GL_GENERATE_SYS_SOCKET_H=true
+  fi
+  gl_PREREQ_SYS_H_WINSOCK2
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+/* Some systems require prerequisite headers.  */
+#include <sys/types.h>
+#include <sys/socket.h>
+    ]], [socket connect accept bind getpeername getsockname getsockopt
+    listen recv send recvfrom sendto setsockopt shutdown accept4])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:103: -1- AC_DEFUN([gl_PREREQ_SYS_H_SOCKET], [
+  dnl Check prerequisites of the <sys/socket.h> replacement.
+  AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
+  gl_CHECK_NEXT_HEADERS([sys/socket.h])
+  if test $ac_cv_header_sys_socket_h = yes; then
+    HAVE_SYS_SOCKET_H=1
+  else
+    HAVE_SYS_SOCKET_H=0
+  fi
+  AC_SUBST([HAVE_SYS_SOCKET_H])
+  gl_PREREQ_SYS_H_WS2TCPIP
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:120: -1- AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2], [
+  m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])])
+  m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])])
+  AC_CHECK_HEADERS_ONCE([sys/socket.h])
+  if test $ac_cv_header_sys_socket_h != yes; then
+    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+    dnl the check for those headers unconditional; yet cygwin reports
+    dnl that the headers are present but cannot be compiled (since on
+    dnl cygwin, all socket information should come from sys/socket.h).
+    AC_CHECK_HEADERS([winsock2.h])
+  fi
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    HAVE_WINSOCK2_H=1
+    UNISTD_H_HAVE_WINSOCK2_H=1
+    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
+  else
+    HAVE_WINSOCK2_H=0
+  fi
+  AC_SUBST([HAVE_WINSOCK2_H])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:145: -1- AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP], [
+  AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
+  if test $ac_cv_header_sys_socket_h = yes; then
+    HAVE_WS2TCPIP_H=0
+  else
+    if test $ac_cv_header_ws2tcpip_h = yes; then
+      HAVE_WS2TCPIP_H=1
+    else
+      HAVE_WS2TCPIP_H=0
+    fi
+  fi
+  AC_SUBST([HAVE_WS2TCPIP_H])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:164: -1- AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_SYS_SOCKET_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:176: -1- AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT4])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:199: -1- AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], [
+  HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE])
+  HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1;
+                        AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY])
+  HAVE_SA_FAMILY_T=1;   AC_SUBST([HAVE_SA_FAMILY_T])
+  HAVE_ACCEPT4=1;       AC_SUBST([HAVE_ACCEPT4])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4:10: -1- AC_DEFUN_ONCE([gl_SYS_STAT_H], [
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+
+  dnl Check for broken stat macros.
+  AC_REQUIRE([AC_HEADER_STAT])
+
+  gl_CHECK_NEXT_HEADERS([sys/stat.h])
+
+  dnl Ensure the type mode_t gets defined.
+  AC_REQUIRE([AC_TYPE_MODE_T])
+
+  dnl Whether to enable precise timestamps in 'struct stat'.
+  m4_ifdef([gl_WINDOWS_STAT_TIMESPEC], [
+    AC_REQUIRE([gl_WINDOWS_STAT_TIMESPEC])
+  ], [
+    WINDOWS_STAT_TIMESPEC=0
+  ])
+  AC_SUBST([WINDOWS_STAT_TIMESPEC])
+
+  dnl Whether to ensure that struct stat.st_size is 64-bit wide.
+  m4_ifdef([gl_LARGEFILE], [
+    AC_REQUIRE([gl_LARGEFILE])
+  ], [
+    WINDOWS_64_BIT_ST_SIZE=0
+  ])
+  AC_SUBST([WINDOWS_64_BIT_ST_SIZE])
+
+  dnl Define types that are supposed to be defined in <sys/types.h> or
+  dnl <sys/stat.h>.
+  AC_CHECK_TYPE([nlink_t], [],
+    [AC_DEFINE([nlink_t], [int],
+       [Define to the type of st_nlink in struct stat, or a supertype.])],
+    [#include <sys/types.h>
+     #include <sys/stat.h>])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[#include <sys/stat.h>
+    ]], [fchmodat fstat fstatat futimens getumask lchmod lstat
+    mkdirat mkfifo mkfifoat mknod mknodat stat utimensat])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4:59: -1- AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_SYS_STAT_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4:71: -1- AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT])
+    dnl Support Microsoft deprecated alias function names by default.
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4:100: -1- AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], [
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_FCHMODAT=1;      AC_SUBST([HAVE_FCHMODAT])
+  HAVE_FSTATAT=1;       AC_SUBST([HAVE_FSTATAT])
+  HAVE_FUTIMENS=1;      AC_SUBST([HAVE_FUTIMENS])
+  HAVE_GETUMASK=1;      AC_SUBST([HAVE_GETUMASK])
+  HAVE_LCHMOD=1;        AC_SUBST([HAVE_LCHMOD])
+  HAVE_LSTAT=1;         AC_SUBST([HAVE_LSTAT])
+  HAVE_MKDIRAT=1;       AC_SUBST([HAVE_MKDIRAT])
+  HAVE_MKFIFO=1;        AC_SUBST([HAVE_MKFIFO])
+  HAVE_MKFIFOAT=1;      AC_SUBST([HAVE_MKFIFOAT])
+  HAVE_MKNOD=1;         AC_SUBST([HAVE_MKNOD])
+  HAVE_MKNODAT=1;       AC_SUBST([HAVE_MKNODAT])
+  HAVE_UTIMENSAT=1;     AC_SUBST([HAVE_UTIMENSAT])
+  REPLACE_FCHMODAT=0;   AC_SUBST([REPLACE_FCHMODAT])
+  REPLACE_FSTAT=0;      AC_SUBST([REPLACE_FSTAT])
+  REPLACE_FSTATAT=0;    AC_SUBST([REPLACE_FSTATAT])
+  REPLACE_FUTIMENS=0;   AC_SUBST([REPLACE_FUTIMENS])
+  REPLACE_LSTAT=0;      AC_SUBST([REPLACE_LSTAT])
+  REPLACE_MKDIR=0;      AC_SUBST([REPLACE_MKDIR])
+  REPLACE_MKFIFO=0;     AC_SUBST([REPLACE_MKFIFO])
+  REPLACE_MKFIFOAT=0;   AC_SUBST([REPLACE_MKFIFOAT])
+  REPLACE_MKNOD=0;      AC_SUBST([REPLACE_MKNOD])
+  REPLACE_MKNODAT=0;    AC_SUBST([REPLACE_MKNODAT])
+  REPLACE_STAT=0;       AC_SUBST([REPLACE_STAT])
+  REPLACE_UTIMENSAT=0;  AC_SUBST([REPLACE_UTIMENSAT])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_types_h.m4:7: -1- AC_DEFUN_ONCE([gl_SYS_TYPES_H], [
+  AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
+
+  dnl Use sane struct stat types in OpenVMS 8.2 and later.
+  AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.])
+
+  gl_NEXT_HEADERS([sys/types.h])
+
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
+  dnl Ensure the type mode_t gets defined.
+  AC_REQUIRE([AC_TYPE_MODE_T])
+
+  dnl Whether to override the 'off_t' type.
+  AC_REQUIRE([gl_TYPE_OFF_T])
+
+  dnl Whether to override the 'dev_t' and 'ino_t' types.
+  m4_ifdef([gl_WINDOWS_STAT_INODES], [
+    AC_REQUIRE([gl_WINDOWS_STAT_INODES])
+  ], [
+    WINDOWS_STAT_INODES=0
+  ])
+  AC_SUBST([WINDOWS_STAT_INODES])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_types_h.m4:37: -1- AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/sys_types_h.m4:45: -1- AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], [
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/time_h.m4:13: -1- AC_DEFUN_ONCE([gl_TIME_H], [
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE([gl_TIME_H_DEFAULTS])
+
+  gl_NEXT_HEADERS([time.h])
+  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_CACHE_CHECK([for TIME_UTC in <time.h>],
+    [gl_cv_time_h_has_TIME_UTC],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <time.h>
+          ]],
+          [[static int x = TIME_UTC; x++;]])],
+       [gl_cv_time_h_has_TIME_UTC=yes],
+       [gl_cv_time_h_has_TIME_UTC=no])])
+  if test $gl_cv_time_h_has_TIME_UTC = yes; then
+    TIME_H_DEFINES_TIME_UTC=1
+  else
+    TIME_H_DEFINES_TIME_UTC=0
+  fi
+  AC_SUBST([TIME_H_DEFINES_TIME_UTC])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/time_h.m4:44: -1- AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], [
+  AC_CHECK_HEADERS_ONCE([sys/time.h])
+  AC_CACHE_CHECK([for struct timespec in <time.h>],
+    [gl_cv_sys_struct_timespec_in_time_h],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <time.h>
+          ]],
+          [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+       [gl_cv_sys_struct_timespec_in_time_h=yes],
+       [gl_cv_sys_struct_timespec_in_time_h=no])])
+
+  TIME_H_DEFINES_STRUCT_TIMESPEC=0
+  SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
+  PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
+  UNISTD_H_DEFINES_STRUCT_TIMESPEC=0
+  if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
+    TIME_H_DEFINES_STRUCT_TIMESPEC=1
+  else
+    AC_CACHE_CHECK([for struct timespec in <sys/time.h>],
+      [gl_cv_sys_struct_timespec_in_sys_time_h],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <sys/time.h>
+            ]],
+            [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+         [gl_cv_sys_struct_timespec_in_sys_time_h=yes],
+         [gl_cv_sys_struct_timespec_in_sys_time_h=no])])
+    if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
+      SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
+    else
+      AC_CACHE_CHECK([for struct timespec in <pthread.h>],
+        [gl_cv_sys_struct_timespec_in_pthread_h],
+        [AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <pthread.h>
+              ]],
+              [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+           [gl_cv_sys_struct_timespec_in_pthread_h=yes],
+           [gl_cv_sys_struct_timespec_in_pthread_h=no])])
+      if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
+        PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
+      else
+        AC_CACHE_CHECK([for struct timespec in <unistd.h>],
+          [gl_cv_sys_struct_timespec_in_unistd_h],
+          [AC_COMPILE_IFELSE(
+             [AC_LANG_PROGRAM(
+                [[#include <unistd.h>
+                ]],
+                [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+             [gl_cv_sys_struct_timespec_in_unistd_h=yes],
+             [gl_cv_sys_struct_timespec_in_unistd_h=no])])
+        if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
+          UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC])
+  AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC])
+  AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC])
+  AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/time_h.m4:113: -1- AC_DEFUN([gl_TIME_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_TIME_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/time_h.m4:125: -1- AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GETRES])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET])
+    dnl Support Microsoft deprecated alias function names by default.
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_TIME_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/time_h.m4:147: -1- AC_DEFUN([gl_TIME_H_DEFAULTS], [
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_LOCALTIME_R=1;               AC_SUBST([HAVE_DECL_LOCALTIME_R])
+  HAVE_NANOSLEEP=1;                      AC_SUBST([HAVE_NANOSLEEP])
+  HAVE_STRPTIME=1;                       AC_SUBST([HAVE_STRPTIME])
+  HAVE_TIMEGM=1;                         AC_SUBST([HAVE_TIMEGM])
+  HAVE_TIMESPEC_GET=1;                   AC_SUBST([HAVE_TIMESPEC_GET])
+  HAVE_TIMESPEC_GETRES=1;                AC_SUBST([HAVE_TIMESPEC_GETRES])
+  dnl Even GNU libc does not have timezone_t yet.
+  HAVE_TIMEZONE_T=0;                     AC_SUBST([HAVE_TIMEZONE_T])
+  dnl If another module says to replace or to not replace, do that.
+  dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
+  dnl this lets maintainers check for portability.
+  REPLACE_CTIME=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_CTIME])
+  REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;  AC_SUBST([REPLACE_LOCALTIME_R])
+  REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_MKTIME])
+  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST([REPLACE_NANOSLEEP])
+  REPLACE_STRFTIME=GNULIB_PORTCHECK;     AC_SUBST([REPLACE_STRFTIME])
+  REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_TIMEGM])
+  REPLACE_TZSET=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_TZSET])
+
+  dnl Hack so that the time module doesn't depend on the sys_time module.
+  dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
+  : ${GNULIB_GETTIMEOFDAY=0};            AC_SUBST([GNULIB_GETTIMEOFDAY])
+  dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
+  dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
+  dnl is no longer a big deal.
+  REPLACE_GMTIME=0;                      AC_SUBST([REPLACE_GMTIME])
+  REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/unistd_h.m4:9: -1- AC_DEFUN_ONCE([gl_UNISTD_H], [
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+
+  gl_CHECK_NEXT_HEADERS([unistd.h])
+  if test $ac_cv_header_unistd_h = yes; then
+    HAVE_UNISTD_H=1
+  else
+    HAVE_UNISTD_H=0
+  fi
+  AC_SUBST([HAVE_UNISTD_H])
+
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
+  dnl Determine WINDOWS_64_BIT_OFF_T.
+  AC_REQUIRE([gl_TYPE_OFF_T])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+/* Some systems declare various items in the wrong headers.  */
+#if !(defined __GLIBC__ && !defined __UCLIBC__)
+# include <fcntl.h>
+# include <stdio.h>
+# include <stdlib.h>
+# if defined _WIN32 && ! defined __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+    ]], [access chdir chown copy_file_range dup dup2 dup3 environ euidaccess
+    execl execle execlp execv execve execvp execvpe
+    faccessat fchdir
+    fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize
+    getentropy getgroups gethostname getlogin getlogin_r getpagesize getpass
+    getusershell setusershell endusershell
+    group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
+    readlink readlinkat rmdir sethostname sleep symlink symlinkat
+    truncate ttyname_r unlink unlinkat usleep])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_CHECK_DECLS_ONCE([execvpe])
+  if test $ac_cv_have_decl_execvpe = no; then
+    HAVE_DECL_EXECVPE=0
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/unistd_h.m4:66: -1- AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_UNISTD_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/unistd_h.m4:78: -1- AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS_GNU])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE])
+    dnl Support Microsoft deprecated alias function names by default.
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/unistd_h.m4:171: -1- AC_DEFUN([gl_UNISTD_H_DEFAULTS], [
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_CHOWN=1;                      AC_SUBST([HAVE_CHOWN])
+  HAVE_COPY_FILE_RANGE=1;            AC_SUBST([HAVE_COPY_FILE_RANGE])
+  HAVE_DUP3=1;                       AC_SUBST([HAVE_DUP3])
+  HAVE_EUIDACCESS=1;                 AC_SUBST([HAVE_EUIDACCESS])
+  HAVE_EXECVPE=1;                    AC_SUBST([HAVE_EXECVPE])
+  HAVE_FACCESSAT=1;                  AC_SUBST([HAVE_FACCESSAT])
+  HAVE_FCHDIR=1;                     AC_SUBST([HAVE_FCHDIR])
+  HAVE_FCHOWNAT=1;                   AC_SUBST([HAVE_FCHOWNAT])
+  HAVE_FDATASYNC=1;                  AC_SUBST([HAVE_FDATASYNC])
+  HAVE_FSYNC=1;                      AC_SUBST([HAVE_FSYNC])
+  HAVE_FTRUNCATE=1;                  AC_SUBST([HAVE_FTRUNCATE])
+  HAVE_GETDTABLESIZE=1;              AC_SUBST([HAVE_GETDTABLESIZE])
+  HAVE_GETENTROPY=1;                 AC_SUBST([HAVE_GETENTROPY])
+  HAVE_GETGROUPS=1;                  AC_SUBST([HAVE_GETGROUPS])
+  HAVE_GETHOSTNAME=1;                AC_SUBST([HAVE_GETHOSTNAME])
+  HAVE_GETLOGIN=1;                   AC_SUBST([HAVE_GETLOGIN])
+  HAVE_GETPAGESIZE=1;                AC_SUBST([HAVE_GETPAGESIZE])
+  HAVE_GETPASS=1;                    AC_SUBST([HAVE_GETPASS])
+  HAVE_GROUP_MEMBER=1;               AC_SUBST([HAVE_GROUP_MEMBER])
+  HAVE_LCHOWN=1;                     AC_SUBST([HAVE_LCHOWN])
+  HAVE_LINK=1;                       AC_SUBST([HAVE_LINK])
+  HAVE_LINKAT=1;                     AC_SUBST([HAVE_LINKAT])
+  HAVE_PIPE=1;                       AC_SUBST([HAVE_PIPE])
+  HAVE_PIPE2=1;                      AC_SUBST([HAVE_PIPE2])
+  HAVE_PREAD=1;                      AC_SUBST([HAVE_PREAD])
+  HAVE_PWRITE=1;                     AC_SUBST([HAVE_PWRITE])
+  HAVE_READLINK=1;                   AC_SUBST([HAVE_READLINK])
+  HAVE_READLINKAT=1;                 AC_SUBST([HAVE_READLINKAT])
+  HAVE_SETHOSTNAME=1;                AC_SUBST([HAVE_SETHOSTNAME])
+  HAVE_SLEEP=1;                      AC_SUBST([HAVE_SLEEP])
+  HAVE_SYMLINK=1;                    AC_SUBST([HAVE_SYMLINK])
+  HAVE_SYMLINKAT=1;                  AC_SUBST([HAVE_SYMLINKAT])
+  HAVE_UNLINKAT=1;                   AC_SUBST([HAVE_UNLINKAT])
+  HAVE_USLEEP=1;                     AC_SUBST([HAVE_USLEEP])
+  HAVE_DECL_ENVIRON=1;               AC_SUBST([HAVE_DECL_ENVIRON])
+  HAVE_DECL_EXECVPE=1;               AC_SUBST([HAVE_DECL_EXECVPE])
+  HAVE_DECL_FCHDIR=1;                AC_SUBST([HAVE_DECL_FCHDIR])
+  HAVE_DECL_FDATASYNC=1;             AC_SUBST([HAVE_DECL_FDATASYNC])
+  HAVE_DECL_GETDOMAINNAME=1;         AC_SUBST([HAVE_DECL_GETDOMAINNAME])
+  HAVE_DECL_GETLOGIN=1;              AC_SUBST([HAVE_DECL_GETLOGIN])
+  HAVE_DECL_GETLOGIN_R=1;            AC_SUBST([HAVE_DECL_GETLOGIN_R])
+  HAVE_DECL_GETPAGESIZE=1;           AC_SUBST([HAVE_DECL_GETPAGESIZE])
+  HAVE_DECL_GETUSERSHELL=1;          AC_SUBST([HAVE_DECL_GETUSERSHELL])
+  HAVE_DECL_SETHOSTNAME=1;           AC_SUBST([HAVE_DECL_SETHOSTNAME])
+  HAVE_DECL_TRUNCATE=1;              AC_SUBST([HAVE_DECL_TRUNCATE])
+  HAVE_DECL_TTYNAME_R=1;             AC_SUBST([HAVE_DECL_TTYNAME_R])
+  HAVE_OS_H=0;                       AC_SUBST([HAVE_OS_H])
+  HAVE_SYS_PARAM_H=0;                AC_SUBST([HAVE_SYS_PARAM_H])
+  REPLACE_ACCESS=0;                  AC_SUBST([REPLACE_ACCESS])
+  REPLACE_CHOWN=0;                   AC_SUBST([REPLACE_CHOWN])
+  REPLACE_CLOSE=0;                   AC_SUBST([REPLACE_CLOSE])
+  REPLACE_COPY_FILE_RANGE=0;         AC_SUBST([REPLACE_COPY_FILE_RANGE])
+  REPLACE_DUP=0;                     AC_SUBST([REPLACE_DUP])
+  REPLACE_DUP2=0;                    AC_SUBST([REPLACE_DUP2])
+  REPLACE_EXECL=0;                   AC_SUBST([REPLACE_EXECL])
+  REPLACE_EXECLE=0;                  AC_SUBST([REPLACE_EXECLE])
+  REPLACE_EXECLP=0;                  AC_SUBST([REPLACE_EXECLP])
+  REPLACE_EXECV=0;                   AC_SUBST([REPLACE_EXECV])
+  REPLACE_EXECVE=0;                  AC_SUBST([REPLACE_EXECVE])
+  REPLACE_EXECVP=0;                  AC_SUBST([REPLACE_EXECVP])
+  REPLACE_EXECVPE=0;                 AC_SUBST([REPLACE_EXECVPE])
+  REPLACE_FACCESSAT=0;               AC_SUBST([REPLACE_FACCESSAT])
+  REPLACE_FCHOWNAT=0;                AC_SUBST([REPLACE_FCHOWNAT])
+  REPLACE_FTRUNCATE=0;               AC_SUBST([REPLACE_FTRUNCATE])
+  REPLACE_GETCWD=0;                  AC_SUBST([REPLACE_GETCWD])
+  REPLACE_GETDOMAINNAME=0;           AC_SUBST([REPLACE_GETDOMAINNAME])
+  REPLACE_GETDTABLESIZE=0;           AC_SUBST([REPLACE_GETDTABLESIZE])
+  REPLACE_GETLOGIN_R=0;              AC_SUBST([REPLACE_GETLOGIN_R])
+  REPLACE_GETGROUPS=0;               AC_SUBST([REPLACE_GETGROUPS])
+  REPLACE_GETPAGESIZE=0;             AC_SUBST([REPLACE_GETPAGESIZE])
+  REPLACE_GETPASS=0;                 AC_SUBST([REPLACE_GETPASS])
+  REPLACE_GETPASS_FOR_GETPASS_GNU=0; AC_SUBST([REPLACE_GETPASS_FOR_GETPASS_GNU])
+  REPLACE_ISATTY=0;                  AC_SUBST([REPLACE_ISATTY])
+  REPLACE_LCHOWN=0;                  AC_SUBST([REPLACE_LCHOWN])
+  REPLACE_LINK=0;                    AC_SUBST([REPLACE_LINK])
+  REPLACE_LINKAT=0;                  AC_SUBST([REPLACE_LINKAT])
+  REPLACE_LSEEK=0;                   AC_SUBST([REPLACE_LSEEK])
+  REPLACE_PREAD=0;                   AC_SUBST([REPLACE_PREAD])
+  REPLACE_PWRITE=0;                  AC_SUBST([REPLACE_PWRITE])
+  REPLACE_READ=0;                    AC_SUBST([REPLACE_READ])
+  REPLACE_READLINK=0;                AC_SUBST([REPLACE_READLINK])
+  REPLACE_READLINKAT=0;              AC_SUBST([REPLACE_READLINKAT])
+  REPLACE_RMDIR=0;                   AC_SUBST([REPLACE_RMDIR])
+  REPLACE_SLEEP=0;                   AC_SUBST([REPLACE_SLEEP])
+  REPLACE_SYMLINK=0;                 AC_SUBST([REPLACE_SYMLINK])
+  REPLACE_SYMLINKAT=0;               AC_SUBST([REPLACE_SYMLINKAT])
+  REPLACE_TRUNCATE=0;                AC_SUBST([REPLACE_TRUNCATE])
+  REPLACE_TTYNAME_R=0;               AC_SUBST([REPLACE_TTYNAME_R])
+  REPLACE_UNLINK=0;                  AC_SUBST([REPLACE_UNLINK])
+  REPLACE_UNLINKAT=0;                AC_SUBST([REPLACE_UNLINKAT])
+  REPLACE_USLEEP=0;                  AC_SUBST([REPLACE_USLEEP])
+  REPLACE_WRITE=0;                   AC_SUBST([REPLACE_WRITE])
+  UNISTD_H_HAVE_SYS_RANDOM_H=0;      AC_SUBST([UNISTD_H_HAVE_SYS_RANDOM_H])
+  UNISTD_H_HAVE_WINSOCK2_H=0;        AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H])
+  UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0;
+                           AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/unlocked-io.m4:17: -1- AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO], [
+  dnl Persuade glibc and Solaris <stdio.h> to declare
+  dnl fgets_unlocked(), fputs_unlocked() etc.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
+  AC_CHECK_DECLS_ONCE([clearerr_unlocked])
+  AC_CHECK_DECLS_ONCE([feof_unlocked])
+  AC_CHECK_DECLS_ONCE([ferror_unlocked])
+  AC_CHECK_DECLS_ONCE([fflush_unlocked])
+  AC_CHECK_DECLS_ONCE([fgets_unlocked])
+  AC_CHECK_DECLS_ONCE([fputc_unlocked])
+  AC_CHECK_DECLS_ONCE([fputs_unlocked])
+  AC_CHECK_DECLS_ONCE([fread_unlocked])
+  AC_CHECK_DECLS_ONCE([fwrite_unlocked])
+  AC_CHECK_DECLS_ONCE([getc_unlocked])
+  AC_CHECK_DECLS_ONCE([getchar_unlocked])
+  AC_CHECK_DECLS_ONCE([putc_unlocked])
+  AC_CHECK_DECLS_ONCE([putchar_unlocked])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/visibility.m4:23: -1- AC_DEFUN([gl_VISIBILITY], [
+  AC_REQUIRE([AC_PROG_CC])
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+    dnl First, check whether -Werror can be added to the command line, or
+    dnl whether it leads to an error because of some other option that the
+    dnl user has put into $CC $CFLAGS $CPPFLAGS.
+    AC_CACHE_CHECK([whether the -Werror option is usable],
+      [gl_cv_cc_vis_werror],
+      [gl_save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -Werror"
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[]], [[]])],
+         [gl_cv_cc_vis_werror=yes],
+         [gl_cv_cc_vis_werror=no])
+       CFLAGS="$gl_save_CFLAGS"
+      ])
+    dnl Now check whether visibility declarations are supported.
+    AC_CACHE_CHECK([for simple visibility declarations],
+      [gl_cv_cc_visibility],
+      [gl_save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fvisibility=hidden"
+       dnl We use the option -Werror and a function dummyfunc, because on some
+       dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
+       dnl "visibility attribute not supported in this configuration; ignored"
+       dnl at the first function definition in every compilation unit, and we
+       dnl don't want to use the option in this case.
+       if test $gl_cv_cc_vis_werror = yes; then
+         CFLAGS="$CFLAGS -Werror"
+       fi
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+              extern __attribute__((__visibility__("default"))) int exportedvar;
+              extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+              extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+              void dummyfunc (void);
+              int hiddenvar;
+              int exportedvar;
+              int hiddenfunc (void) { return 51; }
+              int exportedfunc (void) { return 1225736919; }
+              void dummyfunc (void) {}
+            ]],
+            [[]])],
+         [gl_cv_cc_visibility=yes],
+         [gl_cv_cc_visibility=no])
+       CFLAGS="$gl_save_CFLAGS"
+      ])
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+  AC_SUBST([CFLAG_VISIBILITY])
+  AC_SUBST([HAVE_VISIBILITY])
+  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/warn-on-use.m4:26: -1- AC_DEFUN([gl_WARN_ON_USE_PREPARE], [
+  m4_ifdef([gl_POSIXCHECK],
+    [m4_foreach_w([gl_decl], [$2],
+       [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
+         [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
+          undefining macros.])])dnl
+     for gl_func in m4_flatten([$2]); do
+       AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
+       AC_CACHE_CHECK([whether $gl_func is declared without a macro],
+         [gl_Symbol],
+         [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],
+[[#undef $gl_func
+  (void) $gl_func;]])],
+           [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])])
+       AS_VAR_IF([gl_Symbol], [yes],
+         [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
+          dnl shortcut - if the raw declaration exists, then set a cache
+          dnl variable to allow skipping any later AC_CHECK_DECL efforts
+          eval ac_cv_have_decl_$gl_func=yes])
+       AS_VAR_POPDEF([gl_Symbol])dnl
+     done
+    ])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wchar_h.m4:12: -1- AC_DEFUN_ONCE([gl_WCHAR_H], [
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_REQUIRE([gl_WCHAR_H_INLINE_OK])
+  dnl Prepare for creating substitute <wchar.h>.
+  dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
+  dnl character support).
+  dnl <wchar.h> is always overridden, because of GNULIB_POSIXCHECK.
+  gl_CHECK_NEXT_HEADERS([wchar.h])
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
+  AC_SUBST([HAVE_WCHAR_H])
+
+  AC_REQUIRE([gl_FEATURES_H])
+
+  AC_REQUIRE([gt_TYPE_WINT_T])
+  if test $gt_cv_c_wint_t = yes; then
+    HAVE_WINT_T=1
+  else
+    HAVE_WINT_T=0
+  fi
+  AC_SUBST([HAVE_WINT_T])
+
+  AC_REQUIRE([gl_TYPE_WINT_T_PREREQ])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+      #include <wchar.h>
+    ]],
+    [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
+     wcsrtombs wcsnrtombs wcwidth
+     wmemchr wmemcmp wmemcpy wmemmove wmempcpy wmemset
+     wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp
+     wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr
+     wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime
+    ])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_CHECK_DECLS([wcsdup], [], [], [[
+      #include <wchar.h>
+    ]])
+  if test $ac_cv_have_decl_wcsdup = no; then
+    HAVE_DECL_WCSDUP=0
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wchar_h.m4:64: -1- AC_DEFUN([gl_WCHAR_H_INLINE_OK], [
+  dnl Test whether <wchar.h> suffers due to the transition from '__inline' to
+  dnl 'gnu_inline'. See <https://sourceware.org/bugzilla/show_bug.cgi?id=4022>
+  dnl and <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42440>. In summary,
+  dnl glibc version 2.5 or older, together with gcc version 4.3 or newer and
+  dnl the option -std=c99 or -std=gnu99, leads to a broken <wchar.h>.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CACHE_CHECK([whether <wchar.h> uses 'inline' correctly],
+    [gl_cv_header_wchar_h_correct_inline],
+    [gl_cv_header_wchar_h_correct_inline=yes
+     case "$host_os" in
+       *-gnu* | gnu*)
+         AC_LANG_CONFTEST([
+           AC_LANG_SOURCE([[
+             #define wcstod renamed_wcstod
+             #include <wchar.h>
+             extern int zero (void);
+             int main () { return zero(); }
+           ]])])
+         dnl Do not rename the object file from conftest.$ac_objext to
+         dnl conftest1.$ac_objext, as this will cause the link to fail on
+         dnl z/OS when using the XPLINK object format (due to duplicate
+         dnl CSECT names). Instead, temporarily redefine $ac_compile so
+         dnl that the object file has the latter name from the start.
+         save_ac_compile="$ac_compile"
+         ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
+         if echo '#include "conftest.c"' >conftest1.c \
+            && AC_TRY_EVAL([ac_compile]); then
+           AC_LANG_CONFTEST([
+             AC_LANG_SOURCE([[
+               #define wcstod renamed_wcstod
+               #include <wchar.h>
+               int zero (void) { return 0; }
+             ]])])
+           dnl See note above about renaming object files.
+           ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
+           if echo '#include "conftest.c"' >conftest2.c \
+              && AC_TRY_EVAL([ac_compile]); then
+             if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
+               :
+             else
+               gl_cv_header_wchar_h_correct_inline=no
+             fi
+           fi
+         fi
+         ac_compile="$save_ac_compile"
+         rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext
+         ;;
+     esac
+    ])
+  if test $gl_cv_header_wchar_h_correct_inline = no; then
+    AC_MSG_ERROR([<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
+This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
+C99 mode. You have four options:
+  - Add the flag -fgnu89-inline to CC and reconfigure, or
+  - Fix your include files, using parts of
+    <https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
+  - Use a gcc version older than 4.3, or
+  - Don't use the flags -std=c99 or -std=gnu99.
+Configuration aborted.])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wchar_h.m4:132: -1- AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], [
+  dnl Ensure to expand the default settings once only.
+  gl_WCHAR_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wchar_h.m4:144: -1- AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], [
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME])
+    dnl Support Microsoft deprecated alias function names by default.
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS])
+  dnl Make sure the shell variable for GNULIB_FREE_POSIX is initialized.
+  gl_STDLIB_H_REQUIRE_DEFAULTS
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wchar_h.m4:197: -1- AC_DEFUN([gl_WCHAR_H_DEFAULTS], [
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
+  HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
+  HAVE_MBRTOWC=1;       AC_SUBST([HAVE_MBRTOWC])
+  HAVE_MBRLEN=1;        AC_SUBST([HAVE_MBRLEN])
+  HAVE_MBSRTOWCS=1;     AC_SUBST([HAVE_MBSRTOWCS])
+  HAVE_MBSNRTOWCS=1;    AC_SUBST([HAVE_MBSNRTOWCS])
+  HAVE_WCRTOMB=1;       AC_SUBST([HAVE_WCRTOMB])
+  HAVE_WCSRTOMBS=1;     AC_SUBST([HAVE_WCSRTOMBS])
+  HAVE_WCSNRTOMBS=1;    AC_SUBST([HAVE_WCSNRTOMBS])
+  HAVE_WMEMCHR=1;       AC_SUBST([HAVE_WMEMCHR])
+  HAVE_WMEMCMP=1;       AC_SUBST([HAVE_WMEMCMP])
+  HAVE_WMEMCPY=1;       AC_SUBST([HAVE_WMEMCPY])
+  HAVE_WMEMMOVE=1;      AC_SUBST([HAVE_WMEMMOVE])
+  HAVE_WMEMPCPY=1;      AC_SUBST([HAVE_WMEMPCPY])
+  HAVE_WMEMSET=1;       AC_SUBST([HAVE_WMEMSET])
+  HAVE_WCSLEN=1;        AC_SUBST([HAVE_WCSLEN])
+  HAVE_WCSNLEN=1;       AC_SUBST([HAVE_WCSNLEN])
+  HAVE_WCSCPY=1;        AC_SUBST([HAVE_WCSCPY])
+  HAVE_WCPCPY=1;        AC_SUBST([HAVE_WCPCPY])
+  HAVE_WCSNCPY=1;       AC_SUBST([HAVE_WCSNCPY])
+  HAVE_WCPNCPY=1;       AC_SUBST([HAVE_WCPNCPY])
+  HAVE_WCSCAT=1;        AC_SUBST([HAVE_WCSCAT])
+  HAVE_WCSNCAT=1;       AC_SUBST([HAVE_WCSNCAT])
+  HAVE_WCSCMP=1;        AC_SUBST([HAVE_WCSCMP])
+  HAVE_WCSNCMP=1;       AC_SUBST([HAVE_WCSNCMP])
+  HAVE_WCSCASECMP=1;    AC_SUBST([HAVE_WCSCASECMP])
+  HAVE_WCSNCASECMP=1;   AC_SUBST([HAVE_WCSNCASECMP])
+  HAVE_WCSCOLL=1;       AC_SUBST([HAVE_WCSCOLL])
+  HAVE_WCSXFRM=1;       AC_SUBST([HAVE_WCSXFRM])
+  HAVE_WCSDUP=1;        AC_SUBST([HAVE_WCSDUP])
+  HAVE_WCSCHR=1;        AC_SUBST([HAVE_WCSCHR])
+  HAVE_WCSRCHR=1;       AC_SUBST([HAVE_WCSRCHR])
+  HAVE_WCSCSPN=1;       AC_SUBST([HAVE_WCSCSPN])
+  HAVE_WCSSPN=1;        AC_SUBST([HAVE_WCSSPN])
+  HAVE_WCSPBRK=1;       AC_SUBST([HAVE_WCSPBRK])
+  HAVE_WCSSTR=1;        AC_SUBST([HAVE_WCSSTR])
+  HAVE_WCSTOK=1;        AC_SUBST([HAVE_WCSTOK])
+  HAVE_WCSWIDTH=1;      AC_SUBST([HAVE_WCSWIDTH])
+  HAVE_WCSFTIME=1;      AC_SUBST([HAVE_WCSFTIME])
+  HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
+  HAVE_DECL_WCSDUP=1;   AC_SUBST([HAVE_DECL_WCSDUP])
+  HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
+  REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
+  REPLACE_BTOWC=0;      AC_SUBST([REPLACE_BTOWC])
+  REPLACE_WCTOB=0;      AC_SUBST([REPLACE_WCTOB])
+  REPLACE_MBSINIT=0;    AC_SUBST([REPLACE_MBSINIT])
+  REPLACE_MBRTOWC=0;    AC_SUBST([REPLACE_MBRTOWC])
+  REPLACE_MBRLEN=0;     AC_SUBST([REPLACE_MBRLEN])
+  REPLACE_MBSRTOWCS=0;  AC_SUBST([REPLACE_MBSRTOWCS])
+  REPLACE_MBSNRTOWCS=0; AC_SUBST([REPLACE_MBSNRTOWCS])
+  REPLACE_WCRTOMB=0;    AC_SUBST([REPLACE_WCRTOMB])
+  REPLACE_WCSRTOMBS=0;  AC_SUBST([REPLACE_WCSRTOMBS])
+  REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
+  REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
+  REPLACE_WCSWIDTH=0;   AC_SUBST([REPLACE_WCSWIDTH])
+  REPLACE_WCSFTIME=0;   AC_SUBST([REPLACE_WCSFTIME])
+  REPLACE_WCSTOK=0;     AC_SUBST([REPLACE_WCSTOK])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wchar_t.m4:11: -1- AC_DEFUN([gt_TYPE_WCHAR_T], [
+  AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stddef.h>
+            wchar_t foo = (wchar_t)'\0';]],
+          [[]])],
+       [gt_cv_c_wchar_t=yes],
+       [gt_cv_c_wchar_t=no])])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wint_t.m4:12: -1- AC_DEFUN([gt_TYPE_WINT_T], [
+  AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <wchar.h>
+            wint_t foo = (wchar_t)'\0';]],
+          [[]])],
+       [gt_cv_c_wint_t=yes],
+       [gt_cv_c_wint_t=no])])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
+
+    dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present,
+    dnl override 'wint_t'.
+    AC_CACHE_CHECK([whether wint_t is large enough],
+      [gl_cv_type_wint_t_large_enough],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <wchar.h>
+              int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
+            ]])],
+         [gl_cv_type_wint_t_large_enough=yes],
+         [gl_cv_type_wint_t_large_enough=no])])
+    if test $gl_cv_type_wint_t_large_enough = no; then
+      GNULIBHEADERS_OVERRIDE_WINT_T=1
+    else
+      GNULIBHEADERS_OVERRIDE_WINT_T=0
+    fi
+  else
+    GNULIBHEADERS_OVERRIDE_WINT_T=0
+  fi
+  AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/wint_t.m4:48: -1- AC_DEFUN([gl_TYPE_WINT_T_PREREQ], [
+  AC_CHECK_HEADERS_ONCE([crtdefs.h])
+  if test $ac_cv_header_crtdefs_h = yes; then
+    HAVE_CRTDEFS_H=1
+  else
+    HAVE_CRTDEFS_H=0
+  fi
+  AC_SUBST([HAVE_CRTDEFS_H])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/year2038.m4:10: -1- AC_DEFUN([gl_YEAR2038_EARLY], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1],
+        [For 64-bit time_t on 32-bit mingw.])
+      ;;
+  esac
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/year2038.m4:23: -1- AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], [[
+  #include <time.h>
+  /* Check that time_t can represent 2**32 - 1 correctly.  */
+  #define LARGE_TIME_T \\
+    ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
+  int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535
+                           && LARGE_TIME_T % 65537 == 0)
+                          ? 1 : -1];
+]])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/year2038.m4:36: -1- AC_DEFUN([gl_YEAR2038_BODY], [
+ AC_ARG_ENABLE([year2038],
+   [  --disable-year2038      omit support for timestamps past the year 2038])
+ AS_IF([test "$enable_year2038" != no],
+ [
+  dnl On many systems, time_t is already a 64-bit type.
+  dnl On those systems where time_t is still 32-bit, it requires kernel
+  dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux,
+  dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM.
+  dnl
+  dnl On native Windows, the system include files define types __time32_t
+  dnl and __time64_t. By default, time_t is an alias of
+  dnl   - __time32_t on 32-bit mingw,
+  dnl   - __time64_t on 64-bit mingw and on MSVC (since MSVC 8).
+  dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an
+  dnl alias of __time64_t.
+  dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of
+  dnl __time32_t.
+  AC_CACHE_CHECK([for time_t past the year 2038], [gl_cv_type_time_t_y2038],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])],
+       [gl_cv_type_time_t_y2038=yes], [gl_cv_type_time_t_y2038=no])
+    ])
+  if test "$gl_cv_type_time_t_y2038" = no; then
+    AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64],
+      [gl_cv_type_time_t_bits_macro],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_SOURCE([[#define _TIME_BITS 64
+                           #define _FILE_OFFSET_BITS 64
+                           ]gl_YEAR2038_TEST_INCLUDES])],
+         [gl_cv_type_time_t_bits_macro=yes],
+         [gl_cv_type_time_t_bits_macro=no])
+      ])
+    if test "$gl_cv_type_time_t_bits_macro" = yes; then
+      AC_DEFINE([_TIME_BITS], [64],
+        [Number of bits in a timestamp, on hosts where this is settable.])
+      dnl AC_SYS_LARGFILE also defines this; it's OK if we do too.
+      AC_DEFINE([_FILE_OFFSET_BITS], [64],
+        [Number of bits in a file offset, on hosts where this is settable.])
+      gl_cv_type_time_t_y2038=yes
+    fi
+  fi
+  if test $gl_cv_type_time_t_y2038 = no; then
+    AC_COMPILE_IFELSE(
+      [AC_LANG_SOURCE(
+         [[#ifdef _USE_32BIT_TIME_T
+             int ok;
+           #else
+             error fail
+           #endif
+         ]])],
+      [AC_MSG_FAILURE(
+         [The 'time_t' type stops working after January 2038.
+          Remove _USE_32BIT_TIME_T from the compiler flags.])],
+      [# If not cross-compiling and $1 says we should check,
+       # and 'touch' works with a large timestamp, then evidently wider time_t
+       # is desired and supported, so fail and ask the builder to fix the
+       # problem.  Otherwise, just warn the builder.
+       m4_ifval([$1],
+         [if test $cross_compiling = no \
+             && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then
+            case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in
+              *'Feb  7  2106'* | *'Feb  7 17:10'*)
+                AC_MSG_FAILURE(
+                  [The 'time_t' type stops working after January 2038,
+                   and your system appears to support a wider 'time_t'.
+                   Try configuring with 'CC="${CC} -m64"'.
+                   To build with a 32-bit time_t anyway (not recommended),
+                   configure with '--disable-year2038'.]);;
+            esac
+            rm -f conftest.time
+          fi])
+       if test "$gl_warned_about_y2038" != yes; then
+         AC_MSG_WARN(
+           [The 'time_t' type stops working after January 2038,
+            and this package needs a wider 'time_t' type
+            if there is any way to access timestamps after that.
+            Configure with 'CC="${CC} -m64"' perhaps?])
+         gl_warned_about_y2038=yes
+       fi
+      ])
+  fi])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/year2038.m4:121: -1- AC_DEFUN([gl_YEAR2038], [
+  gl_YEAR2038_BODY([require-year2038-safe])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/zzgnulib.m4:23: -1- AC_DEFUN([gl_ZZGNULIB])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:34: -1- AC_DEFUN([gl_BUILD_TO_HOST], [
+  AC_REQUIRE([AC_CANONICAL_BUILD])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_BUILD_TO_HOST_INIT])
+
+  dnl Define somedir_c.
+  gl_final_[$1]="$[$1]"
+  dnl Translate it from build syntax to host syntax.
+  case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw* | windows*)
+          gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;;
+      esac
+      ;;
+  esac
+  dnl Convert it to C string syntax.
+  [$1]_c=`printf '%s\n' "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+  [$1]_c='"'"$[$1]_c"'"'
+  AC_SUBST([$1_c])
+
+  dnl Define somedir_c_make.
+  [$1]_c_make=`printf '%s\n' "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+  dnl Use the substituted somedir variable, when possible, so that the user
+  dnl may adjust somedir a posteriori when there are no special characters.
+  if test "$[$1]_c_make" = '\"'"${gl_final_[$1]}"'\"'; then
+    [$1]_c_make='\"$([$1])\"'
+  fi
+  AC_SUBST([$1_c_make])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:67: -1- AC_DEFUN([gl_BUILD_TO_HOST_INIT], [
+  gl_sed_double_backslashes='s/\\/\\\\/g'
+  gl_sed_escape_doublequotes='s/"/\\"/g'
+changequote(,)dnl
+  gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
+changequote([,])dnl
+  gl_sed_escape_for_make_2='s,\$,\\$$,g'
+  dnl Find out how to remove carriage returns from output. Solaris /usr/ucb/tr
+  dnl does not understand '\r'.
+  case `echo r | tr -d '\r'` in
+    '') gl_tr_cr='\015' ;;
+    *)  gl_tr_cr='\r' ;;
+  esac
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:89: -1- AC_DEFUN_ONCE([gl_BUILD_TO_HOST_BINDIR], [
+  dnl Find the final value of bindir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_bindir="${bindir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval bindir="$bindir"
+  gl_BUILD_TO_HOST([bindir])
+  bindir="${gl_saved_bindir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:113: -1- AC_DEFUN_ONCE([gl_BUILD_TO_HOST_DATADIR], [
+  dnl Find the final value of datadir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_datadir="${datadir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval datadir="$datadir"
+  gl_BUILD_TO_HOST([datadir])
+  datadir="${gl_saved_datadir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:133: -1- AC_DEFUN_ONCE([gl_BUILD_TO_HOST_LIBDIR], [
+  dnl Find the final value of libdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libdir="${libdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libdir="$libdir"
+  gl_BUILD_TO_HOST([libdir])
+  libdir="${gl_saved_libdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:156: -1- AC_DEFUN_ONCE([gl_BUILD_TO_HOST_LIBEXECDIR], [
+  dnl Find the final value of libexecdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libexecdir="${libexecdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libexecdir="$libexecdir"
+  gl_BUILD_TO_HOST([libexecdir])
+  libexecdir="${gl_saved_libexecdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:179: -1- AC_DEFUN_ONCE([gl_BUILD_TO_HOST_LOCALEDIR], [
+  dnl Find the final value of localedir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
+  gl_BUILD_TO_HOST([localedir])
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:200: -1- AC_DEFUN_ONCE([gl_BUILD_TO_HOST_PKGDATADIR], [
+  dnl Find the final value of pkgdatadir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_datadir="${datadir}"
+  gl_saved_pkgdatadir="${pkgdatadir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval datadir="$datadir"
+  eval pkgdatadir="$pkgdatadir"
+  gl_BUILD_TO_HOST([pkgdatadir])
+  pkgdatadir="${gl_saved_pkgdatadir}"
+  datadir="${gl_saved_datadir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:224: -1- AC_DEFUN_ONCE([gl_BUILD_TO_HOST_PKGLIBDIR], [
+  dnl Find the final value of pkglibdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libdir="${libdir}"
+  gl_saved_pkglibdir="${pkglibdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libdir="$libdir"
+  eval pkglibdir="$pkglibdir"
+  gl_BUILD_TO_HOST([pkglibdir])
+  pkglibdir="${gl_saved_pkglibdir}"
+  libdir="${gl_saved_libdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/build-to-host.m4:251: -1- AC_DEFUN_ONCE([gl_BUILD_TO_HOST_PKGLIBEXECDIR], [
+  dnl Find the final value of pkglibexecdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libexecdir="${libexecdir}"
+  gl_saved_pkglibexecdir="${pkglibexecdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libexecdir="$libexecdir"
+  eval pkglibexecdir="$pkglibexecdir"
+  gl_BUILD_TO_HOST([pkglibexecdir])
+  pkglibexecdir="${gl_saved_pkglibexecdir}"
+  libexecdir="${gl_saved_libexecdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/cp.m4:12: -1- AC_DEFUN([CL_PROG_CP], [AC_CACHE_CHECK(how to copy files, cl_cv_prog_cp, [
+echo "blabla" > conftest.x
+err=`/bin/sh -c "cp -p conftest.x conftest.y 2>&1"`
+if test -z "$err"; then
+  cl_cv_prog_cp='cp -p'
+else
+  cl_cv_prog_cp='cp'
+fi
+rm -f conftest*
+])
+CP="$cl_cv_prog_cp"
+AC_SUBST(CP)dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/eilseq.m4:14: -1- AC_DEFUN([AC_EILSEQ], [
+  AC_REQUIRE([AC_PROG_CC])dnl
+
+  dnl Check for any extra headers that could define EILSEQ.
+  AC_CHECK_HEADERS([wchar.h])
+
+  AC_CACHE_CHECK([for EILSEQ], [ac_cv_decl_EILSEQ], [
+    AC_EGREP_CPP([yes],[
+#include <errno.h>
+#ifdef EILSEQ
+yes
+#endif
+      ], [have_eilseq=1])
+    if test -n "$have_eilseq"; then
+      dnl EILSEQ exists in <errno.h>. Don't need to define EILSEQ ourselves.
+      ac_cv_decl_EILSEQ=yes
+    else
+      AC_EGREP_CPP([yes],[
+#include <errno.h>
+#if HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+#ifdef EILSEQ
+yes
+#endif
+        ], [have_eilseq=1])
+      if test -n "$have_eilseq"; then
+        dnl EILSEQ exists in some other system header.
+        dnl Define it to the same value.
+        AC_COMPUTE_INT([ac_cv_decl_EILSEQ], [EILSEQ], [
+#include <errno.h>
+#if HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+/* The following two lines are a workaround against an autoconf-2.52 bug.  */
+#include <stdio.h>
+#include <stdlib.h>
+])
+      else
+        dnl EILSEQ isn't defined by the system. Define EILSEQ ourselves, but
+        dnl don't define it as EINVAL, because iconv() callers want to
+        dnl distinguish EINVAL and EILSEQ.
+        ac_cv_decl_EILSEQ=ENOENT
+      fi
+    fi
+  ])
+  if test "$ac_cv_decl_EILSEQ" != yes; then
+    AC_DEFINE_UNQUOTED([EILSEQ], [$ac_cv_decl_EILSEQ],
+                       [Define as good substitute value for EILSEQ.])
+    EILSEQ="$ac_cv_decl_EILSEQ"
+    AC_SUBST([EILSEQ])
+  fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/gettext.m4:58: -1- AC_DEFUN([AM_GNU_GETTEXT], [
+  dnl Argument checking.
+  m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [m4_if([$1], [here], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old],
+    [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
+])])
+  m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_building_libintl_in_same_build_tree],
+    m4_if([$1], [use-libtool], [yes], [m4_if([$1], [here], [yes], [no])]))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+  dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
+  m4_if(gt_building_libintl_in_same_build_tree, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AC_REQUIRE([AM_NLS])
+
+  m4_if(gt_building_libintl_in_same_build_tree, yes, [
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    m4_if(gt_building_libintl_in_same_build_tree, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH([included-gettext],
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+               ]],
+               [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+               ]])],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          m4_if(gt_building_libintl_in_same_build_tree, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            [$gt_func_gnugettext_libintl],
+           [gt_saved_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_saved_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_LINK_IFELSE(
+              [AC_LANG_PROGRAM(
+                 [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+                 ]],
+                 [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+                 ]])],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
+            dnl Now see whether libintl exists and depends on libiconv or other
+            dnl OS dependent libraries, specifically on macOS and AIX.
+            gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
+            AC_REQUIRE([AC_CANONICAL_HOST])
+            case "$host_os" in
+              aix*) gt_LIBINTL_EXTRA="-lpthread" ;;
+            esac
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+               && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+              LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
+              AC_LINK_IFELSE(
+                [AC_LANG_PROGRAM(
+                   [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+                   ]],
+                   [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+                   ]])],
+                [LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA"
+                 eval "$gt_func_gnugettext_libintl=yes"
+                ])
+            fi
+            CPPFLAGS="$gt_saved_CPPFLAGS"
+            LIBS="$gt_saved_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools \
+                && test "$PACKAGE" != libintl; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    m4_if(gt_building_libintl_in_same_build_tree, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
+        LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE([ENABLE_NLS], [1],
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE([HAVE_GETTEXT], [1],
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  m4_if(gt_building_libintl_in_same_build_tree, yes, [
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST([USE_INCLUDED_LIBINTL])
+    AC_SUBST([CATOBJEXT])
+  ])
+
+  m4_if(gt_building_libintl_in_same_build_tree, yes, [], [
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLLIBS="$LIBINTL"
+    AC_SUBST([INTLLIBS])
+  ])
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  AC_SUBST([POSUB])
+
+  dnl Define localedir_c and localedir_c_make.
+  gl_BUILD_TO_HOST_LOCALEDIR
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/gettext.m4:381: -1- AC_DEFUN([AM_GNU_GETTEXT_NEED], [
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/gettext.m4:388: -1- AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/gettext.m4:392: -1- AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/host-cpu-c-abi.m4:52: -1- AC_DEFUN([gl_HOST_CPU_C_ABI], [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_C_ASM])
   AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi],
@@ -5343,219 +10001,68 @@ EOF
 ])
 
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/host-cpu-c-abi.m4:466: -1- AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/host-cpu-c-abi.m4:468: -1- AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT], [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit],
-    [if test -n "$gl_cv_host_cpu_c_abi"; then
-       case "$gl_cv_host_cpu_c_abi" in
-         i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
-           gl_cv_host_cpu_c_abi_32bit=yes ;;
-         x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
-           gl_cv_host_cpu_c_abi_32bit=no ;;
-         *)
-           gl_cv_host_cpu_c_abi_32bit=unknown ;;
-       esac
-     else
-       case "$host_cpu" in
+    [case "$host_cpu" in
 
-         # CPUs that only support a 32-bit ABI.
-         arc \
-         | bfin \
-         | cris* \
-         | csky \
-         | epiphany \
-         | ft32 \
-         | h8300 \
-         | m68k \
-         | microblaze | microblazeel \
-         | nds32 | nds32le | nds32be \
-         | nios2 | nios2eb | nios2el \
-         | or1k* \
-         | or32 \
-         | sh | sh[1234] | sh[1234]e[lb] \
-         | tic6x \
-         | xtensa* )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
+       # CPUs that only support a 32-bit ABI.
+       arc \
+       | bfin \
+       | cris* \
+       | csky \
+       | epiphany \
+       | ft32 \
+       | h8300 \
+       | m68k \
+       | microblaze | microblazeel \
+       | nds32 | nds32le | nds32be \
+       | nios2 | nios2eb | nios2el \
+       | or1k* \
+       | or32 \
+       | sh | sh[1234] | sh[1234]e[lb] \
+       | tic6x \
+       | xtensa* )
+         gl_cv_host_cpu_c_abi_32bit=yes
+         ;;
 
-         # CPUs that only support a 64-bit ABI.
+       # CPUs that only support a 64-bit ABI.
 changequote(,)dnl
-         alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
-         | mmix )
+       alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
+       | mmix )
 changequote([,])dnl
-           gl_cv_host_cpu_c_abi_32bit=no
-           ;;
+         gl_cv_host_cpu_c_abi_32bit=no
+         ;;
 
-changequote(,)dnl
-         i[34567]86 )
-changequote([,])dnl
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         x86_64 )
-           # On x86_64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
-           # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
-           #   with native Windows (mingw, MSVC).
-           # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if (defined __x86_64__ || defined __amd64__ \
-                       || defined _M_X64 || defined _M_AMD64) \
-                      && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         arm* | aarch64 )
-           # Assume arm with EABI.
-           # On arm64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
-           # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
-           # On hppa, the C compiler may be generating 32-bit code or 64-bit
-           # code. In the latter case, it defines _LP64 and __LP64__.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#ifdef __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         ia64* )
-           # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
-           # 32-bit code. In the latter case, it defines _ILP32.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#ifdef _ILP32
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=yes],
-             [gl_cv_host_cpu_c_abi_32bit=no])
-           ;;
-
-         mips* )
-           # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
-           # at 32.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         powerpc* )
-           # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
-           # No need to distinguish them here; the caller may distinguish
-           # them based on the OS.
-           # On powerpc64 systems, the C compiler may still be generating
-           # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
-           # be generating 64-bit code.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __powerpc64__ || defined __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         rs6000 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         riscv32 | riscv64 )
-           # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
-           # Size of 'long' and 'void *':
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __LP64__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         s390* )
-           # On s390x, the C compiler may be generating 64-bit (= s390x) code
-           # or 31-bit (= s390) code.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __LP64__ || defined __s390x__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         sparc | sparc64 )
-           # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
-           # C compiler still generates 32-bit code.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __sparcv9 || defined __arch64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         *)
+       *)
+         if test -n "$gl_cv_host_cpu_c_abi"; then
+           dnl gl_HOST_CPU_C_ABI has already been run. Use its result.
+           case "$gl_cv_host_cpu_c_abi" in
+             i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+               gl_cv_host_cpu_c_abi_32bit=yes ;;
+             x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+               gl_cv_host_cpu_c_abi_32bit=no ;;
+             *)
+               gl_cv_host_cpu_c_abi_32bit=unknown ;;
+           esac
+         else
            gl_cv_host_cpu_c_abi_32bit=unknown
-           ;;
-       esac
-     fi
+         fi
+         if test $gl_cv_host_cpu_c_abi_32bit = unknown; then
+           AC_COMPILE_IFELSE(
+             [AC_LANG_SOURCE(
+                [[int test_pointer_size[sizeof (void *) - 5];
+                ]])],
+             [gl_cv_host_cpu_c_abi_32bit=no],
+             [gl_cv_host_cpu_c_abi_32bit=yes])
+         fi
+         ;;
+     esac
     ])
 
   HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/iconv.m4:16: -1- AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/iconv.m4:18: -1- AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], [
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
@@ -5564,7 +10071,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
   dnl accordingly.
   AC_LIB_LINKFLAGS_BODY([iconv])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/iconv.m4:27: -1- AC_DEFUN([AM_ICONV_LINK], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/iconv.m4:29: -1- AC_DEFUN([AM_ICONV_LINK], [
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable GNU libiconv installed).
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
@@ -5577,7 +10084,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
   dnl because if the user has installed libiconv and not disabled its use
   dnl via --without-libiconv-prefix, he wants to use it. The first
   dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
+  gl_saved_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
   AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
@@ -5594,7 +10101,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
            iconv_close(cd);]])],
       [am_cv_func_iconv=yes])
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       AC_LINK_IFELSE(
         [AC_LANG_PROGRAM(
@@ -5607,14 +10114,14 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
              iconv_close(cd);]])],
         [am_cv_lib_iconv=yes]
         [am_cv_func_iconv=yes])
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
   ])
   if test "$am_cv_func_iconv" = yes; then
     AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
       dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
-      dnl Solaris 10.
-      am_save_LIBS="$LIBS"
+      dnl Solaris 10, macOS 14.4.
+      gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -5652,6 +10159,35 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -5668,7 +10204,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -5687,7 +10223,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -5707,7 +10243,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -5725,7 +10261,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -5744,7 +10280,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
            esac])
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     ])
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
@@ -5763,14 +10299,14 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
   else
     dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
     dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
+    CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
   AC_SUBST([LIBICONV])
   AC_SUBST([LTLIBICONV])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/iconv.m4:243: -1- AC_DEFUN_ONCE([AM_ICONV], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/iconv.m4:268: -1- AC_DEFUN_ONCE([AM_ICONV], [
   AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_CACHE_CHECK([whether iconv is compatible with its POSIX signature],
@@ -5809,159 +10345,28 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
        ICONV_CONST="const"
      fi
     ])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/include_next.m4:36: -1- AC_DEFUN([gl_INCLUDE_NEXT], [
-  AC_LANG_PREPROC_REQUIRE()
-  AC_CACHE_CHECK([whether the preprocessor supports include_next],
-    [gl_cv_have_include_next],
-    [rm -rf conftestd1a conftestd1b conftestd2
-     mkdir conftestd1a conftestd1b conftestd2
-     dnl IBM C 9.0, 10.1 (original versions, prior to the 2009-01 updates) on
-     dnl AIX 6.1 support include_next when used as first preprocessor directive
-     dnl in a file, but not when preceded by another include directive. Check
-     dnl for this bug by including <stdio.h>.
-     dnl Additionally, with this same compiler, include_next is a no-op when
-     dnl used in a header file that was included by specifying its absolute
-     dnl file name. Despite these two bugs, include_next is used in the
-     dnl compiler's <math.h>. By virtue of the second bug, we need to use
-     dnl include_next as well in this case.
-     cat <<EOF > conftestd1a/conftest.h
-#define DEFINED_IN_CONFTESTD1
-#include_next <conftest.h>
-#ifdef DEFINED_IN_CONFTESTD2
-int foo;
-#else
-#error "include_next doesn't work"
-#endif
-EOF
-     cat <<EOF > conftestd1b/conftest.h
-#define DEFINED_IN_CONFTESTD1
-#include <stdio.h>
-#include_next <conftest.h>
-#ifdef DEFINED_IN_CONFTESTD2
-int foo;
-#else
-#error "include_next doesn't work"
-#endif
-EOF
-     cat <<EOF > conftestd2/conftest.h
-#ifndef DEFINED_IN_CONFTESTD1
-#error "include_next test doesn't work"
-#endif
-#define DEFINED_IN_CONFTESTD2
-EOF
-     gl_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
-dnl We intentionally avoid using AC_LANG_SOURCE here.
-     AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
-       [gl_cv_have_include_next=yes],
-       [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
-        AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
-          [gl_cv_have_include_next=buggy],
-          [gl_cv_have_include_next=no])
-       ])
-     CPPFLAGS="$gl_save_CPPFLAGS"
-     rm -rf conftestd1a conftestd1b conftestd2
-    ])
-  PRAGMA_SYSTEM_HEADER=
-  if test $gl_cv_have_include_next = yes; then
-    INCLUDE_NEXT=include_next
-    INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
-    if test -n "$GCC"; then
-      PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
-    fi
-  else
-    if test $gl_cv_have_include_next = buggy; then
-      INCLUDE_NEXT=include
-      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+
+  dnl A summary result, for those packages which want to print a summary at the
+  dnl end of the configuration.
+  if test "$am_func_iconv" = yes; then
+    if test -n "$LIBICONV"; then
+      am_cv_func_iconv_summary='yes, in libiconv'
     else
-      INCLUDE_NEXT=include
-      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
+      am_cv_func_iconv_summary='yes, in libc'
+    fi
+  else
+    if test "$am_cv_func_iconv" = yes; then
+      am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
+    else
+      am_cv_func_iconv_summary='no, consider installing GNU libiconv'
     fi
   fi
-  AC_SUBST([INCLUDE_NEXT])
-  AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
-  AC_SUBST([PRAGMA_SYSTEM_HEADER])
-
-  dnl HP NonStop systems, which define __TANDEM, limit the line length
-  dnl after including some system header files.
-  AC_CACHE_CHECK([whether source code line length is unlimited],
-    [gl_cv_source_line_length_unlimited],
-    [AC_EGREP_CPP([choke me],
-       [
-#ifdef __TANDEM
-choke me
-#endif
-       ],
-       [gl_cv_source_line_length_unlimited=no],
-       [gl_cv_source_line_length_unlimited=yes])
-    ])
-  if test $gl_cv_source_line_length_unlimited = no; then
-    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
-  else
-    PRAGMA_COLUMNS=
-  fi
-  AC_SUBST([PRAGMA_COLUMNS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/include_next.m4:156: -1- AC_DEFUN([gl_CHECK_NEXT_HEADERS], [
-  gl_NEXT_HEADERS_INTERNAL([$1], [check])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/include_next.m4:166: -1- AC_DEFUN([gl_NEXT_HEADERS], [
-  gl_NEXT_HEADERS_INTERNAL([$1], [assume])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/include_next.m4:172: -1- AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], [
-  AC_REQUIRE([gl_INCLUDE_NEXT])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
-  m4_if([$2], [check],
-    [AC_CHECK_HEADERS_ONCE([$1])
-    ])
-
-  m4_foreach_w([gl_HEADER_NAME], [$1],
-    [AS_VAR_PUSHDEF([gl_next_header],
-                    [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
-     if test $gl_cv_have_include_next = yes; then
-       AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
-     else
-       AC_CACHE_CHECK(
-         [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
-         [gl_next_header],
-         [m4_if([$2], [check],
-            [AS_VAR_PUSHDEF([gl_header_exists],
-                            [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
-             if test AS_VAR_GET([gl_header_exists]) = yes; then
-             AS_VAR_POPDEF([gl_header_exists])
-            ])
-          gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
-          AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
-          AS_VAR_SET([gl_next_header], ['"'$gl_header'"'])
-          m4_if([$2], [check],
-            [else
-               AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
-             fi
-            ])
-         ])
-     fi
-     AC_SUBST(
-       AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
-       [AS_VAR_GET([gl_next_header])])
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'gl_HEADER_NAME'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=AS_VAR_GET([gl_next_header])
-     fi
-     AC_SUBST(
-       AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
-       [$gl_next_as_first_directive])
-     AS_VAR_POPDEF([gl_next_header])])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/intlmacosx.m4:18: -1- AC_DEFUN([gt_INTL_MACOSX], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/intlmacosx.m4:20: -1- AC_DEFUN([gt_INTL_MACOSX], [
   dnl Check for API introduced in Mac OS X 10.4.
   AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
     [gt_cv_func_CFPreferencesCopyAppValue],
-    [gt_save_LIBS="$LIBS"
+    [gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
@@ -5969,7 +10374,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
           [[CFPreferencesCopyAppValue(NULL, NULL)]])],
        [gt_cv_func_CFPreferencesCopyAppValue=yes],
        [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
+     LIBS="$gt_saved_LIBS"])
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
     AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
       [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
@@ -5984,7 +10389,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
   dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
   dnl first among the preferred languages and CC is the territory.
   AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
-    [gt_save_LIBS="$LIBS"
+    [gt_saved_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
@@ -5992,7 +10397,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
           [[CFLocaleCopyPreferredLanguages();]])],
        [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
        [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
-     LIBS="$gt_save_LIBS"])
+     LIBS="$gt_saved_LIBS"])
   if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
     AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
       [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
@@ -6000,256 +10405,15 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/i
   INTL_MACOSX_LIBS=
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
      || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+    dnl Starting with macOS version 14, CoreFoundation relies on CoreServices,
+    dnl and we have to link it in explicitly, otherwise an exception
+    dnl NSInvalidArgumentException "unrecognized selector sent to instance"
+    dnl occurs.
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
   fi
   AC_SUBST([INTL_MACOSX_LIBS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/inttypes.m4:10: -1- AC_DEFUN_ONCE([gl_INTTYPES_H], [
-  AC_REQUIRE([gl_INTTYPES_INCOMPLETE])
-  gl_INTTYPES_PRI_SCN
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/inttypes.m4:16: -1- AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE], [
-  AC_REQUIRE([gl_STDINT_H])
-  AC_CHECK_HEADERS_ONCE([inttypes.h])
-
-  dnl Override <inttypes.h> always, so that the portability warnings work.
-  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
-  gl_CHECK_NEXT_HEADERS([inttypes.h])
-
-  AC_REQUIRE([gl_MULTIARCH])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[#include <inttypes.h>
-    ]], [imaxabs imaxdiv strtoimax strtoumax])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/inttypes.m4:36: -1- AC_DEFUN([gl_INTTYPES_PRI_SCN], [
-  PRIPTR_PREFIX=
-  if $GL_GENERATE_STDINT_H; then
-    dnl Using the gnulib <stdint.h>. It defines intptr_t to 'long' or
-    dnl 'long long', depending on _WIN64.
-    AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM([[
-         #ifdef _WIN64
-         LLP64
-         #endif
-         ]])
-      ],
-      [PRIPTR_PREFIX='"l"'],
-      [PRIPTR_PREFIX='"ll"'])
-  else
-    dnl Using the system's <stdint.h>.
-    for glpfx in '' l ll I64; do
-      case $glpfx in
-        '')  gltype1='int';;
-        l)   gltype1='long int';;
-        ll)  gltype1='long long int';;
-        I64) gltype1='__int64';;
-      esac
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[#include <stdint.h>
-           extern intptr_t foo;
-           extern $gltype1 foo;]])],
-        [PRIPTR_PREFIX='"'$glpfx'"'])
-      test -n "$PRIPTR_PREFIX" && break
-    done
-  fi
-  AC_SUBST([PRIPTR_PREFIX])
-
-  gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-    [INT32_MAX_LT_INTMAX_MAX],
-    [defined INT32_MAX && defined INTMAX_MAX],
-    [INT32_MAX < INTMAX_MAX],
-    [sizeof (int) < sizeof (long long int)])
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-    gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-      [INT64_MAX_EQ_LONG_MAX],
-      [defined INT64_MAX],
-      [INT64_MAX == LONG_MAX],
-      [sizeof (long long int) == sizeof (long int)])
-  else
-    INT64_MAX_EQ_LONG_MAX=-1
-  fi
-  gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-    [UINT32_MAX_LT_UINTMAX_MAX],
-    [defined UINT32_MAX && defined UINTMAX_MAX],
-    [UINT32_MAX < UINTMAX_MAX],
-    [sizeof (unsigned int) < sizeof (unsigned long long int)])
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-    gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-      [UINT64_MAX_EQ_ULONG_MAX],
-      [defined UINT64_MAX],
-      [UINT64_MAX == ULONG_MAX],
-      [sizeof (unsigned long long int) == sizeof (unsigned long int)])
-  else
-    UINT64_MAX_EQ_ULONG_MAX=-1
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/inttypes.m4:106: -1- AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], [
-  AC_CACHE_CHECK([whether $3],
-    [gl_cv_test_$1],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[/* Work also in C++ mode.  */
-            #define __STDC_LIMIT_MACROS 1
-
-            /* Work if build is not clean.  */
-            #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-
-            #include <limits.h>
-            #if HAVE_STDINT_H
-             #include <stdint.h>
-            #endif
-
-            #if $2
-             #define CONDITION ($3)
-            #else
-             #define CONDITION ($4)
-            #endif
-            int test[CONDITION ? 1 : -1];]])],
-       [gl_cv_test_$1=yes],
-       [gl_cv_test_$1=no])])
-  if test $gl_cv_test_$1 = yes; then
-    $1=1;
-  else
-    $1=0;
-  fi
-  AC_SUBST([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/inttypes.m4:143: -1- AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_INTTYPES_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/inttypes.m4:153: -1- AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/inttypes.m4:165: -1- AC_DEFUN([gl_INTTYPES_H_DEFAULTS], [
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_IMAXABS=1;   AC_SUBST([HAVE_DECL_IMAXABS])
-  HAVE_DECL_IMAXDIV=1;   AC_SUBST([HAVE_DECL_IMAXDIV])
-  HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
-  HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
-  HAVE_IMAXDIV_T=1;      AC_SUBST([HAVE_IMAXDIV_T])
-  REPLACE_STRTOIMAX=0;   AC_SUBST([REPLACE_STRTOIMAX])
-  REPLACE_STRTOUMAX=0;   AC_SUBST([REPLACE_STRTOUMAX])
-  INT32_MAX_LT_INTMAX_MAX=1;  AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
-  INT64_MAX_EQ_LONG_MAX='defined _LP64';  AC_SUBST([INT64_MAX_EQ_LONG_MAX])
-  PRIPTR_PREFIX=__PRIPTR_PREFIX;  AC_SUBST([PRIPTR_PREFIX])
-  UINT32_MAX_LT_UINTMAX_MAX=1;  AC_SUBST([UINT32_MAX_LT_UINTMAX_MAX])
-  UINT64_MAX_EQ_ULONG_MAX='defined _LP64';  AC_SUBST([UINT64_MAX_EQ_ULONG_MAX])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/largefile.m4:13: -1- AC_DEFUN([gl_SET_LARGEFILE_SOURCE], [
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_FUNC_FSEEKO
-  case "$host_os" in
-    hpux*)
-      AC_DEFINE([_LARGEFILE_SOURCE], [1],
-        [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).])
-      ;;
-  esac
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/largefile.m4:83: -1- AC_DEFUN([AC_SYS_LARGEFILE], [AC_ARG_ENABLE(largefile,
-               [  --disable-largefile     omit support for large files])
-AS_IF([test "$enable_largefile" != no],
- [AC_CACHE_CHECK([for special C compiler options needed for large files],
-    ac_cv_sys_largefile_CC,
-    [ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-         # IRIX 6.2 and later do not support large files by default,
-         # so use the C compiler's -n32 option if that helps.
-         AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
-         AC_COMPILE_IFELSE([], [break])
-         CC="$CC -n32"
-         AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
-         break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi])
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
-    ac_cv_sys_file_offset_bits,
-    [Number of bits in a file offset, on hosts where this is settable.],
-    [_AC_SYS_LARGEFILE_TEST_INCLUDES])
-  AS_CASE([$ac_cv_sys_file_offset_bits],
-    [unknown],
-      [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1],
-         [ac_cv_sys_large_files],
-         [Define for large files, on AIX-style hosts.],
-         [_AC_SYS_LARGEFILE_TEST_INCLUDES])],
-    [64],
-      [gl_YEAR2038_BODY([])])])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/largefile.m4:126: -1- AC_DEFUN([gl_LARGEFILE], [
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      dnl Native Windows.
-      dnl mingw64 defines off_t to a 64-bit type already, if
-      dnl _FILE_OFFSET_BITS=64, which is ensured by AC_SYS_LARGEFILE.
-      AC_CACHE_CHECK([for 64-bit off_t], [gl_cv_type_off_t_64],
-        [AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM(
-              [[#include <sys/types.h>
-                int verify_off_t_size[sizeof (off_t) >= 8 ? 1 : -1];
-              ]],
-              [[]])],
-           [gl_cv_type_off_t_64=yes], [gl_cv_type_off_t_64=no])
-        ])
-      if test $gl_cv_type_off_t_64 = no; then
-        WINDOWS_64_BIT_OFF_T=1
-      else
-        WINDOWS_64_BIT_OFF_T=0
-      fi
-      dnl Some mingw versions define, if _FILE_OFFSET_BITS=64, 'struct stat'
-      dnl to 'struct _stat32i64' or 'struct _stat64' (depending on
-      dnl _USE_32BIT_TIME_T), which has a 32-bit st_size member.
-      AC_CACHE_CHECK([for 64-bit st_size], [gl_cv_member_st_size_64],
-        [AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM(
-              [[#include <sys/types.h>
-                struct stat buf;
-                int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1];
-              ]],
-              [[]])],
-           [gl_cv_member_st_size_64=yes], [gl_cv_member_st_size_64=no])
-        ])
-      if test $gl_cv_member_st_size_64 = no; then
-        WINDOWS_64_BIT_ST_SIZE=1
-      else
-        WINDOWS_64_BIT_ST_SIZE=0
-      fi
-      ;;
-    *)
-      dnl Nothing to do on gnulib's side.
-      dnl A 64-bit off_t is
-      dnl   - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX,
-      dnl     OSF/1, Cygwin,
-      dnl   - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on
-      dnl     glibc, HP-UX, Solaris,
-      dnl   - enabled by _LARGE_FILES=1 (ensured by AC_SYS_LARGEFILE) on AIX,
-      dnl   - impossible to achieve on Minix 3.1.8.
-      WINDOWS_64_BIT_OFF_T=0
-      WINDOWS_64_BIT_ST_SIZE=0
-      ;;
-  esac
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-ld.m4:12: -1- AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-ld.m4:14: -1- AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
 [# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -6261,11 +10425,11 @@ case `$LD -v 2>&1 </dev/null` in
 esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-ld.m4:27: -1- AC_DEFUN([AC_LIB_PROG_LD], [AC_REQUIRE([AC_PROG_CC])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-ld.m4:29: -1- AC_DEFUN([AC_LIB_PROG_LD], [AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 
 AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
+    [AS_HELP_STRING([[--with-gnu-ld]],
         [assume the C compiler uses GNU ld [default=no]])],
     [test "$withval" = no || with_gnu_ld=yes],
     [with_gnu_ld=no])dnl
@@ -6303,7 +10467,7 @@ else
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -6333,9 +10497,9 @@ else
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -6352,7 +10516,7 @@ else
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -6402,7 +10566,7 @@ else
 fi
 AC_LIB_PROG_LD_GNU
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-link.m4:17: -1- AC_DEFUN([AC_LIB_LINKFLAGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-link.m4:19: -1- AC_DEFUN([AC_LIB_LINKFLAGS], [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
   pushdef([Name],[m4_translit([$1],[./+-], [____])])
@@ -6429,7 +10593,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
   popdef([NAME])
   popdef([Name])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-link.m4:57: -1- AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-link.m4:59: -1- AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
   pushdef([Name],[m4_translit([$1],[./+-], [____])])
@@ -6443,11 +10607,11 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
   dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
   dnl because if the user has installed lib[]Name and not disabled its use
   dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
+  acl_saved_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
 
   AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
+    acl_saved_LIBS="$LIBS"
     dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
     dnl because these -l options might require -L options that are present in
     dnl LIBS. -l options benefit only from the -L options listed before it.
@@ -6463,7 +10627,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
       [AC_LANG_PROGRAM([[$3]], [[$4]])],
       [ac_cv_lib[]Name=yes],
       [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
-    LIBS="$ac_save_LIBS"
+    LIBS="$acl_saved_LIBS"
   ])
   if test "$ac_cv_lib[]Name" = yes; then
     HAVE_LIB[]NAME=yes
@@ -6474,7 +10638,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
     HAVE_LIB[]NAME=no
     dnl If $LIB[]NAME didn't lead to a usable library, we don't need
     dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
+    CPPFLAGS="$acl_saved_CPPFLAGS"
     LIB[]NAME=
     LTLIB[]NAME=
     LIB[]NAME[]_PREFIX=
@@ -6486,7 +10650,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
   popdef([NAME])
   popdef([Name])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-link.m4:125: -1- AC_DEFUN([AC_LIB_RPATH], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-link.m4:127: -1- AC_DEFUN([AC_LIB_RPATH], [
   dnl Complain if config.rpath is missing.
   AC_REQUIRE_AUX_FILE([config.rpath])
   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
@@ -6514,7 +10678,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
     [  --disable-rpath         do not hardcode runtime library paths],
     :, enable_rpath=yes)
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-link.m4:161: -1- AC_DEFUN([AC_LIB_FROMPACKAGE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-link.m4:163: -1- AC_DEFUN([AC_LIB_FROMPACKAGE], [
   pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
                                    [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   define([acl_frompackage_]NAME, [$2])
@@ -6527,7 +10691,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
   popdef([PACKUP])
   popdef([PACK])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-link.m4:181: -1- AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-link.m4:183: -1- AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
                                    [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
@@ -6544,8 +10708,8 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   ])
   AC_ARG_WITH(PACK[-prefix],
-[[  --with-]]PACK[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
-  --without-]]PACK[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[[  --with-]]PACK[[-prefix[=DIR]  search for ]]PACKLIBS[[ in DIR/include and DIR/lib
+  --without-]]PACK[[-prefix     don't search for ]]PACKLIBS[[ in includedir and libdir]],
 [
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -6572,7 +10736,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
     additional_libdir3=
   fi
   dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
+  dnl $LDFLAGS. Use breadth-first search.
   LIB[]NAME=
   LTLIB[]NAME=
   INC[]NAME=
@@ -6885,12 +11049,12 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
               dnl Read the .la file. It defines the variables
               dnl dlname, library_names, old_library, dependency_libs, current,
               dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
+              saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
               dnl We use only dependency_libs.
               for dep in $dependency_libs; do
                 case "$dep" in
@@ -7030,18 +11194,18 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
       dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
+      acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
     else
       dnl The -rpath options are cumulative.
       for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
       done
     fi
@@ -7058,7 +11222,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
   popdef([PACK])
   popdef([NAME])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-link.m4:718: -1- AC_DEFUN([AC_LIB_APPENDTOVAR], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-link.m4:720: -1- AC_DEFUN([AC_LIB_APPENDTOVAR], [
   for element in [$2]; do
     haveit=
     for x in $[$1]; do
@@ -7073,7 +11237,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
     fi
   done
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-link.m4:742: -1- AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-link.m4:744: -1- AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], [
   AC_REQUIRE([AC_LIB_RPATH])
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   $1=
@@ -7123,18 +11287,18 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
             for dir in $rpathdirs; do
               alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
             done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
             libdir="$alldirs"
             eval flag=\"$acl_hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
+            libdir="$acl_saved_libdir"
             $1="$flag"
           else
             dnl The -rpath options are cumulative.
             for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
+              acl_saved_libdir="$libdir"
               libdir="$dir"
               eval flag=\"$acl_hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
+              libdir="$acl_saved_libdir"
               $1="${$1}${$1:+ }$flag"
             done
           fi
@@ -7144,7 +11308,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
   fi
   AC_SUBST([$1])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-prefix.m4:15: -1- AC_DEFUN([AC_LIB_PREFIX], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-prefix.m4:17: -1- AC_DEFUN([AC_LIB_PREFIX], [
   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST])
@@ -7239,7 +11403,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
     fi
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-prefix.m4:115: -1- AC_DEFUN([AC_LIB_PREPARE_PREFIX], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-prefix.m4:117: -1- AC_DEFUN([AC_LIB_PREPARE_PREFIX], [
   dnl Unfortunately, prefix and exec_prefix get only finally determined
   dnl at the end of configure.
   if test "X$prefix" = "XNONE"; then
@@ -7252,21 +11416,21 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
   else
     acl_final_exec_prefix="$exec_prefix"
   fi
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
+  prefix="$acl_saved_prefix"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-prefix.m4:138: -1- AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], [
-  acl_save_prefix="$prefix"
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-prefix.m4:140: -1- AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], [
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-prefix.m4:155: -1- AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-prefix.m4:157: -1- AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [
   dnl There is no formal standard regarding lib, lib32, and lib64.
   dnl On most glibc systems, the current practice is that on a system supporting
   dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
@@ -7287,7 +11451,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/l
 
   AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf],
     [AC_EGREP_CPP([Extensible Linking Format],
-       [#if defined __ELF__ || (defined __linux__ && defined __EDG__)
+       [#if defined __ELF__ || (defined __linux__ && (defined __EDG__ || defined __SUNPRO_C))
         Extensible Linking Format
         #endif
        ],
@@ -7369,6 +11533,15 @@ changequote([,])dnl
            esac
          fi
          ;;
+       netbsd*)
+         dnl On NetBSD/sparc64, there is a 'sparc' subdirectory that contains
+         dnl 32-bit libraries.
+         if test $HOST_CPU_C_ABI_32BIT != no; then
+           case "$host_cpu" in
+             sparc*) acl_libdirstem2=lib/sparc ;;
+           esac
+         fi
+         ;;
        *)
          dnl If $CC generates code for a 32-bit ABI, the libraries are
          dnl surely under $prefix/lib or $prefix/lib32, not $prefix/lib64.
@@ -7393,7 +11566,7 @@ changequote([,])dnl
            fi
          fi
          if test -n "$searchpath"; then
-           acl_save_IFS="${IFS= 	}"; IFS=":"
+           acl_saved_IFS="${IFS= 	}"; IFS=":"
            for searchdir in $searchpath; do
              if test -d "$searchdir"; then
                case "$searchdir" in
@@ -7410,7 +11583,7 @@ changequote([,])dnl
                esac
              fi
            done
-           IFS="$acl_save_IFS"
+           IFS="$acl_saved_IFS"
            if test $HOST_CPU_C_ABI_32BIT = yes; then
              # 32-bit ABI.
              acl_libdirstem3=
@@ -7434,469 +11607,1075 @@ changequote(,)dnl
   acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
 changequote([,])dnl
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/libunistring-base.m4:22: -1- AC_DEFUN([gl_LIBUNISTRING_MODULE], [
-  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
-  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
-  dnl gl_LIBUNISTRING_CORE if that macro has been run.
-  gl_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]),
-    [gl_LIBUNISTRING_VERSION_CMP([$1])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:62: -1- AC_DEFUN([LT_INIT], [AC_PREREQ([2.64])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/libunistring-base.m4:48: -1- AC_DEFUN([gl_LIBUNISTRING_LIBHEADER], [
-  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
-  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
-  dnl gl_LIBUNISTRING_CORE if that macro has been run.
-  if gl_LIBUNISTRING_VERSION_CMP([$1]); then
-    dnl It is OK to use a .h file in lib/ from within tests/, but not vice
-    dnl versa.
-    if test -z "$LIBUNISTRING_[]AS_TR_CPP([$2])"; then
-      LIBUNISTRING_[]AS_TR_CPP([$2])="${gl_source_base_prefix}$2"
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:100: -1- AU_DEFUN([AC_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:100: -1- AC_DEFUN([AC_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AC_PROG_LIBTOOL' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_INIT], [LT_INIT($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:101: -1- AU_DEFUN([AM_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:101: -1- AC_DEFUN([AM_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AM_PROG_LIBTOOL' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_INIT], [LT_INIT($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:702: -1- AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2025-2026 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+while test 0 != $[#]
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try '$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try '$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:894: -1- AC_DEFUN([LT_SUPPORTED_TAG], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:905: -1- AC_DEFUN([LT_LANG], [AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Objective-C],		[_LT_LANG(OBJC)],
+  [Objective-C++],	[_LT_LANG(OBJCXX)],
+  [Microsoft Macro Assembler],  [_LT_LANG(ML64)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1035: -1- AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1035: -1- AC_DEFUN([AC_LIBTOOL_CXX], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_CXX' is obsolete.
+You should run autoupdate.])dnl
+LT_LANG(C++)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1036: -1- AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1036: -1- AC_DEFUN([AC_LIBTOOL_F77], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_F77' is obsolete.
+You should run autoupdate.])dnl
+LT_LANG(Fortran 77)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1037: -1- AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1037: -1- AC_DEFUN([AC_LIBTOOL_FC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_FC' is obsolete.
+You should run autoupdate.])dnl
+LT_LANG(Fortran)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1038: -1- AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1038: -1- AC_DEFUN([AC_LIBTOOL_GCJ], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_GCJ' is obsolete.
+You should run autoupdate.])dnl
+LT_LANG(Java)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1039: -1- AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1039: -1- AC_DEFUN([AC_LIBTOOL_RC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_RC' is obsolete.
+You should run autoupdate.])dnl
+LT_LANG(Windows Resource)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1397: -1- AC_DEFUN([_LT_WITH_SYSROOT], [m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     # Trim trailing / since we'll always append absolute paths and we want
+     # to avoid //, if only for less confusing output for the user.
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([$with_sysroot])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and where our libraries should be installed.])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1737: -1- AC_DEFUN([_LT_COMPILER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1779: -1- AU_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1779: -1- AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_COMPILER_OPTION' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1788: -1- AC_DEFUN([_LT_LINKER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.expsym conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1823: -1- AU_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1823: -1- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_LINKER_OPTION' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1830: -1- AC_DEFUN([LT_CMD_MAX_LEN], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | windows* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
     fi
-  else
-    LIBUNISTRING_[]AS_TR_CPP([$2])=
-  fi
-  AC_SUBST([LIBUNISTRING_]AS_TR_CPP([$2]))
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/libunistring-base.m4:67: -1- AC_DEFUN([gl_LIBUNISTRING_LIB_PREPARE], [
-  dnl Ensure that HAVE_LIBUNISTRING is fully determined at this point.
-  m4_ifdef([gl_LIBUNISTRING], [AC_REQUIRE([gl_LIBUNISTRING])])
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
 
-  AC_REQUIRE([AC_PROG_AWK])
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
 
-dnl Sed expressions to extract the parts of a version number.
-changequote(,)
-gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
-i\
-0
-q
-'
-gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
-i\
-0
-q
-'
-gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
-i\
-0
-q
-'
-changequote([,])
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
 
-  if test "$HAVE_LIBUNISTRING" = yes; then
-    LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
-    LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
-    LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/libunistring-base.m4:103: -1- AC_DEFUN([gl_LIBUNISTRING_VERSION_CMP], [ { test "$HAVE_LIBUNISTRING" != yes \
-    || {
-         dnl AS_LITERAL_IF exists and works fine since autoconf-2.59 at least.
-         AS_LITERAL_IF([$1],
-           [dnl This is the optimized variant, that assumes the argument is a literal:
-            m4_pushdef([requested_version_major],
-              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^\([0-9]*\).*], [\1]), [])])
-            m4_pushdef([requested_version_minor],
-              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
-            m4_pushdef([requested_version_subminor],
-              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.][0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
-            test $LIBUNISTRING_VERSION_MAJOR -lt requested_version_major \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq requested_version_major \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt requested_version_minor \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq requested_version_minor \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt requested_version_subminor
-                         }
-                    }
-               }
-            m4_popdef([requested_version_subminor])
-            m4_popdef([requested_version_minor])
-            m4_popdef([requested_version_major])
-           ],
-           [dnl This is the unoptimized variant:
-            requested_version_major=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_major"`
-            requested_version_minor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_minor"`
-            requested_version_subminor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_subminor"`
-            test $LIBUNISTRING_VERSION_MAJOR -lt $requested_version_major \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq $requested_version_major \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt $requested_version_minor \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq $requested_version_minor \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt $requested_version_subminor
-                         }
-                    }
-               }
-           ])
-       }
-  }])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/limits-h.m4:10: -1- AC_DEFUN_ONCE([gl_LIMITS_H], [
-  gl_CHECK_NEXT_HEADERS([limits.h])
-
-  AC_CACHE_CHECK([whether limits.h has WORD_BIT, BOOL_WIDTH etc.],
-    [gl_cv_header_limits_width],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
-             #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
-            #endif
-            #include <limits.h>
-            long long llm = LLONG_MAX;
-            int wb = WORD_BIT;
-            int ullw = ULLONG_WIDTH;
-            int bw = BOOL_WIDTH;
-          ]])],
-       [gl_cv_header_limits_width=yes],
-       [gl_cv_header_limits_width=no])])
-  if test "$gl_cv_header_limits_width" = yes; then
-    GL_GENERATE_LIMITS_H=false
-  else
-    GL_GENERATE_LIMITS_H=true
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/limits-h.m4:37: -1- AC_DEFUN([gl_REPLACE_LIMITS_H], [
-  AC_REQUIRE([gl_LIMITS_H])
-  GL_GENERATE_LIMITS_H=true
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lstat.m4:11: -1- AC_DEFUN([gl_FUNC_LSTAT], [
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
-  dnl If lstat does not exist, the replacement <sys/stat.h> does
-  dnl "#define lstat stat", and lstat.c is a no-op.
-  AC_CHECK_FUNCS_ONCE([lstat])
-  if test $ac_cv_func_lstat = yes; then
-    AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
-    case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in
-      solaris* | *no)
-        REPLACE_LSTAT=1
-        ;;
-    esac
-  else
-    HAVE_LSTAT=0
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lstat.m4:31: -1- AC_DEFUN([gl_PREREQ_LSTAT], [:])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lstat.m4:33: -1- AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], [
-  dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it
-  dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ.
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether lstat correctly handles trailing slash],
-    [gl_cv_func_lstat_dereferences_slashed_symlink],
-    [rm -f conftest.sym conftest.file
-     echo >conftest.file
-     AC_RUN_IFELSE(
-       [AC_LANG_PROGRAM(
-          [AC_INCLUDES_DEFAULT],
-          [[struct stat sbuf;
-            if (symlink ("conftest.file", "conftest.sym") != 0)
-              return 1;
-            /* Linux will dereference the symlink and fail, as required by
-               POSIX.  That is better in the sense that it means we will not
-               have to compile and use the lstat wrapper.  */
-            return lstat ("conftest.sym/", &sbuf) == 0;
-          ]])],
-       [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
-       [gl_cv_func_lstat_dereferences_slashed_symlink=no],
-       [case "$host_os" in
-          linux-* | linux)
-            # Guess yes on Linux systems.
-            gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
-          *-gnu* | gnu*)
-            # Guess yes on glibc systems.
-            gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
-          mingw*)
-            # Guess no on native Windows.
-            gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
-          *)
-            # If we don't know, obey --enable-cross-guesses.
-            gl_cv_func_lstat_dereferences_slashed_symlink="$gl_cross_guess_normal" ;;
-        esac
-       ])
-     rm -f conftest.sym conftest.file
-    ])
-  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
-    *yes)
-      AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
-        [Define to 1 if 'lstat' dereferences a symlink specified
-         with a trailing slash.])
-      ;;
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
   esac
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/malloc.m4:9: -1- AC_DEFUN([_AC_FUNC_MALLOC_IF], [
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
-  AC_CACHE_CHECK([whether malloc (0) returns nonnull],
-    [ac_cv_func_malloc_0_nonnull],
-    [AC_RUN_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stdlib.h>
-          ]],
-          [[void *p = malloc (0);
-            int result = !p;
-            free (p);
-            return result;]])
-       ],
-       [ac_cv_func_malloc_0_nonnull=yes],
-       [ac_cv_func_malloc_0_nonnull=no],
-       [case "$host_os" in
-          # Guess yes on platforms where we know the result.
-          *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
-          | gnu* | *-musl* | midnightbsd* \
-          | hpux* | solaris* | cygwin* | mingw* | msys* )
-            ac_cv_func_malloc_0_nonnull="guessing yes" ;;
-          # If we don't know, obey --enable-cross-guesses.
-          *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;;
-        esac
-       ])
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1969: -1- AU_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1969: -1- AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_SYS_MAX_CMD_LEN' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:2080: -1- AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl
+if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | windows* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
     ])
-  AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/malloc.m4:42: -1- AC_DEFUN([gl_FUNC_MALLOC_GNU], [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([gl_FUNC_MALLOC_POSIX])
-  REPLACE_MALLOC_FOR_MALLOC_GNU="$REPLACE_MALLOC_FOR_MALLOC_POSIX"
-  if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 0; then
-    _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC_FOR_MALLOC_GNU=1])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/malloc.m4:56: -1- AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF], [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF])
-  test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC_FOR_MALLOC_POSIX=1
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/malloc.m4:66: -1- AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF], [
-  AC_CACHE_CHECK([whether malloc is ptrdiff_t safe],
-    [gl_cv_malloc_ptrdiff],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stdint.h>
-          ]],
-          [[/* 64-bit ptrdiff_t is so wide that no practical platform
-               can exceed it.  */
-            #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0)
+    ;;
 
-            /* On rare machines where size_t fits in ptrdiff_t there
-               is no problem.  */
-            #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX)
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
 
-            /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t
-               bounds even on 32-bit platforms.  We don't know which
-               non-glibc systems are safe.  */
-            #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__))
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen=shl_load],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen=dlopen],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
 
-            #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE
-              return 0;
-            #else
-              #error "malloc might not be ptrdiff_t safe"
-              syntax error
-            #endif
-          ]])],
-       [gl_cv_malloc_ptrdiff=yes],
-       [gl_cv_malloc_ptrdiff=no])
-    ])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/malloc.m4:104: -1- AC_DEFUN([gl_FUNC_MALLOC_POSIX], [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF])
-  AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
-  if test "$gl_cv_func_malloc_posix" = yes; then
-    AC_DEFINE([HAVE_MALLOC_POSIX], [1],
-      [Define if malloc, realloc, and calloc set errno on allocation failure.])
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
   else
-    REPLACE_MALLOC_FOR_MALLOC_POSIX=1
+    enable_dlopen=yes
   fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/malloc.m4:119: -1- AC_DEFUN([gl_CHECK_MALLOC_POSIX], [
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure],
-    [gl_cv_func_malloc_posix],
-    [
-      dnl It is too dangerous to try to allocate a large amount of memory:
-      dnl some systems go to their knees when you do that. So assume that
-      dnl all Unix implementations of the function set errno on failure,
-      dnl except on those platforms where we have seen 'test-malloc-gnu',
-      dnl 'test-realloc-gnu', 'test-calloc-gnu' fail.
-      case "$host_os" in
-        mingw*)
-          gl_cv_func_malloc_posix=no ;;
-        irix* | solaris*)
-          dnl On IRIX 6.5, the three functions return NULL with errno unset
-          dnl when the argument is larger than PTRDIFF_MAX.
-          dnl On Solaris 11.3, the three functions return NULL with errno set
-          dnl to EAGAIN, not ENOMEM, when the argument is larger than
-          dnl PTRDIFF_MAX.
-          dnl Here is a test program:
-m4_divert_push([KILL])
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define ptrdiff_t long
-#ifndef PTRDIFF_MAX
-# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1))
-#endif
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:2205: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:2205: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN_SELF' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3412: -1- AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
 
-int main ()
-{
-  void *p;
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
 
-  fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX);
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac])
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3474: -1- AU_DEFUN([AC_PATH_TOOL_PREFIX], [m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3474: -1- AC_DEFUN([AC_PATH_TOOL_PREFIX], [m4_warn([obsolete], [The macro 'AC_PATH_TOOL_PREFIX' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3497: -1- AC_DEFUN([LT_PATH_LD], [AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 
-  errno = 0;
-  p = malloc ((unsigned long) PTRDIFF_MAX + 1);
-  fprintf (stderr, "p=%p errno=%d\n", p, errno);
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
 
-  errno = 0;
-  p = calloc (PTRDIFF_MAX / 2 + 1, 2);
-  fprintf (stderr, "p=%p errno=%d\n", p, errno);
-
-  errno = 0;
-  p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1);
-  fprintf (stderr, "p=%p errno=%d\n", p, errno);
-
-  return 0;
-}
-m4_divert_pop([KILL])
-          gl_cv_func_malloc_posix=no ;;
-        *)
-          gl_cv_func_malloc_posix=yes ;;
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw* | *-*-windows*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
       esac
-    ])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/malloca.m4:8: -1- AC_DEFUN([gl_MALLOCA], [
-  dnl Use the autoconf tests for alloca(), but not the AC_SUBSTed variables
-  dnl @ALLOCA@ and @LTALLOCA@.
-  dnl gl_FUNC_ALLOCA   dnl Already brought in by the module dependencies.
-  AC_REQUIRE([gl_EEMALLOC])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/mbstate_t.m4:15: -1- AC_DEFUN([AC_TYPE_MBSTATE_T], [
-   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl for HP-UX 11.11
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi])
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
 
-   AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t],
-     [AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [AC_INCLUDES_DEFAULT[
-             #include <wchar.h>]],
-           [[mbstate_t x; return sizeof x;]])],
-        [ac_cv_type_mbstate_t=yes],
-        [ac_cv_type_mbstate_t=no])])
-   if test $ac_cv_type_mbstate_t = yes; then
-     AC_DEFINE([HAVE_MBSTATE_T], [1],
-               [Define to 1 if <wchar.h> declares mbstate_t.])
-   else
-     AC_DEFINE([mbstate_t], [int],
-               [Define to a type if <wchar.h> does not define.])
-   fi
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/mempcpy.m4:8: -1- AC_DEFUN([gl_FUNC_MEMPCPY], [
-  dnl Persuade glibc <string.h> to declare mempcpy().
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-  dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'.
-  AC_REQUIRE([AC_C_RESTRICT])
-
-  AC_REQUIRE([gl_STRING_H_DEFAULTS])
-  AC_CHECK_FUNCS([mempcpy])
-  if test $ac_cv_func_mempcpy = no; then
-    HAVE_MEMPCPY=0
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3586: -1- AU_DEFUN([AM_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3586: -1- AC_DEFUN([AM_PROG_LD], [m4_warn([obsolete], [The macro 'AM_PROG_LD' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3587: -1- AU_DEFUN([AC_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3587: -1- AC_DEFUN([AC_PROG_LD], [m4_warn([obsolete], [The macro 'AC_PROG_LD' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3923: -1- AC_DEFUN([LT_PATH_NM], [AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
   fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/mempcpy.m4:24: -1- AC_DEFUN([gl_PREREQ_MEMPCPY], [
-  :
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/minmax.m4:9: -1- AC_DEFUN([gl_MINMAX], [
-  AC_REQUIRE([gl_PREREQ_MINMAX])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/minmax.m4:15: -1- AC_DEFUN([gl_PREREQ_MINMAX], [
-  gl_MINMAX_IN_HEADER([limits.h])
-  gl_MINMAX_IN_HEADER([sys/param.h])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/minmax.m4:25: -1- AC_DEFUN([gl_MINMAX_IN_HEADER], [
-  m4_pushdef([header], AS_TR_SH([$1]))
-  m4_pushdef([HEADER], AS_TR_CPP([$1]))
-  AC_CACHE_CHECK([whether <$1> defines MIN and MAX],
-    [gl_cv_minmax_in_]header,
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <$1>
-            int x = MIN (42, 17);]],
-          [[]])],
-       [gl_cv_minmax_in_]header[=yes],
-       [gl_cv_minmax_in_]header[=no])])
-  if test $gl_cv_minmax_in_[]header = yes; then
-    AC_DEFINE([HAVE_MINMAX_IN_]HEADER, 1,
-      [Define to 1 if <$1> defines the MIN and MAX macros.])
-  fi
-  m4_popdef([HEADER])
-  m4_popdef([header])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/mode_t.m4:12: -1- AC_DEFUN([gl_PROMOTED_TYPE_MODE_T], [
-  AC_REQUIRE([AC_TYPE_MODE_T])
-  AC_CACHE_CHECK([for promoted mode_t type], [gl_cv_promoted_mode_t], [
-    dnl Assume mode_t promotes to 'int' if and only if it is smaller than 'int',
-    dnl and to itself otherwise. This assumption is not guaranteed by the ISO C
-    dnl standard, but we don't know of any real-world counterexamples.
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]],
-      [[typedef int array[2 * (sizeof (mode_t) < sizeof (int)) - 1];]])],
-      [gl_cv_promoted_mode_t='int'],
-      [gl_cv_promoted_mode_t='mode_t'])
-  ])
-  AC_DEFINE_UNQUOTED([PROMOTED_MODE_T], [$gl_cv_promoted_mode_t],
-    [Define to the type that is the result of default argument promotions of type mode_t.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/msvc-inval.m4:7: -1- AC_DEFUN([gl_MSVC_INVAL], [
-  AC_CHECK_FUNCS_ONCE([_set_invalid_parameter_handler])
-  if test $ac_cv_func__set_invalid_parameter_handler = yes; then
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
-    AC_DEFINE([HAVE_MSVC_INVALID_PARAMETER_HANDLER], [1],
-      [Define to 1 on MSVC platforms that have the "invalid parameter handler"
-       concept.])
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
   else
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
   fi
-  AC_SUBST([HAVE_MSVC_INVALID_PARAMETER_HANDLER])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/msvc-nothrow.m4:7: -1- AC_DEFUN([gl_MSVC_NOTHROW], [
-  AC_REQUIRE([gl_MSVC_INVAL])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/multiarch.m4:21: -1- AC_DEFUN_ONCE([gl_MULTIARCH], [
-  dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN.
-  AC_CACHE_CHECK([whether the compiler produces multi-arch binaries],
-    [gl_cv_c_multiarch],
-    [gl_cv_c_multiarch=no
-     AC_COMPILE_IFELSE(
-       [AC_LANG_SOURCE(
-         [[#ifndef __APPLE_CC__
-            not a universal capable compiler
-           #endif
-           typedef int dummy;
-         ]])],
-       [
-        dnl Check for potential -arch flags.  It is not universal unless
-        dnl there are at least two -arch flags with different values.
-        arch=
-        prev=
-        for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
-          if test -n "$prev"; then
-            case $word in
-              i?86 | x86_64 | ppc | ppc64 | arm | arm64)
-                if test -z "$arch" || test "$arch" = "$word"; then
-                  arch="$word"
-                else
-                  gl_cv_c_multiarch=yes
-                fi
-                ;;
-            esac
-            prev=
-          else
-            if test "x$word" = "x-arch"; then
-              prev=arch
-            fi
-          fi
-        done
-       ])
-    ])
-  if test $gl_cv_c_multiarch = yes; then
-    APPLE_UNIVERSAL_BUILD=1
-  else
-    APPLE_UNIVERSAL_BUILD=0
+  AC_SUBST([DUMPBIN])
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
-  AC_SUBST([APPLE_UNIVERSAL_BUILD])
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/nls.m4:23: -1- AC_DEFUN([AM_NLS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4018: -1- AU_DEFUN([AM_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4018: -1- AC_DEFUN([AM_PROG_NM], [m4_warn([obsolete], [The macro 'AM_PROG_NM' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4019: -1- AU_DEFUN([AC_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4019: -1- AC_DEFUN([AC_PROG_NM], [m4_warn([obsolete], [The macro 'AC_PROG_NM' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4090: -1- AC_DEFUN([_LT_DLL_DEF_P], [dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4104: -1- AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
+  ;;
+esac
+AC_SUBST([LIBM])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4123: -1- AU_DEFUN([AC_CHECK_LIBM], [m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4123: -1- AC_DEFUN([AC_CHECK_LIBM], [m4_warn([obsolete], [The macro 'AC_CHECK_LIBM' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8677: -1- AC_DEFUN([LT_PROG_ML64], [AC_CHECK_TOOL(ML64, ml64,)
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8684: -1- AC_DEFUN([LT_PROG_OBJC], [AC_CHECK_TOOL(OBJC, gcc,)
+  AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,)
+  if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
+    test set = "${OBJCFLAGS+set}" || OBJCFLAGS="`gnustep-config --objc-flags`"
+  fi
+  AC_SUBST(OBJCFLAGS)[]dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8695: -1- AC_DEFUN([LT_PROG_OBJCXX], [AC_CHECK_TOOL(OBJCXX, g++,)
+  AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,)
+  if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
+    test set = "${OBJCXXFLAGS+set}" || OBJCXXFLAGS="`gnustep-config --objc-flags`"
+  fi
+  AC_SUBST(OBJCXXFLAGS)[]dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8706: -1- AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8715: -1- AU_DEFUN([LT_AC_PROG_GCJ], [m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8715: -1- AC_DEFUN([LT_AC_PROG_GCJ], [m4_warn([obsolete], [The macro 'LT_AC_PROG_GCJ' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8722: -1- AC_DEFUN([LT_PROG_GO], [AC_CHECK_TOOL(GOC, gccgo,)
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8729: -1- AC_DEFUN([LT_PROG_RC], [AC_CHECK_TOOL(RC, windres,)
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8734: -1- AU_DEFUN([LT_AC_PROG_RC], [m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8734: -1- AC_DEFUN([LT_AC_PROG_RC], [m4_warn([obsolete], [The macro 'LT_AC_PROG_RC' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ln.m4:12: -1- AC_DEFUN([CL_PROG_LN], [AC_REQUIRE([CL_PROG_CP])dnl
+AC_CACHE_CHECK(how to make hard links, cl_cv_prog_LN, [
+rm -f conftestdata conftestfile
+echo data > conftestfile
+if ln conftestfile conftestdata 2>/dev/null; then
+  cl_cv_prog_LN=ln
+else
+  cl_cv_prog_LN="$cl_cv_prog_cp"
+fi
+rm -f conftestdata conftestfile
+])
+LN="$cl_cv_prog_LN"
+AC_SUBST(LN)dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ln.m4:28: -1- AC_DEFUN([CL_PROG_LN_S], [AC_REQUIRE([CL_PROG_LN])dnl
+dnl Make a symlink if possible; otherwise try a hard link. On filesystems
+dnl which support neither symlink nor hard link, use a plain copy.
+AC_MSG_CHECKING(whether ln -s works)
+AC_CACHE_VAL(cl_cv_prog_LN_S, [
+rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null; then
+  cl_cv_prog_LN_S="ln -s"
+else
+  cl_cv_prog_LN_S="$cl_cv_prog_LN"
+fi
+rm -f conftestdata
+])dnl
+if test "$cl_cv_prog_LN_S" = "ln -s"; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+LN_S="$cl_cv_prog_LN_S"
+AC_SUBST(LN_S)dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ln.m4:51: -1- AC_DEFUN([CL_PROG_HLN], [AC_REQUIRE([CL_PROG_LN_S])dnl
+dnl SVR4 "ln" makes hard links to symbolic links, instead of resolving the
+dnl symbolic link. To avoid this, use the "hln" program.
+AC_CACHE_CHECK(how to make hard links to symlinks, cl_cv_prog_hln, [
+cl_cv_prog_hln="ln"
+if test "$cl_cv_prog_LN_S" = "ln -s"; then
+echo "blabla" > conftest.x
+ln -s conftest.x conftest.y
+ln conftest.y conftest.z 2>&AC_FD_CC
+rm -f conftest.x
+if cat conftest.z > /dev/null 2>&1 ; then
+  # ln is usable.
+  cl_cv_prog_hln="ln"
+else
+  # conftest.z is a symbolic link to the non-existent conftest.x
+  cl_cv_prog_hln="hln"
+fi
+else
+# If there are no symbolic links, the problem cannot occur.
+cl_cv_prog_hln="ln"
+fi
+rm -f conftest*
+])
+HLN="$cl_cv_prog_hln"
+AC_SUBST(HLN)dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:14: -1- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:113: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:113: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN' is obsolete.
+You should run autoupdate.])dnl
+_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:148: -1- AU_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:148: -1- AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_WIN32_DLL' is obsolete.
+You should run autoupdate.])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:197: -1- AC_DEFUN([AC_ENABLE_SHARED], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:201: -1- AC_DEFUN([AC_DISABLE_SHARED], [_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:205: -1- AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:205: -1- AC_DEFUN([AM_ENABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_ENABLE_SHARED' is obsolete.
+You should run autoupdate.])dnl
+AC_ENABLE_SHARED($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:206: -1- AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:206: -1- AC_DEFUN([AM_DISABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_DISABLE_SHARED' is obsolete.
+You should run autoupdate.])dnl
+AC_DISABLE_SHARED($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:251: -1- AC_DEFUN([AC_ENABLE_STATIC], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:255: -1- AC_DEFUN([AC_DISABLE_STATIC], [_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:259: -1- AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:259: -1- AC_DEFUN([AM_ENABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_ENABLE_STATIC' is obsolete.
+You should run autoupdate.])dnl
+AC_ENABLE_STATIC($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:260: -1- AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:260: -1- AC_DEFUN([AM_DISABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_DISABLE_STATIC' is obsolete.
+You should run autoupdate.])dnl
+AC_DISABLE_STATIC($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:305: -1- AU_DEFUN([AC_ENABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:305: -1- AC_DEFUN([AC_ENABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_ENABLE_FAST_INSTALL' is obsolete.
+You should run autoupdate.])dnl
+_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:312: -1- AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:312: -1- AC_DEFUN([AC_DISABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_DISABLE_FAST_INSTALL' is obsolete.
+You should run autoupdate.])dnl
+_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:411: -1- AU_DEFUN([AC_LIBTOOL_PICMODE], [_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:411: -1- AC_DEFUN([AC_LIBTOOL_PICMODE], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_PICMODE' is obsolete.
+You should run autoupdate.])dnl
+_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltsugar.m4:14: -1- AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltversion.m4:19: -1- AC_DEFUN([LTVERSION_VERSION], [macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:37: -1- AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:41: -1- AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:42: -1- AC_DEFUN([_LT_AC_SHELL_INIT])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:43: -1- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:45: -1- AC_DEFUN([_LT_AC_TAGVAR])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:46: -1- AC_DEFUN([AC_LTDL_ENABLE_INSTALL])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:47: -1- AC_DEFUN([AC_LTDL_PREOPEN])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:48: -1- AC_DEFUN([_LT_AC_SYS_COMPILER])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:49: -1- AC_DEFUN([_LT_AC_LOCK])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:50: -1- AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:51: -1- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:52: -1- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:53: -1- AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:54: -1- AC_DEFUN([AC_LIBTOOL_OBJDIR])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:55: -1- AC_DEFUN([AC_LTDL_OBJDIR])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:56: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:57: -1- AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:58: -1- AC_DEFUN([AC_PATH_MAGIC])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:59: -1- AC_DEFUN([AC_PROG_LD_GNU])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:60: -1- AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:61: -1- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:62: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:63: -1- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:64: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:65: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:66: -1- AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:67: -1- AC_DEFUN([LT_AC_PROG_EGREP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:68: -1- AC_DEFUN([LT_AC_PROG_SED])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:72: -1- AC_DEFUN([_AC_PROG_LIBTOOL])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:73: -1- AC_DEFUN([AC_LIBTOOL_SETUP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:74: -1- AC_DEFUN([_LT_AC_CHECK_DLFCN])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:75: -1- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:76: -1- AC_DEFUN([_LT_AC_TAGCONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:78: -1- AC_DEFUN([_LT_AC_LANG_CXX])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:79: -1- AC_DEFUN([_LT_AC_LANG_F77])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:80: -1- AC_DEFUN([_LT_AC_LANG_GCJ])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:81: -1- AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:82: -1- AC_DEFUN([_LT_AC_LANG_C_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:83: -1- AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:84: -1- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:85: -1- AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:86: -1- AC_DEFUN([_LT_AC_LANG_F77_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:87: -1- AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:88: -1- AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:89: -1- AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:90: -1- AC_DEFUN([_LT_AC_LANG_RC_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:91: -1- AC_DEFUN([AC_LIBTOOL_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:92: -1- AC_DEFUN([_LT_AC_FILE_LTDLL_C])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:94: -1- AC_DEFUN([_LT_AC_PROG_CXXCPP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:97: -1- AC_DEFUN([_LT_PROG_F77])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:98: -1- AC_DEFUN([_LT_PROG_FC])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:99: -1- AC_DEFUN([_LT_PROG_CXX])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/nls.m4:24: -1- AC_DEFUN([AM_NLS], [
   AC_MSG_CHECKING([whether NLS is requested])
   dnl Default is enabled NLS
   AC_ARG_ENABLE([nls],
@@ -7905,267 +12684,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/n
   AC_MSG_RESULT([$USE_NLS])
   AC_SUBST([USE_NLS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/nocrash.m4:18: -1- AC_DEFUN([GL_NOCRASH], [[
-#include <stdlib.h>
-#if defined __MACH__ && defined __APPLE__
-/* Avoid a crash on Mac OS X.  */
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <mach/thread_status.h>
-#include <mach/exception.h>
-#include <mach/task.h>
-#include <pthread.h>
-/* The exception port on which our thread listens.  */
-static mach_port_t our_exception_port;
-/* The main function of the thread listening for exceptions of type
-   EXC_BAD_ACCESS.  */
-static void *
-mach_exception_thread (void *arg)
-{
-  /* Buffer for a message to be received.  */
-  struct {
-    mach_msg_header_t head;
-    mach_msg_body_t msgh_body;
-    char data[1024];
-  } msg;
-  mach_msg_return_t retval;
-  /* Wait for a message on the exception port.  */
-  retval = mach_msg (&msg.head, MACH_RCV_MSG | MACH_RCV_LARGE, 0, sizeof (msg),
-                     our_exception_port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-  if (retval != MACH_MSG_SUCCESS)
-    abort ();
-  exit (1);
-}
-static void
-nocrash_init (void)
-{
-  mach_port_t self = mach_task_self ();
-  /* Allocate a port on which the thread shall listen for exceptions.  */
-  if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port)
-      == KERN_SUCCESS) {
-    /* See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html.  */
-    if (mach_port_insert_right (self, our_exception_port, our_exception_port,
-                                MACH_MSG_TYPE_MAKE_SEND)
-        == KERN_SUCCESS) {
-      /* The exceptions we want to catch.  Only EXC_BAD_ACCESS is interesting
-         for us.  */
-      exception_mask_t mask = EXC_MASK_BAD_ACCESS;
-      /* Create the thread listening on the exception port.  */
-      pthread_attr_t attr;
-      pthread_t thread;
-      if (pthread_attr_init (&attr) == 0
-          && pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED) == 0
-          && pthread_create (&thread, &attr, mach_exception_thread, NULL) == 0) {
-        pthread_attr_destroy (&attr);
-        /* Replace the exception port info for these exceptions with our own.
-           Note that we replace the exception port for the entire task, not only
-           for a particular thread.  This has the effect that when our exception
-           port gets the message, the thread specific exception port has already
-           been asked, and we don't need to bother about it.
-           See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html.  */
-        task_set_exception_ports (self, mask, our_exception_port,
-                                  EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
-      }
-    }
-  }
-}
-#elif defined _WIN32 && ! defined __CYGWIN__
-/* Avoid a crash on native Windows.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winerror.h>
-static LONG WINAPI
-exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
-{
-  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
-    {
-    case EXCEPTION_ACCESS_VIOLATION:
-    case EXCEPTION_IN_PAGE_ERROR:
-    case EXCEPTION_STACK_OVERFLOW:
-    case EXCEPTION_GUARD_PAGE:
-    case EXCEPTION_PRIV_INSTRUCTION:
-    case EXCEPTION_ILLEGAL_INSTRUCTION:
-    case EXCEPTION_DATATYPE_MISALIGNMENT:
-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-      exit (1);
-    }
-  return EXCEPTION_CONTINUE_SEARCH;
-}
-static void
-nocrash_init (void)
-{
-  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
-}
-#else
-/* Avoid a crash on POSIX systems.  */
-#include <signal.h>
-#include <unistd.h>
-/* A POSIX signal handler.  */
-static void
-exception_handler (int sig)
-{
-  _exit (1);
-}
-static void
-nocrash_init (void)
-{
-#ifdef SIGSEGV
-  signal (SIGSEGV, exception_handler);
-#endif
-#ifdef SIGBUS
-  signal (SIGBUS, exception_handler);
-#endif
-}
-#endif
-]])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/off_t.m4:10: -1- AC_DEFUN([gl_TYPE_OFF_T], [
-  m4_ifdef([gl_LARGEFILE], [
-    AC_REQUIRE([gl_LARGEFILE])
-  ], [
-    WINDOWS_64_BIT_OFF_T=0
-  ])
-  AC_SUBST([WINDOWS_64_BIT_OFF_T])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/open-cloexec.m4:8: -1- AC_DEFUN([gl_PREPROC_O_CLOEXEC], [
-  AC_CACHE_CHECK([for O_CLOEXEC],
-    [gl_cv_macro_O_CLOEXEC],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([[#include <fcntl.h>
-                          #ifndef O_CLOEXEC
-                            choke me;
-                          #endif
-                        ]],
-                        [[return O_CLOEXEC;]])],
-       [gl_cv_macro_O_CLOEXEC=yes],
-       [gl_cv_macro_O_CLOEXEC=no])])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/open-slash.m4:9: -1- AC_DEFUN([gl_OPEN_TRAILING_SLASH_BUG], [
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  dnl open("foo/") should not create a file when the file name has a
-  dnl trailing slash.  FreeBSD only has the problem on symlinks.
-  AC_CHECK_FUNCS_ONCE([lstat])
-  AC_CACHE_CHECK([whether open recognizes a trailing slash],
-    [gl_cv_func_open_slash],
-    [# Assume that if we have lstat, we can also check symlinks.
-     if test $ac_cv_func_lstat = yes; then
-       touch conftest.tmp
-       ln -s conftest.tmp conftest.lnk
-     fi
-     AC_RUN_IFELSE(
-       [AC_LANG_SOURCE([[
-#include <fcntl.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-]GL_MDA_DEFINES[
-int main ()
-{
-  int result = 0;
-#if HAVE_LSTAT
-  if (open ("conftest.lnk/", O_RDONLY) != -1)
-    result |= 1;
-#endif
-  if (open ("conftest.sl/", O_CREAT, 0600) >= 0)
-    result |= 2;
-  return result;
-}]])],
-       [gl_cv_func_open_slash=yes],
-       [gl_cv_func_open_slash=no],
-       [
-changequote(,)dnl
-        case "$host_os" in
-          freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
-            gl_cv_func_open_slash="guessing no" ;;
-          *)
-            gl_cv_func_open_slash="guessing yes" ;;
-        esac
-changequote([,])dnl
-       ])
-     rm -f conftest.sl conftest.tmp conftest.lnk
-    ])
-  case "$gl_cv_func_open_slash" in
-    *no)
-      AC_DEFINE([OPEN_TRAILING_SLASH_BUG], [1],
-        [Define to 1 if open() fails to recognize a trailing slash.])
-      ;;
-  esac
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/open.m4:7: -1- AC_DEFUN([gl_FUNC_OPEN], [
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_PREPROC_O_CLOEXEC])
-  case "$host_os" in
-    mingw* | pw*)
-      REPLACE_OPEN=1
-      ;;
-    *)
-      dnl open("foo/") should not create a file when the file name has a
-      dnl trailing slash.  FreeBSD only has the problem on symlinks.
-      AC_CHECK_FUNCS_ONCE([lstat])
-      if test "$gl_cv_macro_O_CLOEXEC" != yes; then
-        REPLACE_OPEN=1
-      fi
-      gl_OPEN_TRAILING_SLASH_BUG
-      case "$gl_cv_func_open_slash" in
-        *no)
-          REPLACE_OPEN=1
-          ;;
-      esac
-      ;;
-  esac
-  dnl Replace open() for supporting the gnulib-defined fchdir() function,
-  dnl to keep fchdir's bookkeeping up-to-date.
-  m4_ifdef([gl_FUNC_FCHDIR], [
-    if test $REPLACE_OPEN = 0; then
-      gl_TEST_FCHDIR
-      if test $HAVE_FCHDIR = 0; then
-        REPLACE_OPEN=1
-      fi
-    fi
-  ])
-  dnl Replace open() for supporting the gnulib-defined O_NONBLOCK flag.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    if test $REPLACE_OPEN = 0; then
-      gl_NONBLOCKING_IO
-      if test $gl_cv_have_open_O_NONBLOCK != yes; then
-        REPLACE_OPEN=1
-      fi
-    fi
-  ])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/open.m4:52: -1- AC_DEFUN([gl_PREREQ_OPEN], [
-  AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T])
-  :
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/pathmax.m4:8: -1- AC_DEFUN([gl_PATHMAX], [
-  dnl Prerequisites of lib/pathmax.h.
-  AC_CHECK_HEADERS_ONCE([sys/param.h])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/pathmax.m4:16: -1- AC_DEFUN([gl_PATHMAX_SNIPPET], [[
-/* Arrange to define PATH_MAX, like "pathmax.h" does. */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <limits.h>
-#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
-# include <sys/param.h>
-#endif
-#if !defined PATH_MAX && defined MAXPATHLEN
-# define PATH_MAX MAXPATHLEN
-#endif
-#ifdef __hpux
-# undef PATH_MAX
-# define PATH_MAX 1024
-#endif
-#if defined _WIN32 && ! defined __CYGWIN__
-# undef PATH_MAX
-# define PATH_MAX 260
-#endif
-]])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/pathmax.m4:39: -1- AC_DEFUN([gl_PATHMAX_SNIPPET_PREREQ], [
-  AC_CHECK_HEADERS_ONCE([unistd.h sys/param.h])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/po.m4:23: -1- AC_DEFUN([AM_PO_SUBDIRS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/po.m4:25: -1- AC_DEFUN([AM_PO_SUBDIRS], [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
   AC_REQUIRE([AC_PROG_MKDIR_P])dnl
@@ -8174,7 +12693,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/p
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.20])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.22])
 
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.
@@ -8323,7 +12842,9 @@ changequote([,])dnl
                 #      presentlang can be used as a fallback for messages
                 #      which are not translated in the desiredlang catalog).
                 case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
+                  "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+                    useit=yes
+                    ;;
                 esac
               done
               if test $useit = yes; then
@@ -8358,7 +12879,7 @@ changequote([,])dnl
     LINGUAS="${LINGUAS-%UNSET%}"
    ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/po.m4:219: -1- AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/po.m4:223: -1- AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], [
   # When this code is run, in config.status, two variables have already been
   # set:
   # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
@@ -8520,7 +13041,9 @@ changequote([,])dnl
         #      presentlang can be used as a fallback for messages
         #      which are not translated in the desiredlang catalog).
         case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
+          "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+            useit=yes
+            ;;
         esac
       done
       if test $useit = yes; then
@@ -8576,14 +13099,14 @@ EOF
   fi
   mv "$ac_file.tmp" "$ac_file"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/po.m4:440: -1- AC_DEFUN([AM_XGETTEXT_OPTION_INIT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/po.m4:446: -1- AC_DEFUN([AM_XGETTEXT_OPTION_INIT], [
   XGETTEXT_EXTRA_OPTIONS=
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/po.m4:446: -1- AC_DEFUN([AM_XGETTEXT_OPTION], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/po.m4:452: -1- AC_DEFUN([AM_XGETTEXT_OPTION], [
   AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/progtest.m4:25: -1- AC_DEFUN([AM_PATH_PROG_WITH_TEST], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/progtest.m4:26: -1- AC_DEFUN([AM_PATH_PROG_WITH_TEST], [
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
@@ -8620,9 +13143,9 @@ AC_CACHE_VAL([ac_cv_path_$1],
     ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
     ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
     for ac_dir in m4_if([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
+      IFS="$gt_saved_IFS"
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
@@ -8634,7 +13157,7 @@ AC_CACHE_VAL([ac_cv_path_$1],
         fi
       done
     done
-    IFS="$ac_save_IFS"
+    IFS="$gt_saved_IFS"
 dnl If no 4th arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
 m4_if([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
@@ -8649,4395 +13172,6 @@ else
 fi
 AC_SUBST([$1])dnl
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/raise.m4:7: -1- AC_DEFUN([gl_FUNC_RAISE], [
-  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS([raise])
-  if test $ac_cv_func_raise = no; then
-    HAVE_RAISE=0
-  else
-    m4_ifdef([gl_MSVC_INVAL], [
-      AC_REQUIRE([gl_MSVC_INVAL])
-      if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-        REPLACE_RAISE=1
-      fi
-    ])
-    m4_ifdef([gl_SIGNALBLOCKING], [
-      gl_SIGNALBLOCKING
-      if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-        m4_ifdef([gl_SIGNAL_SIGPIPE], [
-          gl_SIGNAL_SIGPIPE
-          if test $gl_cv_header_signal_h_SIGPIPE != yes; then
-            REPLACE_RAISE=1
-          fi
-        ], [:])
-      fi
-    ])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/raise.m4:36: -1- AC_DEFUN([gl_PREREQ_RAISE], [:])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/rawmemchr.m4:7: -1- AC_DEFUN([gl_FUNC_RAWMEMCHR], [
-  dnl Persuade glibc <string.h> to declare rawmemchr().
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-  AC_REQUIRE([gl_STRING_H_DEFAULTS])
-  AC_CHECK_FUNCS([rawmemchr])
-  if test $ac_cv_func_rawmemchr = no; then
-    HAVE_RAWMEMCHR=0
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/rawmemchr.m4:20: -1- AC_DEFUN([gl_PREREQ_RAWMEMCHR], [:])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/read.m4:7: -1- AC_DEFUN([gl_FUNC_READ], [
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  m4_ifdef([gl_MSVC_INVAL], [
-    AC_REQUIRE([gl_MSVC_INVAL])
-    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-      REPLACE_READ=1
-    fi
-  ])
-  dnl This ifdef is just an optimization, to avoid performing a configure
-  dnl check whose result is not used. It does not make the test of
-  dnl GNULIB_UNISTD_H_NONBLOCKING or GNULIB_NONBLOCKING redundant.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    gl_NONBLOCKING_IO
-    if test $gl_cv_have_nonblocking != yes; then
-      REPLACE_READ=1
-    fi
-  ])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/read.m4:28: -1- AC_DEFUN([gl_PREREQ_READ], [:])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/readlink.m4:7: -1- AC_DEFUN([gl_FUNC_READLINK], [
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CHECK_FUNCS_ONCE([readlink])
-  if test $ac_cv_func_readlink = no; then
-    HAVE_READLINK=0
-  else
-    AC_CACHE_CHECK([whether readlink signature is correct],
-      [gl_cv_decl_readlink_works],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-           [[#include <unistd.h>
-      /* Cause compilation failure if original declaration has wrong type.  */
-      ssize_t readlink (const char *, char *, size_t);]])],
-         [gl_cv_decl_readlink_works=yes], [gl_cv_decl_readlink_works=no])])
-    dnl Solaris 9 ignores trailing slash.
-    dnl FreeBSD 7.2 dereferences only one level of links with trailing slash.
-    AC_CACHE_CHECK([whether readlink handles trailing slash correctly],
-      [gl_cv_func_readlink_trailing_slash],
-      [# We have readlink, so assume ln -s works.
-       ln -s conftest.no-such conftest.link
-       ln -s conftest.link conftest.lnk2
-       AC_RUN_IFELSE(
-         [AC_LANG_PROGRAM(
-           [[#include <unistd.h>
-]], [[char buf[20];
-      return readlink ("conftest.lnk2/", buf, sizeof buf) != -1;]])],
-         [gl_cv_func_readlink_trailing_slash=yes],
-         [gl_cv_func_readlink_trailing_slash=no],
-         [case "$host_os" in
-            # Guess yes on Linux or glibc systems.
-            linux-* | linux | *-gnu* | gnu*)
-              gl_cv_func_readlink_trailing_slash="guessing yes" ;;
-            # Guess no on AIX or HP-UX.
-            aix* | hpux*)
-              gl_cv_func_readlink_trailing_slash="guessing no" ;;
-            # If we don't know, obey --enable-cross-guesses.
-            *)
-              gl_cv_func_readlink_trailing_slash="$gl_cross_guess_normal" ;;
-          esac
-         ])
-      rm -f conftest.link conftest.lnk2])
-    case "$gl_cv_func_readlink_trailing_slash" in
-      *yes)
-        if test "$gl_cv_decl_readlink_works" != yes; then
-          REPLACE_READLINK=1
-        fi
-        ;;
-      *)
-        AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink
-          fails to recognize a trailing slash.])
-        REPLACE_READLINK=1
-        ;;
-    esac
-
-    AC_CACHE_CHECK([whether readlink truncates results correctly],
-      [gl_cv_func_readlink_truncate],
-      [# We have readlink, so assume ln -s works.
-       ln -s ab conftest.link
-       AC_RUN_IFELSE(
-         [AC_LANG_PROGRAM(
-           [[#include <unistd.h>
-]], [[char c;
-      return readlink ("conftest.link", &c, 1) != 1;]])],
-         [gl_cv_func_readlink_truncate=yes],
-         [gl_cv_func_readlink_truncate=no],
-         [case "$host_os" in
-            # Guess yes on Linux or glibc systems.
-            linux-* | linux | *-gnu* | gnu*)
-              gl_cv_func_readlink_truncate="guessing yes" ;;
-            # Guess no on AIX or HP-UX.
-            aix* | hpux*)
-              gl_cv_func_readlink_truncate="guessing no" ;;
-            # If we don't know, obey --enable-cross-guesses.
-            *)
-              gl_cv_func_readlink_truncate="$gl_cross_guess_normal" ;;
-          esac
-         ])
-      rm -f conftest.link conftest.lnk2])
-    case $gl_cv_func_readlink_truncate in
-      *yes)
-        if test "$gl_cv_decl_readlink_works" != yes; then
-          REPLACE_READLINK=1
-        fi
-        ;;
-      *)
-        AC_DEFINE([READLINK_TRUNCATE_BUG], [1], [Define to 1 if readlink
-          sets errno instead of truncating a too-long link.])
-        REPLACE_READLINK=1
-        ;;
-    esac
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/readlink.m4:104: -1- AC_DEFUN([gl_FUNC_READLINK_SEPARATE], [
-  AC_CHECK_FUNCS_ONCE([readlink])
-  gl_PREREQ_READLINK
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/readlink.m4:111: -1- AC_DEFUN([gl_PREREQ_READLINK], [
-  :
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/realloc.m4:9: -1- AC_DEFUN([_AC_FUNC_REALLOC_IF], [
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
-  AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull],
-    [ac_cv_func_realloc_0_nonnull],
-    [AC_RUN_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stdlib.h>
-          ]],
-          [[void *p = realloc (0, 0);
-            int result = !p;
-            free (p);
-            return result;]])
-       ],
-       [ac_cv_func_realloc_0_nonnull=yes],
-       [ac_cv_func_realloc_0_nonnull=no],
-       [case "$host_os" in
-          # Guess yes on platforms where we know the result.
-          *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
-          | gnu* | *-musl* | midnightbsd* \
-          | hpux* | solaris* | cygwin* | mingw* | msys* )
-            ac_cv_func_realloc_0_nonnull="guessing yes" ;;
-          # If we don't know, obey --enable-cross-guesses.
-          *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;;
-        esac
-       ])
-    ])
-  AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/realloc.m4:42: -1- AC_DEFUN([gl_FUNC_REALLOC_GNU], [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([gl_FUNC_REALLOC_POSIX])
-  if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 0; then
-    _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC_FOR_REALLOC_GNU=1])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/realloc.m4:56: -1- AC_DEFUN([gl_FUNC_REALLOC_POSIX], [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([gl_FUNC_MALLOC_POSIX])
-  if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then
-    REPLACE_REALLOC_FOR_REALLOC_POSIX=1
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:10: -1- AC_DEFUN([gl_RELOCATABLE_LIBRARY], [
-  AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:14: -1- AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], [
-  AC_REQUIRE([gl_RELOCATABLE_NOP])
-  dnl Easier to put this here once, instead of into the DEFS of each Makefile.
-  if test "X$prefix" = "XNONE"; then
-    reloc_final_prefix="$ac_default_prefix"
-  else
-    reloc_final_prefix="$prefix"
-  fi
-  AC_DEFINE_UNQUOTED([INSTALLPREFIX], ["${reloc_final_prefix}"],
-    [Define to the value of ${prefix}, as a string.])
-  if test $RELOCATABLE = yes; then
-    AC_DEFINE([ENABLE_RELOCATABLE], [1],
-      [Define to 1 if the package shall run at any location in the file
-       system.])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:33: -1- AC_DEFUN([gl_RELOCATABLE_NOP], [
-  AC_MSG_CHECKING([whether to activate relocatable installation])
-  AC_ARG_ENABLE([relocatable],
-    [AS_HELP_STRING([--enable-relocatable],
-      [install a package that can be moved in the file system])],
-    [if test "$enableval" != no; then
-       RELOCATABLE=yes
-     else
-       RELOCATABLE=no
-     fi
-    ], RELOCATABLE=no)
-  AC_SUBST([RELOCATABLE])
-  AC_MSG_RESULT([$RELOCATABLE])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable.m4:13: -1- AC_DEFUN([gl_RELOCATABLE], [
-  AC_REQUIRE([gl_RELOCATABLE_BODY])
-  gl_RELOCATABLE_LIBRARY
-  : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
-  RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
-  RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable.m4:22: -1- AC_DEFUN([gl_RELOCATABLE_BODY], [
-  AC_REQUIRE([AC_PROG_INSTALL])
-
-  dnl This AC_BEFORE invocation leads to unjustified autoconf warnings
-  dnl when gl_RELOCATABLE_BODY is invoked more than once.
-  dnl
-  dnl We need this AC_BEFORE because AC_PROG_INSTALL is documented to
-  dnl overwrite earlier settings of INSTALL and INSTALL_PROGRAM (even
-  dnl though in autoconf-2.52..2.60 it doesn't do so), but we want this
-  dnl macro's setting of INSTALL_PROGRAM to persist.
-  dnl Arghh: AC_BEFORE does not work in this setting :-(
-  dnl AC_BEFORE([AC_PROG_INSTALL],[gl_RELOCATABLE_BODY])
-  dnl
-  dnl LT_INIT sets LIBTOOL, but we want this macro's setting of LIBTOOL to
-  dnl persist.
-  dnl Arghh: AC_BEFORE does not work in this setting :-(
-  dnl AC_BEFORE([LT_INIT],[gl_RELOCATABLE_BODY])
-
-  AC_REQUIRE([AC_LIB_LIBPATH])
-  AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  is_noop=no
-  use_elf_origin_trick=no
-  use_macos_tools=no
-  use_wrapper=no
-  if test $RELOCATABLE = yes; then
-    # --enable-relocatable implies --disable-rpath
-    enable_rpath=no
-    AC_CHECK_HEADERS([mach-o/dyld.h])
-    AC_CHECK_FUNCS([_NSGetExecutablePath])
-    case "$host_os" in
-      mingw*) is_noop=yes ;;
-      # For the platforms that support $ORIGIN, see
-      # <https://lekensteyn.nl/rpath.html>.
-      # glibc systems, Linux with musl libc: yes. Android: no.
-      linux*-android*) ;;
-      linux* | kfreebsd*) use_elf_origin_trick=yes ;;
-      # Hurd: <https://lists.gnu.org/r/bug-hurd/2019-02/msg00049.html>
-      # only after the glibc commit from 2018-01-08
-      # <https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=311ba8dc4416467947eff2ab327854f124226309>
-      gnu*)
-        # Test for a glibc version >= 2.27.
-        AC_CHECK_FUNCS([copy_file_range])
-        if test $ac_cv_func_copy_file_range = yes; then
-          use_elf_origin_trick=yes
-        fi
-        ;;
-changequote(,)dnl
-      # FreeBSD >= 7.3, DragonFly >= 3.0, MidnightBSD >= 1.1: yes.
-      freebsd | freebsd[1-7] | freebsd[1-6].* | freebsd7.[0-2]) ;;
-      dragonfly | dragonfly[1-2] | dragonfly[1-2].*) ;;
-      midnightbsd | midnightbsd0* | midnightbsd1.0*) ;;
-      freebsd* | dragonfly* | midnightbsd*) use_elf_origin_trick=yes ;;
-      # NetBSD >= 8.0: yes.
-      netbsd | netbsd[1-7] | netbsd[1-7].*) ;;
-      netbsdelf | netbsdelf[1-7] | netbsdelf[1-7].*) ;;
-      netbsd*) use_elf_origin_trick=yes ;;
-      # OpenBSD >= 5.4: yes.
-      openbsd | openbsd[1-5] | openbsd[1-4].* | openbsd5.[0-3]) ;;
-      openbsd*) use_elf_origin_trick=yes ;;
-      # Solaris >= 10: yes.
-      solaris | solaris2.[1-9] | solaris2.[1-9].*) ;;
-      solaris*) use_elf_origin_trick=yes ;;
-      # Haiku: yes.
-      haiku*) use_elf_origin_trick=yes ;;
-      # On Mac OS X 10.4 or newer, use Mac OS X tools. See
-      # <https://wincent.com/wiki/@executable_path,_@load_path_and_@rpath>.
-      darwin | darwin[1-7].*) ;;
-      darwin*) use_macos_tools=yes ;;
-changequote([,])dnl
-    esac
-    if test $is_noop = yes; then
-      RELOCATABLE_LDFLAGS=:
-      AC_SUBST([RELOCATABLE_LDFLAGS])
-    else
-      if test $use_elf_origin_trick = yes || test $use_macos_tools = yes; then
-        dnl Use the dynamic linker's support for relocatable programs.
-        case "$ac_aux_dir" in
-          /*) reloc_ldflags="$ac_aux_dir/reloc-ldflags" ;;
-          *) reloc_ldflags="\$(top_builddir)/$ac_aux_dir/reloc-ldflags" ;;
-        esac
-        RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
-        AC_SUBST([RELOCATABLE_LDFLAGS])
-        if test $use_macos_tools = yes; then
-          dnl Use a libtool wrapper that uses Mac OS X tools.
-          case "$ac_aux_dir" in
-            /*) LIBTOOL="${CONFIG_SHELL-$SHELL} $ac_aux_dir/libtool-reloc $LIBTOOL" ;;
-            *) LIBTOOL="${CONFIG_SHELL-$SHELL} \$(top_builddir)/$ac_aux_dir/libtool-reloc $LIBTOOL" ;;
-          esac
-        fi
-      else
-        use_wrapper=yes
-        dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
-        dnl consisting of more than one word - libtool doesn't support this.
-        dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
-        dnl 'install-strip' target.
-        INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\""
-        AC_SUBST([INSTALL_PROGRAM_ENV])
-        case "$ac_aux_dir" in
-          /*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
-          *) INSTALL_PROGRAM="\$(top_builddir)/$ac_aux_dir/install-reloc" ;;
-        esac
-      fi
-    fi
-  fi
-  AM_CONDITIONAL([RELOCATABLE_VIA_LD],
-    [test $is_noop = yes || test $use_elf_origin_trick = yes || test $use_macos_tools = yes])
-  AM_CONDITIONAL([RELOCATABLE_VIA_WRAPPER], [test $use_wrapper = yes])
-
-  dnl RELOCATABLE_LIBRARY_PATH can be set in configure.ac. Default is empty.
-  AC_SUBST([RELOCATABLE_LIBRARY_PATH])
-
-  AC_SUBST([RELOCATABLE_CONFIG_H_DIR])
-  AC_SUBST([RELOCATABLE_SRC_DIR])
-  AC_SUBST([RELOCATABLE_BUILD_DIR])
-
-  dnl Ensure RELOCATABLE_STRIP is defined in Makefiles (at least those
-  dnl generated by automake), with value ':'.
-  RELOCATABLE_STRIP=':'
-  AC_SUBST([RELOCATABLE_STRIP])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable.m4:147: -1- AC_DEFUN([AC_LIB_LIBPATH], [
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library path variable], [acl_cv_libpath], [
-    LD="$LD" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.libpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_libpath=${acl_cv_shlibpath_var:-none}
-  ])
-  shlibpath_var="$acl_cv_shlibpath_var"
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/safe-read.m4:9: -1- AC_DEFUN([gl_PREREQ_SAFE_READ], [
-  AC_REQUIRE([gt_TYPE_SSIZE_T])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/setenv.m4:7: -1- AC_DEFUN([gl_FUNC_SETENV], [
-  AC_REQUIRE([gl_FUNC_SETENV_SEPARATE])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  if test $ac_cv_func_setenv = no; then
-    HAVE_SETENV=0
-  else
-    AC_CACHE_CHECK([whether setenv validates arguments],
-      [gl_cv_func_setenv_works],
-      [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-       #include <stdlib.h>
-       #include <errno.h>
-       #include <string.h>
-      ]], [[
-       int result = 0;
-       {
-         if (setenv ("", "", 0) != -1)
-           result |= 1;
-         else if (errno != EINVAL)
-           result |= 2;
-       }
-       {
-         if (setenv ("a", "=", 1) != 0)
-           result |= 4;
-         else if (strcmp (getenv ("a"), "=") != 0)
-           result |= 8;
-       }
-       return result;
-      ]])],
-      [gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no],
-      [case "$host_os" in
-                        # Guess yes on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;;
-                        # Guess yes on musl systems.
-         *-musl*)       gl_cv_func_setenv_works="guessing yes" ;;
-                        # If we don't know, obey --enable-cross-guesses.
-         *)             gl_cv_func_setenv_works="$gl_cross_guess_normal" ;;
-       esac
-      ])])
-    case "$gl_cv_func_setenv_works" in
-      *yes) ;;
-      *)
-        REPLACE_SETENV=1
-        ;;
-    esac
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/setenv.m4:57: -1- AC_DEFUN([gl_FUNC_SETENV_SEPARATE], [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_CHECK_DECLS_ONCE([setenv])
-  if test $ac_cv_have_decl_setenv = no; then
-    HAVE_DECL_SETENV=0
-  fi
-  AC_CHECK_FUNCS_ONCE([setenv])
-  gl_PREREQ_SETENV
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/setenv.m4:68: -1- AC_DEFUN([gl_FUNC_UNSETENV], [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CHECK_DECLS_ONCE([unsetenv])
-  if test $ac_cv_have_decl_unsetenv = no; then
-    HAVE_DECL_UNSETENV=0
-  fi
-  AC_CHECK_FUNCS([unsetenv])
-  if test $ac_cv_func_unsetenv = no; then
-    HAVE_UNSETENV=0
-  else
-    HAVE_UNSETENV=1
-    dnl Some BSDs return void, failing to do error checking.
-    AC_CACHE_CHECK([for unsetenv() return type], [gt_cv_func_unsetenv_ret],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[
-#undef _BSD
-#define _BSD 1 /* unhide unsetenv declaration in OSF/1 5.1 <stdlib.h> */
-#include <stdlib.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-int unsetenv (const char *name);
-            ]],
-            [[]])],
-         [gt_cv_func_unsetenv_ret='int'],
-         [gt_cv_func_unsetenv_ret='void'])])
-    if test $gt_cv_func_unsetenv_ret = 'void'; then
-      AC_DEFINE([VOID_UNSETENV], [1], [Define to 1 if unsetenv returns void
-       instead of int.])
-      REPLACE_UNSETENV=1
-    fi
-
-    dnl Solaris 10 unsetenv does not remove all copies of a name.
-    dnl Haiku alpha 2 unsetenv gets confused by assignment to environ.
-    dnl OpenBSD 4.7 unsetenv("") does not fail.
-    AC_CACHE_CHECK([whether unsetenv obeys POSIX],
-      [gl_cv_func_unsetenv_works],
-      [AC_RUN_IFELSE(
-         [AC_LANG_PROGRAM([[
-            #include <stdlib.h>
-            #include <errno.h>
-            extern char **environ;
-           ]GL_MDA_DEFINES],
-           [[
-            char entry1[] = "a=1";
-            char entry2[] = "b=2";
-            char *env[] = { entry1, entry2, NULL };
-            if (putenv ((char *) "a=1")) return 1;
-            if (putenv (entry2)) return 2;
-            entry2[0] = 'a';
-            unsetenv ("a");
-            if (getenv ("a")) return 3;
-            if (!unsetenv ("") || errno != EINVAL) return 4;
-            entry2[0] = 'b';
-            environ = env;
-            if (!getenv ("a")) return 5;
-            entry2[0] = 'a';
-            unsetenv ("a");
-            if (getenv ("a")) return 6;
-           ]])],
-         [gl_cv_func_unsetenv_works=yes],
-         [gl_cv_func_unsetenv_works=no],
-         [case "$host_os" in
-                    # Guess yes on glibc systems.
-            *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;;
-                    # If we don't know, obey --enable-cross-guesses.
-            *)      gl_cv_func_unsetenv_works="$gl_cross_guess_normal" ;;
-          esac
-         ])
-      ])
-    case "$gl_cv_func_unsetenv_works" in
-      *yes) ;;
-      *)
-        REPLACE_UNSETENV=1
-        ;;
-    esac
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/setenv.m4:152: -1- AC_DEFUN([gl_PREREQ_SETENV], [
-  AC_REQUIRE([AC_FUNC_ALLOCA])
-  AC_REQUIRE([gl_ENVIRON])
-  AC_CHECK_HEADERS_ONCE([unistd.h])
-  AC_CHECK_HEADERS([search.h])
-  AC_CHECK_FUNCS([tsearch])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/setenv.m4:162: -1- AC_DEFUN([gl_PREREQ_UNSETENV], [
-  AC_REQUIRE([gl_ENVIRON])
-  AC_CHECK_HEADERS_ONCE([unistd.h])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/signal_h.m4:7: -1- AC_DEFUN_ONCE([gl_SIGNAL_H], [
-  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
-  gl_NEXT_HEADERS([signal.h])
-
-# AIX declares sig_atomic_t to already include volatile, and C89 compilers
-# then choke on 'volatile sig_atomic_t'.  C99 requires that it compile.
-  AC_CHECK_TYPE([volatile sig_atomic_t], [],
-    [HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0], [[
-#include <signal.h>
-    ]])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  AC_REQUIRE([AC_TYPE_UID_T])
-
-  dnl Persuade glibc <signal.h> to define sighandler_t.
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_TYPE([sighandler_t], [], [HAVE_SIGHANDLER_T=0], [[
-#include <signal.h>
-    ]])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[#include <signal.h>
-    ]], [pthread_sigmask sigaction
-    sigaddset sigdelset sigemptyset sigfillset sigismember
-    sigpending sigprocmask])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/signal_h.m4:41: -1- AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], [
-  AC_CHECK_TYPES([sigset_t],
-    [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
-    [[
-      #include <signal.h>
-      /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
-      #include <sys/types.h>
-    ]])
-  if test $gl_cv_type_sigset_t != yes; then
-    HAVE_SIGSET_T=0
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/signal_h.m4:59: -1- AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_SIGNAL_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/signal_h.m4:71: -1- AC_DEFUN([gl_SIGNAL_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SIGMASK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAISE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGPROCMASK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGACTION])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/signal_h.m4:84: -1- AC_DEFUN([gl_SIGNAL_H_DEFAULTS], [
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING])
-  HAVE_PTHREAD_SIGMASK=1;      AC_SUBST([HAVE_PTHREAD_SIGMASK])
-  HAVE_RAISE=1;                AC_SUBST([HAVE_RAISE])
-  HAVE_SIGSET_T=1;             AC_SUBST([HAVE_SIGSET_T])
-  HAVE_SIGINFO_T=1;            AC_SUBST([HAVE_SIGINFO_T])
-  HAVE_SIGACTION=1;            AC_SUBST([HAVE_SIGACTION])
-  HAVE_STRUCT_SIGACTION_SA_SIGACTION=1;
-                               AC_SUBST([HAVE_STRUCT_SIGACTION_SA_SIGACTION])
-  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
-                               AC_SUBST([HAVE_TYPE_VOLATILE_SIG_ATOMIC_T])
-  HAVE_SIGHANDLER_T=1;         AC_SUBST([HAVE_SIGHANDLER_T])
-  REPLACE_PTHREAD_SIGMASK=0;   AC_SUBST([REPLACE_PTHREAD_SIGMASK])
-  REPLACE_RAISE=0;             AC_SUBST([REPLACE_RAISE])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/signalblocking.m4:12: -1- AC_DEFUN([gl_SIGNALBLOCKING], [
-  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
-  HAVE_POSIX_SIGNALBLOCKING=0
-  if test "$gl_cv_type_sigset_t" = yes; then
-    AC_CHECK_FUNC([sigprocmask], [HAVE_POSIX_SIGNALBLOCKING=1])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/signalblocking.m4:23: -1- AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sigpipe.m4:9: -1- AC_DEFUN([gl_SIGNAL_SIGPIPE], [
-  dnl Ensure to expand the default settings once only, before all statements
-  dnl that occur in other macros.
-  AC_REQUIRE([gl_SIGNAL_SIGPIPE_BODY])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sigpipe.m4:16: -1- AC_DEFUN([gl_SIGNAL_SIGPIPE_BODY], [
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([for SIGPIPE], [gl_cv_header_signal_h_SIGPIPE], [
-    AC_EGREP_CPP([booboo],[
-#include <signal.h>
-#if !defined SIGPIPE
-booboo
-#endif
-      ],
-      [gl_cv_header_signal_h_SIGPIPE=no],
-      [gl_cv_header_signal_h_SIGPIPE=yes])
-  ])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/ssize_t.m4:10: -1- AC_DEFUN([gt_TYPE_SSIZE_T], [
-  AC_CACHE_CHECK([for ssize_t], [gt_cv_ssize_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <sys/types.h>]],
-          [[int x = sizeof (ssize_t *) + sizeof (ssize_t);
-            return !x;]])],
-       [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])])
-  if test $gt_cv_ssize_t = no; then
-    AC_DEFINE([ssize_t], [int],
-              [Define as a signed type of the same size as size_t.])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stat-time.m4:20: -1- AC_DEFUN([gl_STAT_TIME], [
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_HEADERS_ONCE([sys/time.h])
-
-  AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec],
-    [AC_CACHE_CHECK([whether struct stat.st_atim is of type struct timespec],
-       [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec],
-       [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-          [[
-            #include <sys/types.h>
-            #include <sys/stat.h>
-            #if HAVE_SYS_TIME_H
-            # include <sys/time.h>
-            #endif
-            #include <time.h>
-            struct timespec ts;
-            struct stat st;
-          ]],
-          [[
-            st.st_atim = ts;
-          ]])],
-          [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes],
-          [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no])])
-     if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then
-       AC_DEFINE([TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC], [1],
-         [Define to 1 if the type of the st_atim member of a struct stat is
-          struct timespec.])
-     fi],
-    [AC_CHECK_MEMBERS([struct stat.st_atimespec.tv_nsec], [],
-       [AC_CHECK_MEMBERS([struct stat.st_atimensec], [],
-          [AC_CHECK_MEMBERS([struct stat.st_atim.st__tim.tv_nsec], [], [],
-             [#include <sys/types.h>
-              #include <sys/stat.h>])],
-          [#include <sys/types.h>
-           #include <sys/stat.h>])],
-       [#include <sys/types.h>
-        #include <sys/stat.h>])],
-    [#include <sys/types.h>
-     #include <sys/stat.h>])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stat-time.m4:70: -1- AC_DEFUN([gl_STAT_BIRTHTIME], [
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_HEADERS_ONCE([sys/time.h])
-  AC_CHECK_MEMBERS([struct stat.st_birthtimespec.tv_nsec], [],
-    [AC_CHECK_MEMBERS([struct stat.st_birthtimensec], [],
-      [AC_CHECK_MEMBERS([struct stat.st_birthtim.tv_nsec], [], [],
-         [#include <sys/types.h>
-          #include <sys/stat.h>])],
-       [#include <sys/types.h>
-        #include <sys/stat.h>])],
-    [#include <sys/types.h>
-     #include <sys/stat.h>])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stat.m4:9: -1- AC_DEFUN([gl_FUNC_STAT], [
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
-  AC_CHECK_FUNCS_ONCE([lstat])
-  case "$host_os" in
-    mingw*)
-      dnl On this platform, the original stat() returns st_atime, st_mtime,
-      dnl st_ctime values that are affected by the time zone.
-      REPLACE_STAT=1
-      ;;
-    *)
-      dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/").
-      dnl (For mingw, this is due to a broken stat() override in libmingwex.a.)
-      dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/").
-      AC_CACHE_CHECK([whether stat handles trailing slashes on files],
-        [gl_cv_func_stat_file_slash],
-        [touch conftest.tmp
-         # Assume that if we have lstat, we can also check symlinks.
-         if test $ac_cv_func_lstat = yes; then
-           ln -s conftest.tmp conftest.lnk
-         fi
-         AC_RUN_IFELSE(
-           [AC_LANG_PROGRAM(
-             [[#include <sys/stat.h>
-]], [[int result = 0;
-               struct stat st;
-               if (!stat ("conftest.tmp/", &st))
-                 result |= 1;
-#if HAVE_LSTAT
-               if (!stat ("conftest.lnk/", &st))
-                 result |= 2;
-#endif
-               return result;
-             ]])],
-           [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no],
-           [case "$host_os" in
-                               # Guess yes on Linux systems.
-              linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;;
-                               # Guess yes on glibc systems.
-              *-gnu* | gnu*)   gl_cv_func_stat_file_slash="guessing yes" ;;
-                               # If we don't know, obey --enable-cross-guesses.
-              *)               gl_cv_func_stat_file_slash="$gl_cross_guess_normal" ;;
-            esac
-           ])
-         rm -f conftest.tmp conftest.lnk])
-      case $gl_cv_func_stat_file_slash in
-        *no)
-          REPLACE_STAT=1
-          AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs
-            help when passed a file name with a trailing slash]);;
-      esac
-      case $host_os in
-        dnl Solaris stat can return a negative tv_nsec.
-        solaris*)
-          REPLACE_FSTAT=1 ;;
-      esac
-      ;;
-  esac
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stat.m4:71: -1- AC_DEFUN([gl_PREREQ_STAT], [
-  AC_REQUIRE([gl_SYS_STAT_H])
-  AC_REQUIRE([gl_PREREQ_STAT_W32])
-  :
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stat.m4:78: -1- AC_DEFUN([gl_PREREQ_STAT_W32], [
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      AC_CHECK_HEADERS([sdkddkver.h])
-      ;;
-  esac
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdalign.m4:10: -1- AC_DEFUN([gl_STDALIGN_H], [
-  AC_CACHE_CHECK([for working stdalign.h],
-    [gl_cv_header_working_stdalign_h],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stdint.h>
-            #include <stdalign.h>
-            #include <stddef.h>
-
-            /* Test that alignof yields a result consistent with offsetof.
-               This catches GCC bug 52023
-               <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
-            #ifdef __cplusplus
-               template <class t> struct alignof_helper { char a; t b; };
-            # define ao(type) offsetof (alignof_helper<type>, b)
-            #else
-            # define ao(type) offsetof (struct { char a; type b; }, b)
-            #endif
-            char test_double[ao (double) % _Alignof (double) == 0 ? 1 : -1];
-            char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1];
-            char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1];
-
-            /* Test _Alignas only on platforms where gnulib can help.  */
-            #if \
-                ((defined __cplusplus && 201103 <= __cplusplus) \
-                 || (__TINYC__ && defined __attribute__) \
-                 || (defined __APPLE__ && defined __MACH__ \
-                     ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
-                     : __GNUC__) \
-                 || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
-                 || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \
-                 || 1300 <= _MSC_VER)
-              struct alignas_test { char c; char alignas (8) alignas_8; };
-              char test_alignas[offsetof (struct alignas_test, alignas_8) == 8
-                                ? 1 : -1];
-            #endif
-          ]])],
-       [gl_cv_header_working_stdalign_h=yes],
-       [gl_cv_header_working_stdalign_h=no])])
-
-  if test $gl_cv_header_working_stdalign_h = yes; then
-    GL_GENERATE_STDALIGN_H=false
-  else
-    GL_GENERATE_STDALIGN_H=true
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdbool.m4:12: -1- AC_DEFUN([gl_STDBOOL_H], [
-  AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
-  dnl On some platforms, <stdbool.h> does not exist or does not conform to C99.
-  dnl On Solaris 10 with CC=cc CXX=CC, <stdbool.h> exists but is not usable
-  dnl in C++ mode (and no <cstdbool> exists). In this case, we use our
-  dnl replacement, also in C mode (for binary compatibility between C and C++).
-  if test "$ac_cv_header_stdbool_h" = yes; then
-    case "$host_os" in
-      solaris*)
-        if test -z "$GCC"; then
-          GL_GENERATE_STDBOOL_H=true
-        else
-          GL_GENERATE_STDBOOL_H=false
-        fi
-        ;;
-      *)
-        GL_GENERATE_STDBOOL_H=false
-        ;;
-    esac
-  else
-    GL_GENERATE_STDBOOL_H=true
-  fi
-
-  if test "$ac_cv_type__Bool" = yes; then
-    HAVE__BOOL=1
-  else
-    HAVE__BOOL=0
-  fi
-  AC_SUBST([HAVE__BOOL])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdbool.m4:48: -1- AC_DEFUN([AC_CHECK_HEADER_STDBOOL], [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
-     [ac_cv_header_stdbool_h],
-     [AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-             #include <stdbool.h>
-
-             #ifdef __cplusplus
-              typedef bool Bool;
-             #else
-              typedef _Bool Bool;
-              #ifndef bool
-               "error: bool is not defined"
-              #endif
-              #ifndef false
-               "error: false is not defined"
-              #endif
-              #if false
-               "error: false is not 0"
-              #endif
-              #ifndef true
-               "error: true is not defined"
-              #endif
-              #if true != 1
-               "error: true is not 1"
-              #endif
-             #endif
-
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
-             #endif
-
-             struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s;
-
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
-             /* The following fails for
-                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-             /* Catch a bug in an HP-UX C compiler.  See
-                https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html
-              */
-             Bool q = true;
-             Bool *pq = &q;
-             bool *qq = &q;
-           ]],
-           [[
-             bool e = &s;
-             *pq |= q; *pq |= ! q;
-             *qq |= q; *qq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq + !qq);
-           ]])],
-        [ac_cv_header_stdbool_h=yes],
-        [ac_cv_header_stdbool_h=no])])
-   AC_CHECK_TYPES([_Bool])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stddef_h.m4:9: -1- AC_DEFUN_ONCE([gl_STDDEF_H], [
-  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
-  AC_REQUIRE([gt_TYPE_WCHAR_T])
-
-  dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-
-  GL_GENERATE_STDDEF_H=false
-
-  dnl Test whether the type max_align_t exists and whether its alignment
-  dnl "is as great as is supported by the implementation in all contexts".
-  AC_CACHE_CHECK([for good max_align_t],
-    [gl_cv_type_max_align_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stddef.h>
-            unsigned int s = sizeof (max_align_t);
-            #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__
-            int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1];
-            int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1];
-            #endif
-            typedef struct { char a; max_align_t b; } max_helper;
-            typedef struct { char a; long b; } long_helper;
-            typedef struct { char a; double b; } double_helper;
-            typedef struct { char a; long double b; } long_double_helper;
-            int check3[2 * (offsetof (long_helper, b) <= offsetof (max_helper, b)) - 1];
-            int check4[2 * (offsetof (double_helper, b) <= offsetof (max_helper, b)) - 1];
-            int check5[2 * (offsetof (long_double_helper, b) <= offsetof (max_helper, b)) - 1];
-          ]])],
-       [gl_cv_type_max_align_t=yes],
-       [gl_cv_type_max_align_t=no])
-    ])
-  if test $gl_cv_type_max_align_t = no; then
-    HAVE_MAX_ALIGN_T=0
-    GL_GENERATE_STDDEF_H=true
-  fi
-
-  if test $gt_cv_c_wchar_t = no; then
-    HAVE_WCHAR_T=0
-    GL_GENERATE_STDDEF_H=true
-  fi
-
-  AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions],
-    [gl_cv_decl_null_works],
-    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
-      int test[2 * (sizeof NULL == sizeof (void *)) -1];
-]])],
-      [gl_cv_decl_null_works=yes],
-      [gl_cv_decl_null_works=no])])
-  if test $gl_cv_decl_null_works = no; then
-    REPLACE_NULL=1
-    GL_GENERATE_STDDEF_H=true
-  fi
-
-  if $GL_GENERATE_STDDEF_H; then
-    gl_NEXT_HEADERS([stddef.h])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stddef_h.m4:73: -1- AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_STDDEF_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stddef_h.m4:83: -1- AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stddef_h.m4:91: -1- AC_DEFUN([gl_STDDEF_H_DEFAULTS], [
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
-  HAVE_MAX_ALIGN_T=1;            AC_SUBST([HAVE_MAX_ALIGN_T])
-  HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdint.m4:12: -1- AC_DEFUN_ONCE([gl_STDINT_H], [
-  AC_PREREQ([2.59])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  AC_REQUIRE([gl_LIMITS_H])
-  AC_REQUIRE([gt_TYPE_WINT_T])
-
-  dnl For backward compatibility. Some packages may still be testing these
-  dnl macros.
-  AC_DEFINE([HAVE_LONG_LONG_INT], [1],
-    [Define to 1 if the system has the type 'long long int'.])
-  AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
-    [Define to 1 if the system has the type 'unsigned long long int'.])
-
-  dnl Check for <wchar.h>, in the same way as gl_WCHAR_H does.
-  AC_CHECK_HEADERS_ONCE([wchar.h])
-  if test $ac_cv_header_wchar_h = yes; then
-    HAVE_WCHAR_H=1
-  else
-    HAVE_WCHAR_H=0
-  fi
-  AC_SUBST([HAVE_WCHAR_H])
-
-  dnl Check for <inttypes.h>.
-  AC_CHECK_HEADERS_ONCE([inttypes.h])
-  if test $ac_cv_header_inttypes_h = yes; then
-    HAVE_INTTYPES_H=1
-  else
-    HAVE_INTTYPES_H=0
-  fi
-  AC_SUBST([HAVE_INTTYPES_H])
-
-  dnl Check for <sys/types.h>.
-  AC_CHECK_HEADERS_ONCE([sys/types.h])
-  if test $ac_cv_header_sys_types_h = yes; then
-    HAVE_SYS_TYPES_H=1
-  else
-    HAVE_SYS_TYPES_H=0
-  fi
-  AC_SUBST([HAVE_SYS_TYPES_H])
-
-  gl_CHECK_NEXT_HEADERS([stdint.h])
-  if test $ac_cv_header_stdint_h = yes; then
-    HAVE_STDINT_H=1
-  else
-    HAVE_STDINT_H=0
-  fi
-  AC_SUBST([HAVE_STDINT_H])
-
-  dnl Now see whether we need a substitute <stdint.h>.
-  if test $ac_cv_header_stdint_h = yes; then
-    AC_CACHE_CHECK([whether stdint.h conforms to C99],
-      [gl_cv_header_working_stdint_h],
-      [gl_cv_header_working_stdint_h=no
-       AC_COMPILE_IFELSE([
-         AC_LANG_PROGRAM([[
-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-#define __STDC_CONSTANT_MACROS 1
-#define __STDC_LIMIT_MACROS 1
-#include <stdint.h>
-/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
-#if !(defined WCHAR_MIN && defined WCHAR_MAX)
-#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
-#endif
-]
-gl_STDINT_INCLUDES
-[
-#ifdef INT8_MAX
-int8_t a1 = INT8_MAX;
-int8_t a1min = INT8_MIN;
-#endif
-#ifdef INT16_MAX
-int16_t a2 = INT16_MAX;
-int16_t a2min = INT16_MIN;
-#endif
-#ifdef INT32_MAX
-int32_t a3 = INT32_MAX;
-int32_t a3min = INT32_MIN;
-#endif
-#ifdef INT64_MAX
-int64_t a4 = INT64_MAX;
-int64_t a4min = INT64_MIN;
-#endif
-#ifdef UINT8_MAX
-uint8_t b1 = UINT8_MAX;
-#else
-typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
-#endif
-#ifdef UINT16_MAX
-uint16_t b2 = UINT16_MAX;
-#endif
-#ifdef UINT32_MAX
-uint32_t b3 = UINT32_MAX;
-#endif
-#ifdef UINT64_MAX
-uint64_t b4 = UINT64_MAX;
-#endif
-int_least8_t c1 = INT8_C (0x7f);
-int_least8_t c1max = INT_LEAST8_MAX;
-int_least8_t c1min = INT_LEAST8_MIN;
-int_least16_t c2 = INT16_C (0x7fff);
-int_least16_t c2max = INT_LEAST16_MAX;
-int_least16_t c2min = INT_LEAST16_MIN;
-int_least32_t c3 = INT32_C (0x7fffffff);
-int_least32_t c3max = INT_LEAST32_MAX;
-int_least32_t c3min = INT_LEAST32_MIN;
-int_least64_t c4 = INT64_C (0x7fffffffffffffff);
-int_least64_t c4max = INT_LEAST64_MAX;
-int_least64_t c4min = INT_LEAST64_MIN;
-uint_least8_t d1 = UINT8_C (0xff);
-uint_least8_t d1max = UINT_LEAST8_MAX;
-uint_least16_t d2 = UINT16_C (0xffff);
-uint_least16_t d2max = UINT_LEAST16_MAX;
-uint_least32_t d3 = UINT32_C (0xffffffff);
-uint_least32_t d3max = UINT_LEAST32_MAX;
-uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
-uint_least64_t d4max = UINT_LEAST64_MAX;
-int_fast8_t e1 = INT_FAST8_MAX;
-int_fast8_t e1min = INT_FAST8_MIN;
-int_fast16_t e2 = INT_FAST16_MAX;
-int_fast16_t e2min = INT_FAST16_MIN;
-int_fast32_t e3 = INT_FAST32_MAX;
-int_fast32_t e3min = INT_FAST32_MIN;
-int_fast64_t e4 = INT_FAST64_MAX;
-int_fast64_t e4min = INT_FAST64_MIN;
-uint_fast8_t f1 = UINT_FAST8_MAX;
-uint_fast16_t f2 = UINT_FAST16_MAX;
-uint_fast32_t f3 = UINT_FAST32_MAX;
-uint_fast64_t f4 = UINT_FAST64_MAX;
-#ifdef INTPTR_MAX
-intptr_t g = INTPTR_MAX;
-intptr_t gmin = INTPTR_MIN;
-#endif
-#ifdef UINTPTR_MAX
-uintptr_t h = UINTPTR_MAX;
-#endif
-intmax_t i = INTMAX_MAX;
-uintmax_t j = UINTMAX_MAX;
-
-/* Check that SIZE_MAX has the correct type, if possible.  */
-#if 201112 <= __STDC_VERSION__
-int k = _Generic (SIZE_MAX, size_t: 0);
-#elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \
-       || (0x5110 <= __SUNPRO_C && !__STDC__))
-extern size_t k;
-extern __typeof__ (SIZE_MAX) k;
-#endif
-
-#include <limits.h> /* for CHAR_BIT */
-#define TYPE_MINIMUM(t) \
-  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
-#define TYPE_MAXIMUM(t) \
-  ((t) ((t) 0 < (t) -1 \
-        ? (t) -1 \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-struct s {
-  int check_PTRDIFF:
-      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
-      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
-      ? 1 : -1;
-  /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64.  */
-  int check_SIG_ATOMIC:
-      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
-      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
-      ? 1 : -1;
-  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
-  int check_WCHAR:
-      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
-      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
-      ? 1 : -1;
-  /* Detect bug in mingw.  */
-  int check_WINT:
-      WINT_MIN == TYPE_MINIMUM (wint_t)
-      && WINT_MAX == TYPE_MAXIMUM (wint_t)
-      ? 1 : -1;
-
-  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
-  int check_UINT8_C:
-        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
-  int check_UINT16_C:
-        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
-
-  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
-#ifdef UINT8_MAX
-  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
-#endif
-#ifdef UINT16_MAX
-  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
-#endif
-#ifdef UINT32_MAX
-  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
-#endif
-#ifdef UINT64_MAX
-  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
-#endif
-  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
-  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
-  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
-  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
-  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
-  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
-  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
-  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
-  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
-  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
-  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
-};
-         ]])],
-         [dnl Determine whether the various *_MIN, *_MAX macros are usable
-          dnl in preprocessor expression. We could do it by compiling a test
-          dnl program for each of these macros. It is faster to run a program
-          dnl that inspects the macro expansion.
-          dnl This detects a bug on HP-UX 11.23/ia64.
-          AC_RUN_IFELSE([
-            AC_LANG_PROGRAM([[
-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-#define __STDC_CONSTANT_MACROS 1
-#define __STDC_LIMIT_MACROS 1
-#include <stdint.h>
-]
-gl_STDINT_INCLUDES
-[
-#include <stdio.h>
-#include <string.h>
-#define MVAL(macro) MVAL1(macro)
-#define MVAL1(expression) #expression
-static const char *macro_values[] =
-  {
-#ifdef INT8_MAX
-    MVAL (INT8_MAX),
-#endif
-#ifdef INT16_MAX
-    MVAL (INT16_MAX),
-#endif
-#ifdef INT32_MAX
-    MVAL (INT32_MAX),
-#endif
-#ifdef INT64_MAX
-    MVAL (INT64_MAX),
-#endif
-#ifdef UINT8_MAX
-    MVAL (UINT8_MAX),
-#endif
-#ifdef UINT16_MAX
-    MVAL (UINT16_MAX),
-#endif
-#ifdef UINT32_MAX
-    MVAL (UINT32_MAX),
-#endif
-#ifdef UINT64_MAX
-    MVAL (UINT64_MAX),
-#endif
-    NULL
-  };
-]], [[
-  const char **mv;
-  for (mv = macro_values; *mv != NULL; mv++)
-    {
-      const char *value = *mv;
-      /* Test whether it looks like a cast expression.  */
-      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
-          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
-          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
-          || strncmp (value, "((int)"/*)*/, 6) == 0
-          || strncmp (value, "((signed short)"/*)*/, 15) == 0
-          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
-        return mv - macro_values + 1;
-    }
-  return 0;
-]])],
-              [gl_cv_header_working_stdint_h=yes],
-              [],
-              [case "$host_os" in
-                         # Guess yes on native Windows.
-                 mingw*) gl_cv_header_working_stdint_h="guessing yes" ;;
-                         # In general, assume it works.
-                 *)      gl_cv_header_working_stdint_h="guessing yes" ;;
-               esac
-              ])
-         ])
-      ])
-  fi
-
-  HAVE_C99_STDINT_H=0
-  HAVE_SYS_BITYPES_H=0
-  HAVE_SYS_INTTYPES_H=0
-  GL_GENERATE_STDINT_H=true
-  case "$gl_cv_header_working_stdint_h" in
-    *yes)
-      HAVE_C99_STDINT_H=1
-      dnl Now see whether the system <stdint.h> works without
-      dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined.
-      dnl If not, there would be problems when stdint.h is included from C++.
-      AC_CACHE_CHECK([whether stdint.h works without ISO C predefines],
-        [gl_cv_header_stdint_without_STDC_macros],
-        [gl_cv_header_stdint_without_STDC_macros=no
-         AC_COMPILE_IFELSE([
-           AC_LANG_PROGRAM([[
-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-#include <stdint.h>
-]
-gl_STDINT_INCLUDES
-[
-intmax_t im = INTMAX_MAX;
-int32_t i32 = INT32_C (0x7fffffff);
-           ]])],
-           [gl_cv_header_stdint_without_STDC_macros=yes])
-        ])
-
-      if test $gl_cv_header_stdint_without_STDC_macros = no; then
-        AC_DEFINE([__STDC_CONSTANT_MACROS], [1],
-          [Define to 1 if the system <stdint.h> predates C++11.])
-        AC_DEFINE([__STDC_LIMIT_MACROS], [1],
-          [Define to 1 if the system <stdint.h> predates C++11.])
-      fi
-      AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.],
-        [gl_cv_header_stdint_width],
-        [gl_cv_header_stdint_width=no
-         AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM([[
-              /* Work if build is not clean.  */
-              #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1
-              #ifndef __STDC_WANT_IEC_60559_BFP_EXT__
-               #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
-              #endif
-              #include <stdint.h>
-              ]gl_STDINT_INCLUDES[
-              int iw = UINTMAX_WIDTH;
-              ]])],
-           [gl_cv_header_stdint_width=yes])])
-      if test "$gl_cv_header_stdint_width" = yes; then
-        GL_GENERATE_STDINT_H=false
-      fi
-      ;;
-    *)
-      dnl Check for <sys/inttypes.h>, and for
-      dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
-      AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])
-      if test $ac_cv_header_sys_inttypes_h = yes; then
-        HAVE_SYS_INTTYPES_H=1
-      fi
-      if test $ac_cv_header_sys_bitypes_h = yes; then
-        HAVE_SYS_BITYPES_H=1
-      fi
-      gl_STDINT_TYPE_PROPERTIES
-      ;;
-  esac
-
-  dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH.
-  gl_REPLACE_LIMITS_H
-
-  AC_SUBST([HAVE_C99_STDINT_H])
-  AC_SUBST([HAVE_SYS_BITYPES_H])
-  AC_SUBST([HAVE_SYS_INTTYPES_H])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdint.m4:371: -1- AC_DEFUN([gl_STDINT_BITSIZEOF], [
-  dnl Use a shell loop, to avoid bloating configure, and
-  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
-  dnl   config.h.in,
-  dnl - extra AC_SUBST calls, so that the right substitutions are made.
-  m4_foreach_w([gltype], [$1],
-    [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
-       [Define to the number of bits in type ']gltype['.])])
-  for gltype in $1 ; do
-    AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
-      [AC_COMPUTE_INT([result], [sizeof ($gltype) * CHAR_BIT],
-         [$2
-#include <limits.h>], [result=unknown])
-       eval gl_cv_bitsizeof_${gltype}=\$result
-      ])
-    eval result=\$gl_cv_bitsizeof_${gltype}
-    if test $result = unknown; then
-      dnl Use a nonempty default, because some compilers, such as IRIX 5 cc,
-      dnl do a syntax check even on unused #if conditions and give an error
-      dnl on valid C code like this:
-      dnl   #if 0
-      dnl   # if  > 32
-      dnl   # endif
-      dnl   #endif
-      result=0
-    fi
-    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result])
-    eval BITSIZEOF_${GLTYPE}=\$result
-  done
-  m4_foreach_w([gltype], [$1],
-    [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdint.m4:409: -1- AC_DEFUN([gl_CHECK_TYPES_SIGNED], [
-  dnl Use a shell loop, to avoid bloating configure, and
-  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
-  dnl   config.h.in,
-  dnl - extra AC_SUBST calls, so that the right substitutions are made.
-  m4_foreach_w([gltype], [$1],
-    [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
-       [Define to 1 if ']gltype[' is a signed integer type.])])
-  for gltype in $1 ; do
-    AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([$2[
-            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])],
-         result=yes, result=no)
-       eval gl_cv_type_${gltype}_signed=\$result
-      ])
-    eval result=\$gl_cv_type_${gltype}_signed
-    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    if test "$result" = yes; then
-      AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], [1])
-      eval HAVE_SIGNED_${GLTYPE}=1
-    else
-      eval HAVE_SIGNED_${GLTYPE}=0
-    fi
-  done
-  m4_foreach_w([gltype], [$1],
-    [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdint.m4:442: -1- AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], [
-  dnl Use a shell loop, to avoid bloating configure, and
-  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
-  dnl   config.h.in,
-  dnl - extra AC_SUBST calls, so that the right substitutions are made.
-  m4_foreach_w([gltype], [$1],
-    [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
-       [Define to l, ll, u, ul, ull, etc., as suitable for
-        constants of type ']gltype['.])])
-  for gltype in $1 ; do
-    AC_CACHE_CHECK([for $gltype integer literal suffix],
-      [gl_cv_type_${gltype}_suffix],
-      [eval gl_cv_type_${gltype}_suffix=no
-       eval result=\$gl_cv_type_${gltype}_signed
-       if test "$result" = yes; then
-         glsufu=
-       else
-         glsufu=u
-       fi
-       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
-         case $glsuf in
-           '')  gltype1='int';;
-           l)   gltype1='long int';;
-           ll)  gltype1='long long int';;
-           i64) gltype1='__int64';;
-           u)   gltype1='unsigned int';;
-           ul)  gltype1='unsigned long int';;
-           ull) gltype1='unsigned long long int';;
-           ui64)gltype1='unsigned __int64';;
-         esac
-         AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM([$2[
-              extern $gltype foo;
-              extern $gltype1 foo;]])],
-           [eval gl_cv_type_${gltype}_suffix=\$glsuf])
-         eval result=\$gl_cv_type_${gltype}_suffix
-         test "$result" != no && break
-       done])
-    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    eval result=\$gl_cv_type_${gltype}_suffix
-    test "$result" = no && result=
-    eval ${GLTYPE}_SUFFIX=\$result
-    AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
-  done
-  m4_foreach_w([gltype], [$1],
-    [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdint.m4:492: -1- AC_DEFUN([gl_STDINT_INCLUDES], [[
-  #include <stddef.h>
-  #include <signal.h>
-  #if HAVE_WCHAR_H
-  # include <wchar.h>
-  #endif
-]])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdint.m4:504: -1- AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], [
-  AC_REQUIRE([gl_MULTIARCH])
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-    gl_STDINT_BITSIZEOF([ptrdiff_t size_t],
-      [gl_STDINT_INCLUDES])
-  fi
-  gl_STDINT_BITSIZEOF([sig_atomic_t wchar_t wint_t],
-    [gl_STDINT_INCLUDES])
-  gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t],
-    [gl_STDINT_INCLUDES])
-  gl_cv_type_ptrdiff_t_signed=yes
-  gl_cv_type_size_t_signed=no
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
-    gl_INTEGER_TYPE_SUFFIX([ptrdiff_t size_t],
-      [gl_STDINT_INCLUDES])
-  fi
-  gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t],
-    [gl_STDINT_INCLUDES])
-
-  dnl If wint_t is smaller than 'int', it cannot satisfy the ISO C 99
-  dnl requirement that wint_t is "unchanged by default argument promotions".
-  dnl In this case gnulib's <wchar.h> and <wctype.h> override wint_t.
-  dnl Set the variable BITSIZEOF_WINT_T accordingly.
-  if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then
-    BITSIZEOF_WINT_T=32
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdio_h.m4:7: -1- AC_DEFUN_ONCE([gl_STDIO_H], [
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AH_VERBATIM([MINGW_ANSI_STDIO],
-[/* Use GNU style printf and scanf.  */
-#ifndef __USE_MINGW_ANSI_STDIO
-# undef __USE_MINGW_ANSI_STDIO
-#endif
-])
-  AC_DEFINE([__USE_MINGW_ANSI_STDIO])
-  gl_NEXT_HEADERS([stdio.h])
-
-  dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and
-  dnl inttypes.h behave like gnu instead of system; we must give our
-  dnl printf wrapper the right attribute to match.
-  AC_CACHE_CHECK([which flavor of printf attribute matches inttypes macros],
-    [gl_cv_func_printf_attribute_flavor],
-    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-       #define __STDC_FORMAT_MACROS 1
-       #include <stdio.h>
-       #include <inttypes.h>
-       /* For non-mingw systems, compilation will trivially succeed.
-          For mingw, compilation will succeed for older mingw (system
-          printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */
-       #if (defined _WIN32 && ! defined __CYGWIN__) && \
-         (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-       extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1];
-       #endif
-      ]])], [gl_cv_func_printf_attribute_flavor=system],
-      [gl_cv_func_printf_attribute_flavor=gnu])])
-  if test "$gl_cv_func_printf_attribute_flavor" = gnu; then
-    AC_DEFINE([GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU], [1],
-      [Define to 1 if printf and friends should be labeled with
-       attribute "__gnu_printf__" instead of "__printf__"])
-  fi
-
-  dnl This ifdef is an optimization, to avoid performing a configure check whose
-  dnl result is not used. But it does not make the test of
-  dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    gl_NONBLOCKING_IO
-    if test $gl_cv_have_nonblocking != yes; then
-      REPLACE_STDIO_READ_FUNCS=1
-    fi
-  ])
-
-  dnl This ifdef is an optimization, to avoid performing a configure check whose
-  dnl result is not used. But it does not make the test of
-  dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant.
-  m4_ifdef([gl_SIGNAL_SIGPIPE], [
-    gl_SIGNAL_SIGPIPE
-    if test $gl_cv_header_signal_h_SIGPIPE != yes; then
-      REPLACE_STDIO_WRITE_FUNCS=1
-    fi
-  ])
-  dnl This ifdef is an optimization, to avoid performing a configure check whose
-  dnl result is not used. But it does not make the test of
-  dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant.
-  m4_ifdef([gl_NONBLOCKING_IO], [
-    gl_NONBLOCKING_IO
-    if test $gl_cv_have_nonblocking != yes; then
-      REPLACE_STDIO_WRITE_FUNCS=1
-    fi
-  ])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use, and which is not
-  dnl guaranteed by both C89 and C11.
-  gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
-    ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen
-    renameat snprintf tmpfile vdprintf vsnprintf])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-
-  AC_CHECK_DECLS_ONCE([fcloseall])
-  if test $ac_cv_have_decl_fcloseall = no; then
-    HAVE_DECL_FCLOSEALL=0
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdio_h.m4:91: -1- AC_DEFUN([gl_STDIO_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_STDIO_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdio_h.m4:103: -1- AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN_GNU])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX])
-    dnl Support Microsoft deprecated alias function names by default.
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdio_h.m4:172: -1- AC_DEFUN([gl_STDIO_H_DEFAULTS], [
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_FCLOSEALL=1;         AC_SUBST([HAVE_DECL_FCLOSEALL])
-  HAVE_DECL_FPURGE=1;            AC_SUBST([HAVE_DECL_FPURGE])
-  HAVE_DECL_FSEEKO=1;            AC_SUBST([HAVE_DECL_FSEEKO])
-  HAVE_DECL_FTELLO=1;            AC_SUBST([HAVE_DECL_FTELLO])
-  HAVE_DECL_GETDELIM=1;          AC_SUBST([HAVE_DECL_GETDELIM])
-  HAVE_DECL_GETLINE=1;           AC_SUBST([HAVE_DECL_GETLINE])
-  HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
-  HAVE_DECL_SNPRINTF=1;          AC_SUBST([HAVE_DECL_SNPRINTF])
-  HAVE_DECL_VSNPRINTF=1;         AC_SUBST([HAVE_DECL_VSNPRINTF])
-  HAVE_DPRINTF=1;                AC_SUBST([HAVE_DPRINTF])
-  HAVE_FSEEKO=1;                 AC_SUBST([HAVE_FSEEKO])
-  HAVE_FTELLO=1;                 AC_SUBST([HAVE_FTELLO])
-  HAVE_PCLOSE=1;                 AC_SUBST([HAVE_PCLOSE])
-  HAVE_POPEN=1;                  AC_SUBST([HAVE_POPEN])
-  HAVE_RENAMEAT=1;               AC_SUBST([HAVE_RENAMEAT])
-  HAVE_VASPRINTF=1;              AC_SUBST([HAVE_VASPRINTF])
-  HAVE_VDPRINTF=1;               AC_SUBST([HAVE_VDPRINTF])
-  REPLACE_DPRINTF=0;             AC_SUBST([REPLACE_DPRINTF])
-  REPLACE_FCLOSE=0;              AC_SUBST([REPLACE_FCLOSE])
-  REPLACE_FDOPEN=0;              AC_SUBST([REPLACE_FDOPEN])
-  REPLACE_FFLUSH=0;              AC_SUBST([REPLACE_FFLUSH])
-  REPLACE_FOPEN=0;               AC_SUBST([REPLACE_FOPEN])
-  REPLACE_FOPEN_FOR_FOPEN_GNU=0; AC_SUBST([REPLACE_FOPEN_FOR_FOPEN_GNU])
-  REPLACE_FPRINTF=0;             AC_SUBST([REPLACE_FPRINTF])
-  REPLACE_FPURGE=0;              AC_SUBST([REPLACE_FPURGE])
-  REPLACE_FREOPEN=0;             AC_SUBST([REPLACE_FREOPEN])
-  REPLACE_FSEEK=0;               AC_SUBST([REPLACE_FSEEK])
-  REPLACE_FSEEKO=0;              AC_SUBST([REPLACE_FSEEKO])
-  REPLACE_FTELL=0;               AC_SUBST([REPLACE_FTELL])
-  REPLACE_FTELLO=0;              AC_SUBST([REPLACE_FTELLO])
-  REPLACE_GETDELIM=0;            AC_SUBST([REPLACE_GETDELIM])
-  REPLACE_GETLINE=0;             AC_SUBST([REPLACE_GETLINE])
-  REPLACE_OBSTACK_PRINTF=0;      AC_SUBST([REPLACE_OBSTACK_PRINTF])
-  REPLACE_PERROR=0;              AC_SUBST([REPLACE_PERROR])
-  REPLACE_POPEN=0;               AC_SUBST([REPLACE_POPEN])
-  REPLACE_PRINTF=0;              AC_SUBST([REPLACE_PRINTF])
-  REPLACE_REMOVE=0;              AC_SUBST([REPLACE_REMOVE])
-  REPLACE_RENAME=0;              AC_SUBST([REPLACE_RENAME])
-  REPLACE_RENAMEAT=0;            AC_SUBST([REPLACE_RENAMEAT])
-  REPLACE_SNPRINTF=0;            AC_SUBST([REPLACE_SNPRINTF])
-  REPLACE_SPRINTF=0;             AC_SUBST([REPLACE_SPRINTF])
-  REPLACE_STDIO_READ_FUNCS=0;    AC_SUBST([REPLACE_STDIO_READ_FUNCS])
-  REPLACE_STDIO_WRITE_FUNCS=0;   AC_SUBST([REPLACE_STDIO_WRITE_FUNCS])
-  REPLACE_TMPFILE=0;             AC_SUBST([REPLACE_TMPFILE])
-  REPLACE_VASPRINTF=0;           AC_SUBST([REPLACE_VASPRINTF])
-  REPLACE_VDPRINTF=0;            AC_SUBST([REPLACE_VDPRINTF])
-  REPLACE_VFPRINTF=0;            AC_SUBST([REPLACE_VFPRINTF])
-  REPLACE_VPRINTF=0;             AC_SUBST([REPLACE_VPRINTF])
-  REPLACE_VSNPRINTF=0;           AC_SUBST([REPLACE_VSNPRINTF])
-  REPLACE_VSPRINTF=0;            AC_SUBST([REPLACE_VSPRINTF])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdlib_h.m4:7: -1- AC_DEFUN_ONCE([gl_STDLIB_H], [
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  gl_NEXT_HEADERS([stdlib.h])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use, and which is not
-  dnl guaranteed by C89.
-  gl_WARN_ON_USE_PREPARE([[#include <stdlib.h>
-#if HAVE_SYS_LOADAVG_H
-/* OpenIndiana has a bug: <sys/time.h> must be included before
-   <sys/loadavg.h>.  */
-# include <sys/time.h>
-# include <sys/loadavg.h>
-#endif
-#if HAVE_RANDOM_H
-# include <random.h>
-#endif
-    ]], [_Exit aligned_alloc atoll canonicalize_file_name free
-    getloadavg getsubopt grantpt
-    initstate initstate_r mbtowc mkdtemp mkostemp mkostemps mkstemp mkstemps
-    posix_memalign posix_openpt ptsname ptsname_r qsort_r
-    random random_r reallocarray realpath rpmatch secure_getenv setenv
-    setstate setstate_r srandom srandom_r
-    strtod strtol strtold strtoll strtoul strtoull unlockpt unsetenv])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-
-  AC_CHECK_DECLS_ONCE([ecvt])
-  if test $ac_cv_have_decl_ecvt = no; then
-    HAVE_DECL_ECVT=0
-  fi
-  AC_CHECK_DECLS_ONCE([fcvt])
-  if test $ac_cv_have_decl_fcvt = no; then
-    HAVE_DECL_FCVT=0
-  fi
-  AC_CHECK_DECLS_ONCE([gcvt])
-  if test $ac_cv_have_decl_gcvt = no; then
-    HAVE_DECL_GCVT=0
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdlib_h.m4:53: -1- AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_STDLIB_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdlib_h.m4:65: -1- AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_GNU])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_GNU])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_GNU])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB])
-    dnl Support Microsoft deprecated alias function names by default.
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/stdlib_h.m4:122: -1- AC_DEFUN([gl_STDLIB_H_DEFAULTS], [
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
-  HAVE_ALIGNED_ALLOC=1;      AC_SUBST([HAVE_ALIGNED_ALLOC])
-  HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
-  HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
-  HAVE_DECL_ECVT=1;          AC_SUBST([HAVE_DECL_ECVT])
-  HAVE_DECL_FCVT=1;          AC_SUBST([HAVE_DECL_FCVT])
-  HAVE_DECL_GCVT=1;          AC_SUBST([HAVE_DECL_GCVT])
-  HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
-  HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
-  HAVE_GRANTPT=1;            AC_SUBST([HAVE_GRANTPT])
-  HAVE_INITSTATE=1;          AC_SUBST([HAVE_INITSTATE])
-  HAVE_DECL_INITSTATE=1;     AC_SUBST([HAVE_DECL_INITSTATE])
-  HAVE_MBTOWC=1;             AC_SUBST([HAVE_MBTOWC])
-  HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
-  HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
-  HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
-  HAVE_MKSTEMP=1;            AC_SUBST([HAVE_MKSTEMP])
-  HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
-  HAVE_POSIX_MEMALIGN=1;     AC_SUBST([HAVE_POSIX_MEMALIGN])
-  HAVE_POSIX_OPENPT=1;       AC_SUBST([HAVE_POSIX_OPENPT])
-  HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
-  HAVE_PTSNAME_R=1;          AC_SUBST([HAVE_PTSNAME_R])
-  HAVE_QSORT_R=1;            AC_SUBST([HAVE_QSORT_R])
-  HAVE_RANDOM=1;             AC_SUBST([HAVE_RANDOM])
-  HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
-  HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
-  HAVE_REALLOCARRAY=1;       AC_SUBST([HAVE_REALLOCARRAY])
-  HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
-  HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
-  HAVE_SECURE_GETENV=1;      AC_SUBST([HAVE_SECURE_GETENV])
-  HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
-  HAVE_DECL_SETENV=1;        AC_SUBST([HAVE_DECL_SETENV])
-  HAVE_SETSTATE=1;           AC_SUBST([HAVE_SETSTATE])
-  HAVE_DECL_SETSTATE=1;      AC_SUBST([HAVE_DECL_SETSTATE])
-  HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
-  HAVE_STRTOL=1;             AC_SUBST([HAVE_STRTOL])
-  HAVE_STRTOLD=1;            AC_SUBST([HAVE_STRTOLD])
-  HAVE_STRTOLL=1;            AC_SUBST([HAVE_STRTOLL])
-  HAVE_STRTOUL=1;            AC_SUBST([HAVE_STRTOUL])
-  HAVE_STRTOULL=1;           AC_SUBST([HAVE_STRTOULL])
-  HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA])
-  HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
-  HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
-  HAVE_DECL_UNSETENV=1;      AC_SUBST([HAVE_DECL_UNSETENV])
-  REPLACE_ALIGNED_ALLOC=0;   AC_SUBST([REPLACE_ALIGNED_ALLOC])
-  REPLACE_CALLOC_FOR_CALLOC_GNU=0;    AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_GNU])
-  REPLACE_CALLOC_FOR_CALLOC_POSIX=0;  AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_POSIX])
-  REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
-  REPLACE_FREE=0;            AC_SUBST([REPLACE_FREE])
-  REPLACE_INITSTATE=0;       AC_SUBST([REPLACE_INITSTATE])
-  REPLACE_MALLOC_FOR_MALLOC_GNU=0;    AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_GNU])
-  REPLACE_MALLOC_FOR_MALLOC_POSIX=0;  AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_POSIX])
-  REPLACE_MBTOWC=0;          AC_SUBST([REPLACE_MBTOWC])
-  REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
-  REPLACE_POSIX_MEMALIGN=0;  AC_SUBST([REPLACE_POSIX_MEMALIGN])
-  REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
-  REPLACE_PTSNAME_R=0;       AC_SUBST([REPLACE_PTSNAME_R])
-  REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
-  REPLACE_QSORT_R=0;         AC_SUBST([REPLACE_QSORT_R])
-  REPLACE_RANDOM=0;          AC_SUBST([REPLACE_RANDOM])
-  REPLACE_RANDOM_R=0;        AC_SUBST([REPLACE_RANDOM_R])
-  REPLACE_REALLOC_FOR_REALLOC_GNU=0;    AC_SUBST([REPLACE_REALLOC_FOR_REALLOC_GNU])
-  REPLACE_REALLOC_FOR_REALLOC_POSIX=0;  AC_SUBST([REPLACE_REALLOC_FOR_REALLOC_POSIX])
-  REPLACE_REALLOCARRAY=0;    AC_SUBST([REPLACE_REALLOCARRAY])
-  REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
-  REPLACE_SETENV=0;          AC_SUBST([REPLACE_SETENV])
-  REPLACE_SETSTATE=0;        AC_SUBST([REPLACE_SETSTATE])
-  REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
-  REPLACE_STRTOL=0;          AC_SUBST([REPLACE_STRTOL])
-  REPLACE_STRTOLD=0;         AC_SUBST([REPLACE_STRTOLD])
-  REPLACE_STRTOLL=0;         AC_SUBST([REPLACE_STRTOLL])
-  REPLACE_STRTOUL=0;         AC_SUBST([REPLACE_STRTOUL])
-  REPLACE_STRTOULL=0;        AC_SUBST([REPLACE_STRTOULL])
-  REPLACE_UNSETENV=0;        AC_SUBST([REPLACE_UNSETENV])
-  REPLACE_WCTOMB=0;          AC_SUBST([REPLACE_WCTOMB])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/strerror.m4:7: -1- AC_DEFUN([gl_FUNC_STRERROR], [
-  AC_REQUIRE([gl_STRING_H_DEFAULTS])
-  AC_REQUIRE([gl_HEADER_ERRNO_H])
-  AC_REQUIRE([gl_FUNC_STRERROR_0])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
-    AC_REQUIRE([gl_FUNC_STRERROR_R_WORKS])
-  ])
-  if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then
-    AC_CACHE_CHECK([for working strerror function],
-     [gl_cv_func_working_strerror],
-     [AC_RUN_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[#include <string.h>
-           ]],
-           [[if (!*strerror (-2)) return 1;]])],
-        [gl_cv_func_working_strerror=yes],
-        [gl_cv_func_working_strerror=no],
-        [case "$host_os" in
-                          # Guess yes on glibc systems.
-           *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-                          # Guess yes on musl systems.
-           *-musl*)       gl_cv_func_working_strerror="guessing yes" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-           *)             gl_cv_func_working_strerror="$gl_cross_guess_normal" ;;
-         esac
-        ])
-    ])
-    case "$gl_cv_func_working_strerror" in
-      *yes) ;;
-      *)
-        dnl The system's strerror() fails to return a string for out-of-range
-        dnl integers. Replace it.
-        REPLACE_STRERROR=1
-        ;;
-    esac
-    m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [
-      dnl If the system's strerror_r or __xpg_strerror_r clobbers strerror's
-      dnl buffer, we must replace strerror.
-      case "$gl_cv_func_strerror_r_works" in
-        *no) REPLACE_STRERROR=1 ;;
-      esac
-    ])
-  else
-    dnl The system's strerror() cannot know about the new errno values we add
-    dnl to <errno.h>, or any fix for strerror(0). Replace it.
-    REPLACE_STRERROR=1
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/strerror.m4:60: -1- AC_DEFUN([gl_FUNC_STRERROR_0], [
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  REPLACE_STRERROR_0=0
-  AC_CACHE_CHECK([whether strerror(0) succeeds],
-   [gl_cv_func_strerror_0_works],
-   [AC_RUN_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[#include <string.h>
-           #include <errno.h>
-         ]],
-         [[int result = 0;
-           char *str;
-           errno = 0;
-           str = strerror (0);
-           if (!*str) result |= 1;
-           if (errno) result |= 2;
-           if (strstr (str, "nknown") || strstr (str, "ndefined"))
-             result |= 4;
-           return result;]])],
-      [gl_cv_func_strerror_0_works=yes],
-      [gl_cv_func_strerror_0_works=no],
-      [case "$host_os" in
-                        # Guess yes on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # Guess yes on musl systems.
-         *-musl*)       gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # Guess yes on native Windows.
-         mingw*)        gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # If we don't know, obey --enable-cross-guesses.
-         *)             gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
-       esac
-      ])
-  ])
-  case "$gl_cv_func_strerror_0_works" in
-    *yes) ;;
-    *)
-      REPLACE_STRERROR_0=1
-      AC_DEFINE([REPLACE_STRERROR_0], [1], [Define to 1 if strerror(0)
-        does not return a message implying success.])
-      ;;
-  esac
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/string_h.m4:12: -1- AC_DEFUN_ONCE([gl_STRING_H], [
-  dnl Ensure to expand the default settings once only, before all statements
-  dnl that occur in other macros.
-  AC_REQUIRE([gl_STRING_H_DEFAULTS])
-  gl_NEXT_HEADERS([string.h])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use, and which is not
-  dnl guaranteed by C89.
-  gl_WARN_ON_USE_PREPARE([[#include <string.h>
-    ]],
-    [ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul
-     strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r
-     strerror_r strerrorname_np sigabbrev_np sigdescr_np strsignal strverscmp])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/string_h.m4:35: -1- AC_DEFUN([gl_STRING_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_STRING_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/string_h.m4:47: -1- AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP])
-    dnl Support Microsoft deprecated alias function names by default.
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS])
-  dnl Make sure the shell variable for GNULIB_FREE_POSIX is initialized.
-  gl_STDLIB_H_REQUIRE_DEFAULTS
-  AC_REQUIRE([gl_STRING_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/string_h.m4:101: -1- AC_DEFUN([gl_STRING_H_DEFAULTS], [
-  HAVE_MBSLEN=0;             AC_SUBST([HAVE_MBSLEN])
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_EXPLICIT_BZERO=1;        AC_SUBST([HAVE_EXPLICIT_BZERO])
-  HAVE_FFSL=1;                  AC_SUBST([HAVE_FFSL])
-  HAVE_FFSLL=1;                 AC_SUBST([HAVE_FFSLL])
-  HAVE_DECL_MEMMEM=1;           AC_SUBST([HAVE_DECL_MEMMEM])
-  HAVE_MEMPCPY=1;               AC_SUBST([HAVE_MEMPCPY])
-  HAVE_DECL_MEMRCHR=1;          AC_SUBST([HAVE_DECL_MEMRCHR])
-  HAVE_RAWMEMCHR=1;             AC_SUBST([HAVE_RAWMEMCHR])
-  HAVE_STPCPY=1;                AC_SUBST([HAVE_STPCPY])
-  HAVE_STPNCPY=1;               AC_SUBST([HAVE_STPNCPY])
-  HAVE_STRCHRNUL=1;             AC_SUBST([HAVE_STRCHRNUL])
-  HAVE_DECL_STRDUP=1;           AC_SUBST([HAVE_DECL_STRDUP])
-  HAVE_DECL_STRNDUP=1;          AC_SUBST([HAVE_DECL_STRNDUP])
-  HAVE_DECL_STRNLEN=1;          AC_SUBST([HAVE_DECL_STRNLEN])
-  HAVE_STRPBRK=1;               AC_SUBST([HAVE_STRPBRK])
-  HAVE_STRSEP=1;                AC_SUBST([HAVE_STRSEP])
-  HAVE_STRCASESTR=1;            AC_SUBST([HAVE_STRCASESTR])
-  HAVE_DECL_STRTOK_R=1;         AC_SUBST([HAVE_DECL_STRTOK_R])
-  HAVE_DECL_STRERROR_R=1;       AC_SUBST([HAVE_DECL_STRERROR_R])
-  HAVE_STRERRORNAME_NP=1;       AC_SUBST([HAVE_STRERRORNAME_NP])
-  HAVE_SIGABBREV_NP=1;          AC_SUBST([HAVE_SIGABBREV_NP])
-  HAVE_SIGDESCR_NP=1;           AC_SUBST([HAVE_SIGDESCR_NP])
-  HAVE_DECL_STRSIGNAL=1;        AC_SUBST([HAVE_DECL_STRSIGNAL])
-  HAVE_STRVERSCMP=1;            AC_SUBST([HAVE_STRVERSCMP])
-  REPLACE_FFSLL=0;              AC_SUBST([REPLACE_FFSLL])
-  REPLACE_MEMCHR=0;             AC_SUBST([REPLACE_MEMCHR])
-  REPLACE_MEMMEM=0;             AC_SUBST([REPLACE_MEMMEM])
-  REPLACE_STPNCPY=0;            AC_SUBST([REPLACE_STPNCPY])
-  REPLACE_STRCHRNUL=0;          AC_SUBST([REPLACE_STRCHRNUL])
-  REPLACE_STRDUP=0;             AC_SUBST([REPLACE_STRDUP])
-  REPLACE_STRNCAT=0;            AC_SUBST([REPLACE_STRNCAT])
-  REPLACE_STRNDUP=0;            AC_SUBST([REPLACE_STRNDUP])
-  REPLACE_STRNLEN=0;            AC_SUBST([REPLACE_STRNLEN])
-  REPLACE_STRSTR=0;             AC_SUBST([REPLACE_STRSTR])
-  REPLACE_STRCASESTR=0;         AC_SUBST([REPLACE_STRCASESTR])
-  REPLACE_STRTOK_R=0;           AC_SUBST([REPLACE_STRTOK_R])
-  REPLACE_STRERROR=0;           AC_SUBST([REPLACE_STRERROR])
-  REPLACE_STRERROR_R=0;         AC_SUBST([REPLACE_STRERROR_R])
-  REPLACE_STRERRORNAME_NP=0;    AC_SUBST([REPLACE_STRERRORNAME_NP])
-  REPLACE_STRSIGNAL=0;          AC_SUBST([REPLACE_STRSIGNAL])
-  UNDEFINE_STRTOK_R=0;          AC_SUBST([UNDEFINE_STRTOK_R])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:9: -1- AC_DEFUN_ONCE([gl_SYS_SOCKET_H], [
-  AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
-  dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have
-  dnl old-style declarations (with return type 'int' instead of 'ssize_t')
-  dnl unless _POSIX_PII_SOCKET is defined.
-  case "$host_os" in
-    osf*)
-      AC_DEFINE([_POSIX_PII_SOCKET], [1],
-        [Define to 1 in order to get the POSIX compatible declarations
-         of socket functions.])
-      ;;
-  esac
-
-  GL_GENERATE_SYS_SOCKET_H=false
-  AC_CACHE_CHECK([whether <sys/socket.h> is self-contained],
-    [gl_cv_header_sys_socket_h_selfcontained],
-    [
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[]])],
-        [gl_cv_header_sys_socket_h_selfcontained=yes],
-        [gl_cv_header_sys_socket_h_selfcontained=no])
-    ])
-  if test $gl_cv_header_sys_socket_h_selfcontained = yes; then
-    dnl If the shutdown function exists, <sys/socket.h> should define
-    dnl SHUT_RD, SHUT_WR, SHUT_RDWR.
-    AC_CHECK_FUNCS([shutdown])
-    if test $ac_cv_func_shutdown = yes; then
-      AC_CACHE_CHECK([whether <sys/socket.h> defines the SHUT_* macros],
-        [gl_cv_header_sys_socket_h_shut],
-        [
-          AC_COMPILE_IFELSE(
-            [AC_LANG_PROGRAM([[#include <sys/socket.h>]],
-               [[int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR };]])],
-            [gl_cv_header_sys_socket_h_shut=yes],
-            [gl_cv_header_sys_socket_h_shut=no])
-        ])
-      if test $gl_cv_header_sys_socket_h_shut = no; then
-        GL_GENERATE_SYS_SOCKET_H=true
-      fi
-    fi
-  fi
-  # We need to check for ws2tcpip.h now.
-  gl_PREREQ_SYS_H_SOCKET
-  AC_CHECK_TYPES([struct sockaddr_storage, sa_family_t],,,[
-  /* sys/types.h is not needed according to POSIX, but the
-     sys/socket.h in i386-unknown-freebsd4.10 and
-     powerpc-apple-darwin5.5 required it. */
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
-])
-  if test $ac_cv_type_struct_sockaddr_storage = no; then
-    HAVE_STRUCT_SOCKADDR_STORAGE=0
-  fi
-  if test $ac_cv_type_sa_family_t = no; then
-    HAVE_SA_FAMILY_T=0
-  fi
-  if test $ac_cv_type_struct_sockaddr_storage != no; then
-    AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],
-      [],
-      [HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0],
-      [#include <sys/types.h>
-       #ifdef HAVE_SYS_SOCKET_H
-       #include <sys/socket.h>
-       #endif
-       #ifdef HAVE_WS2TCPIP_H
-       #include <ws2tcpip.h>
-       #endif
-      ])
-  fi
-  if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \
-     || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then
-    GL_GENERATE_SYS_SOCKET_H=true
-  fi
-  gl_PREREQ_SYS_H_WINSOCK2
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[
-/* Some systems require prerequisite headers.  */
-#include <sys/types.h>
-#include <sys/socket.h>
-    ]], [socket connect accept bind getpeername getsockname getsockopt
-    listen recv send recvfrom sendto setsockopt shutdown accept4])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:103: -1- AC_DEFUN([gl_PREREQ_SYS_H_SOCKET], [
-  dnl Check prerequisites of the <sys/socket.h> replacement.
-  AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
-  gl_CHECK_NEXT_HEADERS([sys/socket.h])
-  if test $ac_cv_header_sys_socket_h = yes; then
-    HAVE_SYS_SOCKET_H=1
-  else
-    HAVE_SYS_SOCKET_H=0
-  fi
-  AC_SUBST([HAVE_SYS_SOCKET_H])
-  gl_PREREQ_SYS_H_WS2TCPIP
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:120: -1- AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2], [
-  m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])])
-  m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])])
-  AC_CHECK_HEADERS_ONCE([sys/socket.h])
-  if test $ac_cv_header_sys_socket_h != yes; then
-    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
-    dnl the check for those headers unconditional; yet cygwin reports
-    dnl that the headers are present but cannot be compiled (since on
-    dnl cygwin, all socket information should come from sys/socket.h).
-    AC_CHECK_HEADERS([winsock2.h])
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
-  AC_SUBST([HAVE_WINSOCK2_H])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:145: -1- AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP], [
-  AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
-  if test $ac_cv_header_sys_socket_h = yes; then
-    HAVE_WS2TCPIP_H=0
-  else
-    if test $ac_cv_header_ws2tcpip_h = yes; then
-      HAVE_WS2TCPIP_H=1
-    else
-      HAVE_WS2TCPIP_H=0
-    fi
-  fi
-  AC_SUBST([HAVE_WS2TCPIP_H])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:164: -1- AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_SYS_SOCKET_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:176: -1- AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT4])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_socket_h.m4:199: -1- AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], [
-  HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE])
-  HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1;
-                        AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY])
-  HAVE_SA_FAMILY_T=1;   AC_SUBST([HAVE_SA_FAMILY_T])
-  HAVE_ACCEPT4=1;       AC_SUBST([HAVE_ACCEPT4])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4:10: -1- AC_DEFUN_ONCE([gl_SYS_STAT_H], [
-  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
-
-  dnl Check for broken stat macros.
-  AC_REQUIRE([AC_HEADER_STAT])
-
-  gl_CHECK_NEXT_HEADERS([sys/stat.h])
-
-  dnl Ensure the type mode_t gets defined.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-
-  dnl Whether to enable precise timestamps in 'struct stat'.
-  m4_ifdef([gl_WINDOWS_STAT_TIMESPEC], [
-    AC_REQUIRE([gl_WINDOWS_STAT_TIMESPEC])
-  ], [
-    WINDOWS_STAT_TIMESPEC=0
-  ])
-  AC_SUBST([WINDOWS_STAT_TIMESPEC])
-
-  dnl Whether to ensure that struct stat.st_size is 64-bit wide.
-  m4_ifdef([gl_LARGEFILE], [
-    AC_REQUIRE([gl_LARGEFILE])
-  ], [
-    WINDOWS_64_BIT_ST_SIZE=0
-  ])
-  AC_SUBST([WINDOWS_64_BIT_ST_SIZE])
-
-  dnl Define types that are supposed to be defined in <sys/types.h> or
-  dnl <sys/stat.h>.
-  AC_CHECK_TYPE([nlink_t], [],
-    [AC_DEFINE([nlink_t], [int],
-       [Define to the type of st_nlink in struct stat, or a supertype.])],
-    [#include <sys/types.h>
-     #include <sys/stat.h>])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[#include <sys/stat.h>
-    ]], [fchmodat fstat fstatat futimens getumask lchmod lstat
-    mkdirat mkfifo mkfifoat mknod mknodat stat utimensat])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4:59: -1- AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_SYS_STAT_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4:71: -1- AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT])
-    dnl Support Microsoft deprecated alias function names by default.
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_stat_h.m4:100: -1- AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], [
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_FCHMODAT=1;      AC_SUBST([HAVE_FCHMODAT])
-  HAVE_FSTATAT=1;       AC_SUBST([HAVE_FSTATAT])
-  HAVE_FUTIMENS=1;      AC_SUBST([HAVE_FUTIMENS])
-  HAVE_GETUMASK=1;      AC_SUBST([HAVE_GETUMASK])
-  HAVE_LCHMOD=1;        AC_SUBST([HAVE_LCHMOD])
-  HAVE_LSTAT=1;         AC_SUBST([HAVE_LSTAT])
-  HAVE_MKDIRAT=1;       AC_SUBST([HAVE_MKDIRAT])
-  HAVE_MKFIFO=1;        AC_SUBST([HAVE_MKFIFO])
-  HAVE_MKFIFOAT=1;      AC_SUBST([HAVE_MKFIFOAT])
-  HAVE_MKNOD=1;         AC_SUBST([HAVE_MKNOD])
-  HAVE_MKNODAT=1;       AC_SUBST([HAVE_MKNODAT])
-  HAVE_UTIMENSAT=1;     AC_SUBST([HAVE_UTIMENSAT])
-  REPLACE_FCHMODAT=0;   AC_SUBST([REPLACE_FCHMODAT])
-  REPLACE_FSTAT=0;      AC_SUBST([REPLACE_FSTAT])
-  REPLACE_FSTATAT=0;    AC_SUBST([REPLACE_FSTATAT])
-  REPLACE_FUTIMENS=0;   AC_SUBST([REPLACE_FUTIMENS])
-  REPLACE_LSTAT=0;      AC_SUBST([REPLACE_LSTAT])
-  REPLACE_MKDIR=0;      AC_SUBST([REPLACE_MKDIR])
-  REPLACE_MKFIFO=0;     AC_SUBST([REPLACE_MKFIFO])
-  REPLACE_MKFIFOAT=0;   AC_SUBST([REPLACE_MKFIFOAT])
-  REPLACE_MKNOD=0;      AC_SUBST([REPLACE_MKNOD])
-  REPLACE_MKNODAT=0;    AC_SUBST([REPLACE_MKNODAT])
-  REPLACE_STAT=0;       AC_SUBST([REPLACE_STAT])
-  REPLACE_UTIMENSAT=0;  AC_SUBST([REPLACE_UTIMENSAT])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_types_h.m4:7: -1- AC_DEFUN_ONCE([gl_SYS_TYPES_H], [
-  AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
-
-  dnl Use sane struct stat types in OpenVMS 8.2 and later.
-  AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.])
-
-  gl_NEXT_HEADERS([sys/types.h])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Ensure the type mode_t gets defined.
-  AC_REQUIRE([AC_TYPE_MODE_T])
-
-  dnl Whether to override the 'off_t' type.
-  AC_REQUIRE([gl_TYPE_OFF_T])
-
-  dnl Whether to override the 'dev_t' and 'ino_t' types.
-  m4_ifdef([gl_WINDOWS_STAT_INODES], [
-    AC_REQUIRE([gl_WINDOWS_STAT_INODES])
-  ], [
-    WINDOWS_STAT_INODES=0
-  ])
-  AC_SUBST([WINDOWS_STAT_INODES])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_types_h.m4:37: -1- AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/sys_types_h.m4:45: -1- AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], [
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/time_h.m4:13: -1- AC_DEFUN_ONCE([gl_TIME_H], [
-  dnl Ensure to expand the default settings once only, before all statements
-  dnl that occur in other macros.
-  AC_REQUIRE([gl_TIME_H_DEFAULTS])
-
-  gl_NEXT_HEADERS([time.h])
-  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-
-  AC_CACHE_CHECK([for TIME_UTC in <time.h>],
-    [gl_cv_time_h_has_TIME_UTC],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <time.h>
-          ]],
-          [[static int x = TIME_UTC; x++;]])],
-       [gl_cv_time_h_has_TIME_UTC=yes],
-       [gl_cv_time_h_has_TIME_UTC=no])])
-  if test $gl_cv_time_h_has_TIME_UTC = yes; then
-    TIME_H_DEFINES_TIME_UTC=1
-  else
-    TIME_H_DEFINES_TIME_UTC=0
-  fi
-  AC_SUBST([TIME_H_DEFINES_TIME_UTC])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/time_h.m4:44: -1- AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], [
-  AC_CHECK_HEADERS_ONCE([sys/time.h])
-  AC_CACHE_CHECK([for struct timespec in <time.h>],
-    [gl_cv_sys_struct_timespec_in_time_h],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <time.h>
-          ]],
-          [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
-       [gl_cv_sys_struct_timespec_in_time_h=yes],
-       [gl_cv_sys_struct_timespec_in_time_h=no])])
-
-  TIME_H_DEFINES_STRUCT_TIMESPEC=0
-  SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
-  PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
-  UNISTD_H_DEFINES_STRUCT_TIMESPEC=0
-  if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
-    TIME_H_DEFINES_STRUCT_TIMESPEC=1
-  else
-    AC_CACHE_CHECK([for struct timespec in <sys/time.h>],
-      [gl_cv_sys_struct_timespec_in_sys_time_h],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[#include <sys/time.h>
-            ]],
-            [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
-         [gl_cv_sys_struct_timespec_in_sys_time_h=yes],
-         [gl_cv_sys_struct_timespec_in_sys_time_h=no])])
-    if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
-      SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
-    else
-      AC_CACHE_CHECK([for struct timespec in <pthread.h>],
-        [gl_cv_sys_struct_timespec_in_pthread_h],
-        [AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM(
-              [[#include <pthread.h>
-              ]],
-              [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
-           [gl_cv_sys_struct_timespec_in_pthread_h=yes],
-           [gl_cv_sys_struct_timespec_in_pthread_h=no])])
-      if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
-        PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
-      else
-        AC_CACHE_CHECK([for struct timespec in <unistd.h>],
-          [gl_cv_sys_struct_timespec_in_unistd_h],
-          [AC_COMPILE_IFELSE(
-             [AC_LANG_PROGRAM(
-                [[#include <unistd.h>
-                ]],
-                [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
-             [gl_cv_sys_struct_timespec_in_unistd_h=yes],
-             [gl_cv_sys_struct_timespec_in_unistd_h=no])])
-        if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
-          UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC])
-  AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC])
-  AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC])
-  AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/time_h.m4:113: -1- AC_DEFUN([gl_TIME_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_TIME_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/time_h.m4:125: -1- AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GETRES])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET])
-    dnl Support Microsoft deprecated alias function names by default.
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_TIME_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/time_h.m4:147: -1- AC_DEFUN([gl_TIME_H_DEFAULTS], [
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_LOCALTIME_R=1;               AC_SUBST([HAVE_DECL_LOCALTIME_R])
-  HAVE_NANOSLEEP=1;                      AC_SUBST([HAVE_NANOSLEEP])
-  HAVE_STRPTIME=1;                       AC_SUBST([HAVE_STRPTIME])
-  HAVE_TIMEGM=1;                         AC_SUBST([HAVE_TIMEGM])
-  HAVE_TIMESPEC_GET=1;                   AC_SUBST([HAVE_TIMESPEC_GET])
-  HAVE_TIMESPEC_GETRES=1;                AC_SUBST([HAVE_TIMESPEC_GETRES])
-  dnl Even GNU libc does not have timezone_t yet.
-  HAVE_TIMEZONE_T=0;                     AC_SUBST([HAVE_TIMEZONE_T])
-  dnl If another module says to replace or to not replace, do that.
-  dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
-  dnl this lets maintainers check for portability.
-  REPLACE_CTIME=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_CTIME])
-  REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;  AC_SUBST([REPLACE_LOCALTIME_R])
-  REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_MKTIME])
-  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST([REPLACE_NANOSLEEP])
-  REPLACE_STRFTIME=GNULIB_PORTCHECK;     AC_SUBST([REPLACE_STRFTIME])
-  REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_TIMEGM])
-  REPLACE_TZSET=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_TZSET])
-
-  dnl Hack so that the time module doesn't depend on the sys_time module.
-  dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
-  : ${GNULIB_GETTIMEOFDAY=0};            AC_SUBST([GNULIB_GETTIMEOFDAY])
-  dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
-  dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
-  dnl is no longer a big deal.
-  REPLACE_GMTIME=0;                      AC_SUBST([REPLACE_GMTIME])
-  REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/unistd_h.m4:9: -1- AC_DEFUN_ONCE([gl_UNISTD_H], [
-  dnl Ensure to expand the default settings once only, before all statements
-  dnl that occur in other macros.
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-
-  gl_CHECK_NEXT_HEADERS([unistd.h])
-  if test $ac_cv_header_unistd_h = yes; then
-    HAVE_UNISTD_H=1
-  else
-    HAVE_UNISTD_H=0
-  fi
-  AC_SUBST([HAVE_UNISTD_H])
-
-  dnl Ensure the type pid_t gets defined.
-  AC_REQUIRE([AC_TYPE_PID_T])
-
-  dnl Determine WINDOWS_64_BIT_OFF_T.
-  AC_REQUIRE([gl_TYPE_OFF_T])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-/* Some systems declare various items in the wrong headers.  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
-# include <fcntl.h>
-# include <stdio.h>
-# include <stdlib.h>
-# if defined _WIN32 && ! defined __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-    ]], [access chdir chown copy_file_range dup dup2 dup3 environ euidaccess
-    execl execle execlp execv execve execvp execvpe
-    faccessat fchdir
-    fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize
-    getentropy getgroups gethostname getlogin getlogin_r getpagesize getpass
-    getusershell setusershell endusershell
-    group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
-    readlink readlinkat rmdir sethostname sleep symlink symlinkat
-    truncate ttyname_r unlink unlinkat usleep])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-
-  AC_CHECK_DECLS_ONCE([execvpe])
-  if test $ac_cv_have_decl_execvpe = no; then
-    HAVE_DECL_EXECVPE=0
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/unistd_h.m4:66: -1- AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_UNISTD_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/unistd_h.m4:78: -1- AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS_GNU])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE])
-    dnl Support Microsoft deprecated alias function names by default.
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS])
-  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/unistd_h.m4:171: -1- AC_DEFUN([gl_UNISTD_H_DEFAULTS], [
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_CHOWN=1;                      AC_SUBST([HAVE_CHOWN])
-  HAVE_COPY_FILE_RANGE=1;            AC_SUBST([HAVE_COPY_FILE_RANGE])
-  HAVE_DUP3=1;                       AC_SUBST([HAVE_DUP3])
-  HAVE_EUIDACCESS=1;                 AC_SUBST([HAVE_EUIDACCESS])
-  HAVE_EXECVPE=1;                    AC_SUBST([HAVE_EXECVPE])
-  HAVE_FACCESSAT=1;                  AC_SUBST([HAVE_FACCESSAT])
-  HAVE_FCHDIR=1;                     AC_SUBST([HAVE_FCHDIR])
-  HAVE_FCHOWNAT=1;                   AC_SUBST([HAVE_FCHOWNAT])
-  HAVE_FDATASYNC=1;                  AC_SUBST([HAVE_FDATASYNC])
-  HAVE_FSYNC=1;                      AC_SUBST([HAVE_FSYNC])
-  HAVE_FTRUNCATE=1;                  AC_SUBST([HAVE_FTRUNCATE])
-  HAVE_GETDTABLESIZE=1;              AC_SUBST([HAVE_GETDTABLESIZE])
-  HAVE_GETENTROPY=1;                 AC_SUBST([HAVE_GETENTROPY])
-  HAVE_GETGROUPS=1;                  AC_SUBST([HAVE_GETGROUPS])
-  HAVE_GETHOSTNAME=1;                AC_SUBST([HAVE_GETHOSTNAME])
-  HAVE_GETLOGIN=1;                   AC_SUBST([HAVE_GETLOGIN])
-  HAVE_GETPAGESIZE=1;                AC_SUBST([HAVE_GETPAGESIZE])
-  HAVE_GETPASS=1;                    AC_SUBST([HAVE_GETPASS])
-  HAVE_GROUP_MEMBER=1;               AC_SUBST([HAVE_GROUP_MEMBER])
-  HAVE_LCHOWN=1;                     AC_SUBST([HAVE_LCHOWN])
-  HAVE_LINK=1;                       AC_SUBST([HAVE_LINK])
-  HAVE_LINKAT=1;                     AC_SUBST([HAVE_LINKAT])
-  HAVE_PIPE=1;                       AC_SUBST([HAVE_PIPE])
-  HAVE_PIPE2=1;                      AC_SUBST([HAVE_PIPE2])
-  HAVE_PREAD=1;                      AC_SUBST([HAVE_PREAD])
-  HAVE_PWRITE=1;                     AC_SUBST([HAVE_PWRITE])
-  HAVE_READLINK=1;                   AC_SUBST([HAVE_READLINK])
-  HAVE_READLINKAT=1;                 AC_SUBST([HAVE_READLINKAT])
-  HAVE_SETHOSTNAME=1;                AC_SUBST([HAVE_SETHOSTNAME])
-  HAVE_SLEEP=1;                      AC_SUBST([HAVE_SLEEP])
-  HAVE_SYMLINK=1;                    AC_SUBST([HAVE_SYMLINK])
-  HAVE_SYMLINKAT=1;                  AC_SUBST([HAVE_SYMLINKAT])
-  HAVE_UNLINKAT=1;                   AC_SUBST([HAVE_UNLINKAT])
-  HAVE_USLEEP=1;                     AC_SUBST([HAVE_USLEEP])
-  HAVE_DECL_ENVIRON=1;               AC_SUBST([HAVE_DECL_ENVIRON])
-  HAVE_DECL_EXECVPE=1;               AC_SUBST([HAVE_DECL_EXECVPE])
-  HAVE_DECL_FCHDIR=1;                AC_SUBST([HAVE_DECL_FCHDIR])
-  HAVE_DECL_FDATASYNC=1;             AC_SUBST([HAVE_DECL_FDATASYNC])
-  HAVE_DECL_GETDOMAINNAME=1;         AC_SUBST([HAVE_DECL_GETDOMAINNAME])
-  HAVE_DECL_GETLOGIN=1;              AC_SUBST([HAVE_DECL_GETLOGIN])
-  HAVE_DECL_GETLOGIN_R=1;            AC_SUBST([HAVE_DECL_GETLOGIN_R])
-  HAVE_DECL_GETPAGESIZE=1;           AC_SUBST([HAVE_DECL_GETPAGESIZE])
-  HAVE_DECL_GETUSERSHELL=1;          AC_SUBST([HAVE_DECL_GETUSERSHELL])
-  HAVE_DECL_SETHOSTNAME=1;           AC_SUBST([HAVE_DECL_SETHOSTNAME])
-  HAVE_DECL_TRUNCATE=1;              AC_SUBST([HAVE_DECL_TRUNCATE])
-  HAVE_DECL_TTYNAME_R=1;             AC_SUBST([HAVE_DECL_TTYNAME_R])
-  HAVE_OS_H=0;                       AC_SUBST([HAVE_OS_H])
-  HAVE_SYS_PARAM_H=0;                AC_SUBST([HAVE_SYS_PARAM_H])
-  REPLACE_ACCESS=0;                  AC_SUBST([REPLACE_ACCESS])
-  REPLACE_CHOWN=0;                   AC_SUBST([REPLACE_CHOWN])
-  REPLACE_CLOSE=0;                   AC_SUBST([REPLACE_CLOSE])
-  REPLACE_COPY_FILE_RANGE=0;         AC_SUBST([REPLACE_COPY_FILE_RANGE])
-  REPLACE_DUP=0;                     AC_SUBST([REPLACE_DUP])
-  REPLACE_DUP2=0;                    AC_SUBST([REPLACE_DUP2])
-  REPLACE_EXECL=0;                   AC_SUBST([REPLACE_EXECL])
-  REPLACE_EXECLE=0;                  AC_SUBST([REPLACE_EXECLE])
-  REPLACE_EXECLP=0;                  AC_SUBST([REPLACE_EXECLP])
-  REPLACE_EXECV=0;                   AC_SUBST([REPLACE_EXECV])
-  REPLACE_EXECVE=0;                  AC_SUBST([REPLACE_EXECVE])
-  REPLACE_EXECVP=0;                  AC_SUBST([REPLACE_EXECVP])
-  REPLACE_EXECVPE=0;                 AC_SUBST([REPLACE_EXECVPE])
-  REPLACE_FACCESSAT=0;               AC_SUBST([REPLACE_FACCESSAT])
-  REPLACE_FCHOWNAT=0;                AC_SUBST([REPLACE_FCHOWNAT])
-  REPLACE_FTRUNCATE=0;               AC_SUBST([REPLACE_FTRUNCATE])
-  REPLACE_GETCWD=0;                  AC_SUBST([REPLACE_GETCWD])
-  REPLACE_GETDOMAINNAME=0;           AC_SUBST([REPLACE_GETDOMAINNAME])
-  REPLACE_GETDTABLESIZE=0;           AC_SUBST([REPLACE_GETDTABLESIZE])
-  REPLACE_GETLOGIN_R=0;              AC_SUBST([REPLACE_GETLOGIN_R])
-  REPLACE_GETGROUPS=0;               AC_SUBST([REPLACE_GETGROUPS])
-  REPLACE_GETPAGESIZE=0;             AC_SUBST([REPLACE_GETPAGESIZE])
-  REPLACE_GETPASS=0;                 AC_SUBST([REPLACE_GETPASS])
-  REPLACE_GETPASS_FOR_GETPASS_GNU=0; AC_SUBST([REPLACE_GETPASS_FOR_GETPASS_GNU])
-  REPLACE_ISATTY=0;                  AC_SUBST([REPLACE_ISATTY])
-  REPLACE_LCHOWN=0;                  AC_SUBST([REPLACE_LCHOWN])
-  REPLACE_LINK=0;                    AC_SUBST([REPLACE_LINK])
-  REPLACE_LINKAT=0;                  AC_SUBST([REPLACE_LINKAT])
-  REPLACE_LSEEK=0;                   AC_SUBST([REPLACE_LSEEK])
-  REPLACE_PREAD=0;                   AC_SUBST([REPLACE_PREAD])
-  REPLACE_PWRITE=0;                  AC_SUBST([REPLACE_PWRITE])
-  REPLACE_READ=0;                    AC_SUBST([REPLACE_READ])
-  REPLACE_READLINK=0;                AC_SUBST([REPLACE_READLINK])
-  REPLACE_READLINKAT=0;              AC_SUBST([REPLACE_READLINKAT])
-  REPLACE_RMDIR=0;                   AC_SUBST([REPLACE_RMDIR])
-  REPLACE_SLEEP=0;                   AC_SUBST([REPLACE_SLEEP])
-  REPLACE_SYMLINK=0;                 AC_SUBST([REPLACE_SYMLINK])
-  REPLACE_SYMLINKAT=0;               AC_SUBST([REPLACE_SYMLINKAT])
-  REPLACE_TRUNCATE=0;                AC_SUBST([REPLACE_TRUNCATE])
-  REPLACE_TTYNAME_R=0;               AC_SUBST([REPLACE_TTYNAME_R])
-  REPLACE_UNLINK=0;                  AC_SUBST([REPLACE_UNLINK])
-  REPLACE_UNLINKAT=0;                AC_SUBST([REPLACE_UNLINKAT])
-  REPLACE_USLEEP=0;                  AC_SUBST([REPLACE_USLEEP])
-  REPLACE_WRITE=0;                   AC_SUBST([REPLACE_WRITE])
-  UNISTD_H_HAVE_SYS_RANDOM_H=0;      AC_SUBST([UNISTD_H_HAVE_SYS_RANDOM_H])
-  UNISTD_H_HAVE_WINSOCK2_H=0;        AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H])
-  UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0;
-                           AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/unlocked-io.m4:17: -1- AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO], [
-  dnl Persuade glibc and Solaris <stdio.h> to declare
-  dnl fgets_unlocked(), fputs_unlocked() etc.
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-
-  AC_CHECK_DECLS_ONCE([clearerr_unlocked])
-  AC_CHECK_DECLS_ONCE([feof_unlocked])
-  AC_CHECK_DECLS_ONCE([ferror_unlocked])
-  AC_CHECK_DECLS_ONCE([fflush_unlocked])
-  AC_CHECK_DECLS_ONCE([fgets_unlocked])
-  AC_CHECK_DECLS_ONCE([fputc_unlocked])
-  AC_CHECK_DECLS_ONCE([fputs_unlocked])
-  AC_CHECK_DECLS_ONCE([fread_unlocked])
-  AC_CHECK_DECLS_ONCE([fwrite_unlocked])
-  AC_CHECK_DECLS_ONCE([getc_unlocked])
-  AC_CHECK_DECLS_ONCE([getchar_unlocked])
-  AC_CHECK_DECLS_ONCE([putc_unlocked])
-  AC_CHECK_DECLS_ONCE([putchar_unlocked])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/visibility.m4:23: -1- AC_DEFUN([gl_VISIBILITY], [
-  AC_REQUIRE([AC_PROG_CC])
-  CFLAG_VISIBILITY=
-  HAVE_VISIBILITY=0
-  if test -n "$GCC"; then
-    dnl First, check whether -Werror can be added to the command line, or
-    dnl whether it leads to an error because of some other option that the
-    dnl user has put into $CC $CFLAGS $CPPFLAGS.
-    AC_CACHE_CHECK([whether the -Werror option is usable],
-      [gl_cv_cc_vis_werror],
-      [gl_save_CFLAGS="$CFLAGS"
-       CFLAGS="$CFLAGS -Werror"
-       AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([[]], [[]])],
-         [gl_cv_cc_vis_werror=yes],
-         [gl_cv_cc_vis_werror=no])
-       CFLAGS="$gl_save_CFLAGS"
-      ])
-    dnl Now check whether visibility declarations are supported.
-    AC_CACHE_CHECK([for simple visibility declarations],
-      [gl_cv_cc_visibility],
-      [gl_save_CFLAGS="$CFLAGS"
-       CFLAGS="$CFLAGS -fvisibility=hidden"
-       dnl We use the option -Werror and a function dummyfunc, because on some
-       dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
-       dnl "visibility attribute not supported in this configuration; ignored"
-       dnl at the first function definition in every compilation unit, and we
-       dnl don't want to use the option in this case.
-       if test $gl_cv_cc_vis_werror = yes; then
-         CFLAGS="$CFLAGS -Werror"
-       fi
-       AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-              extern __attribute__((__visibility__("default"))) int exportedvar;
-              extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-              extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-              void dummyfunc (void);
-              int hiddenvar;
-              int exportedvar;
-              int hiddenfunc (void) { return 51; }
-              int exportedfunc (void) { return 1225736919; }
-              void dummyfunc (void) {}
-            ]],
-            [[]])],
-         [gl_cv_cc_visibility=yes],
-         [gl_cv_cc_visibility=no])
-       CFLAGS="$gl_save_CFLAGS"
-      ])
-    if test $gl_cv_cc_visibility = yes; then
-      CFLAG_VISIBILITY="-fvisibility=hidden"
-      HAVE_VISIBILITY=1
-    fi
-  fi
-  AC_SUBST([CFLAG_VISIBILITY])
-  AC_SUBST([HAVE_VISIBILITY])
-  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
-    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/warn-on-use.m4:26: -1- AC_DEFUN([gl_WARN_ON_USE_PREPARE], [
-  m4_ifdef([gl_POSIXCHECK],
-    [m4_foreach_w([gl_decl], [$2],
-       [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
-         [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
-          undefining macros.])])dnl
-     for gl_func in m4_flatten([$2]); do
-       AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
-       AC_CACHE_CHECK([whether $gl_func is declared without a macro],
-         [gl_Symbol],
-         [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],
-[[#undef $gl_func
-  (void) $gl_func;]])],
-           [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])])
-       AS_VAR_IF([gl_Symbol], [yes],
-         [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
-          dnl shortcut - if the raw declaration exists, then set a cache
-          dnl variable to allow skipping any later AC_CHECK_DECL efforts
-          eval ac_cv_have_decl_$gl_func=yes])
-       AS_VAR_POPDEF([gl_Symbol])dnl
-     done
-    ])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wchar_h.m4:12: -1- AC_DEFUN_ONCE([gl_WCHAR_H], [
-  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-  AC_REQUIRE([gl_WCHAR_H_INLINE_OK])
-  dnl Prepare for creating substitute <wchar.h>.
-  dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
-  dnl character support).
-  dnl <wchar.h> is always overridden, because of GNULIB_POSIXCHECK.
-  gl_CHECK_NEXT_HEADERS([wchar.h])
-  if test $ac_cv_header_wchar_h = yes; then
-    HAVE_WCHAR_H=1
-  else
-    HAVE_WCHAR_H=0
-  fi
-  AC_SUBST([HAVE_WCHAR_H])
-
-  AC_REQUIRE([gl_FEATURES_H])
-
-  AC_REQUIRE([gt_TYPE_WINT_T])
-  if test $gt_cv_c_wint_t = yes; then
-    HAVE_WINT_T=1
-  else
-    HAVE_WINT_T=0
-  fi
-  AC_SUBST([HAVE_WINT_T])
-
-  AC_REQUIRE([gl_TYPE_WINT_T_PREREQ])
-
-  dnl Check for declarations of anything we want to poison if the
-  dnl corresponding gnulib module is not in use.
-  gl_WARN_ON_USE_PREPARE([[
-      #include <wchar.h>
-    ]],
-    [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
-     wcsrtombs wcsnrtombs wcwidth
-     wmemchr wmemcmp wmemcpy wmemmove wmempcpy wmemset
-     wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp
-     wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr
-     wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime
-    ])
-
-  AC_REQUIRE([AC_C_RESTRICT])
-
-  AC_CHECK_DECLS([wcsdup], [], [], [[
-      #include <wchar.h>
-    ]])
-  if test $ac_cv_have_decl_wcsdup = no; then
-    HAVE_DECL_WCSDUP=0
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wchar_h.m4:64: -1- AC_DEFUN([gl_WCHAR_H_INLINE_OK], [
-  dnl Test whether <wchar.h> suffers due to the transition from '__inline' to
-  dnl 'gnu_inline'. See <https://sourceware.org/bugzilla/show_bug.cgi?id=4022>
-  dnl and <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42440>. In summary,
-  dnl glibc version 2.5 or older, together with gcc version 4.3 or newer and
-  dnl the option -std=c99 or -std=gnu99, leads to a broken <wchar.h>.
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CACHE_CHECK([whether <wchar.h> uses 'inline' correctly],
-    [gl_cv_header_wchar_h_correct_inline],
-    [gl_cv_header_wchar_h_correct_inline=yes
-     case "$host_os" in
-       *-gnu* | gnu*)
-         AC_LANG_CONFTEST([
-           AC_LANG_SOURCE([[
-             #define wcstod renamed_wcstod
-             #include <wchar.h>
-             extern int zero (void);
-             int main () { return zero(); }
-           ]])])
-         dnl Do not rename the object file from conftest.$ac_objext to
-         dnl conftest1.$ac_objext, as this will cause the link to fail on
-         dnl z/OS when using the XPLINK object format (due to duplicate
-         dnl CSECT names). Instead, temporarily redefine $ac_compile so
-         dnl that the object file has the latter name from the start.
-         save_ac_compile="$ac_compile"
-         ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
-         if echo '#include "conftest.c"' >conftest1.c \
-            && AC_TRY_EVAL([ac_compile]); then
-           AC_LANG_CONFTEST([
-             AC_LANG_SOURCE([[
-               #define wcstod renamed_wcstod
-               #include <wchar.h>
-               int zero (void) { return 0; }
-             ]])])
-           dnl See note above about renaming object files.
-           ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
-           if echo '#include "conftest.c"' >conftest2.c \
-              && AC_TRY_EVAL([ac_compile]); then
-             if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
-               :
-             else
-               gl_cv_header_wchar_h_correct_inline=no
-             fi
-           fi
-         fi
-         ac_compile="$save_ac_compile"
-         rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext
-         ;;
-     esac
-    ])
-  if test $gl_cv_header_wchar_h_correct_inline = no; then
-    AC_MSG_ERROR([<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
-This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
-C99 mode. You have four options:
-  - Add the flag -fgnu89-inline to CC and reconfigure, or
-  - Fix your include files, using parts of
-    <https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
-  - Use a gcc version older than 4.3, or
-  - Don't use the flags -std=c99 or -std=gnu99.
-Configuration aborted.])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wchar_h.m4:132: -1- AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], [
-  dnl Ensure to expand the default settings once only.
-  gl_WCHAR_H_REQUIRE_DEFAULTS
-  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-  dnl Define it also as a C macro, for the benefit of the unit tests.
-  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wchar_h.m4:144: -1- AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], [
-  m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME])
-    dnl Support Microsoft deprecated alias function names by default.
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1])
-  ])
-  m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS])
-  dnl Make sure the shell variable for GNULIB_FREE_POSIX is initialized.
-  gl_STDLIB_H_REQUIRE_DEFAULTS
-  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wchar_h.m4:197: -1- AC_DEFUN([gl_WCHAR_H_DEFAULTS], [
-  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
-  HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
-  HAVE_MBRTOWC=1;       AC_SUBST([HAVE_MBRTOWC])
-  HAVE_MBRLEN=1;        AC_SUBST([HAVE_MBRLEN])
-  HAVE_MBSRTOWCS=1;     AC_SUBST([HAVE_MBSRTOWCS])
-  HAVE_MBSNRTOWCS=1;    AC_SUBST([HAVE_MBSNRTOWCS])
-  HAVE_WCRTOMB=1;       AC_SUBST([HAVE_WCRTOMB])
-  HAVE_WCSRTOMBS=1;     AC_SUBST([HAVE_WCSRTOMBS])
-  HAVE_WCSNRTOMBS=1;    AC_SUBST([HAVE_WCSNRTOMBS])
-  HAVE_WMEMCHR=1;       AC_SUBST([HAVE_WMEMCHR])
-  HAVE_WMEMCMP=1;       AC_SUBST([HAVE_WMEMCMP])
-  HAVE_WMEMCPY=1;       AC_SUBST([HAVE_WMEMCPY])
-  HAVE_WMEMMOVE=1;      AC_SUBST([HAVE_WMEMMOVE])
-  HAVE_WMEMPCPY=1;      AC_SUBST([HAVE_WMEMPCPY])
-  HAVE_WMEMSET=1;       AC_SUBST([HAVE_WMEMSET])
-  HAVE_WCSLEN=1;        AC_SUBST([HAVE_WCSLEN])
-  HAVE_WCSNLEN=1;       AC_SUBST([HAVE_WCSNLEN])
-  HAVE_WCSCPY=1;        AC_SUBST([HAVE_WCSCPY])
-  HAVE_WCPCPY=1;        AC_SUBST([HAVE_WCPCPY])
-  HAVE_WCSNCPY=1;       AC_SUBST([HAVE_WCSNCPY])
-  HAVE_WCPNCPY=1;       AC_SUBST([HAVE_WCPNCPY])
-  HAVE_WCSCAT=1;        AC_SUBST([HAVE_WCSCAT])
-  HAVE_WCSNCAT=1;       AC_SUBST([HAVE_WCSNCAT])
-  HAVE_WCSCMP=1;        AC_SUBST([HAVE_WCSCMP])
-  HAVE_WCSNCMP=1;       AC_SUBST([HAVE_WCSNCMP])
-  HAVE_WCSCASECMP=1;    AC_SUBST([HAVE_WCSCASECMP])
-  HAVE_WCSNCASECMP=1;   AC_SUBST([HAVE_WCSNCASECMP])
-  HAVE_WCSCOLL=1;       AC_SUBST([HAVE_WCSCOLL])
-  HAVE_WCSXFRM=1;       AC_SUBST([HAVE_WCSXFRM])
-  HAVE_WCSDUP=1;        AC_SUBST([HAVE_WCSDUP])
-  HAVE_WCSCHR=1;        AC_SUBST([HAVE_WCSCHR])
-  HAVE_WCSRCHR=1;       AC_SUBST([HAVE_WCSRCHR])
-  HAVE_WCSCSPN=1;       AC_SUBST([HAVE_WCSCSPN])
-  HAVE_WCSSPN=1;        AC_SUBST([HAVE_WCSSPN])
-  HAVE_WCSPBRK=1;       AC_SUBST([HAVE_WCSPBRK])
-  HAVE_WCSSTR=1;        AC_SUBST([HAVE_WCSSTR])
-  HAVE_WCSTOK=1;        AC_SUBST([HAVE_WCSTOK])
-  HAVE_WCSWIDTH=1;      AC_SUBST([HAVE_WCSWIDTH])
-  HAVE_WCSFTIME=1;      AC_SUBST([HAVE_WCSFTIME])
-  HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
-  HAVE_DECL_WCSDUP=1;   AC_SUBST([HAVE_DECL_WCSDUP])
-  HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
-  REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
-  REPLACE_BTOWC=0;      AC_SUBST([REPLACE_BTOWC])
-  REPLACE_WCTOB=0;      AC_SUBST([REPLACE_WCTOB])
-  REPLACE_MBSINIT=0;    AC_SUBST([REPLACE_MBSINIT])
-  REPLACE_MBRTOWC=0;    AC_SUBST([REPLACE_MBRTOWC])
-  REPLACE_MBRLEN=0;     AC_SUBST([REPLACE_MBRLEN])
-  REPLACE_MBSRTOWCS=0;  AC_SUBST([REPLACE_MBSRTOWCS])
-  REPLACE_MBSNRTOWCS=0; AC_SUBST([REPLACE_MBSNRTOWCS])
-  REPLACE_WCRTOMB=0;    AC_SUBST([REPLACE_WCRTOMB])
-  REPLACE_WCSRTOMBS=0;  AC_SUBST([REPLACE_WCSRTOMBS])
-  REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
-  REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
-  REPLACE_WCSWIDTH=0;   AC_SUBST([REPLACE_WCSWIDTH])
-  REPLACE_WCSFTIME=0;   AC_SUBST([REPLACE_WCSFTIME])
-  REPLACE_WCSTOK=0;     AC_SUBST([REPLACE_WCSTOK])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wchar_t.m4:11: -1- AC_DEFUN([gt_TYPE_WCHAR_T], [
-  AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stddef.h>
-            wchar_t foo = (wchar_t)'\0';]],
-          [[]])],
-       [gt_cv_c_wchar_t=yes],
-       [gt_cv_c_wchar_t=no])])
-  if test $gt_cv_c_wchar_t = yes; then
-    AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wint_t.m4:12: -1- AC_DEFUN([gt_TYPE_WINT_T], [
-  AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <wchar.h>
-            wint_t foo = (wchar_t)'\0';]],
-          [[]])],
-       [gt_cv_c_wint_t=yes],
-       [gt_cv_c_wint_t=no])])
-  if test $gt_cv_c_wint_t = yes; then
-    AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
-
-    dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present,
-    dnl override 'wint_t'.
-    AC_CACHE_CHECK([whether wint_t is large enough],
-      [gl_cv_type_wint_t_large_enough],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[#include <wchar.h>
-              int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
-            ]])],
-         [gl_cv_type_wint_t_large_enough=yes],
-         [gl_cv_type_wint_t_large_enough=no])])
-    if test $gl_cv_type_wint_t_large_enough = no; then
-      GNULIBHEADERS_OVERRIDE_WINT_T=1
-    else
-      GNULIBHEADERS_OVERRIDE_WINT_T=0
-    fi
-  else
-    GNULIBHEADERS_OVERRIDE_WINT_T=0
-  fi
-  AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/wint_t.m4:48: -1- AC_DEFUN([gl_TYPE_WINT_T_PREREQ], [
-  AC_CHECK_HEADERS_ONCE([crtdefs.h])
-  if test $ac_cv_header_crtdefs_h = yes; then
-    HAVE_CRTDEFS_H=1
-  else
-    HAVE_CRTDEFS_H=0
-  fi
-  AC_SUBST([HAVE_CRTDEFS_H])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/year2038.m4:10: -1- AC_DEFUN([gl_YEAR2038_EARLY], [
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1],
-        [For 64-bit time_t on 32-bit mingw.])
-      ;;
-  esac
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/year2038.m4:23: -1- AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], [[
-  #include <time.h>
-  /* Check that time_t can represent 2**32 - 1 correctly.  */
-  #define LARGE_TIME_T \\
-    ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
-  int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535
-                           && LARGE_TIME_T % 65537 == 0)
-                          ? 1 : -1];
-]])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/year2038.m4:36: -1- AC_DEFUN([gl_YEAR2038_BODY], [
- AC_ARG_ENABLE([year2038],
-   [  --disable-year2038      omit support for timestamps past the year 2038])
- AS_IF([test "$enable_year2038" != no],
- [
-  dnl On many systems, time_t is already a 64-bit type.
-  dnl On those systems where time_t is still 32-bit, it requires kernel
-  dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux,
-  dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM.
-  dnl
-  dnl On native Windows, the system include files define types __time32_t
-  dnl and __time64_t. By default, time_t is an alias of
-  dnl   - __time32_t on 32-bit mingw,
-  dnl   - __time64_t on 64-bit mingw and on MSVC (since MSVC 8).
-  dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an
-  dnl alias of __time64_t.
-  dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of
-  dnl __time32_t.
-  AC_CACHE_CHECK([for time_t past the year 2038], [gl_cv_type_time_t_y2038],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])],
-       [gl_cv_type_time_t_y2038=yes], [gl_cv_type_time_t_y2038=no])
-    ])
-  if test "$gl_cv_type_time_t_y2038" = no; then
-    AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64],
-      [gl_cv_type_time_t_bits_macro],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_SOURCE([[#define _TIME_BITS 64
-                           #define _FILE_OFFSET_BITS 64
-                           ]gl_YEAR2038_TEST_INCLUDES])],
-         [gl_cv_type_time_t_bits_macro=yes],
-         [gl_cv_type_time_t_bits_macro=no])
-      ])
-    if test "$gl_cv_type_time_t_bits_macro" = yes; then
-      AC_DEFINE([_TIME_BITS], [64],
-        [Number of bits in a timestamp, on hosts where this is settable.])
-      dnl AC_SYS_LARGFILE also defines this; it's OK if we do too.
-      AC_DEFINE([_FILE_OFFSET_BITS], [64],
-        [Number of bits in a file offset, on hosts where this is settable.])
-      gl_cv_type_time_t_y2038=yes
-    fi
-  fi
-  if test $gl_cv_type_time_t_y2038 = no; then
-    AC_COMPILE_IFELSE(
-      [AC_LANG_SOURCE(
-         [[#ifdef _USE_32BIT_TIME_T
-             int ok;
-           #else
-             error fail
-           #endif
-         ]])],
-      [AC_MSG_FAILURE(
-         [The 'time_t' type stops working after January 2038.
-          Remove _USE_32BIT_TIME_T from the compiler flags.])],
-      [# If not cross-compiling and $1 says we should check,
-       # and 'touch' works with a large timestamp, then evidently wider time_t
-       # is desired and supported, so fail and ask the builder to fix the
-       # problem.  Otherwise, just warn the builder.
-       m4_ifval([$1],
-         [if test $cross_compiling = no \
-             && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then
-            case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in
-              *'Feb  7  2106'* | *'Feb  7 17:10'*)
-                AC_MSG_FAILURE(
-                  [The 'time_t' type stops working after January 2038,
-                   and your system appears to support a wider 'time_t'.
-                   Try configuring with 'CC="${CC} -m64"'.
-                   To build with a 32-bit time_t anyway (not recommended),
-                   configure with '--disable-year2038'.]);;
-            esac
-            rm -f conftest.time
-          fi])
-       if test "$gl_warned_about_y2038" != yes; then
-         AC_MSG_WARN(
-           [The 'time_t' type stops working after January 2038,
-            and this package needs a wider 'time_t' type
-            if there is any way to access timestamps after that.
-            Configure with 'CC="${CC} -m64"' perhaps?])
-         gl_warned_about_y2038=yes
-       fi
-      ])
-  fi])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/year2038.m4:121: -1- AC_DEFUN([gl_YEAR2038], [
-  gl_YEAR2038_BODY([require-year2038-safe])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/zzgnulib.m4:23: -1- AC_DEFUN([gl_ZZGNULIB])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/cp.m4:12: -1- AC_DEFUN([CL_PROG_CP], [AC_CACHE_CHECK(how to copy files, cl_cv_prog_cp, [
-echo "blabla" > conftest.x
-err=`/bin/sh -c "cp -p conftest.x conftest.y 2>&1"`
-if test -z "$err"; then
-  cl_cv_prog_cp='cp -p'
-else
-  cl_cv_prog_cp='cp'
-fi
-rm -f conftest*
-])
-CP="$cl_cv_prog_cp"
-AC_SUBST(CP)dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/eilseq.m4:14: -1- AC_DEFUN([AC_EILSEQ], [
-  AC_REQUIRE([AC_PROG_CC])dnl
-
-  dnl Check for any extra headers that could define EILSEQ.
-  AC_CHECK_HEADERS([wchar.h])
-
-  AC_CACHE_CHECK([for EILSEQ], [ac_cv_decl_EILSEQ], [
-    AC_EGREP_CPP([yes],[
-#include <errno.h>
-#ifdef EILSEQ
-yes
-#endif
-      ], [have_eilseq=1])
-    if test -n "$have_eilseq"; then
-      dnl EILSEQ exists in <errno.h>. Don't need to define EILSEQ ourselves.
-      ac_cv_decl_EILSEQ=yes
-    else
-      AC_EGREP_CPP([yes],[
-#include <errno.h>
-#if HAVE_WCHAR_H
-#include <wchar.h>
-#endif
-#ifdef EILSEQ
-yes
-#endif
-        ], [have_eilseq=1])
-      if test -n "$have_eilseq"; then
-        dnl EILSEQ exists in some other system header.
-        dnl Define it to the same value.
-        AC_COMPUTE_INT([ac_cv_decl_EILSEQ], [EILSEQ], [
-#include <errno.h>
-#if HAVE_WCHAR_H
-#include <wchar.h>
-#endif
-/* The following two lines are a workaround against an autoconf-2.52 bug.  */
-#include <stdio.h>
-#include <stdlib.h>
-])
-      else
-        dnl EILSEQ isn't defined by the system. Define EILSEQ ourselves, but
-        dnl don't define it as EINVAL, because iconv() callers want to
-        dnl distinguish EINVAL and EILSEQ.
-        ac_cv_decl_EILSEQ=ENOENT
-      fi
-    fi
-  ])
-  if test "$ac_cv_decl_EILSEQ" != yes; then
-    AC_DEFINE_UNQUOTED([EILSEQ], [$ac_cv_decl_EILSEQ],
-                       [Define as good substitute value for EILSEQ.])
-    EILSEQ="$ac_cv_decl_EILSEQ"
-    AC_SUBST([EILSEQ])
-  fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:62: -1- AC_DEFUN([LT_INIT], [AC_PREREQ([2.64])dnl We use AC_PATH_PROGS_FEATURE_CHECK
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:100: -1- AU_DEFUN([AC_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:100: -1- AC_DEFUN([AC_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AC_PROG_LIBTOOL' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_INIT], [LT_INIT($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:101: -1- AU_DEFUN([AM_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:101: -1- AC_DEFUN([AM_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AM_PROG_LIBTOOL' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_INIT], [LT_INIT($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:621: -1- AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-'$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2024 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-while test 0 != $[#]
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try '$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try '$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test yes = "$silent" &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:813: -1- AC_DEFUN([LT_SUPPORTED_TAG], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:824: -1- AC_DEFUN([LT_LANG], [AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:916: -1- AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:916: -1- AC_DEFUN([AC_LIBTOOL_CXX], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_CXX' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(C++)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:917: -1- AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:917: -1- AC_DEFUN([AC_LIBTOOL_F77], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_F77' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(Fortran 77)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:918: -1- AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:918: -1- AC_DEFUN([AC_LIBTOOL_FC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_FC' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(Fortran)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:919: -1- AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:919: -1- AC_DEFUN([AC_LIBTOOL_GCJ], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_GCJ' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(Java)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:920: -1- AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:920: -1- AC_DEFUN([AC_LIBTOOL_RC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_RC' is obsolete.
-You should run autoupdate.])dnl
-LT_LANG(Windows Resource)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1278: -1- AC_DEFUN([_LT_WITH_SYSROOT], [m4_require([_LT_DECL_SED])dnl
-AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
-  [Search for dependent libraries within DIR (or the compiler's sysroot
-   if not specified).])],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     # Trim trailing / since we'll always append absolute paths and we want
-     # to avoid //, if only for less confusing output for the user.
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([$with_sysroot])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and where our libraries should be installed.])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1618: -1- AC_DEFUN([_LT_COMPILER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test yes = "[$]$2"; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1660: -1- AU_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1660: -1- AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_COMPILER_OPTION' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1669: -1- AC_DEFUN([_LT_LINKER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-])
-
-if test yes = "[$]$2"; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1704: -1- AU_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1704: -1- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_LINKER_OPTION' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1711: -1- AC_DEFUN([LT_CMD_MAX_LEN], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | windows* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1850: -1- AU_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1850: -1- AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_SYS_MAX_CMD_LEN' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1961: -1- AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl
-if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | windows* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen=shl_load],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen=dlopen],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:2086: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:2086: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN_SELF' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3296: -1- AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$1"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac])
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3358: -1- AU_DEFUN([AC_PATH_TOOL_PREFIX], [m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3358: -1- AC_DEFUN([AC_PATH_TOOL_PREFIX], [m4_warn([obsolete], [The macro 'AC_PATH_TOOL_PREFIX' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3381: -1- AC_DEFUN([LT_PATH_LD], [AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test no = "$withval" || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw* | *-*-windows*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi])
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3470: -1- AU_DEFUN([AM_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3470: -1- AC_DEFUN([AM_PROG_LD], [m4_warn([obsolete], [The macro 'AM_PROG_LD' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3471: -1- AU_DEFUN([AC_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3471: -1- AC_DEFUN([AC_PROG_LD], [m4_warn([obsolete], [The macro 'AC_PROG_LD' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3811: -1- AC_DEFUN([LT_PATH_NM], [AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3906: -1- AU_DEFUN([AM_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3906: -1- AC_DEFUN([AM_PROG_NM], [m4_warn([obsolete], [The macro 'AM_PROG_NM' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3907: -1- AU_DEFUN([AC_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3907: -1- AC_DEFUN([AC_PROG_NM], [m4_warn([obsolete], [The macro 'AC_PROG_NM' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3978: -1- AC_DEFUN([_LT_DLL_DEF_P], [dnl
-  test DEF = "`$SED -n dnl
-    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
-    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
-    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
-    -e q dnl                          Only consider the first "real" line
-    $1`" dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3992: -1- AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM=-lm)
-  ;;
-esac
-AC_SUBST([LIBM])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:4011: -1- AU_DEFUN([AC_CHECK_LIBM], [m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:4011: -1- AC_DEFUN([AC_CHECK_LIBM], [m4_warn([obsolete], [The macro 'AC_CHECK_LIBM' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8336: -1- AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8345: -1- AU_DEFUN([LT_AC_PROG_GCJ], [m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8345: -1- AC_DEFUN([LT_AC_PROG_GCJ], [m4_warn([obsolete], [The macro 'LT_AC_PROG_GCJ' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8352: -1- AC_DEFUN([LT_PROG_GO], [AC_CHECK_TOOL(GOC, gccgo,)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8359: -1- AC_DEFUN([LT_PROG_RC], [AC_CHECK_TOOL(RC, windres,)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8364: -1- AU_DEFUN([LT_AC_PROG_RC], [m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8364: -1- AC_DEFUN([LT_AC_PROG_RC], [m4_warn([obsolete], [The macro 'LT_AC_PROG_RC' is obsolete.
-You should run autoupdate.])dnl
-m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ln.m4:12: -1- AC_DEFUN([CL_PROG_LN], [AC_REQUIRE([CL_PROG_CP])dnl
-AC_CACHE_CHECK(how to make hard links, cl_cv_prog_LN, [
-rm -f conftestdata conftestfile
-echo data > conftestfile
-if ln conftestfile conftestdata 2>/dev/null; then
-  cl_cv_prog_LN=ln
-else
-  cl_cv_prog_LN="$cl_cv_prog_cp"
-fi
-rm -f conftestdata conftestfile
-])
-LN="$cl_cv_prog_LN"
-AC_SUBST(LN)dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ln.m4:28: -1- AC_DEFUN([CL_PROG_LN_S], [AC_REQUIRE([CL_PROG_LN])dnl
-dnl Make a symlink if possible; otherwise try a hard link. On filesystems
-dnl which support neither symlink nor hard link, use a plain copy.
-AC_MSG_CHECKING(whether ln -s works)
-AC_CACHE_VAL(cl_cv_prog_LN_S, [
-rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null; then
-  cl_cv_prog_LN_S="ln -s"
-else
-  cl_cv_prog_LN_S="$cl_cv_prog_LN"
-fi
-rm -f conftestdata
-])dnl
-if test "$cl_cv_prog_LN_S" = "ln -s"; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-LN_S="$cl_cv_prog_LN_S"
-AC_SUBST(LN_S)dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ln.m4:51: -1- AC_DEFUN([CL_PROG_HLN], [AC_REQUIRE([CL_PROG_LN_S])dnl
-dnl SVR4 "ln" makes hard links to symbolic links, instead of resolving the
-dnl symbolic link. To avoid this, use the "hln" program.
-AC_CACHE_CHECK(how to make hard links to symlinks, cl_cv_prog_hln, [
-cl_cv_prog_hln="ln"
-if test "$cl_cv_prog_LN_S" = "ln -s"; then
-echo "blabla" > conftest.x
-ln -s conftest.x conftest.y
-ln conftest.y conftest.z 2>&AC_FD_CC
-rm -f conftest.x
-if cat conftest.z > /dev/null 2>&1 ; then
-  # ln is usable.
-  cl_cv_prog_hln="ln"
-else
-  # conftest.z is a symbolic link to the non-existent conftest.x
-  cl_cv_prog_hln="hln"
-fi
-else
-# If there are no symbolic links, the problem cannot occur.
-cl_cv_prog_hln="ln"
-fi
-rm -f conftest*
-])
-HLN="$cl_cv_prog_hln"
-AC_SUBST(HLN)dnl
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:14: -1- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:113: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'dlopen' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:113: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN' is obsolete.
-You should run autoupdate.])dnl
-_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'dlopen' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:148: -1- AU_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'win32-dll' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:148: -1- AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_WIN32_DLL' is obsolete.
-You should run autoupdate.])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'win32-dll' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:197: -1- AC_DEFUN([AC_ENABLE_SHARED], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:201: -1- AC_DEFUN([AC_DISABLE_SHARED], [_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:205: -1- AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:205: -1- AC_DEFUN([AM_ENABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_ENABLE_SHARED' is obsolete.
-You should run autoupdate.])dnl
-AC_ENABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:206: -1- AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:206: -1- AC_DEFUN([AM_DISABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_DISABLE_SHARED' is obsolete.
-You should run autoupdate.])dnl
-AC_DISABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:251: -1- AC_DEFUN([AC_ENABLE_STATIC], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:255: -1- AC_DEFUN([AC_DISABLE_STATIC], [_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:259: -1- AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:259: -1- AC_DEFUN([AM_ENABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_ENABLE_STATIC' is obsolete.
-You should run autoupdate.])dnl
-AC_ENABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:260: -1- AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:260: -1- AC_DEFUN([AM_DISABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_DISABLE_STATIC' is obsolete.
-You should run autoupdate.])dnl
-AC_DISABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:305: -1- AU_DEFUN([AC_ENABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'fast-install' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:305: -1- AC_DEFUN([AC_ENABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_ENABLE_FAST_INSTALL' is obsolete.
-You should run autoupdate.])dnl
-_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'fast-install' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:312: -1- AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'disable-fast-install' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:312: -1- AC_DEFUN([AC_DISABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_DISABLE_FAST_INSTALL' is obsolete.
-You should run autoupdate.])dnl
-_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'disable-fast-install' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:411: -1- AU_DEFUN([AC_LIBTOOL_PICMODE], [_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'pic-only' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:411: -1- AC_DEFUN([AC_LIBTOOL_PICMODE], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_PICMODE' is obsolete.
-You should run autoupdate.])dnl
-_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'pic-only' option into LT_INIT's first parameter.])
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltsugar.m4:14: -1- AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltversion.m4:19: -1- AC_DEFUN([LTVERSION_VERSION], [macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:37: -1- AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:41: -1- AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:42: -1- AC_DEFUN([_LT_AC_SHELL_INIT])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:43: -1- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:45: -1- AC_DEFUN([_LT_AC_TAGVAR])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:46: -1- AC_DEFUN([AC_LTDL_ENABLE_INSTALL])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:47: -1- AC_DEFUN([AC_LTDL_PREOPEN])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:48: -1- AC_DEFUN([_LT_AC_SYS_COMPILER])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:49: -1- AC_DEFUN([_LT_AC_LOCK])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:50: -1- AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:51: -1- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:52: -1- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:53: -1- AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:54: -1- AC_DEFUN([AC_LIBTOOL_OBJDIR])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:55: -1- AC_DEFUN([AC_LTDL_OBJDIR])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:56: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:57: -1- AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:58: -1- AC_DEFUN([AC_PATH_MAGIC])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:59: -1- AC_DEFUN([AC_PROG_LD_GNU])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:60: -1- AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:61: -1- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:62: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:63: -1- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:64: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:65: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:66: -1- AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:67: -1- AC_DEFUN([LT_AC_PROG_EGREP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:68: -1- AC_DEFUN([LT_AC_PROG_SED])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:72: -1- AC_DEFUN([_AC_PROG_LIBTOOL])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:73: -1- AC_DEFUN([AC_LIBTOOL_SETUP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:74: -1- AC_DEFUN([_LT_AC_CHECK_DLFCN])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:75: -1- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:76: -1- AC_DEFUN([_LT_AC_TAGCONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:78: -1- AC_DEFUN([_LT_AC_LANG_CXX])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:79: -1- AC_DEFUN([_LT_AC_LANG_F77])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:80: -1- AC_DEFUN([_LT_AC_LANG_GCJ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:81: -1- AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:82: -1- AC_DEFUN([_LT_AC_LANG_C_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:83: -1- AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:84: -1- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:85: -1- AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:86: -1- AC_DEFUN([_LT_AC_LANG_F77_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:87: -1- AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:88: -1- AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:89: -1- AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:90: -1- AC_DEFUN([_LT_AC_LANG_RC_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:91: -1- AC_DEFUN([AC_LIBTOOL_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:92: -1- AC_DEFUN([_LT_AC_FILE_LTDLL_C])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:94: -1- AC_DEFUN([_LT_AC_PROG_CXXCPP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:97: -1- AC_DEFUN([_LT_PROG_F77])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:98: -1- AC_DEFUN([_LT_PROG_FC])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:99: -1- AC_DEFUN([_LT_PROG_CXX])
 m4trace:configure.ac:19: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:19: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:19: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section 'AC_LIBOBJ vs LIBOBJS'])
@@ -13083,18 +13217,18 @@ m4trace:configure.ac:19: -1- m4_pattern_allow([^PACKAGE_STRING$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^PACKAGE_URL$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_T$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^LIBS$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^build_alias$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^host_alias$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_T$])
 m4trace:configure.ac:22: -1- AM_INIT_AUTOMAKE
 m4trace:configure.ac:22: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
 m4trace:configure.ac:22: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
 m4trace:configure.ac:22: -1- AM_AUTOMAKE_VERSION([1.18.1])
-m4trace:configure.ac:22: -1- _AM_AUTOCONF_VERSION([2.72])
+m4trace:configure.ac:22: -1- _AM_AUTOCONF_VERSION([2.73])
 m4trace:configure.ac:22: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
 m4trace:configure.ac:22: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
 m4trace:configure.ac:22: -1- m4_pattern_allow([^INSTALL_DATA$])
@@ -13291,6 +13425,7 @@ m4trace:configure.ac:51: -1- AC_DEFUN([_AC_Header_minix_config_h], [m4_divert_te
   [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
   [" minix/config.h ]AS_TR_SH([minix/config.h]) AS_TR_CPP([HAVE_minix/config.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
 m4trace:configure.ac:51: -1- m4_pattern_allow([^_ALL_SOURCE$])
+m4trace:configure.ac:51: -1- m4_pattern_allow([^_COSMO_SOURCE$])
 m4trace:configure.ac:51: -1- m4_pattern_allow([^_DARWIN_C_SOURCE$])
 m4trace:configure.ac:51: -1- m4_pattern_allow([^_GNU_SOURCE$])
 m4trace:configure.ac:51: -1- m4_pattern_allow([^_HPUX_ALT_XOPEN_SOCKET_API$])
@@ -13540,6 +13675,11 @@ m4trace:configure.ac:99: -1- m4_pattern_allow([^INTLLIBS$])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^LIBINTL$])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^LTLIBINTL$])
 m4trace:configure.ac:99: -1- m4_pattern_allow([^POSUB$])
+m4trace:configure.ac:99: -1- gl_BUILD_TO_HOST_LOCALEDIR
+m4trace:configure.ac:99: -1- gl_BUILD_TO_HOST([localedir])
+m4trace:configure.ac:99: -1- gl_BUILD_TO_HOST_INIT
+m4trace:configure.ac:99: -1- m4_pattern_allow([^localedir_c$])
+m4trace:configure.ac:99: -1- m4_pattern_allow([^localedir_c_make$])
 m4trace:configure.ac:103: -1- AC_TYPE_MBSTATE_T
 m4trace:configure.ac:103: -1- m4_pattern_allow([^HAVE_MBSTATE_T$])
 m4trace:configure.ac:103: -1- m4_pattern_allow([^mbstate_t$])
@@ -14215,6 +14355,7 @@ m4trace:configure.ac:160: -1- AM_COND_IF([GL_COND_OBJ_ERROR], [
 m4trace:configure.ac:160: -1- gl_PREREQ_ERROR
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_strerror_r], [_AC_CHECK_DECLS([strerror_r])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_STRERROR_R$])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_STRERROR_R$])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^STRERROR_R_CHAR_P$])
@@ -14422,6 +14563,7 @@ m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Func_getdtablesize], [m4_divert_text
   [" getdtablesize ]AS_TR_CPP([HAVE_getdtablesize])["])])_AC_FUNCS_EXPANSION(_AC_LANG_ABBREV)])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_getdtablesize], [_AC_CHECK_DECLS([getdtablesize])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_GETDTABLESIZE$])
 m4trace:configure.ac:160: -1- GL_MDA_DEFINES
 m4trace:configure.ac:160: -1- gl_CONDITIONAL([GL_COND_OBJ_GETDTABLESIZE], [test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1])
@@ -14450,10 +14592,13 @@ m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Func_getexecname], [m4_divert_text([
   [AS_VAR_APPEND([ac_func_]]_AC_LANG_ABBREV[[_list],
   [" getexecname ]AS_TR_CPP([HAVE_getexecname])["])])_AC_FUNCS_EXPANSION(_AC_LANG_ABBREV)])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_PROGRAM_INVOCATION_NAME$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL___ARGV$])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_VAR___PROGNAME$])
 m4trace:configure.ac:160: -1- AM_GNU_GETTEXT_VERSION([0.20])
@@ -14813,8 +14958,10 @@ m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Header_sys_param_h], [m4_divert_text
   [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
   [" sys/param.h ]AS_TR_SH([sys/param.h]) AS_TR_CPP([HAVE_sys/param.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_PROGRAM_INVOCATION_NAME$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME$])
 m4trace:configure.ac:160: -1- gl_FUNC_RAISE
 m4trace:configure.ac:160: -1- gl_SIGNAL_H_DEFAULTS
@@ -14979,6 +15126,7 @@ m4trace:configure.ac:160: -1- gl_RELOCATABLE_LIBRARY
 m4trace:configure.ac:160: -1- gl_FUNC_SETENV_SEPARATE
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_setenv], [_AC_CHECK_DECLS([setenv])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_SETENV$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Func_setenv], [m4_divert_text([INIT_PREPARE],
   [AS_VAR_APPEND([ac_func_]]_AC_LANG_ABBREV[[_list],
@@ -15329,6 +15477,7 @@ m4trace:configure.ac:160: -1- gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
     renameat snprintf tmpfile vdprintf vsnprintf])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_fcloseall], [_AC_CHECK_DECLS([fcloseall])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FCLOSEALL$])
 m4trace:configure.ac:160: -1- gl_STDIO_H_REQUIRE_DEFAULTS
 m4trace:configure.ac:160: -1- gl_CONDITIONAL([GL_COND_OBJ_STDIO_READ], [test $REPLACE_STDIO_READ_FUNCS = 1])
@@ -15508,12 +15657,15 @@ m4trace:configure.ac:160: -1- gl_WARN_ON_USE_PREPARE([[#include <stdlib.h>
     strtod strtol strtold strtoll strtoul strtoull unlockpt unsetenv])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_ecvt], [_AC_CHECK_DECLS([ecvt])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_ECVT$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_fcvt], [_AC_CHECK_DECLS([fcvt])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FCVT$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_gcvt], [_AC_CHECK_DECLS([gcvt])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_GCVT$])
 m4trace:configure.ac:160: -1- gl_STDLIB_H_REQUIRE_DEFAULTS
 m4trace:configure.ac:160: -1- gl_FUNC_STRERROR
@@ -15671,6 +15823,7 @@ m4trace:configure.ac:160: -1- gl_WARN_ON_USE_PREPARE([[
     truncate ttyname_r unlink unlinkat usleep])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_execvpe], [_AC_CHECK_DECLS([execvpe])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_EXECVPE$])
 m4trace:configure.ac:160: -1- gl_UNISTD_H_REQUIRE_DEFAULTS
 m4trace:configure.ac:160: -1- gl_LIBUNISTRING_LIBHEADER([0.9.11], [unitypes.h])
@@ -15693,42 +15846,55 @@ m4trace:configure.ac:160: -1- m4_pattern_allow([^USE_UNLOCKED_IO$])
 m4trace:configure.ac:160: -1- gl_FUNC_GLIBC_UNLOCKED_IO
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_clearerr_unlocked], [_AC_CHECK_DECLS([clearerr_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_CLEARERR_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_feof_unlocked], [_AC_CHECK_DECLS([feof_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FEOF_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_ferror_unlocked], [_AC_CHECK_DECLS([ferror_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FERROR_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_fflush_unlocked], [_AC_CHECK_DECLS([fflush_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FFLUSH_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_fgets_unlocked], [_AC_CHECK_DECLS([fgets_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FGETS_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_fputc_unlocked], [_AC_CHECK_DECLS([fputc_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FPUTC_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_fputs_unlocked], [_AC_CHECK_DECLS([fputs_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FPUTS_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_fread_unlocked], [_AC_CHECK_DECLS([fread_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FREAD_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_fwrite_unlocked], [_AC_CHECK_DECLS([fwrite_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_FWRITE_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_getc_unlocked], [_AC_CHECK_DECLS([getc_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_GETC_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_getchar_unlocked], [_AC_CHECK_DECLS([getchar_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_GETCHAR_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_putc_unlocked], [_AC_CHECK_DECLS([putc_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_PUTC_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_Check_Decl_putchar_unlocked], [_AC_CHECK_DECLS([putchar_unlocked])])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_PUTCHAR_UNLOCKED$])
 m4trace:configure.ac:160: -1- AC_C_VARARRAYS
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_C_VARARRAYS$])
@@ -15823,6 +15989,7 @@ m4trace:configure.ac:160: -1- gl_WARN_ON_USE_PREPARE([[
      wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime
     ])
 m4trace:configure.ac:160: -1- AC_DEFUN([_AC_UNDECLARED_BUILTIN_c], [_AC_UNDECLARED_BUILTIN])
+m4trace:configure.ac:160: -1- AC_DEFUN([_AC_FUTURE_DARWIN_c], [_AC_FUTURE_DARWIN])
 m4trace:configure.ac:160: -1- m4_pattern_allow([^HAVE_DECL_WCSDUP$])
 m4trace:configure.ac:160: -1- gl_WCHAR_H_REQUIRE_DEFAULTS
 m4trace:configure.ac:160: -1- gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC])
diff --git a/recipes/libs/libiconv/source/build-aux/ltmain.sh b/recipes/libs/libiconv/source/build-aux/ltmain.sh
index b1ba2d3b02..f2abcc80d1 100644
--- a/recipes/libs/libiconv/source/build-aux/ltmain.sh
+++ b/recipes/libs/libiconv/source/build-aux/ltmain.sh
@@ -2,11 +2,11 @@
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
 ##               by inline-source v2019-02-19.15
 
-# libtool (GNU libtool) 2.6.0
+# libtool (GNU libtool) 2.6.0.23-b08cb
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2019, 2021-2025 Free Software Foundation, Inc.
+# Copyright (C) 1996-2019, 2021-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.6.0
-package_revision=2.6.0
+VERSION=2.6.0.23-b08cb
+package_revision=2.6.0.23
 
 
 ## ------ ##
@@ -2215,7 +2215,7 @@ func_version ()
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.6.0'
+scriptversion='(GNU libtool) 2.6.0.23-b08cb'
 
 # func_version
 # ------------
@@ -3204,11 +3204,11 @@ func_convert_core_msys_to_w32_with_cygpath ()
 
   # Since MSYS2 is packaged with cygpath, call cygpath in $PATH; no need
   # to use LT_CYGPATH in this case.
-  func_convert_core_msys_to_w32_result=`cygpath "$@" 2>/dev/null |
+  func_convert_core_msys_to_w32_with_cygpath_result=`cygpath "$@" 2>/dev/null |
 	$SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
   if test "$?" -ne 0; then
       # on failure, ensure result is empty
-      func_convert_core_msys_to_w32_result=
+      func_convert_core_msys_to_w32_with_cygpath_result=
   fi
 }
 #end: func_convert_core_msys_to_w32_with_cygpath
@@ -5655,7 +5655,7 @@ func_extract_archives ()
 	    $RM -rf unfat-$$
 	    cd "$darwin_orig_dir"
 	  else
-	    cd $darwin_orig_dir
+	    cd "$darwin_orig_dir"
 	    func_extract_an_archive "$my_xdir" "$my_xabs"
 	  fi # $darwin_arches
 	} # !$opt_dry_run
@@ -6988,7 +6988,15 @@ func_mode_link ()
       # even a static library is built.  For now, we need to specify
       # -no-undefined on the libtool link line when we can be certain
       # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
+      case $host in
+      *-*-os2*)
+        # OS/2 does not allow undefined symbols at all when linking a dll.
+        allow_undefined=no
+        ;;
+      *)
+        allow_undefined=yes
+        ;;
+      esac
       ;;
     *)
       allow_undefined=yes
@@ -7060,7 +7068,7 @@ func_mode_link ()
 	build_old_libs=no
 	break
 	;;
-      -all-static | -static | -static-libtool-libs)
+      -all-static | -static | -static-libtool-libs | --static | -Bstatic)
 	case $arg in
 	-all-static)
 	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
@@ -7077,7 +7085,7 @@ func_mode_link ()
 	  fi
 	  prefer_static_libs=built
 	  ;;
-	-static-libtool-libs)
+	-static-libtool-libs | --static | -Bstatic)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
@@ -7094,6 +7102,16 @@ func_mode_link ()
     # See if our shared archives depend on static archives.
     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 
+    # make sure "-Xpreprocessor -fopenmp" is processed as one token
+    case $@ in
+    *-Xpreprocessor\ -fopenmp*)
+      fopenmp_match="-Xpreprocessor -fopenmp"
+      ;;
+    *)
+      fopenmp_match=-fopenmp
+      ;;
+    esac
+
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
       arg=$1
@@ -7583,7 +7601,7 @@ func_mode_link ()
 	continue
 	;;
       -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+      |-threads|$fopenmp_match|fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -7810,6 +7828,7 @@ func_mode_link ()
       # -fuse-ld=*           Linker select flags for GCC
       # -static-*            direct GCC to link specific libraries statically
       # -fcilkplus           Cilk Plus language extension features for C/C++
+      # -resource-dir=*      for selecting compiler resource directory with clang
       # -rtlib=*             select c runtime lib with clang
       # --unwindlib=*        select unwinder library with clang
       # -f{file|debug|macro|profile}-prefix-map=* needed for lto linking
@@ -7818,7 +7837,7 @@ func_mode_link ()
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*|--target=*| \
       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-no-canonical-prefixes| \
-      -stdlib=*|-rtlib=*|--unwindlib=*| \
+      -stdlib=*|-resource-dir=*|-rtlib=*|--unwindlib=*| \
       -specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \
       -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \
       -fdiagnostics-color*|-frecord-gcc-switches| \
@@ -7944,8 +7963,8 @@ func_mode_link ()
 	fi
 	;;
 
-      *.$libext)
-	# An archive.
+      *.$libext|*.so)
+	# An archive or an explicit shared library.
 	func_append deplibs " $arg"
 	func_append old_deplibs " $arg"
 	continue
@@ -8173,7 +8192,7 @@ func_mode_link ()
        continue
        ;;
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+        |-threads|$fopenmp_match|fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -8323,6 +8342,25 @@ func_mode_link ()
 	  func_resolve_sysroot "$deplib"
 	  lib=$func_resolve_sysroot_result
 	  ;;
+	 *.so)
+	   case $linkmode,$pass in
+	     lib,*)
+	       deplibs="$deplib $deplibs"
+	       newdependency_libs="$deplib $newdependency_libs"
+	       ;;
+	     prog,link)
+	       compile_deplibs="$deplib $compile_deplibs"
+	       finalize_deplibs="$deplib $finalize_deplibs"
+	       ;;
+	     prog,*)
+	       deplibs="$deplib $deplibs"
+	       ;;
+	     *)
+	       func_warning "'$deplib' is ignored for archives/objects"
+	       ;;
+	   esac
+	   continue
+	   ;;
 	*.$libext)
 	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
diff --git a/recipes/libs/libiconv/source/configure b/recipes/libs/libiconv/source/configure
index ca0cf20511..ed422afa67 100755
--- a/recipes/libs/libiconv/source/configure
+++ b/recipes/libs/libiconv/source/configure
@@ -7326,8 +7326,8 @@ esac
 
 
 
-macro_version='2.6.0'
-macro_revision='2.6.0'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
 
 
@@ -31490,8 +31490,8 @@ AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
 AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
diff --git a/recipes/libs/libiconv/source/libcharset/aclocal.m4 b/recipes/libs/libiconv/source/libcharset/aclocal.m4
index b2b66e9d64..3fef9bab5b 100644
--- a/recipes/libs/libiconv/source/libcharset/aclocal.m4
+++ b/recipes/libs/libiconv/source/libcharset/aclocal.m4
@@ -1390,175 +1390,6 @@ AC_DEFUN([_GL_MDA_DEFINES],
 '
 ])
 
-# lib-ld.m4 serial 10
-dnl Copyright (C) 1996-2003, 2009-2022 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
-
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-2.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-        [assume the C compiler uses GNU ld [default=no]])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-if test -n "$LD"; then
-  AC_MSG_CHECKING([for ld])
-elif test "$GCC" = yes; then
-  AC_MSG_CHECKING([for ld used by $CC])
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-if test -n "$LD"; then
-  # Let the user override the test with a path.
-  :
-else
-  AC_CACHE_VAL([acl_cv_path_LD],
-  [
-    acl_cv_path_LD= # Final result of this test
-    ac_prog=ld # Program to search in $PATH
-    if test "$GCC" = yes; then
-      # Check if gcc -print-prog-name=ld gives a path.
-      case $host in
-        *-*-mingw*)
-          # gcc leaves a trailing carriage return which upsets mingw
-          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-        *)
-          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
-      esac
-      case $acl_output in
-        # Accept absolute paths.
-        [[\\/]]* | ?:[[\\/]]*)
-          re_direlt='/[[^/]][[^/]]*/\.\./'
-          # Canonicalize the pathname of ld
-          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
-          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
-            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
-          done
-          # Got the pathname. No search in PATH is needed.
-          acl_cv_path_LD="$acl_output"
-          ac_prog=
-          ;;
-        "")
-          # If it fails, then pretend we aren't using GCC.
-          ;;
-        *)
-          # If it is relative, then search for the first ld in PATH.
-          with_gnu_ld=unknown
-          ;;
-      esac
-    fi
-    if test -n "$ac_prog"; then
-      # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-      for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
-        test -z "$ac_dir" && ac_dir=.
-        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-          acl_cv_path_LD="$ac_dir/$ac_prog"
-          # Check to see if the program is GNU ld.  I'd rather use --version,
-          # but apparently some variants of GNU ld only accept -v.
-          # Break only if it was the GNU/non-GNU ld that we prefer.
-          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-            *GNU* | *'with BFD'*)
-              test "$with_gnu_ld" != no && break
-              ;;
-            *)
-              test "$with_gnu_ld" != yes && break
-              ;;
-          esac
-        fi
-      done
-      IFS="$acl_save_ifs"
-    fi
-    case $host in
-      *-*-aix*)
-        AC_COMPILE_IFELSE(
-          [AC_LANG_SOURCE(
-             [[#if defined __powerpc64__ || defined __LP64__
-                int ok;
-               #else
-                error fail
-               #endif
-             ]])],
-          [# The compiler produces 64-bit code. Add option '-b64' so that the
-           # linker groks 64-bit object files.
-           case "$acl_cv_path_LD " in
-             *" -b64 "*) ;;
-             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
-           esac
-          ], [])
-        ;;
-      sparc64-*-netbsd*)
-        AC_COMPILE_IFELSE(
-          [AC_LANG_SOURCE(
-             [[#if defined __sparcv9 || defined __arch64__
-                int ok;
-               #else
-                error fail
-               #endif
-             ]])],
-          [],
-          [# The compiler produces 32-bit code. Add option '-m elf32_sparc'
-           # so that the linker groks 32-bit object files.
-           case "$acl_cv_path_LD " in
-             *" -m elf32_sparc "*) ;;
-             *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
-           esac
-          ])
-        ;;
-    esac
-  ])
-  LD="$acl_cv_path_LD"
-fi
-if test -n "$LD"; then
-  AC_MSG_RESULT([$LD])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([no acceptable ld found in \$PATH])
-fi
-AC_LIB_PROG_LD_GNU
-])
-
 # relocatable-lib.m4 serial 6
 dnl Copyright (C) 2003, 2005-2007, 2009-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -1851,9 +1682,180 @@ AC_DEFUN([gl_VISIBILITY],
     [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
 ])
 
+# lib-ld.m4
+# serial 13
+dnl Copyright (C) 1996-2003, 2009-2024 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
+
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes
+  ;;
+*)
+  acl_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-2.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([[--with-gnu-ld]],
+        [assume the C compiler uses GNU ld [default=no]])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+if test -n "$LD"; then
+  AC_MSG_CHECKING([for ld])
+elif test "$GCC" = yes; then
+  AC_MSG_CHECKING([for ld used by $CC])
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+if test -n "$LD"; then
+  # Let the user override the test with a path.
+  :
+else
+  AC_CACHE_VAL([acl_cv_path_LD],
+  [
+    acl_cv_path_LD= # Final result of this test
+    ac_prog=ld # Program to search in $PATH
+    if test "$GCC" = yes; then
+      # Check if gcc -print-prog-name=ld gives a path.
+      case $host in
+        *-*-mingw* | windows*)
+          # gcc leaves a trailing carriage return which upsets mingw
+          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+        *)
+          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
+      esac
+      case $acl_output in
+        # Accept absolute paths.
+        [[\\/]]* | ?:[[\\/]]*)
+          re_direlt='/[[^/]][[^/]]*/\.\./'
+          # Canonicalize the pathname of ld
+          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
+          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
+            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
+          done
+          # Got the pathname. No search in PATH is needed.
+          acl_cv_path_LD="$acl_output"
+          ac_prog=
+          ;;
+        "")
+          # If it fails, then pretend we aren't using GCC.
+          ;;
+        *)
+          # If it is relative, then search for the first ld in PATH.
+          with_gnu_ld=unknown
+          ;;
+      esac
+    fi
+    if test -n "$ac_prog"; then
+      # Search for $ac_prog in $PATH.
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
+      for ac_dir in $PATH; do
+        IFS="$acl_saved_IFS"
+        test -z "$ac_dir" && ac_dir=.
+        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+          acl_cv_path_LD="$ac_dir/$ac_prog"
+          # Check to see if the program is GNU ld.  I'd rather use --version,
+          # but apparently some variants of GNU ld only accept -v.
+          # Break only if it was the GNU/non-GNU ld that we prefer.
+          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+            *GNU* | *'with BFD'*)
+              test "$with_gnu_ld" != no && break
+              ;;
+            *)
+              test "$with_gnu_ld" != yes && break
+              ;;
+          esac
+        fi
+      done
+      IFS="$acl_saved_IFS"
+    fi
+    case $host in
+      *-*-aix*)
+        AC_COMPILE_IFELSE(
+          [AC_LANG_SOURCE(
+             [[#if defined __powerpc64__ || defined __LP64__
+                int ok;
+               #else
+                error fail
+               #endif
+             ]])],
+          [# The compiler produces 64-bit code. Add option '-b64' so that the
+           # linker groks 64-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -b64 "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
+           esac
+          ], [])
+        ;;
+      sparc64-*-netbsd*)
+        AC_COMPILE_IFELSE(
+          [AC_LANG_SOURCE(
+             [[#if defined __sparcv9 || defined __arch64__
+                int ok;
+               #else
+                error fail
+               #endif
+             ]])],
+          [],
+          [# The compiler produces 32-bit code. Add option '-m elf32_sparc'
+           # so that the linker groks 32-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -m elf32_sparc "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
+           esac
+          ])
+        ;;
+    esac
+  ])
+  LD="$acl_cv_path_LD"
+fi
+if test -n "$LD"; then
+  AC_MSG_RESULT([$LD])
+else
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([no acceptable ld found in \$PATH])
+fi
+AC_LIB_PROG_LD_GNU
+])
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2019, 2021-2024 Free Software
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2026 Free Software
 #   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
@@ -1862,7 +1864,7 @@ AC_DEFUN([gl_VISIBILITY],
 # modifications, as long as this notice is preserved.
 
 m4_define([_LT_COPYING], [dnl
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -1885,7 +1887,7 @@ m4_define([_LT_COPYING], [dnl
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ])
 
-# serial 63 LT_INIT
+# serial 66 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -2353,6 +2355,87 @@ m4_define([_LT_LIBTOOL_TAG_VARS],
 # ------------------------------
 m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
 
+# _LT_OBJECTIVE_C
+# ------------------------------
+m4_defun([_LT_OBJECTIVE_C], [
+  AC_CACHE_CHECK([for Objective C compilation],
+    [lt_cv_objc_compiles],
+    [ save_CFLAGS=$CFLAGS
+      CFLAGS=$OBJCFLAGS
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([#import <Foundation/Foundation.h>
+@interface Addition : NSObject
+- (int)this:(int)a that:(int)b;
+@end
+
+@implementation Addition
+- (int)this:(int)a that:(int)b
+{
+  return a + b;
+}
+@end
+],[])],
+        lt_cv_objc_compiles=yes,
+        lt_cv_objc_compiles=no
+      )
+      CFLAGS=$save_CFLAGS
+    ]
+  )
+  objc_compiles=$lt_cv_objc_compiles
+  _LT_DECL([], [objc_compiles], [1],
+    [Check for compiling Objective C code])
+])
+
+# _LT_OBJECTIVE_CXX
+# ------------------------------
+m4_defun([_LT_OBJECTIVE_CXX], [
+  AC_CACHE_CHECK([for Objective C++ compilation],
+    [lt_cv_objcxx_compiles],
+    [ save_CFLAGS=$CFLAGS
+      CFLAGS=$OBJCXXFLAGS
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([#import <Foundation/Foundation.h>
+@interface Addition : NSObject
+- (int)this:(int)a that:(int)b;
+@end
+
+@implementation Addition
+- (int)this:(int)a that:(int)b
+{
+  return a + b;
+}
+@end
+],[])],
+        lt_cv_objcxx_compiles=yes,
+        lt_cv_objcxx_compiles=no
+      )
+      CFLAGS=$save_CFLAGS
+    ]
+  )
+  objcxx_compiles=$lt_cv_objcxx_compiles
+  _LT_DECL([], [objcxx_compiles], [1],
+    [Check for compiling Objective C++ code])
+])
+
+m4_defun([_LT_ML64], [
+  AC_CACHE_CHECK([for ML64 compilation],
+    [lt_cv_ml64_compiles],
+    [ save_CFLAGS=$CFLAGS
+      CFLAGS=$ML64FLAGS
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([ret
+],[])],
+        lt_cv_ml64_compiles=yes,
+        lt_cv_ml64_compiles=no
+      )
+      CFLAGS=$save_CFLAGS
+    ]
+  )
+  objc_compiles=$lt_cv_objc_compiles
+  _LT_DECL([], [ml64_compiles], [1],
+    [Check for compiling ml64 code])
+])
+
 
 # _LT_CONFIG_COMMANDS
 # -------------------
@@ -2498,7 +2581,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2024 Free Software Foundation, Inc.
+Copyright (C) 2025-2026 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -2673,6 +2756,9 @@ AC_DEFUN([LT_LANG],
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Objective-C],		[_LT_LANG(OBJC)],
+  [Objective-C++],	[_LT_LANG(OBJCXX)],
+  [Microsoft Macro Assembler],  [_LT_LANG(ML64)],
   [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
@@ -2695,6 +2781,26 @@ m4_defun([_LT_LANG],
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_ML64], [
+m4_defun([AC_PROG_ML64],
+[AC_LANG_PUSH(ML64)dnl
+AC_ARG_VAR([ML64],     [ml64 compiler command])dnl
+AC_ARG_VAR([ML64FLAGS], [ml64 compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(ML64, ml64)
+if test -z "$ML64"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(ML64, [${ac_tool_prefix}ml64], [${ac_tool_prefix}ml64])
+  fi
+fi
+if test -z "$ML64"; then
+  AC_CHECK_PROG(ML64, ml64, ml64, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+
 m4_ifndef([AC_PROG_GO], [
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_GO.  When it is available in    #
@@ -2743,19 +2849,34 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
       [LT_LANG(GCJ)],
       [m4_ifdef([AC_PROG_GCJ],
 	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+
        m4_ifdef([A][M_PROG_GCJ],
 	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
 AC_PROVIDE_IFELSE([AC_PROG_GO],
   [LT_LANG(GO)],
   [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
 
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+  [LT_LANG(OBJC)],
+  [m4_define([AC_PROG_OBJC], defn([AC_PROG_OBJC])[LT_LANG(OBJC)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+  [LT_LANG(OBJCXX)],
+  [m4_define([AC_PROG_OBJCXX], defn([AC_PROG_OBJCXX])[LT_LANG(OBJCXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_ML64],
+  [LT_LANG(ML64)],
+  [m4_define([AC_PROG_ML64], defn([AC_PROG_ML64])[LT_LANG(ML64)])])
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
+
+
+])
+
+# _LT_LANG_DEFAULT_CONFIG
 
 # Obsolete macros:
 AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
@@ -3006,8 +3127,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
     _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
     m4_if([$1], [CXX],
 [   if test yes = "$_lt_dar_needs_single_mod" -a yes != "$lt_cv_apple_cc_single_mod"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 ],[])
   else
@@ -3382,7 +3503,7 @@ _LT_DECL([], [AR], [1], [The archiver])
 
 test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
 lt_ar_flags=$AR_FLAGS
-_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
+_LT_DECL([], [lt_ar_flags], [1], [Flags to create an archive (by configure)])
 
 # Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
 # by AR_FLAGS because that was never working and AR_FLAGS is about to die.
@@ -3485,9 +3606,9 @@ AC_CACHE_CHECK([$1], [$2],
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
@@ -3525,9 +3646,9 @@ AC_CACHE_CHECK([$1], [$2],
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          $2=yes
        fi
      else
@@ -3570,9 +3691,9 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -3968,9 +4089,9 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
@@ -4473,8 +4594,8 @@ m4_if([$1], [],[
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -4734,6 +4855,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -4821,6 +4954,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -4839,30 +4974,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -4907,9 +5020,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -5358,7 +5476,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -5526,16 +5644,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5952,13 +6066,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -5972,22 +6086,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -6008,8 +6122,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -6285,7 +6401,7 @@ m4_if([$1], [CXX], [
 	  # AIX 5 now supports IA64 processor
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.expsym'
 	fi
 	;;
       chorus*)
@@ -6358,6 +6474,8 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
+      *-mlibc)
+	;;
       linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
@@ -6371,7 +6489,7 @@ m4_if([$1], [CXX], [
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  icpc* )
+	  icpc* | icpx*)
 	    # Intel C++, used to be incompatible with GCC.
 	    # ICC 10 doesn't accept -KPIC any more.
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -6424,10 +6542,6 @@ m4_if([$1], [CXX], [
 	;;
       netbsd* | netbsdelf*-gnu)
 	;;
-      *-mlibc)
-	;;
-      redox*)
-	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
         # it will coredump.
@@ -6636,7 +6750,7 @@ m4_if([$1], [CXX], [
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -6688,7 +6802,13 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -6704,7 +6824,7 @@ m4_if([$1], [CXX], [
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -6727,6 +6847,12 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -6784,18 +6910,6 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    *-mlibc)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-      ;;
-
-    redox*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -6952,7 +7066,8 @@ m4_if([$1], [CXX], [
     ;;
   cygwin* | mingw* | windows* | cegcc*)
     case $cc_basename in
-    cl* | icl*)
+    cl* | icl* | icx* | icpx*)
+      # Native MSVC and Intel compilers
       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
       ;;
     *)
@@ -7158,17 +7273,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -7177,7 +7292,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
@@ -7197,6 +7311,11 @@ _LT_EOF
       _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -7222,7 +7341,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
@@ -7277,16 +7396,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -7595,8 +7704,8 @@ _LT_EOF
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -7606,14 +7715,20 @@ _LT_EOF
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	_LT_TAGVAR(archive_cmds, $1)='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
@@ -7645,7 +7760,7 @@ _LT_EOF
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	_LT_TAGVAR(archive_cmds, $1)='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	# FIXME: Should let the user specify the lib program.
@@ -7819,6 +7934,9 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -7830,12 +7948,6 @@ _LT_EOF
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -7882,17 +7994,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -7901,7 +8013,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
@@ -7927,8 +8038,8 @@ _LT_EOF
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -7945,21 +8056,21 @@ _LT_EOF
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -8429,8 +8540,8 @@ if test yes != "$_lt_caught_CXX_error"; then
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test yes = "$with_gnu_ld"; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
         _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
@@ -8455,13 +8566,13 @@ if test yes != "$_lt_caught_CXX_error"; then
         # linker, instead of GNU ld.  If possible, this setting should
         # overridden to take advantage of the native linker features on
         # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
       fi
 
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"'
 
     else
       GXX=no
@@ -8672,8 +8783,8 @@ if test yes != "$_lt_caught_CXX_error"; then
 
       cygwin* | mingw* | windows* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl* | ,icl* | no,icl*)
-	  # Native MSVC or ICC
+	,cl* | no,cl* | ,icl* | no,icl* | ,icx* | no,icx* | ,icpx* | no,icpx*)
+	  # Native MSVC and Intel compilers
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -8685,14 +8796,20 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  # Tell ltmain to make .dll files, not .so files.
 	  shrext_cmds=.dll
 	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  # A check exists to verify if there are linker flags, which will use
+	  # different commands when linking.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
               cp "$export_symbols" "$output_objdir/$soname.def";
-              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
             else
-              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+            fi~
+            if test -z "$linker_flags"; then
+               $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+            else
+               $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
             fi~
-            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
             linknames='
 	  # The linker will not automatically build a static lib if we build a DLL.
 	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
@@ -8726,7 +8843,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  _LT_TAGVAR(file_list_spec, $1)='@'
 
 	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	    # If the export-symbols file already is a .def file, use it as
 	    # is; otherwise, prepend EXPORTS...
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
@@ -8735,7 +8852,7 @@ if test yes != "$_lt_caught_CXX_error"; then
               echo EXPORTS > $output_objdir/$soname.def;
               cat $export_symbols >> $output_objdir/$soname.def;
             fi~
-            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+            $CC -shared $stdlibflag $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	  else
 	    _LT_TAGVAR(ld_shlibs, $1)=no
 	  fi
@@ -8751,17 +8868,17 @@ if test yes != "$_lt_caught_CXX_error"; then
 	_LT_TAGVAR(hardcode_minus_L, $1)=yes
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	shrext_cmds=.dll
-	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	_LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  echo EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  echo EXPORTS >> $output_objdir/$libname.def~
 	  prefix_cmds="$SED"~
 	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	    prefix_cmds="$prefix_cmds -e 1d";
@@ -8770,7 +8887,6 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;
@@ -8842,7 +8958,7 @@ if test yes != "$_lt_caught_CXX_error"; then
             ;;
           *)
             if test yes = "$GXX"; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $stdlibflag $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -8910,13 +9026,13 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      if test no = "$with_gnu_ld"; then
 	        case $host_cpu in
 	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -8957,9 +9073,9 @@ if test yes != "$_lt_caught_CXX_error"; then
           *)
 	    if test yes = "$GXX"; then
 	      if test no = "$with_gnu_ld"; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -8970,6 +9086,10 @@ if test yes != "$_lt_caught_CXX_error"; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
+      *-mlibc)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
       linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
@@ -8997,7 +9117,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 	    ;;
-	  icpc* | ecpc* )
+	  icpc* | ecpc* | icpx*)
 	    # Intel C++
 	    with_gnu_ld=yes
 	    # version 8.0 and above of icpc choke on multiply defined symbols
@@ -9135,14 +9255,6 @@ if test yes != "$_lt_caught_CXX_error"; then
 	esac
 	;;
 
-      *-mlibc)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      redox*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
       netbsd*)
         if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
@@ -9150,9 +9262,11 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	  _LT_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	else
+	  _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	output_verbose_link_cmd=func_echo_all
 	;;
 
       *nto* | *qnx*)
@@ -9212,10 +9326,10 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-                  echo "-hidden">> $lib.exp~
-                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
-                  $RM $lib.exp'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done~
+                  echo "-hidden">> $lib.expsym~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.expsym  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.expsym'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
 	    esac
@@ -9237,10 +9351,10 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -9250,7 +9364,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -9294,8 +9408,8 @@ if test yes != "$_lt_caught_CXX_error"; then
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.expsym -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.expsym'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -9330,25 +9444,25 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    if test yes,no = "$GXX,$with_gnu_ld"; then
 	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+                  $CC -shared $pic_flag $stdlibflag $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.expsym'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"'
 	      else
 	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+                  $CC -G $stdlibflag $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.expsym'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
@@ -9433,6 +9547,14 @@ if test yes != "$_lt_caught_CXX_error"; then
         _LT_TAGVAR(ld_shlibs, $1)=no
         ;;
 
+      emscripten*)
+        # Emscripten side modules (-sSIDE_MODULE=2) use a separate PIC sysroot
+        # and do not link system libraries (they are imported from the main module
+        # at runtime).  Re-run the verbose link with -sSIDE_MODULE=2 so that the
+        # detected paths point to the PIC sysroot instead of the non-PIC one.
+        output_verbose_link_cmd='$CC -sSIDE_MODULE=2 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP " [[-]]L"'
+        ;;
+
       *)
         # FIXME: insert proper C++ library support
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -9582,10 +9704,14 @@ if AC_TRY_EVAL(ac_compile); then
   # the conftest object file.
   pre_test_object_deps_done=no
 
+  if test yes = "$enable_cxx_stdlib"; then
+    output_verbose_link_cmd=
+  fi
+
   for p in `eval "$output_verbose_link_cmd"`; do
     case $prev$p in
 
-    -L* | -R* | -l*)
+    -L* | -R* | -l* | */libclang_rt.*.a)
        # Some compilers place space between "-{L,R,l}" and the path.
        # Remove the space.
        if test x-L = x"$p" ||
@@ -10044,6 +10170,72 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_ML64_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the ML64 assembler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_ML64_CONFIG],
+[AC_REQUIRE([LT_PROG_ML64])dnl
+AC_LANG_SAVE
+
+# Source file extension for ML64 test sources.
+ac_ext=asm
+
+#Object file extension for compile ML64 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="main PROC ret main ENDP"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="main PROC ret main ENDP"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# TODO? Check for compilation issues with ML64 flags.
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${ML64-"gcc"}
+CFLAGS=$ML64FLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_ML64_CONFIG
+
+
 # _LT_LANG_GO_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for the GNU Go compiler
@@ -10111,6 +10303,146 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GO_CONFIG
 
 
+# _LT_LANG_OBJC_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Objective-C compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_OBJC_CONFIG],
+[AC_REQUIRE([LT_PROG_OBJC])dnl
+AC_LANG_SAVE
+
+# Source file extension for OBJC test sources.
+ac_ext=m
+
+# Object file extension for compiled OBJC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(void){return(0);}'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Check for compilation issues with OBJC flags
+_LT_OBJECTIVE_C
+if test "yes" = "$lt_cv_gnustep_exists"; then
+  OBJCFLAGS="$OBJCFLAGS `gnustep-config --objc-flags`"
+fi
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${OBJC-"gcc"}
+CFLAGS=$OBJCFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_OBJC_CONFIG
+
+
+# _LT_LANG_OBJCXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Objective-C++ compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_OBJCXX_CONFIG],
+[AC_REQUIRE([LT_PROG_OBJCXX])dnl
+AC_LANG_SAVE
+
+# Source file extension for OBJCXX test sources.
+ac_ext=mm
+
+# Object file extension for compiled OBJCXX test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Check for compilation issues with OBJCXX flags
+_LT_OBJECTIVE_CXX
+if test "yes" = "$lt_cv_gnustep_exists"; then
+  OBJCXXFLAGS="$OBJCXXFLAGS `gnustep-config --objc-flags`"
+fi
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${OBJCXX-"g++"}
+CFLAGS=$OBJCXXFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_OBJCXX_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -10163,6 +10495,34 @@ CC=$lt_save_CC
 CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_RC_CONFIG
 
+# LT_PROG_ML64
+# -----------
+AC_DEFUN([LT_PROG_ML64],
+[AC_CHECK_TOOL(ML64, ml64,)
+])
+
+
+# LT_PROG_OBJC
+# -----------
+AC_DEFUN([LT_PROG_OBJC],
+[AC_CHECK_TOOL(OBJC, gcc,)
+  AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,)
+  if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
+    test set = "${OBJCFLAGS+set}" || OBJCFLAGS="`gnustep-config --objc-flags`"
+  fi
+  AC_SUBST(OBJCFLAGS)[]dnl
+])
+
+# LT_PROG_OBJCXX
+# -----------
+AC_DEFUN([LT_PROG_OBJCXX],
+[AC_CHECK_TOOL(OBJCXX, g++,)
+  AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,)
+  if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
+    test set = "${OBJCXXFLAGS+set}" || OBJCXXFLAGS="`gnustep-config --objc-flags`"
+  fi
+  AC_SUBST(OBJCXXFLAGS)[]dnl
+])
 
 # LT_PROG_GCJ
 # -----------
@@ -10354,6 +10714,42 @@ to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
 _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
          [0], [convert $build files to toolchain format])dnl
+
+AS_CASE([$host],
+  [*-*-mingw* | *-*-windows* | *-*-cygwin*],
+  [AS_CASE([$build],
+    [*-*-mingw* | *-*-windows* | *-*-cygwin*],
+    [AC_MSG_CHECKING([whether cygpath is installed])
+      AC_CACHE_VAL([lt_cv_cygpath_installed],
+        [lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          AS_IF([test 0 = "$_lt_result"],
+            [lt_cv_cygpath_installed=yes],
+            [lt_cv_cygpath_installed=no])
+        ])
+      AC_MSG_RESULT([$lt_cv_cygpath_installed])
+      _LT_DECL([cygpath_installed], [lt_cv_cygpath_installed],
+               [0], [whether cygpath is installed])dnl
+      AS_IF([test "xyes" != "x$lt_cv_cygpath_installed"],
+        [
+          AC_MSG_CHECKING([whether to use cmd with one slash or two slashes])
+          AC_CACHE_VAL([lt_cv_cmd_slashes],
+            [
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              AS_IF([test 0 != $?],
+                [AC_MSG_ERROR([Do not know how to convert paths])])
+              AS_CASE([$_lt_result],
+                [one-slash*],[lt_cv_cmd_slashes="one"],
+                [two-slashes*],[lt_cv_cmd_slashes="two"],
+                [AC_MSG_ERROR([Do not know how to convert paths])]
+              )
+            ])
+          AC_MSG_RESULT([$lt_cv_cmd_slashes])
+        ])
+    ])
+  ]
+)dnl
 ])# _LT_PATH_CONVERSION_FUNCTIONS
 
 # Helper functions for option handling.                    -*- Autoconf -*-
@@ -10915,7 +11311,7 @@ m4_define([lt_dict_filter],
 
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2019, 2021-2024 Free Software Foundation,
+#   Copyright (C) 2004, 2011-2019, 2021-2026 Free Software Foundation,
 #   Inc.
 #   Written by Scott James Remnant, 2004
 #
@@ -10925,15 +11321,15 @@ m4_define([lt_dict_filter],
 
 # @configure_input@
 
-# serial 4443 ltversion.m4
+# serial 4532 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.5.4-redox-9510])
-m4_define([LT_PACKAGE_REVISION], [2.5.4])
+m4_define([LT_PACKAGE_VERSION], [2.6.0.23-b08cb])
+m4_define([LT_PACKAGE_REVISION], [2.6.0.23])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+[macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.0 b/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.0
index eb284c4266..d4d973ac4f 100644
--- a/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.0
+++ b/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.0
@@ -1,9 +1,9 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.72 for libcharset 1.5.
+@%:@ Generated by GNU Autoconf 2.73 for libcharset 1.5.
 @%:@ 
 @%:@ 
-@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 @%:@ Inc.
 @%:@ 
 @%:@ 
@@ -20,7 +20,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -107,7 +107,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -129,10 +129,13 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -143,7 +146,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -261,22 +264,25 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -336,7 +342,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -345,7 +351,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -428,9 +434,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -457,7 +463,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -503,7 +509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -517,29 +523,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -600,6 +583,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIB@&t@OBJS=
@@ -712,13 +696,13 @@ LDFLAGS
 CFLAGS
 CC
 SET_MAKE
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -884,7 +868,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -910,7 +894,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1123,7 +1107,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1139,7 +1123,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1183,9 +1167,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1193,7 +1177,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -1201,7 +1185,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1265,7 +1249,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1448,9 +1432,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1487,7 +1471,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1497,9 +1481,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libcharset configure 1.5
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1523,7 +1507,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1531,7 +1515,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1539,7 +1523,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1562,7 +1546,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1570,7 +1554,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1578,7 +1562,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -1596,7 +1580,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1618,8 +1602,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_header_compile
@@ -1637,7 +1621,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1645,7 +1629,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1656,7 +1640,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1678,7 +1662,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1730,8 +1714,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_func
@@ -1749,26 +1733,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -1784,7 +1768,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -1796,7 +1780,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?@<:@ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -1804,7 +1788,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libcharset $as_me 1.5, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -1844,7 +1828,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -1879,7 +1863,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1908,31 +1892,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -1941,67 +1916,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -2010,21 +2013,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -2046,12 +2049,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -2061,27 +2064,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -2161,7 +2257,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -2172,7 +2269,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -2260,15 +2357,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -2284,13 +2381,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -2425,7 +2521,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -2438,7 +2534,7 @@ do
   esac
   as_found=:
   
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -2449,13 +2545,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -2467,7 +2563,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -2520,38 +2616,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2561,10 +2663,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -2572,6 +2674,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2583,10 +2702,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_config_headers="$ac_config_headers config.h"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -2594,7 +2713,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -2607,12 +2726,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2627,6 +2746,9 @@ fi
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2635,7 +2757,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2656,7 +2778,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2668,11 +2790,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2681,7 +2803,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -2702,7 +2824,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2714,11 +2836,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2726,8 +2848,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2740,7 +2862,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2761,7 +2883,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2773,11 +2895,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2786,7 +2908,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2812,7 +2934,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2836,11 +2958,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2851,7 +2973,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2872,7 +2994,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2884,11 +3006,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2901,7 +3023,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -2922,7 +3044,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2934,11 +3056,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2950,8 +3072,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2963,7 +3085,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2984,7 +3106,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2996,11 +3118,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -3009,7 +3131,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -3030,7 +3152,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3042,11 +3164,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3054,8 +3176,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3067,13 +3189,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -3083,7 +3205,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3093,7 +3215,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -3113,9 +3235,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3136,10 +3258,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -3180,29 +3302,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3210,10 +3332,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -3230,15 +3352,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3261,7 +3383,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -3270,10 +3392,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -3281,31 +3403,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -3329,10 +3451,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -3344,11 +3466,11 @@ then :
   esac
 done
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -3356,11 +3478,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -3392,8 +3514,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -3403,7 +3525,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -3471,8 +3593,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3491,7 +3613,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -3503,7 +3674,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -3520,16 +3691,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -3540,7 +3711,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -3569,16 +3740,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -3589,7 +3760,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -3618,16 +3789,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -3644,7 +3815,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
 printf %s "checking whether the compiler is clang... " >&6; }
 if test ${gl_cv_compiler_clang+y}
 then :
@@ -3677,11 +3848,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
-printf "%s\n" "$gl_cv_compiler_clang" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
+printf '%s\n' "$gl_cv_compiler_clang" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5
 printf %s "checking for compiler option needed when checking for declarations... " >&6; }
 if test ${gl_cv_compiler_check_decl_option+y}
 then :
@@ -3716,8 +3887,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
-printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
+printf '%s\n' "$gl_cv_compiler_check_decl_option" >&6; }
   if test "x$gl_cv_compiler_check_decl_option" != xnone; then
     ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
   else
@@ -3730,7 +3901,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -3801,8 +3972,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3850,8 +4021,8 @@ if $ac_preproc_ok
 then :
   
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -3879,7 +4050,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -3902,8 +4073,8 @@ case $as_dir in @%:@((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3953,8 +4124,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3972,7 +4143,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -3988,8 +4159,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -4005,10 +4176,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -4023,8 +4194,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -4040,7 +4211,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -4054,7 +4225,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -4074,7 +4245,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
   
-printf "%s\n" "@%:@define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "@%:@define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -4083,7 +4254,7 @@ fi
     
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
@@ -4112,10 +4283,10 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
@@ -4166,49 +4337,51 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "@%:@define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "@%:@define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "@%:@define _MINIX 1" >>confdefs.h
+    printf '%s\n' "@%:@define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
 
 else case e in @%:@(
   e) MINIX= ;;
@@ -4216,12 +4389,12 @@ esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
@@ -4234,14 +4407,14 @@ fi
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
     
     
@@ -4279,7 +4452,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -4306,12 +4479,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -4327,7 +4500,7 @@ esac
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -4370,7 +4543,7 @@ case `"$ac_path_SED" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4399,8 +4572,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4417,7 +4590,7 @@ Xsed="$SED -e 1s/^X//"
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -4454,7 +4627,7 @@ case `"$ac_path_GREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4483,12 +4656,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -4528,7 +4701,7 @@ case `"$ac_path_EGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4558,14 +4731,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
  
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -4605,7 +4778,7 @@ case `"$ac_path_FGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4635,8 +4808,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
  
 
@@ -4672,7 +4845,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -4702,10 +4875,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -4741,14 +4914,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -4765,8 +4938,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -4777,7 +4950,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -4833,8 +5006,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -4847,7 +5020,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -4868,7 +5041,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4880,11 +5053,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4897,7 +5070,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -4918,7 +5091,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4930,11 +5103,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4946,8 +5119,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -4975,7 +5148,7 @@ test -z "$NM" && NM=nm
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -4997,22 +5170,22 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -5030,9 +5203,9 @@ else case e in @%:@(
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -5145,11 +5318,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -5193,7 +5366,7 @@ esac
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -5235,14 +5408,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -5264,14 +5437,85 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+case $host in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+      
+    
+    
+    
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+  
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in @%:@(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; @%:@(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; @%:@(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+        
+fi
+     ;; @%:@(
+  *) :
+     ;;
+esac
+  
+ ;; @%:@(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -5280,8 +5524,8 @@ else case e in @%:@(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -5296,7 +5540,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -5313,7 +5557,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -5334,7 +5578,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5347,11 +5591,11 @@ esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5364,7 +5608,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -5385,7 +5629,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5397,11 +5641,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5410,7 +5654,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -5431,7 +5675,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5443,11 +5687,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -5455,8 +5699,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -5472,7 +5716,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -5589,16 +5833,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5685,8 +5925,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -5730,7 +5970,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -5751,7 +5991,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5763,11 +6003,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5776,7 +6016,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -5797,7 +6037,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5809,11 +6049,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -5821,8 +6061,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -5839,7 +6079,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -5868,8 +6108,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -5882,7 +6122,7 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
@@ -5903,7 +6143,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5915,11 +6155,11 @@ esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5928,7 +6168,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
@@ -5949,7 +6189,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5961,11 +6201,11 @@ esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -5973,8 +6213,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -5988,7 +6228,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -6009,7 +6249,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6021,11 +6261,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6038,7 +6278,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -6059,7 +6299,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6071,11 +6311,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6087,8 +6327,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6124,7 +6364,7 @@ lt_ar_flags=$AR_FLAGS
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -6149,7 +6389,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -6157,7 +6397,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -6170,8 +6410,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -6188,7 +6428,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -6209,7 +6449,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6221,11 +6461,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6234,7 +6474,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -6255,7 +6495,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6267,11 +6507,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6279,8 +6519,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6341,11 +6581,11 @@ esac
     
 
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -6366,7 +6606,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6378,11 +6618,11 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6418,7 +6658,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -6478,13 +6718,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -6498,22 +6738,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -6534,8 +6774,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -6575,7 +6817,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
@@ -6648,7 +6890,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -6684,11 +6926,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -6734,7 +6976,7 @@ fi
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 @%:@ Check whether --with-sysroot was given.
@@ -6762,20 +7004,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -6820,11 +7062,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -6841,8 +7083,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
     
     
@@ -6882,7 +7124,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -6902,7 +7144,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -6940,7 +7182,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -6981,7 +7223,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -7044,7 +7286,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -7084,8 +7326,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -7098,7 +7340,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -7135,7 +7377,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -7156,7 +7398,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7168,11 +7410,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7181,7 +7423,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -7202,7 +7444,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7214,11 +7456,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -7226,8 +7468,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -7237,7 +7479,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -7253,8 +7495,8 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -7269,7 +7511,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -7290,7 +7532,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7302,11 +7544,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7315,7 +7557,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -7336,7 +7578,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7348,11 +7590,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -7360,8 +7602,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -7373,7 +7615,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -7394,7 +7636,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7406,11 +7648,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7419,7 +7661,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -7440,7 +7682,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7452,11 +7694,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -7464,8 +7706,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -7477,7 +7719,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -7498,7 +7740,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7510,11 +7752,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7523,7 +7765,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -7544,7 +7786,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7556,11 +7798,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -7568,8 +7810,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -7581,7 +7823,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -7602,7 +7844,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7614,11 +7856,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7627,7 +7869,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -7648,7 +7890,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7660,11 +7902,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -7672,8 +7914,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -7685,7 +7927,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -7706,7 +7948,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7718,11 +7960,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7731,7 +7973,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -7752,7 +7994,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7764,11 +8006,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -7776,8 +8018,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -7812,7 +8054,7 @@ fi
     
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -7847,12 +8089,12 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
     # Feature test to disable chained fixups since it is not
     # compatible with '-undefined dynamic_lookup'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
 printf %s "checking for -no_fixup_chains linker flag... " >&6; }
 if test ${lt_cv_support_no_fixup_chains+y}
 then :
@@ -7886,10 +8128,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -7923,10 +8165,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -7960,8 +8202,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -8050,7 +8292,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_inc
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -8066,7 +8308,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -8087,7 +8329,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8099,11 +8341,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8112,7 +8354,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -8133,7 +8375,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8145,11 +8387,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -8157,8 +8399,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -8170,7 +8412,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -8191,7 +8433,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8203,11 +8445,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8216,7 +8458,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -8237,7 +8479,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8249,11 +8491,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -8261,8 +8503,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -8274,7 +8516,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -8295,7 +8537,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8307,11 +8549,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8320,7 +8562,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -8341,7 +8583,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8353,11 +8595,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -8365,8 +8607,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -8535,7 +8777,7 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
   
 @%:@ Check whether --with-aix-soname was given.
@@ -8562,8 +8804,8 @@ fi
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -8645,7 +8887,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -8662,15 +8904,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
     
     
     
 
-printf "%s\n" "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -8716,7 +8958,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -8771,11 +9013,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     
@@ -8784,7 +9026,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -8839,11 +9081,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8928,7 +9170,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -8955,9 +9197,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -8965,8 +9207,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -9104,7 +9346,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -9155,7 +9397,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -9171,7 +9419,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -9194,6 +9442,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -9251,18 +9505,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -9344,7 +9586,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -9353,15 +9595,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -9388,9 +9630,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -9398,8 +9640,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -9427,7 +9669,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -9443,9 +9685,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -9457,8 +9699,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -9472,7 +9714,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -9503,9 +9745,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -9521,15 +9763,15 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
     
     
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -9560,9 +9802,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -9578,8 +9820,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -9587,7 +9829,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -9595,11 +9837,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -9611,7 +9853,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -9805,17 +10047,17 @@ _LT_EOF
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -9824,7 +10066,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -9844,6 +10085,11 @@ _LT_EOF
       archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -9869,7 +10115,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
@@ -9924,16 +10170,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -10332,8 +10568,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -10343,14 +10579,20 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -10382,7 +10624,7 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
@@ -10516,7 +10758,7 @@ fi
 	
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -10532,9 +10774,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
@@ -10546,8 +10788,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -10587,7 +10829,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -10611,8 +10853,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -10627,6 +10869,9 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -10638,12 +10883,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -10690,17 +10929,17 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -10709,7 +10948,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -10735,8 +10973,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10753,21 +10991,21 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -10903,8 +11141,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -10940,7 +11178,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -10952,7 +11190,7 @@ else case e in @%:@(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -10970,7 +11208,7 @@ else case e in @%:@(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -10985,8 +11223,8 @@ else case e in @%:@(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -11145,7 +11383,7 @@ esac
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -11438,8 +11676,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -11706,6 +11944,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -11816,6 +12066,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -11834,30 +12086,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -11902,9 +12132,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -12178,7 +12413,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -12229,7 +12464,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -12245,7 +12486,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -12268,6 +12509,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -12325,18 +12572,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -12418,7 +12653,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -12427,15 +12662,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -12462,9 +12697,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -12472,8 +12707,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -12495,7 +12730,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -12511,9 +12746,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -12525,8 +12760,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -12547,8 +12782,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12669,7 +12904,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -12694,8 +12929,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -12739,7 +12974,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -12780,8 +13015,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -12810,7 +13045,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -12851,8 +13086,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -12862,7 +13097,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -12903,13 +13138,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -12950,13 +13185,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -12997,8 +13232,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -13044,7 +13279,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -13128,7 +13363,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13147,12 +13382,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -13236,7 +13471,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13255,8 +13490,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -13294,40 +13529,40 @@ fi
   
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -13345,12 +13580,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -13375,15 +13610,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
   
 
@@ -13404,11 +13639,18 @@ CC=$lt_save_CC
 
 
 
+
        
        
 
 
 
+
+
+
+
+
+
 
 
         ac_config_commands="$ac_config_commands libtool"
@@ -13444,16 +13686,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -13470,7 +13712,7 @@ else case e in @%:@(
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -13500,9 +13742,9 @@ else case e in @%:@(
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -13519,7 +13761,7 @@ else case e in @%:@(
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -13577,14 +13819,14 @@ fi
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
@@ -13601,13 +13843,13 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 printf %s "checking for shared library path variable... " >&6; }
 if test ${acl_cv_libpath+y}
 then :
@@ -13622,12 +13864,12 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-printf "%s\n" "$acl_cv_libpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+printf '%s\n' "$acl_cv_libpath" >&6; }
   shlibpath_var="$acl_cv_shlibpath_var"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
 printf %s "checking whether to activate relocatable installation... " >&6; }
   @%:@ Check whether --enable-relocatable was given.
 if test ${enable_relocatable+y}
@@ -13644,8 +13886,8 @@ esac
 fi
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-printf "%s\n" "$RELOCATABLE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+printf '%s\n' "$RELOCATABLE" >&6; }
 
 
   
@@ -13655,11 +13897,13 @@ printf "%s\n" "$RELOCATABLE" >&6; }
     reloc_final_prefix="$prefix"
   fi
   
-printf "%s\n" "@%:@define INSTALLPREFIX \"${reloc_final_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+@%:@define INSTALLPREFIX "${reloc_final_prefix}"
+_ACEOF
 
   if test $RELOCATABLE = yes; then
     
-printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
 
   fi
 
@@ -13680,14 +13924,14 @@ printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
 if test "x$ac_cv_header_mach_o_dyld_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
 
 fi
 
     ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
 if test "x$ac_cv_func__NSGetExecutablePath" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
 
 fi
 
@@ -13706,7 +13950,7 @@ fi
         ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
 if test "x$ac_cv_func_copy_file_range" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
@@ -13804,7 +14048,7 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -13835,9 +14079,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -13881,8 +14125,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -13891,13 +14135,13 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 printf %s "checking for nl_langinfo and CODESET... " >&6; }
 if test ${am_cv_langinfo_codeset+y}
 then :
@@ -13926,11 +14170,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf '%s\n' "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
     
-printf "%s\n" "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -14007,7 +14251,7 @@ gl_mda_defines='
 
        
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 printf %s "checking for working fcntl.h... " >&6; }
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
@@ -14141,15 +14385,15 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+printf '%s\n' "$gl_cv_header_working_fcntl_h" >&6; }
 
   case $gl_cv_header_working_fcntl_h in #(
   *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
 
 
   case $gl_cv_header_working_fcntl_h in #(
@@ -14157,13 +14401,13 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 
 
 ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
 if test "x$ac_cv_func_setlocale" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
 
 fi
 
@@ -14196,44 +14440,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -14245,8 +14452,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -14260,8 +14467,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -14278,7 +14485,7 @@ U=
 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -14299,13 +14506,21 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in @%:@(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -14319,7 +14534,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -14331,7 +14546,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -14418,7 +14633,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -14434,9 +14649,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -14531,7 +14746,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -14553,29 +14768,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -14617,7 +14809,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -14626,7 +14818,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14679,19 +14871,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by libcharset $as_me 1.5, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14713,7 +14905,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -14721,7 +14913,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -14753,16 +14945,16 @@ $config_commands
 Report bugs to the package provider."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 libcharset config.status 1.5
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -14770,10 +14962,14 @@ ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -14801,15 +14997,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -14817,7 +15013,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -14826,7 +15022,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -14850,29 +15046,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
 @%:@@%:@ Running $as_me. @%:@@%:@
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -14920,6 +15116,7 @@ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
@@ -15060,6 +15257,7 @@ file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
+lt_ar_flags \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -15166,7 +15364,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -15253,13 +15451,13 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -15270,7 +15468,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -15315,9 +15513,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -15346,7 +15544,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -15378,7 +15576,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -15449,9 +15647,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -15469,8 +15667,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -15485,7 +15687,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -15529,7 +15731,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -15537,17 +15739,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -15564,7 +15766,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -15588,9 +15790,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -15630,7 +15832,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -15647,10 +15849,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -15664,11 +15866,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -15691,9 +15893,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -15709,27 +15911,27 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
   
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -15755,7 +15957,7 @@ printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -15878,6 +16080,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
 # A file(cmd) program that detects file types.
 FILECMD=$lt_FILECMD
 
@@ -15900,7 +16105,7 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 AR=$lt_AR
 
 # Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
+lt_ar_flags=$lt_lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}
@@ -16294,7 +16499,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -16310,18 +16515,25 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in @%:@(
+  -*) :
+    ac_no_opts=-- ;; @%:@(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.1 b/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.1
index 8decfde104..242d67a128 100644
--- a/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.1
+++ b/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.1
@@ -1,9 +1,9 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.72 for libcharset 1.5.
+@%:@ Generated by GNU Autoconf 2.73 for libcharset 1.5.
 @%:@ 
 @%:@ 
-@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 @%:@ Inc.
 @%:@ 
 @%:@ 
@@ -20,7 +20,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -107,7 +107,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -129,10 +129,13 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -143,7 +146,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -261,22 +264,25 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -336,7 +342,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -345,7 +351,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -428,9 +434,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -457,7 +463,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -503,7 +509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -517,29 +523,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -600,6 +583,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIB@&t@OBJS=
@@ -712,13 +696,13 @@ LDFLAGS
 CFLAGS
 CC
 SET_MAKE
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -884,7 +868,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -910,7 +894,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1123,7 +1107,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1139,7 +1123,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1183,9 +1167,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1193,7 +1177,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -1201,7 +1185,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1265,7 +1249,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1448,9 +1432,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1487,7 +1471,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1497,9 +1481,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libcharset configure 1.5
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1523,7 +1507,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1531,7 +1515,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1539,7 +1523,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1562,7 +1546,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1570,7 +1554,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1578,7 +1562,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -1596,7 +1580,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1618,8 +1602,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_header_compile
@@ -1637,7 +1621,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1645,7 +1629,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1656,7 +1640,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1678,7 +1662,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1730,8 +1714,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_func
@@ -1749,26 +1733,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -1784,7 +1768,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -1796,7 +1780,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?@<:@ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -1804,7 +1788,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libcharset $as_me 1.5, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -1844,7 +1828,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -1879,7 +1863,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1908,31 +1892,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -1941,67 +1916,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -2010,21 +2013,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -2046,12 +2049,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -2061,27 +2064,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -2161,7 +2257,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -2172,7 +2269,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -2260,15 +2357,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -2284,13 +2381,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -2425,7 +2521,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -2438,7 +2534,7 @@ do
   esac
   as_found=:
   
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -2449,13 +2545,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -2467,7 +2563,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -2520,38 +2616,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2561,10 +2663,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -2572,6 +2674,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2583,10 +2702,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_config_headers="$ac_config_headers config.h"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -2594,7 +2713,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -2607,12 +2726,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2627,6 +2746,9 @@ fi
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2635,7 +2757,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2656,7 +2778,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2668,11 +2790,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2681,7 +2803,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -2702,7 +2824,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2714,11 +2836,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2726,8 +2848,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2740,7 +2862,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2761,7 +2883,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2773,11 +2895,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2786,7 +2908,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2812,7 +2934,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2836,11 +2958,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2851,7 +2973,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2872,7 +2994,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2884,11 +3006,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2901,7 +3023,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -2922,7 +3044,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2934,11 +3056,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2950,8 +3072,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2963,7 +3085,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2984,7 +3106,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2996,11 +3118,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -3009,7 +3131,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -3030,7 +3152,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3042,11 +3164,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3054,8 +3176,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3067,13 +3189,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -3083,7 +3205,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3093,7 +3215,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -3113,9 +3235,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3136,10 +3258,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -3180,29 +3302,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3210,10 +3332,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -3230,15 +3352,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3261,7 +3383,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -3270,10 +3392,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -3281,31 +3403,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -3329,10 +3451,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -3344,11 +3466,11 @@ then :
   esac
 done
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -3356,11 +3478,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -3392,8 +3514,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -3403,7 +3525,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -3471,8 +3593,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3491,7 +3613,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -3503,7 +3674,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -3520,16 +3691,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -3540,7 +3711,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -3569,16 +3740,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -3589,7 +3760,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -3618,16 +3789,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -3648,7 +3819,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -3719,8 +3890,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3768,8 +3939,8 @@ if $ac_preproc_ok
 then :
   
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -3797,7 +3968,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -3820,8 +3991,8 @@ case $as_dir in @%:@((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3871,8 +4042,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3890,7 +4061,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -3906,8 +4077,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -3923,10 +4094,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -3941,8 +4112,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -3958,7 +4129,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -3972,7 +4143,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -3992,7 +4163,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
   
-printf "%s\n" "@%:@define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "@%:@define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -4001,7 +4172,7 @@ fi
     
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
@@ -4030,10 +4201,10 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
@@ -4084,49 +4255,51 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "@%:@define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "@%:@define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "@%:@define _MINIX 1" >>confdefs.h
+    printf '%s\n' "@%:@define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
 
 else case e in @%:@(
   e) MINIX= ;;
@@ -4134,12 +4307,12 @@ esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
@@ -4152,14 +4325,14 @@ fi
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
     
     
@@ -4197,7 +4370,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -4224,12 +4397,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -4245,7 +4418,7 @@ esac
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -4288,7 +4461,7 @@ case `"$ac_path_SED" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4317,8 +4490,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4335,7 +4508,7 @@ Xsed="$SED -e 1s/^X//"
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -4372,7 +4545,7 @@ case `"$ac_path_GREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4401,12 +4574,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -4446,7 +4619,7 @@ case `"$ac_path_EGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4476,14 +4649,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
  
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -4523,7 +4696,7 @@ case `"$ac_path_FGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4553,8 +4726,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
  
 
@@ -4590,7 +4763,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -4620,10 +4793,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -4659,14 +4832,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -4683,8 +4856,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -4695,7 +4868,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -4751,8 +4924,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -4765,7 +4938,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -4786,7 +4959,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4798,11 +4971,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4815,7 +4988,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -4836,7 +5009,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4848,11 +5021,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4864,8 +5037,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -4893,7 +5066,7 @@ test -z "$NM" && NM=nm
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -4915,22 +5088,22 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -4948,9 +5121,9 @@ else case e in @%:@(
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -5063,11 +5236,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -5111,7 +5284,7 @@ esac
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -5153,14 +5326,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -5182,14 +5355,85 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+case $host in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+      
+    
+    
+    
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+  
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in @%:@(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; @%:@(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; @%:@(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+        
+fi
+     ;; @%:@(
+  *) :
+     ;;
+esac
+  
+ ;; @%:@(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -5198,8 +5442,8 @@ else case e in @%:@(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -5214,7 +5458,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -5231,7 +5475,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -5252,7 +5496,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5265,11 +5509,11 @@ esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5282,7 +5526,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -5303,7 +5547,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5315,11 +5559,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5328,7 +5572,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -5349,7 +5593,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5361,11 +5605,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -5373,8 +5617,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -5390,7 +5634,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -5507,16 +5751,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5603,8 +5843,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -5648,7 +5888,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -5669,7 +5909,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5681,11 +5921,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5694,7 +5934,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -5715,7 +5955,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5727,11 +5967,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -5739,8 +5979,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -5757,7 +5997,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -5786,8 +6026,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -5800,7 +6040,7 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
@@ -5821,7 +6061,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5833,11 +6073,11 @@ esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5846,7 +6086,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
@@ -5867,7 +6107,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5879,11 +6119,11 @@ esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -5891,8 +6131,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -5906,7 +6146,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -5927,7 +6167,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5939,11 +6179,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5956,7 +6196,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -5977,7 +6217,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5989,11 +6229,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6005,8 +6245,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6042,7 +6282,7 @@ lt_ar_flags=$AR_FLAGS
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -6067,7 +6307,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -6075,7 +6315,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -6088,8 +6328,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -6106,7 +6346,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -6127,7 +6367,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6139,11 +6379,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6152,7 +6392,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -6173,7 +6413,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6185,11 +6425,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6197,8 +6437,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6259,11 +6499,11 @@ esac
     
 
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -6284,7 +6524,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6296,11 +6536,11 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6336,7 +6576,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -6396,13 +6636,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -6416,22 +6656,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -6452,8 +6692,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -6493,7 +6735,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
@@ -6566,7 +6808,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -6602,11 +6844,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -6652,7 +6894,7 @@ fi
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 @%:@ Check whether --with-sysroot was given.
@@ -6680,20 +6922,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -6738,11 +6980,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -6759,8 +7001,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
     
     
@@ -6800,7 +7042,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -6820,7 +7062,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -6858,7 +7100,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -6899,7 +7141,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -6962,7 +7204,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -7002,8 +7244,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -7016,7 +7258,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -7053,7 +7295,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -7074,7 +7316,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7086,11 +7328,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7099,7 +7341,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -7120,7 +7362,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7132,11 +7374,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -7144,8 +7386,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -7155,7 +7397,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -7171,8 +7413,8 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -7187,7 +7429,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -7208,7 +7450,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7220,11 +7462,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7233,7 +7475,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -7254,7 +7496,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7266,11 +7508,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -7278,8 +7520,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -7291,7 +7533,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -7312,7 +7554,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7324,11 +7566,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7337,7 +7579,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -7358,7 +7600,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7370,11 +7612,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -7382,8 +7624,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -7395,7 +7637,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -7416,7 +7658,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7428,11 +7670,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7441,7 +7683,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -7462,7 +7704,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7474,11 +7716,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -7486,8 +7728,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -7499,7 +7741,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -7520,7 +7762,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7532,11 +7774,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7545,7 +7787,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -7566,7 +7808,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7578,11 +7820,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -7590,8 +7832,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -7603,7 +7845,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -7624,7 +7866,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7636,11 +7878,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7649,7 +7891,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -7670,7 +7912,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7682,11 +7924,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -7694,8 +7936,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -7730,7 +7972,7 @@ fi
     
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -7765,12 +8007,12 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
     # Feature test to disable chained fixups since it is not
     # compatible with '-undefined dynamic_lookup'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
 printf %s "checking for -no_fixup_chains linker flag... " >&6; }
 if test ${lt_cv_support_no_fixup_chains+y}
 then :
@@ -7804,10 +8046,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -7841,10 +8083,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -7878,8 +8120,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -7968,7 +8210,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_inc
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -7984,7 +8226,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -8005,7 +8247,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8017,11 +8259,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8030,7 +8272,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -8051,7 +8293,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8063,11 +8305,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -8075,8 +8317,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -8088,7 +8330,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -8109,7 +8351,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8121,11 +8363,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8134,7 +8376,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -8155,7 +8397,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8167,11 +8409,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -8179,8 +8421,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -8192,7 +8434,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -8213,7 +8455,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8225,11 +8467,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8238,7 +8480,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -8259,7 +8501,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8271,11 +8513,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -8283,8 +8525,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -8453,7 +8695,7 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
   
 @%:@ Check whether --with-aix-soname was given.
@@ -8480,8 +8722,8 @@ fi
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -8563,7 +8805,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -8580,15 +8822,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
     
     
     
 
-printf "%s\n" "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -8634,7 +8876,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -8689,11 +8931,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     
@@ -8702,7 +8944,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -8757,11 +8999,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8842,7 +9084,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -8869,9 +9111,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -8879,8 +9121,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -9018,7 +9260,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -9069,7 +9311,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -9085,7 +9333,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -9108,6 +9356,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -9165,18 +9419,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -9258,7 +9500,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -9267,15 +9509,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -9302,9 +9544,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -9312,8 +9554,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -9341,7 +9583,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -9357,9 +9599,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -9371,8 +9613,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -9386,7 +9628,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -9417,9 +9659,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -9435,15 +9677,15 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
     
     
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -9474,9 +9716,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -9492,8 +9734,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -9501,7 +9743,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -9509,11 +9751,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -9525,7 +9767,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -9719,17 +9961,17 @@ _LT_EOF
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -9738,7 +9980,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -9758,6 +9999,11 @@ _LT_EOF
       archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -9783,7 +10029,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
@@ -9838,16 +10084,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -10246,8 +10482,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -10257,14 +10493,20 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -10296,7 +10538,7 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
@@ -10430,7 +10672,7 @@ fi
 	
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -10446,9 +10688,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
@@ -10460,8 +10702,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -10501,7 +10743,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -10525,8 +10767,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -10541,6 +10783,9 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -10552,12 +10797,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -10604,17 +10843,17 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -10623,7 +10862,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -10649,8 +10887,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10667,21 +10905,21 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -10817,8 +11055,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -10854,7 +11092,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -10866,7 +11104,7 @@ else case e in @%:@(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -10884,7 +11122,7 @@ else case e in @%:@(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -10899,8 +11137,8 @@ else case e in @%:@(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -11059,7 +11297,7 @@ esac
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -11352,8 +11590,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -11620,6 +11858,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -11730,6 +11980,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -11748,30 +12000,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -11816,9 +12046,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -12092,7 +12327,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -12143,7 +12378,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -12159,7 +12400,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -12182,6 +12423,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -12239,18 +12486,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -12332,7 +12567,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -12341,15 +12576,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -12376,9 +12611,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -12386,8 +12621,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -12409,7 +12644,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -12425,9 +12660,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -12439,8 +12674,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -12461,8 +12696,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12583,7 +12818,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -12608,8 +12843,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -12653,7 +12888,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -12694,8 +12929,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -12724,7 +12959,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -12765,8 +13000,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -12776,7 +13011,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -12817,13 +13052,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -12864,13 +13099,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -12911,8 +13146,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -12958,7 +13193,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -13042,7 +13277,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13061,12 +13296,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -13150,7 +13385,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13169,8 +13404,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -13208,40 +13443,40 @@ fi
   
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -13259,12 +13494,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -13289,15 +13524,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
   
 
@@ -13318,11 +13553,18 @@ CC=$lt_save_CC
 
 
 
+
        
        
 
 
 
+
+
+
+
+
+
 
 
         ac_config_commands="$ac_config_commands libtool"
@@ -13358,16 +13600,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -13384,7 +13626,7 @@ else case e in @%:@(
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -13414,9 +13656,9 @@ else case e in @%:@(
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -13433,7 +13675,7 @@ else case e in @%:@(
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -13491,14 +13733,14 @@ fi
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
@@ -13515,13 +13757,13 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 printf %s "checking for shared library path variable... " >&6; }
 if test ${acl_cv_libpath+y}
 then :
@@ -13536,12 +13778,12 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-printf "%s\n" "$acl_cv_libpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+printf '%s\n' "$acl_cv_libpath" >&6; }
   shlibpath_var="$acl_cv_shlibpath_var"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
 printf %s "checking whether to activate relocatable installation... " >&6; }
   @%:@ Check whether --enable-relocatable was given.
 if test ${enable_relocatable+y}
@@ -13558,8 +13800,8 @@ esac
 fi
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-printf "%s\n" "$RELOCATABLE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+printf '%s\n' "$RELOCATABLE" >&6; }
 
 
   
@@ -13569,11 +13811,13 @@ printf "%s\n" "$RELOCATABLE" >&6; }
     reloc_final_prefix="$prefix"
   fi
   
-printf "%s\n" "@%:@define INSTALLPREFIX \"${reloc_final_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+@%:@define INSTALLPREFIX "${reloc_final_prefix}"
+_ACEOF
 
   if test $RELOCATABLE = yes; then
     
-printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
 
   fi
 
@@ -13594,14 +13838,14 @@ printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
 if test "x$ac_cv_header_mach_o_dyld_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
 
 fi
 
     ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
 if test "x$ac_cv_func__NSGetExecutablePath" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
 
 fi
 
@@ -13620,7 +13864,7 @@ fi
         ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
 if test "x$ac_cv_func_copy_file_range" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
@@ -13718,7 +13962,7 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -13749,9 +13993,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -13795,8 +14039,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -13805,13 +14049,13 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 printf %s "checking for nl_langinfo and CODESET... " >&6; }
 if test ${am_cv_langinfo_codeset+y}
 then :
@@ -13840,11 +14084,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf '%s\n' "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
     
-printf "%s\n" "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -13921,7 +14165,7 @@ gl_mda_defines='
 
        
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 printf %s "checking for working fcntl.h... " >&6; }
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
@@ -14055,15 +14299,15 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+printf '%s\n' "$gl_cv_header_working_fcntl_h" >&6; }
 
   case $gl_cv_header_working_fcntl_h in #(
   *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
 
 
   case $gl_cv_header_working_fcntl_h in #(
@@ -14071,13 +14315,13 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 
 
 ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
 if test "x$ac_cv_func_setlocale" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
 
 fi
 
@@ -14110,44 +14354,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -14159,8 +14366,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -14174,8 +14381,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -14192,7 +14399,7 @@ U=
 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -14213,13 +14420,21 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in @%:@(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -14233,7 +14448,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -14245,7 +14460,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -14332,7 +14547,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -14348,9 +14563,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -14445,7 +14660,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -14467,29 +14682,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -14531,7 +14723,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -14540,7 +14732,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14593,19 +14785,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by libcharset $as_me 1.5, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14627,7 +14819,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -14635,7 +14827,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -14667,16 +14859,16 @@ $config_commands
 Report bugs to the package provider."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 libcharset config.status 1.5
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -14684,10 +14876,14 @@ ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -14715,15 +14911,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -14731,7 +14927,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -14740,7 +14936,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -14764,29 +14960,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
 @%:@@%:@ Running $as_me. @%:@@%:@
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -14834,6 +15030,7 @@ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
@@ -14974,6 +15171,7 @@ file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
+lt_ar_flags \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -15080,7 +15278,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -15167,13 +15365,13 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -15184,7 +15382,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -15229,9 +15427,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -15260,7 +15458,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -15292,7 +15490,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -15363,9 +15561,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -15383,8 +15581,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -15399,7 +15601,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -15443,7 +15645,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -15451,17 +15653,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -15478,7 +15680,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -15502,9 +15704,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -15544,7 +15746,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -15561,10 +15763,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -15578,11 +15780,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -15605,9 +15807,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -15623,27 +15825,27 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
   
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -15669,7 +15871,7 @@ printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -15792,6 +15994,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
 # A file(cmd) program that detects file types.
 FILECMD=$lt_FILECMD
 
@@ -15814,7 +16019,7 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 AR=$lt_AR
 
 # Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
+lt_ar_flags=$lt_lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}
@@ -16208,7 +16413,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -16224,18 +16429,25 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in @%:@(
+  -*) :
+    ac_no_opts=-- ;; @%:@(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.2 b/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.2
index dde4ddefa3..3783220ac7 100644
--- a/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.2
+++ b/recipes/libs/libiconv/source/libcharset/autom4te.cache/output.2
@@ -1,9 +1,9 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.72 for libcharset 1.5.
+@%:@ Generated by GNU Autoconf 2.73 for libcharset 1.5.
 @%:@ 
 @%:@ 
-@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 @%:@ Inc.
 @%:@ 
 @%:@ 
@@ -20,7 +20,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -107,7 +107,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -129,10 +129,13 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -143,7 +146,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -261,22 +264,25 @@ case $- in @%:@ ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -336,7 +342,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -345,7 +351,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -428,9 +434,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -457,7 +463,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -503,7 +509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -517,29 +523,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -600,6 +583,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIB@&t@OBJS=
@@ -712,13 +696,13 @@ LDFLAGS
 CFLAGS
 CC
 SET_MAKE
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -884,7 +868,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -910,7 +894,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1123,7 +1107,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1139,7 +1123,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1183,9 +1167,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1193,7 +1177,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -1201,7 +1185,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1265,7 +1249,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1448,9 +1432,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1487,7 +1471,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1497,9 +1481,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libcharset configure 1.5
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1523,7 +1507,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1531,7 +1515,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1539,7 +1523,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1562,7 +1546,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1570,7 +1554,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1578,7 +1562,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -1596,7 +1580,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1618,8 +1602,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_header_compile
@@ -1637,7 +1621,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1645,7 +1629,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1656,7 +1640,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1678,7 +1662,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1730,8 +1714,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } @%:@ ac_fn_c_check_func
@@ -1749,26 +1733,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -1784,7 +1768,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -1796,7 +1780,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?@<:@ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -1804,7 +1788,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libcharset $as_me 1.5, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -1844,7 +1828,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -1879,7 +1863,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1908,31 +1892,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -1941,67 +1916,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -2010,21 +2013,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -2046,12 +2049,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -2061,27 +2064,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -2161,7 +2257,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -2172,7 +2269,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -2260,15 +2357,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -2284,13 +2381,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -2425,7 +2521,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -2438,7 +2534,7 @@ do
   esac
   as_found=:
   
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -2449,13 +2545,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -2467,7 +2563,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -2520,38 +2616,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2561,10 +2663,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -2572,6 +2674,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2583,10 +2702,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_config_headers="$ac_config_headers config.h"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -2594,7 +2713,7 @@ else case e in @%:@(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -2607,12 +2726,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2627,6 +2746,9 @@ fi
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2635,7 +2757,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2656,7 +2778,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2668,11 +2790,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2681,7 +2803,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -2702,7 +2824,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2714,11 +2836,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2726,8 +2848,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2740,7 +2862,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2761,7 +2883,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2773,11 +2895,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2786,7 +2908,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2812,7 +2934,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2836,11 +2958,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2851,7 +2973,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2872,7 +2994,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2884,11 +3006,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2901,7 +3023,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -2922,7 +3044,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2934,11 +3056,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2950,8 +3072,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2963,7 +3085,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2984,7 +3106,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2996,11 +3118,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -3009,7 +3131,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -3030,7 +3152,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3042,11 +3164,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3054,8 +3176,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3067,13 +3189,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -3083,7 +3205,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3093,7 +3215,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -3113,9 +3235,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3136,10 +3258,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -3180,29 +3302,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3210,10 +3332,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -3230,15 +3352,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3261,7 +3383,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -3270,10 +3392,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -3281,31 +3403,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -3329,10 +3451,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -3344,11 +3466,11 @@ then :
   esac
 done
 else case e in @%:@(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -3356,11 +3478,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -3392,8 +3514,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -3403,7 +3525,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -3471,8 +3593,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3491,7 +3613,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -3503,7 +3674,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -3520,16 +3691,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -3540,7 +3711,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -3569,16 +3740,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -3589,7 +3760,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -3618,16 +3789,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in @%:@(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -3648,7 +3819,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -3719,8 +3890,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3768,8 +3939,8 @@ if $ac_preproc_ok
 then :
   
 else case e in @%:@(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -3797,7 +3968,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -3820,8 +3991,8 @@ case $as_dir in @%:@((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3871,8 +4042,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3890,7 +4061,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -3906,8 +4077,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -3923,10 +4094,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -3941,8 +4112,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -3958,7 +4129,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -3972,7 +4143,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -3992,7 +4163,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
   
-printf "%s\n" "@%:@define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "@%:@define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -4001,7 +4172,7 @@ fi
     
   
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
@@ -4030,10 +4201,10 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
@@ -4084,49 +4255,51 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "@%:@define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "@%:@define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "@%:@define _MINIX 1" >>confdefs.h
+    printf '%s\n' "@%:@define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
 
 else case e in @%:@(
   e) MINIX= ;;
@@ -4134,12 +4307,12 @@ esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "@%:@define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
@@ -4152,14 +4325,14 @@ fi
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
     
     
@@ -4197,7 +4370,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -4224,12 +4397,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -4245,7 +4418,7 @@ esac
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -4288,7 +4461,7 @@ case `"$ac_path_SED" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4317,8 +4490,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4335,7 +4508,7 @@ Xsed="$SED -e 1s/^X//"
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -4372,7 +4545,7 @@ case `"$ac_path_GREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4401,12 +4574,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
  
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -4446,7 +4619,7 @@ case `"$ac_path_EGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4476,14 +4649,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
  
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -4523,7 +4696,7 @@ case `"$ac_path_FGREP" --version 2>&1` in @%:@(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4553,8 +4726,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
  
 
@@ -4590,7 +4763,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -4620,10 +4793,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -4659,14 +4832,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -4683,8 +4856,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -4695,7 +4868,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -4751,8 +4924,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -4765,7 +4938,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -4786,7 +4959,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4798,11 +4971,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4815,7 +4988,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -4836,7 +5009,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4848,11 +5021,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4864,8 +5037,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -4893,7 +5066,7 @@ test -z "$NM" && NM=nm
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -4915,22 +5088,22 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -4948,9 +5121,9 @@ else case e in @%:@(
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -5063,11 +5236,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -5111,7 +5284,7 @@ esac
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -5153,14 +5326,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -5182,14 +5355,85 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+case $host in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+      
+    
+    
+    
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+  
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in @%:@(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; @%:@(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; @%:@(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+        
+fi
+     ;; @%:@(
+  *) :
+     ;;
+esac
+  
+ ;; @%:@(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -5198,8 +5442,8 @@ else case e in @%:@(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -5214,7 +5458,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -5231,7 +5475,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -5252,7 +5496,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5265,11 +5509,11 @@ esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5282,7 +5526,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -5303,7 +5547,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5315,11 +5559,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5328,7 +5572,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -5349,7 +5593,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5361,11 +5605,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -5373,8 +5617,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -5390,7 +5634,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -5507,16 +5751,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5603,8 +5843,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -5648,7 +5888,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -5669,7 +5909,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5681,11 +5921,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5694,7 +5934,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -5715,7 +5955,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5727,11 +5967,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -5739,8 +5979,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -5757,7 +5997,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -5786,8 +6026,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -5800,7 +6040,7 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
@@ -5821,7 +6061,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5833,11 +6073,11 @@ esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5846,7 +6086,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
@@ -5867,7 +6107,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5879,11 +6119,11 @@ esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -5891,8 +6131,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -5906,7 +6146,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -5927,7 +6167,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5939,11 +6179,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5956,7 +6196,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -5977,7 +6217,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5989,11 +6229,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6005,8 +6245,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6042,7 +6282,7 @@ lt_ar_flags=$AR_FLAGS
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -6067,7 +6307,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -6075,7 +6315,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -6088,8 +6328,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -6106,7 +6346,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -6127,7 +6367,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6139,11 +6379,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6152,7 +6392,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -6173,7 +6413,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6185,11 +6425,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6197,8 +6437,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6259,11 +6499,11 @@ esac
     
 
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -6284,7 +6524,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6296,11 +6536,11 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6336,7 +6576,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -6396,13 +6636,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -6416,22 +6656,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -6452,8 +6692,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -6493,7 +6735,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
@@ -6566,7 +6808,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -6602,11 +6844,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -6652,7 +6894,7 @@ fi
     
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 @%:@ Check whether --with-sysroot was given.
@@ -6680,20 +6922,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
     
     
     
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -6738,11 +6980,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -6759,8 +7001,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
     
     
@@ -6800,7 +7042,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -6820,7 +7062,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -6858,7 +7100,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -6899,7 +7141,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -6962,7 +7204,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -7002,8 +7244,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -7016,7 +7258,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -7053,7 +7295,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -7074,7 +7316,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7086,11 +7328,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7099,7 +7341,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -7120,7 +7362,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7132,11 +7374,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -7144,8 +7386,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -7155,7 +7397,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -7171,8 +7413,8 @@ else case e in @%:@(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -7187,7 +7429,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -7208,7 +7450,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7220,11 +7462,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7233,7 +7475,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -7254,7 +7496,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7266,11 +7508,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -7278,8 +7520,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -7291,7 +7533,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -7312,7 +7554,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7324,11 +7566,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7337,7 +7579,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -7358,7 +7600,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7370,11 +7612,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -7382,8 +7624,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -7395,7 +7637,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -7416,7 +7658,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7428,11 +7670,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7441,7 +7683,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -7462,7 +7704,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7474,11 +7716,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -7486,8 +7728,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -7499,7 +7741,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -7520,7 +7762,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7532,11 +7774,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7545,7 +7787,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -7566,7 +7808,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7578,11 +7820,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -7590,8 +7832,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -7603,7 +7845,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -7624,7 +7866,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7636,11 +7878,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7649,7 +7891,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -7670,7 +7912,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7682,11 +7924,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -7694,8 +7936,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -7730,7 +7972,7 @@ fi
     
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -7765,12 +8007,12 @@ else case e in @%:@(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
     # Feature test to disable chained fixups since it is not
     # compatible with '-undefined dynamic_lookup'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
 printf %s "checking for -no_fixup_chains linker flag... " >&6; }
 if test ${lt_cv_support_no_fixup_chains+y}
 then :
@@ -7804,10 +8046,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -7841,10 +8083,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -7878,8 +8120,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -7968,7 +8210,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_inc
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -7984,7 +8226,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -8005,7 +8247,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8017,11 +8259,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8030,7 +8272,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -8051,7 +8293,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8063,11 +8305,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -8075,8 +8317,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -8088,7 +8330,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -8109,7 +8351,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8121,11 +8363,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8134,7 +8376,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -8155,7 +8397,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8167,11 +8409,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -8179,8 +8421,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -8192,7 +8434,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -8213,7 +8455,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8225,11 +8467,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8238,7 +8480,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -8259,7 +8501,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8271,11 +8513,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -8283,8 +8525,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -8453,7 +8695,7 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
   
 @%:@ Check whether --with-aix-soname was given.
@@ -8480,8 +8722,8 @@ fi
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -8563,7 +8805,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -8580,15 +8822,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
     
     
     
 
-printf "%s\n" "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -8634,7 +8876,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -8689,11 +8931,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     
@@ -8702,7 +8944,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -8757,11 +8999,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8842,7 +9084,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -8869,9 +9111,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -8879,8 +9121,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -9018,7 +9260,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -9069,7 +9311,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -9085,7 +9333,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -9108,6 +9356,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -9165,18 +9419,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -9258,7 +9500,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -9267,15 +9509,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -9302,9 +9544,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -9312,8 +9554,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -9341,7 +9583,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -9357,9 +9599,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -9371,8 +9613,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -9386,7 +9628,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -9417,9 +9659,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -9435,15 +9677,15 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
     
     
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -9474,9 +9716,9 @@ else case e in @%:@(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -9492,8 +9734,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -9501,7 +9743,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -9509,11 +9751,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -9525,7 +9767,7 @@ fi
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -9719,17 +9961,17 @@ _LT_EOF
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -9738,7 +9980,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -9758,6 +9999,11 @@ _LT_EOF
       archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -9783,7 +10029,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
@@ -9838,16 +10084,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -10246,8 +10482,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -10257,14 +10493,20 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -10296,7 +10538,7 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
@@ -10430,7 +10672,7 @@ fi
 	
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -10446,9 +10688,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
@@ -10460,8 +10702,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -10501,7 +10743,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -10525,8 +10767,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -10541,6 +10783,9 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -10552,12 +10797,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -10604,17 +10843,17 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -10623,7 +10862,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -10649,8 +10887,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10667,21 +10905,21 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -10817,8 +11055,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -10854,7 +11092,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -10866,7 +11104,7 @@ else case e in @%:@(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -10884,7 +11122,7 @@ else case e in @%:@(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -10899,8 +11137,8 @@ else case e in @%:@(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -11059,7 +11297,7 @@ esac
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -11352,8 +11590,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -11620,6 +11858,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -11730,6 +11980,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -11748,30 +12000,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -11816,9 +12046,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -12092,7 +12327,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -12143,7 +12378,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -12159,7 +12400,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -12182,6 +12423,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -12239,18 +12486,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -12332,7 +12567,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -12341,15 +12576,15 @@ else case e in @%:@(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -12376,9 +12611,9 @@ else case e in @%:@(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -12386,8 +12621,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -12409,7 +12644,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -12425,9 +12660,9 @@ else case e in @%:@(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -12439,8 +12674,8 @@ else case e in @%:@(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -12461,8 +12696,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12583,7 +12818,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
     
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -12608,8 +12843,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -12653,7 +12888,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -12694,8 +12929,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -12724,7 +12959,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -12765,8 +13000,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -12776,7 +13011,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -12817,13 +13052,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -12864,13 +13099,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in @%:@(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -12911,8 +13146,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -12958,7 +13193,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -13042,7 +13277,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13061,12 +13296,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -13150,7 +13385,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13169,8 +13404,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -13208,40 +13443,40 @@ fi
   
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -13259,12 +13494,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -13289,15 +13524,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
   
 
@@ -13318,11 +13553,18 @@ CC=$lt_save_CC
 
 
 
+
        
        
 
 
 
+
+
+
+
+
+
 
 
         ac_config_commands="$ac_config_commands libtool"
@@ -13358,16 +13600,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -13384,7 +13626,7 @@ else case e in @%:@(
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -13414,9 +13656,9 @@ else case e in @%:@(
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -13433,7 +13675,7 @@ else case e in @%:@(
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -13491,14 +13733,14 @@ fi
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
@@ -13515,13 +13757,13 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 printf %s "checking for shared library path variable... " >&6; }
 if test ${acl_cv_libpath+y}
 then :
@@ -13536,12 +13778,12 @@ else case e in @%:@(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-printf "%s\n" "$acl_cv_libpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+printf '%s\n' "$acl_cv_libpath" >&6; }
   shlibpath_var="$acl_cv_shlibpath_var"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
 printf %s "checking whether to activate relocatable installation... " >&6; }
   @%:@ Check whether --enable-relocatable was given.
 if test ${enable_relocatable+y}
@@ -13558,8 +13800,8 @@ esac
 fi
 
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-printf "%s\n" "$RELOCATABLE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+printf '%s\n' "$RELOCATABLE" >&6; }
 
 
   
@@ -13569,11 +13811,13 @@ printf "%s\n" "$RELOCATABLE" >&6; }
     reloc_final_prefix="$prefix"
   fi
   
-printf "%s\n" "@%:@define INSTALLPREFIX \"${reloc_final_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+@%:@define INSTALLPREFIX "${reloc_final_prefix}"
+_ACEOF
 
   if test $RELOCATABLE = yes; then
     
-printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
+printf '%s\n' "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
 
   fi
 
@@ -13594,14 +13838,14 @@ printf "%s\n" "@%:@define ENABLE_RELOCATABLE 1" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
 if test "x$ac_cv_header_mach_o_dyld_h" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
 
 fi
 
     ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
 if test "x$ac_cv_func__NSGetExecutablePath" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
 
 fi
 
@@ -13620,7 +13864,7 @@ fi
         ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
 if test "x$ac_cv_func_copy_file_range" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
@@ -13718,7 +13962,7 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -13749,9 +13993,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -13795,8 +14039,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -13805,13 +14049,13 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
   
   
   
-printf "%s\n" "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 printf %s "checking for nl_langinfo and CODESET... " >&6; }
 if test ${am_cv_langinfo_codeset+y}
 then :
@@ -13840,11 +14084,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf '%s\n' "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
     
-printf "%s\n" "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -13921,7 +14165,7 @@ gl_mda_defines='
 
        
   
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 printf %s "checking for working fcntl.h... " >&6; }
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
@@ -14055,15 +14299,15 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+printf '%s\n' "$gl_cv_header_working_fcntl_h" >&6; }
 
   case $gl_cv_header_working_fcntl_h in #(
   *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
 
 
   case $gl_cv_header_working_fcntl_h in #(
@@ -14071,13 +14315,13 @@ printf "%s\n" "@%:@define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
   *) ac_val=1;;
   esac
   
-printf "%s\n" "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
+printf '%s\n' "@%:@define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 
 
 ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
 if test "x$ac_cv_func_setlocale" = xyes
 then :
-  printf "%s\n" "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
+  printf '%s\n' "@%:@define HAVE_SETLOCALE 1" >>confdefs.h
 
 fi
 
@@ -14110,44 +14354,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -14159,8 +14366,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -14174,8 +14381,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -14192,7 +14399,7 @@ U=
 for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -14213,13 +14420,21 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in @%:@(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -14233,7 +14448,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -14245,7 +14460,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in @%:@(
@@ -14332,7 +14547,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -14348,9 +14563,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } @%:@ as_fn_error
 
@@ -14445,7 +14660,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -14467,29 +14682,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in @%:@(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_@&t@echo='printf %s\n'
-as_@&t@echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -14531,7 +14723,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -14540,7 +14732,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14593,19 +14785,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by libcharset $as_me 1.5, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14627,7 +14819,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -14635,7 +14827,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -14667,16 +14859,16 @@ $config_commands
 Report bugs to the package provider."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 libcharset config.status 1.5
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -14684,10 +14876,14 @@ ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -14715,15 +14911,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -14731,7 +14927,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -14740,7 +14936,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -14764,29 +14960,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
 @%:@@%:@ Running $as_me. @%:@@%:@
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -14834,6 +15030,7 @@ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
@@ -14974,6 +15171,7 @@ file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
+lt_ar_flags \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -15080,7 +15278,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -15167,13 +15365,13 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -15184,7 +15382,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -15229,9 +15427,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -15260,7 +15458,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -15292,7 +15490,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -15363,9 +15561,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -15383,8 +15581,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -15399,7 +15601,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -15443,7 +15645,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -15451,17 +15653,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -15478,7 +15680,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -15502,9 +15704,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -15544,7 +15746,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -15561,10 +15763,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -15578,11 +15780,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -15605,9 +15807,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -15623,27 +15825,27 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
   
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -15669,7 +15871,7 @@ printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -15792,6 +15994,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
 # A file(cmd) program that detects file types.
 FILECMD=$lt_FILECMD
 
@@ -15814,7 +16019,7 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 AR=$lt_AR
 
 # Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
+lt_ar_flags=$lt_lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}
@@ -16208,7 +16413,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -16224,19 +16429,26 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in @%:@(
+  -*) :
+    ac_no_opts=-- ;; @%:@(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
    
\ No newline at end of file
diff --git a/recipes/libs/libiconv/source/libcharset/autom4te.cache/requests b/recipes/libs/libiconv/source/libcharset/autom4te.cache/requests
index 42dc7b0444..c2f92d58f6 100644
--- a/recipes/libs/libiconv/source/libcharset/autom4te.cache/requests
+++ b/recipes/libs/libiconv/source/libcharset/autom4te.cache/requests
@@ -1,4 +1,4 @@
-# This file was generated by Autom4te 2.72.
+# This file was generated by Autom4te 2.73.
 # It contains the lists of macros which have been traced.
 # It can be safely removed.
 
@@ -14,24 +14,24 @@
                         '/usr/share/aclocal-1.18/internal/ac-config-macro-dirs.m4',
                         '/usr/share/aclocal-1.18/cond.m4',
                         '/usr/share/aclocal-1.18/substnot.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltargz.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/00gnulib.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/codeset.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/extensions.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl-o.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-ld.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/std-gnu11.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/visibility.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/zzgnulib.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltsugar.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltversion.m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4',
+                        '/usr/share/aclocal/ltargz.m4',
+                        '/usr/share/aclocal/ltdl.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/00gnulib.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/codeset.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/extensions.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl-o.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/std-gnu11.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/visibility.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/zzgnulib.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-ld.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltsugar.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltversion.m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4',
                         'configure.ac'
                       ],
                       {
@@ -148,6 +148,9 @@
                         'LT_PATH_NM' => 1,
                         'LT_PROG_GCJ' => 1,
                         'LT_PROG_GO' => 1,
+                        'LT_PROG_ML64' => 1,
+                        'LT_PROG_OBJC' => 1,
+                        'LT_PROG_OBJCXX' => 1,
                         'LT_PROG_RC' => 1,
                         'LT_SUPPORTED_TAG' => 1,
                         'LT_SYS_DLOPEN_DEPLIBS' => 1,
@@ -256,9 +259,9 @@
                       1,
                       [
                         '/usr/share/autoconf',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot//share/aclocal'
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4',
+                        '/usr/share/aclocal'
                       ],
                       [
                         '/usr/share/autoconf/autoconf/autoconf.m4f',
@@ -275,6 +278,7 @@
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_CONFIG_LINKS' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
@@ -284,6 +288,9 @@
                         'AC_FC_SRCEXT' => 1,
                         'AC_INIT' => 1,
                         'AC_LIBSOURCE' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_SUBST' => 1,
@@ -295,6 +302,9 @@
                         'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'AM_GNU_GETTEXT' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AM_ICONV' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
@@ -312,6 +322,7 @@
                         'AM_SILENT_RULES' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
                         'GTK_DOC_CHECK' => 1,
+                        'GUILE_FLAGS' => 1,
                         'IT_PROG_INTLTOOL' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
                         'LT_INIT' => 1,
@@ -336,9 +347,9 @@
                       1,
                       [
                         '/usr/share/autoconf',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4',
-                        '/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4',
-                        '/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot//share/aclocal'
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4',
+                        '/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4',
+                        '/usr/share/aclocal'
                       ],
                       [
                         '/usr/share/autoconf/autoconf/autoconf.m4f',
@@ -356,6 +367,7 @@
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_CONFIG_LINKS' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
@@ -365,6 +377,9 @@
                         'AC_FC_SRCEXT' => 1,
                         'AC_INIT' => 1,
                         'AC_LIBSOURCE' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_SUBST' => 1,
@@ -376,6 +391,9 @@
                         'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'AM_GNU_GETTEXT' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AM_ICONV' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
@@ -393,6 +411,7 @@
                         'AM_SILENT_RULES' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
                         'GTK_DOC_CHECK' => 1,
+                        'GUILE_FLAGS' => 1,
                         'IT_PROG_INTLTOOL' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
                         'LT_INIT' => 1,
diff --git a/recipes/libs/libiconv/source/libcharset/autom4te.cache/traces.0 b/recipes/libs/libiconv/source/libcharset/autom4te.cache/traces.0
index 3fcd854f75..c933d92783 100644
--- a/recipes/libs/libiconv/source/libcharset/autom4te.cache/traces.0
+++ b/recipes/libs/libiconv/source/libcharset/autom4te.cache/traces.0
@@ -20,7 +20,7 @@ Usually this means the macro was only invoked conditionally.]])
 fi])])
 m4trace:/usr/share/aclocal-1.18/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
 m4trace:/usr/share/aclocal-1.18/substnot.m4:17: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltargz.m4:13: -1- AC_DEFUN([LT_FUNC_ARGZ], [
+m4trace:/usr/share/aclocal/ltargz.m4:13: -1- AC_DEFUN([LT_FUNC_ARGZ], [
 dnl Required for use of '$SED' in Cygwin configuration.
 AC_REQUIRE([AC_PROG_SED])dnl
 AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
@@ -85,10 +85,10 @@ AS_IF([test -z "$LT_ARGZ_H"],
 
 AC_SUBST([LT_ARGZ_H])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:17: -1- AC_DEFUN([LT_CONFIG_LTDL_DIR], [AC_BEFORE([$0], [LTDL_INIT])
+m4trace:/usr/share/aclocal/ltdl.m4:17: -1- AC_DEFUN([LT_CONFIG_LTDL_DIR], [AC_BEFORE([$0], [LTDL_INIT])
 _$0($*)
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:69: -1- AC_DEFUN([LTDL_CONVENIENCE], [AC_BEFORE([$0], [LTDL_INIT])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:69: -1- AC_DEFUN([LTDL_CONVENIENCE], [AC_BEFORE([$0], [LTDL_INIT])dnl
 dnl Although the argument is deprecated and no longer documented,
 dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one
 dnl here make sure it is the same as any other declaration of libltdl's
@@ -97,13 +97,13 @@ dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
 m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
 _$0()
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:82: -1- AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+m4trace:/usr/share/aclocal/ltdl.m4:82: -1- AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_CONVENIENCE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:82: -1- AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_CONVENIENCE' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:82: -1- AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_CONVENIENCE' is obsolete.
 You should run autoupdate.])dnl
 _LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_CONVENIENCE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:125: -1- AC_DEFUN([LTDL_INSTALLABLE], [AC_BEFORE([$0], [LTDL_INIT])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:125: -1- AC_DEFUN([LTDL_INSTALLABLE], [AC_BEFORE([$0], [LTDL_INIT])dnl
 dnl Although the argument is deprecated and no longer documented,
 dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one
 dnl here make sure it is the same as any other declaration of libltdl's
@@ -112,17 +112,17 @@ dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
 m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
 _$0()
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:138: -1- AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+m4trace:/usr/share/aclocal/ltdl.m4:138: -1- AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_INSTALLABLE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:138: -1- AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_INSTALLABLE' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:138: -1- AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [m4_warn([obsolete], [The macro 'AC_LIBLTDL_INSTALLABLE' is obsolete.
 You should run autoupdate.])dnl
 _LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
 _LTDL_INSTALLABLE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:214: -1- AC_DEFUN([_LT_LIBOBJ], [
+m4trace:/usr/share/aclocal/ltdl.m4:214: -1- AC_DEFUN([_LT_LIBOBJ], [
   m4_pattern_allow([^_LT_LIBOBJS$])
   _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:227: -1- AC_DEFUN([LTDL_INIT], [dnl Parse OPTIONS
+m4trace:/usr/share/aclocal/ltdl.m4:227: -1- AC_DEFUN([LTDL_INIT], [dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
 dnl We need to keep our own list of libobjs separate from our parent project,
@@ -245,19 +245,19 @@ AC_CONFIG_COMMANDS_PRE([
 # Only expand once:
 m4_define([LTDL_INIT])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:353: -1- AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:353: -1- AC_DEFUN([AC_LIB_LTDL], [m4_warn([obsolete], [The macro 'AC_LIB_LTDL' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:353: -1- AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:353: -1- AC_DEFUN([AC_LIB_LTDL], [m4_warn([obsolete], [The macro 'AC_LIB_LTDL' is obsolete.
 You should run autoupdate.])dnl
 LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:354: -1- AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:354: -1- AC_DEFUN([AC_WITH_LTDL], [m4_warn([obsolete], [The macro 'AC_WITH_LTDL' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:354: -1- AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:354: -1- AC_DEFUN([AC_WITH_LTDL], [m4_warn([obsolete], [The macro 'AC_WITH_LTDL' is obsolete.
 You should run autoupdate.])dnl
 LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:355: -1- AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:355: -1- AC_DEFUN([LT_WITH_LTDL], [m4_warn([obsolete], [The macro 'LT_WITH_LTDL' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:355: -1- AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:355: -1- AC_DEFUN([LT_WITH_LTDL], [m4_warn([obsolete], [The macro 'LT_WITH_LTDL' is obsolete.
 You should run autoupdate.])dnl
 LTDL_INIT($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:368: -1- AC_DEFUN([_LTDL_SETUP], [AC_REQUIRE([AC_PROG_CC])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:368: -1- AC_DEFUN([_LTDL_SETUP], [AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([LT_SYS_MODULE_EXT])dnl
 AC_REQUIRE([LT_SYS_MODULE_PATH])dnl
 AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl
@@ -311,7 +311,7 @@ name=ltdl
 eval "LTDLOPEN=\"$libname_spec\""
 AC_SUBST([LTDLOPEN])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:445: -1- AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:445: -1- AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
   [lt_cv_sys_dlopen_deplibs],
   [# PORTME does your system automatically load deplibs for dlopen?
@@ -366,9 +366,6 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
   *-mlibc)
     lt_cv_sys_dlopen_deplibs=yes
     ;;
-  redox*)
-    lt_cv_sys_dlopen_deplibs=yes
-    ;;
   netbsd* | netbsdelf*-gnu)
     lt_cv_sys_dlopen_deplibs=yes
     ;;
@@ -413,11 +410,11 @@ if test yes != "$lt_cv_sys_dlopen_deplibs"; then
     [Define if the OS needs help to load dependent libraries for dlopen().])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:550: -1- AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:550: -1- AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_warn([obsolete], [The macro 'AC_LTDL_SYS_DLOPEN_DEPLIBS' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:547: -1- AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:547: -1- AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_warn([obsolete], [The macro 'AC_LTDL_SYS_DLOPEN_DEPLIBS' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:557: -1- AC_DEFUN([LT_SYS_MODULE_EXT], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:554: -1- AC_DEFUN([LT_SYS_MODULE_EXT], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
 AC_CACHE_CHECK([what extension is used for runtime loadable modules],
   [libltdl_cv_shlibext],
 [
@@ -442,11 +439,11 @@ if test -n "$shared_archive_member_spec"; then
     [Define to the shared archive member specification, say "(shr.o)".])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:585: -1- AU_DEFUN([AC_LTDL_SHLIBEXT], [m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:585: -1- AC_DEFUN([AC_LTDL_SHLIBEXT], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBEXT' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:582: -1- AU_DEFUN([AC_LTDL_SHLIBEXT], [m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:582: -1- AC_DEFUN([AC_LTDL_SHLIBEXT], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBEXT' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:592: -1- AC_DEFUN([LT_SYS_MODULE_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:589: -1- AC_DEFUN([LT_SYS_MODULE_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
 AC_CACHE_CHECK([what variable specifies run-time module search path],
   [lt_cv_module_path_var], [lt_cv_module_path_var=$shlibpath_var])
 if test -n "$lt_cv_module_path_var"; then
@@ -455,11 +452,11 @@ if test -n "$lt_cv_module_path_var"; then
     [Define to the name of the environment variable that determines the run-time module search path.])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:604: -1- AU_DEFUN([AC_LTDL_SHLIBPATH], [m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:604: -1- AC_DEFUN([AC_LTDL_SHLIBPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBPATH' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:601: -1- AU_DEFUN([AC_LTDL_SHLIBPATH], [m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:601: -1- AC_DEFUN([AC_LTDL_SHLIBPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SHLIBPATH' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:611: -1- AC_DEFUN([LT_SYS_DLSEARCH_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:608: -1- AC_DEFUN([LT_SYS_DLSEARCH_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
 AC_CACHE_CHECK([for the default library search path],
   [lt_cv_sys_dlsearch_path],
   [lt_cv_sys_dlsearch_path=$sys_lib_dlsearch_path_spec])
@@ -477,11 +474,11 @@ if test -n "$lt_cv_sys_dlsearch_path"; then
     [Define to the system default library search path.])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:632: -1- AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:632: -1- AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SYSSEARCHPATH' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:629: -1- AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:629: -1- AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_warn([obsolete], [The macro 'AC_LTDL_SYSSEARCHPATH' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:658: -1- AC_DEFUN([LT_LIB_DLLOAD], [m4_pattern_allow([^LT_DLLOADERS$])
+m4trace:/usr/share/aclocal/ltdl.m4:655: -1- AC_DEFUN([LT_LIB_DLLOAD], [m4_pattern_allow([^LT_DLLOADERS$])
 LT_DLLOADERS=
 AC_SUBST([LT_DLLOADERS])
 
@@ -573,11 +570,11 @@ AC_SUBST([LIBADD_DL])
 LIBS=$lt_dlload_save_LIBS
 AC_LANG_POP
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:753: -1- AU_DEFUN([AC_LTDL_DLLIB], [m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:753: -1- AC_DEFUN([AC_LTDL_DLLIB], [m4_warn([obsolete], [The macro 'AC_LTDL_DLLIB' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:750: -1- AU_DEFUN([AC_LTDL_DLLIB], [m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:750: -1- AC_DEFUN([AC_LTDL_DLLIB], [m4_warn([obsolete], [The macro 'AC_LTDL_DLLIB' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:761: -1- AC_DEFUN([LT_SYS_SYMBOL_USCORE], [m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4trace:/usr/share/aclocal/ltdl.m4:758: -1- AC_DEFUN([LT_SYS_SYMBOL_USCORE], [m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 AC_CACHE_CHECK([for _ prefix in compiled symbols],
   [lt_cv_sys_symbol_underscore],
   [lt_cv_sys_symbol_underscore=no
@@ -611,11 +608,11 @@ _LT_EOF
   sys_symbol_underscore=$lt_cv_sys_symbol_underscore
   AC_SUBST([sys_symbol_underscore])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:798: -1- AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:798: -1- AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_SYMBOL_USCORE' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:795: -1- AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:795: -1- AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_SYMBOL_USCORE' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:805: -1- AC_DEFUN([LT_FUNC_DLSYM_USCORE], [AC_REQUIRE([_LT_COMPILER_PIC])dnl	for lt_prog_compiler_wl
+m4trace:/usr/share/aclocal/ltdl.m4:802: -1- AC_DEFUN([LT_FUNC_DLSYM_USCORE], [AC_REQUIRE([_LT_COMPILER_PIC])dnl	for lt_prog_compiler_wl
 AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl	for lt_cv_sys_symbol_underscore
 AC_REQUIRE([LT_SYS_MODULE_EXT])dnl	for libltdl_cv_shlibext
 if test yes = "$lt_cv_sys_symbol_underscore"; then
@@ -719,11 +716,11 @@ if test yes = "$libltdl_cv_need_uscore"; then
     [Define if dlsym() requires a leading underscore in symbol names.])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:912: -1- AU_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/prefix/x86_64-unknown-redox/sysroot/share/aclocal/ltdl.m4:912: -1- AC_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_DLSYM_USCORE' is obsolete.
+m4trace:/usr/share/aclocal/ltdl.m4:909: -1- AU_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])], [], [])
+m4trace:/usr/share/aclocal/ltdl.m4:909: -1- AC_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_warn([obsolete], [The macro 'AC_LTDL_DLSYM_USCORE' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/00gnulib.m4:24: -1- AC_DEFUN([gl_COMPILER_CLANG], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/00gnulib.m4:24: -1- AC_DEFUN([gl_COMPILER_CLANG], [
 dnl AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([whether the compiler is clang],
     [gl_cv_compiler_clang],
@@ -741,7 +738,7 @@ dnl AC_REQUIRE([AC_PROG_CC])
         [gl_cv_compiler_clang=yes])
     ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/00gnulib.m4:43: -1- AC_DEFUN([gl_COMPILER_PREPARE_CHECK_DECL], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/00gnulib.m4:43: -1- AC_DEFUN([gl_COMPILER_PREPARE_CHECK_DECL], [
 dnl AC_REQUIRE([AC_PROG_CC])
 dnl AC_REQUIRE([gl_COMPILER_CLANG])
   AC_CACHE_CHECK([for compiler option needed when checking for declarations],
@@ -767,8 +764,8 @@ dnl AC_REQUIRE([gl_COMPILER_CLANG])
     ac_compile_for_check_decl="$ac_compile"
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/00gnulib.m4:85: -1- AC_DEFUN([gl_00GNULIB])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/codeset.m4:10: -1- AC_DEFUN([AM_LANGINFO_CODESET], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/00gnulib.m4:85: -1- AC_DEFUN([gl_00GNULIB])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/codeset.m4:10: -1- AC_DEFUN([AM_LANGINFO_CODESET], [
   AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
@@ -782,7 +779,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/c
       [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/extensions.m4:212: -1- AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/extensions.m4:212: -1- AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], [
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   dnl On OpenBSD 6.8 with GCC, the include files contain a couple of
@@ -797,7 +794,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/e
       ;;
   esac
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/fcntl-o.m4:14: -1- AC_DEFUN([gl_FCNTL_O_FLAGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/fcntl-o.m4:14: -1- AC_DEFUN([gl_FCNTL_O_FLAGS], [
   dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
@@ -923,13 +920,13 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/f
   AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
     [Define to 1 if O_NOFOLLOW works.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:11: -1- AC_DEFUN([gl_COMMON], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:11: -1- AC_DEFUN([gl_COMMON], [
   dnl Use AC_REQUIRE here, so that the code is expanded once only.
   AC_REQUIRE([gl_00GNULIB])
   AC_REQUIRE([gl_COMMON_BODY])
   AC_REQUIRE([gl_ZZGNULIB])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:17: -1- AC_DEFUN([gl_COMMON_BODY], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:17: -1- AC_DEFUN([gl_COMMON_BODY], [
   AH_VERBATIM([_GL_GNUC_PREREQ],
 [/* True if the compiler says it groks GNU C version MAJOR.MINOR.  */
 #if defined __GNUC__ && defined __GNUC_MINOR__
@@ -1429,18 +1426,18 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   LIBC_FATAL_STDERR_=1
   export LIBC_FATAL_STDERR_
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:522: -1- AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:522: -1- AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], [
   GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2])
   AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:537: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:537: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], [
   gl_MODULE_INDICATOR_SET_VARIABLE_AUX(
     [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]],
                                                        [abcdefghijklmnopqrstuvwxyz./-],
                                                        [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])],
     [gl_MODULE_INDICATOR_CONDITION])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:550: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:550: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX], [
   m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1],
     [
      dnl Simplify the expression VALUE || 1 to 1.
@@ -1449,7 +1446,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1],
                                              [gl_MODULE_INDICATOR_CONDITION])])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:564: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:564: -1- AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR], [
   dnl Simplify the expression 1 || CONDITION to 1.
   if test "$[]$1" != 1; then
     dnl Simplify the expression 0 || CONDITION to CONDITION.
@@ -1460,7 +1457,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     fi
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:589: -1- AC_DEFUN([gl_MODULE_INDICATOR], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:589: -1- AC_DEFUN([gl_MODULE_INDICATOR], [
   AC_DEFINE_UNQUOTED([GNULIB_]m4_translit([[$1]],
       [abcdefghijklmnopqrstuvwxyz./-],
       [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]),
@@ -1468,22 +1465,22 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     [Define to a C preprocessor expression that evaluates to 1 or 0,
      depending whether the gnulib module $1 shall be considered present.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:612: -1- AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:612: -1- AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [
   AC_DEFINE([GNULIB_TEST_]m4_translit([[$1]],
       [abcdefghijklmnopqrstuvwxyz./-],
       [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
     [Define to 1 when the gnulib module $1 should be tested.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:624: -1- AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:624: -1- AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK], [
   dnl Override gl_WARN_ON_USE_PREPARE.
   dnl But hide this definition from 'aclocal'.
   AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], [])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:635: -1- AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:635: -1- AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS], [
   dnl Override gl_MODULE_INDICATOR_FOR_TESTS.
   AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:643: -1- AC_DEFUN([gl_FEATURES_H], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:643: -1- AC_DEFUN([gl_FEATURES_H], [
   AC_CHECK_HEADERS_ONCE([features.h])
   if test $ac_cv_header_features_h = yes; then
     HAVE_FEATURES_H=1
@@ -1492,7 +1489,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   fi
   AC_SUBST([HAVE_FEATURES_H])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:657: -1- AC_DEFUN([gl_PROG_CC_C99], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:657: -1- AC_DEFUN([gl_PROG_CC_C99], [
   dnl Just use AC_PROG_CC_C99.
   dnl When AC_PROG_CC_C99 and AC_PROG_CC_STDC are used together, the substituted
   dnl value of CC will contain the C99 enabling options twice. But this is only
@@ -1503,7 +1500,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     [AC_REQUIRE([AC_PROG_CC])],
     [AC_REQUIRE([AC_PROG_CC_C99])])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:674: -1- AC_DEFUN([gl_PROG_AR_RANLIB], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:674: -1- AC_DEFUN([gl_PROG_AR_RANLIB], [
   dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
   dnl as "cc", and GCC as "gcc". They have different object file formats and
   dnl library formats. In particular, the GNU binutils programs ar and ranlib
@@ -1567,20 +1564,20 @@ Amsterdam
   fi
   AC_SUBST([RANLIB])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:794: -1- AC_DEFUN([gl_BIGENDIAN], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:794: -1- AC_DEFUN([gl_BIGENDIAN], [
   AC_C_BIGENDIAN
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:808: -1- AC_DEFUN([gl_SILENT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:808: -1- AC_DEFUN([gl_SILENT], [
   exec GL_TMP_FD>&AS_MESSAGE_FD AS_MESSAGE_FD>/dev/null
   $1
   exec AS_MESSAGE_FD>&GL_TMP_FD GL_TMP_FD>&-
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:820: -1- AC_DEFUN([gl_CACHE_VAL_SILENT], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:820: -1- AC_DEFUN([gl_CACHE_VAL_SILENT], [
   gl_SILENT([
     AC_CACHE_VAL([$1], [$2])
   ])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:834: -1- AC_DEFUN([gl_CONDITIONAL], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:834: -1- AC_DEFUN([gl_CONDITIONAL], [
   pushdef([AC_CONFIG_COMMANDS_PRE], [:])dnl
   AM_CONDITIONAL([$1], [$2])
   popdef([AC_CONFIG_COMMANDS_PRE])dnl
@@ -1589,7 +1586,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
     [$1]_FALSE='#'
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:850: -1- AC_DEFUN([gl_CC_ALLOW_WARNINGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:850: -1- AC_DEFUN([gl_CC_ALLOW_WARNINGS], [
   AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([for C compiler option to allow warnings],
     [gl_cv_cc_wallow],
@@ -1614,7 +1611,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   esac
   AC_SUBST([GL_CFLAG_ALLOW_WARNINGS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:880: -1- AC_DEFUN([gl_CXX_ALLOW_WARNINGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:880: -1- AC_DEFUN([gl_CXX_ALLOW_WARNINGS], [
   dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX.
   if test -n "$CXX" && test "$CXX" != no; then
     AC_CACHE_CHECK([for C++ compiler option to allow warnings],
@@ -1643,7 +1640,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   fi
   AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:914: -1- AC_DEFUN([gl_CC_GNULIB_WARNINGS], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:914: -1- AC_DEFUN([gl_CC_GNULIB_WARNINGS], [
   AC_REQUIRE([gl_CC_ALLOW_WARNINGS])
   dnl Assume that the compiler supports -Wno-* options only if it also supports
   dnl -Wno-error.
@@ -1704,7 +1701,7 @@ EOF
   fi
   AC_SUBST([GL_CFLAG_GNULIB_WARNINGS])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:984: -1- AC_DEFUN([gl_CONDITIONAL_HEADER], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:984: -1- AC_DEFUN([gl_CONDITIONAL_HEADER], [
   m4_pushdef([gl_header_name], AS_TR_SH(m4_toupper($1)))
   m4_pushdef([gl_generate_var], [GL_GENERATE_]AS_TR_SH(m4_toupper($1)))
   m4_pushdef([gl_generate_cond], [GL_GENERATE_]AS_TR_SH(m4_toupper($1)))
@@ -1725,11 +1722,11 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
   m4_popdef([gl_generate_var])
   m4_popdef([gl_header_name])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:1016: -1- AC_DEFUN([GL_MDA_DEFINES], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:1016: -1- AC_DEFUN([GL_MDA_DEFINES], [
 AC_REQUIRE([_GL_MDA_DEFINES])
 [$gl_mda_defines]
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:1020: -1- AC_DEFUN([_GL_MDA_DEFINES], [gl_mda_defines='
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/gnulib-common.m4:1020: -1- AC_DEFUN([_GL_MDA_DEFINES], [gl_mda_defines='
 #if defined _WIN32 && !defined __CYGWIN__
 #define access    _access
 #define chdir     _chdir
@@ -1784,163 +1781,10 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/g
 #endif
 '
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-ld.m4:12: -1- AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/lib-ld.m4:27: -1- AC_DEFUN([AC_LIB_PROG_LD], [AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-        [assume the C compiler uses GNU ld [default=no]])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-if test -n "$LD"; then
-  AC_MSG_CHECKING([for ld])
-elif test "$GCC" = yes; then
-  AC_MSG_CHECKING([for ld used by $CC])
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-if test -n "$LD"; then
-  # Let the user override the test with a path.
-  :
-else
-  AC_CACHE_VAL([acl_cv_path_LD],
-  [
-    acl_cv_path_LD= # Final result of this test
-    ac_prog=ld # Program to search in $PATH
-    if test "$GCC" = yes; then
-      # Check if gcc -print-prog-name=ld gives a path.
-      case $host in
-        *-*-mingw*)
-          # gcc leaves a trailing carriage return which upsets mingw
-          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-        *)
-          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
-      esac
-      case $acl_output in
-        # Accept absolute paths.
-        [[\\/]]* | ?:[[\\/]]*)
-          re_direlt='/[[^/]][[^/]]*/\.\./'
-          # Canonicalize the pathname of ld
-          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
-          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
-            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
-          done
-          # Got the pathname. No search in PATH is needed.
-          acl_cv_path_LD="$acl_output"
-          ac_prog=
-          ;;
-        "")
-          # If it fails, then pretend we aren't using GCC.
-          ;;
-        *)
-          # If it is relative, then search for the first ld in PATH.
-          with_gnu_ld=unknown
-          ;;
-      esac
-    fi
-    if test -n "$ac_prog"; then
-      # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-      for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
-        test -z "$ac_dir" && ac_dir=.
-        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-          acl_cv_path_LD="$ac_dir/$ac_prog"
-          # Check to see if the program is GNU ld.  I'd rather use --version,
-          # but apparently some variants of GNU ld only accept -v.
-          # Break only if it was the GNU/non-GNU ld that we prefer.
-          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-            *GNU* | *'with BFD'*)
-              test "$with_gnu_ld" != no && break
-              ;;
-            *)
-              test "$with_gnu_ld" != yes && break
-              ;;
-          esac
-        fi
-      done
-      IFS="$acl_save_ifs"
-    fi
-    case $host in
-      *-*-aix*)
-        AC_COMPILE_IFELSE(
-          [AC_LANG_SOURCE(
-             [[#if defined __powerpc64__ || defined __LP64__
-                int ok;
-               #else
-                error fail
-               #endif
-             ]])],
-          [# The compiler produces 64-bit code. Add option '-b64' so that the
-           # linker groks 64-bit object files.
-           case "$acl_cv_path_LD " in
-             *" -b64 "*) ;;
-             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
-           esac
-          ], [])
-        ;;
-      sparc64-*-netbsd*)
-        AC_COMPILE_IFELSE(
-          [AC_LANG_SOURCE(
-             [[#if defined __sparcv9 || defined __arch64__
-                int ok;
-               #else
-                error fail
-               #endif
-             ]])],
-          [],
-          [# The compiler produces 32-bit code. Add option '-m elf32_sparc'
-           # so that the linker groks 32-bit object files.
-           case "$acl_cv_path_LD " in
-             *" -m elf32_sparc "*) ;;
-             *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
-           esac
-          ])
-        ;;
-    esac
-  ])
-  LD="$acl_cv_path_LD"
-fi
-if test -n "$LD"; then
-  AC_MSG_RESULT([$LD])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([no acceptable ld found in \$PATH])
-fi
-AC_LIB_PROG_LD_GNU
-])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:10: -1- AC_DEFUN([gl_RELOCATABLE_LIBRARY], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:10: -1- AC_DEFUN([gl_RELOCATABLE_LIBRARY], [
   AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:14: -1- AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:14: -1- AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], [
   AC_REQUIRE([gl_RELOCATABLE_NOP])
   dnl Easier to put this here once, instead of into the DEFS of each Makefile.
   if test "X$prefix" = "XNONE"; then
@@ -1956,7 +1800,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/r
        system.])
   fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:33: -1- AC_DEFUN([gl_RELOCATABLE_NOP], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable-lib.m4:33: -1- AC_DEFUN([gl_RELOCATABLE_NOP], [
   AC_MSG_CHECKING([whether to activate relocatable installation])
   AC_ARG_ENABLE([relocatable],
     [AS_HELP_STRING([--enable-relocatable],
@@ -1970,14 +1814,14 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/r
   AC_SUBST([RELOCATABLE])
   AC_MSG_RESULT([$RELOCATABLE])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable.m4:13: -1- AC_DEFUN([gl_RELOCATABLE], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable.m4:13: -1- AC_DEFUN([gl_RELOCATABLE], [
   AC_REQUIRE([gl_RELOCATABLE_BODY])
   gl_RELOCATABLE_LIBRARY
   : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
   RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
   RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable.m4:22: -1- AC_DEFUN([gl_RELOCATABLE_BODY], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable.m4:22: -1- AC_DEFUN([gl_RELOCATABLE_BODY], [
   AC_REQUIRE([AC_PROG_INSTALL])
 
   dnl This AC_BEFORE invocation leads to unjustified autoconf warnings
@@ -2098,7 +1942,7 @@ changequote([,])dnl
   RELOCATABLE_STRIP=':'
   AC_SUBST([RELOCATABLE_STRIP])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/relocatable.m4:147: -1- AC_DEFUN([AC_LIB_LIBPATH], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/relocatable.m4:147: -1- AC_DEFUN([AC_LIB_LIBPATH], [
   AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD
   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
   AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
@@ -2111,7 +1955,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/r
   ])
   shlibpath_var="$acl_cv_shlibpath_var"
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/visibility.m4:23: -1- AC_DEFUN([gl_VISIBILITY], [
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/visibility.m4:23: -1- AC_DEFUN([gl_VISIBILITY], [
   AC_REQUIRE([AC_PROG_CC])
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
@@ -2170,8 +2014,161 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/v
   AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
     [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/srcm4/zzgnulib.m4:23: -1- AC_DEFUN([gl_ZZGNULIB])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:62: -1- AC_DEFUN([LT_INIT], [AC_PREREQ([2.64])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/srcm4/zzgnulib.m4:23: -1- AC_DEFUN([gl_ZZGNULIB])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-ld.m4:14: -1- AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes
+  ;;
+*)
+  acl_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lib-ld.m4:29: -1- AC_DEFUN([AC_LIB_PROG_LD], [AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([[--with-gnu-ld]],
+        [assume the C compiler uses GNU ld [default=no]])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+if test -n "$LD"; then
+  AC_MSG_CHECKING([for ld])
+elif test "$GCC" = yes; then
+  AC_MSG_CHECKING([for ld used by $CC])
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+if test -n "$LD"; then
+  # Let the user override the test with a path.
+  :
+else
+  AC_CACHE_VAL([acl_cv_path_LD],
+  [
+    acl_cv_path_LD= # Final result of this test
+    ac_prog=ld # Program to search in $PATH
+    if test "$GCC" = yes; then
+      # Check if gcc -print-prog-name=ld gives a path.
+      case $host in
+        *-*-mingw* | windows*)
+          # gcc leaves a trailing carriage return which upsets mingw
+          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+        *)
+          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
+      esac
+      case $acl_output in
+        # Accept absolute paths.
+        [[\\/]]* | ?:[[\\/]]*)
+          re_direlt='/[[^/]][[^/]]*/\.\./'
+          # Canonicalize the pathname of ld
+          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
+          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
+            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
+          done
+          # Got the pathname. No search in PATH is needed.
+          acl_cv_path_LD="$acl_output"
+          ac_prog=
+          ;;
+        "")
+          # If it fails, then pretend we aren't using GCC.
+          ;;
+        *)
+          # If it is relative, then search for the first ld in PATH.
+          with_gnu_ld=unknown
+          ;;
+      esac
+    fi
+    if test -n "$ac_prog"; then
+      # Search for $ac_prog in $PATH.
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
+      for ac_dir in $PATH; do
+        IFS="$acl_saved_IFS"
+        test -z "$ac_dir" && ac_dir=.
+        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+          acl_cv_path_LD="$ac_dir/$ac_prog"
+          # Check to see if the program is GNU ld.  I'd rather use --version,
+          # but apparently some variants of GNU ld only accept -v.
+          # Break only if it was the GNU/non-GNU ld that we prefer.
+          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+            *GNU* | *'with BFD'*)
+              test "$with_gnu_ld" != no && break
+              ;;
+            *)
+              test "$with_gnu_ld" != yes && break
+              ;;
+          esac
+        fi
+      done
+      IFS="$acl_saved_IFS"
+    fi
+    case $host in
+      *-*-aix*)
+        AC_COMPILE_IFELSE(
+          [AC_LANG_SOURCE(
+             [[#if defined __powerpc64__ || defined __LP64__
+                int ok;
+               #else
+                error fail
+               #endif
+             ]])],
+          [# The compiler produces 64-bit code. Add option '-b64' so that the
+           # linker groks 64-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -b64 "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
+           esac
+          ], [])
+        ;;
+      sparc64-*-netbsd*)
+        AC_COMPILE_IFELSE(
+          [AC_LANG_SOURCE(
+             [[#if defined __sparcv9 || defined __arch64__
+                int ok;
+               #else
+                error fail
+               #endif
+             ]])],
+          [],
+          [# The compiler produces 32-bit code. Add option '-m elf32_sparc'
+           # so that the linker groks 32-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -m elf32_sparc "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
+           esac
+          ])
+        ;;
+    esac
+  ])
+  LD="$acl_cv_path_LD"
+fi
+if test -n "$LD"; then
+  AC_MSG_RESULT([$LD])
+else
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([no acceptable ld found in \$PATH])
+fi
+AC_LIB_PROG_LD_GNU
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:62: -1- AC_DEFUN([LT_INIT], [AC_PREREQ([2.64])dnl We use AC_PATH_PROGS_FEATURE_CHECK
 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -2206,15 +2203,15 @@ _LT_SETUP
 # Only expand once:
 m4_define([LT_INIT])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:100: -1- AU_DEFUN([AC_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:100: -1- AC_DEFUN([AC_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AC_PROG_LIBTOOL' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:100: -1- AU_DEFUN([AC_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:100: -1- AC_DEFUN([AC_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AC_PROG_LIBTOOL' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_INIT], [LT_INIT($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:101: -1- AU_DEFUN([AM_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:101: -1- AC_DEFUN([AM_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AM_PROG_LIBTOOL' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:101: -1- AU_DEFUN([AM_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:101: -1- AC_DEFUN([AM_PROG_LIBTOOL], [m4_warn([obsolete], [The macro 'AM_PROG_LIBTOOL' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_INIT], [LT_INIT($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:621: -1- AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt}
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:702: -1- AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
 _LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
 [# Run this file to recreate a libtool stub with the current configuration.])
@@ -2246,7 +2243,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2024 Free Software Foundation, Inc.
+Copyright (C) 2025-2026 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -2299,11 +2296,14 @@ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
 exec AS_MESSAGE_LOG_FD>>config.log
 $lt_cl_success || AS_EXIT(1)
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:813: -1- AC_DEFUN([LT_SUPPORTED_TAG], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:824: -1- AC_DEFUN([LT_LANG], [AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:894: -1- AC_DEFUN([LT_SUPPORTED_TAG], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:905: -1- AC_DEFUN([LT_LANG], [AC_BEFORE([$0], [LT_OUTPUT])dnl
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Objective-C],		[_LT_LANG(OBJC)],
+  [Objective-C++],	[_LT_LANG(OBJCXX)],
+  [Microsoft Macro Assembler],  [_LT_LANG(ML64)],
   [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
@@ -2313,27 +2313,27 @@ m4_case([$1],
     [_LT_LANG($1)],
     [m4_fatal([$0: unsupported language: "$1"])])])dnl
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:916: -1- AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:916: -1- AC_DEFUN([AC_LIBTOOL_CXX], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_CXX' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1035: -1- AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1035: -1- AC_DEFUN([AC_LIBTOOL_CXX], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_CXX' is obsolete.
 You should run autoupdate.])dnl
 LT_LANG(C++)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:917: -1- AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:917: -1- AC_DEFUN([AC_LIBTOOL_F77], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_F77' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1036: -1- AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1036: -1- AC_DEFUN([AC_LIBTOOL_F77], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_F77' is obsolete.
 You should run autoupdate.])dnl
 LT_LANG(Fortran 77)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:918: -1- AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:918: -1- AC_DEFUN([AC_LIBTOOL_FC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_FC' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1037: -1- AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1037: -1- AC_DEFUN([AC_LIBTOOL_FC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_FC' is obsolete.
 You should run autoupdate.])dnl
 LT_LANG(Fortran)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:919: -1- AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:919: -1- AC_DEFUN([AC_LIBTOOL_GCJ], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_GCJ' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1038: -1- AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1038: -1- AC_DEFUN([AC_LIBTOOL_GCJ], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_GCJ' is obsolete.
 You should run autoupdate.])dnl
 LT_LANG(Java)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:920: -1- AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:920: -1- AC_DEFUN([AC_LIBTOOL_RC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_RC' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1039: -1- AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1039: -1- AC_DEFUN([AC_LIBTOOL_RC], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_RC' is obsolete.
 You should run autoupdate.])dnl
 LT_LANG(Windows Resource)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1278: -1- AC_DEFUN([_LT_WITH_SYSROOT], [m4_require([_LT_DECL_SED])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1397: -1- AC_DEFUN([_LT_WITH_SYSROOT], [m4_require([_LT_DECL_SED])dnl
 AC_MSG_CHECKING([for sysroot])
 AC_ARG_WITH([sysroot],
 [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
@@ -2366,7 +2366,7 @@ esac
  AC_MSG_RESULT([${lt_sysroot:-no}])
 _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
 [dependent libraries, and where our libraries should be installed.])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1618: -1- AC_DEFUN([_LT_COMPILER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1737: -1- AC_DEFUN([_LT_COMPILER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_SED])dnl
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
@@ -2390,9 +2390,9 @@ AC_CACHE_CHECK([$1], [$2],
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
@@ -2405,11 +2405,11 @@ else
     m4_if([$6], , :, [$6])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1660: -1- AU_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1660: -1- AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_COMPILER_OPTION' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1779: -1- AU_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1779: -1- AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_COMPILER_OPTION' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1669: -1- AC_DEFUN([_LT_LINKER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1788: -1- AC_DEFUN([_LT_LINKER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_SED])dnl
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
@@ -2422,9 +2422,9 @@ AC_CACHE_CHECK([$1], [$2],
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          $2=yes
        fi
      else
@@ -2441,11 +2441,11 @@ else
     m4_if([$5], , :, [$5])
 fi
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1704: -1- AU_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1704: -1- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_LINKER_OPTION' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1823: -1- AU_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1823: -1- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_LINKER_OPTION' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1711: -1- AC_DEFUN([LT_CMD_MAX_LEN], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1830: -1- AC_DEFUN([LT_CMD_MAX_LEN], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 # find the maximum length of command line arguments
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
@@ -2461,9 +2461,9 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required 
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -2581,11 +2581,11 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 _LT_DECL([], [max_cmd_len], [0],
     [What is the maximum length of a command?])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1850: -1- AU_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1850: -1- AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_SYS_MAX_CMD_LEN' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1969: -1- AU_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:1969: -1- AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_SYS_MAX_CMD_LEN' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:1961: -1- AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:2080: -1- AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl
 if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
@@ -2707,11 +2707,11 @@ _LT_DECL([dlopen_self], [enable_dlopen_self], [0],
 _LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
 	 [Whether dlopen of statically linked programs is supported])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:2086: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:2086: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN_SELF' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:2205: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:2205: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN_SELF' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3296: -1- AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3412: -1- AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl
 AC_MSG_CHECKING([for $1])
 AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 [case $MAGIC_CMD in
@@ -2770,11 +2770,11 @@ fi
 _LT_DECL([], [MAGIC_CMD], [0],
 	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3358: -1- AU_DEFUN([AC_PATH_TOOL_PREFIX], [m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3358: -1- AC_DEFUN([AC_PATH_TOOL_PREFIX], [m4_warn([obsolete], [The macro 'AC_PATH_TOOL_PREFIX' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3474: -1- AU_DEFUN([AC_PATH_TOOL_PREFIX], [m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3474: -1- AC_DEFUN([AC_PATH_TOOL_PREFIX], [m4_warn([obsolete], [The macro 'AC_PATH_TOOL_PREFIX' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3381: -1- AC_DEFUN([LT_PATH_LD], [AC_REQUIRE([AC_PROG_CC])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3497: -1- AC_DEFUN([LT_PATH_LD], [AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -2860,15 +2860,15 @@ AC_SUBST([LD])
 
 _LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3470: -1- AU_DEFUN([AM_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3470: -1- AC_DEFUN([AM_PROG_LD], [m4_warn([obsolete], [The macro 'AM_PROG_LD' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3586: -1- AU_DEFUN([AM_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3586: -1- AC_DEFUN([AM_PROG_LD], [m4_warn([obsolete], [The macro 'AM_PROG_LD' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3471: -1- AU_DEFUN([AC_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3471: -1- AC_DEFUN([AC_PROG_LD], [m4_warn([obsolete], [The macro 'AC_PROG_LD' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3587: -1- AU_DEFUN([AC_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3587: -1- AC_DEFUN([AC_PROG_LD], [m4_warn([obsolete], [The macro 'AC_PROG_LD' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3811: -1- AC_DEFUN([LT_PATH_NM], [AC_REQUIRE([AC_PROG_CC])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:3923: -1- AC_DEFUN([LT_PATH_NM], [AC_REQUIRE([AC_PROG_CC])dnl
 AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
@@ -2960,15 +2960,15 @@ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
   fi
   rm -f conftest*])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3906: -1- AU_DEFUN([AM_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3906: -1- AC_DEFUN([AM_PROG_NM], [m4_warn([obsolete], [The macro 'AM_PROG_NM' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4018: -1- AU_DEFUN([AM_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4018: -1- AC_DEFUN([AM_PROG_NM], [m4_warn([obsolete], [The macro 'AM_PROG_NM' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3907: -1- AU_DEFUN([AC_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3907: -1- AC_DEFUN([AC_PROG_NM], [m4_warn([obsolete], [The macro 'AC_PROG_NM' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4019: -1- AU_DEFUN([AC_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4019: -1- AC_DEFUN([AC_PROG_NM], [m4_warn([obsolete], [The macro 'AC_PROG_NM' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3978: -1- AC_DEFUN([_LT_DLL_DEF_P], [dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4090: -1- AC_DEFUN([_LT_DLL_DEF_P], [dnl
   test DEF = "`$SED -n dnl
     -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
     -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
@@ -2976,7 +2976,7 @@ m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libt
     -e q dnl                          Only consider the first "real" line
     $1`" dnl
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:3992: -1- AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4104: -1- AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
 *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
@@ -2992,48 +2992,64 @@ case $host in
 esac
 AC_SUBST([LIBM])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:4011: -1- AU_DEFUN([AC_CHECK_LIBM], [m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:4011: -1- AC_DEFUN([AC_CHECK_LIBM], [m4_warn([obsolete], [The macro 'AC_CHECK_LIBM' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4123: -1- AU_DEFUN([AC_CHECK_LIBM], [m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:4123: -1- AC_DEFUN([AC_CHECK_LIBM], [m4_warn([obsolete], [The macro 'AC_CHECK_LIBM' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8336: -1- AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8677: -1- AC_DEFUN([LT_PROG_ML64], [AC_CHECK_TOOL(ML64, ml64,)
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8684: -1- AC_DEFUN([LT_PROG_OBJC], [AC_CHECK_TOOL(OBJC, gcc,)
+  AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,)
+  if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
+    test set = "${OBJCFLAGS+set}" || OBJCFLAGS="`gnustep-config --objc-flags`"
+  fi
+  AC_SUBST(OBJCFLAGS)[]dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8695: -1- AC_DEFUN([LT_PROG_OBJCXX], [AC_CHECK_TOOL(OBJCXX, g++,)
+  AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,)
+  if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
+    test set = "${OBJCXXFLAGS+set}" || OBJCXXFLAGS="`gnustep-config --objc-flags`"
+  fi
+  AC_SUBST(OBJCXXFLAGS)[]dnl
+])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8706: -1- AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
   [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
     [AC_CHECK_TOOL(GCJ, gcj,)
       test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
       AC_SUBST(GCJFLAGS)])])[]dnl
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8345: -1- AU_DEFUN([LT_AC_PROG_GCJ], [m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8345: -1- AC_DEFUN([LT_AC_PROG_GCJ], [m4_warn([obsolete], [The macro 'LT_AC_PROG_GCJ' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8715: -1- AU_DEFUN([LT_AC_PROG_GCJ], [m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8715: -1- AC_DEFUN([LT_AC_PROG_GCJ], [m4_warn([obsolete], [The macro 'LT_AC_PROG_GCJ' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8352: -1- AC_DEFUN([LT_PROG_GO], [AC_CHECK_TOOL(GOC, gccgo,)
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8722: -1- AC_DEFUN([LT_PROG_GO], [AC_CHECK_TOOL(GOC, gccgo,)
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8359: -1- AC_DEFUN([LT_PROG_RC], [AC_CHECK_TOOL(RC, windres,)
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8729: -1- AC_DEFUN([LT_PROG_RC], [AC_CHECK_TOOL(RC, windres,)
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8364: -1- AU_DEFUN([LT_AC_PROG_RC], [m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])], [], [])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/libtool.m4:8364: -1- AC_DEFUN([LT_AC_PROG_RC], [m4_warn([obsolete], [The macro 'LT_AC_PROG_RC' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8734: -1- AU_DEFUN([LT_AC_PROG_RC], [m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])], [], [])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/libtool.m4:8734: -1- AC_DEFUN([LT_AC_PROG_RC], [m4_warn([obsolete], [The macro 'LT_AC_PROG_RC' is obsolete.
 You should run autoupdate.])dnl
 m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:14: -1- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:113: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:14: -1- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:113: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the 'dlopen' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:113: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:113: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_DLOPEN' is obsolete.
 You should run autoupdate.])dnl
 _LT_SET_OPTION([LT_INIT], [dlopen])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the 'dlopen' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:148: -1- AU_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:148: -1- AU_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 _LT_SET_OPTION([LT_INIT], [win32-dll])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the 'win32-dll' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:148: -1- AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_WIN32_DLL' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:148: -1- AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_WIN32_DLL' is obsolete.
 You should run autoupdate.])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 _LT_SET_OPTION([LT_INIT], [win32-dll])
@@ -3041,124 +3057,124 @@ AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the 'win32-dll' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:197: -1- AC_DEFUN([AC_ENABLE_SHARED], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:197: -1- AC_DEFUN([AC_ENABLE_SHARED], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:201: -1- AC_DEFUN([AC_DISABLE_SHARED], [_LT_SET_OPTION([LT_INIT], [disable-shared])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:201: -1- AC_DEFUN([AC_DISABLE_SHARED], [_LT_SET_OPTION([LT_INIT], [disable-shared])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:205: -1- AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:205: -1- AC_DEFUN([AM_ENABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_ENABLE_SHARED' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:205: -1- AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:205: -1- AC_DEFUN([AM_ENABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_ENABLE_SHARED' is obsolete.
 You should run autoupdate.])dnl
 AC_ENABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:206: -1- AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:206: -1- AC_DEFUN([AM_DISABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_DISABLE_SHARED' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:206: -1- AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:206: -1- AC_DEFUN([AM_DISABLE_SHARED], [m4_warn([obsolete], [The macro 'AM_DISABLE_SHARED' is obsolete.
 You should run autoupdate.])dnl
 AC_DISABLE_SHARED($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:251: -1- AC_DEFUN([AC_ENABLE_STATIC], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:251: -1- AC_DEFUN([AC_ENABLE_STATIC], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:255: -1- AC_DEFUN([AC_DISABLE_STATIC], [_LT_SET_OPTION([LT_INIT], [disable-static])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:255: -1- AC_DEFUN([AC_DISABLE_STATIC], [_LT_SET_OPTION([LT_INIT], [disable-static])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:259: -1- AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:259: -1- AC_DEFUN([AM_ENABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_ENABLE_STATIC' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:259: -1- AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:259: -1- AC_DEFUN([AM_ENABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_ENABLE_STATIC' is obsolete.
 You should run autoupdate.])dnl
 AC_ENABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:260: -1- AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:260: -1- AC_DEFUN([AM_DISABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_DISABLE_STATIC' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:260: -1- AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:260: -1- AC_DEFUN([AM_DISABLE_STATIC], [m4_warn([obsolete], [The macro 'AM_DISABLE_STATIC' is obsolete.
 You should run autoupdate.])dnl
 AC_DISABLE_STATIC($@)])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:305: -1- AU_DEFUN([AC_ENABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:305: -1- AU_DEFUN([AC_ENABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
 the 'fast-install' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:305: -1- AC_DEFUN([AC_ENABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_ENABLE_FAST_INSTALL' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:305: -1- AC_DEFUN([AC_ENABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_ENABLE_FAST_INSTALL' is obsolete.
 You should run autoupdate.])dnl
 _LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
 the 'fast-install' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:312: -1- AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:312: -1- AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
 the 'disable-fast-install' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:312: -1- AC_DEFUN([AC_DISABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_DISABLE_FAST_INSTALL' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:312: -1- AC_DEFUN([AC_DISABLE_FAST_INSTALL], [m4_warn([obsolete], [The macro 'AC_DISABLE_FAST_INSTALL' is obsolete.
 You should run autoupdate.])dnl
 _LT_SET_OPTION([LT_INIT], [disable-fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
 the 'disable-fast-install' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:411: -1- AU_DEFUN([AC_LIBTOOL_PICMODE], [_LT_SET_OPTION([LT_INIT], [pic-only])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:411: -1- AU_DEFUN([AC_LIBTOOL_PICMODE], [_LT_SET_OPTION([LT_INIT], [pic-only])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the 'pic-only' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltoptions.m4:411: -1- AC_DEFUN([AC_LIBTOOL_PICMODE], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_PICMODE' is obsolete.
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltoptions.m4:411: -1- AC_DEFUN([AC_LIBTOOL_PICMODE], [m4_warn([obsolete], [The macro 'AC_LIBTOOL_PICMODE' is obsolete.
 You should run autoupdate.])dnl
 _LT_SET_OPTION([LT_INIT], [pic-only])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the 'pic-only' option into LT_INIT's first parameter.])
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltsugar.m4:14: -1- AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/ltversion.m4:19: -1- AC_DEFUN([LTVERSION_VERSION], [macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltsugar.m4:14: -1- AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/ltversion.m4:19: -1- AC_DEFUN([LTVERSION_VERSION], [macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:37: -1- AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:41: -1- AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:42: -1- AC_DEFUN([_LT_AC_SHELL_INIT])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:43: -1- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:45: -1- AC_DEFUN([_LT_AC_TAGVAR])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:46: -1- AC_DEFUN([AC_LTDL_ENABLE_INSTALL])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:47: -1- AC_DEFUN([AC_LTDL_PREOPEN])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:48: -1- AC_DEFUN([_LT_AC_SYS_COMPILER])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:49: -1- AC_DEFUN([_LT_AC_LOCK])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:50: -1- AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:51: -1- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:52: -1- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:53: -1- AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:54: -1- AC_DEFUN([AC_LIBTOOL_OBJDIR])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:55: -1- AC_DEFUN([AC_LTDL_OBJDIR])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:56: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:57: -1- AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:58: -1- AC_DEFUN([AC_PATH_MAGIC])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:59: -1- AC_DEFUN([AC_PROG_LD_GNU])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:60: -1- AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:61: -1- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:62: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:63: -1- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:64: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:65: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:66: -1- AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:67: -1- AC_DEFUN([LT_AC_PROG_EGREP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:68: -1- AC_DEFUN([LT_AC_PROG_SED])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:72: -1- AC_DEFUN([_AC_PROG_LIBTOOL])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:73: -1- AC_DEFUN([AC_LIBTOOL_SETUP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:74: -1- AC_DEFUN([_LT_AC_CHECK_DLFCN])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:75: -1- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:76: -1- AC_DEFUN([_LT_AC_TAGCONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:78: -1- AC_DEFUN([_LT_AC_LANG_CXX])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:79: -1- AC_DEFUN([_LT_AC_LANG_F77])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:80: -1- AC_DEFUN([_LT_AC_LANG_GCJ])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:81: -1- AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:82: -1- AC_DEFUN([_LT_AC_LANG_C_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:83: -1- AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:84: -1- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:85: -1- AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:86: -1- AC_DEFUN([_LT_AC_LANG_F77_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:87: -1- AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:88: -1- AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:89: -1- AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:90: -1- AC_DEFUN([_LT_AC_LANG_RC_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:91: -1- AC_DEFUN([AC_LIBTOOL_CONFIG])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:92: -1- AC_DEFUN([_LT_AC_FILE_LTDLL_C])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:94: -1- AC_DEFUN([_LT_AC_PROG_CXXCPP])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:97: -1- AC_DEFUN([_LT_PROG_F77])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:98: -1- AC_DEFUN([_LT_PROG_FC])
-m4trace:/mnt/data/homes/kellito/Builds/rbos/recipes/libs/libiconv/source/m4/lt~obsolete.m4:99: -1- AC_DEFUN([_LT_PROG_CXX])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:37: -1- AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:41: -1- AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:42: -1- AC_DEFUN([_LT_AC_SHELL_INIT])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:43: -1- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:45: -1- AC_DEFUN([_LT_AC_TAGVAR])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:46: -1- AC_DEFUN([AC_LTDL_ENABLE_INSTALL])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:47: -1- AC_DEFUN([AC_LTDL_PREOPEN])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:48: -1- AC_DEFUN([_LT_AC_SYS_COMPILER])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:49: -1- AC_DEFUN([_LT_AC_LOCK])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:50: -1- AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:51: -1- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:52: -1- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:53: -1- AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:54: -1- AC_DEFUN([AC_LIBTOOL_OBJDIR])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:55: -1- AC_DEFUN([AC_LTDL_OBJDIR])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:56: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:57: -1- AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:58: -1- AC_DEFUN([AC_PATH_MAGIC])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:59: -1- AC_DEFUN([AC_PROG_LD_GNU])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:60: -1- AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:61: -1- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:62: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:63: -1- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:64: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:65: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:66: -1- AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:67: -1- AC_DEFUN([LT_AC_PROG_EGREP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:68: -1- AC_DEFUN([LT_AC_PROG_SED])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:72: -1- AC_DEFUN([_AC_PROG_LIBTOOL])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:73: -1- AC_DEFUN([AC_LIBTOOL_SETUP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:74: -1- AC_DEFUN([_LT_AC_CHECK_DLFCN])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:75: -1- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:76: -1- AC_DEFUN([_LT_AC_TAGCONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:78: -1- AC_DEFUN([_LT_AC_LANG_CXX])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:79: -1- AC_DEFUN([_LT_AC_LANG_F77])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:80: -1- AC_DEFUN([_LT_AC_LANG_GCJ])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:81: -1- AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:82: -1- AC_DEFUN([_LT_AC_LANG_C_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:83: -1- AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:84: -1- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:85: -1- AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:86: -1- AC_DEFUN([_LT_AC_LANG_F77_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:87: -1- AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:88: -1- AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:89: -1- AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:90: -1- AC_DEFUN([_LT_AC_LANG_RC_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:91: -1- AC_DEFUN([AC_LIBTOOL_CONFIG])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:92: -1- AC_DEFUN([_LT_AC_FILE_LTDLL_C])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:94: -1- AC_DEFUN([_LT_AC_PROG_CXXCPP])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:97: -1- AC_DEFUN([_LT_PROG_F77])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:98: -1- AC_DEFUN([_LT_PROG_FC])
+m4trace:/home/kellito/Builds/RedBear-OS/recipes/libs/libiconv/source/m4/lt~obsolete.m4:99: -1- AC_DEFUN([_LT_PROG_CXX])
 m4trace:configure.ac:19: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:19: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:19: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section 'AC_LIBOBJ vs LIBOBJS'])
@@ -3204,13 +3220,13 @@ m4trace:configure.ac:19: -1- m4_pattern_allow([^PACKAGE_STRING$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^PACKAGE_URL$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_T$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^LIBS$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^build_alias$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^host_alias$])
 m4trace:configure.ac:19: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^ECHO_T$])
 m4trace:configure.ac:23: -1- m4_pattern_allow([^SET_MAKE$])
 m4trace:configure.ac:27: -1- AC_PROG_CC
 m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
@@ -3279,6 +3295,7 @@ m4trace:configure.ac:41: -1- AC_DEFUN([_AC_Header_minix_config_h], [m4_divert_te
   [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
   [" minix/config.h ]AS_TR_SH([minix/config.h]) AS_TR_CPP([HAVE_minix/config.h])["])])_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])
 m4trace:configure.ac:41: -1- m4_pattern_allow([^_ALL_SOURCE$])
+m4trace:configure.ac:41: -1- m4_pattern_allow([^_COSMO_SOURCE$])
 m4trace:configure.ac:41: -1- m4_pattern_allow([^_DARWIN_C_SOURCE$])
 m4trace:configure.ac:41: -1- m4_pattern_allow([^_GNU_SOURCE$])
 m4trace:configure.ac:41: -1- m4_pattern_allow([^_HPUX_ALT_XOPEN_SOCKET_API$])
diff --git a/recipes/libs/libiconv/source/libcharset/build-aux/ltmain.sh b/recipes/libs/libiconv/source/libcharset/build-aux/ltmain.sh
index b1ba2d3b02..f2abcc80d1 100644
--- a/recipes/libs/libiconv/source/libcharset/build-aux/ltmain.sh
+++ b/recipes/libs/libiconv/source/libcharset/build-aux/ltmain.sh
@@ -2,11 +2,11 @@
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
 ##               by inline-source v2019-02-19.15
 
-# libtool (GNU libtool) 2.6.0
+# libtool (GNU libtool) 2.6.0.23-b08cb
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2019, 2021-2025 Free Software Foundation, Inc.
+# Copyright (C) 1996-2019, 2021-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.6.0
-package_revision=2.6.0
+VERSION=2.6.0.23-b08cb
+package_revision=2.6.0.23
 
 
 ## ------ ##
@@ -2215,7 +2215,7 @@ func_version ()
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.6.0'
+scriptversion='(GNU libtool) 2.6.0.23-b08cb'
 
 # func_version
 # ------------
@@ -3204,11 +3204,11 @@ func_convert_core_msys_to_w32_with_cygpath ()
 
   # Since MSYS2 is packaged with cygpath, call cygpath in $PATH; no need
   # to use LT_CYGPATH in this case.
-  func_convert_core_msys_to_w32_result=`cygpath "$@" 2>/dev/null |
+  func_convert_core_msys_to_w32_with_cygpath_result=`cygpath "$@" 2>/dev/null |
 	$SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
   if test "$?" -ne 0; then
       # on failure, ensure result is empty
-      func_convert_core_msys_to_w32_result=
+      func_convert_core_msys_to_w32_with_cygpath_result=
   fi
 }
 #end: func_convert_core_msys_to_w32_with_cygpath
@@ -5655,7 +5655,7 @@ func_extract_archives ()
 	    $RM -rf unfat-$$
 	    cd "$darwin_orig_dir"
 	  else
-	    cd $darwin_orig_dir
+	    cd "$darwin_orig_dir"
 	    func_extract_an_archive "$my_xdir" "$my_xabs"
 	  fi # $darwin_arches
 	} # !$opt_dry_run
@@ -6988,7 +6988,15 @@ func_mode_link ()
       # even a static library is built.  For now, we need to specify
       # -no-undefined on the libtool link line when we can be certain
       # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
+      case $host in
+      *-*-os2*)
+        # OS/2 does not allow undefined symbols at all when linking a dll.
+        allow_undefined=no
+        ;;
+      *)
+        allow_undefined=yes
+        ;;
+      esac
       ;;
     *)
       allow_undefined=yes
@@ -7060,7 +7068,7 @@ func_mode_link ()
 	build_old_libs=no
 	break
 	;;
-      -all-static | -static | -static-libtool-libs)
+      -all-static | -static | -static-libtool-libs | --static | -Bstatic)
 	case $arg in
 	-all-static)
 	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
@@ -7077,7 +7085,7 @@ func_mode_link ()
 	  fi
 	  prefer_static_libs=built
 	  ;;
-	-static-libtool-libs)
+	-static-libtool-libs | --static | -Bstatic)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
@@ -7094,6 +7102,16 @@ func_mode_link ()
     # See if our shared archives depend on static archives.
     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 
+    # make sure "-Xpreprocessor -fopenmp" is processed as one token
+    case $@ in
+    *-Xpreprocessor\ -fopenmp*)
+      fopenmp_match="-Xpreprocessor -fopenmp"
+      ;;
+    *)
+      fopenmp_match=-fopenmp
+      ;;
+    esac
+
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
       arg=$1
@@ -7583,7 +7601,7 @@ func_mode_link ()
 	continue
 	;;
       -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+      |-threads|$fopenmp_match|fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -7810,6 +7828,7 @@ func_mode_link ()
       # -fuse-ld=*           Linker select flags for GCC
       # -static-*            direct GCC to link specific libraries statically
       # -fcilkplus           Cilk Plus language extension features for C/C++
+      # -resource-dir=*      for selecting compiler resource directory with clang
       # -rtlib=*             select c runtime lib with clang
       # --unwindlib=*        select unwinder library with clang
       # -f{file|debug|macro|profile}-prefix-map=* needed for lto linking
@@ -7818,7 +7837,7 @@ func_mode_link ()
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*|--target=*| \
       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-no-canonical-prefixes| \
-      -stdlib=*|-rtlib=*|--unwindlib=*| \
+      -stdlib=*|-resource-dir=*|-rtlib=*|--unwindlib=*| \
       -specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \
       -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \
       -fdiagnostics-color*|-frecord-gcc-switches| \
@@ -7944,8 +7963,8 @@ func_mode_link ()
 	fi
 	;;
 
-      *.$libext)
-	# An archive.
+      *.$libext|*.so)
+	# An archive or an explicit shared library.
 	func_append deplibs " $arg"
 	func_append old_deplibs " $arg"
 	continue
@@ -8173,7 +8192,7 @@ func_mode_link ()
        continue
        ;;
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+        |-threads|$fopenmp_match|fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -8323,6 +8342,25 @@ func_mode_link ()
 	  func_resolve_sysroot "$deplib"
 	  lib=$func_resolve_sysroot_result
 	  ;;
+	 *.so)
+	   case $linkmode,$pass in
+	     lib,*)
+	       deplibs="$deplib $deplibs"
+	       newdependency_libs="$deplib $newdependency_libs"
+	       ;;
+	     prog,link)
+	       compile_deplibs="$deplib $compile_deplibs"
+	       finalize_deplibs="$deplib $finalize_deplibs"
+	       ;;
+	     prog,*)
+	       deplibs="$deplib $deplibs"
+	       ;;
+	     *)
+	       func_warning "'$deplib' is ignored for archives/objects"
+	       ;;
+	   esac
+	   continue
+	   ;;
 	*.$libext)
 	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
diff --git a/recipes/libs/libiconv/source/libcharset/configure b/recipes/libs/libiconv/source/libcharset/configure
index b7c102afa2..96edc051c9 100755
--- a/recipes/libs/libiconv/source/libcharset/configure
+++ b/recipes/libs/libiconv/source/libcharset/configure
@@ -4092,8 +4092,8 @@ esac
 
 
 
-macro_version='2.6.0'
-macro_revision='2.6.0'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
 
 
@@ -13903,8 +13903,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
diff --git a/recipes/libs/libiconv/source/libcharset/configure~ b/recipes/libs/libiconv/source/libcharset/configure~
index fbd68918a2..74257317ab 100755
--- a/recipes/libs/libiconv/source/libcharset/configure~
+++ b/recipes/libs/libiconv/source/libcharset/configure~
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for libcharset 1.5.
+# Generated by GNU Autoconf 2.73 for libcharset 1.5.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+# Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 # Inc.
 #
 #
@@ -20,7 +20,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in #(
@@ -107,7 +107,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -129,10 +129,13 @@ case $- in # ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $# in # ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -143,7 +146,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in #(
@@ -261,22 +264,25 @@ case $- in # ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $# in # ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -336,7 +342,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -345,7 +351,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -428,9 +434,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -457,7 +463,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -503,7 +509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -517,29 +523,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -600,6 +583,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
@@ -712,13 +696,13 @@ LDFLAGS
 CFLAGS
 CC
 SET_MAKE
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -884,7 +868,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -910,7 +894,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1123,7 +1107,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1139,7 +1123,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1183,9 +1167,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1193,7 +1177,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -1201,7 +1185,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1265,7 +1249,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1448,9 +1432,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1487,7 +1471,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1497,9 +1481,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libcharset configure 1.5
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1523,7 +1507,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1531,7 +1515,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1539,7 +1523,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1562,7 +1546,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1570,7 +1554,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1578,7 +1562,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -1596,7 +1580,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1618,8 +1602,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -1637,7 +1621,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1645,7 +1629,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1656,7 +1640,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1678,7 +1662,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1730,8 +1714,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -1749,26 +1733,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in #(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -1784,7 +1768,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -1796,7 +1780,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -1804,7 +1788,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libcharset $as_me 1.5, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -1844,7 +1828,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -1879,7 +1863,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1908,31 +1892,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -1941,67 +1916,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -2010,21 +2013,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -2046,12 +2049,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -2061,27 +2064,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -2161,7 +2257,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -2172,7 +2269,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -2260,15 +2357,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -2284,13 +2381,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -2425,7 +2521,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -2438,7 +2534,7 @@ do
   esac
   as_found=:
 
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -2449,13 +2545,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -2467,7 +2563,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -2520,38 +2616,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2561,10 +2663,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -2572,6 +2674,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2583,10 +2702,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_config_headers="$ac_config_headers config.h"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -2594,7 +2713,7 @@ else case e in #(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -2607,12 +2726,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2627,6 +2746,9 @@ fi
 
 
 
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2635,7 +2757,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2656,7 +2778,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2668,11 +2790,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2681,7 +2803,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -2702,7 +2824,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2714,11 +2836,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2726,8 +2848,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2740,7 +2862,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2761,7 +2883,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2773,11 +2895,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2786,7 +2908,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2812,7 +2934,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2836,11 +2958,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2851,7 +2973,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2872,7 +2994,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2884,11 +3006,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2901,7 +3023,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -2922,7 +3044,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2934,11 +3056,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -2950,8 +3072,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2963,7 +3085,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -2984,7 +3106,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2996,11 +3118,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -3009,7 +3131,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -3030,7 +3152,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3042,11 +3164,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3054,8 +3176,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3067,13 +3189,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -3083,7 +3205,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3093,7 +3215,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -3113,9 +3235,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3136,10 +3258,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -3180,29 +3302,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3210,10 +3332,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -3230,15 +3352,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3261,7 +3383,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -3270,10 +3392,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -3281,31 +3403,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -3329,10 +3451,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -3344,11 +3466,11 @@ then :
   esac
 done
 else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -3356,11 +3478,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -3392,8 +3514,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -3403,7 +3525,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -3471,8 +3593,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3491,7 +3613,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in #(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in #(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -3503,7 +3674,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -3520,16 +3691,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in #(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -3540,7 +3711,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -3569,16 +3740,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in #(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -3589,7 +3760,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -3618,16 +3789,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in #(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -3648,7 +3819,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -3719,8 +3890,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3768,8 +3939,8 @@ if $ac_preproc_ok
 then :
 
 else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -3797,7 +3968,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -3820,8 +3991,8 @@ case $as_dir in #((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3871,8 +4042,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3890,7 +4061,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -3906,8 +4077,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -3923,10 +4094,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -3941,8 +4112,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -3958,7 +4129,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -3972,7 +4143,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -3992,7 +4163,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
 
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -4001,7 +4172,7 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
@@ -4030,10 +4201,10 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
@@ -4084,49 +4255,51 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "#define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "#define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "#define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "#define _MINIX 1" >>confdefs.h
+    printf '%s\n' "#define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "#define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
 else case e in #(
   e) MINIX= ;;
@@ -4134,12 +4307,12 @@ esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "#define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "#define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
@@ -4152,14 +4325,14 @@ fi
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.5.4-redox-9510'
-macro_revision='2.5.4'
+macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 
 
 
@@ -4197,7 +4370,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -4224,12 +4397,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -4245,7 +4418,7 @@ esac
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -4288,7 +4461,7 @@ case `"$ac_path_SED" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4317,8 +4490,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4335,7 +4508,7 @@ Xsed="$SED -e 1s/^X//"
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -4372,7 +4545,7 @@ case `"$ac_path_GREP" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4401,12 +4574,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -4446,7 +4619,7 @@ case `"$ac_path_EGREP" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4476,14 +4649,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -4523,7 +4696,7 @@ case `"$ac_path_FGREP" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4553,8 +4726,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
 
@@ -4590,7 +4763,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -4620,10 +4793,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -4659,14 +4832,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -4683,8 +4856,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -4695,7 +4868,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -4751,8 +4924,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -4765,7 +4938,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -4786,7 +4959,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4798,11 +4971,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4815,7 +4988,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -4836,7 +5009,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4848,11 +5021,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4864,8 +5037,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -4893,7 +5066,7 @@ test -z "$NM" && NM=nm
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -4915,22 +5088,22 @@ else case e in #(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -4948,9 +5121,9 @@ else case e in #(
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu* | ironclad* | redox*)
-    # Under GNU Hurd, Ironclad and Redox, this test is not required
-    # because there is no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -5063,11 +5236,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -5111,7 +5284,7 @@ esac
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -5153,14 +5326,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -5182,14 +5355,85 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+case $host in #(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in #(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in #(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+
+
+
+
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in #(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; #(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; #(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+
+fi
+     ;; #(
+  *) :
+     ;;
+esac
+
+ ;; #(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -5198,8 +5442,8 @@ else case e in #(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -5214,7 +5458,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -5231,7 +5475,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -5252,7 +5496,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_FILECMD="file"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5265,11 +5509,11 @@ esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5282,7 +5526,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -5303,7 +5547,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5315,11 +5559,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5328,7 +5572,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -5349,7 +5593,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5361,11 +5605,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -5373,8 +5617,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -5390,7 +5634,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -5507,16 +5751,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 *-mlibc)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-redox*)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5603,8 +5843,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -5648,7 +5888,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -5669,7 +5909,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5681,11 +5921,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5694,7 +5934,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -5715,7 +5955,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5727,11 +5967,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -5739,8 +5979,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -5757,7 +5997,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -5786,8 +6026,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -5800,7 +6040,7 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
@@ -5821,7 +6061,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5833,11 +6073,11 @@ esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5846,7 +6086,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
@@ -5867,7 +6107,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5879,11 +6119,11 @@ esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -5891,8 +6131,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -5906,7 +6146,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -5927,7 +6167,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5939,11 +6179,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5956,7 +6196,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -5977,7 +6217,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5989,11 +6229,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6005,8 +6245,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6042,7 +6282,7 @@ lt_ar_flags=$AR_FLAGS
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -6067,7 +6307,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -6075,7 +6315,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -6088,8 +6328,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -6106,7 +6346,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -6127,7 +6367,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6139,11 +6379,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6152,7 +6392,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -6173,7 +6413,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6185,11 +6425,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6197,8 +6437,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6259,11 +6499,11 @@ esac
 
 
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -6284,7 +6524,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6296,11 +6536,11 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -6336,7 +6576,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -6396,13 +6636,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -6416,22 +6656,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -6452,8 +6692,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -6493,7 +6735,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
@@ -6566,7 +6808,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -6602,11 +6844,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -6652,7 +6894,7 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 # Check whether --with-sysroot was given.
@@ -6680,20 +6922,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -6738,11 +6980,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -6759,8 +7001,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
 
 
@@ -6800,7 +7042,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -6820,7 +7062,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -6858,7 +7100,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -6899,7 +7141,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -6962,7 +7204,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -7002,8 +7244,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -7016,7 +7258,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -7053,7 +7295,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -7074,7 +7316,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7086,11 +7328,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7099,7 +7341,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -7120,7 +7362,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7132,11 +7374,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -7144,8 +7386,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -7155,7 +7397,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -7171,8 +7413,8 @@ else case e in #(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -7187,7 +7429,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -7208,7 +7450,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7220,11 +7462,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7233,7 +7475,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -7254,7 +7496,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7266,11 +7508,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -7278,8 +7520,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -7291,7 +7533,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -7312,7 +7554,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7324,11 +7566,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7337,7 +7579,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -7358,7 +7600,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7370,11 +7612,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -7382,8 +7624,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -7395,7 +7637,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -7416,7 +7658,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7428,11 +7670,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7441,7 +7683,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -7462,7 +7704,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7474,11 +7716,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -7486,8 +7728,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -7499,7 +7741,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -7520,7 +7762,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7532,11 +7774,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7545,7 +7787,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -7566,7 +7808,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7578,11 +7820,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -7590,8 +7832,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -7603,7 +7845,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -7624,7 +7866,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7636,11 +7878,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7649,7 +7891,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -7670,7 +7912,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7682,11 +7924,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -7694,8 +7936,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -7730,7 +7972,7 @@ fi
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -7765,12 +8007,12 @@ else case e in #(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
     # Feature test to disable chained fixups since it is not
     # compatible with '-undefined dynamic_lookup'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
 printf %s "checking for -no_fixup_chains linker flag... " >&6; }
 if test ${lt_cv_support_no_fixup_chains+y}
 then :
@@ -7804,10 +8046,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -7841,10 +8083,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -7878,8 +8120,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -7968,7 +8210,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_inc
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -7984,7 +8226,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -8005,7 +8247,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8017,11 +8259,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8030,7 +8272,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -8051,7 +8293,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8063,11 +8305,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -8075,8 +8317,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -8088,7 +8330,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -8109,7 +8351,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8121,11 +8363,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8134,7 +8376,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -8155,7 +8397,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8167,11 +8409,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -8179,8 +8421,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -8192,7 +8434,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -8213,7 +8455,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8225,11 +8467,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8238,7 +8480,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -8259,7 +8501,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8271,11 +8513,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -8283,8 +8525,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -8453,7 +8695,7 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
 
 # Check whether --with-aix-soname was given.
@@ -8480,8 +8722,8 @@ fi
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -8563,7 +8805,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -8580,15 +8822,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
 
 
 
-printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -8634,7 +8876,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -8689,11 +8931,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8702,7 +8944,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -8757,11 +8999,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8842,7 +9084,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -8869,9 +9111,9 @@ else case e in #(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -8879,8 +9121,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -9018,7 +9260,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -9069,7 +9311,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -9085,7 +9333,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -9108,6 +9356,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -9165,18 +9419,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -9258,7 +9500,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -9267,15 +9509,15 @@ else case e in #(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -9302,9 +9544,9 @@ else case e in #(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -9312,8 +9554,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -9341,7 +9583,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -9357,9 +9599,9 @@ else case e in #(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -9371,8 +9613,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -9386,7 +9628,7 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -9417,9 +9659,9 @@ else case e in #(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -9435,15 +9677,15 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -9474,9 +9716,9 @@ else case e in #(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -9492,8 +9734,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -9501,7 +9743,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -9509,11 +9751,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -9525,7 +9767,7 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -9719,17 +9961,17 @@ _LT_EOF
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -9738,7 +9980,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -9758,6 +9999,11 @@ _LT_EOF
       archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -9783,7 +10029,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
@@ -9838,16 +10084,6 @@ _LT_EOF
       fi
       ;;
 
-    *-mlibc)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
-    redox*)
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -10246,8 +10482,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -10257,14 +10493,20 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
 	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -10296,7 +10538,7 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
@@ -10430,7 +10672,7 @@ fi
 
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -10446,9 +10688,9 @@ else case e in #(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
@@ -10460,8 +10702,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -10501,7 +10743,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -10525,8 +10767,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -10541,6 +10783,9 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
@@ -10552,12 +10797,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       esac
       ;;
 
-    *-mlibc)
-      ;;
-
-    redox*)
-      ;;
-
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -10604,17 +10843,17 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -10623,7 +10862,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       file_list_spec='@'
       ;;
@@ -10649,8 +10887,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10667,21 +10905,21 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -10817,8 +11055,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -10854,7 +11092,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -10866,7 +11104,7 @@ else case e in #(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -10884,7 +11122,7 @@ else case e in #(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -10899,8 +11137,8 @@ else case e in #(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -11059,7 +11297,7 @@ esac
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -11352,8 +11590,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -11620,6 +11858,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -11730,6 +11980,8 @@ netbsdelf*-gnu)
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 netbsd*)
@@ -11748,30 +12000,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  ;;
-
-*-mlibc)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='mlibc ld.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-redox*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='relibc ld64.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -11816,9 +12046,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -12092,7 +12327,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -12143,7 +12378,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -12159,7 +12400,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -12182,6 +12423,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -12239,18 +12486,6 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    *-mlibc)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
-    redox*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-fPIC'
-      lt_prog_compiler_static='-static'
-      ;;
-
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
@@ -12332,7 +12567,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -12341,15 +12576,15 @@ else case e in #(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -12376,9 +12611,9 @@ else case e in #(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -12386,8 +12621,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -12409,7 +12644,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -12425,9 +12660,9 @@ else case e in #(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -12439,8 +12674,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -12461,8 +12696,8 @@ fi
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12583,7 +12818,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -12608,8 +12843,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -12653,7 +12888,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -12694,8 +12929,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -12724,7 +12959,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -12765,8 +13000,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -12776,7 +13011,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -12817,13 +13052,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -12864,13 +13099,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -12911,8 +13146,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -12958,7 +13193,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -13042,7 +13277,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13061,12 +13296,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -13150,7 +13385,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13169,8 +13404,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -13208,40 +13443,40 @@ fi
 
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -13259,12 +13494,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -13289,15 +13524,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
 
 
@@ -13323,6 +13558,13 @@ CC=$lt_save_CC
 
 
 
+
+
+
+
+
+
+
 
 
         ac_config_commands="$ac_config_commands libtool"
@@ -13358,16 +13600,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -13384,7 +13626,7 @@ else case e in #(
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -13414,9 +13656,9 @@ else case e in #(
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -13433,7 +13675,7 @@ else case e in #(
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -13491,14 +13733,14 @@ fi
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
@@ -13515,13 +13757,13 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+                              { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
 printf %s "checking for shared library path variable... " >&6; }
 if test ${acl_cv_libpath+y}
 then :
@@ -13536,12 +13778,12 @@ else case e in #(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
-printf "%s\n" "$acl_cv_libpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libpath" >&5
+printf '%s\n' "$acl_cv_libpath" >&6; }
   shlibpath_var="$acl_cv_shlibpath_var"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to activate relocatable installation" >&5
 printf %s "checking whether to activate relocatable installation... " >&6; }
   # Check whether --enable-relocatable was given.
 if test ${enable_relocatable+y}
@@ -13558,8 +13800,8 @@ esac
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
-printf "%s\n" "$RELOCATABLE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RELOCATABLE" >&5
+printf '%s\n' "$RELOCATABLE" >&6; }
 
 
 
@@ -13569,11 +13811,13 @@ printf "%s\n" "$RELOCATABLE" >&6; }
     reloc_final_prefix="$prefix"
   fi
 
-printf "%s\n" "#define INSTALLPREFIX \"${reloc_final_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define INSTALLPREFIX "${reloc_final_prefix}"
+_ACEOF
 
   if test $RELOCATABLE = yes; then
 
-printf "%s\n" "#define ENABLE_RELOCATABLE 1" >>confdefs.h
+printf '%s\n' "#define ENABLE_RELOCATABLE 1" >>confdefs.h
 
   fi
 
@@ -13594,14 +13838,14 @@ printf "%s\n" "#define ENABLE_RELOCATABLE 1" >>confdefs.h
     ac_fn_c_check_header_compile "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
 if test "x$ac_cv_header_mach_o_dyld_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_MACH_O_DYLD_H 1" >>confdefs.h
 
 fi
 
     ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
 if test "x$ac_cv_func__NSGetExecutablePath" = xyes
 then :
-  printf "%s\n" "#define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
+  printf '%s\n' "#define HAVE__NSGETEXECUTABLEPATH 1" >>confdefs.h
 
 fi
 
@@ -13620,7 +13864,7 @@ fi
         ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range"
 if test "x$ac_cv_func_copy_file_range" = xyes
 then :
-  printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
@@ -13718,7 +13962,7 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -13749,9 +13993,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -13795,8 +14039,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -13805,13 +14049,13 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
 
 
 
-printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 printf %s "checking for nl_langinfo and CODESET... " >&6; }
 if test ${am_cv_langinfo_codeset+y}
 then :
@@ -13840,11 +14084,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf '%s\n' "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
 
-printf "%s\n" "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf '%s\n' "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -13921,7 +14165,7 @@ gl_mda_defines='
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 printf %s "checking for working fcntl.h... " >&6; }
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
@@ -14055,15 +14299,15 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
+printf '%s\n' "$gl_cv_header_working_fcntl_h" >&6; }
 
   case $gl_cv_header_working_fcntl_h in #(
   *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
   *) ac_val=1;;
   esac
 
-printf "%s\n" "#define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
+printf '%s\n' "#define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
 
 
   case $gl_cv_header_working_fcntl_h in #(
@@ -14071,13 +14315,13 @@ printf "%s\n" "#define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h
   *) ac_val=1;;
   esac
 
-printf "%s\n" "#define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
+printf '%s\n' "#define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h
 
 
 ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
 if test "x$ac_cv_func_setlocale" = xyes
 then :
-  printf "%s\n" "#define HAVE_SETLOCALE 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SETLOCALE 1" >>confdefs.h
 
 fi
 
@@ -14110,44 +14354,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -14159,8 +14366,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -14174,8 +14381,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -14192,7 +14399,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -14213,13 +14420,21 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in #(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; #(
+  */*) :
+     ;; #(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -14233,7 +14448,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -14245,7 +14460,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in #(
@@ -14332,7 +14547,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -14348,9 +14563,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -14445,7 +14660,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -14467,29 +14682,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -14531,7 +14723,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -14540,7 +14732,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14593,19 +14785,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by libcharset $as_me 1.5, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14627,7 +14819,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -14635,7 +14827,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -14667,16 +14859,16 @@ $config_commands
 Report bugs to the package provider."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 libcharset config.status 1.5
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -14684,10 +14876,14 @@ ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -14715,15 +14911,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -14731,7 +14927,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -14740,7 +14936,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -14764,29 +14960,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -14834,6 +15030,7 @@ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
@@ -14974,6 +15171,7 @@ file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
+lt_ar_flags \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -15080,7 +15278,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -15167,13 +15365,13 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -15184,7 +15382,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -15229,9 +15427,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -15260,7 +15458,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -15292,7 +15490,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -15363,9 +15561,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -15383,8 +15581,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -15399,7 +15601,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -15443,7 +15645,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -15451,17 +15653,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -15478,7 +15680,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -15502,9 +15704,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -15544,7 +15746,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -15561,10 +15763,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -15578,11 +15780,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -15605,9 +15807,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -15623,27 +15825,27 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -15669,7 +15871,7 @@ printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -15792,6 +15994,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
 # A file(cmd) program that detects file types.
 FILECMD=$lt_FILECMD
 
@@ -15814,7 +16019,7 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 AR=$lt_AR
 
 # Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
+lt_ar_flags=$lt_lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
@@ -16208,7 +16413,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -16224,19 +16429,26 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in #(
+  -*) :
+    ac_no_opts=-- ;; #(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
diff --git a/recipes/libs/libiconv/source/libcharset/m4/libtool.m4 b/recipes/libs/libiconv/source/libcharset/m4/libtool.m4
index 5ccb3a8131..84a34a1281 100644
--- a/recipes/libs/libiconv/source/libcharset/m4/libtool.m4
+++ b/recipes/libs/libiconv/source/libcharset/m4/libtool.m4
@@ -1,6 +1,6 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2019, 2021-2025 Free Software
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2026 Free Software
 #   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
@@ -9,7 +9,7 @@
 # modifications, as long as this notice is preserved.
 
 m4_define([_LT_COPYING], [dnl
-# Copyright (C) 2025 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -534,7 +534,38 @@ m4_defun([_LT_OBJECTIVE_C], [
   )
   objc_compiles=$lt_cv_objc_compiles
   _LT_DECL([], [objc_compiles], [1],
-    [Check for compiling Objective C and C++ code])
+    [Check for compiling Objective C code])
+])
+
+# _LT_OBJECTIVE_CXX
+# ------------------------------
+m4_defun([_LT_OBJECTIVE_CXX], [
+  AC_CACHE_CHECK([for Objective C++ compilation],
+    [lt_cv_objcxx_compiles],
+    [ save_CFLAGS=$CFLAGS
+      CFLAGS=$OBJCXXFLAGS
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([#import <Foundation/Foundation.h>
+@interface Addition : NSObject
+- (int)this:(int)a that:(int)b;
+@end
+
+@implementation Addition
+- (int)this:(int)a that:(int)b
+{
+  return a + b;
+}
+@end
+],[])],
+        lt_cv_objcxx_compiles=yes,
+        lt_cv_objcxx_compiles=no
+      )
+      CFLAGS=$save_CFLAGS
+    ]
+  )
+  objcxx_compiles=$lt_cv_objcxx_compiles
+  _LT_DECL([], [objcxx_compiles], [1],
+    [Check for compiling Objective C++ code])
 ])
 
 m4_defun([_LT_ML64], [
@@ -701,7 +732,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2025 Free Software Foundation, Inc.
+Copyright (C) 2025-2026 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -3142,9 +3173,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -4964,6 +5000,12 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -5384,17 +5426,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -5403,7 +5445,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
@@ -6106,17 +6147,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -6125,7 +6166,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
@@ -6985,17 +7025,17 @@ if test yes != "$_lt_caught_CXX_error"; then
 	_LT_TAGVAR(hardcode_minus_L, $1)=yes
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	shrext_cmds=.dll
-	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	_LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  echo EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  echo EXPORTS >> $output_objdir/$libname.def~
 	  prefix_cmds="$SED"~
 	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	    prefix_cmds="$prefix_cmds -e 1d";
@@ -7004,7 +7044,6 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;
@@ -7665,6 +7704,14 @@ if test yes != "$_lt_caught_CXX_error"; then
         _LT_TAGVAR(ld_shlibs, $1)=no
         ;;
 
+      emscripten*)
+        # Emscripten side modules (-sSIDE_MODULE=2) use a separate PIC sysroot
+        # and do not link system libraries (they are imported from the main module
+        # at runtime).  Re-run the verbose link with -sSIDE_MODULE=2 so that the
+        # detected paths point to the PIC sysroot instead of the non-PIC one.
+        output_verbose_link_cmd='$CC -sSIDE_MODULE=2 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP " [[-]]L"'
+        ;;
+
       *)
         # FIXME: insert proper C++ library support
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -8529,7 +8576,10 @@ _LT_COMPILER_BOILERPLATE
 _LT_LINKER_BOILERPLATE
 
 # Check for compilation issues with OBJCXX flags
-_LT_OBJECTIVE_C
+_LT_OBJECTIVE_CXX
+if test "yes" = "$lt_cv_gnustep_exists"; then
+  OBJCXXFLAGS="$OBJCXXFLAGS `gnustep-config --objc-flags`"
+fi
 
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
@@ -8637,7 +8687,7 @@ AC_DEFUN([LT_PROG_OBJC],
   if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
     test set = "${OBJCFLAGS+set}" || OBJCFLAGS="`gnustep-config --objc-flags`"
   fi
-  AC_SUBST(OBJCFLAGS)])])[]dnl
+  AC_SUBST(OBJCFLAGS)[]dnl
 ])
 
 # LT_PROG_OBJCXX
@@ -8648,7 +8698,7 @@ AC_DEFUN([LT_PROG_OBJCXX],
   if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
     test set = "${OBJCXXFLAGS+set}" || OBJCXXFLAGS="`gnustep-config --objc-flags`"
   fi
-  AC_SUBST(OBJCXXFLAGS)])])[]dnl
+  AC_SUBST(OBJCXXFLAGS)[]dnl
 ])
 
 # LT_PROG_GCJ
diff --git a/recipes/libs/libiconv/source/libcharset/m4/ltoptions.m4 b/recipes/libs/libiconv/source/libcharset/m4/ltoptions.m4
index 9e93e6f040..994d4487b1 100644
--- a/recipes/libs/libiconv/source/libcharset/m4/ltoptions.m4
+++ b/recipes/libs/libiconv/source/libcharset/m4/ltoptions.m4
@@ -1,6 +1,6 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2025 Free
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2026 Free
 #   Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
diff --git a/recipes/libs/libiconv/source/libcharset/m4/ltsugar.m4 b/recipes/libs/libiconv/source/libcharset/m4/ltsugar.m4
index 5698955ba8..a15a50726c 100644
--- a/recipes/libs/libiconv/source/libcharset/m4/ltsugar.m4
+++ b/recipes/libs/libiconv/source/libcharset/m4/ltsugar.m4
@@ -1,6 +1,6 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2025 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2026 Free Software
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
diff --git a/recipes/libs/libiconv/source/libcharset/m4/ltversion.m4 b/recipes/libs/libiconv/source/libcharset/m4/ltversion.m4
index 09bdaa5ee3..fd8528d482 100644
--- a/recipes/libs/libiconv/source/libcharset/m4/ltversion.m4
+++ b/recipes/libs/libiconv/source/libcharset/m4/ltversion.m4
@@ -1,6 +1,6 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2019, 2021-2025 Free Software Foundation,
+#   Copyright (C) 2004, 2011-2019, 2021-2026 Free Software Foundation,
 #   Inc.
 #   Written by Scott James Remnant, 2004
 #
@@ -10,15 +10,15 @@
 
 # @configure_input@
 
-# serial 4509 ltversion.m4
+# serial 4532 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.6.0])
-m4_define([LT_PACKAGE_REVISION], [2.6.0])
+m4_define([LT_PACKAGE_VERSION], [2.6.0.23-b08cb])
+m4_define([LT_PACKAGE_REVISION], [2.6.0.23])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.6.0'
-macro_revision='2.6.0'
+[macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/recipes/libs/libiconv/source/libcharset/m4/lt~obsolete.m4 b/recipes/libs/libiconv/source/libcharset/m4/lt~obsolete.m4
index c1d7729b4a..cadcdbe468 100644
--- a/recipes/libs/libiconv/source/libcharset/m4/lt~obsolete.m4
+++ b/recipes/libs/libiconv/source/libcharset/m4/lt~obsolete.m4
@@ -1,6 +1,6 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2025 Free
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2026 Free
 #   Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
diff --git a/recipes/libs/libiconv/source/m4/libtool.m4 b/recipes/libs/libiconv/source/m4/libtool.m4
index 5ccb3a8131..84a34a1281 100644
--- a/recipes/libs/libiconv/source/m4/libtool.m4
+++ b/recipes/libs/libiconv/source/m4/libtool.m4
@@ -1,6 +1,6 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2019, 2021-2025 Free Software
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2026 Free Software
 #   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
@@ -9,7 +9,7 @@
 # modifications, as long as this notice is preserved.
 
 m4_define([_LT_COPYING], [dnl
-# Copyright (C) 2025 Free Software Foundation, Inc.
+# Copyright (C) 2025-2026 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -534,7 +534,38 @@ m4_defun([_LT_OBJECTIVE_C], [
   )
   objc_compiles=$lt_cv_objc_compiles
   _LT_DECL([], [objc_compiles], [1],
-    [Check for compiling Objective C and C++ code])
+    [Check for compiling Objective C code])
+])
+
+# _LT_OBJECTIVE_CXX
+# ------------------------------
+m4_defun([_LT_OBJECTIVE_CXX], [
+  AC_CACHE_CHECK([for Objective C++ compilation],
+    [lt_cv_objcxx_compiles],
+    [ save_CFLAGS=$CFLAGS
+      CFLAGS=$OBJCXXFLAGS
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([#import <Foundation/Foundation.h>
+@interface Addition : NSObject
+- (int)this:(int)a that:(int)b;
+@end
+
+@implementation Addition
+- (int)this:(int)a that:(int)b
+{
+  return a + b;
+}
+@end
+],[])],
+        lt_cv_objcxx_compiles=yes,
+        lt_cv_objcxx_compiles=no
+      )
+      CFLAGS=$save_CFLAGS
+    ]
+  )
+  objcxx_compiles=$lt_cv_objcxx_compiles
+  _LT_DECL([], [objcxx_compiles], [1],
+    [Check for compiling Objective C++ code])
 ])
 
 m4_defun([_LT_ML64], [
@@ -701,7 +732,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2025 Free Software Foundation, Inc.
+Copyright (C) 2025-2026 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -3142,9 +3173,14 @@ os2*)
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
+    n=$($ECHO $libname | tr -d .-);
+    l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l));
+    r=$($ECHO $release | tr -d .-);
+    l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l));
+    v=$($ECHO $versuffix | tr -d .- | cut -b -$mv);
+    r=$($ECHO $r | cut -b -$(($mr - ${#v})));
+    n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v})));
+    $ECHO $n$r$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
@@ -4964,6 +5000,12 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	;;
+      slimcc*)
+	# Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -5384,17 +5426,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -5403,7 +5445,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
@@ -6106,17 +6147,17 @@ _LT_EOF
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
+      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	echo EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
@@ -6125,7 +6166,6 @@ _LT_EOF
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
@@ -6985,17 +7025,17 @@ if test yes != "$_lt_caught_CXX_error"; then
 	_LT_TAGVAR(hardcode_minus_L, $1)=yes
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	shrext_cmds=.dll
-	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	_LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  echo EXPORTS >> $output_objdir/$libname.def~
 	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  echo EXPORTS >> $output_objdir/$libname.def~
 	  prefix_cmds="$SED"~
 	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	    prefix_cmds="$prefix_cmds -e 1d";
@@ -7004,7 +7044,6 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;
@@ -7665,6 +7704,14 @@ if test yes != "$_lt_caught_CXX_error"; then
         _LT_TAGVAR(ld_shlibs, $1)=no
         ;;
 
+      emscripten*)
+        # Emscripten side modules (-sSIDE_MODULE=2) use a separate PIC sysroot
+        # and do not link system libraries (they are imported from the main module
+        # at runtime).  Re-run the verbose link with -sSIDE_MODULE=2 so that the
+        # detected paths point to the PIC sysroot instead of the non-PIC one.
+        output_verbose_link_cmd='$CC -sSIDE_MODULE=2 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP " [[-]]L"'
+        ;;
+
       *)
         # FIXME: insert proper C++ library support
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -8529,7 +8576,10 @@ _LT_COMPILER_BOILERPLATE
 _LT_LINKER_BOILERPLATE
 
 # Check for compilation issues with OBJCXX flags
-_LT_OBJECTIVE_C
+_LT_OBJECTIVE_CXX
+if test "yes" = "$lt_cv_gnustep_exists"; then
+  OBJCXXFLAGS="$OBJCXXFLAGS `gnustep-config --objc-flags`"
+fi
 
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
@@ -8637,7 +8687,7 @@ AC_DEFUN([LT_PROG_OBJC],
   if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
     test set = "${OBJCFLAGS+set}" || OBJCFLAGS="`gnustep-config --objc-flags`"
   fi
-  AC_SUBST(OBJCFLAGS)])])[]dnl
+  AC_SUBST(OBJCFLAGS)[]dnl
 ])
 
 # LT_PROG_OBJCXX
@@ -8648,7 +8698,7 @@ AC_DEFUN([LT_PROG_OBJCXX],
   if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then
     test set = "${OBJCXXFLAGS+set}" || OBJCXXFLAGS="`gnustep-config --objc-flags`"
   fi
-  AC_SUBST(OBJCXXFLAGS)])])[]dnl
+  AC_SUBST(OBJCXXFLAGS)[]dnl
 ])
 
 # LT_PROG_GCJ
diff --git a/recipes/libs/libiconv/source/m4/ltoptions.m4 b/recipes/libs/libiconv/source/m4/ltoptions.m4
index 9e93e6f040..994d4487b1 100644
--- a/recipes/libs/libiconv/source/m4/ltoptions.m4
+++ b/recipes/libs/libiconv/source/m4/ltoptions.m4
@@ -1,6 +1,6 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2025 Free
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2026 Free
 #   Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
diff --git a/recipes/libs/libiconv/source/m4/ltsugar.m4 b/recipes/libs/libiconv/source/m4/ltsugar.m4
index 5698955ba8..a15a50726c 100644
--- a/recipes/libs/libiconv/source/m4/ltsugar.m4
+++ b/recipes/libs/libiconv/source/m4/ltsugar.m4
@@ -1,6 +1,6 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2025 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2026 Free Software
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
diff --git a/recipes/libs/libiconv/source/m4/ltversion.m4 b/recipes/libs/libiconv/source/m4/ltversion.m4
index 09bdaa5ee3..fd8528d482 100644
--- a/recipes/libs/libiconv/source/m4/ltversion.m4
+++ b/recipes/libs/libiconv/source/m4/ltversion.m4
@@ -1,6 +1,6 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2019, 2021-2025 Free Software Foundation,
+#   Copyright (C) 2004, 2011-2019, 2021-2026 Free Software Foundation,
 #   Inc.
 #   Written by Scott James Remnant, 2004
 #
@@ -10,15 +10,15 @@
 
 # @configure_input@
 
-# serial 4509 ltversion.m4
+# serial 4532 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.6.0])
-m4_define([LT_PACKAGE_REVISION], [2.6.0])
+m4_define([LT_PACKAGE_VERSION], [2.6.0.23-b08cb])
+m4_define([LT_PACKAGE_REVISION], [2.6.0.23])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.6.0'
-macro_revision='2.6.0'
+[macro_version='2.6.0.23-b08cb'
+macro_revision='2.6.0.23'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/recipes/libs/libiconv/source/m4/lt~obsolete.m4 b/recipes/libs/libiconv/source/m4/lt~obsolete.m4
index c1d7729b4a..cadcdbe468 100644
--- a/recipes/libs/libiconv/source/m4/lt~obsolete.m4
+++ b/recipes/libs/libiconv/source/m4/lt~obsolete.m4
@@ -1,6 +1,6 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2025 Free
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2026 Free
 #   Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
diff --git a/recipes/tools/gettext/recipe.toml b/recipes/tools/gettext/recipe.toml
index 269ecdf34b..439f8cf293 100644
--- a/recipes/tools/gettext/recipe.toml
+++ b/recipes/tools/gettext/recipe.toml
@@ -39,5 +39,8 @@ COOKBOOK_CONFIGURE_FLAGS+=(
     gt_cv_locale_tr_utf8=false
     gt_cv_locale_zh_CN=false
 )
-cookbook_configure
+"${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"
+
+make -j "${COOKBOOK_MAKE_JOBS}" ACLOCAL=true AUTOMAKE=true
+make install ACLOCAL=true AUTOMAKE=true DESTDIR="${COOKBOOK_STAGE}"
 """
\ No newline at end of file
diff --git a/recipes/tools/xz/source/Makefile.in b/recipes/tools/xz/source/Makefile.in
index 9c2fc4133d..991708e25c 100644
--- a/recipes/tools/xz/source/Makefile.in
+++ b/recipes/tools/xz/source/Makefile.in
@@ -221,8 +221,8 @@ am__DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.in \
 	$(top_srcdir)/build-aux/missing ABOUT-NLS AUTHORS COPYING \
 	ChangeLog INSTALL NEWS README THANKS TODO build-aux/compile \
 	build-aux/config.guess build-aux/config.rpath \
-	build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \
-	build-aux/missing
+	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+	build-aux/ltmain.sh build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
diff --git a/recipes/tools/xz/source/autom4te.cache/output.4 b/recipes/tools/xz/source/autom4te.cache/output.4
new file mode 100644
index 0000000000..5aedad919c
--- /dev/null
+++ b/recipes/tools/xz/source/autom4te.cache/output.4
@@ -0,0 +1,26036 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
+@%:@ Generated by GNU Autoconf 2.73 for XZ Utils 5.2.13.
+@%:@
+@%:@ Report bugs to <xz@tukaani.org>.
+@%:@ 
+@%:@ 
+@%:@ Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
+@%:@ Inc.
+@%:@ 
+@%:@ 
+@%:@ This configure script is free software; the Free Software Foundation
+@%:@ gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # contradicts POSIX and common usage.  Disable this.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else case e in @%:@(
+  e) case `(set -o) 2>/dev/null` in @%:@(
+  *posix*) :
+    set -o posix ;; @%:@(
+  *) :
+     ;;
+esac ;;
+esac
+fi
+
+
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
+as_nl='
+'
+export as_nl
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+
+# The user is always right.
+if ${PATH_SEPARATOR+false} :; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in @%:@((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in @%:@ ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed 'exec'.
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # contradicts POSIX and common usage.  Disable this.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else case e in @%:@(
+  e) case \`(set -o) 2>/dev/null\` in @%:@(
+  *posix*) :
+    set -o posix ;; @%:@(
+  *) :
+     ;;
+esac ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
+  
+else case e in @%:@(
+  e) exitcode=1; echo positional parameters were not saved. ;;
+esac
+fi
+test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+  if (eval "$as_required") 2>/dev/null
+then :
+  as_have_required=yes
+else case e in @%:@(
+  e) as_have_required=no ;;
+esac
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
+  
+else case e in @%:@(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+  case $as_dir in @%:@(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+  
+else case e in @%:@(
+  e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi ;;
+esac
+fi
+
+
+      if test "x$CONFIG_SHELL" != x
+then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in @%:@ ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+case $@%:@ in @%:@ ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed 'exec'.
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno
+then :
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org and xz@tukaani.org
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
+fi ;;
+esac
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+@%:@ as_fn_unset VAR
+@%:@ ---------------
+@%:@ Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+
+@%:@ as_fn_set_status STATUS
+@%:@ -----------------------
+@%:@ Set @S|@? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} @%:@ as_fn_set_status
+
+@%:@ as_fn_exit STATUS
+@%:@ -----------------
+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} @%:@ as_fn_exit
+
+@%:@ as_fn_mkdir_p
+@%:@ -------------
+@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} @%:@ as_fn_mkdir_p
+
+@%:@ as_fn_executable_p FILE
+@%:@ -----------------------
+@%:@ Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} @%:@ as_fn_executable_p
+@%:@ as_fn_append VAR VALUE
+@%:@ ----------------------
+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
+@%:@ advantage of any shell optimizations that allow amortized linear growth over
+@%:@ repeated appends, instead of the typical quadratic growth present in naive
+@%:@ implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else case e in @%:@(
+  e) as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  } ;;
+esac
+fi # as_fn_append
+
+@%:@ as_fn_arith ARG...
+@%:@ ------------------
+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
+@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
+@%:@ must be portable across @S|@(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else case e in @%:@(
+  e) as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  } ;;
+esac
+fi # as_fn_arith
+
+
+@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD]
+@%:@ ----------------------------------------
+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+@%:@ script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  printf '%s\n' "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} @%:@ as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      t clear
+      :clear
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+
+# Sed expression to map a string onto a valid variable name.
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
+ac_clean_files=
+ac_config_libobj_dir=.
+LIB@&t@OBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='XZ Utils'
+PACKAGE_TARNAME='xz'
+PACKAGE_VERSION='5.2.13'
+PACKAGE_STRING='XZ Utils 5.2.13'
+PACKAGE_BUGREPORT='xz@tukaani.org'
+PACKAGE_URL='https://tukaani.org/xz/'
+
+ac_unique_file="src/liblzma/common/common.h"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_header_c_list=
+gt_needs=
+: ${enable_year2038:=no}
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+xz
+AM_CFLAGS
+COND_GNULIB_FALSE
+COND_GNULIB_TRUE
+HAVE_VISIBILITY
+CFLAG_VISIBILITY
+CAPSICUM_LIB
+COND_INTERNAL_SHA256_FALSE
+COND_INTERNAL_SHA256_TRUE
+GETOPT_H
+LIB@&t@OBJS
+localedir_c_make
+localedir_c
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+LTLIBICONV
+LIBICONV
+INTL_MACOSX_LIBS
+DESIRED_LINGUAS
+XGETTEXT_EXTRA_OPTIONS
+MSGMERGE_FOR_MSGFMT_OPTION
+MSGMERGE
+XGETTEXT_015
+XGETTEXT
+GMSGFMT_015
+GMSGFMT
+MSGFMT
+GETTEXT_MACRO_VERSION
+USE_NLS
+COND_SYMVERS_GENERIC_FALSE
+COND_SYMVERS_GENERIC_TRUE
+COND_SYMVERS_LINUX_FALSE
+COND_SYMVERS_LINUX_TRUE
+COND_SHARED_FALSE
+COND_SHARED_TRUE
+RC
+LT_SYS_LIBRARY_PATH
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+ac_ct_AR
+AR
+FILECMD
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
+COND_THREADS_FALSE
+COND_THREADS_TRUE
+PTHREAD_CFLAGS
+PTHREAD_LIBS
+PTHREAD_CXX
+PTHREAD_CC
+ax_pthread_config
+CPP
+SED
+am__fastdepCCAS_FALSE
+am__fastdepCCAS_TRUE
+CCASDEPMODE
+CCASFLAGS
+CCAS
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+LN_S
+am__xargs_n
+am__rm_f_notfound
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+CSCOPE
+ETAGS
+CTAGS
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+PREFERABLY_POSIX_SHELL
+POSIX_SHELL
+enable_path_for_scripts
+COND_DOC_FALSE
+COND_DOC_TRUE
+COND_SCRIPTS_FALSE
+COND_SCRIPTS_TRUE
+COND_LZMALINKS_FALSE
+COND_LZMALINKS_TRUE
+COND_LZMAINFO_FALSE
+COND_LZMAINFO_TRUE
+COND_LZMADEC_FALSE
+COND_LZMADEC_TRUE
+COND_XZDEC_FALSE
+COND_XZDEC_TRUE
+COND_XZ_FALSE
+COND_XZ_TRUE
+COND_SMALL_FALSE
+COND_SMALL_TRUE
+COND_ASM_X86_64_FALSE
+COND_ASM_X86_64_TRUE
+COND_ASM_X86_FALSE
+COND_ASM_X86_TRUE
+COND_CHECK_SHA256_FALSE
+COND_CHECK_SHA256_TRUE
+COND_CHECK_CRC64_FALSE
+COND_CHECK_CRC64_TRUE
+COND_CHECK_CRC32_FALSE
+COND_CHECK_CRC32_TRUE
+COND_DECODER_LZ_FALSE
+COND_DECODER_LZ_TRUE
+COND_ENCODER_LZ_FALSE
+COND_ENCODER_LZ_TRUE
+COND_FILTER_LZ_FALSE
+COND_FILTER_LZ_TRUE
+COND_DECODER_SIMPLE_FALSE
+COND_DECODER_SIMPLE_TRUE
+COND_ENCODER_SIMPLE_FALSE
+COND_ENCODER_SIMPLE_TRUE
+COND_FILTER_SIMPLE_FALSE
+COND_FILTER_SIMPLE_TRUE
+COND_DECODER_SPARC_FALSE
+COND_DECODER_SPARC_TRUE
+COND_ENCODER_SPARC_FALSE
+COND_ENCODER_SPARC_TRUE
+COND_FILTER_SPARC_FALSE
+COND_FILTER_SPARC_TRUE
+COND_DECODER_ARMTHUMB_FALSE
+COND_DECODER_ARMTHUMB_TRUE
+COND_ENCODER_ARMTHUMB_FALSE
+COND_ENCODER_ARMTHUMB_TRUE
+COND_FILTER_ARMTHUMB_FALSE
+COND_FILTER_ARMTHUMB_TRUE
+COND_DECODER_ARM_FALSE
+COND_DECODER_ARM_TRUE
+COND_ENCODER_ARM_FALSE
+COND_ENCODER_ARM_TRUE
+COND_FILTER_ARM_FALSE
+COND_FILTER_ARM_TRUE
+COND_DECODER_IA64_FALSE
+COND_DECODER_IA64_TRUE
+COND_ENCODER_IA64_FALSE
+COND_ENCODER_IA64_TRUE
+COND_FILTER_IA64_FALSE
+COND_FILTER_IA64_TRUE
+COND_DECODER_POWERPC_FALSE
+COND_DECODER_POWERPC_TRUE
+COND_ENCODER_POWERPC_FALSE
+COND_ENCODER_POWERPC_TRUE
+COND_FILTER_POWERPC_FALSE
+COND_FILTER_POWERPC_TRUE
+COND_DECODER_X86_FALSE
+COND_DECODER_X86_TRUE
+COND_ENCODER_X86_FALSE
+COND_ENCODER_X86_TRUE
+COND_FILTER_X86_FALSE
+COND_FILTER_X86_TRUE
+COND_DECODER_DELTA_FALSE
+COND_DECODER_DELTA_TRUE
+COND_ENCODER_DELTA_FALSE
+COND_ENCODER_DELTA_TRUE
+COND_FILTER_DELTA_FALSE
+COND_FILTER_DELTA_TRUE
+COND_DECODER_LZMA2_FALSE
+COND_DECODER_LZMA2_TRUE
+COND_ENCODER_LZMA2_FALSE
+COND_ENCODER_LZMA2_TRUE
+COND_FILTER_LZMA2_FALSE
+COND_FILTER_LZMA2_TRUE
+COND_DECODER_LZMA1_FALSE
+COND_DECODER_LZMA1_TRUE
+COND_ENCODER_LZMA1_FALSE
+COND_ENCODER_LZMA1_TRUE
+COND_FILTER_LZMA1_FALSE
+COND_FILTER_LZMA1_TRUE
+COND_MAIN_DECODER_FALSE
+COND_MAIN_DECODER_TRUE
+COND_MAIN_ENCODER_FALSE
+COND_MAIN_ENCODER_TRUE
+LN_EXEEXT
+COND_W32_FALSE
+COND_W32_TRUE
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+ECHO_T
+ECHO_N
+ECHO_C
+target_alias
+host_alias
+build_alias
+LIBS
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+runstatedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL
+am__quote'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_debug
+enable_encoders
+enable_decoders
+enable_match_finders
+enable_checks
+enable_external_sha256
+enable_assembler
+enable_small
+enable_threads
+enable_assume_ram
+enable_xz
+enable_xzdec
+enable_lzmadec
+enable_lzmainfo
+enable_lzma_links
+enable_scripts
+enable_doc
+enable_sandbox
+enable_path_for_scripts
+enable_silent_rules
+enable_dependency_tracking
+enable_shared
+enable_static
+enable_pic
+with_pic
+enable_cxx_stdlib
+enable_fast_install
+enable_aix_soname
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+enable_symbol_versions
+enable_nls
+enable_rpath
+with_libiconv_prefix
+with_libintl_prefix
+enable_largefile
+enable_unaligned_access
+enable_unsafe_type_punning
+enable_werror
+enable_year2038
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CCAS
+CCASFLAGS
+CPP
+LT_SYS_LIBRARY_PATH'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: '$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: '$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: '$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: '$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: '$ac_option'
+Try '$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir runstatedir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: '$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+'configure' configures XZ Utils 5.2.13 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print 'checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for '--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or '..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          @<:@@S|@ac_default_prefix@:>@
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          @<:@PREFIX@:>@
+
+By default, 'make install' will install all the files in
+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than '$ac_default_prefix' using '--prefix',
+for instance '--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root @<:@DATAROOTDIR/doc/xz@:>@
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of XZ Utils 5.2.13:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-debug          Enable debugging code.
+  --enable-encoders=LIST  Comma-separated list of encoders to build.
+                          Default=all. Available encoders: lzma1 lzma2 delta
+                          x86 powerpc ia64 arm armthumb sparc
+  --enable-decoders=LIST  Comma-separated list of decoders to build.
+                          Default=all. Available decoders are the same as
+                          available encoders.
+  --enable-match-finders=LIST 
+                          Comma-separated list of match finders to build.
+                          Default=all. At least one match finder is required
+                          for encoding with the LZMA1 and LZMA2 filters.
+                          Available match finders: hc3 hc4 bt2 bt3 bt4
+  --enable-checks=LIST    Comma-separated list of integrity checks to build.
+                          Default=all. Available integrity checks: crc32 crc64
+                          sha256
+  --enable-external-sha256 
+                          Use SHA-256 code from the operating system. See
+                          INSTALL for possible subtle problems.
+  --disable-assembler     Do not use assembler optimizations even if such
+                          exist for the architecture.
+  --enable-small          Make liblzma smaller and a little slower. This is
+                          disabled by default to optimize for speed.
+  --enable-threads=METHOD Supported METHODS are `yes', `no', `posix', `win95',
+                          and `vista'. The default is `yes'. Using `no'
+                          together with --enable-small makes liblzma thread
+                          unsafe.
+  --enable-assume-ram=SIZE 
+                          If and only if the real amount of RAM cannot be
+                          determined, assume SIZE MiB. The default is 128 MiB.
+                          This affects the default memory usage limit.
+  --disable-xz            do not build the xz tool
+  --disable-xzdec         do not build xzdec
+  --disable-lzmadec       do not build lzmadec (it exists primarily for LZMA
+                          Utils compatibility)
+  --disable-lzmainfo      do not build lzmainfo (it exists primarily for LZMA
+                          Utils compatibility)
+  --disable-lzma-links    do not create symlinks for LZMA Utils compatibility
+  --disable-scripts       do not install the scripts xzdiff, xzgrep, xzless,
+                          xzmore, and their symlinks
+  --disable-doc           do not install documentation files to docdir (man
+                          pages will still be installed)
+  --enable-sandbox=METHOD Sandboxing METHOD can be `auto', `no', or
+                          `capsicum'. The default is `auto' which enables
+                          sandboxing if a supported sandboxing method is
+                          found.
+  --enable-path-for-scripts=PREFIX 
+                          If PREFIX isn't empty, PATH=PREFIX:@S|@PATH will be set
+                          in the beginning of the scripts (xzgrep and others).
+                          The default is empty except on Solaris the default
+                          is /usr/xpg4/bin.
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking 
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking 
+                          speeds up one-time build
+  --enable-shared@<:@=PKGS@:>@  build shared libraries @<:@default=yes@:>@
+  --enable-static@<:@=PKGS@:>@  build static libraries @<:@default=yes@:>@
+  --enable-pic@<:@=PKGS@:>@     try to use only PIC/non-PIC objects @<:@default=use
+                          both@:>@
+  --enable-cxx-stdlib@<:@=PKGS@:>@ 
+                          let the compiler frontend decide what standard
+                          libraries to link when building C++ shared libraries
+                          and modules @<:@default=no@:>@
+  --enable-fast-install@<:@=PKGS@:>@ 
+                          optimize for fast installation @<:@default=yes@:>@
+  --enable-aix-soname=aix|svr4|both 
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, @<:@default=aix@:>@.
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-symbol-versions 
+                          Use symbol versioning for liblzma. Enabled by
+                          default on GNU/Linux, other GNU-based systems, and
+                          FreeBSD.
+  --disable-nls           do not use Native Language Support
+  --disable-rpath         do not hardcode runtime library paths
+  --disable-largefile     omit support for large files
+  --enable-unaligned-access 
+                          Enable if the system supports *fast* unaligned
+                          memory access with 16-bit and 32-bit integers. By
+                          default, this is enabled only on x86, x86_64, and
+                          big endian PowerPC.
+  --enable-unsafe-type-punning 
+                          This introduces strict aliasing violations and may
+                          result in broken code. However, this might improve
+                          performance in some cases, especially with old
+                          compilers (e.g. GCC 3 and early 4.x on x86, GCC < 6
+                          on ARMv6 and ARMv7).
+  --enable-werror         Enable -Werror to abort compilation on all compiler
+                          warnings.
+  --enable-year2038       support timestamps after 2038
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-ld           assume the C compiler uses GNU ld @<:@default=no@:>@
+  --with-sysroot@<:@=DIR@:>@    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
+  --with-gnu-ld           assume the C compiler uses GNU ld @<:@default=no@:>@
+  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
+  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
+  --without-libintl-prefix     don't search for libintl in includedir and libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CCAS        assembler compiler command (defaults to CC)
+  CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
+  CPP         C preprocessor
+  LT_SYS_LIBRARY_PATH 
+              User-defined run-time library search path.
+
+Use these variables to override the choices made by 'configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <xz@tukaani.org>.
+XZ Utils home page: <https://tukaani.org/xz/>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+XZ Utils configure 5.2.13
+generated by GNU Autoconf 2.73
+
+Copyright (C) 2026 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+@%:@ ac_fn_c_try_compile LINENO
+@%:@ --------------------------
+@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest.beam
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext
+then :
+  ac_retval=0
+else case e in @%:@(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1 ;;
+esac
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_try_compile
+
+@%:@ ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+@%:@ -------------------------------------------------------
+@%:@ Tests whether HEADER exists and can be compiled using the include files in
+@%:@ INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+@%:@include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$3=yes"
+else case e in @%:@(
+  e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_header_compile
+
+@%:@ ac_fn_c_try_link LINENO
+@%:@ -----------------------
+@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }
+then :
+  ac_retval=0
+else case e in @%:@(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1 ;;
+esac
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_try_link
+
+@%:@ ac_fn_c_try_cpp LINENO
+@%:@ ----------------------
+@%:@ Try to preprocess conftest.@S|@ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }
+then :
+  ac_retval=0
+else case e in @%:@(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1 ;;
+esac
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_try_cpp
+
+@%:@ ac_fn_c_check_func LINENO FUNC VAR
+@%:@ ----------------------------------
+@%:@ Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+   which can conflict with char $2 (void); below.  */
+
+#include <limits.h>
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 (void);
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main (void)
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  eval "$3=yes"
+else case e in @%:@(
+  e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_func
+
+@%:@ ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
+@%:@ ------------------------------------------------------------------
+@%:@ Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+@%:@ accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
+ac_fn_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+printf %s "checking whether $as_decl_name is declared... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  eval ac_save_FLAGS=\$$6
+  as_fn_append $6 " $5"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$3=yes"
+else case e in @%:@(
+  e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  eval $6=\$ac_save_FLAGS
+ ;;
+esac
+fi
+eval ac_res=\$$3
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_check_decl
+
+@%:@ ac_fn_c_try_run LINENO
+@%:@ ----------------------
+@%:@ Try to run conftest.@S|@ac_ext, and return whether this succeeded. Assumes that
+@%:@ executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
+  ac_retval=0
+else case e in @%:@(
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status ;;
+esac
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_try_run
+
+@%:@ ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+@%:@ -------------------------------------------
+@%:@ Tests whether TYPE exists after having included INCLUDES, setting cache
+@%:@ variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+else case e in @%:@(
+  e) eval "$3=yes" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_type
+
+@%:@ ac_fn_c_find_uintX_t LINENO BITS VAR
+@%:@ ------------------------------------
+@%:@ Finds an unsigned integer type with width BITS, setting cache variable VAR
+@%:@ accordingly.
+ac_fn_c_find_uintX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+printf %s "checking for uint$2_t... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main (void)
+{
+static int test_array @<:@1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)@:>@;
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  case $ac_type in @%:@(
+  uint$2_t) :
+    eval "$3=yes" ;; @%:@(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"
+then :
+  
+else case e in @%:@(
+  e) break ;;
+esac
+fi
+     done ;;
+esac
+fi
+eval ac_res=\$$3
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_find_uintX_t
+
+@%:@ ac_fn_c_find_intX_t LINENO BITS VAR
+@%:@ -----------------------------------
+@%:@ Finds a signed integer type with width BITS, setting cache variable VAR
+@%:@ accordingly.
+ac_fn_c_find_intX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
+printf %s "checking for int$2_t... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in int$2_t 'int' 'long int' \
+	 'long long int' 'short int' 'signed char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+	     enum { N = $2 / 2 - 1 };
+int
+main (void)
+{
+static int test_array @<:@1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))@:>@;
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+	        enum { N = $2 / 2 - 1 };
+int
+main (void)
+{
+static int test_array @<:@1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))@:>@;
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+else case e in @%:@(
+  e) case $ac_type in @%:@(
+  int$2_t) :
+    eval "$3=yes" ;; @%:@(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"
+then :
+  
+else case e in @%:@(
+  e) break ;;
+esac
+fi
+     done ;;
+esac
+fi
+eval ac_res=\$$3
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_find_intX_t
+
+@%:@ ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+@%:@ --------------------------------------------
+@%:@ Tries to find the compile-time value of EXPR in a program that includes
+@%:@ INCLUDES, setting VAR accordingly. Returns whether the value could be
+@%:@ computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+static int test_array @<:@1 - 2 * !(($2) >= 0)@:>@;
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_hi=$ac_mid; break
+else case e in @%:@(
+  e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  done
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+static int test_array @<:@1 - 2 * !(($2) < 0)@:>@;
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+static int test_array @<:@1 - 2 * !(($2) >= $ac_mid)@:>@;
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_lo=$ac_mid; break
+else case e in @%:@(
+  e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  done
+else case e in @%:@(
+  e) ac_lo= ac_hi= ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_hi=$ac_mid
+else case e in @%:@(
+  e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+done
+case $ac_lo in @%:@((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval (void) { return $2; }
+static unsigned long int ulongval (void) { return $2; }
+@%:@include <stdio.h>
+@%:@include <stdlib.h>
+int
+main (void)
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else case e in @%:@(
+  e) ac_retval=1 ;;
+esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} @%:@ ac_fn_c_compute_int
+
+@%:@ ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+@%:@ ----------------------------------------------------
+@%:@ Tries to find if the field MEMBER exists in type AGGR, after including
+@%:@ INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+printf %s "checking for $2.$3... " >&6; }
+if eval test \${$4+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main (void)
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$4=yes"
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main (void)
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$4=yes"
+else case e in @%:@(
+  e) eval "$4=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$4
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} @%:@ ac_fn_c_check_member
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?@<:@ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by XZ Utils $as_me 5.2.13, which was
+generated by GNU Autoconf 2.73.  Invocation command line was
+
+  $ $0$ac_configure_args_raw
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf '%s\n' "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+}
+
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+    echo
+    for ac_var in $ac_subst_files
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+      esac
+      printf '%s\n' "$ac_var='$ac_val'"
+    done | sort
+    echo
+  fi
+
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+}
+
+trap 'ac_exit_trap $?' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+printf '%s\n' "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+printf '%s\n' "@%:@define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+
+printf '%s\n' "@%:@define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+
+printf '%s\n' "@%:@define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+
+printf '%s\n' "@%:@define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+
+printf '%s\n' "@%:@define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+
+printf '%s\n' "@%:@define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+if test -n "$CONFIG_SITE"; then
+  ac_site_files="$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
+else
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+fi
+
+for ac_site_file in $ac_site_files
+do
+  case $ac_site_file in @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See 'config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (char **p, int i)
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* C89 style stringification. */
+#define noexpand_stringify(a) #a
+const char *stringified = noexpand_stringify(arbitrary+token=sequence);
+
+/* C89 style token pasting.  Exercises some of the corner cases that
+   e.g. old MSVC gets wrong, but not very hard. */
+#define noexpand_concat(a,b) a##b
+#define expand_concat(a,b) noexpand_concat(a,b)
+extern int vA;
+extern int vbee;
+#define aye A
+#define bee B
+int *pvA = &expand_concat(v,aye);
+int *pvbee = &noexpand_concat(v,bee);
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+/* Does the compiler advertise C99 conformance? */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+// See if C++-style comments work.
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+extern void free (void *);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, aND third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  const char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+  // Work around memory leak warnings.
+  free (ia);
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || ni.number != 58);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+/* Does the compiler advertise C11 conformance? */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
+gt_needs="$gt_needs "
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.rpath ltmain.sh compile missing install-sh config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}/build-aux"
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+  
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+  
+else case e in @%:@(
+  e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
+esac
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_@&t@config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_@&t@config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_@&t@configure="$SHELL ${ac_aux_dir}configure"
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
+	    and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in @%:@(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+
+echo
+echo "$PACKAGE_STRING"
+
+echo
+echo "System type:"
+# This is needed to know if assembler optimizations can be used.
+
+
+  
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+# We do some special things on Windows (32-bit or 64-bit) builds.
+case $host_os in
+	mingw* | cygwin | msys) is_w32=yes ;;
+	*)                      is_w32=no ;;
+esac
+ if test "$is_w32" = yes; then
+  COND_W32_TRUE=
+  COND_W32_FALSE='#'
+else
+  COND_W32_TRUE='#'
+  COND_W32_FALSE=
+fi
+
+
+# We need to use $EXEEXT with $(LN_S) when creating symlinks to
+# executables. Cygwin is an exception to this, since it is recommended
+# that symlinks don't have the .exe suffix. To make this work, we
+# define LN_EXEEXT.
+#
+# MSYS2 is treated the same way as Cygwin. It uses plain "msys" like
+# the original MSYS when building MSYS/MSYS2-binaries. Hopefully this
+# doesn't break things for the original MSYS developers. Note that this
+# doesn't affect normal MSYS/MSYS2 users building non-MSYS/MSYS2 binaries
+# since in that case the $host_os is usually mingw32.
+case $host_os in
+	cygwin | msys)  LN_EXEEXT= ;;
+	*)              LN_EXEEXT='$(EXEEXT)' ;;
+esac
+
+
+echo
+echo "Configure options:"
+AM_CFLAGS=
+
+
+#############
+# Debugging #
+#############
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if debugging code should be compiled" >&5
+printf %s "checking if debugging code should be compiled... " >&6; }
+@%:@ Check whether --enable-debug was given.
+if test ${enable_debug+y}
+then :
+  enableval=$enable_debug; 
+else case e in @%:@(
+  e) enable_debug=no ;;
+esac
+fi
+
+if test "x$enable_debug" = xyes; then
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+else
+	
+printf '%s\n' "@%:@define NDEBUG 1" >>confdefs.h
+
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+###########
+# Filters #
+###########
+
+
+
+
+enable_filter_lzma1=no
+enable_encoder_lzma1=no
+enable_decoder_lzma1=no
+enable_filter_lzma2=no
+enable_encoder_lzma2=no
+enable_decoder_lzma2=no
+enable_filter_delta=no
+enable_encoder_delta=no
+enable_decoder_delta=no
+enable_filter_x86=no
+enable_encoder_x86=no
+enable_decoder_x86=no
+enable_filter_powerpc=no
+enable_encoder_powerpc=no
+enable_decoder_powerpc=no
+enable_filter_ia64=no
+enable_encoder_ia64=no
+enable_decoder_ia64=no
+enable_filter_arm=no
+enable_encoder_arm=no
+enable_decoder_arm=no
+enable_filter_armthumb=no
+enable_encoder_armthumb=no
+enable_decoder_armthumb=no
+enable_filter_sparc=no
+enable_encoder_sparc=no
+enable_decoder_sparc=no
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which encoders to build" >&5
+printf %s "checking which encoders to build... " >&6; }
+@%:@ Check whether --enable-encoders was given.
+if test ${enable_encoders+y}
+then :
+  enableval=$enable_encoders; 
+else case e in @%:@(
+  e) enable_encoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc ;;
+esac
+fi
+
+enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'`
+if test "x$enable_encoders" = xno || test "x$enable_encoders" = x; then
+	enable_encoders=no
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
+printf '%s\n' "(none)" >&6; }
+else
+	for arg in $enable_encoders
+	do
+		case $arg in 
+			lzma1)
+				enable_filter_lzma1=yes
+				enable_encoder_lzma1=yes
+				
+printf '%s\n' "@%:@define HAVE_ENCODER_LZMA1 1" >>confdefs.h
+
+				;;
+			lzma2)
+				enable_filter_lzma2=yes
+				enable_encoder_lzma2=yes
+				
+printf '%s\n' "@%:@define HAVE_ENCODER_LZMA2 1" >>confdefs.h
+
+				;;
+			delta)
+				enable_filter_delta=yes
+				enable_encoder_delta=yes
+				
+printf '%s\n' "@%:@define HAVE_ENCODER_DELTA 1" >>confdefs.h
+
+				;;
+			x86)
+				enable_filter_x86=yes
+				enable_encoder_x86=yes
+				
+printf '%s\n' "@%:@define HAVE_ENCODER_X86 1" >>confdefs.h
+
+				;;
+			powerpc)
+				enable_filter_powerpc=yes
+				enable_encoder_powerpc=yes
+				
+printf '%s\n' "@%:@define HAVE_ENCODER_POWERPC 1" >>confdefs.h
+
+				;;
+			ia64)
+				enable_filter_ia64=yes
+				enable_encoder_ia64=yes
+				
+printf '%s\n' "@%:@define HAVE_ENCODER_IA64 1" >>confdefs.h
+
+				;;
+			arm)
+				enable_filter_arm=yes
+				enable_encoder_arm=yes
+				
+printf '%s\n' "@%:@define HAVE_ENCODER_ARM 1" >>confdefs.h
+
+				;;
+			armthumb)
+				enable_filter_armthumb=yes
+				enable_encoder_armthumb=yes
+				
+printf '%s\n' "@%:@define HAVE_ENCODER_ARMTHUMB 1" >>confdefs.h
+
+				;;
+			sparc)
+				enable_filter_sparc=yes
+				enable_encoder_sparc=yes
+				
+printf '%s\n' "@%:@define HAVE_ENCODER_SPARC 1" >>confdefs.h
+
+				;;
+			*)
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+				as_fn_error $? "unknown filter: $arg" "$LINENO" 5
+				;;
+		esac
+	done
+	
+printf '%s\n' "@%:@define HAVE_ENCODERS 1" >>confdefs.h
+
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_encoders" >&5
+printf '%s\n' "$enable_encoders" >&6; }
+fi
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which decoders to build" >&5
+printf %s "checking which decoders to build... " >&6; }
+@%:@ Check whether --enable-decoders was given.
+if test ${enable_decoders+y}
+then :
+  enableval=$enable_decoders; 
+else case e in @%:@(
+  e) enable_decoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc ;;
+esac
+fi
+
+enable_decoders=`echo "$enable_decoders" | sed 's/,/ /g'`
+if test "x$enable_decoders" = xno || test "x$enable_decoders" = x; then
+	enable_decoders=no
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
+printf '%s\n' "(none)" >&6; }
+else
+	for arg in $enable_decoders
+	do
+		case $arg in 
+			lzma1)
+				enable_filter_lzma1=yes
+				enable_decoder_lzma1=yes
+				
+printf '%s\n' "@%:@define HAVE_DECODER_LZMA1 1" >>confdefs.h
+
+				;;
+			lzma2)
+				enable_filter_lzma2=yes
+				enable_decoder_lzma2=yes
+				
+printf '%s\n' "@%:@define HAVE_DECODER_LZMA2 1" >>confdefs.h
+
+				;;
+			delta)
+				enable_filter_delta=yes
+				enable_decoder_delta=yes
+				
+printf '%s\n' "@%:@define HAVE_DECODER_DELTA 1" >>confdefs.h
+
+				;;
+			x86)
+				enable_filter_x86=yes
+				enable_decoder_x86=yes
+				
+printf '%s\n' "@%:@define HAVE_DECODER_X86 1" >>confdefs.h
+
+				;;
+			powerpc)
+				enable_filter_powerpc=yes
+				enable_decoder_powerpc=yes
+				
+printf '%s\n' "@%:@define HAVE_DECODER_POWERPC 1" >>confdefs.h
+
+				;;
+			ia64)
+				enable_filter_ia64=yes
+				enable_decoder_ia64=yes
+				
+printf '%s\n' "@%:@define HAVE_DECODER_IA64 1" >>confdefs.h
+
+				;;
+			arm)
+				enable_filter_arm=yes
+				enable_decoder_arm=yes
+				
+printf '%s\n' "@%:@define HAVE_DECODER_ARM 1" >>confdefs.h
+
+				;;
+			armthumb)
+				enable_filter_armthumb=yes
+				enable_decoder_armthumb=yes
+				
+printf '%s\n' "@%:@define HAVE_DECODER_ARMTHUMB 1" >>confdefs.h
+
+				;;
+			sparc)
+				enable_filter_sparc=yes
+				enable_decoder_sparc=yes
+				
+printf '%s\n' "@%:@define HAVE_DECODER_SPARC 1" >>confdefs.h
+
+				;;
+			*)
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+				as_fn_error $? "unknown filter: $arg" "$LINENO" 5
+				;;
+		esac
+	done
+	
+printf '%s\n' "@%:@define HAVE_DECODERS 1" >>confdefs.h
+
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_decoders" >&5
+printf '%s\n' "$enable_decoders" >&6; }
+fi
+
+if test "x$enable_encoder_lzma2$enable_encoder_lzma1" = xyesno \
+		|| test "x$enable_decoder_lzma2$enable_decoder_lzma1" = xyesno; then
+	as_fn_error $? "LZMA2 requires that LZMA1 is also enabled." "$LINENO" 5
+fi
+
+ if test "x$enable_encoders" != xno; then
+  COND_MAIN_ENCODER_TRUE=
+  COND_MAIN_ENCODER_FALSE='#'
+else
+  COND_MAIN_ENCODER_TRUE='#'
+  COND_MAIN_ENCODER_FALSE=
+fi
+
+ if test "x$enable_decoders" != xno; then
+  COND_MAIN_DECODER_TRUE=
+  COND_MAIN_DECODER_FALSE='#'
+else
+  COND_MAIN_DECODER_TRUE='#'
+  COND_MAIN_DECODER_FALSE=
+fi
+
+
+ if test "x$enable_filter_lzma1" = xyes; then
+  COND_FILTER_LZMA1_TRUE=
+  COND_FILTER_LZMA1_FALSE='#'
+else
+  COND_FILTER_LZMA1_TRUE='#'
+  COND_FILTER_LZMA1_FALSE=
+fi
+
+ if test "x$enable_encoder_lzma1" = xyes; then
+  COND_ENCODER_LZMA1_TRUE=
+  COND_ENCODER_LZMA1_FALSE='#'
+else
+  COND_ENCODER_LZMA1_TRUE='#'
+  COND_ENCODER_LZMA1_FALSE=
+fi
+
+ if test "x$enable_decoder_lzma1" = xyes; then
+  COND_DECODER_LZMA1_TRUE=
+  COND_DECODER_LZMA1_FALSE='#'
+else
+  COND_DECODER_LZMA1_TRUE='#'
+  COND_DECODER_LZMA1_FALSE=
+fi
+
+ if test "x$enable_filter_lzma2" = xyes; then
+  COND_FILTER_LZMA2_TRUE=
+  COND_FILTER_LZMA2_FALSE='#'
+else
+  COND_FILTER_LZMA2_TRUE='#'
+  COND_FILTER_LZMA2_FALSE=
+fi
+
+ if test "x$enable_encoder_lzma2" = xyes; then
+  COND_ENCODER_LZMA2_TRUE=
+  COND_ENCODER_LZMA2_FALSE='#'
+else
+  COND_ENCODER_LZMA2_TRUE='#'
+  COND_ENCODER_LZMA2_FALSE=
+fi
+
+ if test "x$enable_decoder_lzma2" = xyes; then
+  COND_DECODER_LZMA2_TRUE=
+  COND_DECODER_LZMA2_FALSE='#'
+else
+  COND_DECODER_LZMA2_TRUE='#'
+  COND_DECODER_LZMA2_FALSE=
+fi
+
+ if test "x$enable_filter_delta" = xyes; then
+  COND_FILTER_DELTA_TRUE=
+  COND_FILTER_DELTA_FALSE='#'
+else
+  COND_FILTER_DELTA_TRUE='#'
+  COND_FILTER_DELTA_FALSE=
+fi
+
+ if test "x$enable_encoder_delta" = xyes; then
+  COND_ENCODER_DELTA_TRUE=
+  COND_ENCODER_DELTA_FALSE='#'
+else
+  COND_ENCODER_DELTA_TRUE='#'
+  COND_ENCODER_DELTA_FALSE=
+fi
+
+ if test "x$enable_decoder_delta" = xyes; then
+  COND_DECODER_DELTA_TRUE=
+  COND_DECODER_DELTA_FALSE='#'
+else
+  COND_DECODER_DELTA_TRUE='#'
+  COND_DECODER_DELTA_FALSE=
+fi
+
+ if test "x$enable_filter_x86" = xyes; then
+  COND_FILTER_X86_TRUE=
+  COND_FILTER_X86_FALSE='#'
+else
+  COND_FILTER_X86_TRUE='#'
+  COND_FILTER_X86_FALSE=
+fi
+
+ if test "x$enable_encoder_x86" = xyes; then
+  COND_ENCODER_X86_TRUE=
+  COND_ENCODER_X86_FALSE='#'
+else
+  COND_ENCODER_X86_TRUE='#'
+  COND_ENCODER_X86_FALSE=
+fi
+
+ if test "x$enable_decoder_x86" = xyes; then
+  COND_DECODER_X86_TRUE=
+  COND_DECODER_X86_FALSE='#'
+else
+  COND_DECODER_X86_TRUE='#'
+  COND_DECODER_X86_FALSE=
+fi
+
+ if test "x$enable_filter_powerpc" = xyes; then
+  COND_FILTER_POWERPC_TRUE=
+  COND_FILTER_POWERPC_FALSE='#'
+else
+  COND_FILTER_POWERPC_TRUE='#'
+  COND_FILTER_POWERPC_FALSE=
+fi
+
+ if test "x$enable_encoder_powerpc" = xyes; then
+  COND_ENCODER_POWERPC_TRUE=
+  COND_ENCODER_POWERPC_FALSE='#'
+else
+  COND_ENCODER_POWERPC_TRUE='#'
+  COND_ENCODER_POWERPC_FALSE=
+fi
+
+ if test "x$enable_decoder_powerpc" = xyes; then
+  COND_DECODER_POWERPC_TRUE=
+  COND_DECODER_POWERPC_FALSE='#'
+else
+  COND_DECODER_POWERPC_TRUE='#'
+  COND_DECODER_POWERPC_FALSE=
+fi
+
+ if test "x$enable_filter_ia64" = xyes; then
+  COND_FILTER_IA64_TRUE=
+  COND_FILTER_IA64_FALSE='#'
+else
+  COND_FILTER_IA64_TRUE='#'
+  COND_FILTER_IA64_FALSE=
+fi
+
+ if test "x$enable_encoder_ia64" = xyes; then
+  COND_ENCODER_IA64_TRUE=
+  COND_ENCODER_IA64_FALSE='#'
+else
+  COND_ENCODER_IA64_TRUE='#'
+  COND_ENCODER_IA64_FALSE=
+fi
+
+ if test "x$enable_decoder_ia64" = xyes; then
+  COND_DECODER_IA64_TRUE=
+  COND_DECODER_IA64_FALSE='#'
+else
+  COND_DECODER_IA64_TRUE='#'
+  COND_DECODER_IA64_FALSE=
+fi
+
+ if test "x$enable_filter_arm" = xyes; then
+  COND_FILTER_ARM_TRUE=
+  COND_FILTER_ARM_FALSE='#'
+else
+  COND_FILTER_ARM_TRUE='#'
+  COND_FILTER_ARM_FALSE=
+fi
+
+ if test "x$enable_encoder_arm" = xyes; then
+  COND_ENCODER_ARM_TRUE=
+  COND_ENCODER_ARM_FALSE='#'
+else
+  COND_ENCODER_ARM_TRUE='#'
+  COND_ENCODER_ARM_FALSE=
+fi
+
+ if test "x$enable_decoder_arm" = xyes; then
+  COND_DECODER_ARM_TRUE=
+  COND_DECODER_ARM_FALSE='#'
+else
+  COND_DECODER_ARM_TRUE='#'
+  COND_DECODER_ARM_FALSE=
+fi
+
+ if test "x$enable_filter_armthumb" = xyes; then
+  COND_FILTER_ARMTHUMB_TRUE=
+  COND_FILTER_ARMTHUMB_FALSE='#'
+else
+  COND_FILTER_ARMTHUMB_TRUE='#'
+  COND_FILTER_ARMTHUMB_FALSE=
+fi
+
+ if test "x$enable_encoder_armthumb" = xyes; then
+  COND_ENCODER_ARMTHUMB_TRUE=
+  COND_ENCODER_ARMTHUMB_FALSE='#'
+else
+  COND_ENCODER_ARMTHUMB_TRUE='#'
+  COND_ENCODER_ARMTHUMB_FALSE=
+fi
+
+ if test "x$enable_decoder_armthumb" = xyes; then
+  COND_DECODER_ARMTHUMB_TRUE=
+  COND_DECODER_ARMTHUMB_FALSE='#'
+else
+  COND_DECODER_ARMTHUMB_TRUE='#'
+  COND_DECODER_ARMTHUMB_FALSE=
+fi
+
+ if test "x$enable_filter_sparc" = xyes; then
+  COND_FILTER_SPARC_TRUE=
+  COND_FILTER_SPARC_FALSE='#'
+else
+  COND_FILTER_SPARC_TRUE='#'
+  COND_FILTER_SPARC_FALSE=
+fi
+
+ if test "x$enable_encoder_sparc" = xyes; then
+  COND_ENCODER_SPARC_TRUE=
+  COND_ENCODER_SPARC_FALSE='#'
+else
+  COND_ENCODER_SPARC_TRUE='#'
+  COND_ENCODER_SPARC_FALSE=
+fi
+
+ if test "x$enable_decoder_sparc" = xyes; then
+  COND_DECODER_SPARC_TRUE=
+  COND_DECODER_SPARC_FALSE='#'
+else
+  COND_DECODER_SPARC_TRUE='#'
+  COND_DECODER_SPARC_FALSE=
+fi
+
+
+# The so called "simple filters" share common code.
+enable_filter_simple=no
+enable_encoder_simple=no
+enable_decoder_simple=no
+test "x$enable_filter_x86" = xyes && enable_filter_simple=yes
+test "x$enable_encoder_x86" = xyes && enable_encoder_simple=yes
+test "x$enable_decoder_x86" = xyes && enable_decoder_simple=yes
+test "x$enable_filter_powerpc" = xyes && enable_filter_simple=yes
+test "x$enable_encoder_powerpc" = xyes && enable_encoder_simple=yes
+test "x$enable_decoder_powerpc" = xyes && enable_decoder_simple=yes
+test "x$enable_filter_ia64" = xyes && enable_filter_simple=yes
+test "x$enable_encoder_ia64" = xyes && enable_encoder_simple=yes
+test "x$enable_decoder_ia64" = xyes && enable_decoder_simple=yes
+test "x$enable_filter_arm" = xyes && enable_filter_simple=yes
+test "x$enable_encoder_arm" = xyes && enable_encoder_simple=yes
+test "x$enable_decoder_arm" = xyes && enable_decoder_simple=yes
+test "x$enable_filter_armthumb" = xyes && enable_filter_simple=yes
+test "x$enable_encoder_armthumb" = xyes && enable_encoder_simple=yes
+test "x$enable_decoder_armthumb" = xyes && enable_decoder_simple=yes
+test "x$enable_filter_sparc" = xyes && enable_filter_simple=yes
+test "x$enable_encoder_sparc" = xyes && enable_encoder_simple=yes
+test "x$enable_decoder_sparc" = xyes && enable_decoder_simple=yes
+ if test "x$enable_filter_simple" = xyes; then
+  COND_FILTER_SIMPLE_TRUE=
+  COND_FILTER_SIMPLE_FALSE='#'
+else
+  COND_FILTER_SIMPLE_TRUE='#'
+  COND_FILTER_SIMPLE_FALSE=
+fi
+
+ if test "x$enable_encoder_simple" = xyes; then
+  COND_ENCODER_SIMPLE_TRUE=
+  COND_ENCODER_SIMPLE_FALSE='#'
+else
+  COND_ENCODER_SIMPLE_TRUE='#'
+  COND_ENCODER_SIMPLE_FALSE=
+fi
+
+ if test "x$enable_decoder_simple" = xyes; then
+  COND_DECODER_SIMPLE_TRUE=
+  COND_DECODER_SIMPLE_FALSE='#'
+else
+  COND_DECODER_SIMPLE_TRUE='#'
+  COND_DECODER_SIMPLE_FALSE=
+fi
+
+
+# LZ-based filters share common code.
+enable_filter_lz=no
+enable_encoder_lz=no
+enable_decoder_lz=no
+test "x$enable_filter_lzma1" = xyes && enable_filter_lz=yes
+test "x$enable_encoder_lzma1" = xyes && enable_encoder_lz=yes
+test "x$enable_decoder_lzma1" = xyes && enable_decoder_lz=yes
+test "x$enable_filter_lzma2" = xyes && enable_filter_lz=yes
+test "x$enable_encoder_lzma2" = xyes && enable_encoder_lz=yes
+test "x$enable_decoder_lzma2" = xyes && enable_decoder_lz=yes
+ if test "x$enable_filter_lz" = xyes; then
+  COND_FILTER_LZ_TRUE=
+  COND_FILTER_LZ_FALSE='#'
+else
+  COND_FILTER_LZ_TRUE='#'
+  COND_FILTER_LZ_FALSE=
+fi
+
+ if test "x$enable_encoder_lz" = xyes; then
+  COND_ENCODER_LZ_TRUE=
+  COND_ENCODER_LZ_FALSE='#'
+else
+  COND_ENCODER_LZ_TRUE='#'
+  COND_ENCODER_LZ_FALSE=
+fi
+
+ if test "x$enable_decoder_lz" = xyes; then
+  COND_DECODER_LZ_TRUE=
+  COND_DECODER_LZ_FALSE='#'
+else
+  COND_DECODER_LZ_TRUE='#'
+  COND_DECODER_LZ_FALSE=
+fi
+
+
+
+#################
+# Match finders #
+#################
+
+
+
+enable_match_finder_hc3=no
+enable_match_finder_hc4=no
+enable_match_finder_bt2=no
+enable_match_finder_bt3=no
+enable_match_finder_bt4=no
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which match finders to build" >&5
+printf %s "checking which match finders to build... " >&6; }
+@%:@ Check whether --enable-match-finders was given.
+if test ${enable_match_finders+y}
+then :
+  enableval=$enable_match_finders; 
+else case e in @%:@(
+  e) enable_match_finders=hc3,hc4,bt2,bt3,bt4 ;;
+esac
+fi
+
+enable_match_finders=`echo "$enable_match_finders" | sed 's/,/ /g'`
+if test "x$enable_encoder_lz" = xyes ; then
+	if test -z "$enable_match_finders"; then
+		as_fn_error $? "At least one match finder is required for an LZ-based encoder." "$LINENO" 5
+	fi
+
+	for arg in $enable_match_finders
+		do
+		case $arg in 
+			hc3)
+				enable_match_finder_hc3=yes
+				
+printf '%s\n' "@%:@define HAVE_MF_HC3 1" >>confdefs.h
+
+				;;
+			hc4)
+				enable_match_finder_hc4=yes
+				
+printf '%s\n' "@%:@define HAVE_MF_HC4 1" >>confdefs.h
+
+				;;
+			bt2)
+				enable_match_finder_bt2=yes
+				
+printf '%s\n' "@%:@define HAVE_MF_BT2 1" >>confdefs.h
+
+				;;
+			bt3)
+				enable_match_finder_bt3=yes
+				
+printf '%s\n' "@%:@define HAVE_MF_BT3 1" >>confdefs.h
+
+				;;
+			bt4)
+				enable_match_finder_bt4=yes
+				
+printf '%s\n' "@%:@define HAVE_MF_BT4 1" >>confdefs.h
+
+				;;
+			*)
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+				as_fn_error $? "unknown match finder: $arg" "$LINENO" 5
+				;;
+		esac
+	done
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_match_finders" >&5
+printf '%s\n' "$enable_match_finders" >&6; }
+else
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (none because not building any LZ-based encoder)" >&5
+printf '%s\n' "(none because not building any LZ-based encoder)" >&6; }
+fi
+
+
+####################
+# Integrity checks #
+####################
+
+
+
+enable_check_crc32=no
+enable_check_crc64=no
+enable_check_sha256=no
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which integrity checks to build" >&5
+printf %s "checking which integrity checks to build... " >&6; }
+@%:@ Check whether --enable-checks was given.
+if test ${enable_checks+y}
+then :
+  enableval=$enable_checks; 
+else case e in @%:@(
+  e) enable_checks=crc32,crc64,sha256 ;;
+esac
+fi
+
+enable_checks=`echo "$enable_checks" | sed 's/,/ /g'`
+if test "x$enable_checks" = xno || test "x$enable_checks" = x; then
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
+printf '%s\n' "(none)" >&6; }
+else
+	for arg in $enable_checks
+	do
+		case $arg in 
+			crc32)
+				enable_check_crc32=yes
+				
+printf '%s\n' "@%:@define HAVE_CHECK_CRC32 1" >>confdefs.h
+
+				;;
+			crc64)
+				enable_check_crc64=yes
+				
+printf '%s\n' "@%:@define HAVE_CHECK_CRC64 1" >>confdefs.h
+
+				;;
+			sha256)
+				enable_check_sha256=yes
+				
+printf '%s\n' "@%:@define HAVE_CHECK_SHA256 1" >>confdefs.h
+
+				;;
+			*)
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+				as_fn_error $? "unknown integrity check: $arg" "$LINENO" 5
+				;;
+		esac
+	done
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_checks" >&5
+printf '%s\n' "$enable_checks" >&6; }
+fi
+if test "x$enable_check_crc32" = xno ; then
+	as_fn_error $? "For now, the CRC32 check must always be enabled." "$LINENO" 5
+fi
+
+ if test "x$enable_check_crc32" = xyes; then
+  COND_CHECK_CRC32_TRUE=
+  COND_CHECK_CRC32_FALSE='#'
+else
+  COND_CHECK_CRC32_TRUE='#'
+  COND_CHECK_CRC32_FALSE=
+fi
+
+ if test "x$enable_check_crc64" = xyes; then
+  COND_CHECK_CRC64_TRUE=
+  COND_CHECK_CRC64_FALSE='#'
+else
+  COND_CHECK_CRC64_TRUE='#'
+  COND_CHECK_CRC64_FALSE=
+fi
+
+ if test "x$enable_check_sha256" = xyes; then
+  COND_CHECK_SHA256_TRUE=
+  COND_CHECK_SHA256_FALSE='#'
+else
+  COND_CHECK_SHA256_TRUE='#'
+  COND_CHECK_SHA256_FALSE=
+fi
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if external SHA-256 should be used" >&5
+printf %s "checking if external SHA-256 should be used... " >&6; }
+@%:@ Check whether --enable-external-sha256 was given.
+if test ${enable_external_sha256+y}
+then :
+  enableval=$enable_external_sha256; 
+else case e in @%:@(
+  e) enable_external_sha256=no ;;
+esac
+fi
+
+if test "x$enable_check_sha256" != "xyes"; then
+	enable_external_sha256=no
+fi
+if test "x$enable_external_sha256" = xyes; then
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+else
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+###########################
+# Assembler optimizations #
+###########################
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if assembler optimizations should be used" >&5
+printf %s "checking if assembler optimizations should be used... " >&6; }
+@%:@ Check whether --enable-assembler was given.
+if test ${enable_assembler+y}
+then :
+  enableval=$enable_assembler; 
+else case e in @%:@(
+  e) enable_assembler=yes ;;
+esac
+fi
+
+if test "x$enable_assembler" = xyes; then
+	enable_assembler=no
+	case $host_os in
+		# Darwin should work too but only if not creating universal
+		# binaries. Solaris x86 could work too but I cannot test.
+		linux* | *bsd* | mingw* | cygwin | msys | *djgpp*)
+			case $host_cpu in
+				i?86)   enable_assembler=x86 ;;
+				x86_64) enable_assembler=x86_64 ;;
+			esac
+			;;
+	esac
+fi
+case $enable_assembler in
+	x86 | x86_64 | no)
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_assembler" >&5
+printf '%s\n' "$enable_assembler" >&6; }
+		;;
+	*)
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+		as_fn_error $? "--enable-assembler accepts only \`yes', \`no', \`x86', or \`x86_64'." "$LINENO" 5
+		;;
+esac
+ if test "x$enable_assembler" = xx86; then
+  COND_ASM_X86_TRUE=
+  COND_ASM_X86_FALSE='#'
+else
+  COND_ASM_X86_TRUE='#'
+  COND_ASM_X86_FALSE=
+fi
+
+ if test "x$enable_assembler" = xx86_64; then
+  COND_ASM_X86_64_TRUE=
+  COND_ASM_X86_64_FALSE='#'
+else
+  COND_ASM_X86_64_TRUE='#'
+  COND_ASM_X86_64_FALSE=
+fi
+
+
+
+#####################
+# Size optimization #
+#####################
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if small size is preferred over speed" >&5
+printf %s "checking if small size is preferred over speed... " >&6; }
+@%:@ Check whether --enable-small was given.
+if test ${enable_small+y}
+then :
+  enableval=$enable_small; 
+else case e in @%:@(
+  e) enable_small=no ;;
+esac
+fi
+
+if test "x$enable_small" = xyes; then
+	
+printf '%s\n' "@%:@define HAVE_SMALL 1" >>confdefs.h
+
+elif test "x$enable_small" != xno; then
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+	as_fn_error $? "--enable-small accepts only \`yes' or \`no'" "$LINENO" 5
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_small" >&5
+printf '%s\n' "$enable_small" >&6; }
+ if test "x$enable_small" = xyes; then
+  COND_SMALL_TRUE=
+  COND_SMALL_FALSE='#'
+else
+  COND_SMALL_TRUE='#'
+  COND_SMALL_FALSE=
+fi
+
+
+
+#############
+# Threading #
+#############
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if threading support is wanted" >&5
+printf %s "checking if threading support is wanted... " >&6; }
+@%:@ Check whether --enable-threads was given.
+if test ${enable_threads+y}
+then :
+  enableval=$enable_threads; 
+else case e in @%:@(
+  e) enable_threads=yes ;;
+esac
+fi
+
+
+if test "x$enable_threads" = xyes; then
+	case $host_os in
+		mingw*)
+			case $host_cpu in
+				i?86)   enable_threads=win95 ;;
+				*)      enable_threads=vista ;;
+			esac
+			;;
+		*)
+			enable_threads=posix
+			;;
+	esac
+fi
+
+case $enable_threads in
+	posix | win95 | vista)
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes, $enable_threads" >&5
+printf '%s\n' "yes, $enable_threads" >&6; }
+		;;
+	no)
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+		;;
+	*)
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+		as_fn_error $? "--enable-threads only accepts \`yes', \`no', \`posix', \`win95', or \`vista'" "$LINENO" 5
+		;;
+esac
+
+# The Win95 threading lacks thread-safe one-time initialization function.
+# It's better to disallow it instead of allowing threaded but thread-unsafe
+# build.
+if test "x$enable_small$enable_threads" = xyeswin95; then
+	as_fn_error $? "--enable-threads=win95 and --enable-small cannot be
+		used at the same time" "$LINENO" 5
+fi
+
+# We use the actual result a little later.
+
+
+#########################
+# Assumed amount of RAM #
+#########################
+
+# We use 128 MiB as default, because it will allow decompressing files
+# created with "xz -9". It would be slightly safer to guess a lower value,
+# but most systems, on which we don't have any way to determine the amount
+# of RAM, will probably have at least 128 MiB of RAM.
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how much RAM to assume if the real amount is unknown" >&5
+printf %s "checking how much RAM to assume if the real amount is unknown... " >&6; }
+@%:@ Check whether --enable-assume-ram was given.
+if test ${enable_assume_ram+y}
+then :
+  enableval=$enable_assume_ram; 
+else case e in @%:@(
+  e) enable_assume_ram=128 ;;
+esac
+fi
+
+assume_ram_check=`echo "$enable_assume_ram" | tr -d 0123456789`
+if test -z "$enable_assume_ram" || test -n "$assume_ram_check"; then
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+	as_fn_error $? "--enable-assume-ram accepts only an integer argument" "$LINENO" 5
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_assume_ram MiB" >&5
+printf '%s\n' "$enable_assume_ram MiB" >&6; }
+
+printf '%s\n' "@%:@define ASSUME_RAM $enable_assume_ram" >>confdefs.h
+
+
+
+#########################
+# Components to install #
+#########################
+
+@%:@ Check whether --enable-xz was given.
+if test ${enable_xz+y}
+then :
+  enableval=$enable_xz; 
+else case e in @%:@(
+  e) enable_xz=yes ;;
+esac
+fi
+
+ if test x$enable_xz != xno; then
+  COND_XZ_TRUE=
+  COND_XZ_FALSE='#'
+else
+  COND_XZ_TRUE='#'
+  COND_XZ_FALSE=
+fi
+
+
+@%:@ Check whether --enable-xzdec was given.
+if test ${enable_xzdec+y}
+then :
+  enableval=$enable_xzdec; 
+else case e in @%:@(
+  e) enable_xzdec=yes ;;
+esac
+fi
+
+test "x$enable_decoders" = xno && enable_xzdec=no
+ if test x$enable_xzdec != xno; then
+  COND_XZDEC_TRUE=
+  COND_XZDEC_FALSE='#'
+else
+  COND_XZDEC_TRUE='#'
+  COND_XZDEC_FALSE=
+fi
+
+
+@%:@ Check whether --enable-lzmadec was given.
+if test ${enable_lzmadec+y}
+then :
+  enableval=$enable_lzmadec; 
+else case e in @%:@(
+  e) enable_lzmadec=yes ;;
+esac
+fi
+
+test "x$enable_decoder_lzma1" = xno && enable_lzmadec=no
+ if test x$enable_lzmadec != xno; then
+  COND_LZMADEC_TRUE=
+  COND_LZMADEC_FALSE='#'
+else
+  COND_LZMADEC_TRUE='#'
+  COND_LZMADEC_FALSE=
+fi
+
+
+@%:@ Check whether --enable-lzmainfo was given.
+if test ${enable_lzmainfo+y}
+then :
+  enableval=$enable_lzmainfo; 
+else case e in @%:@(
+  e) enable_lzmainfo=yes ;;
+esac
+fi
+
+test "x$enable_decoder_lzma1" = xno && enable_lzmainfo=no
+ if test x$enable_lzmainfo != xno; then
+  COND_LZMAINFO_TRUE=
+  COND_LZMAINFO_FALSE='#'
+else
+  COND_LZMAINFO_TRUE='#'
+  COND_LZMAINFO_FALSE=
+fi
+
+
+@%:@ Check whether --enable-lzma-links was given.
+if test ${enable_lzma_links+y}
+then :
+  enableval=$enable_lzma_links; 
+else case e in @%:@(
+  e) enable_lzma_links=yes ;;
+esac
+fi
+
+ if test x$enable_lzma_links != xno; then
+  COND_LZMALINKS_TRUE=
+  COND_LZMALINKS_FALSE='#'
+else
+  COND_LZMALINKS_TRUE='#'
+  COND_LZMALINKS_FALSE=
+fi
+
+
+@%:@ Check whether --enable-scripts was given.
+if test ${enable_scripts+y}
+then :
+  enableval=$enable_scripts; 
+else case e in @%:@(
+  e) enable_scripts=yes ;;
+esac
+fi
+
+ if test x$enable_scripts != xno; then
+  COND_SCRIPTS_TRUE=
+  COND_SCRIPTS_FALSE='#'
+else
+  COND_SCRIPTS_TRUE='#'
+  COND_SCRIPTS_FALSE=
+fi
+
+
+@%:@ Check whether --enable-doc was given.
+if test ${enable_doc+y}
+then :
+  enableval=$enable_doc; 
+else case e in @%:@(
+  e) enable_doc=yes ;;
+esac
+fi
+
+ if test x$enable_doc != xno; then
+  COND_DOC_TRUE=
+  COND_DOC_FALSE='#'
+else
+  COND_DOC_TRUE='#'
+  COND_DOC_FALSE=
+fi
+
+
+
+##############
+# Sandboxing #
+##############
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if sandboxing should be used" >&5
+printf %s "checking if sandboxing should be used... " >&6; }
+@%:@ Check whether --enable-sandbox was given.
+if test ${enable_sandbox+y}
+then :
+  enableval=$enable_sandbox; 
+else case e in @%:@(
+  e) enable_sandbox=auto ;;
+esac
+fi
+
+case $enable_sandbox in
+	auto)
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: maybe (autodetect)" >&5
+printf '%s\n' "maybe (autodetect)" >&6; }
+		;;
+	no | capsicum)
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_sandbox" >&5
+printf '%s\n' "$enable_sandbox" >&6; }
+		;;
+	*)
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+		as_fn_error $? "--enable-sandbox only accepts \`auto', \`no', or \`capsicum'." "$LINENO" 5
+		;;
+esac
+
+
+###########################
+# PATH prefix for scripts #
+###########################
+
+# The scripts can add a prefix to the search PATH so that POSIX tools
+# or the xz binary is always in the PATH.
+@%:@ Check whether --enable-path-for-scripts was given.
+if test ${enable_path_for_scripts+y}
+then :
+  enableval=$enable_path_for_scripts; 
+else case e in @%:@(
+  e) 
+		case $host_os in
+			solaris*) enable_path_for_scripts=/usr/xpg4/bin ;;
+			*)        enable_path_for_scripts= ;;
+		esac
+	 ;;
+esac
+fi
+
+if test -n "$enable_path_for_scripts" && test "x$enable_path_for_scripts" != xno ; then
+	enable_path_for_scripts="PATH=$enable_path_for_scripts:\$PATH"
+else
+	enable_path_for_scripts=
+fi
+
+
+
+###############################################################################
+# Checks for programs.
+###############################################################################
+
+echo
+case $host_os in
+	solaris*)
+		# The gnulib POSIX shell macro below may pick a shell that
+		# doesn't work with xzgrep. Workaround by picking a shell
+		# that is known to work.
+		if test -z "$gl_cv_posix_shell" && test -x /usr/xpg4/bin/sh; then
+			gl_cv_posix_shell=/usr/xpg4/bin/sh
+		fi
+		;;
+esac
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a shell that conforms to POSIX" >&5
+printf %s "checking for a shell that conforms to POSIX... " >&6; }
+if test ${gl_cv_posix_shell+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) gl_test_posix_shell_script='
+       func_return () {
+	 (exit $1)
+       }
+       func_success () {
+	 func_return 0
+       }
+       func_failure () {
+	 func_return 1
+       }
+       func_ret_success () {
+	 return 0
+       }
+       func_ret_failure () {
+	 return 1
+       }
+       subshell_umask_sanity () {
+	 (umask 22; (umask 0); test $(umask) -eq 22)
+       }
+       test "$(echo foo)" = foo &&
+       func_success &&
+       ! func_failure &&
+       func_ret_success &&
+       ! func_ret_failure &&
+       (set x && func_ret_success y && test x = "$1") &&
+       subshell_umask_sanity
+     '
+     for gl_cv_posix_shell in \
+	 "$CONFIG_SHELL" "$SHELL" /bin/sh /bin/bash /bin/ksh /bin/sh5 no; do
+       case $gl_cv_posix_shell in
+         /*)
+	   "$gl_cv_posix_shell" -c "$gl_test_posix_shell_script" 2>/dev/null \
+	     && break;;
+       esac
+     done ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_posix_shell" >&5
+printf '%s\n' "$gl_cv_posix_shell" >&6; }
+
+  if test "$gl_cv_posix_shell" != no; then
+    POSIX_SHELL=$gl_cv_posix_shell
+    PREFERABLY_POSIX_SHELL=$POSIX_SHELL
+  else
+    POSIX_SHELL=
+    PREFERABLY_POSIX_SHELL=/bin/sh
+  fi
+  
+  
+
+if test -z "$POSIX_SHELL" && test "x$enable_scripts" = xyes ; then
+	as_fn_error $? "No POSIX conforming shell (sh) was found." "$LINENO" 5
+fi
+
+echo
+echo "Initializing Automake:"
+
+# We don't use "subdir-objects" yet because it breaks "make distclean" when
+# dependencies are enabled (as of Automake 1.14.1) due to this bug:
+# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354
+# The -Wno-unsupported is used to silence warnings about missing
+# "subdir-objects".
+am__api_version='1.18'
+
+
+  # Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test ${ac_cv_path_install+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in @%:@((
+  ./ | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+ ;;
+esac
+fi
+  if test ${ac_cv_path_install+y}; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if sleep 0.001 2>/dev/null
+then :
+  am_cv_sleep_fractional_seconds=yes
+else case e in @%:@(
+  e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf '%s\n' "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+# 
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+  # Even a millisecond often causes a bunch of false positives,
+  # so just try a hundredth of a second. The time saved between .001 and
+  # .01 is not terribly consequential.
+  am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer.  Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works.  Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+     set X `ls -t conftest.ts[12]` &&
+     {
+       test "$*" != "X conftest.ts1 conftest.ts2" ||
+       test "$*" != "X conftest.ts2 conftest.ts1";
+     }
+); then :; else
+  # If neither matched, then we have a broken ls.  This can happen
+  # if, for instance, CONFIG_SHELL is bash and it inherits a
+  # broken ls alias from the environment.  This has actually
+  # happened.  Such a system could not be considered "sane".
+  printf '%s\n' ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+  # Any one fine-grained sleep might happen to cross the boundary
+  # between two values of a coarser actual resolution, but if we do
+  # two fine-grained sleeps in a row, at least one of them will fall
+  # entirely within a coarse interval.
+  echo alpha > conftest.ts1
+  sleep $am_try_res
+  echo beta > conftest.ts2
+  sleep $am_try_res
+  echo gamma > conftest.ts3
+
+  # We assume that 'ls -t' will make use of high-resolution
+  # timestamps if the operating system supports them at all.
+  if (set X `ls -t conftest.ts?` &&
+      test "$2" = conftest.ts3 &&
+      test "$3" = conftest.ts2 &&
+      test "$4" = conftest.ts1); then
+    #
+    # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+    # because we don't need to test make.
+    make_ok=true
+    if test $am_try_res != 1; then
+      # But if we've succeeded so far with a subsecond resolution, we
+      # have one more thing to check: make. It can happen that
+      # everything else supports the subsecond mtimes, but make doesn't;
+      # notably on macOS, which ships make 3.81 from 2006 (the last one
+      # released under GPLv2). https://bugs.gnu.org/68808
+      # 
+      # We test $MAKE if it is defined in the environment, else "make".
+      # It might get overridden later, but our hope is that in practice
+      # it does not matter: it is the system "make" which is (by far)
+      # the most likely to be broken, whereas if the user overrides it,
+      # probably they did so with a better, or at least not worse, make.
+      # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+      #
+      # Create a Makefile (real tab character here):
+      rm -f conftest.mk
+      echo 'conftest.ts1: conftest.ts2' >conftest.mk
+      echo '	touch conftest.ts2' >>conftest.mk
+      #
+      # Now, running
+      #   touch conftest.ts1; touch conftest.ts2; make
+      # should touch ts1 because ts2 is newer. This could happen by luck,
+      # but most often, it will fail if make's support is insufficient. So
+      # test for several consecutive successes.
+      #
+      # (We reuse conftest.ts[12] because we still want to modify existing
+      # files, not create new ones, per above.)
+      n=0
+      make=${MAKE-make}
+      until test $n -eq 3; do
+        echo one > conftest.ts1
+        sleep $am_try_res
+        echo two > conftest.ts2 # ts2 should now be newer than ts1
+        if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+          make_ok=false
+          break # out of $n loop
+        fi
+        n=`expr $n + 1`
+      done
+    fi
+    #
+    if $make_ok; then
+      # Everything we know to check worked out, so call this resolution good.
+      am_cv_filesystem_timestamp_resolution=$am_try_res
+      break # out of $am_try_res loop
+    fi
+    # Otherwise, we'll go on to check the next resolution.
+  fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf '%s\n' "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+printf %s "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+  echo "timestamp, slept: $am_has_slept" > conftest.file
+  if (
+    set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+    if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+    fi
+    test "$2" = conftest.file
+  ); then
+    am_build_env_is_sane=yes
+    break
+  fi
+  # Just in case.
+  sleep "$am_cv_filesystem_timestamp_resolution"
+  am_has_slept=yes
+done
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf '%s\n' "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+  as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+  
+else case e in @%:@(
+  e)   ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
+  am_sleep_pid=$!
+ ;;
+esac
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was 's,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`printf '%s\n' "$program_transform_name" | sed "$ac_script"`
+
+
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+
+  if test x"${MISSING+set}" != xset; then
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf '%s\n' "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+printf %s "checking for a race-free mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test ${ac_cv_path_mkdir+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir ('*'coreutils) '* | \
+	     *'BusyBox '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+ ;;
+esac
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test ${ac_cv_path_mkdir+y}; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use plain mkdir -p,
+    # in the hope it doesn't have the bugs of ancient mkdir.
+    MKDIR_P='mkdir -p'
+  fi
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf '%s\n' "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk 'busybox awk'
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make ;;
+esac
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+  SET_MAKE=
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+AM_DEFAULT_VERBOSITY=1
+@%:@ Check whether --enable-silent-rules was given.
+if test ${enable_silent_rules+y}
+then :
+  enableval=$enable_silent_rules; 
+fi
+
+am_make=${MAKE-make}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if printf '%s\n' 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf '%s\n' "$am_cv_make_support_nested_variables" >&6; }
+AM_BACKSLASH='\'
+
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+  
+else case e in @%:@(
+  e) am__rm_f_notfound='""' ;;
+esac
+fi
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+  am_cv_xargs_n_works=yes
+else case e in @%:@(
+  e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf '%s\n' "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+  am__xargs_n='xargs -n'
+else case e in @%:@(
+  e)   am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='xz'
+ VERSION='5.2.13'
+
+
+printf '%s\n' "@%:@define PACKAGE \"$PACKAGE\"" >>confdefs.h
+
+ 
+printf '%s\n' "@%:@define VERSION \"$VERSION\"" >>confdefs.h
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+
+
+
+
+
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+printf %s "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
+am__doit:
+	@echo this is the am__doit target >confinc.out
+.PHONY: am__doit
+END
+am__include="#"
+am__quote=
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in @%:@(
+  '0:this is the am__doit target') :
+    case $s in @%:@(
+  BSD) :
+    am__include='.include' am__quote='"' ;; @%:@(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; @%:@(
+  *) :
+     ;;
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf '%s\n' "${_am_result}" >&6; }
+
+@%:@ Check whether --enable-dependency-tracking was given.
+if test ${enable_dependency_tracking+y}
+then :
+  enableval=$enable_dependency_tracking; 
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $@%:@ != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
+  fi
+fi
+fi ;;
+esac
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+
+
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See 'config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion -version; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
+# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an '-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else case e in @%:@(
+  e) ac_file='' ;;
+esac
+fi
+if test -z "$ac_file"
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
+  # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
+# catch 'conftest.exe'.  For instance with Cygwin, 'ls conftest' will
+# work properly (i.e., refer to 'conftest.exe'), while it won't with
+# 'rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else case e in @%:@(
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+@%:@include <stdio.h>
+int
+main (void)
+{
+FILE *f = fopen ("conftest.out", "w");
+ if (!f)
+  return 1;
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
+If you meant to cross compile, use '--host'.
+See 'config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext \
+  conftest.o conftest.obj conftest.out
+ac_clean_files=$ac_clean_files_save
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf '%s\n' "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else case e in @%:@(
+  e) printf '%s\n' "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_compiler_gnu=yes
+else case e in @%:@(
+  e) ac_compiler_gnu=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+y}
+ac_save_CFLAGS=$CFLAGS
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_g=yes
+else case e in @%:@(
+  e) CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+else case e in @%:@(
+  e) ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c11=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11 -std:c11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in @%:@(
+  e) if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89 ;;
+esac
+fi
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+printf %s "checking whether $CC understands -c and -o together... " >&6; }
+if test ${am_cv_prog_cc_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  # aligned with autoconf, so not including core; see bug#72225.
+  rm -f -r a.out a.exe b.out conftest.$ac_ext conftest.$ac_objext \
+    conftest.dSYM conftest1.$ac_ext conftest1.$ac_objext conftest1.dSYM \
+    conftest2.$ac_ext conftest2.$ac_objext conftest2.dSYM
+  unset am_i ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf '%s\n' "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+depcc="$CC"   am_compiler_list=
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+printf %s "checking dependency style of $depcc... " >&6; }
+if test ${am_cv_CC_dependencies_compiler_type+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thus:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if 
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+if test x$ac_cv_prog_cc_c99 = xno ; then
+	as_fn_error $? "No C99 compiler was found." "$LINENO" 5
+fi
+
+
+# By default we simply use the C compiler to build assembly code.
+
+test "${CCAS+set}" = set || CCAS=$CC
+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+
+
+
+depcc="$CCAS"   am_compiler_list=
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+printf %s "checking dependency style of $depcc... " >&6; }
+if test ${am_cv_CCAS_dependencies_compiler_type+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CCAS_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thus:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CCAS_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CCAS_dependencies_compiler_type=none
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CCAS_dependencies_compiler_type" >&6; }
+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
+
+ if 
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
+  am__fastdepCCAS_TRUE=
+  am__fastdepCCAS_FALSE='#'
+else
+  am__fastdepCCAS_TRUE='#'
+  am__fastdepCCAS_FALSE=
+fi
+
+
+
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+  
+printf '%s\n' "@%:@define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+    
+  
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_safe_to_define___extensions__=yes
+else case e in @%:@(
+  e) ac_cv_safe_to_define___extensions__=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_should_define__xopen_source=no
+    if test $ac_cv_header_wchar_h = yes
+then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+          #include <wchar.h>
+          mbstate_t x;
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+            #define _XOPEN_SOURCE 500
+            #include <wchar.h>
+            mbstate_t x;
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
+
+  printf '%s\n' "@%:@define _ALL_SOURCE 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _COSMO_SOURCE 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _GNU_SOURCE 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _NETBSD_SOURCE 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _OPENBSD_SOURCE 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
+
+  if test $ac_cv_header_minix_config_h = yes
+then :
+  MINIX=yes
+    printf '%s\n' "@%:@define _MINIX 1" >>confdefs.h
+
+    printf '%s\n' "@%:@define _POSIX_SOURCE 1" >>confdefs.h
+
+    printf '%s\n' "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else case e in @%:@(
+  e) MINIX= ;;
+esac
+fi
+  if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+  printf '%s\n' "@%:@define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+  if test $ac_cv_should_define__xopen_source = yes
+then :
+  printf '%s\n' "@%:@define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)           ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in @%:@(
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+@%:@(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)     # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+@%:@include <limits.h>
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+  
+else case e in @%:@(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+@%:@include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+  # Broken: success on invalid input.
+continue
+else case e in @%:@(
+  e) # Passes both tests.
+ac_preproc_ok=:
+break ;;
+esac
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok
+then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+   ;;
+esac
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+@%:@include <limits.h>
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+  
+else case e in @%:@(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+@%:@include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+  # Broken: success on invalid input.
+continue
+else case e in @%:@(
+  e) # Passes both tests.
+ac_preproc_ok=:
+break ;;
+esac
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok
+then :
+  
+else case e in @%:@(
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+printf %s "checking for egrep -e... " >&6; }
+if test ${ac_cv_path_EGREP_TRADITIONAL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -z "$EGREP_TRADITIONAL"; then
+  ac_path_EGREP_TRADITIONAL_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+  # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
+*GNU*)
+  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+@%:@(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
+    "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+      ac_path_EGREP_TRADITIONAL_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_TRADITIONAL_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
+    :
+  fi
+else
+  ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
+fi
+
+    if test "$ac_cv_path_EGREP_TRADITIONAL"
+then :
+  ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E"
+else case e in @%:@(
+  e) if test -z "$EGREP_TRADITIONAL"; then
+  ac_path_EGREP_TRADITIONAL_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+  # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in @%:@(
+*GNU*)
+  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+@%:@(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
+    "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+      ac_path_EGREP_TRADITIONAL_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_TRADITIONAL_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
+fi
+ ;;
+esac
+fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf '%s\n' "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+ EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to detect undeclared functions" >&5
+printf %s "checking for $CC options to detect undeclared functions... " >&6; }
+if test ${ac_cv_c_undeclared_builtin_options+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_save_CFLAGS=$CFLAGS
+   ac_cv_c_undeclared_builtin_options='cannot detect'
+   for ac_arg in '' -fno-builtin; do
+     CFLAGS="$ac_save_CFLAGS $ac_arg"
+     # This test program should *not* compile successfully.
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+(void) strchr;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+else case e in @%:@(
+  e) # This test program should compile successfully.
+        # No library function is consistently available on
+        # freestanding implementations, so test against a dummy
+        # declaration.  Include always-available headers on the
+        # off chance that they somehow elicit warnings.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <float.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stddef.h>
+extern void ac_decl (int, char *);
+
+int
+main (void)
+{
+(void) ac_decl (0, (char *) 0);
+  (void) ac_decl;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  if test x"$ac_arg" = x
+then :
+  ac_cv_c_undeclared_builtin_options='none needed'
+else case e in @%:@(
+  e) ac_cv_c_undeclared_builtin_options=$ac_arg ;;
+esac
+fi
+          break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    done
+    CFLAGS=$ac_save_CFLAGS
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf '%s\n' "$ac_cv_c_undeclared_builtin_options" >&6; }
+  case $ac_cv_c_undeclared_builtin_options in @%:@(
+  'cannot detect') :
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "cannot make $CC report undeclared builtins
+See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
+  'none needed') :
+    ac_c_undeclared_builtin_options='' ;; @%:@(
+  *) :
+    ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
+esac
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to ignore future-version functions" >&5
+printf %s "checking for $CC options to ignore future-version functions... " >&6; }
+if test ${ac_cv_c_future_darwin_options+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)       ac_compile_saved="$ac_compile"
+   ac_compile="$ac_compile -Werror=unguarded-availability-new"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if ! (defined __APPLE__ && defined __MACH__)
+	   #error "-Werror=unguarded-availability-new not needed here"
+	  #endif
+	
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_future_darwin_options='-Werror=unguarded-availability-new'
+else case e in @%:@(
+  e) ac_cv_c_future_darwin_options='none needed' ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_compile="$ac_compile_saved"
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_future_darwin_options" >&5
+printf '%s\n' "$ac_cv_c_future_darwin_options" >&6; }
+ case $ac_cv_c_future_darwin_options in @%:@(
+  'none needed') :
+    ac_c_future_darwin_options='' ;; @%:@(
+  *) :
+    ac_c_future_darwin_options=$ac_cv_c_future_darwin_options ;;
+esac
+
+case $enable_threads in @%:@(
+  posix) :
+    
+		echo
+		echo "POSIX threading support:"
+		
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on Tru64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
+        ax_pthread_save_CC="$CC"
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        if test "x$PTHREAD_CC" != "x"
+then :
+  CC="$PTHREAD_CC"
+fi
+        if test "x$PTHREAD_CXX" != "x"
+then :
+  CXX="$PTHREAD_CXX"
+fi
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
+printf %s "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_join (void);
+int
+main (void)
+{
+return pthread_join ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ax_pthread_ok=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+printf '%s\n' "$ax_pthread_ok" >&6; }
+        if test "x$ax_pthread_ok" = "xno"; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        CC="$ax_pthread_save_CC"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try. Items with a "," contain both
+# C compiler flags (before ",") and linker flags (after ","). Other items
+# starting with a "-" are C compiler flags, and remaining items are
+# library names, except for "none" which indicates that we try without
+# any flags at all, and "pthread-config" which is a program returning
+# the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
+#           (Note: HP C rejects this with "bad form for `-t' option")
+# -pthreads: Solaris/gcc (Note: HP C also rejects)
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads and
+#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
+#      is present but should not be used directly; and before -mthreads,
+#      because the compiler interprets this as "-mt" + "-hreads")
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case $host_os in
+
+        freebsd*)
+
+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+
+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+        ;;
+
+        hpux*)
+
+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
+        # multi-threading and also sets -lpthread."
+
+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+        ;;
+
+        openedition*)
+
+        # IBM z/OS requires a feature-test macro to be defined in order to
+        # enable POSIX threads at all, so give the user a hint if this is
+        # not set. (We don't define these ourselves, as they can affect
+        # other portions of the system API in unpredictable ways.)
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
+             AX_PTHREAD_ZOS_MISSING
+#            endif
+            
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP_TRADITIONAL "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5
+printf '%s\n' "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;}
+fi
+rm -rf conftest*
+
+        ;;
+
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed. (N.B.: The stubs are missing
+        # pthread_cleanup_push, or rather a function called by this macro,
+        # so we could check for that, but who knows whether they'll stub
+        # that too in a future libc.)  So we'll check first for the
+        # standard Solaris way of linking pthreads (-mt -lpthread).
+
+        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
+        ;;
+esac
+
+# Are we compiling with Clang?
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5
+printf %s "checking whether $CC is Clang... " >&6; }
+if test ${ax_cv_PTHREAD_CLANG+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ax_cv_PTHREAD_CLANG=no
+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
+     if test "x$GCC" = "xyes"; then
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
+#            if defined(__clang__) && defined(__llvm__)
+             AX_PTHREAD_CC_IS_CLANG
+#            endif
+            
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP_TRADITIONAL "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1
+then :
+  ax_cv_PTHREAD_CLANG=yes
+fi
+rm -rf conftest*
+
+     fi
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5
+printf '%s\n' "$ax_cv_PTHREAD_CLANG" >&6; }
+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+
+
+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
+
+# Note that for GCC and Clang -pthread generally implies -lpthread,
+# except when -nostdlib is passed.
+# This is problematic using libtool to build C++ shared libraries with pthread:
+# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
+# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
+# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
+# To solve this, first try -pthread together with -lpthread for GCC
+
+if test "x$GCC" = "xyes"
+then :
+  ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"
+fi
+
+# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
+
+if test "x$ax_pthread_clang" = "xyes"
+then :
+  ax_pthread_flags="-pthread,-lpthread -pthread"
+fi
+
+
+# The presence of a feature test macro requesting re-entrant function
+# definitions is, on some systems, a strong hint that pthreads support is
+# correctly enabled
+
+case $host_os in
+        darwin* | hpux* | linux* | osf* | solaris*)
+        ax_pthread_check_macro="_REENTRANT"
+        ;;
+
+        aix*)
+        ax_pthread_check_macro="_THREAD_SAFE"
+        ;;
+
+        *)
+        ax_pthread_check_macro="--"
+        ;;
+esac
+if test "x$ax_pthread_check_macro" = "x--"
+then :
+  ax_pthread_check_cond=0
+else case e in @%:@(
+  e) ax_pthread_check_cond="!defined($ax_pthread_check_macro)" ;;
+esac
+fi
+
+
+if test "x$ax_pthread_ok" = "xno"; then
+for ax_pthread_try_flag in $ax_pthread_flags; do
+
+        case $ax_pthread_try_flag in
+                none)
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
+printf %s "checking whether pthreads work without any flags... " >&6; }
+                ;;
+
+                *,*)
+                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
+                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"" >&5
+printf %s "checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"... " >&6; }
+                ;;
+
+                -*)
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
+printf %s "checking whether pthreads work with $ax_pthread_try_flag... " >&6; }
+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                ;;
+
+                pthread-config)
+                # Extract the first word of "pthread-config", so it can be a program name with args.
+set dummy pthread-config; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ax_pthread_config+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ax_pthread_config"; then
+  ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ax_pthread_config="yes"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no"
+fi ;;
+esac
+fi
+ax_pthread_config=$ac_cv_prog_ax_pthread_config
+if test -n "$ax_pthread_config"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
+printf '%s\n' "$ax_pthread_config" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+                if test "x$ax_pthread_config" = "xno"
+then :
+  continue
+fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
+printf %s "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; }
+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                ;;
+        esac
+
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+#                       if $ax_pthread_check_cond
+#                        error "$ax_pthread_check_macro must be defined"
+#                       endif
+                        static void *some_global = NULL;
+                        static void routine(void *a)
+                          {
+                             /* To avoid any unused-parameter or
+                                unused-but-set-parameter warning.  */
+                             some_global = a;
+                          }
+                        static void *start_routine(void *a) { return a; }
+int
+main (void)
+{
+pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ax_pthread_ok=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+printf '%s\n' "$ax_pthread_ok" >&6; }
+        if test "x$ax_pthread_ok" = "xyes"
+then :
+  break
+fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+
+# Clang needs special handling, because older versions handle the -pthread
+# option in a rather... idiosyncratic way
+
+if test "x$ax_pthread_clang" = "xyes"; then
+
+        # Clang takes -pthread; it has never supported any other flag
+
+        # (Note 1: This will need to be revisited if a system that Clang
+        # supports has POSIX threads in a separate library.  This tends not
+        # to be the way of modern systems, but it's conceivable.)
+
+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
+        # to get POSIX threads support; the API is always present and
+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+        # -pthread does define _REENTRANT, and while the Darwin headers
+        # ignore this macro, third-party headers might not.)
+
+        # However, older versions of Clang make a point of warning the user
+        # that, in an invocation where only linking and no compilation is
+        # taking place, the -pthread option has no effect ("argument unused
+        # during compilation").  They expect -pthread to be passed in only
+        # when source code is being compiled.
+        #
+        # Problem is, this is at odds with the way Automake and most other
+        # C build frameworks function, which is that the same flags used in
+        # compilation (CFLAGS) are also used in linking.  Many systems
+        # supported by AX_PTHREAD require exactly this for POSIX threads
+        # support, and in fact it is often not straightforward to specify a
+        # flag that is used only in the compilation phase and not in
+        # linking.  Such a scenario is extremely rare in practice.
+        #
+        # Even though use of the -pthread flag in linking would only print
+        # a warning, this can be a nuisance for well-run software projects
+        # that build with -Werror.  So if the active version of Clang has
+        # this misfeature, we search for an option to squash it.
+
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
+printf %s "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; }
+if test ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
+             # Create an alternate version of $ac_link that compiles and
+             # links in two steps (.c -> .o, .o -> exe) instead of one
+             # (.c -> exe), because the warning occurs only in the second
+             # step
+             ax_pthread_save_ac_link="$ac_link"
+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+             ax_pthread_link_step=`printf '%s\n' "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+             ax_pthread_save_CFLAGS="$CFLAGS"
+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+                if test "x$ax_pthread_try" = "xunknown"
+then :
+  break
+fi
+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+                ac_link="$ax_pthread_save_ac_link"
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main(void){return 0;}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_link="$ax_pthread_2step_ac_link"
+                     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main(void){return 0;}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+                    
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+             done
+             ac_link="$ax_pthread_save_ac_link"
+             CFLAGS="$ax_pthread_save_CFLAGS"
+             if test "x$ax_pthread_try" = "x"
+then :
+  ax_pthread_try=no
+fi
+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+             ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5
+printf '%s\n' "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; }
+
+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+                no | unknown) ;;
+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+        esac
+
+fi # $ax_pthread_clang = yes
+
+
+
+# Various other checks:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
+printf %s "checking for joinable pthread attribute... " >&6; }
+if test ${ax_cv_PTHREAD_JOINABLE_ATTR+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ax_cv_PTHREAD_JOINABLE_ATTR=unknown
+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main (void)
+{
+int attr = $ax_pthread_attr; return attr /* ; */
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+             done
+             ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5
+printf '%s\n' "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; }
+        if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+               test "x$ax_pthread_joinable_attr_defined" != "xyes"
+then :
+  
+printf '%s\n' "@%:@define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR" >>confdefs.h
+
+               ax_pthread_joinable_attr_defined=yes
+              
+fi
+
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
+printf %s "checking whether more special flags are required for pthreads... " >&6; }
+if test ${ax_cv_PTHREAD_SPECIAL_FLAGS+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ax_cv_PTHREAD_SPECIAL_FLAGS=no
+             case $host_os in
+             solaris*)
+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+             ;;
+             esac
+             ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5
+printf '%s\n' "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; }
+        if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+               test "x$ax_pthread_special_flags_added" != "xyes"
+then :
+  PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
+               ax_pthread_special_flags_added=yes
+fi
+
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
+printf %s "checking for PTHREAD_PRIO_INHERIT... " >&6; }
+if test ${ax_cv_PTHREAD_PRIO_INHERIT+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main (void)
+{
+int i = PTHREAD_PRIO_INHERIT;
+                                               return i;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ax_cv_PTHREAD_PRIO_INHERIT=yes
+else case e in @%:@(
+  e) ax_cv_PTHREAD_PRIO_INHERIT=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+             ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
+printf '%s\n' "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
+        if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+               test "x$ax_pthread_prio_inherit_defined" != "xyes"
+then :
+  
+printf '%s\n' "@%:@define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
+
+               ax_pthread_prio_inherit_defined=yes
+              
+fi
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != "xyes"; then
+            case $host_os in
+                aix*)
+                case "x/$CC" in @%:@(
+  x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6) :
+    #handle absolute path differently from PATH based program lookup
+                     case "x$CC" in @%:@(
+  x/*) :
+    
+			   if as_fn_executable_p ${CC}_r
+then :
+  PTHREAD_CC="${CC}_r"
+fi
+			   if test "x${CXX}" != "x"
+then :
+  if as_fn_executable_p ${CXX}_r
+then :
+  PTHREAD_CXX="${CXX}_r"
+fi
+fi
+			  ;; @%:@(
+  *) :
+    
+			   for ac_prog in ${CC}_r
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_PTHREAD_CC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$PTHREAD_CC"; then
+  ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_PTHREAD_CC="$ac_prog"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
+if test -n "$PTHREAD_CC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
+printf '%s\n' "$PTHREAD_CC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+  test -n "$PTHREAD_CC" && break
+done
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+			   if test "x${CXX}" != "x"
+then :
+  for ac_prog in ${CXX}_r
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_PTHREAD_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$PTHREAD_CXX"; then
+  ac_cv_prog_PTHREAD_CXX="$PTHREAD_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_PTHREAD_CXX="$ac_prog"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+PTHREAD_CXX=$ac_cv_prog_PTHREAD_CXX
+if test -n "$PTHREAD_CXX"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CXX" >&5
+printf '%s\n' "$PTHREAD_CXX" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+  test -n "$PTHREAD_CXX" && break
+done
+test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX"
+
+fi
+			 
+                      ;;
+esac
+                     ;; @%:@(
+  *) :
+     ;;
+esac
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX"
+
+
+
+
+
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test "x$ax_pthread_ok" = "xyes"; then
+        :
+        :
+else
+        ax_pthread_ok=no
+        
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ 		LIBS="$LIBS $PTHREAD_LIBS"
+		AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
+
+								
+		
+printf '%s\n' "@%:@define MYTHREAD_POSIX 1" >>confdefs.h
+
+
+		# These are nice to have but not mandatory.
+		#
+		# FIXME: xz uses clock_gettime if it is available and can do
+		# it even when threading is disabled. Moving this outside
+		# of pthread detection may be undesirable because then
+		# liblzma may get linked against librt even when librt isn't
+		# needed by liblzma.
+		OLD_CFLAGS=$CFLAGS
+		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
+printf %s "checking for library containing clock_gettime... " >&6; }
+if test ${ac_cv_search_clock_gettime+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clock_gettime (void);
+int
+main (void)
+{
+return clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' rt
+do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_search_clock_gettime=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext
+  if test ${ac_cv_search_clock_gettime+y}
+then :
+  break
+fi
+done
+if test ${ac_cv_search_clock_gettime+y}
+then :
+  
+else case e in @%:@(
+  e) ac_cv_search_clock_gettime=no ;;
+esac
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
+printf '%s\n' "$ac_cv_search_clock_gettime" >&6; }
+ac_res=$ac_cv_search_clock_gettime
+if test "$ac_res" != no
+then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  
+fi
+
+		ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
+if test "x$ac_cv_func_clock_gettime" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pthread_condattr_setclock" "ac_cv_func_pthread_condattr_setclock"
+if test "x$ac_cv_func_pthread_condattr_setclock" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_PTHREAD_CONDATTR_SETCLOCK 1" >>confdefs.h
+
+fi
+
+		ac_fn_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_have_decl_CLOCK_MONOTONIC" "#include <time.h>
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_CLOCK_MONOTONIC" = xyes
+then :
+  ac_have_decl=1
+else case e in @%:@(
+  e) ac_have_decl=0 ;;
+esac
+fi
+printf '%s\n' "@%:@define HAVE_DECL_CLOCK_MONOTONIC $ac_have_decl" >>confdefs.h
+
+		CFLAGS=$OLD_CFLAGS
+	 ;; @%:@(
+  win95) :
+    
+		
+printf '%s\n' "@%:@define MYTHREAD_WIN95 1" >>confdefs.h
+
+	 ;; @%:@(
+  vista) :
+    
+		
+printf '%s\n' "@%:@define MYTHREAD_VISTA 1" >>confdefs.h
+
+	
+ ;; @%:@(
+  *) :
+     ;;
+esac
+ if test "x$enable_threads" != xno; then
+  COND_THREADS_TRUE=
+  COND_THREADS_FALSE='#'
+else
+  COND_THREADS_TRUE='#'
+  COND_THREADS_FALSE=
+fi
+
+
+echo
+echo "Initializing Libtool:"
+
+case `pwd` in
+  *\ * | *\	*)
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.6.0'
+macro_revision='2.6.0'
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+
+
+  
+ltmain=$ac_aux_dir/ltmain.sh
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+printf %s "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case $ECHO in
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
+esac
+
+
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)           ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in @%:@(
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+@%:@(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in @%:@(
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+@%:@(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+ 
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in @%:@(
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+@%:@(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+ 
+         EGREP_TRADITIONAL=$EGREP
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+printf %s "checking for fgrep... " >&6; }
+if test ${ac_cv_path_FGREP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in fgrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in @%:@(
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+@%:@(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+ 
+
+test -z "$GREP" && GREP=grep
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+
+
+
+@%:@ Check whether --with-gnu-ld was given.
+if test ${with_gnu_ld+y}
+then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else case e in @%:@(
+  e) with_gnu_ld=no ;;
+esac
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw* | *-*-windows*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
+fi
+if test ${lt_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi ;;
+esac
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${lt_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+    
+    
+    
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test ${lt_cv_path_NM+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DUMPBIN+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+    
+    
+    
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+printf %s "checking the name lister ($NM) interface... " >&6; }
+if test ${lt_cv_nm_interface+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest* ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
+
+# find the maximum length of command line arguments
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+printf %s "checking the maximum length of command line arguments... " >&6; }
+if test ${lt_cv_sys_max_cmd_len+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)   i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | windows* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+ ;;
+esac
+fi
+
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+    
+    
+    
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+    
+    
+    
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+    
+    
+    
+
+    
+    
+    
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+printf %s "checking how to convert $build file names to $host format... " >&6; }
+if test ${lt_cv_to_host_file_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* | *-*-windows* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* | *-*-windows* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+ ;;
+esac
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
+
+    
+    
+    
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+printf %s "checking how to convert $build file names to toolchain format... " >&6; }
+if test ${lt_cv_to_tool_file_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* | *-*-windows* )
+    case $build in
+      *-*-mingw* | *-*-windows* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+ ;;
+esac
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
+
+    
+    
+    
+
+case $host in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in @%:@(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in @%:@(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+      
+    
+    
+    
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+  
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in @%:@(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; @%:@(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; @%:@(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+        
+fi
+     ;; @%:@(
+  *) :
+     ;;
+esac
+  
+ ;; @%:@(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+printf %s "checking for $LD option to reload object files... " >&6; }
+if test ${lt_cv_ld_reload_flag+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_ld_reload_flag='-r' ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | windows* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+    
+    
+    
+
+    
+    
+    
+
+# Extract the first word of "file", so it can be a program name with args.
+set dummy file; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FILECMD+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$FILECMD"; then
+  ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FILECMD="file"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_FILECMD" && ac_cv_prog_FILECMD=":"
+fi ;;
+esac
+fi
+FILECMD=$ac_cv_prog_FILECMD
+if test -n "$FILECMD"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+
+    
+    
+    
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+printf %s "checking how to recognize dependent libraries... " >&6; }
+if test ${lt_cv_deplibs_check_method+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='$FILECMD -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | windows* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly* | midnightbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=$FILECMD
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=$FILECMD
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+*-mlibc)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=$FILECMD
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+serenity*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | windows* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+printf %s "checking how to associate runtime and link libraries... " >&6; }
+if test ${lt_cv_sharedlib_from_linklib_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | windows* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+    
+    
+    
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+
+    
+    
+    
+
+
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because that's what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+
+    
+    
+    
+
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+
+    
+    
+    
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+printf %s "checking for archiver @FILE support... " >&6; }
+if test ${lt_cv_ar_at_file+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+    
+    
+    
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+    
+    
+    
+
+
+
+test -z "$RANLIB" && RANLIB=:
+
+    
+    
+    
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+  old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+printf %s "checking command to parse $NM output from $compiler object... " >&6; }
+if test ${lt_cv_sys_global_symbol_pipe+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | windows* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BCDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw* | windows*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(void){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+ ;;
+esac
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+printf %s "checking for sysroot... " >&6; }
+
+@%:@ Check whether --with-sysroot was given.
+if test ${with_sysroot+y}
+then :
+  withval=$with_sysroot; 
+else case e in @%:@(
+  e) with_sysroot=no ;;
+esac
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     # Trim trailing / since we'll always append absolute paths and we want
+     # to avoid //, if only for less confusing output for the user.
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
+
+    
+    
+    
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+printf %s "checking for a working dd... " >&6; }
+if test ${ac_cv_path_lt_DD+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in dd
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+printf %s "checking how to truncate binary pipes... " >&6; }
+if test ${lt_cv_truncate_bin+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
+
+    
+    
+    
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+@%:@ Check whether --enable-libtool-lock was given.
+if test ${enable_libtool_lock+y}
+then :
+  enableval=$enable_libtool_lock; 
+fi
+
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `$FILECMD conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `$FILECMD conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `$FILECMD conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `$FILECMD conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `$FILECMD conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `$FILECMD conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `$FILECMD conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*|x86_64-gnu*)
+	    case `$FILECMD conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*|x86_64-gnu*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+printf %s "checking whether the C compiler needs -belf... " >&6; }
+if test ${lt_cv_cc_needs_belf+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  lt_cv_cc_needs_belf=yes
+else case e in @%:@(
+  e) lt_cv_cc_needs_belf=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `$FILECMD conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_MANIFEST_TOOL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if test ${lt_cv_path_manifest_tool+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_path_manifest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_manifest_tool=yes
+  fi
+  rm -f conftest* ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
+if test yes != "$lt_cv_path_manifest_tool"; then
+  MANIFEST_TOOL=:
+fi
+
+    
+    
+    
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_LIPO+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_LIPO+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OTOOL64+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OTOOL64+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+
+
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+printf %s "checking for -single_module linker flag... " >&6; }
+if test ${lt_cv_apple_cc_single_mod+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
+
+    # Feature test to disable chained fixups since it is not
+    # compatible with '-undefined dynamic_lookup'
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+printf %s "checking for -no_fixup_chains linker flag... " >&6; }
+if test ${lt_cv_support_no_fixup_chains+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)  save_LDFLAGS=$LDFLAGS
+        LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  lt_cv_support_no_fixup_chains=yes
+else case e in @%:@(
+  e) lt_cv_support_no_fixup_chains=no
+         ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS=$save_LDFLAGS
+      
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
+
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+printf %s "checking for -exported_symbols_list linker flag... " >&6; }
+if test ${lt_cv_ld_exported_symbols_list+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  lt_cv_ld_exported_symbols_list=yes
+else case e in @%:@(
+  e) lt_cv_ld_exported_symbols_list=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS=$save_LDFLAGS
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+printf %s "checking for -force_load linker flag... " >&6; }
+if test ${lt_cv_ld_force_load+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main(void) { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.[012],*|,*powerpc*-darwin[5-8]*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'
+          if test yes = "$lt_cv_support_no_fixup_chains"; then
+            as_fn_append _lt_dar_allow_undefined ' $wl-no_fixup_chains'
+          fi
+        ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    _lt_dar_needs_single_mod=no
+    case $host_os in
+    rhapsody* | darwin1.*)
+      _lt_dar_needs_single_mod=yes ;;
+    darwin*)
+      # When targeting Mac OS X 10.4 (darwin 8) or later,
+      # -single_module is the default and -multi_module is unsupported.
+      # The toolchain on macOS 10.14 (darwin 18) and later cannot
+      # target any OS version that needs -single_module.
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+      10.0,*-darwin[567].*|10.[0-3],*-darwin[5-9].*|10.[0-3],*-darwin1[0-7].*)
+        _lt_dar_needs_single_mod=yes ;;
+      esac
+    ;;
+    esac
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_DLFCN_H 1" >>confdefs.h
+
+fi
+
+
+
+
+
+# Set options
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AS+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AS+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+    
+    
+    
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+    
+    
+    
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+    
+    
+    
+
+
+
+        enable_dlopen=no
+  
+
+  
+            @%:@ Check whether --enable-shared was given.
+if test ${enable_shared+y}
+then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else case e in @%:@(
+  e) enable_shared=yes ;;
+esac
+fi
+
+
+    
+    
+    
+    
+
+
+
+  @%:@ Check whether --enable-static was given.
+if test ${enable_static+y}
+then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else case e in @%:@(
+  e) enable_static=yes ;;
+esac
+fi
+
+
+    
+    
+    
+    
+
+
+
+  @%:@ Check whether --enable-pic was given.
+if test ${enable_pic+y}
+then :
+  enableval=$enable_pic; lt_p=${PACKAGE-default}
+     case $enableval in
+     yes|no) pic_mode=$enableval ;;
+     *)
+       pic_mode=default
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+       for lt_pkg in $enableval; do
+	 IFS=$lt_save_ifs
+	 if test "X$lt_pkg" = "X$lt_p"; then
+	   pic_mode=yes
+	 fi
+       done
+       IFS=$lt_save_ifs
+       ;;
+     esac
+else case e in @%:@(
+  e)           @%:@ Check whether --with-pic was given.
+if test ${with_pic+y}
+then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+	 case $withval in
+	 yes|no) pic_mode=$withval ;;
+	 *)
+	   pic_mode=default
+	   # Look at the argument we got.  We use all the common list separators.
+	   lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+	   for lt_pkg in $withval; do
+	     IFS=$lt_save_ifs
+	     if test "X$lt_pkg" = "X$lt_p"; then
+	       pic_mode=yes
+	     fi
+	   done
+	   IFS=$lt_save_ifs
+	   ;;
+	 esac
+else case e in @%:@(
+  e) pic_mode=default ;;
+esac
+fi
+
+     ;;
+esac
+fi
+
+
+
+    
+    
+    
+
+
+  stdlibflag=-nostdlib
+@%:@ Check whether --enable-cxx-stdlib was given.
+if test ${enable_cxx_stdlib+y}
+then :
+  enableval=$enable_cxx_stdlib; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_cxx_stdlib=yes ;;
+    no) enable_cxx_stdlib=no ;;
+    *)
+     enable_cxx_stdlib=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_cxx_stdlib=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else case e in @%:@(
+  e) enable_cxx_stdlib=no ;;
+esac
+fi
+
+
+if test yes = "$enable_cxx_stdlib"; then
+  stdlibflag=
+fi
+
+
+    
+    
+    
+
+    
+    
+    
+
+
+  @%:@ Check whether --enable-fast-install was given.
+if test ${enable_fast_install+y}
+then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else case e in @%:@(
+  e) enable_fast_install=yes ;;
+esac
+fi
+
+
+
+    
+    
+    
+
+
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+printf %s "checking which variant of shared library versioning to provide... " >&6; }
+  @%:@ Check whether --enable-aix-soname was given.
+if test ${enable_aix_soname+y}
+then :
+  enableval=$enable_aix_soname; case $enableval in
+     aix|svr4|both)
+       ;;
+     *)
+       as_fn_error $? "Unknown argument to --enable-aix-soname" "$LINENO" 5
+       ;;
+     esac
+     lt_cv_with_aix_soname=$enable_aix_soname
+else case e in @%:@(
+  e) @%:@ Check whether --with-aix-soname was given.
+if test ${with_aix_soname+y}
+then :
+  withval=$with_aix_soname; case $withval in
+         aix|svr4|both)
+           ;;
+         *)
+           as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+           ;;
+         esac
+         lt_cv_with_aix_soname=$with_aix_soname
+else case e in @%:@(
+  e) if test ${lt_cv_with_aix_soname+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_with_aix_soname=aix ;;
+esac
+fi
+ ;;
+esac
+fi
+
+     enable_aix_soname=$lt_cv_with_aix_soname ;;
+esac
+fi
+
+  with_aix_soname=$enable_aix_soname
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+power*-*-aix[5-9]*,'')
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: for $host, specify if building shared libraries for versioning (svr4|both)" >&5
+printf '%s\n' "$as_me: WARNING: for $host, specify if building shared libraries for versioning (svr4|both)" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+printf %s "checking which variant of shared library versioning to provide... " >&6; }
+  with_aix_soname=aix
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (default) $with_aix_soname" >&5
+printf '%s\n' "(default) $with_aix_soname" >&6; }
+  ;;
+*)
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+printf %s "checking which variant of shared library versioning to provide... " >&6; }
+  with_aix_soname=aix
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (default) $with_aix_soname" >&5
+printf '%s\n' "(default) $with_aix_soname" >&6; }
+  ;;
+esac
+
+
+    
+    
+    
+
+
+  
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+test -z "$LN_S" && LN_S="ln -s"
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+printf %s "checking for objdir... " >&6; }
+if test ${lt_cv_objdir+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+    
+    
+    
+
+printf '%s\n' "@%:@define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+printf %s "checking for ${ac_tool_prefix}file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+    
+    
+    
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+printf %s "checking for file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC=$CC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(void){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  
+lt_prog_compiler_no_builtin_flag=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test ${lt_cv_prog_compiler_rtti_exceptions+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+    
+    
+    
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      *flang* | ftn | f18* | f95*)
+        # Flang compiler.
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort* | icx* | ifx*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    serenity*)
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic@&t@ -DPIC"
+    ;;
+esac
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+printf %s "checking for $compiler option to produce PIC... " >&6; }
+if test ${lt_cv_prog_compiler_pic+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test ${lt_cv_prog_compiler_pic_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic@&t@ -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+    
+    
+    
+
+
+
+    
+    
+    
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test ${lt_cv_prog_compiler_static_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.expsym conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+    
+    
+    
+
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
+
+    
+    
+    
+
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+printf %s "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+    
+    
+    
+
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | windows* | pw32* | cegcc*)
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++ or Intel C++ Compiler.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+    with_gnu_ld=yes
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | windows* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      file_list_spec='@'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=no
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test no = "$ld_shlibs"; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      export_dynamic_flag_spec='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if test ${lt_cv_aix_libpath_+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+   ;;
+esac
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if test ${lt_cv_aix_libpath_+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+   ;;
+esac
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | windows* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++ or Intel C++ Compiler.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
+	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          fi~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC and ICC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      
+  
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly* | midnightbsd*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+printf %s "checking if $CC understands -b... " >&6; }
+if test ${lt_cv_prog_compiler__b+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.expsym conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if test ${lt_cv_irix_exported_symbol+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  lt_cv_irix_exported_symbol=yes
+else case e in @%:@(
+  e) lt_cv_irix_exported_symbol=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS=$save_LDFLAGS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    *-mlibc)
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	;;
+      esac
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
+	else
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    serenity*)
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='$wl-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+printf %s "checking whether -lc should be explicitly linked in... " >&6; }
+if test ${lt_cv_archive_cmds_need_lc+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	 ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+printf %s "checking dynamic linker characteristics... " >&6; }
+
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | windows* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    # If user builds GCC with multilib enabled,
+    # it should just install on $(libdir)
+    # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.
+    if test xyes = x"$multilib"; then
+      postinstall_cmds='base_file=`basename \$file`~
+        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+        dldir=$destdir/`dirname \$dlpath`~
+        $install_prog $dir/$dlname $destdir/$dlname~
+        chmod a+x $destdir/$dlname~
+        if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+          eval '\''$striplib $destdir/$dlname'\'' || exit \$?;
+        fi'
+    else
+      postinstall_cmds='base_file=`basename \$file`~
+        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+        dldir=$destdir/`dirname \$dlpath`~
+        test -d \$dldir || mkdir -p \$dldir~
+        $install_prog $dir/$dlname \$dldir/$dlname~
+        chmod a+x \$dldir/$dlname~
+        if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+          eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+        fi'
+    fi
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | windows* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw* | windows*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC and ICC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly* | midnightbsd*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  case $host_cpu in
+    powerpc64)
+      # On FreeBSD bi-arch platforms, a different variable is used for 32-bit
+      # binaries.  See <https://man.freebsd.org/cgi/man.cgi?query=ld.so>.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int test_pointer_size[sizeof (void *) - 5];
+           
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  shlibpath_var=LD_LIBRARY_PATH
+else case e in @%:@(
+  e) shlibpath_var=LD_32_LIBRARY_PATH ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+      ;;
+    *)
+      shlibpath_var=LD_LIBRARY_PATH
+      ;;
+  esac
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'
+  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'
+  hardcode_into_libs=no
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # -rpath works at least for libraries that are not overridden by
+  # libraries installed in system locations.
+  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if test ${lt_cv_shlibpath_overrides_runpath+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null
+then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+     ;;
+esac
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directories which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+serenity*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  dynamic_linker='SerenityOS LibELF'
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+emscripten*)
+  version_type=none
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  dynamic_linker="Emscripten linker"
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      *flang* | ftn | f18* | f95*)
+        # Flang compiler.
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort* | icx* | ifx*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    serenity*)
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic@&t@ -DPIC"
+    ;;
+esac
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+printf %s "checking for $compiler option to produce PIC... " >&6; }
+if test ${lt_cv_prog_compiler_pic+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test ${lt_cv_prog_compiler_pic_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic@&t@ -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test ${lt_cv_prog_compiler_static_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.expsym conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+='-fPIC'
+  archive_cmds='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib'
+  archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym'
+  archive_cmds_need_lc=no
+  no_undefined_flag=
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+printf %s "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test yes = "$hardcode_automatic"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
+
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+    
+    
+    
+
+
+  if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | windows* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
+int
+main (void)
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_dl_dlopen=yes
+else case e in @%:@(
+  e) ac_cv_lib_dl_dlopen=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else case e in @%:@(
+  e) 
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+     ;;
+esac
+fi
+
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes
+then :
+  lt_cv_dlopen=shl_load
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+printf %s "checking for shl_load in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_shl_load+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load (void);
+int
+main (void)
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_dld_shl_load=yes
+else case e in @%:@(
+  e) ac_cv_lib_dld_shl_load=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes
+then :
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
+else case e in @%:@(
+  e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes
+then :
+  lt_cv_dlopen=dlopen
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
+int
+main (void)
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_dl_dlopen=yes
+else case e in @%:@(
+  e) ac_cv_lib_dl_dlopen=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+printf %s "checking for dlopen in -lsvld... " >&6; }
+if test ${ac_cv_lib_svld_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
+int
+main (void)
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_svld_dlopen=yes
+else case e in @%:@(
+  e) ac_cv_lib_svld_dlopen=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes
+then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+printf %s "checking for dld_link in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_dld_link+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link (void);
+int
+main (void)
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_dld_dld_link=yes
+else case e in @%:@(
+  e) ac_cv_lib_dld_dld_link=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes
+then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+
+	       ;;
+esac
+fi
+
+	     ;;
+esac
+fi
+
+	   ;;
+esac
+fi
+
+	 ;;
+esac
+fi
+
+       ;;
+esac
+fi
+
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+printf %s "checking whether a program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord (void) __attribute__((visibility("default")));
+#endif
+
+int fnord (void) { return 42; }
+int main (void)
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self_static+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord (void) __attribute__((visibility("default")));
+#endif
+
+int fnord (void) { return 42; }
+int main (void)
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+       ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+  
+striplib=
+old_striplib=
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+printf %s "checking whether stripping libraries is possible... " >&6; }
+if test -z "$STRIP"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+else
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+      else
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+      fi
+      ;;
+    *)
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+      ;;
+    esac
+  fi
+fi
+
+    
+    
+    
+
+
+    
+    
+    
+
+
+
+  # Report what library types will actually be built
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+printf %s "checking if libtool supports shared libraries... " >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+printf %s "checking whether to build shared libraries... " >&6; }
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+printf %s "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
+
+  
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC=$lt_save_CC
+
+
+
+
+
+
+
+
+
+       
+       
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ac_tool_prefix}windres; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$RC"; then
+  ac_cv_prog_RC="$RC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RC="${ac_tool_prefix}windres"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+RC=$ac_cv_prog_RC
+if test -n "$RC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+printf '%s\n' "$RC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RC"; then
+  ac_ct_RC=$RC
+  # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RC+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if test -n "$ac_ct_RC"; then
+  ac_cv_prog_ac_ct_RC="$ac_ct_RC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RC="windres"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_RC=$ac_cv_prog_ac_ct_RC
+if test -n "$ac_ct_RC"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
+printf '%s\n' "$ac_ct_RC" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_RC" = x; then
+    RC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RC=$ac_ct_RC
+  fi
+else
+  RC="$ac_cv_prog_RC"
+fi
+
+
+      
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+objext_RC=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+compiler_RC=$CC
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+lt_cv_prog_compiler_c_o_RC=yes
+
+if test -n "$compiler"; then
+  :
+  
+
+
+fi
+
+GCC=$lt_save_GCC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+
+
+# This is a bit wrong since it is possible to request that only some libs
+# are built as shared. Using that feature isn't so common though, and this
+# breaks only on Windows (at least for now) if the user enables only some
+# libs as shared.
+ if test "x$enable_shared" != xno; then
+  COND_SHARED_TRUE=
+  COND_SHARED_FALSE='#'
+else
+  COND_SHARED_TRUE='#'
+  COND_SHARED_FALSE=
+fi
+
+
+#####################
+# Symbol versioning #
+#####################
+
+# NOTE: This checks if we are building shared or static library
+# and if --with-pic or --without-pic was used. Thus this check
+# must be after Libtool initialization.
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if library symbol versioning should be used" >&5
+printf %s "checking if library symbol versioning should be used... " >&6; }
+@%:@ Check whether --enable-symbol-versions was given.
+if test ${enable_symbol_versions+y}
+then :
+  enableval=$enable_symbol_versions; 
+else case e in @%:@(
+  e) enable_symbol_versions=auto ;;
+esac
+fi
+
+if test "x$enable_symbol_versions" = xauto; then
+	case $host_os in
+		# NOTE: Even if one omits -gnu on GNU/Linux (e.g.
+		# i486-slackware-linux), configure will (via config.sub)
+		# append -gnu (e.g. i486-slackware-linux-gnu), and this
+		# test will work correctly.
+		gnu* | *-gnu* | freebsd*)
+			enable_symbol_versions=yes
+			;;
+		*)
+			enable_symbol_versions=no
+			;;
+	esac
+fi
+
+# There are two variants for symbol versioning.
+# See src/liblzma/validate_map.sh for details.
+#
+# On GNU/Linux, extra symbols are added in the C code. These extra symbols
+# must not be put into a static library as they can cause problems (and
+# even if they didn't cause problems, they would be useless). On other
+# systems symbol versioning may be used too but there is no problem as only
+# a linker script is specified in src/liblzma/Makefile.am and that isn't
+# used when creating a static library.
+#
+# Libtool always uses -DPIC when building shared libraries by default and
+# doesn't use it for static libs by default. This can be overriden with
+# --with-pic and --without-pic though. As long as neither --with-pic nor
+# --without-pic is used then we can use #ifdef PIC to detect if the file is
+# being built for a shared library.
+if test "x$enable_symbol_versions" = xno
+then :
+  
+	enable_symbol_versions=no
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+
+elif test "x$enable_shared" = xno
+then :
+  
+	enable_symbol_versions=no
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no (not building a shared library)" >&5
+printf '%s\n' "no (not building a shared library)" >&6; }
+
+else case e in @%:@(
+  e) 
+	# "yes" means that symbol version are to be used but we need to
+	# autodetect which variant to use.
+	if test "x$enable_symbol_versions" = xyes ; then
+		case "$host_cpu-$host_os" in
+			microblaze*)
+				# GCC 12 on MicroBlaze doesn't support
+				# __symver__ attribute. It's simplest and
+				# safest to use the generic version on that
+				# platform since then only the linker script
+				# is needed. The RHEL/CentOS 7 compatibility
+				# symbols don't matter on MicroBlaze.
+				enable_symbol_versions=generic
+				;;
+			*-linux*)
+				# NVIDIA HPC Compiler doesn't support symbol
+				# versioning but the linker script can still
+				# be used.
+				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __NVCOMPILER
+					use_generic_symbol_versioning
+					#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP_TRADITIONAL "use_generic_symbol_versioning" >/dev/null 2>&1
+then :
+  enable_symbol_versions=generic
+else case e in @%:@(
+  e) enable_symbol_versions=linux ;;
+esac
+fi
+rm -rf conftest*
+
+				;;
+			*)
+				enable_symbol_versions=generic
+				;;
+		esac
+	fi
+
+	if test "x$enable_symbol_versions" = xlinux ; then
+		case "$pic_mode-$enable_static" in
+			default-*)
+				# Use symvers if PIC is defined.
+				have_symbol_versions_linux=2
+				;;
+			*-no)
+				# Not building static library.
+				# Use symvers unconditionally.
+				have_symbol_versions_linux=1
+				;;
+			*)
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+				as_fn_error $? "
+    On GNU/Linux, building both shared and static library at the same time
+    is not supported if --with-pic or --without-pic is used.
+    Use either --disable-shared or --disable-static to build one type
+    of library at a time. If both types are needed, build one at a time,
+    possibly picking only src/liblzma/.libs/liblzma.a from the static build." "$LINENO" 5
+				;;
+		esac
+		
+printf '%s\n' "@%:@define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h
+
+	elif test "x$enable_symbol_versions" != xgeneric ; then
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
+		as_fn_error $? "unknown symbol versioning variant '$enable_symbol_versions'" "$LINENO" 5
+	fi
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes ($enable_symbol_versions)" >&5
+printf '%s\n' "yes ($enable_symbol_versions)" >&6; }
+ ;;
+esac
+fi
+
+ if test "x$enable_symbol_versions" = xlinux; then
+  COND_SYMVERS_LINUX_TRUE=
+  COND_SYMVERS_LINUX_FALSE='#'
+else
+  COND_SYMVERS_LINUX_TRUE='#'
+  COND_SYMVERS_LINUX_FALSE=
+fi
+
+ if test "x$enable_symbol_versions" = xgeneric; then
+  COND_SYMVERS_GENERIC_TRUE=
+  COND_SYMVERS_GENERIC_FALSE='#'
+else
+  COND_SYMVERS_GENERIC_TRUE='#'
+  COND_SYMVERS_GENERIC_FALSE=
+fi
+
+
+
+###############################################################################
+# Checks for libraries.
+###############################################################################
+
+echo
+echo "Initializing gettext:"
+
+
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+printf %s "checking whether NLS is requested... " >&6; }
+    @%:@ Check whether --enable-nls was given.
+if test ${enable_nls+y}
+then :
+  enableval=$enable_nls; USE_NLS=$enableval
+else case e in @%:@(
+  e) USE_NLS=yes ;;
+esac
+fi
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
+  
+
+
+          
+      GETTEXT_MACRO_VERSION=0.24
+
+
+    
+        
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGFMT+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) case "$MSGFMT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+    ;;
+  *)
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$gt_saved_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me:${as_lineno-$LINENO}: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$gt_saved_IFS"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+    ;;
+esac ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf '%s\n' "$MSGFMT" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GMSGFMT+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf '%s\n' "$GMSGFMT" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+
+    case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+  
+
+        
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XGETTEXT+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) case "$XGETTEXT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+    ;;
+  *)
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$gt_saved_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me:${as_lineno-$LINENO}: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$gt_saved_IFS"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+    ;;
+esac ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf '%s\n' "$XGETTEXT" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+    rm -f messages.po
+
+    case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+  
+
+    
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGMERGE+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) case "$MSGMERGE" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+    ;;
+  *)
+    gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$gt_saved_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me:${as_lineno-$LINENO}: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$gt_saved_IFS"
+  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+    ;;
+esac ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf '%s\n' "$MSGMERGE" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+    if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
+    MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
+  else
+        if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
+      MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
+    else
+                        MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
+    fi
+  fi
+  
+
+    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  
+
+  if test -n "$ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+
+        DESIRED_LINGUAS="${LINGUAS-\$(ALL_LINGUAS)}"
+  
+
+  ac_config_commands="$ac_config_commands po-directories"
+
+
+
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_saved_prefix"
+
+
+
+@%:@ Check whether --with-gnu-ld was given.
+if test ${with_gnu_ld+y}
+then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else case e in @%:@(
+  e) with_gnu_ld=no ;;
+esac
+fi
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+if test -n "$LD"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+printf %s "checking for ld... " >&6; }
+elif test "$GCC" = yes; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
+elif test "$with_gnu_ld" = yes; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
+fi
+if test -n "$LD"; then
+  # Let the user override the test with a path.
+  :
+else
+  if test ${acl_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+    acl_cv_path_LD= # Final result of this test
+    ac_prog=ld # Program to search in $PATH
+    if test "$GCC" = yes; then
+      # Check if gcc -print-prog-name=ld gives a path.
+      case $host in
+        *-*-mingw* | windows*)
+          # gcc leaves a trailing carriage return which upsets mingw
+          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+        *)
+          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
+      esac
+      case $acl_output in
+        # Accept absolute paths.
+        [\\/]* | ?:[\\/]*)
+          re_direlt='/[^/][^/]*/\.\./'
+          # Canonicalize the pathname of ld
+          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
+          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
+            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
+          done
+          # Got the pathname. No search in PATH is needed.
+          acl_cv_path_LD="$acl_output"
+          ac_prog=
+          ;;
+        "")
+          # If it fails, then pretend we aren't using GCC.
+          ;;
+        *)
+          # If it is relative, then search for the first ld in PATH.
+          with_gnu_ld=unknown
+          ;;
+      esac
+    fi
+    if test -n "$ac_prog"; then
+      # Search for $ac_prog in $PATH.
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
+      for ac_dir in $PATH; do
+        IFS="$acl_saved_IFS"
+        test -z "$ac_dir" && ac_dir=.
+        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+          acl_cv_path_LD="$ac_dir/$ac_prog"
+          # Check to see if the program is GNU ld.  I'd rather use --version,
+          # but apparently some variants of GNU ld only accept -v.
+          # Break only if it was the GNU/non-GNU ld that we prefer.
+          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+            *GNU* | *'with BFD'*)
+              test "$with_gnu_ld" != no && break
+              ;;
+            *)
+              test "$with_gnu_ld" != yes && break
+              ;;
+          esac
+        fi
+      done
+      IFS="$acl_saved_IFS"
+    fi
+    case $host in
+      *-*-aix*)
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined __powerpc64__ || defined __LP64__
+                int ok;
+               #else
+                error fail
+               #endif
+             
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  # The compiler produces 64-bit code. Add option '-b64' so that the
+           # linker groks 64-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -b64 "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
+           esac
+          
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+        ;;
+      sparc64-*-netbsd*)
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined __sparcv9 || defined __arch64__
+                int ok;
+               #else
+                error fail
+               #endif
+             
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+else case e in @%:@(
+  e) # The compiler produces 32-bit code. Add option '-m elf32_sparc'
+           # so that the linker groks 32-bit object files.
+           case "$acl_cv_path_LD " in
+             *" -m elf32_sparc "*) ;;
+             *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
+           esac
+           ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+        ;;
+    esac
+   ;;
+esac
+fi
+
+  LD="$acl_cv_path_LD"
+fi
+if test -n "$LD"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+  as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${acl_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes
+  ;;
+*)
+  acl_cv_prog_gnu_ld=no
+  ;;
+esac ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+    
+  
+                                                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+printf %s "checking for shared library run path origin... " >&6; }
+if test ${acl_cv_rpath+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf '%s\n' "$acl_cv_rpath" >&6; }
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+    @%:@ Check whether --enable-rpath was given.
+if test ${enable_rpath+y}
+then :
+  enableval=$enable_rpath; :
+else case e in @%:@(
+  e) enable_rpath=yes ;;
+esac
+fi
+
+
+
+  
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
+printf %s "checking 32-bit host C ABI... " >&6; }
+if test ${gl_cv_host_cpu_c_abi_32bit+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) case "$host_cpu" in
+
+       # CPUs that only support a 32-bit ABI.
+       arc \
+       | bfin \
+       | cris* \
+       | csky \
+       | epiphany \
+       | ft32 \
+       | h8300 \
+       | m68k \
+       | microblaze | microblazeel \
+       | nds32 | nds32le | nds32be \
+       | nios2 | nios2eb | nios2el \
+       | or1k* \
+       | or32 \
+       | sh | sh1234 | sh1234elb \
+       | tic6x \
+       | xtensa* )
+         gl_cv_host_cpu_c_abi_32bit=yes
+         ;;
+
+       # CPUs that only support a 64-bit ABI.
+       alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
+       | mmix )
+         gl_cv_host_cpu_c_abi_32bit=no
+         ;;
+
+       *)
+         if test -n "$gl_cv_host_cpu_c_abi"; then
+                      case "$gl_cv_host_cpu_c_abi" in
+             i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | loongarch32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+               gl_cv_host_cpu_c_abi_32bit=yes ;;
+             x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | loongarch64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+               gl_cv_host_cpu_c_abi_32bit=no ;;
+             *)
+               gl_cv_host_cpu_c_abi_32bit=unknown ;;
+           esac
+         else
+           gl_cv_host_cpu_c_abi_32bit=unknown
+         fi
+         if test $gl_cv_host_cpu_c_abi_32bit = unknown; then
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int test_pointer_size[sizeof (void *) - 5];
+                
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_host_cpu_c_abi_32bit=no
+else case e in @%:@(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+         fi
+         ;;
+     esac
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
+printf '%s\n' "$gl_cv_host_cpu_c_abi_32bit" >&6; }
+
+  HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
+
+
+                                
+  
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
+printf %s "checking for ELF binary format... " >&6; }
+if test ${gl_cv_elf+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined __ELF__ || (defined __linux__ && (defined __EDG__ || defined __SUNPRO_C))
+        Extensible Linking Format
+        #endif
+       
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1
+then :
+  gl_cv_elf=yes
+else case e in @%:@(
+  e) gl_cv_elf=no ;;
+esac
+fi
+rm -rf conftest*
+
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
+printf '%s\n' "$gl_cv_elf" >&6; }
+  if test $gl_cv_elf = yes; then
+    # Extract the ELF class of a file (5th byte) in decimal.
+    # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
+    if od -A x < /dev/null >/dev/null 2>/dev/null; then
+      # Use POSIX od.
+      func_elfclass ()
+      {
+        od -A n -t d1 -j 4 -N 1
+      }
+    else
+      # Use BSD hexdump.
+      func_elfclass ()
+      {
+        dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "'
+        echo
+      }
+    fi
+    # Use 'expr', not 'test', to compare the values of func_elfclass, because on
+    # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002,
+    # not 1 or 2.
+    case $HOST_CPU_C_ABI_32BIT in
+      yes)
+        # 32-bit ABI.
+        acl_is_expected_elfclass ()
+        {
+          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 1 > /dev/null
+        }
+        ;;
+      no)
+        # 64-bit ABI.
+        acl_is_expected_elfclass ()
+        {
+          expr "`func_elfclass | sed -e 's/[ 	]//g'`" = 2 > /dev/null
+        }
+        ;;
+      *)
+        # Unknown.
+        acl_is_expected_elfclass ()
+        {
+          :
+        }
+        ;;
+    esac
+  else
+    acl_is_expected_elfclass ()
+    {
+      :
+    }
+  fi
+
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+printf %s "checking for the common suffixes of directories in the library search path... " >&6; }
+if test ${acl_cv_libdirstems+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e)           acl_libdirstem=lib
+     acl_libdirstem2=
+     acl_libdirstem3=
+     case "$host_os" in
+       solaris*)
+                                                      if test $HOST_CPU_C_ABI_32BIT = no; then
+           acl_libdirstem2=lib/64
+           case "$host_cpu" in
+             sparc*)        acl_libdirstem3=lib/sparcv9 ;;
+             i*86 | x86_64) acl_libdirstem3=lib/amd64 ;;
+           esac
+         fi
+         ;;
+       netbsd*)
+                           if test $HOST_CPU_C_ABI_32BIT != no; then
+           case "$host_cpu" in
+             sparc*) acl_libdirstem2=lib/sparc ;;
+           esac
+         fi
+         ;;
+       *)
+                                                                                 searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
+                     | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+         if test $HOST_CPU_C_ABI_32BIT != no; then
+           # 32-bit or unknown ABI.
+           if test -d /usr/lib32; then
+             acl_libdirstem2=lib32
+           fi
+         fi
+         if test $HOST_CPU_C_ABI_32BIT != yes; then
+           # 64-bit or unknown ABI.
+           if test -d /usr/lib64; then
+             acl_libdirstem3=lib64
+           fi
+         fi
+         if test -n "$searchpath"; then
+           acl_saved_IFS="${IFS= 	}"; IFS=":"
+           for searchdir in $searchpath; do
+             if test -d "$searchdir"; then
+               case "$searchdir" in
+                 */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;;
+                 */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;;
+                 */../ | */.. )
+                   # Better ignore directories of this form. They are misleading.
+                   ;;
+                 *) searchdir=`cd "$searchdir" && pwd`
+                    case "$searchdir" in
+                      */lib32 ) acl_libdirstem2=lib32 ;;
+                      */lib64 ) acl_libdirstem3=lib64 ;;
+                    esac ;;
+               esac
+             fi
+           done
+           IFS="$acl_saved_IFS"
+           if test $HOST_CPU_C_ABI_32BIT = yes; then
+             # 32-bit ABI.
+             acl_libdirstem3=
+           fi
+           if test $HOST_CPU_C_ABI_32BIT = no; then
+             # 64-bit ABI.
+             acl_libdirstem2=
+           fi
+         fi
+         ;;
+     esac
+     test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+     test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
+     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+printf '%s\n' "$acl_cv_libdirstems" >&6; }
+      acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
+  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
+  acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
+
+
+    
+  
+
+      
+  
+  
+  
+  
+  
+    use_additional=yes
+  
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+    eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+    eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
+  
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+  
+@%:@ Check whether --with-libiconv-prefix was given.
+if test ${with_libiconv_prefix+y}
+then :
+  withval=$with_libiconv_prefix; 
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+          eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+          eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
+        
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        additional_libdir2="$withval/$acl_libdirstem2"
+        additional_libdir3="$withval/$acl_libdirstem3"
+      fi
+    fi
+
+fi
+
+  if test "X$additional_libdir2" = "X$additional_libdir"; then
+    additional_libdir2=
+  fi
+  if test "X$additional_libdir3" = "X$additional_libdir"; then
+    additional_libdir3=
+  fi
+      LIBICONV=
+  LTLIBICONV=
+  INCICONV=
+  LIBICONV_PREFIX=
+      HAVE_LIBICONV=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='iconv '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
+              if test "X$found_dir" = "X"; then
+                eval dir=\$$additional_libdir_variable
+                if test -n "$dir"; then
+                                                      if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                fi
+              fi
+            done
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBICONV; do
+              
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$acl_hardcode_direct" = yes; then
+                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBICONV; do
+                      
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+              else
+                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem3 | */$acl_libdirstem3/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCICONV; do
+                    
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        saved_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$saved_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
+                      haveit=
+                      if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBICONV; do
+                          
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+                          if test "X$x" = "X-L$dependency_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$dependency_libdir"; then
+                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$dependency_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBICONV; do
+                          
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+                          if test "X$x" = "X-L$dependency_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$dependency_libdir"; then
+                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$dependency_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                                                                                                                                                dep=`echo "X$dep" | sed -e 's/^X-l//'`
+                    if test "X$dep" != Xc \
+                       || case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) false ;;
+                            *)                          true ;;
+                          esac; then
+                      names_next_round="$names_next_round $dep"
+                    fi
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_saved_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_saved_libdir"
+      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_saved_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_saved_libdir"
+        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+    done
+  fi
+  
+  
+  
+  
+
+
+
+  gl_sed_double_backslashes='s/\\/\\\\/g'
+  gl_sed_escape_doublequotes='s/"/\\"/g'
+  gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
+  gl_sed_escape_for_make_2='s,\$,\\$$,g'
+      case `echo r | tr -d '\r'` in
+    '') gl_tr_cr='\015' ;;
+    *)  gl_tr_cr='\r' ;;
+  esac
+
+
+    gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+      if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
+  
+  
+  
+  
+
+    gl_final_localedir="$localedir"
+    case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw* | windows*)
+          gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;;
+      esac
+      ;;
+  esac
+    localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+  localedir_c='"'"$localedir_c"'"'
+  
+
+    localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+      if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then
+    localedir_c_make='\"$(localedir)\"'
+  fi
+  
+
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+
+
+    
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+
+  
+    
+  
+
+                      
+    
+  
+
+    
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
+if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) gt_saved_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFPreferences.h>
+int
+main (void)
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gt_cv_func_CFPreferencesCopyAppValue=yes
+else case e in @%:@(
+  e) gt_cv_func_CFPreferencesCopyAppValue=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_saved_LIBS" ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf '%s\n' "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    
+printf '%s\n' "@%:@define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+  fi
+                    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; }
+if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) gt_saved_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFLocale.h>
+int
+main (void)
+{
+CFLocaleCopyPreferredLanguages();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gt_cv_func_CFLocaleCopyPreferredLanguages=yes
+else case e in @%:@(
+  e) gt_cv_func_CFLocaleCopyPreferredLanguages=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_saved_LIBS" ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+printf '%s\n' "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+  if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+    
+printf '%s\n' "@%:@define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
+
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+     || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
+  fi
+  
+
+
+        
+  INTL_WINDOWS_LIBS=
+  case "$host_os" in
+    mingw* | windows*) INTL_WINDOWS_LIBS='-ladvapi32' ;;
+  esac
+
+    
+
+  
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+    case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+    if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    
+                        
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+                                                                                                                                                        
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+printf %s "checking for GNU gettext in libc... " >&6; }
+if eval test \${$gt_func_gnugettext_libc+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#if defined _MSC_VER
+#define _nl_msg_cat_cntr 0
+#else
+extern int _nl_msg_cat_cntr;
+#endif
+extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+               
+int
+main (void)
+{
+
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+               
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+                                                                                                                                                                           if test "`uname -sr`" = 'SunOS 5.11'; then
+               case `uname -v` in
+                 11.4 | 11.4.*) eval "$gt_func_gnugettext_libc=yes" ;;
+                 *)             eval "$gt_func_gnugettext_libc=no" ;;
+               esac
+             else
+               eval "$gt_func_gnugettext_libc=yes"
+             fi
+            
+else case e in @%:@(
+  e) eval "$gt_func_gnugettext_libc=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$gt_func_gnugettext_libc
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+                    
+            
+       
+      
+
+          gl_saved_CPPFLAGS="$CPPFLAGS"
+  
+  for element in $INCICONV; do
+    haveit=
+    for x in $CPPFLAGS; do
+      
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+printf %s "checking for iconv... " >&6; }
+if test ${am_cv_func_iconv+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <iconv.h>
+         
+int
+main (void)
+{
+iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+    if test "$am_cv_func_iconv" != yes; then
+      gl_saved_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <iconv.h>
+           
+int
+main (void)
+{
+iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+      LIBS="$gl_saved_LIBS"
+    fi
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
+  if test "$am_cv_func_iconv" = yes; then
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+printf %s "checking for working iconv... " >&6; }
+if test ${am_cv_func_iconv_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+                  gl_saved_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        if test "$cross_compiling" = yes
+then :
+  case "$host_os" in
+             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+             *)            am_cv_func_iconv_works="guessing yes" ;;
+           esac
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+             
+int
+main (void)
+{
+int result = 0;
+  /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from
+     successful returns.  This is even documented in
+     <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\263";
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 4;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 16;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  {
+    /* Try standardized names.  */
+    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+    /* Try possible *BSD names.  */
+    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+    /* Try AIX names.  */
+    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+    /* Try HP-UX names.  */
+    iconv_t cd4 = iconv_open ("utf8", "eucJP");
+    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+      result |= 32;
+    if (cd1 != (iconv_t)(-1))
+      iconv_close (cd1);
+    if (cd2 != (iconv_t)(-1))
+      iconv_close (cd2);
+    if (cd3 != (iconv_t)(-1))
+      iconv_close (cd3);
+    if (cd4 != (iconv_t)(-1))
+      iconv_close (cd4);
+  }
+  return result;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  am_cv_func_iconv_works=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+
+        test "$am_cv_func_iconv_works" = no || break
+      done
+      LIBS="$gl_saved_LIBS"
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    
+printf '%s\n' "@%:@define HAVE_ICONV 1" >>confdefs.h
+
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+printf %s "checking how to link with libiconv... " >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
+  else
+            CPPFLAGS="$gl_saved_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  
+  
+
+          
+                                                  
+  
+  
+  
+  
+  
+    use_additional=yes
+  
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+    eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+    eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
+  
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+  
+@%:@ Check whether --with-libintl-prefix was given.
+if test ${with_libintl_prefix+y}
+then :
+  withval=$with_libintl_prefix; 
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+          eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+          eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
+        
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        additional_libdir2="$withval/$acl_libdirstem2"
+        additional_libdir3="$withval/$acl_libdirstem3"
+      fi
+    fi
+
+fi
+
+  if test "X$additional_libdir2" = "X$additional_libdir"; then
+    additional_libdir2=
+  fi
+  if test "X$additional_libdir3" = "X$additional_libdir"; then
+    additional_libdir3=
+  fi
+      LIBINTL=
+  LTLIBINTL=
+  INCINTL=
+  LIBINTL_PREFIX=
+      HAVE_LIBINTL=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='intl '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
+              if test "X$found_dir" = "X"; then
+                eval dir=\$$additional_libdir_variable
+                if test -n "$dir"; then
+                                                      if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                fi
+              fi
+            done
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBINTL; do
+              
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
+                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$acl_hardcode_direct" = yes; then
+                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBINTL; do
+                      
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+              else
+                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem3 | */$acl_libdirstem3/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCINTL; do
+                    
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        saved_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$saved_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
+                      haveit=
+                      if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBINTL; do
+                          
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+                          if test "X$x" = "X-L$dependency_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$dependency_libdir"; then
+                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$dependency_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBINTL; do
+                          
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+                          if test "X$x" = "X-L$dependency_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$dependency_libdir"; then
+                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$dependency_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                                                                                                                                                dep=`echo "X$dep" | sed -e 's/^X-l//'`
+                    if test "X$dep" != Xc \
+                       || case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) false ;;
+                            *)                          true ;;
+                          esac; then
+                      names_next_round="$names_next_round $dep"
+                    fi
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_saved_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_saved_libdir"
+      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_saved_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_saved_libdir"
+        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+    done
+  fi
+  
+  
+  
+  
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+printf %s "checking for GNU gettext in libintl... " >&6; }
+if eval test \${$gt_func_gnugettext_libintl+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) gt_saved_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_saved_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#if defined _MSC_VER
+#define _nl_msg_cat_cntr 0
+#else
+extern int _nl_msg_cat_cntr;
+#endif
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+                 
+int
+main (void)
+{
+
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+                 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  eval "$gt_func_gnugettext_libintl=yes"
+else case e in @%:@(
+  e) eval "$gt_func_gnugettext_libintl=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+                                                gt_LIBINTL_EXTRA=
+            case "$host_os" in
+              darwin*)           gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" ;;
+              aix*)              gt_LIBINTL_EXTRA="-lpthread" ;;
+              mingw* | windows*) gt_LIBINTL_EXTRA="$INTL_WINDOWS_LIBS" ;;
+            esac
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+               && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+              LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#if defined _MSC_VER
+#define _nl_msg_cat_cntr 0
+#else
+extern int _nl_msg_cat_cntr;
+#endif
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+                   
+int
+main (void)
+{
+
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+                   
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA"
+                 eval "$gt_func_gnugettext_libintl=yes"
+                
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+            fi
+            CPPFLAGS="$gt_saved_CPPFLAGS"
+            LIBS="$gt_saved_LIBS" ;;
+esac
+fi
+eval ac_res=\$$gt_func_gnugettext_libintl
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
+        fi
+
+                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools \
+                && test "$PACKAGE" != libintl; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+                    LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$gt_cv_use_gnu_libintl" = "yes"; then
+                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test -n "$INTL_WINDOWS_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$gt_cv_use_gnu_libintl" = "yes"; then
+                LIBINTL="$LIBINTL $INTL_WINDOWS_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_WINDOWS_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$gt_cv_use_gnu_libintl" = "yes"; then
+      
+printf '%s\n' "@%:@define ENABLE_NLS 1" >>confdefs.h
+
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+printf %s "checking whether to use NLS... " >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
+  if test "$USE_NLS" = "yes"; then
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+printf %s "checking where the gettext function comes from... " >&6; }
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf '%s\n' "$gt_source" >&6; }
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+printf %s "checking how to link with libintl... " >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf '%s\n' "$LIBINTL" >&6; }
+        
+  for element in $INCINTL; do
+    haveit=
+    for x in $CPPFLAGS; do
+      
+  acl_saved_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+      fi
+
+            
+printf '%s\n' "@%:@define HAVE_GETTEXT 1" >>confdefs.h
+
+      
+printf '%s\n' "@%:@define HAVE_DCGETTEXT 1" >>confdefs.h
+
+    fi
+
+        POSUB=po
+  fi
+
+  
+
+  
+        INTLLIBS="$LIBINTL"
+    
+  
+
+    
+  
+  
+
+    
+
+
+
+###############################################################################
+# Checks for header files.
+###############################################################################
+
+echo
+echo "System headers and functions:"
+
+# There is currently no workarounds in this package if some of
+# these headers are missing.
+       for ac_header in fcntl.h limits.h sys/time.h
+do :
+  as_ac_Header=`printf '%s\n' "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define `printf '%s\n' "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
+_ACEOF
+ 
+else case e in @%:@(
+  e) as_fn_error $? "Required header file(s) are missing." "$LINENO" 5 ;;
+esac
+fi
+
+done
+
+# This allows the use of the intrinsic functions if they are available.
+ac_fn_c_check_header_compile "$LINENO" "immintrin.h" "ac_cv_header_immintrin_h" "$ac_includes_default"
+if test "x$ac_cv_header_immintrin_h" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_IMMINTRIN_H 1" >>confdefs.h
+
+fi
+
+
+
+###############################################################################
+# Checks for typedefs, structures, and compiler characteristics.
+###############################################################################
+
+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE__BOOL 1" >>confdefs.h
+
+
+fi
+
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99 or later" >&5
+printf %s "checking for stdbool.h that conforms to C99 or later... " >&6; }
+if test ${ac_cv_header_stdbool_h+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdbool.h>
+
+             /* "true" and "false" should be usable in #if expressions and
+                integer constant expressions, and "bool" should be a valid
+                type name.
+
+                Although C99 requires bool, true, and false to be macros,
+                C23 and C++11 overrule that, so do not test for that.
+                Although C99 requires __bool_true_false_are_defined and
+                _Bool, C23 says they are obsolescent, so do not require
+                them.  */
+
+             #if !true
+               #error "'true' is not true"
+             #endif
+             #if true != 1
+               #error "'true' is not equal to 1"
+             #endif
+             char b[true == 1 ? 1 : -1];
+             char c[true];
+
+             #if false
+               #error "'false' is not false"
+             #endif
+             #if false != 0
+               #error "'false' is not equal to 0"
+             #endif
+             char d[false == 0 ? 1 : -1];
+
+             enum { e = false, f = true, g = false * true, h = true * 256 };
+
+             char i[(bool) 0.5 == true ? 1 : -1];
+             char j[(bool) 0.0 == false ? 1 : -1];
+             char k[sizeof (bool) > 0 ? 1 : -1];
+
+             struct sb { bool s: 1; bool t; } s;
+             char l[sizeof s.t > 0 ? 1 : -1];
+
+             /* The following fails for
+                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+             bool m[h];
+             char n[sizeof m == h * sizeof m[0] ? 1 : -1];
+             char o[-1 - (bool) 0 < 0 ? 1 : -1];
+             /* Catch a bug in an HP-UX C compiler.  See
+                https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+                https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html
+              */
+             bool p = true;
+             bool *pp = &p;
+           
+int
+main (void)
+{
+
+             bool ps = &s;
+             *pp |= p;
+             *pp |= ! p;
+
+             /* Refer to every declared value, so they cannot be
+                discarded as unused.  */
+             return (!b + !c + !d + !e + !f + !g + !h + !i + !j + !k
+                     + !l + !m + !n + !o + !p + !pp + !ps);
+           
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_header_stdbool_h=yes
+else case e in @%:@(
+  e) ac_cv_header_stdbool_h=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+printf '%s\n' "$ac_cv_header_stdbool_h" >&6; }
+
+if test $ac_cv_header_stdbool_h = yes; then
+  
+printf '%s\n' "@%:@define HAVE_STDBOOL_H 1" >>confdefs.h
+
+fi
+
+
+ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
+case $ac_cv_c_uint8_t in #(
+  no|yes) ;; #(
+  *)
+    
+printf '%s\n' "@%:@define _UINT8_T 1" >>confdefs.h
+
+    
+printf '%s\n' "@%:@define uint8_t $ac_cv_c_uint8_t" >>confdefs.h
+;;
+  esac
+
+ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
+case $ac_cv_c_uint16_t in #(
+  no|yes) ;; #(
+  *)
+    
+    
+printf '%s\n' "@%:@define uint16_t $ac_cv_c_uint16_t" >>confdefs.h
+;;
+  esac
+
+ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
+case $ac_cv_c_int32_t in #(
+  no|yes) ;; #(
+  *)
+    
+printf '%s\n' "@%:@define int32_t $ac_cv_c_int32_t" >>confdefs.h
+;;
+esac
+
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
+  no|yes) ;; #(
+  *)
+    
+printf '%s\n' "@%:@define _UINT32_T 1" >>confdefs.h
+
+    
+printf '%s\n' "@%:@define uint32_t $ac_cv_c_uint32_t" >>confdefs.h
+;;
+  esac
+
+ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
+case $ac_cv_c_int64_t in #(
+  no|yes) ;; #(
+  *)
+    
+printf '%s\n' "@%:@define int64_t $ac_cv_c_int64_t" >>confdefs.h
+;;
+esac
+
+ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t"
+case $ac_cv_c_uint64_t in #(
+  no|yes) ;; #(
+  *)
+    
+printf '%s\n' "@%:@define _UINT64_T 1" >>confdefs.h
+
+    
+printf '%s\n' "@%:@define uint64_t $ac_cv_c_uint64_t" >>confdefs.h
+;;
+  esac
+
+
+  ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_uintptr_t" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_UINTPTR_T 1" >>confdefs.h
+
+else case e in @%:@(
+  e) for ac_type in 'unsigned int' 'unsigned long int' \
+	'unsigned long long int'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main (void)
+{
+static int test_array @<:@1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))@:>@;
+test_array @<:@0@:>@ = 0;
+return test_array @<:@0@:>@;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+printf '%s\n' "@%:@define uintptr_t $ac_type" >>confdefs.h
+
+	  ac_type=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+       test -z "$ac_type" && break
+     done ;;
+esac
+fi
+
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+printf %s "checking size of size_t... " >&6; }
+if test ${ac_cv_sizeof_size_t+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"
+then :
+  
+else case e in @%:@(
+  e) ac_cv_sizeof_size_t=0 ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
+printf '%s\n' "$ac_cv_sizeof_size_t" >&6; }
+
+
+
+printf '%s\n' "@%:@define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h
+
+
+
+# The command line tool can copy high resolution timestamps if such
+# information is available in struct stat. Otherwise one second accuracy
+# is used.
+ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_struct_stat_st_atim_tv_nsec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_uatime" "ac_cv_member_struct_stat_st_uatime" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_uatime" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_UATIME 1" >>confdefs.h
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
+
+
+fi
+
+
+@%:@ Check whether --enable-largefile was given.
+if test ${enable_largefile+y}
+then :
+  enableval=$enable_largefile; 
+fi
+if test "$enable_largefile,$enable_year2038" != no,no
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to support large files" >&5
+printf %s "checking for $CC option to support large files... " >&6; }
+if test ${ac_cv_sys_largefile_opts+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_save_CPPFLAGS=$CPPFLAGS
+  ac_opt_found=no
+  for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1"; do
+    if test x"$ac_opt" != x"none needed"
+then :
+  CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"
+fi
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+@%:@include <sys/types.h>
+@%:@ifndef FTYPE
+@%:@ define FTYPE off_t
+@%:@endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_FTYPE to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+@%:@define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+  int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721
+		       && LARGE_FTYPE % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  if test x"$ac_opt" = x"none needed"
+then :
+  # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
+	 CPPFLAGS="$CPPFLAGS -DFTYPE=ino_t"
+	 if ac_fn_c_try_compile "$LINENO"
+then :
+  
+else case e in @%:@(
+  e) CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+	    if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_opt='-D_FILE_OFFSET_BITS=64'
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+fi
+      ac_cv_sys_largefile_opts=$ac_opt
+      ac_opt_found=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    test $ac_opt_found = no || break
+  done
+  CPPFLAGS=$ac_save_CPPFLAGS
+      
+  test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5
+printf '%s\n' "$ac_cv_sys_largefile_opts" >&6; }
+
+ac_have_largefile=yes
+case $ac_cv_sys_largefile_opts in @%:@(
+  "none needed") :
+     ;; @%:@(
+  "supported through gnulib") :
+     ;; @%:@(
+  "support not detected") :
+    ac_have_largefile=no ;; @%:@(
+  "-D_FILE_OFFSET_BITS=64") :
+    
+printf '%s\n' "@%:@define _FILE_OFFSET_BITS 64" >>confdefs.h
+ ;; @%:@(
+  "-D_LARGE_FILES=1") :
+    
+printf '%s\n' "@%:@define _LARGE_FILES 1" >>confdefs.h
+ ;; @%:@(
+  *) :
+    as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;;
+esac
+
+if test "$enable_year2038" != no
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to support timestamps after 2038" >&5
+printf %s "checking for $CC option to support timestamps after 2038... " >&6; }
+if test ${ac_cv_sys_year2038_opts+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_save_CPPFLAGS="$CPPFLAGS"
+  ac_opt_found=no
+  for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do
+    if test x"$ac_opt" != x"none needed"
+then :
+  CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"
+fi
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  #include <time.h>
+  /* Check that time_t can represent 2**32 - 1 correctly.  */
+  #define LARGE_TIME_T \\
+    ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
+  int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535
+                           && LARGE_TIME_T % 65537 == 0)
+                          ? 1 : -1];
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_sys_year2038_opts="$ac_opt"
+      ac_opt_found=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    test $ac_opt_found = no || break
+  done
+  CPPFLAGS="$ac_save_CPPFLAGS"
+  test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5
+printf '%s\n' "$ac_cv_sys_year2038_opts" >&6; }
+
+ac_have_year2038=yes
+case $ac_cv_sys_year2038_opts in @%:@(
+  "none needed") :
+     ;; @%:@(
+  "support not detected") :
+    ac_have_year2038=no ;; @%:@(
+  "-D_TIME_BITS=64") :
+    
+printf '%s\n' "@%:@define _TIME_BITS 64" >>confdefs.h
+ ;; @%:@(
+  "-D__MINGW_USE_VC2005_COMPAT") :
+    
+printf '%s\n' "@%:@define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
+ ;; @%:@(
+  "-U_USE_32_BIT_TIME_T"*) :
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It
+will stop working after mid-January 2038. Remove
+_USE_32BIT_TIME_T from the compiler flags.
+See 'config.log' for more details" "$LINENO" 5; } ;; @%:@(
+  *) :
+    as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;;
+esac
+
+fi
+
+fi
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+printf %s "checking whether byte ordering is bigendian... " >&6; }
+if test ${ac_cv_c_bigendian+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+	    
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+	   
+int
+main (void)
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+	   
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+	      
+int
+main (void)
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+	      
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_bigendian=yes
+else case e in @%:@(
+  e) ac_cv_c_bigendian=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+	   
+int
+main (void)
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+	   
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+	      
+int
+main (void)
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+	      
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_bigendian=yes
+else case e in @%:@(
+  e) ac_cv_c_bigendian=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes
+then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+unsigned short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		unsigned short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		unsigned short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		unsigned short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		int
+		main (int argc, char **argv)
+		{
+		  /* Intimidate the compiler so that it does not
+		     optimize the arrays away.  */
+		  char *p = argv[0];
+		  ascii_mm[1] = *p++; ebcdic_mm[1] = *p++;
+		  ascii_ii[1] = *p++; ebcdic_ii[1] = *p++;
+		  return use_ascii (argc) == use_ebcdic (*p);
+		}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main (void)
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+	   
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  ac_cv_c_bigendian=no
+else case e in @%:@(
+  e) ac_cv_c_bigendian=yes ;;
+esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+
+    fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf '%s\n' "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     printf '%s\n' "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+     	
+printf '%s\n' "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+
+
+###############################################################################
+# Checks for library functions.
+###############################################################################
+
+# Gnulib replacements as needed
+
+  if test -z "$GETOPT_H"; then
+           for ac_header in getopt.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
+if test "x$ac_cv_header_getopt_h" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_GETOPT_H 1" >>confdefs.h
+ 
+else case e in @%:@(
+  e) GETOPT_H=getopt.h ;;
+esac
+fi
+
+done
+  fi
+
+  if test -z "$GETOPT_H"; then
+    
+  for ac_func in getopt_long
+do :
+  ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
+if test "x$ac_cv_func_getopt_long" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_GETOPT_LONG 1" >>confdefs.h
+ 
+else case e in @%:@(
+  e) GETOPT_H=getopt.h ;;
+esac
+fi
+
+done
+  fi
+
+                                  if test -z "$GETOPT_H"; then
+    ac_fn_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" "#include <getopt.h>
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_optreset" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_OPTRESET 1" >>confdefs.h
+
+fi
+  fi
+
+      
+
+  
+  if test -n "$GETOPT_H"
+then :
+  
+  case " $LIB@&t@OBJS " in
+  *" getopt.$ac_objext "* ) ;;
+  *) LIB@&t@OBJS="$LIB@&t@OBJS getopt.$ac_objext"
+ ;;
+esac
+
+  case " $LIB@&t@OBJS " in
+  *" getopt1.$ac_objext "* ) ;;
+  *) LIB@&t@OBJS="$LIB@&t@OBJS getopt1.$ac_objext"
+ ;;
+esac
+
+  
+  GETOPT_H=getopt.h
+  
+printf '%s\n' "@%:@define __GETOPT_PREFIX rpl_" >>confdefs.h
+
+  
+
+
+fi
+
+
+# Find the best function to set timestamps.
+
+  for ac_func in futimens futimes futimesat utimes _futime utime
+do :
+  as_ac_var=`printf '%s\n' "ac_cv_func_$ac_func" | sed "$as_sed_sh"`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"
+then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define `printf '%s\n' "HAVE_$ac_func" | sed "$as_sed_cpp"` 1
+_ACEOF
+ break
+fi
+
+done
+
+# This is nice to have but not mandatory.
+ac_fn_c_check_func "$LINENO" "posix_fadvise" "ac_cv_func_posix_fadvise"
+if test "x$ac_cv_func_posix_fadvise" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_POSIX_FADVISE 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+
+
+
+ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_program_invocation_name" = xyes
+then :
+  ac_have_decl=1
+else case e in @%:@(
+  e) ac_have_decl=0 ;;
+esac
+fi
+printf '%s\n' "@%:@define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+
+
+
+
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if __builtin_bswap16/32/64 are supported" >&5
+printf %s "checking if __builtin_bswap16/32/64 are supported... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+__builtin_bswap16(1);
+			__builtin_bswap32(1);
+			__builtin_bswap64(1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  
+	
+printf '%s\n' "@%:@define HAVE___BUILTIN_BSWAPXX 1" >>confdefs.h
+
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+
+else case e in @%:@(
+  e) 
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+
+	# Look for other byteswapping methods.
+	       for ac_header in byteswap.h sys/endian.h sys/byteorder.h
+do :
+  as_ac_Header=`printf '%s\n' "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define `printf '%s\n' "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
+_ACEOF
+ break
+fi
+
+done
+
+	# Even if we have byteswap.h we may lack the specific macros/functions.
+	if test x$ac_cv_header_byteswap_h = xyes ; then
+		
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if bswap_16 is available" >&5
+printf %s "checking if bswap_16 is available... " >&6; }
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <byteswap.h>
+int
+main(void)
+{
+	bswap_16(42);
+	return 0;
+}
+			
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  
+				
+printf '%s\n' "@%:@define HAVE_BSWAP_16 1" >>confdefs.h
+
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+			
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; } ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+		
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if bswap_32 is available" >&5
+printf %s "checking if bswap_32 is available... " >&6; }
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <byteswap.h>
+int
+main(void)
+{
+	bswap_32(42);
+	return 0;
+}
+			
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  
+				
+printf '%s\n' "@%:@define HAVE_BSWAP_32 1" >>confdefs.h
+
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+			
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; } ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+		
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if bswap_64 is available" >&5
+printf %s "checking if bswap_64 is available... " >&6; }
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <byteswap.h>
+int
+main(void)
+{
+	bswap_64(42);
+	return 0;
+}
+			
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  
+				
+printf '%s\n' "@%:@define HAVE_BSWAP_64 1" >>confdefs.h
+
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+			
+else case e in @%:@(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; } ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+			fi
+ ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if unaligned memory access should be used" >&5
+printf %s "checking if unaligned memory access should be used... " >&6; }
+@%:@ Check whether --enable-unaligned-access was given.
+if test ${enable_unaligned_access+y}
+then :
+  enableval=$enable_unaligned_access; 
+else case e in @%:@(
+  e) enable_unaligned_access=auto ;;
+esac
+fi
+
+if test "x$enable_unaligned_access" = xauto ; then
+	# TODO: There may be other architectures, on which unaligned access
+	# is OK.
+	case $host_cpu in
+		i?86|x86_64|powerpc|powerpc64)
+			enable_unaligned_access=yes
+			;;
+		*)
+			enable_unaligned_access=no
+			;;
+	esac
+fi
+if test "x$enable_unaligned_access" = xyes ; then
+	
+printf '%s\n' "@%:@define TUKLIB_FAST_UNALIGNED_ACCESS 1" >>confdefs.h
+
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+else
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if unsafe type punning should be used" >&5
+printf %s "checking if unsafe type punning should be used... " >&6; }
+@%:@ Check whether --enable-unsafe-type-punning was given.
+if test ${enable_unsafe_type_punning+y}
+then :
+  enableval=$enable_unsafe_type_punning; 
+else case e in @%:@(
+  e) enable_unsafe_type_punning=no ;;
+esac
+fi
+
+if test "x$enable_unsafe_type_punning" = xyes ; then
+	
+printf '%s\n' "@%:@define TUKLIB_USE_UNSAFE_TYPE_PUNNING 1" >>confdefs.h
+
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+else
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if __builtin_assume_aligned is supported" >&5
+printf %s "checking if __builtin_assume_aligned is supported... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+__builtin_assume_aligned("", 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  
+		
+printf '%s\n' "@%:@define HAVE___BUILTIN_ASSUME_ALIGNED 1" >>confdefs.h
+
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+	
+else case e in @%:@(
+  e) 
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+	 ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+
+
+# sys/param.h might be needed by sys/sysctl.h.
+ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_param_h" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_SYS_PARAM_H 1" >>confdefs.h
+
+fi
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to detect the amount of physical memory" >&5
+printf %s "checking how to detect the amount of physical memory... " >&6; }
+if test ${tuklib_cv_physmem_method+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+
+# Maybe checking $host_os would be enough but this matches what
+# tuklib_physmem.c does.
+#
+# NOTE: IRIX has a compiler that doesn't error out with #error, so use
+# a non-compilable text instead of #error to generate an error.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__OS2__) \
+		|| defined(__DJGPP__) || defined(__VMS) \
+		|| defined(AMIGA) || defined(__AROS__) || defined(__QNX__)
+int main(void) { return 0; }
+#else
+compile error
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_physmem_method=special
+else case e in @%:@(
+  e) 
+
+# Look for AIX-specific solution before sysconf(), because the test
+# for sysconf() will pass on AIX but won't actually work
+# (sysconf(_SC_PHYS_PAGES) compiles but always returns -1 on AIX).
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/systemcfg.h>
+
+int
+main(void)
+{
+	(void)_system_configuration.physmem;
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_physmem_method=aix
+else case e in @%:@(
+  e) 
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <unistd.h>
+int
+main(void)
+{
+	long i;
+	i = sysconf(_SC_PAGESIZE);
+	i = sysconf(_SC_PHYS_PAGES);
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_physmem_method=sysconf
+else case e in @%:@(
+  e) 
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#	include <sys/param.h>
+#endif
+#include <sys/sysctl.h>
+int
+main(void)
+{
+	int name[2] = { CTL_HW, HW_PHYSMEM };
+	unsigned long mem;
+	size_t mem_ptr_size = sizeof(mem);
+	sysctl(name, 2, &mem, &mem_ptr_size, NULL, 0);
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_physmem_method=sysctl
+else case e in @%:@(
+  e) 
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/sysinfo.h>
+#include <machine/hal_sysinfo.h>
+
+int
+main(void)
+{
+	int memkb;
+	int start = 0;
+	getsysinfo(GSI_PHYSMEM, (caddr_t)&memkb, sizeof(memkb), &start);
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_physmem_method=getsysinfo
+else case e in @%:@(
+  e) 
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/param.h>
+#include <sys/pstat.h>
+
+int
+main(void)
+{
+	struct pst_static pst;
+	pstat_getstatic(&pst, sizeof(pst), 1, 0);
+	(void)pst.physical_memory;
+	(void)pst.page_size;
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_physmem_method=pstat_getstatic
+else case e in @%:@(
+  e) 
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <invent.h>
+int
+main(void)
+{
+	inv_state_t *st = NULL;
+	setinvent_r(&st);
+	getinvent_r(st);
+	endinvent_r(st);
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_physmem_method=getinvent_r
+else case e in @%:@(
+  e) 
+
+# This version of sysinfo() is Linux-specific. Some non-Linux systems have
+# different sysinfo() so we must check $host_os.
+case $host_os in
+	linux*)
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/sysinfo.h>
+int
+main(void)
+{
+	struct sysinfo si;
+	sysinfo(&si);
+	return 0;
+}
+		
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+			tuklib_cv_physmem_method=sysinfo
+		
+else case e in @%:@(
+  e) 
+			tuklib_cv_physmem_method=unknown
+		 ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+		;;
+	*)
+		tuklib_cv_physmem_method=unknown
+		;;
+esac
+ ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $tuklib_cv_physmem_method" >&5
+printf '%s\n' "$tuklib_cv_physmem_method" >&6; }
+
+case $tuklib_cv_physmem_method in
+	aix)
+		
+printf '%s\n' "@%:@define TUKLIB_PHYSMEM_AIX 1" >>confdefs.h
+
+		;;
+	sysconf)
+		
+printf '%s\n' "@%:@define TUKLIB_PHYSMEM_SYSCONF 1" >>confdefs.h
+
+		;;
+	sysctl)
+		
+printf '%s\n' "@%:@define TUKLIB_PHYSMEM_SYSCTL 1" >>confdefs.h
+
+		;;
+	getsysinfo)
+		
+printf '%s\n' "@%:@define TUKLIB_PHYSMEM_GETSYSINFO 1" >>confdefs.h
+
+		;;
+	pstat_getstatic)
+		
+printf '%s\n' "@%:@define TUKLIB_PHYSMEM_PSTAT_GETSTATIC 1" >>confdefs.h
+
+		;;
+	getinvent_r)
+		
+printf '%s\n' "@%:@define TUKLIB_PHYSMEM_GETINVENT_R 1" >>confdefs.h
+
+		;;
+	sysinfo)
+		
+printf '%s\n' "@%:@define TUKLIB_PHYSMEM_SYSINFO 1" >>confdefs.h
+
+		;;
+esac
+
+
+
+
+# sys/param.h might be needed by sys/sysctl.h.
+ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_param_h" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_SYS_PARAM_H 1" >>confdefs.h
+
+fi
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to detect the number of available CPU cores" >&5
+printf %s "checking how to detect the number of available CPU cores... " >&6; }
+if test ${tuklib_cv_cpucores_method+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) 
+
+# Maybe checking $host_os would be enough but this matches what
+# tuklib_cpucores.c does.
+#
+# NOTE: IRIX has a compiler that doesn't error out with #error, so use
+# a non-compilable text instead of #error to generate an error.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+int main(void) { return 0; }
+#else
+compile error
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_cpucores_method=special
+else case e in @%:@(
+  e) 
+
+# glibc-based systems (GNU/Linux and GNU/kFreeBSD) have sched_getaffinity().
+# The CPU_COUNT() macro was added in glibc 2.9 so we try to link the
+# test program instead of merely compiling it. glibc 2.9 is old enough that
+# if someone uses the code on older glibc, the fallback to sysconf() should
+# be good enough.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sched.h>
+int
+main(void)
+{
+	cpu_set_t cpu_mask;
+	sched_getaffinity(0, sizeof(cpu_mask), &cpu_mask);
+	return CPU_COUNT(&cpu_mask);
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  tuklib_cv_cpucores_method=sched_getaffinity
+else case e in @%:@(
+  e) 
+
+# FreeBSD has both cpuset and sysctl. Look for cpuset first because
+# it's a better approach.
+#
+# This test would match on GNU/kFreeBSD too but it would require
+# -lfreebsd-glue when linking and thus in the current form this would
+# fail on GNU/kFreeBSD. The above test for sched_getaffinity() matches
+# on GNU/kFreeBSD so the test below should never run on that OS.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/param.h>
+#include <sys/cpuset.h>
+
+int
+main(void)
+{
+	cpuset_t set;
+	cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1,
+			sizeof(set), &set);
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_cpucores_method=cpuset
+else case e in @%:@(
+  e) 
+
+# On OS/2, both sysconf() and sysctl() pass the tests in this file,
+# but only sysctl() works. On QNX it's the opposite: only sysconf() works
+# (although it assumes that _POSIX_SOURCE, _XOPEN_SOURCE, and _POSIX_C_SOURCE
+# are undefined or alternatively _QNX_SOURCE is defined).
+#
+# We test sysctl() first and intentionally break the sysctl() test on QNX
+# so that sysctl() is never used on QNX.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef __QNX__
+compile error
+#endif
+#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#	include <sys/param.h>
+#endif
+#include <sys/sysctl.h>
+int
+main(void)
+{
+#ifdef HW_NCPUONLINE
+	/* This is preferred on OpenBSD, see tuklib_cpucores.c. */
+	int name[2] = { CTL_HW, HW_NCPUONLINE };
+#else
+	int name[2] = { CTL_HW, HW_NCPU };
+#endif
+	int cpus;
+	size_t cpus_size = sizeof(cpus);
+	sysctl(name, 2, &cpus, &cpus_size, NULL, 0);
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_cpucores_method=sysctl
+else case e in @%:@(
+  e) 
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <unistd.h>
+int
+main(void)
+{
+	long i;
+#ifdef _SC_NPROCESSORS_ONLN
+	/* Many systems using sysconf() */
+	i = sysconf(_SC_NPROCESSORS_ONLN);
+#else
+	/* IRIX */
+	i = sysconf(_SC_NPROC_ONLN);
+#endif
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_cpucores_method=sysconf
+else case e in @%:@(
+  e) 
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/param.h>
+#include <sys/pstat.h>
+
+int
+main(void)
+{
+	struct pst_dynamic pst;
+	pstat_getdynamic(&pst, sizeof(pst), 1, 0);
+	(void)pst.psd_proc_cnt;
+	return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  tuklib_cv_cpucores_method=pstat_getdynamic
+else case e in @%:@(
+  e) 
+
+	tuklib_cv_cpucores_method=unknown
+ ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $tuklib_cv_cpucores_method" >&5
+printf '%s\n' "$tuklib_cv_cpucores_method" >&6; }
+
+case $tuklib_cv_cpucores_method in
+	sched_getaffinity)
+		
+printf '%s\n' "@%:@define TUKLIB_CPUCORES_SCHED_GETAFFINITY 1" >>confdefs.h
+
+		;;
+	cpuset)
+		
+printf '%s\n' "@%:@define TUKLIB_CPUCORES_CPUSET 1" >>confdefs.h
+
+		;;
+	sysctl)
+		
+printf '%s\n' "@%:@define TUKLIB_CPUCORES_SYSCTL 1" >>confdefs.h
+
+		;;
+	sysconf)
+		
+printf '%s\n' "@%:@define TUKLIB_CPUCORES_SYSCONF 1" >>confdefs.h
+
+		;;
+	pstat_getdynamic)
+		
+printf '%s\n' "@%:@define TUKLIB_CPUCORES_PSTAT_GETDYNAMIC 1" >>confdefs.h
+
+		;;
+esac
+
+
+
+
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc and mbstate_t are properly declared" >&5
+printf %s "checking whether mbrtowc and mbstate_t are properly declared... " >&6; }
+if test ${ac_cv_func_mbrtowc+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+@%:@include <wchar.h>
+int
+main (void)
+{
+wchar_t wc;
+	      char const s[] = "";
+	      size_t n = 1;
+	      mbstate_t state;
+	      return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_func_mbrtowc=yes
+else case e in @%:@(
+  e) ac_cv_func_mbrtowc=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mbrtowc" >&5
+printf '%s\n' "$ac_cv_func_mbrtowc" >&6; }
+  if test $ac_cv_func_mbrtowc = yes; then
+    
+printf '%s\n' "@%:@define HAVE_MBRTOWC 1" >>confdefs.h
+
+  fi
+
+ac_fn_c_check_func "$LINENO" "wcwidth" "ac_cv_func_wcwidth"
+if test "x$ac_cv_func_wcwidth" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_WCWIDTH 1" >>confdefs.h
+
+fi
+
+
+
+# If requested, check for system-provided SHA-256. At least the following
+# implementations are supported:
+#
+# OS       Headers                     Library  Type           Function
+# FreeBSD  sys/types.h + sha256.h      libmd    SHA256_CTX     SHA256_Init
+# NetBSD   sys/types.h + sha2.h                 SHA256_CTX     SHA256_Init
+# OpenBSD  sys/types.h + sha2.h                 SHA2_CTX       SHA256Init
+# Solaris  sys/types.h + sha2.h        libmd    SHA256_CTX     SHA256Init
+# MINIX 3  sys/types.h + sha2.h                 SHA256_CTX     SHA256_Init
+# Darwin   CommonCrypto/CommonDigest.h          CC_SHA256_CTX  CC_SHA256_Init
+#
+# Note that Darwin's CC_SHA256_Update takes buffer size as uint32_t instead
+# of size_t.
+#
+sha256_header_found=no
+sha256_type_found=no
+sha256_func_found=no
+if test "x$enable_external_sha256" = "xyes"
+then :
+  
+	# Test for Common Crypto before others, because Darwin has sha256.h
+	# too and we don't want to use that, because on older versions it
+	# uses OpenSSL functions, whose SHA256_Init is not guaranteed to
+	# succeed.
+	       for ac_header in CommonCrypto/CommonDigest.h sha256.h sha2.h
+do :
+  as_ac_Header=`printf '%s\n' "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define `printf '%s\n' "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
+_ACEOF
+ sha256_header_found=yes ; break
+fi
+
+done
+	if test "x$sha256_header_found" = xyes; then
+		ac_fn_c_check_type "$LINENO" "CC_SHA256_CTX" "ac_cv_type_CC_SHA256_CTX" "#ifdef HAVE_SYS_TYPES_H
+			  # include <sys/types.h>
+			  #endif
+			  #ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H
+			  # include <CommonCrypto/CommonDigest.h>
+			  #endif
+			  #ifdef HAVE_SHA256_H
+			  # include <sha256.h>
+			  #endif
+			  #ifdef HAVE_SHA2_H
+			  # include <sha2.h>
+			  #endif
+"
+if test "x$ac_cv_type_CC_SHA256_CTX" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_CC_SHA256_CTX 1" >>confdefs.h
+
+sha256_type_found=yes
+fi
+ac_fn_c_check_type "$LINENO" "SHA256_CTX" "ac_cv_type_SHA256_CTX" "#ifdef HAVE_SYS_TYPES_H
+			  # include <sys/types.h>
+			  #endif
+			  #ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H
+			  # include <CommonCrypto/CommonDigest.h>
+			  #endif
+			  #ifdef HAVE_SHA256_H
+			  # include <sha256.h>
+			  #endif
+			  #ifdef HAVE_SHA2_H
+			  # include <sha2.h>
+			  #endif
+"
+if test "x$ac_cv_type_SHA256_CTX" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_SHA256_CTX 1" >>confdefs.h
+
+sha256_type_found=yes
+fi
+ac_fn_c_check_type "$LINENO" "SHA2_CTX" "ac_cv_type_SHA2_CTX" "#ifdef HAVE_SYS_TYPES_H
+			  # include <sys/types.h>
+			  #endif
+			  #ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H
+			  # include <CommonCrypto/CommonDigest.h>
+			  #endif
+			  #ifdef HAVE_SHA256_H
+			  # include <sha256.h>
+			  #endif
+			  #ifdef HAVE_SHA2_H
+			  # include <sha2.h>
+			  #endif
+"
+if test "x$ac_cv_type_SHA2_CTX" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE_SHA2_CTX 1" >>confdefs.h
+
+sha256_type_found=yes
+fi
+
+		if test "x$sha256_type_found" = xyes ; then
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256Init" >&5
+printf %s "checking for library containing SHA256Init... " >&6; }
+if test ${ac_cv_search_SHA256Init+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SHA256Init (void);
+int
+main (void)
+{
+return SHA256Init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' md
+do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_search_SHA256Init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext
+  if test ${ac_cv_search_SHA256Init+y}
+then :
+  break
+fi
+done
+if test ${ac_cv_search_SHA256Init+y}
+then :
+  
+else case e in @%:@(
+  e) ac_cv_search_SHA256Init=no ;;
+esac
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256Init" >&5
+printf '%s\n' "$ac_cv_search_SHA256Init" >&6; }
+ac_res=$ac_cv_search_SHA256Init
+if test "$ac_res" != no
+then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  
+fi
+
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256_Init" >&5
+printf %s "checking for library containing SHA256_Init... " >&6; }
+if test ${ac_cv_search_SHA256_Init+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SHA256_Init (void);
+int
+main (void)
+{
+return SHA256_Init ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' md
+do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_search_SHA256_Init=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext
+  if test ${ac_cv_search_SHA256_Init+y}
+then :
+  break
+fi
+done
+if test ${ac_cv_search_SHA256_Init+y}
+then :
+  
+else case e in @%:@(
+  e) ac_cv_search_SHA256_Init=no ;;
+esac
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256_Init" >&5
+printf '%s\n' "$ac_cv_search_SHA256_Init" >&6; }
+ac_res=$ac_cv_search_SHA256_Init
+if test "$ac_res" != no
+then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  
+fi
+
+			
+  for ac_func in CC_SHA256_Init SHA256Init SHA256_Init
+do :
+  as_ac_var=`printf '%s\n' "ac_cv_func_$ac_func" | sed "$as_sed_sh"`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"
+then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define `printf '%s\n' "HAVE_$ac_func" | sed "$as_sed_cpp"` 1
+_ACEOF
+ sha256_func_found=yes ; break
+fi
+
+done
+		fi
+	fi
+
+fi
+ if test "x$sha256_func_found" = xno; then
+  COND_INTERNAL_SHA256_TRUE=
+  COND_INTERNAL_SHA256_FALSE='#'
+else
+  COND_INTERNAL_SHA256_TRUE='#'
+  COND_INTERNAL_SHA256_FALSE=
+fi
+
+if test "x$enable_external_sha256$sha256_func_found" = xyesno; then
+	as_fn_error $? "--enable-external-sha256 was specified but no supported external SHA-256 implementation was found" "$LINENO" 5
+fi
+
+# Check for SSE2 intrinsics. There is no run-time detection for SSE2 so if
+# compiler options enable SSE2 then SSE2 support is required by the binaries.
+# The compile-time check for SSE2 is done with #ifdefs because some compilers
+# (ICC, MSVC) allow SSE2 intrinsics even when SSE2 isn't enabled.
+ac_fn_check_decl "$LINENO" "_mm_movemask_epi8" "ac_cv_have_decl__mm_movemask_epi8" "#ifdef HAVE_IMMINTRIN_H
+#include <immintrin.h>
+#endif
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
+if test "x$ac_cv_have_decl__mm_movemask_epi8" = xyes
+then :
+  
+printf '%s\n' "@%:@define HAVE__MM_MOVEMASK_EPI8 1" >>confdefs.h
+
+fi
+
+# Check for sandbox support. If one is found, set enable_sandbox=found.
+case $enable_sandbox in @%:@(
+  auto | capsicum) :
+    
+		
+# On FreeBSD >= 11.x and Linux, Capsicum is uses <sys/capsicum.h>.
+# If this header is found, it is assumed to be the right one.
+capsicum_header_found=no
+       for ac_header in sys/capsicum.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/capsicum.h" "ac_cv_header_sys_capsicum_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_capsicum_h" = xyes
+then :
+  printf '%s\n' "@%:@define HAVE_SYS_CAPSICUM_H 1" >>confdefs.h
+ capsicum_header_found=yes
+fi
+
+done
+if test "$capsicum_header_found" = no ; then
+    # On FreeBSD 10.x Capsicum uses <sys/capability.h>. Such a header exists
+    # on Linux too but it describes POSIX.1e capabilities. Look for the
+    # declaration of cap_rights_limit to check if <sys/capability.h> is
+    # a Capsicum header.
+    ac_fn_check_decl "$LINENO" "cap_rights_limit" "ac_cv_have_decl_cap_rights_limit" "#include <sys/capability.h>
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_cap_rights_limit" = xyes
+then :
+  capsicum_header_found=yes
+fi
+fi
+
+capsicum_lib_found=no
+CAPSICUM_LIB=
+if test "$capsicum_header_found" = yes ; then
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+    # FreeBSD >= 10.x has Capsicum functions in libc.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cap_rights_limit (void);
+int
+main (void)
+{
+return cap_rights_limit ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  capsicum_lib_found=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+    # Linux has Capsicum functions in libcaprights.
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cap_rights_limit in -lcaprights" >&5
+printf %s "checking for cap_rights_limit in -lcaprights... " >&6; }
+if test ${ac_cv_lib_caprights_cap_rights_limit+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcaprights  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cap_rights_limit (void);
+int
+main (void)
+{
+return cap_rights_limit ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_caprights_cap_rights_limit=yes
+else case e in @%:@(
+  e) ac_cv_lib_caprights_cap_rights_limit=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_caprights_cap_rights_limit" >&5
+printf '%s\n' "$ac_cv_lib_caprights_cap_rights_limit" >&6; }
+if test "x$ac_cv_lib_caprights_cap_rights_limit" = xyes
+then :
+  CAPSICUM_LIB=-lcaprights
+                  capsicum_lib_found=yes
+fi
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+
+
+if test "$capsicum_lib_found" = yes ; then
+    
+printf '%s\n' "@%:@define HAVE_CAPSICUM 1" >>confdefs.h
+
+    enable_sandbox=found
+else
+    :
+fi
+	
+ ;; @%:@(
+  *) :
+     ;;
+esac
+
+# If a specific sandboxing method was explicitly requested and it wasn't
+# found, give an error.
+case $enable_sandbox in
+	auto | no | found)
+		;;
+	*)
+		as_fn_error $? "$enable_sandbox support not found" "$LINENO" 5
+		;;
+esac
+
+
+###############################################################################
+# If using GCC, set some additional AM_CFLAGS:
+###############################################################################
+
+if test "$GCC" = yes ; then
+	echo
+	echo "GCC extensions:"
+fi
+
+# Always do the visibility check but don't set AM_CFLAGS on Windows.
+# This way things get set properly even on Windows.
+
+  
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+printf %s "checking whether the -Werror option is usable... " >&6; }
+if test ${gl_cv_cc_vis_werror+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) gl_saved_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -Werror"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_cc_vis_werror=yes
+else case e in @%:@(
+  e) gl_cv_cc_vis_werror=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+       CFLAGS="$gl_saved_CFLAGS"
+       ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+printf %s "checking for simple visibility declarations... " >&6; }
+if test ${gl_cv_cc_visibility+y}
+then :
+  printf %s "(cached) " >&6
+else case e in @%:@(
+  e) gl_saved_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fvisibility=hidden"
+                                          if test $gl_cv_cc_vis_werror = yes; then
+         CFLAGS="$CFLAGS -Werror"
+       fi
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+              extern __attribute__((__visibility__("default"))) int exportedvar;
+              extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+              extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+              void dummyfunc (void);
+              int hiddenvar;
+              int exportedvar;
+              int hiddenfunc (void) { return 51; }
+              int exportedfunc (void) { return 1225736919; }
+              void dummyfunc (void) {}
+            
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_cc_visibility=yes
+else case e in @%:@(
+  e) gl_cv_cc_visibility=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+       CFLAGS="$gl_saved_CFLAGS"
+       ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+  
+  
+  
+printf '%s\n' "@%:@define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+
+
+if test -n "$CFLAG_VISIBILITY" && test "$is_w32" = no; then
+	AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY"
+fi
+
+if test "$GCC" = yes
+then :
+  
+	# Enable as much warnings as possible. These commented warnings won't
+	# work for this package though:
+	#   * -Wunreachable-code breaks several assert(0) cases, which are
+	#     backed up with "return LZMA_PROG_ERROR".
+	#   * -Wcast-qual would break various things where we need a non-const
+	#     pointer although we don't modify anything through it.
+	#   * -Wcast-align breaks optimized CRC32 and CRC64 implementation
+	#     on some architectures (not on x86), where this warning is bogus,
+	#     because we take care of correct alignment.
+	#   * -Winline, -Wdisabled-optimization, -Wunsafe-loop-optimizations
+	#     don't seem so useful here; at least the last one gives some
+	#     warnings which are not bugs.
+	for NEW_FLAG in \
+			-Wall \
+			-Wextra \
+			-Wvla \
+			-Wformat=2 \
+			-Winit-self \
+			-Wmissing-include-dirs \
+			-Wstrict-aliasing \
+			-Wfloat-equal \
+			-Wundef \
+			-Wshadow \
+			-Wpointer-arith \
+			-Wbad-function-cast \
+			-Wwrite-strings \
+			-Wlogical-op \
+			-Waggregate-return \
+			-Wstrict-prototypes \
+			-Wold-style-definition \
+			-Wmissing-prototypes \
+			-Wmissing-declarations \
+			-Wmissing-noreturn \
+			-Wredundant-decls
+	do
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC accepts $NEW_FLAG" >&5
+printf %s "checking if $CC accepts $NEW_FLAG... " >&6; }
+		OLD_CFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS $NEW_FLAG -Werror"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+void foo(void); void foo(void) { }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  
+			AM_CFLAGS="$AM_CFLAGS $NEW_FLAG"
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
+		
+else case e in @%:@(
+  e) 
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+		 ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+		CFLAGS="$OLD_CFLAGS"
+	done
+
+	@%:@ Check whether --enable-werror was given.
+if test ${enable_werror+y}
+then :
+  enableval=$enable_werror; 
+else case e in @%:@(
+  e) enable_werror=no ;;
+esac
+fi
+
+	if test "x$enable_werror" = "xyes"; then
+		AM_CFLAGS="$AM_CFLAGS -Werror"
+	fi
+
+fi
+
+
+###############################################################################
+# Create the makefiles and config.h
+###############################################################################
+
+echo
+
+# Don't build the lib directory at all if we don't need any replacement
+# functions.
+ if test -n "$LIBOBJS"; then
+  COND_GNULIB_TRUE=
+  COND_GNULIB_FALSE='#'
+else
+  COND_GNULIB_TRUE='#'
+  COND_GNULIB_FALSE=
+fi
+
+
+# Add default AM_CFLAGS.
+
+
+# This is needed for src/scripts.
+xz=`echo xz | sed "$program_transform_name"`
+
+
+ac_config_files="$ac_config_files Doxyfile Makefile po/Makefile.in lib/Makefile src/Makefile src/liblzma/Makefile src/liblzma/api/Makefile src/xz/Makefile src/xzdec/Makefile src/lzmainfo/Makefile src/scripts/Makefile tests/Makefile debug/Makefile"
+
+ac_config_files="$ac_config_files src/scripts/xzdiff"
+
+ac_config_files="$ac_config_files src/scripts/xzgrep"
+
+ac_config_files="$ac_config_files src/scripts/xzmore"
+
+ac_config_files="$ac_config_files src/scripts/xzless"
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# 'ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* 'ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+ac_cache_dump |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIB@&t@OBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${COND_W32_TRUE}" && test -z "${COND_W32_FALSE}"; then
+  as_fn_error $? "conditional \"COND_W32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_MAIN_ENCODER_TRUE}" && test -z "${COND_MAIN_ENCODER_FALSE}"; then
+  as_fn_error $? "conditional \"COND_MAIN_ENCODER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_MAIN_DECODER_TRUE}" && test -z "${COND_MAIN_DECODER_FALSE}"; then
+  as_fn_error $? "conditional \"COND_MAIN_DECODER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_LZMA1_TRUE}" && test -z "${COND_FILTER_LZMA1_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_LZMA1\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_LZMA1_TRUE}" && test -z "${COND_ENCODER_LZMA1_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_LZMA1\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_LZMA1_TRUE}" && test -z "${COND_DECODER_LZMA1_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_LZMA1\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_LZMA2_TRUE}" && test -z "${COND_FILTER_LZMA2_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_LZMA2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_LZMA2_TRUE}" && test -z "${COND_ENCODER_LZMA2_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_LZMA2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_LZMA2_TRUE}" && test -z "${COND_DECODER_LZMA2_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_LZMA2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_DELTA_TRUE}" && test -z "${COND_FILTER_DELTA_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_DELTA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_DELTA_TRUE}" && test -z "${COND_ENCODER_DELTA_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_DELTA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_DELTA_TRUE}" && test -z "${COND_DECODER_DELTA_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_DELTA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_X86_TRUE}" && test -z "${COND_FILTER_X86_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_X86\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_X86_TRUE}" && test -z "${COND_ENCODER_X86_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_X86\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_X86_TRUE}" && test -z "${COND_DECODER_X86_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_X86\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_POWERPC_TRUE}" && test -z "${COND_FILTER_POWERPC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_POWERPC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_POWERPC_TRUE}" && test -z "${COND_ENCODER_POWERPC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_POWERPC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_POWERPC_TRUE}" && test -z "${COND_DECODER_POWERPC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_POWERPC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_IA64_TRUE}" && test -z "${COND_FILTER_IA64_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_IA64\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_IA64_TRUE}" && test -z "${COND_ENCODER_IA64_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_IA64\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_IA64_TRUE}" && test -z "${COND_DECODER_IA64_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_IA64\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_ARM_TRUE}" && test -z "${COND_FILTER_ARM_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_ARM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_ARM_TRUE}" && test -z "${COND_ENCODER_ARM_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_ARM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_ARM_TRUE}" && test -z "${COND_DECODER_ARM_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_ARM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_ARMTHUMB_TRUE}" && test -z "${COND_FILTER_ARMTHUMB_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_ARMTHUMB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_ARMTHUMB_TRUE}" && test -z "${COND_ENCODER_ARMTHUMB_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_ARMTHUMB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_ARMTHUMB_TRUE}" && test -z "${COND_DECODER_ARMTHUMB_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_ARMTHUMB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_SPARC_TRUE}" && test -z "${COND_FILTER_SPARC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_SPARC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_SPARC_TRUE}" && test -z "${COND_ENCODER_SPARC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_SPARC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_SPARC_TRUE}" && test -z "${COND_DECODER_SPARC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_SPARC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_SIMPLE_TRUE}" && test -z "${COND_FILTER_SIMPLE_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_SIMPLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_SIMPLE_TRUE}" && test -z "${COND_ENCODER_SIMPLE_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_SIMPLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_SIMPLE_TRUE}" && test -z "${COND_DECODER_SIMPLE_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_SIMPLE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_FILTER_LZ_TRUE}" && test -z "${COND_FILTER_LZ_FALSE}"; then
+  as_fn_error $? "conditional \"COND_FILTER_LZ\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ENCODER_LZ_TRUE}" && test -z "${COND_ENCODER_LZ_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ENCODER_LZ\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DECODER_LZ_TRUE}" && test -z "${COND_DECODER_LZ_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DECODER_LZ\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_CHECK_CRC32_TRUE}" && test -z "${COND_CHECK_CRC32_FALSE}"; then
+  as_fn_error $? "conditional \"COND_CHECK_CRC32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_CHECK_CRC64_TRUE}" && test -z "${COND_CHECK_CRC64_FALSE}"; then
+  as_fn_error $? "conditional \"COND_CHECK_CRC64\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_CHECK_SHA256_TRUE}" && test -z "${COND_CHECK_SHA256_FALSE}"; then
+  as_fn_error $? "conditional \"COND_CHECK_SHA256\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ASM_X86_TRUE}" && test -z "${COND_ASM_X86_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ASM_X86\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_ASM_X86_64_TRUE}" && test -z "${COND_ASM_X86_64_FALSE}"; then
+  as_fn_error $? "conditional \"COND_ASM_X86_64\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_SMALL_TRUE}" && test -z "${COND_SMALL_FALSE}"; then
+  as_fn_error $? "conditional \"COND_SMALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_XZ_TRUE}" && test -z "${COND_XZ_FALSE}"; then
+  as_fn_error $? "conditional \"COND_XZ\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_XZDEC_TRUE}" && test -z "${COND_XZDEC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_XZDEC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_LZMADEC_TRUE}" && test -z "${COND_LZMADEC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_LZMADEC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_LZMAINFO_TRUE}" && test -z "${COND_LZMAINFO_FALSE}"; then
+  as_fn_error $? "conditional \"COND_LZMAINFO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_LZMALINKS_TRUE}" && test -z "${COND_LZMALINKS_FALSE}"; then
+  as_fn_error $? "conditional \"COND_LZMALINKS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_SCRIPTS_TRUE}" && test -z "${COND_SCRIPTS_FALSE}"; then
+  as_fn_error $? "conditional \"COND_SCRIPTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_DOC_TRUE}" && test -z "${COND_DOC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+printf %s "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf '%s\n' "done" >&6; }
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_THREADS_TRUE}" && test -z "${COND_THREADS_FALSE}"; then
+  as_fn_error $? "conditional \"COND_THREADS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_SHARED_TRUE}" && test -z "${COND_SHARED_FALSE}"; then
+  as_fn_error $? "conditional \"COND_SHARED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_SYMVERS_LINUX_TRUE}" && test -z "${COND_SYMVERS_LINUX_FALSE}"; then
+  as_fn_error $? "conditional \"COND_SYMVERS_LINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_SYMVERS_GENERIC_TRUE}" && test -z "${COND_SYMVERS_GENERIC_FALSE}"; then
+  as_fn_error $? "conditional \"COND_SYMVERS_GENERIC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+@%:@ Check whether --enable-year2038 was given.
+if test ${enable_year2038+y}
+then :
+  enableval=$enable_year2038; 
+fi
+
+
+if test -z "${COND_INTERNAL_SHA256_TRUE}" && test -z "${COND_INTERNAL_SHA256_FALSE}"; then
+  as_fn_error $? "conditional \"COND_INTERNAL_SHA256\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COND_GNULIB_TRUE}" && test -z "${COND_GNULIB_FALSE}"; then
+  as_fn_error $? "conditional \"COND_GNULIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in @%:@(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; @%:@(
+  */*) :
+     ;; @%:@(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
+ac_write_fail=0
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # contradicts POSIX and common usage.  Disable this.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else case e in @%:@(
+  e) case `(set -o) 2>/dev/null` in @%:@(
+  *posix*) :
+    set -o posix ;; @%:@(
+  *) :
+     ;;
+esac ;;
+esac
+fi
+
+
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
+as_nl='
+'
+export as_nl
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+
+# The user is always right.
+if ${PATH_SEPARATOR+false} :; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in @%:@((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in @%:@(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+
+
+@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD]
+@%:@ ----------------------------------------
+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+@%:@ script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  printf '%s\n' "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} @%:@ as_fn_error
+
+
+@%:@ as_fn_set_status STATUS
+@%:@ -----------------------
+@%:@ Set @S|@? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} @%:@ as_fn_set_status
+
+@%:@ as_fn_exit STATUS
+@%:@ -----------------
+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} @%:@ as_fn_exit
+
+@%:@ as_fn_unset VAR
+@%:@ ---------------
+@%:@ Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+@%:@ as_fn_append VAR VALUE
+@%:@ ----------------------
+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
+@%:@ advantage of any shell optimizations that allow amortized linear growth over
+@%:@ repeated appends, instead of the typical quadratic growth present in naive
+@%:@ implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else case e in @%:@(
+  e) as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  } ;;
+esac
+fi # as_fn_append
+
+@%:@ as_fn_arith ARG...
+@%:@ ------------------
+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
+@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
+@%:@ must be portable across @S|@(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else case e in @%:@(
+  e) as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  } ;;
+esac
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+@%:@ as_fn_mkdir_p
+@%:@ -------------
+@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} @%:@ as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+@%:@ as_fn_executable_p FILE
+@%:@ -----------------------
+@%:@ Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} @%:@ as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+
+# Sed expression to map a string onto a valid variable name.
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+
+
+exec 6>&1
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
+
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by XZ Utils $as_me 5.2.13, which was
+generated by GNU Autoconf 2.73.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+'$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE] 
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE] 
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <xz@tukaani.org>.
+XZ Utils home page: <https://tukaani.org/xz/>."
+
+_ACEOF
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
+ac_cs_config='$ac_cs_config_escaped'
+ac_cs_version="\\
+XZ Utils config.status 5.2.13
+configured by $0, generated by GNU Autoconf 2.73,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2026 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
+_ACEOF
+
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    printf '%s\n' "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    printf '%s\n' "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: '$1'
+Try '$0 --help' for more information.";;
+  --help | --hel | -h )
+    printf '%s\n' "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: '$1'
+Try '$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
+@%:@@%:@ Running $as_me. @%:@@%:@
+_ASBOX
+  printf '%s\n' "$ac_log"
+} >&5
+
+_ACEOF
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_cxx_stdlib='`$ECHO "$enable_cxx_stdlib" | $SED "$delay_single_quote_subst"`'
+stdlibflag='`$ECHO "$stdlibflag" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`'
+reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`'
+reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_RC='`$ECHO "$old_archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
+compiler_RC='`$ECHO "$compiler_RC" | $SED "$delay_single_quote_subst"`'
+GCC_RC='`$ECHO "$GCC_RC" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_RC='`$ECHO "$lt_prog_compiler_no_builtin_flag_RC" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_RC='`$ECHO "$lt_prog_compiler_pic_RC" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_RC='`$ECHO "$lt_prog_compiler_wl_RC" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_RC='`$ECHO "$lt_prog_compiler_static_RC" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_RC='`$ECHO "$lt_cv_prog_compiler_c_o_RC" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_RC='`$ECHO "$archive_cmds_need_lc_RC" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_RC='`$ECHO "$enable_shared_with_static_runtimes_RC" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_RC='`$ECHO "$export_dynamic_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_RC='`$ECHO "$whole_archive_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_RC='`$ECHO "$compiler_needs_object_RC" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_RC='`$ECHO "$old_archive_from_new_cmds_RC" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_RC='`$ECHO "$old_archive_from_expsyms_cmds_RC" | $SED "$delay_single_quote_subst"`'
+archive_cmds_RC='`$ECHO "$archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_RC='`$ECHO "$archive_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
+module_cmds_RC='`$ECHO "$module_cmds_RC" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_RC='`$ECHO "$module_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_RC='`$ECHO "$with_gnu_ld_RC" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_RC='`$ECHO "$allow_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_RC='`$ECHO "$no_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_RC='`$ECHO "$hardcode_libdir_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_RC='`$ECHO "$hardcode_libdir_separator_RC" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_RC='`$ECHO "$hardcode_direct_RC" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_RC='`$ECHO "$hardcode_direct_absolute_RC" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_RC='`$ECHO "$hardcode_minus_L_RC" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_RC='`$ECHO "$hardcode_shlibpath_var_RC" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_RC='`$ECHO "$hardcode_automatic_RC" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_RC='`$ECHO "$inherit_rpath_RC" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_RC='`$ECHO "$link_all_deplibs_RC" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_RC='`$ECHO "$always_export_symbols_RC" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_RC='`$ECHO "$export_symbols_cmds_RC" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_RC='`$ECHO "$exclude_expsyms_RC" | $SED "$delay_single_quote_subst"`'
+include_expsyms_RC='`$ECHO "$include_expsyms_RC" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_RC='`$ECHO "$prelink_cmds_RC" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`'
+file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`'
+hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in AS \
+DLLTOOL \
+OBJDUMP \
+SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+FILECMD \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+sharedlib_from_linklib_cmd \
+AR \
+lt_ar_flags \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib \
+LD_RC \
+reload_flag_RC \
+compiler_RC \
+lt_prog_compiler_no_builtin_flag_RC \
+lt_prog_compiler_pic_RC \
+lt_prog_compiler_wl_RC \
+lt_prog_compiler_static_RC \
+lt_cv_prog_compiler_c_o_RC \
+export_dynamic_flag_spec_RC \
+whole_archive_flag_spec_RC \
+compiler_needs_object_RC \
+with_gnu_ld_RC \
+allow_undefined_flag_RC \
+no_undefined_flag_RC \
+hardcode_libdir_flag_spec_RC \
+hardcode_libdir_separator_RC \
+exclude_expsyms_RC \
+include_expsyms_RC \
+file_list_spec_RC; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
+reload_cmds_RC \
+old_archive_cmds_RC \
+old_archive_from_new_cmds_RC \
+old_archive_from_expsyms_cmds_RC \
+archive_cmds_RC \
+archive_expsym_cmds_RC \
+module_cmds_RC \
+module_expsym_cmds_RC \
+export_symbols_cmds_RC \
+prelink_cmds_RC \
+postlink_cmds_RC; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+
+_ACEOF
+
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+    "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/liblzma/Makefile") CONFIG_FILES="$CONFIG_FILES src/liblzma/Makefile" ;;
+    "src/liblzma/api/Makefile") CONFIG_FILES="$CONFIG_FILES src/liblzma/api/Makefile" ;;
+    "src/xz/Makefile") CONFIG_FILES="$CONFIG_FILES src/xz/Makefile" ;;
+    "src/xzdec/Makefile") CONFIG_FILES="$CONFIG_FILES src/xzdec/Makefile" ;;
+    "src/lzmainfo/Makefile") CONFIG_FILES="$CONFIG_FILES src/lzmainfo/Makefile" ;;
+    "src/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES src/scripts/Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "debug/Makefile") CONFIG_FILES="$CONFIG_FILES debug/Makefile" ;;
+    "src/scripts/xzdiff") CONFIG_FILES="$CONFIG_FILES src/scripts/xzdiff" ;;
+    "src/scripts/xzgrep") CONFIG_FILES="$CONFIG_FILES src/scripts/xzgrep" ;;
+    "src/scripts/xzmore") CONFIG_FILES="$CONFIG_FILES src/scripts/xzmore" ;;
+    "src/scripts/xzless") CONFIG_FILES="$CONFIG_FILES src/scripts/xzless" ;;
+
+  *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to '$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with './config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>"$CONFIG_STATUS" || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with './config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script 'defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
+
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro suffix
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain ':'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is 'configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when '$srcdir' = '.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      printf '%s\n' "/* $configure_input  */" >&1 \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    printf '%s\n' "/* $configure_input  */" >&1 \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+  
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in @%:@(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; @%:@(
+  *) :
+    set x $CONFIG_FILES ;; @%:@(
+  *) :
+     ;;
+esac
+  shift
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
+  do
+    # Strip MF so we end up with the name of the file.
+    am_mf=`printf '%s\n' "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X"$am_mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
+  done
+  if test $am_rc -ne 0; then
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE=\"gmake\" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See 'config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
+}
+ ;;
+    "libtool":C) 
+    
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2025 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags='RC '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Assembler program.
+AS=$lt_AS
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$lt_OBJDUMP
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether to let the compiler frontend decide what standard libraries to link when building C++ shared libraries and modules.
+enable_cxx_stdlib=$enable_cxx_stdlib
+
+# Flag used for specifying not to link standard libraries.
+stdlibflag=$stdlibflag
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
+# A file(cmd) program that detects file types.
+FILECMD=$lt_FILECMD
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive (by configure).
+lt_ar_flags=$lt_lt_ar_flags
+
+# Flags to create an archive.
+AR_FLAGS=\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e. impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  
+  
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  $SED '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: RC
+
+# The linker used to build libraries.
+LD=$lt_LD_RC
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_RC
+reload_cmds=$lt_reload_cmds_RC
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_RC
+
+# A language specific compiler.
+CC=$lt_compiler_RC
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_RC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_RC
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_RC
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_RC
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_RC
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_RC
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_RC
+archive_expsym_cmds=$lt_archive_expsym_cmds_RC
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_RC
+module_expsym_cmds=$lt_module_expsym_cmds_RC
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_RC
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_RC
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_RC
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_RC
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e. impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_RC
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_RC
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_RC
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_RC
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_RC
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_RC
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_RC
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_RC
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_RC
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_RC
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_RC
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_RC
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_RC
+
+# ### END LIBTOOL TAG CONFIG: RC
+_LT_EOF
+
+ ;;
+    "po-directories":C) 
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          cat "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+        fi
+        ;;
+      esac
+    done ;;
+    "src/scripts/xzdiff":F) chmod +x src/scripts/xzdiff ;;
+    "src/scripts/xzgrep":F) chmod +x src/scripts/xzgrep ;;
+    "src/scripts/xzmore":F) chmod +x src/scripts/xzmore ;;
+    "src/scripts/xzless":F) chmod +x src/scripts/xzless ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_CONFIG_STATUS=
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  case $CONFIG_STATUS in @%:@(
+  -*) :
+    ac_no_opts=-- ;; @%:@(
+  *) :
+    ac_no_opts= ;;
+esac
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
+# Some warnings
+if test x$tuklib_cv_physmem_method = xunknown; then
+	echo
+	echo "WARNING:"
+	echo "No supported method to detect the amount of RAM."
+	echo "Consider using --enable-assume-ram (if you didn't already)"
+	echo "or make a patch to add support for this operating system."
+fi
+
+if test x$tuklib_cv_cpucores_method = xunknown; then
+	echo
+	echo "WARNING:"
+	echo "No supported method to detect the number of CPU cores."
+fi
+
+if test "x$enable_threads$enable_small" = xnoyes; then
+	echo
+	echo "NOTE:"
+	echo "liblzma will be thread unsafe due the combination"
+	echo "of --disable-threads --enable-small."
+fi
+   
\ No newline at end of file
diff --git a/recipes/tools/xz/source/autom4te.cache/requests b/recipes/tools/xz/source/autom4te.cache/requests
index 1343cc602a..6bff194171 100644
--- a/recipes/tools/xz/source/autom4te.cache/requests
+++ b/recipes/tools/xz/source/autom4te.cache/requests
@@ -540,6 +540,92 @@
                         'm4_sinclude' => 1,
                         'sinclude' => 1
                       }
+                    ], 'Autom4te::Request' ),
+             bless( [
+                      '4',
+                      1,
+                      [
+                        '/usr/share/autoconf'
+                      ],
+                      [
+                        '/usr/share/autoconf/autoconf/autoconf.m4f',
+                        'aclocal.m4',
+                        '/usr/share/autoconf/autoconf/trailer.m4',
+                        'configure.ac'
+                      ],
+                      {
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AC_INIT' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AM_ICONV' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_NLS' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'GTK_DOC_CHECK' => 1,
+                        'GUILE_FLAGS' => 1,
+                        'IT_PROG_INTLTOOL' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'LT_INIT' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        '_AM_COND_IF' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_m4_warn' => 1,
+                        'include' => 1,
+                        'm4_include' => 1,
+                        'm4_pattern_allow' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'm4_sinclude' => 1,
+                        'sinclude' => 1
+                      }
                     ], 'Autom4te::Request' )
            );
 
diff --git a/recipes/tools/xz/source/autom4te.cache/traces.4 b/recipes/tools/xz/source/autom4te.cache/traces.4
new file mode 100644
index 0000000000..5fe830dc32
--- /dev/null
+++ b/recipes/tools/xz/source/autom4te.cache/traces.4
@@ -0,0 +1,1905 @@
+m4trace:aclocal.m4:682: -1- AC_SUBST([am__quote])
+m4trace:aclocal.m4:682: -1- AC_SUBST_TRACE([am__quote])
+m4trace:aclocal.m4:682: -1- m4_pattern_allow([^am__quote$])
+m4trace:aclocal.m4:1338: -1- m4_include([m4/ax_check_capsicum.m4])
+m4trace:aclocal.m4:1339: -1- m4_include([m4/ax_pthread.m4])
+m4trace:aclocal.m4:1340: -1- m4_include([m4/build-to-host.m4])
+m4trace:aclocal.m4:1341: -1- m4_include([m4/getopt.m4])
+m4trace:aclocal.m4:1342: -1- m4_include([m4/gettext.m4])
+m4trace:aclocal.m4:1343: -1- m4_include([m4/host-cpu-c-abi.m4])
+m4trace:aclocal.m4:1344: -1- m4_include([m4/iconv.m4])
+m4trace:aclocal.m4:1345: -1- m4_include([m4/intlmacosx.m4])
+m4trace:aclocal.m4:1346: -1- m4_include([m4/lib-ld.m4])
+m4trace:aclocal.m4:1347: -1- m4_include([m4/lib-link.m4])
+m4trace:aclocal.m4:1348: -1- m4_include([m4/lib-prefix.m4])
+m4trace:aclocal.m4:1349: -1- m4_include([m4/libtool.m4])
+m4trace:aclocal.m4:1350: -1- m4_include([m4/ltoptions.m4])
+m4trace:aclocal.m4:1351: -1- m4_include([m4/ltsugar.m4])
+m4trace:aclocal.m4:1352: -1- m4_include([m4/ltversion.m4])
+m4trace:aclocal.m4:1353: -1- m4_include([m4/lt~obsolete.m4])
+m4trace:aclocal.m4:1354: -1- m4_include([m4/nls.m4])
+m4trace:aclocal.m4:1355: -1- m4_include([m4/po.m4])
+m4trace:aclocal.m4:1356: -1- m4_include([m4/posix-shell.m4])
+m4trace:aclocal.m4:1357: -1- m4_include([m4/progtest.m4])
+m4trace:aclocal.m4:1358: -1- m4_include([m4/tuklib_common.m4])
+m4trace:aclocal.m4:1359: -1- m4_include([m4/tuklib_cpucores.m4])
+m4trace:aclocal.m4:1360: -1- m4_include([m4/tuklib_integer.m4])
+m4trace:aclocal.m4:1361: -1- m4_include([m4/tuklib_mbstr.m4])
+m4trace:aclocal.m4:1362: -1- m4_include([m4/tuklib_physmem.m4])
+m4trace:aclocal.m4:1363: -1- m4_include([m4/tuklib_progname.m4])
+m4trace:aclocal.m4:1364: -1- m4_include([m4/visibility.m4])
+m4trace:configure.ac:20: -1- AC_INIT([XZ Utils], [5.2.13], [xz@tukaani.org], [xz], [https://tukaani.org/xz/])
+m4trace:configure.ac:20: -1- m4_pattern_forbid([^_?A[CHUM]_])
+m4trace:configure.ac:20: -1- m4_pattern_forbid([_AC_])
+m4trace:configure.ac:20: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section 'AC_LIBOBJ vs LIBOBJS'])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^AS_FLAGS$])
+m4trace:configure.ac:20: -1- m4_pattern_forbid([^_?m4_])
+m4trace:configure.ac:20: -1- m4_pattern_forbid([^dnl$])
+m4trace:configure.ac:20: -1- m4_pattern_forbid([^_?AS_])
+m4trace:configure.ac:20: -1- AC_SUBST([SHELL])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([SHELL])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^SHELL$])
+m4trace:configure.ac:20: -1- AC_SUBST([PATH_SEPARATOR])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PATH_SEPARATOR$])
+m4trace:configure.ac:20: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([PACKAGE_NAME])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:20: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:20: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:20: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([PACKAGE_STRING])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:20: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:20: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL],       ['AC_PACKAGE_URL'])])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([PACKAGE_URL])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_URL$])
+m4trace:configure.ac:20: -1- AC_SUBST([exec_prefix], [NONE])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([exec_prefix])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^exec_prefix$])
+m4trace:configure.ac:20: -1- AC_SUBST([prefix], [NONE])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([prefix])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^prefix$])
+m4trace:configure.ac:20: -1- AC_SUBST([program_transform_name], [s,x,x,])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([program_transform_name])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^program_transform_name$])
+m4trace:configure.ac:20: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([bindir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^bindir$])
+m4trace:configure.ac:20: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([sbindir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^sbindir$])
+m4trace:configure.ac:20: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([libexecdir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^libexecdir$])
+m4trace:configure.ac:20: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([datarootdir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.ac:20: -1- AC_SUBST([datadir], ['${datarootdir}'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([datadir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^datadir$])
+m4trace:configure.ac:20: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([sysconfdir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^sysconfdir$])
+m4trace:configure.ac:20: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([sharedstatedir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^sharedstatedir$])
+m4trace:configure.ac:20: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([localstatedir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^localstatedir$])
+m4trace:configure.ac:20: -1- AC_SUBST([runstatedir], ['${localstatedir}/run'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([runstatedir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^runstatedir$])
+m4trace:configure.ac:20: -1- AC_SUBST([includedir], ['${prefix}/include'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([includedir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^includedir$])
+m4trace:configure.ac:20: -1- AC_SUBST([oldincludedir], ['/usr/include'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([oldincludedir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^oldincludedir$])
+m4trace:configure.ac:20: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
+				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
+				     ['${datarootdir}/doc/${PACKAGE}'])])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([docdir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.ac:20: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([infodir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^infodir$])
+m4trace:configure.ac:20: -1- AC_SUBST([htmldir], ['${docdir}'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([htmldir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^htmldir$])
+m4trace:configure.ac:20: -1- AC_SUBST([dvidir], ['${docdir}'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([dvidir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^dvidir$])
+m4trace:configure.ac:20: -1- AC_SUBST([pdfdir], ['${docdir}'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([pdfdir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^pdfdir$])
+m4trace:configure.ac:20: -1- AC_SUBST([psdir], ['${docdir}'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([psdir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^psdir$])
+m4trace:configure.ac:20: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([libdir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^libdir$])
+m4trace:configure.ac:20: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([localedir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.ac:20: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([mandir])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^mandir$])
+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:20: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
+@%:@undef PACKAGE_NAME])
+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:20: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
+@%:@undef PACKAGE_TARNAME])
+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:20: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
+@%:@undef PACKAGE_VERSION])
+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:20: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
+@%:@undef PACKAGE_STRING])
+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:20: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
+@%:@undef PACKAGE_BUGREPORT])
+m4trace:configure.ac:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^PACKAGE_URL$])
+m4trace:configure.ac:20: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */
+@%:@undef PACKAGE_URL])
+m4trace:configure.ac:20: -1- AC_SUBST([DEFS])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([DEFS])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^DEFS$])
+m4trace:configure.ac:20: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:20: -1- AC_SUBST([build_alias])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([build_alias])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^build_alias$])
+m4trace:configure.ac:20: -1- AC_SUBST([host_alias])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([host_alias])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^host_alias$])
+m4trace:configure.ac:20: -1- AC_SUBST([target_alias])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([target_alias])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.ac:20: -1- AC_SUBST([ECHO_C])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ECHO_C])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.ac:20: -1- AC_SUBST([ECHO_N])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ECHO_N])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.ac:20: -1- AC_SUBST([ECHO_T])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ECHO_T])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^ECHO_T$])
+m4trace:configure.ac:23: -1- AC_CONFIG_AUX_DIR([build-aux])
+m4trace:configure.ac:24: -1- AC_CONFIG_MACRO_DIR([m4])
+m4trace:configure.ac:24: -1- AC_CONFIG_MACRO_DIR_TRACE([m4])
+m4trace:configure.ac:25: -1- AC_CONFIG_HEADERS([config.h])
+m4trace:configure.ac:33: -1- AC_CANONICAL_HOST
+m4trace:configure.ac:33: -1- AC_CANONICAL_BUILD
+m4trace:configure.ac:33: -1- AC_REQUIRE_AUX_FILE([config.sub])
+m4trace:configure.ac:33: -1- AC_REQUIRE_AUX_FILE([config.guess])
+m4trace:configure.ac:33: -1- AC_SUBST([build], [$ac_cv_build])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([build])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:33: -1- AC_SUBST([build_cpu], [$[1]])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([build_cpu])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:33: -1- AC_SUBST([build_vendor], [$[2]])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([build_vendor])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:33: -1- AC_SUBST([build_os])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([build_os])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:33: -1- AC_SUBST([host], [$ac_cv_host])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([host])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:33: -1- AC_SUBST([host_cpu], [$[1]])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([host_cpu])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:33: -1- AC_SUBST([host_vendor], [$[2]])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([host_vendor])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:33: -1- AC_SUBST([host_os])
+m4trace:configure.ac:33: -1- AC_SUBST_TRACE([host_os])
+m4trace:configure.ac:33: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:40: -1- AM_CONDITIONAL([COND_W32], [test "$is_w32" = yes])
+m4trace:configure.ac:40: -1- AC_SUBST([COND_W32_TRUE])
+m4trace:configure.ac:40: -1- AC_SUBST_TRACE([COND_W32_TRUE])
+m4trace:configure.ac:40: -1- m4_pattern_allow([^COND_W32_TRUE$])
+m4trace:configure.ac:40: -1- AC_SUBST([COND_W32_FALSE])
+m4trace:configure.ac:40: -1- AC_SUBST_TRACE([COND_W32_FALSE])
+m4trace:configure.ac:40: -1- m4_pattern_allow([^COND_W32_FALSE$])
+m4trace:configure.ac:40: -1- _AM_SUBST_NOTMAKE([COND_W32_TRUE])
+m4trace:configure.ac:40: -1- _AM_SUBST_NOTMAKE([COND_W32_FALSE])
+m4trace:configure.ac:56: -1- AC_SUBST([LN_EXEEXT])
+m4trace:configure.ac:56: -1- AC_SUBST_TRACE([LN_EXEEXT])
+m4trace:configure.ac:56: -1- m4_pattern_allow([^LN_EXEEXT$])
+m4trace:configure.ac:73: -1- AC_DEFINE_TRACE_LITERAL([NDEBUG])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^NDEBUG$])
+m4trace:configure.ac:73: -1- AH_OUTPUT([NDEBUG], [/* Define to 1 to disable debugging code. */
+@%:@undef NDEBUG])
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODER_LZMA1])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_ENCODER_LZMA1$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_ENCODER_LZMA1], [/* Define to 1 if lzma1 encoder is enabled. */
+@%:@undef HAVE_ENCODER_LZMA1])
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODER_LZMA2])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_ENCODER_LZMA2$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_ENCODER_LZMA2], [/* Define to 1 if lzma2 encoder is enabled. */
+@%:@undef HAVE_ENCODER_LZMA2])
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODER_DELTA])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_ENCODER_DELTA$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_ENCODER_DELTA], [/* Define to 1 if delta encoder is enabled. */
+@%:@undef HAVE_ENCODER_DELTA])
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODER_X86])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_ENCODER_X86$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_ENCODER_X86], [/* Define to 1 if x86 encoder is enabled. */
+@%:@undef HAVE_ENCODER_X86])
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODER_POWERPC])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_ENCODER_POWERPC$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_ENCODER_POWERPC], [/* Define to 1 if powerpc encoder is enabled. */
+@%:@undef HAVE_ENCODER_POWERPC])
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODER_IA64])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_ENCODER_IA64$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_ENCODER_IA64], [/* Define to 1 if ia64 encoder is enabled. */
+@%:@undef HAVE_ENCODER_IA64])
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODER_ARM])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_ENCODER_ARM$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_ENCODER_ARM], [/* Define to 1 if arm encoder is enabled. */
+@%:@undef HAVE_ENCODER_ARM])
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODER_ARMTHUMB])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_ENCODER_ARMTHUMB$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_ENCODER_ARMTHUMB], [/* Define to 1 if armthumb encoder is enabled. */
+@%:@undef HAVE_ENCODER_ARMTHUMB])
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODER_SPARC])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_ENCODER_SPARC$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_ENCODER_SPARC], [/* Define to 1 if sparc encoder is enabled. */
+@%:@undef HAVE_ENCODER_SPARC])
+m4trace:configure.ac:118: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENCODERS])
+m4trace:configure.ac:118: -1- m4_pattern_allow([^HAVE_ENCODERS$])
+m4trace:configure.ac:118: -1- AH_OUTPUT([HAVE_ENCODERS], [/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */
+@%:@undef HAVE_ENCODERS])
+m4trace:configure.ac:135: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODER_LZMA1])
+m4trace:configure.ac:135: -1- m4_pattern_allow([^HAVE_DECODER_LZMA1$])
+m4trace:configure.ac:135: -1- AH_OUTPUT([HAVE_DECODER_LZMA1], [/* Define to 1 if lzma1 decoder is enabled. */
+@%:@undef HAVE_DECODER_LZMA1])
+m4trace:configure.ac:135: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODER_LZMA2])
+m4trace:configure.ac:135: -1- m4_pattern_allow([^HAVE_DECODER_LZMA2$])
+m4trace:configure.ac:135: -1- AH_OUTPUT([HAVE_DECODER_LZMA2], [/* Define to 1 if lzma2 decoder is enabled. */
+@%:@undef HAVE_DECODER_LZMA2])
+m4trace:configure.ac:135: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODER_DELTA])
+m4trace:configure.ac:135: -1- m4_pattern_allow([^HAVE_DECODER_DELTA$])
+m4trace:configure.ac:135: -1- AH_OUTPUT([HAVE_DECODER_DELTA], [/* Define to 1 if delta decoder is enabled. */
+@%:@undef HAVE_DECODER_DELTA])
+m4trace:configure.ac:135: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODER_X86])
+m4trace:configure.ac:135: -1- m4_pattern_allow([^HAVE_DECODER_X86$])
+m4trace:configure.ac:135: -1- AH_OUTPUT([HAVE_DECODER_X86], [/* Define to 1 if x86 decoder is enabled. */
+@%:@undef HAVE_DECODER_X86])
+m4trace:configure.ac:135: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODER_POWERPC])
+m4trace:configure.ac:135: -1- m4_pattern_allow([^HAVE_DECODER_POWERPC$])
+m4trace:configure.ac:135: -1- AH_OUTPUT([HAVE_DECODER_POWERPC], [/* Define to 1 if powerpc decoder is enabled. */
+@%:@undef HAVE_DECODER_POWERPC])
+m4trace:configure.ac:135: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODER_IA64])
+m4trace:configure.ac:135: -1- m4_pattern_allow([^HAVE_DECODER_IA64$])
+m4trace:configure.ac:135: -1- AH_OUTPUT([HAVE_DECODER_IA64], [/* Define to 1 if ia64 decoder is enabled. */
+@%:@undef HAVE_DECODER_IA64])
+m4trace:configure.ac:135: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODER_ARM])
+m4trace:configure.ac:135: -1- m4_pattern_allow([^HAVE_DECODER_ARM$])
+m4trace:configure.ac:135: -1- AH_OUTPUT([HAVE_DECODER_ARM], [/* Define to 1 if arm decoder is enabled. */
+@%:@undef HAVE_DECODER_ARM])
+m4trace:configure.ac:135: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODER_ARMTHUMB])
+m4trace:configure.ac:135: -1- m4_pattern_allow([^HAVE_DECODER_ARMTHUMB$])
+m4trace:configure.ac:135: -1- AH_OUTPUT([HAVE_DECODER_ARMTHUMB], [/* Define to 1 if armthumb decoder is enabled. */
+@%:@undef HAVE_DECODER_ARMTHUMB])
+m4trace:configure.ac:135: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODER_SPARC])
+m4trace:configure.ac:135: -1- m4_pattern_allow([^HAVE_DECODER_SPARC$])
+m4trace:configure.ac:135: -1- AH_OUTPUT([HAVE_DECODER_SPARC], [/* Define to 1 if sparc decoder is enabled. */
+@%:@undef HAVE_DECODER_SPARC])
+m4trace:configure.ac:148: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECODERS])
+m4trace:configure.ac:148: -1- m4_pattern_allow([^HAVE_DECODERS$])
+m4trace:configure.ac:148: -1- AH_OUTPUT([HAVE_DECODERS], [/* Define to 1 if any of HAVE_DECODER_foo have been defined. */
+@%:@undef HAVE_DECODERS])
+m4trace:configure.ac:158: -1- AM_CONDITIONAL([COND_MAIN_ENCODER], [test "x$enable_encoders" != xno])
+m4trace:configure.ac:158: -1- AC_SUBST([COND_MAIN_ENCODER_TRUE])
+m4trace:configure.ac:158: -1- AC_SUBST_TRACE([COND_MAIN_ENCODER_TRUE])
+m4trace:configure.ac:158: -1- m4_pattern_allow([^COND_MAIN_ENCODER_TRUE$])
+m4trace:configure.ac:158: -1- AC_SUBST([COND_MAIN_ENCODER_FALSE])
+m4trace:configure.ac:158: -1- AC_SUBST_TRACE([COND_MAIN_ENCODER_FALSE])
+m4trace:configure.ac:158: -1- m4_pattern_allow([^COND_MAIN_ENCODER_FALSE$])
+m4trace:configure.ac:158: -1- _AM_SUBST_NOTMAKE([COND_MAIN_ENCODER_TRUE])
+m4trace:configure.ac:158: -1- _AM_SUBST_NOTMAKE([COND_MAIN_ENCODER_FALSE])
+m4trace:configure.ac:159: -1- AM_CONDITIONAL([COND_MAIN_DECODER], [test "x$enable_decoders" != xno])
+m4trace:configure.ac:159: -1- AC_SUBST([COND_MAIN_DECODER_TRUE])
+m4trace:configure.ac:159: -1- AC_SUBST_TRACE([COND_MAIN_DECODER_TRUE])
+m4trace:configure.ac:159: -1- m4_pattern_allow([^COND_MAIN_DECODER_TRUE$])
+m4trace:configure.ac:159: -1- AC_SUBST([COND_MAIN_DECODER_FALSE])
+m4trace:configure.ac:159: -1- AC_SUBST_TRACE([COND_MAIN_DECODER_FALSE])
+m4trace:configure.ac:159: -1- m4_pattern_allow([^COND_MAIN_DECODER_FALSE$])
+m4trace:configure.ac:159: -1- _AM_SUBST_NOTMAKE([COND_MAIN_DECODER_TRUE])
+m4trace:configure.ac:159: -1- _AM_SUBST_NOTMAKE([COND_MAIN_DECODER_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_FILTER_LZMA1], [test "x$enable_filter_lzma1" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_LZMA1_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_LZMA1_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_LZMA1_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_LZMA1_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_LZMA1_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_LZMA1_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_LZMA1_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_LZMA1_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_ENCODER_LZMA1], [test "x$enable_encoder_lzma1" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_LZMA1_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_LZMA1_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_LZMA1_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_LZMA1_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_LZMA1_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_LZMA1_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_LZMA1_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_LZMA1_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_DECODER_LZMA1], [test "x$enable_decoder_lzma1" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_LZMA1_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_LZMA1_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_LZMA1_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_LZMA1_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_LZMA1_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_LZMA1_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_LZMA1_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_LZMA1_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_FILTER_LZMA2], [test "x$enable_filter_lzma2" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_LZMA2_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_LZMA2_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_LZMA2_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_LZMA2_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_LZMA2_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_LZMA2_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_LZMA2_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_LZMA2_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_ENCODER_LZMA2], [test "x$enable_encoder_lzma2" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_LZMA2_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_LZMA2_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_LZMA2_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_LZMA2_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_LZMA2_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_LZMA2_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_LZMA2_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_LZMA2_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_DECODER_LZMA2], [test "x$enable_decoder_lzma2" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_LZMA2_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_LZMA2_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_LZMA2_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_LZMA2_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_LZMA2_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_LZMA2_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_LZMA2_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_LZMA2_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_FILTER_DELTA], [test "x$enable_filter_delta" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_DELTA_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_DELTA_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_DELTA_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_DELTA_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_DELTA_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_DELTA_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_DELTA_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_DELTA_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_ENCODER_DELTA], [test "x$enable_encoder_delta" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_DELTA_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_DELTA_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_DELTA_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_DELTA_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_DELTA_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_DELTA_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_DELTA_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_DELTA_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_DECODER_DELTA], [test "x$enable_decoder_delta" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_DELTA_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_DELTA_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_DELTA_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_DELTA_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_DELTA_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_DELTA_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_DELTA_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_DELTA_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_FILTER_X86], [test "x$enable_filter_x86" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_X86_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_X86_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_X86_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_X86_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_X86_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_X86_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_X86_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_X86_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_ENCODER_X86], [test "x$enable_encoder_x86" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_X86_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_X86_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_X86_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_X86_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_X86_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_X86_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_X86_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_X86_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_DECODER_X86], [test "x$enable_decoder_x86" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_X86_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_X86_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_X86_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_X86_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_X86_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_X86_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_X86_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_X86_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_FILTER_POWERPC], [test "x$enable_filter_powerpc" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_POWERPC_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_POWERPC_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_POWERPC_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_POWERPC_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_POWERPC_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_POWERPC_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_POWERPC_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_POWERPC_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_ENCODER_POWERPC], [test "x$enable_encoder_powerpc" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_POWERPC_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_POWERPC_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_POWERPC_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_POWERPC_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_POWERPC_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_POWERPC_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_POWERPC_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_POWERPC_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_DECODER_POWERPC], [test "x$enable_decoder_powerpc" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_POWERPC_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_POWERPC_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_POWERPC_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_POWERPC_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_POWERPC_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_POWERPC_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_POWERPC_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_POWERPC_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_FILTER_IA64], [test "x$enable_filter_ia64" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_IA64_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_IA64_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_IA64_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_IA64_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_IA64_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_IA64_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_IA64_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_IA64_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_ENCODER_IA64], [test "x$enable_encoder_ia64" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_IA64_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_IA64_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_IA64_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_IA64_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_IA64_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_IA64_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_IA64_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_IA64_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_DECODER_IA64], [test "x$enable_decoder_ia64" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_IA64_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_IA64_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_IA64_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_IA64_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_IA64_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_IA64_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_IA64_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_IA64_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_FILTER_ARM], [test "x$enable_filter_arm" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_ARM_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_ARM_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_ARM_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_ARM_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_ARM_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_ARM_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_ARM_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_ARM_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_ENCODER_ARM], [test "x$enable_encoder_arm" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_ARM_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_ARM_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_ARM_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_ARM_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_ARM_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_ARM_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_ARM_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_ARM_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_DECODER_ARM], [test "x$enable_decoder_arm" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_ARM_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_ARM_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_ARM_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_ARM_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_ARM_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_ARM_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_ARM_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_ARM_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_FILTER_ARMTHUMB], [test "x$enable_filter_armthumb" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_ARMTHUMB_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_ARMTHUMB_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_ARMTHUMB_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_ARMTHUMB_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_ARMTHUMB_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_ARMTHUMB_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_ARMTHUMB_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_ARMTHUMB_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_ENCODER_ARMTHUMB], [test "x$enable_encoder_armthumb" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_ARMTHUMB_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_ARMTHUMB_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_ARMTHUMB_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_ARMTHUMB_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_ARMTHUMB_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_ARMTHUMB_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_ARMTHUMB_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_ARMTHUMB_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_DECODER_ARMTHUMB], [test "x$enable_decoder_armthumb" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_ARMTHUMB_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_ARMTHUMB_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_ARMTHUMB_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_ARMTHUMB_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_ARMTHUMB_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_ARMTHUMB_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_ARMTHUMB_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_ARMTHUMB_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_FILTER_SPARC], [test "x$enable_filter_sparc" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_SPARC_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_SPARC_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_SPARC_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_FILTER_SPARC_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_FILTER_SPARC_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_FILTER_SPARC_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_SPARC_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_FILTER_SPARC_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_ENCODER_SPARC], [test "x$enable_encoder_sparc" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_SPARC_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_SPARC_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_SPARC_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_ENCODER_SPARC_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_ENCODER_SPARC_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_ENCODER_SPARC_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_SPARC_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_SPARC_FALSE])
+m4trace:configure.ac:161: -1- AM_CONDITIONAL([COND_DECODER_SPARC], [test "x$enable_decoder_sparc" = xyes])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_SPARC_TRUE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_SPARC_TRUE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_SPARC_TRUE$])
+m4trace:configure.ac:161: -1- AC_SUBST([COND_DECODER_SPARC_FALSE])
+m4trace:configure.ac:161: -1- AC_SUBST_TRACE([COND_DECODER_SPARC_FALSE])
+m4trace:configure.ac:161: -1- m4_pattern_allow([^COND_DECODER_SPARC_FALSE$])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_SPARC_TRUE])
+m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([COND_DECODER_SPARC_FALSE])
+m4trace:configure.ac:176: -1- AM_CONDITIONAL([COND_FILTER_SIMPLE], [test "x$enable_filter_simple" = xyes])
+m4trace:configure.ac:176: -1- AC_SUBST([COND_FILTER_SIMPLE_TRUE])
+m4trace:configure.ac:176: -1- AC_SUBST_TRACE([COND_FILTER_SIMPLE_TRUE])
+m4trace:configure.ac:176: -1- m4_pattern_allow([^COND_FILTER_SIMPLE_TRUE$])
+m4trace:configure.ac:176: -1- AC_SUBST([COND_FILTER_SIMPLE_FALSE])
+m4trace:configure.ac:176: -1- AC_SUBST_TRACE([COND_FILTER_SIMPLE_FALSE])
+m4trace:configure.ac:176: -1- m4_pattern_allow([^COND_FILTER_SIMPLE_FALSE$])
+m4trace:configure.ac:176: -1- _AM_SUBST_NOTMAKE([COND_FILTER_SIMPLE_TRUE])
+m4trace:configure.ac:176: -1- _AM_SUBST_NOTMAKE([COND_FILTER_SIMPLE_FALSE])
+m4trace:configure.ac:177: -1- AM_CONDITIONAL([COND_ENCODER_SIMPLE], [test "x$enable_encoder_simple" = xyes])
+m4trace:configure.ac:177: -1- AC_SUBST([COND_ENCODER_SIMPLE_TRUE])
+m4trace:configure.ac:177: -1- AC_SUBST_TRACE([COND_ENCODER_SIMPLE_TRUE])
+m4trace:configure.ac:177: -1- m4_pattern_allow([^COND_ENCODER_SIMPLE_TRUE$])
+m4trace:configure.ac:177: -1- AC_SUBST([COND_ENCODER_SIMPLE_FALSE])
+m4trace:configure.ac:177: -1- AC_SUBST_TRACE([COND_ENCODER_SIMPLE_FALSE])
+m4trace:configure.ac:177: -1- m4_pattern_allow([^COND_ENCODER_SIMPLE_FALSE$])
+m4trace:configure.ac:177: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_SIMPLE_TRUE])
+m4trace:configure.ac:177: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_SIMPLE_FALSE])
+m4trace:configure.ac:178: -1- AM_CONDITIONAL([COND_DECODER_SIMPLE], [test "x$enable_decoder_simple" = xyes])
+m4trace:configure.ac:178: -1- AC_SUBST([COND_DECODER_SIMPLE_TRUE])
+m4trace:configure.ac:178: -1- AC_SUBST_TRACE([COND_DECODER_SIMPLE_TRUE])
+m4trace:configure.ac:178: -1- m4_pattern_allow([^COND_DECODER_SIMPLE_TRUE$])
+m4trace:configure.ac:178: -1- AC_SUBST([COND_DECODER_SIMPLE_FALSE])
+m4trace:configure.ac:178: -1- AC_SUBST_TRACE([COND_DECODER_SIMPLE_FALSE])
+m4trace:configure.ac:178: -1- m4_pattern_allow([^COND_DECODER_SIMPLE_FALSE$])
+m4trace:configure.ac:178: -1- _AM_SUBST_NOTMAKE([COND_DECODER_SIMPLE_TRUE])
+m4trace:configure.ac:178: -1- _AM_SUBST_NOTMAKE([COND_DECODER_SIMPLE_FALSE])
+m4trace:configure.ac:189: -1- AM_CONDITIONAL([COND_FILTER_LZ], [test "x$enable_filter_lz" = xyes])
+m4trace:configure.ac:189: -1- AC_SUBST([COND_FILTER_LZ_TRUE])
+m4trace:configure.ac:189: -1- AC_SUBST_TRACE([COND_FILTER_LZ_TRUE])
+m4trace:configure.ac:189: -1- m4_pattern_allow([^COND_FILTER_LZ_TRUE$])
+m4trace:configure.ac:189: -1- AC_SUBST([COND_FILTER_LZ_FALSE])
+m4trace:configure.ac:189: -1- AC_SUBST_TRACE([COND_FILTER_LZ_FALSE])
+m4trace:configure.ac:189: -1- m4_pattern_allow([^COND_FILTER_LZ_FALSE$])
+m4trace:configure.ac:189: -1- _AM_SUBST_NOTMAKE([COND_FILTER_LZ_TRUE])
+m4trace:configure.ac:189: -1- _AM_SUBST_NOTMAKE([COND_FILTER_LZ_FALSE])
+m4trace:configure.ac:190: -1- AM_CONDITIONAL([COND_ENCODER_LZ], [test "x$enable_encoder_lz" = xyes])
+m4trace:configure.ac:190: -1- AC_SUBST([COND_ENCODER_LZ_TRUE])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([COND_ENCODER_LZ_TRUE])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^COND_ENCODER_LZ_TRUE$])
+m4trace:configure.ac:190: -1- AC_SUBST([COND_ENCODER_LZ_FALSE])
+m4trace:configure.ac:190: -1- AC_SUBST_TRACE([COND_ENCODER_LZ_FALSE])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^COND_ENCODER_LZ_FALSE$])
+m4trace:configure.ac:190: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_LZ_TRUE])
+m4trace:configure.ac:190: -1- _AM_SUBST_NOTMAKE([COND_ENCODER_LZ_FALSE])
+m4trace:configure.ac:191: -1- AM_CONDITIONAL([COND_DECODER_LZ], [test "x$enable_decoder_lz" = xyes])
+m4trace:configure.ac:191: -1- AC_SUBST([COND_DECODER_LZ_TRUE])
+m4trace:configure.ac:191: -1- AC_SUBST_TRACE([COND_DECODER_LZ_TRUE])
+m4trace:configure.ac:191: -1- m4_pattern_allow([^COND_DECODER_LZ_TRUE$])
+m4trace:configure.ac:191: -1- AC_SUBST([COND_DECODER_LZ_FALSE])
+m4trace:configure.ac:191: -1- AC_SUBST_TRACE([COND_DECODER_LZ_FALSE])
+m4trace:configure.ac:191: -1- m4_pattern_allow([^COND_DECODER_LZ_FALSE$])
+m4trace:configure.ac:191: -1- _AM_SUBST_NOTMAKE([COND_DECODER_LZ_TRUE])
+m4trace:configure.ac:191: -1- _AM_SUBST_NOTMAKE([COND_DECODER_LZ_FALSE])
+m4trace:configure.ac:219: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MF_HC3])
+m4trace:configure.ac:219: -1- m4_pattern_allow([^HAVE_MF_HC3$])
+m4trace:configure.ac:219: -1- AH_OUTPUT([HAVE_MF_HC3], [/* Define to 1 to enable hc3 match finder. */
+@%:@undef HAVE_MF_HC3])
+m4trace:configure.ac:219: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MF_HC4])
+m4trace:configure.ac:219: -1- m4_pattern_allow([^HAVE_MF_HC4$])
+m4trace:configure.ac:219: -1- AH_OUTPUT([HAVE_MF_HC4], [/* Define to 1 to enable hc4 match finder. */
+@%:@undef HAVE_MF_HC4])
+m4trace:configure.ac:219: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MF_BT2])
+m4trace:configure.ac:219: -1- m4_pattern_allow([^HAVE_MF_BT2$])
+m4trace:configure.ac:219: -1- AH_OUTPUT([HAVE_MF_BT2], [/* Define to 1 to enable bt2 match finder. */
+@%:@undef HAVE_MF_BT2])
+m4trace:configure.ac:219: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MF_BT3])
+m4trace:configure.ac:219: -1- m4_pattern_allow([^HAVE_MF_BT3$])
+m4trace:configure.ac:219: -1- AH_OUTPUT([HAVE_MF_BT3], [/* Define to 1 to enable bt3 match finder. */
+@%:@undef HAVE_MF_BT3])
+m4trace:configure.ac:219: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MF_BT4])
+m4trace:configure.ac:219: -1- m4_pattern_allow([^HAVE_MF_BT4$])
+m4trace:configure.ac:219: -1- AH_OUTPUT([HAVE_MF_BT4], [/* Define to 1 to enable bt4 match finder. */
+@%:@undef HAVE_MF_BT4])
+m4trace:configure.ac:259: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CHECK_CRC32])
+m4trace:configure.ac:259: -1- m4_pattern_allow([^HAVE_CHECK_CRC32$])
+m4trace:configure.ac:259: -1- AH_OUTPUT([HAVE_CHECK_CRC32], [/* Define to 1 if crc32 integrity check is enabled. */
+@%:@undef HAVE_CHECK_CRC32])
+m4trace:configure.ac:259: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CHECK_CRC64])
+m4trace:configure.ac:259: -1- m4_pattern_allow([^HAVE_CHECK_CRC64$])
+m4trace:configure.ac:259: -1- AH_OUTPUT([HAVE_CHECK_CRC64], [/* Define to 1 if crc64 integrity check is enabled. */
+@%:@undef HAVE_CHECK_CRC64])
+m4trace:configure.ac:259: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CHECK_SHA256])
+m4trace:configure.ac:259: -1- m4_pattern_allow([^HAVE_CHECK_SHA256$])
+m4trace:configure.ac:259: -1- AH_OUTPUT([HAVE_CHECK_SHA256], [/* Define to 1 if sha256 integrity check is enabled. */
+@%:@undef HAVE_CHECK_SHA256])
+m4trace:configure.ac:278: -1- AM_CONDITIONAL([COND_CHECK_CRC32], [test "x$enable_check_crc32" = xyes])
+m4trace:configure.ac:278: -1- AC_SUBST([COND_CHECK_CRC32_TRUE])
+m4trace:configure.ac:278: -1- AC_SUBST_TRACE([COND_CHECK_CRC32_TRUE])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^COND_CHECK_CRC32_TRUE$])
+m4trace:configure.ac:278: -1- AC_SUBST([COND_CHECK_CRC32_FALSE])
+m4trace:configure.ac:278: -1- AC_SUBST_TRACE([COND_CHECK_CRC32_FALSE])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^COND_CHECK_CRC32_FALSE$])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([COND_CHECK_CRC32_TRUE])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([COND_CHECK_CRC32_FALSE])
+m4trace:configure.ac:278: -1- AM_CONDITIONAL([COND_CHECK_CRC64], [test "x$enable_check_crc64" = xyes])
+m4trace:configure.ac:278: -1- AC_SUBST([COND_CHECK_CRC64_TRUE])
+m4trace:configure.ac:278: -1- AC_SUBST_TRACE([COND_CHECK_CRC64_TRUE])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^COND_CHECK_CRC64_TRUE$])
+m4trace:configure.ac:278: -1- AC_SUBST([COND_CHECK_CRC64_FALSE])
+m4trace:configure.ac:278: -1- AC_SUBST_TRACE([COND_CHECK_CRC64_FALSE])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^COND_CHECK_CRC64_FALSE$])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([COND_CHECK_CRC64_TRUE])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([COND_CHECK_CRC64_FALSE])
+m4trace:configure.ac:278: -1- AM_CONDITIONAL([COND_CHECK_SHA256], [test "x$enable_check_sha256" = xyes])
+m4trace:configure.ac:278: -1- AC_SUBST([COND_CHECK_SHA256_TRUE])
+m4trace:configure.ac:278: -1- AC_SUBST_TRACE([COND_CHECK_SHA256_TRUE])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^COND_CHECK_SHA256_TRUE$])
+m4trace:configure.ac:278: -1- AC_SUBST([COND_CHECK_SHA256_FALSE])
+m4trace:configure.ac:278: -1- AC_SUBST_TRACE([COND_CHECK_SHA256_FALSE])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^COND_CHECK_SHA256_FALSE$])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([COND_CHECK_SHA256_TRUE])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([COND_CHECK_SHA256_FALSE])
+m4trace:configure.ac:328: -1- AM_CONDITIONAL([COND_ASM_X86], [test "x$enable_assembler" = xx86])
+m4trace:configure.ac:328: -1- AC_SUBST([COND_ASM_X86_TRUE])
+m4trace:configure.ac:328: -1- AC_SUBST_TRACE([COND_ASM_X86_TRUE])
+m4trace:configure.ac:328: -1- m4_pattern_allow([^COND_ASM_X86_TRUE$])
+m4trace:configure.ac:328: -1- AC_SUBST([COND_ASM_X86_FALSE])
+m4trace:configure.ac:328: -1- AC_SUBST_TRACE([COND_ASM_X86_FALSE])
+m4trace:configure.ac:328: -1- m4_pattern_allow([^COND_ASM_X86_FALSE$])
+m4trace:configure.ac:328: -1- _AM_SUBST_NOTMAKE([COND_ASM_X86_TRUE])
+m4trace:configure.ac:328: -1- _AM_SUBST_NOTMAKE([COND_ASM_X86_FALSE])
+m4trace:configure.ac:329: -1- AM_CONDITIONAL([COND_ASM_X86_64], [test "x$enable_assembler" = xx86_64])
+m4trace:configure.ac:329: -1- AC_SUBST([COND_ASM_X86_64_TRUE])
+m4trace:configure.ac:329: -1- AC_SUBST_TRACE([COND_ASM_X86_64_TRUE])
+m4trace:configure.ac:329: -1- m4_pattern_allow([^COND_ASM_X86_64_TRUE$])
+m4trace:configure.ac:329: -1- AC_SUBST([COND_ASM_X86_64_FALSE])
+m4trace:configure.ac:329: -1- AC_SUBST_TRACE([COND_ASM_X86_64_FALSE])
+m4trace:configure.ac:329: -1- m4_pattern_allow([^COND_ASM_X86_64_FALSE$])
+m4trace:configure.ac:329: -1- _AM_SUBST_NOTMAKE([COND_ASM_X86_64_TRUE])
+m4trace:configure.ac:329: -1- _AM_SUBST_NOTMAKE([COND_ASM_X86_64_FALSE])
+m4trace:configure.ac:342: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SMALL])
+m4trace:configure.ac:342: -1- m4_pattern_allow([^HAVE_SMALL$])
+m4trace:configure.ac:342: -1- AH_OUTPUT([HAVE_SMALL], [/* Define to 1 if optimizing for size. */
+@%:@undef HAVE_SMALL])
+m4trace:configure.ac:348: -1- AM_CONDITIONAL([COND_SMALL], [test "x$enable_small" = xyes])
+m4trace:configure.ac:348: -1- AC_SUBST([COND_SMALL_TRUE])
+m4trace:configure.ac:348: -1- AC_SUBST_TRACE([COND_SMALL_TRUE])
+m4trace:configure.ac:348: -1- m4_pattern_allow([^COND_SMALL_TRUE$])
+m4trace:configure.ac:348: -1- AC_SUBST([COND_SMALL_FALSE])
+m4trace:configure.ac:348: -1- AC_SUBST_TRACE([COND_SMALL_FALSE])
+m4trace:configure.ac:348: -1- m4_pattern_allow([^COND_SMALL_FALSE$])
+m4trace:configure.ac:348: -1- _AM_SUBST_NOTMAKE([COND_SMALL_TRUE])
+m4trace:configure.ac:348: -1- _AM_SUBST_NOTMAKE([COND_SMALL_FALSE])
+m4trace:configure.ac:420: -1- AC_DEFINE_TRACE_LITERAL([ASSUME_RAM])
+m4trace:configure.ac:420: -1- m4_pattern_allow([^ASSUME_RAM$])
+m4trace:configure.ac:420: -1- AH_OUTPUT([ASSUME_RAM], [/* How many MiB of RAM to assume if the real amount cannot be determined. */
+@%:@undef ASSUME_RAM])
+m4trace:configure.ac:432: -1- AM_CONDITIONAL([COND_XZ], [test x$enable_xz != xno])
+m4trace:configure.ac:432: -1- AC_SUBST([COND_XZ_TRUE])
+m4trace:configure.ac:432: -1- AC_SUBST_TRACE([COND_XZ_TRUE])
+m4trace:configure.ac:432: -1- m4_pattern_allow([^COND_XZ_TRUE$])
+m4trace:configure.ac:432: -1- AC_SUBST([COND_XZ_FALSE])
+m4trace:configure.ac:432: -1- AC_SUBST_TRACE([COND_XZ_FALSE])
+m4trace:configure.ac:432: -1- m4_pattern_allow([^COND_XZ_FALSE$])
+m4trace:configure.ac:432: -1- _AM_SUBST_NOTMAKE([COND_XZ_TRUE])
+m4trace:configure.ac:432: -1- _AM_SUBST_NOTMAKE([COND_XZ_FALSE])
+m4trace:configure.ac:438: -1- AM_CONDITIONAL([COND_XZDEC], [test x$enable_xzdec != xno])
+m4trace:configure.ac:438: -1- AC_SUBST([COND_XZDEC_TRUE])
+m4trace:configure.ac:438: -1- AC_SUBST_TRACE([COND_XZDEC_TRUE])
+m4trace:configure.ac:438: -1- m4_pattern_allow([^COND_XZDEC_TRUE$])
+m4trace:configure.ac:438: -1- AC_SUBST([COND_XZDEC_FALSE])
+m4trace:configure.ac:438: -1- AC_SUBST_TRACE([COND_XZDEC_FALSE])
+m4trace:configure.ac:438: -1- m4_pattern_allow([^COND_XZDEC_FALSE$])
+m4trace:configure.ac:438: -1- _AM_SUBST_NOTMAKE([COND_XZDEC_TRUE])
+m4trace:configure.ac:438: -1- _AM_SUBST_NOTMAKE([COND_XZDEC_FALSE])
+m4trace:configure.ac:445: -1- AM_CONDITIONAL([COND_LZMADEC], [test x$enable_lzmadec != xno])
+m4trace:configure.ac:445: -1- AC_SUBST([COND_LZMADEC_TRUE])
+m4trace:configure.ac:445: -1- AC_SUBST_TRACE([COND_LZMADEC_TRUE])
+m4trace:configure.ac:445: -1- m4_pattern_allow([^COND_LZMADEC_TRUE$])
+m4trace:configure.ac:445: -1- AC_SUBST([COND_LZMADEC_FALSE])
+m4trace:configure.ac:445: -1- AC_SUBST_TRACE([COND_LZMADEC_FALSE])
+m4trace:configure.ac:445: -1- m4_pattern_allow([^COND_LZMADEC_FALSE$])
+m4trace:configure.ac:445: -1- _AM_SUBST_NOTMAKE([COND_LZMADEC_TRUE])
+m4trace:configure.ac:445: -1- _AM_SUBST_NOTMAKE([COND_LZMADEC_FALSE])
+m4trace:configure.ac:452: -1- AM_CONDITIONAL([COND_LZMAINFO], [test x$enable_lzmainfo != xno])
+m4trace:configure.ac:452: -1- AC_SUBST([COND_LZMAINFO_TRUE])
+m4trace:configure.ac:452: -1- AC_SUBST_TRACE([COND_LZMAINFO_TRUE])
+m4trace:configure.ac:452: -1- m4_pattern_allow([^COND_LZMAINFO_TRUE$])
+m4trace:configure.ac:452: -1- AC_SUBST([COND_LZMAINFO_FALSE])
+m4trace:configure.ac:452: -1- AC_SUBST_TRACE([COND_LZMAINFO_FALSE])
+m4trace:configure.ac:452: -1- m4_pattern_allow([^COND_LZMAINFO_FALSE$])
+m4trace:configure.ac:452: -1- _AM_SUBST_NOTMAKE([COND_LZMAINFO_TRUE])
+m4trace:configure.ac:452: -1- _AM_SUBST_NOTMAKE([COND_LZMAINFO_FALSE])
+m4trace:configure.ac:457: -1- AM_CONDITIONAL([COND_LZMALINKS], [test x$enable_lzma_links != xno])
+m4trace:configure.ac:457: -1- AC_SUBST([COND_LZMALINKS_TRUE])
+m4trace:configure.ac:457: -1- AC_SUBST_TRACE([COND_LZMALINKS_TRUE])
+m4trace:configure.ac:457: -1- m4_pattern_allow([^COND_LZMALINKS_TRUE$])
+m4trace:configure.ac:457: -1- AC_SUBST([COND_LZMALINKS_FALSE])
+m4trace:configure.ac:457: -1- AC_SUBST_TRACE([COND_LZMALINKS_FALSE])
+m4trace:configure.ac:457: -1- m4_pattern_allow([^COND_LZMALINKS_FALSE$])
+m4trace:configure.ac:457: -1- _AM_SUBST_NOTMAKE([COND_LZMALINKS_TRUE])
+m4trace:configure.ac:457: -1- _AM_SUBST_NOTMAKE([COND_LZMALINKS_FALSE])
+m4trace:configure.ac:463: -1- AM_CONDITIONAL([COND_SCRIPTS], [test x$enable_scripts != xno])
+m4trace:configure.ac:463: -1- AC_SUBST([COND_SCRIPTS_TRUE])
+m4trace:configure.ac:463: -1- AC_SUBST_TRACE([COND_SCRIPTS_TRUE])
+m4trace:configure.ac:463: -1- m4_pattern_allow([^COND_SCRIPTS_TRUE$])
+m4trace:configure.ac:463: -1- AC_SUBST([COND_SCRIPTS_FALSE])
+m4trace:configure.ac:463: -1- AC_SUBST_TRACE([COND_SCRIPTS_FALSE])
+m4trace:configure.ac:463: -1- m4_pattern_allow([^COND_SCRIPTS_FALSE$])
+m4trace:configure.ac:463: -1- _AM_SUBST_NOTMAKE([COND_SCRIPTS_TRUE])
+m4trace:configure.ac:463: -1- _AM_SUBST_NOTMAKE([COND_SCRIPTS_FALSE])
+m4trace:configure.ac:469: -1- AM_CONDITIONAL([COND_DOC], [test x$enable_doc != xno])
+m4trace:configure.ac:469: -1- AC_SUBST([COND_DOC_TRUE])
+m4trace:configure.ac:469: -1- AC_SUBST_TRACE([COND_DOC_TRUE])
+m4trace:configure.ac:469: -1- m4_pattern_allow([^COND_DOC_TRUE$])
+m4trace:configure.ac:469: -1- AC_SUBST([COND_DOC_FALSE])
+m4trace:configure.ac:469: -1- AC_SUBST_TRACE([COND_DOC_FALSE])
+m4trace:configure.ac:469: -1- m4_pattern_allow([^COND_DOC_FALSE$])
+m4trace:configure.ac:469: -1- _AM_SUBST_NOTMAKE([COND_DOC_TRUE])
+m4trace:configure.ac:469: -1- _AM_SUBST_NOTMAKE([COND_DOC_FALSE])
+m4trace:configure.ac:519: -1- AC_SUBST([enable_path_for_scripts])
+m4trace:configure.ac:519: -1- AC_SUBST_TRACE([enable_path_for_scripts])
+m4trace:configure.ac:519: -1- m4_pattern_allow([^enable_path_for_scripts$])
+m4trace:configure.ac:537: -1- AC_SUBST([POSIX_SHELL])
+m4trace:configure.ac:537: -1- AC_SUBST_TRACE([POSIX_SHELL])
+m4trace:configure.ac:537: -1- m4_pattern_allow([^POSIX_SHELL$])
+m4trace:configure.ac:537: -1- AC_SUBST([PREFERABLY_POSIX_SHELL])
+m4trace:configure.ac:537: -1- AC_SUBST_TRACE([PREFERABLY_POSIX_SHELL])
+m4trace:configure.ac:537: -1- m4_pattern_allow([^PREFERABLY_POSIX_SHELL$])
+m4trace:configure.ac:550: -1- AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests -Wno-unsupported])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:550: -1- AM_AUTOMAKE_VERSION([1.18.1])
+m4trace:configure.ac:550: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:550: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:550: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:550: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([INSTALL_DATA])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:550: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([am__isrc])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.ac:550: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:550: -1- AC_SUBST([CYGPATH_W])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([CYGPATH_W])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.ac:550: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([PACKAGE])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:550: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([VERSION])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:550: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:550: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
+@%:@undef PACKAGE])
+m4trace:configure.ac:550: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:550: -1- AH_OUTPUT([VERSION], [/* Version number of package */
+@%:@undef VERSION])
+m4trace:configure.ac:550: -1- AC_REQUIRE_AUX_FILE([missing])
+m4trace:configure.ac:550: -1- AC_SUBST([ACLOCAL])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([ACLOCAL])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.ac:550: -1- AC_SUBST([AUTOCONF])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([AUTOCONF])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.ac:550: -1- AC_SUBST([AUTOMAKE])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([AUTOMAKE])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.ac:550: -1- AC_SUBST([AUTOHEADER])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([AUTOHEADER])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.ac:550: -1- AC_SUBST([MAKEINFO])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([MAKEINFO])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.ac:550: -1- AC_SUBST([install_sh])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([install_sh])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.ac:550: -1- AC_SUBST([STRIP])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([STRIP])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:550: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.ac:550: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:550: -1- AC_SUBST([MKDIR_P])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.ac:550: -1- AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([mkdir_p])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:550: -1- AC_SUBST([AWK])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([AWK])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:550: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([SET_MAKE])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:550: -1- AC_SUBST([am__leading_dot])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([am__leading_dot])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.ac:550: -1- AC_SUBST([AMTAR], ['$${TAR-tar}'])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([AMTAR])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.ac:550: -1- AC_SUBST([am__tar])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([am__tar])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:550: -1- AC_SUBST([am__untar])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([am__untar])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.ac:550: -1- AC_SUBST([CTAGS])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([CTAGS])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^CTAGS$])
+m4trace:configure.ac:550: -1- AC_SUBST([ETAGS])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([ETAGS])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^ETAGS$])
+m4trace:configure.ac:550: -1- AC_SUBST([CSCOPE])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([CSCOPE])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^CSCOPE$])
+m4trace:configure.ac:550: -1- AC_SUBST([AM_V])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([AM_V])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AM_V$])
+m4trace:configure.ac:550: -1- _AM_SUBST_NOTMAKE([AM_V])
+m4trace:configure.ac:550: -1- AC_SUBST([AM_DEFAULT_V])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([AM_DEFAULT_V])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AM_DEFAULT_V$])
+m4trace:configure.ac:550: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
+m4trace:configure.ac:550: -1- AC_SUBST([AM_DEFAULT_VERBOSITY])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([AM_DEFAULT_VERBOSITY])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
+m4trace:configure.ac:550: -1- AC_SUBST([AM_BACKSLASH])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([AM_BACKSLASH])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^AM_BACKSLASH$])
+m4trace:configure.ac:550: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
+m4trace:configure.ac:550: -1- AC_SUBST([am__rm_f_notfound])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([am__rm_f_notfound])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^am__rm_f_notfound$])
+m4trace:configure.ac:550: -1- AC_SUBST([am__xargs_n])
+m4trace:configure.ac:550: -1- AC_SUBST_TRACE([am__xargs_n])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^am__xargs_n$])
+m4trace:configure.ac:551: -1- AC_SUBST([LN_S], [$as_ln_s])
+m4trace:configure.ac:551: -1- AC_SUBST_TRACE([LN_S])
+m4trace:configure.ac:551: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:556: -1- _m4_warn([obsolete], [The macro 'AC_PROG_CC_C99' is obsolete.
+You should run autoupdate.], [./lib/autoconf/c.m4:1788: AC_PROG_CC_C99 is expanded from...
+configure.ac:556: the top level])
+m4trace:configure.ac:556: -1- AC_SUBST([CC])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:556: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:556: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:556: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:556: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:556: -1- AC_SUBST([CC])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:556: -1- AC_SUBST([CC])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:556: -1- AC_SUBST([CC])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:556: -1- AC_SUBST([CC])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:556: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([ac_ct_CC])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:556: -1- AC_SUBST([CC])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:556: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([EXEEXT])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:556: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([OBJEXT])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:556: -1- AC_REQUIRE_AUX_FILE([compile])
+m4trace:configure.ac:556: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([DEPDIR])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:556: -1- AC_SUBST([am__include])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([am__include])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:556: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:556: -1- AC_SUBST([AMDEP_TRUE])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([AMDEP_TRUE])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:556: -1- AC_SUBST([AMDEP_FALSE])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([AMDEP_FALSE])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:556: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:556: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:556: -1- AC_SUBST([AMDEPBACKSLASH])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:556: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:556: -1- AC_SUBST([am__nodep])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([am__nodep])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^am__nodep$])
+m4trace:configure.ac:556: -1- _AM_SUBST_NOTMAKE([am__nodep])
+m4trace:configure.ac:556: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([CCDEPMODE])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:556: -1- AM_CONDITIONAL([am__fastdepCC], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:556: -1- AC_SUBST([am__fastdepCC_TRUE])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:556: -1- AC_SUBST([am__fastdepCC_FALSE])
+m4trace:configure.ac:556: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:556: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:556: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:561: -1- AM_PROG_CC_C_O
+m4trace:configure.ac:562: -1- AC_SUBST([CCAS])
+m4trace:configure.ac:562: -1- AC_SUBST_TRACE([CCAS])
+m4trace:configure.ac:562: -1- m4_pattern_allow([^CCAS$])
+m4trace:configure.ac:562: -1- AC_SUBST([CCASFLAGS])
+m4trace:configure.ac:562: -1- AC_SUBST_TRACE([CCASFLAGS])
+m4trace:configure.ac:562: -1- m4_pattern_allow([^CCASFLAGS$])
+m4trace:configure.ac:562: -1- AC_SUBST([CCASDEPMODE], [depmode=$am_cv_CCAS_dependencies_compiler_type])
+m4trace:configure.ac:562: -1- AC_SUBST_TRACE([CCASDEPMODE])
+m4trace:configure.ac:562: -1- m4_pattern_allow([^CCASDEPMODE$])
+m4trace:configure.ac:562: -1- AM_CONDITIONAL([am__fastdepCCAS], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:562: -1- AC_SUBST([am__fastdepCCAS_TRUE])
+m4trace:configure.ac:562: -1- AC_SUBST_TRACE([am__fastdepCCAS_TRUE])
+m4trace:configure.ac:562: -1- m4_pattern_allow([^am__fastdepCCAS_TRUE$])
+m4trace:configure.ac:562: -1- AC_SUBST([am__fastdepCCAS_FALSE])
+m4trace:configure.ac:562: -1- AC_SUBST_TRACE([am__fastdepCCAS_FALSE])
+m4trace:configure.ac:562: -1- m4_pattern_allow([^am__fastdepCCAS_FALSE$])
+m4trace:configure.ac:562: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_TRUE])
+m4trace:configure.ac:562: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_FALSE])
+m4trace:configure.ac:563: -1- AH_OUTPUT([USE_SYSTEM_EXTENSIONS], [/* Enable extensions on AIX, Interix, z/OS.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable extensions on Cosmopolitan Libc. */
+#ifndef _COSMO_SOURCE
+# undef _COSMO_SOURCE
+#endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers\' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+   Oddly enough, this does nothing on OpenBSD.  */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by C23 Annex F.  */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions.  Define to 500 only if necessary
+   to make mbstate_t available.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_STDIO_H], [/* Define to 1 if you have the <stdio.h> header file. */
+@%:@undef HAVE_STDIO_H])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+@%:@undef HAVE_STDLIB_H])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+@%:@undef HAVE_STRING_H])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+@%:@undef HAVE_INTTYPES_H])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+@%:@undef HAVE_STDINT_H])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+@%:@undef HAVE_STRINGS_H])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
+@%:@undef HAVE_SYS_STAT_H])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+@%:@undef HAVE_SYS_TYPES_H])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+@%:@undef HAVE_UNISTD_H])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:563: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if all of the C89 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+@%:@undef STDC_HEADERS])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
+@%:@undef HAVE_WCHAR_H])
+m4trace:configure.ac:563: -1- AH_OUTPUT([HAVE_MINIX_CONFIG_H], [/* Define to 1 if you have the <minix/config.h> header file. */
+@%:@undef HAVE_MINIX_CONFIG_H])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_ALL_SOURCE$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_COSMO_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_COSMO_SOURCE$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_DARWIN_C_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_DARWIN_C_SOURCE$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_GNU_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_GNU_SOURCE$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_HPUX_ALT_XOPEN_SOCKET_API])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_HPUX_ALT_XOPEN_SOCKET_API$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_NETBSD_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_NETBSD_SOURCE$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_OPENBSD_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_OPENBSD_SOURCE$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_PTHREAD_SEMANTICS])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_POSIX_PTHREAD_SEMANTICS$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([__STDC_WANT_IEC_60559_ATTRIBS_EXT__])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^__STDC_WANT_IEC_60559_ATTRIBS_EXT__$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([__STDC_WANT_IEC_60559_BFP_EXT__])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^__STDC_WANT_IEC_60559_BFP_EXT__$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([__STDC_WANT_IEC_60559_DFP_EXT__])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^__STDC_WANT_IEC_60559_DFP_EXT__$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([__STDC_WANT_IEC_60559_EXT__])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^__STDC_WANT_IEC_60559_EXT__$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([__STDC_WANT_IEC_60559_FUNCS_EXT__])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^__STDC_WANT_IEC_60559_FUNCS_EXT__$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([__STDC_WANT_IEC_60559_TYPES_EXT__])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^__STDC_WANT_IEC_60559_TYPES_EXT__$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([__STDC_WANT_LIB_EXT2__])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^__STDC_WANT_LIB_EXT2__$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([__STDC_WANT_MATH_SPEC_FUNCS__])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^__STDC_WANT_MATH_SPEC_FUNCS__$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_TANDEM_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_MINIX])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_MINIX$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_POSIX_SOURCE$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_1_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_POSIX_1_SOURCE$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^__EXTENSIONS__$])
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([_XOPEN_SOURCE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^_XOPEN_SOURCE$])
+m4trace:configure.ac:565: -1- AC_SUBST([SED])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([SED])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:565: -1- AC_SUBST([CPP])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:565: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:565: -1- AC_SUBST([CPP])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:565: -1- AC_SUBST([ax_pthread_config])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([ax_pthread_config])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^ax_pthread_config$])
+m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
+m4trace:configure.ac:565: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+@%:@undef PTHREAD_CREATE_JOINABLE])
+m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD_PRIO_INHERIT])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^HAVE_PTHREAD_PRIO_INHERIT$])
+m4trace:configure.ac:565: -1- AH_OUTPUT([HAVE_PTHREAD_PRIO_INHERIT], [/* Have PTHREAD_PRIO_INHERIT. */
+@%:@undef HAVE_PTHREAD_PRIO_INHERIT])
+m4trace:configure.ac:565: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:565: -1- AC_SUBST([PTHREAD_CXX])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([PTHREAD_CXX])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^PTHREAD_CXX$])
+m4trace:configure.ac:565: -1- AC_SUBST([PTHREAD_LIBS])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:565: -1- AC_SUBST([PTHREAD_CFLAGS])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
+m4trace:configure.ac:565: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:565: -1- AC_SUBST([PTHREAD_CXX])
+m4trace:configure.ac:565: -1- AC_SUBST_TRACE([PTHREAD_CXX])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^PTHREAD_CXX$])
+m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([MYTHREAD_POSIX])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^MYTHREAD_POSIX$])
+m4trace:configure.ac:565: -1- AH_OUTPUT([MYTHREAD_POSIX], [/* Define to 1 when using POSIX threads (pthreads). */
+@%:@undef MYTHREAD_POSIX])
+m4trace:configure.ac:565: -1- AH_OUTPUT([HAVE_CLOCK_GETTIME], [/* Define to 1 if you have the \'clock_gettime\' function. */
+@%:@undef HAVE_CLOCK_GETTIME])
+m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+m4trace:configure.ac:565: -1- AH_OUTPUT([HAVE_PTHREAD_CONDATTR_SETCLOCK], [/* Define to 1 if you have the \'pthread_condattr_setclock\' function. */
+@%:@undef HAVE_PTHREAD_CONDATTR_SETCLOCK])
+m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD_CONDATTR_SETCLOCK])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^HAVE_PTHREAD_CONDATTR_SETCLOCK$])
+m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_CLOCK_MONOTONIC])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^HAVE_DECL_CLOCK_MONOTONIC$])
+m4trace:configure.ac:565: -1- AH_OUTPUT([HAVE_DECL_CLOCK_MONOTONIC], [/* Define to 1 if you have the declaration of \'CLOCK_MONOTONIC\', and to 0 if
+   you don\'t. */
+@%:@undef HAVE_DECL_CLOCK_MONOTONIC])
+m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([MYTHREAD_WIN95])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^MYTHREAD_WIN95$])
+m4trace:configure.ac:565: -1- AH_OUTPUT([MYTHREAD_WIN95], [/* Define to 1 when using Windows 95 (and thus XP) compatible threads. This
+   avoids use of features that were added in Windows Vista. */
+@%:@undef MYTHREAD_WIN95])
+m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([MYTHREAD_VISTA])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^MYTHREAD_VISTA$])
+m4trace:configure.ac:565: -1- AH_OUTPUT([MYTHREAD_VISTA], [/* Define to 1 when using Windows Vista compatible threads. This uses features
+   that are not available on Windows XP. */
+@%:@undef MYTHREAD_VISTA])
+m4trace:configure.ac:607: -1- AM_CONDITIONAL([COND_THREADS], [test "x$enable_threads" != xno])
+m4trace:configure.ac:607: -1- AC_SUBST([COND_THREADS_TRUE])
+m4trace:configure.ac:607: -1- AC_SUBST_TRACE([COND_THREADS_TRUE])
+m4trace:configure.ac:607: -1- m4_pattern_allow([^COND_THREADS_TRUE$])
+m4trace:configure.ac:607: -1- AC_SUBST([COND_THREADS_FALSE])
+m4trace:configure.ac:607: -1- AC_SUBST_TRACE([COND_THREADS_FALSE])
+m4trace:configure.ac:607: -1- m4_pattern_allow([^COND_THREADS_FALSE$])
+m4trace:configure.ac:607: -1- _AM_SUBST_NOTMAKE([COND_THREADS_TRUE])
+m4trace:configure.ac:607: -1- _AM_SUBST_NOTMAKE([COND_THREADS_FALSE])
+m4trace:configure.ac:612: -1- LT_INIT([win32-dll])
+m4trace:configure.ac:612: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
+m4trace:configure.ac:612: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:612: -1- AC_SUBST([AS])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([AS])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^AS$])
+m4trace:configure.ac:612: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([DLLTOOL])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:612: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([OBJDUMP])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:612: -1- AC_SUBST([LIBTOOL])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([LIBTOOL])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^LIBTOOL$])
+m4trace:configure.ac:612: -1- AC_SUBST([SED])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([SED])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:612: -1- AC_SUBST([GREP])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([GREP])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:612: -1- AC_SUBST([EGREP])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([EGREP])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:612: -1- AC_SUBST([FGREP])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([FGREP])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^FGREP$])
+m4trace:configure.ac:612: -1- AC_SUBST([GREP])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([GREP])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:612: -1- AC_SUBST([LD])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([LD])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:612: -1- AC_SUBST([DUMPBIN])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([DUMPBIN])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:612: -1- AC_SUBST([ac_ct_DUMPBIN])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
+m4trace:configure.ac:612: -1- AC_SUBST([DUMPBIN])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([DUMPBIN])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:612: -1- AC_SUBST([NM])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([NM])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^NM$])
+m4trace:configure.ac:612: -1- AC_SUBST([FILECMD])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([FILECMD])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^FILECMD$])
+m4trace:configure.ac:612: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([OBJDUMP])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:612: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([OBJDUMP])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:612: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([DLLTOOL])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:612: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([DLLTOOL])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:612: -1- AC_SUBST([AR])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([AR])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:612: -1- AC_SUBST([ac_ct_AR])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([ac_ct_AR])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^ac_ct_AR$])
+m4trace:configure.ac:612: -1- AC_SUBST([STRIP])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([STRIP])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:612: -1- AC_SUBST([RANLIB])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([RANLIB])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:612: -1- m4_pattern_allow([LT_OBJDIR])
+m4trace:configure.ac:612: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^LT_OBJDIR$])
+m4trace:configure.ac:612: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory where libtool stores uninstalled libraries. */
+@%:@undef LT_OBJDIR])
+m4trace:configure.ac:612: -1- LT_SUPPORTED_TAG([CC])
+m4trace:configure.ac:612: -1- AC_SUBST([MANIFEST_TOOL])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([MANIFEST_TOOL])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^MANIFEST_TOOL$])
+m4trace:configure.ac:612: -1- AC_SUBST([DSYMUTIL])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([DSYMUTIL])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^DSYMUTIL$])
+m4trace:configure.ac:612: -1- AC_SUBST([NMEDIT])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([NMEDIT])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^NMEDIT$])
+m4trace:configure.ac:612: -1- AC_SUBST([LIPO])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([LIPO])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^LIPO$])
+m4trace:configure.ac:612: -1- AC_SUBST([OTOOL])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([OTOOL])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^OTOOL$])
+m4trace:configure.ac:612: -1- AC_SUBST([OTOOL64])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([OTOOL64])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^OTOOL64$])
+m4trace:configure.ac:612: -1- AC_SUBST([LT_SYS_LIBRARY_PATH])
+m4trace:configure.ac:612: -1- AC_SUBST_TRACE([LT_SYS_LIBRARY_PATH])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^LT_SYS_LIBRARY_PATH$])
+m4trace:configure.ac:612: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
+@%:@undef HAVE_DLFCN_H])
+m4trace:configure.ac:612: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
+m4trace:configure.ac:612: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
+m4trace:configure.ac:613: -1- LT_SUPPORTED_TAG([RC])
+m4trace:configure.ac:613: -1- AC_SUBST([RC])
+m4trace:configure.ac:613: -1- AC_SUBST_TRACE([RC])
+m4trace:configure.ac:613: -1- m4_pattern_allow([^RC$])
+m4trace:configure.ac:619: -1- AM_CONDITIONAL([COND_SHARED], [test "x$enable_shared" != xno])
+m4trace:configure.ac:619: -1- AC_SUBST([COND_SHARED_TRUE])
+m4trace:configure.ac:619: -1- AC_SUBST_TRACE([COND_SHARED_TRUE])
+m4trace:configure.ac:619: -1- m4_pattern_allow([^COND_SHARED_TRUE$])
+m4trace:configure.ac:619: -1- AC_SUBST([COND_SHARED_FALSE])
+m4trace:configure.ac:619: -1- AC_SUBST_TRACE([COND_SHARED_FALSE])
+m4trace:configure.ac:619: -1- m4_pattern_allow([^COND_SHARED_FALSE$])
+m4trace:configure.ac:619: -1- _AM_SUBST_NOTMAKE([COND_SHARED_TRUE])
+m4trace:configure.ac:619: -1- _AM_SUBST_NOTMAKE([COND_SHARED_FALSE])
+m4trace:configure.ac:663: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYMBOL_VERSIONS_LINUX])
+m4trace:configure.ac:663: -1- m4_pattern_allow([^HAVE_SYMBOL_VERSIONS_LINUX$])
+m4trace:configure.ac:663: -1- AH_OUTPUT([HAVE_SYMBOL_VERSIONS_LINUX], [/* Define to 1 to if GNU/Linux-specific details are unconditionally wanted for
+   symbol versioning. Define to 2 to if these are wanted only if also PIC is
+   defined (allows building both shared and static liblzma at the same time
+   with Libtool if neither --with-pic nor --without-pic is used). This define
+   must be used together with liblzma_linux.map. */
+@%:@undef HAVE_SYMBOL_VERSIONS_LINUX])
+m4trace:configure.ac:738: -1- AM_CONDITIONAL([COND_SYMVERS_LINUX], [test "x$enable_symbol_versions" = xlinux])
+m4trace:configure.ac:738: -1- AC_SUBST([COND_SYMVERS_LINUX_TRUE])
+m4trace:configure.ac:738: -1- AC_SUBST_TRACE([COND_SYMVERS_LINUX_TRUE])
+m4trace:configure.ac:738: -1- m4_pattern_allow([^COND_SYMVERS_LINUX_TRUE$])
+m4trace:configure.ac:738: -1- AC_SUBST([COND_SYMVERS_LINUX_FALSE])
+m4trace:configure.ac:738: -1- AC_SUBST_TRACE([COND_SYMVERS_LINUX_FALSE])
+m4trace:configure.ac:738: -1- m4_pattern_allow([^COND_SYMVERS_LINUX_FALSE$])
+m4trace:configure.ac:738: -1- _AM_SUBST_NOTMAKE([COND_SYMVERS_LINUX_TRUE])
+m4trace:configure.ac:738: -1- _AM_SUBST_NOTMAKE([COND_SYMVERS_LINUX_FALSE])
+m4trace:configure.ac:740: -1- AM_CONDITIONAL([COND_SYMVERS_GENERIC], [test "x$enable_symbol_versions" = xgeneric])
+m4trace:configure.ac:740: -1- AC_SUBST([COND_SYMVERS_GENERIC_TRUE])
+m4trace:configure.ac:740: -1- AC_SUBST_TRACE([COND_SYMVERS_GENERIC_TRUE])
+m4trace:configure.ac:740: -1- m4_pattern_allow([^COND_SYMVERS_GENERIC_TRUE$])
+m4trace:configure.ac:740: -1- AC_SUBST([COND_SYMVERS_GENERIC_FALSE])
+m4trace:configure.ac:740: -1- AC_SUBST_TRACE([COND_SYMVERS_GENERIC_FALSE])
+m4trace:configure.ac:740: -1- m4_pattern_allow([^COND_SYMVERS_GENERIC_FALSE$])
+m4trace:configure.ac:740: -1- _AM_SUBST_NOTMAKE([COND_SYMVERS_GENERIC_TRUE])
+m4trace:configure.ac:740: -1- _AM_SUBST_NOTMAKE([COND_SYMVERS_GENERIC_FALSE])
+m4trace:configure.ac:753: -1- AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
+m4trace:configure.ac:754: -1- AM_GNU_GETTEXT_VERSION([0.19.6])
+m4trace:configure.ac:755: -1- AM_GNU_GETTEXT([external])
+m4trace:configure.ac:755: -1- AM_NLS
+m4trace:configure.ac:755: -1- AC_SUBST([USE_NLS])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([USE_NLS])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^USE_NLS$])
+m4trace:configure.ac:755: -1- AC_SUBST([GETTEXT_MACRO_VERSION], [0.24])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([GETTEXT_MACRO_VERSION])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^GETTEXT_MACRO_VERSION$])
+m4trace:configure.ac:755: -1- AC_SUBST([MSGFMT])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([MSGFMT])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^MSGFMT$])
+m4trace:configure.ac:755: -1- AC_SUBST([GMSGFMT])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([GMSGFMT])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^GMSGFMT$])
+m4trace:configure.ac:755: -1- AC_SUBST([GMSGFMT_015])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([GMSGFMT_015])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^GMSGFMT_015$])
+m4trace:configure.ac:755: -1- AC_SUBST([XGETTEXT])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([XGETTEXT])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^XGETTEXT$])
+m4trace:configure.ac:755: -1- AC_SUBST([XGETTEXT_015])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([XGETTEXT_015])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^XGETTEXT_015$])
+m4trace:configure.ac:755: -1- AC_SUBST([MSGMERGE])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([MSGMERGE])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^MSGMERGE$])
+m4trace:configure.ac:755: -1- AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([MSGMERGE_FOR_MSGFMT_OPTION])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^MSGMERGE_FOR_MSGFMT_OPTION$])
+m4trace:configure.ac:755: -1- AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([XGETTEXT_EXTRA_OPTIONS])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^XGETTEXT_EXTRA_OPTIONS$])
+m4trace:configure.ac:755: -1- AC_SUBST([DESIRED_LINGUAS])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([DESIRED_LINGUAS])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^DESIRED_LINGUAS$])
+m4trace:configure.ac:755: -1- AC_REQUIRE_AUX_FILE([config.rpath])
+m4trace:configure.ac:755: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CFPREFERENCESCOPYAPPVALUE])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^HAVE_CFPREFERENCESCOPYAPPVALUE$])
+m4trace:configure.ac:755: -1- AH_OUTPUT([HAVE_CFPREFERENCESCOPYAPPVALUE], [/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+@%:@undef HAVE_CFPREFERENCESCOPYAPPVALUE])
+m4trace:configure.ac:755: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CFLOCALECOPYPREFERREDLANGUAGES])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^HAVE_CFLOCALECOPYPREFERREDLANGUAGES$])
+m4trace:configure.ac:755: -1- AH_OUTPUT([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [/* Define to 1 if you have the Mac OS X function
+   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
+@%:@undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES])
+m4trace:configure.ac:755: -1- AC_SUBST([INTL_MACOSX_LIBS])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([INTL_MACOSX_LIBS])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^INTL_MACOSX_LIBS$])
+m4trace:configure.ac:755: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ICONV])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^HAVE_ICONV$])
+m4trace:configure.ac:755: -1- AH_OUTPUT([HAVE_ICONV], [/* Define if you have the iconv() function and it works. */
+@%:@undef HAVE_ICONV])
+m4trace:configure.ac:755: -1- AC_SUBST([LIBICONV])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([LIBICONV])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^LIBICONV$])
+m4trace:configure.ac:755: -1- AC_SUBST([LTLIBICONV])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([LTLIBICONV])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^LTLIBICONV$])
+m4trace:configure.ac:755: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^ENABLE_NLS$])
+m4trace:configure.ac:755: -1- AH_OUTPUT([ENABLE_NLS], [/* Define to 1 if translation of program messages to the user\'s native
+   language is requested. */
+@%:@undef ENABLE_NLS])
+m4trace:configure.ac:755: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^HAVE_GETTEXT$])
+m4trace:configure.ac:755: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */
+@%:@undef HAVE_GETTEXT])
+m4trace:configure.ac:755: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DCGETTEXT])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^HAVE_DCGETTEXT$])
+m4trace:configure.ac:755: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
+@%:@undef HAVE_DCGETTEXT])
+m4trace:configure.ac:755: -1- AC_SUBST([INTLLIBS])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([INTLLIBS])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^INTLLIBS$])
+m4trace:configure.ac:755: -1- AC_SUBST([LIBINTL])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([LIBINTL])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^LIBINTL$])
+m4trace:configure.ac:755: -1- AC_SUBST([LTLIBINTL])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([LTLIBINTL])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^LTLIBINTL$])
+m4trace:configure.ac:755: -1- AC_SUBST([POSUB])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([POSUB])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^POSUB$])
+m4trace:configure.ac:755: -1- AC_SUBST([localedir_c])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([localedir_c])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^localedir_c$])
+m4trace:configure.ac:755: -1- AC_SUBST([localedir_c_make])
+m4trace:configure.ac:755: -1- AC_SUBST_TRACE([localedir_c_make])
+m4trace:configure.ac:755: -1- m4_pattern_allow([^localedir_c_make$])
+m4trace:configure.ac:767: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
+@%:@undef HAVE_FCNTL_H])
+m4trace:configure.ac:767: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
+@%:@undef HAVE_LIMITS_H])
+m4trace:configure.ac:767: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
+@%:@undef HAVE_SYS_TIME_H])
+m4trace:configure.ac:772: -1- AH_OUTPUT([HAVE_IMMINTRIN_H], [/* Define to 1 if you have the <immintrin.h> header file. */
+@%:@undef HAVE_IMMINTRIN_H])
+m4trace:configure.ac:772: -1- AC_DEFINE_TRACE_LITERAL([HAVE_IMMINTRIN_H])
+m4trace:configure.ac:772: -1- m4_pattern_allow([^HAVE_IMMINTRIN_H$])
+m4trace:configure.ac:779: -1- AC_DEFINE_TRACE_LITERAL([HAVE__BOOL])
+m4trace:configure.ac:779: -1- m4_pattern_allow([^HAVE__BOOL$])
+m4trace:configure.ac:779: -1- AH_OUTPUT([HAVE__BOOL], [/* Define to 1 if the system has the type \'_Bool\'. */
+@%:@undef HAVE__BOOL])
+m4trace:configure.ac:779: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDBOOL_H])
+m4trace:configure.ac:779: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
+m4trace:configure.ac:779: -1- AH_OUTPUT([HAVE_STDBOOL_H], [/* Define to 1 if stdbool.h conforms to C99. */
+@%:@undef HAVE_STDBOOL_H])
+m4trace:configure.ac:781: -1- AC_DEFINE_TRACE_LITERAL([_UINT8_T])
+m4trace:configure.ac:781: -1- m4_pattern_allow([^_UINT8_T$])
+m4trace:configure.ac:781: -1- AH_OUTPUT([_UINT8_T], [/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   @%:@define below would cause a syntax error. */
+@%:@undef _UINT8_T])
+m4trace:configure.ac:781: -1- AC_DEFINE_TRACE_LITERAL([uint8_t])
+m4trace:configure.ac:781: -1- m4_pattern_allow([^uint8_t$])
+m4trace:configure.ac:781: -1- AH_OUTPUT([uint8_t], [/* Define to the type of an unsigned integer type of width exactly 8 bits if
+   such a type exists and the standard includes do not define it. */
+@%:@undef uint8_t])
+m4trace:configure.ac:782: -1- AC_DEFINE_TRACE_LITERAL([uint16_t])
+m4trace:configure.ac:782: -1- m4_pattern_allow([^uint16_t$])
+m4trace:configure.ac:782: -1- AH_OUTPUT([uint16_t], [/* Define to the type of an unsigned integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+@%:@undef uint16_t])
+m4trace:configure.ac:783: -1- AC_DEFINE_TRACE_LITERAL([int32_t])
+m4trace:configure.ac:783: -1- m4_pattern_allow([^int32_t$])
+m4trace:configure.ac:783: -1- AH_OUTPUT([int32_t], [/* Define to the type of a signed integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+@%:@undef int32_t])
+m4trace:configure.ac:784: -1- AC_DEFINE_TRACE_LITERAL([_UINT32_T])
+m4trace:configure.ac:784: -1- m4_pattern_allow([^_UINT32_T$])
+m4trace:configure.ac:784: -1- AH_OUTPUT([_UINT32_T], [/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   @%:@define below would cause a syntax error. */
+@%:@undef _UINT32_T])
+m4trace:configure.ac:784: -1- AC_DEFINE_TRACE_LITERAL([uint32_t])
+m4trace:configure.ac:784: -1- m4_pattern_allow([^uint32_t$])
+m4trace:configure.ac:784: -1- AH_OUTPUT([uint32_t], [/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+@%:@undef uint32_t])
+m4trace:configure.ac:785: -1- AC_DEFINE_TRACE_LITERAL([int64_t])
+m4trace:configure.ac:785: -1- m4_pattern_allow([^int64_t$])
+m4trace:configure.ac:785: -1- AH_OUTPUT([int64_t], [/* Define to the type of a signed integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+@%:@undef int64_t])
+m4trace:configure.ac:786: -1- AC_DEFINE_TRACE_LITERAL([_UINT64_T])
+m4trace:configure.ac:786: -1- m4_pattern_allow([^_UINT64_T$])
+m4trace:configure.ac:786: -1- AH_OUTPUT([_UINT64_T], [/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   @%:@define below would cause a syntax error. */
+@%:@undef _UINT64_T])
+m4trace:configure.ac:786: -1- AC_DEFINE_TRACE_LITERAL([uint64_t])
+m4trace:configure.ac:786: -1- m4_pattern_allow([^uint64_t$])
+m4trace:configure.ac:786: -1- AH_OUTPUT([uint64_t], [/* Define to the type of an unsigned integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+@%:@undef uint64_t])
+m4trace:configure.ac:787: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINTPTR_T])
+m4trace:configure.ac:787: -1- m4_pattern_allow([^HAVE_UINTPTR_T$])
+m4trace:configure.ac:787: -1- AH_OUTPUT([HAVE_UINTPTR_T], [/* Define to 1 if the system has the type \'uintptr_t\'. */
+@%:@undef HAVE_UINTPTR_T])
+m4trace:configure.ac:787: -1- AC_DEFINE_TRACE_LITERAL([uintptr_t])
+m4trace:configure.ac:787: -1- m4_pattern_allow([^uintptr_t$])
+m4trace:configure.ac:787: -1- AH_OUTPUT([uintptr_t], [/* Define to the type of an unsigned integer type wide enough to hold a
+   pointer, if such a type exists, and if the system does not define it. */
+@%:@undef uintptr_t])
+m4trace:configure.ac:789: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_SIZE_T])
+m4trace:configure.ac:789: -1- m4_pattern_allow([^SIZEOF_SIZE_T$])
+m4trace:configure.ac:789: -1- AH_OUTPUT([SIZEOF_SIZE_T], [/* The size of \'size_t\', as computed by sizeof. */
+@%:@undef SIZEOF_SIZE_T])
+m4trace:configure.ac:794: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC])
+m4trace:configure.ac:794: -1- m4_pattern_allow([^HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC$])
+m4trace:configure.ac:794: -1- AH_OUTPUT([HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC], [/* Define to 1 if \'st_atim.tv_nsec\' is a member of \'struct stat\'. */
+@%:@undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC])
+m4trace:configure.ac:794: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC])
+m4trace:configure.ac:794: -1- m4_pattern_allow([^HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC$])
+m4trace:configure.ac:794: -1- AH_OUTPUT([HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC], [/* Define to 1 if \'st_atimespec.tv_nsec\' is a member of \'struct stat\'. */
+@%:@undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC])
+m4trace:configure.ac:794: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_STAT_ST_ATIMENSEC])
+m4trace:configure.ac:794: -1- m4_pattern_allow([^HAVE_STRUCT_STAT_ST_ATIMENSEC$])
+m4trace:configure.ac:794: -1- AH_OUTPUT([HAVE_STRUCT_STAT_ST_ATIMENSEC], [/* Define to 1 if \'st_atimensec\' is a member of \'struct stat\'. */
+@%:@undef HAVE_STRUCT_STAT_ST_ATIMENSEC])
+m4trace:configure.ac:794: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_STAT_ST_UATIME])
+m4trace:configure.ac:794: -1- m4_pattern_allow([^HAVE_STRUCT_STAT_ST_UATIME$])
+m4trace:configure.ac:794: -1- AH_OUTPUT([HAVE_STRUCT_STAT_ST_UATIME], [/* Define to 1 if \'st_uatime\' is a member of \'struct stat\'. */
+@%:@undef HAVE_STRUCT_STAT_ST_UATIME])
+m4trace:configure.ac:794: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC])
+m4trace:configure.ac:794: -1- m4_pattern_allow([^HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC$])
+m4trace:configure.ac:794: -1- AH_OUTPUT([HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC], [/* Define to 1 if \'st_atim.st__tim.tv_nsec\' is a member of \'struct stat\'. */
+@%:@undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC])
+m4trace:configure.ac:801: -1- AC_DEFINE_TRACE_LITERAL([_FILE_OFFSET_BITS])
+m4trace:configure.ac:801: -1- m4_pattern_allow([^_FILE_OFFSET_BITS$])
+m4trace:configure.ac:801: -1- AH_OUTPUT([_FILE_OFFSET_BITS], [/* Number of bits in a file offset, on hosts where this is settable. */
+@%:@undef _FILE_OFFSET_BITS])
+m4trace:configure.ac:801: -1- AC_DEFINE_TRACE_LITERAL([_LARGE_FILES])
+m4trace:configure.ac:801: -1- m4_pattern_allow([^_LARGE_FILES$])
+m4trace:configure.ac:801: -1- AH_OUTPUT([_LARGE_FILES], [/* Define to 1 on platforms where this makes off_t a 64-bit type. */
+@%:@undef _LARGE_FILES])
+m4trace:configure.ac:801: -1- AC_DEFINE_TRACE_LITERAL([_TIME_BITS])
+m4trace:configure.ac:801: -1- m4_pattern_allow([^_TIME_BITS$])
+m4trace:configure.ac:801: -1- AH_OUTPUT([_TIME_BITS], [/* Number of bits in time_t, on hosts where this is settable. */
+@%:@undef _TIME_BITS])
+m4trace:configure.ac:801: -1- AC_DEFINE_TRACE_LITERAL([__MINGW_USE_VC2005_COMPAT])
+m4trace:configure.ac:801: -1- m4_pattern_allow([^__MINGW_USE_VC2005_COMPAT$])
+m4trace:configure.ac:801: -1- AH_OUTPUT([__MINGW_USE_VC2005_COMPAT], [/* Define to 1 on platforms where this makes time_t a 64-bit type. */
+@%:@undef __MINGW_USE_VC2005_COMPAT])
+m4trace:configure.ac:802: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif])
+m4trace:configure.ac:802: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
+m4trace:configure.ac:802: -1- m4_pattern_allow([^WORDS_BIGENDIAN$])
+m4trace:configure.ac:802: -1- AC_DEFINE_TRACE_LITERAL([AC_APPLE_UNIVERSAL_BUILD])
+m4trace:configure.ac:802: -1- m4_pattern_allow([^AC_APPLE_UNIVERSAL_BUILD$])
+m4trace:configure.ac:802: -1- AH_OUTPUT([AC_APPLE_UNIVERSAL_BUILD], [/* Define if building universal (internal helper macro) */
+@%:@undef AC_APPLE_UNIVERSAL_BUILD])
+m4trace:configure.ac:810: -1- AH_OUTPUT([HAVE_GETOPT_H], [/* Define to 1 if you have the <getopt.h> header file. */
+@%:@undef HAVE_GETOPT_H])
+m4trace:configure.ac:810: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETOPT_H])
+m4trace:configure.ac:810: -1- m4_pattern_allow([^HAVE_GETOPT_H$])
+m4trace:configure.ac:810: -1- AH_OUTPUT([HAVE_GETOPT_LONG], [/* Define to 1 if you have the \'getopt_long\' function. */
+@%:@undef HAVE_GETOPT_LONG])
+m4trace:configure.ac:810: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETOPT_LONG])
+m4trace:configure.ac:810: -1- m4_pattern_allow([^HAVE_GETOPT_LONG$])
+m4trace:configure.ac:810: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OPTRESET])
+m4trace:configure.ac:810: -1- m4_pattern_allow([^HAVE_OPTRESET$])
+m4trace:configure.ac:810: -1- AH_OUTPUT([HAVE_OPTRESET], [/* Define to 1 if getopt.h declares extern int optreset. */
+@%:@undef HAVE_OPTRESET])
+m4trace:configure.ac:810: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS getopt.$ac_objext"])
+m4trace:configure.ac:810: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:810: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:810: -1- AC_LIBSOURCE([getopt.c])
+m4trace:configure.ac:810: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS getopt1.$ac_objext"])
+m4trace:configure.ac:810: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:810: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:810: -1- AC_LIBSOURCE([getopt1.c])
+m4trace:configure.ac:810: -1- AC_DEFINE_TRACE_LITERAL([__GETOPT_PREFIX])
+m4trace:configure.ac:810: -1- m4_pattern_allow([^__GETOPT_PREFIX$])
+m4trace:configure.ac:810: -1- AH_OUTPUT([__GETOPT_PREFIX], [/* Define to rpl_ if the getopt replacement functions and variables should be
+   used. */
+@%:@undef __GETOPT_PREFIX])
+m4trace:configure.ac:810: -1- AC_SUBST([GETOPT_H])
+m4trace:configure.ac:810: -1- AC_SUBST_TRACE([GETOPT_H])
+m4trace:configure.ac:810: -1- m4_pattern_allow([^GETOPT_H$])
+m4trace:configure.ac:813: -1- AH_OUTPUT([HAVE_FUTIMENS], [/* Define to 1 if you have the \'futimens\' function. */
+@%:@undef HAVE_FUTIMENS])
+m4trace:configure.ac:813: -1- AH_OUTPUT([HAVE_FUTIMES], [/* Define to 1 if you have the \'futimes\' function. */
+@%:@undef HAVE_FUTIMES])
+m4trace:configure.ac:813: -1- AH_OUTPUT([HAVE_FUTIMESAT], [/* Define to 1 if you have the \'futimesat\' function. */
+@%:@undef HAVE_FUTIMESAT])
+m4trace:configure.ac:813: -1- AH_OUTPUT([HAVE_UTIMES], [/* Define to 1 if you have the \'utimes\' function. */
+@%:@undef HAVE_UTIMES])
+m4trace:configure.ac:813: -1- AH_OUTPUT([HAVE__FUTIME], [/* Define to 1 if you have the \'_futime\' function. */
+@%:@undef HAVE__FUTIME])
+m4trace:configure.ac:813: -1- AH_OUTPUT([HAVE_UTIME], [/* Define to 1 if you have the \'utime\' function. */
+@%:@undef HAVE_UTIME])
+m4trace:configure.ac:816: -1- AH_OUTPUT([HAVE_POSIX_FADVISE], [/* Define to 1 if you have the \'posix_fadvise\' function. */
+@%:@undef HAVE_POSIX_FADVISE])
+m4trace:configure.ac:816: -1- AC_DEFINE_TRACE_LITERAL([HAVE_POSIX_FADVISE])
+m4trace:configure.ac:816: -1- m4_pattern_allow([^HAVE_POSIX_FADVISE$])
+m4trace:configure.ac:818: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_PROGRAM_INVOCATION_NAME])
+m4trace:configure.ac:818: -1- m4_pattern_allow([^HAVE_DECL_PROGRAM_INVOCATION_NAME$])
+m4trace:configure.ac:818: -1- AH_OUTPUT([HAVE_DECL_PROGRAM_INVOCATION_NAME], [/* Define to 1 if you have the declaration of \'program_invocation_name\', and
+   to 0 if you don\'t. */
+@%:@undef HAVE_DECL_PROGRAM_INVOCATION_NAME])
+m4trace:configure.ac:819: -1- AC_DEFINE_TRACE_LITERAL([HAVE___BUILTIN_BSWAPXX])
+m4trace:configure.ac:819: -1- m4_pattern_allow([^HAVE___BUILTIN_BSWAPXX$])
+m4trace:configure.ac:819: -1- AH_OUTPUT([HAVE___BUILTIN_BSWAPXX], [/* Define to 1 if the GNU C extensions __builtin_bswap16/32/64 are supported.
+   */
+@%:@undef HAVE___BUILTIN_BSWAPXX])
+m4trace:configure.ac:819: -1- AH_OUTPUT([HAVE_BYTESWAP_H], [/* Define to 1 if you have the <byteswap.h> header file. */
+@%:@undef HAVE_BYTESWAP_H])
+m4trace:configure.ac:819: -1- AH_OUTPUT([HAVE_SYS_ENDIAN_H], [/* Define to 1 if you have the <sys/endian.h> header file. */
+@%:@undef HAVE_SYS_ENDIAN_H])
+m4trace:configure.ac:819: -1- AH_OUTPUT([HAVE_SYS_BYTEORDER_H], [/* Define to 1 if you have the <sys/byteorder.h> header file. */
+@%:@undef HAVE_SYS_BYTEORDER_H])
+m4trace:configure.ac:819: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BSWAP_16])
+m4trace:configure.ac:819: -1- m4_pattern_allow([^HAVE_BSWAP_16$])
+m4trace:configure.ac:819: -1- AH_OUTPUT([HAVE_BSWAP_16], [/* Define to 1 if bswap_16 is available. */
+@%:@undef HAVE_BSWAP_16])
+m4trace:configure.ac:819: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BSWAP_32])
+m4trace:configure.ac:819: -1- m4_pattern_allow([^HAVE_BSWAP_32$])
+m4trace:configure.ac:819: -1- AH_OUTPUT([HAVE_BSWAP_32], [/* Define to 1 if bswap_32 is available. */
+@%:@undef HAVE_BSWAP_32])
+m4trace:configure.ac:819: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BSWAP_64])
+m4trace:configure.ac:819: -1- m4_pattern_allow([^HAVE_BSWAP_64$])
+m4trace:configure.ac:819: -1- AH_OUTPUT([HAVE_BSWAP_64], [/* Define to 1 if bswap_64 is available. */
+@%:@undef HAVE_BSWAP_64])
+m4trace:configure.ac:819: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_FAST_UNALIGNED_ACCESS])
+m4trace:configure.ac:819: -1- m4_pattern_allow([^TUKLIB_FAST_UNALIGNED_ACCESS$])
+m4trace:configure.ac:819: -1- AH_OUTPUT([TUKLIB_FAST_UNALIGNED_ACCESS], [/* Define to 1 if the system supports fast unaligned access to 16-bit and
+   32-bit integers. */
+@%:@undef TUKLIB_FAST_UNALIGNED_ACCESS])
+m4trace:configure.ac:819: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_USE_UNSAFE_TYPE_PUNNING])
+m4trace:configure.ac:819: -1- m4_pattern_allow([^TUKLIB_USE_UNSAFE_TYPE_PUNNING$])
+m4trace:configure.ac:819: -1- AH_OUTPUT([TUKLIB_USE_UNSAFE_TYPE_PUNNING], [/* Define to 1 to use unsafe type punning, e.g. char *x = ...; *(int *)x =
+   123; which violates strict aliasing rules and thus is undefined behavior
+   and might result in broken code. */
+@%:@undef TUKLIB_USE_UNSAFE_TYPE_PUNNING])
+m4trace:configure.ac:819: -1- AC_DEFINE_TRACE_LITERAL([HAVE___BUILTIN_ASSUME_ALIGNED])
+m4trace:configure.ac:819: -1- m4_pattern_allow([^HAVE___BUILTIN_ASSUME_ALIGNED$])
+m4trace:configure.ac:819: -1- AH_OUTPUT([HAVE___BUILTIN_ASSUME_ALIGNED], [/* Define to 1 if the GNU C extension __builtin_assume_aligned is supported.
+   */
+@%:@undef HAVE___BUILTIN_ASSUME_ALIGNED])
+m4trace:configure.ac:820: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+@%:@undef HAVE_SYS_PARAM_H])
+m4trace:configure.ac:820: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_PARAM_H])
+m4trace:configure.ac:820: -1- m4_pattern_allow([^HAVE_SYS_PARAM_H$])
+m4trace:configure.ac:820: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_PHYSMEM_AIX])
+m4trace:configure.ac:820: -1- m4_pattern_allow([^TUKLIB_PHYSMEM_AIX$])
+m4trace:configure.ac:820: -1- AH_OUTPUT([TUKLIB_PHYSMEM_AIX], [/* Define to 1 if the amount of physical memory can be detected with
+   _system_configuration.physmem. */
+@%:@undef TUKLIB_PHYSMEM_AIX])
+m4trace:configure.ac:820: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_PHYSMEM_SYSCONF])
+m4trace:configure.ac:820: -1- m4_pattern_allow([^TUKLIB_PHYSMEM_SYSCONF$])
+m4trace:configure.ac:820: -1- AH_OUTPUT([TUKLIB_PHYSMEM_SYSCONF], [/* Define to 1 if the amount of physical memory can be detected with
+   sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES). */
+@%:@undef TUKLIB_PHYSMEM_SYSCONF])
+m4trace:configure.ac:820: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_PHYSMEM_SYSCTL])
+m4trace:configure.ac:820: -1- m4_pattern_allow([^TUKLIB_PHYSMEM_SYSCTL$])
+m4trace:configure.ac:820: -1- AH_OUTPUT([TUKLIB_PHYSMEM_SYSCTL], [/* Define to 1 if the amount of physical memory can be detected with sysctl().
+   */
+@%:@undef TUKLIB_PHYSMEM_SYSCTL])
+m4trace:configure.ac:820: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_PHYSMEM_GETSYSINFO])
+m4trace:configure.ac:820: -1- m4_pattern_allow([^TUKLIB_PHYSMEM_GETSYSINFO$])
+m4trace:configure.ac:820: -1- AH_OUTPUT([TUKLIB_PHYSMEM_GETSYSINFO], [/* Define to 1 if the amount of physical memory can be detected with
+   getsysinfo(). */
+@%:@undef TUKLIB_PHYSMEM_GETSYSINFO])
+m4trace:configure.ac:820: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_PHYSMEM_PSTAT_GETSTATIC])
+m4trace:configure.ac:820: -1- m4_pattern_allow([^TUKLIB_PHYSMEM_PSTAT_GETSTATIC$])
+m4trace:configure.ac:820: -1- AH_OUTPUT([TUKLIB_PHYSMEM_PSTAT_GETSTATIC], [/* Define to 1 if the amount of physical memory can be detected with
+   pstat_getstatic(). */
+@%:@undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC])
+m4trace:configure.ac:820: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_PHYSMEM_GETINVENT_R])
+m4trace:configure.ac:820: -1- m4_pattern_allow([^TUKLIB_PHYSMEM_GETINVENT_R$])
+m4trace:configure.ac:820: -1- AH_OUTPUT([TUKLIB_PHYSMEM_GETINVENT_R], [/* Define to 1 if the amount of physical memory can be detected with
+   getinvent_r(). */
+@%:@undef TUKLIB_PHYSMEM_GETINVENT_R])
+m4trace:configure.ac:820: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_PHYSMEM_SYSINFO])
+m4trace:configure.ac:820: -1- m4_pattern_allow([^TUKLIB_PHYSMEM_SYSINFO$])
+m4trace:configure.ac:820: -1- AH_OUTPUT([TUKLIB_PHYSMEM_SYSINFO], [/* Define to 1 if the amount of physical memory can be detected with Linux
+   sysinfo(). */
+@%:@undef TUKLIB_PHYSMEM_SYSINFO])
+m4trace:configure.ac:821: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+@%:@undef HAVE_SYS_PARAM_H])
+m4trace:configure.ac:821: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_PARAM_H])
+m4trace:configure.ac:821: -1- m4_pattern_allow([^HAVE_SYS_PARAM_H$])
+m4trace:configure.ac:821: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_CPUCORES_SCHED_GETAFFINITY])
+m4trace:configure.ac:821: -1- m4_pattern_allow([^TUKLIB_CPUCORES_SCHED_GETAFFINITY$])
+m4trace:configure.ac:821: -1- AH_OUTPUT([TUKLIB_CPUCORES_SCHED_GETAFFINITY], [/* Define to 1 if the number of available CPU cores can be detected with
+   sched_getaffinity() */
+@%:@undef TUKLIB_CPUCORES_SCHED_GETAFFINITY])
+m4trace:configure.ac:821: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_CPUCORES_CPUSET])
+m4trace:configure.ac:821: -1- m4_pattern_allow([^TUKLIB_CPUCORES_CPUSET$])
+m4trace:configure.ac:821: -1- AH_OUTPUT([TUKLIB_CPUCORES_CPUSET], [/* Define to 1 if the number of available CPU cores can be detected with
+   cpuset(2). */
+@%:@undef TUKLIB_CPUCORES_CPUSET])
+m4trace:configure.ac:821: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_CPUCORES_SYSCTL])
+m4trace:configure.ac:821: -1- m4_pattern_allow([^TUKLIB_CPUCORES_SYSCTL$])
+m4trace:configure.ac:821: -1- AH_OUTPUT([TUKLIB_CPUCORES_SYSCTL], [/* Define to 1 if the number of available CPU cores can be detected with
+   sysctl(). */
+@%:@undef TUKLIB_CPUCORES_SYSCTL])
+m4trace:configure.ac:821: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_CPUCORES_SYSCONF])
+m4trace:configure.ac:821: -1- m4_pattern_allow([^TUKLIB_CPUCORES_SYSCONF$])
+m4trace:configure.ac:821: -1- AH_OUTPUT([TUKLIB_CPUCORES_SYSCONF], [/* Define to 1 if the number of available CPU cores can be detected with
+   sysconf(_SC_NPROCESSORS_ONLN) or sysconf(_SC_NPROC_ONLN). */
+@%:@undef TUKLIB_CPUCORES_SYSCONF])
+m4trace:configure.ac:821: -1- AC_DEFINE_TRACE_LITERAL([TUKLIB_CPUCORES_PSTAT_GETDYNAMIC])
+m4trace:configure.ac:821: -1- m4_pattern_allow([^TUKLIB_CPUCORES_PSTAT_GETDYNAMIC$])
+m4trace:configure.ac:821: -1- AH_OUTPUT([TUKLIB_CPUCORES_PSTAT_GETDYNAMIC], [/* Define to 1 if the number of available CPU cores can be detected with
+   pstat_getdynamic(). */
+@%:@undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC])
+m4trace:configure.ac:822: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MBRTOWC])
+m4trace:configure.ac:822: -1- m4_pattern_allow([^HAVE_MBRTOWC$])
+m4trace:configure.ac:822: -1- AH_OUTPUT([HAVE_MBRTOWC], [/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
+@%:@undef HAVE_MBRTOWC])
+m4trace:configure.ac:822: -1- AH_OUTPUT([HAVE_WCWIDTH], [/* Define to 1 if you have the \'wcwidth\' function. */
+@%:@undef HAVE_WCWIDTH])
+m4trace:configure.ac:822: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WCWIDTH])
+m4trace:configure.ac:822: -1- m4_pattern_allow([^HAVE_WCWIDTH$])
+m4trace:configure.ac:841: -1- AH_OUTPUT([HAVE_COMMONCRYPTO_COMMONDIGEST_H], [/* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
+@%:@undef HAVE_COMMONCRYPTO_COMMONDIGEST_H])
+m4trace:configure.ac:841: -1- AH_OUTPUT([HAVE_SHA256_H], [/* Define to 1 if you have the <sha256.h> header file. */
+@%:@undef HAVE_SHA256_H])
+m4trace:configure.ac:841: -1- AH_OUTPUT([HAVE_SHA2_H], [/* Define to 1 if you have the <sha2.h> header file. */
+@%:@undef HAVE_SHA2_H])
+m4trace:configure.ac:841: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CC_SHA256_CTX])
+m4trace:configure.ac:841: -1- m4_pattern_allow([^HAVE_CC_SHA256_CTX$])
+m4trace:configure.ac:841: -1- AH_OUTPUT([HAVE_CC_SHA256_CTX], [/* Define to 1 if the system has the type \'CC_SHA256_CTX\'. */
+@%:@undef HAVE_CC_SHA256_CTX])
+m4trace:configure.ac:841: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SHA256_CTX])
+m4trace:configure.ac:841: -1- m4_pattern_allow([^HAVE_SHA256_CTX$])
+m4trace:configure.ac:841: -1- AH_OUTPUT([HAVE_SHA256_CTX], [/* Define to 1 if the system has the type \'SHA256_CTX\'. */
+@%:@undef HAVE_SHA256_CTX])
+m4trace:configure.ac:841: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SHA2_CTX])
+m4trace:configure.ac:841: -1- m4_pattern_allow([^HAVE_SHA2_CTX$])
+m4trace:configure.ac:841: -1- AH_OUTPUT([HAVE_SHA2_CTX], [/* Define to 1 if the system has the type \'SHA2_CTX\'. */
+@%:@undef HAVE_SHA2_CTX])
+m4trace:configure.ac:841: -1- AH_OUTPUT([HAVE_CC_SHA256_INIT], [/* Define to 1 if you have the \'CC_SHA256_Init\' function. */
+@%:@undef HAVE_CC_SHA256_INIT])
+m4trace:configure.ac:841: -1- AH_OUTPUT([HAVE_SHA256INIT], [/* Define to 1 if you have the \'SHA256Init\' function. */
+@%:@undef HAVE_SHA256INIT])
+m4trace:configure.ac:841: -1- AH_OUTPUT([HAVE_SHA256_INIT], [/* Define to 1 if you have the \'SHA256_Init\' function. */
+@%:@undef HAVE_SHA256_INIT])
+m4trace:configure.ac:872: -1- AM_CONDITIONAL([COND_INTERNAL_SHA256], [test "x$sha256_func_found" = xno])
+m4trace:configure.ac:872: -1- AC_SUBST([COND_INTERNAL_SHA256_TRUE])
+m4trace:configure.ac:872: -1- AC_SUBST_TRACE([COND_INTERNAL_SHA256_TRUE])
+m4trace:configure.ac:872: -1- m4_pattern_allow([^COND_INTERNAL_SHA256_TRUE$])
+m4trace:configure.ac:872: -1- AC_SUBST([COND_INTERNAL_SHA256_FALSE])
+m4trace:configure.ac:872: -1- AC_SUBST_TRACE([COND_INTERNAL_SHA256_FALSE])
+m4trace:configure.ac:872: -1- m4_pattern_allow([^COND_INTERNAL_SHA256_FALSE$])
+m4trace:configure.ac:872: -1- _AM_SUBST_NOTMAKE([COND_INTERNAL_SHA256_TRUE])
+m4trace:configure.ac:872: -1- _AM_SUBST_NOTMAKE([COND_INTERNAL_SHA256_FALSE])
+m4trace:configure.ac:881: -1- AC_DEFINE_TRACE_LITERAL([HAVE__MM_MOVEMASK_EPI8])
+m4trace:configure.ac:881: -1- m4_pattern_allow([^HAVE__MM_MOVEMASK_EPI8$])
+m4trace:configure.ac:881: -1- AH_OUTPUT([HAVE__MM_MOVEMASK_EPI8], [/* Define to 1 if _mm_movemask_epi8 is available. */
+@%:@undef HAVE__MM_MOVEMASK_EPI8])
+m4trace:configure.ac:890: -1- AH_OUTPUT([HAVE_SYS_CAPSICUM_H], [/* Define to 1 if you have the <sys/capsicum.h> header file. */
+@%:@undef HAVE_SYS_CAPSICUM_H])
+m4trace:configure.ac:890: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_CAPSICUM_H])
+m4trace:configure.ac:890: -1- m4_pattern_allow([^HAVE_SYS_CAPSICUM_H$])
+m4trace:configure.ac:890: -1- AC_SUBST([CAPSICUM_LIB])
+m4trace:configure.ac:890: -1- AC_SUBST_TRACE([CAPSICUM_LIB])
+m4trace:configure.ac:890: -1- m4_pattern_allow([^CAPSICUM_LIB$])
+m4trace:configure.ac:890: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CAPSICUM])
+m4trace:configure.ac:890: -1- m4_pattern_allow([^HAVE_CAPSICUM$])
+m4trace:configure.ac:890: -1- AH_OUTPUT([HAVE_CAPSICUM], [/* Define to 1 if Capsicum is available. */
+@%:@undef HAVE_CAPSICUM])
+m4trace:configure.ac:918: -1- AC_SUBST([CFLAG_VISIBILITY])
+m4trace:configure.ac:918: -1- AC_SUBST_TRACE([CFLAG_VISIBILITY])
+m4trace:configure.ac:918: -1- m4_pattern_allow([^CFLAG_VISIBILITY$])
+m4trace:configure.ac:918: -1- AC_SUBST([HAVE_VISIBILITY])
+m4trace:configure.ac:918: -1- AC_SUBST_TRACE([HAVE_VISIBILITY])
+m4trace:configure.ac:918: -1- m4_pattern_allow([^HAVE_VISIBILITY$])
+m4trace:configure.ac:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VISIBILITY])
+m4trace:configure.ac:918: -1- m4_pattern_allow([^HAVE_VISIBILITY$])
+m4trace:configure.ac:918: -1- AH_OUTPUT([HAVE_VISIBILITY], [/* Define to 1 or 0, depending whether the compiler supports simple visibility
+   declarations. */
+@%:@undef HAVE_VISIBILITY])
+m4trace:configure.ac:990: -1- AM_CONDITIONAL([COND_GNULIB], [test -n "$LIBOBJS"])
+m4trace:configure.ac:990: -1- AC_SUBST([COND_GNULIB_TRUE])
+m4trace:configure.ac:990: -1- AC_SUBST_TRACE([COND_GNULIB_TRUE])
+m4trace:configure.ac:990: -1- m4_pattern_allow([^COND_GNULIB_TRUE$])
+m4trace:configure.ac:990: -1- AC_SUBST([COND_GNULIB_FALSE])
+m4trace:configure.ac:990: -1- AC_SUBST_TRACE([COND_GNULIB_FALSE])
+m4trace:configure.ac:990: -1- m4_pattern_allow([^COND_GNULIB_FALSE$])
+m4trace:configure.ac:990: -1- _AM_SUBST_NOTMAKE([COND_GNULIB_TRUE])
+m4trace:configure.ac:990: -1- _AM_SUBST_NOTMAKE([COND_GNULIB_FALSE])
+m4trace:configure.ac:993: -1- AC_SUBST([AM_CFLAGS])
+m4trace:configure.ac:993: -1- AC_SUBST_TRACE([AM_CFLAGS])
+m4trace:configure.ac:993: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:997: -1- AC_SUBST([xz])
+m4trace:configure.ac:997: -1- AC_SUBST_TRACE([xz])
+m4trace:configure.ac:997: -1- m4_pattern_allow([^xz$])
+m4trace:configure.ac:999: -1- AC_CONFIG_FILES([
+	Doxyfile
+	Makefile
+	po/Makefile.in
+	lib/Makefile
+	src/Makefile
+	src/liblzma/Makefile
+	src/liblzma/api/Makefile
+	src/xz/Makefile
+	src/xzdec/Makefile
+	src/lzmainfo/Makefile
+	src/scripts/Makefile
+	tests/Makefile
+	debug/Makefile
+])
+m4trace:configure.ac:1014: -1- AC_CONFIG_FILES([src/scripts/xzdiff], [chmod +x src/scripts/xzdiff])
+m4trace:configure.ac:1015: -1- AC_CONFIG_FILES([src/scripts/xzgrep], [chmod +x src/scripts/xzgrep])
+m4trace:configure.ac:1016: -1- AC_CONFIG_FILES([src/scripts/xzmore], [chmod +x src/scripts/xzmore])
+m4trace:configure.ac:1017: -1- AC_CONFIG_FILES([src/scripts/xzless], [chmod +x src/scripts/xzless])
+m4trace:configure.ac:1019: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:1019: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:1019: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:1019: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:1019: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:1019: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1019: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:1019: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1019: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:1019: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1019: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:1019: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:1019: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
diff --git a/recipes/tools/xz/source/configure~ b/recipes/tools/xz/source/configure~
index 77f4490d5e..590953647b 100755
--- a/recipes/tools/xz/source/configure~
+++ b/recipes/tools/xz/source/configure~
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for XZ Utils 5.2.13.
+# Generated by GNU Autoconf 2.73 for XZ Utils 5.2.13.
 #
 # Report bugs to <xz@tukaani.org>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+# Copyright (C) 1992-1996, 1998-2017, 2020-2026 Free Software Foundation,
 # Inc.
 #
 #
@@ -22,7 +22,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in #(
@@ -109,7 +109,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -131,10 +131,13 @@ case $- in # ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $# in # ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
@@ -145,7 +148,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else case e in #(
@@ -263,22 +266,25 @@ case $- in # ((((
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+case $# in # ((
+  0) exec $CONFIG_SHELL $as_opts "$as_myself" ;;
+  *) exec $CONFIG_SHELL $as_opts "$as_myself" "$@" ;;
+esac
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf '%s\n' "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno
 then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
+  printf '%s\n' "$0: This script requires a shell more modern than all"
+  printf '%s\n' "$0: the shells that I found on your system."
   if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    printf '%s\n' "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf '%s\n' "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and xz@tukaani.org
+    printf '%s\n' "$0: Please tell bug-autoconf@gnu.org and xz@tukaani.org
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
@@ -339,7 +345,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -348,7 +354,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -431,9 +437,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -460,7 +466,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -506,7 +512,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf '%s\n' "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -520,29 +526,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -603,6 +586,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_CONFIG_STATUS=
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
@@ -653,7 +637,7 @@ ac_includes_default="\
 
 ac_header_c_list=
 gt_needs=
-enable_year2038=no
+: ${enable_year2038:=no}
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -677,6 +661,7 @@ INTLLIBS
 LTLIBICONV
 LIBICONV
 INTL_MACOSX_LIBS
+DESIRED_LINGUAS
 XGETTEXT_EXTRA_OPTIONS
 MSGMERGE_FOR_MSGFMT_OPTION
 MSGMERGE
@@ -747,6 +732,8 @@ LDFLAGS
 CFLAGS
 CC
 LN_S
+am__xargs_n
+am__rm_f_notfound
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
@@ -887,13 +874,13 @@ build_os
 build_vendor
 build_cpu
 build
+ECHO_T
+ECHO_N
+ECHO_C
 target_alias
 host_alias
 build_alias
 LIBS
-ECHO_T
-ECHO_N
-ECHO_C
 DEFS
 mandir
 localedir
@@ -953,8 +940,11 @@ enable_silent_rules
 enable_dependency_tracking
 enable_shared
 enable_static
+enable_pic
 with_pic
+enable_cxx_stdlib
 enable_fast_install
+enable_aix_soname
 with_aix_soname
 with_gnu_ld
 with_sysroot
@@ -1092,7 +1082,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1118,7 +1108,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1331,7 +1321,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1347,7 +1337,7 @@ do
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf '%s\n' "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1391,9 +1381,9 @@ Try '$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf '%s\n' "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf '%s\n' "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1401,7 +1391,7 @@ Try '$0 --help' for more information"
 done
 
 if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`printf '%s\n' $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -1409,7 +1399,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1473,7 +1463,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+printf '%s\n' X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1667,8 +1657,17 @@ Optional Features:
                           speeds up one-time build
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-pic[=PKGS]     try to use only PIC/non-PIC objects [default=use
+                          both]
+  --enable-cxx-stdlib[=PKGS]
+                          let the compiler frontend decide what standard
+                          libraries to link when building C++ shared libraries
+                          and modules [default=no]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
+  --enable-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-symbol-versions
                           Use symbol versioning for liblzma. Enabled by
@@ -1695,11 +1694,6 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-aix-soname=aix|svr4|both
-                          shared library versioning (aka "SONAME") variant to
-                          provide on AIX, [default=aix].
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
@@ -1743,9 +1737,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1782,7 +1776,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf '%s\n' "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1792,9 +1786,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 XZ Utils configure 5.2.13
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.73
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1818,7 +1812,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1826,7 +1820,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1834,7 +1828,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1852,7 +1846,7 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -1874,8 +1868,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -1893,7 +1887,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1901,7 +1895,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1912,7 +1906,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1 ;;
@@ -1940,7 +1934,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1948,7 +1942,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -1956,7 +1950,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 then :
   ac_retval=0
 else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1 ;;
@@ -1973,7 +1967,7 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2025,8 +2019,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -2039,7 +2033,7 @@ ac_fn_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 printf %s "checking whether $as_decl_name is declared... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2079,8 +2073,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_check_decl
@@ -2098,26 +2092,26 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
 else case e in #(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: program exited with status $ac_status" >&5
+       printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status ;;
@@ -2136,7 +2130,7 @@ fi
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2182,8 +2176,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
@@ -2195,7 +2189,7 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_find_uintX_t ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
 printf %s "checking for uint$2_t... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2241,8 +2235,8 @@ fi
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_find_uintX_t
@@ -2254,7 +2248,7 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_find_intX_t ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
 printf %s "checking for int$2_t... " >&6; }
 if eval test \${$3+y}
 then :
@@ -2324,8 +2318,8 @@ fi
 esac
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_find_intX_t
@@ -2532,7 +2526,7 @@ rm -f conftest.val
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 printf %s "checking for $2.$3... " >&6; }
 if eval test \${$4+y}
 then :
@@ -2582,8 +2576,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
@@ -2592,7 +2586,7 @@ for ac_arg
 do
   case $ac_arg in
   *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   as_fn_append ac_configure_args_raw " '$ac_arg'"
 done
@@ -2604,7 +2598,7 @@ case $ac_configure_args_raw in
     ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
     ac_unsafe_a="$ac_unsafe_z#~"
     ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+    ac_configure_args_raw=`      printf '%s\n' "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
 
 cat >config.log <<_ACEOF
@@ -2612,7 +2606,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by XZ Utils $as_me 5.2.13, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -2652,7 +2646,7 @@ do
     */) ;;
     *) as_dir=$as_dir/ ;;
   esac
-    printf "%s\n" "PATH: $as_dir"
+    printf '%s\n' "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2687,7 +2681,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf '%s\n' "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2716,31 +2710,22 @@ done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    printf "%s\n" "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
+# Dump the cache to stdout.  It can be in a pipe (this is a requirement).
+ac_cache_dump ()
+{
+  # The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
 (
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf '%s\n' "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2749,67 +2734,95 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       esac ;;
     esac
   done
+
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
-    echo
+}
 
-    printf "%s\n" "## ----------------- ##
+# Print debugging info to stdout.
+ac_dump_debugging_info ()
+{
+  echo
+
+  printf '%s\n' "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+  echo
+  ac_cache_dump
+  echo
+
+  printf '%s\n' "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
+  echo
+  for ac_var in $ac_subst_vars
+  do
+    eval ac_val=\$$ac_var
+    case $ac_val in
+    *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
+    esac
+    printf '%s\n' "$ac_var='$ac_val'"
+  done | sort
+  echo
+
+  if test -n "$ac_subst_files"; then
+    printf '%s\n' "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
     echo
-    for ac_var in $ac_subst_vars
+    for ac_var in $ac_subst_files
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'*) ac_val=`printf '%s\n' "$ac_val" | sed "s/'/'\\\\\\\\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      printf '%s\n' "$ac_var='$ac_val'"
     done | sort
     echo
+  fi
 
-    if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+  if test -s confdefs.h; then
+    printf '%s\n' "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
+    echo
+    cat confdefs.h
+    echo
+  fi
+  test "$ac_signal" != 0 &&
+    printf '%s\n' "$as_me: caught signal $ac_signal"
+  printf '%s\n' "$as_me: exit $exit_status"
+}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.
+ac_exit_trap ()
+{
+  exit_status=
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  ac_dump_debugging_info >&5
+  eval "rm -f $ac_clean_CONFIG_STATUS core *.core core.conftest.*" &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+}
+
+trap 'ac_exit_trap $?' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
@@ -2818,21 +2831,21 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+printf '%s\n' "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
@@ -2854,12 +2867,12 @@ do
     ac_site_file=./$ac_site_file ;;
 esac
   if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf '%s\n' "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See 'config.log' for more details" "$LINENO" 5; }
   fi
@@ -2869,27 +2882,120 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf '%s\n' "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf '%s\n' "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C23 (global declarations)
+ac_c_conftest_c23_globals='
+/* Does the compiler advertise conformance to C17 or earlier?
+   Although GCC 14 does not do that, even with -std=gnu23,
+   it is close enough, and defines __STDC_VERSION == 202000L.  */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ <= 201710L
+# error "Compiler advertises conformance to C17 or earlier"
+#endif
+
+// Check alignas.
+char alignas (double) c23_aligned_as_double;
+char alignas (0) c23_no_special_alignment;
+extern char c23_aligned_as_int;
+char alignas (0) alignas (int) c23_aligned_as_int;
+
+// Check alignof.
+enum
+{
+  c23_int_alignment = alignof (int),
+  c23_int_array_alignment = alignof (int[100]),
+  c23_char_alignment = alignof (char)
+};
+static_assert (0 < -alignof (int), "alignof is signed");
+
+int function_with_unnamed_parameter (int) { return 0; }
+
+void c23_noreturn ();
+
+/* Test parsing of string and char UTF-8 literals (including hex escapes).
+   The parens pacify GCC 15.  */
+bool use_u8 = (!sizeof u8"\xFF") == (!u8'\''x'\'');
+
+bool check_that_bool_works = true | false | !nullptr;
+#if !true
+# error "true does not work in #if"
+#endif
+#if false
+#elifdef __STDC_VERSION__
+#else
+# error "#elifdef does not work"
+#endif
+
+#ifndef __has_c_attribute
+# error "__has_c_attribute not defined"
+#endif
+
+#ifndef __has_include
+# error "__has_include not defined"
+#endif
+
+#define LPAREN() (
+#define FORTY_TWO(x) 42
+#define VA_OPT_TEST(r, x, ...) __VA_OPT__ (FORTY_TWO r x))
+static_assert (VA_OPT_TEST (LPAREN (), 0, <:-) == 42);
+
+static_assert (0b101010 == 42);
+static_assert (0B101010 == 42);
+static_assert (0xDEAD'\''BEEF == 3'\''735'\''928'\''559);
+static_assert (0.500'\''000'\''000 == 0.5);
+
+enum unsignedish : unsigned int { uione = 1 };
+static_assert (0 < -uione);
+
+#include <stddef.h>
+constexpr nullptr_t null_pointer = nullptr;
+
+static typeof (1 + 1L) two () { return 2; }
+static long int three () { return 3; }
+'
+
+# Test code for whether the C compiler supports C23 (body of main).
+ac_c_conftest_c23_main='
+  {
+    label_before_declaration:
+      int arr[10] = {};
+      if (arr[0])
+        goto label_before_declaration;
+      if (!arr[0])
+        goto label_at_end_of_block;
+    label_at_end_of_block:
+  }
+  ok |= !null_pointer;
+  ok |= two != three;
+'
+
+# Test code for whether the C compiler supports C23 (complete).
+ac_c_conftest_c23_program="${ac_c_conftest_c23_globals}
+
+int
+main (int, char **)
+{
+  int ok = 0;
+  ${ac_c_conftest_c23_main}
+  return ok;
+}
+"
+
 # Test code for whether the C compiler supports C89 (global declarations)
 ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
+/* Do not test the value of __STDC__, because some compilers define it to 0
+   or do not define it, while otherwise adequately conforming.  */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -2969,7 +3075,8 @@ extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
+// FILE and stderr, and "aND" is used instead of "and" to work around
+// GCC bug 40564 which is irrelevant here.
 #define debug(...) dprintf (2, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
@@ -2980,7 +3087,7 @@ test_varargs_macros (void)
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
+  showlist (The first, second, aND third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
@@ -3068,15 +3175,15 @@ ac_c_conftest_c99_main='
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
-  char *restrict newvar = "Another string";
+  const char *restrict newvar = "Another string";
 
   // Check varargs.
   success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  static struct incomplete_array *volatile incomplete_array_pointer;
+  struct incomplete_array *ia = incomplete_array_pointer;
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
@@ -3092,13 +3199,12 @@ ac_c_conftest_c99_main='
 
   ni.number = 58;
 
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
+  // Do not test for VLAs, as some otherwise-conforming compilers lack them.
+  // C code should instead use __STDC_NO_VLA__; see Autoconf manual.
 
   // work around unused variable warnings
   ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
+	 || ni.number != 58);
 '
 
 # Test code for whether the C compiler supports C11 (global declarations)
@@ -3233,7 +3339,7 @@ ac_aux_dir_candidates="${srcdir}/build-aux"
 # $ac_aux_dir_candidates and give up.
 ac_missing_aux_files=""
 ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in $ac_aux_dir_candidates
@@ -3246,7 +3352,7 @@ do
   esac
   as_found=:
 
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
   ac_aux_dir_found=yes
   ac_install_sh=
   for ac_aux in $ac_aux_files
@@ -3257,13 +3363,13 @@ do
     if test x"$ac_aux" = x"install-sh"
     then
       if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
         ac_install_sh="${as_dir}install-sh -c"
       elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
         ac_install_sh="${as_dir}install.sh -c"
       elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
         ac_install_sh="${as_dir}shtool install -c"
       else
         ac_aux_dir_found=no
@@ -3275,7 +3381,7 @@ do
       fi
     else
       if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+        printf '%s\n' "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
       else
         ac_aux_dir_found=no
         if $ac_first_candidate; then
@@ -3328,38 +3434,44 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf '%s\n' "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+	ac_old_val_w=
+	for ac_val in x $ac_old_val; do
+	  ac_old_val_w="$ac_old_val_w $ac_val"
+	done
+	ac_new_val_w=
+	for ac_val in x $ac_new_val; do
+	  ac_new_val_w="$ac_new_val_w $ac_val"
+	done
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf '%s\n' "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf '%s\n' "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf '%s\n' "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf '%s\n' "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf '%s\n' "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -3369,10 +3481,10 @@ printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf '%s\n' "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
@@ -3380,6 +3492,23 @@ fi
 ## Main body of script. ##
 ## -------------------- ##
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3406,7 +3535,7 @@ echo "System type:"
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
@@ -3422,8 +3551,8 @@ ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf '%s\n' "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -3439,10 +3568,10 @@ shift; shift
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+case $build_os in *\ *) build_os=`printf '%s\n' "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
@@ -3457,8 +3586,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf '%s\n' "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -3474,7 +3603,7 @@ shift; shift
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+case $host_os in *\ *) host_os=`printf '%s\n' "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -3517,7 +3646,7 @@ AM_CFLAGS=
 # Debugging #
 #############
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if debugging code should be compiled" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if debugging code should be compiled" >&5
 printf %s "checking if debugging code should be compiled... " >&6; }
 # Check whether --enable-debug was given.
 if test ${enable_debug+y}
@@ -3529,14 +3658,14 @@ esac
 fi
 
 if test "x$enable_debug" = xyes; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
 
-printf "%s\n" "#define NDEBUG 1" >>confdefs.h
+printf '%s\n' "#define NDEBUG 1" >>confdefs.h
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -3575,7 +3704,7 @@ enable_filter_sparc=no
 enable_encoder_sparc=no
 enable_decoder_sparc=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which encoders to build" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which encoders to build" >&5
 printf %s "checking which encoders to build... " >&6; }
 # Check whether --enable-encoders was given.
 if test ${enable_encoders+y}
@@ -3589,8 +3718,8 @@ fi
 enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'`
 if test "x$enable_encoders" = xno || test "x$enable_encoders" = x; then
 	enable_encoders=no
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
-printf "%s\n" "(none)" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
+printf '%s\n' "(none)" >&6; }
 else
 	for arg in $enable_encoders
 	do
@@ -3599,80 +3728,80 @@ else
 				enable_filter_lzma1=yes
 				enable_encoder_lzma1=yes
 
-printf "%s\n" "#define HAVE_ENCODER_LZMA1 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODER_LZMA1 1" >>confdefs.h
 
 				;;
 			lzma2)
 				enable_filter_lzma2=yes
 				enable_encoder_lzma2=yes
 
-printf "%s\n" "#define HAVE_ENCODER_LZMA2 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODER_LZMA2 1" >>confdefs.h
 
 				;;
 			delta)
 				enable_filter_delta=yes
 				enable_encoder_delta=yes
 
-printf "%s\n" "#define HAVE_ENCODER_DELTA 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODER_DELTA 1" >>confdefs.h
 
 				;;
 			x86)
 				enable_filter_x86=yes
 				enable_encoder_x86=yes
 
-printf "%s\n" "#define HAVE_ENCODER_X86 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODER_X86 1" >>confdefs.h
 
 				;;
 			powerpc)
 				enable_filter_powerpc=yes
 				enable_encoder_powerpc=yes
 
-printf "%s\n" "#define HAVE_ENCODER_POWERPC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODER_POWERPC 1" >>confdefs.h
 
 				;;
 			ia64)
 				enable_filter_ia64=yes
 				enable_encoder_ia64=yes
 
-printf "%s\n" "#define HAVE_ENCODER_IA64 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODER_IA64 1" >>confdefs.h
 
 				;;
 			arm)
 				enable_filter_arm=yes
 				enable_encoder_arm=yes
 
-printf "%s\n" "#define HAVE_ENCODER_ARM 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODER_ARM 1" >>confdefs.h
 
 				;;
 			armthumb)
 				enable_filter_armthumb=yes
 				enable_encoder_armthumb=yes
 
-printf "%s\n" "#define HAVE_ENCODER_ARMTHUMB 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODER_ARMTHUMB 1" >>confdefs.h
 
 				;;
 			sparc)
 				enable_filter_sparc=yes
 				enable_encoder_sparc=yes
 
-printf "%s\n" "#define HAVE_ENCODER_SPARC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODER_SPARC 1" >>confdefs.h
 
 				;;
 			*)
-				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 				as_fn_error $? "unknown filter: $arg" "$LINENO" 5
 				;;
 		esac
 	done
 
-printf "%s\n" "#define HAVE_ENCODERS 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ENCODERS 1" >>confdefs.h
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_encoders" >&5
-printf "%s\n" "$enable_encoders" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_encoders" >&5
+printf '%s\n' "$enable_encoders" >&6; }
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which decoders to build" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which decoders to build" >&5
 printf %s "checking which decoders to build... " >&6; }
 # Check whether --enable-decoders was given.
 if test ${enable_decoders+y}
@@ -3686,8 +3815,8 @@ fi
 enable_decoders=`echo "$enable_decoders" | sed 's/,/ /g'`
 if test "x$enable_decoders" = xno || test "x$enable_decoders" = x; then
 	enable_decoders=no
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
-printf "%s\n" "(none)" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
+printf '%s\n' "(none)" >&6; }
 else
 	for arg in $enable_decoders
 	do
@@ -3696,77 +3825,77 @@ else
 				enable_filter_lzma1=yes
 				enable_decoder_lzma1=yes
 
-printf "%s\n" "#define HAVE_DECODER_LZMA1 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODER_LZMA1 1" >>confdefs.h
 
 				;;
 			lzma2)
 				enable_filter_lzma2=yes
 				enable_decoder_lzma2=yes
 
-printf "%s\n" "#define HAVE_DECODER_LZMA2 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODER_LZMA2 1" >>confdefs.h
 
 				;;
 			delta)
 				enable_filter_delta=yes
 				enable_decoder_delta=yes
 
-printf "%s\n" "#define HAVE_DECODER_DELTA 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODER_DELTA 1" >>confdefs.h
 
 				;;
 			x86)
 				enable_filter_x86=yes
 				enable_decoder_x86=yes
 
-printf "%s\n" "#define HAVE_DECODER_X86 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODER_X86 1" >>confdefs.h
 
 				;;
 			powerpc)
 				enable_filter_powerpc=yes
 				enable_decoder_powerpc=yes
 
-printf "%s\n" "#define HAVE_DECODER_POWERPC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODER_POWERPC 1" >>confdefs.h
 
 				;;
 			ia64)
 				enable_filter_ia64=yes
 				enable_decoder_ia64=yes
 
-printf "%s\n" "#define HAVE_DECODER_IA64 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODER_IA64 1" >>confdefs.h
 
 				;;
 			arm)
 				enable_filter_arm=yes
 				enable_decoder_arm=yes
 
-printf "%s\n" "#define HAVE_DECODER_ARM 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODER_ARM 1" >>confdefs.h
 
 				;;
 			armthumb)
 				enable_filter_armthumb=yes
 				enable_decoder_armthumb=yes
 
-printf "%s\n" "#define HAVE_DECODER_ARMTHUMB 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODER_ARMTHUMB 1" >>confdefs.h
 
 				;;
 			sparc)
 				enable_filter_sparc=yes
 				enable_decoder_sparc=yes
 
-printf "%s\n" "#define HAVE_DECODER_SPARC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODER_SPARC 1" >>confdefs.h
 
 				;;
 			*)
-				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 				as_fn_error $? "unknown filter: $arg" "$LINENO" 5
 				;;
 		esac
 	done
 
-printf "%s\n" "#define HAVE_DECODERS 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DECODERS 1" >>confdefs.h
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_decoders" >&5
-printf "%s\n" "$enable_decoders" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_decoders" >&5
+printf '%s\n' "$enable_decoders" >&6; }
 fi
 
 if test "x$enable_encoder_lzma2$enable_encoder_lzma1" = xyesno \
@@ -4104,7 +4233,7 @@ enable_match_finder_bt3=no
 enable_match_finder_bt4=no
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which match finders to build" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which match finders to build" >&5
 printf %s "checking which match finders to build... " >&6; }
 # Check whether --enable-match-finders was given.
 if test ${enable_match_finders+y}
@@ -4127,45 +4256,45 @@ if test "x$enable_encoder_lz" = xyes ; then
 			hc3)
 				enable_match_finder_hc3=yes
 
-printf "%s\n" "#define HAVE_MF_HC3 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MF_HC3 1" >>confdefs.h
 
 				;;
 			hc4)
 				enable_match_finder_hc4=yes
 
-printf "%s\n" "#define HAVE_MF_HC4 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MF_HC4 1" >>confdefs.h
 
 				;;
 			bt2)
 				enable_match_finder_bt2=yes
 
-printf "%s\n" "#define HAVE_MF_BT2 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MF_BT2 1" >>confdefs.h
 
 				;;
 			bt3)
 				enable_match_finder_bt3=yes
 
-printf "%s\n" "#define HAVE_MF_BT3 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MF_BT3 1" >>confdefs.h
 
 				;;
 			bt4)
 				enable_match_finder_bt4=yes
 
-printf "%s\n" "#define HAVE_MF_BT4 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MF_BT4 1" >>confdefs.h
 
 				;;
 			*)
-				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 				as_fn_error $? "unknown match finder: $arg" "$LINENO" 5
 				;;
 		esac
 	done
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_match_finders" >&5
-printf "%s\n" "$enable_match_finders" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_match_finders" >&5
+printf '%s\n' "$enable_match_finders" >&6; }
 else
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (none because not building any LZ-based encoder)" >&5
-printf "%s\n" "(none because not building any LZ-based encoder)" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (none because not building any LZ-based encoder)" >&5
+printf '%s\n' "(none because not building any LZ-based encoder)" >&6; }
 fi
 
 
@@ -4179,7 +4308,7 @@ enable_check_crc32=no
 enable_check_crc64=no
 enable_check_sha256=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which integrity checks to build" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which integrity checks to build" >&5
 printf %s "checking which integrity checks to build... " >&6; }
 # Check whether --enable-checks was given.
 if test ${enable_checks+y}
@@ -4192,8 +4321,8 @@ fi
 
 enable_checks=`echo "$enable_checks" | sed 's/,/ /g'`
 if test "x$enable_checks" = xno || test "x$enable_checks" = x; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
-printf "%s\n" "(none)" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
+printf '%s\n' "(none)" >&6; }
 else
 	for arg in $enable_checks
 	do
@@ -4201,30 +4330,30 @@ else
 			crc32)
 				enable_check_crc32=yes
 
-printf "%s\n" "#define HAVE_CHECK_CRC32 1" >>confdefs.h
+printf '%s\n' "#define HAVE_CHECK_CRC32 1" >>confdefs.h
 
 				;;
 			crc64)
 				enable_check_crc64=yes
 
-printf "%s\n" "#define HAVE_CHECK_CRC64 1" >>confdefs.h
+printf '%s\n' "#define HAVE_CHECK_CRC64 1" >>confdefs.h
 
 				;;
 			sha256)
 				enable_check_sha256=yes
 
-printf "%s\n" "#define HAVE_CHECK_SHA256 1" >>confdefs.h
+printf '%s\n' "#define HAVE_CHECK_SHA256 1" >>confdefs.h
 
 				;;
 			*)
-				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 				as_fn_error $? "unknown integrity check: $arg" "$LINENO" 5
 				;;
 		esac
 	done
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_checks" >&5
-printf "%s\n" "$enable_checks" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_checks" >&5
+printf '%s\n' "$enable_checks" >&6; }
 fi
 if test "x$enable_check_crc32" = xno ; then
 	as_fn_error $? "For now, the CRC32 check must always be enabled." "$LINENO" 5
@@ -4255,7 +4384,7 @@ else
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external SHA-256 should be used" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if external SHA-256 should be used" >&5
 printf %s "checking if external SHA-256 should be used... " >&6; }
 # Check whether --enable-external-sha256 was given.
 if test ${enable_external_sha256+y}
@@ -4270,11 +4399,11 @@ if test "x$enable_check_sha256" != "xyes"; then
 	enable_external_sha256=no
 fi
 if test "x$enable_external_sha256" = xyes; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4282,7 +4411,7 @@ fi
 # Assembler optimizations #
 ###########################
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if assembler optimizations should be used" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if assembler optimizations should be used" >&5
 printf %s "checking if assembler optimizations should be used... " >&6; }
 # Check whether --enable-assembler was given.
 if test ${enable_assembler+y}
@@ -4308,12 +4437,12 @@ if test "x$enable_assembler" = xyes; then
 fi
 case $enable_assembler in
 	x86 | x86_64 | no)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_assembler" >&5
-printf "%s\n" "$enable_assembler" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_assembler" >&5
+printf '%s\n' "$enable_assembler" >&6; }
 		;;
 	*)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 		as_fn_error $? "--enable-assembler accepts only \`yes', \`no', \`x86', or \`x86_64'." "$LINENO" 5
 		;;
 esac
@@ -4339,7 +4468,7 @@ fi
 # Size optimization #
 #####################
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if small size is preferred over speed" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if small size is preferred over speed" >&5
 printf %s "checking if small size is preferred over speed... " >&6; }
 # Check whether --enable-small was given.
 if test ${enable_small+y}
@@ -4352,15 +4481,15 @@ fi
 
 if test "x$enable_small" = xyes; then
 
-printf "%s\n" "#define HAVE_SMALL 1" >>confdefs.h
+printf '%s\n' "#define HAVE_SMALL 1" >>confdefs.h
 
 elif test "x$enable_small" != xno; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 	as_fn_error $? "--enable-small accepts only \`yes' or \`no'" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_small" >&5
-printf "%s\n" "$enable_small" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_small" >&5
+printf '%s\n' "$enable_small" >&6; }
  if test "x$enable_small" = xyes; then
   COND_SMALL_TRUE=
   COND_SMALL_FALSE='#'
@@ -4375,7 +4504,7 @@ fi
 # Threading #
 #############
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if threading support is wanted" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if threading support is wanted" >&5
 printf %s "checking if threading support is wanted... " >&6; }
 # Check whether --enable-threads was given.
 if test ${enable_threads+y}
@@ -4403,16 +4532,16 @@ fi
 
 case $enable_threads in
 	posix | win95 | vista)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, $enable_threads" >&5
-printf "%s\n" "yes, $enable_threads" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes, $enable_threads" >&5
+printf '%s\n' "yes, $enable_threads" >&6; }
 		;;
 	no)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 		;;
 	*)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 		as_fn_error $? "--enable-threads only accepts \`yes', \`no', \`posix', \`win95', or \`vista'" "$LINENO" 5
 		;;
 esac
@@ -4436,7 +4565,7 @@ fi
 # created with "xz -9". It would be slightly safer to guess a lower value,
 # but most systems, on which we don't have any way to determine the amount
 # of RAM, will probably have at least 128 MiB of RAM.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how much RAM to assume if the real amount is unknown" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how much RAM to assume if the real amount is unknown" >&5
 printf %s "checking how much RAM to assume if the real amount is unknown... " >&6; }
 # Check whether --enable-assume-ram was given.
 if test ${enable_assume_ram+y}
@@ -4449,14 +4578,14 @@ fi
 
 assume_ram_check=`echo "$enable_assume_ram" | tr -d 0123456789`
 if test -z "$enable_assume_ram" || test -n "$assume_ram_check"; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 	as_fn_error $? "--enable-assume-ram accepts only an integer argument" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_assume_ram MiB" >&5
-printf "%s\n" "$enable_assume_ram MiB" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_assume_ram MiB" >&5
+printf '%s\n' "$enable_assume_ram MiB" >&6; }
 
-printf "%s\n" "#define ASSUME_RAM $enable_assume_ram" >>confdefs.h
+printf '%s\n' "#define ASSUME_RAM $enable_assume_ram" >>confdefs.h
 
 
 
@@ -4598,7 +4727,7 @@ fi
 # Sandboxing #
 ##############
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if sandboxing should be used" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if sandboxing should be used" >&5
 printf %s "checking if sandboxing should be used... " >&6; }
 # Check whether --enable-sandbox was given.
 if test ${enable_sandbox+y}
@@ -4611,16 +4740,16 @@ fi
 
 case $enable_sandbox in
 	auto)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: maybe (autodetect)" >&5
-printf "%s\n" "maybe (autodetect)" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: maybe (autodetect)" >&5
+printf '%s\n' "maybe (autodetect)" >&6; }
 		;;
 	no | capsicum)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_sandbox" >&5
-printf "%s\n" "$enable_sandbox" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_sandbox" >&5
+printf '%s\n' "$enable_sandbox" >&6; }
 		;;
 	*)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 		as_fn_error $? "--enable-sandbox only accepts \`auto', \`no', or \`capsicum'." "$LINENO" 5
 		;;
 esac
@@ -4670,7 +4799,7 @@ case $host_os in
 		;;
 esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a shell that conforms to POSIX" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a shell that conforms to POSIX" >&5
 printf %s "checking for a shell that conforms to POSIX... " >&6; }
 if test ${gl_cv_posix_shell+y}
 then :
@@ -4713,8 +4842,8 @@ else case e in #(
      done ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_posix_shell" >&5
-printf "%s\n" "$gl_cv_posix_shell" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_posix_shell" >&5
+printf '%s\n' "$gl_cv_posix_shell" >&6; }
 
   if test "$gl_cv_posix_shell" != no; then
     POSIX_SHELL=$gl_cv_posix_shell
@@ -4738,7 +4867,7 @@ echo "Initializing Automake:"
 # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354
 # The -Wno-unsupported is used to silence warnings about missing
 # "subdir-objects".
-am__api_version='1.16'
+am__api_version='1.18'
 
 
   # Find a good install program.  We prefer a C program (faster),
@@ -4755,7 +4884,7 @@ am__api_version='1.16'
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
@@ -4778,8 +4907,8 @@ case $as_dir in #((
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
+    # OSF/1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF/1 since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4829,8 +4958,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf '%s\n' "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -4840,7 +4969,166 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) if sleep 0.001 2>/dev/null
+then :
+  am_cv_sleep_fractional_seconds=yes
+else case e in #(
+  e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf '%s\n' "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+  # Even a millisecond often causes a bunch of false positives,
+  # so just try a hundredth of a second. The time saved between .001 and
+  # .01 is not terribly consequential.
+  am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer.  Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works.  Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+     set X `ls -t conftest.ts[12]` &&
+     {
+       test "$*" != "X conftest.ts1 conftest.ts2" ||
+       test "$*" != "X conftest.ts2 conftest.ts1";
+     }
+); then :; else
+  # If neither matched, then we have a broken ls.  This can happen
+  # if, for instance, CONFIG_SHELL is bash and it inherits a
+  # broken ls alias from the environment.  This has actually
+  # happened.  Such a system could not be considered "sane".
+  printf '%s\n' ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+  { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+  # Any one fine-grained sleep might happen to cross the boundary
+  # between two values of a coarser actual resolution, but if we do
+  # two fine-grained sleeps in a row, at least one of them will fall
+  # entirely within a coarse interval.
+  echo alpha > conftest.ts1
+  sleep $am_try_res
+  echo beta > conftest.ts2
+  sleep $am_try_res
+  echo gamma > conftest.ts3
+
+  # We assume that 'ls -t' will make use of high-resolution
+  # timestamps if the operating system supports them at all.
+  if (set X `ls -t conftest.ts?` &&
+      test "$2" = conftest.ts3 &&
+      test "$3" = conftest.ts2 &&
+      test "$4" = conftest.ts1); then
+    #
+    # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+    # because we don't need to test make.
+    make_ok=true
+    if test $am_try_res != 1; then
+      # But if we've succeeded so far with a subsecond resolution, we
+      # have one more thing to check: make. It can happen that
+      # everything else supports the subsecond mtimes, but make doesn't;
+      # notably on macOS, which ships make 3.81 from 2006 (the last one
+      # released under GPLv2). https://bugs.gnu.org/68808
+      #
+      # We test $MAKE if it is defined in the environment, else "make".
+      # It might get overridden later, but our hope is that in practice
+      # it does not matter: it is the system "make" which is (by far)
+      # the most likely to be broken, whereas if the user overrides it,
+      # probably they did so with a better, or at least not worse, make.
+      # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+      #
+      # Create a Makefile (real tab character here):
+      rm -f conftest.mk
+      echo 'conftest.ts1: conftest.ts2' >conftest.mk
+      echo '	touch conftest.ts2' >>conftest.mk
+      #
+      # Now, running
+      #   touch conftest.ts1; touch conftest.ts2; make
+      # should touch ts1 because ts2 is newer. This could happen by luck,
+      # but most often, it will fail if make's support is insufficient. So
+      # test for several consecutive successes.
+      #
+      # (We reuse conftest.ts[12] because we still want to modify existing
+      # files, not create new ones, per above.)
+      n=0
+      make=${MAKE-make}
+      until test $n -eq 3; do
+        echo one > conftest.ts1
+        sleep $am_try_res
+        echo two > conftest.ts2 # ts2 should now be newer than ts1
+        if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+          make_ok=false
+          break # out of $n loop
+        fi
+        n=`expr $n + 1`
+      done
+    fi
+    #
+    if $make_ok; then
+      # Everything we know to check worked out, so call this resolution good.
+      am_cv_filesystem_timestamp_resolution=$am_try_res
+      break # out of $am_try_res loop
+    fi
+    # Otherwise, we'll go on to check the next resolution.
+  fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf '%s\n' "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
@@ -4848,10 +5136,14 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
     as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
@@ -4860,49 +5152,45 @@ esac
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+  echo "timestamp, slept: $am_has_slept" > conftest.file
+  if (
+    set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+    if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+    fi
+    test "$2" = conftest.file
+  ); then
+    am_build_env_is_sane=yes
+    break
+  fi
+  # Just in case.
+  sleep "$am_cv_filesystem_timestamp_resolution"
+  am_has_slept=yes
+done
 
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf '%s\n' "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+  as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
 # If we didn't sleep, we still need to ensure time stamps of config.status and
 # generated files are strictly newer.
 am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+  e)   ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
   am_sleep_pid=$!
+ ;;
+esac
 fi
 
 rm -f conftest.file
@@ -4915,7 +5203,7 @@ test "$program_suffix" != NONE &&
 # Double any \ or $.
 # By default was 's,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf '%s\n' "$program_transform_name" | sed "$ac_script"`
 
 
 # Expand $ac_aux_dir to an absolute path.
@@ -4930,8 +5218,8 @@ if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf '%s\n' "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -4951,7 +5239,7 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -4972,7 +5260,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4984,11 +5272,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -4997,7 +5285,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -5018,7 +5306,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5030,11 +5318,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -5042,8 +5330,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -5056,7 +5344,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
 printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test ${ac_cv_path_mkdir+y}
@@ -5099,14 +5387,14 @@ fi
     MKDIR_P='mkdir -p'
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf '%s\n' "$MKDIR_P" >&6; }
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in gawk mawk nawk awk 'busybox awk'
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AWK+y}
 then :
@@ -5127,7 +5415,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5139,21 +5427,21 @@ esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf '%s\n' "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ac_make=`printf '%s\n' "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
@@ -5161,7 +5449,7 @@ else case e in #(
   e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@printf '%s\n' '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
@@ -5174,12 +5462,12 @@ rm -f conftest.make ;;
 esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   SET_MAKE=
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -5192,25 +5480,21 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+AM_DEFAULT_VERBOSITY=1
 # Check whether --enable-silent-rules was given.
 if test ${enable_silent_rules+y}
 then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 printf %s "checking whether $am_make supports nested variables... " >&6; }
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
 else case e in #(
-  e) if printf "%s\n" 'TRUE=$(BAR$(V))
+  e) if printf '%s\n' 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -5223,17 +5507,47 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf '%s\n' "$am_cv_make_support_nested_variables" >&6; }
 AM_BACKSLASH='\'
 
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+
+else case e in #(
+  e) am__rm_f_notfound='""' ;;
+esac
+fi
+
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+  am_cv_xargs_n_works=yes
+else case e in #(
+  e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf '%s\n' "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+  am__xargs_n='xargs -n'
+else case e in #(
+  e)   am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -5259,10 +5573,10 @@ fi
  VERSION='5.2.13'
 
 
-printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
+printf '%s\n' "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
 
-printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h
+printf '%s\n' "#define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -5317,57 +5631,19 @@ fi
 
 
 
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
 
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
 
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
 
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf '%s\n' "no, using $LN_S" >&6; }
 fi
 
 
@@ -5380,11 +5656,14 @@ fi
 
 
 
+
+
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
 printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
 cat > confinc.mk << 'END'
 am__doit:
@@ -5421,8 +5700,8 @@ esac
   fi
 done
 rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf '%s\n' "${_am_result}" >&6; }
 
 # Check whether --enable-dependency-tracking was given.
 if test ${enable_dependency_tracking+y}
@@ -5452,7 +5731,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5473,7 +5752,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5485,11 +5764,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5498,7 +5777,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5519,7 +5798,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5531,11 +5810,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5543,8 +5822,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5557,7 +5836,7 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5578,7 +5857,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5590,11 +5869,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5603,7 +5882,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5629,7 +5908,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5653,11 +5932,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5668,7 +5947,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5689,7 +5968,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5701,11 +5980,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5718,7 +5997,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5739,7 +6018,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5751,11 +6030,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5767,8 +6046,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5780,7 +6059,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CC+y}
 then :
@@ -5801,7 +6080,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5813,11 +6092,11 @@ esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf '%s\n' "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -5826,7 +6105,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "clang", so it can be a program name with args.
 set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
@@ -5847,7 +6126,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5859,11 +6138,11 @@ esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf '%s\n' "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5871,8 +6150,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5884,13 +6163,13 @@ fi
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion -version; do
@@ -5900,7 +6179,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -5910,7 +6189,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -5930,9 +6209,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ac_link_default=`printf '%s\n' "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -5953,10 +6232,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
@@ -5997,29 +6276,29 @@ esac
 fi
 if test -z "$ac_file"
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See 'config.log' for more details" "$LINENO" 5; }
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; } ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf '%s\n' "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -6027,10 +6306,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
@@ -6047,15 +6326,15 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf '%s\n' "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -6078,7 +6357,7 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
@@ -6087,10 +6366,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -6098,31 +6377,31 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+	{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use '--host'.
 See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf '%s\n' "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext \
   conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
@@ -6146,10 +6425,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+printf '%s\n' "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
   for ac_file in conftest.o conftest.obj conftest.*; do
@@ -6161,11 +6440,11 @@ then :
   esac
 done
 else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+  e) printf '%s\n' "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -6173,11 +6452,11 @@ fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf '%s\n' "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
 printf %s "checking whether the compiler supports GNU C... " >&6; }
 if test ${ac_cv_c_compiler_gnu+y}
 then :
@@ -6209,8 +6488,8 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf '%s\n' "$ac_cv_c_compiler_gnu" >&6; }
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_compiler_gnu = yes; then
@@ -6220,7 +6499,7 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
@@ -6288,8 +6567,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf '%s\n' "$ac_cv_prog_cc_g" >&6; }
 if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -6308,7 +6587,56 @@ fi
 ac_prog_cc_stdc=no
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C23 features" >&5
+printf %s "checking for $CC option to enable C23 features... " >&6; }
+if test ${ac_cv_prog_cc_c23+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) ac_cv_prog_cc_c23=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c23_program
+_ACEOF
+for ac_arg in '' -std=gnu23
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c23=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c23" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
+
+if test "x$ac_cv_prog_cc_c23" = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
+else case e in #(
+  e) if test "x$ac_cv_prog_cc_c23" = x
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
+else case e in #(
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c23" >&5
+printf '%s\n' "$ac_cv_prog_cc_c23" >&6; }
+     CC="$CC $ac_cv_prog_cc_c23" ;;
+esac
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c23
+  ac_prog_cc_stdc=c23 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -6320,7 +6648,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -std=gnu11
+for ac_arg in '' -std=gnu11 -std:c11
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -6337,16 +6665,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in #(
   e) if test "x$ac_cv_prog_cc_c11" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf '%s\n' "$ac_cv_prog_cc_c11" >&6; }
      CC="$CC $ac_cv_prog_cc_c11" ;;
 esac
 fi
@@ -6357,7 +6685,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
 then :
@@ -6386,16 +6714,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in #(
   e) if test "x$ac_cv_prog_cc_c99" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf '%s\n' "$ac_cv_prog_cc_c99" >&6; }
      CC="$CC $ac_cv_prog_cc_c99" ;;
 esac
 fi
@@ -6406,7 +6734,7 @@ fi
 fi
 if test x$ac_prog_cc_stdc = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
 then :
@@ -6435,16 +6763,16 @@ fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf '%s\n' "unsupported" >&6; }
 else case e in #(
   e) if test "x$ac_cv_prog_cc_c89" = x
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf '%s\n' "none needed" >&6; }
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf '%s\n' "$ac_cv_prog_cc_c89" >&6; }
      CC="$CC $ac_cv_prog_cc_c89" ;;
 esac
 fi
@@ -6466,7 +6794,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
 printf %s "checking whether $CC understands -c and -o together... " >&6; }
 if test ${am_cv_prog_cc_c_o+y}
 then :
@@ -6501,12 +6829,15 @@ _ACEOF
       break
     fi
   done
-  rm -f core conftest*
+  # aligned with autoconf, so not including core; see bug#72225.
+  rm -f -r a.out a.exe b.out conftest.$ac_ext conftest.$ac_objext \
+    conftest.dSYM conftest1.$ac_ext conftest1.$ac_objext conftest1.dSYM \
+    conftest2.$ac_ext conftest2.$ac_objext conftest2.dSYM
   unset am_i ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf '%s\n' "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -6524,7 +6855,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CC"   am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CC_dependencies_compiler_type+y}
 then :
@@ -6617,7 +6948,7 @@ else case e in #(
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
       # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      # When given -MP, icc 7.0 and 7.1 complain thus:
       #   icc: Command line warning: ignoring option '-M'; no argument required
       # The diagnosis changed in icc 8.0:
       #   icc: Command line remark: option '-MP' not supported
@@ -6637,8 +6968,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -6667,7 +6998,7 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
 
 depcc="$CCAS"   am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 printf %s "checking dependency style of $depcc... " >&6; }
 if test ${am_cv_CCAS_dependencies_compiler_type+y}
 then :
@@ -6758,7 +7089,7 @@ else case e in #(
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
       # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      # When given -MP, icc 7.0 and 7.1 complain thus:
       #   icc: Command line warning: ignoring option '-M'; no argument required
       # The diagnosis changed in icc 8.0:
       #   icc: Command line remark: option '-MP' not supported
@@ -6778,8 +7109,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CCAS_dependencies_compiler_type" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+printf '%s\n' "$am_cv_CCAS_dependencies_compiler_type" >&6; }
 CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
 
  if
@@ -6800,7 +7131,7 @@ do
   if test $ac_cache; then
     ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
     if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+      printf '%s\n' "#define $ac_item 1" >> confdefs.h
     fi
     ac_header= ac_cache=
   elif test $ac_header; then
@@ -6820,7 +7151,7 @@ done
 if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
 then :
 
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+printf '%s\n' "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -6829,7 +7160,7 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
@@ -6858,10 +7189,10 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf '%s\n' "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
 printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
 if test ${ac_cv_should_define__xopen_source+y}
 then :
@@ -6912,49 +7243,51 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf '%s\n' "$ac_cv_should_define__xopen_source" >&6; }
 
-  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _ALL_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _COSMO_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _DARWIN_C_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+  printf '%s\n' "#define _GNU_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
 
-  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define _NETBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  printf '%s\n' "#define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+  printf '%s\n' "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf '%s\n' "#define _TANDEM_SOURCE 1" >>confdefs.h
 
   if test $ac_cv_header_minix_config_h = yes
 then :
   MINIX=yes
-    printf "%s\n" "#define _MINIX 1" >>confdefs.h
+    printf '%s\n' "#define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+    printf '%s\n' "#define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+    printf '%s\n' "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
 else case e in #(
   e) MINIX= ;;
@@ -6962,17 +7295,17 @@ esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
-  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+  printf '%s\n' "#define __EXTENSIONS__ 1" >>confdefs.h
 
 fi
   if test $ac_cv_should_define__xopen_source = yes
 then :
-  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+  printf '%s\n' "#define _XOPEN_SOURCE 500" >>confdefs.h
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -7015,7 +7348,7 @@ case `"$ac_path_SED" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7044,8 +7377,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -7054,7 +7387,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -7125,8 +7458,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf '%s\n' "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -7174,8 +7507,8 @@ if $ac_preproc_ok
 then :
 
 else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  e) { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See 'config.log' for more details" "$LINENO" 5; } ;;
 esac
@@ -7188,7 +7521,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
 printf %s "checking for egrep -e... " >&6; }
 if test ${ac_cv_path_EGREP_TRADITIONAL+y}
 then :
@@ -7225,7 +7558,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7287,7 +7620,7 @@ case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    printf '%s\n' 'EGREP_TRADITIONAL' >> "conftest.nl"
     "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -7318,12 +7651,12 @@ esac
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
-printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf '%s\n' "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
  EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
-printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to detect undeclared functions" >&5
+printf %s "checking for $CC options to detect undeclared functions... " >&6; }
 if test ${ac_cv_c_undeclared_builtin_options+y}
 then :
   printf %s "(cached) " >&6
@@ -7391,12 +7724,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
-printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf '%s\n' "$ac_cv_c_undeclared_builtin_options" >&6; }
   case $ac_cv_c_undeclared_builtin_options in #(
   'cannot detect') :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot make $CC report undeclared builtins
 See 'config.log' for more details" "$LINENO" 5; } ;; #(
   'none needed') :
@@ -7405,6 +7738,49 @@ See 'config.log' for more details" "$LINENO" 5; } ;; #(
     ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
 esac
 
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC options to ignore future-version functions" >&5
+printf %s "checking for $CC options to ignore future-version functions... " >&6; }
+if test ${ac_cv_c_future_darwin_options+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)       ac_compile_saved="$ac_compile"
+   ac_compile="$ac_compile -Werror=unguarded-availability-new"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if ! (defined __APPLE__ && defined __MACH__)
+	   #error "-Werror=unguarded-availability-new not needed here"
+	  #endif
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_future_darwin_options='-Werror=unguarded-availability-new'
+else case e in #(
+  e) ac_cv_c_future_darwin_options='none needed' ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_compile="$ac_compile_saved"
+   ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_future_darwin_options" >&5
+printf '%s\n' "$ac_cv_c_future_darwin_options" >&6; }
+ case $ac_cv_c_future_darwin_options in #(
+  'none needed') :
+    ac_c_future_darwin_options='' ;; #(
+  *) :
+    ac_c_future_darwin_options=$ac_cv_c_future_darwin_options ;;
+esac
+
 case $enable_threads in #(
   posix) :
 
@@ -7443,7 +7819,7 @@ then :
 fi
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
         LIBS="$PTHREAD_LIBS $LIBS"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
 printf %s "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7472,8 +7848,8 @@ then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
-printf "%s\n" "$ax_pthread_ok" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+printf '%s\n' "$ax_pthread_ok" >&6; }
         if test "x$ax_pthread_ok" = "xno"; then
                 PTHREAD_LIBS=""
                 PTHREAD_CFLAGS=""
@@ -7553,8 +7929,8 @@ _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP_TRADITIONAL "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5
-printf "%s\n" "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5
+printf '%s\n' "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;}
 fi
 rm -rf conftest*
 
@@ -7576,7 +7952,7 @@ esac
 
 # Are we compiling with Clang?
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5
 printf %s "checking whether $CC is Clang... " >&6; }
 if test ${ax_cv_PTHREAD_CLANG+y}
 then :
@@ -7604,8 +7980,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5
-printf "%s\n" "$ax_cv_PTHREAD_CLANG" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5
+printf '%s\n' "$ax_cv_PTHREAD_CLANG" >&6; }
 ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
 
 
@@ -7663,19 +8039,19 @@ for ax_pthread_try_flag in $ax_pthread_flags; do
 
         case $ax_pthread_try_flag in
                 none)
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
 printf %s "checking whether pthreads work without any flags... " >&6; }
                 ;;
 
                 *,*)
                 PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
                 PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"" >&5
 printf %s "checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"... " >&6; }
                 ;;
 
                 -*)
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
 printf %s "checking whether pthreads work with $ax_pthread_try_flag... " >&6; }
                 PTHREAD_CFLAGS="$ax_pthread_try_flag"
                 ;;
@@ -7683,7 +8059,7 @@ printf %s "checking whether pthreads work with $ax_pthread_try_flag... " >&6; }
                 pthread-config)
                 # Extract the first word of "pthread-config", so it can be a program name with args.
 set dummy pthread-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ax_pthread_config+y}
 then :
@@ -7704,7 +8080,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ax_pthread_config="yes"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7717,11 +8093,11 @@ esac
 fi
 ax_pthread_config=$ac_cv_prog_ax_pthread_config
 if test -n "$ax_pthread_config"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
-printf "%s\n" "$ax_pthread_config" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
+printf '%s\n' "$ax_pthread_config" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -7734,7 +8110,7 @@ fi
                 ;;
 
                 *)
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
 printf %s "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; }
                 PTHREAD_LIBS="-l$ax_pthread_try_flag"
                 ;;
@@ -7792,8 +8168,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
         CFLAGS="$ax_pthread_save_CFLAGS"
         LIBS="$ax_pthread_save_LIBS"
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
-printf "%s\n" "$ax_pthread_ok" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+printf '%s\n' "$ax_pthread_ok" >&6; }
         if test "x$ax_pthread_ok" = "xyes"
 then :
   break
@@ -7841,7 +8217,7 @@ if test "x$ax_pthread_clang" = "xyes"; then
         # that build with -Werror.  So if the active version of Clang has
         # this misfeature, we search for an option to squash it.
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
 printf %s "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; }
 if test ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+y}
 then :
@@ -7854,7 +8230,7 @@ else case e in #(
              # step
              ax_pthread_save_ac_link="$ac_link"
              ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`printf "%s\n" "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_link_step=`printf '%s\n' "$ac_link" | sed "$ax_pthread_sed"`
              ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
              ax_pthread_save_CFLAGS="$CFLAGS"
              for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
@@ -7896,8 +8272,8 @@ fi
              ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5
-printf "%s\n" "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5
+printf '%s\n' "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; }
 
         case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
                 no | unknown) ;;
@@ -7916,7 +8292,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
         LIBS="$PTHREAD_LIBS $LIBS"
 
         # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
 printf %s "checking for joinable pthread attribute... " >&6; }
 if test ${ax_cv_PTHREAD_JOINABLE_ATTR+y}
 then :
@@ -7945,20 +8321,20 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
              ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5
-printf "%s\n" "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5
+printf '%s\n' "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; }
         if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
                test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
                test "x$ax_pthread_joinable_attr_defined" != "xyes"
 then :
 
-printf "%s\n" "#define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR" >>confdefs.h
+printf '%s\n' "#define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR" >>confdefs.h
 
                ax_pthread_joinable_attr_defined=yes
 
 fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
 printf %s "checking whether more special flags are required for pthreads... " >&6; }
 if test ${ax_cv_PTHREAD_SPECIAL_FLAGS+y}
 then :
@@ -7973,8 +8349,8 @@ else case e in #(
              ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5
-printf "%s\n" "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5
+printf '%s\n' "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; }
         if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
                test "x$ax_pthread_special_flags_added" != "xyes"
 then :
@@ -7982,7 +8358,7 @@ then :
                ax_pthread_special_flags_added=yes
 fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
 printf %s "checking for PTHREAD_PRIO_INHERIT... " >&6; }
 if test ${ax_cv_PTHREAD_PRIO_INHERIT+y}
 then :
@@ -8012,13 +8388,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
              ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
-printf "%s\n" "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
+printf '%s\n' "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
         if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
                test "x$ax_pthread_prio_inherit_defined" != "xyes"
 then :
 
-printf "%s\n" "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
+printf '%s\n' "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
 
                ax_pthread_prio_inherit_defined=yes
 
@@ -8055,7 +8431,7 @@ fi
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_PTHREAD_CC+y}
 then :
@@ -8076,7 +8452,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_PTHREAD_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8088,11 +8464,11 @@ esac
 fi
 PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
 if test -n "$PTHREAD_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
-printf "%s\n" "$PTHREAD_CC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
+printf '%s\n' "$PTHREAD_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8106,7 +8482,7 @@ then :
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_PTHREAD_CXX+y}
 then :
@@ -8127,7 +8503,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_PTHREAD_CXX="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8139,11 +8515,11 @@ esac
 fi
 PTHREAD_CXX=$ac_cv_prog_PTHREAD_CXX
 if test -n "$PTHREAD_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CXX" >&5
-printf "%s\n" "$PTHREAD_CXX" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CXX" >&5
+printf '%s\n' "$PTHREAD_CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8191,7 +8567,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-printf "%s\n" "#define MYTHREAD_POSIX 1" >>confdefs.h
+printf '%s\n' "#define MYTHREAD_POSIX 1" >>confdefs.h
 
 
 		# These are nice to have but not mandatory.
@@ -8203,7 +8579,7 @@ printf "%s\n" "#define MYTHREAD_POSIX 1" >>confdefs.h
 		# needed by liblzma.
 		OLD_CFLAGS=$CFLAGS
 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
 printf %s "checking for library containing clock_gettime... " >&6; }
 if test ${ac_cv_search_clock_gettime+y}
 then :
@@ -8261,8 +8637,8 @@ rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
-printf "%s\n" "$ac_cv_search_clock_gettime" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
+printf '%s\n' "$ac_cv_search_clock_gettime" >&6; }
 ac_res=$ac_cv_search_clock_gettime
 if test "$ac_res" != no
 then :
@@ -8273,18 +8649,18 @@ fi
 		ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
 if test "x$ac_cv_func_clock_gettime" = xyes
 then :
-  printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "pthread_condattr_setclock" "ac_cv_func_pthread_condattr_setclock"
 if test "x$ac_cv_func_pthread_condattr_setclock" = xyes
 then :
-  printf "%s\n" "#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1" >>confdefs.h
 
 fi
 
 		ac_fn_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_have_decl_CLOCK_MONOTONIC" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_CLOCK_MONOTONIC" = xyes
 then :
   ac_have_decl=1
@@ -8292,20 +8668,20 @@ else case e in #(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "#define HAVE_DECL_CLOCK_MONOTONIC $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_CLOCK_MONOTONIC $ac_have_decl" >>confdefs.h
 
 		CFLAGS=$OLD_CFLAGS
 	 ;; #(
   win95) :
 
 
-printf "%s\n" "#define MYTHREAD_WIN95 1" >>confdefs.h
+printf '%s\n' "#define MYTHREAD_WIN95 1" >>confdefs.h
 
 	 ;; #(
   vista) :
 
 
-printf "%s\n" "#define MYTHREAD_VISTA 1" >>confdefs.h
+printf '%s\n' "#define MYTHREAD_VISTA 1" >>confdefs.h
 
 
  ;; #(
@@ -8326,14 +8702,14 @@ echo "Initializing Libtool:"
 
 case `pwd` in
   *\ * | *\	*)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf '%s\n' "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.5.0.1-38c1-dirty'
-macro_revision='2.5.0.1'
+macro_version='2.6.0'
+macro_revision='2.6.0'
 
 
 
@@ -8371,7 +8747,7 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 printf %s "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
@@ -8398,12 +8774,12 @@ func_echo_all ()
 }
 
 case $ECHO in
-  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
-  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
-  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+  printf*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf '%s\n' "printf" >&6; } ;;
+  print*) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf '%s\n' "print -r" >&6; } ;;
+  *) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf '%s\n' "cat" >&6; } ;;
 esac
 
 
@@ -8419,7 +8795,7 @@ esac
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${ac_cv_path_SED+y}
 then :
@@ -8462,7 +8838,7 @@ case `"$ac_path_SED" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    printf '%s\n' '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8491,8 +8867,8 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf '%s\n' "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -8509,7 +8885,7 @@ Xsed="$SED -e 1s/^X//"
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
@@ -8546,7 +8922,7 @@ case `"$ac_path_GREP" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    printf '%s\n' 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8575,12 +8951,12 @@ fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf '%s\n' "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
@@ -8620,7 +8996,7 @@ case `"$ac_path_EGREP" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    printf '%s\n' 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8650,14 +9026,14 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf '%s\n' "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
          EGREP_TRADITIONAL=$EGREP
  ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
@@ -8697,7 +9073,7 @@ case `"$ac_path_FGREP" --version 2>&1` in #(
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'FGREP' >> "conftest.nl"
+    printf '%s\n' 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8727,8 +9103,8 @@ fi
    fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf '%s\n' "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
 
@@ -8764,7 +9140,7 @@ fi
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw* | *-*-windows*)
@@ -8794,10 +9170,10 @@ printf %s "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test ${lt_cv_path_LD+y}
@@ -8833,14 +9209,14 @@ fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
@@ -8857,8 +9233,8 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf '%s\n' "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -8869,7 +9245,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
@@ -8925,8 +9301,8 @@ else
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf '%s\n' "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
@@ -8939,7 +9315,7 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
@@ -8960,7 +9336,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8972,11 +9348,11 @@ esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf '%s\n' "$DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -8989,7 +9365,7 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
@@ -9010,7 +9386,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9022,11 +9398,11 @@ esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf '%s\n' "$ac_ct_DUMPBIN" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9038,8 +9414,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -9067,7 +9443,7 @@ test -z "$NM" && NM=nm
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 printf %s "checking the name lister ($NM) interface... " >&6; }
 if test ${lt_cv_nm_interface+y}
 then :
@@ -9089,11 +9465,11 @@ else case e in #(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf '%s\n' "$lt_cv_nm_interface" >&6; }
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
@@ -9111,9 +9487,9 @@ else case e in #(
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
+  gnu* | ironclad*)
+    # Under GNU Hurd and Ironclad, this test is not required because there
+    # is no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
@@ -9226,11 +9602,11 @@ esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf '%s\n' "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf '%s\n' "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -9274,7 +9650,7 @@ esac
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 printf %s "checking how to convert $build file names to $host format... " >&6; }
 if test ${lt_cv_to_host_file_cmd+y}
 then :
@@ -9316,14 +9692,14 @@ esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_host_file_cmd" >&6; }
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 printf %s "checking how to convert $build file names to toolchain format... " >&6; }
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
@@ -9345,14 +9721,85 @@ esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf '%s\n' "$lt_cv_to_tool_file_cmd" >&6; }
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+case $host in #(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    case $build in #(
+  *-*-mingw* | *-*-windows* | *-*-cygwin*) :
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5
+printf %s "checking whether cygpath is installed... " >&6; }
+      if test ${lt_cv_cygpath_installed+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) lt_cv_cygpath_installed=ignoring
+          cygpath --help &> /dev/null
+          _lt_result=$?
+          if test 0 = "$_lt_result"
+then :
+  lt_cv_cygpath_installed=yes
+else case e in #(
+  e) lt_cv_cygpath_installed=no ;;
+esac
+fi
+         ;;
+esac
+fi
+
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5
+printf '%s\n' "$lt_cv_cygpath_installed" >&6; }
+
+
+
+
+      if test "xyes" != "x$lt_cv_cygpath_installed"
+then :
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5
+printf %s "checking whether to use cmd with one slash or two slashes... " >&6; }
+          if test ${lt_cv_cmd_slashes+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+              _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null`
+              if test 0 != $?
+then :
+  as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+fi
+              case $_lt_result in #(
+  one-slash*) :
+    lt_cv_cmd_slashes="one" ;; #(
+  two-slashes*) :
+    lt_cv_cmd_slashes="two" ;; #(
+  *) :
+    as_fn_error $? "Do not know how to convert paths" "$LINENO" 5
+               ;;
+esac
+             ;;
+esac
+fi
+
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5
+printf '%s\n' "$lt_cv_cmd_slashes" >&6; }
+
+fi
+     ;; #(
+  *) :
+     ;;
+esac
+
+ ;; #(
+  *) :
+     ;;
+esac
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
@@ -9361,8 +9808,8 @@ else case e in #(
   e) lt_cv_ld_reload_flag='-r' ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf '%s\n' "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -9377,7 +9824,7 @@ case $host_os in
     ;;
   darwin*)
     if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+      reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -9394,7 +9841,7 @@ esac
 
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILECMD+y}
 then :
@@ -9414,24 +9861,25 @@ do
   esac
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FILECMD=":"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_FILECMD="file"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
+  test -z "$ac_cv_prog_FILECMD" && ac_cv_prog_FILECMD=":"
 fi ;;
 esac
 fi
 FILECMD=$ac_cv_prog_FILECMD
 if test -n "$FILECMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf '%s\n' "$FILECMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9444,7 +9892,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -9465,7 +9913,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9477,11 +9925,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9490,7 +9938,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -9511,7 +9959,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9523,11 +9971,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -9535,8 +9983,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -9552,7 +10000,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
@@ -9601,7 +10049,7 @@ mingw* | windows* | pw32*)
     lt_cv_file_magic_cmd='func_win32_libid'
   else
     # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
@@ -9669,12 +10117,16 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+*-mlibc)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 # This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -9708,6 +10160,10 @@ rdos*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+serenity*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9753,8 +10209,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf '%s\n' "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -9798,7 +10254,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -9819,7 +10275,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9831,11 +10287,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -9844,7 +10300,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -9865,7 +10321,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9877,11 +10333,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -9889,8 +10345,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -9907,7 +10363,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 printf %s "checking how to associate runtime and link libraries... " >&6; }
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
@@ -9936,8 +10392,8 @@ esac
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf '%s\n' "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -9947,12 +10403,116 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
 
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf '%s\n' "$RANLIB" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf '%s\n' "$ac_ct_RANLIB" >&6; }
+else
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
 if test -n "$ac_tool_prefix"; then
   for ac_prog in ar
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
@@ -9973,7 +10533,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9985,11 +10545,11 @@ esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf '%s\n' "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10002,7 +10562,7 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
@@ -10023,7 +10583,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10035,11 +10595,11 @@ esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf '%s\n' "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10051,8 +10611,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -10088,7 +10648,7 @@ lt_ar_flags=$AR_FLAGS
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 printf %s "checking for archiver @FILE support... " >&6; }
 if test ${lt_cv_ar_at_file+y}
 then :
@@ -10113,7 +10673,7 @@ then :
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -10121,7 +10681,7 @@ then :
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
@@ -10134,8 +10694,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf '%s\n' "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
@@ -10152,7 +10712,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
@@ -10173,7 +10733,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10185,11 +10745,11 @@ esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf '%s\n' "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -10198,7 +10758,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
@@ -10219,7 +10779,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10231,11 +10791,11 @@ esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf '%s\n' "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -10243,8 +10803,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -10260,109 +10820,6 @@ test -z "$STRIP" && STRIP=:
 
 
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi ;;
-esac
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi ;;
-esac
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
 
 test -z "$RANLIB" && RANLIB=:
 
@@ -10437,7 +10894,7 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 printf %s "checking command to parse $NM output from $compiler object... " >&6; }
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
@@ -10497,13 +10954,13 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+  -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
@@ -10517,22 +10974,22 @@ fi
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -10553,8 +11010,10 @@ for ac_symprfx in "" "_"; do
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
+    # which start with @ or ?.  And Cygwin gawk-4.1.4-3 and newer
+    # treats input as binary, have to drop carriage return first.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {sub(/\\r\$/,\"\")};"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
@@ -10588,21 +11047,18 @@ void nm_test_func(void){}
 #ifdef __cplusplus
 }
 #endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
+int main(void){nm_test_var='a';nm_test_func();return(0);}
 _LT_EOF
 
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -10670,7 +11126,7 @@ _LT_EOF
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -10706,11 +11162,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf '%s\n' "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf '%s\n' "ok" >&6; }
 fi
 
 # Response file support.
@@ -10756,7 +11212,7 @@ fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 printf %s "checking for sysroot... " >&6; }
 
 # Check whether --with-sysroot was given.
@@ -10784,20 +11240,20 @@ case $with_sysroot in #(
  no|'')
    ;; #(
  *)
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf '%s\n' "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf '%s\n' "${lt_sysroot:-no}" >&6; }
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 printf %s "checking for a working dd... " >&6; }
 if test ${ac_cv_path_lt_DD+y}
 then :
@@ -10842,11 +11298,11 @@ fi
 rm -f conftest.i conftest2.i conftest.out ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf '%s\n' "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 printf %s "checking how to truncate binary pipes... " >&6; }
 if test ${lt_cv_truncate_bin+y}
 then :
@@ -10863,8 +11319,8 @@ rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf '%s\n' "$lt_cv_truncate_bin" >&6; }
 
 
 
@@ -10904,7 +11360,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
@@ -10924,7 +11380,7 @@ ia64-*-hpux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `$FILECMD conftest.$ac_objext` in
@@ -10962,7 +11418,7 @@ mips64*-*linux*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `$FILECMD conftest.$ac_objext` in
@@ -11003,7 +11459,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
       *32-bit*)
@@ -11066,7 +11522,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
@@ -11106,8 +11562,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf '%s\n' "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
@@ -11120,7 +11576,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `$FILECMD conftest.o` in
     *64-bit*)
@@ -11157,7 +11613,7 @@ need_locks=$enable_libtool_lock
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
@@ -11178,7 +11634,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11190,11 +11646,11 @@ esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf '%s\n' "$MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11203,7 +11659,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
@@ -11224,7 +11680,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11236,11 +11692,11 @@ esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf '%s\n' "$ac_ct_MANIFEST_TOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -11248,8 +11704,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -11259,7 +11715,7 @@ else
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if test ${lt_cv_path_manifest_tool+y}
 then :
@@ -11275,8 +11731,8 @@ else case e in #(
   rm -f conftest* ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
+printf '%s\n' "$lt_cv_path_manifest_tool" >&6; }
 if test yes != "$lt_cv_path_manifest_tool"; then
   MANIFEST_TOOL=:
 fi
@@ -11291,7 +11747,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
@@ -11312,7 +11768,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11324,11 +11780,11 @@ esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf '%s\n' "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11337,7 +11793,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
@@ -11358,7 +11814,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11370,11 +11826,11 @@ esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf '%s\n' "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -11382,8 +11838,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -11395,7 +11851,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
@@ -11416,7 +11872,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11428,11 +11884,11 @@ esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf '%s\n' "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11441,7 +11897,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
@@ -11462,7 +11918,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11474,11 +11930,11 @@ esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf '%s\n' "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -11486,8 +11942,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -11499,7 +11955,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_LIPO+y}
 then :
@@ -11520,7 +11976,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11532,11 +11988,11 @@ esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf '%s\n' "$LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11545,7 +12001,7 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
@@ -11566,7 +12022,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11578,11 +12034,11 @@ esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf '%s\n' "$ac_ct_LIPO" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -11590,8 +12046,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -11603,7 +12059,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL+y}
 then :
@@ -11624,7 +12080,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11636,11 +12092,11 @@ esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf '%s\n' "$OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11649,7 +12105,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
@@ -11670,7 +12126,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11682,11 +12138,11 @@ esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf '%s\n' "$ac_ct_OTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -11694,8 +12150,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -11707,7 +12163,7 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OTOOL64+y}
 then :
@@ -11728,7 +12184,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11740,11 +12196,11 @@ esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf '%s\n' "$OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -11753,7 +12209,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
@@ -11774,7 +12230,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11786,11 +12242,11 @@ esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf '%s\n' "$ac_ct_OTOOL64" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -11798,8 +12254,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -11834,7 +12290,7 @@ fi
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
@@ -11869,10 +12325,49 @@ else case e in #(
       fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf '%s\n' "$lt_cv_apple_cc_single_mod" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    # Feature test to disable chained fixups since it is not
+    # compatible with '-undefined dynamic_lookup'
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
+printf %s "checking for -no_fixup_chains linker flag... " >&6; }
+if test ${lt_cv_support_no_fixup_chains+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)  save_LDFLAGS=$LDFLAGS
+        LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  lt_cv_support_no_fixup_chains=yes
+else case e in #(
+  e) lt_cv_support_no_fixup_chains=no
+         ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS=$save_LDFLAGS
+
+     ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
+printf '%s\n' "$lt_cv_support_no_fixup_chains" >&6; }
+
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
@@ -11906,10 +12401,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf '%s\n' "$lt_cv_ld_exported_symbols_list" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 printf %s "checking for -force_load linker flag... " >&6; }
 if test ${lt_cv_ld_force_load+y}
 then :
@@ -11926,7 +12421,7 @@ _LT_EOF
       echo "$RANLIB libconftest.a" >&5
       $RANLIB libconftest.a 2>&5
       cat > conftest.c << _LT_EOF
-int main() { return 0;}
+int main(void) { return 0;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
@@ -11943,8 +12438,8 @@ _LT_EOF
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf '%s\n' "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
@@ -11955,13 +12450,32 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; }
         10.[012],*|,*powerpc*-darwin[5-8]*)
           _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
         *)
-          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'
+          if test yes = "$lt_cv_support_no_fixup_chains"; then
+            as_fn_append _lt_dar_allow_undefined ' $wl-no_fixup_chains'
+          fi
+        ;;
       esac
     ;;
   esac
     if test yes = "$lt_cv_apple_cc_single_mod"; then
       _lt_dar_single_mod='$single_module'
     fi
+    _lt_dar_needs_single_mod=no
+    case $host_os in
+    rhapsody* | darwin1.*)
+      _lt_dar_needs_single_mod=yes ;;
+    darwin*)
+      # When targeting Mac OS X 10.4 (darwin 8) or later,
+      # -single_module is the default and -multi_module is unsupported.
+      # The toolchain on macOS 10.14 (darwin 18) and later cannot
+      # target any OS version that needs -single_module.
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+      10.0,*-darwin[567].*|10.[0-3],*-darwin[5-9].*|10.[0-3],*-darwin1[0-7].*)
+        _lt_dar_needs_single_mod=yes ;;
+      esac
+    ;;
+    esac
     if test yes = "$lt_cv_ld_exported_symbols_list"; then
       _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
     else
@@ -12014,7 +12528,7 @@ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_inc
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_DLFCN_H 1" >>confdefs.h
 
 fi
 
@@ -12030,7 +12544,7 @@ case $host in
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
@@ -12051,7 +12565,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12063,11 +12577,11 @@ esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-printf "%s\n" "$AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+printf '%s\n' "$AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12076,7 +12590,7 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
@@ -12097,7 +12611,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12109,11 +12623,11 @@ esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-printf "%s\n" "$ac_ct_AS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+printf '%s\n' "$ac_ct_AS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -12121,8 +12635,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AS=$ac_ct_AS
@@ -12134,7 +12648,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
@@ -12155,7 +12669,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12167,11 +12681,11 @@ esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf '%s\n' "$DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12180,7 +12694,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
@@ -12201,7 +12715,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12213,11 +12727,11 @@ esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf '%s\n' "$ac_ct_DLLTOOL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -12225,8 +12739,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
@@ -12238,7 +12752,7 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
@@ -12259,7 +12773,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12271,11 +12785,11 @@ esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf '%s\n' "$OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12284,7 +12798,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
@@ -12305,7 +12819,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12317,11 +12831,11 @@ esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf '%s\n' "$ac_ct_OBJDUMP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -12329,8 +12843,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
@@ -12432,32 +12946,96 @@ fi
 
 
 
-
-# Check whether --with-pic was given.
+  # Check whether --enable-pic was given.
+if test ${enable_pic+y}
+then :
+  enableval=$enable_pic; lt_p=${PACKAGE-default}
+     case $enableval in
+     yes|no) pic_mode=$enableval ;;
+     *)
+       pic_mode=default
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+       for lt_pkg in $enableval; do
+	 IFS=$lt_save_ifs
+	 if test "X$lt_pkg" = "X$lt_p"; then
+	   pic_mode=yes
+	 fi
+       done
+       IFS=$lt_save_ifs
+       ;;
+     esac
+else case e in #(
+  e)           # Check whether --with-pic was given.
 if test ${with_pic+y}
 then :
   withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
+	 case $withval in
+	 yes|no) pic_mode=$withval ;;
+	 *)
+	   pic_mode=default
+	   # Look at the argument we got.  We use all the common list separators.
+	   lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+	   for lt_pkg in $withval; do
+	     IFS=$lt_save_ifs
+	     if test "X$lt_pkg" = "X$lt_p"; then
+	       pic_mode=yes
+	     fi
+	   done
+	   IFS=$lt_save_ifs
+	   ;;
+	 esac
+else case e in #(
+  e) pic_mode=default ;;
+esac
+fi
+
+     ;;
+esac
+fi
+
+
+
+
+
+
+
+
+  stdlibflag=-nostdlib
+# Check whether --enable-cxx-stdlib was given.
+if test ${enable_cxx_stdlib+y}
+then :
+  enableval=$enable_cxx_stdlib; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_cxx_stdlib=yes ;;
+    no) enable_cxx_stdlib=no ;;
     *)
-      pic_mode=default
+     enable_cxx_stdlib=no
       # Look at the argument we got.  We use all the common list separators.
       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for lt_pkg in $withval; do
+      for pkg in $enableval; do
 	IFS=$lt_save_ifs
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
+	if test "X$pkg" = "X$p"; then
+	  enable_cxx_stdlib=yes
 	fi
       done
       IFS=$lt_save_ifs
       ;;
     esac
 else case e in #(
-  e) pic_mode=default ;;
+  e) enable_cxx_stdlib=no ;;
 esac
 fi
 
 
+if test yes = "$enable_cxx_stdlib"; then
+  stdlibflag=
+fi
+
+
+
+
+
 
 
 
@@ -12499,20 +13077,31 @@ fi
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 printf %s "checking which variant of shared library versioning to provide... " >&6; }
-
-# Check whether --with-aix-soname was given.
+  # Check whether --enable-aix-soname was given.
+if test ${enable_aix_soname+y}
+then :
+  enableval=$enable_aix_soname; case $enableval in
+     aix|svr4|both)
+       ;;
+     *)
+       as_fn_error $? "Unknown argument to --enable-aix-soname" "$LINENO" 5
+       ;;
+     esac
+     lt_cv_with_aix_soname=$enable_aix_soname
+else case e in #(
+  e) # Check whether --with-aix-soname was given.
 if test ${with_aix_soname+y}
 then :
   withval=$with_aix_soname; case $withval in
-    aix|svr4|both)
-      ;;
-    *)
-      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
-      ;;
-    esac
-    lt_cv_with_aix_soname=$with_aix_soname
+         aix|svr4|both)
+           ;;
+         *)
+           as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+           ;;
+         esac
+         lt_cv_with_aix_soname=$with_aix_soname
 else case e in #(
   e) if test ${lt_cv_with_aix_soname+y}
 then :
@@ -12521,13 +13110,17 @@ else case e in #(
   e) lt_cv_with_aix_soname=aix ;;
 esac
 fi
-
-    with_aix_soname=$lt_cv_with_aix_soname ;;
+ ;;
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+     enable_aix_soname=$lt_cv_with_aix_soname ;;
+esac
+fi
+
+  with_aix_soname=$enable_aix_soname
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf '%s\n' "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -12541,8 +13134,21 @@ printf "%s\n" "$with_aix_soname" >&6; }
     fi
   fi
   ;;
-*)
+power*-*-aix[5-9]*,'')
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: for $host, specify if building shared libraries for versioning (svr4|both)" >&5
+printf '%s\n' "$as_me: WARNING: for $host, specify if building shared libraries for versioning (svr4|both)" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+printf %s "checking which variant of shared library versioning to provide... " >&6; }
   with_aix_soname=aix
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (default) $with_aix_soname" >&5
+printf '%s\n' "(default) $with_aix_soname" >&6; }
+  ;;
+*)
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+printf %s "checking which variant of shared library versioning to provide... " >&6; }
+  with_aix_soname=aix
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: (default) $with_aix_soname" >&5
+printf '%s\n' "(default) $with_aix_soname" >&6; }
   ;;
 esac
 
@@ -12609,7 +13215,7 @@ if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
@@ -12626,15 +13232,15 @@ fi
 rmdir .libs 2>/dev/null ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf '%s\n' "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
 
 
 
-printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+printf '%s\n' "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
 
 
 
@@ -12680,7 +13286,7 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12735,11 +13341,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12748,7 +13354,7 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
@@ -12803,11 +13409,11 @@ fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf '%s\n' "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -12841,7 +13447,7 @@ objext=$objext
 lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
+lt_simple_link_test_code='int main(void){return(0);}'
 
 
 
@@ -12892,7 +13498,7 @@ if test yes = "$GCC"; then
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
@@ -12919,9 +13525,9 @@ else case e in #(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -12929,8 +13535,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf '%s\n' "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -13068,7 +13674,7 @@ lt_prog_compiler_static=
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
       fi
       ;;
 
@@ -13119,7 +13725,13 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
@@ -13127,7 +13739,7 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
-      *flang)
+      *flang* | ftn | f18* | f95*)
         # Flang compiler.
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
@@ -13135,7 +13747,7 @@ lt_prog_compiler_static=
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
+      icc* | ifort* | icx* | ifx*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
@@ -13231,6 +13843,9 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    serenity*)
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -13293,7 +13908,7 @@ case $host_os in
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 printf %s "checking for $compiler option to produce PIC... " >&6; }
 if test ${lt_cv_prog_compiler_pic+y}
 then :
@@ -13302,15 +13917,15 @@ else case e in #(
   e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
@@ -13337,9 +13952,9 @@ else case e in #(
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
@@ -13347,8 +13962,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
@@ -13376,7 +13991,7 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
@@ -13392,9 +14007,9 @@ else case e in #(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
@@ -13406,8 +14021,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
@@ -13421,7 +14036,7 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -13452,9 +14067,9 @@ else case e in #(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -13470,15 +14085,15 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
@@ -13509,9 +14124,9 @@ else case e in #(
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -13527,8 +14142,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf '%s\n' "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -13536,7 +14151,7 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 printf %s "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -13544,11 +14159,11 @@ printf %s "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf '%s\n' "$hard_links" >&6; }
   if test no = "$hard_links"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf '%s\n' "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -13560,7 +14175,7 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -13616,9 +14231,6 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
     # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
     with_gnu_ld=yes
     ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
   esac
 
   ld_shlibs=yes
@@ -13729,6 +14341,7 @@ _LT_EOF
       enable_shared_with_static_runtimes=yes
       export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
       exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      file_list_spec='@'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -13748,7 +14361,7 @@ _LT_EOF
 
     haiku*)
       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
+      link_all_deplibs=no
       ;;
 
     os2*)
@@ -13795,6 +14408,11 @@ _LT_EOF
       archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
+    *-mlibc)
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
@@ -13820,7 +14438,7 @@ _LT_EOF
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
+	ifc* | ifort* | ifx*)		# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
@@ -13854,6 +14472,7 @@ _LT_EOF
 
 	case $cc_basename in
 	tcc*)
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	  export_dynamic_flag_spec='-rdynamic'
 	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
@@ -13874,7 +14493,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -14272,8 +14891,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl* | icl* | icx* | icpx*)
+	# Native MSVC and Intel compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -14283,14 +14902,20 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -Fe $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	# A check exists to verify if there are linker flags, which will use
+	# different commands when linking.
+	archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym";
           else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym;
+          fi~
+          if test -z "$linker_flags"; then
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
+          else
+             $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib";
           fi~
-          $CC -Fe $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -14322,7 +14947,7 @@ fi
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
@@ -14456,7 +15081,7 @@ fi
 
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+	  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 printf %s "checking if $CC understands -b... " >&6; }
 if test ${lt_cv_prog_compiler__b+y}
 then :
@@ -14472,9 +15097,9 @@ else case e in #(
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
+       if diff conftest.expsym conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
@@ -14486,8 +15111,8 @@ else case e in #(
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf '%s\n' "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -14527,7 +15152,7 @@ fi
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if test ${lt_cv_irix_exported_symbol+y}
 then :
@@ -14551,8 +15176,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
            LDFLAGS=$save_LDFLAGS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf '%s\n' "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -14567,17 +15192,21 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
+    *-mlibc)
+      ;;
+
     linux*)
       case $cc_basename in
       tcc*)
 	# Fabrice Bellard et al's Tiny C Compiler
 	ld_shlibs=yes
 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	;;
       esac
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -14668,8 +15297,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -14678,26 +15307,29 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_libdir_separator=:
       ;;
 
+    serenity*)
+      ;;
+
     solaris*)
       no_undefined_flag=' -z defs'
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~
+            $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym'
 	  ;;
 	esac
       fi
@@ -14833,8 +15465,8 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
     fi
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf '%s\n' "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -14870,7 +15502,7 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 printf %s "checking whether -lc should be explicitly linked in... " >&6; }
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
@@ -14882,7 +15514,7 @@ else case e in #(
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
@@ -14900,7 +15532,7 @@ else case e in #(
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
@@ -14915,8 +15547,8 @@ else case e in #(
 	 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf '%s\n' "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
@@ -15075,7 +15707,7 @@ esac
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 printf %s "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
@@ -15216,7 +15848,7 @@ aix[4-9]*)
     # Unfortunately, runtime linking may impact performance, so we do
     # not want this to be the default eventually. Also, we use the
     # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only.
     # To allow for filename-based versioning support, we need to create
     # libNAME.so.V as an archive file, containing:
     # *) an Import File, referring to the versioned filename of the
@@ -15321,15 +15953,29 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
+    # If user builds GCC with multilib enabled,
+    # it should just install on $(libdir)
+    # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.
+    if test xyes = x"$multilib"; then
+      postinstall_cmds='base_file=`basename \$file`~
+        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+        dldir=$destdir/`dirname \$dlpath`~
+        $install_prog $dir/$dlname $destdir/$dlname~
+        chmod a+x $destdir/$dlname~
+        if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+          eval '\''$striplib $destdir/$dlname'\'' || exit \$?;
+        fi'
+    else
+      postinstall_cmds='base_file=`basename \$file`~
+        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+        dldir=$destdir/`dirname \$dlpath`~
+        test -d \$dldir || mkdir -p \$dldir~
+        $install_prog $dir/$dlname \$dldir/$dlname~
+        chmod a+x \$dldir/$dlname~
+        if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+          eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+        fi'
+    fi
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $RM \$dlpath'
@@ -15354,8 +16000,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl* | *,icl* | *,icx*)
+    # Native MSVC and Intel compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -15468,7 +16114,28 @@ freebsd* | dragonfly* | midnightbsd*)
       need_version=yes
       ;;
   esac
+  case $host_cpu in
+    powerpc64)
+      # On FreeBSD bi-arch platforms, a different variable is used for 32-bit
+      # binaries.  See <https://man.freebsd.org/cgi/man.cgi?query=ld.so>.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int test_pointer_size[sizeof (void *) - 5];
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
   shlibpath_var=LD_LIBRARY_PATH
+else case e in #(
+  e) shlibpath_var=LD_32_LIBRARY_PATH ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+      ;;
+    *)
+      shlibpath_var=LD_LIBRARY_PATH
+      ;;
+  esac
   case $host_os in
   freebsd2.*)
     shlibpath_overrides_runpath=yes
@@ -15498,8 +16165,9 @@ haiku*)
   soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
+  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'
+  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'
+  hardcode_into_libs=no
   ;;
 
 hpux9* | hpux10* | hpux11*)
@@ -15600,6 +16268,18 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
+*-mlibc)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='mlibc ld.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
@@ -15700,6 +16380,20 @@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  enable_cxx_stdlib=yes
+  stdlibflag=
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -15716,6 +16410,8 @@ netbsd*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
+  enable_cxx_stdlib=yes
+  stdlibflag=
   ;;
 
 newsos6)
@@ -15797,6 +16493,17 @@ rdos*)
   dynamic_linker=no
   ;;
 
+serenity*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  dynamic_linker='SerenityOS LibELF'
+  ;;
+
 solaris*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -15894,12 +16601,502 @@ uts4*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+emscripten*)
+  version_type=none
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  dynamic_linker="Emscripten linker"
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    *-mlibc)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-fPIC'
+      lt_prog_compiler_static='-static'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      *flang* | ftn | f18* | f95*)
+        # Flang compiler.
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort* | icx* | ifx*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    serenity*)
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+printf %s "checking for $compiler option to produce PIC... " >&6; }
+if test ${lt_cv_prog_compiler_pic+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test ${lt_cv_prog_compiler_pic_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test ${lt_cv_prog_compiler_static_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.expsym conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+ ;;
+esac
+fi
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf '%s\n' "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+='-fPIC'
+  archive_cmds='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib'
+  archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym'
+  archive_cmds_need_lc=no
+  no_undefined_flag=
+  ;;
+
 *)
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf '%s\n' "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -16020,7 +17217,7 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 printf %s "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -16045,8 +17242,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf '%s\n' "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
@@ -16090,7 +17287,7 @@ else
 
   darwin*)
     # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16131,8 +17328,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
@@ -16161,7 +17358,7 @@ if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
@@ -16202,8 +17399,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf '%s\n' "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
@@ -16213,7 +17410,7 @@ if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
@@ -16254,13 +17451,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
@@ -16301,13 +17498,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf '%s\n' "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
@@ -16348,8 +17545,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf '%s\n' "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes
 then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
@@ -16395,7 +17592,7 @@ fi
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
@@ -16451,11 +17648,11 @@ else
 /* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
+int fnord (void) __attribute__((visibility("default")));
 #endif
 
-int fnord () { return 42; }
-int main ()
+int fnord (void) { return 42; }
+int main (void)
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
   int status = $lt_dlunknown;
@@ -16479,7 +17676,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16498,12 +17695,12 @@ rm -fr conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf '%s\n' "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self_static+y}
 then :
@@ -16559,11 +17756,11 @@ else
 /* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
+int fnord (void) __attribute__((visibility("default")));
 #endif
 
-int fnord () { return 42; }
-int main ()
+int fnord (void) { return 42; }
+int main (void)
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
   int status = $lt_dlunknown;
@@ -16587,7 +17784,7 @@ _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf '%s\n' "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -16606,8 +17803,8 @@ rm -fr conftest*
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf '%s\n' "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
@@ -16645,40 +17842,40 @@ fi
 
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 printf %s "checking whether stripping libraries is possible... " >&6; }
 if test -z "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 else
   if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
     old_striplib="$STRIP --strip-debug"
     striplib="$STRIP --strip-unneeded"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
   else
     case $host_os in
     darwin*)
       # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       ;;
     freebsd*)
       if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
         old_striplib="$STRIP --strip-debug"
         striplib="$STRIP --strip-unneeded"
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       fi
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
       ;;
     esac
   fi
@@ -16696,12 +17893,12 @@ fi
 
 
   # Report what library types will actually be built
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 printf %s "checking if libtool supports shared libraries... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf '%s\n' "$can_build_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 printf %s "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
@@ -16726,15 +17923,15 @@ printf %s "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf '%s\n' "$enable_shared" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 printf %s "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf '%s\n' "$enable_static" >&6; }
 
 
 
@@ -16760,6 +17957,13 @@ CC=$lt_save_CC
 
 
 
+
+
+
+
+
+
+
 
 
         ac_config_commands="$ac_config_commands libtool"
@@ -16773,7 +17977,7 @@ CC=$lt_save_CC
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RC+y}
 then :
@@ -16794,7 +17998,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -16806,11 +18010,11 @@ esac
 fi
 RC=$ac_cv_prog_RC
 if test -n "$RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
-printf "%s\n" "$RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+printf '%s\n' "$RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -16819,7 +18023,7 @@ if test -z "$ac_cv_prog_RC"; then
   ac_ct_RC=$RC
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RC+y}
 then :
@@ -16840,7 +18044,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RC="windres"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -16852,11 +18056,11 @@ esac
 fi
 ac_ct_RC=$ac_cv_prog_ac_ct_RC
 if test -n "$ac_ct_RC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
-printf "%s\n" "$ac_ct_RC" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
+printf '%s\n' "$ac_ct_RC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   if test "x$ac_ct_RC" = x; then
@@ -16864,8 +18068,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf '%s\n' "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RC=$ac_ct_RC
@@ -16973,7 +18177,7 @@ fi
 # NOTE: This checks if we are building shared or static library
 # and if --with-pic or --without-pic was used. Thus this check
 # must be after Libtool initialization.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if library symbol versioning should be used" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if library symbol versioning should be used" >&5
 printf %s "checking if library symbol versioning should be used... " >&6; }
 # Check whether --enable-symbol-versions was given.
 if test ${enable_symbol_versions+y}
@@ -17018,15 +18222,15 @@ if test "x$enable_symbol_versions" = xno
 then :
 
 	enable_symbol_versions=no
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 
 elif test "x$enable_shared" = xno
 then :
 
 	enable_symbol_versions=no
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (not building a shared library)" >&5
-printf "%s\n" "no (not building a shared library)" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no (not building a shared library)" >&5
+printf '%s\n' "no (not building a shared library)" >&6; }
 
 else case e in #(
   e)
@@ -17082,8 +18286,8 @@ rm -rf conftest*
 				have_symbol_versions_linux=1
 				;;
 			*)
-				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 				as_fn_error $? "
     On GNU/Linux, building both shared and static library at the same time
     is not supported if --with-pic or --without-pic is used.
@@ -17093,15 +18297,15 @@ printf "%s\n" "" >&6; }
 				;;
 		esac
 
-printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h
+printf '%s\n' "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h
 
 	elif test "x$enable_symbol_versions" != xgeneric ; then
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf '%s\n' "" >&6; }
 		as_fn_error $? "unknown symbol versioning variant '$enable_symbol_versions'" "$LINENO" 5
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($enable_symbol_versions)" >&5
-printf "%s\n" "yes ($enable_symbol_versions)" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes ($enable_symbol_versions)" >&5
+printf '%s\n' "yes ($enable_symbol_versions)" >&6; }
  ;;
 esac
 fi
@@ -17133,7 +18337,7 @@ echo "Initializing gettext:"
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 printf %s "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
 if test ${enable_nls+y}
@@ -17144,13 +18348,13 @@ else case e in #(
 esac
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
 
 
 
 
-      GETTEXT_MACRO_VERSION=0.20
+      GETTEXT_MACRO_VERSION=0.24
 
 
 
@@ -17184,7 +18388,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGFMT+y}
 then :
@@ -17201,7 +18405,7 @@ else case e in #(
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          echo "$as_me:${as_lineno-$LINENO}: trying $ac_dir/$ac_word..." >&5
           if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
             ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
@@ -17218,16 +18422,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-printf "%s\n" "$MSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf '%s\n' "$MSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_GMSGFMT+y}
 then :
@@ -17250,7 +18454,7 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -17264,11 +18468,11 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-printf "%s\n" "$GMSGFMT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf '%s\n' "$GMSGFMT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17309,7 +18513,7 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XGETTEXT+y}
 then :
@@ -17326,7 +18530,7 @@ else case e in #(
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          echo "$as_me:${as_lineno-$LINENO}: trying $ac_dir/$ac_word..." >&5
           if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
      (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
             ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
@@ -17343,11 +18547,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-printf "%s\n" "$XGETTEXT" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf '%s\n' "$XGETTEXT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
     rm -f messages.po
@@ -17388,7 +18592,7 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MSGMERGE+y}
 then :
@@ -17405,7 +18609,7 @@ else case e in #(
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          echo "$as_me:${as_lineno-$LINENO}: trying $ac_dir/$ac_word..." >&5
           if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
             ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
             break 2
@@ -17421,11 +18625,11 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-printf "%s\n" "$MSGMERGE" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf '%s\n' "$MSGMERGE" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
 
@@ -17443,6 +18647,13 @@ fi
     test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
 
 
+  if test -n "$ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+
+        DESIRED_LINGUAS="${LINGUAS-\$(ALL_LINGUAS)}"
+
+
   ac_config_commands="$ac_config_commands po-directories"
 
 
@@ -17487,16 +18698,16 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
 printf %s "checking for ld... " >&6; }
 elif test "$GCC" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 printf %s "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 printf %s "checking for non-GNU ld... " >&6; }
 fi
 if test -n "$LD"; then
@@ -17620,14 +18831,14 @@ fi
   LD="$acl_cv_path_LD"
 fi
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf '%s\n' "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
   as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${acl_cv_prog_gnu_ld+y}
 then :
@@ -17644,15 +18855,15 @@ case `$LD -v 2>&1 </dev/null` in
 esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf '%s\n' "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
 
 
-                                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+                                                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 printf %s "checking for shared library run path origin... " >&6; }
 if test ${acl_cv_rpath+y}
 then :
@@ -17667,8 +18878,8 @@ else case e in #(
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-printf "%s\n" "$acl_cv_rpath" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf '%s\n' "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   acl_libext="$acl_cv_libext"
   acl_shlibext="$acl_cv_shlibext"
@@ -17690,7 +18901,7 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
 printf %s "checking 32-bit host C ABI... " >&6; }
 if test ${gl_cv_host_cpu_c_abi_32bit+y}
 then :
@@ -17727,9 +18938,9 @@ else case e in #(
        *)
          if test -n "$gl_cv_host_cpu_c_abi"; then
                       case "$gl_cv_host_cpu_c_abi" in
-             i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+             i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | loongarch32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
                gl_cv_host_cpu_c_abi_32bit=yes ;;
-             x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+             x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | loongarch64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
                gl_cv_host_cpu_c_abi_32bit=no ;;
              *)
                gl_cv_host_cpu_c_abi_32bit=unknown ;;
@@ -17757,8 +18968,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
-printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
+printf '%s\n' "$gl_cv_host_cpu_c_abi_32bit" >&6; }
 
   HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
 
@@ -17766,7 +18977,7 @@ printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
 printf %s "checking for ELF binary format... " >&6; }
 if test ${gl_cv_elf+y}
 then :
@@ -17774,7 +18985,7 @@ then :
 else case e in #(
   e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if defined __ELF__ || (defined __linux__ && defined __EDG__)
+#if defined __ELF__ || (defined __linux__ && (defined __EDG__ || defined __SUNPRO_C))
         Extensible Linking Format
         #endif
 
@@ -17792,8 +19003,8 @@ rm -rf conftest*
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
-printf "%s\n" "$gl_cv_elf" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
+printf '%s\n' "$gl_cv_elf" >&6; }
   if test $gl_cv_elf = yes; then
     # Extract the ELF class of a file (5th byte) in decimal.
     # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
@@ -17844,7 +19055,7 @@ printf "%s\n" "$gl_cv_elf" >&6; }
     }
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
 printf %s "checking for the common suffixes of directories in the library search path... " >&6; }
 if test ${acl_cv_libdirstems+y}
 then :
@@ -17921,8 +19132,8 @@ else case e in #(
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
-printf "%s\n" "$acl_cv_libdirstems" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+printf '%s\n' "$acl_cv_libdirstems" >&6; }
       acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
   acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
   acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
@@ -18434,6 +19645,41 @@ fi
   esac
 
 
+    gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+      if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
+
+
+
+
+
+    gl_final_localedir="$localedir"
+    case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw* | windows*)
+          gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;;
+      esac
+      ;;
+  esac
+    localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+  localedir_c='"'"$localedir_c"'"'
+
+
+    localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+      if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then
+    localedir_c_make='\"$(localedir)\"'
+  fi
+
+
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
 
 
 
@@ -18455,7 +19701,9 @@ fi
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+
+
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
 if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
 then :
@@ -18486,14 +19734,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf '%s\n' "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 
-printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+printf '%s\n' "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+                    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
 printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; }
 if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y}
 then :
@@ -18524,11 +19772,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
      LIBS="$gt_saved_LIBS" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
-printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+printf '%s\n' "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
   if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
 
-printf "%s\n" "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
+printf '%s\n' "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
 
   fi
   INTL_MACOSX_LIBS=
@@ -18540,6 +19788,12 @@ printf "%s\n" "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
 
 
 
+  INTL_WINDOWS_LIBS=
+  case "$host_os" in
+    mingw* | windows*) INTL_WINDOWS_LIBS='-ladvapi32' ;;
+  esac
+
+
 
 
   LIBINTL=
@@ -18574,7 +19828,8 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
           gt_expression_test_code=
         fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 printf %s "checking for GNU gettext in libc... " >&6; }
 if eval test \${$gt_func_gnugettext_libc+y}
 then :
@@ -18585,7 +19840,11 @@ else case e in #(
 
 #include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#if defined _MSC_VER
+#define _nl_msg_cat_cntr 0
+#else
 extern int _nl_msg_cat_cntr;
+#endif
 extern int *_nl_domain_bindings;
 #define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
 #else
@@ -18606,7 +19865,15 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
-  eval "$gt_func_gnugettext_libc=yes"
+                                                                                                                                                                           if test "`uname -sr`" = 'SunOS 5.11'; then
+               case `uname -v` in
+                 11.4 | 11.4.*) eval "$gt_func_gnugettext_libc=yes" ;;
+                 *)             eval "$gt_func_gnugettext_libc=no" ;;
+               esac
+             else
+               eval "$gt_func_gnugettext_libc=yes"
+             fi
+
 else case e in #(
   e) eval "$gt_func_gnugettext_libc=no" ;;
 esac
@@ -18616,8 +19883,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libc
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
@@ -18650,7 +19917,7 @@ printf "%s\n" "$ac_res" >&6; }
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 printf %s "checking for iconv... " >&6; }
 if test ${am_cv_func_iconv+y}
 then :
@@ -18712,10 +19979,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
    ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-printf "%s\n" "$am_cv_func_iconv" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf '%s\n' "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 printf %s "checking for working iconv... " >&6; }
 if test ${am_cv_func_iconv_works+y}
 then :
@@ -18770,6 +20037,35 @@ int result = 0;
         iconv_close (cd_utf8_to_88591);
       }
   }
+  /* Test against macOS 14.4 bug: Failures are not distinguishable from
+     successful returns.
+     POSIX:2018 says: "The iconv() function shall ... return the number of
+     non-identical conversions performed."
+     But here, the conversion always does transliteration (the suffixes
+     "//TRANSLIT" and "//IGNORE" have no effect, nor does iconvctl()) and
+     does not report when it does a non-identical conversion.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\305\202"; /* LATIN SMALL LETTER L WITH STROKE */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        /* Here:
+           With glibc, GNU libiconv (including macOS up to 13): res == (size_t)-1, errno == EILSEQ.
+           With musl libc, NetBSD 10, Solaris 11: res == 1.
+           With macOS 14.4: res == 0, output is "l".  */
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
      successful returns.  */
   {
@@ -18786,7 +20082,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          result |= 2;
+          result |= 4;
         iconv_close (cd_ascii_to_88591);
       }
   }
@@ -18805,7 +20101,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
+          result |= 8;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18825,7 +20121,7 @@ int result = 0;
                             &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          result |= 8;
+          result |= 16;
         iconv_close (cd_88591_to_utf8);
       }
   }
@@ -18835,7 +20131,7 @@ int result = 0;
   {
     /* Try standardized names.  */
     iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
-    /* Try IRIX, OSF/1 names.  */
+    /* Try possible *BSD names.  */
     iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
     /* Try AIX names.  */
     iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
@@ -18843,7 +20139,7 @@ int result = 0;
     iconv_t cd4 = iconv_open ("utf8", "eucJP");
     if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
         && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
+      result |= 32;
     if (cd1 != (iconv_t)(-1))
       iconv_close (cd1);
     if (cd2 != (iconv_t)(-1))
@@ -18874,8 +20170,8 @@ fi
      ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-printf "%s\n" "$am_cv_func_iconv_works" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf '%s\n' "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
       *)   am_func_iconv=yes ;;
@@ -18885,14 +20181,14 @@ printf "%s\n" "$am_cv_func_iconv_works" >&6; }
   fi
   if test "$am_func_iconv" = yes; then
 
-printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
+printf '%s\n' "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 printf %s "checking how to link with libiconv... " >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-printf "%s\n" "$LIBICONV" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf '%s\n' "$LIBICONV" >&6; }
   else
             CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
@@ -19393,22 +20689,26 @@ fi
 
 
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+          { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 printf %s "checking for GNU gettext in libintl... " >&6; }
 if eval test \${$gt_func_gnugettext_libintl+y}
 then :
   printf %s "(cached) " >&6
 else case e in #(
-  e) gt_save_CPPFLAGS="$CPPFLAGS"
+  e) gt_saved_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
+            gt_saved_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#if defined _MSC_VER
+#define _nl_msg_cat_cntr 0
+#else
 extern int _nl_msg_cat_cntr;
+#endif
 extern
 #ifdef __cplusplus
 "C"
@@ -19440,10 +20740,11 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-                                    gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
-
+                                                gt_LIBINTL_EXTRA=
             case "$host_os" in
-              aix*) gt_LIBINTL_EXTRA="-lpthread" ;;
+              darwin*)           gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" ;;
+              aix*)              gt_LIBINTL_EXTRA="-lpthread" ;;
+              mingw* | windows*) gt_LIBINTL_EXTRA="$INTL_WINDOWS_LIBS" ;;
             esac
             if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
                && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
@@ -19453,7 +20754,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 
 #include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#if defined _MSC_VER
+#define _nl_msg_cat_cntr 0
+#else
 extern int _nl_msg_cat_cntr;
+#endif
 extern
 #ifdef __cplusplus
 "C"
@@ -19486,13 +20791,13 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
             fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS" ;;
+            CPPFLAGS="$gt_saved_CPPFLAGS"
+            LIBS="$gt_saved_LIBS" ;;
 esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libintl
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf '%s\n' "$ac_res" >&6; }
         fi
 
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
@@ -19511,28 +20816,36 @@ printf "%s\n" "$ac_res" >&6; }
 
     if test -n "$INTL_MACOSX_LIBS"; then
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+         || test "$gt_cv_use_gnu_libintl" = "yes"; then
                 LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
         LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
       fi
     fi
 
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+    if test -n "$INTL_WINDOWS_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$gt_cv_use_gnu_libintl" = "yes"; then
+                LIBINTL="$LIBINTL $INTL_WINDOWS_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_WINDOWS_LIBS"
+      fi
+    fi
 
-printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$gt_cv_use_gnu_libintl" = "yes"; then
+
+printf '%s\n' "#define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
 printf %s "checking whether to use NLS... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-printf "%s\n" "$USE_NLS" >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf '%s\n' "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
 printf %s "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
@@ -19543,18 +20856,18 @@ printf %s "checking where the gettext function comes from... " >&6; }
     else
       gt_source="included intl directory"
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-printf "%s\n" "$gt_source" >&6; }
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf '%s\n' "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
 printf %s "checking how to link with libintl... " >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-printf "%s\n" "$LIBINTL" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf '%s\n' "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -19581,10 +20894,10 @@ printf "%s\n" "$LIBINTL" >&6; }
       fi
 
 
-printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h
+printf '%s\n' "#define HAVE_GETTEXT 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
+printf '%s\n' "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -19602,44 +20915,10 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
 
 
-      gt_save_prefix="${prefix}"
-  gt_save_datarootdir="${datarootdir}"
-  gt_save_localedir="${localedir}"
-      if test "X$prefix" = "XNONE"; then
-    prefix="$ac_default_prefix"
-  fi
-  eval datarootdir="$datarootdir"
-  eval localedir="$localedir"
 
 
 
 
-
-    gl_final_localedir="$localedir"
-    case "$build_os" in
-    cygwin*)
-      case "$host_os" in
-        mingw* | windows*)
-          gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;;
-      esac
-      ;;
-  esac
-    localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
-  localedir_c='"'"$localedir_c"'"'
-
-
-    localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
-      if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then
-    localedir_c_make='\"$(localedir)\"'
-  fi
-
-
-  localedir="${gt_save_localedir}"
-  datarootdir="${gt_save_datarootdir}"
-  prefix="${gt_save_prefix}"
-
-
-
 ###############################################################################
 # Checks for header files.
 ###############################################################################
@@ -19651,12 +20930,12 @@ echo "System headers and functions:"
 # these headers are missing.
        for ac_header in fcntl.h limits.h sys/time.h
 do :
-  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
+  as_ac_Header=`printf '%s\n' "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"
 then :
   cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
+#define `printf '%s\n' "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
 _ACEOF
 
 else case e in #(
@@ -19670,7 +20949,7 @@ done
 ac_fn_c_check_header_compile "$LINENO" "immintrin.h" "ac_cv_header_immintrin_h" "$ac_includes_default"
 if test "x$ac_cv_header_immintrin_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_IMMINTRIN_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_IMMINTRIN_H 1" >>confdefs.h
 
 fi
 
@@ -19684,12 +20963,12 @@ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 if test "x$ac_cv_type__Bool" = xyes
 then :
 
-printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h
+printf '%s\n' "#define HAVE__BOOL 1" >>confdefs.h
 
 
 fi
 
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99 or later" >&5
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99 or later" >&5
 printf %s "checking for stdbool.h that conforms to C99 or later... " >&6; }
 if test ${ac_cv_header_stdbool_h+y}
 then :
@@ -19774,12 +21053,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-printf "%s\n" "$ac_cv_header_stdbool_h" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+printf '%s\n' "$ac_cv_header_stdbool_h" >&6; }
 
 if test $ac_cv_header_stdbool_h = yes; then
 
-printf "%s\n" "#define HAVE_STDBOOL_H 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STDBOOL_H 1" >>confdefs.h
 
 fi
 
@@ -19789,10 +21068,10 @@ case $ac_cv_c_uint8_t in #(
   no|yes) ;; #(
   *)
 
-printf "%s\n" "#define _UINT8_T 1" >>confdefs.h
+printf '%s\n' "#define _UINT8_T 1" >>confdefs.h
 
 
-printf "%s\n" "#define uint8_t $ac_cv_c_uint8_t" >>confdefs.h
+printf '%s\n' "#define uint8_t $ac_cv_c_uint8_t" >>confdefs.h
 ;;
   esac
 
@@ -19802,7 +21081,7 @@ case $ac_cv_c_uint16_t in #(
   *)
 
 
-printf "%s\n" "#define uint16_t $ac_cv_c_uint16_t" >>confdefs.h
+printf '%s\n' "#define uint16_t $ac_cv_c_uint16_t" >>confdefs.h
 ;;
   esac
 
@@ -19811,7 +21090,7 @@ case $ac_cv_c_int32_t in #(
   no|yes) ;; #(
   *)
 
-printf "%s\n" "#define int32_t $ac_cv_c_int32_t" >>confdefs.h
+printf '%s\n' "#define int32_t $ac_cv_c_int32_t" >>confdefs.h
 ;;
 esac
 
@@ -19820,10 +21099,10 @@ case $ac_cv_c_uint32_t in #(
   no|yes) ;; #(
   *)
 
-printf "%s\n" "#define _UINT32_T 1" >>confdefs.h
+printf '%s\n' "#define _UINT32_T 1" >>confdefs.h
 
 
-printf "%s\n" "#define uint32_t $ac_cv_c_uint32_t" >>confdefs.h
+printf '%s\n' "#define uint32_t $ac_cv_c_uint32_t" >>confdefs.h
 ;;
   esac
 
@@ -19832,7 +21111,7 @@ case $ac_cv_c_int64_t in #(
   no|yes) ;; #(
   *)
 
-printf "%s\n" "#define int64_t $ac_cv_c_int64_t" >>confdefs.h
+printf '%s\n' "#define int64_t $ac_cv_c_int64_t" >>confdefs.h
 ;;
 esac
 
@@ -19841,10 +21120,10 @@ case $ac_cv_c_uint64_t in #(
   no|yes) ;; #(
   *)
 
-printf "%s\n" "#define _UINT64_T 1" >>confdefs.h
+printf '%s\n' "#define _UINT64_T 1" >>confdefs.h
 
 
-printf "%s\n" "#define uint64_t $ac_cv_c_uint64_t" >>confdefs.h
+printf '%s\n' "#define uint64_t $ac_cv_c_uint64_t" >>confdefs.h
 ;;
   esac
 
@@ -19853,7 +21132,7 @@ printf "%s\n" "#define uint64_t $ac_cv_c_uint64_t" >>confdefs.h
 if test "x$ac_cv_type_uintptr_t" = xyes
 then :
 
-printf "%s\n" "#define HAVE_UINTPTR_T 1" >>confdefs.h
+printf '%s\n' "#define HAVE_UINTPTR_T 1" >>confdefs.h
 
 else case e in #(
   e) for ac_type in 'unsigned int' 'unsigned long int' \
@@ -19875,7 +21154,7 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-printf "%s\n" "#define uintptr_t $ac_type" >>confdefs.h
+printf '%s\n' "#define uintptr_t $ac_type" >>confdefs.h
 
 	  ac_type=
 fi
@@ -19891,7 +21170,7 @@ fi
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
 printf %s "checking size of size_t... " >&6; }
 if test ${ac_cv_sizeof_size_t+y}
 then :
@@ -19901,25 +21180,18 @@ else case e in #(
 then :
 
 else case e in #(
-  e) if test "$ac_cv_type_size_t" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (size_t)
-See 'config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi ;;
+  e) ac_cv_sizeof_size_t=0 ;;
 esac
 fi
  ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-printf "%s\n" "$ac_cv_sizeof_size_t" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
+printf '%s\n' "$ac_cv_sizeof_size_t" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h
+printf '%s\n' "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h
 
 
 
@@ -19930,7 +21202,7 @@ ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_str
 if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -19938,7 +21210,7 @@ ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_membe
 if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -19946,7 +21218,7 @@ ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct
 if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
 
 
 fi
@@ -19954,7 +21226,7 @@ ac_fn_c_check_member "$LINENO" "struct stat" "st_uatime" "ac_cv_member_struct_st
 if test "x$ac_cv_member_struct_stat_st_uatime" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_UATIME 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_UATIME 1" >>confdefs.h
 
 
 fi
@@ -19962,7 +21234,7 @@ ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_me
 if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes
 then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h
 
 
 fi
@@ -19975,18 +21247,18 @@ then :
 fi
 if test "$enable_largefile,$enable_year2038" != no,no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5
-printf %s "checking for $CC option to enable large file support... " >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to support large files" >&5
+printf %s "checking for $CC option to support large files... " >&6; }
 if test ${ac_cv_sys_largefile_opts+y}
 then :
   printf %s "(cached) " >&6
 else case e in #(
-  e) ac_save_CC="$CC"
+  e) ac_save_CPPFLAGS=$CPPFLAGS
   ac_opt_found=no
-  for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do
+  for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1"; do
     if test x"$ac_opt" != x"none needed"
 then :
-  CC="$ac_save_CC $ac_opt"
+  CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"
 fi
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20015,12 +21287,12 @@ then :
   if test x"$ac_opt" = x"none needed"
 then :
   # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
-	 CC="$CC -DFTYPE=ino_t"
+	 CPPFLAGS="$CPPFLAGS -DFTYPE=ino_t"
 	 if ac_fn_c_try_compile "$LINENO"
 then :
 
 else case e in #(
-  e) CC="$CC -D_FILE_OFFSET_BITS=64"
+  e) CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
 	    if ac_fn_c_try_compile "$LINENO"
 then :
   ac_opt='-D_FILE_OFFSET_BITS=64'
@@ -20036,13 +21308,13 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     test $ac_opt_found = no || break
   done
-  CC="$ac_save_CC"
+  CPPFLAGS=$ac_save_CPPFLAGS
 
   test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5
-printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5
+printf '%s\n' "$ac_cv_sys_largefile_opts" >&6; }
 
 ac_have_largefile=yes
 case $ac_cv_sys_largefile_opts in #(
@@ -20054,22 +21326,20 @@ case $ac_cv_sys_largefile_opts in #(
     ac_have_largefile=no ;; #(
   "-D_FILE_OFFSET_BITS=64") :
 
-printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+printf '%s\n' "#define _FILE_OFFSET_BITS 64" >>confdefs.h
  ;; #(
   "-D_LARGE_FILES=1") :
 
-printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h
+printf '%s\n' "#define _LARGE_FILES 1" >>confdefs.h
  ;; #(
-  "-n32") :
-    CC="$CC -n32" ;; #(
   *) :
     as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;;
 esac
 
 if test "$enable_year2038" != no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5
-printf %s "checking for $CC option for timestamps after 2038... " >&6; }
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for $CC option to support timestamps after 2038" >&5
+printf %s "checking for $CC option to support timestamps after 2038... " >&6; }
 if test ${ac_cv_sys_year2038_opts+y}
 then :
   printf %s "(cached) " >&6
@@ -20112,8 +21382,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5
-printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5
+printf '%s\n' "$ac_cv_sys_year2038_opts" >&6; }
 
 ac_have_year2038=yes
 case $ac_cv_sys_year2038_opts in #(
@@ -20123,15 +21393,15 @@ case $ac_cv_sys_year2038_opts in #(
     ac_have_year2038=no ;; #(
   "-D_TIME_BITS=64") :
 
-printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h
+printf '%s\n' "#define _TIME_BITS 64" >>confdefs.h
  ;; #(
   "-D__MINGW_USE_VC2005_COMPAT") :
 
-printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
+printf '%s\n' "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
  ;; #(
   "-U_USE_32_BIT_TIME_T"*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It
 will stop working after mid-January 2038. Remove
 _USE_32BIT_TIME_T from the compiler flags.
@@ -20143,7 +21413,7 @@ esac
 fi
 
 fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 printf %s "checking whether byte ordering is bigendian... " >&6; }
 if test ${ac_cv_c_bigendian+y}
 then :
@@ -20365,17 +21635,17 @@ fi
     fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-printf "%s\n" "$ac_cv_c_bigendian" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf '%s\n' "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf '%s\n' "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
       ;; #(
    universal)
 
-printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf '%s\n' "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -20397,7 +21667,7 @@ do :
   ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
 if test "x$ac_cv_header_getopt_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_GETOPT_H 1" >>confdefs.h
 
 else case e in #(
   e) GETOPT_H=getopt.h ;;
@@ -20414,7 +21684,7 @@ do :
   ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
 if test "x$ac_cv_func_getopt_long" = xyes
 then :
-  printf "%s\n" "#define HAVE_GETOPT_LONG 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_GETOPT_LONG 1" >>confdefs.h
 
 else case e in #(
   e) GETOPT_H=getopt.h ;;
@@ -20426,11 +21696,11 @@ done
 
                                   if test -z "$GETOPT_H"; then
     ac_fn_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" "#include <getopt.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_optreset" = xyes
 then :
 
-printf "%s\n" "#define HAVE_OPTRESET 1" >>confdefs.h
+printf '%s\n' "#define HAVE_OPTRESET 1" >>confdefs.h
 
 fi
   fi
@@ -20456,7 +21726,7 @@ esac
 
   GETOPT_H=getopt.h
 
-printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h
+printf '%s\n' "#define __GETOPT_PREFIX rpl_" >>confdefs.h
 
 
 
@@ -20468,12 +21738,12 @@ fi
 
   for ac_func in futimens futimes futimesat utimes _futime utime
 do :
-  as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"`
+  as_ac_var=`printf '%s\n' "ac_cv_func_$ac_func" | sed "$as_sed_sh"`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"
 then :
   cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1
+#define `printf '%s\n' "HAVE_$ac_func" | sed "$as_sed_cpp"` 1
 _ACEOF
  break
 fi
@@ -20484,7 +21754,7 @@ done
 ac_fn_c_check_func "$LINENO" "posix_fadvise" "ac_cv_func_posix_fadvise"
 if test "x$ac_cv_func_posix_fadvise" = xyes
 then :
-  printf "%s\n" "#define HAVE_POSIX_FADVISE 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_POSIX_FADVISE 1" >>confdefs.h
 
 fi
 
@@ -20497,7 +21767,7 @@ fi
 
 
 ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
@@ -20505,14 +21775,14 @@ else case e in #(
   e) ac_have_decl=0 ;;
 esac
 fi
-printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+printf '%s\n' "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if __builtin_bswap16/32/64 are supported" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if __builtin_bswap16/32/64 are supported" >&5
 printf %s "checking if __builtin_bswap16/32/64 are supported... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20531,25 +21801,25 @@ if ac_fn_c_try_link "$LINENO"
 then :
 
 
-printf "%s\n" "#define HAVE___BUILTIN_BSWAPXX 1" >>confdefs.h
+printf '%s\n' "#define HAVE___BUILTIN_BSWAPXX 1" >>confdefs.h
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 
 else case e in #(
   e)
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 
 	# Look for other byteswapping methods.
 	       for ac_header in byteswap.h sys/endian.h sys/byteorder.h
 do :
-  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
+  as_ac_Header=`printf '%s\n' "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"
 then :
   cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
+#define `printf '%s\n' "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
 _ACEOF
  break
 fi
@@ -20559,7 +21829,7 @@ done
 	# Even if we have byteswap.h we may lack the specific macros/functions.
 	if test x$ac_cv_header_byteswap_h = xyes ; then
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if bswap_16 is available" >&5
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if bswap_16 is available" >&5
 printf %s "checking if bswap_16 is available... " >&6; }
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20577,21 +21847,21 @@ if ac_fn_c_try_link "$LINENO"
 then :
 
 
-printf "%s\n" "#define HAVE_BSWAP_16 1" >>confdefs.h
+printf '%s\n' "#define HAVE_BSWAP_16 1" >>confdefs.h
 
-				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; } ;;
 esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if bswap_32 is available" >&5
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if bswap_32 is available" >&5
 printf %s "checking if bswap_32 is available... " >&6; }
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20609,21 +21879,21 @@ if ac_fn_c_try_link "$LINENO"
 then :
 
 
-printf "%s\n" "#define HAVE_BSWAP_32 1" >>confdefs.h
+printf '%s\n' "#define HAVE_BSWAP_32 1" >>confdefs.h
 
-				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; } ;;
 esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if bswap_64 is available" >&5
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if bswap_64 is available" >&5
 printf %s "checking if bswap_64 is available... " >&6; }
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20641,14 +21911,14 @@ if ac_fn_c_try_link "$LINENO"
 then :
 
 
-printf "%s\n" "#define HAVE_BSWAP_64 1" >>confdefs.h
+printf '%s\n' "#define HAVE_BSWAP_64 1" >>confdefs.h
 
-				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+				{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 
 else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;;
+  e) { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; } ;;
 esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -20661,7 +21931,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if unaligned memory access should be used" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if unaligned memory access should be used" >&5
 printf %s "checking if unaligned memory access should be used... " >&6; }
 # Check whether --enable-unaligned-access was given.
 if test ${enable_unaligned_access+y}
@@ -20686,16 +21956,16 @@ if test "x$enable_unaligned_access" = xauto ; then
 fi
 if test "x$enable_unaligned_access" = xyes ; then
 
-printf "%s\n" "#define TUKLIB_FAST_UNALIGNED_ACCESS 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_FAST_UNALIGNED_ACCESS 1" >>confdefs.h
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if unsafe type punning should be used" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if unsafe type punning should be used" >&5
 printf %s "checking if unsafe type punning should be used... " >&6; }
 # Check whether --enable-unsafe-type-punning was given.
 if test ${enable_unsafe_type_punning+y}
@@ -20708,16 +21978,16 @@ fi
 
 if test "x$enable_unsafe_type_punning" = xyes ; then
 
-printf "%s\n" "#define TUKLIB_USE_UNSAFE_TYPE_PUNNING 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_USE_UNSAFE_TYPE_PUNNING 1" >>confdefs.h
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 else
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+	{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if __builtin_assume_aligned is supported" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if __builtin_assume_aligned is supported" >&5
 printf %s "checking if __builtin_assume_aligned is supported... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20734,15 +22004,15 @@ if ac_fn_c_try_link "$LINENO"
 then :
 
 
-printf "%s\n" "#define HAVE___BUILTIN_ASSUME_ALIGNED 1" >>confdefs.h
+printf '%s\n' "#define HAVE___BUILTIN_ASSUME_ALIGNED 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 
 else case e in #(
   e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 	 ;;
 esac
 fi
@@ -20756,12 +22026,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_param_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to detect the amount of physical memory" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to detect the amount of physical memory" >&5
 printf %s "checking how to detect the amount of physical memory... " >&6; }
 if test ${tuklib_cv_physmem_method+y}
 then :
@@ -20983,43 +22253,43 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tuklib_cv_physmem_method" >&5
-printf "%s\n" "$tuklib_cv_physmem_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $tuklib_cv_physmem_method" >&5
+printf '%s\n' "$tuklib_cv_physmem_method" >&6; }
 
 case $tuklib_cv_physmem_method in
 	aix)
 
-printf "%s\n" "#define TUKLIB_PHYSMEM_AIX 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_PHYSMEM_AIX 1" >>confdefs.h
 
 		;;
 	sysconf)
 
-printf "%s\n" "#define TUKLIB_PHYSMEM_SYSCONF 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_PHYSMEM_SYSCONF 1" >>confdefs.h
 
 		;;
 	sysctl)
 
-printf "%s\n" "#define TUKLIB_PHYSMEM_SYSCTL 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_PHYSMEM_SYSCTL 1" >>confdefs.h
 
 		;;
 	getsysinfo)
 
-printf "%s\n" "#define TUKLIB_PHYSMEM_GETSYSINFO 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_PHYSMEM_GETSYSINFO 1" >>confdefs.h
 
 		;;
 	pstat_getstatic)
 
-printf "%s\n" "#define TUKLIB_PHYSMEM_PSTAT_GETSTATIC 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_PHYSMEM_PSTAT_GETSTATIC 1" >>confdefs.h
 
 		;;
 	getinvent_r)
 
-printf "%s\n" "#define TUKLIB_PHYSMEM_GETINVENT_R 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_PHYSMEM_GETINVENT_R 1" >>confdefs.h
 
 		;;
 	sysinfo)
 
-printf "%s\n" "#define TUKLIB_PHYSMEM_SYSINFO 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_PHYSMEM_SYSINFO 1" >>confdefs.h
 
 		;;
 esac
@@ -21031,12 +22301,12 @@ esac
 ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_param_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to detect the number of available CPU cores" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking how to detect the number of available CPU cores" >&5
 printf %s "checking how to detect the number of available CPU cores... " >&6; }
 if test ${tuklib_cv_cpucores_method+y}
 then :
@@ -21228,33 +22498,33 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tuklib_cv_cpucores_method" >&5
-printf "%s\n" "$tuklib_cv_cpucores_method" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $tuklib_cv_cpucores_method" >&5
+printf '%s\n' "$tuklib_cv_cpucores_method" >&6; }
 
 case $tuklib_cv_cpucores_method in
 	sched_getaffinity)
 
-printf "%s\n" "#define TUKLIB_CPUCORES_SCHED_GETAFFINITY 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_CPUCORES_SCHED_GETAFFINITY 1" >>confdefs.h
 
 		;;
 	cpuset)
 
-printf "%s\n" "#define TUKLIB_CPUCORES_CPUSET 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_CPUCORES_CPUSET 1" >>confdefs.h
 
 		;;
 	sysctl)
 
-printf "%s\n" "#define TUKLIB_CPUCORES_SYSCTL 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_CPUCORES_SYSCTL 1" >>confdefs.h
 
 		;;
 	sysconf)
 
-printf "%s\n" "#define TUKLIB_CPUCORES_SYSCONF 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_CPUCORES_SYSCONF 1" >>confdefs.h
 
 		;;
 	pstat_getdynamic)
 
-printf "%s\n" "#define TUKLIB_CPUCORES_PSTAT_GETDYNAMIC 1" >>confdefs.h
+printf '%s\n' "#define TUKLIB_CPUCORES_PSTAT_GETDYNAMIC 1" >>confdefs.h
 
 		;;
 esac
@@ -21262,7 +22532,7 @@ esac
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc and mbstate_t are properly declared" >&5
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc and mbstate_t are properly declared" >&5
 printf %s "checking whether mbrtowc and mbstate_t are properly declared... " >&6; }
 if test ${ac_cv_func_mbrtowc+y}
 then :
@@ -21294,18 +22564,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mbrtowc" >&5
-printf "%s\n" "$ac_cv_func_mbrtowc" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mbrtowc" >&5
+printf '%s\n' "$ac_cv_func_mbrtowc" >&6; }
   if test $ac_cv_func_mbrtowc = yes; then
 
-printf "%s\n" "#define HAVE_MBRTOWC 1" >>confdefs.h
+printf '%s\n' "#define HAVE_MBRTOWC 1" >>confdefs.h
 
   fi
 
 ac_fn_c_check_func "$LINENO" "wcwidth" "ac_cv_func_wcwidth"
 if test "x$ac_cv_func_wcwidth" = xyes
 then :
-  printf "%s\n" "#define HAVE_WCWIDTH 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_WCWIDTH 1" >>confdefs.h
 
 fi
 
@@ -21337,12 +22607,12 @@ then :
 	# succeed.
 	       for ac_header in CommonCrypto/CommonDigest.h sha256.h sha2.h
 do :
-  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
+  as_ac_Header=`printf '%s\n' "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"
 then :
   cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
+#define `printf '%s\n' "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
 _ACEOF
  sha256_header_found=yes ; break
 fi
@@ -21365,7 +22635,7 @@ done
 if test "x$ac_cv_type_CC_SHA256_CTX" = xyes
 then :
 
-printf "%s\n" "#define HAVE_CC_SHA256_CTX 1" >>confdefs.h
+printf '%s\n' "#define HAVE_CC_SHA256_CTX 1" >>confdefs.h
 
 sha256_type_found=yes
 fi
@@ -21385,7 +22655,7 @@ ac_fn_c_check_type "$LINENO" "SHA256_CTX" "ac_cv_type_SHA256_CTX" "#ifdef HAVE_S
 if test "x$ac_cv_type_SHA256_CTX" = xyes
 then :
 
-printf "%s\n" "#define HAVE_SHA256_CTX 1" >>confdefs.h
+printf '%s\n' "#define HAVE_SHA256_CTX 1" >>confdefs.h
 
 sha256_type_found=yes
 fi
@@ -21405,13 +22675,13 @@ ac_fn_c_check_type "$LINENO" "SHA2_CTX" "ac_cv_type_SHA2_CTX" "#ifdef HAVE_SYS_T
 if test "x$ac_cv_type_SHA2_CTX" = xyes
 then :
 
-printf "%s\n" "#define HAVE_SHA2_CTX 1" >>confdefs.h
+printf '%s\n' "#define HAVE_SHA2_CTX 1" >>confdefs.h
 
 sha256_type_found=yes
 fi
 
 		if test "x$sha256_type_found" = xyes ; then
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256Init" >&5
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256Init" >&5
 printf %s "checking for library containing SHA256Init... " >&6; }
 if test ${ac_cv_search_SHA256Init+y}
 then :
@@ -21469,8 +22739,8 @@ rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256Init" >&5
-printf "%s\n" "$ac_cv_search_SHA256Init" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256Init" >&5
+printf '%s\n' "$ac_cv_search_SHA256Init" >&6; }
 ac_res=$ac_cv_search_SHA256Init
 if test "$ac_res" != no
 then :
@@ -21478,7 +22748,7 @@ then :
 
 fi
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256_Init" >&5
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for library containing SHA256_Init" >&5
 printf %s "checking for library containing SHA256_Init... " >&6; }
 if test ${ac_cv_search_SHA256_Init+y}
 then :
@@ -21536,8 +22806,8 @@ rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256_Init" >&5
-printf "%s\n" "$ac_cv_search_SHA256_Init" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SHA256_Init" >&5
+printf '%s\n' "$ac_cv_search_SHA256_Init" >&6; }
 ac_res=$ac_cv_search_SHA256_Init
 if test "$ac_res" != no
 then :
@@ -21548,12 +22818,12 @@ fi
 
   for ac_func in CC_SHA256_Init SHA256Init SHA256_Init
 do :
-  as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"`
+  as_ac_var=`printf '%s\n' "ac_cv_func_$ac_func" | sed "$as_sed_sh"`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"
 then :
   cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1
+#define `printf '%s\n' "HAVE_$ac_func" | sed "$as_sed_cpp"` 1
 _ACEOF
  sha256_func_found=yes ; break
 fi
@@ -21582,11 +22852,11 @@ fi
 ac_fn_check_decl "$LINENO" "_mm_movemask_epi8" "ac_cv_have_decl__mm_movemask_epi8" "#ifdef HAVE_IMMINTRIN_H
 #include <immintrin.h>
 #endif
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl__mm_movemask_epi8" = xyes
 then :
 
-printf "%s\n" "#define HAVE__MM_MOVEMASK_EPI8 1" >>confdefs.h
+printf '%s\n' "#define HAVE__MM_MOVEMASK_EPI8 1" >>confdefs.h
 
 fi
 
@@ -21603,7 +22873,7 @@ do :
   ac_fn_c_check_header_compile "$LINENO" "sys/capsicum.h" "ac_cv_header_sys_capsicum_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_capsicum_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_SYS_CAPSICUM_H 1" >>confdefs.h
+  printf '%s\n' "#define HAVE_SYS_CAPSICUM_H 1" >>confdefs.h
  capsicum_header_found=yes
 fi
 
@@ -21614,7 +22884,7 @@ if test "$capsicum_header_found" = no ; then
     # declaration of cap_rights_limit to check if <sys/capability.h> is
     # a Capsicum header.
     ac_fn_check_decl "$LINENO" "cap_rights_limit" "ac_cv_have_decl_cap_rights_limit" "#include <sys/capability.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
+" "$ac_c_undeclared_builtin_options$ac_c_future_darwin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_cap_rights_limit" = xyes
 then :
   capsicum_header_found=yes
@@ -21659,7 +22929,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     # Linux has Capsicum functions in libcaprights.
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cap_rights_limit in -lcaprights" >&5
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for cap_rights_limit in -lcaprights" >&5
 printf %s "checking for cap_rights_limit in -lcaprights... " >&6; }
 if test ${ac_cv_lib_caprights_cap_rights_limit+y}
 then :
@@ -21700,8 +22970,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 LIBS=$ac_check_lib_save_LIBS ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_caprights_cap_rights_limit" >&5
-printf "%s\n" "$ac_cv_lib_caprights_cap_rights_limit" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_caprights_cap_rights_limit" >&5
+printf '%s\n' "$ac_cv_lib_caprights_cap_rights_limit" >&6; }
 if test "x$ac_cv_lib_caprights_cap_rights_limit" = xyes
 then :
   CAPSICUM_LIB=-lcaprights
@@ -21719,7 +22989,7 @@ fi
 
 if test "$capsicum_lib_found" = yes ; then
 
-printf "%s\n" "#define HAVE_CAPSICUM 1" >>confdefs.h
+printf '%s\n' "#define HAVE_CAPSICUM 1" >>confdefs.h
 
     enable_sandbox=found
 else
@@ -21758,7 +23028,7 @@ fi
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+                { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
 printf %s "checking whether the -Werror option is usable... " >&6; }
 if test ${gl_cv_cc_vis_werror+y}
 then :
@@ -21789,9 +23059,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
-printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+printf '%s\n' "$gl_cv_cc_vis_werror" >&6; }
+        { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 printf %s "checking for simple visibility declarations... " >&6; }
 if test ${gl_cv_cc_visibility+y}
 then :
@@ -21835,8 +23105,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
-printf "%s\n" "$gl_cv_cc_visibility" >&6; }
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+printf '%s\n' "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
       HAVE_VISIBILITY=1
@@ -21845,7 +23115,7 @@ printf "%s\n" "$gl_cv_cc_visibility" >&6; }
 
 
 
-printf "%s\n" "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
+printf '%s\n' "#define HAVE_VISIBILITY $HAVE_VISIBILITY" >>confdefs.h
 
 
 if test -n "$CFLAG_VISIBILITY" && test "$is_w32" = no; then
@@ -21890,7 +23160,7 @@ then :
 			-Wmissing-noreturn \
 			-Wredundant-decls
 	do
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC accepts $NEW_FLAG" >&5
+		{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking if $CC accepts $NEW_FLAG" >&5
 printf %s "checking if $CC accepts $NEW_FLAG... " >&6; }
 		OLD_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $NEW_FLAG -Werror"
@@ -21902,13 +23172,13 @@ if ac_fn_c_try_compile "$LINENO"
 then :
 
 			AM_CFLAGS="$AM_CFLAGS $NEW_FLAG"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf '%s\n' "yes" >&6; }
 
 else case e in #(
   e)
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf '%s\n' "no" >&6; }
 		 ;;
 esac
 fi
@@ -21983,44 +23253,7 @@ cat >confcache <<\_ACEOF
 
 _ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
+ac_cache_dump |
   sed '
      /^ac_cv_env_/b end
      t clear
@@ -22032,8 +23265,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf '%s\n' "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -22047,8 +23280,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf '%s\n' "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf '%s\n' "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -22065,7 +23298,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`printf '%s\n' "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -22272,14 +23505,26 @@ if test -z "${COND_DOC_TRUE}" && test -z "${COND_DOC_FALSE}"; then
   as_fn_error $? "conditional \"COND_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
 printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf '%s\n' "done" >&6; }
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -22333,13 +23578,21 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : "${CONFIG_STATUS=./config.status}"
+case $CONFIG_STATUS in #(
+  -*) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;; #(
+  */*) :
+     ;; #(
+  *) :
+    CONFIG_STATUS=./$CONFIG_STATUS ;;
+esac
+
 ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+ac_clean_CONFIG_STATUS='"$CONFIG_STATUS"'
+{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf '%s\n' "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >"$CONFIG_STATUS" <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -22353,7 +23606,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -22365,7 +23618,7 @@ then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
+  # contradicts POSIX and common usage.  Disable this.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else case e in #(
@@ -22452,7 +23705,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf '%s\n' "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
@@ -22468,9 +23721,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  printf '%s\n' "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -22565,7 +23818,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+printf '%s\n' X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -22587,29 +23840,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -22651,7 +23881,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf '%s\n' "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -22660,7 +23890,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+printf '%s\n' X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -22713,19 +23943,19 @@ as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
+## ------------------------------------- ##
+## Main body of "$CONFIG_STATUS" script. ##
+## ------------------------------------- ##
 _ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+test $as_write_fail = 0 && chmod +x "$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by XZ Utils $as_me 5.2.13, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.73.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -22747,7 +23977,7 @@ case $ac_config_headers in *"
 esac
 
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -22755,7 +23985,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 '$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
@@ -22788,16 +24018,16 @@ Report bugs to <xz@tukaani.org>.
 XZ Utils home page: <https://tukaani.org/xz/>."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config=`printf '%s\n' "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf '%s\n' "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 XZ Utils config.status 5.2.13
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.73,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2026 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -22806,10 +24036,14 @@ srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+test -n "\$AWK" || {
+  awk '' </dev/null ||
+    as_fn_error \$? "try installing gawk"
+  AWK=awk
+}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
@@ -22837,15 +24071,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    printf '%s\n' "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    printf '%s\n' "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -22853,7 +24087,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf '%s\n' "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -22862,7 +24096,7 @@ do
     as_fn_error $? "ambiguous option: '$1'
 Try '$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    printf '%s\n' "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -22886,29 +24120,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf '%s\n' "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  printf "%s\n" "$ac_log"
+  printf '%s\n' "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -22930,6 +24164,8 @@ OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_cxx_stdlib='`$ECHO "$enable_cxx_stdlib" | $SED "$delay_single_quote_subst"`'
+stdlibflag='`$ECHO "$stdlibflag" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
@@ -22957,6 +24193,7 @@ lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
@@ -23139,6 +24376,7 @@ file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
+lt_ar_flags \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -23274,16 +24512,10 @@ fi
 
 
 
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
-    OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -23383,13 +24615,13 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim_num=`echo "$ac_subst_vars" | sed -n '$='`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | sed -n '$='`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
@@ -23400,7 +24632,7 @@ for ac_last_try in false false false false false :; do
 done
 rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -23445,9 +24677,9 @@ t delim
   N
   s/\n//
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
+' >>"$CONFIG_STATUS" || ac_write_fail=1
 rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
@@ -23476,7 +24708,7 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
@@ -23508,7 +24740,7 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
@@ -23579,9 +24811,9 @@ s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
+"/g' >>"$CONFIG_STATUS" || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
@@ -23599,8 +24831,12 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
+    suffix = P[macro] D[macro]
+    while (suffix ~ /[\t ]$/) {
+      suffix = substr(suffix, 1, length(suffix) - 1)
+    }
     # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
+    print prefix "define", macro suffix
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
@@ -23615,7 +24851,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 { print }
 _ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -23659,7 +24895,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf '%s\n' "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -23667,17 +24903,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf '%s\n' "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf '%s\n' "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`printf '%s\n' "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -23694,7 +24930,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+printf '%s\n' X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23718,9 +24954,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf '%s\n' "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf '%s\n' "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -23765,7 +25001,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -23782,10 +25018,10 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf '%s\n' "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -23799,11 +25035,11 @@ _ACEOF
 # Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>"$CONFIG_STATUS" <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
@@ -23827,9 +25063,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf '%s\n' "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -23845,20 +25081,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { printf '%s\n' "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf '%s\n' "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    printf '%s\n' "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -23878,7 +25114,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$_am_arg" |
+printf '%s\n' X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23898,8 +25134,8 @@ printf "%s\n" X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf '%s\n' "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -23925,7 +25161,7 @@ esac
   for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    am_mf=`printf '%s\n' "$am_mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile which includes
     # dependency-tracking related rules and includes.
     # Grep'ing the whole file directly is not great: AIX grep has a line
@@ -23937,7 +25173,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$am_mf" : 'X\(//\)[^/]' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$am_mf" |
+printf '%s\n' X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23959,7 +25195,7 @@ printf "%s\n" X"$am_mf" |
 $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$am_mf" : 'X\(//\)$' \| \
 	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$am_mf" |
+printf '%s\n' X/"$am_mf" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -23984,8 +25220,8 @@ printf "%s\n" X/"$am_mf" |
    (exit $ac_status); } || am_rc=$?
   done
   if test $am_rc -ne 0; then
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+    { { printf '%s\n' "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf '%s\n' "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
     for automatic dependency tracking.  If GNU make was not used, consider
     re-running the configure script with MAKE=\"gmake\" (or whatever is
@@ -24021,7 +25257,7 @@ See 'config.log' for more details" "$LINENO" 5; }
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2025 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -24074,6 +25310,12 @@ build_old_libs=$enable_static
 # What type of objects to build.
 pic_mode=$pic_mode
 
+# Whether to let the compiler frontend decide what standard libraries to link when building C++ shared libraries and modules.
+enable_cxx_stdlib=$enable_cxx_stdlib
+
+# Flag used for specifying not to link standard libraries.
+stdlibflag=$stdlibflag
+
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
@@ -24144,6 +25386,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
+# whether cygpath is installed.
+cygpath_installed=$lt_cv_cygpath_installed
+
 # A file(cmd) program that detects file types.
 FILECMD=$lt_FILECMD
 
@@ -24166,7 +25411,7 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 AR=$lt_AR
 
 # Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
+lt_ar_flags=$lt_lt_ar_flags
 
 # Flags to create an archive.
 AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
@@ -24707,100 +25952,12 @@ _LT_EOF
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
         test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
         # Treat a directory as a PO directory if and only if it has a
         # POTFILES.in file. This allows packages to have multiple PO
         # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
-                    useit=yes
-                    ;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
           test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
+          cat "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
         fi
         ;;
       esac
@@ -24816,7 +25973,7 @@ done # for ac_tag
 
 as_fn_exit 0
 _ACEOF
-ac_clean_files=$ac_clean_files_save
+ac_clean_CONFIG_STATUS=
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
@@ -24832,19 +25989,26 @@ test $ac_write_fail = 0 ||
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  case $CONFIG_STATUS in #(
+  -*) :
+    ac_no_opts=-- ;; #(
+  *) :
+    ac_no_opts= ;;
+esac
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  $SHELL $ac_no_opts "$CONFIG_STATUS" $ac_config_status_args ||
+    ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf '%s\n' "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi